ports/92825: [MAINTAINER] www/gallery2: [SUMMARIZE CHANGES]

[Alex Varju]

>Number:         92825
>Category:       ports
>Synopsis:       [MAINTAINER] www/gallery2: [SUMMARIZE CHANGES]
>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:   Sat Feb 04 22:00:16 GMT 2006
>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:
- Fix pkg-plist error
- Allow PostgreSQL to be used instead of MySQL (based on a patch sent to me by Brian.Johnson at stellent.com)
- Add missing php-gd dependency when WITH_GD is specified

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.43
diff -u -u -r1.43 Makefile
--- Makefile	1 Dec 2005 08:28:25 -0000	1.43
+++ Makefile	4 Feb 2006 21:51:26 -0000
@@ -16,7 +16,7 @@
 MAINTAINER=	freebsd-ports at varju.ca
 COMMENT=	Gallery is a web based photo album written using PHP
 
-USE_PHP=	pcre session mysql
+USE_PHP=	pcre session
 WANT_PHP_WEB=	yes
 
 WRKSRC=		${WRKDIR}/${DIST_SUBDIR}
@@ -29,29 +29,39 @@
 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
+# Note that USE_PHP must be set before bsd.port.pre.mk is included, so
+# OPTIONS can't be used right now without making portlint angry
+#OPTIONS=	NETPBM "Enable netpbm support" on \
+#		IMAGEMAGICK "Enable imagemagick support" on \
+#		PGSQL "Use PostgreSQL instead of MySQL" off \
+#		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
+
+.if defined(WITH_PGSQL)
+USE_PHP+=	pgsql
+.else
+USE_PHP+=	mysql
+.endif
+.if defined(WITH_GD)
+USE_PHP+=	gd
+RUN_DEPENDS+=	pngtogd:${PORTSDIR}/graphics/gd
+.endif
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_NETPBM)
+.if !defined(WITHOUT_NETPBM)
 RUN_DEPENDS+=	giftopnm:${PORTSDIR}/graphics/netpbm
 .endif
-.if defined(WITH_IMAGEMAGICK)
+.if !defined(WITHOUT_IMAGEMAGICK)
 RUN_DEPENDS+=	convert:${PORTSDIR}/graphics/ImageMagick
 .endif
-.if defined(WITH_GD)
-RUN_DEPENDS+=	pngtogd:${PORTSDIR}/graphics/gd
-.endif
-.if defined(WITH_JHEAD)
+.if !defined(WITHOUT_JHEAD)
 RUN_DEPENDS+=	jhead:${PORTSDIR}/graphics/jhead
 .endif
-.if defined(WITH_UNZIP)
+.if !defined(WITHOUT_UNZIP)
 RUN_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
 .endif
 .if defined(WITH_FFMPEG)
Index: pkg-plist
===================================================================
RCS file: /home/freebsd/cvsroot/ports/www/gallery2/pkg-plist,v
retrieving revision 1.29
diff -u -u -r1.29 pkg-plist
--- pkg-plist	22 Jan 2006 02:57:31 -0000	1.29
+++ pkg-plist	4 Feb 2006 21:51:29 -0000
@@ -5624,7 +5624,7 @@
 @dirrm %%GALLERY2DIR%%/install/locale/bg_BG
 @dirrm %%GALLERY2DIR%%/install/locale
 @dirrm %%GALLERY2DIR%%/install/images
- at dirrmtry %%GALLERYDIR%%/install
+ at dirrmtry %%GALLERY2DIR%%/install
 @dirrm %%GALLERY2DIR%%/images
 @dirrm %%GALLERY2DIR%%/docs
- at dirrmtry %%GALLERYDIR%%
+ at dirrmtry %%GALLERY2DIR%%
--- gallery2-2.0.2.patch ends here ---

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