diff --git a/audio/py-ao/Makefile b/audio/py-ao/Makefile
index 6c821ad1a36..5d08626d8f6 100644
--- a/audio/py-ao/Makefile
+++ b/audio/py-ao/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2015/04/21 18:40:20 sthen Exp $
-
-SHARED_ONLY=	Yes
+# $OpenBSD: Makefile,v 1.20 2016/03/20 16:12:22 naddy Exp $
 
 COMMENT=	Python wrapper module for the ao library
 
diff --git a/audio/py-cddb/Makefile b/audio/py-cddb/Makefile
index d195313f322..b28fe36a785 100644
--- a/audio/py-cddb/Makefile
+++ b/audio/py-cddb/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.18 2015/04/21 18:40:20 sthen Exp $
-
-SHARED_ONLY=	Yes
+# $OpenBSD: Makefile,v 1.19 2016/03/20 16:12:22 naddy Exp $
 
 COMMENT=	CDDB audio CD track info access in Python
 
diff --git a/audio/py-ogg/Makefile b/audio/py-ogg/Makefile
index a3e836153b5..a3da076ccb2 100644
--- a/audio/py-ogg/Makefile
+++ b/audio/py-ogg/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.22 2015/04/21 18:40:20 sthen Exp $
-
-SHARED_ONLY=	Yes
+# $OpenBSD: Makefile,v 1.23 2016/03/20 16:12:22 naddy Exp $
 
 COMMENT=	Python wrapper for the Ogg libraries
 
diff --git a/audio/py-vorbis/Makefile b/audio/py-vorbis/Makefile
index 522b5e596cf..b5d689f8991 100644
--- a/audio/py-vorbis/Makefile
+++ b/audio/py-vorbis/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2015/04/21 18:40:20 sthen Exp $
-
-SHARED_ONLY =	Yes
+# $OpenBSD: Makefile,v 1.8 2016/03/20 16:12:22 naddy Exp $
 
 COMMENT =	Python wrapper for the Vorbis libraries
 
diff --git a/audio/py-xmms/Makefile b/audio/py-xmms/Makefile
index 74a66a1a0db..e37e1b37832 100644
--- a/audio/py-xmms/Makefile
+++ b/audio/py-xmms/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.20 2015/04/21 18:40:20 sthen Exp $
-
-SHARED_ONLY=	Yes
+# $OpenBSD: Makefile,v 1.21 2016/03/20 16:12:22 naddy Exp $
 
 COMMENT=	Python interface to XMMS
 
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index a7e8be9b657..b25a03642ba 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.150 2016/01/24 10:50:25 ajacoutot Exp $
-
-SHARED_ONLY=		Yes
+# $OpenBSD: Makefile,v 1.151 2016/03/20 16:12:22 naddy Exp $
 
 COMMENT=		integrated music management application for GNOME
 
diff --git a/biology/py-biopython/Makefile b/biology/py-biopython/Makefile
index f2bfde09136..fccc887b7ad 100644
--- a/biology/py-biopython/Makefile
+++ b/biology/py-biopython/Makefile
@@ -1,6 +1,5 @@
-# $OpenBSD: Makefile,v 1.26 2016/01/12 13:19:37 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.27 2016/03/20 16:12:22 naddy Exp $
 
-SHARED_ONLY=		Yes
 COMMENT=		Python tools for computational molecular biology
 
 MODPY_EGG_VERSION=	1.66
diff --git a/comms/hamlib/Makefile b/comms/hamlib/Makefile
index e7ee0dd7a78..36cce3c836d 100644
--- a/comms/hamlib/Makefile
+++ b/comms/hamlib/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.31 2015/06/10 21:42:26 sthen Exp $
-
-SHARED_ONLY=	Yes
+# $OpenBSD: Makefile,v 1.32 2016/03/20 16:12:22 naddy Exp $
 
 COMMENT-main=	radio/rotator control library
 COMMENT-python=	python bindings for hamlib
diff --git a/converters/py-cjkcodecs/Makefile b/converters/py-cjkcodecs/Makefile
index 792a4b61a9e..3e0d2097001 100644
--- a/converters/py-cjkcodecs/Makefile
+++ b/converters/py-cjkcodecs/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2015/01/21 06:13:46 bentley Exp $
-
-SHARED_ONLY=	Yes
+# $OpenBSD: Makefile,v 1.22 2016/03/20 16:12:22 naddy Exp $
 
 COMMENT=	Python unicode codecs for Chinese, Japanese and Korean
 
diff --git a/converters/py-iconvcodec/Makefile b/converters/py-iconvcodec/Makefile
index eba38613a4e..0e95b759a31 100644
--- a/converters/py-iconvcodec/Makefile
+++ b/converters/py-iconvcodec/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2015/01/21 06:13:46 bentley Exp $
-
-SHARED_ONLY=	Yes
+# $OpenBSD: Makefile,v 1.18 2016/03/20 16:12:22 naddy Exp $
 
 COMMENT=	universal unicode codec using iconv for Python
 
diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile
index af37b035cfd..aead40369ef 100644
--- a/databases/evolution-data-server/Makefile
+++ b/databases/evolution-data-server/Makefile
@@ -1,9 +1,7 @@
-# $OpenBSD: Makefile,v 1.202 2016/02/27 08:57:44 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.203 2016/03/20 16:12:22 naddy Exp $
 
 # XXX add libphonenumber support when a cpp release is out
 
-SHARED_ONLY=		Yes
-
 COMMENT=		unified backend for PIM programs
 
 GNOME_PROJECT=		evolution-data-server
diff --git a/databases/luma/Makefile b/databases/luma/Makefile
index 1ca8ffde39f..0d832742deb 100644
--- a/databases/luma/Makefile
+++ b/databases/luma/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2015/03/27 08:11:25 ajacoutot Exp $
-
-SHARED_ONLY=	Yes
+# $OpenBSD: Makefile,v 1.12 2016/03/20 16:12:22 naddy Exp $
 
 COMMENT=	Qt-based LDAP browser and utility
 
diff --git a/databases/postgresql/Makefile b/databases/postgresql/Makefile
index e1f505aa36f..bd1836a7a03 100644
--- a/databases/postgresql/Makefile
+++ b/databases/postgresql/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.209 2016/02/13 21:54:28 sthen Exp $
+# $OpenBSD: Makefile,v 1.210 2016/03/20 16:12:23 naddy Exp $
 
 COMMENT-main=	PostgreSQL RDBMS (client)
 COMMENT-server=	PostgreSQL RDBMS (server)
@@ -43,7 +43,6 @@ MULTI_PACKAGES=	-docs -main -server -contrib -plpython
 # but the server requires loadable library support. Until we figure
 # out the correct incantation to not build the server on those systems,
 # simply don't build for them, yet.
-SHARED_ONLY=	Yes
 
 MAKE_FILE=	GNUmakefile
 
diff --git a/databases/py-apsw/Makefile b/databases/py-apsw/Makefile
index 5cb7cd52c60..aa0d3f1b9dc 100644
--- a/databases/py-apsw/Makefile
+++ b/databases/py-apsw/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2016/01/26 13:29:11 sthen Exp $
-
-SHARED_ONLY =	Yes
+# $OpenBSD: Makefile,v 1.5 2016/03/20 16:12:23 naddy Exp $
 
 COMMENT =	thin SQLite wrapper for Python
 
diff --git a/databases/py-ldap/Makefile b/databases/py-ldap/Makefile
index de7447e1a4d..6209a3fed00 100644
--- a/databases/py-ldap/Makefile
+++ b/databases/py-ldap/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.41 2015/11/13 08:44:53 ajacoutot Exp $
-
-SHARED_ONLY=		Yes
+# $OpenBSD: Makefile,v 1.42 2016/03/20 16:12:23 naddy Exp $
 
 COMMENT-main=		LDAP client API for Python
 COMMENT-examples=	example programs for the LDAP client API for Python
diff --git a/databases/py-mysql/Makefile b/databases/py-mysql/Makefile
index d4df93d8679..72b909ce3f4 100644
--- a/databases/py-mysql/Makefile
+++ b/databases/py-mysql/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.49 2015/09/29 10:51:14 sthen Exp $
-
-SHARED_ONLY =	Yes
+# $OpenBSD: Makefile,v 1.50 2016/03/20 16:12:23 naddy Exp $
 
 COMMENT =	Python interface to MySQL
 
diff --git a/databases/py-odbc/Makefile b/databases/py-odbc/Makefile
index 2f05f7d380d..3d7d6ce7010 100644
--- a/databases/py-odbc/Makefile
+++ b/databases/py-odbc/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2015/09/29 10:51:14 sthen Exp $
-
-SHARED_ONLY =	Yes
+# $OpenBSD: Makefile,v 1.13 2016/03/20 16:12:23 naddy Exp $
 
 COMMENT =	ODBC bindings for Python
 
diff --git a/databases/py-psycopg2/Makefile b/databases/py-psycopg2/Makefile
index fcecca3da18..7f86e3e9cc4 100644
--- a/databases/py-psycopg2/Makefile
+++ b/databases/py-psycopg2/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.25 2016/01/06 17:01:54 ajacoutot Exp $
-
-SHARED_ONLY =		Yes
+# $OpenBSD: Makefile,v 1.26 2016/03/20 16:12:23 naddy Exp $
 
 COMMENT =		PostgreSQL database adapter for Python
 
diff --git a/databases/py-sqlite/Makefile b/databases/py-sqlite/Makefile
index 576456205cd..414cf551481 100644
--- a/databases/py-sqlite/Makefile
+++ b/databases/py-sqlite/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.23 2015/04/21 18:40:20 sthen Exp $
-
-SHARED_ONLY=	Yes
+# $OpenBSD: Makefile,v 1.24 2016/03/20 16:12:23 naddy Exp $
 
 COMMENT=	SQLite adapter for Python
 
diff --git a/databases/py-sybase/Makefile b/databases/py-sybase/Makefile
index e4f5e18d0c5..eb55c344331 100644
--- a/databases/py-sybase/Makefile
+++ b/databases/py-sybase/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.23 2015/11/13 09:04:37 ajacoutot Exp $
-
-SHARED_ONLY=	Yes
+# $OpenBSD: Makefile,v 1.24 2016/03/20 16:12:23 naddy Exp $
 
 COMMENT=	Python interface to the Sybase relational database system
 
diff --git a/databases/tdb/Makefile b/databases/tdb/Makefile
index 3953fd2e1a0..b4aa9d44a7b 100644
--- a/databases/tdb/Makefile
+++ b/databases/tdb/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2015/08/12 11:24:05 jca Exp $
-
-SHARED_ONLY=	Yes
+# $OpenBSD: Makefile,v 1.16 2016/03/20 16:12:23 naddy Exp $
 
 COMMENT=	trivial database library
 
diff --git a/devel/coccinelle/Makefile b/devel/coccinelle/Makefile
index d8c13278a3f..8096370ec7e 100644
--- a/devel/coccinelle/Makefile
+++ b/devel/coccinelle/Makefile
@@ -1,6 +1,5 @@
-# $OpenBSD: Makefile,v 1.30 2015/12/10 08:47:02 landry Exp $
+# $OpenBSD: Makefile,v 1.31 2016/03/20 16:12:23 naddy Exp $
 
-SHARED_ONLY =	Yes
 BROKEN-alpha =	yes_prepare_ocamlcocci.cmi does not exist
 BROKEN-powerpc = yes_prepare_ocamlcocci.cmi does not exist
 BROKEN-sparc64 = yes_prepare_ocamlcocci.cmi does not exist
diff --git a/devel/gtkparasite/Makefile b/devel/gtkparasite/Makefile
index c11d7bba92b..da1b2e31ef1 100644
--- a/devel/gtkparasite/Makefile
+++ b/devel/gtkparasite/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2015/05/02 12:43:59 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.18 2016/03/20 16:12:23 naddy Exp $
 
 COMMENT =	Gtk debugging tool
 
@@ -11,8 +11,6 @@ REVISION =	0
 
 HOMEPAGE =	http://chipx86.github.com/gtkparasite/
 
-SHARED_ONLY =	Yes
-
 # BSD
 PERMIT_PACKAGE_CDROM =	Yes
 
diff --git a/devel/libplist/Makefile b/devel/libplist/Makefile
index f5f87c66d09..18800bfd3d2 100644
--- a/devel/libplist/Makefile
+++ b/devel/libplist/Makefile
@@ -1,10 +1,8 @@
-# $OpenBSD: Makefile,v 1.7 2015/11/12 16:34:23 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.8 2016/03/20 16:12:23 naddy Exp $
 
 COMMENT-main =		library to handle Apple Property List format
 COMMENT-python =	python bindings for libplist
 
-SHARED_ONLY =		Yes
-
 VERSION =		1.12
 SUBST_VARS +=		VERSION
 DISTNAME =		libplist-${VERSION}
diff --git a/devel/libtalloc/Makefile b/devel/libtalloc/Makefile
index 8d822b3ba67..e781baf54ac 100644
--- a/devel/libtalloc/Makefile
+++ b/devel/libtalloc/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2015/08/12 11:24:05 jca Exp $
-
-SHARED_ONLY=	Yes
+# $OpenBSD: Makefile,v 1.9 2016/03/20 16:12:23 naddy Exp $
 
 COMMENT=	hierarchical memory pool system with destructors
 
diff --git a/devel/mozjs17/Makefile b/devel/mozjs17/Makefile
index 558fcc25b45..464c8e69037 100644
--- a/devel/mozjs17/Makefile
+++ b/devel/mozjs17/Makefile
@@ -1,6 +1,5 @@
-# $OpenBSD: Makefile,v 1.7 2016/03/12 07:02:16 mmcc Exp $
+# $OpenBSD: Makefile,v 1.8 2016/03/20 16:12:23 naddy Exp $
 
-SHARED_ONLY=	Yes
 # based on ffx 17 engine
 # jsapi-tests crashes in js::MarkRangeConservatively() on hppa (SIGSEGV in js/src/jsgc.cpp:1142)
 # jsapi-tests crashes in js::Bindings::switchToScriptStorage() on alpha (SIGBUS in jsutil.h:235)
diff --git a/devel/py-mxDateTime/Makefile b/devel/py-mxDateTime/Makefile
index 1397eb353c4..bfd200b1e28 100644
--- a/devel/py-mxDateTime/Makefile
+++ b/devel/py-mxDateTime/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.43 2015/09/17 12:33:00 benoit Exp $
-
-SHARED_ONLY =	Yes
+# $OpenBSD: Makefile,v 1.44 2016/03/20 16:12:23 naddy Exp $
 
 COMMENT =	date and time types for Python
 
diff --git a/devel/py-radix/Makefile b/devel/py-radix/Makefile
index c00c9d3c13e..16c2e7a59be 100644
--- a/devel/py-radix/Makefile
+++ b/devel/py-radix/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2013/03/13 16:09:17 benoit Exp $
-
-SHARED_ONLY=	Yes
+# $OpenBSD: Makefile,v 1.13 2016/03/20 16:12:23 naddy Exp $
 
 COMMENT=	Radix tree implementation for Python
 
diff --git a/devel/py-silc/Makefile b/devel/py-silc/Makefile
index 72958c89efb..c7746968dd0 100644
--- a/devel/py-silc/Makefile
+++ b/devel/py-silc/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.20 2016/01/06 17:01:54 ajacoutot Exp $
-
-SHARED_ONLY=	Yes
+# $OpenBSD: Makefile,v 1.21 2016/03/20 16:12:23 naddy Exp $
 
 COMMENT=	Python bindings for the SILC toolkit
 
diff --git a/devel/py-sip/Makefile b/devel/py-sip/Makefile
index 524e3c0fe81..ffde97539ab 100644
--- a/devel/py-sip/Makefile
+++ b/devel/py-sip/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.29 2015/08/20 10:02:25 sthen Exp $
-
-SHARED_ONLY=	Yes
+# $OpenBSD: Makefile,v 1.30 2016/03/20 16:12:23 naddy Exp $
 
 COMMENT=	automatically generate Python bindings for C and C++ libs
 
diff --git a/devel/pygame/Makefile b/devel/pygame/Makefile
index 793a638cbd3..927023a8744 100644
--- a/devel/pygame/Makefile
+++ b/devel/pygame/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.31 2015/07/07 22:29:14 bcallah Exp $
-
-SHARED_ONLY=	Yes
+# $OpenBSD: Makefile,v 1.32 2016/03/20 16:12:23 naddy Exp $
 
 COMMENT=	set of Python modules designed for writing games
 
diff --git a/devel/pyrex/Makefile b/devel/pyrex/Makefile
index 205eb13a429..6c891129a09 100644
--- a/devel/pyrex/Makefile
+++ b/devel/pyrex/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2015/11/24 09:11:04 jasper Exp $
-
-SHARED_ONLY=	Yes
+# $OpenBSD: Makefile,v 1.17 2016/03/20 16:12:23 naddy Exp $
 
 COMMENT=	Python-alike language for writing Python extension modules
 
diff --git a/devel/pyusb/Makefile b/devel/pyusb/Makefile
index 3505e63d305..c6bea4b97b8 100644
--- a/devel/pyusb/Makefile
+++ b/devel/pyusb/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2015/04/21 18:33:49 sthen Exp $
-
-SHARED_ONLY=	Yes
+# $OpenBSD: Makefile,v 1.15 2016/03/20 16:12:23 naddy Exp $
 
 COMMENT=	python interface to libusb
 
diff --git a/devel/spidermonkey/Makefile b/devel/spidermonkey/Makefile
index a092a50e4ad..ddb6a8a2b3f 100644
--- a/devel/spidermonkey/Makefile
+++ b/devel/spidermonkey/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.31 2016/03/12 07:02:16 mmcc Exp $
-
-SHARED_ONLY =		Yes
+# $OpenBSD: Makefile,v 1.32 2016/03/20 16:12:24 naddy Exp $
 
 # jsapi-tests crashes in js::MarkRangeConservatively() on hppa (SIGSEGV in js/src/jsgc.cpp:1142)
 # jsapi-tests crashes in js::Bindings::switchToScriptStorage() on alpha (SIGBUS in jsutil.h:235)
diff --git a/devel/vim-command-t/Makefile b/devel/vim-command-t/Makefile
index 0e8ed834426..6a47c69ddef 100644
--- a/devel/vim-command-t/Makefile
+++ b/devel/vim-command-t/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2015/12/03 21:24:29 sthen Exp $
+# $OpenBSD: Makefile,v 1.5 2016/03/20 16:12:24 naddy Exp $
 
 COMMENT =		fast, intuitive file opening in VIM
 
@@ -18,8 +18,6 @@ WANTLIB +=		c m ${MODRUBY_WANTLIB}
 
 MASTER_SITES =		https://spacehopper.org/mirrors/
 
-SHARED_ONLY =		Yes
-
 # Must stay in sync with the version vim is using!
 MODRUBY_REV =		1.8
 MODULES =		lang/ruby
diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index 2cf1d4b872c..82dafa3287a 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -1,9 +1,7 @@
-# $OpenBSD: Makefile,v 1.105 2016/03/11 20:28:25 naddy Exp $
+# $OpenBSD: Makefile,v 1.106 2016/03/20 16:12:24 naddy Exp $
 
 BROKEN-alpha=	gr_RenderInfo.cpp:426:1: internal compiler error: Segmentation fault
 
-SHARED_ONLY=	Yes
-
 COMMENT=	free cross-platform WYSIWYG word processor
 
 VERSION=	3.0.1
diff --git a/editors/texworks/Makefile b/editors/texworks/Makefile
index 2156e7eb1fb..6d0bfdadb14 100644
--- a/editors/texworks/Makefile
+++ b/editors/texworks/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.26 2016/03/07 09:37:06 zhuk Exp $
+# $OpenBSD: Makefile,v 1.27 2016/03/20 16:12:24 naddy Exp $
 
 COMMENT-main =		easy to use LaTeX and ConTeXt editor
 COMMENT-python =	Python scripting for TeXworks
@@ -33,8 +33,6 @@ MODQMAKE_PROJECTS =	plugins-src/TWLuaPlugin/TWLuaPlugin.pro \
 			plugins-src/TWPythonPlugin/TWPythonPlugin.pro \
 			TeXworks.pro
 
-SHARED_ONLY =		Yes
-
 WANTLIB += ICE QtDBus QtGui QtScript QtScriptTools QtXml SM X11
 WANTLIB += Xext Xi Xinerama Xrender c fontconfig freetype hunspell-1.3
 WANTLIB += m poppler-qt4 pthread stdc++ z
diff --git a/fonts/zh-bg5pdf/Makefile b/fonts/zh-bg5pdf/Makefile
index c184d2a9025..afc3fcd5482 100644
--- a/fonts/zh-bg5pdf/Makefile
+++ b/fonts/zh-bg5pdf/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2015/07/18 21:54:37 jasper Exp $
-
-SHARED_ONLY=	Yes
+# $OpenBSD: Makefile,v 1.7 2016/03/20 16:12:24 naddy Exp $
 
 COMMENT=	convert Big5 encoded files to PDF
 
diff --git a/games/gcompris/Makefile b/games/gcompris/Makefile
index 1beadba6a1c..0d98eb8842d 100644
--- a/games/gcompris/Makefile
+++ b/games/gcompris/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.63 2016/03/11 20:28:25 naddy Exp $
-
-SHARED_ONLY=	Yes
+# $OpenBSD: Makefile,v 1.64 2016/03/20 16:12:24 naddy Exp $
 
 COMMENT=	educational game for children
 
diff --git a/games/gemrb/Makefile b/games/gemrb/Makefile
index db38025c572..163aa0e4ba4 100644
--- a/games/gemrb/Makefile
+++ b/games/gemrb/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2016/03/06 20:28:36 kirby Exp $
-
-SHARED_ONLY = 		Yes
+# $OpenBSD: Makefile,v 1.4 2016/03/20 16:12:24 naddy Exp $
 
 SHARED_LIBS += 		gemrb_core 0.0
 
diff --git a/games/golly/Makefile b/games/golly/Makefile
index 82ae6fdb251..4a657753440 100644
--- a/games/golly/Makefile
+++ b/games/golly/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2015/08/31 01:21:39 jca Exp $
-
-SHARED_ONLY =	Yes
+# $OpenBSD: Makefile,v 1.5 2016/03/20 16:12:24 naddy Exp $
 
 COMMENT =	game of life simulator
 
diff --git a/games/mnemosyne/Makefile b/games/mnemosyne/Makefile
index e18db65cbd6..bac5cacc1ae 100644
--- a/games/mnemosyne/Makefile
+++ b/games/mnemosyne/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.33 2015/12/14 07:45:57 benoit Exp $
-
-SHARED_ONLY=	Yes
+# $OpenBSD: Makefile,v 1.34 2016/03/20 16:12:24 naddy Exp $
 
 COMMENT=	flash-card tool which optimises your learning process
 
diff --git a/geo/qgis/Makefile b/geo/qgis/Makefile
index 7d29179a08c..87450be8e2e 100644
--- a/geo/qgis/Makefile
+++ b/geo/qgis/Makefile
@@ -1,9 +1,7 @@
-# $OpenBSD: Makefile,v 1.48 2016/03/02 14:39:10 landry Exp $
+# $OpenBSD: Makefile,v 1.49 2016/03/20 16:12:24 naddy Exp $
 
 COMMENT =	desktop geographical information system
 
-SHARED_ONLY =	Yes
-
 DISTNAME =	qgis-2.14.0
 EXTRACT_SUFX =	.tar.bz2
 CATEGORIES =	geo x11
diff --git a/graphics/gimp/stable/Makefile b/graphics/gimp/stable/Makefile
index 9348ebad76e..e2e668c1ef2 100644
--- a/graphics/gimp/stable/Makefile
+++ b/graphics/gimp/stable/Makefile
@@ -1,9 +1,7 @@
-# $OpenBSD: Makefile,v 1.106 2015/12/30 10:59:32 giovanni Exp $
+# $OpenBSD: Makefile,v 1.107 2016/03/20 16:12:24 naddy Exp $
 
 COMMENT=	GNU Image Manipulation Program
 
-SHARED_ONLY=	Yes
-
 DISTNAME=	gimp-2.8.16
 
 SHARED_LIBS+=	gimp-2.0	272.0	# 800.0
diff --git a/graphics/hugin/Makefile b/graphics/hugin/Makefile
index 0cd394a6da9..31369500e2a 100644
--- a/graphics/hugin/Makefile
+++ b/graphics/hugin/Makefile
@@ -1,9 +1,7 @@
-# $OpenBSD: Makefile,v 1.45 2015/10/10 08:44:39 kirby Exp $
+# $OpenBSD: Makefile,v 1.46 2016/03/20 16:12:24 naddy Exp $
 
 BROKEN-hppa =	run dep on enblend-enfuse which will not build on hppa
 
-SHARED_ONLY =		Yes
-
 COMMENT =		panorama image stitcher
 
 DISTNAME =		hugin-2014.0.0
diff --git a/graphics/libiptcdata/Makefile b/graphics/libiptcdata/Makefile
index 8f513c0c302..31dd5e50901 100644
--- a/graphics/libiptcdata/Makefile
+++ b/graphics/libiptcdata/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2016/03/11 20:28:26 naddy Exp $
-
-SHARED_ONLY = 		Yes
+# $OpenBSD: Makefile,v 1.6 2016/03/20 16:12:24 naddy Exp $
 
 COMMENT-main =		library for manipulating IPTC metadata
 COMMENT-python =	libiptcdata Python bindings
diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile
index c3c815210a4..d1aee52fc39 100644
--- a/graphics/opencv/Makefile
+++ b/graphics/opencv/Makefile
@@ -1,8 +1,7 @@
-# $OpenBSD: Makefile,v 1.35 2015/11/23 20:34:07 zhuk Exp $
+# $OpenBSD: Makefile,v 1.36 2016/03/20 16:12:24 naddy Exp $
 
 ONLY_FOR_ARCHS =	${GCC4_ARCHS}
 ONLY_FOR_ARCHS-java =	amd64 i386
-SHARED_ONLY =		Yes
 
 CATEGORIES =		graphics devel
 COMMENT-docs =		OpenCV documentation and examples
diff --git a/graphics/openimageio/Makefile b/graphics/openimageio/Makefile
index 1bb0b6b3deb..500ba6114e4 100644
--- a/graphics/openimageio/Makefile
+++ b/graphics/openimageio/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2015/10/08 12:02:03 jasper Exp $
-
-SHARED_ONLY =		Yes
+# $OpenBSD: Makefile,v 1.18 2016/03/20 16:12:24 naddy Exp $
 
 COMMENT =		library for reading and writing images
 
diff --git a/graphics/py-gd/Makefile b/graphics/py-gd/Makefile
index a779367d209..134f04cf50e 100644
--- a/graphics/py-gd/Makefile
+++ b/graphics/py-gd/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.24 2015/04/05 13:31:14 sthen Exp $
-
-SHARED_ONLY=	Yes
+# $OpenBSD: Makefile,v 1.25 2016/03/20 16:12:24 naddy Exp $
 
 COMMENT=	Python wrapper for the GD library
 
diff --git a/inputmethods/ibus/Makefile b/inputmethods/ibus/Makefile
index 20c93e825a9..f4591da0bc4 100644
--- a/inputmethods/ibus/Makefile
+++ b/inputmethods/ibus/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.48 2016/01/01 12:00:15 ajacoutot Exp $
-
-SHARED_ONLY =	Yes
+# $OpenBSD: Makefile,v 1.49 2016/03/20 16:12:24 naddy Exp $
 
 COMMENT =	intelligent input bus framework
 
diff --git a/lang/io/Makefile b/lang/io/Makefile
index ecb450a01c9..9bdedb0f85f 100644
--- a/lang/io/Makefile
+++ b/lang/io/Makefile
@@ -1,6 +1,5 @@
-# $OpenBSD: Makefile,v 1.18 2015/12/03 21:24:30 sthen Exp $
+# $OpenBSD: Makefile,v 1.19 2016/03/20 16:12:24 naddy Exp $
 
-SHARED_ONLY =	Yes
 ONLY_FOR_ARCHS =i386 amd64
 
 COMMENT =	embeddable prototype-based language
diff --git a/lang/python/python.port.mk b/lang/python/python.port.mk
index 43428f89bef..390a4b6b91f 100644
--- a/lang/python/python.port.mk
+++ b/lang/python/python.port.mk
@@ -1,4 +1,4 @@
-# $OpenBSD: python.port.mk,v 1.86 2016/03/11 18:13:19 naddy Exp $
+# $OpenBSD: python.port.mk,v 1.87 2016/03/20 16:12:24 naddy Exp $
 #
 #	python.port.mk - Xavier Santolaria <xavier@santolaria.net>
 #	This file is in the public domain.
@@ -72,10 +72,6 @@ BUILD_DEPENDS +=	${_MODPY_BUILD_DEPENDS}
 RUN_DEPENDS +=		${MODPY_RUN_DEPENDS}
 .endif
 
-.if ${MODPY_BUILDDEP:L} == "yes" || ${MODPY_RUNDEP:L} == "yes"
-SHARED_ONLY =		Yes
-.endif
-
 _MODPY_PRE_BUILD_STEPS = :
 .if defined(MODPY_SETUPTOOLS) && ${MODPY_SETUPTOOLS:L} == "yes"
 # The setuptools module provides a package locator (site.py) that is
diff --git a/lang/ruby/ruby.port.mk b/lang/ruby/ruby.port.mk
index c0915156ca2..c8d202e8c01 100644
--- a/lang/ruby/ruby.port.mk
+++ b/lang/ruby/ruby.port.mk
@@ -1,4 +1,4 @@
-# $OpenBSD: ruby.port.mk,v 1.86 2016/01/17 19:39:05 jasper Exp $
+# $OpenBSD: ruby.port.mk,v 1.87 2016/03/20 16:12:24 naddy Exp $
 
 # ruby module
 
@@ -253,12 +253,11 @@ MODRUBY_WANTLIB+=	gmp
 
 .if ${CONFIGURE_STYLE:L:Mext} || ${CONFIGURE_STYLE:L:Mextconf}
 # Ruby C exensions are specific to an arch and are loaded as
-# shared libraries (not compiled into ruby), so set SHARED_ONLY
-# and make sure PKG_ARCH=* is not set.
+# shared libraries (not compiled into ruby), so make sure PKG_ARCH=*
+# is not set.
 .  if defined(PKG_ARCH) && ${PKG_ARCH} == *
 ERRORS+=	"Fatal: Should not have PKG_ARCH=* when compiling extensions"
 .  endif
-SHARED_ONLY=	Yes
 
 # Add appropriate libraries to WANTLIB depending on ruby version and
 # implementation
@@ -285,14 +284,8 @@ BUILD_DEPENDS+=	lang/jruby>=1.6.5
 BUILD_DEPENDS+=	lang/ruby/2.1>=2.1.0p0
 .  endif
 
-# Just like all ruby C extensions should set SHARED_ONLY,
-# pure ruby gem ports without C extensions should definitely not
-# set SHARED_ONLY, and they are arch-independent.
+# Pure ruby gem ports without C extensions are arch-independent.
 .  if !${CONFIGURE_STYLE:L:Mext}
-.    if defined(SHARED_ONLY) && ${SHARED_ONLY:L:Myes}
-ERRORS+=	"Fatal: Pure ruby gems without ext CONFIGURE_STYLE should not \
-		have SHARED_ONLY=Yes"
-.    endif
 PKG_ARCH=	*
 .  elif ${MODRUBY_REV} == 2.1 || ${MODRUBY_REV} == 2.2 || ${MODRUBY_REV} == 2.3
 # Add build complete file to package so rubygems doesn't complain
diff --git a/lang/spidermonkey/Makefile b/lang/spidermonkey/Makefile
index d3b3aa3268c..38c7a3a7f47 100644
--- a/lang/spidermonkey/Makefile
+++ b/lang/spidermonkey/Makefile
@@ -1,10 +1,8 @@
-# $OpenBSD: Makefile,v 1.29 2016/03/12 07:02:16 mmcc Exp $
+# $OpenBSD: Makefile,v 1.30 2016/03/20 16:12:24 naddy Exp $
 
 # old version that does not get updates; should be rm'd at some point
 PORTROACH=	ignore:1
 
-SHARED_ONLY=	Yes
-
 COMMENT =	Mozilla C implementation of JavaScript
 
 MOZILLA_VERSION =	1.9.2.28
diff --git a/math/py-Numeric/Makefile b/math/py-Numeric/Makefile
index 832b67ffca4..bdd0e7ce3e2 100644
--- a/math/py-Numeric/Makefile
+++ b/math/py-Numeric/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.27 2015/04/21 18:24:22 sthen Exp $
-
-SHARED_ONLY=	Yes
+# $OpenBSD: Makefile,v 1.28 2016/03/20 16:12:25 naddy Exp $
 
 COMMENT=	fast array facility to the Python language
 
diff --git a/math/py-probstat/Makefile b/math/py-probstat/Makefile
index d218d0d6867..abbec885c8a 100644
--- a/math/py-probstat/Makefile
+++ b/math/py-probstat/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2015/04/21 18:24:22 sthen Exp $
-
-SHARED_ONLY=	Yes
+# $OpenBSD: Makefile,v 1.16 2016/03/20 16:12:25 naddy Exp $
 
 COMMENT=	probability and statistics utilities for Python
 
diff --git a/misc/gutenpy/Makefile b/misc/gutenpy/Makefile
index 01ae4cc19a4..bb625f434ab 100644
--- a/misc/gutenpy/Makefile
+++ b/misc/gutenpy/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2013/03/11 11:23:57 espie Exp $
-
-SHARED_ONLY=		Yes
+# $OpenBSD: Makefile,v 1.15 2016/03/20 16:12:25 naddy Exp $
 
 COMMENT=		text reader and catalog browser for Project Gutenberg
 
diff --git a/net/freeradius3/Makefile b/net/freeradius3/Makefile
index 2eaf6844a6f..f69c5541a15 100644
--- a/net/freeradius3/Makefile
+++ b/net/freeradius3/Makefile
@@ -1,9 +1,7 @@
-# $OpenBSD: Makefile,v 1.9 2016/03/11 20:28:28 naddy Exp $
+# $OpenBSD: Makefile,v 1.10 2016/03/20 16:12:25 naddy Exp $
 
 PORTROACH=	limit:^3\.
 
-SHARED_ONLY=	Yes
-
 COMMENT-main=	RADIUS server implementation
 COMMENT-iodbc=	freeradius iodbc rlm addon
 COMMENT-memcached= freeradius memcached rlm addon
diff --git a/net/gajim/Makefile b/net/gajim/Makefile
index 43107788cb1..647313cb879 100644
--- a/net/gajim/Makefile
+++ b/net/gajim/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.69 2016/03/11 19:59:15 naddy Exp $
-
-SHARED_ONLY=	Yes
+# $OpenBSD: Makefile,v 1.70 2016/03/20 16:12:25 naddy Exp $
 
 COMMENT=	jabber client written in pygtk
 DISTNAME=	gajim-0.15.4
diff --git a/net/gupnp/core/Makefile b/net/gupnp/core/Makefile
index 6800ea7be88..5390bef8582 100644
--- a/net/gupnp/core/Makefile
+++ b/net/gupnp/core/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.39 2016/02/25 07:36:15 jasper Exp $
-
-SHARED_ONLY=		Yes
+# $OpenBSD: Makefile,v 1.40 2016/03/20 16:12:25 naddy Exp $
 
 COMMENT=		framework for creating UPnP devices and control points
 
diff --git a/net/hexchat/Makefile b/net/hexchat/Makefile
index d8da2607c7e..fb1e0dd1cf0 100644
--- a/net/hexchat/Makefile
+++ b/net/hexchat/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2016/03/14 20:25:39 jca Exp $
-
-SHARED_ONLY =		Yes
+# $OpenBSD: Makefile,v 1.10 2016/03/20 16:12:25 naddy Exp $
 
 COMMENT =		GTK+2 IRC Client
 DISTNAME =		hexchat-2.12.0
diff --git a/net/honeyd/Makefile b/net/honeyd/Makefile
index 09916d927fa..9ac0105db35 100644
--- a/net/honeyd/Makefile
+++ b/net/honeyd/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.38 2015/05/20 11:29:58 jca Exp $
-
-SHARED_ONLY=	Yes
+# $OpenBSD: Makefile,v 1.39 2016/03/20 16:12:25 naddy Exp $
 
 COMMENT=	utility to create virtual hosts on a network
 DISTNAME=	honeyd-1.5c
diff --git a/net/netatalk3/Makefile b/net/netatalk3/Makefile
index 769910aeb73..ee6cb2799c9 100644
--- a/net/netatalk3/Makefile
+++ b/net/netatalk3/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2016/01/18 22:30:44 sthen Exp $
-
-SHARED_ONLY=		Yes
+# $OpenBSD: Makefile,v 1.6 2016/03/20 16:12:25 naddy Exp $
 
 COMMENT=		AFP file and print services for IP networks
 
diff --git a/net/nmap/Makefile b/net/nmap/Makefile
index 14afa8a47c8..32700224d49 100644
--- a/net/nmap/Makefile
+++ b/net/nmap/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.118 2016/03/18 21:13:38 giovanni Exp $
-
-SHARED_ONLY=	Yes
+# $OpenBSD: Makefile,v 1.119 2016/03/20 16:12:25 naddy Exp $
 
 COMMENT-main=	scan ports and fingerprint stack of network hosts
 COMMENT-zenmap=	graphical frontend for nmap
diff --git a/net/pidgin/Makefile b/net/pidgin/Makefile
index 0d709e1356d..99769fcf707 100644
--- a/net/pidgin/Makefile
+++ b/net/pidgin/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.129 2016/01/22 19:04:39 ajacoutot Exp $
-
-SHARED_ONLY=	Yes
+# $OpenBSD: Makefile,v 1.130 2016/03/20 16:12:25 naddy Exp $
 
 COMMENT-main=	multi-protocol instant messaging client
 COMMENT-finch=	multi-protocol instant messaging client, console client
diff --git a/net/py-adns/Makefile b/net/py-adns/Makefile
index 8d7bc3ceece..41f57ce23c8 100644
--- a/net/py-adns/Makefile
+++ b/net/py-adns/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2015/08/19 20:13:59 sthen Exp $
-
-SHARED_ONLY=		Yes
+# $OpenBSD: Makefile,v 1.14 2016/03/20 16:12:25 naddy Exp $
 
 COMMENT=		python interface to adns
 
diff --git a/net/py-curl/Makefile b/net/py-curl/Makefile
index d7b4ffac38b..e82158a58e8 100644
--- a/net/py-curl/Makefile
+++ b/net/py-curl/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.37 2016/01/06 10:49:28 sthen Exp $
-
-SHARED_ONLY=	Yes
+# $OpenBSD: Makefile,v 1.38 2016/03/20 16:12:25 naddy Exp $
 
 COMMENT=	Python interface to cURL library
 
diff --git a/net/py-flowd/Makefile b/net/py-flowd/Makefile
index 61263ea003d..681bb4eb118 100644
--- a/net/py-flowd/Makefile
+++ b/net/py-flowd/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2015/08/19 20:13:59 sthen Exp $
-
-SHARED_ONLY=		Yes
+# $OpenBSD: Makefile,v 1.17 2016/03/20 16:12:25 naddy Exp $
 
 COMMENT=		Python API for flowd binary log files
 
diff --git a/net/py-flowtools/Makefile b/net/py-flowtools/Makefile
index 143504991ba..3f521279193 100644
--- a/net/py-flowtools/Makefile
+++ b/net/py-flowtools/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2015/08/19 20:13:59 sthen Exp $
-
-SHARED_ONLY=	Yes
+# $OpenBSD: Makefile,v 1.17 2016/03/20 16:12:25 naddy Exp $
 
 COMMENT=	python interface to flow-tools file format
 
diff --git a/net/py-libpcap/Makefile b/net/py-libpcap/Makefile
index 6185b9ec331..f9eea1f507a 100644
--- a/net/py-libpcap/Makefile
+++ b/net/py-libpcap/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.30 2016/01/23 18:28:34 ajacoutot Exp $
-
-SHARED_ONLY=		Yes
+# $OpenBSD: Makefile,v 1.31 2016/03/20 16:12:25 naddy Exp $
 
 COMMENT=		libpcap bindings for Python
 
diff --git a/net/rrdtool/Makefile b/net/rrdtool/Makefile
index d696ac2155f..48e892cdbae 100644
--- a/net/rrdtool/Makefile
+++ b/net/rrdtool/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.94 2016/03/11 20:28:29 naddy Exp $
-
-SHARED_ONLY=	Yes
+# $OpenBSD: Makefile,v 1.95 2016/03/20 16:12:25 naddy Exp $
 
 COMMENT-main=	system to store and display time-series data
 COMMENT-update=	lightweight update-only tool for rrdtool
diff --git a/net/weechat/Makefile b/net/weechat/Makefile
index ec4a3797045..4b22270a82a 100644
--- a/net/weechat/Makefile
+++ b/net/weechat/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.23 2016/01/11 15:11:31 abieber Exp $
+# $OpenBSD: Makefile,v 1.24 2016/03/20 16:12:25 naddy Exp $
 
 COMMENT-main=	fast, light and extensible chat client
 COMMENT-lua=	Lua bindings for weechat
@@ -21,8 +21,6 @@ HOMEPAGE=	http://www.weechat.org/
 
 MAINTAINER=	Eric Lalonde <eric.c.lalonde@gmail.com>
 
-SHARED_ONLY=	Yes
-
 # GPLv3
 PERMIT_PACKAGE_CDROM=	Yes
 
diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile
index a8d50af7fce..861929cde44 100644
--- a/net/wireshark/Makefile
+++ b/net/wireshark/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.36 2016/03/05 16:26:40 kirby Exp $
+# $OpenBSD: Makefile,v 1.37 2016/03/20 16:12:25 naddy Exp $
 
 # XXX should add pledge to dumpcap.
 
@@ -16,7 +16,6 @@ DISTNAME =	wireshark-${WVER}
 PKGNAME-main =	wireshark-${WVER}
 PKGNAME-gtk =	wireshark-gtk-${WVER}
 PKGNAME-text =	tshark-${WVER}
-SHARED_ONLY =	Yes
 
 SHARED_LIBS +=	wsutil               2.0      # 5.0
 SHARED_LIBS +=	wiretap              2.0      # 4.5
diff --git a/print/fontforge/Makefile b/print/fontforge/Makefile
index c8a50bbc6c0..055606470dc 100644
--- a/print/fontforge/Makefile
+++ b/print/fontforge/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.38 2015/04/21 18:51:26 sthen Exp $
-
-SHARED_ONLY=		Yes
+# $OpenBSD: Makefile,v 1.39 2016/03/20 16:12:25 naddy Exp $
 
 COMMENT=		vector font editor/converter
 
diff --git a/print/hplip/Makefile b/print/hplip/Makefile
index e3ce38bfc69..6a6672f254b 100644
--- a/print/hplip/Makefile
+++ b/print/hplip/Makefile
@@ -1,9 +1,7 @@
-# $OpenBSD: Makefile,v 1.140 2016/03/19 11:37:40 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.141 2016/03/20 16:12:25 naddy Exp $
 
 PORTROACH=		skipv:${V}_py2.5
 
-SHARED_ONLY=		Yes
-
 COMMENT-main=		HP Linux Imaging and Printing
 COMMENT-common=		HPLIP applications common files
 COMMENT-hpaio=		HP sane(7) scanner backend
diff --git a/print/lilypond/Makefile b/print/lilypond/Makefile
index f1f397890ca..d7f74fb08b2 100644
--- a/print/lilypond/Makefile
+++ b/print/lilypond/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.43 2015/04/06 21:05:07 ajacoutot Exp $
-
-SHARED_ONLY=		Yes
+# $OpenBSD: Makefile,v 1.44 2016/03/20 16:12:26 naddy Exp $
 
 COMMENT-main=		text based music notation system
 COMMENT-docs=		lilypond documentation
diff --git a/print/scribus/Makefile b/print/scribus/Makefile
index 823c33ef351..73a87ed9ba2 100644
--- a/print/scribus/Makefile
+++ b/print/scribus/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.56 2016/01/05 11:24:05 landry Exp $
-
-SHARED_ONLY=	Yes
+# $OpenBSD: Makefile,v 1.57 2016/03/20 16:12:26 naddy Exp $
 
 COMMENT=	DTP program
 DISTNAME=	scribus-1.4.5
diff --git a/security/py-cryptkit/Makefile b/security/py-cryptkit/Makefile
index a2f945c7c6a..987348b8915 100644
--- a/security/py-cryptkit/Makefile
+++ b/security/py-cryptkit/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.20 2015/04/21 18:19:27 sthen Exp $
-
-SHARED_ONLY=	Yes
+# $OpenBSD: Makefile,v 1.21 2016/03/20 16:12:26 naddy Exp $
 
 COMMENT=	Python Cryptographic Toolkit
 
diff --git a/security/py-crypto/Makefile b/security/py-crypto/Makefile
index 21865e43726..5a44d5469ea 100644
--- a/security/py-crypto/Makefile
+++ b/security/py-crypto/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.35 2015/12/29 23:19:33 rpe Exp $
-
-SHARED_ONLY =		Yes
+# $OpenBSD: Makefile,v 1.36 2016/03/20 16:12:26 naddy Exp $
 
 COMMENT =		cryptographic tools for Python
 
diff --git a/sysutils/collectd/Makefile b/sysutils/collectd/Makefile
index 8d09711ab89..286592a38aa 100644
--- a/sysutils/collectd/Makefile
+++ b/sysutils/collectd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.35 2015/10/30 12:59:16 sthen Exp $
+# $OpenBSD: Makefile,v 1.36 2016/03/20 16:12:26 naddy Exp $
 
 COMMENT-main =		system metrics collection engine
 COMMENT-mysql =		collectd mysql plugin
@@ -29,7 +29,6 @@ CATEGORIES =		sysutils
 
 HOMEPAGE =		http://www.collectd.org/
 SHARED_LIBS +=		collectdclient 1.0
-SHARED_ONLY =		Yes
 
 # GPLv2
 PERMIT_PACKAGE_CDROM =	Yes
diff --git a/sysutils/deja-dup/Makefile b/sysutils/deja-dup/Makefile
index 3fc27fcb489..d40939ee68e 100755
--- a/sysutils/deja-dup/Makefile
+++ b/sysutils/deja-dup/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.34 2016/01/17 09:48:59 ajacoutot Exp $
-
-SHARED_ONLY=		Yes
+# $OpenBSD: Makefile,v 1.35 2016/03/20 16:12:26 naddy Exp $
 
 COMMENT=		simple encrypted backup tool for GNOME
 
diff --git a/sysutils/libvirt-python/Makefile b/sysutils/libvirt-python/Makefile
index cfbfb3f592d..69889f5fe3f 100644
--- a/sysutils/libvirt-python/Makefile
+++ b/sysutils/libvirt-python/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.24 2016/03/04 10:14:05 jasper Exp $
-
-SHARED_ONLY =		Yes
+# $OpenBSD: Makefile,v 1.25 2016/03/20 16:12:26 naddy Exp $
 
 COMMENT =		libvirt virtualization API python bindings
 
diff --git a/telephony/pjsua/Makefile b/telephony/pjsua/Makefile
index 025e87c36d0..2b24bd27419 100644
--- a/telephony/pjsua/Makefile
+++ b/telephony/pjsua/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.38 2016/03/10 11:50:13 naddy Exp $
-
-SHARED_ONLY=	Yes
+# $OpenBSD: Makefile,v 1.39 2016/03/20 16:12:26 naddy Exp $
 
 COMMENT-main=	multimedia communication library (SIP, RTP, ICE, etc)
 COMMENT-pjsua=	lightweight sip client
diff --git a/textproc/gonzui/Makefile b/textproc/gonzui/Makefile
index 7f931c3473b..1daaa86e131 100755
--- a/textproc/gonzui/Makefile
+++ b/textproc/gonzui/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.36 2015/08/27 07:04:35 ajacoutot Exp $
-
-SHARED_ONLY=		Yes
+# $OpenBSD: Makefile,v 1.37 2016/03/20 16:12:26 naddy Exp $
 
 # This architecture lacks fast mutexes...
 NOT_FOR_ARCHS=		mips64 mips64el
diff --git a/textproc/gtranslator/Makefile b/textproc/gtranslator/Makefile
index 344fb3929e4..4ac3b2147e2 100644
--- a/textproc/gtranslator/Makefile
+++ b/textproc/gtranslator/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.63 2015/07/19 23:46:08 naddy Exp $
-
-SHARED_ONLY=	Yes
+# $OpenBSD: Makefile,v 1.64 2016/03/20 16:12:26 naddy Exp $
 
 COMMENT=	gettext(1) files editor for GNOME
 
diff --git a/textproc/py-xml/Makefile b/textproc/py-xml/Makefile
index 898155bd4c0..41a23747e64 100644
--- a/textproc/py-xml/Makefile
+++ b/textproc/py-xml/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.47 2015/08/19 20:13:59 sthen Exp $
-
-SHARED_ONLY=	Yes
+# $OpenBSD: Makefile,v 1.48 2016/03/20 16:12:26 naddy Exp $
 
 COMMENT=	Python module for writing basic XML applications
 
diff --git a/textproc/ruby-pygments.rb/Makefile b/textproc/ruby-pygments.rb/Makefile
index a10997d2d9a..91d42ae8c00 100644
--- a/textproc/ruby-pygments.rb/Makefile
+++ b/textproc/ruby-pygments.rb/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2015/06/23 07:46:25 jasper Exp $
+# $OpenBSD: Makefile,v 1.11 2016/03/20 16:12:26 naddy Exp $
 
 COMMENT=	syntax highlighter based on pygments
 
@@ -12,8 +12,6 @@ HOMEPAGE=	https://github.com/tmm1/pygments.rb
 # GPL
 PERMIT_PACKAGE_CDROM=	Yes
 
-# order matters, as otherwise ruby.port.mk complains about SHARED_ONLY=yes
-# which is set by python.port.mk, and not having 'ext' in CONFIGURE_STYLE.
 MODULES=	lang/ruby \
 		lang/python
 
diff --git a/www/ap2-mod_wsgi/Makefile b/www/ap2-mod_wsgi/Makefile
index 7062a486679..f4e2f1f60f5 100644
--- a/www/ap2-mod_wsgi/Makefile
+++ b/www/ap2-mod_wsgi/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2015/07/17 23:58:43 ajacoutot Exp $
-
-SHARED_ONLY=	Yes
+# $OpenBSD: Makefile,v 1.4 2016/03/20 16:12:26 naddy Exp $
 
 COMMENT=	Python WSGI compliant interface module for Apache2
 
diff --git a/www/clearsilver/Makefile b/www/clearsilver/Makefile
index 5f532158a51..74997b6ce68 100644
--- a/www/clearsilver/Makefile
+++ b/www/clearsilver/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.28 2014/06/14 10:34:45 sthen Exp $
-
-SHARED_ONLY=	Yes
+# $OpenBSD: Makefile,v 1.29 2016/03/20 16:12:26 naddy Exp $
 
 COMMENT-main=	fast, powerful, and language-neutral HTML template system
 COMMENT-perl=	perl bindings for clearsilver
diff --git a/www/webkitgtk4/Makefile b/www/webkitgtk4/Makefile
index 244d5813c6e..8014d6c37fd 100644
--- a/www/webkitgtk4/Makefile
+++ b/www/webkitgtk4/Makefile
@@ -1,12 +1,10 @@
-# $OpenBSD: Makefile,v 1.37 2016/03/18 12:20:06 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.38 2016/03/20 16:12:26 naddy Exp $
 
 BROKEN-alpha =		error: Compiler GCC >= 4.7 or Clang >= 3.3 is required for C compilation
 BROKEN-hppa =		error: Compiler GCC >= 4.7 or Clang >= 3.3 is required for C compilation
 
 PORTROACH =		limitw:1,even
 
-SHARED_ONLY =		Yes
-
 COMMENT =		GTK+ port of the WebKit rendering engine
 
 V =			2.10.9
diff --git a/x11/ede/lib/Makefile b/x11/ede/lib/Makefile
index bc825d6e185..df82c0d4d6c 100644
--- a/x11/ede/lib/Makefile
+++ b/x11/ede/lib/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2016/03/11 11:48:28 naddy Exp $
-
-SHARED_ONLY =		Yes
+# $OpenBSD: Makefile,v 1.8 2016/03/20 16:12:26 naddy Exp $
 
 COMMENT =		equinox desktop library
 
diff --git a/x11/gnome/anjuta/Makefile b/x11/gnome/anjuta/Makefile
index 66a8e8a8d46..12c0d292291 100644
--- a/x11/gnome/anjuta/Makefile
+++ b/x11/gnome/anjuta/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.133 2015/11/08 19:43:40 jasper Exp $
-
-SHARED_ONLY=		Yes
+# $OpenBSD: Makefile,v 1.134 2016/03/20 16:12:26 naddy Exp $
 
 COMMENT=		versatile IDE for GNOME
 
diff --git a/x11/gnome/builder/Makefile b/x11/gnome/builder/Makefile
index 96425832495..604b6d55e69 100644
--- a/x11/gnome/builder/Makefile
+++ b/x11/gnome/builder/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2015/10/30 12:59:17 sthen Exp $
-
-SHARED_ONLY=		Yes
+# $OpenBSD: Makefile,v 1.16 2016/03/20 16:12:26 naddy Exp $
 
 COMMENT=		IDE for GNOME
 
diff --git a/x11/gnome/keyring/Makefile b/x11/gnome/keyring/Makefile
index 2b66abc52f2..540c8c4526a 100644
--- a/x11/gnome/keyring/Makefile
+++ b/x11/gnome/keyring/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.121 2016/01/23 09:09:40 ajacoutot Exp $
-
-SHARED_ONLY=		Yes
+# $OpenBSD: Makefile,v 1.122 2016/03/20 16:12:26 naddy Exp $
 
 COMMENT=		password agent for the GNOME project
 
diff --git a/x11/gnome/libgda/Makefile b/x11/gnome/libgda/Makefile
index f746d256a36..7a22b5e443e 100644
--- a/x11/gnome/libgda/Makefile
+++ b/x11/gnome/libgda/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.108 2016/01/05 17:18:19 ajacoutot Exp $
-
-SHARED_ONLY=		Yes
+# $OpenBSD: Makefile,v 1.109 2016/03/20 16:12:26 naddy Exp $
 
 COMMENT-main=		GNOME Data Access library
 COMMENT-ldap=		LDAP backend for libgda
diff --git a/x11/gnome/music/Makefile b/x11/gnome/music/Makefile
index 03e34da476e..981c9fbe20a 100644
--- a/x11/gnome/music/Makefile
+++ b/x11/gnome/music/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.33 2015/11/16 10:05:35 ajacoutot Exp $
-
-SHARED_ONLY=		Yes
+# $OpenBSD: Makefile,v 1.34 2016/03/20 16:12:26 naddy Exp $
 
 COMMENT=		GNOME music playing application
 
diff --git a/x11/gnome/totem/Makefile b/x11/gnome/totem/Makefile
index 2dd84f45fea..efa3c846bbd 100644
--- a/x11/gnome/totem/Makefile
+++ b/x11/gnome/totem/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.140 2015/10/12 17:20:35 ajacoutot Exp $
-
-SHARED_ONLY=		Yes
+# $OpenBSD: Makefile,v 1.141 2016/03/20 16:12:27 naddy Exp $
 
 COMMENT=		official media player for GNOME
 
diff --git a/x11/gnome/tracker/Makefile b/x11/gnome/tracker/Makefile
index c01052dc2aa..d02ae01ce35 100644
--- a/x11/gnome/tracker/Makefile
+++ b/x11/gnome/tracker/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.199 2016/03/02 07:22:38 ajacoutot Exp $
-
-SHARED_ONLY=		Yes
+# $OpenBSD: Makefile,v 1.200 2016/03/20 16:12:27 naddy Exp $
 
 COMMENT=		powerful desktop search tool and indexer
 
diff --git a/x11/py-gtk2/Makefile b/x11/py-gtk2/Makefile
index 295c60ef4be..02f3ca71a22 100644
--- a/x11/py-gtk2/Makefile
+++ b/x11/py-gtk2/Makefile
@@ -1,6 +1,5 @@
-# $OpenBSD: Makefile,v 1.61 2015/08/19 20:13:59 sthen Exp $
+# $OpenBSD: Makefile,v 1.62 2016/03/20 16:12:27 naddy Exp $
 
-SHARED_ONLY=	Yes
 BROKEN-alpha=	.got subsegment exceeds 64K
 
 COMMENT=	GTK+2 Python bindings
diff --git a/x11/py-osd/Makefile b/x11/py-osd/Makefile
index 832156a30a4..279f5cdf6a9 100644
--- a/x11/py-osd/Makefile
+++ b/x11/py-osd/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2015/08/19 20:13:59 sthen Exp $
-
-SHARED_ONLY=	Yes
+# $OpenBSD: Makefile,v 1.15 2016/03/20 16:12:27 naddy Exp $
 
 COMMENT=	python bindings to the XOSD library
 
diff --git a/x11/py-qt4/Makefile b/x11/py-qt4/Makefile
index e3bf30c15de..e8fc8dc9a58 100644
--- a/x11/py-qt4/Makefile
+++ b/x11/py-qt4/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.44 2015/08/20 10:02:25 sthen Exp $
-
-SHARED_ONLY=	Yes
+# $OpenBSD: Makefile,v 1.45 2016/03/20 16:12:27 naddy Exp $
 
 COMMENT-main=	python Qt4 bindings
 COMMENT-docs=	py-qt4 documentation
diff --git a/x11/py-qt5/Makefile b/x11/py-qt5/Makefile
index 2eee82803e7..8f53537ac1b 100644
--- a/x11/py-qt5/Makefile
+++ b/x11/py-qt5/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2016/03/06 11:57:17 zhuk Exp $
-
-SHARED_ONLY=	Yes
+# $OpenBSD: Makefile,v 1.3 2016/03/20 16:12:27 naddy Exp $
 
 COMMENT-main=	python Qt5 bindings
 COMMENT-docs=	py-qt5 documentation
diff --git a/x11/py-wxPython/Makefile b/x11/py-wxPython/Makefile
index 74b71d27b4f..c56956d5197 100644
--- a/x11/py-wxPython/Makefile
+++ b/x11/py-wxPython/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2015/12/23 07:58:56 jasper Exp $
-
-SHARED_ONLY=	Yes
+# $OpenBSD: Makefile,v 1.17 2016/03/20 16:12:27 naddy Exp $
 
 COMMENT=	Python bindings for wxWidgets C++ class library
 
diff --git a/x11/pypanel/Makefile b/x11/pypanel/Makefile
index f46943ff90c..f0ce2f6961c 100644
--- a/x11/pypanel/Makefile
+++ b/x11/pypanel/Makefile
@@ -1,6 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2015/08/19 20:14:00 sthen Exp $
-
-SHARED_ONLY=	Yes
+# $OpenBSD: Makefile,v 1.17 2016/03/20 16:12:27 naddy Exp $
 
 COMMENT=	lightweight panel written in Python and C for X11