Date: Tue, 9 Nov 2010 02:35:36 +0800 (CST) From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: appleboy.tw@gmail.com Subject: ports/152058: [PATCH] www/gallery3: add missing OPTIONS Message-ID: <20101108183536.D709E2AECA16@sunpoet.net> Resent-Message-ID: <201011081840.oA8Ie5Qk060048@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 152058
>Category: ports
>Synopsis: [PATCH] www/gallery3: add missing OPTIONS
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Nov 08 18:40:05 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Sunpoet Po-Chuan Hsieh
>Release: FreeBSD 8.1-STABLE amd64
>Organization:
The FreeBSD Project
>Environment:
System: FreeBSD bonjour.sunpoet.net 8.1-STABLE FreeBSD 8.1-STABLE #0: Sat Oct 23 16:01:16 CST 2010
>Description:
- Add missing OPTIONS: UNZIP (default on)
- Sort OPTIONS
- Use bsd.port.options.mk
- Bump PORTREVISION for dependency change: WITH_UNZIP
Port maintainer (appleboy.tw@gmail.com) is cc'd.
Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:
--- gallery3-3.0_7.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/www/gallery3/Makefile,v
retrieving revision 1.73
diff -u -u -r1.73 Makefile
--- Makefile 8 Nov 2010 07:54:12 -0000 1.73
+++ Makefile 8 Nov 2010 15:28:01 -0000
@@ -7,7 +7,7 @@
PORTNAME= gallery3
PORTVERSION= 3.0
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= www
MASTER_SITES= SF/gallery/${PORTNAME}/${PORTVERSION}
DISTNAME= gallery-${PORTVERSION}
@@ -25,58 +25,59 @@
SUB_FILES= pkg-message
-OPTIONS= NETPBM "Enable netpbm support" off \
- IMAGEMAGICK "Enable imagemagick support" on \
+OPTIONS= DCRAW "Enable dcraw support" off \
+ FFMPEG "Enable ffmpeg support" off \
+ GD "Enable gd support" off \
GRAPHMAGICK "Enable graphicsmagick support" off \
+ IMAGEMAGICK "Enable imagemagick support" on \
JHEAD "Enable jhead support" on \
- GD "Enable gd support" off \
- DCRAW "Enable dcraw support" off \
- FFMPEG "Enable ffmpeg support" off \
- NLS "Enable National Language Support" on
+ NETPBM "Enable netpbm support" off \
+ NLS "Enable National Language Support" on \
+ UNZIP "Enable unzip support" on
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
-.if defined(WITH_GD)
-USE_PHP+= gd
-RUN_DEPENDS+= pngtogd:${PORTSDIR}/graphics/gd
+.if defined(GALLERY3DIR)
+# Continue to support legacy GALLERY3DIR variable
+WWWDIR= ${GALLERY3DIR}
.endif
-.if defined(WITH_NLS)
-USE_PHP+= gettext
-USE_GETTEXT= yes # Pet portlint
+.if defined(WITH_DCRAW)
+RUN_DEPENDS+= dcraw:${PORTSDIR}/graphics/dcraw
.endif
-.if defined(WITH_NETPBM)
-RUN_DEPENDS+= giftopnm:${PORTSDIR}/graphics/netpbm
+.if defined(WITH_FFMPEG)
+LIB_DEPENDS+= avcodec.1:${PORTSDIR}/multimedia/ffmpeg
+.endif
+
+.if defined(WITH_GD)
+USE_PHP+= gd
+RUN_DEPENDS+= pngtogd:${PORTSDIR}/graphics/gd
.endif
.if defined(WITH_GRAPHMAGICK)
RUN_DEPENDS+= gm:${PORTSDIR}/graphics/GraphicsMagick
.endif
-.if defined(WITH_IMAGEMAGICK)
+.if !defined(WITHOUT_IMAGEMAGICK)
RUN_DEPENDS+= convert:${PORTSDIR}/graphics/ImageMagick
.endif
-.if defined(WITH_JHEAD)
+.if !defined(WITHOUT_JHEAD)
RUN_DEPENDS+= jhead:${PORTSDIR}/graphics/jhead
.endif
-.if defined(WITH_UNZIP)
-RUN_DEPENDS+= unzip:${PORTSDIR}/archivers/unzip
+.if defined(WITH_NETPBM)
+RUN_DEPENDS+= giftopnm:${PORTSDIR}/graphics/netpbm
.endif
-.if defined(WITH_FFMPEG)
-LIB_DEPENDS+= avcodec.1:${PORTSDIR}/multimedia/ffmpeg
-
-.endif
-.if defined(WITH_DCRAW)
-RUN_DEPENDS+= dcraw:${PORTSDIR}/graphics/dcraw
+.if !defined(WITHOUT_NLS)
+USE_PHP+= gettext
+USE_GETTEXT= yes # Pet portlint
.endif
-.if defined(GALLERY3DIR)
-# Continue to support legacy GALLERY3DIR variable
-WWWDIR= ${GALLERY3DIR}
+.if !defined(WITHOUT_UNZIP)
+RUN_DEPENDS+= unzip:${PORTSDIR}/archivers/unzip
.endif
do-install:
@@ -88,4 +89,4 @@
@${CAT} ${PKGMESSAGE}
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- gallery3-3.0_7.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?20101108183536.D709E2AECA16>