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

upgrade to ImageMagick 5.2.8

Browse Source
This commit is contained in:
brad 2001-02-05 15:58:08 +00:00
parent 58b160959a
commit d0f541b355
9 changed files with 267 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
graphics/ImageMagick/Makefile
View File

@ -1,6 +1,6 @@
# $OpenBSD: Makefile,v 1.45 2001/01/10 01:21:21 brad Exp $
# $OpenBSD: Makefile,v 1.46 2001/02/05 15:58:08 brad Exp $
DISTNAME= ImageMagick-5.2.5
DISTNAME= ImageMagick-5.2.8
CATEGORIES= graphics
NEED_VERSION= 1.336
MASTER_SITES= ftp://ftp.simplesystems.org/pub/ImageMagick/ \
@ -33,7 +33,8 @@ CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
CONFIGURE_ARGS+= --enable-static --enable-lzw --enable-16bit-pixel \
--without-perl --without-modules --without-dps \
--without-fpx --without-hdf --without-lcms
--without-fpx --without-hdf --without-lcms \
--without-ttf --without-wmf --without-threads
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"

6
graphics/ImageMagick/files/md5
View File

@ -1,3 +1,3 @@
MD5 (ImageMagick-5.2.5.tar.gz) = 5106e2c1912898aed8e166f2772d0071
RMD160 (ImageMagick-5.2.5.tar.gz) = 0373652a60acf0f25c5f9ce67250298c81120749
SHA1 (ImageMagick-5.2.5.tar.gz) = 3d31c2c5fa550e7816b6028d427630c92d5f45a7
MD5 (ImageMagick-5.2.8.tar.gz) = 5c860b6bce575da2123feaae1888827c
RMD160 (ImageMagick-5.2.8.tar.gz) = 57036f53035654d9f918a22f55b2cb28a1ec54d5
SHA1 (ImageMagick-5.2.8.tar.gz) = 7f2b5337de285f3b18842ae8afd880cac827640e

36
graphics/ImageMagick/patches/patch-ltcf-c.sh Normal file
View File

@ -0,0 +1,36 @@
--- ltcf-c.sh.orig Sun Feb 4 20:19:31 2001
+++ ltcf-c.sh Sun Feb 4 20:54:25 2001
@@ -47,6 +47,9 @@
with_gnu_ld=no
fi
;;
+openbsd*)
+ with_gnu_ld=no
+ ;;
esac
@@ -378,10 +381,21 @@
;;
openbsd*)
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
- hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
+ case "$host_os" in
+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_libdir_flag_spec='-R$libdir'
+ ;;
+ *)
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ if [ "`/usr/bin/file /usr/lib/libc.so.* | grep ELF`" != "" ]; then
+ export_dynamic_flag_spec='${wl}-E'
+ fi
+ ;;
+ esac
;;
os2*)

64
graphics/ImageMagick/patches/patch-ltcf-cxx.sh Normal file
View File

@ -0,0 +1,64 @@
--- ltcf-cxx.sh.orig Fri Nov 3 19:51:15 2000
+++ ltcf-cxx.sh Sun Feb 4 22:43:40 2001
@@ -54,6 +54,13 @@
compiler=$2
cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
+case "$host_os" in
+ openbsd*)
+ with_gnu_ld=no
+ ;;
+
+esac
+
# Check if we are using GNU gcc (taken/adapted from configure script)
# We need to check here since "--with-gcc" is set at configure time,
# not ltconfig time!
@@ -67,6 +74,7 @@
# Set up default GNU C++ configuration
+ if test "$with_gnu_ld" != no; then
# Check if GNU C++ uses GNU ld as the underlying linker, since the
# archiving commands below assume that GNU ld is being used.
if eval "`$CC -print-prog-name=ld` --version 2>&1" | \
@@ -91,6 +99,7 @@
else
whole_archive_flag_spec=
fi
+ fi
else
with_gnu_ld=no
wlarc=
@@ -300,6 +309,22 @@
netbsd*)
# NetBSD uses g++ - do we need to do anything?
;;
+ openbsd*)
+ case "$host_os" in
+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+ ld_shlibs=no
+ ;;
+ *)
+ wlarc='${wl}'
+ archive_cmds='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ output_verbose_link_cmds='$CC -shared $pic_flag $CFLAGS -v conftest.$objext 2>&1 | egrep "\-L"'
+ if [ "`/usr/bin/file /usr/lib/libc.so.* | grep ELF`" != "" ]; then
+ export_dynamic_flag_spec='${wl}-E'
+ fi
+ ;;
+ esac
+ ;;
osf3*)
if test "$with_gcc" = yes && test "$with_gnu_ld" = no; then
allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -695,6 +720,8 @@
esac
;;
netbsd*)
+ ;;
+ openbsd*)
;;
osf3* | osf4* | osf5*)
case "$cc_basename" in

13
graphics/ImageMagick/patches/patch-ltconfig
View File

@ -1,6 +1,13 @@
--- ltconfig.orig Thu Jul 13 10:26:28 2000
+++ ltconfig Mon Aug 21 10:33:58 2000
@@ -1704,6 +1704,7 @@
--- ltconfig.orig Sun Dec 10 19:02:22 2000
+++ ltconfig Sun Feb 4 20:19:04 2001
@@ -1126,13 +1126,10 @@
openbsd*)
version_type=sunos
- if test "$with_gnu_ld" = yes; then
- need_lib_prefix=no
- need_version=no
- fi
library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
shlibpath_var=LD_LIBRARY_PATH

27
graphics/ImageMagick/patches/patch-ltmain_sh
View File

@ -1,6 +1,27 @@
--- ltmain.sh.orig Thu Jul 13 10:26:33 2000
+++ ltmain.sh Mon Aug 21 10:33:58 2000
@@ -4279,40 +4279,6 @@
--- ltmain.sh.orig Sun Dec 10 19:02:22 2000
+++ ltmain.sh Sun Feb 4 20:53:38 2001
@@ -1097,6 +1097,10 @@
# These systems don't actually have c library (as such)
continue
;;
+ *-*-openbsd*)
+ # Do not include libc due to us having libc/libc_r.
+ continue
+ ;;
esac
elif test "$arg" = "-lm"; then
case "$host" in
@@ -2602,6 +2606,9 @@
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
# these systems don't actually have a c library (as such)!
;;
+ *-*-openbsd*)
+ # Do not include libc due to us having libc/libc_r.
+ ;;
*)
# Add libc to deplibs on all other systems if necessary.
if test $build_libtool_need_lc = "yes"; then
@@ -4505,40 +4512,6 @@
# Exit here if they wanted silent mode.
test "$show" = : && exit 0

12
graphics/ImageMagick/patches/patch-magick_magick_h
View File

@ -1,12 +0,0 @@
--- magick/magick.h.orig Fri Nov 3 19:09:26 2000
+++ magick/magick.h Wed Nov 29 23:04:47 2000
@@ -9,8 +9,8 @@
*/
#define __EXTENSIONS__ 1
#define _POSIX_C_SOURCE 199506L
+#ifndef __OpenBSD__
#define _XOPEN_SOURCE 500
-#ifndef __NetBSD__
#define _XOPEN_SOURCE_EXTENDED 1
#endif

5
graphics/ImageMagick/pkg/PFRAG.shared
View File

@ -1,3 +1,4 @@
@comment $OpenBSD: PFRAG.shared,v 1.5 2000/11/30 04:41:38 dugsong Exp $
lib/libMagick.so.5.25
@comment $OpenBSD: PFRAG.shared,v 1.6 2001/02/05 15:58:09 brad Exp $
lib/libMagick++.so.5.28
lib/libMagick.so.5.28
DYNLIBDIR(%B)

124
graphics/ImageMagick/pkg/PLIST
View File

@ -1,13 +1,31 @@
@comment $OpenBSD: PLIST,v 1.18 2000/07/25 07:17:00 brad Exp $
@comment $OpenBSD: PLIST,v 1.19 2001/02/05 15:58:09 brad Exp $
bin/Magick++-config
bin/Magick-config
bin/animate
bin/cgimagick
bin/combine
bin/convert
bin/display
bin/identify
bin/import
bin/iptcutil
bin/mogrify
bin/montage
include/Magick++.h
include/Magick++/Blob.h
include/Magick++/Coder.h
include/Magick++/Color.h
include/Magick++/Drawable.h
include/Magick++/Exception.h
include/Magick++/Functions.h
include/Magick++/Geometry.h
include/Magick++/Image.h
include/Magick++/Include.h
include/Magick++/Montage.h
include/Magick++/Options.h
include/Magick++/Pixels.h
include/Magick++/STL.h
include/Magick++/Thread.h
include/magick/PreRvIcccm.h
include/magick/api.h
include/magick/attributes.h
@ -18,6 +36,7 @@ include/magick/classify.h
include/magick/compress.h
include/magick/config.h
include/magick/delegates.h
include/magick/draw.h
include/magick/error.h
include/magick/gems.h
include/magick/image.h
@ -30,10 +49,14 @@ include/magick/utility.h
include/magick/version.h
include/magick/widget.h
include/magick/xwindows.h
lib/libMagick++.a
lib/libMagick++.la
lib/libMagick.a
lib/libMagick.la
%%SHARED%%
man/man1/ImageMagick.1
man/man1/Magick++-config.1
man/man1/Magick-config.1
man/man1/animate.1
man/man1/combine.1
man/man1/convert.1
@ -44,7 +67,106 @@ man/man1/mogrify.1
man/man1/montage.1
man/man4/miff.4
man/man5/quantize.5
share/ImageMagick/Copyright.txt
share/ImageMagick/ImageMagick.html
share/ImageMagick/QuickStart.txt
share/ImageMagick/delegates.mgk
share/ImageMagick/images/authentica.jpg
share/ImageMagick/images/ball.png
share/ImageMagick/images/corbis.png
share/ImageMagick/images/digital-applications.png
share/ImageMagick/images/examples.jpg
share/ImageMagick/images/home.png
share/ImageMagick/images/logo.png
share/ImageMagick/images/magick.png
share/ImageMagick/images/magick_small.png
share/ImageMagick/images/mail.png
share/ImageMagick/images/right_triangle.png
share/ImageMagick/images/right_triangle_option.png
share/ImageMagick/images/screen.png
share/ImageMagick/magic.mgk
share/ImageMagick/www/Changelog.html
share/ImageMagick/www/Magick.html
share/ImageMagick/www/animate.html
share/ImageMagick/www/api.html
share/ImageMagick/www/api/animate.html
share/ImageMagick/www/api/annotate.html
share/ImageMagick/www/api/attributes.html
share/ImageMagick/www/api/blob.html
share/ImageMagick/www/api/cache.html
share/ImageMagick/www/api/cache_view.html
share/ImageMagick/www/api/colors.html
share/ImageMagick/www/api/compress.html
share/ImageMagick/www/api/constitute.html
share/ImageMagick/www/api/decorate.html
share/ImageMagick/www/api/delegates.html
share/ImageMagick/www/api/display.html
share/ImageMagick/www/api/draw.html
share/ImageMagick/www/api/effects.html
share/ImageMagick/www/api/enhance.html
share/ImageMagick/www/api/error.html
share/ImageMagick/www/api/gems.html
share/ImageMagick/www/api/image.html
share/ImageMagick/www/api/mac.html
share/ImageMagick/www/api/magick.html
share/ImageMagick/www/api/memory.html
share/ImageMagick/www/api/monitor.html
share/ImageMagick/www/api/montage.html
share/ImageMagick/www/api/nt.html
share/ImageMagick/www/api/pixel_cache.html
share/ImageMagick/www/api/pixels.html
share/ImageMagick/www/api/quantize.html
share/ImageMagick/www/api/segment.html
share/ImageMagick/www/api/shear.html
share/ImageMagick/www/api/signature.html
share/ImageMagick/www/api/stream.html
share/ImageMagick/www/api/transform.html
share/ImageMagick/www/api/types/AnnotateInfo.html
share/ImageMagick/www/api/types/ChromaticityInfo.html
share/ImageMagick/www/api/types/ColorPacket.html
share/ImageMagick/www/api/types/DrawInfo.html
share/ImageMagick/www/api/types/Enumerations.html
share/ImageMagick/www/api/types/ExceptionInfo.html
share/ImageMagick/www/api/types/Image.html
share/ImageMagick/www/api/types/ImageAttribute.html
share/ImageMagick/www/api/types/ImageInfo.html
share/ImageMagick/www/api/types/MagickInfo.html
share/ImageMagick/www/api/types/PixelPacket.html
share/ImageMagick/www/api/types/PointInfo.html
share/ImageMagick/www/api/types/ProfileInfo.html
share/ImageMagick/www/api/types/RectangleInfo.html
share/ImageMagick/www/api/utility.html
share/ImageMagick/www/api/vms.html
share/ImageMagick/www/api/widget.html
share/ImageMagick/www/api/xwindows.html
share/ImageMagick/www/api/zoom.html
share/ImageMagick/www/archives.html
share/ImageMagick/www/cd.html
share/ImageMagick/www/color.html
share/ImageMagick/www/combine.html
share/ImageMagick/www/convert.html
share/ImageMagick/www/cvs.html
share/ImageMagick/www/display.html
share/ImageMagick/www/formats.html
share/ImageMagick/www/help.html
share/ImageMagick/www/identify.html
share/ImageMagick/www/import.html
share/ImageMagick/www/install.html
share/ImageMagick/www/magick-list.html
share/ImageMagick/www/miff.html
share/ImageMagick/www/mogrify.html
share/ImageMagick/www/montage.html
share/ImageMagick/www/new.html
share/ImageMagick/www/perl.html
share/ImageMagick/www/quantize.html
share/ImageMagick/www/smile.c
share/ImageMagick/www/sponsor.html
share/ImageMagick/www/tools.html
share/ImageMagick/www/xtp.html
@dirrm include/Magick++
@dirrm include/magick
@dirrm share/ImageMagick/images
@dirrm share/ImageMagick/www/api/types
@dirrm share/ImageMagick/www/api
@dirrm share/ImageMagick/www
@dirrm share/ImageMagick