diff options
| author | kim <kim> | 2008-12-28 08:56:59 +0000 |
|---|---|---|
| committer | kim <kim> | 2008-12-28 08:56:59 +0000 |
| commit | 47bff5b81e999c819fc4f390ba40096319ba1a49 (patch) | |
| tree | 3190bf8446cdbf9bf4cbda0ec1e9f7475a438b03 /net/proftpd | |
| parent | 1e49e69bb590f7fed443dc0b3fa03191f53c86ce (diff) | |
| download | pkgsrc-47bff5b81e999c819fc4f390ba40096319ba1a49.tar.gz | |
Grrr, cannot patch next to RCS id strings, so use sed instead.
Diffstat (limited to 'net/proftpd')
| -rw-r--r-- | net/proftpd/Makefile | 8 | ||||
| -rw-r--r-- | net/proftpd/distinfo | 3 | ||||
| -rw-r--r-- | net/proftpd/patches/patch-ad | 16 |
3 files changed, 8 insertions, 19 deletions
diff --git a/net/proftpd/Makefile b/net/proftpd/Makefile index ea70c581a11..72f6f4c09a1 100644 --- a/net/proftpd/Makefile +++ b/net/proftpd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.51 2008/12/28 08:42:01 kim Exp $ +# $NetBSD: Makefile,v 1.52 2008/12/28 08:56:59 kim Exp $ DISTNAME= proftpd-1.3.2rc3 #PKGREVISION= 1 @@ -48,6 +48,12 @@ PLIST_SRC+= ${PKGDIR}/PLIST .include "options.mk" +post-patch: + cd ${WRKSRC}/contrib \ + && ${CP} -p mod_wrap.c mod_wrap.c.orig \ + && ${SED} -e '/^...\$$Libraries: /s/ -lnsl\$$$$/$$/' \ + mod_wrap.c.orig > mod_wrap.c + post-install: .for i in NEWS README README.IPv6 README.LDAP README.PAM README.capabilities \ README.classes README.controls README.facl README.modules diff --git a/net/proftpd/distinfo b/net/proftpd/distinfo index a58cf266f65..4ce810a075b 100644 --- a/net/proftpd/distinfo +++ b/net/proftpd/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.28 2008/12/28 08:42:01 kim Exp $ +$NetBSD: distinfo,v 1.29 2008/12/28 08:56:59 kim Exp $ SHA1 (proftpd-1.3.2rc3.tar.bz2) = 941e283d04e63d14f62556330b3fce75436af0b2 RMD160 (proftpd-1.3.2rc3.tar.bz2) = 20e26b46baa42419cd0ad86899c7c3cb60dcb5e1 @@ -6,5 +6,4 @@ Size (proftpd-1.3.2rc3.tar.bz2) = 2407996 bytes SHA1 (patch-aa) = 09b842233ba545a2354c4e141ddd7a5478237774 SHA1 (patch-ab) = 08f1f4be777c3af2ce63d94d4797b4f818270306 SHA1 (patch-ac) = 9e17ad4085860575964adbbaf956350acf39e785 -SHA1 (patch-ad) = 8ef75eadeeb57ba06c6846113e8ead4db910ae44 SHA1 (patch-ae) = 0bf4d13e9a6c2a2c1c73ffc9fb7e6e3c3e57a8a8 diff --git a/net/proftpd/patches/patch-ad b/net/proftpd/patches/patch-ad deleted file mode 100644 index 055cf0d5d41..00000000000 --- a/net/proftpd/patches/patch-ad +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ad,v 1.7 2008/12/28 08:42:01 kim Exp $ - -The -lnsl library has its own check in configure. We cannot hardcode it -as it is not needed and does not even exist on all platforms. - ---- contrib/mod_wrap.c.orig 2008-01-25 03:53:34.000000000 +0200 -+++ contrib/mod_wrap.c 2008-12-26 11:42:48.000000000 +0200 -@@ -23,7 +23,7 @@ - * the source code for OpenSSL in the source distribution. - * - * -- DO NOT MODIFY THE TWO LINES BELOW -- -- * $Libraries: -lwrap -lnsl$ -+ * $Libraries: -lwrap$ - * $Id: patch-ad,v 1.7 2008/12/28 08:42:01 kim Exp $ - */ - |