Finally convert to new ports scheme, remove usa/non-usa stuff, package default

conf files too

4 files changed, 54 insertions, 4 deletions

diff --git a/security/pgp/Makefile b/security/pgp/Makefile
index e2e7b5141299..5feee70409b8 100644
--- a/security/pgp/Makefile
+++ b/security/pgp/Makefile
@@ -15,8 +15,6 @@ DISTNAME=	pgp263is
 MAINTAINER=	ache@FreeBSD.org
 
 WRKSRC=		${WRKDIR}/src
-FILESDIR=	${.CURDIR}/files.non_usa
-PATCHDIR=	${.CURDIR}/patches.non_usa
 
 MAKEFILE=	makefile
 ALL_TARGET=	freebsd-${MACHINE_ARCH} OS_CFLAGS="${CFLAGS}"
@@ -32,8 +30,10 @@ do-install:
 	cd ${WRKSRC}/..; \
 	    ${INSTALL_DATA} -c -o bin -g bin -m 444 pgp.hlp \
 			      doc/pgpdoc1.txt doc/pgpdoc2.txt ${PGPLIB}; \
+	    ${INSTALL_DATA} -c -o bin -g bin -m 444 language.txt ${PGPLIB}/language.txt-dist; \
 	    [ -f ${PGPLIB}/language.txt ] || \
 		      ${INSTALL_DATA} -c -o bin -g bin -m 444 language.txt ${PGPLIB}; \
+	    ${INSTALL_DATA} -c -o bin -g bin -m 444 config.txt ${PGPLIB}/config.txt-dist; \
 	    [ -f ${PGPLIB}/config.txt ] || \
 		      ${INSTALL_DATA} -c -o bin -g bin -m 444 config.txt ${PGPLIB}
 	-${PREFIX}/bin/pgp > /dev/null  2>&1  # update .idx file
diff --git a/security/pgp/distinfo b/security/pgp/distinfo
new file mode 100644
index 000000000000..fd9280e3c215
--- /dev/null
+++ b/security/pgp/distinfo
@@ -0,0 +1 @@
+MD5 (pgp263is.tar.gz) = 73bbb87b8c77debcf9de3b9d49902892
diff --git a/security/pgp/files/patch-aa b/security/pgp/files/patch-aa
new file mode 100644
index 000000000000..0fc4dcff9f24
--- /dev/null
+++ b/security/pgp/files/patch-aa
@@ -0,0 +1,45 @@
+*** 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:
diff --git a/security/pgp/pkg-plist b/security/pgp/pkg-plist
index d0e093bed146..64c16b1be009 100644
--- a/security/pgp/pkg-plist
+++ b/security/pgp/pkg-plist
@@ -2,6 +2,10 @@ bin/pgp
 lib/pgp/pgp.hlp
 lib/pgp/pgpdoc1.txt
 lib/pgp/pgpdoc2.txt
-lib/pgp/language.txt
-lib/pgp/config.txt
+lib/pgp/language.txt-dist
+@exec [ ! -f %B/language.txt ] && cp %B/%f %B/language.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/config.txt-dist
+@exec [ ! -f %B/config.txt ] && cp %B/%f %B/config.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
 @dirrm lib/pgp