From naddy@bigeye.rhein-neckar.de Fri Aug 13 21:34:24 1999
Return-Path: <naddy@bigeye.rhein-neckar.de>
Received: from news-ma.rhein-neckar.de (news-ma.rhein-neckar.de [193.197.90.3])
	by hub.freebsd.org (Postfix) with ESMTP id D00F114E52
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 13 Aug 1999 21:34:17 -0700 (PDT)
	(envelope-from naddy@bigeye.rhein-neckar.de)
Received: from mips.rhein-neckar.de (uucp@localhost)
	by news-ma.rhein-neckar.de (8.8.8/8.8.8) with bsmtp id GAA09549;
	Sat, 14 Aug 1999 06:33:02 +0200 (CEST)
	(envelope-from naddy@bigeye.rhein-neckar.de)
Received: from bigeye.rhein-neckar.de ([193.197.90.235]) by mips.rhein-neckar.de
	 with esmtp id m11FUBT-000WyPC
	(Debian Smail-3.2.0.101 1997-Dec-17 #2); Sat, 14 Aug 1999 05:08:39 +0200 (CEST)
Received: (from naddy@localhost)
	by bigeye.rhein-neckar.de (8.9.3/8.9.3) id FAA57230;
	Sat, 14 Aug 1999 05:10:28 +0200 (CEST)
	(envelope-from naddy)
Message-Id: <199908140310.FAA57230@bigeye.rhein-neckar.de>
Date: Sat, 14 Aug 1999 05:10:28 +0200 (CEST)
From: Christian Weisgerber <naddy@mips.rhein-neckar.de>
Sender: naddy@bigeye.rhein-neckar.de
Reply-To: naddy@mips.rhein-neckar.de
To: FreeBSD-gnats-submit@freebsd.org
Cc: chuckr@glue.umd.edu
Subject: update: xpdf 0.90
X-Send-Pr-Version: 3.2

>Number:         13133
>Category:       ports
>Synopsis:       update: xpdf 0.90
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    chuckr
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Aug 13 21:40:01 PDT 1999
>Closed-Date:    Mon Nov 22 19:38:37 PST 1999
>Last-Modified:  Mon Nov 22 19:39:10 PST 1999
>Originator:     Christian Weisgerber
>Release:        FreeBSD 4.0-CURRENT i386
>Organization:
>Environment:

>Description:

Update graphics/xpdf port to version 0.90.

>How-To-Repeat:

>Fix:
	
diff -uNr /usr/ports/graphics/xpdf/Makefile xpdf/Makefile
--- /usr/ports/graphics/xpdf/Makefile	Wed Jun 30 00:34:33 1999
+++ xpdf/Makefile	Sat Aug 14 04:46:27 1999
@@ -6,31 +6,37 @@
 # $Id: Makefile,v 1.22 1999/06/23 06:59:59 taoka Exp $
 #
 
-DISTNAME=       xpdf-0.80
+DISTNAME=       xpdf-0.90
 CATEGORIES=	graphics print
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN} ftp://ftp.foolabs.com/pub/xpdf/  \
-		ftp://ftp.duke.edu/pub/X11/contrib/applications/  \
-		${MASTER_SITE_TEX_CTAN}
+		ftp://ftp.duke.edu/pub/X11/contrib/applications/
 MASTER_SITE_SUBDIR=support/xpdf
 EXTRACT_SUFX=	.tgz
 
 .if defined(USA_RESIDENT) && !defined(PACKAGE_BUILDING)
-PATCH_SITES=	ftp://ftp.sci.usq.edu.au/pub/linux/xpdf/
-PATCHFILES=	xpdf-0.80-decrypt.patch
-PATCH_DIST_ARGS=-p0 -E -d ${WRKDIR} --quiet
+PATCH_SITES=	http://www.fefe.de/
+PATCHFILES=	xpdf-0.90-fefe-diff.gz
+PATCH_DIST_STRIP= -p1
 .endif
 
 MAINTAINER=	chuckr@glue.umd.edu
 
+BUILD_DEPENDS=	${LOCALBASE}/lib/libt1.a:${PORTSDIR}/devel/t1lib
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 
 .if defined(USA_RESIDENT) && !defined(PACKAGE_BUILDING)
 RESTRICTED=     "Contains cryptography"
 .endif
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-gzip --enable-japanese
-CONFIGURE_ENV=	CXXFLAGS="${CFLAGS}"
+CONFIGURE_ARGS=	--with-gzip --enable-japanese		\
+		--with-t1-library=${LOCALBASE}/lib	\
+		--with-t1-includes=${LOCALBASE}/include	\
+		--with-t1x-library=${LOCALBASE}/lib	\
+		--with-t1x-includes=${LOCALBASE}/include
+.if defined(A4)
+CONFIGURE_ARGS+=	--enable-a4-paper
+.endif
 
 MAN1=		pdfimages.1 \
 		pdfinfo.1 \
diff -uNr /usr/ports/graphics/xpdf/files/md5 xpdf/files/md5
--- /usr/ports/graphics/xpdf/files/md5	Wed Jun 30 00:34:33 1999
+++ xpdf/files/md5	Sat Aug 14 04:47:14 1999
@@ -1,2 +1,2 @@
-MD5 (xpdf-0.80.tgz) = 91d49cfaf1e555a26a9bcd0b57e51f8a
-MD5 (xpdf-0.80-decrypt.patch) = 97d6648022fcd9633917f8dc96d25fa2
+MD5 (xpdf-0.90.tgz) = a7678b64713a466279b61c28ba01134b
+MD5 (xpdf-0.90-fefe-diff.gz) = 94540d59aee83441f33fbc09fc800ba8
diff -uNr /usr/ports/graphics/xpdf/patches/patch-aa xpdf/patches/patch-aa
--- /usr/ports/graphics/xpdf/patches/patch-aa	Thu Jan  1 01:00:00 1970
+++ xpdf/patches/patch-aa	Sat Aug 14 04:20:57 1999
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Tue Aug  3 06:36:22 1999
++++ Makefile.in	Sat Aug 14 04:20:32 1999
+@@ -12,7 +12,7 @@
+ exec_prefix = @exec_prefix@
+ srcdir = @srcdir@
+ 
+-INSTALL = @INSTALL@
++INSTALL = @INSTALL_PROGRAM@
+ INSTALL_DATA = @INSTALL_DATA@
+ 
+ EXE = @EXE@

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports->chuckr 
Responsible-Changed-By: steve 
Responsible-Changed-When: Sat Aug 21 21:07:00 PDT 1999 
Responsible-Changed-Why:  
Over to port's maintainer. 

From: OKAZAKI Tetsurou <okazaki@be.to>
To: bug-followup@FreeBSD.org
Cc: chuckr@glue.umd.edu, naddy@mips.rhein-neckar.de
Subject: Re: ports/13133: update: xpdf 0.90
Date: Fri, 19 Nov 1999 00:52:30 +0900

 Dear committor,
 
 Please commit following patch after the ports/13133.
 
 Summary of changes:
  o decryption patch update.
  o switch t1lib BUILD_DEPENDS to LIB_DEPENDS.
  o new patch: patch-ab (or `patch-ac' is better?)
     modifies `configure.in' to detect argument types of
     select(2) exactly. (gcc-2.95.2 fails to compile 
     ltk/LTKApp.cc if SELECT_TAKES_INT was defined.)
  o then define USE_AUTOCONF.
 
 Best regards.
 
 Tetsurou
 
 
 diff -urN xpdf-pr13133/Makefile xpdf/Makefile
 --- xpdf-pr13133/Makefile	Thu Nov 18 22:34:00 1999
 +++ xpdf/Makefile	Thu Nov 18 22:50:11 1999
 @@ -1,5 +1,5 @@
  # New ports collection makefile for:	xpdf
 -# Version required:     0.80
 +# Version required:     0.90
  # Date created:         02 Feb 1996
  # Whom:                 chuckr@glue.umd.edu
  #
 @@ -15,20 +15,20 @@
  
  .if defined(USA_RESIDENT) && !defined(PACKAGE_BUILDING)
  PATCH_SITES=	http://www.fefe.de/
 -PATCHFILES=	xpdf-0.90-fefe-diff.gz
 +PATCHFILES=	xpdf-0.90-fefe-diff2.gz
  PATCH_DIST_STRIP= -p1
  .endif
  
  MAINTAINER=	chuckr@glue.umd.edu
  
 -BUILD_DEPENDS=	${LOCALBASE}/lib/libt1.a:${PORTSDIR}/devel/t1lib
 -LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 +LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
 +		t1.9:${PORTSDIR}/devel/t1lib
  
  .if defined(USA_RESIDENT) && !defined(PACKAGE_BUILDING)
  RESTRICTED=     "Contains cryptography"
  .endif
  USE_XLIB=	yes
 -GNU_CONFIGURE=	yes
 +USE_AUTOCONF=	yes
  CONFIGURE_ARGS=	--with-gzip --enable-japanese		\
  		--with-t1-library=${LOCALBASE}/lib	\
  		--with-t1-includes=${LOCALBASE}/include	\
 diff -urN xpdf-pr13133/files/md5 xpdf/files/md5
 --- xpdf-pr13133/files/md5	Thu Nov 18 22:34:00 1999
 +++ xpdf/files/md5	Thu Nov 18 04:35:52 1999
 @@ -1,2 +1,2 @@
  MD5 (xpdf-0.90.tgz) = a7678b64713a466279b61c28ba01134b
 -MD5 (xpdf-0.90-fefe-diff.gz) = 94540d59aee83441f33fbc09fc800ba8
 +MD5 (xpdf-0.90-fefe-diff2.gz) = 33339e6b598f4e3caadf2a4f20fe4734
 diff -urN xpdf-pr13133/patches/patch-ab xpdf/patches/patch-ab
 --- xpdf-pr13133/patches/patch-ab	Thu Jan  1 09:00:00 1970
 +++ xpdf/patches/patch-ab	Thu Nov 18 06:46:55 1999
 @@ -0,0 +1,20 @@
 +--- configure.in.~1~	Tue Aug  3 13:36:22 1999
 ++++ configure.in	Thu Nov 18 06:45:50 1999
 +@@ -69,6 +69,7 @@
 + dnl ##### Checks for header files.
 + AC_PATH_XTRA
 + AC_HEADER_DIRENT
 ++AC_CHECK_HEADERS(unistd.h)
 + 
 + dnl ##### Look for header that defines fd_set.
 + AC_MSG_CHECKING([fd_set and sys/select.h or sys/bsdtypes.h])
 +@@ -147,6 +148,9 @@
 + xpdf_cv_func_select_arg,
 + [AC_TRY_COMPILE([#include <sys/types.h>
 + #include <sys/time.h>
 ++#ifdef HAVE_UNISTD_H
 ++#include <unistd.h>
 ++#endif
 + #ifdef HAVE_SYS_SELECT_H
 + #include <sys/select.h>
 + #endif],
 
State-Changed-From-To: open->closed 
State-Changed-By: chuckr 
State-Changed-When: Mon Nov 22 19:38:37 PST 1999 
State-Changed-Why:  
Committed most of patch. 
>Unformatted:
