Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 19 Oct 2013 13:27:32 +0000 (UTC)
From:      Danilo Egea Gondolfo <danilo@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r330865 - head/www/coppermine
Message-ID:  <201310191327.r9JDRWUM048180@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: danilo
Date: Sat Oct 19 13:27:32 2013
New Revision: 330865
URL: http://svnweb.freebsd.org/changeset/ports/330865

Log:
  - Change maintainer email to @FreeBSD.org
  - Remove indefinite article from COMMENT
  - Use options helpers
  - Add stage support

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

Modified: head/www/coppermine/Makefile
==============================================================================
--- head/www/coppermine/Makefile	Sat Oct 19 13:24:59 2013	(r330864)
+++ head/www/coppermine/Makefile	Sat Oct 19 13:27:32 2013	(r330865)
@@ -6,28 +6,26 @@ CATEGORIES=	www
 MASTER_SITES=	SF/${PORTNAME}/Coppermine/1.5.x/
 DISTNAME=	cpg${PORTVERSION}
 
-MAINTAINER=	danilogondolfo@gmail.com
-COMMENT=	A web picture gallery script
+MAINTAINER=	danilo@FreeBSD.org
+COMMENT=	Web picture gallery script
 
 OPTIONS_DEFINE=	DOCS IMAGEMAGICK
 IMAGEMAGICK_DESC=	Use ImageMagick instead of PHP GD extension
 
+IMAGEMAGICK_RUN_DEPENDS+=	convert:${PORTSDIR}/graphics/ImageMagick
+
 USE_PHP=	mysql pcre ctype
 USE_ZIP=	yes
 
 NO_BUILD=	yes
-PKGMESSAGE=	${WRKDIR}/pkg-message
 WRKSRC=		${WRKDIR}/cpg${PORTVERSION:R:R}${PORTVERSION:R:E}x
 DOCFILES=	CHANGELOG.txt COPYING.txt README.txt
 
 SUB_FILES+=	pkg-message
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MIMAGEMAGICK}
-RUN_DEPENDS+=	convert:${PORTSDIR}/graphics/ImageMagick
-.else
+.if empty(PORT_OPTIONS:MIMAGEMAGICK)
 USE_PHP+=	gd
 .endif
 
@@ -41,15 +39,9 @@ post-extract:
 	@${CHMOD} -R o-w ${WRKSRC}/
 
 do-install:
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}/
-	@cd ${WRKSRC} && ${INSTALL_DATA} ${DOCFILES} ${DOCSDIR}
-.endif
-	cd ${WRKSRC}/ && ${RM} ${DOCFILES}
-	cd ${WRKSRC}/ && ${COPYTREE_SHARE} . ${WWWDIR}/
-	${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}/
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}/
+	@cd ${WRKSRC} && ${INSTALL_DATA} ${DOCFILES} ${STAGEDIR}${DOCSDIR}
+	@cd ${WRKSRC}/ && ${RM} ${DOCFILES}
+	@cd ${WRKSRC}/ && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}/
 
 .include <bsd.port.mk>

Modified: head/www/coppermine/pkg-plist
==============================================================================
--- head/www/coppermine/pkg-plist	Sat Oct 19 13:24:59 2013	(r330864)
+++ head/www/coppermine/pkg-plist	Sat Oct 19 13:27:32 2013	(r330865)
@@ -1,6 +1,8 @@
 %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG.txt
 %%PORTDOCS%%%%DOCSDIR%%/COPYING.txt
 %%PORTDOCS%%%%DOCSDIR%%/README.txt
+@owner www
+@group www
 %%WWWDIR%%/addfav.php
 %%WWWDIR%%/addpic.php
 %%WWWDIR%%/admin.php
@@ -2172,6 +2174,8 @@
 %%WWWDIR%%/viewlog.php
 %%WWWDIR%%/xp_publish.php
 %%WWWDIR%%/zipdownload.php
+@group
+@owner
 @dirrm %%WWWDIR%%/themes/water_drop/images
 @dirrm %%WWWDIR%%/themes/water_drop
 @dirrm %%WWWDIR%%/themes/sample/images



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