Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 14 Sep 2014 20:58:04 +0000 (UTC)
From:      Antoine Brodin <antoine@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r368228 - head/mail/lurker
Message-ID:  <201409142058.s8EKw4HH027489@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: antoine
Date: Sun Sep 14 20:58:04 2014
New Revision: 368228
URL: http://svnweb.freebsd.org/changeset/ports/368228
QAT: https://qat.redports.org/buildarchive/r368228/

Log:
  - Allow staging as a regular user
  - Bump portrevision as some files were not packaged with intended owner

Modified:
  head/mail/lurker/Makefile
  head/mail/lurker/pkg-plist

Modified: head/mail/lurker/Makefile
==============================================================================
--- head/mail/lurker/Makefile	Sun Sep 14 20:50:10 2014	(r368227)
+++ head/mail/lurker/Makefile	Sun Sep 14 20:58:04 2014	(r368228)
@@ -2,7 +2,7 @@
 
 PORTNAME=	lurker
 PORTVERSION=	2.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	SF:0 \
 		SF/${PORTNAME}/mimelib/${MIMELIB_VERSION}/:1
@@ -22,6 +22,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-mimelib-local \
 		--with-default-www-dir=${PREFIX}/www/lurker \
 		--with-cgi-bin-dir=${PREFIX}/www/lurker
+PLIST_SUB=	WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}"
 
 OPTIONS_DEFINE=	DOCS
 
@@ -34,7 +35,6 @@ post-install:
 	${INSTALL_MAN} ${WRKSRC}/INSTALL ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${WRKSRC}/FAQ ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${WRKSRC}/ChangeLog ${STAGEDIR}${DOCSDIR}
-	@${CHOWN} -R www:www ${STAGEDIR}${PREFIX}/www/lurker
 	${INSTALL_DATA} ${WRKSRC}/lurker.conf ${STAGEDIR}${PREFIX}/etc/lurker/lurker.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/apache.conf ${STAGEDIR}${PREFIX}/etc/lurker/apache.conf.sample
 

Modified: head/mail/lurker/pkg-plist
==============================================================================
--- head/mail/lurker/pkg-plist	Sun Sep 14 20:50:10 2014	(r368227)
+++ head/mail/lurker/pkg-plist	Sun Sep 14 20:58:04 2014	(r368228)
@@ -4,12 +4,8 @@ bin/lurker-params
 bin/lurker-prune
 bin/lurker-regenerate
 bin/lurker-search
-@unexec if cmp -s %D/etc/lurker/lurker.conf.sample $D/etc/lurker/lurker.conf; then rm -f $D/etc/lurker/lurker.conf; fi
-etc/lurker/lurker.conf.sample
-@exec if [ ! -f %D/etc/lurker/lurker.conf ] ; then cp -p $D/%F %B/lurker.conf; fi
-@unexec if cmp -s %D/etc/lurker/apache.conf.sample $D/etc/lurker/apache.conf; then rm -f $D/etc/lurker/apache.conf; fi
-etc/lurker/apache.conf.sample
-@exec if [ ! -f %D/etc/lurker/apache.conf ] ; then cp -p $D/%F %B/apache.conf; fi
+@sample etc/lurker/lurker.conf.sample
+@sample etc/lurker/apache.conf.sample
 man/man1/lurker-index.1.gz
 man/man1/lurker-list.1.gz
 man/man1/lurker-params.1.gz
@@ -19,6 +15,8 @@ man/man1/lurker-search.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/FAQ
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+@owner %%WWWOWN%%
+@group %%WWWGRP%%
 www/lurker/bounce.cgi
 www/lurker/imgs/a.png
 www/lurker/imgs/b.png
@@ -82,5 +80,7 @@ www/lurker/ui/thread.xsl
 @dirrm www/lurker/imgs
 @dirrm www/lurker/attach
 @dirrm www/lurker
+@owner root
+@group wheel
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm etc/lurker



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