aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--www/phpsysinfo/Makefile28
-rw-r--r--www/phpsysinfo/pkg-plist3
2 files changed, 10 insertions, 21 deletions
diff --git a/www/phpsysinfo/Makefile b/www/phpsysinfo/Makefile
index f176d2102fbe..c0cb7325d086 100644
--- a/www/phpsysinfo/Makefile
+++ b/www/phpsysinfo/Makefile
@@ -3,12 +3,12 @@
PORTNAME= phpsysinfo
PORTVERSION= 3.0.10
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}/
MAINTAINER= walt@relnor.com
-COMMENT= A PHP script for displaying system information
+COMMENT= PHP script for displaying system information
LICENSE= GPLv2
@@ -22,23 +22,11 @@ WRKSRC= ${WRKDIR}/${PORTNAME}
SUB_FILES= pkg-message
-NO_STAGE= yes
-.include <bsd.port.pre.mk>
-
-post-install:
- @if [ ! -f ${WWWDIR}/config.php ]; then \
- ${CP} -p ${WWWDIR}/config.php ${WWWDIR}/config.php.bak ; \
- fi
-
do-install:
- ${MKDIR} ${WWWDIR}
+ ${MKDIR} ${STAGEDIR}${WWWDIR}
cd ${WRKSRC}; ${FIND} . \
- | ${CPIO} -pdm -R ${WWWOWN}:${WWWGRP} ${WWWDIR}
- ${CHMOD} -R ${BINMODE} ${WWWDIR}
- ${FIND} ${WWWDIR} ! -type d | ${XARGS} ${CHMOD} ${NOBINMODE}
- ${CP} ${WWWDIR}/config.php.new ${WWWDIR}/config.php
-
-.if !defined(BATCH)
- @ ${CAT} ${PKGMESSAGE}
-.endif
-.include <bsd.port.post.mk>
+ | ${CPIO} -pdm -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR}
+ ${CHMOD} -R ${BINMODE} ${STAGEDIR}${WWWDIR}
+ ${FIND} ${STAGEDIR}${WWWDIR} ! -type d | ${XARGS} ${CHMOD} ${NOBINMODE}
+
+.include <bsd.port.mk>
diff --git a/www/phpsysinfo/pkg-plist b/www/phpsysinfo/pkg-plist
index 1381577b58f5..d05ef9c89764 100644
--- a/www/phpsysinfo/pkg-plist
+++ b/www/phpsysinfo/pkg-plist
@@ -2,8 +2,9 @@
%%WWWDIR%%/ChangeLog
%%WWWDIR%%/README
%%WWWDIR%%/README_PLUGIN
-%%WWWDIR%%/config.php
+@unexec if cmp -s %D/%%WWWDIR%%/config.php.new %D/%%WWWDIR%%/config.php; then rm -f %D/%%WWWDIR%%/config.php; fi
%%WWWDIR%%/config.php.new
+@exec if [ ! -f %D/%%WWWDIR%%/config.php ] ; then cp -p %D/%F %B/config.php; fi
%%WWWDIR%%/data/ModelTranslation.txt
%%WWWDIR%%/data/distros.ini
%%WWWDIR%%/gfx/ajaxLoader.gif