Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 9 Feb 2002 11:50:14 -0800 (PST)
From:      KATO Tsuguru <tkato@prontomail.com>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/34770: Update port: graphics/xpdf to 1.00 (fix ports/31611)
Message-ID:  <200202091950.g19JoEU24934@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         34770
>Category:       ports
>Synopsis:       Update port: graphics/xpdf to 1.00 (fix ports/31611)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Feb 09 12:00:04 PST 2002
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        4.4-RELEASE i386
>Organization:
>Environment:
>Description:
- Update to version 1.00

New file:
files/patch-ac
files/patch-ad
files/patch-ae

This PR supersedes ports/31611.

>How-To-Repeat:

>Fix:
diff -urN /usr/ports/graphics/xpdf/Makefile graphics/xpdf/Makefile
--- /usr/ports/graphics/xpdf/Makefile	Sat Nov 24 06:27:56 2001
+++ graphics/xpdf/Makefile	Sat Feb  2 14:00:16 2002
@@ -6,42 +6,37 @@
 #
 
 PORTNAME=	xpdf
-PORTVERSION=	0.92
+PORTVERSION=	1.00
 CATEGORIES=	graphics print
 MASTER_SITES=	ftp://ftp.foolabs.com/pub/xpdf/  \
 		${MASTER_SITE_TEX_CTAN}
 MASTER_SITE_SUBDIR=	support/xpdf
-EXTRACT_SUFX=	.tgz
-
-PATCH_SITES=	http://vzzbx.xs4all.nl/files/ \
-		http://www.cs.cmu.edu/~dst/Adobe/Gallery/
-PATCHFILES=	xpdf-ro-remove.patch
-PATCH_DIST_STRIP= -p1
 
 MAINTAINER=	chuckr@FreeBSD.org
 
-LIB_DEPENDS=	t1.4:${PORTSDIR}/devel/t1lib
+BUILD_DEPENDS=	freetype-config:${PORTSDIR}/print/freetype2	# XXX
+LIB_DEPENDS=	t1.4:${PORTSDIR}/devel/t1lib \
+		freetype.8:${PORTSDIR}/print/freetype2
 
 USE_X_PREFIX=	yes
 USE_XPM=	yes
-USE_FREETYPE=	yes
+USE_GMAKE=	yes
 USE_AUTOCONF=	yes
-CONFIGURE_ARGS=	--with-gzip --enable-opi		\
-		--enable-japanese 	\
-		--enable-chinese-cns --enable-chinese-gb	\
-		--with-t1-library=${LOCALBASE}/lib	\
-		--with-t1-includes=${LOCALBASE}/include	\
-		--with-freetype-library=${LOCALBASE}/lib \
-		--with-freetype-includes=${LOCALBASE}/include/freetype
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/freetype2 -I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS=	--with-gzip --enable-opi \
+		--without-freetype-library
 .if defined(A4)
 CONFIGURE_ARGS+=	--enable-a4-paper
 .endif
 
-MAN1=		pdfimages.1 \
+MAN1=		pdffonts.1 \
+		pdfimages.1 \
 		pdfinfo.1 \
 		pdftopbm.1 \
 		pdftops.1 \
 		pdftotext.1 \
 		xpdf.1
+MAN5=		xpdfrc.5
 
 .include <bsd.port.mk>
diff -urN /usr/ports/graphics/xpdf/distinfo graphics/xpdf/distinfo
--- /usr/ports/graphics/xpdf/distinfo	Sun Sep  2 11:56:29 2001
+++ graphics/xpdf/distinfo	Sat Feb  2 10:57:56 2002
@@ -1,2 +1 @@
-MD5 (xpdf-0.92.tgz) = 2d6e9fb157db928bd0cca4214ddd2c80
-MD5 (xpdf-ro-remove.patch) = cd4717d3de8244bbcd04d11114b73e57
+MD5 (xpdf-1.00.tar.gz) = 81f3c381cef729e4b6f4ce21cf5bbf3c
diff -urN /usr/ports/graphics/xpdf/files/patch-ac graphics/xpdf/files/patch-ac
--- /usr/ports/graphics/xpdf/files/patch-ac	Thu Jan  1 09:00:00 1970
+++ graphics/xpdf/files/patch-ac	Sat Feb  2 12:35:34 2002
@@ -0,0 +1,17 @@
+--- xpdf/pdftotext.cc.orig	Sat Feb  2 08:15:45 2002
++++ xpdf/pdftotext.cc	Sat Feb  2 12:35:19 2002
+@@ -148,10 +148,10 @@
+   }
+ 
+   // check for copy permission
+-  if (!doc->okToCopy()) {
+-    error(-1, "Copying of text from this document is not allowed.");
+-    goto err2;
+-  }
++  //  if (!doc->okToCopy()) {
++  //    error(-1, "Copying of text from this document is not allowed.");
++  //    goto err2;
++  //  }
+ 
+   // construct text file name
+   if (argc == 3) {
diff -urN /usr/ports/graphics/xpdf/files/patch-ad graphics/xpdf/files/patch-ad
--- /usr/ports/graphics/xpdf/files/patch-ad	Thu Jan  1 09:00:00 1970
+++ graphics/xpdf/files/patch-ad	Sat Oct 27 19:17:24 2001
@@ -0,0 +1,13 @@
+--- xpdf/xpdf.cc.orig	Sat Oct 27 02:52:42 2001
++++ xpdf/xpdf.cc	Sat Oct 27 19:17:09 2001
+@@ -1320,7 +1320,9 @@
+ 	s = out->getText(selectXMin, selectYMin, selectXMax, selectYMax);
+ 	win->setSelection(NULL, s);
+       } else {
+-	error(-1, "Copying of text from this document is not allowed.");
++	error(-1, "Copying of text from this document is not allowed, but possible :-).");
++	s = out->getText(selectXMin, selectYMin, selectXMax, selectYMax);
++	win->setSelection(NULL, s);
+       }
+ #endif
+ 
diff -urN /usr/ports/graphics/xpdf/files/patch-ae graphics/xpdf/files/patch-ae
--- /usr/ports/graphics/xpdf/files/patch-ae	Thu Jan  1 09:00:00 1970
+++ graphics/xpdf/files/patch-ae	Sat Feb  2 13:36:33 2002
@@ -0,0 +1,11 @@
+--- xpdf/Makefile.in.orig	Sat Feb  2 08:15:45 2002
++++ xpdf/Makefile.in	Sat Feb  2 13:36:23 2002
+@@ -17,7 +17,7 @@
+ LTKSRCDIR = $(srcdir)/../ltk
+ LTKLIBDIR = ../ltk
+ 
+-CXXFLAGS = @CXXFLAGS@ @DEFS@ -I.. -I$(GOOSRCDIR) -I$(LTKSRCDIR) -I$(srcdir) @X_CFLAGS@ @Xpm_CFLAGS@ @t1_CFLAGS@ @freetype_CFLAGS@ @freetype2_CFLAGS@ @libpaper_CFLAGS@
++CXXFLAGS = @CXXFLAGS@ @DEFS@ -I.. -I$(GOOSRCDIR) -I$(LTKSRCDIR) -I$(srcdir) @CPPFLAGS@ @X_CFLAGS@ @Xpm_CFLAGS@ @t1_CFLAGS@ @freetype_CFLAGS@ @freetype2_CFLAGS@ @libpaper_CFLAGS@
+ 
+ LDFLAGS = @LDFLAGS@
+ 
diff -urN /usr/ports/graphics/xpdf/pkg-plist graphics/xpdf/pkg-plist
--- /usr/ports/graphics/xpdf/pkg-plist	Mon Dec  7 09:40:19 1998
+++ graphics/xpdf/pkg-plist	Sat Feb  2 13:29:10 2002
@@ -1,6 +1,8 @@
+bin/pdffonts
 bin/pdfimages
 bin/pdfinfo
 bin/pdftopbm
 bin/pdftops
 bin/pdftotext
 bin/xpdf
+etc/xpdfrc

>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200202091950.g19JoEU24934>