garbage collect CONFIGURE_SHARED

2016-03-11 20:28:21 +00:00 · 2016-03-11 20:28:21 +00:00 · ce859edcb4
commit ce859edcb4
parent c07aaff4f9
253 changed files with 500 additions and 753 deletions
--- a/archivers/lzip/lzlib/Makefile
+++ b/archivers/lzip/lzlib/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2015/07/21 00:41:08 juanfra Exp $
+# $OpenBSD: Makefile,v 1.6 2016/03/11 20:28:21 naddy Exp $

 COMMENT =		lzip compression library

@ -16,8 +16,7 @@ MAKE_ENV +=		LIBlz_VERSION=${LIBlz_VERSION}

 USE_GMAKE =		Yes

-CONFIGURE_ARGS +=	${CONFIGURE_SHARED} \
-			--disable-static \
+CONFIGURE_ARGS +=	--disable-static \
 			--disable-ldconfig

 # The Makefile tries to strip a shared lib with the install-strip target.
--- a/archivers/xz/Makefile
+++ b/archivers/xz/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.31 2016/01/17 20:28:36 naddy Exp $
+# $OpenBSD: Makefile,v 1.32 2016/03/11 20:28:21 naddy Exp $

 COMMENT=	LZMA compression and decompression tools

@ -22,8 +22,7 @@ WANTLIB=	c pthread

 SEPARATE_BUILD=	Yes
 CONFIGURE_STYLE=gnu
-CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
-		--disable-nls
+CONFIGURE_ARGS=	--disable-nls
 MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/build-aux

 .include <bsd.port.mk>
--- a/astro/celestia/Makefile
+++ b/astro/celestia/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.36 2015/08/12 22:27:31 sthen Exp $
+# $OpenBSD: Makefile,v 1.37 2016/03/11 20:28:21 naddy Exp $

 COMMENT=	free space simulator and planetarium

@ -40,8 +40,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
 		LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib -lGL" \
 		LUA_CFLAGS="`pkg-config --cflags ${MODLUA_DEP}`" \
 		LUA_LIBS="`pkg-config --libs ${MODLUA_DEP}`"
-CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
-		--with-gtk \
+CONFIGURE_ARGS=	--with-gtk \
 		--with-lua \
 		--enable-cairo \
 		--enable-theora
--- a/astro/wcslib/Makefile
+++ b/astro/wcslib/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2015/12/04 20:47:52 landry Exp $
+# $OpenBSD: Makefile,v 1.8 2016/03/11 20:28:21 naddy Exp $

 BROKEN-hppa=	ICE on prj.c:4381
 COMMENT =	implementation of the FITS WCS standard
@ -28,8 +28,7 @@ USE_GMAKE =		Yes
 CONFIGURE_STYLE =	autoconf
 CONFIGURE_ENV =		LIBwcs_VERSION=${LIBwcs_VERSION}

-CONFIGURE_ARGS =	${CONFIGURE_SHARED} \
-			--docdir=${PREFIX}/share/doc/wcslib \
+CONFIGURE_ARGS =	--docdir=${PREFIX}/share/doc/wcslib \
 			--with-x

 # non-free licensed dependency
--- a/audio/audacity/Makefile
+++ b/audio/audacity/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.42 2016/01/12 13:10:44 jasper Exp $
+# $OpenBSD: Makefile,v 1.43 2016/03/11 20:28:21 naddy Exp $

 COMMENT=	free audio editor

@ -54,8 +54,7 @@ MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} \
 			${WRKSRC}/lib-src/sbsms \
 			${WRKSRC}/lib-src/libnyquist

-CONFIGURE_ARGS=		${CONFIGURE_SHARED} \
-			--enable-unicode \
+CONFIGURE_ARGS=		--enable-unicode \
 			--enable-ladspa \
 			--enable-nyquist \
 			--with-lib-preferences=system \
--- a/audio/celt/Makefile
+++ b/audio/celt/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2015/05/22 11:31:10 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.18 2016/03/11 20:28:21 naddy Exp $

 PORTROACH =	limit:^0\.11\.1
 PORTROACH_COMMENT =	audio/mumble (at least as of 1.2.4) requires *exactly* 0.11.1
@ -35,8 +35,7 @@ LIB_DEPENDS =		audio/libogg

 CONFIGURE_STYLE =	gnu

-CONFIGURE_ARGS =	${CONFIGURE_SHARED} \
-			--enable-assertions \
+CONFIGURE_ARGS =	--enable-assertions \
 			--enable-custom-modes \
 			--with-ogg=${LOCALBASE}

--- a/audio/celt07/Makefile
+++ b/audio/celt07/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2015/05/22 11:31:10 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.5 2016/03/11 20:28:21 naddy Exp $

 # Warning: CELT is experimental software. Neither the API/ABI, nor
 # the bit-stream are stable. Compatibility between different releases
@ -28,8 +28,7 @@ LIB_DEPENDS =		audio/libogg

 CONFIGURE_STYLE =	gnu

-CONFIGURE_ARGS =	${CONFIGURE_SHARED} \
-			--program-suffix=07 \
+CONFIGURE_ARGS =	--program-suffix=07 \
 			--with-ogg=${LOCALBASE}

 CONFIGURE_ENV =		CPPFLAGS="-DUSE_SNDIO"
--- a/audio/deadbeef/Makefile
+++ b/audio/deadbeef/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2015/10/30 12:47:38 sthen Exp $
+# $OpenBSD: Makefile,v 1.22 2016/03/11 20:28:21 naddy Exp $

 SHARED_ONLY =		Yes

@ -66,8 +66,7 @@ AUTOCONF_VERSION =	2.69
 AUTOMAKE_VERSION =	1.11

 CONFIGURE_STYLE =	gnu
-CONFIGURE_ARGS +=	${CONFIGURE_SHARED} \
-			--disable-static \
+CONFIGURE_ARGS +=	--disable-static \
 			--disable-abstract-socket \
 			--disable-adplug \
 			--disable-alsa \
--- a/audio/fdk-aac/Makefile
+++ b/audio/fdk-aac/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2016/01/11 11:04:21 czarkoff Exp $
+# $OpenBSD: Makefile,v 1.8 2016/03/11 20:28:21 naddy Exp $

 COMMENT =		modified Fraunhofer FDK AAC encoder and decoder
 DISTNAME =		fdk-aac-0.1.4
@ -16,8 +16,7 @@ WANTLIB =		c m

 MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=opencore-amr/fdk-aac/}
 CONFIGURE_STYLE =	gnu
-CONFIGURE_ARGS =	${CONFIGURE_SHARED} \
-			--enable-example
+CONFIGURE_ARGS =	--enable-example

 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/fdk-aac
--- a/audio/flac/Makefile
+++ b/audio/flac/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.46 2015/01/10 15:50:58 naddy Exp $
+# $OpenBSD: Makefile,v 1.47 2016/03/11 20:28:22 naddy Exp $

 COMMENT=	free lossless audio codec

@ -26,8 +26,7 @@ BUILD_DEPENDS+=	devel/nasm
 .endif

 CONFIGURE_STYLE=gnu
-CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
-		--disable-altivec \
+CONFIGURE_ARGS=	--disable-altivec \
 		--disable-thorough-tests \
 		--disable-xmms-plugin
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
--- a/audio/fluidsynth/Makefile
+++ b/audio/fluidsynth/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.22 2015/05/22 11:31:10 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.23 2016/03/11 20:28:22 naddy Exp $

 COMMENT =		SoundFont2 software synthesizer
 DISTNAME =		fluidsynth-1.1.6
@ -30,8 +30,7 @@ BUILD_DEPENDS +=	${MODGNU_AUTOCONF_DEPENDS} \
 BUILD_DEPENDS +=        devel/libtool

 CONFIGURE_STYLE =	gnu
-CONFIGURE_ARGS +=	${CONFIGURE_SHARED} \
-			--disable-coreaudio \
+CONFIGURE_ARGS +=	--disable-coreaudio \
 			--disable-coremidi \
 			--disable-dart \
 			--disable-dbus-support \
--- a/audio/jack/Makefile
+++ b/audio/jack/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.32 2015/05/21 11:44:00 jca Exp $
+# $OpenBSD: Makefile,v 1.33 2016/03/11 20:28:22 naddy Exp $

 SHARED_ONLY =		Yes

@ -37,8 +37,7 @@ LIBTOOL_FLAGS +=	--tag=disable-static
 AUTOCONF_VERSION =	2.65
 AUTOMAKE_VERSION =	1.10
 CONFIGURE_STYLE =	autoconf automake
-CONFIGURE_ARGS +=	${CONFIGURE_SHARED} \
-			--with-default-tmpdir=/var/tmp \
+CONFIGURE_ARGS +=	--with-default-tmpdir=/var/tmp \
 			--disable-sun \
 			--disable-portaudio \
 			--disable-optimize
--- a/audio/lame/Makefile
+++ b/audio/lame/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.55 2016/03/09 18:29:10 naddy Exp $
+# $OpenBSD: Makefile,v 1.56 2016/03/11 20:28:22 naddy Exp $

 COMMENT=	lame ain't an MP3 encoder

@ -26,8 +26,7 @@ MODULES=	converters/libiconv
 USE_GMAKE=	Yes

 CONFIGURE_STYLE=gnu
-CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
-		--enable-mp3rtp \
+CONFIGURE_ARGS=	--enable-mp3rtp \
 		--disable-mp3x \
 		--with-fileio=lame

--- a/audio/libcanberra/Makefile
+++ b/audio/libcanberra/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.44 2015/08/17 12:06:27 kili Exp $
+# $OpenBSD: Makefile,v 1.45 2016/03/11 20:28:22 naddy Exp $

 SHARED_ONLY=	Yes

@ -89,8 +89,7 @@ USE_GMAKE=		Yes
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS= 	${CONFIGURE_SHARED} \
-			--disable-gstreamer \
+CONFIGURE_ARGS= 	--disable-gstreamer \
 			--disable-null \
 			--disable-oss \
 			--disable-pulse \
--- a/audio/libcdio/Makefile
+++ b/audio/libcdio/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2015/03/16 18:07:35 naddy Exp $
+# $OpenBSD: Makefile,v 1.16 2016/03/11 20:28:22 naddy Exp $

 COMMENT=	compact disk input and control library

@ -27,8 +27,7 @@ LIB_DEPENDS=	audio/libcddb
 USE_GMAKE=	Yes
 CONFIGURE_STYLE= autoconf
 AUTOCONF_VERSION= 2.61
-CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
-		--disable-vcd-info
+CONFIGURE_ARGS=	--disable-vcd-info
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"

--- a/audio/libmp3splt/Makefile
+++ b/audio/libmp3splt/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2015/01/21 06:13:46 bentley Exp $
+# $OpenBSD: Makefile,v 1.8 2016/03/11 20:28:22 naddy Exp $

 COMMENT=	library to split mp3/ogg files without decoding

@ -27,8 +27,7 @@ LIB_DEPENDS=	audio/libmad \
 LIB_DEPENDS +=	audio/libogg

 CONFIGURE_STYLE=gnu
-CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
-		--with-ogg="${LOCALBASE}" \
+CONFIGURE_ARGS= --with-ogg="${LOCALBASE}" \
 		--with-vorbis="${LOCALBASE}" 
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
--- a/audio/libsamplerate/Makefile
+++ b/audio/libsamplerate/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.20 2015/05/22 11:31:10 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.21 2016/03/11 20:28:22 naddy Exp $

 COMMENT=	audio sample rate conversion library

@ -22,8 +22,7 @@ LIB_DEPENDS=	audio/libsndfile
 CONFIGURE_STYLE=gnu
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
-		--disable-cpu-clip \
+CONFIGURE_ARGS=	--disable-cpu-clip \
 		--disable-fftw

 post-install:
--- a/audio/libsndfile/Makefile
+++ b/audio/libsndfile/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.29 2015/12/10 10:00:30 sthen Exp $
+# $OpenBSD: Makefile,v 1.30 2016/03/11 20:28:22 naddy Exp $

 COMMENT=	library to handle various audio file formats

@ -16,8 +16,7 @@ MASTER_SITES=	${HOMEPAGE}files/
 WANTLIB=	c m sndio FLAC ogg vorbis vorbisenc

 CONFIGURE_STYLE=gnu
-CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
-		--disable-alsa \
+CONFIGURE_ARGS=	--disable-alsa \
 		--disable-octave \
 		--disable-sqlite
 MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/Cfg
--- a/audio/opus/Makefile
+++ b/audio/opus/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2016/01/15 21:52:32 naddy Exp $
+# $OpenBSD: Makefile,v 1.14 2016/03/11 20:28:22 naddy Exp $

 # invalid use of `restrict'
 NOT_FOR_ARCHS=	${GCC3_ARCHS}
@ -24,8 +24,7 @@ WANTLIB=	m
 USE_GMAKE=	Yes
 SEPARATE_BUILD=	Yes
 CONFIGURE_STYLE=gnu
-CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
-		--disable-maintainer-mode
+CONFIGURE_ARGS=	--disable-maintainer-mode
 CONFIGURE_ARGS+=--disable-doc	# requires doxygen

 # x86: requires cpuid instruction
--- a/audio/opusfile/Makefile
+++ b/audio/opusfile/Makefile
@ -24,8 +24,7 @@ LIB_DEPENDS =		audio/libogg \

 SEPARATE_BUILD =	Yes
 CONFIGURE_STYLE =	gnu
-CONFIGURE_ARGS =	${CONFIGURE_SHARED} \
-			--disable-maintainer-mode
+CONFIGURE_ARGS =	--disable-maintainer-mode
 CONFIGURE_ARGS +=	--disable-doc	# requires doxygen

 .if ${MACHINE_ARCH} == "arm"
--- a/audio/pulseaudio/Makefile
+++ b/audio/pulseaudio/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.75 2016/02/06 07:48:37 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.76 2016/03/11 20:28:22 naddy Exp $

 # XXX
 # util.c: implement pa_get_binary_name()
@ -67,8 +67,7 @@ CONFIGURE_STYLE=	gnu
 # We only enable the strict minimum for basic volume control support.
 # sndiod(1) is the default sound server on OpenBSD and pulseaudio is only
 # needed for a couple of use cases (volume control, media-keys)
-CONFIGURE_ARGS=		${CONFIGURE_SHARED} \
-			--disable-atomic-arm-linux-helpers \
+CONFIGURE_ARGS=		--disable-atomic-arm-linux-helpers \
 			--disable-default-build-tests \
 			--with-system-user=_pulse \
 			--with-system-group=_pulse \
--- a/audio/sox/Makefile
+++ b/audio/sox/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.63 2015/12/12 08:17:34 landry Exp $
+# $OpenBSD: Makefile,v 1.64 2016/03/11 20:28:22 naddy Exp $

 BROKEN-hppa =	bend.c:155:12: internal compiler error: in expand_expr_addr_expr_1, at expr.c:7697

@ -45,8 +45,7 @@ LIB_DEPENDS=			\
 	graphics/png

 CONFIGURE_STYLE=gnu
-CONFIGURE_ARGS=	${CONFIGURE_SHARED}	\
-	--datarootdir=${LOCALBASE}      \
+CONFIGURE_ARGS=	--datarootdir=${LOCALBASE}      \
 	--enable-largefile		\
 	--disable-silent-libtool	\
 	--disable-openmp		\
--- a/audio/speech-dispatcher/Makefile
+++ b/audio/speech-dispatcher/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.18 2015/07/18 19:19:48 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.19 2016/03/11 20:28:22 naddy Exp $

 COMMENT=	common interface to speech synthesis

@ -44,8 +44,7 @@ USE_GMAKE=	Yes
 CONFIGURE_STYLE=gnu
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
-		--without-pulse
+CONFIGURE_ARGS=	--without-pulse

 FAKE_FLAGS=	sysconfdir=${PREFIX}/share/examples/speech-dispatcher

--- a/audio/speex/Makefile
+++ b/audio/speex/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.27 2015/03/16 18:07:37 naddy Exp $
+# $OpenBSD: Makefile,v 1.28 2016/03/11 20:28:22 naddy Exp $

 COMMENT=	patent-free speech codec

@ -20,8 +20,7 @@ LIB_DEPENDS=	audio/libogg
 WANTLIB=	c m ogg>=5 sndio

 CONFIGURE_STYLE=gnu
-CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
-		--with-ogg=${LOCALBASE}
+CONFIGURE_ARGS=	--with-ogg=${LOCALBASE}
 CONFIGURE_ENV=	CPPFLAGS="-DUSE_SNDIO"

 MAKE_FLAGS=	docdir=${TRUEPREFIX}/share/doc/speex \
--- a/cad/geda-gaf/Makefile
+++ b/cad/geda-gaf/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.20 2015/05/22 11:31:11 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.21 2016/03/11 20:28:22 naddy Exp $

 COMMENT =		suite of tools for electronic design automation
 DISTNAME =		geda-gaf-1.6.0
@ -40,8 +40,7 @@ RUN_DEPENDS = 		misc/shared-mime-info \

 USE_GMAKE =		Yes
 CONFIGURE_STYLE =	gnu
-CONFIGURE_ARGS =	${CONFIGURE_SHARED} \
-			--disable-update-xdg-database
+CONFIGURE_ARGS =	--disable-update-xdg-database
 MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/build-tools

 # This confuses update-patches.
--- a/cad/xcircuit/Makefile
+++ b/cad/xcircuit/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.28 2014/09/01 21:55:25 stu Exp $
+# $OpenBSD: Makefile,v 1.29 2016/03/11 20:28:22 naddy Exp $

 SHARED_ONLY =	Yes

@ -25,8 +25,7 @@ USE_GMAKE =	Yes

 CONFIGURE_STYLE =	autoconf no-autoheader
 AUTOCONF_VERSION =	2.68
-CONFIGURE_ARGS +=	${CONFIGURE_SHARED} \
-			--with-tcl=${MODTCL_LIBDIR} \
+CONFIGURE_ARGS +=	--with-tcl=${MODTCL_LIBDIR} \
 			--with-tk=${MODTK_LIBDIR}

 NO_TEST =	Yes
--- a/comms/jpilot/Makefile
+++ b/comms/jpilot/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.69 2015/09/21 08:46:50 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.70 2016/03/11 20:28:22 naddy Exp $

 SHARED_ONLY=	Yes

@ -36,8 +36,7 @@ USE_GMAKE=	Yes
 CONFIGURE_STYLE=gnu
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
-		--with-pilot-prefix=${LOCALBASE}
+CONFIGURE_ARGS=	--with-pilot-prefix=${LOCALBASE}

 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps
--- a/comms/pilot-link/Makefile
+++ b/comms/pilot-link/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.78 2015/09/21 08:46:50 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.79 2016/03/11 20:28:22 naddy Exp $

 SHARED_ONLY=	Yes

@ -36,8 +36,7 @@ CONFIGURE_STYLE=	gnu
 CONFIGURE_ENV+=		CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib" \
 			ac_cv_lib_png_main=yes
-CONFIGURE_ARGS+=	${CONFIGURE_SHARED} \
-			--with-libiconv=${LOCALBASE} \
+CONFIGURE_ARGS+=	--with-libiconv=${LOCALBASE} \
 			--with-libpng=${LOCALBASE} \
 			--with-perl=/usr/bin/perl \
 			--with-readline \
--- a/converters/enca/Makefile
+++ b/converters/enca/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2016/01/08 21:18:41 jasper Exp $
+# $OpenBSD: Makefile,v 1.11 2016/03/11 20:28:22 naddy Exp $

 COMMENT=		detect character set and encoding of text files

@ -23,8 +23,7 @@ LIB_DEPENDS=		converters/recode
 SEPARATE_BUILD=		Yes
 USE_GMAKE=		Yes
 CONFIGURE_STYLE=	gnu
-CONFIGURE_ARGS+=	${CONFIGURE_SHARED} \
-			--disable-rpath \
+CONFIGURE_ARGS+=	--disable-rpath \
 			--with-libiconv-prefix=${LOCALBASE} \
 			--with-librecode=${LOCALBASE}
 CONFIGURE_ENV+=		CPPFLAGS="-I${LOCALBASE}/include" \
--- a/converters/libiconv/Makefile
+++ b/converters/libiconv/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.49 2015/04/12 20:21:57 naddy Exp $
+# $OpenBSD: Makefile,v 1.50 2016/03/11 20:28:22 naddy Exp $

 COMMENT=	character set conversion library

@ -21,8 +21,7 @@ WANTLIB=	c
 SEPARATE_BUILD=	Yes
 CONFIGURE_STYLE= gnu
 MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/build-aux ${WRKSRC}/libcharset/build-aux
-CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
-		--disable-nls \
+CONFIGURE_ARGS= --disable-nls \
 		--enable-extra-encodings \
 		--enable-static

--- a/converters/libpst/Makefile
+++ b/converters/libpst/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.40 2015/12/30 14:43:30 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.41 2016/03/11 20:28:23 naddy Exp $

 BROKEN-hppa=		linking .libs/python-libpst.o fails

@ -51,8 +51,7 @@ LIB_DEPENDS-python=	${MODLIBICONV_LIB_DEPENDS} \
 USE_GMAKE=		Yes

 CONFIGURE_STYLE=	gnu
-CONFIGURE_ARGS+=	${CONFIGURE_SHARED} \
-			--enable-pst-debug \
+CONFIGURE_ARGS+=	--enable-pst-debug \
 			--disable-static-tools \
 			--enable-libpst-shared
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include -I${MODPY_INCDIR}" \
--- a/databases/apache-couchdb/Makefile
+++ b/databases/apache-couchdb/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.25 2015/10/30 12:47:38 sthen Exp $
+# $OpenBSD: Makefile,v 1.26 2016/03/11 20:28:23 naddy Exp $

 COMMENT =	distributed, document-oriented database

@ -32,8 +32,7 @@ MAKE_FLAGS =	LDFLAGS="-L${LOCALBASE}/lib -pthread" \
 FAKE_FLAGS =	localconfdir=${PREFIX}/share/examples/couchdb

 CONFIGURE_STYLE = gnu
-CONFIGURE_ARGS = ${CONFIGURE_SHARED} \
-		--with-erlang=${LOCALBASE}/lib/erlang${MODERL_VERSION}/usr/include \
+CONFIGURE_ARGS = --with-erlang=${LOCALBASE}/lib/erlang${MODERL_VERSION}/usr/include \
 		--with-js-include=${LOCALBASE}/include/js \
 		--with-js-lib=${LOCALBASE}/lib \
 		--disable-docs \
--- a/databases/freetds/Makefile
+++ b/databases/freetds/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.78 2016/01/24 01:31:09 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.79 2016/03/11 20:28:23 naddy Exp $

 COMMENT=	database drivers for Sybase/Microsoft SQL Server

@ -43,8 +43,7 @@ TEST_IS_INTERACTIVE=Yes
 CONFIGURE_STYLE=gnu
 CONFIGURE_ENV=	ac_cv_prog_DOXYGEN=
 # --disable-threadsafe required by databases/ruby-tiny_tds
-CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
-		--disable-threadsafe \
+CONFIGURE_ARGS=	--disable-threadsafe \
 		--enable-static \
 		--with-iodbc="${LOCALBASE}" \
 		--with-libiconv-prefix="${LOCALBASE}" \
--- a/databases/libzdb/Makefile
+++ b/databases/libzdb/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2015/09/11 19:28:37 kirby Exp $
+# $OpenBSD: Makefile,v 1.4 2016/03/11 20:28:23 naddy Exp $

 COMMENT =		easy to use database connection pool Library

@ -19,8 +19,7 @@ MASTER_SITES =		http://www.tildeslash.com/libzdb/dist/

 USE_GMAKE =		Yes
 CONFIGURE_STYLE =	gnu
-CONFIGURE_ARGS +=	${CONFIGURE_SHARED} \
-			--with-postgresql=no \
+CONFIGURE_ARGS +=	--with-postgresql=no \
 			--with-mysql=no

 FLAVORS =	mysql postgresql
--- a/databases/openldap/Makefile
+++ b/databases/openldap/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.143 2016/02/25 00:45:43 sthen Exp $
+# $OpenBSD: Makefile,v 1.144 2016/03/11 20:28:23 naddy Exp $

 DPB_PROPERTIES =	parallel

@ -50,8 +50,7 @@ USE_GROFF =		Yes
 FLAVOR ?=
 FLAVORS =		aci

-CONFIGURE_ARGS +=	${CONFIGURE_SHARED} \
-			--enable-ipv6 \
+CONFIGURE_ARGS +=	--enable-ipv6 \
 			--with-tls=openssl

 # slapd options
--- a/databases/openldap23/Makefile
+++ b/databases/openldap23/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2015/10/08 21:19:21 sthen Exp $
+# $OpenBSD: Makefile,v 1.20 2016/03/11 20:28:23 naddy Exp $

 COMMENT=	open-source LDAP software (server, legacy version)

@ -25,8 +25,7 @@ EXTRACT_SUFX=		.tgz
 SEPARATE_BUILD=		Yes
 CONFIGURE_STYLE=	gnu

-CONFIGURE_ARGS+=	${CONFIGURE_SHARED} \
-			--enable-ipv6
+CONFIGURE_ARGS+=	--enable-ipv6

 # slapd options
 CONFIGURE_ARGS+=	--enable-slapd \
--- a/databases/pecl-redis/Makefile
+++ b/databases/pecl-redis/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2016/02/01 21:55:38 sthen Exp $
+# $OpenBSD: Makefile,v 1.3 2016/03/11 20:28:23 naddy Exp $

 COMMENT=		PHP interface to redis

@ -13,7 +13,6 @@ PERMIT_PACKAGE_CDROM=	Yes
 MODULES=		lang/php/pecl

 CONFIGURE_STYLE=	gnu
-CONFIGURE_ARGS=		${CONFIGURE_SHARED} \
-			--enable-redis
+CONFIGURE_ARGS=		--enable-redis

 .include <bsd.port.mk>
--- a/databases/pgtcl/Makefile
+++ b/databases/pgtcl/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2013/03/11 02:52:07 espie Exp $
+# $OpenBSD: Makefile,v 1.12 2016/03/11 20:28:23 naddy Exp $

 SHARED_ONLY=	Yes

@ -25,8 +25,7 @@ BUILD_DEPENDS=	${MODTCL_BUILD_DEPENDS}
 WANTLIB +=	pq>=5 ${MODTCL_WANTLIB}

 CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
-		--with-tcl=${MODTCL_LIBDIR} \
+CONFIGURE_ARGS=	--with-tcl=${MODTCL_LIBDIR} \
 		--libdir=${MODTCL_TCLDIR} \
 		--with-postgres-include=${LOCALBASE}/include/postgresql \
 		--with-postgres-lib=${LOCALBASE}/lib \
--- a/databases/tdbc-sqlite3/Makefile
+++ b/databases/tdbc-sqlite3/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2015/05/22 04:24:54 stu Exp $
+# $OpenBSD: Makefile,v 1.5 2016/03/11 20:28:23 naddy Exp $

 COMMENT =	sqlite3 module for TDBC

@ -31,8 +31,7 @@ SEPARATE_BUILD =	Yes
 USE_GROFF =		Yes
 CONFIGURE_STYLE =	gnu

-CONFIGURE_ARGS +=	${CONFIGURE_SHARED} \
-			--with-tcl=${MODTCL_LIBDIR} \
+CONFIGURE_ARGS +=	--with-tcl=${MODTCL_LIBDIR} \
 			--with-tdbc=${MODTCL_TCLDIR}/tdbc

 TEST_TARGET =		test
--- a/databases/tdbc/Makefile
+++ b/databases/tdbc/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2015/05/22 04:23:29 stu Exp $
+# $OpenBSD: Makefile,v 1.6 2016/03/11 20:28:23 naddy Exp $

 COMMENT =	Tcl Database Connectivity

@ -29,8 +29,7 @@ SEPARATE_BUILD =	Yes
 USE_GROFF =		Yes
 CONFIGURE_STYLE =	autoconf no-autoheader

-CONFIGURE_ARGS +=	${CONFIGURE_SHARED} \
-			--with-tcl=${MODTCL_LIBDIR} \
+CONFIGURE_ARGS +=	--with-tcl=${MODTCL_LIBDIR} \
 			--includedir=${PREFIX}/include/tdbc \
 			SHLIB_VERSION=${LIBtdbc${V:S/.//g}_VERSION}

--- a/databases/virtuoso/Makefile
+++ b/databases/virtuoso/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2015/11/29 10:45:22 sthen Exp $
+# $OpenBSD: Makefile,v 1.12 2016/03/11 20:28:23 naddy Exp $

 BROKEN-macppc =	make: don't know how to make all

@ -35,8 +35,7 @@ AUTOMAKE_VERSION =	1.9

 CONFIGURE_ENV =		YACC="${LOCALBASE}/bin/bison -y"

-CONFIGURE_ARGS =	${CONFIGURE_SHARED} \
-			--disable-all-vads \
+CONFIGURE_ARGS =	--disable-all-vads \
 			--disable-hslookup \
 			--disable-openldap \
 			--disable-php \
--- a/databases/xapian-core/Makefile
+++ b/databases/xapian-core/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.20 2015/09/12 14:15:32 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.21 2016/03/11 20:28:23 naddy Exp $

 COMMENT=	search engine library

@ -25,8 +25,7 @@ LIB_DEPENDS=	sysutils/e2fsprogs>=1.42.7
 CONFIGURE_STYLE= autoconf
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
-		LIBxapian_VERSION=${LIBxapian_VERSION}
+CONFIGURE_ARGS=	LIBxapian_VERSION=${LIBxapian_VERSION}

 AUTOCONF_VERSION=	2.68

--- a/devel/apr/Makefile
+++ b/devel/apr/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.38 2016/03/09 19:11:35 naddy Exp $
+# $OpenBSD: Makefile,v 1.39 2016/03/11 20:28:23 naddy Exp $

 COMMENT=	Apache Portable Runtime

@ -20,8 +20,7 @@ WANTLIB += pthread
 MASTER_SITES=	${MASTER_SITE_APACHE:=apr/}

 CONFIGURE_STYLE=gnu
-CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
-		--includedir=${LOCALBASE}/include/apr-1/ \
+CONFIGURE_ARGS=	--includedir=${LOCALBASE}/include/apr-1/ \
 		--with-installbuilddir=${LOCALBASE}/lib/apr-1/ \
 		--enable-other-child \
 		--enable-threads \
--- a/devel/boehm-gc/Makefile
+++ b/devel/boehm-gc/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.61 2016/03/09 19:54:50 naddy Exp $
+# $OpenBSD: Makefile,v 1.62 2016/03/11 20:28:23 naddy Exp $

 COMMENT-main=	garbage collection and memory leak detection for C and C++
 COMMENT-atomic=	access to hardware provided atomic memory operations
@ -43,8 +43,7 @@ MAKE_ENV=	CP="cp" \

 CONFIGURE_STYLE= gnu

-CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
-		--with-libatomic-ops=no \
+CONFIGURE_ARGS= --with-libatomic-ops=no \
 		--enable-cplusplus \
 		--enable-threads=pthreads

--- a/devel/codeblocks/Makefile
+++ b/devel/codeblocks/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.30 2016/01/30 11:20:01 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.31 2016/03/11 20:28:23 naddy Exp $

 SHARED_ONLY=	Yes
 BROKEN-alpha=	sqvm.cpp:394:1: internal compiler error: Segmentation fault
@ -73,8 +73,7 @@ BUILD_DEPENDS +=	${MODGNU_AUTOCONF_DEPENDS} \
 CONFIGURE_STYLE=gnu
 CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
-		--with-contrib-plugins=all
+CONFIGURE_ARGS=	--with-contrib-plugins=all
 pre-patch: 
 	cd ${WRKSRC}; \
 	env \
--- a/devel/commoncpp/Makefile
+++ b/devel/commoncpp/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2015/07/18 18:43:30 jca Exp $
+# $OpenBSD: Makefile,v 1.15 2016/03/11 20:28:23 naddy Exp $

 COMMENT=	GNU project portable class framework for C++

@ -21,8 +21,7 @@ WANTLIB=	crypto ssl z m stdc++ pthread

 CONFIGURE_STYLE= autoconf
 AUTOCONF_VERSION= 2.61
-CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
-		--without-nat \
+CONFIGURE_ARGS+= --without-nat \
 		--with-openssl
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
--- a/devel/fribidi/Makefile
+++ b/devel/fribidi/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2015/11/13 09:09:55 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.18 2016/03/11 20:28:23 naddy Exp $

 COMMENT=	library implementing the Unicode Bidirectional Algorithm

@ -18,8 +18,7 @@ WANTLIB=	c

 USE_GMAKE=	Yes
 CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
-		--enable-static \
+CONFIGURE_ARGS=	--enable-static \
 		--without-glib

 post-install:
--- a/devel/gettext-tools/Makefile
+++ b/devel/gettext-tools/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2016/01/02 22:00:49 naddy Exp $
+# $OpenBSD: Makefile,v 1.4 2016/03/11 20:28:23 naddy Exp $

 COMMENT=	GNU gettext development and translation tools

@ -32,8 +32,7 @@ RUN_DEPENDS=	archivers/xz

 WRKSRC=		${WRKDIST}/gettext-tools
 CONFIGURE_STYLE=gnu
-CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
-		--disable-csharp \
+CONFIGURE_ARGS=	--disable-csharp \
 		--disable-java \
 		--with-libiconv-prefix="${LOCALBASE}" \
 		--with-libintl-prefix="${LOCALBASE}" \
--- a/devel/gettext/Makefile
+++ b/devel/gettext/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.78 2016/01/02 22:00:49 naddy Exp $
+# $OpenBSD: Makefile,v 1.79 2016/03/11 20:28:23 naddy Exp $

 COMMENT=	GNU gettext runtime libraries and programs

@ -24,8 +24,7 @@ WANTLIB=	c m stdc++

 WRKSRC=		${WRKDIST}/gettext-runtime
 CONFIGURE_STYLE=gnu
-CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
-		--disable-csharp \
+CONFIGURE_ARGS=	--disable-csharp \
 		--disable-java \
 		--with-libiconv-prefix="${LOCALBASE}" \
 		--with-included-gettext
--- a/devel/glog/Makefile
+++ b/devel/glog/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2015/03/16 18:07:40 naddy Exp $
+# $OpenBSD: Makefile,v 1.8 2016/03/11 20:28:24 naddy Exp $

 COMMENT =		C++ application-level logging library

@ -25,8 +25,7 @@ TEST_DEPENDS =	devel/gtest
 BUILD_DEPENDS +=	${TEST_DEPENDS}

 CONFIGURE_STYLE =	gnu
-CONFIGURE_ARGS +=	${CONFIGURE_SHARED} \
-			--with-gflags=${LOCALBASE}
+CONFIGURE_ARGS +=	--with-gflags=${LOCALBASE}
 MAKE_FLAGS =            docdir='$$(prefix)/share/doc/glog'

 .include <bsd.port.mk>
--- a/devel/glpk/Makefile
+++ b/devel/glpk/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2015/05/07 17:28:33 okan Exp $
+# $OpenBSD: Makefile,v 1.11 2016/03/11 20:28:24 naddy Exp $

 COMMENT=	GNU Linear Programming Kit

@ -19,8 +19,7 @@ WANTLIB=		c m gmp
 LIB_DEPENDS=		devel/gmp

 CONFIGURE_STYLE=	gnu
-CONFIGURE_ARGS=		${CONFIGURE_SHARED} \
-			--with-gmp
+CONFIGURE_ARGS=		--with-gmp
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib"

--- a/devel/gmp/Makefile
+++ b/devel/gmp/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.28 2015/06/18 02:36:35 bentley Exp $
+# $OpenBSD: Makefile,v 1.29 2016/03/11 20:28:24 naddy Exp $

 COMMENT=	library for arbitrary precision arithmetic

@ -22,8 +22,7 @@ MASTER_SITES=	ftp://ftp.gmplib.org/pub/${DISTNAME}/ \
 		${MASTER_SITE_GNU:=gmp/}

 CONFIGURE_STYLE=gnu
-CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
-		--enable-cxx
+CONFIGURE_ARGS=	--enable-cxx
 # Don't try to optimize for the local CPU submodel
 CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-unknown-openbsd${OSrev}

--- a/devel/harfbuzz/Makefile
+++ b/devel/harfbuzz/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.47 2016/02/28 11:27:02 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.48 2016/03/11 20:28:24 naddy Exp $

 BROKEN-hppa=		no atomic primitives

@ -53,8 +53,7 @@ LIB_DEPENDS-icu=	devel/harfbuzz,-main=${V} \
 			textproc/icu4c

 CONFIGURE_STYLE=	gnu
-CONFIGURE_ARGS=		${CONFIGURE_SHARED} \
-			--enable-introspection \
+CONFIGURE_ARGS=		--enable-introspection \
 			--with-graphite2 \
 			--with-gobject

--- a/devel/itcl/Makefile
+++ b/devel/itcl/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2015/03/16 18:07:41 naddy Exp $
+# $OpenBSD: Makefile,v 1.14 2016/03/11 20:28:24 naddy Exp $

 COMMENT=	object-oriented extensions to Tcl

@ -31,8 +31,7 @@ WRKDIST=	${WRKDIR}/itcl${VERSION}

 CONFIGURE_STYLE=gnu

-CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
-		--libdir=${MODTCL_TCLDIR} \
+CONFIGURE_ARGS=	--libdir=${MODTCL_TCLDIR} \
 		--with-tcl=${MODTCL_LIBDIR} \
 		--with-tclinclude=${MODTCL_INCDIR} \
 		--includedir=${PREFIX}/include/itcl
--- a/devel/libdaemon/Makefile
+++ b/devel/libdaemon/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2015/03/16 18:07:41 naddy Exp $
+# $OpenBSD: Makefile,v 1.13 2016/03/11 20:28:24 naddy Exp $

 COMMENT=		lightweight C library that eases the writing of daemons

@ -15,8 +15,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 MASTER_SITES=		${HOMEPAGE}

 CONFIGURE_STYLE=	gnu
-CONFIGURE_ARGS= 	${CONFIGURE_SHARED} \
-			--disable-lynx
+CONFIGURE_ARGS= 	--disable-lynx


 .include <bsd.port.mk>
--- a/devel/libidn/Makefile
+++ b/devel/libidn/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.27 2015/08/04 07:27:41 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.28 2016/03/11 20:28:24 naddy Exp $

 COMMENT=		internationalized string handling

@ -23,8 +23,7 @@ MASTER_SITES=		${MASTER_SITE_GNU:=libidn/}
 MODULES=		devel/gettext

 CONFIGURE_STYLE=	gnu
-CONFIGURE_ARGS=		${CONFIGURE_SHARED} \
-			--disable-csharp \
+CONFIGURE_ARGS=		--disable-csharp \
 			--disable-java

 MODGNU_CONFIG_GUESS_DIRS=	${WRKSRC}/build-aux
--- a/devel/liblouis/Makefile
+++ b/devel/liblouis/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2014/10/05 13:53:37 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.17 2016/03/11 20:28:24 naddy Exp $

 COMMENT=	braille translator, back-translator and formatter

@ -26,8 +26,7 @@ MODPY_ADJ_FILES=tools/lou_harnessGenerator
 BUILD_DEPENDS=	devel/help2man

 CONFIGURE_STYLE=gnu
-CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
-		--with-packager="OpenBSD Ports"
+CONFIGURE_ARGS=	--with-packager="OpenBSD Ports"

 post-install:
 	${INSTALL_DATA_DIR} ${WRKINST}/${MODPY_SITEPKG}/louis
--- a/devel/libofx/Makefile
+++ b/devel/libofx/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2014/10/01 19:19:25 landry Exp $
+# $OpenBSD: Makefile,v 1.13 2016/03/11 20:28:24 naddy Exp $

 COMMENT=	opensource implementation of the OFX specification

@ -27,8 +27,7 @@ CONFIGURE_STYLE=gnu
 CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib -lm" \
 		CPPFLAGS="-I${LOCALBASE}/include"

-CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
-		--without-libcurl \
+CONFIGURE_ARGS=	--without-libcurl \
 		--disable-doxygen \
 		--disable-dot \
 		--disable-gengetopt
--- a/devel/liboop/Makefile
+++ b/devel/liboop/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2015/11/24 09:11:04 jasper Exp $
+# $OpenBSD: Makefile,v 1.14 2016/03/11 20:28:24 naddy Exp $

 COMMENT=		low-level event loop management library

@ -15,8 +15,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 MASTER_SITES=		https://distfiles.nl/

 CONFIGURE_STYLE=	gnu
-CONFIGURE_ARGS+= 	${CONFIGURE_SHARED} \
-			--without-adns \
+CONFIGURE_ARGS+= 	--without-adns \
 			--without-glib \
 			--without-libwww \
 			--without-readline \
--- a/devel/log4cpp/Makefile
+++ b/devel/log4cpp/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.2 2016/01/17 17:29:08 sthen Exp $
+# $OpenBSD: Makefile,v 1.3 2016/03/11 20:28:24 naddy Exp $

 COMMENT=	library of C++ classes for flexible logging

@ -21,8 +21,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=log4cpp/}

 CONFIGURE_STYLE= gnu

-CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
-		--with-pthreads \
+CONFIGURE_ARGS+= --with-pthreads \
 		--disable-doxygen
 SEPARATE_BUILD=	Yes

--- a/devel/lutok/Makefile
+++ b/devel/lutok/Makefile
@ -31,8 +31,7 @@ TEST_DEPENDS =		devel/kyua-cli
 .endif

 CONFIGURE_STYLE  =	gnu
-CONFIGURE_ARGS =	${CONFIGURE_SHARED} \
-			--without-doxygen
+CONFIGURE_ARGS =	--without-doxygen
 CONFIGURE_ENV =		LUA_CFLAGS="`pkg-config --cflags ${MODLUA_DEP}`" \
 			LUA_LIBS="`pkg-config --libs ${MODLUA_DEP}`"

--- a/devel/mpfr/Makefile
+++ b/devel/mpfr/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2015/03/16 18:07:44 naddy Exp $
+# $OpenBSD: Makefile,v 1.17 2016/03/11 20:28:24 naddy Exp $

 COMMENT=	library for multiple-precision floating-point computations

@ -26,8 +26,7 @@ WANTLIB=	gmp

 SEPARATE_BUILD=	Yes
 CONFIGURE_STYLE=gnu
-CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
-		--with-gmp=${LOCALBASE}
+CONFIGURE_ARGS=	--with-gmp=${LOCALBASE}

 # Do not install useless docs and misplaced examples.
 FAKE_FLAGS=	docdir=""
--- a/devel/pcre/Makefile
+++ b/devel/pcre/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.60 2016/03/09 18:31:36 jasper Exp $
+# $OpenBSD: Makefile,v 1.61 2016/03/11 20:28:24 naddy Exp $

 COMMENT=	perl-compatible regular expression library

@ -25,8 +25,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 WANTLIB += c curses m readline stdc++

 CONFIGURE_STYLE=	gnu
-CONFIGURE_ARGS=		${CONFIGURE_SHARED} \
-			--enable-pcre8 \
+CONFIGURE_ARGS=		--enable-pcre8 \
 			--enable-pcre16 \
 			--enable-utf \
 			--enable-unicode-properties \
--- a/devel/rapidsvn/Makefile
+++ b/devel/rapidsvn/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.23 2014/12/18 19:09:51 kili Exp $
+# $OpenBSD: Makefile,v 1.24 2016/03/11 20:28:24 naddy Exp $

 # XXX doesn't build if already installed
 COMMENT=	graphical subversion client
@ -41,8 +41,7 @@ LIB_DEPENDS=	x11/wxWidgets \
 MODULES=	devel/gettext

 CONFIGURE_STYLE=gnu
-CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
-		--with-apr-config=${LOCALBASE}/bin/apr-1-config \
+CONFIGURE_ARGS=	--with-apr-config=${LOCALBASE}/bin/apr-1-config \
 		--with-apu-config=${LOCALBASE}/bin/apu-1-config \
 		--with-doxygen=no \
 		--with-manpage=no
--- a/devel/sdl-image/Makefile
+++ b/devel/sdl-image/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.38 2015/05/22 11:31:13 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.39 2016/03/11 20:28:24 naddy Exp $

 COMMENT=	SDL image library

@ -25,8 +25,7 @@ LIB_DEPENDS=	devel/sdl \
 		graphics/tiff

 CONFIGURE_STYLE=gnu
-CONFIGURE_ARGS+=${CONFIGURE_SHARED} \
-		--disable-jpg-shared \
+CONFIGURE_ARGS+=--disable-jpg-shared \
 		--disable-png-shared \
 		--disable-tif-shared \
 		--disable-webp-shared
--- a/devel/sdl-mixer/Makefile
+++ b/devel/sdl-mixer/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.47 2015/05/22 11:31:13 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.48 2016/03/11 20:28:24 naddy Exp $

 COMMENT=	SDL multi-channel audio mixer library

@ -28,8 +28,7 @@ LIB_DEPENDS=	audio/flac \

 USE_GMAKE=	Yes
 CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
-		--disable-music-flac-shared \
+CONFIGURE_ARGS+= --disable-music-flac-shared \
 		--disable-music-fluidsynth-midi \
 		--disable-music-mod-shared \
 		--disable-music-mp3-shared \
--- a/devel/sdl-net/Makefile
+++ b/devel/sdl-net/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.37 2015/06/06 04:49:47 bentley Exp $
+# $OpenBSD: Makefile,v 1.38 2016/03/11 20:28:24 naddy Exp $

 COMMENT=	SDL cross-platform networking library

@ -24,7 +24,6 @@ LIB_DEPENDS=	devel/sdl

 SEPARATE_BUILD=	Yes
 CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS+=${CONFIGURE_SHARED} \
-		--disable-gui
+CONFIGURE_ARGS+=--disable-gui

 .include <bsd.port.mk>
--- a/devel/sdl/Makefile
+++ b/devel/sdl/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.97 2015/05/22 11:31:13 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.98 2016/03/11 20:28:24 naddy Exp $

 COMMENT=	cross-platform multimedia library

@ -34,8 +34,7 @@ USE_GMAKE=	Yes
 SEPARATE_BUILD=	Yes
 CONFIGURE_STYLE= gnu
 MODGNU_CONFIG_GUESS_DIRS=	${WRKSRC} ${WRKSRC}/test
-CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
-		 --disable-alsa \
+CONFIGURE_ARGS+= --disable-alsa \
 		 --disable-arts \
 		 --disable-esd \
 		 --disable-oss \
--- a/devel/sdl2-image/Makefile
+++ b/devel/sdl2-image/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2016/01/10 08:10:16 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.6 2016/03/11 20:28:25 naddy Exp $

 V =		2.0.1
 COMMENT =	SDL2 image library
@ -24,8 +24,7 @@ LIB_DEPENDS =	devel/sdl2 \
 		graphics/tiff

 CONFIGURE_STYLE =	gnu
-CONFIGURE_ARGS +=	${CONFIGURE_SHARED} \
-			--disable-jpg-shared \
+CONFIGURE_ARGS +=	--disable-jpg-shared \
 			--disable-png-shared \
 			--disable-tif-shared \
 			--disable-webp-shared
--- a/devel/sdl2-mixer/Makefile
+++ b/devel/sdl2-mixer/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2016/01/10 08:10:31 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.8 2016/03/11 20:28:25 naddy Exp $

 V =		2.0.1
 COMMENT =	SDL2 multi-channel audio mixer library
@ -27,8 +27,7 @@ LIB_DEPENDS =	audio/flac \
 		devel/smpeg2

 CONFIGURE_STYLE =	gnu
-CONFIGURE_ARGS +=	${CONFIGURE_SHARED} \
-			--disable-music-flac-shared \
+CONFIGURE_ARGS +=	--disable-music-flac-shared \
 			--disable-music-midi-fluidsynth \
 			--disable-music-mod-modplug-shared \
 			--disable-music-mp3-smpeg-shared \
--- a/devel/sdl2-net/Makefile
+++ b/devel/sdl2-net/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2016/01/10 08:10:42 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.5 2016/03/11 20:28:25 naddy Exp $

 V =		2.0.1
 COMMENT =	SDL2 cross-platform networking library
@ -20,8 +20,7 @@ MASTER_SITES =	http://www.libsdl.org/projects/SDL_net/release/
 LIB_DEPENDS =	devel/sdl2

 CONFIGURE_STYLE =	gnu
-CONFIGURE_ARGS +=	${CONFIGURE_SHARED} \
-			--disable-gui
+CONFIGURE_ARGS +=	--disable-gui

 SEPARATE_BUILD =	Yes

--- a/devel/sdl2/Makefile
+++ b/devel/sdl2/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2016/01/10 08:04:43 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.13 2016/03/11 20:28:25 naddy Exp $

 COMMENT=	cross-platform multimedia library

@ -23,8 +23,7 @@ MODGNU_CONFIG_GUESS_DIRS=	${WRKSRC} ${WRKSRC}/build-scripts
 CONFIGURE_ENV+=		CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib"

-CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
-		 --disable-alsa \
+CONFIGURE_ARGS+= --disable-alsa \
 		 --disable-arts \
 		 --disable-dbus \
 		 --disable-esd \
--- a/devel/silc-toolkit/Makefile
+++ b/devel/silc-toolkit/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.37 2015/05/22 11:31:14 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.38 2016/03/11 20:28:25 naddy Exp $

 COMMENT=	toolkit for the development of SILC applications

@ -31,8 +31,7 @@ AUTOCONF_VERSION= 2.69
 .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
 CONFIGURE_ENV+= ac_cv_path_NASM=no YASM=${LOCALBASE}/bin/yasm
 .endif
-CONFIGURE_ARGS+=${CONFIGURE_SHARED} \
-		--docdir=${PREFIX}/share/doc/silc \
+CONFIGURE_ARGS+=--docdir=${PREFIX}/share/doc/silc \
 		--includedir=${PREFIX}/include/silc

 .if ${MACHINE_ARCH} != "amd64" && ${MACHINE_ARCH} != "i386"
--- a/devel/smpeg/Makefile
+++ b/devel/smpeg/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.44 2015/11/24 09:11:04 jasper Exp $
+# $OpenBSD: Makefile,v 1.45 2016/03/11 20:28:25 naddy Exp $

 COMMENT=	MPEG video player library with sound support

@ -23,8 +23,7 @@ LIB_DEPENDS=	devel/sdl

 SEPARATE_BUILD=	Yes
 CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
-		 --disable-opengl-player \
+CONFIGURE_ARGS+= --disable-opengl-player \
 		 --disable-gtk-player
 CONFIGURE_ENV+=  LDFLAGS="-L${X11BASE}/lib"

--- a/devel/subversion/Makefile
+++ b/devel/subversion/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.144 2015/12/16 10:21:52 stsp Exp $
+# $OpenBSD: Makefile,v 1.145 2016/03/11 20:28:25 naddy Exp $

 COMMENT-main=		subversion revision control system
 COMMENT-perl=		perl interface to subversion
@ -137,8 +137,7 @@ MAKE_FLAGS=	MAKE=${MAKE_PROGRAM}
 AUTOCONF_VERSION=2.64
 CONFIGURE_STYLE=gnu
 CONFIGURE_ENV=	PYTHON2=${MODPY_BIN} MKDIR="/bin/mkdir -p"
-CONFIGURE_ARGS+=${CONFIGURE_SHARED} \
-		--with-sasl=${LOCALBASE} \
+CONFIGURE_ARGS+=--with-sasl=${LOCALBASE} \
 		--with-gnome-keyring \
 		--without-jikes \
 		--without-jdk \
--- a/devel/t1lib/Makefile
+++ b/devel/t1lib/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.29 2015/03/16 18:07:45 naddy Exp $
+# $OpenBSD: Makefile,v 1.30 2016/03/11 20:28:25 naddy Exp $

 COMMENT=	Type 1 rasterizer library for UNIX/X11

@ -19,8 +19,7 @@ WANTLIB=	c m
 USE_GMAKE=	Yes
 CONFIGURE_STYLE= gnu
 MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/ac-tools
-CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
-		--without-x
+CONFIGURE_ARGS=	--without-x

 NO_TEST=	Yes

--- a/devel/tclthread/Makefile
+++ b/devel/tclthread/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2015/05/22 04:21:42 stu Exp $
+# $OpenBSD: Makefile,v 1.5 2016/03/11 20:28:25 naddy Exp $

 COMMENT =	thread extension for Tcl

@ -28,8 +28,7 @@ SEPARATE_BUILD =	Yes
 USE_GROFF =		Yes
 CONFIGURE_STYLE =	gnu

-CONFIGURE_ARGS +=	${CONFIGURE_SHARED} \
-			--with-tcl=${MODTCL_LIBDIR} \
+CONFIGURE_ARGS +=	--with-tcl=${MODTCL_LIBDIR} \
 			SHLIB_VERSION=${LIBtclthread${V:S/.//g}_VERSION}

 TEST_TARGET =	test
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.104 2015/10/30 12:47:39 sthen Exp $
+# $OpenBSD: Makefile,v 1.105 2016/03/11 20:28:25 naddy Exp $

 BROKEN-alpha=	gr_RenderInfo.cpp:426:1: internal compiler error: Segmentation fault

@ -71,8 +71,7 @@ RUN_DEPENDS +=	devel/xdg-utils
 PLUGINS=	goffice opendocument openwriter openxml pdf

 CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
-		--enable-introspection \
+CONFIGURE_ARGS=	--enable-introspection \
 		--enable-plugins="${PLUGINS}" \
 		--enable-clipart \
 		--enable-templates
--- a/editors/ged/Makefile
+++ b/editors/ged/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2016/02/29 16:19:57 pascal Exp $
+# $OpenBSD: Makefile,v 1.10 2016/03/11 20:28:25 naddy Exp $

 COMMENT =		GNU version of standard text editor

@ -21,8 +21,7 @@ MASTER_SITES =		${MASTER_SITE_GNU:=ed/}
 EXTRACT_SUFX =		.tar.lz

 CONFIGURE_STYLE =	gnu
-CONFIGURE_ARGS +=	${CONFIGURE_SHARED} \
-			--program-prefix=g \
+CONFIGURE_ARGS +=	--program-prefix=g \
 			CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"

 FAKE_FLAGS =		INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
--- a/editors/subtitleeditor/Makefile
+++ b/editors/subtitleeditor/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.44 2015/09/23 09:41:18 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.45 2016/03/11 20:28:25 naddy Exp $

 SHARED_ONLY=	   	Yes

@ -61,8 +61,7 @@ CONFIGURE_STYLE=	gnu
 CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
 			CXXFLAGS="-std=c++11" \
 			LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=		${CONFIGURE_SHARED} \
-			--with-default-video-sink=autovideosink \
+CONFIGURE_ARGS=		--with-default-video-sink=autovideosink \
 			--with-default-audio-sink=autoaudiosink \
 			--enable-ccache=no

--- a/games/bzflag/Makefile
+++ b/games/bzflag/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.36 2016/01/17 17:29:08 sthen Exp $
+# $OpenBSD: Makefile,v 1.37 2016/03/11 20:28:25 naddy Exp $

 SHARED_ONLY=	Yes

@ -34,8 +34,7 @@ AUTOCONF_VERSION= 2.68
 CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
 		LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib" \
 		ac_cv_lib_bind_gethostent=no
-CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
-		--disable-static
+CONFIGURE_ARGS=	--disable-static

 # Do not configure bundled software we don't use.  This also avoids
 # build failures from those configures picking up dependencies that
--- a/games/fillets-ng/Makefile
+++ b/games/fillets-ng/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2015/04/06 22:18:31 stsp Exp $
+# $OpenBSD: Makefile,v 1.2 2016/03/11 20:28:25 naddy Exp $

 COMMENT =		wonderful puzzle game
 V = 			1.0.1
@ -24,8 +24,7 @@ LIB_DEPENDS =		devel/fribidi \
 			devel/sdl-ttf \
 			devel/smpeg
 CONFIGURE_STYLE =	gnu
-CONFIGURE_ARGS +=	${CONFIGURE_SHARED} \
-			--with-lua=${PREFIX} \
+CONFIGURE_ARGS +=	--with-lua=${PREFIX} \
 			--datadir=${LOCALBASE}/share/fillets-ng
 CONFIGURE_ENV += 	CPPFLAGS="${CPPFLAGS} -I${MODLUA_INCL_DIR}" \
 			LUA_CFLAGS=-I${MODLUA_INCL_DIR} \
--- a/games/gcompris/Makefile
+++ b/games/gcompris/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.62 2015/10/19 17:00:34 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.63 2016/03/11 20:28:25 naddy Exp $

 SHARED_ONLY=	Yes

@ -55,8 +55,7 @@ USE_GMAKE=	Yes
 CONFIGURE_STYLE=gnu
 CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
 		LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
-		--enable-py-build-only \
+CONFIGURE_ARGS=	--enable-py-build-only \
 		--with-python=${MODPY_BIN}

 # don't install under share/gnome/help/, there is no yelp (xml) file
--- a/games/ri-li/Makefile
+++ b/games/ri-li/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2013/03/11 11:07:40 espie Exp $
+# $OpenBSD: Makefile,v 1.11 2016/03/11 20:28:25 naddy Exp $

 COMMENT=	drive a toy wood engine

@ -26,8 +26,7 @@ CONFIGURE_ENV=	CPPFLAGS="`${SDL_CONFIG} --cflags` \
 		-I${X11BASE}/include \
 		-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
-		--with-sdl-config=${SDL_CONFIG}
+CONFIGURE_ARGS=	--with-sdl-config=${SDL_CONFIG}

 pre-configure:
 	perl -pi -e 's|-lSDL |`${SDL_CONFIG} --libs`|' ${WRKSRC}/configure
--- a/games/vegastrike/engine/Makefile
+++ b/games/vegastrike/engine/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2014/04/18 15:14:09 pascal Exp $
+# $OpenBSD: Makefile,v 1.2 2016/03/11 20:28:25 naddy Exp $

 ONLY_FOR_ARCHS =	amd64 i386

@ -30,8 +30,7 @@ LIB_DEPENDS =		x11/gtk+2 \


 CONFIGURE_STYLE =	gnu
-CONFIGURE_ARGS +=	${CONFIGURE_SHARED} \
-			--with-python-version=${MODPY_VERSION} \
+CONFIGURE_ARGS +=	--with-python-version=${MODPY_VERSION} \
 			--with-png-libs="${LOCALBASE}/lib" \
 			--with-png-inc="${LOCALBASE}/include/libpng" \
 			--with-jpeg-libs="${LOCALBASE}/lib" \
--- a/geo/gdal/Makefile
+++ b/geo/gdal/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.43 2016/02/07 12:28:28 landry Exp $
+# $OpenBSD: Makefile,v 1.44 2016/03/11 20:28:25 naddy Exp $

 COMMENT-main =	translator library for geospatial data formats
 COMMENT-python =python bindings and utilities for GDAL
@ -75,8 +75,7 @@ CONFIGURE_ENV =	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -pthread"
 INSTALL_TARGET =	install install-man

-CONFIGURE_ARGS =${CONFIGURE_SHARED} \
-		--without-hdf5 \
+CONFIGURE_ARGS =--without-hdf5 \
 		--without-cfitsio \
 		--without-netcdf \
 		--without-xerces \
--- a/geo/geoclue/Makefile
+++ b/geo/geoclue/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.26 2015/04/21 18:51:24 sthen Exp $
+# $OpenBSD: Makefile,v 1.27 2016/03/11 20:28:25 naddy Exp $

 COMMENT=		modular geoinformation service on top of D-Bus

@ -29,8 +29,7 @@ LIB_DEPENDS =		devel/libsoup \
 USE_GMAKE=		Yes

 CONFIGURE_STYLE=	gnu
-CONFIGURE_ARGS=		${CONFIGURE_SHARED} \
-			--disable-gtk \
+CONFIGURE_ARGS=		--disable-gtk \
 			--disable-connman
 CONFIGURE_ENV=          CPPFLAGS="-I${LOCALBASE}/include" \
                        LDFLAGS="-L${LOCALBASE}/lib"
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.142 2016/03/08 00:27:03 sthen Exp $
+# $OpenBSD: Makefile,v 1.143 2016/03/11 20:28:25 naddy Exp $

 SHARED_ONLY=		Yes

@ -52,8 +52,7 @@ CONFIGURE_STYLE=	autoconf
 LIBTOOL_FLAGS=		--tag=disable-static
 AUTOCONF_VERSION=	2.69
 USE_GMAKE=		Yes
-CONFIGURE_ARGS+=	${CONFIGURE_SHARED} \
-			--without-gcc-arch \
+CONFIGURE_ARGS+=	--without-gcc-arch \
 			--with-gs-font-dir=${LOCALBASE}/share/fonts/ghostscript \
 			--with-perl \
 			--with-perl-options='MAKE=${MAKE_PROGRAM}' \
--- a/graphics/agg/Makefile
+++ b/graphics/agg/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.22 2015/03/16 18:07:45 naddy Exp $
+# $OpenBSD: Makefile,v 1.23 2016/03/11 20:28:25 naddy Exp $

 COMMENT=	anti-grain geometry graphics library

@ -32,8 +32,7 @@ BUILD_DEPENDS=	devel/autoconf/${AUTOCONF_VERSION} \
 SEPARATE_BUILD=	Yes
 CONFIGURE_STYLE=automake

-CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
-		--disable-gpc \
+CONFIGURE_ARGS=	--disable-gpc \
 		--disable-examples \
 		--disable-sdltest
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
--- a/graphics/colord-gtk/Makefile
+++ b/graphics/colord-gtk/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2015/10/08 12:02:03 jasper Exp $
+# $OpenBSD: Makefile,v 1.16 2016/03/11 20:28:26 naddy Exp $

 COMMENT=	GTK+ support library for colord

@ -43,8 +43,7 @@ CONFIGURE_STYLE=gnu
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"

-CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
-		--enable-introspection \
+CONFIGURE_ARGS=	--enable-introspection \
 		--enable-vala

 pre-configure:
--- a/graphics/colord/Makefile
+++ b/graphics/colord/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.57 2015/11/28 08:31:56 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.58 2016/03/11 20:28:26 naddy Exp $

 PORTROACH=	limitw:1,even

@ -53,8 +53,7 @@ CONFIGURE_STYLE=gnu
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"

-CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
-		--enable-introspection \
+CONFIGURE_ARGS=	--enable-introspection \
 		--enable-vala \
 		--disable-systemd-login \
 		--disable-udev \
--- a/graphics/exiv2/Makefile
+++ b/graphics/exiv2/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.20 2015/11/21 15:33:56 jca Exp $
+# $OpenBSD: Makefile,v 1.21 2016/03/11 20:28:26 naddy Exp $

 COMMENT=	manipulate image meta-data such as exif and ipct

@ -23,8 +23,7 @@ CONFIGURE_STYLE=gnu

 MODULES=	devel/gettext

-CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
-		--enable-static
+CONFIGURE_ARGS=	--enable-static
 CONFIGURE_ENV=	LDFLAGS="${LDFLAGS} -pthread"

 NO_TEST=	Yes
--- a/graphics/freeglut/Makefile
+++ b/graphics/freeglut/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2016/01/17 21:42:11 sthen Exp $
+# $OpenBSD: Makefile,v 1.17 2016/03/11 20:28:26 naddy Exp $

 # no libGL (toolchain issue)
 NOT_FOR_ARCHS=	m88k
@ -21,8 +21,7 @@ WANTLIB += usbhid xcb xcb-dri2 xcb-glx
 MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=freeglut/}

 CONFIGURE_STYLE =	gnu
-CONFIGURE_ARGS +=	${CONFIGURE_SHARED} \
-			--enable-warnings=no
+CONFIGURE_ARGS +=	--enable-warnings=no
 CONFIGURE_ENV +=	LDFLAGS="-L${X11BASE}/lib"

 NO_TEST =		Yes
--- a/graphics/gegl/Makefile
+++ b/graphics/gegl/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.52 2015/09/22 18:47:52 pascal Exp $
+# $OpenBSD: Makefile,v 1.53 2016/03/11 20:28:26 naddy Exp $

 PORTROACH=		limit:^0\.2

@ -77,8 +77,7 @@ CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
 			ac_cv_prog_RUBY="" \
 			ac_cv_path_DOT="no"

-CONFIGURE_ARGS=		${CONFIGURE_SHARED} \
-			--disable-docs \
+CONFIGURE_ARGS=		--disable-docs \
 			--without-umfpack \
 			--without-sdl \
 			--without-lua \
--- a/graphics/jasper/Makefile
+++ b/graphics/jasper/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.20 2016/03/09 15:16:05 jasper Exp $
+# $OpenBSD: Makefile,v 1.21 2016/03/11 20:28:26 naddy Exp $

 COMMENT =	reference implementation of JPEG-2000

@ -17,8 +17,7 @@ PERMIT_PACKAGE_CDROM =	Yes
 WANTLIB =		c m

 CONFIGURE_STYLE =	gnu
-CONFIGURE_ARGS +=	${CONFIGURE_SHARED} \
-			--without-x \
+CONFIGURE_ARGS +=	--without-x \
 			--disable-opengl
 MODGNU_CONFIG_GUESS_DIRS =${WRKSRC}/acaux

--- a/graphics/libgphoto2/Makefile
+++ b/graphics/libgphoto2/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.42 2015/11/19 07:16:24 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.43 2016/03/11 20:28:26 naddy Exp $

 SHARED_ONLY=		Yes

@ -41,8 +41,7 @@ CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
 			ac_cv_path_DOXYGEN=false

-CONFIGURE_ARGS=		${CONFIGURE_SHARED} \
-			--enable-static \
+CONFIGURE_ARGS=		--enable-static \
 			--without-hal \
 			--without-bonjour

--- a/graphics/libiptcdata/Makefile
+++ b/graphics/libiptcdata/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2015/11/24 12:21:26 jasper Exp $
+# $OpenBSD: Makefile,v 1.5 2016/03/11 20:28:26 naddy Exp $

 SHARED_ONLY = 		Yes

@ -30,8 +30,7 @@ MODULES =		devel/gettext lang/python
 LIB_DEPENDS-python = 	graphics/libiptcdata,-main

 CONFIGURE_STYLE =	gnu
-CONFIGURE_ARGS +=	${CONFIGURE_SHARED} \
-			--enable-python
+CONFIGURE_ARGS +=	--enable-python
 CONFIGURE_ENV += 	PYTHON_VERSION=${MODPY_VERSION} \
 			LDFLAGS="-L${LOCALBASE}/lib -pthread -lm -lutil"

--- a/graphics/libmpeg2/Makefile
+++ b/graphics/libmpeg2/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.22 2015/03/16 18:07:48 naddy Exp $
+# $OpenBSD: Makefile,v 1.23 2016/03/11 20:28:26 naddy Exp $

 COMMENT=	free MPEG-2 video stream decoder

@ -19,8 +19,7 @@ CONFIGURE_STYLE= autoconf
 AUTOCONF_VERSION= 2.61
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS+=${CONFIGURE_SHARED} \
-		--disable-sdl
+CONFIGURE_ARGS+=--disable-sdl
 MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/.auto

 NO_TEST=	Yes
--- a/graphics/libqrencode/Makefile
+++ b/graphics/libqrencode/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2014/11/08 00:43:35 jturner Exp $
+# $OpenBSD: Makefile,v 1.7 2016/03/11 20:28:26 naddy Exp $

 SHARED_ONLY=		Yes

@ -27,8 +27,7 @@ LIB_DEPENDS=		graphics/png
 BUILD_DEPENDS=		converters/libiconv

 CONFIGURE_STYLE=	gnu
-CONFIGURE_ARGS+=	${CONFIGURE_SHARED} \
-			--with-tools \
+CONFIGURE_ARGS+=	--with-tools \
 			--with-tests \
 			--with-sdl-prefix=/no
 CONFIGURE_ENV+= 	LIBS=-pthread \
--- a/graphics/libwebp/Makefile
+++ b/graphics/libwebp/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2015/11/20 13:41:09 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.12 2016/03/11 20:28:26 naddy Exp $

 COMMENT=	Google WebP image format conversion tool

@ -24,8 +24,7 @@ LIB_DEPENDS=	graphics/giflib \
 		graphics/tiff

 CONFIGURE_STYLE=gnu
-CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
-		--enable-everything
+CONFIGURE_ARGS=	--enable-everything
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"

--- a/Show More
+++ b/Show More