summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mail/pine-pgp-filters/Makefile14
-rw-r--r--mail/pine-pgp-filters/PLIST5
-rw-r--r--mail/pine-pgp-filters/distinfo13
-rw-r--r--mail/pine-pgp-filters/patches/patch-aa30
-rw-r--r--mail/pine-pgp-filters/patches/patch-ab16
-rw-r--r--mail/pine-pgp-filters/patches/patch-ac30
-rw-r--r--mail/pine-pgp-filters/patches/patch-ad31
7 files changed, 38 insertions, 101 deletions
diff --git a/mail/pine-pgp-filters/Makefile b/mail/pine-pgp-filters/Makefile
index 76b555692e7..7f1aec3f5d9 100644
--- a/mail/pine-pgp-filters/Makefile
+++ b/mail/pine-pgp-filters/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2008/06/12 02:14:35 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2008/06/12 21:46:44 abs Exp $
#
-DISTNAME= pine-pgp-filters-1.1
-PKGREVISION= 3
+DISTNAME= pine-pgp-filters-1.6
CATEGORIES= security mail
-MASTER_SITES= http://dougbarton.us/PGP/scripts/ppf/Old/
+MASTER_SITES= http://dougbarton.us/PGP/scripts/ppf/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://dougbarton.us/PGP/scripts/ppf/
@@ -20,13 +19,16 @@ DOCFILES= BUGS CHANGES INSTALL LICENSE README
INSTALLATION_DIRS= ${DOCDIR}
-do-build:
+post-build:
.for f in ${DOCFILES}
${SED} 's:/usr/local:${PREFIX}:g' ${WRKSRC}/${f} > ${WRKSRC}/${f}.gen
.endfor
+pre-install:
+ ${INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin
+ ${INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/libexec
+
post-install:
- ${RM} ${DESTDIR}${PREFIX}/libexec/ppf_*.orig
.for f in ${DOCFILES}
${INSTALL_DATA} ${WRKSRC}/${f}.gen ${DESTDIR}${DOCDIR}/${f}
.endfor
diff --git a/mail/pine-pgp-filters/PLIST b/mail/pine-pgp-filters/PLIST
index 39ad77c9d0c..e391eb3c77f 100644
--- a/mail/pine-pgp-filters/PLIST
+++ b/mail/pine-pgp-filters/PLIST
@@ -1,7 +1,10 @@
-@comment $NetBSD: PLIST,v 1.2 2006/02/19 00:55:46 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2008/06/12 21:46:44 abs Exp $
+bin/ppf_mime
+bin/ppf_mime_decrypt
libexec/ppf_decrypt
libexec/ppf_encrypt
libexec/ppf_mime
+libexec/ppf_mime_decrypt
libexec/ppf_sign
libexec/ppf_verify
share/doc/pine-pgp-filters/BUGS
diff --git a/mail/pine-pgp-filters/distinfo b/mail/pine-pgp-filters/distinfo
index 321e43efaf7..52cd93f5657 100644
--- a/mail/pine-pgp-filters/distinfo
+++ b/mail/pine-pgp-filters/distinfo
@@ -1,9 +1,6 @@
-$NetBSD: distinfo,v 1.4 2008/06/12 02:14:35 joerg Exp $
+$NetBSD: distinfo,v 1.5 2008/06/12 21:46:44 abs Exp $
-SHA1 (pine-pgp-filters-1.1.tar.gz) = e81d5ff8c3632d423728aeaed32236093a62a6db
-RMD160 (pine-pgp-filters-1.1.tar.gz) = cf97953b4bcee6cbecde3ee380c6c3d0e08df05c
-Size (pine-pgp-filters-1.1.tar.gz) = 6859 bytes
-SHA1 (patch-aa) = 0059bdd731355b7f94e1333c5c476774cffd3ca2
-SHA1 (patch-ab) = 271a81ba0bcc224040e663bf8961c81d136e6edd
-SHA1 (patch-ac) = 4e7ba38d8b4f1d393264fe207ab4ef8e312fcc40
-SHA1 (patch-ad) = 833fa184d041fd4c6983628ea807110e4fa18e4f
+SHA1 (pine-pgp-filters-1.6.tar.gz) = 5d1a4d679a477736ff55fc05802bc2ad752ab4e4
+RMD160 (pine-pgp-filters-1.6.tar.gz) = b1a76358761958e07c184d84e3942fe8071a5135
+Size (pine-pgp-filters-1.6.tar.gz) = 10034 bytes
+SHA1 (patch-ad) = ebb5c15ef4aeceb7c3c6bb01375e7ef0cea8d79b
diff --git a/mail/pine-pgp-filters/patches/patch-aa b/mail/pine-pgp-filters/patches/patch-aa
deleted file mode 100644
index 6544399e59f..00000000000
--- a/mail/pine-pgp-filters/patches/patch-aa
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2005/02/07 15:54:04 abs Exp $
-
---- scripts/ppf_decrypt.orig 2003-09-06 23:25:42.000000000 +0100
-+++ scripts/ppf_decrypt
-@@ -11,11 +11,11 @@ trap "rm -f ${TDIR}/* ; rmdir ${TDIR} ;
- pgp_failed () {
- message_file="${1}"
-
-- echo '------------------------------------------------------------------------------' >${TDIR}/error
-+ echo '----------------------------------------------------------------------------' >${TDIR}/error
- echo "$0: ${2:-pgp command failed}" >>${TDIR}/error
- echo '' >>${TDIR}/error
- cat ${TDIR}/stderr >>${TDIR}/error
-- echo '------------------------------------------------------------------------------' >>${TDIR}/error
-+ echo '----------------------------------------------------------------------------' >>${TDIR}/error
- echo '' >>${TDIR}/error
- cp ${message_file} ${TDIR}/message
- cat ${TDIR}/error ${TDIR}/message > ${message_file}
-@@ -38,9 +38,9 @@ else
- pgp_failed ${1} "Can't find pgp on this system"
- fi
-
--echo '----------------------------- PGP Command Output -----------------------------' >${1}
-+echo '--------------------------- PGP Command Output -----------------------------' >${1}
- grep -v '^$' ${TDIR}/stderr >>${1}
--echo '------------------------------- End PGP Output -------------------------------' >>${1}
-+echo '----------------------------- End PGP Output -------------------------------' >>${1}
- echo '' >>${1}
- cat ${TDIR}/message >>${1}
-
diff --git a/mail/pine-pgp-filters/patches/patch-ab b/mail/pine-pgp-filters/patches/patch-ab
deleted file mode 100644
index 597499f4bdf..00000000000
--- a/mail/pine-pgp-filters/patches/patch-ab
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2005/02/07 15:54:04 abs Exp $
-
---- scripts/ppf_mime.orig 2003-09-05 11:23:43.000000000 +0100
-+++ scripts/ppf_mime
-@@ -41,9 +41,9 @@ fi
- egrep -hi '^(From|Resent-From|To|Resent-To|Cc|Resent-cc|Bcc|Newsgroups|Followup-To|Date|Resent-Date|Organization|Subject|Resent-Subject|Reply-To):' ${TDIR}/fa[ab]
- echo ''
-
--echo '----------------------------- PGP Command Output -----------------------------'
-+echo '--------------------------- PGP Command Output -----------------------------'
- grep -v '^$' ${TDIR}/stderr
--echo '------------------------------- End PGP Output -------------------------------'
-+echo '----------------------------- End PGP Output -------------------------------'
-
- # Remove the MIME headers from the message
- sed -e '1,2d' -e '3s/^Content-.*//' ${TDIR}/message
diff --git a/mail/pine-pgp-filters/patches/patch-ac b/mail/pine-pgp-filters/patches/patch-ac
deleted file mode 100644
index 2581112fd46..00000000000
--- a/mail/pine-pgp-filters/patches/patch-ac
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2005/02/07 15:54:05 abs Exp $
-
---- scripts/ppf_verify.orig 2003-09-06 23:26:42.000000000 +0100
-+++ scripts/ppf_verify
-@@ -11,11 +11,11 @@ trap "rm -f ${TDIR}/* ; rmdir ${TDIR} ;
- pgp_failed () {
- message_file="${1}"
-
-- echo '------------------------------------------------------------------------------' >${TDIR}/error
-+ echo '----------------------------------------------------------------------------' >${TDIR}/error
- echo "$0: ${2:-pgp command failed}" >>${TDIR}/error
- echo '' >>${TDIR}/error
- cat ${TDIR}/stderr >>${TDIR}/error
-- echo '------------------------------------------------------------------------------' >>${TDIR}/error
-+ echo '----------------------------------------------------------------------------' >>${TDIR}/error
- echo '' >>${TDIR}/error
- cp ${message_file} ${TDIR}/message
- cat ${TDIR}/error ${TDIR}/message > ${message_file}
-@@ -36,9 +36,9 @@ else
- pgp_failed ${1} "Can't find pgp on this system"
- fi
-
--echo '----------------------------- PGP Command Output -----------------------------' >${1}
-+echo '--------------------------- PGP Command Output -----------------------------' >${1}
- egrep -v '^$|pattern is:' ${TDIR}/stderr >>${1}
--echo '------------------------------- End PGP Output -------------------------------' >>${1}
-+echo '----------------------------- End PGP Output -------------------------------' >>${1}
- echo '' >>${1}
- cat ${TDIR}/message >>${1}
-
diff --git a/mail/pine-pgp-filters/patches/patch-ad b/mail/pine-pgp-filters/patches/patch-ad
index 2d9f388766a..978d5723a53 100644
--- a/mail/pine-pgp-filters/patches/patch-ad
+++ b/mail/pine-pgp-filters/patches/patch-ad
@@ -1,16 +1,27 @@
-$NetBSD: patch-ad,v 1.1 2008/06/12 02:14:35 joerg Exp $
+$NetBSD: patch-ad,v 1.2 2008/06/12 21:46:44 abs Exp $
---- Makefile.in.orig 2008-06-11 08:57:56.000000000 +0000
+--- Makefile.in.orig 2007-07-30 20:58:43.000000000 +0100
+++ Makefile.in
-@@ -1,9 +1,9 @@
+@@ -10,17 +10,17 @@ all:
install:
- .if !exists(@@PREFIX@@/libexec)
-- install -d -m 755 @@PREFIX@@/libexec
-+ install -d -m 755 ${DESTDIR}@@PREFIX@@/libexec
- .endif
-- install -m 555 ${.CURDIR}/obj/ppf_* @@PREFIX@@/libexec
-+ install -m 555 ${.CURDIR}/obj/ppf_* ${DESTDIR}@@PREFIX@@/libexec
+ @if [ ! -d @@PREFIX@@/libexec ]; then \
+- install -d -m 755 @@PREFIX@@/libexec; \
++ install -d -m 755 ${DESTDIR}/@@PREFIX@@/libexec; \
+ fi
+
+- install -m 555 $$PWD/out/ppf_* @@PREFIX@@/libexec
++ install -m 555 $$PWD/out/ppf_* ${DESTDIR}/@@PREFIX@@/libexec
+
+ @if [ ! -d @@PREFIX@@/bin ]; then \
+- install -d -m 755 @@PREFIX@@/bin; \
++ install -d -m 755 ${DESTDIR}/@@PREFIX@@/bin; \
+ fi
+
+- ln -sf @@PREFIX@@/libexec/ppf_mime @@PREFIX@@/bin/ppf_mime
+- ln -sf @@PREFIX@@/libexec/ppf_mime_decrypt @@PREFIX@@/bin/ppf_mime_decrypt
++ ln -sf @@PREFIX@@/libexec/ppf_mime ${DESTDIR}/@@PREFIX@@/bin/ppf_mime
++ ln -sf @@PREFIX@@/libexec/ppf_mime_decrypt ${DESTDIR}/@@PREFIX@@/bin/ppf_mime_decrypt
clean:
- rm -f ${.CURDIR}/obj/*
+ @if [ -d "$$PWD/out" ]; then \
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-02 19:01:58 +0000