From e2d4eac84308f8d5d36783b1b2d148bd1c859f23 Mon Sep 17 00:00:00 2001
From: grant <grant@pkgsrc.org>
Date: Mon, 17 Feb 2003 22:46:01 +0000
Subject: use apache/module.mk.

---
 www/ap-auth-ldap/Makefile | 20 +++++++-------------
 www/ap-auth-pam/Makefile  | 15 ++++++---------
 2 files changed, 13 insertions(+), 22 deletions(-)

(limited to 'www')

diff --git a/www/ap-auth-ldap/Makefile b/www/ap-auth-ldap/Makefile
index 419e356721f..d0a87ad1f83 100644
--- a/www/ap-auth-ldap/Makefile
+++ b/www/ap-auth-ldap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2002/10/08 23:48:21 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2003/02/17 22:46:01 grant Exp $
 
 DISTNAME=	auth_ldap-1.6.0
 PKGNAME=	ap-auth-ldap-1.6.0
@@ -12,17 +12,11 @@ COMMENT=	Module to allow apache authentication against an LDAP directory
 
 USE_BUILDLINK2=	# defined
 
-do-build:
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${APXS} -c		\
-		-DWITH_OPENLDAP						\
-		-I${BUILDLINK_PREFIX.openldap}/include			\
-		-L${BUILDLINK_PREFIX.openldap}/lib			\
-		-Wl,-R${BUILDLINK_PREFIX.openldap}/lib -lldap -llber	\
-		auth_ldap.c auth_ldap_cache.c auth_ldap_cache_mgr.c	\
-		auth_ldap_config.c
-
-do-install:
-	@cd ${WRKSRC} && ${APXS} -i auth_ldap.so
+APACHE_MODULE_NAME=	auth_ldap.so
+CPPFLAGS+=		-DWITH_OPENLDAP
+LDFLAGS+=		-lldap -llber
+
+post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mod_auth_ldap
 	${INSTALL_DATA} ${WRKSRC}/FAQ.html				\
 		${PREFIX}/share/doc/mod_auth_ldap
@@ -34,6 +28,6 @@ do-install:
 BUILDLINK_DEPMETHOD.apache=	full
 
 .include "../../databases/openldap/buildlink2.mk"
-.include "../../www/apache/buildlink2.mk"
+.include "../../www/apache/module.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/ap-auth-pam/Makefile b/www/ap-auth-pam/Makefile
index 4485053854a..f86c42d8848 100644
--- a/www/ap-auth-pam/Makefile
+++ b/www/ap-auth-pam/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/08/25 21:51:45 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2003/02/17 22:49:57 grant Exp $
 
 DISTNAME=	mod_auth_pam-1.0a
 PKGNAME=	ap-auth-pam-1.0a
@@ -10,22 +10,19 @@ HOMEPAGE=	http://pam.sourceforge.net/mod_auth_pam/
 COMMENT=	module to allow Apache authentication using PAM
 
 USE_BUILDLINK2=	YES
-APACHE_MODULE=	YES
 
-LIBS+=		-lpam
+APACHE_MODULE_NAME=	mod_auth_pam.so
+LDFLAGS+=		-lpam
+
 EGDIR=		${PREFIX}/share/examples/mod_auth_pam
 HTMLDIR=	${PREFIX}/share/doc/html/mod_auth_pam
 
-do-build:
-	cd ${WRKSRC}; ${APXS} -c $(CPPFLAGS) $(LDFLAGS) $(LIBS) mod_auth_pam.c
-
-do-install:
-	@cd ${WRKSRC}; ${APXS} -i mod_auth_pam.so
+post-install:
 	${INSTALL_DATA_DIR} ${EGDIR} ${HTMLDIR}
 	${INSTALL_DATA} ${WRKSRC}/samples/httpd ${EGDIR}/httpd.pam
 	${INSTALL_DATA} ${WRKSRC}/doc/configure.html ${HTMLDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/faq.html ${HTMLDIR}
 
 .include "../../security/PAM/buildlink2.mk"
-.include "../../www/apache/buildlink2.mk"
+.include "../../www/apache/module.mk"
 .include "../../mk/bsd.pkg.mk"
-- 
cgit v1.2.3