Removed mk/apachever.mk

8 files changed, 14 insertions, 19 deletions

diff --git a/mk/apachever.mk b/mk/apachever.mk
deleted file mode 100644
index 0d8e959cada..00000000000
--- a/mk/apachever.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-# $NetBSD: apachever.mk,v 1.4 2007/10/13 11:04:15 dsl Exp $
-#
-# This file is obsolete. It will be removed after branching 2007Q4.
-#
-.include "apache.mk"
diff --git a/security/base/Makefile b/security/base/Makefile
index 0cfd9b900c7..2f796e61d71 100644
--- a/security/base/Makefile
+++ b/security/base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2011/09/16 05:46:25 obache Exp $
+# $NetBSD: Makefile,v 1.28 2012/04/14 16:25:11 adam Exp $
 #
 
 DISTNAME=	base-1.4.3.1
@@ -12,7 +12,7 @@ COMMENT=	Analysis engine to process a database of security events
 
 PKG_DESTDIR_SUPPORT=	destdir
 
-.include "../../mk/apachever.mk"
+.include "../../mk/apache.mk"
 .include "../../lang/php/phpversion.mk"
 
 DEPENDS+=	adodb>=4.96a:../../databases/adodb
diff --git a/www/blur6ex/Makefile b/www/blur6ex/Makefile
index aab0b22b9c5..3fc1babd51d 100644
--- a/www/blur6ex/Makefile
+++ b/www/blur6ex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2011/12/29 14:35:10 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2012/04/14 16:25:11 adam Exp $
 #
 
 DISTNAME=	blur6ex-0.1.198
@@ -54,6 +54,6 @@ do-install:
 		'-s|./engine/core/db.php$$||' .			\
 		${DESTDIR}${PREFIX}/${HTTPD_ROOT}/blog
 
-.include "../../mk/apachever.mk"
+.include "../../mk/apache.mk"
 .include "../../lang/php/phpversion.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/drupal6/options.mk b/www/drupal6/options.mk
index 23a37c3f40f..3080e79bcdc 100644
--- a/www/drupal6/options.mk
+++ b/www/drupal6/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2010/09/30 08:20:24 obache Exp $
+# $NetBSD: options.mk,v 1.7 2012/04/14 16:25:11 adam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.drupal
 
@@ -42,7 +42,7 @@ DEPENDS+=	${PHP_PKG_PREFIX}-mbstring>=4.3.3:../../converters/php-mbstring
 ###
 .if !empty(PKG_OPTIONS:Mapache)
 DEPENDS+=	${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}>=4.3.5:../../www/ap-php
-.	include "../../mk/apachever.mk"
+.	include "../../mk/apache.mk"
 WWW_USER?=	${APACHE_USER}
 WWW_GROUP?=	${APACHE_GROUP}
 .else
diff --git a/www/drupal7/options.mk b/www/drupal7/options.mk
index 5f4912dd7ad..3358dca4524 100644
--- a/www/drupal7/options.mk
+++ b/www/drupal7/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1.1.1 2011/12/16 12:57:06 taca Exp $
+# $NetBSD: options.mk,v 1.2 2012/04/14 16:25:11 adam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.drupal
 
@@ -47,7 +47,7 @@ EPENDS+=	${PHP_PKG_PREFIX}-mbstring>=5.2.7:../../converters/php-mbstring
 ###
 .if !empty(PKG_OPTIONS:Mapache)
 DEPENDS+=	${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}>=5.2.7:../../www/ap-php
-.	include "../../mk/apachever.mk"
+.	include "../../mk/apache.mk"
 WWW_USER?=	${APACHE_USER}
 WWW_GROUP?=	${APACHE_GROUP}
 .else
diff --git a/www/ganglia-webfrontend/Makefile b/www/ganglia-webfrontend/Makefile
index 94c5dd0123c..bec99c416f9 100644
--- a/www/ganglia-webfrontend/Makefile
+++ b/www/ganglia-webfrontend/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2011/09/16 05:46:26 obache Exp $
+# $NetBSD: Makefile,v 1.14 2012/04/14 16:25:11 adam Exp $
 #
 
 DISTNAME=	ganglia-3.1.2
@@ -44,6 +44,6 @@ do-build:
 do-install:
 	cd ${WRKDIR}/ganglia && ${PAX} -rw . ${DESTDIR}${DOCROOT}/
 
-.include "../../mk/apachever.mk"
+.include "../../mk/apache.mk"
 .include "../../lang/php/phpversion.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/horde/Makefile b/www/horde/Makefile
index 38da0b187c8..cdd05160df5 100644
--- a/www/horde/Makefile
+++ b/www/horde/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.73 2012/02/23 10:34:07 obache Exp $
+# $NetBSD: Makefile,v 1.74 2012/04/14 16:25:11 adam Exp $
 
 DISTNAME=	horde-3.3.13
 CATEGORIES=	www
@@ -126,5 +126,5 @@ do-install:
 	${FIND} ${DESTDIR}${HORDEDIR} -type d -print | ${XARGS} ${CHMOD} ${PKGDIRMODE}
 	${FIND} ${DESTDIR}${HORDEDIR} -type f -print | ${XARGS} ${CHMOD} ${SHAREMODE}
 
-.include "../../mk/apachever.mk"
+.include "../../mk/apache.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/wordpress/options.mk b/www/wordpress/options.mk
index e5dba266e53..b35ed7cc8f8 100644
--- a/www/wordpress/options.mk
+++ b/www/wordpress/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2012/03/13 03:14:38 taca Exp $
+# $NetBSD: options.mk,v 1.4 2012/04/14 16:25:11 adam Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.wordpress
 
@@ -14,6 +14,6 @@ DEPENDS+=	php>=5.2.4:${PHPPKGSRCDIR}
 .endif
 
 .if !empty(PKG_OPTIONS:Map-php)
-.  include "../../mk/apachever.mk"
+.  include "../../mk/apache.mk"
 DEPENDS+=	${APACHE_PKG_PREFIX}-${PHP_PKG_PREFIX}>=4.3.0:../../www/ap-php
 .endif