svn commit: r346934 - head/www/gallery2

[Sunpoet Po-Chuan Hsieh]

Author: sunpoet
Date: Mon Mar  3 17:05:55 2014
New Revision: 346934
URL: http://svnweb.freebsd.org/changeset/ports/346934
QAT: https://qat.redports.org/buildarchive/r346934/

Log:
  - Add LICENSE
  - Add MYSQL option
  - Convert to new options helper
  - Remove GALLERY2DIR
  - Support STAGEDIR
  - Reformat pkg-descr

Modified:
  head/www/gallery2/Makefile
  head/www/gallery2/pkg-descr
  head/www/gallery2/pkg-plist

Modified: head/www/gallery2/Makefile
==============================================================================
--- head/www/gallery2/Makefile	Mon Mar  3 17:05:51 2014	(r346933)
+++ head/www/gallery2/Makefile	Mon Mar  3 17:05:55 2014	(r346934)
@@ -12,77 +12,35 @@ DIST_SUBDIR=	gallery2
 MAINTAINER=	sunpoet at FreeBSD.org
 COMMENT=	Web based photo album organizer written in PHP
 
+LICENSE=	GPLv2
+
+OPTIONS_DEFINE=	DCRAW FFMPEG GD GRAPHMAGICK IMAGEMAGICK JHEAD NETPBM NLS UNZIP
+OPTIONS_SINGLE=	BACKEND
+OPTIONS_SINGLE_BACKEND=	MYSQL PGSQL
+OPTIONS_DEFAULT=IMAGEMAGICK JHEAD MYSQL UNZIP
+
+NO_BUILD=	yes
 USE_PHP=	pcre session
 WANT_PHP_WEB=	yes
-
 WRKSRC=		${WRKDIR}/${PORTNAME}
-NO_BUILD=	yes
 
 SUB_FILES=	pkg-message
 
-OPTIONS_DEFINE=		DCRAW FFMPEG GD GRAPHMAGICK IMAGEMAGICK JHEAD \
-			NETPBM NLS PGSQL UNZIP
-OPTIONS_DEFAULT=	IMAGEMAGICK JHEAD UNZIP
-
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MPGSQL}
-USE_PHP+=	pgsql
-.else
-USE_PHP+=	mysql
-.endif
-
-.if ${PORT_OPTIONS:MGD}
-USE_PHP+=	gd
-RUN_DEPENDS+=	pngtogd:${PORTSDIR}/graphics/gd
-.endif
-
-.if ${PORT_OPTIONS:MNLS}
-USE_PHP+=	gettext
-USES+=		gettext
-.endif
-
-.if ${PORT_OPTIONS:MNETPBM}
-RUN_DEPENDS+=	giftopnm:${PORTSDIR}/graphics/netpbm
-.endif
-
-.if ${PORT_OPTIONS:MGRAPHMAGICK}
-RUN_DEPENDS+=	gm:${PORTSDIR}/graphics/GraphicsMagick
-.endif
-
-.if ${PORT_OPTIONS:MIMAGEMAGICK}
-RUN_DEPENDS+=	convert:${PORTSDIR}/graphics/ImageMagick
-.endif
-
-.if ${PORT_OPTIONS:MJHEAD}
-RUN_DEPENDS+=	jhead:${PORTSDIR}/graphics/jhead
-.endif
-
-.if ${PORT_OPTIONS:MUNZIP}
-RUN_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
-.endif
-
-.if ${PORT_OPTIONS:MFFMPEG}
-LIB_DEPENDS+=	avcodec.1:${PORTSDIR}/multimedia/ffmpeg
-.endif
-
-.if ${PORT_OPTIONS:MDCRAW}
-RUN_DEPENDS+=	dcraw:${PORTSDIR}/graphics/dcraw
-.endif
-
-.if defined(GALLERY2DIR)
-# Continue to support legacy GALLERY2DIR variable
-WWWDIR=	${GALLERY2DIR}
-.endif
+DCRAW_RUN_DEPENDS=	${LOCALBASE}/bin/dcraw:${PORTSDIR}/graphics/dcraw
+FFMPEG_LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
+GD_RUN_DEPENDS=		${LOCALBASE}/bin/pngtogd:${PORTSDIR}/graphics/gd
+GD_USE=			PHP=gd
+GRAPHMAGICK_RUN_DEPENDS=${LOCALBASE}/bin/gm:${PORTSDIR}/graphics/GraphicsMagick
+IMAGEMAGICK_RUN_DEPENDS=${LOCALBASE}/bin/convert:${PORTSDIR}/graphics/ImageMagick
+JHEAD_RUN_DEPENDS=	${LOCALBASE}/bin/jhead:${PORTSDIR}/graphics/jhead
+MYSQL_USE=		PHP=mysql
+NETPBM_RUN_DEPENDS=	${LOCALBASE}/bin/giftopnm:${PORTSDIR}/graphics/netpbm
+NLS_USE=		PHP=gettext
+NLS_USES=		gettext
+PGSQL_USE=		PHP=pgsql
+UNZIP_RUN_DEPENDS=	${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip
 
 do-install:
-	@cd ${WRKSRC}/&&${COPYTREE_SHARE} . ${WWWDIR}/
-	@ ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}/
-	@${ECHO_CMD} '@exec ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}' >> ${TMPPLIST}
-
-.if !defined(BATCH)
-	@ ${CAT} ${PKGMESSAGE}
-.endif
+	cd ${WRKSRC}/ && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}/
 
 .include <bsd.port.mk>

Modified: head/www/gallery2/pkg-descr
==============================================================================
--- head/www/gallery2/pkg-descr	Mon Mar  3 17:05:51 2014	(r346933)
+++ head/www/gallery2/pkg-descr	Mon Mar  3 17:05:55 2014	(r346934)
@@ -1,12 +1,10 @@
-Gallery is a web based software product that lets you manage your
-photos on your own website. You must have your own website with PHP
-support in order to install and use it. With Gallery you can easily
-create and maintain albums of photos via an intuitive interface. Photo
-management includes automatic thumbnail creation, image resizing,
-rotation, ordering, captioning, searching and more. Albums can have
-read, write and caption permissions per individual authenticated user
-for an additional level of privacy. Give accounts to your friends and
-family and let them upload and manage their own photos on your
-website!
+Gallery is a web based software product that lets you manage your photos on your
+own website. You must have your own website with PHP support in order to install
+and use it. With Gallery you can easily create and maintain albums of photos via
+an intuitive interface. Photo management includes automatic thumbnail creation,
+image resizing, rotation, ordering, captioning, searching and more. Albums can
+have read, write and caption permissions per individual authenticated user for
+an additional level of privacy. Give accounts to your friends and family and let
+them upload and manage their own photos on your website!
 
 WWW: http://gallery.sourceforge.net/

Modified: head/www/gallery2/pkg-plist
==============================================================================
--- head/www/gallery2/pkg-plist	Mon Mar  3 17:05:51 2014	(r346933)
+++ head/www/gallery2/pkg-plist	Mon Mar  3 17:05:55 2014	(r346934)
@@ -1,3 +1,5 @@
+ at owner www
+ at group www
 %%WWWDIR%%/LICENSE
 %%WWWDIR%%/MANIFEST
 %%WWWDIR%%/README.html
@@ -8601,3 +8603,5 @@
 @dirrm %%WWWDIR%%/install
 @dirrm %%WWWDIR%%/images
 @dirrmtry %%WWWDIR%%
+ at owner
+ at group