summaryrefslogtreecommitdiff
path: root/graphics/GraphicsMagick/files/patch-configure
diff options
context:
space:
mode:
authorRene Ladan <rene@FreeBSD.org>2014-06-17 18:39:34 +0000
committerRene Ladan <rene@FreeBSD.org>2014-06-17 18:39:34 +0000
commit0685b3e969da31b168fb72e209a44221f69dd984 (patch)
treeb071cb41ba1a596b59d6d211e0b729242233a271 /graphics/GraphicsMagick/files/patch-configure
parentAdd missing font_dir initialization for @fontsdir (diff)
Update www/GraphicsMagick to 1.3.19 and bump PORTREVISION for consumers.
Note that graphics/GraphicsMagick12 was removed on 2014-05-20 because it is no longer maintained upstream. Detailed/other changes: * graphics/GraphicsMagick : - Copy contents from graphics/GraphicsMagick13 - Remove PORTREVISION and PKGNAMESUFFIX - Keep original pkg-descr, do not copy whitespace-only changes. * graphics/pecl-gmagick : - Use modern LIB_DEPENDS * graphics/vips : - Stage support - Use modern LIB_DEPENDS - USES libtool, pathfix * multimedia/bombono : - Update BUILD_DEPENDS and RUN_DEPENDS * textproc/htmltolatex : - Use modern LIB_DEPENDS Phabric: D108 162 Approved by: portmgr (antoine, bapt)
Diffstat (limited to 'graphics/GraphicsMagick/files/patch-configure')
-rw-r--r--graphics/GraphicsMagick/files/patch-configure148
1 files changed, 99 insertions, 49 deletions
diff --git a/graphics/GraphicsMagick/files/patch-configure b/graphics/GraphicsMagick/files/patch-configure
index 18c490659397..1680e29eafa8 100644
--- a/graphics/GraphicsMagick/files/patch-configure
+++ b/graphics/GraphicsMagick/files/patch-configure
@@ -1,58 +1,108 @@
---- configure.orig 2008-11-20 04:31:11.000000000 +0100
-+++ configure 2013-12-13 12:12:27.000000000 +0100
-@@ -32116,7 +32116,7 @@
- fi
+--- configure.orig 2013-12-31 20:58:17.000000000 +0100
++++ configure 2014-04-26 15:53:04.000000000 +0200
+@@ -12919,7 +12919,6 @@
+ # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+ freebsd* | dragonfly*)
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+- hardcode_libdir_flag_spec='-R$libdir'
+ hardcode_direct=yes
+ hardcode_shlibpath_var=no
+ ;;
+@@ -23889,60 +23888,6 @@
+ X_CFLAGS="$X_CFLAGS -I$x_includes"
+ fi
- # Some Freetype installs appear to require that <ft2build.h> be
-- # included prior to including <freetype/freetype.h>. Oops!
-+ # included prior to including <freetype.h>. Oops!
- if test "${ac_cv_header_ft2build_h+set}" = set; then
- { echo "$as_me:$LINENO: checking for ft2build.h" >&5
- echo $ECHO_N "checking for ft2build.h... $ECHO_C" >&6; }
-@@ -32249,8 +32249,8 @@
- fi
+- # It would also be nice to do this for all -L options, not just this one.
+- if test -n "$x_libraries"; then
+- X_LIBS="$X_LIBS -L$x_libraries"
+- # For Solaris; some versions of Sun CC require a space after -R and
+- # others require no space. Words are not sufficient . . . .
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -R must be followed by a space" >&5
+-$as_echo_n "checking whether -R must be followed by a space... " >&6; }
+- ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
+- ac_xsave_c_werror_flag=$ac_c_werror_flag
+- ac_c_werror_flag=yes
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-
+-int
+-main ()
+-{
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+- X_LIBS="$X_LIBS -R$x_libraries"
+-else
+- LIBS="$ac_xsave_LIBS -R $x_libraries"
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-
+-int
+-main ()
+-{
+-
+- ;
+- return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+- X_LIBS="$X_LIBS -R $x_libraries"
+-else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: neither works" >&5
+-$as_echo "neither works" >&6; }
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+- ac_c_werror_flag=$ac_xsave_c_werror_flag
+- LIBS=$ac_xsave_LIBS
+- fi
-
-- { echo "$as_me:$LINENO: checking for freetype/freetype.h" >&5
--echo $ECHO_N "checking for freetype/freetype.h... $ECHO_C" >&6; }
-+ { echo "$as_me:$LINENO: checking for freetype.h" >&5
-+echo $ECHO_N "checking for freetype.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_freetype_freetype_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ # Check for system-dependent libraries X programs must link with.
+ # Do this before checking for the system-independent R6 libraries
+@@ -24637,15 +24582,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
-@@ -32262,7 +32262,7 @@
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ldps $LIBS"
++LIBS="-ldps $LIBDPS_XT $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
- $FT2BUILD_H
--#include <freetype/freetype.h>
-+#include <freetype.h>
- _ACEOF
- rm -f conftest.$ac_objext
- if { (ac_try="$ac_compile"
-@@ -34050,7 +34050,7 @@
- #define MagickLibConfigSubDir "$MagickLibConfigSubDir"
- _ACEOF
+@@ -27095,7 +27041,7 @@
+ #
+
+ # Subdirectory under lib to place GraphicsMagick lib files
+-MagickLibSubdir="${PACKAGE_NAME}-${PACKAGE_VERSION}"
++MagickLibSubdir="${PACKAGE_NAME}"
+
+ cat >>confdefs.h <<_ACEOF
+ #define MagickLibSubdir "$MagickLibSubdir"
+@@ -27199,7 +27145,7 @@
--MagickLibConfigPath="${LIB_DIR}/${MagickLibConfigSubDir}"
-+MagickLibConfigPath="${DATA_DIR}/GraphicsMagick/config"
- MagickLibConfigPathDefine="${MagickLibConfigPath}/"
- if test "$native_win32_build" = 'yes'
- then
-@@ -34108,7 +34108,7 @@
#
# Path to GraphicsMagick share files
- MagickShareSubdir="${PACKAGE_NAME}-${PACKAGE_VERSION}"
--MagickSharePath="${DATA_DIR}/${MagickShareSubdir}"
-+MagickSharePath="${DATA_DIR}/GraphicsMagick/"
+-MagickShareSubdir="${PACKAGE_NAME}-${PACKAGE_VERSION}"
++MagickShareSubdir="${PACKAGE_NAME}"
+ MagickSharePath="${DATA_DIR}/${MagickShareSubdir}"
MagickSharePathDefine="${MagickSharePath}/"
- if test "$native_win32_build" = 'yes'
- then
-@@ -34128,7 +34128,7 @@
- #define MagickShareConfigSubDir "$MagickShareConfigSubDir"
- _ACEOF
-
--MagickShareConfigPath="${DATA_DIR}/${MagickShareConfigSubDir}"
-+MagickShareConfigPath="${MagickLibConfigPath}"
- MagickShareConfigPathDefine="${MagickShareConfigPath}/"
- if test "$native_win32_build" = 'yes'
- then
+ case "${build_os}" in