[pkgsrc/trunk]: pkgsrc/net/proftpd Grrr, cannot patch next to RCS id strings,...

[kim <kim%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c5182e9b8dcc
branches:  trunk
changeset: 552112:c5182e9b8dcc
user:      kim <kim%pkgsrc.org@localhost>
date:      Sun Dec 28 08:56:59 2008 +0000

description:
Grrr, cannot patch next to RCS id strings, so use sed instead.

diffstat:

 net/proftpd/Makefile         |   8 +++++++-
 net/proftpd/distinfo         |   3 +--
 net/proftpd/patches/patch-ad |  16 ----------------
 3 files changed, 8 insertions(+), 19 deletions(-)

diffs (57 lines):

diff -r c877d3fe1a77 -r c5182e9b8dcc net/proftpd/Makefile
--- a/net/proftpd/Makefile      Sun Dec 28 08:42:01 2008 +0000
+++ b/net/proftpd/Makefile      Sun Dec 28 08:56:59 2008 +0000
@@ -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 @@
 
 .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 -r c877d3fe1a77 -r c5182e9b8dcc net/proftpd/distinfo
--- a/net/proftpd/distinfo      Sun Dec 28 08:42:01 2008 +0000
+++ b/net/proftpd/distinfo      Sun Dec 28 08:56:59 2008 +0000
@@ -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 @@
 SHA1 (patch-aa) = 09b842233ba545a2354c4e141ddd7a5478237774
 SHA1 (patch-ab) = 08f1f4be777c3af2ce63d94d4797b4f818270306
 SHA1 (patch-ac) = 9e17ad4085860575964adbbaf956350acf39e785
-SHA1 (patch-ad) = 8ef75eadeeb57ba06c6846113e8ead4db910ae44
 SHA1 (patch-ae) = 0bf4d13e9a6c2a2c1c73ffc9fb7e6e3c3e57a8a8
diff -r c877d3fe1a77 -r c5182e9b8dcc net/proftpd/patches/patch-ad
--- a/net/proftpd/patches/patch-ad      Sun Dec 28 08:42:01 2008 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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 $
-  */
-