Fri Aug 28 07:43:16 2009 UTC ()
Set DIST_SUBDIR for recent DISTFILE replacement, PR 41948.


(obache)
diff -r1.82 -r1.83 pkgsrc/graphics/ImageMagick/Makefile.common
diff -r1.98 -r1.99 pkgsrc/graphics/ImageMagick/distinfo
cvs diff -r1.82 -r1.83 pkgsrc/graphics/ImageMagick/Makefile.common (expand / switch to unified diff)

--- pkgsrc/graphics/ImageMagick/Makefile.common 2009/08/26 21:06:46 1.82
+++ pkgsrc/graphics/ImageMagick/Makefile.common 2009/08/28 07:43:16 1.83
@@ -1,36 +1,37 @@ @@ -1,36 +1,37 @@
1# $NetBSD: Makefile.common,v 1.82 2009/08/26 21:06:46 sno Exp $ 1# $NetBSD: Makefile.common,v 1.83 2009/08/28 07:43:16 obache Exp $
2 2
3########################################################################### 3###########################################################################
4# 4#
5# HEADS UP! NOTE THE FOLLOWING WHEN UPDATING THIS PACKAGE: 5# HEADS UP! NOTE THE FOLLOWING WHEN UPDATING THIS PACKAGE:
6# 6#
7# graphics/p5-PerlMagick also depends on this fragment. Make sure to 7# graphics/p5-PerlMagick also depends on this fragment. Make sure to
8# remove its PKGREVISION upon update of ImageMagick! 8# remove its PKGREVISION upon update of ImageMagick!
9# 9#
10########################################################################### 10###########################################################################
11 11
12IM_MAJOR_VER= 6.5.5 12IM_MAJOR_VER= 6.5.5
13IM_MINOR_VER= 3 13IM_MINOR_VER= 3
14IM_MAJOR_LIB_VER= ${IM_MAJOR_VER} 14IM_MAJOR_LIB_VER= ${IM_MAJOR_VER}
15 15
16.if (${IM_MINOR_VER} != NONE) 16.if (${IM_MINOR_VER} != NONE)
17DISTSUFFIX= ${IM_MAJOR_VER}-${IM_MINOR_VER} 17DISTSUFFIX= ${IM_MAJOR_VER}-${IM_MINOR_VER}
18.else 18.else
19DISTSUFFIX= ${IM_MAJOR_VER} 19DISTSUFFIX= ${IM_MAJOR_VER}
20.endif 20.endif
21 21
22DISTNAME= ImageMagick-${DISTSUFFIX} 22DISTNAME= ImageMagick-${DISTSUFFIX}
23DISTVERSION= ${DISTSUFFIX:S/-/./} 23DISTVERSION= ${DISTSUFFIX:S/-/./}
 24DIST_SUBDIR= ${DISTNAME}-20090827
24 25
25CATEGORIES= graphics 26CATEGORIES= graphics
26MASTER_SITES= ftp://ftp.imagemagick.net/pub/ImageMagick/ \ 27MASTER_SITES= ftp://ftp.imagemagick.net/pub/ImageMagick/ \
27 ftp://ftp.nluug.nl/pub/ImageMagick/ \ 28 ftp://ftp.nluug.nl/pub/ImageMagick/ \
28 ftp://ftp.yggdrasil.com/mirrors/site/ftp.simplesystems.org/pub/ImageMagick/ \ 29 ftp://ftp.yggdrasil.com/mirrors/site/ftp.simplesystems.org/pub/ImageMagick/ \
29 ftp://ftp.fu-berlin.de/unix/X11/graphics/ImageMagick/ \ 30 ftp://ftp.fu-berlin.de/unix/X11/graphics/ImageMagick/ \
30 ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ \ 31 ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ \
31 http://www.imagemagick.net/download/ 32 http://www.imagemagick.net/download/
32EXTRACT_SUFX= .tar.bz2 33EXTRACT_SUFX= .tar.bz2
33 34
34WRKSRC= ${WRKDIR}/ImageMagick-${DISTSUFFIX} 35WRKSRC= ${WRKDIR}/ImageMagick-${DISTSUFFIX}
35 36
36# For things for which we do not specify an explicit dependency above, disable 37# For things for which we do not specify an explicit dependency above, disable
cvs diff -r1.98 -r1.99 pkgsrc/graphics/ImageMagick/distinfo (expand / switch to unified diff)

--- pkgsrc/graphics/ImageMagick/distinfo 2009/08/27 17:52:55 1.98
+++ pkgsrc/graphics/ImageMagick/distinfo 2009/08/28 07:43:16 1.99
@@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
1$NetBSD: distinfo,v 1.98 2009/08/27 17:52:55 sno Exp $ 1$NetBSD: distinfo,v 1.99 2009/08/28 07:43:16 obache Exp $
2 2
3SHA1 (ImageMagick-6.5.5-3.tar.bz2) = dd1851a7805f91aae90c6dcd1db3e448704abeee 3SHA1 (ImageMagick-6.5.5-3-20090827/ImageMagick-6.5.5-3.tar.bz2) = dd1851a7805f91aae90c6dcd1db3e448704abeee
4RMD160 (ImageMagick-6.5.5-3.tar.bz2) = 3c8291b45317030f377bee332419686e2c27ab97 4RMD160 (ImageMagick-6.5.5-3-20090827/ImageMagick-6.5.5-3.tar.bz2) = 3c8291b45317030f377bee332419686e2c27ab97
5Size (ImageMagick-6.5.5-3.tar.bz2) = 8823928 bytes 5Size (ImageMagick-6.5.5-3-20090827/ImageMagick-6.5.5-3.tar.bz2) = 8823928 bytes