svn commit: r367865 - head/www/yanopaste

[Antoine Brodin]

Author: antoine
Date: Wed Sep 10 15:37:36 2014
New Revision: 367865
URL: http://svnweb.freebsd.org/changeset/ports/367865
QAT: https://qat.redports.org/buildarchive/r367865/

Log:
  - Allow staging as a regular user
  - Do not overwrite config.php with and empty file on install

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

Modified: head/www/yanopaste/Makefile
==============================================================================
--- head/www/yanopaste/Makefile	Wed Sep 10 15:33:41 2014	(r367864)
+++ head/www/yanopaste/Makefile	Wed Sep 10 15:37:36 2014	(r367865)
@@ -3,7 +3,7 @@
 
 PORTNAME=	yanopaste
 PORTVERSION=	1.3.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
@@ -13,9 +13,6 @@ COMMENT=	Yet Another Nopaste
 NO_BUILD=	yes
 USE_PHP=	xsl session xmlwriter xmlreader
 SUB_FILES=	pkg-message
-WWWDIR?=	${PREFIX}/www/${PORTNAME}
-
-.include <bsd.port.pre.mk>
 
 post-patch:
 	${FIND} ${WRKSRC} -name .svn -type d | ${XARGS} ${RM} -rf
@@ -23,8 +20,6 @@ post-patch:
 do-install:
 	@${MKDIR} ${STAGEDIR}${WWWDIR}
 	${CP} -R ${WRKSRC}/ ${STAGEDIR}${WWWDIR}
-	@${TOUCH} ${STAGEDIR}${WWWDIR}/config.php
-	@${CHOWN} ${WWWOWN} ${STAGEDIR}${WWWDIR}/config.php
 
 create-plist:
 	@${FIND} -s ${WRKSRC}/${file} -not -type d \
@@ -34,4 +29,4 @@ create-plist:
 	@${FIND} -ds ${WRKSRC}/${file} -type d \
 	| ${SED} -e 's,^${WRKSRC}, at dirrm %%WWWDIR%%,' >> ${PLIST}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/www/yanopaste/pkg-plist
==============================================================================
--- head/www/yanopaste/pkg-plist	Wed Sep 10 15:33:41 2014	(r367864)
+++ head/www/yanopaste/pkg-plist	Wed Sep 10 15:37:36 2014	(r367865)
@@ -3,7 +3,6 @@
 %%WWWDIR%%/INSTALL
 %%WWWDIR%%/LICENSE
 %%WWWDIR%%/common.js
-%%WWWDIR%%/config.php
 %%WWWDIR%%/config.php.sample
 %%WWWDIR%%/functions.php
 %%WWWDIR%%/header.jpg
@@ -154,4 +153,4 @@
 %%WWWDIR%%/upgrade.php
 @dirrm %%WWWDIR%%/includes/geshi
 @dirrm %%WWWDIR%%/includes
- at dirrm %%WWWDIR%%/
+ at dirrm %%WWWDIR%%