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

update to ImageMagick-6.9.10-62

Browse Source
This commit is contained in:
sthen 2019-08-31 15:20:15 +00:00
parent 84bf7220d8
commit c27fb33376
10 changed files with 31 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
graphics/ImageMagick/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.192 2019/08/19 15:27:10 sthen Exp $
# $OpenBSD: Makefile,v 1.193 2019/08/31 15:20:15 sthen Exp $
COMMENT= image processing tools
VER= 6.9.10
DASHVER= 61
DASHVER= 62
DISTNAME= ImageMagick-${VER}-${DASHVER}
PKGNAME= ImageMagick-${VER}.${DASHVER}
PORTROACH= site:https://www.imagemagick.org/download/ limit:6.*

4
graphics/ImageMagick/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (ImageMagick-6.9.10-61.tar.xz) = iAPgT1eVmqVE9GF3O567dGbFWImbRcuyyOg3XzbHIgQ=
SIZE (ImageMagick-6.9.10-61.tar.xz) = 8948128
SHA256 (ImageMagick-6.9.10-62.tar.xz) = 8uY9Q7jiSap+3VTNL4QQNdMiPF/bvIEvE0ILJwyWh9Y=
SIZE (ImageMagick-6.9.10-62.tar.xz) = 8954000

8
graphics/ImageMagick/patches/patch-Magick++_lib_ImageMagick++_pc_in
View File

@ -1,6 +1,8 @@
$OpenBSD: patch-Magick++_lib_ImageMagick++_pc_in,v 1.4 2015/11/06 20:37:21 sthen Exp $
--- Magick++/lib/ImageMagick++.pc.in.orig Sat Oct 10 11:45:02 2015
+++ Magick++/lib/ImageMagick++.pc.in Fri Oct 30 00:14:49 2015
$OpenBSD: patch-Magick++_lib_ImageMagick++_pc_in,v 1.5 2019/08/31 15:20:15 sthen Exp $
Index: Magick++/lib/ImageMagick++.pc.in
--- Magick++/lib/ImageMagick++.pc.in.orig
+++ Magick++/lib/ImageMagick++.pc.in
@@ -1,14 +1,14 @@
prefix=@prefix@
exec_prefix=@exec_prefix@

8
graphics/ImageMagick/patches/patch-Magick++_lib_Magick++_pc_in
View File

@ -1,6 +1,8 @@
$OpenBSD: patch-Magick++_lib_Magick++_pc_in,v 1.4 2015/11/06 20:37:21 sthen Exp $
--- Magick++/lib/Magick++.pc.in.orig Sat Oct 10 11:45:02 2015
+++ Magick++/lib/Magick++.pc.in Fri Oct 30 00:14:55 2015
$OpenBSD: patch-Magick++_lib_Magick++_pc_in,v 1.5 2019/08/31 15:20:15 sthen Exp $
Index: Magick++/lib/Magick++.pc.in
--- Magick++/lib/Magick++.pc.in.orig
+++ Magick++/lib/Magick++.pc.in
@@ -1,14 +1,14 @@
prefix=@prefix@
exec_prefix=@exec_prefix@

2
graphics/ImageMagick/patches/patch-config_policy_xml
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-config_policy_xml,v 1.4 2018/11/06 22:27:13 sthen Exp $
$OpenBSD: patch-config_policy_xml,v 1.5 2019/08/31 15:20:15 sthen Exp $
As recommended in http://www.openwall.com/lists/oss-security/2018/08/21/2
plus followups.

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

@ -1,8 +1,9 @@
$OpenBSD: patch-configure_ac,v 1.20 2019/05/29 12:16:10 sthen Exp $
$OpenBSD: patch-configure_ac,v 1.21 2019/08/31 15:20:15 sthen Exp $
Index: configure.ac
--- configure.ac.orig
+++ configure.ac
@@ -1338,7 +1338,7 @@ fi
@@ -1340,7 +1340,7 @@ fi
# Assume that delegate headers reside under same directory as ImageMagick
# installation prefix.
@ -11,7 +12,7 @@ Index: configure.ac
#
# Find the X11 RGB database
@@ -2972,7 +2972,7 @@ AC_SUBST([PERLMAINCC])
@@ -2974,7 +2974,7 @@ AC_SUBST([PERLMAINCC])
#
# Path to ImageMagick header files
@ -20,7 +21,7 @@ Index: configure.ac
INCLUDE_PATH="${INCLUDE_DIR}/${INCLUDE_RELATIVE_PATH}"
DEFINE_INCLUDE_PATH="${INCLUDE_DIR}/${INCLUDE_RELATIVE_PATH}/"
case "${build_os}" in
@@ -2995,7 +2995,7 @@ AC_DEFINE_UNQUOTED(INCLUDEARCH_PATH,"$DEFINE_INCLUDE_P
@@ -2997,7 +2997,7 @@ AC_DEFINE_UNQUOTED(INCLUDEARCH_PATH,"$DEFINE_INCLUDE_P
AC_SUBST(INCLUDEARCH_PATH)
# Subdirectory under lib to place ImageMagick lib files
@ -29,7 +30,7 @@ Index: configure.ac
AC_DEFINE_UNQUOTED(LIBRARY_RELATIVE_PATH,"$LIBRARY_RELATIVE_PATH",[Subdirectory of lib where ImageMagick architecture dependent files are installed.])
# Path to ImageMagick bin directory
@@ -3086,7 +3086,7 @@ AC_SUBST(FILTER_PATH)
@@ -3088,7 +3088,7 @@ AC_SUBST(FILTER_PATH)
#
# Path to ImageMagick documentation files
@ -38,7 +39,7 @@ Index: configure.ac
DOCUMENTATION_PATH="${DOC_DIR}/${DOCUMENTATION_RELATIVE_PATH}"
DEFINE_DOCUMENTATION_PATH="${DOC_DIR}/${DOCUMENTATION_RELATIVE_PATH}/"
case "${build_os}" in
@@ -3106,7 +3106,7 @@ AC_ARG_ENABLE([docs],
@@ -3108,7 +3108,7 @@ AC_ARG_ENABLE([docs],
AM_CONDITIONAL([INSTALL_DOC], [test "$wantdocs" = "yes"])
# Subdirectory to place architecture-dependent configuration files
@ -47,7 +48,7 @@ Index: configure.ac
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}/"
@@ -3119,7 +3119,7 @@ AC_DEFINE_UNQUOTED(CONFIGURE_PATH,"$DEFINE_CONFIGURE_P
@@ -3121,7 +3121,7 @@ AC_DEFINE_UNQUOTED(CONFIGURE_PATH,"$DEFINE_CONFIGURE_P
AC_SUBST(CONFIGURE_PATH)
# Subdirectory to place architecture-independent configuration files

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

@ -1,4 +1,5 @@
$OpenBSD: patch-magick_ImageMagick_pc_in,v 1.5 2018/05/21 21:12:48 sthen Exp $
$OpenBSD: patch-magick_ImageMagick_pc_in,v 1.6 2019/08/31 15:20:15 sthen Exp $
Index: magick/ImageMagick.pc.in
--- magick/ImageMagick.pc.in.orig
+++ magick/ImageMagick.pc.in

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

@ -1,4 +1,5 @@
$OpenBSD: patch-magick_MagickCore_pc_in,v 1.5 2018/05/21 21:12:48 sthen Exp $
$OpenBSD: patch-magick_MagickCore_pc_in,v 1.6 2019/08/31 15:20:15 sthen Exp $
Index: magick/MagickCore.pc.in
--- magick/MagickCore.pc.in.orig
+++ magick/MagickCore.pc.in

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

@ -1,4 +1,5 @@
$OpenBSD: patch-wand_MagickWand_pc_in,v 1.7 2019/08/19 15:27:10 sthen Exp $
$OpenBSD: patch-wand_MagickWand_pc_in,v 1.8 2019/08/31 15:20:15 sthen Exp $
Index: wand/MagickWand.pc.in
--- wand/MagickWand.pc.in.orig
+++ wand/MagickWand.pc.in

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

@ -1,4 +1,5 @@
$OpenBSD: patch-wand_Wand_pc_in,v 1.6 2018/05/21 21:12:48 sthen Exp $
$OpenBSD: patch-wand_Wand_pc_in,v 1.7 2019/08/31 15:20:15 sthen Exp $
Index: wand/Wand.pc.in
--- wand/Wand.pc.in.orig
+++ wand/Wand.pc.in