From d099caff2e3d5fb8c071a711543c952da9a79fd6 Mon Sep 17 00:00:00 2001
From: jasper <jasper@openbsd.org>
Date: Sat, 30 Aug 2014 21:54:07 +0000
Subject: [PATCH] Remove MASTER_SITES=${MASTER_SITE_BACKUP} which is already
 taken care of by bsd.port.mk

---
 archivers/makeself/Makefile    | 4 +---
 audio/mpegaudio/Makefile       | 3 +--
 chinese/ttfm/Makefile          | 4 +---
 devel/luapack/Makefile         | 3 +--
 devel/py-protocols/Makefile    | 5 ++---
 devel/py-ruledispatch/Makefile | 5 ++---
 fonts/zh-arphicttf/Makefile    | 4 +---
 fonts/zh-bg5ps/Makefile        | 4 +---
 games/oilwar/Makefile          | 3 +--
 games/spatial/Makefile         | 4 +---
 games/xgolgo/Makefile          | 4 +---
 games/xmj/Makefile             | 4 +---
 games/xneko/Makefile           | 3 +--
 lang/ucblogo/Makefile          | 3 +--
 misc/cbb/Makefile              | 4 +---
 misc/pymissile/Makefile        | 3 +--
 net/queso/Makefile             | 4 +---
 security/antisniff/Makefile    | 4 +---
 security/cgichk/Makefile       | 4 +---
 security/l0phtcrack/Makefile   | 3 +--
 www/pecl-chroot/Makefile       | 4 +---
 21 files changed, 23 insertions(+), 56 deletions(-)

diff --git a/archivers/makeself/Makefile b/archivers/makeself/Makefile
index 5ed4c35b0bc..c265c15f4bb 100644
--- a/archivers/makeself/Makefile
+++ b/archivers/makeself/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2013/03/10 22:28:04 espie Exp $
+# $OpenBSD: Makefile,v 1.11 2014/08/30 21:54:07 jasper Exp $
 # Original from: Stephane Peter <megastep@megastep.org>
 
 COMMENT=	script generating a self-extractible .tgz from a directory
@@ -13,8 +13,6 @@ HOMEPAGE=		http://www.megastep.org/makeself/
 # GPL
 PERMIT_PACKAGE_CDROM=	Yes
 
-MASTER_SITES=		${MASTER_SITE_BACKUP}
-
 EXTRACT_ONLY=
 EXTRACT_SUFX=		.gz.sh
 
diff --git a/audio/mpegaudio/Makefile b/audio/mpegaudio/Makefile
index 10e8a6cafc2..c3f50b70c67 100644
--- a/audio/mpegaudio/Makefile
+++ b/audio/mpegaudio/Makefile
@@ -1,10 +1,9 @@
-# $OpenBSD: Makefile,v 1.18 2013/03/10 22:55:04 espie Exp $
+# $OpenBSD: Makefile,v 1.19 2014/08/30 21:54:07 jasper Exp $
 
 COMMENT=	MPEG/audio Layer 1 and Layer 2 encoder/decoder
 DISTNAME=	mpegaudio
 PKGNAME=	mpegaudio-3.9
 CATEGORIES=	audio
-MASTER_SITES=	${MASTER_SITE_BACKUP}
 EXTRACT_SUFX=	.tar.Z
 
 PERMIT_PACKAGE_CDROM=	Yes
diff --git a/chinese/ttfm/Makefile b/chinese/ttfm/Makefile
index 0f41cdb9236..a698cd1e7f3 100644
--- a/chinese/ttfm/Makefile
+++ b/chinese/ttfm/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.26 2014/01/01 20:46:28 naddy Exp $
+# $OpenBSD: Makefile,v 1.27 2014/08/30 21:54:07 jasper Exp $
 
 COMMENT=	big5/gb enhanced truetype font manager
 
@@ -13,8 +13,6 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB=	c freetype z
 
-MASTER_SITES=	${MASTER_SITE_BACKUP}
-
 MAKE_FLAGS=	CC="${CC}" CFLAGS='${CFLAGS} `freetype-config --cflags`'
 
 NO_TEST=	Yes
diff --git a/devel/luapack/Makefile b/devel/luapack/Makefile
index 9cb43d95015..20817b59deb 100644
--- a/devel/luapack/Makefile
+++ b/devel/luapack/Makefile
@@ -1,10 +1,9 @@
-# $OpenBSD: Makefile,v 1.15 2013/05/30 15:37:56 jasper Exp $
+# $OpenBSD: Makefile,v 1.16 2014/08/30 21:54:07 jasper Exp $
 
 COMMENT=	library for packing and unpacking binary data
 DISTNAME=	luapack-20061124
 REVISION =	3
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_BACKUP}
 
 HOMEPAGE=	http://www.tecgraf.puc-rio.br/~lhf/ftp/lua/
 
diff --git a/devel/py-protocols/Makefile b/devel/py-protocols/Makefile
index 210b0d9e359..6775258e322 100644
--- a/devel/py-protocols/Makefile
+++ b/devel/py-protocols/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.20 2013/03/11 10:50:26 espie Exp $
+# $OpenBSD: Makefile,v 1.21 2014/08/30 21:54:08 jasper Exp $
 
 COMMENT=		protocol definition, declaration and adaptation
 
@@ -18,12 +18,11 @@ MAINTAINER=		Martynas Venckus <martynas@openbsd.org>
 # PSF/ZPL
 PERMIT_PACKAGE_CDROM=	Yes
 
-MASTER_SITES=		${MASTER_SITE_BACKUP}
 DISTFILES=		PyProtocols-${VERSION}a0dev_r${REV}${EXTRACT_SUFX}
 
 MODULES=		lang/python
 RUN_DEPENDS=		devel/py-decoratortools
-TEST_DEPENDS=	devel/py-decoratortools
+TEST_DEPENDS=		devel/py-decoratortools
 
 MODPY_SETUPTOOLS=	Yes
 
diff --git a/devel/py-ruledispatch/Makefile b/devel/py-ruledispatch/Makefile
index effbea3c0a4..54c85869cd4 100644
--- a/devel/py-ruledispatch/Makefile
+++ b/devel/py-ruledispatch/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.20 2013/03/11 10:50:26 espie Exp $
+# $OpenBSD: Makefile,v 1.21 2014/08/30 21:54:08 jasper Exp $
 
 COMMENT=		rule-based dispatching and generic functions
 
@@ -18,12 +18,11 @@ MAINTAINER=		Martynas Venckus <martynas@openbsd.org>
 # PSF/ZPL
 PERMIT_PACKAGE_CDROM=	Yes
 
-MASTER_SITES=		${MASTER_SITE_BACKUP}
 DISTFILES=		RuleDispatch-${VERSION}a0.dev-r${REV}${EXTRACT_SUFX}
 
 MODULES=		lang/python
 RUN_DEPENDS=		devel/py-protocols
-TEST_DEPENDS=	devel/py-protocols
+TEST_DEPENDS=		devel/py-protocols
 
 MODPY_SETUPTOOLS=	Yes
 
diff --git a/fonts/zh-arphicttf/Makefile b/fonts/zh-arphicttf/Makefile
index d608b1617e7..f7aa16ce562 100644
--- a/fonts/zh-arphicttf/Makefile
+++ b/fonts/zh-arphicttf/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2013/03/11 11:06:05 espie Exp $
+# $OpenBSD: Makefile,v 1.5 2014/08/30 21:54:08 jasper Exp $
 
 COMMENT=	chinese big5/gb truetype fonts
 
@@ -11,8 +11,6 @@ MAINTAINER=     Kevin Lo <kevlo@openbsd.org>
 
 PERMIT_PACKAGE_CDROM=   Yes
 
-MASTER_SITES=	${MASTER_SITE_BACKUP}
-
 NO_BUILD=	Yes
 NO_TEST=	Yes
 PKG_ARCH=	*
diff --git a/fonts/zh-bg5ps/Makefile b/fonts/zh-bg5ps/Makefile
index 09af9dc055e..17adf90a3f2 100644
--- a/fonts/zh-bg5ps/Makefile
+++ b/fonts/zh-bg5ps/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2013/03/11 11:06:05 espie Exp $
+# $OpenBSD: Makefile,v 1.5 2014/08/30 21:54:08 jasper Exp $
 
 COMMENT=	convert Big5/GB encoded files to postscript
 
@@ -14,8 +14,6 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB=		c m ttf
 
-MASTER_SITES=	${MASTER_SITE_BACKUP}
-
 MODULES=	lang/python
 RUN_DEPENDS=	fonts/zh-arphicttf
 LIB_DEPENDS=	print/freetype
diff --git a/games/oilwar/Makefile b/games/oilwar/Makefile
index a6ee8e4398b..96e164633ff 100644
--- a/games/oilwar/Makefile
+++ b/games/oilwar/Makefile
@@ -1,11 +1,10 @@
-# $OpenBSD: Makefile,v 1.18 2013/03/11 11:07:40 espie Exp $
+# $OpenBSD: Makefile,v 1.19 2014/08/30 21:54:08 jasper Exp $
 
 COMMENT=	sdl shoot 'em up; stop evil army from getting your oil
 DISTNAME=	OilWar-1.2.1
 PKGNAME=	${DISTNAME:L}
 REVISION =	4
 CATEGORIES=	games x11
-MASTER_SITES=	${MASTER_SITE_BACKUP}
 
 # GPLv2
 PERMIT_PACKAGE_CDROM=	Yes
diff --git a/games/spatial/Makefile b/games/spatial/Makefile
index 22102abcbe2..2eb8482c5b6 100644
--- a/games/spatial/Makefile
+++ b/games/spatial/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2013/03/11 11:07:40 espie Exp $
+# $OpenBSD: Makefile,v 1.11 2014/08/30 21:54:08 jasper Exp $
 
 COMMENT=	3d tetris
 
@@ -12,8 +12,6 @@ EXTRACT_SUFX=	.tar.Z
 # BSD
 PERMIT_PACKAGE_CDROM=	Yes
 
-MASTER_SITES=	${MASTER_SITE_BACKUP}
-
 WRKBUILD=	${WRKDIST}/spatial
 PIECEFILE=${PREFIX}/share/spatial/spatial.shp
 SCOREFILE=${PREFIX}/share/spatial/spatial.sco
diff --git a/games/xgolgo/Makefile b/games/xgolgo/Makefile
index e01baa7aa65..e4ba0729e36 100644
--- a/games/xgolgo/Makefile
+++ b/games/xgolgo/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.26 2013/10/11 23:49:41 naddy Exp $
+# $OpenBSD: Makefile,v 1.27 2014/08/30 21:54:08 jasper Exp $
 #
 
 COMMENT=	watch what you are doing -- are you hostile
@@ -13,8 +13,6 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB=	ICE SM X11 Xau Xdmcp Xext Xmu Xt c m pthread-stubs xcb
 
-MASTER_SITES=	${MASTER_SITE_BACKUP}
-
 CONFIGURE_STYLE=imake noman
 
 WRKDIST=	${WRKDIR}/xeyes
diff --git a/games/xmj/Makefile b/games/xmj/Makefile
index 1bd27143e68..7a8d0cd6986 100644
--- a/games/xmj/Makefile
+++ b/games/xmj/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.22 2013/03/11 11:07:41 espie Exp $
+# $OpenBSD: Makefile,v 1.23 2014/08/30 21:54:08 jasper Exp $
 
 COMMENT=	Mahjongg game for X11
 
@@ -7,8 +7,6 @@ PKGNAME=	xmj-1.0
 REVISION =	2
 CATEGORIES=	games
 
-MASTER_SITES=	${MASTER_SITE_BACKUP}
-
 # BSD
 PERMIT_PACKAGE_CDROM=	Yes
 
diff --git a/games/xneko/Makefile b/games/xneko/Makefile
index d38a89d106b..988178eae02 100644
--- a/games/xneko/Makefile
+++ b/games/xneko/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.26 2013/03/11 11:07:42 espie Exp $
+# $OpenBSD: Makefile,v 1.27 2014/08/30 21:54:08 jasper Exp $
 
 COMMENT=	classic BSD4.4 cat-and-mouse
 
@@ -6,7 +6,6 @@ DISTNAME=	xneko
 PKGNAME=	xneko-4.4
 REVISION =	1
 CATEGORIES=	x11 games
-MASTER_SITES=	${MASTER_SITE_BACKUP}
 EXTRACT_SUFX=	.tar
 
 # Public domain - written in Japanese
diff --git a/lang/ucblogo/Makefile b/lang/ucblogo/Makefile
index 407055cf546..f30305028e6 100644
--- a/lang/ucblogo/Makefile
+++ b/lang/ucblogo/Makefile
@@ -1,11 +1,10 @@
-# $OpenBSD: Makefile,v 1.14 2013/12/06 16:06:50 jca Exp $
+# $OpenBSD: Makefile,v 1.15 2014/08/30 21:54:08 jasper Exp $
 
 COMMENT=	Berkeley's implementation of the logo programming language
 DISTNAME=	ucblogo-5.5
 REVISION=	3
 CATEGORIES=	lang
 
-MASTER_SITES=	${MASTER_SITE_BACKUP}
 HOMEPAGE=	http://www.cs.berkeley.edu/~bh/logo.html
 
 # BSD
diff --git a/misc/cbb/Makefile b/misc/cbb/Makefile
index daa56da2671..00c07c5e85e 100644
--- a/misc/cbb/Makefile
+++ b/misc/cbb/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.34 2013/03/11 11:23:56 espie Exp $
+# $OpenBSD: Makefile,v 1.35 2014/08/30 21:54:08 jasper Exp $
 
 COMMENT=	checkbook balancing tool
 
@@ -11,8 +11,6 @@ MAINTAINER=	Stuart Cassoff <stwo@users.sourceforge.net>
 # GPL
 PERMIT_PACKAGE_CDROM=	Yes
 
-MASTER_SITES=	${MASTER_SITE_BACKUP}
-
 MODULES=	x11/tk
 
 RUN_DEPENDS=	misc/plan \
diff --git a/misc/pymissile/Makefile b/misc/pymissile/Makefile
index 7f6c767ed64..9e842c4fdf5 100644
--- a/misc/pymissile/Makefile
+++ b/misc/pymissile/Makefile
@@ -1,11 +1,10 @@
-# $OpenBSD: Makefile,v 1.16 2013/08/07 21:32:12 naddy Exp $
+# $OpenBSD: Makefile,v 1.17 2014/08/30 21:54:08 jasper Exp $
 
 COMMENT=	usb missile launcher control script
 DISTNAME=	pymissile-20061111
 REVISION =	6
 DISTFILES=	${DISTNAME}.py
 CATEGORIES=	misc
-MASTER_SITES=	${MASTER_SITE_BACKUP}
 
 HOMEPAGE =	https://code.google.com/p/pymissile/
 
diff --git a/net/queso/Makefile b/net/queso/Makefile
index 0a88f059381..7061a620952 100644
--- a/net/queso/Makefile
+++ b/net/queso/Makefile
@@ -1,12 +1,10 @@
-# $OpenBSD: Makefile,v 1.18 2013/10/11 23:50:33 naddy Exp $
+# $OpenBSD: Makefile,v 1.19 2014/08/30 21:54:08 jasper Exp $
 
 COMMENT=	determine remote OS using simple tcp packets
 
 DISTNAME=	queso-980922
 CATEGORIES=	net
 
-MASTER_SITES=	${MASTER_SITE_BACKUP}
-
 PERMIT_PACKAGE_CDROM=	Yes
 WANTLIB=		c pcap
 
diff --git a/security/antisniff/Makefile b/security/antisniff/Makefile
index a49e61ba9bf..a9b5e03b861 100644
--- a/security/antisniff/Makefile
+++ b/security/antisniff/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.24 2013/03/11 11:41:24 espie Exp $
+# $OpenBSD: Makefile,v 1.25 2014/08/30 21:54:08 jasper Exp $
 
 COMMENT=	promiscuous mode interface detector
 
@@ -12,8 +12,6 @@ PERMIT_PACKAGE_FTP=	commercial software
 PERMIT_DISTFILES_FTP=	Yes
 WANTLIB=		c kvm pcap
 
-MASTER_SITES=	${MASTER_SITE_BACKUP}
-
 WRKDIST=	${WRKDIR}/anti_sniff
 
 ALL_TARGET=	OpenBSD-all
diff --git a/security/cgichk/Makefile b/security/cgichk/Makefile
index b3cfa87a19a..5a6c3a20693 100644
--- a/security/cgichk/Makefile
+++ b/security/cgichk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2013/03/11 11:41:24 espie Exp $
+# $OpenBSD: Makefile,v 1.18 2014/08/30 21:54:08 jasper Exp $
 
 COMMENT=	scans webservers for vulnerable CGI programs
 
@@ -9,8 +9,6 @@ EXTRACT_SUFX=	.tgz
 
 CATEGORIES=	security
 
-MASTER_SITES=	${MASTER_SITE_BACKUP}
-
 PERMIT_PACKAGE_CDROM=	Yes
 WANTLIB=		c
 
diff --git a/security/l0phtcrack/Makefile b/security/l0phtcrack/Makefile
index e4d8d6753ef..87255ead35b 100644
--- a/security/l0phtcrack/Makefile
+++ b/security/l0phtcrack/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.22 2014/04/16 11:36:14 sthen Exp $
+# $OpenBSD: Makefile,v 1.23 2014/08/30 21:54:08 jasper Exp $
 
 ONLY_FOR_ARCHS=	i386
 
@@ -8,7 +8,6 @@ PKGNAME=	l0phtcrack-2.52
 REVISION=	1
 CATEGORIES=	security
 
-MASTER_SITES=	${MASTER_SITE_BACKUP}
 DISTFILES=	lcsrc.zip readsmb.c
 EXTRACT_ONLY=	lcsrc.zip
 DIST_SUBDIR=	l0phtcrack
diff --git a/www/pecl-chroot/Makefile b/www/pecl-chroot/Makefile
index 08bdb986d9e..b1f1246355a 100644
--- a/www/pecl-chroot/Makefile
+++ b/www/pecl-chroot/Makefile
@@ -1,12 +1,10 @@
-# $OpenBSD: Makefile,v 1.16 2013/08/12 04:11:21 robert Exp $
+# $OpenBSD: Makefile,v 1.17 2014/08/30 21:54:08 jasper Exp $
 
 COMMENT=	PHP support for chroot(2)
 
 DISTNAME=	pecl-chroot-1.0
 REVISION=	8
 
-MASTER_SITES=	${MASTER_SITE_BACKUP}
-
 # PHP
 PERMIT_PACKAGE_CDROM=	Yes