Date: Fri, 31 Aug 2007 09:57:03 -0700 (PDT) From: Alex Varju <freebsd-ports@varju.ca> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/115986: [MAINTAINER] www/gallery2: update to 2.2.3 Message-ID: <200708311657.l7VGv3iX030762@snapple.webct.com> Resent-Message-ID: <200708312100.l7VL02KA048174@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 115986
>Category: ports
>Synopsis: [MAINTAINER] www/gallery2: update to 2.2.3
>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: Fri Aug 31 21:00:01 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: Alex Varju
>Release: FreeBSD 6.2-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD snapple.webct.com 6.2-PRERELEASE FreeBSD 6.2-PRERELEASE #0: Fri Dec 1 01:06:28 PST
>Description:
- Update to 2.2.3 (contains security fixes)
- Miscellaneous port cleanup
Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:
--- gallery2-2.2.3.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/freebsd/cvsroot/ports/www/gallery2/Makefile,v
retrieving revision 1.54
diff -u -u -r1.54 Makefile
--- Makefile 9 Jul 2007 19:24:56 -0000 1.54
+++ Makefile 31 Aug 2007 06:41:26 -0000
@@ -6,12 +6,11 @@
#
PORTNAME= gallery2
-PORTVERSION= 2.2.2
-PORTREVISION= 1
+PORTVERSION= 2.2.3
CATEGORIES= www
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES= SF
MASTER_SITE_SUBDIR= gallery
-DISTNAME= gallery-2.2.2-full
+DISTNAME= gallery-${PORTVERSION}-full
DIST_SUBDIR= gallery2
MAINTAINER= freebsd-ports@varju.ca
@@ -24,21 +23,21 @@
NO_BUILD= yes
CPIOARGS= --quiet -pdum -R
-PKGMESSAGE= ${WRKDIR}/pkg-message
SUB_FILES= pkg-message
SUB_LIST+= WWWDIR_REL=${WWWDIR_REL}
-# 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" off \
-# IMAGEMAGICK "Enable imagemagick support" on \
-# GRAPHICSMAGICK "Use graphicsmagick instead of imagemagick" off \
-# 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
+OPTIONS= NETPBM "Enable netpbm support" off \
+ IMAGEMAGICK "Enable imagemagick support" on \
+ GRAPHICSMAGICK "Use graphicsmagick instead of imagemagick" off \
+ 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 \
+ NLS "Enable National Language Support" on
+
+.include <bsd.port.pre.mk>
.if defined(WITH_PGSQL)
USE_PHP+= pgsql
@@ -49,26 +48,25 @@
USE_PHP+= gd
RUN_DEPENDS+= pngtogd:${PORTSDIR}/graphics/gd
.endif
-.if !defined(WITHOUT_NLS)
+.if defined(WITH_NLS)
USE_PHP+= gettext
+USE_GETTEXT= yes # Pet portlint
.endif
-.include <bsd.port.pre.mk>
-
.if defined(WITH_NETPBM)
RUN_DEPENDS+= giftopnm:${PORTSDIR}/graphics/netpbm
.endif
.if defined(WITH_GRAPHICSMAGICK)
RUN_DEPENDS+= GraphicsMagick.1:${PORTSDIR}/graphics/GraphicsMagick
-.elif !defined(WITHOUT_IMAGEMAGICK)
+.elif defined(WITH_IMAGEMAGICK)
RUN_DEPENDS+= convert:${PORTSDIR}/graphics/ImageMagick
.endif
-.if !defined(WITHOUT_JHEAD)
+.if defined(WITH_JHEAD)
RUN_DEPENDS+= jhead:${PORTSDIR}/graphics/jhead
.endif
-.if !defined(WITHOUT_UNZIP)
+.if defined(WITH_UNZIP)
RUN_DEPENDS+= unzip:${PORTSDIR}/archivers/unzip
.endif
.if defined(WITH_FFMPEG)
@@ -80,15 +78,12 @@
pre-everything::
.if defined(GALLERY2DIR)
+# Continue to support legacy GALLERY2DIR variable
WWWDIR= ${GALLERY2DIR}
-.else
- @${ECHO_MSG} ""
- @${ECHO_MSG} "Define GALLERY2DIR to override default of ${WWWDIR}."
- @${ECHO_MSG} ""
.endif
do-install:
- @ ${MKDIR} -m 0755 ${WWWDIR}
+ @ ${INSTALL} -d -m 0755 ${WWWDIR}
@ cd ${WRKSRC} && ${FIND} * -print | ${CPIO} ${CPIOARGS} ${WWWOWN}:${WWWGRP} ${WWWDIR}
@ ${CHOWN} ${WWWOWN}:${WWWGRP} ${WWWDIR}
Index: distinfo
===================================================================
RCS file: /home/freebsd/cvsroot/ports/www/gallery2/distinfo,v
retrieving revision 1.39
diff -u -u -r1.39 distinfo
--- distinfo 24 Jun 2007 20:34:24 -0000 1.39
+++ distinfo 31 Aug 2007 06:31:10 -0000
@@ -1,3 +1,3 @@
-MD5 (gallery2/gallery-2.2.2-full.tar.gz) = 488d7837d531e99d4b5f420150b792d9
-SHA256 (gallery2/gallery-2.2.2-full.tar.gz) = 521b4d77e6ad21591229c8bd2769a9889052835cbcbe720e0b9abd2820431ac2
-SIZE (gallery2/gallery-2.2.2-full.tar.gz) = 11900129
+MD5 (gallery2/gallery-2.2.3-full.tar.gz) = df5c1a6ecbf0b498417ceffc66fe5f3b
+SHA256 (gallery2/gallery-2.2.3-full.tar.gz) = ce7d9c1c4497954e1828047be25b31c3a271b5c86c0c97bbc652b3746aa1b364
+SIZE (gallery2/gallery-2.2.3-full.tar.gz) = 11901089
Index: files/pkg-message.in
===================================================================
RCS file: /home/freebsd/cvsroot/ports/www/gallery2/files/pkg-message.in,v
retrieving revision 1.1
diff -u -u -r1.1 pkg-message.in
--- files/pkg-message.in 9 Jul 2007 19:24:56 -0000 1.1
+++ files/pkg-message.in 31 Aug 2007 06:27:15 -0000
@@ -22,6 +22,6 @@
Then restart Apache: 'apachectl graceful'
-Please visit 'http://{host.domain}/%%WWWDIR_REL%%/' in a
+Please visit 'http://{host.domain}/gallery2/' in a
web-browser and follow the configuration instructions.
*****************************************************************
--- gallery2-2.2.3.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200708311657.l7VGv3iX030762>