use apache/module.mk.

3 files changed, 17 insertions, 38 deletions

diff --git a/www/ap-layout/Makefile b/www/ap-layout/Makefile
index a8250417156..2e771acf00e 100644
--- a/www/ap-layout/Makefile
+++ b/www/ap-layout/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/02/17 14:40:34 grant Exp $
+# $NetBSD: Makefile,v 1.5 2003/02/17 17:35:22 grant Exp $
 #
 
 DISTNAME=	mod_layout-3.2
@@ -11,19 +11,16 @@ MAINTAINER=	grant@netbsd.org
 HOMEPAGE=	http://software.tangent.org/
 COMMENT=	Apache module to wrap static or dynamic content
 
-DEPENDS+=	apache{,6}-1.3.*:../../www/apache
-USE_PERL5=	build	# for "apxs"
-
 LAYOUT_DIR=	${PREFIX}/share/httpd/htdocs/manual/mod/mod_layout
 
-do-build:
-	@cd ${WRKSRC} && ${PREFIX}/sbin/apxs -c -o mod_layout.so *.c
+APACHE_MODULE_NAME=	mod_layout.so
+APACHE_MODULE_SRC=	*.c
 
-do-install:
-	@cd ${WRKSRC} && ${PREFIX}/sbin/apxs -i mod_layout.so
+post-install:
 	${INSTALL_DATA_DIR} ${LAYOUT_DIR}
 	${INSTALL_DATA} ${WRKSRC}/faq.html ${LAYOUT_DIR}
 	${INSTALL_DATA_DIR} ${LAYOUT_DIR}/directives
 	cd ${WRKSRC}/directives; ${PAX} -rw . ${LAYOUT_DIR}/directives
 
+.include "../../www/apache/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/ap-mp3/Makefile b/www/ap-mp3/Makefile
index 4f5aac34835..2936b3d75ab 100644
--- a/www/ap-mp3/Makefile
+++ b/www/ap-mp3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/02/17 13:50:25 grant Exp $
+# $NetBSD: Makefile,v 1.4 2003/02/17 17:35:23 grant Exp $
 #
 
 DISTNAME=	mod_mp3-0.35
@@ -11,29 +11,17 @@ MAINTAINER=	grant@netbsd.org
 HOMEPAGE=	http://software.tangent.org/media/
 COMMENT=	apache module for streaming mp3 files
 
-DEPENDS+=	apache{,6}-1.3.*:../../www/apache
-USE_PERL5=	build	# for "apxs"
-
 DOC_DIR=	${PREFIX}/share/httpd/htdocs/manual/mod/mod_mp3
 
-do-build:
-	@cd ${WRKSRC}/src && ${PREFIX}/sbin/apxs -c -o mod_mp3.so \
-		common.c \
-		directives.c \
-		encode.c \
-		ice.c \
-		id3.c \
-		internal_dispatch.c \
-		load.c \
-		log.c \
-		mod_mp3.c \
-		ogg.c \
-		shout.c \
-		utility.c
+APACHE_MODULE_NAME=	${DISTNAME:C|-.*||}.so
+APACHE_MODULE_SRCDIR=	${WRKSRC}/src
+APACHE_MODULE_SRC=	common.c directives.c encode.c ice.c id3.c
+APACHE_MODULE_SRC+=	internal_dispatch.c load.c log.c mod_mp3.c
+APACHE_MODULE_SRC+=	ogg.c shout.c utility.c
 
-do-install:
-	@cd ${WRKSRC}/src && ${PREFIX}/sbin/apxs -i mod_mp3.so
+post-install:
 	${INSTALL_DATA_DIR} ${DOC_DIR}
 	${INSTALL_DATA} ${WRKSRC}/faq.html ${DOC_DIR}
 
+.include "../../www/apache/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/ap-throttle/Makefile b/www/ap-throttle/Makefile
index 51fbe36293b..49701e923c5 100644
--- a/www/ap-throttle/Makefile
+++ b/www/ap-throttle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/02/16 11:19:03 grant Exp $
+# $NetBSD: Makefile,v 1.2 2003/02/17 17:35:23 grant Exp $
 
 DISTNAME=	mod_throttle312
 PKGNAME=	ap-throttle-3.1.2
@@ -12,14 +12,8 @@ COMMENT=	Apache module for limiting bandwidth usage
 
 WRKSRC=         ${WRKDIR}/${PKGNAME:S/ap-/mod_/}
 
-USE_BUILDLINK2=	# defined
-APACHE_MODULE=	# defined
+APACHE_MODULE_NAME=	mod_throttle.so
+APACHE_MODULE_SRC=	mod_throttle.c
 
-do-build:
-	cd ${WRKSRC} && ${APXS} -c -o mod_throttle.so mod_throttle.c
-
-do-install:
-	cd ${WRKSRC} && ${APXS} -i mod_throttle.so
-
-.include "../../www/apache/buildlink2.mk"
+.include "../../www/apache/module.mk"
 .include "../../mk/bsd.pkg.mk"