Update port to 1.75.6

PR:		21349
Submitted by:	Maintainer

8 files changed, 96 insertions, 100 deletions

diff --git a/mail/pgp4pine/Makefile b/mail/pgp4pine/Makefile
index 8f2c4122f85a..9a593624c28f 100644
--- a/mail/pgp4pine/Makefile
+++ b/mail/pgp4pine/Makefile
@@ -6,13 +6,17 @@
 #
 
 PORTNAME=	pgp4pine
-PORTVERSION= 	1.74
+PORTVERSION=	${MAJOR}.${PATCHLEVEL}
 CATEGORIES=	mail
 MASTER_SITES=	http://pgp4pine.flatline.de/
-EXTRACT_SUFX=	.tgz
+DISTNAME=	${PORTNAME}-${MAJOR}-${PATCHLEVEL}
 
 MAINTAINER=	holger@flatline.de
 
+MAJOR=		1.75
+PATCHLEVEL=	6
+
+WRKSRC=		${WRKDIR}/${PORTNAME}-${MAJOR}
 MAN1=		pgp4pine.1
 GNU_CONFIGURE=	yes
 
diff --git a/mail/pgp4pine/distinfo b/mail/pgp4pine/distinfo
index cfa9555c2050..e7af7037076d 100644
--- a/mail/pgp4pine/distinfo
+++ b/mail/pgp4pine/distinfo
@@ -1 +1 @@
-MD5 (pgp4pine-1.74.tgz) = 9f044176ff5ef58ed94c8edd94cac99e
+MD5 (pgp4pine-1.75-6.tar.gz) = b1fb3c57d8f5a0d10a7ac38920eb073d
diff --git a/mail/pgp4pine/files/patch-aa b/mail/pgp4pine/files/patch-aa
index 8ac26aaa82ac..7ad07fb779ff 100644
--- a/mail/pgp4pine/files/patch-aa
+++ b/mail/pgp4pine/files/patch-aa
@@ -1,88 +1,11 @@
---- ./pgp4pine/docs/Makefile.am.org	Sat Jan 15 00:09:31 2000
-+++ ./pgp4pine/docs/Makefile.am		Sat Jan 15 23:12:06 2000
-@@ -1,7 +1,7 @@
- ####### kdevelop will overwrite this part!!! (begin)##########
+--- configure.orig	Thu Aug 24 09:25:11 2000
++++ configure	Thu Aug 24 09:35:39 2000
+@@ -728,7 +728,7 @@
  
- SUBDIRS = en 
--docdir = $(prefix)/doc
-+docdir = $(prefix)/share/doc
  
- EXTRA_DIST = INSTALL.TXT README.TXT 
  
---- ./pgp4pine/docs/Makefile.in.org	Sat Jan 15 06:36:46 2000
-+++ ./pgp4pine/docs/Makefile.in		Sat Jan 15 23:12:26 2000
-@@ -66,7 +66,7 @@
- VERSION = @VERSION@
- 
- SUBDIRS = en 
--docdir = $(prefix)/doc
-+docdir = $(prefix)/share/doc
- 
- EXTRA_DIST = INSTALL.TXT README.TXT 
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
---- ./pgp4pine/docs/en/Makefile.am.org	Sat Jan 15 00:10:15 2000
-+++ ./pgp4pine/docs/en/Makefile.am	Sat Jan 15 23:14:00 2000
-@@ -1,6 +1,6 @@
- ####### kdevelop will overwrite this part!!! (begin)##########
- 
--docdir = $(prefix)/doc
-+docdir = $(prefix)/share/doc
- GZIP   = gzip
- EXTRA_DIST = FAQ LICENSE PGP_MIME pgp4pine.1.gz pgp4pinerc 
- 
-@@ -8,8 +8,6 @@
- 	$(mkinstalldirs) $(docdir)/pgp4pine/
- 	$(INSTALL_DATA) FAQ $(docdir)/pgp4pine/FAQ
- 	$(mkinstalldirs) $(docdir)/pgp4pine/
--	$(INSTALL_DATA) LICENSE $(docdir)/pgp4pine/LICENSE
--	$(mkinstalldirs) $(docdir)/pgp4pine/
- 	$(INSTALL_DATA) PGP_MIME $(docdir)/pgp4pine/PGP_MIME
- 	$(mkinstalldirs) $(mandir)/man1/
- 	$(INSTALL_DATA) pgp4pine.1 $(mandir)/man1/pgp4pine.1
-@@ -19,7 +17,6 @@
- 
- uninstall-local:
- 	-rm -f $(docdir)/pgp4pine/FAQ
--	-rm -f $(docdir)/pgp4pine/LICENSE
- 	-rm -f $(docdir)/pgp4pine/PGP_MIME
- 	-rm -f $(mandir)/man1/pgp4pine.1.gz
- 	-rm -f $(docdir)/pgp4pine/example.pgp4pinerc
---- ./pgp4pine/docs/en/Makefile.in.org	Sat Jan 15 06:36:54 2000
-+++ ./pgp4pine/docs/en/Makefile.in	Sat Jan 15 23:14:11 2000
-@@ -65,7 +65,7 @@
- RANLIB = @RANLIB@
- VERSION = @VERSION@
- 
--docdir = $(prefix)/doc
-+docdir = $(prefix)/share/doc
- GZIP = gzip
- EXTRA_DIST = FAQ LICENSE PGP_MIME pgp4pine.1.gz pgp4pinerc 
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -173,8 +173,6 @@
- 	$(mkinstalldirs) $(docdir)/pgp4pine/
- 	$(INSTALL_DATA) FAQ $(docdir)/pgp4pine/FAQ
- 	$(mkinstalldirs) $(docdir)/pgp4pine/
--	$(INSTALL_DATA) LICENSE $(docdir)/pgp4pine/LICENSE
--	$(mkinstalldirs) $(docdir)/pgp4pine/
- 	$(INSTALL_DATA) PGP_MIME $(docdir)/pgp4pine/PGP_MIME
- 	$(mkinstalldirs) $(mandir)/man1/
- 	$(INSTALL_DATA) pgp4pine.1 $(mandir)/man1/pgp4pine.1
-@@ -184,7 +182,6 @@
- 
- uninstall-local:
- 	-rm -f $(docdir)/pgp4pine/FAQ
--	-rm -f $(docdir)/pgp4pine/LICENSE
- 	-rm -f $(docdir)/pgp4pine/PGP_MIME
- 	-rm -f $(mandir)/man1/pgp4pine.1.gz
- 	-rm -f $(docdir)/pgp4pine/example.pgp4pinerc
---- ./pgp4pine/docs/en/pgp4pine.1.in.org	Sat Jan 15 03:54:18 2000
-+++ ./pgp4pine/docs/en/pgp4pine.1.in		Sat Jan 15 23:15:33 2000
-@@ -25,7 +25,7 @@
- 
- .TP 3
- 0. 
--Open your ~/.pgp4pinerc (if you don't have one, run "cp @prefix@/doc/pgp4pinerc ~/.pgp4pinerc") and edit it. 
-+Open your ~/.pgp4pinerc (if you don't have one, run "cp @prefix@/share/doc/pgp4pinerc ~/.pgp4pinerc") and edit it. 
- .TP
- 1. 
- In pine, go into Setup, then Configuration.
+-CFLAGS="-O"
++#CFLAGS="-O"
+ # Extract the first word of "gcc", so it can be a program name with args.
+ set dummy gcc; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
diff --git a/mail/pgp4pine/files/patch-ab b/mail/pgp4pine/files/patch-ab
index 2fa9b93ac7df..6f09bf55fbee 100644
--- a/mail/pgp4pine/files/patch-ab
+++ b/mail/pgp4pine/files/patch-ab
@@ -1,11 +1,40 @@
---- configure.orig	Fri Jan 14 21:15:10 2000
-+++ configure	Mon Feb 28 23:27:54 2000
-@@ -779,7 +779,7 @@
+--- pgp4pine/docs/en/Makefile.in.orig	Thu Aug 24 09:25:11 2000
++++ pgp4pine/docs/en/Makefile.in	Thu Aug 24 09:31:41 2000
+@@ -59,6 +59,7 @@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+ VERSION = @VERSION@
++docdir = $(prefix)/share/doc
  
+ EXTRA_DIST = FAQ LICENSE PGP_MIME pgp4pine.1 pgp4pinerc 
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -161,20 +162,20 @@
  
  
--CFLAGS=-O
-+#CFLAGS=-O
- # Extract the first word of "gcc", so it can be a program name with args.
- set dummy gcc; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+ install-data-local:
+-	$(mkinstalldirs) $(prefix)/doc/pgp4pine/
+-	$(INSTALL_DATA) FAQ $(prefix)/doc/pgp4pine/FAQ
+-	$(mkinstalldirs) $(prefix)/doc/pgp4pine/
+-	$(INSTALL_DATA) PGP_MIME $(prefix)/doc/pgp4pine/PGP_MIME
++	$(mkinstalldirs) $(docdir)/pgp4pine/
++	$(INSTALL_DATA) FAQ $(docdir)/pgp4pine/FAQ
++	$(mkinstalldirs) $(docdir)/pgp4pine/
++	$(INSTALL_DATA) PGP_MIME $(docdir)/pgp4pine/PGP_MIME
+ 	$(mkinstalldirs) $(mandir)/man1/
+ 	$(INSTALL_DATA) pgp4pine.1 $(mandir)/man1/pgp4pine.1
+-	$(mkinstalldirs) $(prefix)/doc/pgp4pine/
+-	$(INSTALL_DATA) pgp4pinerc $(prefix)/doc/pgp4pine/example.pgp4pinerc
++	$(mkinstalldirs) $(docdir)/pgp4pine/
++	$(INSTALL_DATA) pgp4pinerc $(docdir)/pgp4pine/example.pgp4pinerc
+ 
+ uninstall-local:
+-	-rm -f $(prefix)/doc/pgp4pine/FAQ
+-	-rm -f $(prefix)/doc/pgp4pine/PGP_MIME
++	-rm -f $(docdir)/pgp4pine/FAQ
++	-rm -f $(docdir)/pgp4pine/PGP_MIME
+ 	-rm -f $(mandir)/man1/pgp4pine.1
+-	-rm -f $(prefix)/doc/pgp4pine/example.pgp4pinerc
++	-rm -f $(docdir)/pgp4pine/example.pgp4pinerc
+ 
+ ####### kdevelop will overwrite this part!!! (end)############
+ 
diff --git a/mail/pgp4pine/files/patch-ac b/mail/pgp4pine/files/patch-ac
new file mode 100644
index 000000000000..286812111a30
--- /dev/null
+++ b/mail/pgp4pine/files/patch-ac
@@ -0,0 +1,11 @@
+--- pgp4pine/docs/en/pgp4pine.1.in.orig	Thu Aug 24 09:25:11 2000
++++ pgp4pine/docs/en/pgp4pine.1.in	Thu Aug 24 09:33:25 2000
+@@ -25,7 +25,7 @@
+ 
+ .TP 3
+ 0. 
+-Open your ~/.pgp4pinerc (if you don't have one, copy it from @prefix@/doc/pgp4pine/pgp4pinerc or @prefix@/doc/packages/pgp4pine/pgp4pinerc and rename it to .pgp4pinerc and edit it. 
++Open your ~/.pgp4pinerc (if you don't have one, copy it from @prefix@/share/doc/pgp4pine/pgp4pinerc, rename it to .pgp4pinerc and edit it. 
+ .TP
+ 1. 
+ In pine, go into Setup, then Configuration.
diff --git a/mail/pgp4pine/files/patch-ad b/mail/pgp4pine/files/patch-ad
new file mode 100644
index 000000000000..2bc7eb5482b6
--- /dev/null
+++ b/mail/pgp4pine/files/patch-ad
@@ -0,0 +1,30 @@
+--- Makefile.in.orig	Tue Aug  8 22:13:03 2000
++++ Makefile.in	Thu Aug 24 09:56:04 2000
+@@ -59,6 +59,7 @@
+ PACKAGE = @PACKAGE@
+ RANLIB = @RANLIB@
+ VERSION = @VERSION@
++docdir = $(prefix)/share/doc
+ 
+ SUBDIRS = pgp4pine 
+ 
+@@ -335,14 +336,13 @@
+ 
+ 
+ install-data-local:
+-	$(mkinstalldirs) $(prefix)/doc/pgp4pine/
+-	$(INSTALL_DATA) INSTALL $(prefix)/doc/pgp4pine/INSTALL
+-	$(mkinstalldirs) $(prefix)/doc/pgp4pine/
+-	$(INSTALL_DATA) README $(prefix)/doc/pgp4pine/README
++	$(mkinstalldirs) $(docdir)/pgp4pine/
++	$(INSTALL_DATA) INSTALL $(docdir)/pgp4pine/INSTALL
++	$(INSTALL_DATA) README $(docdir)/pgp4pine/README
+ 
+ uninstall-local:
+-	-rm -f $(prefix)/doc/pgp4pine/INSTALL
+-	-rm -f $(prefix)/doc/pgp4pine/README
++	-rm -f $(docdir)/pgp4pine/INSTALL
++	-rm -f $(docdir)/pgp4pine/README
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/mail/pgp4pine/pkg-message b/mail/pgp4pine/pkg-message
index 8eb73d45ffae..a16a953d765c 100644
--- a/mail/pgp4pine/pkg-message
+++ b/mail/pgp4pine/pkg-message
@@ -1,3 +1,2 @@
 You got to manually set up Pine to use pgp4pine!
-Read /usr/share/doc/pgp4pine/INSTALL.TXT to know how !
-
+Read ${PREFIX}/share/doc/pgp4pine/INSTALL.TXT to know how !
diff --git a/mail/pgp4pine/pkg-plist b/mail/pgp4pine/pkg-plist
index 04c0e8848418..7aa3a8f348ed 100644
--- a/mail/pgp4pine/pkg-plist
+++ b/mail/pgp4pine/pkg-plist
@@ -1,7 +1,7 @@
 bin/pgp4pine
 share/doc/pgp4pine/FAQ
-share/doc/pgp4pine/INSTALL.TXT
+share/doc/pgp4pine/INSTALL
 share/doc/pgp4pine/PGP_MIME
-share/doc/pgp4pine/README.TXT
+share/doc/pgp4pine/README
 share/doc/pgp4pine/example.pgp4pinerc
 @dirrm share/doc/pgp4pine