From owner-freebsd-ports Thu Aug 24 4:50:11 2000 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 152CA37B422 for ; Thu, 24 Aug 2000 04:50:01 -0700 (PDT) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id EAA94565; Thu, 24 Aug 2000 04:50:00 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from news.uni-kl.de (news.uni-kl.de [131.246.137.51]) by hub.freebsd.org (Postfix) with SMTP id C0C5237B423 for ; Thu, 24 Aug 2000 04:49:01 -0700 (PDT) Received: from postamt.eit.uni-kl.de ( root@postamt.eit.uni-kl.de [131.246.73.100] ) by news.uni-kl.de id aa00843 for ; 24 Aug 2000 13:48 MESZ Received: from ernie.eit.uni-kl.de (root@fs.eit.uni-kl.de [131.246.12.176]) by postamt.eit.uni-kl.de (8.9.3/8.9.3) with ESMTP id NAA15811 for ; Thu, 24 Aug 2000 13:48:55 +0200 Received: (from root@localhost) by neo.garnix.de (8.9.3/8.9.3) id LAA28614; Thu, 24 Aug 2000 11:28:34 +0200 (CEST) (envelope-from root) Message-Id: <200008240928.LAA28614@neo.garnix.de> Date: Thu, 24 Aug 2000 11:28:34 +0200 (CEST) From: holger@flatline.de To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.2 Subject: ports/20817: Port update: pgp4pine Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 20817 >Category: ports >Synopsis: New port >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Aug 24 04:50:00 PDT 2000 >Closed-Date: >Last-Modified: >Originator: Holger Lamm >Release: FreeBSD 4.1-STABLE i386 >Organization: >Environment: >Description: Upgrade from mail/pgp4pine version 1.74 to 1.75.6 No new files, no files to delete. Hope everything's all right, Holger >How-To-Repeat: >Fix: diff -Nur pgp4pine.bak/Makefile pgp4pine/Makefile --- pgp4pine.bak/Makefile Thu Apr 13 22:00:26 2000 +++ pgp4pine/Makefile Thu Aug 24 11:03:50 2000 @@ -1,18 +1,22 @@ # New ports collection makefile for: pgp4pine +# Version required: 1.75-6 # Date created: 29 February 2000 # Whom: Holger Lamm # # $FreeBSD: ports/mail/pgp4pine/Makefile,v 1.3 2000/04/13 20:00:26 cpiazza Exp $ # -PORTNAME= pgp4pine -PORTVERSION= 1.74 +DISTNAME= ${PORTNAME}-${MAJOR}-${PATCHLEVEL} CATEGORIES= mail MASTER_SITES= http://pgp4pine.flatline.de/ -EXTRACT_SUFX= .tgz MAINTAINER= holger@flatline.de +PORTNAME= pgp4pine +MAJOR= 1.75 +PATCHLEVEL= 6 +PORTVERSION= ${MAJOR}.${PATCHLEVEL} +WRKSRC= ${WRKDIR}/${PORTNAME}-${MAJOR} MAN1= pgp4pine.1 GNU_CONFIGURE= yes diff -Nur pgp4pine.bak/files/md5 pgp4pine/files/md5 --- pgp4pine.bak/files/md5 Tue Feb 29 08:59:35 2000 +++ pgp4pine/files/md5 Thu Aug 24 09:12:00 2000 @@ -1 +1 @@ -MD5 (pgp4pine-1.74.tgz) = 9f044176ff5ef58ed94c8edd94cac99e +MD5 (pgp4pine-1.75-6.tar.gz) = b1fb3c57d8f5a0d10a7ac38920eb073d diff -Nur pgp4pine.bak/patches/patch-aa pgp4pine/patches/patch-aa --- pgp4pine.bak/patches/patch-aa Tue Feb 29 08:59:36 2000 +++ pgp4pine/patches/patch-aa Thu Aug 24 09:40:53 2000 @@ -1,88 +1,65 @@ ---- ./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)########## +diff -u -r ../pgp4pine-1.75-orig/configure ./configure +--- ../pgp4pine-1.75-orig/configure 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 @@ +-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 -u -r ../pgp4pine-1.75-orig/pgp4pine/docs/en/Makefile.in ./pgp4pine/docs/en/Makefile.in +--- ../pgp4pine-1.75-orig/pgp4pine/docs/en/Makefile.in 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@ - - SUBDIRS = en --docdir = $(prefix)/doc +docdir = $(prefix)/share/doc - EXTRA_DIST = INSTALL.TXT README.TXT + EXTRA_DIST = FAQ LICENSE PGP_MIME pgp4pine.1 pgp4pinerc 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)########## +@@ -161,20 +162,20 @@ --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 + 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 -@@ -184,7 +182,6 @@ +- $(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 $(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 +- -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 -u -r ../pgp4pine-1.75-orig/pgp4pine/docs/en/pgp4pine.1.in ./pgp4pine/docs/en/pgp4pine.1.in +--- ../pgp4pine-1.75-orig/pgp4pine/docs/en/pgp4pine.1.in 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, 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. +-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 -Nur pgp4pine.bak/patches/patch-ab pgp4pine/patches/patch-ab --- pgp4pine.bak/patches/patch-ab Tue Feb 29 08:59:37 2000 +++ pgp4pine/patches/patch-ab Thu Aug 24 09:58:47 2000 @@ -1,11 +1,31 @@ ---- configure.orig Fri Jan 14 21:15:10 2000 -+++ configure Mon Feb 28 23:27:54 2000 -@@ -779,7 +779,7 @@ +diff -u ../pgp4pine-1.75-orig/Makefile.in ./Makefile.in +--- ../pgp4pine-1.75-orig/Makefile.in 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 @@ --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) 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 -Nur pgp4pine.bak/pkg/MESSAGE pgp4pine/pkg/MESSAGE --- pgp4pine.bak/pkg/MESSAGE Tue Feb 29 08:59:38 2000 +++ pgp4pine/pkg/MESSAGE Thu Aug 24 10:13:25 2000 @@ -1,3 +1,2 @@ You got to manually set up Pine to use pgp4pine! Read /usr/share/doc/pgp4pine/INSTALL.TXT to know how ! - diff -Nur pgp4pine.bak/pkg/PLIST pgp4pine/pkg/PLIST --- pgp4pine.bak/pkg/PLIST Tue Feb 29 08:59:38 2000 +++ pgp4pine/pkg/PLIST Thu Aug 24 09:59:29 2000 @@ -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 >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message