8 files changed, 6 insertions, 100 deletions
diff --git a/mail/pgp4pine/Makefile b/mail/pgp4pine/Makefile
index 9a593624c28f..f704a7b830ec 100644
--- a/mail/pgp4pine/Makefile
+++ b/mail/pgp4pine/Makefile
@@ -6,18 +6,14 @@
 #
 
 PORTNAME=	pgp4pine
-PORTVERSION=	${MAJOR}.${PATCHLEVEL}
+PORTVERSION=	1.76
 CATEGORIES=	mail
 MASTER_SITES=	http://pgp4pine.flatline.de/
-DISTNAME=	${PORTNAME}-${MAJOR}-${PATCHLEVEL}
 
 MAINTAINER=	holger@flatline.de
 
-MAJOR=		1.75
-PATCHLEVEL=	6
-
-WRKSRC=		${WRKDIR}/${PORTNAME}-${MAJOR}
 MAN1=		pgp4pine.1
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS= --with-docdir=${PREFIX}/share/doc
 
 .include <bsd.port.mk>
diff --git a/mail/pgp4pine/distinfo b/mail/pgp4pine/distinfo
index e7af7037076d..2cce580608a0 100644
--- a/mail/pgp4pine/distinfo
+++ b/mail/pgp4pine/distinfo
@@ -1 +1 @@
-MD5 (pgp4pine-1.75-6.tar.gz) = b1fb3c57d8f5a0d10a7ac38920eb073d
+MD5 (pgp4pine-1.76.tar.gz) = 31b7bf81a3817f2aef26d2fbf315bc5d
diff --git a/mail/pgp4pine/files/patch-aa b/mail/pgp4pine/files/patch-aa
deleted file mode 100644
index 7ad07fb779ff..000000000000
--- a/mail/pgp4pine/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Thu Aug 24 09:25:11 2000
-+++ configure	Thu Aug 24 09:35:39 2000
-@@ -728,7 +728,7 @@
- 
- 
- 
--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
deleted file mode 100644
index 6f09bf55fbee..000000000000
--- a/mail/pgp4pine/files/patch-ab
+++ /dev/null
@@ -1,40 +0,0 @@
---- 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 @@
- 
- 
- 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
deleted file mode 100644
index 286812111a30..000000000000
--- a/mail/pgp4pine/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index 2bc7eb5482b6..000000000000
--- a/mail/pgp4pine/files/patch-ad
+++ /dev/null
@@ -1,30 +0,0 @@
---- 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 a16a953d765c..3dec9e0a7547 100644
--- a/mail/pgp4pine/pkg-message
+++ b/mail/pgp4pine/pkg-message
@@ -1,2 +1,4 @@
 You got to manually set up Pine to use pgp4pine!
 Read ${PREFIX}/share/doc/pgp4pine/INSTALL.TXT to know how !
+You can use the ${PORTSDIR}/mail/pgp4pine/insert_entries.pl 
+and remove_entries.pl scripts for this purpose.
diff --git a/mail/pgp4pine/pkg-plist b/mail/pgp4pine/pkg-plist
index 7aa3a8f348ed..f2a703dad27d 100644
--- a/mail/pgp4pine/pkg-plist
+++ b/mail/pgp4pine/pkg-plist
@@ -3,5 +3,5 @@ share/doc/pgp4pine/FAQ
 share/doc/pgp4pine/INSTALL
 share/doc/pgp4pine/PGP_MIME
 share/doc/pgp4pine/README
-share/doc/pgp4pine/example.pgp4pinerc
+share/doc/pgp4pine/pgp4pinerc.example
 @dirrm share/doc/pgp4pine