diff options
| author | joerg <joerg@pkgsrc.org> | 2006-01-05 23:33:22 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2006-01-05 23:33:22 +0000 |
| commit | 9045bc1ca3746b7bb8c5b3a625cc0549d9c4843c (patch) | |
| tree | 72581f032ae91ba6583406a69e9726f63268f699 /www | |
| parent | d8e77325d08c36e9650efdd125b605490cc80b0c (diff) | |
| download | pkgsrc-9045bc1ca3746b7bb8c5b3a625cc0549d9c4843c.tar.gz | |
Use SUBST framework. I don't believe double PREFIX makes sense, so
fix that and bump the revision.
Diffstat (limited to 'www')
| -rw-r--r-- | www/apc-gui/Makefile | 15 | ||||
| -rw-r--r-- | www/apc-gui/files/apc_gui.conf.dist | 6 |
2 files changed, 13 insertions, 8 deletions
diff --git a/www/apc-gui/Makefile b/www/apc-gui/Makefile index 0f6bdcab876..e65cb86d721 100644 --- a/www/apc-gui/Makefile +++ b/www/apc-gui/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.14 2005/12/29 06:22:21 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2006/01/05 23:33:22 joerg Exp $ DISTNAME= apc_gui-1.0.3 PKGNAME= ${DISTNAME:S/_/-/} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= www MASTER_SITES= http://apc.neuropeans.com/download/ @@ -27,9 +27,14 @@ CONF_FILES= ${EGDIR}/apc_gui.conf ${PKG_SYSCONFDIR}/apc_gui.conf CONF_FILES+= /dev/null ${APC_GUI_DIR}/apc_config_local.php OWN_DIRS= ${APC_GUI_DIR} -pre-install: - ${SED} ${FILES_SUBST_SED} ${FILESDIR}/apc_gui.conf.dist \ - > ${WRKDIR}/apc_gui.conf.dist +SUBST_CLASSES+= paths +SUBST_FILES.paths= ${WRKDIR}/apc_gui.conf.dist +SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g' +SUBST_SED.paths+= -e 's,@APC_GUI_DIR@,${APC_GUI_DIR},g' +SUBST_STAGE.paths= post-patch + +post-extract: + ${CP} ${FILESDIR}/apc_gui.conf.dist ${WRKDIR} do-install: ${INSTALL_DATA_DIR} ${APC_GUI_DIR} ${EGDIR} diff --git a/www/apc-gui/files/apc_gui.conf.dist b/www/apc-gui/files/apc_gui.conf.dist index 653cbc695e8..c2b9e33192c 100644 --- a/www/apc-gui/files/apc_gui.conf.dist +++ b/www/apc-gui/files/apc_gui.conf.dist @@ -1,12 +1,12 @@ -# $NetBSD: apc_gui.conf.dist,v 1.1.1.1 2001/10/29 19:35:05 jlam Exp $ +# $NetBSD: apc_gui.conf.dist,v 1.2 2006/01/05 23:33:22 joerg Exp $ # # APC-GUI configuration file fragment for Apache <IfModule mod_alias.c> - Alias /apc_gui/ "@PREFIX@/@APC_GUI_DIR@/" + Alias /apc_gui/ "@APC_GUI_DIR@/" </IfModule> -<Directory "@PREFIX@/@APC_GUI_DIR@"> +<Directory "@APC_GUI_DIR@"> Options Indexes MultiViews AllowOverride None Order allow,deny |