ports/89785: [MAINTAINER] www/gallery2: update to 2.0.2

[Alex Varju]

>Number:         89785
>Category:       ports
>Synopsis:       [MAINTAINER] www/gallery2: update to 2.0.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Dec 01 06:20:02 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Alex Varju
>Release:        FreeBSD 5.3-STABLE i386
>Organization:
>Environment:
System: FreeBSD snapple.webct.com 5.3-STABLE FreeBSD 5.3-STABLE #13: Wed Nov  3 11:31:28 PST
>Description:
- Update to 2.0.2
  - This fixes a security issue described at http://gallery.menalto.com/gallery_2.0.2_released
- While here, convert some dependencies into options, as suggested by <ingmar.gebert at web.de>

Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:

--- gallery2-2.0.2.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/freebsd/cvsroot/ports/www/gallery2/Makefile,v
retrieving revision 1.42
diff -u -u -r1.42 Makefile
--- Makefile	14 Oct 2005 21:58:56 -0000	1.42
+++ Makefile	1 Dec 2005 05:30:23 -0000
@@ -6,21 +6,16 @@
 #
 
 PORTNAME=	gallery2
-PORTVERSION=	2.0.1
+PORTVERSION=	2.0.2
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gallery
-DISTNAME=	gallery-2.0.1-full
+DISTNAME=	gallery-2.0.2-full
 DIST_SUBDIR=	gallery2
 
 MAINTAINER=	freebsd-ports at varju.ca
 COMMENT=	Gallery is a web based photo album written using PHP
 
-RUN_DEPENDS=	giftopnm:${PORTSDIR}/graphics/netpbm \
-		jhead:${PORTSDIR}/graphics/jhead \
-		unzip:${PORTSDIR}/archivers/unzip \
-		convert:${PORTSDIR}/graphics/ImageMagick
-
 USE_PHP=	pcre session mysql
 WANT_PHP_WEB=	yes
 
@@ -30,6 +25,42 @@
 CPIOARGS=	--quiet -pdum -R
 PLIST_SUB+=	GALLERY2DIR=${GALLERY2DIR}
 
+GALLERY2DIR?=	www/data/gallery2
+WWWOWN?=	www
+WWWGRP?=	www
+
+OPTIONS=	NETPBM "Enable netpbm support" on \
+		IMAGEMAGICK "Enable imagemagick support" on \
+		JHEAD "Enable jhead support" on \
+		UNZIP "Enable unzip support" on \
+		GD "Enable gd support" off \
+		DCRAW "Enable dcraw support" off \
+		FFMPEG "Enable ffmpeg support" off
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_NETPBM)
+RUN_DEPENDS+=	giftopnm:${PORTSDIR}/graphics/netpbm
+.endif
+.if defined(WITH_IMAGEMAGICK)
+RUN_DEPENDS+=	convert:${PORTSDIR}/graphics/ImageMagick
+.endif
+.if defined(WITH_GD)
+RUN_DEPENDS+=	pngtogd:${PORTSDIR}/graphics/gd
+.endif
+.if defined(WITH_JHEAD)
+RUN_DEPENDS+=	jhead:${PORTSDIR}/graphics/jhead
+.endif
+.if defined(WITH_UNZIP)
+RUN_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
+.endif
+.if defined(WITH_FFMPEG)
+LIB_DEPENDS+=	avcodec.1:${PORTSDIR}/multimedia/ffmpeg
+.endif
+.if defined(WITH_DCRAW)
+RUN_DEPENDS+=	dcraw:${PORTSDIR}/graphics/dcraw
+.endif
+
 pre-fetch:
 .if !defined(GALLERY2DIR)
 	@${ECHO_MSG} ""
@@ -37,10 +68,6 @@
 	@${ECHO_MSG} ""
 .endif
 
-GALLERY2DIR?=	www/data/gallery2
-WWWOWN?=	www
-WWWGRP?=	www
-
 post-configure:
 	@ ${SED} -e 's#%%PREFIX%%#${PREFIX}#g' \
 	  -e 's#%%GALLERY2DIR%%#${GALLERY2DIR}#g' pkg-message > ${PKGMESSAGE}
@@ -55,4 +82,4 @@
 	@ ${CAT} ${PKGMESSAGE}
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/freebsd/cvsroot/ports/www/gallery2/distinfo,v
retrieving revision 1.31
diff -u -u -r1.31 distinfo
--- distinfo	14 Oct 2005 21:58:56 -0000	1.31
+++ distinfo	1 Dec 2005 05:02:56 -0000
@@ -1,2 +1,2 @@
-MD5 (gallery2/gallery-2.0.1-full.tar.gz) = e2601ba687acd3a43560041988a3b2a5
-SIZE (gallery2/gallery-2.0.1-full.tar.gz) = 5432452
+MD5 (gallery2/gallery-2.0.2-full.tar.gz) = b833b195d1713745b97be0abfec221f6
+SIZE (gallery2/gallery-2.0.2-full.tar.gz) = 5426443
Index: pkg-plist
===================================================================
RCS file: /home/freebsd/cvsroot/ports/www/gallery2/pkg-plist,v
retrieving revision 1.27
diff -u -u -r1.27 pkg-plist
--- pkg-plist	17 Sep 2005 11:26:55 -0000	1.27
+++ pkg-plist	1 Dec 2005 05:32:27 -0000
@@ -4,7 +4,6 @@
 %%GALLERY2DIR%%/bootstrap.inc
 %%GALLERY2DIR%%/docs/DEVELOPER_GUIDELINES
 %%GALLERY2DIR%%/docs/EMBEDDING
-%%GALLERY2DIR%%/docs/LOCALIZING
 %%GALLERY2DIR%%/embed.php
 %%GALLERY2DIR%%/images/g2Logo.gif
 %%GALLERY2DIR%%/images/gallery.gif
--- gallery2-2.0.2.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: