Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 26 Sep 2015 16:00:34 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r397990 - head/devel/websvn
Message-ID:  <201509261600.t8QG0YEM047251@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Sat Sep 26 16:00:33 2015
New Revision: 397990
URL: https://svnweb.freebsd.org/changeset/ports/397990

Log:
  Fix packaging as a user
  Use @sample

Modified:
  head/devel/websvn/Makefile
  head/devel/websvn/pkg-plist

Modified: head/devel/websvn/Makefile
==============================================================================
--- head/devel/websvn/Makefile	Sat Sep 26 15:53:39 2015	(r397989)
+++ head/devel/websvn/Makefile	Sat Sep 26 16:00:33 2015	(r397990)
@@ -26,13 +26,6 @@ do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${WEBSVNDIR}
 	(cd ${WRKSRC} \
 	    && ${COPYTREE_SHARE} \* ${STAGEDIR}${PREFIX}/${WEBSVNDIR})
-	${CHOWN} -R www:www ${STAGEDIR}${PREFIX}/${WEBSVNDIR}
 	${FIND} ${STAGEDIR}${PREFIX}/${WEBSVNDIR} -type f -exec ${CHMOD} 644 '{}' +
 
-post-install:
-	@[ -f ${STAGEDIR}${PREFIX}/${WEBSVNDIR}/include/config.php ] \
-	    || ${INSTALL_DATA} \
-	    ${STAGEDIR}${PREFIX}/${WEBSVNDIR}/include/distconfig.php \
-	    ${STAGEDIR}${PREFIX}/${WEBSVNDIR}/include/config.php
-
 .include <bsd.port.mk>

Modified: head/devel/websvn/pkg-plist
==============================================================================
--- head/devel/websvn/pkg-plist	Sat Sep 26 15:53:39 2015	(r397989)
+++ head/devel/websvn/pkg-plist	Sat Sep 26 16:00:33 2015	(r397990)
@@ -15,9 +15,7 @@
 %%WEBSVNDIR%%/include/configclass.php
 %%WEBSVNDIR%%/include/diff_inc.php
 %%WEBSVNDIR%%/include/diff_util.php
-@unexec cmp -s %D/%%WEBSVNDIR%%/include/distconfig.php %D/%%WWWDIR%%/include/config.php && rm -f %D/%%WWWDIR%%/include/config.php || true
-%%WEBSVNDIR%%/include/distconfig.php
-@exec [ -f %D/%%WEBSVNDIR%%/include/config.php ] || cp -p %D/%F %B/config.php
+@sample %%WEBSVNDIR%%/include/distconfig.php %%WWWDIR%%/include/config.php
 %%WEBSVNDIR%%/include/header
 %%WEBSVNDIR%%/include/setup.php
 %%WEBSVNDIR%%/include/svnlook.php



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509261600.t8QG0YEM047251>