cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to ImageMagick-6.9.3-7

Browse Source
This commit is contained in:
sthen 2016-03-08 00:27:03 +00:00
parent 6601e25912
commit c2d741bb07
8 changed files with 55 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
graphics/ImageMagick/Makefile
View File

@ -1,18 +1,18 @@
# $OpenBSD: Makefile,v 1.141 2016/01/07 23:44:09 sthen Exp $
# $OpenBSD: Makefile,v 1.142 2016/03/08 00:27:03 sthen Exp $
SHARED_ONLY= Yes
COMMENT= image processing tools
VER= 6.9.3
DASHVER= 0
DASHVER= 7
DISTNAME= ImageMagick-${VER}-${DASHVER}
PKGNAME= ImageMagick-${VER}.${DASHVER}
EXTRACT_SUFX= .tar.xz
SHARED_LIBS += MagickCore-6.Q16 2.0 # 2.0
SHARED_LIBS += MagickWand-6.Q16 1.1 # 2.0
SHARED_LIBS += Magick++-6.Q16 2.0 # 6.0
SHARED_LIBS += Magick++-6.Q16 3.0 # 6.0
CATEGORIES= graphics

4
graphics/ImageMagick/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (ImageMagick-6.9.3-0.tar.xz) = K6BlbrA9ctikTnQerVJOjDQJdBjAu1SHpcT0/l7KllY=
SIZE (ImageMagick-6.9.3-0.tar.xz) = 8767896
SHA256 (ImageMagick-6.9.3-7.tar.xz) = ZzHEFLW5OXE6c6CIhA7WjCLJHRM1UU0ijWaH0Hzi4cg=
SIZE (ImageMagick-6.9.3-7.tar.xz) = 8782808

20
graphics/ImageMagick/patches/patch-configure_ac
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure_ac,v 1.10 2015/11/06 20:37:21 sthen Exp $
--- configure.ac.orig Sat Oct 31 12:18:20 2015
+++ configure.ac Fri Nov 6 16:01:48 2015
@@ -1317,7 +1317,7 @@ fi
$OpenBSD: patch-configure_ac,v 1.11 2016/03/08 00:27:03 sthen Exp $
--- configure.ac.orig Sun Mar 6 14:20:31 2016
+++ configure.ac Mon Mar 7 14:19:31 2016
@@ -1327,7 +1327,7 @@ fi
# Assume that delegate headers reside under same directory as ImageMagick
# installation prefix.
@ -10,7 +10,7 @@ $OpenBSD: patch-configure_ac,v 1.10 2015/11/06 20:37:21 sthen Exp $
#
# Find the X11 RGB database
@@ -2741,7 +2741,7 @@ AC_SUBST([PERLMAINCC])
@@ -2783,7 +2783,7 @@ AC_SUBST([PERLMAINCC])
#
# Path to ImageMagick header files
@ -19,16 +19,16 @@ $OpenBSD: patch-configure_ac,v 1.10 2015/11/06 20:37:21 sthen Exp $
INCLUDE_PATH="${INCLUDE_DIR}/${INCLUDE_RELATIVE_PATH}"
DEFINE_INCLUDE_PATH="${INCLUDE_DIR}/${INCLUDE_RELATIVE_PATH}/"
case "${build_os}" in
@@ -2764,7 +2764,7 @@ AC_DEFINE_UNQUOTED(INCLUDEARCH_PATH,"$DEFINE_INCLUDE_P
@@ -2806,7 +2806,7 @@ AC_DEFINE_UNQUOTED(INCLUDEARCH_PATH,"$DEFINE_INCLUDE_P
AC_SUBST(INCLUDEARCH_PATH)
# Subdirectory under lib to place ImageMagick lib files
-LIBRARY_RELATIVE_PATH="${PACKAGE_NAME}-${PACKAGE_VERSION}"
+LIBRARY_RELATIVE_PATH="${PACKAGE_NAME}"
AC_DEFINE_UNQUOTED(LIBRARY_RELATIVE_PATH,"$LIBRARY_RELATIVE_PATH",[Subdirectory of lib where ImageMagick architecture dependent files are installed])
AC_DEFINE_UNQUOTED(LIBRARY_RELATIVE_PATH,"$LIBRARY_RELATIVE_PATH",[Subdirectory of lib where ImageMagick architecture dependent files are installed.])
# Path to ImageMagick bin directory
@@ -2855,7 +2855,7 @@ AC_SUBST(FILTER_PATH)
@@ -2897,7 +2897,7 @@ AC_SUBST(FILTER_PATH)
#
# Path to ImageMagick documentation files
@ -37,7 +37,7 @@ $OpenBSD: patch-configure_ac,v 1.10 2015/11/06 20:37:21 sthen Exp $
DOCUMENTATION_PATH="${DOC_DIR}/${DOCUMENTATION_RELATIVE_PATH}"
DEFINE_DOCUMENTATION_PATH="${DOC_DIR}/${DOCUMENTATION_RELATIVE_PATH}/"
case "${build_os}" in
@@ -2875,7 +2875,7 @@ AC_ARG_ENABLE([docs],
@@ -2917,7 +2917,7 @@ AC_ARG_ENABLE([docs],
AM_CONDITIONAL([INSTALL_DOC], [test "$wantdocs" = "yes"])
# Subdirectory to place architecture-dependent configuration files
@ -46,7 +46,7 @@ $OpenBSD: patch-configure_ac,v 1.10 2015/11/06 20:37:21 sthen Exp $
AC_DEFINE_UNQUOTED(CONFIGURE_RELATIVE_PATH,"$CONFIGURE_RELATIVE_PATH",[Subdirectory of lib where architecture-dependent configuration files live.])
CONFIGURE_PATH="${SYSCONF_DIR}/${CONFIGURE_RELATIVE_PATH}/"
DEFINE_CONFIGURE_PATH="${SYSCONF_DIR}/${CONFIGURE_RELATIVE_PATH}/"
@@ -2888,7 +2888,7 @@ AC_DEFINE_UNQUOTED(CONFIGURE_PATH,"$DEFINE_CONFIGURE_P
@@ -2930,7 +2930,7 @@ AC_DEFINE_UNQUOTED(CONFIGURE_PATH,"$DEFINE_CONFIGURE_P
AC_SUBST(CONFIGURE_PATH)
# Subdirectory to place architecture-independent configuration files

18
graphics/ImageMagick/patches/patch-magick_ImageMagick_pc_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-magick_ImageMagick_pc_in,v 1.3 2015/11/06 20:37:21 sthen Exp $
--- magick/ImageMagick.pc.in.orig Sat Oct 10 11:45:02 2015
+++ magick/ImageMagick.pc.in Fri Oct 30 00:14:29 2015
@@ -1,13 +1,13 @@
$OpenBSD: patch-magick_ImageMagick_pc_in,v 1.4 2016/03/08 00:27:03 sthen Exp $
--- magick/ImageMagick.pc.in.orig Sun Mar 6 14:20:31 2016
+++ magick/ImageMagick.pc.in Mon Mar 7 14:21:58 2016
@@ -1,8 +1,8 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
@ -12,9 +12,11 @@ $OpenBSD: patch-magick_ImageMagick_pc_in,v 1.3 2015/11/06 20:37:21 sthen Exp $
libname=MagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@
Name: ImageMagick
Description: ImageMagick - Convert, Edit, and Compose Images (ABI @MAGICK_ABI_SUFFIX@)
@@ -10,5 +10,5 @@ Description: ImageMagick - convert, edit, and compose
URL: https://www.imagemagick.org
Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -l${libname}
+Libs: -L${libdir} -L${X11BASE}/lib -l${libname}
Libs.private: -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@
Cflags: -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@
-Libs: -L${libdir} -l${libname}
-Libs.private: -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@
+Libs: -L${X11BASE}/lib -L${libdir} -l${libname}
+Libs.private: -L${X11BASE}/lib -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@

19
graphics/ImageMagick/patches/patch-magick_MagickCore_pc_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-magick_MagickCore_pc_in,v 1.3 2015/11/06 20:37:21 sthen Exp $
--- magick/MagickCore.pc.in.orig Sat Oct 10 11:45:02 2015
+++ magick/MagickCore.pc.in Fri Oct 30 00:14:21 2015
@@ -1,14 +1,14 @@
$OpenBSD: patch-magick_MagickCore_pc_in,v 1.4 2016/03/08 00:27:03 sthen Exp $
--- magick/MagickCore.pc.in.orig Sun Mar 6 14:20:31 2016
+++ magick/MagickCore.pc.in Mon Mar 7 14:22:13 2016
@@ -1,8 +1,8 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
@ -12,10 +12,11 @@ $OpenBSD: patch-magick_MagickCore_pc_in,v 1.3 2015/11/06 20:37:21 sthen Exp $
libname=MagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@
moduledir=@libdir@/ImageMagick-@MAGICK_MAJOR_VERSION@.@MAGICK_MINOR_VERSION@.@MAGICK_MICRO_VERSION@/modules-@MAGICK_ABI_SUFFIX@
Name: MagickCore
Description: MagickCore - C API for ImageMagick (ABI @MAGICK_ABI_SUFFIX@)
@@ -11,5 +11,5 @@ Description: MagickCore - C API for ImageMagick (ABI @
URL: https://www.imagemagick.org
Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -l${libname}
+Libs: -L${libdir} -L${X11BASE}/lib -l${libname}
Libs.private: -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@
Cflags: -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@
-Libs: -L${libdir} -l${libname}
-Libs.private: -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@
+Libs: -L${X11BASE}/lib -L${libdir} -l${libname}
+Libs.private: -L${X11BASE}/lib -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@

16
graphics/ImageMagick/patches/patch-wand_MagickWand_pc_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-wand_MagickWand_pc_in,v 1.4 2015/11/06 20:37:21 sthen Exp $
--- wand/MagickWand.pc.in.orig Sat Oct 10 11:45:02 2015
+++ wand/MagickWand.pc.in Fri Oct 30 00:14:41 2015
@@ -1,14 +1,14 @@
$OpenBSD: patch-wand_MagickWand_pc_in,v 1.5 2016/03/08 00:27:03 sthen Exp $
--- wand/MagickWand.pc.in.orig Sun Mar 6 14:20:31 2016
+++ wand/MagickWand.pc.in Mon Mar 7 14:21:29 2016
@@ -1,8 +1,8 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
@ -12,11 +12,11 @@ $OpenBSD: patch-wand_MagickWand_pc_in,v 1.4 2015/11/06 20:37:21 sthen Exp $
libname=MagickWand-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@
Name: MagickWand
Description: MagickWand - C API for ImageMagick (ABI @MAGICK_ABI_SUFFIX@)
@@ -11,5 +11,5 @@ URL: https://www.imagemagick.org
Version: @PACKAGE_VERSION@
Requires: MagickCore
Cflags: -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@
-Libs: -L${libdir} -l${libname}
-Libs.private: -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@
+Libs: -L${libdir} -L${X11BASE}/lib -l${libname}
+Libs.private: -L${libdir} -L${X11BASE}/lib -l${libname} @MAGICK_LIBS@ @MATH_LIBS@
Cflags: -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@
+Libs: -L${X11BASE}/lib -L${libdir} -l${libname}
+Libs.private: -L${X11BASE}/lib -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@

16
graphics/ImageMagick/patches/patch-wand_Wand_pc_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-wand_Wand_pc_in,v 1.4 2015/11/06 20:37:21 sthen Exp $
--- wand/Wand.pc.in.orig Sat Oct 10 11:45:02 2015
+++ wand/Wand.pc.in Fri Oct 30 00:14:35 2015
@@ -1,14 +1,14 @@
$OpenBSD: patch-wand_Wand_pc_in,v 1.5 2016/03/08 00:27:03 sthen Exp $
--- wand/Wand.pc.in.orig Sun Mar 6 14:20:31 2016
+++ wand/Wand.pc.in Mon Mar 7 14:21:02 2016
@@ -1,8 +1,8 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
@ -12,11 +12,11 @@ $OpenBSD: patch-wand_Wand_pc_in,v 1.4 2015/11/06 20:37:21 sthen Exp $
libname=MagickWand-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@
Name: MagickWand
Description: MagickCore - C API for ImageMagick (ABI @MAGICK_ABI_SUFFIX@)
@@ -11,5 +11,5 @@ URL: https://www.imagemagick.org
Version: @PACKAGE_VERSION@
Requires: MagickCore
Cflags: -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@
-Libs: -L${libdir} -l${libname}
-Libs.private: -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@
+Libs: -L${libdir} -L${X11BASE}/lib -l${libname}
+Libs.private: -L${libdir} -L${X11BASE}/lib -l${libname} @MAGICK_LIBS@ @MATH_LIBS@
Cflags: -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@
+Libs: -L${X11BASE}/lib -L${libdir} -l${libname}
+Libs.private: -L${X11BASE}/lib -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@

5
graphics/ImageMagick/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.48 2016/01/07 23:44:09 sthen Exp $
@comment $OpenBSD: PLIST,v 1.49 2016/03/08 00:27:03 sthen Exp $
@conflict p5-PerlMagick-*
@pkgpath graphics/ImageMagick,no_x11
bin/Magick++-config
@ -350,6 +350,7 @@ share/doc/ImageMagick/www/Magick++/Exception.html
share/doc/ImageMagick/www/Magick++/FormatCharacters.html
share/doc/ImageMagick/www/Magick++/Future.html
share/doc/ImageMagick/www/Magick++/Geometry.html
share/doc/ImageMagick/www/Magick++/Image++.html
share/doc/ImageMagick/www/Magick++/Image.fig
share/doc/ImageMagick/www/Magick++/Image.html
share/doc/ImageMagick/www/Magick++/Image.png
@ -379,6 +380,7 @@ share/doc/ImageMagick/www/advanced-windows-installation.html
share/doc/ImageMagick/www/animate.html
share/doc/ImageMagick/www/api/
share/doc/ImageMagick/www/api.html
share/doc/ImageMagick/www/api/Image++.html
share/doc/ImageMagick/www/api/MagickCore/
share/doc/ImageMagick/www/api/MagickCore/ImageMagick_8h-source.html
share/doc/ImageMagick/www/api/MagickCore/ImageMagick_8h.html
@ -1121,6 +1123,7 @@ share/doc/ImageMagick/www/api/image-view.html
share/doc/ImageMagick/www/api/image.html
share/doc/ImageMagick/www/api/layer.html
share/doc/ImageMagick/www/api/list.html
share/doc/ImageMagick/www/api/magick++-classes.html
share/doc/ImageMagick/www/api/magick-deprecate.html
share/doc/ImageMagick/www/api/magick-image.html
share/doc/ImageMagick/www/api/magick-property.html