[pkgsrc/trunk]: pkgsrc/security/cyrus-saslauthd Use md5.h in distfile instead...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a26fa64996d6
branches:  trunk
changeset: 521481:a26fa64996d6
user:      obache <obache%pkgsrc.org@localhost>
date:      Mon Nov 13 15:47:14 2006 +0000

description:
Use md5.h in distfile instead of system provided file.
This is better solution of PR 28562 and may fix PR 34792.

Also, convert a post-build sed step to use the SUBST framework,
requested by PR 34792.

diffstat:

 security/cyrus-saslauthd/Makefile         |  16 ++++++++--------
 security/cyrus-saslauthd/patches/patch-ad |  16 ----------------
 2 files changed, 8 insertions(+), 24 deletions(-)

diffs (60 lines):

diff -r f0c6b52c23f3 -r a26fa64996d6 security/cyrus-saslauthd/Makefile
--- a/security/cyrus-saslauthd/Makefile Mon Nov 13 15:18:45 2006 +0000
+++ b/security/cyrus-saslauthd/Makefile Mon Nov 13 15:47:14 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2006/10/04 12:07:53 obache Exp $
+# $NetBSD: Makefile,v 1.35 2006/11/13 15:47:14 obache Exp $
 
 DISTNAME=      cyrus-sasl-2.1.22
 PKGNAME=       ${DISTNAME:S/sasl/saslauthd/}
@@ -14,6 +14,7 @@
 
 WRKSRC=                        ${WRKDIR}/${DISTNAME}/saslauthd
 EXTRACT_ELEMENTS=      ${DISTNAME}/saslauthd
+EXTRACT_ELEMENTS+=     ${DISTNAME}/include/md5.h
 EXTRACT_ELEMENTS+=     ${DISTNAME}/include/hmac-md5.h
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
@@ -40,16 +41,15 @@
 
 .include "../../security/openssl/buildlink3.mk"
 
+SUBST_CLASSES+=                sysconf
+SUBST_MESSAGE.sysconf= Fixing path to ${PKG_SYSCONFDIR}
+SUBST_STAGE.sysconf=   post-build
+SUBST_FILES.sysconf=   LDAP_SASLAUTHD saslauthd.mdoc
+SUBST_SED.sysconf=     -e "s,/usr/local/etc/,${PKG_SYSCONFDIR}/,g"
+
 post-configure:
        ${LN} -sf saslauthd.h ${WRKSRC}/config.h
 
-post-build:
-       cd ${WRKSRC}; for f in LDAP_SASLAUTHD saslauthd.mdoc; do        \
-               ${SED}  -e "s|/usr/local/etc/|${PKG_SYSCONFDIR}/|g"     \
-                       $$f > $$f.new;                                  \
-               ${MV} -f $$f.new $$f;                                   \
-       done
-
 post-install:
        for f in saslcache testsaslauthd; do                            \
                ${INSTALL_PROGRAM} ${WRKSRC}/$$f ${PREFIX}/bin/$$f;     \
diff -r f0c6b52c23f3 -r a26fa64996d6 security/cyrus-saslauthd/patches/patch-ad
--- a/security/cyrus-saslauthd/patches/patch-ad Mon Nov 13 15:18:45 2006 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2005/02/21 22:10:18 adam Exp $
-
---- md5.c.orig 2003-03-28 19:59:24.000000000 +0000
-+++ md5.c
-@@ -27,7 +27,11 @@ documentation and/or software.
- 
- #include <config.h>
- #include "md5global.h"
-+#ifdef __APPLE__
-+#include <sys/md5.h>
-+#else
- #include "md5.h"
-+#endif
- #include "hmac-md5.h"
- 
- #ifndef WIN32