Upgrade to 0.6

4 files changed, 77 insertions, 57 deletions

diff --git a/graphics/xpdf/Makefile b/graphics/xpdf/Makefile
index a7e3cb6b0060..edfeb6d8cdbb 100644
--- a/graphics/xpdf/Makefile
+++ b/graphics/xpdf/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	xpdf
-# Version required:     0.5
+# Version required:     0.6
 # Date created:         02 Feb 1996
 # Whom:                 chuckr@glue.umd.edu
 #
-# $Id: Makefile,v 1.6 1996/06/03 00:13:01 asami Exp $
+# $Id: Makefile,v 1.7 1996/11/18 11:29:53 asami Exp $
 #
 
-DISTNAME=       xpdf-0.5
+DISTNAME=       xpdf-0.6
 CATEGORIES=	graphics
 MASTER_SITES=   ftp://ftp.andrew.cmu.edu/pub/xpdf/
 
@@ -15,8 +15,4 @@ MAINTAINER=	chuckr@glue.umd.edu
 USE_X11=	yes
 MAN1=		xpdf.1 pdftops.1
 
-post-install:
-	${INSTALL_MAN} ${WRKSRC}/xpdf.1 ${PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/pdftops.1 ${PREFIX}/man/man1
-
 .include <bsd.port.mk>
diff --git a/graphics/xpdf/distinfo b/graphics/xpdf/distinfo
index 1bbb8b5ea49e..2d72feb47770 100644
--- a/graphics/xpdf/distinfo
+++ b/graphics/xpdf/distinfo
@@ -1 +1 @@
-MD5 (xpdf-0.5.tar.gz) = 52eef2370042dda70c1ca49a26f2869f
+MD5 (xpdf-0.6.tar.gz) = a55656a65f937bbf069723035e1bcf35
diff --git a/graphics/xpdf/files/patch-aa b/graphics/xpdf/files/patch-aa
index d49165df2ebc..d28cb664a341 100644
--- a/graphics/xpdf/files/patch-aa
+++ b/graphics/xpdf/files/patch-aa
@@ -1,13 +1,25 @@
---- Makefile.orig	Fri May 24 10:45:36 1996
-+++ Makefile	Wed May 29 13:21:40 1996
-@@ -21,8 +21,8 @@
- 	cd xpdf; $(MAKE) pdftops
- 
- install:
--	install -c xpdf/xpdf $(PREFIX)/bin
--	install -c xpdf/pdftops $(PREFIX)/bin
-+	install -c xpdf/xpdf $(X11BASE)/bin
-+	install -c xpdf/pdftops $(X11BASE)/bin
- 
- clean:
- 	cd goo; $(MAKE) clean
+*** 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 df5951edfcde..a7aa1c31a5c2 100644
--- a/graphics/xpdf/files/patch-ab
+++ b/graphics/xpdf/files/patch-ab
@@ -1,36 +1,48 @@
---- Makefile.config.dist	Fri May 24 12:29:32 1996
-+++ Makefile.config	Wed May 29 13:23:06 1996
-@@ -81,7 +81,7 @@
- #------------------------------------------------------------------------
- 
- # This will work for most systems:
--CFLAGS2 = -O2 -Wall
-+#CFLAGS2 = -O2 -Wall
- 
- # If you're using g++ 2.7.x, you'll want to use -Wno-unused:
- #CFLAGS2 = -O2 -Wall -Wno-unused
-@@ -90,7 +90,7 @@
- #CFLAGS2 = -O2 -Wall -I/usr/X11R6/include -Wno-unused
- 
- # For official FreeBSD port (using the FreeBSD makefiles):
--#CFLAGS2 = -O2 -Wall -I$(X11BASE)/include -Wno-unused
-+CFLAGS2 = -O2 -Wall -I$(X11BASE)/include -Wno-unused
- 
- # For Solaris:
- #CFLAGS2 = -O2 -Wall -I/usr/openwin/include
-@@ -110,13 +110,13 @@
- #------------------------------------------------------------------------
- 
- # For most systems, just grab the X library:
--XLIBS = -lX11
-+#XLIBS = -lX11
- 
- # For Linux/FreeBSD/NetBSD systems using XFree86:
- #XLIBS = -L/usr/X11R6/lib -lX11
- 
- # For official FreeBSD port (using the FreeBSD makefiles):
--#XLIBS = -L$(X11BASE)/lib -lX11
-+XLIBS = -L$(X11BASE)/lib -lX11
- 
- # For Solaris:
- #XLIBS = -L/usr/openwin/lib -lX11 -lnsl -lsocket
+*** Makefile.config.orig	Fri Nov 29 21:19:49 1996
+--- Makefile.config	Fri Nov 29 21:23:24 1996
+***************
+*** 94,100 ****
+  #CFLAGS2 = -O2 -Wall
+  
+  # If you're using g++ 2.7.x, you'll want to use -Wno-unused:
+! CFLAGS2 = -O2 -Wall -Wno-unused
+  
+  # For Linux/FreeBSD/NetBSD/BSDI systems using XFree86:
+  #CFLAGS2 = -O2 -Wall -I/usr/X11R6/include -Wno-unused
+--- 94,100 ----
+  #CFLAGS2 = -O2 -Wall
+  
+  # If you're using g++ 2.7.x, you'll want to use -Wno-unused:
+! #CFLAGS2 = -O2 -Wall -Wno-unused
+  
+  # For Linux/FreeBSD/NetBSD/BSDI systems using XFree86:
+  #CFLAGS2 = -O2 -Wall -I/usr/X11R6/include -Wno-unused
+***************
+*** 127,139 ****
+  #------------------------------------------------------------------------
+  
+  # For most systems, just grab the X library:
+! XLIBS = -lX11
+  
+  # For Linux/FreeBSD/NetBSD/BSDI systems using XFree86:
+  #XLIBS = -L/usr/X11R6/lib -lX11
+  
+  # For official FreeBSD port (using the FreeBSD makefiles):
+! #XLIBS = -L$(X11BASE)/lib -lX11
+  
+  # Some BSDI systems may need -lipc (?):
+  #XLIBS = -L/usr/X11R6/lib -lX11 -lipc
+--- 127,139 ----
+  #------------------------------------------------------------------------
+  
+  # For most systems, just grab the X library:
+! #XLIBS = -lX11
+  
+  # For Linux/FreeBSD/NetBSD/BSDI systems using XFree86:
+  #XLIBS = -L/usr/X11R6/lib -lX11
+  
+  # For official FreeBSD port (using the FreeBSD makefiles):
+! XLIBS = -L$(X11BASE)/lib -lX11
+  
+  # Some BSDI systems may need -lipc (?):
+  #XLIBS = -L/usr/X11R6/lib -lX11 -lipc