The ${PROJECT}.googlecode.com/files/ master sites are no longer

accessible, but the distfiles are still available at an archive URL. Introduce MASTER_SITE_GOOGLECODE and use it for all affected ports. ok czarkoff@ danj@ sthen@
2016-10-01 11:54:14 +00:00 · 2016-10-01 11:54:14 +00:00 · c326edce1b
commit c326edce1b
parent c66c5ca5b3
81 changed files with 163 additions and 162 deletions
--- a/archivers/fuse-zip/Makefile
+++ b/archivers/fuse-zip/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2014/01/28 01:01:52 jca Exp $
+# $OpenBSD: Makefile,v 1.2 2016/10/01 11:54:14 naddy Exp $

 COMMENT =		navigate zip archives through FUSE

@ -13,7 +13,7 @@ PERMIT_PACKAGE_CDROM =	Yes

 WANTLIB += c fuse m stdc++ z zip

-MASTER_SITES =		https://fuse-zip.googlecode.com/files/
+MASTER_SITES =		${MASTER_SITE_GOOGLECODE:=fuse-zip/}

 LIB_DEPENDS =		archivers/libzip>=0.11.2

--- a/audio/libofa/Makefile
+++ b/audio/libofa/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2016/03/11 19:59:12 naddy Exp $
+# $OpenBSD: Makefile,v 1.12 2016/10/01 11:54:14 naddy Exp $

 COMMENT =	Open Fingerprint Architecture library

@ -11,7 +11,7 @@ SHARED_LIBS +=	ofa	0.0
 # GPL
 PERMIT_PACKAGE_CDROM =		Yes

-MASTER_SITES =	https://musicip-libofa.googlecode.com/files/
+MASTER_SITES =	${MASTER_SITE_GOOGLECODE:=musicip-libofa/}

 WANTLIB +=	m pthread stdc++ fftw3

--- a/benchmarks/httperf/Makefile
+++ b/benchmarks/httperf/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2015/07/18 17:13:49 jca Exp $
+# $OpenBSD: Makefile,v 1.10 2016/10/01 11:54:14 naddy Exp $

 COMMENT =		web server performance testing tool

@ -11,7 +11,7 @@ HOMEPAGE =		http://www.hpl.hp.com/research/linux/httperf/
 # GPLv2
 PERMIT_PACKAGE_CDROM =	Yes

-MASTER_SITES =		https://httperf.googlecode.com/files/
+MASTER_SITES =		${MASTER_SITE_GOOGLECODE:=httperf/}

 CONFIGURE_STYLE =	gnu

--- a/chinese/cconv/Makefile
+++ b/chinese/cconv/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2016/04/09 20:14:48 naddy Exp $
+# $OpenBSD: Makefile,v 1.11 2016/10/01 11:54:14 naddy Exp $

 COMMENT=	simplified-traditional chinese translate tool

@ -16,7 +16,7 @@ PERMIT_PACKAGE_CDROM=	Yes

 WANTLIB= 	c iconv

-MASTER_SITES=	https://cconv.googlecode.com/files/
+MASTER_SITES=	${MASTER_SITE_GOOGLECODE:=cconv/}

 LIB_DEPENDS=	converters/libiconv

--- a/comms/picocom/Makefile
+++ b/comms/picocom/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2016/01/26 13:05:26 sthen Exp $
+# $OpenBSD: Makefile,v 1.7 2016/10/01 11:54:14 naddy Exp $

 COMMENT =		minimal dumb-terminal emulation program

@ -14,7 +14,7 @@ PERMIT_PACKAGE_CDROM =	Yes

 WANTLIB += c

-MASTER_SITES =		https://picocom.googlecode.com/files/
+MASTER_SITES =		${MASTER_SITE_GOOGLECODE:=picocom/}

 MAKE_FLAGS =		CC="${CC}" CFLAGS="${CFLAGS}"
 MAKE_ENV =		LDFLAGS="${LDFLAGS}"
--- a/comms/wy60/Makefile
+++ b/comms/wy60/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2013/03/11 01:30:27 espie Exp $
+# $OpenBSD: Makefile,v 1.13 2016/10/01 11:54:14 naddy Exp $

 COMMENT=	curses-based emulator for the Wyse 60 terminal

@ -12,7 +12,7 @@ MAINTAINER=	Christian Weisgerber <naddy@openbsd.org>
 # GPLv2+
 PERMIT_PACKAGE_CDROM=	Yes

-MASTER_SITES=	https://wy60.googlecode.com/files/
+MASTER_SITES=	${MASTER_SITE_GOOGLECODE:=wy60/}

 WANTLIB=	c curses

--- a/databases/leveldb/Makefile
+++ b/databases/leveldb/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2014/09/10 07:16:24 jasper Exp $
+# $OpenBSD: Makefile,v 1.13 2016/10/01 11:54:14 naddy Exp $

 #'atomic_pointer.h: error Please implement AtomicPointer for this platform' on other archs
 ONLY_FOR_ARCHS=	i386 amd64 arm
@ -17,7 +17,7 @@ PERMIT_PACKAGE_CDROM=	Yes

 WANTLIB += c m pthread stdc++

-MASTER_SITES=	https://leveldb.googlecode.com/files/
+MASTER_SITES=	${MASTER_SITE_GOOGLECODE:=leveldb/}

 USE_GMAKE=	Yes
 MAKE_ENV+=	CXX=${CXX} OPT="${CXXFLAGS}" \
--- a/databases/py-apsw/Makefile
+++ b/databases/py-apsw/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2016/09/23 09:16:53 sthen Exp $
+# $OpenBSD: Makefile,v 1.7 2016/10/01 11:54:14 naddy Exp $

 COMMENT =	thin SQLite wrapper for Python

@ -10,7 +10,7 @@ PKGNAME =	py-apsw-${MODPY_EGG_VERSION}
 CATEGORIES =	databases

 HOMEPAGE=	https://rogerbinns.github.io/apsw/
-MASTER_SITES=	https://apsw.googlecode.com/files/
+MASTER_SITES=	${MASTER_SITE_GOOGLECODE:=apsw/}
 PORTROACH=	site:https://github.com/rogerbinns/apsw/releases

 # zlib
--- a/devel/arduino/Makefile
+++ b/devel/arduino/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2015/11/02 11:56:54 espie Exp $
+# $OpenBSD: Makefile,v 1.16 2016/10/01 11:54:14 naddy Exp $

 COMMENT=	open-source electronics prototyping platform

@ -17,7 +17,7 @@ HOMEPAGE=	http://www.arduino.cc/
 # frontend application: GPLv2 (not shipped yet)
 PERMIT_PACKAGE_CDROM=   Yes

-MASTER_SITES=	https://arduino.googlecode.com/files/
+MASTER_SITES=	${MASTER_SITE_GOOGLECODE:=arduino/}

 RUN_DEPENDS=	devel/avr/binutils \
 		devel/avr/gcc \
--- a/devel/codeworker/Makefile
+++ b/devel/codeworker/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2013/08/07 21:31:31 naddy Exp $
+# $OpenBSD: Makefile,v 1.7 2016/10/01 11:54:14 naddy Exp $

 COMMENT =		universal parsing tool & source code generator

@ -17,7 +17,7 @@ PERMIT_PACKAGE_CDROM =	Yes

 WANTLIB =		c m stdc++

-MASTER_SITES =		https://codeworker.googlecode.com/files/ \
+MASTER_SITES =		${MASTER_SITE_GOOGLECODE:=codeworker/} \
 			http://codeworker.free.fr/downloads/
 DISTNAME =		CodeWorker_SRC${V:S/./_/g}
 EXTRACT_SUFX =		.zip
--- a/devel/dissy/Makefile
+++ b/devel/dissy/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2013/10/11 23:48:24 naddy Exp $
+# $OpenBSD: Makefile,v 1.11 2016/10/01 11:54:15 naddy Exp $

 COMMENT =		graphical frontend to the objdump disassembler

@ -14,7 +14,7 @@ MAINTAINER =		Jonathan Armani <armani@openbsd.org>
 PERMIT_PACKAGE_CDROM =	Yes


-MASTER_SITES =	https://dissy.googlecode.com/files/
+MASTER_SITES =	${MASTER_SITE_GOOGLECODE:=dissy/}

 MODULES =	lang/python
 RUN_DEPENDS =	x11/py-gtk2
--- a/devel/gflags/Makefile
+++ b/devel/gflags/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2016/03/11 19:59:12 naddy Exp $
+# $OpenBSD: Makefile,v 1.10 2016/10/01 11:54:15 naddy Exp $
 # Original from: auclair.vincent

 COMMENT =		c++ commandline flags processing library
@ -18,7 +18,7 @@ MAINTAINER =		Vincent Auclair <auclair.vincent@gmail.com>
 # New BSD
 PERMIT_PACKAGE_CDROM =	Yes

-MASTER_SITES =		https://google-gflags.googlecode.com/files/
+MASTER_SITES =		${MASTER_SITE_GOOGLECODE:=google-gflags/}

 WANTLIB =		pthread m stdc++
 CONFIGURE_STYLE =	gnu
--- a/devel/gtest/Makefile
+++ b/devel/gtest/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2016/03/11 19:59:12 naddy Exp $
+# $OpenBSD: Makefile,v 1.11 2016/10/01 11:54:15 naddy Exp $

 COMMENT =	C++ unit test framework

@ -17,7 +17,7 @@ MAINTAINER =	Vincent Auclair <auclair.vincent@gmail.com>
 # New BSD
 PERMIT_PACKAGE_CDROM =	Yes

-MASTER_SITES =	https://googletest.googlecode.com/files/
+MASTER_SITES =	${MASTER_SITE_GOOGLECODE:=googletest/}

 SEPARATE_BUILD =	Yes

--- a/devel/ocaml-bitstring/Makefile
+++ b/devel/ocaml-bitstring/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2016/03/29 11:27:00 naddy Exp $
+# $OpenBSD: Makefile,v 1.6 2016/10/01 11:54:15 naddy Exp $

 COMMENT=		Erlang-style bitstrings for OCaml

@ -15,7 +15,7 @@ HOMEPAGE=		https://bitstring.googlecode.com/
 # examples and tests are public domain.
 PERMIT_PACKAGE_CDROM=   Yes

-MASTER_SITES=		https://bitstring.googlecode.com/files/
+MASTER_SITES=		${MASTER_SITE_GOOGLECODE:=bitstring/}

 MODULES=		lang/ocaml
 BUILD_DEPENDS=		sysutils/findlib lang/ocaml-camlp4
--- a/devel/protobuf/Makefile
+++ b/devel/protobuf/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2016/03/11 20:11:39 naddy Exp $
+# $OpenBSD: Makefile,v 1.15 2016/10/01 11:54:15 naddy Exp $

 COMMENT =		c++ protocol buffers

@ -20,7 +20,7 @@ PERMIT_PACKAGE_CDROM =	Yes

 WANTLIB +=	c m pthread stdc++ z

-MASTER_SITES =		https://protobuf.googlecode.com/files/
+MASTER_SITES =		${MASTER_SITE_GOOGLECODE:=protobuf/}

 TEST_DEPENDS =	devel/gtest

--- a/devel/py-mox/Makefile
+++ b/devel/py-mox/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2013/08/07 21:31:43 naddy Exp $
+# $OpenBSD: Makefile,v 1.9 2016/10/01 11:54:15 naddy Exp $

 COMMENT =	Mox is a mock object framework for Python

@ -9,7 +9,7 @@ REVISION =	0
 CATEGORIES =	devel

 HOMEPAGE =	https://code.google.com/p/pymox/
-MASTER_SITES =	https://pymox.googlecode.com/files/
+MASTER_SITES =	${MASTER_SITE_GOOGLECODE:=pymox/}

 # Apache 2.0
 PERMIT_PACKAGE_CDROM =	Yes
--- a/devel/py-progressbar/Makefile
+++ b/devel/py-progressbar/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2016/01/26 13:29:11 sthen Exp $
+# $OpenBSD: Makefile,v 1.13 2016/10/01 11:54:15 naddy Exp $

 COMMENT =		text progressbar library for python

@ -19,7 +19,7 @@ MODULES =		lang/python
 MODPY_SETUPTOOLS =	Yes

 # pypi distfile doesn't match the old googlecode one; switch if updating
-MASTER_SITES =		https://python-progressbar.googlecode.com/files/
+MASTER_SITES =		${MASTER_SITE_GOOGLECODE:=python-progressbar/}
 #MODPY_PI =		Yes

 NO_TEST =		Yes
--- a/devel/pybugz/Makefile
+++ b/devel/pybugz/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2013/08/07 21:31:45 naddy Exp $
+# $OpenBSD: Makefile,v 1.10 2016/10/01 11:54:15 naddy Exp $

 COMMENT =		Commandline client for Bugzilla bug tracking systems

@ -12,7 +12,7 @@ HOMEPAGE =		http://www.liquidx.net/pybugz/
 # GPLv2
 PERMIT_PACKAGE_CDROM =	Yes

-MASTER_SITES =		https://pybugz.googlecode.com/files/
+MASTER_SITES =		${MASTER_SITE_GOOGLECODE:=pybugz/}

 MODULES =		lang/python

--- a/devel/rlog/Makefile
+++ b/devel/rlog/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2015/05/22 11:31:13 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.4 2016/10/01 11:54:15 naddy Exp $

 COMMENT =		C++ logging library
 DISTNAME =		rlog-1.4
@ -11,7 +11,7 @@ REVISION =		0
 PERMIT_PACKAGE_CDROM =	Yes

 WANTLIB =		m pthread stdc++
-MASTER_SITES =		http://rlog.googlecode.com/files/
+MASTER_SITES =		${MASTER_SITE_GOOGLECODE:=rlog/}
 CONFIGURE_STYLE =	gnu

 .include <bsd.port.mk>
--- a/devel/shunit2/Makefile
+++ b/devel/shunit2/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2014/12/31 11:14:17 rpe Exp $
+# $OpenBSD: Makefile,v 1.2 2016/10/01 11:54:15 naddy Exp $

 COMMENT =		unit test framework for Bourne based shell scripts

@ -13,7 +13,7 @@ MAINTAINER =		Robert Peichaer <rpe@openbsd.org>
 # LGPLv2.1
 PERMIT_PACKAGE_CDROM =	Yes

-MASTER_SITES =		https://shunit2.googlecode.com/files/
+MASTER_SITES =		${MASTER_SITE_GOOGLECODE:=shunit2/}

 EXTRACT_SUFX =		.tgz

--- a/devel/sparsehash/Makefile
+++ b/devel/sparsehash/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2016/09/01 10:53:27 jasper Exp $
+# $OpenBSD: Makefile,v 1.11 2016/10/01 11:54:15 naddy Exp $

 # g++3 chokes on the code
 NOT_FOR_ARCHS=	${GCC3_ARCHS}
@ -12,7 +12,7 @@ REVISION =		3
 # 3-clause BSDL
 PERMIT_PACKAGE_CDROM =	Yes

-MASTER_SITES =		https://sparsehash.googlecode.com/files/
+MASTER_SITES =		${MASTER_SITE_GOOGLECODE:=sparsehash/}

 SEPARATE_BUILD =	Yes
 CONFIGURE_STYLE =	gnu
--- a/devel/ucpp/Makefile
+++ b/devel/ucpp/Makefile
@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.11 2014/01/01 20:46:28 naddy Exp $
+# $OpenBSD: Makefile,v 1.12 2016/10/01 11:54:15 naddy Exp $

 DISTNAME =	ucpp-1.3.2
 REVISION =	0
 COMMENT =	C preprocessor and lexer
 CATEGORIES =	devel
 HOMEPAGE =	https://code.google.com/p/ucpp
-MASTER_SITES =	https://ucpp.googlecode.com/files/
+MASTER_SITES =	${MASTER_SITE_GOOGLECODE:=ucpp/}

 PERMIT_PACKAGE_CDROM =	Yes
 WANTLIB =		c
--- a/editors/texworks/Makefile
+++ b/editors/texworks/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.28 2016/03/26 20:37:35 zhuk Exp $
+# $OpenBSD: Makefile,v 1.29 2016/10/01 11:54:15 naddy Exp $

 COMMENT-main =		easy to use LaTeX and ConTeXt editor
 COMMENT-python =	Python scripting for TeXworks
@ -48,7 +48,7 @@ WANTLIB-python += fontconfig freetype m stdc++ pthread

 MULTI_PACKAGES =	-main -lua -python

-MASTER_SITES =		https://texworks.googlecode.com/files/
+MASTER_SITES =		${MASTER_SITE_GOOGLECODE:=texworks/}

 LIB_DEPENDS-main =	qt4->=4.8.2:${MODQT4_LIB_DEPENDS} \
 			textproc/hunspell \
--- a/games/choria/Makefile
+++ b/games/choria/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2016/09/23 09:16:54 sthen Exp $
+# $OpenBSD: Makefile,v 1.6 2016/10/01 11:54:15 naddy Exp $

 BROKEN-mips64el =	Bus error on startup, no core file left

@ -16,7 +16,7 @@ PERMIT_PACKAGE_CDROM =		Yes

 WANTLIB += Irrlicht c m pthread sqlite3 stdc++

-MASTER_SITES =	https://choria.googlecode.com/files/
+MASTER_SITES =	${MASTER_SITE_GOOGLECODE:=choria/}

 MODULES =	devel/cmake

--- a/games/pingus/Makefile
+++ b/games/pingus/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2016/09/12 22:20:36 naddy Exp $
+# $OpenBSD: Makefile,v 1.13 2016/10/01 11:54:15 naddy Exp $

 COMMENT=	free Lemmings-like game

@ -9,7 +9,7 @@ CATEGORIES=	games x11
 EXTRACT_SUFX=	.tar.bz2

 HOMEPAGE=	http://pingus.seul.org/
-MASTER_SITES=	https://pingus.googlecode.com/files/
+MASTER_SITES=	${MASTER_SITE_GOOGLECODE:=pingus/}

 # GPLv2
 PERMIT_PACKAGE_CDROM=	Yes
--- a/games/singularity/Makefile
+++ b/games/singularity/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2014/08/10 09:58:05 espie Exp $
+# $OpenBSD: Makefile,v 1.16 2016/10/01 11:54:15 naddy Exp $

 COMMENT=	simulation of a true AI

@ -19,7 +19,7 @@ HOMEPAGE=	http://emhsoft.com/singularity/
 # music under CC Attribution-ShareAlike 3.0 Unported
 PERMIT_PACKAGE_CDROM=	Yes

-MASTER_SITES=	https://endgame-singularity.googlecode.com/files/
+MASTER_SITES=	${MASTER_SITE_GOOGLECODE:=endgame-singularity/}

 WRKDIST=	${WRKDIR}/singularity-${V}
 NO_TEST=	Yes
--- a/geo/gmapcatcher/Makefile
+++ b/geo/gmapcatcher/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.25 2015/09/28 20:19:20 sthen Exp $
+# $OpenBSD: Makefile,v 1.26 2016/10/01 11:54:15 naddy Exp $

 COMMENT=	offline maps viewer

@ -14,7 +14,7 @@ HOMEPAGE=	https://code.google.com/p/gmapcatcher/
 # GPLv2+
 PERMIT_PACKAGE_CDROM=   Yes

-MASTER_SITES=	https://gmapcatcher.googlecode.com/files/
+MASTER_SITES=	${MASTER_SITE_GOOGLECODE:=gmapcatcher/}

 MODULES=	lang/python

--- a/graphics/delaboratory/Makefile
+++ b/graphics/delaboratory/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2016/09/13 15:29:01 naddy Exp $
+# $OpenBSD: Makefile,v 1.6 2016/10/01 11:54:15 naddy Exp $

 COMMENT =	color correction utility for digital images
 DISTNAME =	delaboratory-0.8
@ -14,7 +14,7 @@ WANTLIB += c iconv m pthread stdc++ tiff wx_base wx_base_net wx_base_odbc
 WANTLIB += wx_base_xml wx_gtk2_adv wx_gtk2_aui wx_gtk2_core wx_gtk2_dbgrid
 WANTLIB += wx_gtk2_html wx_gtk2_qa wx_gtk2_richtext wx_gtk2_xrc xml2 z

-MASTER_SITES =	https://delaboratory.googlecode.com/files/
+MASTER_SITES =	${MASTER_SITE_GOOGLECODE:=delaboratory/}

 LIB_DEPENDS =	converters/libiconv \
 		textproc/libxml \
--- a/graphics/ffmpegthumbnailer/Makefile
+++ b/graphics/ffmpegthumbnailer/Makefile
@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.28 2016/07/09 09:09:10 sthen Exp $
+# $OpenBSD: Makefile,v 1.29 2016/10/01 11:54:15 naddy Exp $

 COMMENT=	lightweight video thumbnailer for file managers

 DISTNAME=	ffmpegthumbnailer-2.0.8
 REVISION=	4
 CATEGORIES=	graphics multimedia
-MASTER_SITES=	https://ffmpegthumbnailer.googlecode.com/files/
+MASTER_SITES=	${MASTER_SITE_GOOGLECODE:=ffmpegthumbnailer/}

 SHARED_LIBS=	ffmpegthumbnailer	4.1

--- a/graphics/fotowall/Makefile
+++ b/graphics/fotowall/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2016/08/30 15:19:49 awolk Exp $
+# $OpenBSD: Makefile,v 1.2 2016/10/01 11:54:15 naddy Exp $

 COMMENT =	Pictures collage & creativity tool

@ -17,7 +17,7 @@ WANTLIB += GL ICE QtGui QtNetwork QtOpenGL QtSvg QtXml SM X11
 WANTLIB += Xext Xi Xinerama Xrender c fontconfig freetype m pthread
 WANTLIB += stdc++

-MASTER_SITES =		https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/fotowall/
+MASTER_SITES =		${MASTER_SITE_GOOGLECODE:=fotowall/}

 EXTRACT_SUFX =		.tar.bz2

--- a/graphics/openjpeg/Makefile
+++ b/graphics/openjpeg/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.22 2016/03/09 18:29:10 naddy Exp $
+# $OpenBSD: Makefile,v 1.23 2016/10/01 11:54:15 naddy Exp $

 COMMENT=		open-source JPEG 2000 codec library

@ -18,7 +18,7 @@ PERMIT_PACKAGE_CDROM=	Yes

 WANTLIB += c jpeg lcms2 m png pthread tiff z

-MASTER_SITES=		https://openjpeg.googlecode.com/files/
+MASTER_SITES=		${MASTER_SITE_GOOGLECODE:=openjpeg/}

 CONFIGURE_STYLE=	gnu
 SEPARATE_BUILD=		Yes
--- a/graphics/py-dot/Makefile
+++ b/graphics/py-dot/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.18 2016/03/13 08:12:14 shadchin Exp $
+# $OpenBSD: Makefile,v 1.19 2016/10/01 11:54:15 naddy Exp $

 COMMENT=	Python interface to Graphviz's Dot#'

@ -13,7 +13,7 @@ HOMEPAGE=	https://github.com/erocarrera/pydot
 # MIT
 PERMIT_PACKAGE_CDROM=	Yes

-MASTER_SITES=	https://pydot.googlecode.com/files/
+MASTER_SITES=	${MASTER_SITE_GOOGLECODE:=pydot/}

 MODULES=	lang/python

--- a/graphics/py-graphics/Makefile
+++ b/graphics/py-graphics/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2015/03/26 12:14:15 sthen Exp $
+# $OpenBSD: Makefile,v 1.15 2016/10/01 11:54:15 naddy Exp $

 COMMENT=	multimedia framework for Python

@ -15,7 +15,7 @@ HOMEPAGE=	https://code.google.com/p/pygraphics/
 # GPLv2
 PERMIT_PACKAGE_CDROM=	Yes

-MASTER_SITES=	https://pygraphics.googlecode.com/files/
+MASTER_SITES=	${MASTER_SITE_GOOGLECODE:=pygraphics/}

 MODULES=	lang/python

--- a/infrastructure/templates/network.conf.template
+++ b/infrastructure/templates/network.conf.template
@ -1,4 +1,4 @@
-# $OpenBSD: network.conf.template,v 1.207 2016/06/05 11:02:25 sthen Exp $
+# $OpenBSD: network.conf.template,v 1.208 2016/10/01 11:54:16 naddy Exp $

 #
 # NEVER EDIT THIS FILE DIRECTLY!!!!
@ -238,3 +238,6 @@ MASTER_SITES_GNUPG += \
 	https://www.gnupg.org/ftp/gcrypt/ \
 	http://mirrors.dotsrc.org/gcrypt/ \
 	ftp://ftp.gnupg.org/gcrypt/
+
+MASTER_SITE_GOOGLECODE += \
+	https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/
--- a/inputmethods/ibus-anthy/Makefile
+++ b/inputmethods/ibus-anthy/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2015/03/27 08:43:02 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.18 2016/10/01 11:54:16 naddy Exp $

 COMMENT =	japanese input engine for ibus

@ -18,7 +18,7 @@ PERMIT_PACKAGE_CDROM =	Yes

 WANTLIB =	anthy anthydic ffi glib-2.0 gobject-2.0 m pcre pthread

-MASTER_SITES =	https://ibus.googlecode.com/files/
+MASTER_SITES =	${MASTER_SITE_GOOGLECODE:=ibus/}

 MODULES =	devel/gettext \
 		lang/python \
--- a/inputmethods/ibus/Makefile
+++ b/inputmethods/ibus/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.49 2016/03/20 16:12:24 naddy Exp $
+# $OpenBSD: Makefile,v 1.50 2016/10/01 11:54:16 naddy Exp $

 COMMENT =	intelligent input bus framework

@ -25,7 +25,7 @@ WANTLIB += gtk-x11-2.0 harfbuzz m notify pango-1.0 pangocairo-1.0
 WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread pthread-stubs xcb
 WANTLIB += xcb-render xcb-shm z

-MASTER_SITES =	https://ibus.googlecode.com/files/
+MASTER_SITES =	${MASTER_SITE_GOOGLECODE:=ibus/}

 MODULES =	devel/dconf \
 		devel/gconf2 \
--- a/japanese/mecab/Makefile
+++ b/japanese/mecab/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2016/04/29 11:19:35 naddy Exp $
+# $OpenBSD: Makefile,v 1.13 2016/10/01 11:54:16 naddy Exp $

 # .libs/libmecab.so.0.0: undefined reference to `__sync_val_compare_and_swap_4'
 # .libs/libmecab.so.0.0: undefined reference to `__sync_add_and_fetch_4'
@ -27,7 +27,7 @@ MULTI_PACKAGES = -main -ipadic
 WANTLIB-main =	c iconv m pthread stdc++
 WANTLIB-ipadic =

-MASTER_SITES =	https://mecab.googlecode.com/files/
+MASTER_SITES =	${MASTER_SITE_GOOGLECODE:=mecab/}

 DISTFILES =	${DISTNAME}${EXTRACT_SUFX} \
 		${PKGNAME-ipadic}-${IPADIC_VER}.tar.gz
--- a/lang/processing/Makefile
+++ b/lang/processing/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2016/03/18 23:12:18 naddy Exp $
+# $OpenBSD: Makefile,v 1.12 2016/10/01 11:54:16 naddy Exp $

 COMMENT=		language/IDE for images, animations and interactions

@ -15,7 +15,7 @@ HOMEPAGE=		http://processing.org/
 # Core libraries: LGPL
 PERMIT_PACKAGE_CDROM=	Yes

-MASTER_SITES=		https://processing.googlecode.com/files/
+MASTER_SITES=		${MASTER_SITE_GOOGLECODE:=processing/}
 EXTRACT_SUFX=		.tgz

 RUN_DEPENDS=		devel/desktop-file-utils
--- a/math/foma/Makefile
+++ b/math/foma/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2013/03/22 18:10:59 naddy Exp $
+# $OpenBSD: Makefile,v 1.4 2016/10/01 11:54:16 naddy Exp $

 COMMENT =		finite-state compiler and C library

@ -17,7 +17,7 @@ PERMIT_PACKAGE_CDROM =		Yes

 WANTLIB +=		c readline termcap z

-MASTER_SITES =		https://foma.googlecode.com/files/
+MASTER_SITES =		${MASTER_SITE_GOOGLECODE:=foma/}

 MAKE_FLAGS =		CC="${CC}" \
 			CFLAGS="${CFLAGS}" \
--- a/math/geogebra/Makefile
+++ b/math/geogebra/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2015/09/18 19:03:24 jasper Exp $
+# $OpenBSD: Makefile,v 1.7 2016/10/01 11:54:16 naddy Exp $

 COMMENT=	educational mathematical software

@ -20,7 +20,7 @@ PERMIT_PACKAGE_CDROM=	No
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILE_FTP=	Yes

-MASTER_SITES=		https://geogebra.googlecode.com/files/
+MASTER_SITES=		${MASTER_SITE_GOOGLECODE:=geogebra/}

 MODULES=		java
 MODJAVA_VER=		1.7+
--- a/misc/p5-Umph-Prompt/Makefile
+++ b/misc/p5-Umph-Prompt/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2013/03/11 11:23:58 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2016/10/01 11:54:16 naddy Exp $

 COMMENT =		interactive prompt module

@ -12,7 +12,7 @@ HOMEPAGE =		https://code.google.com/p/umph/
 # LGPLv2.1+
 PERMIT_PACKAGE_CDROM =		Yes

-MASTER_SITES =		https://umph.googlecode.com/files/
+MASTER_SITES =		${MASTER_SITE_GOOGLECODE:=umph/}

 CONFIGURE_STYLE =	perl

--- a/multimedia/libmp4v2/Makefile
+++ b/multimedia/libmp4v2/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2016/03/11 19:59:15 naddy Exp $
+# $OpenBSD: Makefile,v 1.11 2016/10/01 11:54:16 naddy Exp $

 COMMENT =		read and manipulate the MP4 container format

@ -17,7 +17,7 @@ PERMIT_PACKAGE_FTP =	Yes

 WANTLIB =		c m stdc++

-MASTER_SITES =		https://mp4v2.googlecode.com/files/
+MASTER_SITES =		${MASTER_SITE_GOOGLECODE:=mp4v2/}
 EXTRACT_SUFX =		.tar.bz2

 BUILD_DEPENDS =		devel/help2man
--- a/net/flow-tools/Makefile
+++ b/net/flow-tools/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.33 2015/02/16 22:57:10 naddy Exp $
+# $OpenBSD: Makefile,v 1.34 2016/10/01 11:54:16 naddy Exp $

 SHARED_LIBS +=  ft                   0.0      # .0.0

@ -14,7 +14,7 @@ MAINTAINER=	Stuart Henderson <sthen@openbsd.org>
 # forked from:  http://www.splintered.net/sw/flow-tools/
 HOMEPAGE=	https://code.google.com/p/flow-tools/

-MASTER_SITES=	https://flow-tools.googlecode.com/files/
+MASTER_SITES=	${MASTER_SITE_GOOGLECODE:=flow-tools/}

 PERMIT_PACKAGE_CDROM=	Yes

--- a/net/grake/Makefile
+++ b/net/grake/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2013/03/11 11:35:47 espie Exp $
+# $OpenBSD: Makefile,v 1.4 2016/10/01 11:54:16 naddy Exp $

 COMMENT =		tool for scanning webpages for Youtube links

@ -12,7 +12,7 @@ HOMEPAGE =		https://code.google.com/p/grake/
 # GPLv3+
 PERMIT_PACKAGE_CDROM =		Yes

-MASTER_SITES =		https://grake.googlecode.com/files/
+MASTER_SITES =		${MASTER_SITE_GOOGLECODE:=grake/}

 RUN_DEPENDS =		devel/p5-Getopt-ArgvFile \
 			misc/p5-Umph-Prompt \
--- a/net/libdnet/Makefile
+++ b/net/libdnet/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.44 2016/03/12 20:18:26 naddy Exp $
+# $OpenBSD: Makefile,v 1.45 2016/10/01 11:54:16 naddy Exp $

 COMMENT-main=	portable low-level networking library
 COMMENT-python= python interface to libdnet
@ -19,7 +19,7 @@ PERMIT_PACKAGE_CDROM=	Yes

 WANTLIB=		c

-MASTER_SITES=		https://libdnet.googlecode.com/files/
+MASTER_SITES=		${MASTER_SITE_GOOGLECODE:=libdnet/}
 EXTRACT_SUFX=		.tgz

 PSEUDO_FLAVORS=		no_python
--- a/net/openvpn-auth-ldap/Makefile
+++ b/net/openvpn-auth-ldap/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2016/03/17 11:44:56 sthen Exp $
+# $OpenBSD: Makefile,v 1.7 2016/10/01 11:54:16 naddy Exp $

 COMMENT =		LDAP authentication plugin for OpenVPN 2.x

@ -17,7 +17,7 @@ PERMIT_PACKAGE_CDROM =	 Yes

 WANTLIB =		lber ldap objc

-MASTER_SITES =		https://openvpn-auth-ldap.googlecode.com/files/
+MASTER_SITES =		${MASTER_SITE_GOOGLECODE:=openvpn-auth-ldap/}

 RUN_DEPENDS =		net/openvpn
 LIB_DEPENDS =		databases/openldap
--- a/net/p5-SNMP_Session/Makefile
+++ b/net/p5-SNMP_Session/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.22 2016/03/20 19:56:57 naddy Exp $
+# $OpenBSD: Makefile,v 1.23 2016/10/01 11:54:16 naddy Exp $

 COMMENT=	provides rudimentary access to remote SNMP agents

@ -9,7 +9,7 @@ REVISION=	6
 CATEGORIES=	net

 HOMEPAGE=	https://github.com/sleinen/snmp-session
-MASTER_SITES=	https://snmp-session.googlecode.com/files/
+MASTER_SITES=	${MASTER_SITE_GOOGLECODE:=snmp-session/}

 # Artistic License 2.0
 PERMIT_PACKAGE_CDROM=   Yes
--- a/net/py-dpkt/Makefile
+++ b/net/py-dpkt/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2014/10/22 18:06:47 jasper Exp $
+# $OpenBSD: Makefile,v 1.12 2016/10/01 11:54:16 naddy Exp $

 COMMENT =		python network packet manipulation library

@ -16,7 +16,7 @@ MAINTAINER =		Thanasoulas Spiros <dsp@2f30.org>
 # BSD
 PERMIT_PACKAGE_CDROM =	Yes

-MASTER_SITES =		https://dpkt.googlecode.com/files/
+MASTER_SITES =		${MASTER_SITE_GOOGLECODE:=dpkt/}

 MODULES =		lang/python

--- a/net/py-flowtools/Makefile
+++ b/net/py-flowtools/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2016/03/20 16:12:25 naddy Exp $
+# $OpenBSD: Makefile,v 1.18 2016/10/01 11:54:16 naddy Exp $

 COMMENT=	python interface to flow-tools file format

@ -14,7 +14,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 WANTLIB+=	z ft ${MODPY_WANTLIB} pthread

 HOMEPAGE=	https://code.google.com/p/pyflowtools/
-MASTER_SITES=	https://pyflowtools.googlecode.com/files/
+MASTER_SITES=	${MASTER_SITE_GOOGLECODE:=pyflowtools/}

 LIB_DEPENDS=	net/flow-tools
 MODULES=	lang/python
--- a/net/softflowd/Makefile
+++ b/net/softflowd/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2014/07/22 10:55:41 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.10 2016/10/01 11:54:16 naddy Exp $

 COMMENT=	flow-based network traffic analyser

@ -11,7 +11,7 @@ HOMEPAGE=	https://code.google.com/p/softflowd/
 # BSD
 PERMIT_PACKAGE_CDROM=	Yes

-MASTER_SITES=	https://softflowd.googlecode.com/files/
+MASTER_SITES=	${MASTER_SITE_GOOGLECODE:=softflowd/}

 WANTLIB=	c pcap

--- a/net/tircd/Makefile
+++ b/net/tircd/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2013/10/11 23:50:36 naddy Exp $
+# $OpenBSD: Makefile,v 1.7 2016/10/01 11:54:16 naddy Exp $

 COMMENT=	ircd proxy to the twitter API

@ -13,7 +13,7 @@ HOMEPAGE=	https://code.google.com/p/tircd/
 # perl
 PERMIT_PACKAGE_CDROM=	Yes

-MASTER_SITES=	https://tircd.googlecode.com/files/
+MASTER_SITES=	${MASTER_SITE_GOOGLECODE:=tircd/}

 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	net/p5-Net-Twitter
--- a/net/torsocks/Makefile
+++ b/net/torsocks/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2016/05/07 12:40:58 pascal Exp $
+# $OpenBSD: Makefile,v 1.9 2016/10/01 11:54:16 naddy Exp $

 COMMENT =		socks proxy for use with tor

@ -18,7 +18,7 @@ PERMIT_PACKAGE_CDROM =	Yes

 WANTLIB += pthread

-MASTER_SITES =		https://torsocks.googlecode.com/files/
+MASTER_SITES =		${MASTER_SITE_GOOGLECODE:=torsocks/}

 RUN_DEPENDS =		net/tor

--- a/net/unworkable/Makefile
+++ b/net/unworkable/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2013/08/07 21:32:30 naddy Exp $
+# $OpenBSD: Makefile,v 1.14 2016/10/01 11:54:16 naddy Exp $

 COMMENT=		simple BitTorrent implementation

@ -14,7 +14,7 @@ MAINTAINER=		Niall O Higgins <niallo@openbsd.org>
 # BSD
 PERMIT_PACKAGE_CDROM=	Yes

-MASTER_SITES=		https://unworkable.googlecode.com/files/
+MASTER_SITES=		${MASTER_SITE_GOOGLECODE:=unworkable/}

 WRKDIST=		${WRKDIR}/unworkable
 WANTLIB=		c crypto event
--- a/print/apvlv/Makefile
+++ b/print/apvlv/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2015/01/22 13:11:44 naddy Exp $
+# $OpenBSD: Makefile,v 1.13 2016/10/01 11:54:16 naddy Exp $

 COMMENT=	lightweight PDF document viewer with vi bindings

@ -7,7 +7,7 @@ REVISION=	6
 CATEGORIES=	print
 HOMEPAGE=	https://code.google.com/p/apvlv/

-MASTER_SITES=	https://apvlv.googlecode.com/files/
+MASTER_SITES=	${MASTER_SITE_GOOGLECODE:=apvlv/}

 # GPLv2
 PERMIT_PACKAGE_CDROM=   Yes
--- a/print/detex/Makefile
+++ b/print/detex/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.31 2016/02/28 14:59:14 czarkoff Exp $
+# $OpenBSD: Makefile,v 1.32 2016/10/01 11:54:16 naddy Exp $

 COMMENT=		strip TeX/LaTeX codes from a file

@ -7,7 +7,7 @@ PKGNAME=		detex-2.8.1
 CATEGORIES=		print

 HOMEPAGE=		https://code.google.com/archive/p/opendetex/
-MASTER_SITES=		https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/opendetex/
+MASTER_SITES=		${MASTER_SITE_GOOGLECODE:=opendetex/}

 EXTRACT_SUFX=		.tar.bz2

--- a/productivity/akonadi-googledata/Makefile
+++ b/productivity/akonadi-googledata/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2015/08/12 12:33:02 zhuk Exp $
+# $OpenBSD: Makefile,v 1.5 2016/10/01 11:54:17 naddy Exp $

 CATEGORIES =	productivity
 COMMENT =	Google contacts/calendar connector for Akonadi
@ -14,7 +14,7 @@ WANTLIB += ${KDE4LIB}/akonadi-kde ${KDE4LIB}/kabc ${KDE4LIB}/kcal
 WANTLIB += ${KDE4LIB}/kdeui ${KDE4LIB}/kio ${KDE4LIB}/kresources
 WANTLIB += gcal

-MASTER_SITES =	https://libgcal.googlecode.com/files/
+MASTER_SITES =	${MASTER_SITE_GOOGLECODE:=libgcal/}
 EXTRACT_SUFX =	.tar.bz2

 # LGPLv2.1+
--- a/productivity/libgcal/Makefile
+++ b/productivity/libgcal/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2016/03/11 19:59:16 naddy Exp $
+# $OpenBSD: Makefile,v 1.6 2016/10/01 11:54:17 naddy Exp $

 CATEGORIES =		productivity devel
 COMMENT =		C library for Google calendar and contacts
@ -13,7 +13,7 @@ PERMIT_PACKAGE_CDROM =	Yes

 WANTLIB += crypto curl idn lzma m nghttp2 pthread ssl xml2 z

-MASTER_SITES =		https://libgcal.googlecode.com/files/
+MASTER_SITES =		${MASTER_SITE_GOOGLECODE:=libgcal/}
 EXTRACT_SUFX =		.tar.bz2

 CONFIGURE_STYLE =	gnu
--- a/security/bunny/Makefile
+++ b/security/bunny/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2015/10/13 06:29:38 bentley Exp $
+# $OpenBSD: Makefile,v 1.7 2016/10/01 11:54:17 naddy Exp $

 ONLY_FOR_ARCHS=	i386 amd64

@ -17,7 +17,7 @@ HOMEPAGE=	https://code.google.com/p/bunny-the-fuzzer/
 PERMIT_PACKAGE_CDROM=	Yes
 WANTLIB=		c m crypto

-MASTER_SITES=	https://bunny-the-fuzzer.googlecode.com/files/
+MASTER_SITES=	${MASTER_SITE_GOOGLECODE:=bunny-the-fuzzer/}

 WRKDIST=	${WRKDIR}/bunny
 TEST_TARGET=	test1 test2 test3
--- a/security/encfs/Makefile
+++ b/security/encfs/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2016/03/11 20:28:30 naddy Exp $
+# $OpenBSD: Makefile,v 1.8 2016/10/01 11:54:17 naddy Exp $

 BROKEN-hppa =	configure: error: Could not link against boost_serialization-boost_serialization
 BROKEN-sparc64 =	configure: error: Could not link against boost_serialization-boost_serialization
@ -15,7 +15,7 @@ PERMIT_PACKAGE_CDROM =	Yes
 WANTLIB = 		boost_filesystem boost_serialization boost_system c \
 			crypto fuse m pthread rlog ssl stdc++

-MASTER_SITES =		http://encfs.googlecode.com/files/
+MASTER_SITES =		${MASTER_SITE_GOOGLECODE:=encfs/}
 EXTRACT_SUFX =		.tgz

 MODULES =		devel/gettext
--- a/security/py-pefile/Makefile
+++ b/security/py-pefile/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2016/01/26 13:05:27 sthen Exp $
+# $OpenBSD: Makefile,v 1.7 2016/10/01 11:54:17 naddy Exp $

 COMMENT =		Python module to read and work with PE files

@ -18,7 +18,7 @@ PERMIT_PACKAGE_CDROM =	Yes
 PERMIT_PACKAGE_FTP =	Yes
 PERMIT_DISTFILES_FTP =	Yes

-MASTER_SITES =		https://pefile.googlecode.com/files/
+MASTER_SITES =		${MASTER_SITE_GOOGLECODE:=pefile/}

 MODULES =		lang/python
 MODPY_SETUPTOOLS = 	Yes
--- a/security/yubiserve/Makefile
+++ b/security/yubiserve/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2016/09/23 09:16:57 sthen Exp $
+# $OpenBSD: Makefile,v 1.12 2016/10/01 11:54:17 naddy Exp $

 COMMENT=	standalone Yubikey and OATH/HOTP validation server
 DISTNAME=	yubico-yubiserve-3.1
@ -16,7 +16,7 @@ MAINTAINER=	Stuart Henderson <sthen@openbsd.org>
 # GPLv3
 PERMIT_PACKAGE_CDROM=	Yes

-MASTER_SITES=	https://yubico-yubiserve.googlecode.com/files/
+MASTER_SITES=	${MASTER_SITE_GOOGLECODE:=yubico-yubiserve/}

 MODULES=	lang/python
 BUILD_DEPENDS=	databases/sqlite3
--- a/sysutils/py-lockfile/Makefile
+++ b/sysutils/py-lockfile/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2016/04/16 13:36:15 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.14 2016/10/01 11:54:17 naddy Exp $

 COMMENT=		platform-independent file locking for Python

@ -14,8 +14,6 @@ HOMEPAGE=		https://launchpad.net/pylockfile
 # MIT
 PERMIT_PACKAGE_CDROM=	Yes

-MASTER_SITES=		https://pylockfile.googlecode.com/files/
-
 MODULES=		lang/python

 BUILD_DEPENDS=		devel/py-pbr${MODPY_FLAVOR}
--- a/textproc/iksemel/Makefile
+++ b/textproc/iksemel/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.20 2016/07/09 08:57:11 sthen Exp $
+# $OpenBSD: Makefile,v 1.21 2016/10/01 11:54:17 naddy Exp $

 COMMENT=		XML parser designed for Jabber applications
 DISTNAME=		iksemel-1.4
@ -17,7 +17,7 @@ PERMIT_PACKAGE_CDROM=	Yes

 WANTLIB += c ffi gmp gnutls hogweed idn nettle p11-kit pthread tasn1 z

-MASTER_SITES=		https://iksemel.googlecode.com/files/
+MASTER_SITES=		${MASTER_SITE_GOOGLECODE:=iksemel/}

 MODULES=		devel/gettext

--- a/textproc/py-prettytable/Makefile
+++ b/textproc/py-prettytable/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2015/09/29 10:52:53 sthen Exp $
+# $OpenBSD: Makefile,v 1.8 2016/10/01 11:54:17 naddy Exp $

 COMMENT =	Python library for pretty-printing tabular data

@ -10,7 +10,7 @@ REVISION =		0

 MAINTAINER =	Edd Barrett <edd@openbsd.org>

-MASTER_SITES =	https://prettytable.googlecode.com/files/
+MASTER_SITES =	${MASTER_SITE_GOOGLECODE:=prettytable/}
 HOMEPAGE =	https://code.google.com/p/prettytable/

 PKG_ARCH =	*
--- a/textproc/txt2tags/Makefile
+++ b/textproc/txt2tags/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2015/10/09 12:48:22 jasper Exp $
+# $OpenBSD: Makefile,v 1.22 2016/10/01 11:54:17 naddy Exp $

 COMMENT=	utility to turn simply formatted text into markup

@ -13,7 +13,7 @@ MAINTAINER=	Matthias Kilian <kili@openbsd.org>
 # GPLv2
 PERMIT_PACKAGE_CDROM=	Yes

-MASTER_SITES=	https://txt2tags.googlecode.com/files/
+MASTER_SITES=	${MASTER_SITE_GOOGLECODE:=txt2tags/}
 EXTRACT_SUFX=	.tgz

 MODULES=	lang/python
--- a/textproc/uchardet/Makefile
+++ b/textproc/uchardet/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2015/05/22 11:31:19 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.4 2016/10/01 11:54:17 naddy Exp $

 COMMENT=	universal charset detection library and tool

@ -16,7 +16,7 @@ PERMIT_PACKAGE_CDROM=	Yes

 WANTLIB += c m stdc++

-MASTER_SITES=	https://uchardet.googlecode.com/files/
+MASTER_SITES=	${MASTER_SITE_GOOGLECODE:=uchardet/}

 MODULES=	devel/cmake

--- a/www/ap2-mod_wsgi/Makefile
+++ b/www/ap2-mod_wsgi/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2016/03/20 16:12:26 naddy Exp $
+# $OpenBSD: Makefile,v 1.5 2016/10/01 11:54:17 naddy Exp $

 COMMENT=	Python WSGI compliant interface module for Apache2

@ -15,7 +15,7 @@ PERMIT_PACKAGE_CDROM=	Yes

 WANTLIB += m pthread ${MODPY_WANTLIB} util

-MASTER_SITES=	http://modwsgi.googlecode.com/files/
+MASTER_SITES=	${MASTER_SITE_GOOGLECODE:=modwsgi/}

 MODULES=	lang/python

--- a/www/drupal6/jquery_ui/Makefile
+++ b/www/drupal6/jquery_ui/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2016/06/30 11:48:25 espie Exp $
+# $OpenBSD: Makefile,v 1.10 2016/10/01 11:54:17 naddy Exp $

 COMMENT =	wrapper module around the jQuery UI effects library
 MAINTAINER =	Marc Espie <espie@openbsd.org>
@ -10,7 +10,7 @@ REVISION =	0

 EXTRACT_SUFX0 =	.zip

-MASTER_SITES0 = https://jquery-ui.googlecode.com/files/
+MASTER_SITES0 = ${MASTER_SITE_GOOGLECODE:=jquery-ui/}

 DISTFILES +=	${DISTNAME}${EXTRACT_SUFX} \
 		${DISTNAME0}${EXTRACT_SUFX0}:0
--- a/www/gcap/Makefile
+++ b/www/gcap/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2013/03/11 11:44:42 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2016/10/01 11:54:17 naddy Exp $

 COMMENT =		Youtube closed caption downloader

@ -11,7 +11,7 @@ HOMEPAGE =		https://code.google.com/p/gcap/
 # GPLv3+
 PERMIT_PACKAGE_CDROM =		Yes

-MASTER_SITES =		https://gcap.googlecode.com/files/
+MASTER_SITES =		${MASTER_SITE_GOOGLECODE:=gcap/}

 RUN_DEPENDS =		devel/p5-Getopt-ArgvFile \
 			misc/p5-Umph-Prompt \
--- a/www/mollify/Makefile
+++ b/www/mollify/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2015/06/05 06:00:22 robert Exp $
+# $OpenBSD: Makefile,v 1.16 2016/10/01 11:54:17 naddy Exp $

 COMMENT=	simple and clean multi-user web file manager

@ -15,7 +15,7 @@ HOMEPAGE=	http://www.mollify.org/
 PERMIT_PACKAGE_CDROM=	No
 PERMIT_PACKAGE_FTP=	Yes

-MASTER_SITES=	https://mollify.googlecode.com/files/
+MASTER_SITES=	${MASTER_SITE_GOOGLECODE:=mollify/}

 NO_BUILD=	Yes
 NO_TEST=	Yes
--- a/www/sabredav/Makefile
+++ b/www/sabredav/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2015/06/05 06:00:23 robert Exp $
+# $OpenBSD: Makefile,v 1.16 2016/10/01 11:54:17 naddy Exp $

 COMMENT =	php5 WebDAV server
 DISTNAME =	SabreDAV-1.8.7
@ -13,7 +13,7 @@ HOMEPAGE =	https://code.google.com/p/sabredav/
 # BSD
 PERMIT_PACKAGE_CDROM =	Yes

-MASTER_SITES =		https://sabredav.googlecode.com/files/
+MASTER_SITES =		${MASTER_SITE_GOOGLECODE:=sabredav/}

 # phpunit
 NO_TEST =		Yes
--- a/www/sqtop/Makefile
+++ b/www/sqtop/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2013/08/07 21:32:57 naddy Exp $
+# $OpenBSD: Makefile,v 1.5 2016/10/01 11:54:17 naddy Exp $

 COMMENT=		top-like monitor for Squid

@ -17,7 +17,7 @@ PERMIT_PACKAGE_CDROM=	Yes

 WANTLIB += c m ncurses pthread stdc++

-MASTER_SITES=		https://sqtop.googlecode.com/files/
+MASTER_SITES=		${MASTER_SITE_GOOGLECODE:=sqtop/}

 CONFIGURE_STYLE=	gnu

--- a/x11/faenza-icon-theme/Makefile
+++ b/x11/faenza-icon-theme/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2015/03/27 08:16:16 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.12 2016/10/01 11:54:17 naddy Exp $

 COMMENT =		complete, colourful suite of squared icons

@ -9,7 +9,7 @@ REVISION =		2
 CATEGORIES =		x11

 HOMEPAGE =		http://tiheum.deviantart.com/art/Faenza-Icons-173323228
-MASTER_SITES =		https://faenza-icon-theme.googlecode.com/files/
+MASTER_SITES =		${MASTER_SITE_GOOGLECODE:=faenza-icon-theme/}
 EXTRACT_SUFX =		.zip

 MAINTAINER =		David Coppa <dcoppa@openbsd.org>
--- a/x11/gnome-colors-icon-theme/Makefile
+++ b/x11/gnome-colors-icon-theme/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2016/01/26 13:05:27 sthen Exp $
+# $OpenBSD: Makefile,v 1.12 2016/10/01 11:54:17 naddy Exp $

 COMMENT =		complete, multi-colored suite of icons

@ -9,7 +9,7 @@ PKGNAME =		gnome-colors-icon-theme-${V}
 CATEGORIES =		x11

 HOMEPAGE =		https://github.com/gnome-colors/gnome-colors
-MASTER_SITES =		https://gnome-colors.googlecode.com/files/
+MASTER_SITES =		${MASTER_SITE_GOOGLECODE:=gnome-colors/}

 # GPLv2 
 PERMIT_PACKAGE_CDROM =	Yes
--- a/x11/goggles/Makefile
+++ b/x11/goggles/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2015/12/10 08:05:43 jasper Exp $
+# $OpenBSD: Makefile,v 1.22 2016/10/01 11:54:17 naddy Exp $

 COMMENT=	gui for ogle
 CATEGORIES=	x11
@ -7,7 +7,7 @@ DISTNAME=	goggles-0.9.1
 REVISION=	3

 EXTRACT_SUFX=	.tar.bz2
-MASTER_SITES=	https://gogglesmm.googlecode.com/files/
+MASTER_SITES=	${MASTER_SITE_GOOGLECODE:=gogglesmm/}
 HOMEPAGE=	http://www.fifthplanet.net/goggles.html
 MAINTAINER=	Marc Espie <espie@openbsd.org>

--- a/x11/keynav/Makefile
+++ b/x11/keynav/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2016/08/27 14:11:13 jca Exp $
+# $OpenBSD: Makefile,v 1.12 2016/10/01 11:54:17 naddy Exp $

 COMMENT=	turns your keyboard into a fast pointer mover

@ -13,7 +13,7 @@ HOMEPAGE=	http://www.semicomplete.com/projects/keynav/
 # BSD
 PERMIT_PACKAGE_CDROM=	Yes

-MASTER_SITES=	https://semicomplete.googlecode.com/files/
+MASTER_SITES=	${MASTER_SITE_GOOGLECODE:=semicomplete/}

 WANTLIB += X11 Xext Xinerama c cairo glib-2.0 intl xdo

--- a/x11/partiwm/Makefile
+++ b/x11/partiwm/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2016/08/28 13:53:16 jca Exp $
+# $OpenBSD: Makefile,v 1.18 2016/10/01 11:54:17 naddy Exp $

 COMMENT=	tiling window manager

@ -12,7 +12,7 @@ HOMEPAGE=	https://github.com/njsmith/partiwm
 # GPLv2
 PERMIT_PACKAGE_CDROM=	Yes

-MASTER_SITES=	https://partiwm.googlecode.com/files/
+MASTER_SITES=	${MASTER_SITE_GOOGLECODE:=partiwm/}

 MODULES=	lang/python

--- a/x11/pinot/Makefile
+++ b/x11/pinot/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.60 2016/09/23 09:16:58 sthen Exp $
+# $OpenBSD: Makefile,v 1.61 2016/10/01 11:54:18 naddy Exp $

 COMMENT=	personal search and metasearch

@ -26,7 +26,7 @@ WANTLIB += pangomm-1.4 pcre pixman-1 png pthread pthread-stubs
 WANTLIB += sigc-2.0 sqlite3 ssl stdc++ tag textcat uuid xapian
 WANTLIB += xcb xcb-render xcb-shm xml++-2.6 xml2 z

-MASTER_SITES=	https://pinot-search.googlecode.com/files/
+MASTER_SITES=	${MASTER_SITE_GOOGLECODE:=pinot-search/}

 # c++11
 MODULES +=		gcc4
--- a/x11/py-pyglet/Makefile
+++ b/x11/py-pyglet/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2013/08/07 21:33:06 naddy Exp $
+# $OpenBSD: Makefile,v 1.4 2016/10/01 11:54:18 naddy Exp $

 COMMENT =		windowing and multimedia library for Python

@ -12,7 +12,7 @@ MAINTAINER =		Edd Barrett <edd@openbsd.org>
 # BSD
 PERMIT_PACKAGE_CDROM =	Yes

-MASTER_SITES =		https://pyglet.googlecode.com/files/
+MASTER_SITES =		${MASTER_SITE_GOOGLECODE:=pyglet/}

 MODULES =		lang/python

--- a/x11/tktray/Makefile
+++ b/x11/tktray/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2016/07/08 10:37:54 czarkoff Exp $
+# $OpenBSD: Makefile,v 1.12 2016/10/01 11:54:18 naddy Exp $

 COMMENT =	system tray icon support for Tk

@ -15,7 +15,7 @@ PERMIT_PACKAGE_CDROM =	Yes

 WANTLIB =	X11

-MASTER_SITES =	https://tktray.googlecode.com/files/
+MASTER_SITES =	${MASTER_SITE_GOOGLECODE:=tktray/}
 MODULES =	x11/tk
 BUILD_DEPENDS =	${MODTK_BUILD_DEPENDS}
 RUN_DEPENDS =	${MODTK_RUN_DEPENDS}
--- a/x11/wbar/Makefile
+++ b/x11/wbar/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2016/08/27 17:26:15 jca Exp $
+# $OpenBSD: Makefile,v 1.7 2016/10/01 11:54:18 naddy Exp $

 COMMENT =		Mac OS-X style lightweight application launcher

@ -15,7 +15,7 @@ PERMIT_PACKAGE_CDROM=	Yes

 WANTLIB += Imlib2 X11 Xext c freetype intl m stdc++ z

-MASTER_SITES =		https://wbar.googlecode.com/files/
+MASTER_SITES =		${MASTER_SITE_GOOGLECODE:=wbar/}

 MODULES =		textproc/intltool