[pkgsrc/trunk]: pkgsrc/www/apc-gui Use SUBST framework. I don't believe doubl...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a604551b1267
branches:  trunk
changeset: 505664:a604551b1267
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Thu Jan 05 23:33:22 2006 +0000

description:
Use SUBST framework. I don't believe double PREFIX makes sense, so
fix that and bump the revision.

diffstat:

 www/apc-gui/Makefile                |  15 ++++++++++-----
 www/apc-gui/files/apc_gui.conf.dist |   6 +++---
 2 files changed, 13 insertions(+), 8 deletions(-)

diffs (51 lines):

diff -r fff19e13b9e4 -r a604551b1267 www/apc-gui/Makefile
--- a/www/apc-gui/Makefile      Thu Jan 05 23:32:03 2006 +0000
+++ b/www/apc-gui/Makefile      Thu Jan 05 23:33:22 2006 +0000
@@ -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+=   /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 -r fff19e13b9e4 -r a604551b1267 www/apc-gui/files/apc_gui.conf.dist
--- a/www/apc-gui/files/apc_gui.conf.dist       Thu Jan 05 23:32:03 2006 +0000
+++ b/www/apc-gui/files/apc_gui.conf.dist       Thu Jan 05 23:33:22 2006 +0000
@@ -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