diff options
| author | rene <rene@FreeBSD.org> | 2018-12-21 22:05:05 +0800 |
|---|---|---|
| committer | rene <rene@FreeBSD.org> | 2018-12-21 22:05:05 +0800 |
| commit | 0997e70dc086b84492dd5f86105115be320e1213 (patch) | |
| tree | 5e42a95c300f98bb33c2506eb7a8277b28803c08 /graphics | |
| parent | 8ced2135e8a4c4db55277195b4b6262f1003e9e6 (diff) | |
| download | freebsd-ports-gnome-0997e70dc086b84492dd5f86105115be320e1213.tar.gz freebsd-ports-gnome-0997e70dc086b84492dd5f86105115be320e1213.tar.zst freebsd-ports-gnome-0997e70dc086b84492dd5f86105115be320e1213.zip | |
graphics/GraphicsMagick: remove optional dependency on expired x11/dgs
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/GraphicsMagick/Makefile | 7 | ||||
| -rw-r--r-- | graphics/GraphicsMagick/files/patch-configure | 19 |
2 files changed, 1 insertions, 25 deletions
diff --git a/graphics/GraphicsMagick/Makefile b/graphics/GraphicsMagick/Makefile index 02a53d1d8a0b..24b4454f9d67 100644 --- a/graphics/GraphicsMagick/Makefile +++ b/graphics/GraphicsMagick/Makefile @@ -27,18 +27,13 @@ USE_LDCONFIG= yes # Use fonts installed by x11-fonts/webfonts by default WINDOWS_FONT_DIR?= ${LOCALBASE}/share/fonts/webfonts -OPTIONS_DEFINE= BZIP2 DOCS DPS FPX FREETYPE JASPER JBIG JPEG LCMS2 LZMA OPENMP Q8BIT PNG SSE TEST TIFF TRIO UMEM WEBP WMF X11 XML ZLIB ZSTD +OPTIONS_DEFINE= BZIP2 DOCS FPX FREETYPE JASPER JBIG JPEG LCMS2 LZMA OPENMP Q8BIT PNG SSE TEST TIFF TRIO UMEM WEBP WMF X11 XML ZLIB ZSTD OPTIONS_DEFAULT=BZIP2 FREETYPE JASPER JBIG JPEG LCMS2 LZMA OPENMP PNG TIFF WEBP WMF X11 XML ZLIB -DPS_DESC= Display Ghostscript support Q8BIT_DESC= Use 8-bit pixels (speed) instead of 16-bit (quality) TRIO_DESC= TRIO support UMEM_DESC= UMEM memory allocation library support TEST_DESC= Run bundled self-tests after build -DPS_CONFIGURE_WITH= dps -DPS_IMPLIES= X11 -DPS_LIB_DEPENDS= libdps.so:x11/dgs -DPS_USE= XORG=xt BZIP2_CONFIGURE_WITH= bzlib FPX_CONFIGURE_WITH= fpx FPX_LIB_DEPENDS= libfpx.so:graphics/libfpx diff --git a/graphics/GraphicsMagick/files/patch-configure b/graphics/GraphicsMagick/files/patch-configure index 262023e8a38e..92a9e3083493 100644 --- a/graphics/GraphicsMagick/files/patch-configure +++ b/graphics/GraphicsMagick/files/patch-configure @@ -69,25 +69,6 @@ # Check for system-dependent libraries X programs must link with. # Do this before checking for the system-independent R6 libraries -@@ -25245,15 +25190,16 @@ fi - # 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. */ - @@ -27703,7 +27649,7 @@ fi # |