Date: Tue, 04 Aug 2009 23:30:33 +0400 From: Anonymous <swell.k@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/137432: [patch] graphics/gimp-app: add a few OPTIONS Message-ID: <86eirrnzqe.fsf@gmail.com> Resent-Message-ID: <200908041940.n74Je1WD031578@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 137432
>Category: ports
>Synopsis: [patch] graphics/gimp-app: add a few 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: Tue Aug 04 19:40:00 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: Anonymous
>Release: FreeBSD 8.0-CURRENT amd64
>Organization:
>Environment:
System: FreeBSD 8.0-BETA2 #0 r196037M: Sun Aug 2 15:30:58 UTC 2009 root@luffy:/usr/obj/usr/src/sys/PHOENIX amd64
$ make showconfig
===> The following configuration options are available for gimp-app-2.6.6_3,1:
AA=off "Ascii Art plug-in"
DBUS=on "D-BUS support"
EXIF=off "reading meta-data from camera/scanner"
GVFS=off "Use GVFS for the URI plug-in"
HELPBROWSER=off "internal help browser"
MNG=off "MNG format support"
MP=on "multiple processor support"
POPPLER=on "PDF format support"
RSVG=on "SVG format support"
SIMD=on "Use cpu-specific optimizations if available"
WMF=off "wmf plugin"
===> Use 'make config' to modify these settings
Tested: only graphics/gimp-app itself
>Description:
actual changes:
- move some dependencies to OPTIONS (all ON by default);
no point in moving ubiquitous libs: jpeg, png, tiff
- add SIMD knob (OFF by default)
and cosmetic changes (i.e. I don't care if you omit them):
- sort option ifdefs placing WITH_DEBUG and WITH_GNOME at the top
because they don't have respective OPTIONS.
- switch remaining options ifdefs from WITHOUT_* to WITH_* for consistency
>How-To-Repeat:
>Fix:
--- gimp-app.diff begins here ---
Index: graphics/gimp-app/Makefile
===================================================================
RCS file: /home/csup/ports/graphics/gimp-app/Makefile,v
retrieving revision 1.237
diff -u -p -r1.237 Makefile
--- graphics/gimp-app/Makefile 2 Aug 2009 19:34:02 -0000 1.237
+++ graphics/gimp-app/Makefile 4 Aug 2009 19:02:47 -0000
@@ -8,7 +8,7 @@
PORTNAME= gimp-app
DISTVERSION= 2.6.6
-PORTREVISION?= 2
+PORTREVISION?= 3
PORTEPOCH?= 1
CATEGORIES?= graphics gnome
MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \
@@ -25,14 +25,8 @@ MAINTAINER= gnome@FreeBSD.org
COMMENT= A GNU Image Manipulation Program
BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
-LIB_DEPENDS= exif.12:${PORTSDIR}/graphics/libexif \
- wmf.2:${PORTSDIR}/graphics/libwmf \
- poppler-glib.4:${PORTSDIR}/graphics/poppler-gtk \
- aa.1:${PORTSDIR}/graphics/aalib \
- mng.1:${PORTSDIR}/graphics/libmng \
- png.5:${PORTSDIR}/graphics/png \
+LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
jpeg.10:${PORTSDIR}/graphics/jpeg \
- tiff.4:${PORTSDIR}/graphics/tiff \
lcms.1:${PORTSDIR}/graphics/lcms \
gegl-0.0.22:${PORTSDIR}/graphics/gegl
RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes
@@ -64,12 +58,17 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/
.if !defined(GIMP_SLAVE)
WANT_GNOME= yes
-OPTIONS?= DEBUG "debugging" off \
+OPTIONS?= AA "Ascii Art plug-in" on \
DBUS "D-BUS support" on \
+ EXIF "reading meta-data from camera/scanner" on \
GVFS "Use GVFS for the URI plug-in" on \
HELPBROWSER "internal help browser" on \
+ MNG "MNG format support" on \
MP "multiple processor support" off \
- RSVG "SVG format support" on
+ POPPLER "PDF format support" on \
+ RSVG "SVG format support" on \
+ SIMD "Use cpu-specific optimizations if available" off \
+ WMF "wmf plugin" on
.endif
.include <bsd.port.pre.mk>
@@ -91,24 +90,10 @@ MLINKS= gimp-2.6.1 gimp.1 \
gimp-console-2.6.1 gimp-console.1 \
gimprc-2.6.5 gimprc.5
-.if defined(WITHOUT_RSVG)
-CONFIGURE_ARGS+= --without-librsvg
-PLIST_SUB+= SVG="@comment "
-.else
-USE_GNOME+= librsvg2
-PLIST_SUB+= SVG=""
-.endif
-
.if defined(WITH_DEBUG)
CONFIGURE_ARGS+= --enable-debug
.endif
-.if defined(WITH_MP)
-CONFIGURE_ARGS+= --enable-mp
-.else
-CONFIGURE_ARGS+= --disable-mp
-.endif
-
.if ${HAVE_GNOME:Mgnomehier}!="" || defined(WITH_GNOME)
USE_GNOME+= desktopfileutils gnomehier
PLIST_SUB+= GNOME=""
@@ -116,13 +101,12 @@ PLIST_SUB+= GNOME=""
PLIST_SUB+= GNOME="@comment "
.endif
-.if defined(WITH_HELPBROWSER)
-LIB_DEPENDS+= webkit-1.0.1:${PORTSDIR}/www/webkit-gtk2
-CONFIGURE_ARGS+= --with-webkit
-PLIST_SUB+= HELPBROWSER=""
+.if defined(WITH_AA)
+LIB_DEPENDS+= aa.1:${PORTSDIR}/graphics/aalib
+PLIST_SUB+= AA=""
.else
-CONFIGURE_ARGS+= --without-webkit
-PLIST_SUB+= HELPBROWSER="@comment "
+CONFIGURE_ARGS+= --without-aa
+PLIST_SUB+= AA="@comment "
.endif
.if defined(WITH_DBUS)
@@ -132,6 +116,12 @@ CONFIGURE_ARGS+= --with-dbus
CONFIGURE_ARGS+= --without-dbus
.endif
+.if defined(WITH_EXIF)
+LIB_DEPENDS+= exif.12:${PORTSDIR}/graphics/libexif
+.else
+CONFIGURE_ARGS+= --without-libexif
+.endif
+
.if defined(WITH_GVFS) || ${HAVE_GNOME:Mgvfs}!=""
LIB_DEPENDS+= gnome-keyring.0:${PORTSDIR}/security/gnome-keyring
USE_GNOME+= gvfs
@@ -140,6 +130,59 @@ USE_GNOME+= libgnomeui
. endif
.endif
+.if defined(WITH_HELPBROWSER)
+LIB_DEPENDS+= webkit-1.0.1:${PORTSDIR}/www/webkit-gtk2
+CONFIGURE_ARGS+= --with-webkit
+PLIST_SUB+= HELPBROWSER=""
+.else
+CONFIGURE_ARGS+= --without-webkit
+PLIST_SUB+= HELPBROWSER="@comment "
+.endif
+
+.if defined(WITH_MNG)
+LIB_DEPENDS+= mng.1:${PORTSDIR}/graphics/libmng
+PLIST_SUB+= MNG=""
+.else
+CONFIGURE_ARGS+= --without-libmng
+PLIST_SUB+= MNG="@comment "
+.endif
+
+.if defined(WITH_MP)
+CONFIGURE_ARGS+= --enable-mp
+.else
+CONFIGURE_ARGS+= --disable-mp
+.endif
+
+.if defined(WITH_POPPLER)
+LIB_DEPENDS+= poppler-glib.4:${PORTSDIR}/graphics/poppler-gtk
+PLIST_SUB+= POPPLER=""
+.else
+CONFIGURE_ARGS+= --without-poppler
+PLIST_SUB+= POPPLER="@comment "
+.endif
+
+.if defined(WITH_RSVG)
+USE_GNOME+= librsvg2
+PLIST_SUB+= SVG=""
+.else
+CONFIGURE_ARGS+= --without-librsvg
+PLIST_SUB+= SVG="@comment "
+.endif
+
+.if defined(WITH_WMF)
+LIB_DEPENDS+= wmf.2:${PORTSDIR}/graphics/libwmf
+PLIST_SUB+= WMF=""
+.else
+CONFIGURE_ARGS+= --without-wmf
+PLIST_SUB+= WMF="@comment "
+.endif
+
+.if defined(WITH_SIMD)
+CONFIGURE_ARGS+= --enable-mmx \
+ --enable-sse \
+ --enable-altivec
+.endif
+
.endif
post-patch:
Index: graphics/gimp-app/pkg-plist
===================================================================
RCS file: /home/csup/ports/graphics/gimp-app/pkg-plist,v
retrieving revision 1.126
diff -u -p -r1.126 pkg-plist
--- graphics/gimp-app/pkg-plist 21 Mar 2009 04:52:37 -0000 1.126
+++ graphics/gimp-app/pkg-plist 4 Aug 2009 17:46:30 -0000
@@ -334,7 +334,7 @@ libexec/gimp/2.2/plug-ins/edge-neon
libexec/gimp/2.2/plug-ins/edge-sobel
libexec/gimp/2.2/plug-ins/emboss
libexec/gimp/2.2/plug-ins/engrave
-libexec/gimp/2.2/plug-ins/file-aa
+%%AA%%libexec/gimp/2.2/plug-ins/file-aa
libexec/gimp/2.2/plug-ins/file-bmp
libexec/gimp/2.2/plug-ins/file-cel
libexec/gimp/2.2/plug-ins/file-compressor
@@ -353,10 +353,10 @@ libexec/gimp/2.2/plug-ins/file-header
libexec/gimp/2.2/plug-ins/file-html-table
libexec/gimp/2.2/plug-ins/file-ico
libexec/gimp/2.2/plug-ins/file-jpeg
-libexec/gimp/2.2/plug-ins/file-mng
+%%MNG%%libexec/gimp/2.2/plug-ins/file-mng
libexec/gimp/2.2/plug-ins/file-pat
libexec/gimp/2.2/plug-ins/file-pcx
-libexec/gimp/2.2/plug-ins/file-pdf
+%%POPPLER%%libexec/gimp/2.2/plug-ins/file-pdf
libexec/gimp/2.2/plug-ins/file-pix
libexec/gimp/2.2/plug-ins/file-png
libexec/gimp/2.2/plug-ins/file-pnm
@@ -372,7 +372,7 @@ libexec/gimp/2.2/plug-ins/file-tga
libexec/gimp/2.2/plug-ins/file-tiff-load
libexec/gimp/2.2/plug-ins/file-tiff-save
libexec/gimp/2.2/plug-ins/file-uri
-libexec/gimp/2.2/plug-ins/file-wmf
+%%WMF%%libexec/gimp/2.2/plug-ins/file-wmf
libexec/gimp/2.2/plug-ins/file-xbm
libexec/gimp/2.2/plug-ins/file-xjt
libexec/gimp/2.2/plug-ins/file-xpm
--- gimp-app.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?86eirrnzqe.fsf>