diff options
| author | Thierry Thomas <thierry@FreeBSD.org> | 2013-12-27 13:13:47 +0000 |
|---|---|---|
| committer | Thierry Thomas <thierry@FreeBSD.org> | 2013-12-27 13:13:47 +0000 |
| commit | d68f6d300492774b071765d6e20fb67ce3fa149d (patch) | |
| tree | 716f0945fd9150f2daf5fcc83f641b309acd2afc | |
| parent | f9b46817d5a68b0884ac86a443d217b0259c5ce3 (diff) | |
| download | ports-d68f6d300492774b071765d6e20fb67ce3fa149d.tar.gz ports-d68f6d300492774b071765d6e20fb67ce3fa149d.zip | |
Notes
| -rw-r--r-- | graphics/GraphicsMagick13/Makefile | 3 | ||||
| -rw-r--r-- | graphics/GraphicsMagick13/files/patch-configure (renamed from graphics/GraphicsMagick13/files/patch-configure.in) | 27 |
2 files changed, 26 insertions, 4 deletions
diff --git a/graphics/GraphicsMagick13/Makefile b/graphics/GraphicsMagick13/Makefile index 875c66957c5b..eda2a77c036f 100644 --- a/graphics/GraphicsMagick13/Makefile +++ b/graphics/GraphicsMagick13/Makefile @@ -3,6 +3,7 @@ PORTNAME= GraphicsMagick PORTVERSION= 1.3.18 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= SF \ ftp://ftp.graphicsmagick.org/pub/GraphicsMagick/1.3/ @@ -83,6 +84,7 @@ CONFIGURE_ARGS+= --without-fpx .endif .if ${PORT_OPTIONS:MDPS} +USE_XORG+= xt LIB_DEPENDS+= libdps.so:${PORTSDIR}/x11/dgs CONFIGURE_ARGS+= --with-dps .else @@ -113,6 +115,7 @@ CONFIGURE_ARGS+= --with-windows-font-dir="${WINDOWS_FONT_DIR}" CONFIGURE_ARGS+=--without-x LIB_DEPENDS+= libwmflite.so:${PORTSDIR}/graphics/libwmf-nox11 .else +USE_XORG+= xext LIB_DEPENDS+= libwmflite.so:${PORTSDIR}/graphics/libwmf .endif diff --git a/graphics/GraphicsMagick13/files/patch-configure.in b/graphics/GraphicsMagick13/files/patch-configure index 175a24ef8c29..5abbb28f99a1 100644 --- a/graphics/GraphicsMagick13/files/patch-configure.in +++ b/graphics/GraphicsMagick13/files/patch-configure @@ -1,6 +1,25 @@ --- configure.orig 2013-03-10 00:21:59.000000000 +0100 -+++ configure 2013-12-13 12:24:09.000000000 +0100 -@@ -26059,7 +26059,7 @@ ++++ configure 2013-12-27 11:48:19.000000000 +0100 +@@ -24580,15 +24580,16 @@ + # Cygwin doesn't deliver -lXt as a DLL, which prevents a DLL build. + # Adobe DPS (as delivered on Solaris) doesn't require -lXt. + # GraphicsMagick itself doesn't use -lXt. ++ # in FreeBSD < 10, libXt is added by the linker, bot on >= 10 + have_libdps='no' +- LIBDPS_XT='' ++ LIBDPS_XT='-lXt' + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DPSInitialize in -ldps" >&5 + $as_echo_n "checking for DPSInitialize in -ldps... " >&6; } + if ${ac_cv_lib_dps_DPSInitialize+:} false; then : + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-ldps $LIBS" ++LIBS="-ldps $LIBDPS_XT $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -26059,7 +26060,7 @@ fi @@ -9,7 +28,7 @@ " if test "x$ac_cv_header_freetype_freetype_h" = xyes; then : have_freetype_h='yes' -@@ -26935,7 +26935,7 @@ +@@ -26935,7 +26936,7 @@ # # Subdirectory under lib to place GraphicsMagick lib files @@ -18,7 +37,7 @@ cat >>confdefs.h <<_ACEOF #define MagickLibSubdir "$MagickLibSubdir" -@@ -27039,7 +27039,7 @@ +@@ -27039,7 +27040,7 @@ # # Path to GraphicsMagick share files |