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

update to ImageMagick 6.3.0.0

Browse Source 
ok bernd@
This commit is contained in:
steven 2006-10-28 16:20:52 +00:00
parent 6ce4f3210c
commit c87b7ba076
8 changed files with 94 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
graphics/ImageMagick/Makefile
View File

@ -1,14 +1,14 @@
# $OpenBSD: Makefile,v 1.91 2006/08/02 10:10:35 espie Exp $
# $OpenBSD: Makefile,v 1.92 2006/10/28 16:20:52 steven Exp $
COMMENT= "image processing tools"
VER= 6.2.6
DASHVER= 1
VER= 6.3.0
DASHVER= 0
DISTNAME= ImageMagick-${VER}-${DASHVER}
PKGNAME= ImageMagick-${VER}.${DASHVER}
SHARED_LIBS= Magick++ 10.1 \
Magick 10.1 \
Wand 10.1
SHARED_LIBS= Magick++ 11.0 \
Magick 11.0 \
Wand 11.0
CATEGORIES= graphics
MAINTAINER= Bernd Ahlers <bernd@openbsd.org>
@ -18,7 +18,7 @@ HOMEPAGE= http://www.imagemagick.org
MASTER_SITES= ${HOMEPAGE}/download/ \
${MASTER_SITE_SOURCEFORGE:=imagemagick/}
# http://www.imagemagick.org/www/Copyright.html
# http://www.imagemagick.org/script/license.php
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes

8
graphics/ImageMagick/distinfo
View File

@ -1,4 +1,4 @@
MD5 (ImageMagick-6.2.6-1.tar.gz) = 7fade1360a407345ed614f39d42a5f9c
RMD160 (ImageMagick-6.2.6-1.tar.gz) = 9ea56a32785714428c0fcf5425cbc4f028fd2bca
SHA1 (ImageMagick-6.2.6-1.tar.gz) = 0b0c74df99d10bb150b4f5c8b4130d7b2939b95c
SIZE (ImageMagick-6.2.6-1.tar.gz) = 6390721
MD5 (ImageMagick-6.3.0-0.tar.gz) = a917b96f13abd7bef6dd26a516343092
RMD160 (ImageMagick-6.3.0-0.tar.gz) = 6a4601037b6d45d7ff389f3168a856666eb47e2c
SHA1 (ImageMagick-6.3.0-0.tar.gz) = f4a6461fe9ac47d180e54057bef63061a39cd4df
SIZE (ImageMagick-6.3.0-0.tar.gz) = 6536999

29
graphics/ImageMagick/patches/patch-Makefile_in Normal file
View File

@ -0,0 +1,29 @@
$OpenBSD: patch-Makefile_in,v 1.6 2006/10/28 16:20:52 steven Exp $
--- Makefile.in.orig Sat Oct 14 21:21:05 2006
+++ Makefile.in Sat Oct 21 12:48:09 2006
@@ -246,6 +246,7 @@ DIST_COMMON = $(am__configure_deps) $(am
$(top_srcdir)/utilities/import.1.in \
$(top_srcdir)/utilities/mogrify.1.in \
$(top_srcdir)/utilities/montage.1.in \
+ $(top_srcdir)/utilities/stream.1.in \
$(top_srcdir)/wand/Wand-config.in \
$(top_srcdir)/wand/Wand.pc.in \
$(top_srcdir)/wand/wand-config.h.in $(wandinc_HEADERS) AUTHORS \
@@ -277,7 +278,7 @@ CONFIG_CLEAN_FILES = config/delegates.xm
utilities/composite.1 utilities/conjure.1 utilities/convert.1 \
utilities/display.1 utilities/identify.1 \
utilities/ImageMagick.1 utilities/import.1 utilities/mogrify.1 \
- utilities/montage.1 wand/Wand-config wand/Wand.pc
+ utilities/montage.1 utilities/stream.1 wand/Wand-config wand/Wand.pc
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -4780,6 +4781,8 @@ utilities/import.1: $(top_builddir)/conf
utilities/mogrify.1: $(top_builddir)/config.status $(top_srcdir)/utilities/mogrify.1.in
cd $(top_builddir) && $(SHELL) ./config.status $@
utilities/montage.1: $(top_builddir)/config.status $(top_srcdir)/utilities/montage.1.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
+utilities/stream.1: $(top_builddir)/config.status $(top_srcdir)/utilities/stream.1.in
cd $(top_builddir) && $(SHELL) ./config.status $@
wand/Wand-config: $(top_builddir)/config.status $(top_srcdir)/wand/Wand-config.in
cd $(top_builddir) && $(SHELL) ./config.status $@

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

@ -1,7 +1,7 @@
$OpenBSD: patch-configure_ac,v 1.3 2006/02/06 22:10:24 bernd Exp $
--- configure.ac.orig Fri Jan 27 02:20:07 2006
+++ configure.ac Fri Feb 3 13:45:01 2006
@@ -352,9 +352,9 @@ AM_CONDITIONAL(WITH_MODULES, test "$with
$OpenBSD: patch-configure_ac,v 1.4 2006/10/28 16:20:52 steven Exp $
--- configure.ac.orig Tue Oct 10 18:47:49 2006
+++ configure.ac Sat Oct 21 13:08:37 2006
@@ -350,9 +350,9 @@ AM_CONDITIONAL(WITH_MODULES, test "$with
# Enable building/use of libltdl if we are building shared libraries regardless
# of whether modules are built or not.
with_ltdl='no'
@ -14,7 +14,7 @@ $OpenBSD: patch-configure_ac,v 1.3 2006/02/06 22:10:24 bernd Exp $
AM_CONDITIONAL(WITH_LTDL, test "$with_ltdl" != 'no')
if test "$with_ltdl" != 'no' ; then
@@ -1996,7 +1996,7 @@ AC_SUBST(PERLMAINCC)
@@ -1998,7 +1998,7 @@ AC_SUBST(PERLMAINCC)
#
# Subdirectory under lib to place ImageMagick lib files
@ -23,7 +23,7 @@ $OpenBSD: patch-configure_ac,v 1.3 2006/02/06 22:10:24 bernd Exp $
AC_DEFINE_UNQUOTED(MagickLibSubdir,"$MagickLibSubdir",Subdirectory of lib where ImageMagick architecture dependent files are installed)
# Path to ImageMagick bin directory
@@ -2059,7 +2059,7 @@ AC_SUBST(MagickFilterModulesPath)
@@ -2061,7 +2061,7 @@ AC_SUBST(MagickFilterModulesPath)
#
# Path to ImageMagick document files
@ -32,7 +32,7 @@ $OpenBSD: patch-configure_ac,v 1.3 2006/02/06 22:10:24 bernd Exp $
MagickDocumentPath="${DATA_DIR}/doc/${MagickDocumentSubdir}"
MagickDocumentPathDefine="${MagickDocumentPath}/"
if test "$native_win32_build" = 'yes'
@@ -2071,7 +2071,7 @@ AC_SUBST(MagickDocumentPath)
@@ -2073,7 +2073,7 @@ AC_SUBST(MagickDocumentPath)
#
# Path to ImageMagick share files
@ -41,3 +41,11 @@ $OpenBSD: patch-configure_ac,v 1.3 2006/02/06 22:10:24 bernd Exp $
MagickSharePath="${DATA_DIR}/${MagickShareSubdir}"
MagickSharePathDefine="${MagickSharePath}/"
if test "$native_win32_build" = 'yes'
@@ -2751,6 +2751,7 @@ AC_CONFIG_FILES( \
utilities/import.1 \
utilities/mogrify.1 \
utilities/montage.1 \
+ utilities/stream.1 \
wand/Wand-config \
wand/Wand.pc )

21
graphics/ImageMagick/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.33 2006/01/27 17:40:05 bernd Exp $
@comment $OpenBSD: PLIST,v 1.34 2006/10/28 16:20:52 steven Exp $
!%%no_x11%%
%%SHARED%%
bin/Magick++-config
@ -11,6 +11,7 @@ bin/convert
bin/identify
bin/mogrify
bin/montage
bin/stream
include/Magick++/
include/Magick++.h
include/Magick++/Blob.h
@ -59,6 +60,7 @@ include/magick/geometry.h
include/magick/hashmap.h
include/magick/identify.h
include/magick/image.h
include/magick/layer.h
include/magick/list.h
include/magick/locale_.h
include/magick/log.h
@ -90,6 +92,7 @@ include/magick/splay-tree.h
include/magick/statistic.h
include/magick/stream.h
include/magick/string_.h
include/magick/threshold.h
include/magick/timer.h
include/magick/token.h
include/magick/transform.h
@ -118,6 +121,7 @@ include/wand/mogrify.h
include/wand/montage.h
include/wand/pixel-iterator.h
include/wand/pixel-wand.h
include/wand/stream.h
include/wand/wand-config.h
lib/ImageMagick/
lib/ImageMagick/config/
@ -154,6 +158,7 @@ lib/pkgconfig/Wand.pc
@man man/man1/identify.1
@man man/man1/mogrify.1
@man man/man1/montage.1
@man man/man1/stream.1
share/ImageMagick/
share/ImageMagick/ChangeLog
share/ImageMagick/LICENSE
@ -162,31 +167,34 @@ share/ImageMagick/config/
share/ImageMagick/config/coder.xml
share/ImageMagick/config/log.xml
share/ImageMagick/config/magic.xml
share/ImageMagick/config/thresholds.xml
share/doc/ImageMagick/
share/doc/ImageMagick/images/
share/doc/ImageMagick/images/arc.png
share/doc/ImageMagick/images/background.jpg
share/doc/ImageMagick/images/black.png
share/doc/ImageMagick/images/button.gif
share/doc/ImageMagick/images/configure.jpg
share/doc/ImageMagick/images/devlib.gif
share/doc/ImageMagick/images/definitive-guide.png
share/doc/ImageMagick/images/difference.png
share/doc/ImageMagick/images/dogwaffle.jpg
share/doc/ImageMagick/images/donate.png
share/doc/ImageMagick/images/examples.jpg
share/doc/ImageMagick/images/frame.jpg
share/doc/ImageMagick/images/fuzzy-magick.png
share/doc/ImageMagick/images/georeviews.gif
share/doc/ImageMagick/images/granite.png
share/doc/ImageMagick/images/label.gif
share/doc/ImageMagick/images/logo.eps
share/doc/ImageMagick/images/logo.jpg
share/doc/ImageMagick/images/montage.jpg
share/doc/ImageMagick/images/navy.png
share/doc/ImageMagick/images/piechart.png
share/doc/ImageMagick/images/reconstruct.jpg
share/doc/ImageMagick/images/red-ball.png
share/doc/ImageMagick/images/red-circle.png
share/doc/ImageMagick/images/right.gif
share/doc/ImageMagick/images/rose-over.png
share/doc/ImageMagick/images/rose-sigmoidal.png
share/doc/ImageMagick/images/rose.jpg
share/doc/ImageMagick/images/rose.png
share/doc/ImageMagick/images/script.png
@ -194,6 +202,7 @@ share/doc/ImageMagick/images/smile.gif
share/doc/ImageMagick/images/sponsor.jpg
share/doc/ImageMagick/images/sprite.jpg
share/doc/ImageMagick/images/travelsur.gif
share/doc/ImageMagick/images/tricks.png
share/doc/ImageMagick/images/wand.ico
share/doc/ImageMagick/images/white-highlight.png
share/doc/ImageMagick/index.html
@ -261,12 +270,14 @@ share/doc/ImageMagick/www/api/enhance.html
share/doc/ImageMagick/www/api/exception.html
share/doc/ImageMagick/www/api/fx.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-attribute.html
share/doc/ImageMagick/www/api/magick-image.html
share/doc/ImageMagick/www/api/magick-wand.html
share/doc/ImageMagick/www/api/magick.html
share/doc/ImageMagick/www/api/memory.html
share/doc/ImageMagick/www/api/module.html
share/doc/ImageMagick/www/api/monitor.html
share/doc/ImageMagick/www/api/montage.html
share/doc/ImageMagick/www/api/paint.html
@ -283,6 +294,7 @@ share/doc/ImageMagick/www/api/signature.html
share/doc/ImageMagick/www/api/stream.html
share/doc/ImageMagick/www/api/transform.html
share/doc/ImageMagick/www/api/version.html
share/doc/ImageMagick/www/architecture.html
share/doc/ImageMagick/www/binary-releases.html
share/doc/ImageMagick/www/changelog.html
share/doc/ImageMagick/www/color.html
@ -299,6 +311,8 @@ share/doc/ImageMagick/www/display.html
share/doc/ImageMagick/www/download.html
share/doc/ImageMagick/www/examples.html
share/doc/ImageMagick/www/formats.html
share/doc/ImageMagick/www/fx.html
share/doc/ImageMagick/www/history.html
share/doc/ImageMagick/www/identify.html
share/doc/ImageMagick/www/import.html
share/doc/ImageMagick/www/index.html
@ -318,4 +332,5 @@ share/doc/ImageMagick/www/quantize.html
share/doc/ImageMagick/www/resources.html
share/doc/ImageMagick/www/search.html
share/doc/ImageMagick/www/sponsors.html
share/doc/ImageMagick/www/stream.html
share/doc/ImageMagick/www/subversion.html

14
graphics/p5-PerlMagick/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.13 2006/08/03 12:53:18 espie Exp $
# $OpenBSD: Makefile,v 1.14 2006/10/28 16:20:52 steven Exp $
SHARED_ONLY= Yes
COMMENT= "object-oriented Perl interface to ImageMagick"
VER= 6.2.6
DASHVER= 1
VER= 6.3.0
DASHVER= 0
DISTNAME= ImageMagick-${VER}-${DASHVER}
PKGNAME= p5-PerlMagick-${VER}.${DASHVER}
CATEGORIES= graphics devel
@ -15,7 +15,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=imagemagick/}
MAINTAINER= Bernd Ahlers <bernd@openbsd.org>
# http://www.imagemagick.org/www/Copyright.html
# http://www.imagemagick.org/script/license.php
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
@ -24,7 +24,8 @@ WANTLIB= ICE SM X11 Xext bz2 freetype jasper jbig jpeg \
lcms m png tiff xml2 z Xt
RUN_DEPENDS= :ImageMagick-${VER}.${DASHVER}:graphics/ImageMagick
BUILD_DEPENDS= ${RUN_DEPENDS}
BUILD_DEPENDS= ${RUN_DEPENDS} \
::print/ghostscript/gnu:patch
LIB_DEPENDS= Magick.>=10::graphics/ImageMagick
USE_X11= Yes
CONFIGURE_STYLE= perl
@ -32,7 +33,10 @@ CONFIGURE_STYLE= perl
WRKDIST= ${WRKDIR}/${DISTNAME:S/-${DASHVER}$//}
WRKSRC= ${WRKDIST}/PerlMagick
CFLAGS+= -I${WRKDIR}
pre-configure:
@cd ${WRKDIR} && ln -s print/ghostscript/gnu/ghostscript-8.54-gpl/src ghostscript
@perl -pi -e 's|%%LOCALBASE%%|${LOCALBASE}|g; \
s|%%X11BASE%%|${X11BASE}|g; \
s|%%CFLAGS%%|${CFLAGS}|g;' ${WRKSRC}/Makefile.PL

8
graphics/p5-PerlMagick/distinfo
View File

@ -1,4 +1,4 @@
MD5 (ImageMagick-6.2.6-1.tar.gz) = 7fade1360a407345ed614f39d42a5f9c
RMD160 (ImageMagick-6.2.6-1.tar.gz) = 9ea56a32785714428c0fcf5425cbc4f028fd2bca
SHA1 (ImageMagick-6.2.6-1.tar.gz) = 0b0c74df99d10bb150b4f5c8b4130d7b2939b95c
SIZE (ImageMagick-6.2.6-1.tar.gz) = 6390721
MD5 (ImageMagick-6.3.0-0.tar.gz) = a917b96f13abd7bef6dd26a516343092
RMD160 (ImageMagick-6.3.0-0.tar.gz) = 6a4601037b6d45d7ff389f3168a856666eb47e2c
SHA1 (ImageMagick-6.3.0-0.tar.gz) = f4a6461fe9ac47d180e54057bef63061a39cd4df
SIZE (ImageMagick-6.3.0-0.tar.gz) = 6536999

16
graphics/p5-PerlMagick/patches/patch-PerlMagick_Makefile_PL
View File

@ -1,8 +1,8 @@
$OpenBSD: patch-PerlMagick_Makefile_PL,v 1.7 2006/01/27 17:40:05 bernd Exp $
--- PerlMagick/Makefile.PL.orig Wed Jan 18 20:39:17 2006
+++ PerlMagick/Makefile.PL Mon Jan 23 13:42:18 2006
$OpenBSD: patch-PerlMagick_Makefile_PL,v 1.8 2006/10/28 16:20:52 steven Exp $
--- PerlMagick/Makefile.PL.orig Sat Oct 14 21:45:43 2006
+++ PerlMagick/Makefile.PL Sat Oct 21 13:34:16 2006
@@ -44,13 +44,13 @@ WriteMakefile
'DEFINE' => ' -DHAVE_CONFIG_H', # e.g., '-DHAVE_SOMETHING'
'DEFINE' => ' -D_FILE_OFFSET_BITS=64 -DHAVE_CONFIG_H', # e.g., '-DHAVE_SOMETHING'
# Header search specfication and preprocessor flags
- 'INC' => '-I../ -I.. -I/usr/include/freetype2 -I/usr/include/libxml2',
@ -12,17 +12,17 @@ $OpenBSD: patch-PerlMagick_Makefile_PL,v 1.7 2006/01/27 17:40:05 bernd Exp $
# 'CPPFLAGS' => "$Config{'cppflags'} -I/usr/include/freetype2 -I/usr/include/libxml2",
# C compiler flags (e.g. -O -g)
- 'CCFLAGS' => "$Config{'ccflags'} -O3 -g -Wall -pthread",
- 'CCFLAGS' => "$Config{'ccflags'} -O3 -g -Wall -W -pthread",
+ 'CCFLAGS' => "$Config{'ccflags'} %%CFLAGS%%",
# Linker flags for building an executable
'LDFLAGS' => "-L/usr/lib $Config{'ldflags'}",
'LDFLAGS' => "-L../magick/.libs -lMagick $Config{'ldflags'}",
@@ -62,7 +62,7 @@ WriteMakefile
'INSTALLBIN' => '/usr/bin',
# Library specification
- 'LIBS' => ['-L/usr/lib -L../magick/.libs -lMagick -L/usr/lib64 -lfreetype -lz -L/usr/lib -llcms -ltiff -lfreetype -ljpeg -lpng -lXext -lXt -lSM -lICE -lX11 -lbz2 -lxml2 -lz -lpthread -lm -lpthread'],
+ 'LIBS' => ['-L%%LOCALBASE%%/lib -lMagick -L%%X11BASE%%/lib -ljbig -llcms -ltiff -lfreetype -ljasper -ljpeg -lpng -lXext -lXt -lSM -lICE -lX11 -lbz2 -lxml2 -lz -lm'],
- 'LIBS' => [ '-L/usr/lib -lfreetype -L/usr/lib -llcms -ltiff -lfreetype -ljpeg -lfontconfig -lXext -lSM -lICE -lX11 -lXt -lbz2 -lz -lpthread -lm -lpthread' ],
+ 'LIBS' => [ '-L%%LOCALBASE%%/lib -lMagick -L%%X11BASE%%/lib -ljbig -llcms -ltiff -lfreetype -ljasper -ljpeg -lpng -lXext -lXt -lSM -lICE -lX11 -lbz2 -lxml2 -lz -lm' ],
# Perl binary name (if a Perl binary is built)
'MAP_TARGET' => 'PerlMagick',