From 3e81b07c71ea231c0ea771fc3f9f96c5891fd402 Mon Sep 17 00:00:00 2001 From: bentley Date: Sat, 13 Jan 2018 03:00:46 +0000 Subject: [PATCH] Replace distcache.freebsd.org/ports-distfiles/ with _MASTER_SITE_FREEBSD. Some ports used _MASTER_SITE_FREEBSD already but others hardcoded the URL. Switch _MASTER_SITE_FREEBSD and MASTER_SITE_FREEBSD_LOCAL to https. --- astro/luna/Makefile | 4 ++-- converters/ish/Makefile | 4 ++-- devel/dotconf/Makefile | 4 ++-- fonts/ko-baekmuk-fonts/Makefile | 4 ++-- games/connect4/Makefile | 4 ++-- games/xdeblock/Makefile | 4 ++-- infrastructure/templates/network.conf.template | 6 +++--- misc/jive/Makefile | 4 ++-- security/tempwatch/Makefile | 4 ++-- textproc/pinfo/Makefile | 4 ++-- x11/xfishtank/Makefile | 4 ++-- x11/xmold/Makefile | 4 ++-- x11/xtattr/Makefile | 4 ++-- 13 files changed, 27 insertions(+), 27 deletions(-) diff --git a/astro/luna/Makefile b/astro/luna/Makefile index ad7531e562c..2643672e10e 100644 --- a/astro/luna/Makefile +++ b/astro/luna/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.11 2015/06/05 08:11:53 bentley Exp $ +# $OpenBSD: Makefile,v 1.12 2018/01/13 03:00:46 bentley Exp $ COMMENT= display the moon's phase @@ -16,7 +16,7 @@ PERMIT_PACKAGE_FTP= copyrighted PERMIT_DISTFILES_FTP= copyrighted WANTLIB= c -MASTER_SITES= http://distcache.freebsd.org/ports-distfiles/ +MASTER_SITES= ${_MASTER_SITE_FREEBSD} BUILD_DEPENDS= archivers/lha diff --git a/converters/ish/Makefile b/converters/ish/Makefile index 9c026cd2478..515a4adc404 100644 --- a/converters/ish/Makefile +++ b/converters/ish/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.21 2015/06/05 08:11:53 bentley Exp $ +# $OpenBSD: Makefile,v 1.22 2018/01/13 03:00:46 bentley Exp $ COMMENT= binary-to-text file converter @@ -13,7 +13,7 @@ PERMIT_DISTFILES_FTP= no license WANTLIB += c MASTER_SITES= \ - http://distcache.freebsd.org/ports-distfiles/ \ + ${_MASTER_SITE_FREEBSD} \ http://www.unix.gr.jp/jnetcex/soft/ MAKE_FILE= makefile diff --git a/devel/dotconf/Makefile b/devel/dotconf/Makefile index 6522b14ecda..9584597717d 100755 --- a/devel/dotconf/Makefile +++ b/devel/dotconf/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2015/06/05 08:11:53 bentley Exp $ +# $OpenBSD: Makefile,v 1.8 2018/01/13 03:00:46 bentley Exp $ COMMENT= simple, powerful configuration-file parser @@ -14,7 +14,7 @@ HOMEPAGE= https://github.com/williamh/dotconf # LGPLv2.1 PERMIT_PACKAGE_CDROM= Yes -MASTER_SITES= http://distcache.freebsd.org/ports-distfiles/ +MASTER_SITES= ${_MASTER_SITE_FREEBSD} CONFIGURE_STYLE= gnu diff --git a/fonts/ko-baekmuk-fonts/Makefile b/fonts/ko-baekmuk-fonts/Makefile index 9ad69f45f97..28dae68eb1b 100644 --- a/fonts/ko-baekmuk-fonts/Makefile +++ b/fonts/ko-baekmuk-fonts/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2015/09/25 12:50:08 sthen Exp $ +# $OpenBSD: Makefile,v 1.9 2018/01/13 03:00:46 bentley Exp $ PKG_ARCH= * @@ -10,7 +10,7 @@ PKGNAME= ko-baekmuk-fonts-${V} REVISION= 5 CATEGORIES= fonts korean x11 -MASTER_SITES= http://distcache.freebsd.org/ports-distfiles/ \ +MASTER_SITES= ${_MASTER_SITE_FREEBSD} \ ftp://ftp.mizi.com/pub/baekmuk/ HOMEPAGE= http://www.mizi.co.kr diff --git a/games/connect4/Makefile b/games/connect4/Makefile index 74da71b8339..11e1fcdbe3a 100644 --- a/games/connect4/Makefile +++ b/games/connect4/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.33 2015/06/05 08:11:53 bentley Exp $ +# $OpenBSD: Makefile,v 1.34 2018/01/13 03:00:46 bentley Exp $ COMMENT= curses version of the classic game @@ -13,7 +13,7 @@ PERMIT_PACKAGE_FTP= no license PERMIT_DISTFILES_FTP= no license WANTLIB= c curses termcap -MASTER_SITES= http://distcache.freebsd.org/ports-distfiles/ +MASTER_SITES= ${_MASTER_SITE_FREEBSD} EXTRACT_SUFX= .Z EXTRACT_CASES= *.Z) ${GZIP_CMD} -dc ${FULLDISTDIR}/$$archive | \ ${_PERL_FIX_SHAR} | /bin/sh ;; diff --git a/games/xdeblock/Makefile b/games/xdeblock/Makefile index a05bf910bd9..3046f4ba44f 100644 --- a/games/xdeblock/Makefile +++ b/games/xdeblock/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.34 2017/10/23 17:10:50 sthen Exp $ +# $OpenBSD: Makefile,v 1.35 2018/01/13 03:00:46 bentley Exp $ COMMENT= block action game @@ -7,7 +7,7 @@ PKGNAME= xdeblock-1.0 REVISION = 3 CATEGORIES= games -MASTER_SITES= http://distcache.freebsd.org/ports-distfiles/ \ +MASTER_SITES= ${_MASTER_SITE_FREEBSD} \ http://www.vector.co.jp/pack/unix/game/action/block/ EXTRACT_SUFX= .tgz diff --git a/infrastructure/templates/network.conf.template b/infrastructure/templates/network.conf.template index 835bc8b1162..58763c50968 100644 --- a/infrastructure/templates/network.conf.template +++ b/infrastructure/templates/network.conf.template @@ -1,4 +1,4 @@ -# $OpenBSD: network.conf.template,v 1.213 2018/01/12 22:06:28 sthen Exp $ +# $OpenBSD: network.conf.template,v 1.214 2018/01/13 03:00:46 bentley Exp $ # # NEVER EDIT THIS FILE DIRECTLY!!!! @@ -19,7 +19,7 @@ _MASTER_SITE_OPENBSD ?= ${MASTER_SITE_OPENBSD:=${DIST_SUBDIR}/} # Default FreeBSD backup site _MASTER_SITE_FREEBSD?= \ - http://distcache.FreeBSD.org/ports-distfiles/ + https://pkg.FreeBSD.org/ports-distfiles/ # Default NetBSD backup site _MASTER_SITE_NETBSD?= \ @@ -189,7 +189,7 @@ MASTER_SITE_WINDOWMAKER+= \ http://www.windowmaker.org/pub/ MASTER_SITE_FREEBSD_LOCAL+= \ - http://distcache.FreeBSD.org/local-distfiles/ + https://pkg.FreeBSD.org/local-distfiles/ MASTER_SITE_PACKETSTORM+= \ http://dl.packetstormsecurity.net/ \ diff --git a/misc/jive/Makefile b/misc/jive/Makefile index 73ef4bae028..8ebfa4d63dc 100644 --- a/misc/jive/Makefile +++ b/misc/jive/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.26 2015/11/10 12:35:10 sthen Exp $ +# $OpenBSD: Makefile,v 1.27 2018/01/13 03:00:46 bentley Exp $ COMMENT= convert English text to Jive DISTNAME= jive-1.1 CATEGORIES= misc -MASTER_SITES= http://distcache.freebsd.org/ports-distfiles/ +MASTER_SITES= ${_MASTER_SITE_FREEBSD} # License: NONE PERMIT_PACKAGE_CDROM= no license diff --git a/security/tempwatch/Makefile b/security/tempwatch/Makefile index a8aeb2d9b63..9c344093b66 100644 --- a/security/tempwatch/Makefile +++ b/security/tempwatch/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.22 2015/06/10 11:05:02 jca Exp $ +# $OpenBSD: Makefile,v 1.23 2018/01/13 03:00:46 bentley Exp $ COMMENT= temporary file auditing tool @@ -13,7 +13,7 @@ DIST_SUBDIR= tempwatch DISTFILES= l0pht-watch${EXTRACT_SUFX} watch.txt:0 EXTRACT_ONLY= l0pht-watch${EXTRACT_SUFX} -MASTER_SITES= http://distcache.freebsd.org/ports-distfiles/ +MASTER_SITES= ${_MASTER_SITE_FREEBSD} MASTER_SITES0= https://distfiles.bsdfrog.org/ WRKDIST= ${WRKDIR}/temp-watch diff --git a/textproc/pinfo/Makefile b/textproc/pinfo/Makefile index ffe554a24ce..d32b15bece2 100644 --- a/textproc/pinfo/Makefile +++ b/textproc/pinfo/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.13 2017/11/19 00:53:16 naddy Exp $ +# $OpenBSD: Makefile,v 1.14 2018/01/13 03:00:46 bentley Exp $ COMMENT= info viewer with lynx-style navigation @@ -11,7 +11,7 @@ HOMEPAGE= https://alioth.debian.org/frs/?group_id=30592 MAINTAINER= Marc Espie MASTER_SITES= https://alioth.debian.org/frs/download.php/latestfile/434/ \ - http://distcache.freebsd.org/ports-distfiles/ + ${_MASTER_SITE_FREEBSD} # GPLv2 PERMIT_PACKAGE_CDROM= Yes diff --git a/x11/xfishtank/Makefile b/x11/xfishtank/Makefile index eba5a1b45a4..249042c20c5 100644 --- a/x11/xfishtank/Makefile +++ b/x11/xfishtank/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.24 2015/06/05 08:11:53 bentley Exp $ +# $OpenBSD: Makefile,v 1.25 2018/01/13 03:00:46 bentley Exp $ COMMENT= fish swim in the background of your screen @@ -6,7 +6,7 @@ DISTNAME= xfishtank-2.2 REVISION= 1 CATEGORIES= x11 -MASTER_SITES= http://distcache.freebsd.org/ports-distfiles/ +MASTER_SITES= ${_MASTER_SITE_FREEBSD} PERMIT_PACKAGE_CDROM= no license PERMIT_PACKAGE_FTP= no license diff --git a/x11/xmold/Makefile b/x11/xmold/Makefile index 977c3222263..71774cb27e7 100644 --- a/x11/xmold/Makefile +++ b/x11/xmold/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.25 2017/02/27 20:02:54 jca Exp $ +# $OpenBSD: Makefile,v 1.26 2018/01/13 03:00:46 bentley Exp $ COMMENT= mold spreading over your X11 screen @@ -13,7 +13,7 @@ PERMIT_DISTFILES_FTP= no license WANTLIB= X11 Xau Xdmcp Xext c m -MASTER_SITES= http://distcache.freebsd.org/ports-distfiles/ +MASTER_SITES= ${_MASTER_SITE_FREEBSD} MAKE_FLAGS= CC="${CC}" \ CCOPTIONS="${CFLAGS}" diff --git a/x11/xtattr/Makefile b/x11/xtattr/Makefile index 361627d78c9..3a849dcfccf 100644 --- a/x11/xtattr/Makefile +++ b/x11/xtattr/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.23 2015/06/05 08:11:53 bentley Exp $ +# $OpenBSD: Makefile,v 1.24 2018/01/13 03:00:46 bentley Exp $ COMMENT= changing xterm attributes @@ -10,7 +10,7 @@ PERMIT_PACKAGE_CDROM= no license PERMIT_PACKAGE_FTP= no license PERMIT_DISTFILES_FTP= no license -MASTER_SITES = http://distcache.freebsd.org/ports-distfiles/ +MASTER_SITES = ${_MASTER_SITE_FREEBSD} WANTLIB= c CONFIGURE_STYLE= imake