svn commit: r304595 - in head/graphics/GraphicsMagick13: . files
Greg Larkin
glarkin at FreeBSD.org
Thu Sep 20 20:25:56 UTC 2012
Author: glarkin
Date: Thu Sep 20 20:25:55 2012
New Revision: 304595
URL: http://svn.freebsd.org/changeset/ports/304595
Log:
- Updated to 1.3.16
- Fixed X11-conditional dependency injection [1]
- Converted to optionsNG
PR: ports/171516 (based on) [1]
Submitted by: Rainer Duffner <rainer at ultra-secure.de> [1]
Deleted:
head/graphics/GraphicsMagick13/files/patch-coders__png.c
Modified:
head/graphics/GraphicsMagick13/Makefile
head/graphics/GraphicsMagick13/distinfo
head/graphics/GraphicsMagick13/pkg-plist
Modified: head/graphics/GraphicsMagick13/Makefile
==============================================================================
--- head/graphics/GraphicsMagick13/Makefile Thu Sep 20 19:51:30 2012 (r304594)
+++ head/graphics/GraphicsMagick13/Makefile Thu Sep 20 20:25:55 2012 (r304595)
@@ -6,8 +6,7 @@
#
PORTNAME= GraphicsMagick
-PORTVERSION= 1.3.15
-PORTREVISION= 2
+PORTVERSION= 1.3.16
CATEGORIES= graphics
MASTER_SITES= SF \
ftp://ftp.graphicsmagick.org/pub/GraphicsMagick/1.3/
@@ -22,18 +21,20 @@ CONFLICTS= GraphicsMagick-1.[12].*
LIB_DEPENDS= freetype:${PORTSDIR}/print/freetype2 \
png15:${PORTSDIR}/graphics/png \
jbig:${PORTSDIR}/graphics/jbigkit \
- wmflite:${PORTSDIR}/graphics/libwmf \
xml2:${PORTSDIR}/textproc/libxml2
OTHERGRAPHICS= jasper jpeg lcms tiff
LIB_DEPENDS+= ${OTHERGRAPHICS:C|(.+)|\1:${PORTSDIR}/graphics/\1|}
-OPTIONS= Q8BIT "Use 8-bit pixels (speed) instead of 16 (quality)" off \
- FPX "Enable FlashPIX support" on \
- DPS "Enable Display Ghostscript support" on \
- OPENMP "Enable OpenMP support" on \
- SSE "Enable SSE opcodes on supported CPUs" off \
- X11 "Enable X11 support" on \
- TESTS "Run bundled self-tests after build" on
+OPTIONS_DEFINE= Q8BIT FPX OPENMP SSE TESTS X11 DOCS
+
+Q8BIT_DESC= Use 8-bit pixels (speed) instead of 16 (quality)
+DPS_DESC= Enable Display Ghostscript support
+NODPS_DESC= Disable Display Ghostscript support
+TESTS_DESC= Run bundled self-tests after build
+
+OPTIONS_DEFAULT=FPX DPS OPENMP X11 TESTS DOCS
+OPTIONS_SINGLE= X11
+OPTIONS_SINGLE_X11= DPS NODPS
USE_ICONV= yes
USE_AUTOTOOLS= libtool libltdl
@@ -63,15 +64,15 @@ LDFLAGS+= -L${LOCALBASE}/lib
test check:
cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} check
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
-.if defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS} == ""
# Get rid of the Makefile targets that install the documentation
# and HTML files into DOCSDIR
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-Makefile.in
.endif
-.if defined(WITH_SSE)
+.if ${PORT_OPTIONS:MSSE}
.if ${MACHINE_CPU:Msse}
CFLAGS+= -msse
.endif
@@ -83,21 +84,21 @@ CFLAGS+= -msse3
.endif
.endif
-.if defined(WITH_FPX)
+.if ${PORT_OPTIONS:MFPX}
LIB_DEPENDS+= fpx.[2-9]:${PORTSDIR}/graphics/libfpx
CONFIGURE_ARGS+= --with-fpx
.else
CONFIGURE_ARGS+= --without-fpx
.endif
-.if defined(WITH_DPS)
+.if ${PORT_OPTIONS:MDPS}
LIB_DEPENDS+= dps:${PORTSDIR}/x11/dgs
CONFIGURE_ARGS+= --with-dps
.else
CONFIGURE_ARGS+= --without-dps
.endif
-.if defined(WITH_OPENMP)
+.if ${PORT_OPTIONS:MOPENMP}
.if ${OSVERSION} < 700042
IGNORE= does not support OpenMP on FreeBSD version ${OSVERSION}
.endif
@@ -117,12 +118,15 @@ WINDOWS_FONT_DIR=${LOCALBASE}/lib/X11/fo
CONFIGURE_ARGS+= --with-windows-font-dir="${WINDOWS_FONT_DIR}"
.endif
-.if !defined(WITH_X11)
+.if ${PORT_OPTIONS:MX11} == ""
PKGNAMESUFFIX+= -nox11
CONFIGURE_ARGS+=--without-x
+LIB_DEPENDS+= wmflite:${PORTSDIR}/graphics/libwmf-nox11
+.else
+LIB_DEPENDS+= wmflite:${PORTSDIR}/graphics/libwmf
.endif
-.if defined(WITH_Q8BIT) || defined(WITHOUT_GRAPHICSMAGICK_16BIT_PIXEL)
+.if ${PORT_OPTIONS:MQ8BIT}
CONFIGURE_ARGS+= --with-quantum-depth=8
PLIST_SUB+= Q=8
.else
@@ -130,7 +134,7 @@ CONFIGURE_ARGS+= --with-quantum-depth=16
PLIST_SUB+= Q=16
.endif
-.if !defined(WITHOUT_TESTS)
+.if ${PORT_OPTIONS:MTESTS}
post-build:: test
.else
post-build::
@@ -140,4 +144,4 @@ post-build::
#
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Modified: head/graphics/GraphicsMagick13/distinfo
==============================================================================
--- head/graphics/GraphicsMagick13/distinfo Thu Sep 20 19:51:30 2012 (r304594)
+++ head/graphics/GraphicsMagick13/distinfo Thu Sep 20 20:25:55 2012 (r304595)
@@ -1,2 +1,2 @@
-SHA256 (GraphicsMagick-1.3.15.tar.bz2) = fd79168feaca5a2d230ce294541bb3655fd0fb6f21aec7c29dd7f00db14109ed
-SIZE (GraphicsMagick-1.3.15.tar.bz2) = 6686564
+SHA256 (GraphicsMagick-1.3.16.tar.bz2) = 2845bfcd53b0ea57755f21aac80df3becfa7d37ac50c6f67387f004d67d58d83
+SIZE (GraphicsMagick-1.3.16.tar.bz2) = 7328861
Modified: head/graphics/GraphicsMagick13/pkg-plist
==============================================================================
--- head/graphics/GraphicsMagick13/pkg-plist Thu Sep 20 19:51:30 2012 (r304594)
+++ head/graphics/GraphicsMagick13/pkg-plist Thu Sep 20 20:25:55 2012 (r304595)
@@ -95,7 +95,7 @@ lib/libGraphicsMagick++.so.9
lib/libGraphicsMagick.a
lib/libGraphicsMagick.la
lib/libGraphicsMagick.so
-lib/libGraphicsMagick.so.11
+lib/libGraphicsMagick.so.12
lib/libGraphicsMagickWand.a
lib/libGraphicsMagickWand.la
lib/libGraphicsMagickWand.so
More information about the svn-ports-all
mailing list