Sun Dec 3 11:09:46 2017 UTC ()
*: remove ftp.kddlabs.co.jp, does not provide ftp service


(wiz)
diff -r1.159 -r1.160 pkgsrc/graphics/ImageMagick/Makefile.common
diff -r1.11 -r1.12 pkgsrc/graphics/ImageMagick6/Makefile.common
diff -r1.3 -r1.4 pkgsrc/graphics/libfpx/Makefile
diff -r1.287 -r1.288 pkgsrc/mk/defaults/mk.conf
cvs diff -r1.159 -r1.160 pkgsrc/graphics/ImageMagick/Makefile.common (expand / switch to unified diff)

--- pkgsrc/graphics/ImageMagick/Makefile.common 2017/11/13 14:29:26 1.159
+++ pkgsrc/graphics/ImageMagick/Makefile.common 2017/12/03 11:09:46 1.160
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.159 2017/11/13 14:29:26 he Exp $ 1# $NetBSD: Makefile.common,v 1.160 2017/12/03 11:09:46 wiz Exp $
2# 2#
3# When updating this package, please upload the distfile 3# When updating this package, please upload the distfile
4# since they disappear immediately when new releases happen, 4# since they disappear immediately when new releases happen,
5# which is quite often. 5# which is quite often.
6# 6#
7# used by graphics/p5-PerlMagick/Makefile 7# used by graphics/p5-PerlMagick/Makefile
8 8
9IM_MAJOR_VER= 7.0.7 9IM_MAJOR_VER= 7.0.7
10IM_MINOR_VER= 11 10IM_MINOR_VER= 11
11IM_MAJOR_LIB_VER= 7 11IM_MAJOR_LIB_VER= 7
12 12
13.if (${IM_MINOR_VER} != NONE) 13.if (${IM_MINOR_VER} != NONE)
14DISTSUFFIX= ${IM_MAJOR_VER}-${IM_MINOR_VER} 14DISTSUFFIX= ${IM_MAJOR_VER}-${IM_MINOR_VER}
@@ -17,27 +17,26 @@ DISTSUFFIX= ${IM_MAJOR_VER} @@ -17,27 +17,26 @@ DISTSUFFIX= ${IM_MAJOR_VER}
17.endif 17.endif
18 18
19DISTNAME= ImageMagick-${DISTSUFFIX} 19DISTNAME= ImageMagick-${DISTSUFFIX}
20DISTVERSION= ${DISTSUFFIX:S/-/./} 20DISTVERSION= ${DISTSUFFIX:S/-/./}
21 21
22# 22#
23# Please always run `upload-distfiles' after every update! 23# Please always run `upload-distfiles' after every update!
24# (upstream usually get rid of old version and only the latest stable versions 24# (upstream usually get rid of old version and only the latest stable versions
25# are available in the mirrors) 25# are available in the mirrors)
26# 26#
27CATEGORIES= graphics 27CATEGORIES= graphics
28MASTER_SITES= ftp://ftp.imagemagick.org/pub/ImageMagick/ 28MASTER_SITES= ftp://ftp.imagemagick.org/pub/ImageMagick/
29MASTER_SITES+= ftp://ftp.nluug.nl/pub/ImageMagick/ 29MASTER_SITES+= ftp://ftp.nluug.nl/pub/ImageMagick/
30MASTER_SITES+= ftp://ftp.kddlabs.co.jp/graphics/ImageMagick/ 
31MASTER_SITES+= https://www.imagemagick.org/download/ 30MASTER_SITES+= https://www.imagemagick.org/download/
32EXTRACT_SUFX= .tar.xz 31EXTRACT_SUFX= .tar.xz
33 32
34HOMEPAGE= https://www.imagemagick.org/ 33HOMEPAGE= https://www.imagemagick.org/
35LICENSE= gnu-gpl-v3 34LICENSE= gnu-gpl-v3
36 35
37WRKSRC= ${WRKDIR}/ImageMagick-${DISTSUFFIX} 36WRKSRC= ${WRKDIR}/ImageMagick-${DISTSUFFIX}
38 37
39USE_LIBTOOL= yes 38USE_LIBTOOL= yes
40GNU_CONFIGURE= yes 39GNU_CONFIGURE= yes
41# For things for which we do not specify an explicit dependency above, disable 40# For things for which we do not specify an explicit dependency above, disable
42# so that we don't cause implicit "hidden" dependencies. 41# so that we don't cause implicit "hidden" dependencies.
43CONFIGURE_ARGS+= --without-dps 42CONFIGURE_ARGS+= --without-dps
cvs diff -r1.11 -r1.12 pkgsrc/graphics/ImageMagick6/Makefile.common (expand / switch to unified diff)

--- pkgsrc/graphics/ImageMagick6/Makefile.common 2017/10/30 15:08:13 1.11
+++ pkgsrc/graphics/ImageMagick6/Makefile.common 2017/12/03 11:09:46 1.12
@@ -1,35 +1,34 @@ @@ -1,35 +1,34 @@
1# $NetBSD: Makefile.common,v 1.11 2017/10/30 15:08:13 fhajny Exp $ 1# $NetBSD: Makefile.common,v 1.12 2017/12/03 11:09:46 wiz Exp $
2# 2#
3# When updating this package, please upload the distfile 3# When updating this package, please upload the distfile
4# since they disappear immediately when new releases happen. 4# since they disappear immediately when new releases happen.
5 5
6IM_MAJOR_VER= 6.9.9 6IM_MAJOR_VER= 6.9.9
7IM_MINOR_VER= 20 7IM_MINOR_VER= 20
8IM_MAJOR_LIB_VER= 6 8IM_MAJOR_LIB_VER= 6
9 9
10.if (${IM_MINOR_VER} != NONE) 10.if (${IM_MINOR_VER} != NONE)
11DISTSUFFIX= ${IM_MAJOR_VER}-${IM_MINOR_VER} 11DISTSUFFIX= ${IM_MAJOR_VER}-${IM_MINOR_VER}
12.else 12.else
13DISTSUFFIX= ${IM_MAJOR_VER} 13DISTSUFFIX= ${IM_MAJOR_VER}
14.endif 14.endif
15 15
16DISTNAME= ImageMagick-${DISTSUFFIX} 16DISTNAME= ImageMagick-${DISTSUFFIX}
17DISTVERSION= ${DISTSUFFIX:S/-/./} 17DISTVERSION= ${DISTSUFFIX:S/-/./}
18 18
19CATEGORIES= graphics 19CATEGORIES= graphics
20MASTER_SITES= ftp://ftp.imagemagick.org/pub/ImageMagick/ 20MASTER_SITES= ftp://ftp.imagemagick.org/pub/ImageMagick/
21MASTER_SITES+= ftp://ftp.nluug.nl/pub/ImageMagick/ 21MASTER_SITES+= ftp://ftp.nluug.nl/pub/ImageMagick/
22MASTER_SITES+= ftp://ftp.kddlabs.co.jp/graphics/ImageMagick/ 
23MASTER_SITES+= http://www.imagemagick.org/download/ 22MASTER_SITES+= http://www.imagemagick.org/download/
24EXTRACT_SUFX= .tar.xz 23EXTRACT_SUFX= .tar.xz
25 24
26HOMEPAGE= http://www.imagemagick.org/ 25HOMEPAGE= http://www.imagemagick.org/
27LICENSE= gnu-gpl-v3 26LICENSE= gnu-gpl-v3
28 27
29WRKSRC= ${WRKDIR}/ImageMagick-${DISTSUFFIX} 28WRKSRC= ${WRKDIR}/ImageMagick-${DISTSUFFIX}
30 29
31USE_LIBTOOL= yes 30USE_LIBTOOL= yes
32GNU_CONFIGURE= yes 31GNU_CONFIGURE= yes
33# For things for which we do not specify an explicit dependency above, disable 32# For things for which we do not specify an explicit dependency above, disable
34# so that we don't cause implicit "hidden" dependencies. 33# so that we don't cause implicit "hidden" dependencies.
35CONFIGURE_ARGS+= --without-dps 34CONFIGURE_ARGS+= --without-dps
cvs diff -r1.3 -r1.4 pkgsrc/graphics/libfpx/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/libfpx/Makefile 2017/10/04 17:19:33 1.3
+++ pkgsrc/graphics/libfpx/Makefile 2017/12/03 11:09:46 1.4
@@ -1,22 +1,21 @@ @@ -1,22 +1,21 @@
1# $NetBSD: Makefile,v 1.3 2017/10/04 17:19:33 nros Exp $ 1# $NetBSD: Makefile,v 1.4 2017/12/03 11:09:46 wiz Exp $
2 2
3libfpx_ver= 1.3.1 3libfpx_ver= 1.3.1
4DISTNAME= libfpx-${libfpx_ver}-9 4DISTNAME= libfpx-${libfpx_ver}-9
5PKGNAME= libfpx-${libfpx_ver} 5PKGNAME= libfpx-${libfpx_ver}
6PKGREVISION= 1 6PKGREVISION= 1
7CATEGORIES= graphics 7CATEGORIES= graphics
8MASTER_SITES= ftp://ftp.imagemagick.org/pub/ImageMagick/delegates/ 8MASTER_SITES= ftp://ftp.imagemagick.org/pub/ImageMagick/delegates/
9MASTER_SITES+= ftp://ftp.kddlabs.co.jp/graphics/ImageMagick/delegates/ 
10MASTER_SITES+= http://www.imagemagick.org/download/delegates/ 9MASTER_SITES+= http://www.imagemagick.org/download/delegates/
11EXTRACT_SUFX= .tar.xz 10EXTRACT_SUFX= .tar.xz
12 11
13MAINTAINER= nros@NetBSD.org 12MAINTAINER= nros@NetBSD.org
14HOMEPAGE= http://www.imagemagick.org/ 13HOMEPAGE= http://www.imagemagick.org/
15COMMENT= Library for reading and writing FlashPix images 14COMMENT= Library for reading and writing FlashPix images
16LICENSE= flashpix-license 15LICENSE= flashpix-license
17 16
18GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
19USE_LANGUAGES= c c++ 18USE_LANGUAGES= c c++
20USE_LIBTOOL= yes 19USE_LIBTOOL= yes
21 20
22docdir= share/doc/${PKGBASE} 21docdir= share/doc/${PKGBASE}
cvs diff -r1.287 -r1.288 pkgsrc/mk/defaults/mk.conf (expand / switch to unified diff)

--- pkgsrc/mk/defaults/mk.conf 2017/12/03 11:01:19 1.287
+++ pkgsrc/mk/defaults/mk.conf 2017/12/03 11:09:46 1.288
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: mk.conf,v 1.287 2017/12/03 11:01:19 wiz Exp $ 1# $NetBSD: mk.conf,v 1.288 2017/12/03 11:09:46 wiz Exp $
2# 2#
3 3
4# This file provides default values for variables that may be overridden 4# This file provides default values for variables that may be overridden
5# in the MAKECONF file, which is /etc/mk.conf by default. 5# in the MAKECONF file, which is /etc/mk.conf by default.
6# 6#
7# Note: This file is included after the MAKECONF file, so you cannot query 7# Note: This file is included after the MAKECONF file, so you cannot query
8# these default values in the MAKECONF using the ".if" and ".for" 8# these default values in the MAKECONF using the ".if" and ".for"
9# preprocessing directives. 9# preprocessing directives.
10 10
11# ************************************************************************ 11# ************************************************************************
12# NOTE TO PEOPLE EDITING THIS FILE - USE LEADING SPACES, NOT LEADING TABS. 12# NOTE TO PEOPLE EDITING THIS FILE - USE LEADING SPACES, NOT LEADING TABS.
13# ************************************************************************ 13# ************************************************************************
14 14
@@ -1878,28 +1878,27 @@ XAW_TYPE?=standard @@ -1878,28 +1878,27 @@ XAW_TYPE?=standard
1878#MASTER_SITE_CYGWIN= http://ftp.ntua.gr/pub/pc/cygwin/ 1878#MASTER_SITE_CYGWIN= http://ftp.ntua.gr/pub/pc/cygwin/
1879#MASTER_SITE_OPENOFFICE=http://www.ellak.gr/pub/openoffice/ \ 1879#MASTER_SITE_OPENOFFICE=http://www.ellak.gr/pub/openoffice/ \
1880# http://ftp.ntua.gr/pub/OpenOffice/ 1880# http://ftp.ntua.gr/pub/OpenOffice/
1881 1881
1882# Japan 1882# Japan
1883# 1883#
1884#MASTER_SITE_CYGWIN= ftp://ftp.dnsbalance.ring.gr.jp/archives/pc/gnu-win32/ 1884#MASTER_SITE_CYGWIN= ftp://ftp.dnsbalance.ring.gr.jp/archives/pc/gnu-win32/
1885#MASTER_SITE_GNOME= ftp://ftp.dnsbalance.ring.gr.jp/pub/X/gnome/ 1885#MASTER_SITE_GNOME= ftp://ftp.dnsbalance.ring.gr.jp/pub/X/gnome/
1886#MASTER_SITE_GNU= ftp://ftp.dnsbalance.ring.gr.jp/pub/GNU/ 1886#MASTER_SITE_GNU= ftp://ftp.dnsbalance.ring.gr.jp/pub/GNU/
1887#MASTER_SITE_MOZILLA= ftp://ftp.dnsbalance.ring.gr.jp/pub/net/www/mozilla/ 1887#MASTER_SITE_MOZILLA= ftp://ftp.dnsbalance.ring.gr.jp/pub/net/www/mozilla/
1888#MASTER_SITE_PERL_CPAN= ftp://ftp.dnsbalance.ring.gr.jp/pub/lang/perl/CPAN/modules/by-module/ 1888#MASTER_SITE_PERL_CPAN= ftp://ftp.dnsbalance.ring.gr.jp/pub/lang/perl/CPAN/modules/by-module/
1889#MASTER_SITE_OPENOFFICE=ftp://ftp.dnsbalance.ring.gr.jp/pub/misc/openoffice/ 1889#MASTER_SITE_OPENOFFICE=ftp://ftp.dnsbalance.ring.gr.jp/pub/misc/openoffice/
1890#MASTER_SITE_TEX_CTAN= ftp://ftp.dnsbalance.ring.gr.jp/pub/text/CTAN/ 1890#MASTER_SITE_TEX_CTAN= ftp://ftp.dnsbalance.ring.gr.jp/pub/text/CTAN/
1891#MASTER_SITE_SUSE= \ 1891#MASTER_SITE_SUSE= #
1892# ftp://ftp.kddlabs.co.jp/Linux/packages/SuSE/suse/${MACHINE_ARCH}/${SUSE_VERSION}/suse/ 
1893#MASTER_SITE_SUNSITE= ftp://sunsite.sut.ac.jp/pub/archives/linux/sunsite-unc/ 1892#MASTER_SITE_SUNSITE= ftp://sunsite.sut.ac.jp/pub/archives/linux/sunsite-unc/
1894#MASTER_SITE_XCONTRIB= ftp://ftp.dnsbalance.ring.gr.jp/pub/X/opengroup/contrib/ 1893#MASTER_SITE_XCONTRIB= ftp://ftp.dnsbalance.ring.gr.jp/pub/X/opengroup/contrib/
1895#MASTER_SITE_BACKUP= \ 1894#MASTER_SITE_BACKUP= \
1896# ftp://ftp.dnsbalance.ring.gr.jp/pub/NetBSD/packages/distfiles/ \ 1895# ftp://ftp.dnsbalance.ring.gr.jp/pub/NetBSD/packages/distfiles/ \
1897# ftp://ftp.jp.NetBSD.org/pub/NetBSD/packages/distfiles/ 1896# ftp://ftp.jp.NetBSD.org/pub/NetBSD/packages/distfiles/
1898 1897
1899# Switzerland 1898# Switzerland
1900# 1899#
1901#MASTER_SITE_MOZILLA= ftp://mirror.switch.ch/mirror/mozilla/ 1900#MASTER_SITE_MOZILLA= ftp://mirror.switch.ch/mirror/mozilla/
1902#MASTER_SITE_CYGWIN= ftp://mirror.switch.ch/mirror/cygwin/ 1901#MASTER_SITE_CYGWIN= ftp://mirror.switch.ch/mirror/cygwin/
1903#MASTER_SITE_OPENOFFICE=ftp://mirror.switch.ch/mirror/OpenOffice/ 1902#MASTER_SITE_OPENOFFICE=ftp://mirror.switch.ch/mirror/OpenOffice/
1904#MASTER_SITE_SUSE= \ 1903#MASTER_SITE_SUSE= \
1905# ftp://mirror.switch.ch/mirror/suse/suse/${MACHINE_ARCH}/${SUSE_VERSION}/suse/ 1904# ftp://mirror.switch.ch/mirror/suse/suse/${MACHINE_ARCH}/${SUSE_VERSION}/suse/