Upgrade, 0.3 -> 0.4.

Submitted by:	chuckr@Glue.umd.edu

5 files changed, 47 insertions, 37 deletions

diff --git a/graphics/xpdf/Makefile b/graphics/xpdf/Makefile
index a357c8020c01..71d0153261c9 100644
--- a/graphics/xpdf/Makefile
+++ b/graphics/xpdf/Makefile
@@ -1,15 +1,14 @@
 # New ports collection makefile for:	xpdf
-# Version required:     0.3
+# Version required:     0.4
 # Date created:         02 Feb 1996
 # Whom:                 chuckr@glue.umd.edu
 #
-# $Id: Makefile,v 1.2 1996/02/11 03:06:46 asami Exp $
+# $Id: Makefile,v 1.3 1996/03/06 08:20:03 asami Exp $
 #
 
-DISTNAME=       xpdf-0.3
+DISTNAME=       xpdf-0.4
 CATEGORIES+=	graphics
 MASTER_SITES=   ftp://ftp.andrew.cmu.edu/pub/xpdf/
-EXTRACT_SUFX=	.tar.gz
 
 MAINTAINER=	chuckr@glue.umd.edu
 
diff --git a/graphics/xpdf/distinfo b/graphics/xpdf/distinfo
index d3f98df1d137..9af9afc3b19f 100644
--- a/graphics/xpdf/distinfo
+++ b/graphics/xpdf/distinfo
@@ -1 +1 @@
-MD5 (xpdf-0.3.tar.gz) = b0131ba93b936f3ed7b1ccd265d4fe03
+MD5 (xpdf-0.4.tar.gz) = 1320c735f99a375c61cb1bf9cb289823
diff --git a/graphics/xpdf/files/patch-aa b/graphics/xpdf/files/patch-aa
index 6ce212c80571..c22dbaed4d99 100644
--- a/graphics/xpdf/files/patch-aa
+++ b/graphics/xpdf/files/patch-aa
@@ -1,12 +1,13 @@
---- Makefile.orig	Sat Jan 13 11:11:55 1996
-+++ Makefile	Mon Feb  5 18:06:05 1996
-@@ -11,6 +11,9 @@
- 	cd ltk; make depend; make
- 	cd xpdf; make depend; make
+--- Makefile.orig	Wed May  1 17:52:04 1996
++++ Makefile	Wed May  1 17:53:14 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
  
-+install:
-+	install -c xpdf/xpdf ${PREFIX}/bin
-+
  clean:
  	cd goo; make clean
- 	cd ltk; make clean
diff --git a/graphics/xpdf/files/patch-ab b/graphics/xpdf/files/patch-ab
index e13e77f9b7c4..ebc827df8c02 100644
--- a/graphics/xpdf/files/patch-ab
+++ b/graphics/xpdf/files/patch-ab
@@ -1,25 +1,34 @@
---- Makefile.config.orig	Sat Jan 13 11:11:45 1996
-+++ Makefile.config	Mon Feb  5 17:44:39 1996
-@@ -15,18 +15,19 @@
- # Extra flags for C compiler
- # This can include things like -I and -L if your include files or
- # libraries are in non-standard places.
-+# For FreeBSD, need -DHAVE_PARAM_H
+--- Makefile.config.orig	Wed May  1 17:36:22 1996
++++ Makefile.config	Wed May  1 17:37:41 1996
+@@ -74,13 +74,13 @@
  #CFLAGS2 = 
+ 
+ # If you're using g++ 2.7.x, you'll want to use -Wno-unused:
 -CFLAGS2 = -Wno-unused
-+CFLAGS2 = -Wno-unused -DHAVE_PARAM_H -I${X11BASE}/include
- 
- # Extra flags for C++ compiler
- # This can include things like -I and -L if your include files or
- # libraries are in non-standard places.
- #CXXFLAGS2 = 
--CXXFLAGS2 = -Wno-unused
-+CXXFLAGS2 = -Wno-unused -I${X11BASE}/include
- 
- # Any flags necessary to link in libX11.
- #XLIBS = -lX11
--XLIBS = -L/usr/X11/lib -lX11
-+XLIBS = -L${X11BASE}/lib -lX11
- #XLIBS = -lX11-mit
- 
- # Different versions of make have different C++ rules.
++#CFLAGS2 = -Wno-unused
+ 
+ # For Linux systems using XFree86:
+ #CFLAGS2 = -I/usr/X11/include -Wno-unused
+ 
+ # For FreeBSD systems using XFree86:
+-#CFLAGS2 = -I$(X11BASE)/include -Wno-unused
++CFLAGS2 = -I$(X11BASE)/include -Wno-unused
+ 
+ # For Solaris:
+ #CFLAGS2 = -I/usr/openwin/include
+@@ -97,13 +97,13 @@
+ #------------------------------------------------------------------------
+ 
+ # For most systems, just grab the X library:
+-XLIBS = -lX11
++#XLIBS = -lX11
+ 
+ # For Linux systems using XFree86:
+ #XLIBS = -L/usr/X11/lib -lX11
+ 
+ # For FreeBSD systems using XFree86:
+-#XLIBS = -L$(X11BASE)/lib -lX11
++XLIBS = -L$(X11BASE)/lib -lX11
+ 
+ # For Solaris:
+ #XLIBS = -L/usr/openwin/lib -lX11 -lnsl -lsocket
diff --git a/graphics/xpdf/pkg-plist b/graphics/xpdf/pkg-plist
index d38befb01adc..136faf9ed52b 100644
--- a/graphics/xpdf/pkg-plist
+++ b/graphics/xpdf/pkg-plist
@@ -1 +1,2 @@
 bin/xpdf
+bin/pdftops