Sat Jan 17 05:51:44 2015 UTC ()
Define and use MASTER_SITE_OPENBSD.


(obache)
diff -r1.108 -r1.109 pkgsrc/mk/fetch/sites.mk
diff -r1.35 -r1.36 pkgsrc/net/openntpd/Makefile
diff -r1.224 -r1.225 pkgsrc/security/openssh/Makefile
cvs diff -r1.108 -r1.109 pkgsrc/mk/fetch/sites.mk (expand / switch to unified diff)

--- pkgsrc/mk/fetch/sites.mk 2014/12/04 18:42:40 1.108
+++ pkgsrc/mk/fetch/sites.mk 2015/01/17 05:51:43 1.109
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: sites.mk,v 1.108 2014/12/04 18:42:40 rodent Exp $ 1# $NetBSD: sites.mk,v 1.109 2015/01/17 05:51:43 obache Exp $
2# 2#
3# This Makefile fragment defines read-only MASTER_SITE_* variables 3# This Makefile fragment defines read-only MASTER_SITE_* variables
4# representing some well-known master distribution sites for software. 4# representing some well-known master distribution sites for software.
5# 5#
6# When variables are added or removed, the pkgsrc guide (build.xml) 6# When variables are added or removed, the pkgsrc guide (build.xml)
7# should also be updated. 7# should also be updated.
8 8
9MASTER_SITE_XCONTRIB+= \ 9MASTER_SITE_XCONTRIB+= \
10 ftp://ftp.gwdg.de/pub/x11/x.org/contrib/ \ 10 ftp://ftp.gwdg.de/pub/x11/x.org/contrib/ \
11 ftp://sunsite.icm.edu.pl/pub/X11/contrib/ \ 11 ftp://sunsite.icm.edu.pl/pub/X11/contrib/ \
12 ftp://mirror.switch.ch/mirror/X11/contrib/ \ 12 ftp://mirror.switch.ch/mirror/X11/contrib/ \
13 ftp://ftp.x.org/contrib/ 13 ftp://ftp.x.org/contrib/
14 14
@@ -373,25 +373,30 @@ MASTER_SITE_FREEBSD+= \ @@ -373,25 +373,30 @@ MASTER_SITE_FREEBSD+= \
373 ftp://ftp.FreeBSD.org/pub/FreeBSD/distfiles/ \ 373 ftp://ftp.FreeBSD.org/pub/FreeBSD/distfiles/ \
374 ftp://ftp.jp.FreeBSD.org/pub/FreeBSD/distfiles/ 374 ftp://ftp.jp.FreeBSD.org/pub/FreeBSD/distfiles/
375 375
376MASTER_SITE_FREEBSD_LOCAL+= \ 376MASTER_SITE_FREEBSD_LOCAL+= \
377 ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/ \ 377 ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/ \
378 ftp://ftp.jp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/ 378 ftp://ftp.jp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/
379 379
380MASTER_SITE_NETLIB+= \ 380MASTER_SITE_NETLIB+= \
381 http://netlib.org/ \ 381 http://netlib.org/ \
382 http://netlib.sandia.gov/ \ 382 http://netlib.sandia.gov/ \
383 http://www.netlib.no/netlib/ \ 383 http://www.netlib.no/netlib/ \
384 http://www.mirrorservice.org/sites/netlib.bell-labs.com/netlib/ 384 http://www.mirrorservice.org/sites/netlib.bell-labs.com/netlib/
385 385
 386MASTER_SITE_OPENBSD+= \
 387 ftp://ftp.OpenBSD.org/pub/OpenBSD/ \
 388 ftp://ftp3.usa.openbsd.org/pub/OpenBSD/ \
 389 ftp://ftp.jaist.ac.jp/pub/OpenBSD/
 390
386MASTER_SITE_RUBYGEMS+= \ 391MASTER_SITE_RUBYGEMS+= \
387 http://rubygems.org/downloads/ \ 392 http://rubygems.org/downloads/ \
388 393
389MASTER_SITE_HASKELL_HACKAGE+= \ 394MASTER_SITE_HASKELL_HACKAGE+= \
390 http://hackage.haskell.org/package/ 395 http://hackage.haskell.org/package/
391 396
392# The primary backup site. 397# The primary backup site.
393MASTER_SITE_BACKUP?= \ 398MASTER_SITE_BACKUP?= \
394 ftp://ftp.fi.NetBSD.org/pub/NetBSD/packages/distfiles/ \ 399 ftp://ftp.fi.NetBSD.org/pub/NetBSD/packages/distfiles/ \
395 ftp://ftp.NetBSD.org/pub/pkgsrc/distfiles/ \ 400 ftp://ftp.NetBSD.org/pub/pkgsrc/distfiles/ \
396 http://ftp.NetBSD.org/pub/pkgsrc/distfiles/ \ 401 http://ftp.NetBSD.org/pub/pkgsrc/distfiles/ \
397 ftp://ftp.FreeBSD.org/pub/FreeBSD/distfiles/ 402 ftp://ftp.FreeBSD.org/pub/FreeBSD/distfiles/
cvs diff -r1.35 -r1.36 pkgsrc/net/openntpd/Makefile (expand / switch to unified diff)

--- pkgsrc/net/openntpd/Makefile 2015/01/17 05:41:03 1.35
+++ pkgsrc/net/openntpd/Makefile 2015/01/17 05:51:43 1.36
@@ -1,21 +1,19 @@ @@ -1,21 +1,19 @@
1# $NetBSD: Makefile,v 1.35 2015/01/17 05:41:03 obache Exp $ 1# $NetBSD: Makefile,v 1.36 2015/01/17 05:51:43 obache Exp $
2 2
3DISTNAME= openntpd-3.9p1 3DISTNAME= openntpd-3.9p1
4PKGREVISION= 5 4PKGREVISION= 5
5CATEGORIES= net 5CATEGORIES= net
6MASTER_SITES= ftp://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/ \ 6MASTER_SITES= ${MASTER_SITE_OPENBSD:=OpenNTPD/}
7 ftp://ftp3.usa.openbsd.org/pub/OpenBSD/OpenNTPD/ \ 
8 ftp://ftp.jaist.ac.jp/pub/OpenBSD/OpenNTPD/ 
9 7
10MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.openntpd.org/ 9HOMEPAGE= http://www.openntpd.org/
12COMMENT= Free implementation of the Network Time Protocol 10COMMENT= Free implementation of the Network Time Protocol
13 11
14CONFLICTS+= ntp-[0-9]* 12CONFLICTS+= ntp-[0-9]*
15 13
16GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
17CONFIGURE_ARGS+= sysconfdir=${PKG_SYSCONFDIR:Q} 15CONFIGURE_ARGS+= sysconfdir=${PKG_SYSCONFDIR:Q}
18 16
19EGDIR= ${PREFIX}/share/examples/openntpd 17EGDIR= ${PREFIX}/share/examples/openntpd
20CONF_FILES= ${EGDIR}/ntpd.conf ${PKG_SYSCONFDIR}/ntpd.conf 18CONF_FILES= ${EGDIR}/ntpd.conf ${PKG_SYSCONFDIR}/ntpd.conf
21 19
cvs diff -r1.224 -r1.225 pkgsrc/security/openssh/Makefile (expand / switch to unified diff)

--- pkgsrc/security/openssh/Makefile 2015/01/17 05:31:52 1.224
+++ pkgsrc/security/openssh/Makefile 2015/01/17 05:51:43 1.225
@@ -1,24 +1,20 @@ @@ -1,24 +1,20 @@
1# $NetBSD: Makefile,v 1.224 2015/01/17 05:31:52 obache Exp $ 1# $NetBSD: Makefile,v 1.225 2015/01/17 05:51:43 obache Exp $
2 2
3DISTNAME= openssh-6.6p1 3DISTNAME= openssh-6.6p1
4PKGNAME= openssh-6.6.1 4PKGNAME= openssh-6.6.1
5PKGREVISION= 4 5PKGREVISION= 4
6CATEGORIES= security 6CATEGORIES= security
7MASTER_SITES= ftp://ftp.openssh.com/pub/OpenBSD/OpenSSH/portable/ \ 7MASTER_SITES= ${MASTER_SITE_OPENBSD:=OpenSSH/portable/}
8 ftp://ftp3.usa.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \ 
9 ftp://gd.tuwien.ac.at/opsys/OpenBSD/OpenSSH/portable/ \ 
10 ftp://ftp.freenet.de/pub/ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \ 
11 ftp://ftp.jaist.ac.jp/pub/OpenBSD/OpenSSH/portable/ 
12 8
13MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
14HOMEPAGE= http://www.openssh.com/ 10HOMEPAGE= http://www.openssh.com/
15COMMENT= Open Source Secure shell client and server (remote login program) 11COMMENT= Open Source Secure shell client and server (remote login program)
16 12
17CONFLICTS= sftp-[0-9]* 13CONFLICTS= sftp-[0-9]*
18CONFLICTS+= ssh-[0-9]* ssh6-[0-9]* 14CONFLICTS+= ssh-[0-9]* ssh6-[0-9]*
19CONFLICTS+= ssh2-[0-9]* ssh2-nox11-[0-9]* 15CONFLICTS+= ssh2-[0-9]* ssh2-nox11-[0-9]*
20CONFLICTS+= openssh+gssapi-[0-9]* 16CONFLICTS+= openssh+gssapi-[0-9]*
21CONFLICTS+= lsh>2.0 17CONFLICTS+= lsh>2.0
22 18
23USE_GCC_RUNTIME= yes 19USE_GCC_RUNTIME= yes
24USE_TOOLS+= perl 20USE_TOOLS+= perl