diff options
| author | joerg <joerg@pkgsrc.org> | 2007-06-10 08:40:16 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2007-06-10 08:40:16 +0000 |
| commit | 5736c78cde265094942164efb0305326684449cf (patch) | |
| tree | 6d363ad9ebdd5334db17cb9f6e3e4c1b80a4f6bf | |
| parent | 13a92f53e4efb9286d60b6d9ad435a1b4ce4a856 (diff) | |
| download | pkgsrc-5736c78cde265094942164efb0305326684449cf.tar.gz | |
Reorder Apache dependency to get the more specific ones first.
| -rw-r--r-- | www/ap2-auth-ldap/Makefile | 4 | ||||
| -rw-r--r-- | www/ap2-auth-radius/Makefile | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/www/ap2-auth-ldap/Makefile b/www/ap2-auth-ldap/Makefile index 80193ff32a0..460ef6d6e63 100644 --- a/www/ap2-auth-ldap/Makefile +++ b/www/ap2-auth-ldap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2006/12/08 23:34:10 xtraeme Exp $ +# $NetBSD: Makefile,v 1.15 2007/06/10 08:40:16 joerg Exp $ DISTNAME= mod_auth_ldap3.05 PKGNAME= ap2-auth-ldap-3.05 @@ -18,6 +18,7 @@ CPPFLAGS+= -L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib -lldap -llber PKG_APACHE_ACCEPTED= apache2 apache22 +.include "../../mk/apache.mk" BUILDLINK_API_DEPENDS.apache+= apache>=2.0.47 CONFIGURE_ARGS+= --with-apxs=${APXS:Q} @@ -37,6 +38,5 @@ do-install: .include "../../databases/openldap-client/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" -.include "../../mk/apache.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/ap2-auth-radius/Makefile b/www/ap2-auth-radius/Makefile index fe1dec53372..bdec8ac270f 100644 --- a/www/ap2-auth-radius/Makefile +++ b/www/ap2-auth-radius/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2006/12/08 23:34:11 xtraeme Exp $ +# $NetBSD: Makefile,v 1.5 2007/06/10 08:41:06 joerg Exp $ DISTNAME= mod_auth_radius PKGNAME= ap2-auth-radius-1.5.7 @@ -17,9 +17,9 @@ APACHE_MODULE= YES APACHE_MODULE_NAME= mod_auth_radius USE_LIBTOOL= YES -BUILDLINK_API_DEPENDS.apache+= apache>=2.0.47 - PKG_APACHE_ACCEPTED= apache2 apache22 +.include "../../mk/apache.mk" +BUILDLINK_API_DEPENDS.apache+= apache>=2.0.47 .include "../../security/openssl/buildlink3.mk" @@ -45,5 +45,4 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/httpd.conf \ ${PREFIX}/share/examples/mod_auth_radius -.include "../../mk/apache.mk" .include "../../mk/bsd.pkg.mk" |