use SUBST_CMD. Let drupal6.conf work with localbase apache

This commit is contained in:
espie 2015-05-27 13:37:52 +00:00
parent 6e75a7bd98
commit bca9446a36
2 changed files with 7 additions and 8 deletions

View File

@ -1,25 +1,24 @@
# $OpenBSD: Makefile,v 1.39 2015/01/29 13:22:04 sthen Exp $
# $OpenBSD: Makefile,v 1.40 2015/05/27 13:37:52 espie Exp $
COMMENT = powerful content management system
MAINTAINER = Marc Espie <espie@openbsd.org>
DISTNAME = drupal-6.34
DISTFILES = ${DISTNAME}${EXTRACT_SUFX}
REVISION = 0
MODULES= lang/php
RUN_DEPENDS= php-mysql-${MODPHP_VSPEC}|php-mysqli-${MODPHP_VSPEC}|php-pgsql-${MODPHP_VSPEC}:lang/php/${MODPHP_VERSION},-mysql \
lang/php/${MODPHP_VERSION},-gd
SUBST_VARS += DRUPAL
do-install:
mkdir -p ${PREFIX}/${DRUPAL_ROOT}
# copy base distrib
cp -R ${WRKDIST}/* ${PREFIX}/${DRUPAL_ROOT}
# copy config file
perl -p \
-e 's@\$$\{DRUPAL_ROOT\}@${DRUPAL_ROOT}@g;' \
-e 's@\$$\{DRUPAL\}@${DRUPAL}@g;' \
<${FILESDIR}/drupal.conf \
>${PREFIX}/${DRUPAL_ROOT}/misc/drupal.conf
${SUBST_CMD} -c ${FILESDIR}/drupal.conf \
${PREFIX}/${DRUPAL_ROOT}/misc/drupal.conf
install -d -o www ${PREFIX}/${DRUPAL_ROOT}/files
chmod 640 ${PREFIX}/${DRUPAL_ROOT}/sites/default/default.settings.php
chgrp www ${PREFIX}/${DRUPAL_ROOT}/sites/default/default.settings.php

View File

@ -1,9 +1,9 @@
# $OpenBSD: drupal.conf,v 1.2 2009/07/17 09:33:12 espie Exp $
# $OpenBSD: drupal.conf,v 1.3 2015/05/27 13:37:52 espie Exp $
# Written by Marc Espie, public domain
# vim:filetype=apache:
<IfModule !mod_rewrite.c>
LoadModule rewrite_module /usr/lib/apache/modules/mod_rewrite.so
LoadModule rewrite_module ${LOCALBASE}/apache/modules/mod_rewrite.so
</IfModule>
<Directory /var/www/${DRUPAL_ROOT}>
# Allows simple urls