diff --git a/devel/cmockery/Makefile b/devel/cmockery/Makefile
index 8e0301f8d60..30b4ebb0bb9 100644
--- a/devel/cmockery/Makefile
+++ b/devel/cmockery/Makefile
@@ -1,20 +1,18 @@
-# $OpenBSD: Makefile,v 1.7 2015/03/16 18:07:39 naddy Exp $
+# $OpenBSD: Makefile,v 1.8 2017/08/21 19:43:20 jasper Exp $
 
 COMMENT =		library to simplify writing unit tests for C applications
 
 DISTNAME =		cmockery-0.1.2
-REVISION =		3
+REVISION =		4
 
 SHARED_LIBS +=		cmockery                  0.0 # 0.0
 
 CATEGORIES =		devel
 
-HOMEPAGE =		https://cmockery.googlecode.com/
-
 # Apache v2
 PERMIT_PACKAGE_CDROM =	Yes
 
-MASTER_SITES =		${HOMEPAGE}files/
+MASTER_SITES =		https://distfiles.nl/
 
 CONFIGURE_STYLE =	gnu
 
diff --git a/devel/dissy/Makefile b/devel/dissy/Makefile
index 275306277cc..df653ae53a4 100644
--- a/devel/dissy/Makefile
+++ b/devel/dissy/Makefile
@@ -1,20 +1,19 @@
-# $OpenBSD: Makefile,v 1.11 2016/10/01 11:54:15 naddy Exp $
+# $OpenBSD: Makefile,v 1.12 2017/08/21 19:43:20 jasper Exp $
 
 COMMENT =		graphical frontend to the objdump disassembler
 
 MODPY_EGG_VERSION = 	9
 DISTNAME =		dissy-${MODPY_EGG_VERSION}
 CATEGORIES =		devel
-HOMEPAGE =		https://code.google.com/p/dissy/
-REVISION =		2
+HOMEPAGE =		https://github.com/SimonKagstrom/dissy
+REVISION =		3
 
 MAINTAINER =		Jonathan Armani <armani@openbsd.org>
 
 # GPLv2
 PERMIT_PACKAGE_CDROM =	Yes
 
-
-MASTER_SITES =	${MASTER_SITE_GOOGLECODE:=dissy/}
+MASTER_SITES =	https://distfiles.nl/
 
 MODULES =	lang/python
 RUN_DEPENDS =	x11/py-gtk2
diff --git a/devel/mono-gdata/Makefile b/devel/mono-gdata/Makefile
index 1cf2736750e..b76bd474174 100644
--- a/devel/mono-gdata/Makefile
+++ b/devel/mono-gdata/Makefile
@@ -1,20 +1,18 @@
-# $OpenBSD: Makefile,v 1.5 2015/10/03 11:55:39 robert Exp $
+# $OpenBSD: Makefile,v 1.6 2017/08/21 19:43:20 jasper Exp $
 
 COMMENT=	.NET library for the Google Data API
 
 V=		1.9.0.0
 DISTNAME=	libgoogle-data-mono-${V}
 PKGNAME=	mono-gdata-${V}
-REVISION=	0
+REVISION=	1
 
 CATEGORIES=	devel
 
-HOMEPAGE=	https://google-gdata.googlecode.com/
-
 # Apache 2.0
 PERMIT_PACKAGE_CDROM=	Yes
 
-MASTER_SITES=	${HOMEPAGE}files/
+MASTER_SITES=	https://distfiles.nl/
 
 MODULES=	lang/mono
 MODMONO_GMCS_COMPAT=	Yes
diff --git a/devel/p5-Device-USB/Makefile b/devel/p5-Device-USB/Makefile
index 76f9bd87d93..49dc723756a 100644
--- a/devel/p5-Device-USB/Makefile
+++ b/devel/p5-Device-USB/Makefile
@@ -1,14 +1,14 @@
-# $OpenBSD: Makefile,v 1.17 2016/03/20 19:56:21 naddy Exp $
+# $OpenBSD: Makefile,v 1.18 2017/08/21 19:43:20 jasper Exp $
 
 COMMENT=		perl wrapper around libusb
 
 DISTNAME=		Device-USB-0.31
-REVISION=		6
+REVISION=		7
 CATEGORIES=		devel
 
 MODULES=		cpan
 
-HOMEPAGE=		https://code.google.com/p/perl-device-usb/
+HOMEPAGE=		https://github.com/gwadej/perl-device-usb
 
 # perl
 PERMIT_PACKAGE_CDROM=	Yes
diff --git a/devel/py-iniparse/Makefile b/devel/py-iniparse/Makefile
index adbaec0b26b..06239414bb1 100644
--- a/devel/py-iniparse/Makefile
+++ b/devel/py-iniparse/Makefile
@@ -1,16 +1,14 @@
-# $OpenBSD: Makefile,v 1.4 2015/04/02 14:21:15 jasper Exp $
+# $OpenBSD: Makefile,v 1.5 2017/08/21 19:43:20 jasper Exp $
 
 COMMENT =		INI parser for Python
 
 MODPY_EGG_VERSION =	0.4
 DISTNAME =		iniparse-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
-REVISION =		0
+REVISION =		1
 
 CATEGORIES =		devel
 
-HOMEPAGE =		https://code.google.com/p/iniparse/
-
 # MIT
 PERMIT_PACKAGE_CDROM =	Yes
 
diff --git a/devel/shunit2/Makefile b/devel/shunit2/Makefile
index 4af0dae9598..1ec3f7b4418 100644
--- a/devel/shunit2/Makefile
+++ b/devel/shunit2/Makefile
@@ -1,19 +1,20 @@
-# $OpenBSD: Makefile,v 1.2 2016/10/01 11:54:15 naddy Exp $
+# $OpenBSD: Makefile,v 1.3 2017/08/21 19:43:20 jasper Exp $
 
 COMMENT =		unit test framework for Bourne based shell scripts
 
 DISTNAME =		shunit2-2.1.6
+REVISION =		0
 
 CATEGORIES =		devel
 
-HOMEPAGE =		https://shunit2.googlecode.com
+HOMEPAGE =		https://github.com/kward/shunit2
 
 MAINTAINER =		Robert Peichaer <rpe@openbsd.org>
 
 # LGPLv2.1
 PERMIT_PACKAGE_CDROM =	Yes
 
-MASTER_SITES =		${MASTER_SITE_GOOGLECODE:=shunit2/}
+MASTER_SITES =		https://distfiles.nl/
 
 EXTRACT_SUFX =		.tgz
 
diff --git a/devel/ucpp/Makefile b/devel/ucpp/Makefile
index 2e47e2bd4b5..ad567e54c6c 100644
--- a/devel/ucpp/Makefile
+++ b/devel/ucpp/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.12 2016/10/01 11:54:15 naddy Exp $
+# $OpenBSD: Makefile,v 1.13 2017/08/21 19:43:20 jasper Exp $
 
 DISTNAME =	ucpp-1.3.2
-REVISION =	0
+REVISION =	1
 COMMENT =	C preprocessor and lexer
 CATEGORIES =	devel
-HOMEPAGE =	https://code.google.com/p/ucpp
-MASTER_SITES =	${MASTER_SITE_GOOGLECODE:=ucpp/}
+HOMEPAGE =	https://github.com/lpsantil/ucpp
+MASTER_SITES =	https://distfiles.nl/
 
 PERMIT_PACKAGE_CDROM =	Yes
 WANTLIB =		c