diff options
| author | obache <obache> | 2006-11-13 15:47:14 +0000 |
|---|---|---|
| committer | obache <obache> | 2006-11-13 15:47:14 +0000 |
| commit | 05b7f8735f41905344b243222769af46a339e068 (patch) | |
| tree | c100cca8faf7b2d396015a36ec7910524856fc1d /security | |
| parent | 6a0e25cea131d29b1aa2af3f85da935d22a12f4d (diff) | |
| download | pkgsrc-05b7f8735f41905344b243222769af46a339e068.tar.gz | |
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 (limited to 'security')
| -rw-r--r-- | security/cyrus-saslauthd/Makefile | 16 | ||||
| -rw-r--r-- | security/cyrus-saslauthd/patches/patch-ad | 16 |
2 files changed, 8 insertions, 24 deletions
diff --git a/security/cyrus-saslauthd/Makefile b/security/cyrus-saslauthd/Makefile index 7c52c1540e7..3b3aa5eb63b 100644 --- a/security/cyrus-saslauthd/Makefile +++ b/security/cyrus-saslauthd/Makefile @@ -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 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews 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 @@ -40,16 +41,15 @@ INSTALLATION_DIRS= bin .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 --git a/security/cyrus-saslauthd/patches/patch-ad b/security/cyrus-saslauthd/patches/patch-ad deleted file mode 100644 index 1692e7caa97..00000000000 --- a/security/cyrus-saslauthd/patches/patch-ad +++ /dev/null @@ -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 |