summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--graphics/ImageMagick/Makefile17
-rw-r--r--graphics/ImageMagick/PLIST56
-rw-r--r--graphics/ImageMagick/distinfo6
-rw-r--r--graphics/p5-PerlMagick/Makefile16
4 files changed, 54 insertions, 41 deletions
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index e5179645146..81a006770d1 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -1,12 +1,23 @@
-# $NetBSD: Makefile,v 1.94 2003/03/29 12:41:13 jmmv Exp $
+# $NetBSD: Makefile,v 1.95 2003/04/15 11:11:50 mjl Exp $
+IM_MAJOR_VER= 5.5.6
+IM_MINOR_VER= NONE
+IM_MAJOR_LIB_VER= ${IM_MAJOR_VER}-Q16
+
+.if (${IM_MINOR_VER} != NONE)
DISTNAME= ImageMagick-${IM_MAJOR_VER}-${IM_MINOR_VER}
PKGNAME= ImageMagick-${IM_MAJOR_VER}.${IM_MINOR_VER}
+.else
+DISTNAME= ImageMagick-${IM_MAJOR_VER}
+PKGNAME= ImageMagick-${IM_MAJOR_VER}
+.endif
WRKSRC= ${WRKDIR}/ImageMagick-${IM_MAJOR_VER}
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.nluug.nl/pub/ImageMagick/ \
ftp://ftp.yggdrasil.com/mirrors/site/ftp.simplesystems.org/pub/ImageMagick/ \
ftp://ftp.fu-berlin.de/unix/X11/graphics/ImageMagick/ \
+ ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ \
+ ftp://ftp.fu-berlin.de/unix/X11/graphics/ImageMagick/ \
http://imagemagick.sourceforge.net/http/
EXTRACT_SUFX= .tar.bz2
@@ -18,9 +29,6 @@ DEPENDS+= mpeg2codec-1.2:../../graphics/mpeg2codec
CONFLICTS= geomview-[0-9]* # both have a program named 'animate'
-IM_MAJOR_VER= 5.5.3
-IM_MINOR_VER= 2
-
USE_BUILDLINK2= YES
USE_X11= YES
GNU_CONFIGURE= YES
@@ -28,6 +36,7 @@ USE_LIBTOOL= YES
LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
PLIST_SUBST+= IM_MAJOR_VER=${IM_MAJOR_VER}
+PLIST_SUBST+= IM_MAJOR_LIB_VER=${IM_MAJOR_LIB_VER}
.include "../../mk/bsd.prefs.mk"
diff --git a/graphics/ImageMagick/PLIST b/graphics/ImageMagick/PLIST
index 1836d6badb0..4359bdcd8ea 100644
--- a/graphics/ImageMagick/PLIST
+++ b/graphics/ImageMagick/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2003/01/03 23:04:36 wiz Exp $
+@comment $NetBSD: PLIST,v 1.9 2003/04/15 11:11:50 mjl Exp $
bin/Magick++-config
bin/Magick-config
bin/animate
@@ -45,7 +45,6 @@ include/magick/module.h
include/magick/monitor.h
include/magick/paint.h
include/magick/quantize.h
-include/magick/random.h
include/magick/registry.h
include/magick/render.h
include/magick/resource.h
@@ -56,26 +55,26 @@ include/magick/utility.h
include/magick/version.h
include/magick/widget.h
include/magick/xwindow.h
-lib/ImageMagick-${IM_MAJOR_VER}/colors.mgk
-lib/ImageMagick-${IM_MAJOR_VER}/delegates.mgk
-lib/ImageMagick-${IM_MAJOR_VER}/log.mgk
-lib/ImageMagick-${IM_MAJOR_VER}/magic.mgk
-lib/ImageMagick-${IM_MAJOR_VER}/type-ghostscript.mgk
-lib/ImageMagick-${IM_MAJOR_VER}/type-solaris.mgk
-lib/ImageMagick-${IM_MAJOR_VER}/type-windows.mgk
-lib/ImageMagick-${IM_MAJOR_VER}/type.mgk
+lib/ImageMagick-${IM_MAJOR_LIB_VER}/colors.mgk
+lib/ImageMagick-${IM_MAJOR_LIB_VER}/delegates.mgk
+lib/ImageMagick-${IM_MAJOR_LIB_VER}/log.mgk
+lib/ImageMagick-${IM_MAJOR_LIB_VER}/magic.mgk
+lib/ImageMagick-${IM_MAJOR_LIB_VER}/type-ghostscript.mgk
+lib/ImageMagick-${IM_MAJOR_LIB_VER}/type-solaris.mgk
+lib/ImageMagick-${IM_MAJOR_LIB_VER}/type-windows.mgk
+lib/ImageMagick-${IM_MAJOR_LIB_VER}/type.mgk
@exec ${MKDIR} %D/lib/ImageMagick-${IM_MAJOR_VER}/modules/coders
lib/libMagick++.a
lib/libMagick++.la
-lib/libMagick++-${IM_MAJOR_VER}.so
-lib/libMagick++-${IM_MAJOR_VER}.so.0
-lib/libMagick++-${IM_MAJOR_VER}.so.0.0
+lib/libMagick++-${IM_MAJOR_LIB_VER}.so
+lib/libMagick++-${IM_MAJOR_LIB_VER}.so.0
+lib/libMagick++-${IM_MAJOR_LIB_VER}.so.0.0
lib/libMagick++.so
lib/libMagick.a
lib/libMagick.la
-lib/libMagick-${IM_MAJOR_VER}.so
-lib/libMagick-${IM_MAJOR_VER}.so.0
-lib/libMagick-${IM_MAJOR_VER}.so.0.0
+lib/libMagick-${IM_MAJOR_LIB_VER}.so
+lib/libMagick-${IM_MAJOR_LIB_VER}.so.0
+lib/libMagick-${IM_MAJOR_LIB_VER}.so.0.0
lib/libMagick.so
man/man1/ImageMagick.1
man/man1/Magick++-config.1
@@ -94,28 +93,24 @@ man/man5/quantize.5
share/ImageMagick/Copyright.txt
share/ImageMagick/ImageMagick.html
share/ImageMagick/QuickStart.txt
-share/ImageMagick/images/authentica.jpg
-share/ImageMagick/images/ball.png
+share/ImageMagick/images/background.gif
share/ImageMagick/images/examples.jpg
-share/ImageMagick/images/home.png
share/ImageMagick/images/logo.png
share/ImageMagick/images/magick.png
-share/ImageMagick/images/magick_button_120x60.png
-share/ImageMagick/images/magick_button_88x31.png
-share/ImageMagick/images/magick_icon_16x16.png
-share/ImageMagick/images/magick_icon_32x32.png
-share/ImageMagick/images/magick_icons.ico
-share/ImageMagick/images/magick_small.png
-share/ImageMagick/images/mail.png
+share/ImageMagick/images/networkeleven.png
share/ImageMagick/images/pair.png
share/ImageMagick/images/promote.png
share/ImageMagick/images/right_triangle.png
share/ImageMagick/images/right_triangle_option.png
share/ImageMagick/images/screen.png
+share/ImageMagick/images/script.gif
+share/ImageMagick/images/sprite.png
+share/ImageMagick/images/star.png
+share/ImageMagick/images/top.jpg
+share/ImageMagick/images/twi.png
share/ImageMagick/www/Changelog.html
share/ImageMagick/www/Copyright.html
share/ImageMagick/www/FAQ.html
-share/ImageMagick/www/ImageMagick.html
share/ImageMagick/www/Magick++/Blob.html
share/ImageMagick/www/Magick++/Cache.fig
share/ImageMagick/www/Magick++/Cache.png
@@ -229,6 +224,7 @@ share/ImageMagick/www/quantize.html
share/ImageMagick/www/smile.c
share/ImageMagick/www/sponsor.html
share/ImageMagick/www/tools.html
+share/ImageMagick/www/utilities.html
share/ImageMagick/www/windows.html
@dirrm share/ImageMagick/www/api/types
@dirrm share/ImageMagick/www/api
@@ -236,8 +232,8 @@ share/ImageMagick/www/windows.html
@dirrm share/ImageMagick/www
@dirrm share/ImageMagick/images
@dirrm share/ImageMagick
-@dirrm lib/ImageMagick-${IM_MAJOR_VER}/modules/coders
-@dirrm lib/ImageMagick-${IM_MAJOR_VER}/modules
-@dirrm lib/ImageMagick-${IM_MAJOR_VER}
+@dirrm lib/ImageMagick-${IM_MAJOR_LIB_VER}/modules/coders
+@dirrm lib/ImageMagick-${IM_MAJOR_LIB_VER}/modules
+@dirrm lib/ImageMagick-${IM_MAJOR_LIB_VER}
@dirrm include/magick
@dirrm include/Magick++
diff --git a/graphics/ImageMagick/distinfo b/graphics/ImageMagick/distinfo
index 97591620624..e30d87a879c 100644
--- a/graphics/ImageMagick/distinfo
+++ b/graphics/ImageMagick/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2003/01/03 23:04:36 wiz Exp $
+$NetBSD: distinfo,v 1.13 2003/04/15 11:11:50 mjl Exp $
-SHA1 (ImageMagick-5.5.3-2.tar.bz2) = cb557cb06d9b9ed595b3910ac73efd65dc3f8f6b
-Size (ImageMagick-5.5.3-2.tar.bz2) = 3391584 bytes
+SHA1 (ImageMagick-5.5.6.tar.bz2) = 952695b25f53a11c1cf576f790a1d06299a750fb
+Size (ImageMagick-5.5.6.tar.bz2) = 3526303 bytes
diff --git a/graphics/p5-PerlMagick/Makefile b/graphics/p5-PerlMagick/Makefile
index 510679d812f..4baf5e49ba0 100644
--- a/graphics/p5-PerlMagick/Makefile
+++ b/graphics/p5-PerlMagick/Makefile
@@ -1,12 +1,23 @@
-# $NetBSD: Makefile,v 1.25 2003/03/29 12:41:19 jmmv Exp $
+# $NetBSD: Makefile,v 1.26 2003/04/15 11:11:50 mjl Exp $
+IM_MAJOR_VER= 5.5.6
+IM_MINOR_VER= NONE
+IM_MAJOR_LIB_VER= ${IM_MAJOR_VER}-Q16
+
+.if (${IM_MINOR_VER} != NONE)
DISTNAME= ImageMagick-${IM_MAJOR_VER}-${IM_MINOR_VER}
PKGNAME= p5-PerlMagick-${IM_MAJOR_VER}.${IM_MINOR_VER}
+.else
+DISTNAME= ImageMagick-${IM_MAJOR_VER}
+PKGNAME= p5-PerlMagick-${IM_MAJOR_VER}
+.endif
SVR4_PKGNAME= p5pma
WRKSRC= ${WRKDIR}/ImageMagick-${IM_MAJOR_VER}
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.nluug.nl/pub/ImageMagick/ \
ftp://ftp.yggdrasil.com/mirrors/site/ftp.simplesystems.org/pub/ImageMagick/ \
+ ftp://ftp.fu-berlin.de/unix/X11/graphics/ImageMagick/ \
+ ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ \
ftp://ftp.fu-berlin.de/unix/X11/graphics/ImageMagick/
EXTRACT_SUFX= .tar.bz2
@@ -18,9 +29,6 @@ DISTINFO_FILE= ${.CURDIR}/../../graphics/ImageMagick/distinfo
FILESDIR= ${.CURDIR}/../../graphics/ImageMagick/files
PATCHDIR= ${.CURDIR}/../../graphics/ImageMagick/patches
-IM_MAJOR_VER= 5.5.3
-IM_MINOR_VER= 2
-
USE_LIBTOOL= YES
LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-12 21:45:53 +0000