mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-12 07:27:57 +00:00
- On FreeBSD < 10, the linker adds -lXt with dps, but on 10 it does
not => force it; - Register Xext too; - rename patch-configure.
This commit is contained in:
parent
f9b46817d5
commit
d68f6d3004
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=337729
graphics/GraphicsMagick13
@ -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
|
||||
|
||||
|
@ -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
|
Loading…
Reference in New Issue
Block a user