From owner-svn-ports-head@FreeBSD.ORG  Tue Sep  2 22:17:54 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 82535559;
 Tue,  2 Sep 2014 22:17:54 +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 53F751C53;
 Tue,  2 Sep 2014 22:17:54 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s82MHsga096405;
 Tue, 2 Sep 2014 22:17:54 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s82MHrCG096403;
 Tue, 2 Sep 2014 22:17:53 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201409022217.s82MHrCG096403@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org
 using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Tue, 2 Sep 2014 22:17:53 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r367099 - head/audio/ampache
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-1
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: Tue, 02 Sep 2014 22:17:54 -0000

Author: bapt
Date: Tue Sep  2 22:17:53 2014
New Revision: 367099
URL: http://svnweb.freebsd.org/changeset/ports/367099
QAT: https://qat.redports.org/buildarchive/r367099/

Log:
  Fix plist (WWWGROUP has never existed)
  Remove duplicate @owner/@group entries
  Remove now useless @exec entry
  Bump portrevision

Modified:
  head/audio/ampache/Makefile
  head/audio/ampache/pkg-plist

Modified: head/audio/ampache/Makefile
==============================================================================
--- head/audio/ampache/Makefile	Tue Sep  2 22:12:35 2014	(r367098)
+++ head/audio/ampache/Makefile	Tue Sep  2 22:17:53 2014	(r367099)
@@ -3,7 +3,7 @@
 
 PORTNAME=	ampache
 PORTVERSION=	3.5.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio www
 MASTER_SITES=	http://ampache.org/downloads/
 
@@ -22,24 +22,22 @@ SUB_FILES=	pkg-message pkg-deinstall
 SUB_LIST=	PORTNAME=${PORTNAME} \
 		WWWDIR=${WWWDIR} \
 		WWWOWN=${WWWOWN} \
-		WWWGROUP=${WWWGROUP}
+		WWWGRP=${WWWGRP}
+PLIST_SUB=	WWWDIR=${WWWDIR} \
+		WWWOWN=${WWWOWN} \
+		WWWGRP=${WWWGRP}
 
 PORTDOCS=	CHANGELOG README MIGRATION INSTALL
 
 OPTIONS_DEFINE=	DOCS
 
-.include <bsd.port.options.mk>
-
 do-install:
 	@${MKDIR} ${STAGEDIR}${WWWDIR}
 	${INSTALL_MAN} ${WRKSRC}/docs/man/man1/ampache.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
-.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for doc in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/docs/${doc} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
-	${RM} -rf ${WRKSRC}/docs/man
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${STAGEDIR}${WWWDIR} "! -name *.orig")
 
 .include <bsd.port.mk>

Modified: head/audio/ampache/pkg-plist
==============================================================================
--- head/audio/ampache/pkg-plist	Tue Sep  2 22:12:35 2014	(r367098)
+++ head/audio/ampache/pkg-plist	Tue Sep  2 22:17:53 2014	(r367099)
@@ -1,7 +1,5 @@
-@owner %%WWWOWN%% 
-@group %%WWWGROUP%% 
-@owner %%WWWOWN%% 
-@group %%WWWGROUP%% 
+@owner %%WWWOWN%%
+@group %%WWWGRP%%
 %%WWWDIR%%/admin/access.php
 %%WWWDIR%%/admin/catalog.php
 %%WWWDIR%%/admin/duplicates.php
@@ -587,7 +585,7 @@
 %%WWWDIR%%/themes/penguin/theme.cfg.php
 %%WWWDIR%%/update.php
 %%WWWDIR%%/util.php
-man/man1/ampache.1.gz
+@(root,wheel,444) man/man1/ampache.1.gz
 @dirrm %%WWWDIR%%/themes/penguin/templates
 @dirrm %%WWWDIR%%/themes/penguin/images/ratings
 @dirrm %%WWWDIR%%/themes/penguin/images/icons
@@ -664,4 +662,5 @@ man/man1/ampache.1.gz
 @dirrm %%WWWDIR%%/bin
 @dirrm %%WWWDIR%%/admin
 @dirrmtry %%WWWDIR%%
-@exec chown -R %%WWWOWN%%:%%WWWGRP%% %D/%%WWWDIR%%
+@owner root
+@group wheel