Make this port install text files in the more proper location PREFIX/share.

PR:		13351
Submitted by:	Sergei Laskavy <laskavy@Berkeley.Gambit.Msk.SU>, asami

4 files changed, 63 insertions, 55 deletions

diff --git a/security/pgp/Makefile b/security/pgp/Makefile
index ba35da9a5cb4..608715f2960a 100644
--- a/security/pgp/Makefile
+++ b/security/pgp/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pgp
 PORTVERSION=	2.6.3i
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.ifi.uio.no/pub/pgp/2.x/src/ \
 		ftp://ftp.kiarchive.ru/pub/unix/crypto/pgp/
@@ -18,8 +19,9 @@ COMMENT=	PGP MIT or International version - Public-Key encryption for the masses
 WRKSRC=		${WRKDIR}/src
 
 MAKEFILE=	makefile
-ALL_TARGET=	freebsd-${MACHINE_ARCH} OS_CFLAGS="${CFLAGS}"
-PGPLIB=		${PREFIX}/lib/pgp
+ALL_TARGET=	freebsd-${MACHINE_ARCH}
+MAKE_ENV=	PREFIX="${PREFIX}" OS_CFLAGS="${CFLAGS}"
+PGPLIB=		${PREFIX}/share/pgp
 MAN1=		pgp.1 pgp2.1
 ONLY_FOR_ARCHS=	i386 alpha
 
diff --git a/security/pgp/files/patch-aa b/security/pgp/files/patch-aa
index 0fc4dcff9f24..efd6c8c44e91 100644
--- a/security/pgp/files/patch-aa
+++ b/security/pgp/files/patch-aa
@@ -1,45 +1,40 @@
-*** makefile.orig	Thu Jan 18 04:42:36 1996
---- makefile	Sat Feb 19 11:06:55 2000
-***************
-*** 79,85 ****
-  	@echo "where <system> can be:"
-  	@echo "	386bsd, 3b1, 3b1_asm, aix370, aix386, amix-68k-gcc, apollo,"
-  	@echo "	apollo-gcc, atari,aux(*), aux-gcc, bsd, bsdgcc, convexos,"
-! 	@echo "	dgux, djgpp, encore, freebsd, hpux-68k(*), hpux-68k-ansi,"
-  	@echo "	hpux-68k-gcc, hpux-pa(*), hpux-pa-ansi, hpux-pa-gcc,"
-  	@echo "	hpux9-pa-ansi, irix, irix_asm, isc, isc_asm, linux, linux-68k,"
-  	@echo "	machten, mach_386, mips-ultrix, netbsd, netbsd_68k, newsasm,"
---- 79,85 ----
-  	@echo "where <system> can be:"
-  	@echo "	386bsd, 3b1, 3b1_asm, aix370, aix386, amix-68k-gcc, apollo,"
-  	@echo "	apollo-gcc, atari,aux(*), aux-gcc, bsd, bsdgcc, convexos,"
-! 	@echo "	dgux, djgpp, encore, freebsd-{alpha,i386}, hpux-68k(*), hpux-68k-ansi,"
-  	@echo "	hpux-68k-gcc, hpux-pa(*), hpux-pa-ansi, hpux-pa-gcc,"
-  	@echo "	hpux9-pa-ansi, irix, irix_asm, isc, isc_asm, linux, linux-68k,"
-  	@echo "	machten, mach_386, mips-ultrix, netbsd, netbsd_68k, newsasm,"
-***************
-*** 171,179 ****
-  	$(MAKE) all CC=gcc LD=gcc \
-  	CFLAGS="$(RSAINCDIR) -O2 -DHIGHFIRST -DUNIX -DPORTABLE -DIDEA32"
-  
-! freebsd:
-  	$(MAKE) all LD="$(CC) -s" OBJS_EXT="_80386.o _zmatch.o" \
-! 	CFLAGS="$(RSAINCDIR) -O2 -fno-strength-reduce -DUNIX -DIDEA32 -DASM \
-  	-DMAX_NAMELEN=255"
-  
-  386bsd:
---- 171,184 ----
-  	$(MAKE) all CC=gcc LD=gcc \
-  	CFLAGS="$(RSAINCDIR) -O2 -DHIGHFIRST -DUNIX -DPORTABLE -DIDEA32"
-  
-! freebsd-i386:
-  	$(MAKE) all LD="$(CC) -s" OBJS_EXT="_80386.o _zmatch.o" \
-! 	CFLAGS="$(RSAINCDIR) $(OS_CFLAGS) -DUNIX -DIDEA32 -DASM \
-! 	-DMAX_NAMELEN=255"
-! 
-! freebsd-alpha:
-! 	$(MAKE) all LD="$(CC) -s" \
-! 	CFLAGS="$(RSAINCDIR) $(OS_CFLAGS) -DPORTABLE -DUNIX -DIDEA32 \
-  	-DMAX_NAMELEN=255"
-  
-  386bsd:
+--- makefile	Thu Jan 18 05:42:36 1996
++++ makefile.new	Wed Jun 11 20:50:13 2003
+@@ -50,7 +50,8 @@
+ # -DUSE_SELECT to use select() system call
+ # -DUSE_NBIO   to use non-blocking read()
+ 
+-CFLAGS= -O -DUNIX -DPORTABLE $(BYTEORDER)
++PREFIX	?=/usr/local
++CFLAGS= -O -DUNIX -DPORTABLE $(BYTEORDER) -DPREFIX=\"$(PREFIX)\"
+ 
+ # must set byte order for targets "sysv" and "bsd"
+ # BYTEORDER= -DHIGHFIRST
+@@ -79,7 +80,7 @@
+ 	@echo "where <system> can be:"
+ 	@echo "	386bsd, 3b1, 3b1_asm, aix370, aix386, amix-68k-gcc, apollo,"
+ 	@echo "	apollo-gcc, atari,aux(*), aux-gcc, bsd, bsdgcc, convexos,"
+-	@echo "	dgux, djgpp, encore, freebsd, hpux-68k(*), hpux-68k-ansi,"
++	@echo "	dgux, djgpp, encore, freebsd-{alpha,i386}, hpux-68k(*), hpux-68k-ansi,"
+ 	@echo "	hpux-68k-gcc, hpux-pa(*), hpux-pa-ansi, hpux-pa-gcc,"
+ 	@echo "	hpux9-pa-ansi, irix, irix_asm, isc, isc_asm, linux, linux-68k,"
+ 	@echo "	machten, mach_386, mips-ultrix, netbsd, netbsd_68k, newsasm,"
+@@ -171,10 +172,15 @@
+ 	$(MAKE) all CC=gcc LD=gcc \
+ 	CFLAGS="$(RSAINCDIR) -O2 -DHIGHFIRST -DUNIX -DPORTABLE -DIDEA32"
+ 
+-freebsd:
++freebsd-i386:
+ 	$(MAKE) all LD="$(CC) -s" OBJS_EXT="_80386.o _zmatch.o" \
+-	CFLAGS="$(RSAINCDIR) -O2 -fno-strength-reduce -DUNIX -DIDEA32 -DASM \
+-	-DMAX_NAMELEN=255"
++	CFLAGS="-DPREFIX=\\\"$(PREFIX)\\\" $(RSAINCDIR) $(OS_CFLAGS) -DUNIX \
++		-DIDEA32 -DASM -DMAX_NAMELEN=255"
++
++freebsd-alpha:
++	$(MAKE) all LD="$(CC) -s" \
++	CFLAGS="-DPREFIX=\\\"$(PREFIX)\\\" $(RSAINCDIR) $(OS_CFLAGS)
++		-DPORTABLE -DUNIX -DIDEA32 -DMAX_NAMELEN=255"
+ 
+ 386bsd:
+ 	$(MAKE) all CC=gcc LD=gcc OBJS_EXT="_80386.o _zmatch.o" \
diff --git a/security/pgp/files/patch-fileio.h b/security/pgp/files/patch-fileio.h
new file mode 100644
index 000000000000..de5b25fc5109
--- /dev/null
+++ b/security/pgp/files/patch-fileio.h
@@ -0,0 +1,11 @@
+--- fileio.h	Sat Jan  6 14:46:36 1996
++++ fileio.h.new	Wed Jun 11 20:35:03 2003
+@@ -28,7 +28,7 @@
+ #ifdef LINUX
+ #  define PGP_SYSTEM_DIR "/var/lib/pgp/"
+ #else
+-#  define PGP_SYSTEM_DIR "/usr/local/lib/pgp/"
++#  define PGP_SYSTEM_DIR PREFIX "/share/pgp/"
+ #endif
+ #define FOPRBIN		"r"
+ #define FOPRTXT		"r"
diff --git a/security/pgp/pkg-plist b/security/pgp/pkg-plist
index 2d9f9895a04d..465373618d72 100644
--- a/security/pgp/pkg-plist
+++ b/security/pgp/pkg-plist
@@ -1,11 +1,11 @@
 bin/pgp
-lib/pgp/pgp.hlp
-lib/pgp/pgpdoc1.txt
-lib/pgp/pgpdoc2.txt
-@unexec if cmp -s %D/lib/pgp/language.txt %D/lib/pgp/language.txt-dist; then rm -f %D/lib/pgp/language.txt; fi
-lib/pgp/language.txt-dist
+share/pgp/pgp.hlp
+share/pgp/pgpdoc1.txt
+share/pgp/pgpdoc2.txt
+@unexec if cmp -s %D/share/pgp/language.txt %D/share/pgp/language.txt-dist; then rm -f %D/share/pgp/language.txt; fi
+share/pgp/language.txt-dist
 @exec [ ! -f %B/language.txt ] && cp %B/%f %B/language.txt
-@unexec if cmp -s %D/lib/pgp/config.txt %D/lib/pgp/config.txt-dist; then rm -f %D/lib/pgp/config.txt; fi
-lib/pgp/config.txt-dist
+@unexec if cmp -s %D/share/pgp/config.txt %D/share/pgp/config.txt-dist; then rm -f %D/share/pgp/config.txt; fi
+share/pgp/config.txt-dist
 @exec [ ! -f %B/config.txt ] && cp %B/%f %B/config.txt
-@dirrm lib/pgp
+@dirrm share/pgp