From owner-svn-ports-all@freebsd.org  Sat Sep 26 16:00:35 2015
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3C275A0AD32;
 Sat, 26 Sep 2015 16:00:35 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org (repo.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 2D35790B;
 Sat, 26 Sep 2015 16:00:35 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8QG0Z6e047253;
 Sat, 26 Sep 2015 16:00:35 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8QG0YEM047251;
 Sat, 26 Sep 2015 16:00:34 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201509261600.t8QG0YEM047251@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bapt set sender to
 bapt@FreeBSD.org using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Sat, 26 Sep 2015 16:00:34 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r397990 - head/devel/websvn
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 26 Sep 2015 16:00:35 -0000

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