summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authortaca <taca>2012-03-14 03:33:51 +0000
committertaca <taca>2012-03-14 03:33:51 +0000
commit9af56eaf49ac6e1707e1a67269302bc65067f3dc (patch)
tree8bc28ff040931c3c3f3bcaaa0817a1df78590065 /www
parentb6e20b10bfe69745ede887a5f5f5e7b401a7178e (diff)
downloadpkgsrc-9af56eaf49ac6e1707e1a67269302bc65067f3dc.tar.gz
Fix SUBST_SED.conf macro assignment as PR pkg/46187 by Noud de Brouwer.
Bump PKGREVISION.
Diffstat (limited to 'www')
-rw-r--r--www/drupal6/Makefile5
-rw-r--r--www/drupal7/Makefile5
2 files changed, 6 insertions, 4 deletions
diff --git a/www/drupal6/Makefile b/www/drupal6/Makefile
index aed293abfb3..48f13938915 100644
--- a/www/drupal6/Makefile
+++ b/www/drupal6/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.33 2012/03/02 14:21:46 taca Exp $
+# $NetBSD: Makefile,v 1.34 2012/03/14 03:33:51 taca Exp $
DISTNAME= drupal-6.25
+PKGREVISION= 1
CATEGORIES= www
MASTER_SITES= http://drupal.org/files/projects/
@@ -53,7 +54,7 @@ SUBST_CLASSES+= conf
SUBST_STAGE.conf= pre-install
SUBST_FILES.conf= drupal.conf
SUBST_SED.conf= -e "s|@DRUPAL@|${DRUPAL}|g"
-SUBST_SED.conf= -e "s|@PREFIX@|${PREFIX}|g"
+SUBST_SED.conf+= -e "s|@PREFIX@|${PREFIX}|g"
SUBST_MESSAGE.conf= Fixing configuration files.
INSTALLATION_DIRS+= ${DRUPAL}/files ${DRUPAL}/sites/all \
diff --git a/www/drupal7/Makefile b/www/drupal7/Makefile
index 797075fc1a3..52ab32e126d 100644
--- a/www/drupal7/Makefile
+++ b/www/drupal7/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2012/02/19 16:31:08 taca Exp $
+# $NetBSD: Makefile,v 1.5 2012/03/14 03:34:25 taca Exp $
DISTNAME= drupal-7.12
+PKGREVISION= 1
CATEGORIES= www
MASTER_SITES= http://drupal.org/files/projects/
@@ -54,7 +55,7 @@ SUBST_CLASSES+= conf
SUBST_STAGE.conf= pre-install
SUBST_FILES.conf= drupal.conf
SUBST_SED.conf= -e "s|@DRUPAL@|${DRUPAL}|g"
-SUBST_SED.conf= -e "s|@PREFIX@|${PREFIX}|g"
+SUBST_SED.conf+= -e "s|@PREFIX@|${PREFIX}|g"
SUBST_MESSAGE.conf= Fixing configuration files.
INSTALLATION_DIRS+= ${DRUPAL}/files ${DRUPAL}/sites/all \