diff options
author | Satoshi Asami <asami@FreeBSD.org> | 1997-06-03 07:15:52 +0000 |
---|---|---|
committer | Satoshi Asami <asami@FreeBSD.org> | 1997-06-03 07:15:52 +0000 |
commit | 1895fb56f55db7e3549f41cd19e873cedc012ab4 (patch) | |
tree | 69f3ebfe1db36c9aa2d1a3c925416eae388989c5 | |
parent | repeat after me... I will test all changes fully... (diff) |
Upgrade to 0.7.
PR: 3712
Submitted by: Vanill Ice <vanilla@Minje.Com.TW>
Notes
Notes:
svn path=/head/; revision=6688
-rw-r--r-- | graphics/xpdf/Makefile | 8 | ||||
-rw-r--r-- | graphics/xpdf/distinfo | 2 | ||||
-rw-r--r-- | graphics/xpdf/files/patch-aa | 25 | ||||
-rw-r--r-- | graphics/xpdf/files/patch-ab | 62 | ||||
-rw-r--r-- | graphics/xpdf/pkg-plist | 2 |
5 files changed, 58 insertions, 41 deletions
diff --git a/graphics/xpdf/Makefile b/graphics/xpdf/Makefile index 7a0b2d2fab2e..33961c2a8801 100644 --- a/graphics/xpdf/Makefile +++ b/graphics/xpdf/Makefile @@ -1,18 +1,18 @@ # New ports collection makefile for: xpdf -# Version required: 0.6 +# Version required: 0.7 # Date created: 02 Feb 1996 # Whom: chuckr@glue.umd.edu # -# $Id: Makefile,v 1.8 1996/11/29 20:33:16 torstenb Exp $ +# $Id: Makefile,v 1.9 1997/03/21 23:07:01 asami Exp $ # -DISTNAME= xpdf-0.6 +DISTNAME= xpdf-0.7 CATEGORIES= graphics print MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/xpdf/ MAINTAINER= chuckr@glue.umd.edu USE_X11= yes -MAN1= xpdf.1 pdftops.1 +MAN1= xpdf.1 pdftops.1 pdftotext.1 .include <bsd.port.mk> diff --git a/graphics/xpdf/distinfo b/graphics/xpdf/distinfo index 2d72feb47770..6ac7fc619575 100644 --- a/graphics/xpdf/distinfo +++ b/graphics/xpdf/distinfo @@ -1 +1 @@ -MD5 (xpdf-0.6.tar.gz) = a55656a65f937bbf069723035e1bcf35 +MD5 (xpdf-0.7.tar.gz) = a871cade04c8c9e55ff7e45c5ff49b4b diff --git a/graphics/xpdf/files/patch-aa b/graphics/xpdf/files/patch-aa deleted file mode 100644 index d28cb664a341..000000000000 --- a/graphics/xpdf/files/patch-aa +++ /dev/null @@ -1,25 +0,0 @@ -*** Makefile.orig Fri Nov 29 21:16:32 1996 ---- Makefile Fri Nov 29 21:19:22 1996 -*************** -*** 21,30 **** - cd xpdf; $(MAKE) pdftops - - install: -! install -c xpdf/xpdf $(PREFIX)/bin -! install -c xpdf/pdftops $(PREFIX)/bin -! install -c xpdf.1 $(PREFIX)/man/man1 -! install -c pdftops.1 $(PREFIX)/man/man1 - - clean: - cd goo; $(MAKE) clean ---- 21,30 ---- - cd xpdf; $(MAKE) pdftops - - install: -! install -c xpdf/xpdf $(X11BASE)/bin -! install -c xpdf/pdftops $(X11BASE)/bin -! install -c xpdf.1 $(X11BASE)/man/man1 -! install -c pdftops.1 $(X11BASE)/man/man1 - - clean: - cd goo; $(MAKE) clean diff --git a/graphics/xpdf/files/patch-ab b/graphics/xpdf/files/patch-ab index a993fa77a9c9..af6e93e9663f 100644 --- a/graphics/xpdf/files/patch-ab +++ b/graphics/xpdf/files/patch-ab @@ -1,24 +1,41 @@ -*** Makefile.config.orig Fri Nov 29 21:19:49 1996 ---- Makefile.config Fri Nov 29 21:23:24 1996 +*** Makefile.config.orig Fri May 30 03:29:08 1997 +--- Makefile.config Fri May 30 03:31:38 1997 *************** -*** 94,100 **** - #CFLAGS2 = -O2 -Wall +*** 44,50 **** + #------------------------------------------------------------------------ + + # Binaries and man pages will be installed here: +! PREFIX = /usr/local + + # SCO puts stuff here: + #PREFIX = /u +--- 44,50 ---- + #------------------------------------------------------------------------ + + # Binaries and man pages will be installed here: +! PREFIX ?= /usr/X11R6 + + # SCO puts stuff here: + #PREFIX = /u +*************** EXE = +*** 149,155 **** + #CFLAGS2 = -O2 -Wall -DNO_XPM # If you're using g++ 2.7.x, you'll want to use -Wno-unused: -! CFLAGS2 = -O2 -Wall -Wno-unused +! CFLAGS2 = -O2 -Wall -Wno-unused -DNO_XPM # For Linux/FreeBSD/NetBSD/BSDI systems using XFree86: #CFLAGS2 = -O2 -Wall -I/usr/X11R6/include -Wno-unused ---- 94,100 ---- - #CFLAGS2 = -O2 -Wall +--- 149,155 ---- + #CFLAGS2 = -O2 -Wall -DNO_XPM # If you're using g++ 2.7.x, you'll want to use -Wno-unused: -! CFLAGS2 = -O2 -Wall -Wno-unused -I${X11BASE}/include +! CFLAGS2 = -O2 -m486 -pipe -Wall -Wno-unused -I${X11BASE}/include # For Linux/FreeBSD/NetBSD/BSDI systems using XFree86: #CFLAGS2 = -O2 -Wall -I/usr/X11R6/include -Wno-unused -*************** -*** 127,139 **** +*************** CXXFLAGS2 = $(CFLAGS2) +*** 197,209 **** #------------------------------------------------------------------------ # For most systems, just grab the X library: @@ -32,7 +49,7 @@ # Some BSDI systems may need -lipc (?): #XLIBS = -L/usr/X11R6/lib -lX11 -lipc ---- 127,139 ---- +--- 197,209 ---- #------------------------------------------------------------------------ # For most systems, just grab the X library: @@ -46,3 +63,26 @@ # Some BSDI systems may need -lipc (?): #XLIBS = -L/usr/X11R6/lib -lX11 -lipc +*************** XLIBS = -lX11 +*** 242,251 **** + #------------------------------------------------------------------------ + + # This is needed for the color icon: +! #XPMLIB = -lXpm + + # Use this if you don't have libXpm (and also define NO_XPM in CFLAGS2): +! XPMLIB = + + #------------------------------------------------------------------------ + # C++ compilation rule. +--- 242,251 ---- + #------------------------------------------------------------------------ + + # This is needed for the color icon: +! XPMLIB = -lXpm + + # Use this if you don't have libXpm (and also define NO_XPM in CFLAGS2): +! #XPMLIB = + + #------------------------------------------------------------------------ + # C++ compilation rule. diff --git a/graphics/xpdf/pkg-plist b/graphics/xpdf/pkg-plist index 1ec00d39070d..f37fc39577fc 100644 --- a/graphics/xpdf/pkg-plist +++ b/graphics/xpdf/pkg-plist @@ -1,4 +1,6 @@ bin/xpdf bin/pdftops +bin/pdftotext man/man1/xpdf.1.gz man/man1/pdftops.1.gz +man/man1/pdftotext.1.gz |