[pkgsrc/trunk]: pkgsrc Removed mk/apachever.mk

[adam <adam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/dc41cf6073a7
branches:  trunk
changeset: 602474:dc41cf6073a7
user:      adam <adam%pkgsrc.org@localhost>
date:      Sat Apr 14 16:25:11 2012 +0000

description:
Removed mk/apachever.mk

diffstat:

 mk/apachever.mk                  |  5 -----
 security/base/Makefile           |  4 ++--
 www/blur6ex/Makefile             |  4 ++--
 www/drupal6/options.mk           |  4 ++--
 www/drupal7/options.mk           |  4 ++--
 www/ganglia-webfrontend/Makefile |  4 ++--
 www/horde/Makefile               |  4 ++--
 www/wordpress/options.mk         |  4 ++--
 8 files changed, 14 insertions(+), 19 deletions(-)

diffs (130 lines):

diff -r c8721e7571ff -r dc41cf6073a7 mk/apachever.mk
--- a/mk/apachever.mk   Sat Apr 14 16:04:28 2012 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r c8721e7571ff -r dc41cf6073a7 security/base/Makefile
--- a/security/base/Makefile    Sat Apr 14 16:04:28 2012 +0000
+++ b/security/base/Makefile    Sat Apr 14 16:25:11 2012 +0000
@@ -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 @@
 
 PKG_DESTDIR_SUPPORT=   destdir
 
-.include "../../mk/apachever.mk"
+.include "../../mk/apache.mk"
 .include "../../lang/php/phpversion.mk"
 
 DEPENDS+=      adodb>=4.96a:../../databases/adodb
diff -r c8721e7571ff -r dc41cf6073a7 www/blur6ex/Makefile
--- a/www/blur6ex/Makefile      Sat Apr 14 16:04:28 2012 +0000
+++ b/www/blur6ex/Makefile      Sat Apr 14 16:25:11 2012 +0000
@@ -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 @@
                '-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 -r c8721e7571ff -r dc41cf6073a7 www/drupal6/options.mk
--- a/www/drupal6/options.mk    Sat Apr 14 16:04:28 2012 +0000
+++ b/www/drupal6/options.mk    Sat Apr 14 16:25:11 2012 +0000
@@ -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 @@
 ###
 .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 -r c8721e7571ff -r dc41cf6073a7 www/drupal7/options.mk
--- a/www/drupal7/options.mk    Sat Apr 14 16:04:28 2012 +0000
+++ b/www/drupal7/options.mk    Sat Apr 14 16:25:11 2012 +0000
@@ -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 @@
 ###
 .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 -r c8721e7571ff -r dc41cf6073a7 www/ganglia-webfrontend/Makefile
--- a/www/ganglia-webfrontend/Makefile  Sat Apr 14 16:04:28 2012 +0000
+++ b/www/ganglia-webfrontend/Makefile  Sat Apr 14 16:25:11 2012 +0000
@@ -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-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 -r c8721e7571ff -r dc41cf6073a7 www/horde/Makefile
--- a/www/horde/Makefile        Sat Apr 14 16:04:28 2012 +0000
+++ b/www/horde/Makefile        Sat Apr 14 16:25:11 2012 +0000
@@ -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 @@
        ${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 -r c8721e7571ff -r dc41cf6073a7 www/wordpress/options.mk
--- a/www/wordpress/options.mk  Sat Apr 14 16:04:28 2012 +0000
+++ b/www/wordpress/options.mk  Sat Apr 14 16:25:11 2012 +0000
@@ -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 @@
 .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