From owner-svn-ports-head@FreeBSD.ORG  Sun Jul 27 16:18:33 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 3D3F5D98;
 Sun, 27 Jul 2014 16:18:33 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1245F29DF;
 Sun, 27 Jul 2014 16:18:33 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6RGIWWv087273;
 Sun, 27 Jul 2014 16:18:32 GMT (envelope-from marino@svn.freebsd.org)
Received: (from marino@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6RGIWqn087271;
 Sun, 27 Jul 2014 16:18:32 GMT (envelope-from marino@svn.freebsd.org)
Message-Id: <201407271618.s6RGIWqn087271@svn.freebsd.org>
From: John Marino <marino@FreeBSD.org>
Date: Sun, 27 Jul 2014 16:18:32 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r363079 - head/www/phpsysinfo
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 27 Jul 2014 16:18:33 -0000

Author: marino
Date: Sun Jul 27 16:18:32 2014
New Revision: 363079
URL: http://svnweb.freebsd.org/changeset/ports/363079
QAT: https://qat.redports.org/buildarchive/r363079/

Log:
  Stage www/phpsysinfo
  
  The pkgmessage logic requiring <pre> and <post> wasn't needed at all.
  
  PR:		189959
  Submitted by:	joe (thrallingpenguin.com)
  Modifications:	marino

Modified:
  head/www/phpsysinfo/Makefile
  head/www/phpsysinfo/pkg-plist

Modified: head/www/phpsysinfo/Makefile
==============================================================================
--- head/www/phpsysinfo/Makefile	Sun Jul 27 16:04:25 2014	(r363078)
+++ head/www/phpsysinfo/Makefile	Sun Jul 27 16:18:32 2014	(r363079)
@@ -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>

Modified: head/www/phpsysinfo/pkg-plist
==============================================================================
--- head/www/phpsysinfo/pkg-plist	Sun Jul 27 16:04:25 2014	(r363078)
+++ head/www/phpsysinfo/pkg-plist	Sun Jul 27 16:18:32 2014	(r363079)
@@ -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