Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/pkgsrc/www/apc-gui/Attic/Makefile,v retrieving revision 1.16 retrieving revision 1.17 diff -u -p -r1.16 -r1.17 --- pkgsrc/www/apc-gui/Attic/Makefile 2006/02/05 23:11:19 1.16 +++ pkgsrc/www/apc-gui/Attic/Makefile 2006/02/22 07:10:23 1.17 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.16 2006/02/05 23:11:19 joerg Exp $ +# $NetBSD: Makefile,v 1.17 2006/02/22 07:10:23 wiz Exp $ DISTNAME= apc_gui-1.0.3 PKGNAME= ${DISTNAME:S/_/-/} -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= www MASTER_SITES= http://apc.neuropeans.com/download/ @@ -18,14 +18,13 @@ DEPENDS+= php-gd-4.[0-9]*:../../graphics NO_BUILD= YES PKG_SYSCONFSUBDIR?= httpd -APC_GUI_DIR= ${PREFIX}/share/${PKGBASE} -EGDIR= ${PREFIX}/share/examples/${PKGBASE} +APC_GUI_DIR= ${PREFIX}/share/apc-gui +EGDIR= ${PREFIX}/share/examples/apc-gui PLIST_SUBST+= PKGBASE=${PKGBASE:Q} MESSAGE_SUBST+= APC_GUI_DIR=${APC_GUI_DIR} 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} SUBST_CLASSES+= paths SUBST_FILES.paths= ${WRKDIR}/apc_gui.conf.dist @@ -37,9 +36,9 @@ post-extract: ${CP} ${FILESDIR}/apc_gui.conf.dist ${WRKDIR} do-install: - ${INSTALL_DATA_DIR} ${APC_GUI_DIR} ${EGDIR} - cd ${WRKDIR}; ${INSTALL_DATA} apc_gui.conf.dist \ - ${EGDIR}/apc_gui.conf + ${INSTALL_DATA_DIR} ${APC_GUI_DIR} + ${INSTALL_DATA_DIR} ${EGDIR} + ${INSTALL_DATA} ${WRKDIR}/apc_gui.conf.dist ${EGDIR}/apc_gui.conf ${CP} -R ${WRKSRC}/* ${APC_GUI_DIR} ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${APC_GUI_DIR}