diff --git a/archivers/lzip/lzlib/Makefile b/archivers/lzip/lzlib/Makefile index dfa14f2a015..58de97adf53 100644 --- 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. diff --git a/archivers/xz/Makefile b/archivers/xz/Makefile index 9523e8b730b..55620fcc6ba 100644 --- 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 diff --git a/astro/celestia/Makefile b/astro/celestia/Makefile index fd888bd0734..bfdef027da7 100644 --- 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 diff --git a/astro/wcslib/Makefile b/astro/wcslib/Makefile index 4d17763e393..52e1f5e72cd 100644 --- 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 diff --git a/audio/audacity/Makefile b/audio/audacity/Makefile index b13781c7ec8..4db8ca10d97 100644 --- 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 \ diff --git a/audio/celt/Makefile b/audio/celt/Makefile index 9f4046f6c63..4b5d79ae1e3 100644 --- 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} diff --git a/audio/celt07/Makefile b/audio/celt07/Makefile index 802baab0aa0..d0cf97e2ab5 100644 --- 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" diff --git a/audio/deadbeef/Makefile b/audio/deadbeef/Makefile index 6ae8828abd6..0168b5b24c9 100644 --- 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 \ diff --git a/audio/fdk-aac/Makefile b/audio/fdk-aac/Makefile index bb391e735d1..4b9b118d9c5 100644 --- 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 diff --git a/audio/flac/Makefile b/audio/flac/Makefile index 87b10312c9a..946273e3834 100644 --- 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" \ diff --git a/audio/fluidsynth/Makefile b/audio/fluidsynth/Makefile index de912ec3031..522feb38369 100644 --- 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 \ diff --git a/audio/jack/Makefile b/audio/jack/Makefile index acdbcb10542..bfe55fb6690 100644 --- 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 diff --git a/audio/lame/Makefile b/audio/lame/Makefile index 04e6dd6dd73..5b547b9ef43 100644 --- 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 diff --git a/audio/libcanberra/Makefile b/audio/libcanberra/Makefile index 96fa13ac07e..e341168ee8a 100644 --- 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 \ diff --git a/audio/libcdio/Makefile b/audio/libcdio/Makefile index 41dc1902437..c5811bba108 100644 --- 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" diff --git a/audio/libmp3splt/Makefile b/audio/libmp3splt/Makefile index be9f9080789..b8b6f4b4f51 100644 --- 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" diff --git a/audio/libsamplerate/Makefile b/audio/libsamplerate/Makefile index 30a6b647cfa..518b78ddb91 100644 --- 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: diff --git a/audio/libsndfile/Makefile b/audio/libsndfile/Makefile index ca829e48b1c..b1fafde9ca2 100644 --- 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 diff --git a/audio/opus/Makefile b/audio/opus/Makefile index 41de66e6375..36126e5a547 100644 --- 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 diff --git a/audio/opusfile/Makefile b/audio/opusfile/Makefile index 5909d7fa5ea..7b026f2b817 100644 --- 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" diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile index bb202c1dbb0..b6b846254e8 100644 --- 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 \ diff --git a/audio/sox/Makefile b/audio/sox/Makefile index e8aa9b1b668..9498739a23d 100644 --- 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 \ diff --git a/audio/speech-dispatcher/Makefile b/audio/speech-dispatcher/Makefile index 97068cae148..0c9d0489c11 100755 --- 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 diff --git a/audio/speex/Makefile b/audio/speex/Makefile index 9482a0bc072..2944c16186f 100644 --- 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 \ diff --git a/cad/geda-gaf/Makefile b/cad/geda-gaf/Makefile index 84801d39ea7..35b9970de21 100644 --- 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. diff --git a/cad/xcircuit/Makefile b/cad/xcircuit/Makefile index 37913d8a9f1..e6ca7293e2b 100644 --- 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 diff --git a/comms/jpilot/Makefile b/comms/jpilot/Makefile index a784c45c095..782f3fdf26a 100644 --- 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 diff --git a/comms/pilot-link/Makefile b/comms/pilot-link/Makefile index 5897dfbda1f..ec907079401 100644 --- 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 \ diff --git a/converters/enca/Makefile b/converters/enca/Makefile index 3e3cdbd55c6..f3f640828ae 100644 --- 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" \ diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile index bca410b480a..81ba10b12ab 100644 --- 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 diff --git a/converters/libpst/Makefile b/converters/libpst/Makefile index 1d88b149dbc..4589611865c 100644 --- 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}" \ diff --git a/databases/apache-couchdb/Makefile b/databases/apache-couchdb/Makefile index e3d890c6d35..63c791e1f7a 100644 --- 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 \ diff --git a/databases/freetds/Makefile b/databases/freetds/Makefile index 1f5a06ce320..04ba5011557 100644 --- 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}" \ diff --git a/databases/libzdb/Makefile b/databases/libzdb/Makefile index 605436a98fb..4caf42c2fff 100644 --- 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 diff --git a/databases/openldap/Makefile b/databases/openldap/Makefile index 701be1e03fe..4a4967a3932 100644 --- 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 diff --git a/databases/openldap23/Makefile b/databases/openldap23/Makefile index 4455d644760..fd669dd7788 100644 --- 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 \ diff --git a/databases/pecl-redis/Makefile b/databases/pecl-redis/Makefile index 82d060b2708..42d1563483b 100644 --- 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 diff --git a/databases/pgtcl/Makefile b/databases/pgtcl/Makefile index 57959a196c1..c703a6b5bb2 100644 --- 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 \ diff --git a/databases/tdbc-sqlite3/Makefile b/databases/tdbc-sqlite3/Makefile index a469be1ae7c..b24e1901935 100644 --- 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 diff --git a/databases/tdbc/Makefile b/databases/tdbc/Makefile index 62b27c33071..de5798a4247 100644 --- 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} diff --git a/databases/virtuoso/Makefile b/databases/virtuoso/Makefile index 21a27843f1a..d2f0c0f9a17 100644 --- 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 \ diff --git a/databases/xapian-core/Makefile b/databases/xapian-core/Makefile index 4f4870c5882..9fbd176e4a2 100755 --- 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 diff --git a/devel/apr/Makefile b/devel/apr/Makefile index c6b9f7a0309..bf8abc31cf2 100644 --- 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 \ diff --git a/devel/boehm-gc/Makefile b/devel/boehm-gc/Makefile index d998648b482..65e9788d36a 100644 --- 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 diff --git a/devel/codeblocks/Makefile b/devel/codeblocks/Makefile index 887da2276c4..e4438526129 100755 --- 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 \ diff --git a/devel/commoncpp/Makefile b/devel/commoncpp/Makefile index 64fe369a98d..00f1f40f04a 100644 --- 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" \ diff --git a/devel/fribidi/Makefile b/devel/fribidi/Makefile index 33aa4a330e4..5d41119032d 100644 --- 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: diff --git a/devel/gettext-tools/Makefile b/devel/gettext-tools/Makefile index 2f60d026e26..182186fb340 100644 --- 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}" \ diff --git a/devel/gettext/Makefile b/devel/gettext/Makefile index e794baaca97..c270dd9d725 100644 --- 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 diff --git a/devel/glog/Makefile b/devel/glog/Makefile index 27221b36ab0..b3a1574e463 100644 --- 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 diff --git a/devel/glpk/Makefile b/devel/glpk/Makefile index 9f1e1be729e..ba0582ca679 100644 --- 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" diff --git a/devel/gmp/Makefile b/devel/gmp/Makefile index 9bb50269f74..5e1d06aedcf 100644 --- 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} diff --git a/devel/harfbuzz/Makefile b/devel/harfbuzz/Makefile index bfabbfc7344..4e970b5ae8c 100644 --- 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 diff --git a/devel/itcl/Makefile b/devel/itcl/Makefile index f18127556e2..333ea811703 100644 --- 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 diff --git a/devel/libdaemon/Makefile b/devel/libdaemon/Makefile index e81f9b54fc7..2b661e3f699 100644 --- 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 diff --git a/devel/libidn/Makefile b/devel/libidn/Makefile index 40be31024e3..03f6825d589 100644 --- 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 diff --git a/devel/liblouis/Makefile b/devel/liblouis/Makefile index 22f0e314f98..450dbf189aa 100644 --- 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 diff --git a/devel/libofx/Makefile b/devel/libofx/Makefile index 486f6bbf3b3..4ab4557e136 100644 --- 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 diff --git a/devel/liboop/Makefile b/devel/liboop/Makefile index 60c44b25f86..e89b6c8b666 100644 --- 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 \ diff --git a/devel/log4cpp/Makefile b/devel/log4cpp/Makefile index 94a89dda56f..730b8d176d8 100644 --- 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 diff --git a/devel/lutok/Makefile b/devel/lutok/Makefile index f30361ae8d7..494784afb99 100644 --- 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}`" diff --git a/devel/mpfr/Makefile b/devel/mpfr/Makefile index 3ddee6dec12..a59e97e34bb 100644 --- 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="" diff --git a/devel/pcre/Makefile b/devel/pcre/Makefile index 3458e3e36e2..675ed258899 100644 --- 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 \ diff --git a/devel/rapidsvn/Makefile b/devel/rapidsvn/Makefile index 4601475f5fa..2dc5d75c777 100644 --- 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 diff --git a/devel/sdl-image/Makefile b/devel/sdl-image/Makefile index 92286975337..ab3f6fc603a 100644 --- 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 diff --git a/devel/sdl-mixer/Makefile b/devel/sdl-mixer/Makefile index 7b77c631210..9d1c03ad81f 100644 --- 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 \ diff --git a/devel/sdl-net/Makefile b/devel/sdl-net/Makefile index 5d507d3659b..5dfbbf2d31e 100644 --- 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 diff --git a/devel/sdl/Makefile b/devel/sdl/Makefile index de1f24cd2b5..de695241b26 100644 --- 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 \ diff --git a/devel/sdl2-image/Makefile b/devel/sdl2-image/Makefile index 86dea87be61..b305b65c75c 100644 --- 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 diff --git a/devel/sdl2-mixer/Makefile b/devel/sdl2-mixer/Makefile index a33ce7f2ad6..11edd0f6a51 100644 --- 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 \ diff --git a/devel/sdl2-net/Makefile b/devel/sdl2-net/Makefile index 47922e772ad..c40261b514a 100644 --- 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 diff --git a/devel/sdl2/Makefile b/devel/sdl2/Makefile index 82b56930192..dccbd2fefc6 100644 --- 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 \ diff --git a/devel/silc-toolkit/Makefile b/devel/silc-toolkit/Makefile index 8648f233a69..d4989940da4 100644 --- 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" diff --git a/devel/smpeg/Makefile b/devel/smpeg/Makefile index dc26b7a3dd4..5321f07c6ec 100644 --- 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" diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile index 84923ff725a..83b70015c23 100644 --- 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 \ diff --git a/devel/t1lib/Makefile b/devel/t1lib/Makefile index ddaabb9af54..1f18f234372 100644 --- 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 diff --git a/devel/tclthread/Makefile b/devel/tclthread/Makefile index 2db8b85d9f4..6494983f5a2 100644 --- 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 diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile index 31d1ef7eecc..2cf1d4b872c 100644 --- 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 diff --git a/editors/ged/Makefile b/editors/ged/Makefile index af81420fd28..357a509d0ee 100644 --- 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}" \ diff --git a/editors/subtitleeditor/Makefile b/editors/subtitleeditor/Makefile index d365bb424db..8ac395d1aba 100644 --- 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 diff --git a/games/bzflag/Makefile b/games/bzflag/Makefile index 78611e653ce..4d8526130e2 100644 --- 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 diff --git a/games/fillets-ng/Makefile b/games/fillets-ng/Makefile index 14acdea5667..6297324de21 100644 --- 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} \ diff --git a/games/gcompris/Makefile b/games/gcompris/Makefile index 38cb40c5111..1beadba6a1c 100644 --- 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 diff --git a/games/ri-li/Makefile b/games/ri-li/Makefile index 352b5a7ee8c..eebaced21c6 100644 --- 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 diff --git a/games/vegastrike/engine/Makefile b/games/vegastrike/engine/Makefile index 6c5942ce949..d8f70f0ee12 100644 --- 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" \ diff --git a/geo/gdal/Makefile b/geo/gdal/Makefile index e23cf3d891d..94fe8a397e1 100644 --- 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 \ diff --git a/geo/geoclue/Makefile b/geo/geoclue/Makefile index 725d02aec37..591c388b00e 100644 --- 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" diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile index bf84c74654f..014e812b653 100644 --- 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}' \ diff --git a/graphics/agg/Makefile b/graphics/agg/Makefile index 6bdb78d9d42..ba827fdfca1 100644 --- 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" \ diff --git a/graphics/colord-gtk/Makefile b/graphics/colord-gtk/Makefile index f30f436fccc..095e52bc502 100644 --- 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: diff --git a/graphics/colord/Makefile b/graphics/colord/Makefile index 70978227612..d54213b09e1 100644 --- 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 \ diff --git a/graphics/exiv2/Makefile b/graphics/exiv2/Makefile index a0b333dc29a..97efd6088e4 100644 --- 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 diff --git a/graphics/freeglut/Makefile b/graphics/freeglut/Makefile index 8e5aaf6fb38..e7827aa2eaa 100644 --- 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 diff --git a/graphics/gegl/Makefile b/graphics/gegl/Makefile index ec3be248be5..602c82f9a9b 100644 --- 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 \ diff --git a/graphics/jasper/Makefile b/graphics/jasper/Makefile index b79eaa1665c..7962754bf36 100644 --- 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 diff --git a/graphics/libgphoto2/Makefile b/graphics/libgphoto2/Makefile index a731968e567..101e638bed1 100644 --- 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 diff --git a/graphics/libiptcdata/Makefile b/graphics/libiptcdata/Makefile index e92827e1aef..8f513c0c302 100644 --- 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" diff --git a/graphics/libmpeg2/Makefile b/graphics/libmpeg2/Makefile index 58afd615482..f29b87f606c 100644 --- 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 diff --git a/graphics/libqrencode/Makefile b/graphics/libqrencode/Makefile index 442d6f90394..ec8afeb901f 100644 --- 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 \ diff --git a/graphics/libwebp/Makefile b/graphics/libwebp/Makefile index bd687d31b7a..d6801412ef6 100755 --- 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" diff --git a/graphics/libwmf/Makefile b/graphics/libwmf/Makefile index 1e90b4f8e88..9729d742ec6 100644 --- a/graphics/libwmf/Makefile +++ b/graphics/libwmf/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.28 2015/08/19 18:55:05 sthen Exp $ +# $OpenBSD: Makefile,v 1.29 2016/03/11 20:28:26 naddy Exp $ COMMENT= WMF handling and conversion library @@ -26,8 +26,7 @@ LIB_DEPENDS= graphics/jpeg \ graphics/png CONFIGURE_STYLE= gnu -CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ - --with-png=${LOCALBASE} \ +CONFIGURE_ARGS= --with-png=${LOCALBASE} \ --with-freetype=${X11BASE} \ --with-jpeg=${LOCALBASE} \ --with-zlib=/usr \ diff --git a/graphics/povray/Makefile b/graphics/povray/Makefile index 86493e932e7..a6e66e1f751 100644 --- a/graphics/povray/Makefile +++ b/graphics/povray/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.29 2015/11/14 22:53:26 naddy Exp $ +# $OpenBSD: Makefile,v 1.30 2016/03/11 20:28:26 naddy Exp $ COMMENT= 3D image rendering package @@ -29,8 +29,7 @@ LIB_DEPENDS= graphics/jpeg \ graphics/tiff CONFIGURE_STYLE= gnu -CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \ - --with-x \ +CONFIGURE_ARGS+= --with-x \ --enable-watch-cursor \ --disable-optimiz \ --x-includes="${X11BASE}/include" \ diff --git a/graphics/pstoedit/Makefile b/graphics/pstoedit/Makefile index 3ad0fcb018a..a73cb0123b6 100644 --- a/graphics/pstoedit/Makefile +++ b/graphics/pstoedit/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.17 2015/07/19 15:06:14 steven Exp $ +# $OpenBSD: Makefile,v 1.18 2016/03/11 20:28:26 naddy Exp $ COMMENT= translate PostScript/PDF graphics to other vector formats @@ -20,8 +20,7 @@ BUILD_DEPENDS= ${RUN_DEPENDS} USE_GROFF = Yes CONFIGURE_STYLE=gnu -CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ - --without-libplot \ +CONFIGURE_ARGS= --without-libplot \ --without-emf \ --without-swf \ --without-magick diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile index ea003d8f6e6..567342e8718 100755 --- a/graphics/sane-backends/Makefile +++ b/graphics/sane-backends/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.73 2016/01/09 09:52:03 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.74 2016/03/11 20:28:26 naddy Exp $ BROKEN-alpha= ICE hp5590.c:1141: error: unrecognizable insn @@ -41,8 +41,7 @@ LOCALSTATEDIR= ${BASELOCALSTATEDIR}/spool CONFIGURE_STYLE= gnu CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ - --sbindir=${PREFIX}/libexec \ +CONFIGURE_ARGS= --sbindir=${PREFIX}/libexec \ --with-docdir=${PREFIX}/share/doc/sane-backends \ --without-gphoto2 \ --with-group=553 \ diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile index 9611d0e55c9..2845e5aacc2 100644 --- a/graphics/tiff/Makefile +++ b/graphics/tiff/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.75 2016/01/24 16:48:48 naddy Exp $ +# $OpenBSD: Makefile,v 1.76 2016/03/11 20:28:26 naddy Exp $ COMMENT= tools and library routines for working with TIFF images @@ -19,8 +19,7 @@ WANTLIB= c m stdc++ z jpeg PERMIT_PACKAGE_CDROM= Yes CONFIGURE_STYLE=gnu -CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ - --disable-jbig \ +CONFIGURE_ARGS= --disable-jbig \ --disable-lzma \ --with-docdir="${PREFIX}/share/doc/tiff" \ --with-jpeg-include-dir="${LOCALBASE}/include" \ diff --git a/graphics/tkpng/Makefile b/graphics/tkpng/Makefile index 1d5b9ee53e5..e432b235cd9 100644 --- a/graphics/tkpng/Makefile +++ b/graphics/tkpng/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2013/03/11 11:10:56 espie Exp $ +# $OpenBSD: Makefile,v 1.6 2016/03/11 20:28:26 naddy Exp $ SHARED_ONLY = Yes @@ -29,8 +29,7 @@ FAKE_FLAGS = PKG_DIR=tkpng \ SEPARATE_BUILD =Yes CONFIGURE_STYLE=gnu -CONFIGURE_ARGS+=${CONFIGURE_SHARED} \ - --with-tcl=${MODTCL_LIBDIR} \ +CONFIGURE_ARGS+=--with-tcl=${MODTCL_LIBDIR} \ --with-tk=${MODTK_LIBDIR} \ --with-tkinclude=${MODTK_INCDIR} \ --libdir=${MODTCL_TCLDIR} \ diff --git a/graphics/xmedcon/Makefile b/graphics/xmedcon/Makefile index 773d0898083..142006fd324 100644 --- a/graphics/xmedcon/Makefile +++ b/graphics/xmedcon/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.31 2014/05/01 13:43:13 benoit Exp $ +# $OpenBSD: Makefile,v 1.32 2016/03/11 20:28:26 naddy Exp $ COMMENT = medical image conversion @@ -32,8 +32,7 @@ FAKE_FLAGS = sysconfdir=${TRUEPREFIX}/share/examples/xmedcon USE_GROFF = Yes CONFIGURE_STYLE = gnu -CONFIGURE_ARGS += ${CONFIGURE_SHARED} \ - --enable-static \ +CONFIGURE_ARGS += --enable-static \ --sysconfdir="${SYSCONFDIR}" CONFIGURE_ENV = CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" diff --git a/inputmethods/libtomoe-gtk/Makefile b/inputmethods/libtomoe-gtk/Makefile index fce17160ed4..06836af86d8 100644 --- a/inputmethods/libtomoe-gtk/Makefile +++ b/inputmethods/libtomoe-gtk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.22 2015/01/09 16:47:18 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.23 2016/03/11 20:28:26 naddy Exp $ COMMENT= japanese handwriting input widget @@ -35,8 +35,7 @@ CONFIGURE_STYLE=gnu CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ - --without-gucharmap \ +CONFIGURE_ARGS= --without-gucharmap \ --without-python .include diff --git a/inputmethods/scim-chewing/Makefile b/inputmethods/scim-chewing/Makefile index 6451769ccd8..67eb34c8ca3 100644 --- a/inputmethods/scim-chewing/Makefile +++ b/inputmethods/scim-chewing/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.16 2015/05/05 17:00:18 sthen Exp $ +# $OpenBSD: Makefile,v 1.17 2016/03/11 20:28:27 naddy Exp $ SHARED_ONLY= Yes @@ -36,8 +36,7 @@ LIB_DEPENDS= x11/gtk+2 \ LIBTOOL_FLAGS= --tag=disable-static CONFIGURE_STYLE=gnu -CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ - --disable-static +CONFIGURE_ARGS= --disable-static CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/inputmethods/scim-fcitx/Makefile b/inputmethods/scim-fcitx/Makefile index a4d558b8456..124344327ff 100644 --- a/inputmethods/scim-fcitx/Makefile +++ b/inputmethods/scim-fcitx/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2015/01/21 06:13:48 bentley Exp $ +# $OpenBSD: Makefile,v 1.8 2016/03/11 20:28:27 naddy Exp $ SHARED_ONLY= Yes @@ -29,8 +29,7 @@ WRKDIST= ${WRKDIR}/fcitx LIBTOOL_FLAGS= --tag=disable-static CONFIGURE_STYLE=gnu -CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ - --disable-static +CONFIGURE_ARGS= --disable-static CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/inputmethods/scim-hangul/Makefile b/inputmethods/scim-hangul/Makefile index 24a6d165f8d..7972e481d0b 100644 --- a/inputmethods/scim-hangul/Makefile +++ b/inputmethods/scim-hangul/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.16 2015/05/05 17:00:18 sthen Exp $ +# $OpenBSD: Makefile,v 1.17 2016/03/11 20:28:27 naddy Exp $ SHARED_ONLY= Yes @@ -34,8 +34,7 @@ LIB_DEPENDS= korean/libhangul \ LIBTOOL_FLAGS= --tag=disable-static CONFIGURE_STYLE=gnu -CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ - --disable-static \ +CONFIGURE_ARGS= --disable-static \ --disable-skim-support .include diff --git a/inputmethods/scim-pinyin/Makefile b/inputmethods/scim-pinyin/Makefile index 7dde932b75e..94a84b3a0ae 100644 --- a/inputmethods/scim-pinyin/Makefile +++ b/inputmethods/scim-pinyin/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.13 2015/05/05 17:00:18 sthen Exp $ +# $OpenBSD: Makefile,v 1.14 2016/03/11 20:28:27 naddy Exp $ SHARED_ONLY= Yes @@ -33,8 +33,7 @@ LIB_DEPENDS= x11/gtk+2 \ LIBTOOL_FLAGS= --tag=disable-static CONFIGURE_STYLE=gnu -CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ - --disable-static \ +CONFIGURE_ARGS= --disable-static \ --disable-skim-support .include diff --git a/inputmethods/scim-qtimm/Makefile b/inputmethods/scim-qtimm/Makefile index 5ff474d9f4a..fd5159e08cc 100644 --- a/inputmethods/scim-qtimm/Makefile +++ b/inputmethods/scim-qtimm/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.14 2015/04/21 18:24:22 sthen Exp $ +# $OpenBSD: Makefile,v 1.15 2016/03/11 20:28:27 naddy Exp $ SHARED_ONLY= Yes @@ -28,8 +28,7 @@ SUBST_VARS= MODQT_PLUGINS LIBTOOL_FLAGS= --tag=disable-static CONFIGURE_STYLE=gnu -CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ - --disable-static \ +CONFIGURE_ARGS= --disable-static \ --disable-skim-support \ --with-qt-includes=${MODQT_INCDIR} \ --with-qt-libraries=${MODQT_LIBDIR} diff --git a/inputmethods/scim-tables/Makefile b/inputmethods/scim-tables/Makefile index 954ea713e93..d8ef356514e 100644 --- a/inputmethods/scim-tables/Makefile +++ b/inputmethods/scim-tables/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.15 2015/05/05 17:00:18 sthen Exp $ +# $OpenBSD: Makefile,v 1.16 2016/03/11 20:28:27 naddy Exp $ SHARED_ONLY= Yes @@ -33,8 +33,7 @@ LIB_DEPENDS= x11/gtk+2 \ LIBTOOL_FLAGS= --tag=disable-static CONFIGURE_STYLE=gnu -CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ - --disable-static \ +CONFIGURE_ARGS= --disable-static \ --disable-skim-support .include diff --git a/inputmethods/scim/Makefile b/inputmethods/scim/Makefile index ef0283f51a8..5aa2d0c1cf1 100644 --- a/inputmethods/scim/Makefile +++ b/inputmethods/scim/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.23 2015/05/05 17:00:18 sthen Exp $ +# $OpenBSD: Makefile,v 1.24 2016/03/11 20:28:26 naddy Exp $ SHARED_ONLY = Yes @@ -38,8 +38,7 @@ FAKE_FLAGS = sysconfdir=${PREFIX}/share/examples/scim USE_GMAKE = Yes LIBTOOL_FLAGS = --tag=disable-static CONFIGURE_STYLE = gnu -CONFIGURE_ARGS = ${CONFIGURE_SHARED} \ - --with-gtk-im-module-dir="${LOCALBASE}/lib/gtk-2.0/2.10.0/immodules" +CONFIGURE_ARGS = --with-gtk-im-module-dir="${LOCALBASE}/lib/gtk-2.0/2.10.0/immodules" CONFIGURE_ENV = LIBS="-pthread" .include diff --git a/inputmethods/uim-chewing/Makefile b/inputmethods/uim-chewing/Makefile index 3fcf5f26e0c..f621c79fa70 100644 --- a/inputmethods/uim-chewing/Makefile +++ b/inputmethods/uim-chewing/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.13 2015/08/25 00:30:41 bentley Exp $ +# $OpenBSD: Makefile,v 1.14 2016/03/11 20:28:27 naddy Exp $ SHARED_ONLY= Yes @@ -27,7 +27,6 @@ LIB_DEPENDS= chinese/libchewing \ LIBTOOL_FLAGS= --tag=disable-static CONFIGURE_STYLE=gnu -CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ - --disable-static +CONFIGURE_ARGS= --disable-static .include diff --git a/inputmethods/uim/Makefile b/inputmethods/uim/Makefile index 7f98a40f53d..9f95ef4d805 100644 --- a/inputmethods/uim/Makefile +++ b/inputmethods/uim/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.51 2015/08/25 14:03:21 sthen Exp $ +# $OpenBSD: Makefile,v 1.52 2016/03/11 20:28:27 naddy Exp $ SHARED_ONLY= Yes DPB_PROPERTIES= tag:kde3 @@ -120,8 +120,7 @@ CONFIGURE_ENV= CPPFLAGS='-I${MODQT3_INCDIR} -I${LOCALBASE}/include -I${X11BASE} ac_cv_prog_HOST_MOC=${MODQT3_MOC} \ ac_cv_prog_HOST_UIC=${MODQT3_MOC} -CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ - --with-qt \ +CONFIGURE_ARGS= --with-qt \ --with-qt-immodule \ --with-qt4 \ --with-qt4-immodule \ diff --git a/lang/expect/Makefile b/lang/expect/Makefile index cb0f1944606..c9537bca318 100644 --- a/lang/expect/Makefile +++ b/lang/expect/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.67 2015/12/03 09:18:15 sthen Exp $ +# $OpenBSD: Makefile,v 1.68 2016/03/11 20:28:27 naddy Exp $ COMMENT = sophisticated scripter based on Tcl/Tk @@ -24,8 +24,7 @@ LIB_DEPENDS += ${MODTCL_LIB_DEPENDS} SEPARATE_BUILD = Yes AUTOCONF_VERSION = 2.59 CONFIGURE_STYLE = autoconf no-autoheader -CONFIGURE_ARGS += ${CONFIGURE_SHARED} \ - --libdir=${MODTCL_TCLDIR} \ +CONFIGURE_ARGS += --libdir=${MODTCL_TCLDIR} \ --with-tclconfig="${MODTCL_LIBDIR}" \ --with-tclinclude="${MODTCL_INCDIR}" CONFIGURE_ENV += SHLIB_VERSION=${LIBexpect545_VERSION} \ diff --git a/lang/iverilog/Makefile b/lang/iverilog/Makefile index 5a55fb44ca1..53424f87496 100644 --- a/lang/iverilog/Makefile +++ b/lang/iverilog/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.11 2015/12/23 11:12:53 bentley Exp $ +# $OpenBSD: Makefile,v 1.12 2016/03/11 20:28:27 naddy Exp $ COMMENT= Verilog simulation and synthesis tool @@ -22,8 +22,7 @@ BUILD_DEPENDS= devel/bison YACC= bison CONFIGURE_STYLE= gnu -CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \ - --disable-suffix +CONFIGURE_ARGS+= --disable-suffix CFLAGS+= -fPIC VVP_DOCS= README.txt opcodes.txt diff --git a/lang/librep/Makefile b/lang/librep/Makefile index 08a528c3351..1fd748beda3 100644 --- a/lang/librep/Makefile +++ b/lang/librep/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.62 2015/02/16 22:57:09 naddy Exp $ +# $OpenBSD: Makefile,v 1.63 2016/03/11 20:28:27 naddy Exp $ COMMENT= Emacs Lisp-like runtime library @@ -33,8 +33,7 @@ USE_GMAKE= Yes MAKE_FLAGS= rep_LIBTOOL=${LIBTOOL} CONFIGURE_STYLE= gnu -CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \ - --enable-static \ +CONFIGURE_ARGS+= --enable-static \ --with-aclocaldir=${PREFIX}/share/aclocal # -pthread is needed for opening libglib-2.0: diff --git a/lang/mono/Makefile b/lang/mono/Makefile index 47ee43aaa26..2ef9b4ec797 100644 --- a/lang/mono/Makefile +++ b/lang/mono/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.94 2016/03/02 07:17:34 robert Exp $ +# $OpenBSD: Makefile,v 1.95 2016/03/11 20:28:27 naddy Exp $ COMMENT= cross platform, open source .NET developement framework @@ -57,8 +57,7 @@ CONFIGURE_ENV+= CFLAGS="-march=i586" WRKDIST= ${WRKDIR}/mono-${V} -CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ - --with-gc=included \ +CONFIGURE_ARGS= --with-gc=included \ --with-sgen=no \ --enable-quiet-build=no \ --disable-shared-handles diff --git a/lang/tcl/8.5/Makefile b/lang/tcl/8.5/Makefile index a2722f002b2..dd9e36c8fbc 100644 --- a/lang/tcl/8.5/Makefile +++ b/lang/tcl/8.5/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.36 2015/06/06 14:19:10 stu Exp $ +# $OpenBSD: Makefile,v 1.37 2016/03/11 20:28:27 naddy Exp $ COMMENT = Tool Command Language @@ -30,8 +30,7 @@ SEPARATE_BUILD = Yes USE_GROFF = Yes CONFIGURE_STYLE = gnu old -CONFIGURE_ARGS += ${CONFIGURE_SHARED} \ - --includedir="${PREFIX}/include/tcl8.5" \ +CONFIGURE_ARGS += --includedir="${PREFIX}/include/tcl8.5" \ --mandir="${PREFIX}/lib/tcl/tcl8.5/man" \ --sysconfdir="${SYSCONFDIR}" \ --enable-man-symlinks \ diff --git a/lang/tcl/8.6/Makefile b/lang/tcl/8.6/Makefile index b9772389213..847e027cffd 100644 --- a/lang/tcl/8.6/Makefile +++ b/lang/tcl/8.6/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.13 2015/05/22 04:17:01 stu Exp $ +# $OpenBSD: Makefile,v 1.14 2016/03/11 20:28:27 naddy Exp $ COMMENT = Tool Command Language @@ -32,8 +32,7 @@ SEPARATE_BUILD = Yes USE_GROFF = Yes CONFIGURE_STYLE = gnu old -CONFIGURE_ARGS += ${CONFIGURE_SHARED} \ - --includedir="${PREFIX}/include/tcl8.6" \ +CONFIGURE_ARGS += --includedir="${PREFIX}/include/tcl8.6" \ --mandir="${PREFIX}/lib/tcl/tcl8.6/man" \ --sysconfdir="${SYSCONFDIR}" \ --enable-man-symlinks \ diff --git a/mail/perdition/Makefile b/mail/perdition/Makefile index dad53ea7955..6ab25144a05 100644 --- a/mail/perdition/Makefile +++ b/mail/perdition/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.32 2015/08/27 13:51:27 giovanni Exp $ +# $OpenBSD: Makefile,v 1.33 2016/03/11 20:28:27 naddy Exp $ COMMENT-main= fully featured POP3 and IMAP4 proxy server COMMENT-ldap= LDAP backend for perdition mail proxy @@ -40,8 +40,7 @@ CONFIGURE_STYLE= gnu CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -I${LOCALBASE}/include/db4" \ LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \ - --enable-ssl \ +CONFIGURE_ARGS+= --enable-ssl \ --disable-cdb \ --disable-gdbm \ --disable-odbc \ diff --git a/mail/sylpheed/Makefile b/mail/sylpheed/Makefile index 7cdf77f20e0..b64fb485671 100644 --- a/mail/sylpheed/Makefile +++ b/mail/sylpheed/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.106 2015/04/04 09:21:02 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.107 2016/03/11 20:28:27 naddy Exp $ COMMENT = lightweight and user-friendly e-mail client @@ -31,8 +31,7 @@ RUN_DEPENDS = devel/desktop-file-utils MASTER_SITES = http://sylpheed.sraoss.jp/sylpheed/v3.4/ CONFIGURE_STYLE = gnu -CONFIGURE_ARGS = ${CONFIGURE_SHARED} \ - --enable-ssl \ +CONFIGURE_ARGS = --enable-ssl \ --enable-ipv6 \ --enable-gtkspell \ --disable-jpilot \ diff --git a/mail/zarafa/zarafa/Makefile b/mail/zarafa/zarafa/Makefile index 5f705cc83e0..012b0c42a96 100644 --- a/mail/zarafa/zarafa/Makefile +++ b/mail/zarafa/zarafa/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.195 2016/02/01 21:55:39 sthen Exp $ +# $OpenBSD: Makefile,v 1.196 2016/03/11 20:28:27 naddy Exp $ COMMENT-main= MS Exchange groupware suite replacement COMMENT-web= zarafa webaccess frontend and MAPI extensions for PHP @@ -108,8 +108,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \ ZAFARA_LDFLAGS="-L${LOCALBASE}/lib/zarafa" \ PHP_SYSCONF_DIR="${SYSCONFDIR}/php-${MODPHP_VERSION}" \ ac_cv_lib_pam_pam_start=no -CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ - --disable-static \ +CONFIGURE_ARGS= --disable-static \ --with-gsoap-prefix=${LOCALBASE} \ --with-mapi-configdir=${SYSCONFDIR}/mapi \ --with-userscript-prefix=${SYSCONFDIR}/zarafa/userscripts \ diff --git a/math/R/Makefile b/math/R/Makefile index bc9e6553000..12fb4557784 100644 --- a/math/R/Makefile +++ b/math/R/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.78 2016/03/01 17:57:06 feinerer Exp $ +# $OpenBSD: Makefile,v 1.79 2016/03/11 20:28:27 naddy Exp $ SHARED_ONLY= Yes @@ -78,8 +78,7 @@ CONFIGURE_STYLE=gnu MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/tools -CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ - --disable-java \ +CONFIGURE_ARGS= --disable-java \ --enable-BLAS-shlib \ --enable-R-shlib \ --with-tcl-config=${MODTCL_CONFIG} \ diff --git a/math/fftw3/Makefile b/math/fftw3/Makefile index 4faf2622caa..b9bc3b4126c 100644 --- a/math/fftw3/Makefile +++ b/math/fftw3/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.30 2015/08/14 19:51:26 steven Exp $ +# $OpenBSD: Makefile,v 1.31 2016/03/11 20:28:27 naddy Exp $ COMMENT-main= C routines for computing the Discrete Fourier Transform COMMENT-common= common files for the fftw3 packages @@ -34,8 +34,7 @@ FLAVOR?= double USE_GMAKE= Yes CONFIGURE_STYLE=gnu -CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ - --enable-portable-binary \ +CONFIGURE_ARGS= --enable-portable-binary \ --enable-threads .if ${FLAVOR} == "float" diff --git a/math/graphviz/Makefile b/math/graphviz/Makefile index a82f687388a..d199f967ff3 100644 --- a/math/graphviz/Makefile +++ b/math/graphviz/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.62 2016/01/14 20:56:59 jasper Exp $ +# $OpenBSD: Makefile,v 1.63 2016/03/11 20:28:27 naddy Exp $ COMMENT-main= graph drawing software @@ -78,8 +78,7 @@ USE_GMAKE = Yes USE_GROFF = Yes CONFIGURE_STYLE=gnu # Note: --with-tclsh is misspelled "--with-tcl" in configure's help output -CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ - --enable-tcl=yes \ +CONFIGURE_ARGS= --enable-tcl=yes \ --enable-perl \ --enable-guile \ --with-tclsh=${MODTCL_BIN} \ diff --git a/math/hdf5/Makefile b/math/hdf5/Makefile index 0fe08762361..371e9ccb803 100644 --- a/math/hdf5/Makefile +++ b/math/hdf5/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2016/02/27 22:43:18 juanfra Exp $ +# $OpenBSD: Makefile,v 1.7 2016/03/11 20:28:27 naddy Exp $ COMMENT = Hierarchical Data Format 5 Technology suite @@ -26,8 +26,7 @@ MASTER_SITES = https://www.hdfgroup.org/ftp/HDF5/current/src/ \ SEPARATE_BUILD = Yes CONFIGURE_STYLE = gnu -CONFIGURE_ARGS = ${CONFIGURE_SHARED} \ - --enable-cxx +CONFIGURE_ARGS = --enable-cxx post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/hdf5 diff --git a/math/matio/Makefile b/math/matio/Makefile index 7782ecb0619..fa1dfe7c699 100644 --- a/math/matio/Makefile +++ b/math/matio/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.13 2015/05/25 07:54:27 jasper Exp $ +# $OpenBSD: Makefile,v 1.14 2016/03/11 20:28:27 naddy Exp $ COMMENT= library for reading and writing Matlab MAT files @@ -23,8 +23,7 @@ LIB_DEPENDS= ${MODFORTRAN_LIB_DEPENDS} CONFIGURE_STYLE=gnu CONFIGURE_ENV += FC=${MODFORTRAN_COMPILER} -CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ - --enable-fortran=no \ +CONFIGURE_ARGS= --enable-fortran=no \ --enable-test=yes TESTS= copy write writecompressed writecell readslab \ diff --git a/math/octave/Makefile b/math/octave/Makefile index 122da006c38..b1650b3fecb 100644 --- a/math/octave/Makefile +++ b/math/octave/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.82 2016/03/09 18:31:36 jasper Exp $ +# $OpenBSD: Makefile,v 1.83 2016/03/11 20:28:27 naddy Exp $ # sparc: fPIC version of libgcc.a needed but not available NOT_FOR_ARCHS = sparc @@ -72,8 +72,7 @@ SEPARATE_BUILD = Yes USE_GMAKE = Yes CONFIGURE_STYLE = gnu # --disable-readline: needs GNU readline -CONFIGURE_ARGS = ${CONFIGURE_SHARED} \ - --disable-java +CONFIGURE_ARGS = --disable-java CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include \ -I${LOCALBASE}/include/ereadline" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \ diff --git a/misc/memchan/Makefile b/misc/memchan/Makefile index b61137e2dcd..982bffc6b37 100644 --- a/misc/memchan/Makefile +++ b/misc/memchan/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2013/03/11 11:23:57 espie Exp $ +# $OpenBSD: Makefile,v 1.10 2016/03/11 20:28:28 naddy Exp $ SHARED_ONLY = Yes @@ -32,8 +32,7 @@ SEPARATE_BUILD = Yes USE_GROFF = Yes CONFIGURE_STYLE = gnu -CONFIGURE_ARGS += ${CONFIGURE_SHARED} \ - --with-tcl=${MODTCL_LIBDIR} \ +CONFIGURE_ARGS += --with-tcl=${MODTCL_LIBDIR} \ --libdir=${MODTCL_TCLDIR} \ --includedir=${PREFIX}/include/memchan \ SHLIB_VERSION=${LIBMemchan23_VERSION} diff --git a/misc/openbabel/Makefile b/misc/openbabel/Makefile index 0b2ff656bfa..9ef1ecc5860 100644 --- a/misc/openbabel/Makefile +++ b/misc/openbabel/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.19 2015/05/22 11:31:17 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.20 2016/03/11 20:28:28 naddy Exp $ COMMENT= chemistry file translation program @@ -31,8 +31,7 @@ CONFIGURE_STYLE=gnu CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" \ ac_cv_path_DOXYGEN="" -CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ - --disable-inchi \ +CONFIGURE_ARGS= --disable-inchi \ --disable-wx-gui \ --with-boost=${LOCALBASE} diff --git a/multimedia/avidemux/Makefile b/multimedia/avidemux/Makefile index 955c51c11c7..50b650dd358 100644 --- a/multimedia/avidemux/Makefile +++ b/multimedia/avidemux/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.45 2014/11/05 11:43:59 sthen Exp $ +# $OpenBSD: Makefile,v 1.46 2016/03/11 20:28:28 naddy Exp $ COMMENT= free video editor @@ -54,8 +54,7 @@ CONFIGURE_ENV+= CFLAGS="${PIE_CFLAGS} ${CFLAGS}" \ CXXFLAGS="${PIE_CFLAGS} ${CXXFLAGS}" \ CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="${PIE_LDFLAGS} -L${LOCALBASE}/lib -logg -lm -lz" -CONFIGURE_ARGS+=${CONFIGURE_SHARED} \ - --enable-xv \ +CONFIGURE_ARGS+=--enable-xv \ --with-x \ --with-freetype2 \ --with-lame \ diff --git a/multimedia/daala/Makefile b/multimedia/daala/Makefile index ed60852ead0..2ce755fedc4 100644 --- a/multimedia/daala/Makefile +++ b/multimedia/daala/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2016/03/05 16:04:06 pascal Exp $ +# $OpenBSD: Makefile,v 1.4 2016/03/11 20:28:28 naddy Exp $ COMMENT = free video codec DISTNAME = daala-0.0.20160106 @@ -34,8 +34,7 @@ SEPARATE_BUILD = Yes USE_GMAKE = Yes CONFIGURE_STYLE = gnu -CONFIGURE_ARGS += ${CONFIGURE_SHARED} \ - --enable-check-asm \ +CONFIGURE_ARGS += --enable-check-asm \ --disable-docs \ --disable-player \ --disable-tools diff --git a/multimedia/gstreamer-0.10/Makefile.inc b/multimedia/gstreamer-0.10/Makefile.inc index 66431bd7e0d..0ce886d243b 100644 --- a/multimedia/gstreamer-0.10/Makefile.inc +++ b/multimedia/gstreamer-0.10/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.31 2014/09/13 16:36:53 ajacoutot Exp $ +# $OpenBSD: Makefile.inc,v 1.32 2016/03/11 20:28:28 naddy Exp $ # Most frequent usage of the GStreamer packages: # core base library @@ -56,8 +56,7 @@ BUILD_DEPENDS += devel/bison \ CONFIGURE_STYLE ?= autoconf CONFIGURE_ENV += CPPFLAGS="${CPPFLAGS}" \ LDFLAGS="${LDFLAGS}" -CONFIGURE_ARGS += ${CONFIGURE_SHARED} \ - --with-package-name="OpenBSD ${DISTNAME} package" \ +CONFIGURE_ARGS += --with-package-name="OpenBSD ${DISTNAME} package" \ --with-package-origin="http://www.openbsd.org/" \ --with-default-audiosink=sndiosink \ --with-default-audiosrc=sndiosrc \ diff --git a/multimedia/gstreamer-0.10/plugins-ffmpeg/Makefile b/multimedia/gstreamer-0.10/plugins-ffmpeg/Makefile index 8350705414b..67d71726229 100644 --- a/multimedia/gstreamer-0.10/plugins-ffmpeg/Makefile +++ b/multimedia/gstreamer-0.10/plugins-ffmpeg/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.38 2015/11/21 10:57:25 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.39 2016/03/11 20:28:28 naddy Exp $ COMMENT= ffmpeg element for GStreamer @@ -31,8 +31,7 @@ GST_LIBAV_ARCH= generic GST_LIBAV_ARCH= ${MACHINE_ARCH} .endif -ffmpeg_CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ - --arch=${GST_LIBAV_ARCH} \ +ffmpeg_CONFIGURE_ARGS= --arch=${GST_LIBAV_ARCH} \ --cc=${CC} \ --enable-gpl \ --disable-altivec \ diff --git a/multimedia/gstreamer1/Makefile.inc b/multimedia/gstreamer1/Makefile.inc index b7d30ed3dfd..3ca4da6fa92 100644 --- a/multimedia/gstreamer1/Makefile.inc +++ b/multimedia/gstreamer1/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.24 2016/01/21 07:22:51 ajacoutot Exp $ +# $OpenBSD: Makefile.inc,v 1.25 2016/03/11 20:28:28 naddy Exp $ # Most frequent usage of the GStreamer packages: # core base library @@ -61,8 +61,7 @@ AUTOCONF_VERSION ?= 2.69 CONFIGURE_STYLE ?= autoconf CONFIGURE_ENV += CPPFLAGS="${CPPFLAGS}" \ LDFLAGS="${LDFLAGS}" -CONFIGURE_ARGS += ${CONFIGURE_SHARED} \ - --with-package-name="OpenBSD ${DISTNAME} package" \ +CONFIGURE_ARGS += --with-package-name="OpenBSD ${DISTNAME} package" \ --with-package-origin="http://www.openbsd.org/" \ --with-default-audiosink=sndiosink \ --with-default-audiosrc=sndiosrc \ diff --git a/multimedia/gstreamer1/plugins-libav/Makefile b/multimedia/gstreamer1/plugins-libav/Makefile index 59f1a291b48..bdd03264c4a 100644 --- a/multimedia/gstreamer1/plugins-libav/Makefile +++ b/multimedia/gstreamer1/plugins-libav/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.29 2015/12/18 10:07:04 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.30 2016/03/11 20:28:28 naddy Exp $ COMMENT= ffmpeg elements for GStreamer @@ -30,8 +30,7 @@ GST_LIBAV_ARCH= ${MACHINE_ARCH} MODGNU_CONFIG_GUESS_DIRS=${WRKSRC} ${WRKSRC}/gst-libs/ext/libav -libav_CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ - --arch=${GST_LIBAV_ARCH} \ +libav_CONFIGURE_ARGS= --arch=${GST_LIBAV_ARCH} \ --cc=${CC} \ --enable-gpl \ --enable-runtime-cpudetect \ diff --git a/multimedia/libdv/Makefile b/multimedia/libdv/Makefile index 65aaf3acf06..b880819f606 100644 --- a/multimedia/libdv/Makefile +++ b/multimedia/libdv/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.21 2015/05/02 13:03:14 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.22 2016/03/11 20:28:28 naddy Exp $ COMMENT= Quasar DV codec @@ -23,8 +23,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libdv/} LIB_DEPENDS= devel/popt CONFIGURE_STYLE= gnu -CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ - --disable-sdl \ +CONFIGURE_ARGS= --disable-sdl \ --disable-gtk \ --with-x CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/multimedia/libv4l/Makefile b/multimedia/libv4l/Makefile index 01e7bc236cd..90c7c519aec 100644 --- a/multimedia/libv4l/Makefile +++ b/multimedia/libv4l/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2016/01/31 07:12:25 feinerer Exp $ +# $OpenBSD: Makefile,v 1.5 2016/03/11 20:28:28 naddy Exp $ SHARED_ONLY = Yes @@ -34,8 +34,7 @@ LIB_DEPENDS = graphics/jpeg SEPARATE_BUILD = Yes LIBTOOL_FLAGS = --tag=disable-static CONFIGURE_STYLE = autoconf -CONFIGURE_ARGS = ${CONFIGURE_SHARED} \ - --disable-doxygen-doc +CONFIGURE_ARGS = --disable-doxygen-doc CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/multimedia/lives/Makefile b/multimedia/lives/Makefile index 7954743e4d7..3da91936f5b 100644 --- a/multimedia/lives/Makefile +++ b/multimedia/lives/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.10 2015/05/05 17:00:18 sthen Exp $ +# $OpenBSD: Makefile,v 1.11 2016/03/11 20:28:28 naddy Exp $ SHARED_ONLY = Yes @@ -48,8 +48,7 @@ LIB_DEPENDS = multimedia/libtheora \ multimedia/mjpegtools CONFIGURE_STYLE = gnu -CONFIGURE_ARGS += ${CONFIGURE_SHARED} \ - --disable-jack \ +CONFIGURE_ARGS += --disable-jack \ --disable-frei0r \ --disable-libvisual \ --disable-static diff --git a/multimedia/mjpegtools/Makefile b/multimedia/mjpegtools/Makefile index d5aa728e9b3..c292213e823 100644 --- a/multimedia/mjpegtools/Makefile +++ b/multimedia/mjpegtools/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.36 2015/08/19 18:55:05 sthen Exp $ +# $OpenBSD: Makefile,v 1.37 2016/03/11 20:28:28 naddy Exp $ COMMENT= tools to edit/modify/encode video streams @@ -38,8 +38,7 @@ LIB_DEPENDS= devel/sdl \ USE_GROFF= Yes CONFIGURE_STYLE= autoconf AUTOCONF_VERSION= 2.68 -CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \ - --with-x \ +CONFIGURE_ARGS+= --with-x \ --without-v4l CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" diff --git a/net/avahi/Makefile b/net/avahi/Makefile index c2be815deab..7cb46c0b4d9 100755 --- a/net/avahi/Makefile +++ b/net/avahi/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.113 2015/12/06 08:29:35 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.114 2016/03/11 20:28:28 naddy Exp $ ONLY_FOR_ARCHS-mono= ${MONO_ARCHS} @@ -225,8 +225,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ PTHREAD_CFLAGS="-pthread" \ PTHREAD_LIBS="-pthread" \ PYTHON="${MODPY_BIN}" -CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \ - --with-dbus-sys="${SYSCONFDIR}/dbus-1/" \ +CONFIGURE_ARGS+= --with-dbus-sys="${SYSCONFDIR}/dbus-1/" \ --with-avahi-user=_avahi \ --with-avahi-group=_avahi \ --with-avahi-priv-access-group=wheel \ diff --git a/net/curl/Makefile b/net/curl/Makefile index 2f6741796ad..082965d2eae 100644 --- a/net/curl/Makefile +++ b/net/curl/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.115 2016/02/27 21:55:51 naddy Exp $ +# $OpenBSD: Makefile,v 1.116 2016/03/11 20:28:28 naddy Exp $ COMMENT= get files from FTP, Gopher, HTTP or HTTPS servers @@ -25,8 +25,7 @@ WANTLIB= c crypto idn nghttp2 ssl z SEPARATE_BUILD= Yes CONFIGURE_STYLE=gnu -CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ - --with-ca-bundle=/etc/ssl/cert.pem \ +CONFIGURE_ARGS= --with-ca-bundle=/etc/ssl/cert.pem \ --with-libidn=${LOCALBASE} \ --without-libpsl \ --without-libssh2 diff --git a/net/daq/Makefile b/net/daq/Makefile index 74cdd0dd292..81b237878b3 100644 --- a/net/daq/Makefile +++ b/net/daq/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.12 2015/05/29 03:27:27 lteo Exp $ +# $OpenBSD: Makefile,v 1.13 2016/03/11 20:28:28 naddy Exp $ COMMENT = data acquisition library for snort @@ -23,8 +23,7 @@ MASTER_SITES = https://www.snort.org/downloads/snort/ SEPARATE_BUILD = Yes CONFIGURE_STYLE = gnu -CONFIGURE_ARGS += ${CONFIGURE_SHARED} \ - --enable-ipv6 +CONFIGURE_ARGS += --enable-ipv6 BUILD_DEPENDS = devel/bison diff --git a/net/farstream/Makefile b/net/farstream/Makefile index cd1587cae21..8a7e5848c6c 100644 --- a/net/farstream/Makefile +++ b/net/farstream/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.21 2015/05/11 07:21:21 jasper Exp $ +# $OpenBSD: Makefile,v 1.22 2016/03/11 20:28:28 naddy Exp $ SHARED_ONLY= Yes @@ -40,8 +40,7 @@ TEST_DEPENDS= multimedia/gstreamer1/plugins-bad USE_GMAKE= Yes CONFIGURE_STYLE= gnu -CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \ - --enable-gupnp \ +CONFIGURE_ARGS+= --enable-gupnp \ --enable-introspection post-install: diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile index 41c03aafd27..94bfe4979c4 100644 --- a/net/freeradius/Makefile +++ b/net/freeradius/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.68 2015/11/19 14:19:05 sthen Exp $ +# $OpenBSD: Makefile,v 1.69 2016/03/11 20:28:28 naddy Exp $ PORTROACH= limit:^2\. @@ -42,8 +42,7 @@ CONFIGURE_STYLE=autoconf dest AUTOCONF_VERSION=2.69 CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib -lexecinfo" -CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ - --with-large-files \ +CONFIGURE_ARGS= --with-large-files \ --with-snmp \ --with-pic \ --without-rlm-perl \ diff --git a/net/freeradius3/Makefile b/net/freeradius3/Makefile index 3e9a1231192..2eaf6844a6f 100644 --- a/net/freeradius3/Makefile +++ b/net/freeradius3/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2016/01/25 20:32:15 sthen Exp $ +# $OpenBSD: Makefile,v 1.9 2016/03/11 20:28:28 naddy Exp $ PORTROACH= limit:^3\. @@ -45,8 +45,7 @@ CONFIGURE_ENV= ac_cv_path_LOCATE= \ ac_cv_path_SNMPWALK=${LOCALBASE}/bin/snmpwalk \ CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" -CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ - --libdir=${PREFIX}/lib/freeradius +CONFIGURE_ARGS= --libdir=${PREFIX}/lib/freeradius # Disabling modules via --without-rlm_FOO doesn't seem to work as of 3.0.10. # No option to disable collectd; bodged via patch-configure. diff --git a/net/hexchat/Makefile b/net/hexchat/Makefile index 4e7049ad47e..51fb359261d 100644 --- a/net/hexchat/Makefile +++ b/net/hexchat/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2015/04/04 09:21:02 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.8 2016/03/11 20:28:28 naddy Exp $ SHARED_ONLY = Yes @@ -44,8 +44,7 @@ RUN_DEPENDS = devel/desktop-file-utils \ x11/gtk+3,-guic CONFIGURE_STYLE = gnu -CONFIGURE_ARGS += ${CONFIGURE_SHARED} \ - --enable-ipv6 \ +CONFIGURE_ARGS += --enable-ipv6 \ --enable-dbus \ --disable-sysinfo \ --disable-libcanberra diff --git a/net/isc-bind/Makefile b/net/isc-bind/Makefile index 64a65319f5a..27793a4b548 100644 --- a/net/isc-bind/Makefile +++ b/net/isc-bind/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.55 2016/03/10 00:03:34 sthen Exp $ +# $OpenBSD: Makefile,v 1.56 2016/03/11 20:28:28 naddy Exp $ COMMENT= Berkeley Internet Name Daemon: DNS server and tools @@ -41,8 +41,7 @@ LIB_DEPENDS= devel/json-c \ SEPARATE_BUILD= Yes CONFIGURE_STYLE= autoconf AUTOCONF_VERSION= 2.69 -CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ - --enable-filter-aaaa \ +CONFIGURE_ARGS= --enable-filter-aaaa \ --enable-threads \ --with-libtool \ --without-readline \ diff --git a/net/knot/Makefile b/net/knot/Makefile index 32607fbf36f..f2e313ae48d 100644 --- a/net/knot/Makefile +++ b/net/knot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2016/03/03 12:33:41 jca Exp $ +# $OpenBSD: Makefile,v 1.10 2016/03/11 20:28:28 naddy Exp $ PORTROACH = limit:^1\. PORTROACH_COMMENT = knot-2.x uses __thread and lmdb @@ -34,8 +34,7 @@ LIB_DEPENDS = devel/libidn \ USE_GMAKE = Yes USE_LIBTOOL= gnu CONFIGURE_STYLE = gnu -CONFIGURE_ARGS += ${CONFIGURE_SHARED} \ - --with-storage=${LOCALSTATEDIR}/db/knot \ +CONFIGURE_ARGS += --with-storage=${LOCALSTATEDIR}/db/knot \ --with-libidn \ --disable-dnstap \ --disable-lmdb diff --git a/net/libbind/Makefile b/net/libbind/Makefile index de7ca204342..a09746dc48d 100644 --- a/net/libbind/Makefile +++ b/net/libbind/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.18 2015/01/26 22:42:04 sthen Exp $ +# $OpenBSD: Makefile,v 1.19 2016/03/11 20:28:28 naddy Exp $ COMMENT= BIND stub resolver library @@ -21,8 +21,7 @@ PERMIT_PACKAGE_CDROM= Yes MASTER_SITES= ${MASTER_SITE_ISC:=libbind/$V/} CONFIGURE_STYLE= gnu -CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ - --with-libtool \ +CONFIGURE_ARGS= --with-libtool \ --libdir=${TRUEPREFIX}/lib/libbind NO_TEST= Yes diff --git a/net/libgadu/Makefile b/net/libgadu/Makefile index 3d0a263a4aa..1ad3145c475 100644 --- a/net/libgadu/Makefile +++ b/net/libgadu/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.20 2016/01/03 08:23:57 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.21 2016/03/11 20:28:29 naddy Exp $ COMMENT= implementation of Gadu-Gadu IM protocol @@ -19,8 +19,7 @@ WANTLIB= pthread z USE_GMAKE= Yes CONFIGURE_STYLE=gnu -CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ - --disable-tests \ +CONFIGURE_ARGS= --disable-tests \ --without-bind \ --without-gnutls \ --without-openssl diff --git a/net/libnice/Makefile b/net/libnice/Makefile index 6b2676a8510..d7fa9f05db8 100644 --- a/net/libnice/Makefile +++ b/net/libnice/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.34 2015/05/11 07:21:21 jasper Exp $ +# $OpenBSD: Makefile,v 1.35 2016/03/11 20:28:29 naddy Exp $ SHARED_ONLY = Yes @@ -33,8 +33,7 @@ LIB_DEPENDS = multimedia/gstreamer1/core \ net/gupnp/igd CONFIGURE_STYLE = gnu -CONFIGURE_ARGS = ${CONFIGURE_SHARED} \ - --with-gstreamer \ +CONFIGURE_ARGS = --with-gstreamer \ --without-gstreamer-0.10 USE_GMAKE = Yes diff --git a/net/liboauth/Makefile b/net/liboauth/Makefile index 07f34315f8c..2204cd0557c 100644 --- a/net/liboauth/Makefile +++ b/net/liboauth/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.10 2015/06/17 19:56:29 jasper Exp $ +# $OpenBSD: Makefile,v 1.11 2016/03/11 20:28:29 naddy Exp $ COMMENT= library implementing the OAuth Core RFC 5849 standard @@ -19,8 +19,7 @@ LIB_DEPENDS= net/curl \ security/nss CONFIGURE_STYLE= gnu -CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \ - --enable-nss +CONFIGURE_ARGS+= --enable-nss CONFIGURE_ENV= ac_cv_path_DOT="" \ ac_cv_path_DOXYGEN="" diff --git a/net/libpsl/Makefile b/net/libpsl/Makefile index 1ccd8b9e49f..6ae51392dc8 100644 --- a/net/libpsl/Makefile +++ b/net/libpsl/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2015/05/28 06:59:14 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.6 2016/03/11 20:28:29 naddy Exp $ COMMENT = public suffix list library @@ -28,8 +28,7 @@ LIB_DEPENDS = converters/libunistring \ BUILD_DEPENDS = devel/libtool \ sysutils/coreutils CONFIGURE_STYLE = autoconf automake -CONFIGURE_ARGS += ${CONFIGURE_SHARED} \ - --enable-builtin=libidn \ +CONFIGURE_ARGS += --enable-builtin=libidn \ --enable-runtime=libidn CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/net/librsync/Makefile b/net/librsync/Makefile index aa2b3cc1f78..6ce42d9033d 100644 --- a/net/librsync/Makefile +++ b/net/librsync/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.15 2015/08/21 19:43:04 sthen Exp $ +# $OpenBSD: Makefile,v 1.16 2016/03/11 20:28:29 naddy Exp $ COMMENT= library for delta compression of streams @@ -25,8 +25,7 @@ SEPARATE_BUILD= Yes CONFIGURE_STYLE= gnu AUTOCONF_VERSION= 2.69 AUTOMAKE_VERSION= 1.15 -CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \ - --disable-trace +CONFIGURE_ARGS+= --disable-trace CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/net/libsmi/Makefile b/net/libsmi/Makefile index c4d47d7c34c..1dc07419860 100644 --- a/net/libsmi/Makefile +++ b/net/libsmi/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2015/03/16 18:07:52 naddy Exp $ +# $OpenBSD: Makefile,v 1.7 2016/03/11 20:28:29 naddy Exp $ COMMENT= library/tools (incl smilint) to access SMI MIB information @@ -24,8 +24,7 @@ USE_GMAKE= Yes S= ${PREFIX}/share/smi CONFIGURE_STYLE= gnu -CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ - --with-data-dir=${PREFIX}/share/smi \ +CONFIGURE_ARGS= --with-data-dir=${PREFIX}/share/smi \ --with-mibdir=${PREFIX}/share/smi/mibs \ --with-pibdir=${PREFIX}/share/smi/pibs \ --with-smipath=/usr/share/snmp/mibs:$S/mibs/ietf:$S/mibs/iana:$S/mibs/irtf:$S/mibs/site:$S/mibs/tubs:$S/pibs/ietf:$S/pibs/site:$S/pibs/tubs diff --git a/net/libtorrent/Makefile b/net/libtorrent/Makefile index 42ebd852fc1..d3b5e78c55c 100644 --- a/net/libtorrent/Makefile +++ b/net/libtorrent/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.44 2015/12/26 09:45:51 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.45 2016/03/11 20:28:29 naddy Exp $ COMMENT= BitTorrent library written in C++ @@ -26,8 +26,7 @@ BUILD_DEPENDS= devel/cppunit USE_LIBTOOL= gnu CONFIGURE_STYLE= gnu -CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ - --enable-static \ +CONFIGURE_ARGS= --enable-static \ --with-kqueue \ --without-epoll \ --disable-instrumentation \ diff --git a/net/loudmouth/Makefile b/net/loudmouth/Makefile index 6fdab92addd..8b984919bd6 100644 --- a/net/loudmouth/Makefile +++ b/net/loudmouth/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.25 2015/04/21 18:24:23 sthen Exp $ +# $OpenBSD: Makefile,v 1.26 2016/03/11 20:28:29 naddy Exp $ COMMENT= lightweight Jabber client library @@ -26,8 +26,7 @@ BUILD_DEPENDS= ${TEST_DEPENDS} TEST_DEPENDS= devel/check CONFIGURE_STYLE= gnu -CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \ - --disable-mono \ +CONFIGURE_ARGS+= --disable-mono \ --with-check=${LOCALBASE} \ --with-ssl=openssl diff --git a/net/neon/Makefile b/net/neon/Makefile index 8632d62a192..42831bfc500 100644 --- a/net/neon/Makefile +++ b/net/neon/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.38 2014/10/12 07:13:22 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.39 2016/03/11 20:28:29 naddy Exp $ COMMENT= HTTP and WebDAV client library, with C interface @@ -28,8 +28,7 @@ CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \ FAKE_FLAGS= docdir=${PREFIX}/share/doc/neon/ -CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \ - --with-ca-bundle=/etc/ssl/cert.pem \ +CONFIGURE_ARGS+= --with-ca-bundle=/etc/ssl/cert.pem \ --with-ssl=openssl \ --with-expat \ --without-pakchois \ diff --git a/net/net-snmp/Makefile b/net/net-snmp/Makefile index 2681c7ae0b0..1621191b2ca 100644 --- a/net/net-snmp/Makefile +++ b/net/net-snmp/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.86 2016/01/07 12:35:53 sthen Exp $ +# $OpenBSD: Makefile,v 1.87 2016/03/11 20:28:29 naddy Exp $ SHARED_ONLY= Yes @@ -45,8 +45,7 @@ OPENBSD_MIBS= OPENBSD-SNMPD-CONF CONFIGURE_STYLE= autoconf AUTOCONF_VERSION= 2.68 -CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ - --enable-ipv6 \ +CONFIGURE_ARGS= --enable-ipv6 \ --enable-mfd-rewrites \ --with-copy-persistent-files="no" \ --with-mib-modules="${NET_SNMP_MIB_LIST}" \ diff --git a/net/openafs/Makefile b/net/openafs/Makefile index 5cf1a618a3a..3d7bea0f8a4 100644 --- a/net/openafs/Makefile +++ b/net/openafs/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.55 2015/11/09 22:45:07 sthen Exp $ +# $OpenBSD: Makefile,v 1.56 2016/03/11 20:28:29 naddy Exp $ ONLY_FOR_ARCHS= i386 SHARED_ONLY= Yes @@ -31,8 +31,7 @@ NO_TEST= Yes AUTOCONF_VERSION= 2.60 CONFIGURE_STYLE= automake autoconf -CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \ - --disable-transarc-paths \ +CONFIGURE_ARGS+= --disable-transarc-paths \ --enable-namei-fileserver \ --enable-largefile-fileserver \ --with-afs-sysname=${ARCH}_obsd${OSrev} \ diff --git a/net/ortp/Makefile b/net/ortp/Makefile index 91e2b374961..2b5eb82808d 100644 --- a/net/ortp/Makefile +++ b/net/ortp/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2016/03/02 20:22:19 jca Exp $ +# $OpenBSD: Makefile,v 1.10 2016/03/11 20:28:29 naddy Exp $ COMMENT = RTP (RFC3550) library DISTNAME = ortp-0.24.2 @@ -22,8 +22,7 @@ BUILD_DEPENDS = devel/doxygen SEPARATE_BUILD = Yes CONFIGURE_STYLE = gnu -CONFIGURE_ARGS = ${CONFIGURE_SHARED} \ - --enable-ssl-hmac +CONFIGURE_ARGS = --enable-ssl-hmac # OpenBSD does not support AI_V4MAPPED/AI_ALL CONFIGURE_ENV = CFLAGS="${CFLAGS} -DAI_V4MAPPED=0 -DAI_ALL" diff --git a/net/pidgin-sipe/Makefile b/net/pidgin-sipe/Makefile index 128f94a52a4..59cc326a09b 100644 --- a/net/pidgin-sipe/Makefile +++ b/net/pidgin-sipe/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.22 2015/10/10 20:22:25 sthen Exp $ +# $OpenBSD: Makefile,v 1.23 2016/03/11 20:28:29 naddy Exp $ BROKEN-hppa = -Werror + sip-csta.c:707: warning: cast increases required alignment of target type @@ -35,8 +35,7 @@ MODULES = devel/gettext \ USE_GMAKE = Yes CONFIGURE_STYLE = gnu -CONFIGURE_ARGS += ${CONFIGURE_SHARED} \ - --enable-purple \ +CONFIGURE_ARGS += --enable-purple \ --enable-openssl \ --enable-nss \ --disable-telepathy \ diff --git a/net/quvi/libquvi/Makefile b/net/quvi/libquvi/Makefile index 543f76ed590..d48d812ea53 100644 --- a/net/quvi/libquvi/Makefile +++ b/net/quvi/libquvi/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.10 2015/10/30 12:47:40 sthen Exp $ +# $OpenBSD: Makefile,v 1.11 2016/03/11 20:28:29 naddy Exp $ COMMENT= library to parse flash media stream URLs @@ -22,7 +22,6 @@ LIB_DEPENDS= net/curl \ MODLUA_SA= Yes -CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ - --with-manual +CONFIGURE_ARGS= --with-manual .include diff --git a/net/rrdtool/Makefile b/net/rrdtool/Makefile index 683375f5918..d696ac2155f 100644 --- a/net/rrdtool/Makefile +++ b/net/rrdtool/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.93 2015/12/14 18:01:41 sthen Exp $ +# $OpenBSD: Makefile,v 1.94 2016/03/11 20:28:29 naddy Exp $ SHARED_ONLY= Yes @@ -43,8 +43,7 @@ CPPFLAGS+= -I${X11BASE}/include/ \ -I${X11BASE}/include/freetype2 LDFLAGS+= -L${LOCALBASE}/lib -L${X11BASE}/lib -CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \ - --disable-libdbi \ +CONFIGURE_ARGS+= --disable-libdbi \ --disable-lua \ --disable-tcl \ --enable-perl-site-install diff --git a/net/rtorrent/Makefile b/net/rtorrent/Makefile index c17ec870a04..55c5c995068 100644 --- a/net/rtorrent/Makefile +++ b/net/rtorrent/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.51 2016/01/17 17:29:10 sthen Exp $ +# $OpenBSD: Makefile,v 1.52 2016/03/11 20:28:29 naddy Exp $ COMMENT= ncurses BitTorrent client based on libTorrent @@ -32,8 +32,7 @@ LIB_DEPENDS= net/libtorrent>=0.13.4 \ CONFIGURE_STYLE= gnu CONFIGURE_ENV += LDFLAGS=-pthread -CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ - --disable-debug +CONFIGURE_ARGS= --disable-debug post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/rtorrent diff --git a/net/snort/Makefile b/net/snort/Makefile index 1205c55955a..5dc10d0b0f9 100644 --- a/net/snort/Makefile +++ b/net/snort/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.91 2015/05/29 03:28:18 lteo Exp $ +# $OpenBSD: Makefile,v 1.92 2016/03/11 20:28:29 naddy Exp $ SHARED_ONLY = Yes @@ -22,8 +22,7 @@ MASTER_SITES = https://www.snort.org/downloads/snort/ SEPARATE_BUILD = Yes CONFIGURE_STYLE = gnu -CONFIGURE_ARGS += ${CONFIGURE_SHARED} \ - --disable-static-daq \ +CONFIGURE_ARGS += --disable-static-daq \ --enable-non-ether-decoders LIB_DEPENDS = archivers/xz \ diff --git a/net/tcludp/Makefile b/net/tcludp/Makefile index 7ccf316e55c..9e2de3bea52 100644 --- a/net/tcludp/Makefile +++ b/net/tcludp/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.10 2015/04/23 09:06:30 schwarze Exp $ +# $OpenBSD: Makefile,v 1.11 2016/03/11 20:28:29 naddy Exp $ SHARED_ONLY = Yes @@ -22,8 +22,7 @@ FAKE_FLAGS = PKG_DIR=tcludp SEPARATE_BUILD =Yes CONFIGURE_STYLE=gnu -CONFIGURE_ARGS+=${CONFIGURE_SHARED} \ - --with-tcl=${MODTCL_LIBDIR} \ +CONFIGURE_ARGS+=--with-tcl=${MODTCL_LIBDIR} \ --libdir=${MODTCL_TCLDIR} \ --datadir=${PREFIX}/share/examples diff --git a/net/telepathy/telepathy-farstream/Makefile b/net/telepathy/telepathy-farstream/Makefile index d5a952d967d..a3c12557b67 100644 --- a/net/telepathy/telepathy-farstream/Makefile +++ b/net/telepathy/telepathy-farstream/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.11 2015/04/04 09:21:03 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.12 2016/03/11 20:28:29 naddy Exp $ COMMENT= flexible communications framework, farstream component @@ -22,7 +22,6 @@ BUILD_DEPENDS= devel/gobject-introspection LIB_DEPENDS= net/farstream>=0.2.0 \ net/telepathy/telepathy-glib>=0.19.9 -CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ - --enable-introspection +CONFIGURE_ARGS= --enable-introspection .include diff --git a/net/telepathy/telepathy-glib/Makefile b/net/telepathy/telepathy-glib/Makefile index 00d4beb7fa6..6d5cb37588a 100644 --- a/net/telepathy/telepathy-glib/Makefile +++ b/net/telepathy/telepathy-glib/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.61 2015/04/04 09:21:03 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.62 2016/03/11 20:28:30 naddy Exp $ COMMENT= flexible communications framework, glib bindings @@ -24,8 +24,7 @@ BUILD_DEPENDS= devel/gobject-introspection>=1.30.0 \ textproc/libxslt LIB_DEPENDS= x11/dbus-glib -CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \ - --enable-introspection \ +CONFIGURE_ARGS+= --enable-introspection \ --enable-vala-bindings #CONFIGURE_ARGS+= --enable-backtrace (add -llibexecinfo) diff --git a/net/telepathy/telepathy-salut/Makefile b/net/telepathy/telepathy-salut/Makefile index 63f2ed4d3fc..d0f577b4e91 100644 --- a/net/telepathy/telepathy-salut/Makefile +++ b/net/telepathy/telepathy-salut/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.45 2015/04/21 18:51:26 sthen Exp $ +# $OpenBSD: Makefile,v 1.46 2016/03/11 20:28:30 naddy Exp $ COMMENT= flexible communications framework, local-link component @@ -26,8 +26,7 @@ LIB_DEPENDS= devel/libsoup \ MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/lib/ext/wocky -CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ - --disable-Werror \ +CONFIGURE_ARGS= --disable-Werror \ --disable-avahi-tests .include diff --git a/net/zeromq/Makefile b/net/zeromq/Makefile index db84230fc9f..b4ba56e3ce1 100644 --- a/net/zeromq/Makefile +++ b/net/zeromq/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.20 2016/01/15 14:12:37 shadchin Exp $ +# $OpenBSD: Makefile,v 1.21 2016/03/11 20:28:30 naddy Exp $ SHARED_ONLY = Yes @@ -25,8 +25,7 @@ LIB_DEPENDS = security/libsodium USE_GMAKE = Yes CONFIGURE_STYLE = gnu -CONFIGURE_ARGS = ${CONFIGURE_SHARED} \ - --with-libsodium=${LOCALBASE} +CONFIGURE_ARGS = --with-libsodium=${LOCALBASE} # XXX libsodium: https://github.com/jedisct1/libsodium/pull/104 CONFIGURE_ENV = CXXFLAGS="-Wno-long-long ${CXXFLAGS}" diff --git a/plan9/9libs/Makefile b/plan9/9libs/Makefile index 05aec238745..adda8e8c87f 100644 --- a/plan9/9libs/Makefile +++ b/plan9/9libs/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.21 2015/03/19 12:12:20 naddy Exp $ +# $OpenBSD: Makefile,v 1.22 2016/03/11 20:28:30 naddy Exp $ # varargs misuse, and unportable software ONLY_FOR_ARCHS= i386 sparc sparc64 @@ -29,8 +29,7 @@ USE_GMAKE= Yes USE_GROFF = Yes CONFIGURE_STYLE= gnu -CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \ - --includedir=${PREFIX}/include/9libs +CONFIGURE_ARGS+= --includedir=${PREFIX}/include/9libs # broken on colorinit() in test.c TEST_IS_INTERACTIVE= Yes diff --git a/print/cups-filters/Makefile b/print/cups-filters/Makefile index 7e383b76495..145f9edbf06 100644 --- a/print/cups-filters/Makefile +++ b/print/cups-filters/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.86 2016/02/25 03:49:41 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.87 2016/03/11 20:28:30 naddy Exp $ BROKEN-alpha= ICE in cupsfilters/image-jpeg.c:316 BROKEN-hppa= ICE on filter/pdftopdf/qpdf_pdftopdf.cc:147 @@ -60,8 +60,7 @@ CONFIGURE_STYLE=gnu CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \ LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib" -CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ - --with-gs-path=${LOCALBASE}/bin/gs \ +CONFIGURE_ARGS= --with-gs-path=${LOCALBASE}/bin/gs \ --with-test-font-path=${X11BASE}/lib/X11/fonts/TTF/DejaVuSans.ttf \ --with-shell=/bin/ksh \ --without-php \ diff --git a/print/cups/Makefile b/print/cups/Makefile index 5957dfe8552..094c6d66246 100644 --- a/print/cups/Makefile +++ b/print/cups/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.207 2016/02/07 15:54:25 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.208 2016/03/11 20:28:30 naddy Exp $ COMMENT-main= Common Unix Printing System COMMENT-libs= CUPS libraries and headers @@ -86,8 +86,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ ${LIBS_ENV} CONFIGURE_STYLE= gnu -CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ - --enable-static \ +CONFIGURE_ARGS= --enable-static \ --with-cups-group=_cups \ --with-cups-user=_cups \ --with-system-groups=wheel \ diff --git a/print/gutenprint/Makefile b/print/gutenprint/Makefile index 19ac57994eb..480c37da9f5 100644 --- a/print/gutenprint/Makefile +++ b/print/gutenprint/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.43 2016/01/16 08:52:46 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.44 2016/03/11 20:28:30 naddy Exp $ COMMENT= high quality print drivers for foomatic and CUPS @@ -41,8 +41,7 @@ RUN_DEPENDS += print/cups-filters USE_GMAKE= Yes CONFIGURE_STYLE= gnu -CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ - --enable-static \ +CONFIGURE_ARGS= --enable-static \ --enable-cups-ppds-at-top-level \ --disable-translated-cups-ppds \ --disable-libgutenprintui2 \ diff --git a/print/hplip/Makefile b/print/hplip/Makefile index 84eb34c6068..b57f49e9502 100644 --- a/print/hplip/Makefile +++ b/print/hplip/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.138 2016/02/25 03:50:37 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.139 2016/03/11 20:28:30 naddy Exp $ PORTROACH= skipv:${V}_py2.5 @@ -137,8 +137,7 @@ FAKE_FLAGS= hplip_confdir=${PREFIX}/share/examples/hplip/hp \ CONFIGURE_STYLE= gnu CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ - --with-hpppddir=${PREFIX}/share/foomatic/db/source/PPD/HP \ +CONFIGURE_ARGS= --with-hpppddir=${PREFIX}/share/foomatic/db/source/PPD/HP \ --with-cupsbackenddir=${PREFIX}/libexec/cups/backend \ --with-cupsfilterdir=${PREFIX}/libexec/cups/filter \ --with-icondir=${PREFIX}/share/applications \ diff --git a/print/pdflib/Makefile b/print/pdflib/Makefile index 0f3599f7d44..31e58857910 100644 --- a/print/pdflib/Makefile +++ b/print/pdflib/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.26 2015/03/16 18:07:53 naddy Exp $ +# $OpenBSD: Makefile,v 1.27 2016/03/11 20:28:30 naddy Exp $ COMMENT= C library to produce PDF files @@ -26,8 +26,7 @@ FAKE= lib CONFIGURE_STYLE= autoconf dest AUTOCONF_VERSION= 2.13 MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/config -CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ - --with-tifflib \ +CONFIGURE_ARGS= --with-tifflib \ --with-pnglib \ --with-zlib \ --without-perl \ diff --git a/security/botan/Makefile b/security/botan/Makefile index f6ea8292fe1..4d93871d69d 100644 --- a/security/botan/Makefile +++ b/security/botan/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.16 2015/09/18 20:29:11 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.17 2016/03/11 20:28:30 naddy Exp $ ONLY_FOR_ARCHS= ${GCC4_ARCHS} @@ -35,8 +35,7 @@ CXXFLAGS+= -I${LOCALBASE}/include CONFIGURE_STYLE= simple CONFIGURE_SCRIPT= ${MODPY_BIN} ./configure.py -CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ - --cpu=${MACHINE_ARCH} \ +CONFIGURE_ARGS= --cpu=${MACHINE_ARCH} \ --prefix=${PREFIX} \ --with-bzip2 \ --with-gnump \ diff --git a/security/cracklib/Makefile b/security/cracklib/Makefile index 3e0b873a034..cde65344237 100644 --- a/security/cracklib/Makefile +++ b/security/cracklib/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.16 2015/07/22 11:05:15 benoit Exp $ +# $OpenBSD: Makefile,v 1.17 2016/03/11 20:28:30 naddy Exp $ COMMENT = sensible unix password cracker @@ -21,8 +21,7 @@ MODULES = lang/python \ devel/gettext CONFIGURE_STYLE = gnu -CONFIGURE_ARGS = ${CONFIGURE_SHARED} \ - --without-x \ +CONFIGURE_ARGS = --without-x \ --with-default-dict=${PREFIX}/share/cracklib/cracklib-small CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile index a4fb77b480c..d7169e54841 100644 --- a/security/cyrus-sasl2/Makefile +++ b/security/cyrus-sasl2/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.87 2015/12/11 06:35:35 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.88 2016/03/11 20:28:30 naddy Exp $ COMMENT= RFC 2222 SASL (Simple Authentication and Security Layer) @@ -25,8 +25,7 @@ MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/config ${WRKSRC}/saslauthd/config CONFIGURE_STYLE= gnu CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ - --enable-sql \ +CONFIGURE_ARGS= --enable-sql \ --enable-static \ --without-pam \ --with-saslauthd="/var/sasl2" \ diff --git a/security/encfs/Makefile b/security/encfs/Makefile index a098e817ddd..6f59e2c01c4 100644 --- a/security/encfs/Makefile +++ b/security/encfs/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2016/03/03 18:02:43 landry Exp $ +# $OpenBSD: Makefile,v 1.7 2016/03/11 20:28:30 naddy Exp $ BROKEN-hppa = configure: error: Could not link against boost_serialization-boost_serialization BROKEN-sparc64 = configure: error: Could not link against boost_serialization-boost_serialization @@ -23,8 +23,7 @@ LIB_DEPENDS = devel/boost \ devel/rlog CONFIGURE_STYLE = gnu -CONFIGURE_ARGS += ${CONFIGURE_SHARED} \ - --with-boost-serialization=boost_serialization \ +CONFIGURE_ARGS += --with-boost-serialization=boost_serialization \ --with-boost-filesystem=boost_filesystem \ --with-boost-system=boost_system # TODO convert code to use utimensat() instead of lutimes() diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile index 62394e68c77..a94199c9257 100644 --- a/security/gnutls/Makefile +++ b/security/gnutls/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.118 2016/03/06 12:16:53 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.119 2016/03/11 20:28:30 naddy Exp $ COMMENT= GNU Transport Layer Security library @@ -37,8 +37,7 @@ USE_GMAKE= Yes PORTHOME= ${WRKDIR} CONFIGURE_STYLE=gnu -CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ - --disable-guile \ +CONFIGURE_ARGS= --disable-guile \ --disable-valgrind-tests \ --with-default-trust-store-file=/etc/ssl/cert.pem \ --with-unbound-root-key-file=/var/unbound/db/root.key diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile index d33f71375da..1e4661d8bc8 100644 --- a/security/heimdal/Makefile +++ b/security/heimdal/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.16 2014/11/28 22:34:18 sthen Exp $ +# $OpenBSD: Makefile,v 1.17 2016/03/11 20:28:30 naddy Exp $ COMMENT-main= Kerberos 5 implementation COMMENT-devel-docs= Heimdal C functions documentation @@ -83,8 +83,7 @@ MODGNU_CONFIG_GUESS_DIRS= \ CONFIGURE_STYLE= gnu CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \ CPPFLAGS="-I${LOCALBASE}/include" -CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ - --disable-afs-support \ +CONFIGURE_ARGS= --disable-afs-support \ --disable-otp \ --without-x diff --git a/security/libgcrypt/Makefile b/security/libgcrypt/Makefile index 3259b4ae05a..8f7d11fb9ac 100644 --- a/security/libgcrypt/Makefile +++ b/security/libgcrypt/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.41 2016/02/23 15:41:30 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.42 2016/03/11 20:28:31 naddy Exp $ COMMENT= crypto library based on code used in GnuPG @@ -22,7 +22,6 @@ MODULES= devel/gettext LIB_DEPENDS= security/libgpg-error CONFIGURE_STYLE= gnu -CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ - --enable-static +CONFIGURE_ARGS= --enable-static .include diff --git a/security/libotr/Makefile b/security/libotr/Makefile index ba5e3be9c1d..409e0a3e7e6 100644 --- a/security/libotr/Makefile +++ b/security/libotr/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.28 2016/03/10 19:45:59 pascal Exp $ +# $OpenBSD: Makefile,v 1.29 2016/03/11 20:28:31 naddy Exp $ COMMENT= portable OTR messaging library and toolkit @@ -32,8 +32,7 @@ AUTOMAKE_VERSION = 1.11 CONFIGURE_STYLE= autoconf automake # PIE is taken care of on a per-arch basis on OpenBSD, and stack # protection is enabled anyway. -CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ - --disable-gcc-hardening \ +CONFIGURE_ARGS= --disable-gcc-hardening \ --disable-linker-hardening .include diff --git a/security/opencdk/Makefile b/security/opencdk/Makefile index 13ff2a0c564..54161ed2944 100644 --- a/security/opencdk/Makefile +++ b/security/opencdk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.17 2015/03/16 18:07:54 naddy Exp $ +# $OpenBSD: Makefile,v 1.18 2016/03/11 20:28:31 naddy Exp $ COMMENT= Open Crypto Development Kit @@ -31,8 +31,7 @@ LIB_DEPENDS += security/libgpg-error CONFIGURE_STYLE=gnu -CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ - --enable-static \ +CONFIGURE_ARGS= --enable-static \ --with-libgcrypt-prefix=${LOCALBASE} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/security/opensc/Makefile b/security/opensc/Makefile index 0c0cf0758be..7edfa113b95 100644 --- a/security/opensc/Makefile +++ b/security/opensc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.30 2015/08/06 22:09:39 sthen Exp $ +# $OpenBSD: Makefile,v 1.31 2016/03/11 20:28:31 naddy Exp $ SHARED_ONLY= Yes @@ -30,8 +30,7 @@ USE_GMAKE= Yes CONFIGURE_STYLE=autoconf AUTOCONF_VERSION=2.67 -CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ - --enable-static \ +CONFIGURE_ARGS= --enable-static \ --sysconfdir=${SYSCONFDIR} \ --enable-sm \ --with-xsl-stylesheetsdir=${LOCALBASE}/share/xsl/docbook diff --git a/security/p11-kit/Makefile b/security/p11-kit/Makefile index 387e519f9d0..21e7c40489d 100755 --- a/security/p11-kit/Makefile +++ b/security/p11-kit/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.42 2016/03/06 12:16:26 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.43 2016/03/11 20:28:31 naddy Exp $ PORTROACH= limitw:1,even @@ -31,8 +31,7 @@ LIB_DEPENDS= devel/libffi \ CONFIGURE_STYLE=gnu CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ - --with-module-path=${PREFIX}/lib/pkcs11 \ +CONFIGURE_ARGS= --with-module-path=${PREFIX}/lib/pkcs11 \ --with-trust-paths=/etc/ssl/cert.pem # no translation yet diff --git a/security/pcsc-cyberjack/Makefile b/security/pcsc-cyberjack/Makefile index ffdd934b541..d16b8cf871e 100644 --- a/security/pcsc-cyberjack/Makefile +++ b/security/pcsc-cyberjack/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2016/02/01 18:57:59 feinerer Exp $ +# $OpenBSD: Makefile,v 1.2 2016/03/11 20:28:31 naddy Exp $ COMMENT = REINER SCT cyberJack chipcard reader driver @@ -29,8 +29,7 @@ LIB_DEPENDS = devel/libusb1 MAKE_FLAGS = CPPFLAGS=-I${LOCALBASE}/include CONFIGURE_STYLE = autoconf automake -CONFIGURE_ARGS += ${CONFIGURE_SHARED} \ - --disable-fox \ +CONFIGURE_ARGS += --disable-fox \ --disable-xml2 \ --enable-release diff --git a/security/stunnel/Makefile b/security/stunnel/Makefile index 440cc673407..ca79174b289 100644 --- a/security/stunnel/Makefile +++ b/security/stunnel/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.81 2016/01/13 12:39:55 gsoares Exp $ +# $OpenBSD: Makefile,v 1.82 2016/03/11 20:28:31 naddy Exp $ COMMENT= SSL encryption wrapper for standard network daemons @@ -21,8 +21,7 @@ MASTER_SITES= https://www.stunnel.org/downloads/archive/5.x/ \ SEPARATE_BUILD= Yes CONFIGURE_STYLE= gnu -CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \ - --with-ssl=/usr \ +CONFIGURE_ARGS+= --with-ssl=/usr \ --disable-libwrap MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/auto NO_TEST= Yes diff --git a/security/sudo/Makefile b/security/sudo/Makefile index b0abd266216..5d5662a6586 100644 --- a/security/sudo/Makefile +++ b/security/sudo/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2015/11/04 01:52:24 millert Exp $ +# $OpenBSD: Makefile,v 1.7 2016/03/11 20:28:31 naddy Exp $ COMMENT= execute a command as another user @@ -22,8 +22,7 @@ MASTER_SITES= https://www.sudo.ws/dist/ \ SEPARATE_BUILD= Yes CONFIGURE_STYLE= gnu -CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \ - --with-insults \ +CONFIGURE_ARGS+= --with-insults \ --with-env-editor \ --with-logfac=authpriv \ --with-libtool=system \ diff --git a/security/tclgpg/Makefile b/security/tclgpg/Makefile index 116fe682853..095e3d995c7 100644 --- a/security/tclgpg/Makefile +++ b/security/tclgpg/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2016/03/04 10:32:06 czarkoff Exp $ +# $OpenBSD: Makefile,v 1.5 2016/03/11 20:28:31 naddy Exp $ SHARED_ONLY = Yes @@ -32,8 +32,7 @@ FAKE_FLAGS = INSTALL_PROGRAM='$${INSTALL_DATA}' \ SEPARATE_BUILD = Yes CONFIGURE_STYLE = autoconf no-autoheader -CONFIGURE_ARGS += ${CONFIGURE_SHARED} \ - --with-tcl=${MODTCL_LIBDIR} +CONFIGURE_ARGS += --with-tcl=${MODTCL_LIBDIR} AUTOCONF_VERSION = 2.69 TEST_TARGET = test diff --git a/security/tcltls/Makefile b/security/tcltls/Makefile index 3e9c327ce92..a7658b3394f 100644 --- a/security/tcltls/Makefile +++ b/security/tcltls/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.11 2015/03/16 18:07:55 naddy Exp $ +# $OpenBSD: Makefile,v 1.12 2016/03/11 20:28:31 naddy Exp $ SHARED_ONLY = Yes @@ -31,8 +31,7 @@ BUILD_DEPENDS= ${RUN_DEPENDS} WRKDIST= ${WRKDIR}/tls${VERSION} SEPARATE_BUILD =Yes CONFIGURE_STYLE=gnu -CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ - --libdir=${MODTCL_TCLDIR} \ +CONFIGURE_ARGS= --libdir=${MODTCL_TCLDIR} \ --with-tcl=${MODTCL_LIBDIR} \ --with-tclinclude=${MODTCL_INCDIR} \ --with-ssl-dir=/usr \ diff --git a/security/towitoko/Makefile b/security/towitoko/Makefile index 943c3286923..2ed11f4acf0 100644 --- a/security/towitoko/Makefile +++ b/security/towitoko/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.12 2015/03/16 18:07:55 naddy Exp $ +# $OpenBSD: Makefile,v 1.13 2016/03/11 20:28:31 naddy Exp $ COMMENT= library and utilities for towitoko card readers @@ -19,8 +19,7 @@ MASTER_SITES= http://www.geocities.com/cprados/files/ USE_GROFF = Yes CONFIGURE_STYLE= gnu -CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \ - --enable-static +CONFIGURE_ARGS+= --enable-static EXAMPLES= doc/reader.conf diff --git a/security/xmlsec/Makefile b/security/xmlsec/Makefile index 01c04bd5dff..90a1adb069b 100644 --- a/security/xmlsec/Makefile +++ b/security/xmlsec/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.39 2015/09/17 10:30:33 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.40 2016/03/11 20:28:31 naddy Exp $ COMMENT-main= XML security library COMMENT-docs= XML security library documentation @@ -43,8 +43,7 @@ LIB_DEPENDS= devel/libtool,-ltdl \ # USE_GROFF = Yes CONFIGURE_STYLE= gnu -CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ - --without-nss \ +CONFIGURE_ARGS= --without-nss \ --without-nspr CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/sysutils/accountsservice/Makefile b/sysutils/accountsservice/Makefile index 2a52d0739b2..594a1e41c63 100644 --- a/sysutils/accountsservice/Makefile +++ b/sysutils/accountsservice/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.63 2015/11/19 10:07:45 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.64 2016/03/11 20:28:31 naddy Exp $ # XXX fix change password (gnome-cc run-passwd.c: argv[0]) @@ -42,8 +42,7 @@ USE_GMAKE= Yes CONFIGURE_STYLE=gnu CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ - --enable-introspection \ +CONFIGURE_ARGS= --enable-introspection \ --disable-systemd FAKE_FLAGS= sysconfdir=${PREFIX}/share/examples/accountsservice diff --git a/sysutils/augeas/Makefile b/sysutils/augeas/Makefile index 4d99b081e77..b7c12a42977 100644 --- a/sysutils/augeas/Makefile +++ b/sysutils/augeas/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.31 2015/06/03 06:10:42 jasper Exp $ +# $OpenBSD: Makefile,v 1.32 2016/03/11 20:28:31 naddy Exp $ COMMENT= configuration editing tool and API @@ -27,8 +27,7 @@ LIB_DEPENDS= textproc/libxml USE_GMAKE= Yes CONFIGURE_STYLE= gnu -CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \ - --enable-compile-warnings=yes +CONFIGURE_ARGS+= --enable-compile-warnings=yes CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/sysutils/consolekit/Makefile b/sysutils/consolekit/Makefile index 33a8cbf8e0b..2b6867c1840 100644 --- a/sysutils/consolekit/Makefile +++ b/sysutils/consolekit/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.56 2016/01/21 06:43:37 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.57 2016/03/11 20:28:31 naddy Exp $ COMMENT= framework for defining and tracking users, sessions & seats @@ -31,8 +31,7 @@ LIB_DEPENDS= sysutils/polkit RUN_DEPENDS += x11/dbus,-suid CONFIGURE_STYLE= gnu -CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ - --disable-pam-module \ +CONFIGURE_ARGS= --disable-pam-module \ --with-pam-module-dir=${LOCALBASE}/lib/security FAKE_FLAGS= DBUS_SYS_DIR=${TRUEPREFIX}/share/examples/consolekit/dbus-1 \ diff --git a/sysutils/libvirt/Makefile b/sysutils/libvirt/Makefile index 7c834d132ed..ea1cc44a21d 100644 --- a/sysutils/libvirt/Makefile +++ b/sysutils/libvirt/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.48 2016/03/04 10:13:50 jasper Exp $ +# $OpenBSD: Makefile,v 1.49 2016/03/11 20:28:31 naddy Exp $ COMMENT= tool/library for managing platform virtualization @@ -41,8 +41,7 @@ LIB_DEPENDS= net/avahi \ USE_GMAKE= Yes CONFIGURE_STYLE= gnu -CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \ - --with-avahi \ +CONFIGURE_ARGS+= --with-avahi \ --with-ssh2 \ --without-yajl \ --without-netcf \ diff --git a/sysutils/ntfs-3g/Makefile b/sysutils/ntfs-3g/Makefile index 8b691b76552..d67794bb2cb 100644 --- a/sysutils/ntfs-3g/Makefile +++ b/sysutils/ntfs-3g/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2015/11/20 05:32:02 pirofti Exp $ +# $OpenBSD: Makefile,v 1.8 2016/03/11 20:28:31 naddy Exp $ COMMENT = FUSE NTFS driver with read/write support @@ -25,8 +25,7 @@ LIB_DEPENDS = sysutils/e2fsprogs CONFIGURE_STYLE = gnu CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS = ${CONFIGURE_SHARED} \ - --disable-mtab \ +CONFIGURE_ARGS = --disable-mtab \ --disable-ldconfig .include diff --git a/sysutils/polkit/Makefile b/sysutils/polkit/Makefile index 51286c7862f..2cea11b7c26 100644 --- a/sysutils/polkit/Makefile +++ b/sysutils/polkit/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.65 2015/07/19 00:31:29 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.66 2016/03/11 20:28:32 naddy Exp $ COMMENT= framework for granting privileged operations to users @@ -37,8 +37,7 @@ RUN_DEPENDS += x11/dbus,-suid CONFIGURE_STYLE= gnu CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ - --disable-libsystemd-login \ +CONFIGURE_ARGS= --disable-libsystemd-login \ --mandir=${PREFIX}/man \ --enable-introspection \ --enable-man-pages \ diff --git a/sysutils/rsyslog/Makefile b/sysutils/rsyslog/Makefile index c9b3926f3e2..ea4f237a9a3 100644 --- a/sysutils/rsyslog/Makefile +++ b/sysutils/rsyslog/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.26 2016/03/06 12:18:31 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.27 2016/03/11 20:28:32 naddy Exp $ BROKEN-arm = lack of atomic ops BROKEN-hppa = lack of atomic ops @@ -50,8 +50,7 @@ MASTER_SITES = http://www.rsyslog.com/files/download/rsyslog/ \ CONFIGURE_STYLE = autoconf AUTOCONF_VERSION = 2.65 LIBTOOL_FLAGS = --tag=disable-static -CONFIGURE_ARGS += ${CONFIGURE_SHARED} \ - --enable-pgsql \ +CONFIGURE_ARGS += --enable-pgsql \ --enable-mysql \ --enable-mail \ --enable-gnutls \ diff --git a/sysutils/upower/Makefile b/sysutils/upower/Makefile index 4c327732683..21775ac6212 100644 --- a/sysutils/upower/Makefile +++ b/sysutils/upower/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.49 2015/10/24 09:18:13 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.50 2016/03/11 20:28:32 naddy Exp $ ONLY_FOR_ARCHS =${APM_ARCHS} @@ -22,8 +22,7 @@ WANTLIB += c dbus-1 dbus-glib-1 gio-2.0 glib-2.0 gobject-2.0 m WANTLIB += pthread CONFIGURE_STYLE = gnu -CONFIGURE_ARGS += ${CONFIGURE_SHARED} \ - --enable-introspection \ +CONFIGURE_ARGS += --enable-introspection \ --enable-man-pages \ --with-historydir=/var/db/upower \ --with-backend=openbsd \ diff --git a/tests/portbump/t1/Makefile b/tests/portbump/t1/Makefile index b9b93b24ff3..7750496ac22 100644 --- a/tests/portbump/t1/Makefile +++ b/tests/portbump/t1/Makefile @@ -206,8 +206,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ PTHREAD_CFLAGS="-pthread" \ PTHREAD_LIBS="-pthread" \ PYTHON="${MODPY_BIN}" -CONFIGURE_ARGS+=${CONFIGURE_SHARED} \ - --with-dbus-sys="${SYSCONFDIR}/dbus-1/" \ +CONFIGURE_ARGS+=--with-dbus-sys="${SYSCONFDIR}/dbus-1/" \ --with-avahi-user=_avahi \ --with-avahi-group=_avahi \ --with-avahi-priv-access-group=wheel \ diff --git a/tests/portbump/t4/Makefile b/tests/portbump/t4/Makefile index b9b93b24ff3..7750496ac22 100644 --- a/tests/portbump/t4/Makefile +++ b/tests/portbump/t4/Makefile @@ -206,8 +206,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ PTHREAD_CFLAGS="-pthread" \ PTHREAD_LIBS="-pthread" \ PYTHON="${MODPY_BIN}" -CONFIGURE_ARGS+=${CONFIGURE_SHARED} \ - --with-dbus-sys="${SYSCONFDIR}/dbus-1/" \ +CONFIGURE_ARGS+=--with-dbus-sys="${SYSCONFDIR}/dbus-1/" \ --with-avahi-user=_avahi \ --with-avahi-group=_avahi \ --with-avahi-priv-access-group=wheel \ diff --git a/tests/portbump/t5/Makefile b/tests/portbump/t5/Makefile index c7bf1ca4550..b9c1850040f 100644 --- a/tests/portbump/t5/Makefile +++ b/tests/portbump/t5/Makefile @@ -212,8 +212,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ PTHREAD_CFLAGS="-pthread" \ PTHREAD_LIBS="-pthread" \ PYTHON="${MODPY_BIN}" -CONFIGURE_ARGS+=${CONFIGURE_SHARED} \ - --with-dbus-sys="${SYSCONFDIR}/dbus-1/" \ +CONFIGURE_ARGS+=--with-dbus-sys="${SYSCONFDIR}/dbus-1/" \ --with-avahi-user=_avahi \ --with-avahi-group=_avahi \ --with-avahi-priv-access-group=wheel \ diff --git a/textproc/TclXML/Makefile b/textproc/TclXML/Makefile index fbcc463a561..a1779d4e289 100644 --- a/textproc/TclXML/Makefile +++ b/textproc/TclXML/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.25 2015/03/16 18:07:55 naddy Exp $ +# $OpenBSD: Makefile,v 1.26 2016/03/11 20:28:32 naddy Exp $ COMMENT = XML parser for Tcl @@ -26,8 +26,7 @@ RUN_DEPENDS = ${MODTCL_RUN_DEPENDS} \ NO_TEST = Yes CONFIGURE_STYLE = gnu -CONFIGURE_ARGS += ${CONFIGURE_SHARED} \ - --with-tcl=${MODTCL_LIBDIR} \ +CONFIGURE_ARGS += --with-tcl=${MODTCL_LIBDIR} \ --libdir=${MODTCL_TCLDIR} MAKE_FLAGS = PKG_LIB_FILE=libTclxml32.so.${LIBTclxml32_VERSION} \ PKG_DIR=tclxml diff --git a/textproc/aspell/core/Makefile b/textproc/aspell/core/Makefile index 4fb7636925b..e94a20efaa3 100644 --- a/textproc/aspell/core/Makefile +++ b/textproc/aspell/core/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.34 2015/03/16 18:07:55 naddy Exp $ +# $OpenBSD: Makefile,v 1.35 2016/03/11 20:28:32 naddy Exp $ COMMENT= spell checker designed to eventually replace Ispell @@ -29,8 +29,7 @@ MODULES= devel/gettext CONFIGURE_STYLE= gnu CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \ - --enable-static \ +CONFIGURE_ARGS+= --enable-static \ --enable-curses=ncursesw \ --enable-dict-dir=${PREFIX}/share/aspell \ --enable-docdir=${PREFIX}/share/doc/aspell diff --git a/textproc/enchant/Makefile b/textproc/enchant/Makefile index 9760ace6f1a..ca097d0ef40 100755 --- a/textproc/enchant/Makefile +++ b/textproc/enchant/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.22 2015/10/09 12:48:21 jasper Exp $ +# $OpenBSD: Makefile,v 1.23 2016/03/11 20:28:32 naddy Exp $ COMMENT= generic spell checking library/wrapper @@ -30,8 +30,7 @@ CONFIGURE_STYLE=gnu CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -lstdc++ -lm" -CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ - --enable-aspell \ +CONFIGURE_ARGS= --enable-aspell \ --with-aspell-prefix=${LOCALBASE} \ --enable-ispell \ --with-ispell-dir=${LOCALBASE}/lib/ispell/ \ diff --git a/textproc/exempi/Makefile b/textproc/exempi/Makefile index 1a863ab1d21..82a46b4b77a 100644 --- a/textproc/exempi/Makefile +++ b/textproc/exempi/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.11 2015/05/01 18:04:07 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.12 2016/03/11 20:28:32 naddy Exp $ # g++3 chokes on the code NOT_FOR_ARCHS= ${GCC3_ARCHS} @@ -24,8 +24,7 @@ BUILD_DEPENDS = converters/libiconv MASTER_SITES = http://libopenraw.freedesktop.org/download/ CONFIGURE_STYLE = gnu -CONFIGURE_ARGS += ${CONFIGURE_SHARED} \ - --enable-unittest=no +CONFIGURE_ARGS += --enable-unittest=no CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -pthread" diff --git a/textproc/hunspell/Makefile b/textproc/hunspell/Makefile index 57494d16b73..b564dbe2b35 100644 --- a/textproc/hunspell/Makefile +++ b/textproc/hunspell/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.12 2015/07/07 21:43:10 sthen Exp $ +# $OpenBSD: Makefile,v 1.13 2016/03/11 20:28:32 naddy Exp $ COMMENT = spelling, stemming, morphological analysis and generation @@ -25,8 +25,7 @@ MODULES = devel/gettext CONFIGURE_STYLE = gnu CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${WRKBUILD}/src/hunspell/.libs" -CONFIGURE_ARGS = ${CONFIGURE_SHARED} \ - --with-ui \ +CONFIGURE_ARGS = --with-ui \ --with-readline # default dictionary diff --git a/textproc/icu4c/Makefile b/textproc/icu4c/Makefile index c2938804657..15210047481 100644 --- a/textproc/icu4c/Makefile +++ b/textproc/icu4c/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.52 2015/12/29 12:38:27 jsg Exp $ +# $OpenBSD: Makefile,v 1.53 2016/03/11 20:28:32 naddy Exp $ NOT_FOR_ARCHS= ${GCC3_ARCHS} @@ -35,8 +35,7 @@ EXTRACT_SUFX= .tgz USE_GMAKE= Yes CONFIGURE_STYLE= gnu -CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ - --enable-static \ +CONFIGURE_ARGS= --enable-static \ --disable-extras \ --disable-samples diff --git a/textproc/iksemel/Makefile b/textproc/iksemel/Makefile index 72496183af1..85f32fab06d 100644 --- a/textproc/iksemel/Makefile +++ b/textproc/iksemel/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.18 2016/03/06 12:19:06 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.19 2016/03/11 20:28:32 naddy Exp $ COMMENT= XML parser designed for Jabber applications DISTNAME= iksemel-1.4 @@ -24,8 +24,7 @@ MODULES= devel/gettext LIB_DEPENDS= security/gnutls CONFIGURE_STYLE= gnu -CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \ - CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" +CONFIGURE_ARGS+= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" AUTOCONF_VERSION= 2.69 AUTOMAKE_VERSION= 1.15 diff --git a/textproc/libxml/Makefile b/textproc/libxml/Makefile index e49bc13ffd8..d9a3342ee4a 100644 --- a/textproc/libxml/Makefile +++ b/textproc/libxml/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.162 2015/11/22 08:06:36 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.163 2016/03/11 20:28:32 naddy Exp $ COMMENT-main= XML parsing library COMMENT-python= Python bindings for libxml @@ -24,8 +24,7 @@ LIB_DEPENDS= archivers/xz CONFIGURE_STYLE= autoconf AUTOCONF_VERSION= 2.69 -CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \ - --enable-static \ +CONFIGURE_ARGS+= --enable-static \ --with-html-dir="${PREFIX}/share/doc" \ --with-html-subdir="libxml2/html" \ --with-iconv="${LOCALBASE}" \ diff --git a/textproc/libxslt/Makefile b/textproc/libxslt/Makefile index 61b60e324ef..eed3d9361cd 100644 --- a/textproc/libxslt/Makefile +++ b/textproc/libxslt/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.83 2015/11/24 09:11:06 jasper Exp $ +# $OpenBSD: Makefile,v 1.84 2016/03/11 20:28:32 naddy Exp $ COMMENT-main= XSLT C Library for GNOME COMMENT-python= Python bindings for libxslt @@ -42,8 +42,7 @@ LIB_DEPENDS-main += security/libgpg-error USE_GMAKE= Yes CONFIGURE_STYLE= gnu -CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \ - --with-libxml-include-prefix="${LOCALBASE}/include/" \ +CONFIGURE_ARGS+= --with-libxml-include-prefix="${LOCALBASE}/include/" \ --with-html-subdir=libxslt/html .include diff --git a/textproc/link-grammar/Makefile b/textproc/link-grammar/Makefile index b9cd1aec65b..57ddcd20f46 100644 --- a/textproc/link-grammar/Makefile +++ b/textproc/link-grammar/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.21 2015/12/30 10:59:05 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.22 2016/03/11 20:28:32 naddy Exp $ ONLY_FOR_ARCHS-java = i386 amd64 @@ -73,8 +73,7 @@ CONFIGURE_ENV = CFLAGS="${CFLAGS} ${ADD_CFLAGS}" \ CPPFLAGS="${CPPFLAGS} ${ADD_CFLAGS}" \ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" -CONFIGURE_ARGS = ${CONFIGURE_SHARED} \ - --enable-perl-bindings \ +CONFIGURE_ARGS = --enable-perl-bindings \ --enable-python-bindings \ --with-hunspell-dictdir=${LOCALBASE}/share/mozilla-dicts diff --git a/www/bluefish/Makefile b/www/bluefish/Makefile index ffba69fe1d3..3e016de4d97 100644 --- a/www/bluefish/Makefile +++ b/www/bluefish/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.75 2016/02/01 09:30:05 benoit Exp $ +# $OpenBSD: Makefile,v 1.76 2016/03/11 20:28:32 naddy Exp $ COMMENT= HTML editor for experienced web designers @@ -35,8 +35,7 @@ CONFIGURE_STYLE= gnu CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ - --with-freedesktop_org-menu='${PREFIX}/share/applications/' \ +CONFIGURE_ARGS= --with-freedesktop_org-menu='${PREFIX}/share/applications/' \ --disable-update-databases USE_GMAKE= Yes diff --git a/www/cherokee/Makefile b/www/cherokee/Makefile index 5b620145a17..8f65d4c7d15 100644 --- a/www/cherokee/Makefile +++ b/www/cherokee/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.57 2016/03/01 00:07:17 sthen Exp $ +# $OpenBSD: Makefile,v 1.58 2016/03/11 20:28:32 naddy Exp $ SHARED_ONLY= Yes @@ -88,8 +88,7 @@ AUTOCONF_VERSION = 2.68 CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" \ ac_cv_header_execinfo_h=no -CONFIGURE_ARGS = ${CONFIGURE_SHARED} \ - --disable-static \ +CONFIGURE_ARGS = --disable-static \ --enable-tmpdir=/tmp \ --sysconfdir=${SYSCONFDIR} \ --with-cgiroot=/var/cherokee/cgi-bin \ diff --git a/www/httrack/Makefile b/www/httrack/Makefile index 6338c9713e7..4733d38e5c9 100644 --- a/www/httrack/Makefile +++ b/www/httrack/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2015/05/09 12:04:19 jasper Exp $ +# $OpenBSD: Makefile,v 1.5 2016/03/11 20:28:32 naddy Exp $ COMMENT = offline browser DISTNAME = httrack-3.48.21 @@ -37,8 +37,7 @@ RUN_DEPENDS = devel/desktop-file-utils \ SEPARATE_BUILD = No CONFIGURE_STYLE = autoconf -CONFIGURE_ARGS += ${CONFIGURE_SHARED} \ - --enable-online-unit-tests=no \ +CONFIGURE_ARGS += --enable-online-unit-tests=no \ ICONV_LIBS="-liconv" CONFIGURE_ENV = CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ diff --git a/www/liferea/Makefile b/www/liferea/Makefile index e7478fce811..142d96c3f9d 100644 --- a/www/liferea/Makefile +++ b/www/liferea/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.82 2016/01/17 17:29:10 sthen Exp $ +# $OpenBSD: Makefile,v 1.83 2016/03/11 20:28:32 naddy Exp $ SHARED_ONLY= Yes @@ -55,8 +55,7 @@ MODGCONF2_SCHEMAS_DIR= liferea USE_LIBTOOL= gnu CONFIGURE_STYLE= gnu -CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \ - --docdir=${PREFIX}/share/doc/liferea \ +CONFIGURE_ARGS+= --docdir=${PREFIX}/share/doc/liferea \ --enable-libnotify CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/www/nghttp2/Makefile b/www/nghttp2/Makefile index b5ca9218ef0..c65ae1acf57 100644 --- a/www/nghttp2/Makefile +++ b/www/nghttp2/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2015/12/23 23:04:37 sthen Exp $ +# $OpenBSD: Makefile,v 1.4 2016/03/11 20:28:32 naddy Exp $ COMMENT= library for HTTP/2 @@ -26,8 +26,7 @@ CONFIGURE_STYLE= gnu # Both of these pull in additional libraries; deliberately trying to keep # dependencies light for this port, to avoid pulling in the world, and # to avoid restricting arch. -CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \ - --disable-examples \ +CONFIGURE_ARGS+= --disable-examples \ --disable-hpack-tools \ --disable-python-bindings \ --without-libxml2 diff --git a/www/squid/Makefile b/www/squid/Makefile index 59fd4aa9a00..27c5a8f96b4 100644 --- a/www/squid/Makefile +++ b/www/squid/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.178 2016/02/25 00:47:20 sthen Exp $ +# $OpenBSD: Makefile,v 1.179 2016/03/11 20:28:32 naddy Exp $ COMMENT-main= WWW and FTP proxy cache and accelerator COMMENT-ldap= LDAP authentication/ACL support for Squid @@ -62,8 +62,7 @@ FLAVOR?= .include -CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \ - --datadir="${PREFIX}/share/squid" \ +CONFIGURE_ARGS+= --datadir="${PREFIX}/share/squid" \ --libexecdir="${PREFIX}/libexec/squid" \ --disable-loadable-modules \ --enable-arp-acl \ diff --git a/x11/byzi/Makefile b/x11/byzi/Makefile index 5189f55d39f..12caf996fa6 100644 --- a/x11/byzi/Makefile +++ b/x11/byzi/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2013/03/11 11:46:08 espie Exp $ +# $OpenBSD: Makefile,v 1.3 2016/03/11 20:28:32 naddy Exp $ SHARED_ONLY = Yes @@ -23,8 +23,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-tk=${MODTK_LIBDIR} \ --libdir=${MODTCL_TCLDIR} \ SHLIB_VERSION=${LIBbyzi01_VERSION} diff --git a/x11/dbus-glib/Makefile b/x11/dbus-glib/Makefile index 8d00ffbbb79..ed74b6a5e26 100644 --- a/x11/dbus-glib/Makefile +++ b/x11/dbus-glib/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.50 2016/01/16 08:41:30 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.51 2016/03/11 20:28:33 naddy Exp $ COMMENT= glib bindings for dbus message system @@ -28,8 +28,7 @@ LIB_DEPENDS= devel/glib2 \ USE_GMAKE= Yes CONFIGURE_STYLE= gnu -CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ - --with-test-socket-dir=${WRKDIR} +CONFIGURE_ARGS= --with-test-socket-dir=${WRKDIR} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/x11/dbus-python/Makefile b/x11/dbus-python/Makefile index ea31d82c9d9..e1662ace253 100644 --- a/x11/dbus-python/Makefile +++ b/x11/dbus-python/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.34 2016/03/08 08:56:57 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.35 2016/03/11 20:28:33 naddy Exp $ PORTROACH= limitw:2,even @@ -54,8 +54,7 @@ LIB_DEPENDS-common = #empty RUN_DEPENDS-common = #empty CONFIGURE_STYLE = gnu -CONFIGURE_ARGS = ${CONFIGURE_SHARED} \ - --disable-html-docs +CONFIGURE_ARGS = --disable-html-docs TEST_FLAGS = LDFLAGS="-L${LOCALBASE}/lib" TEST_DEPENDS = devel/py-gobject3${MODPY_FLAVOR} diff --git a/x11/dbus-tcl/Makefile b/x11/dbus-tcl/Makefile index bc441aaa703..4ac58c5ecb2 100644 --- a/x11/dbus-tcl/Makefile +++ b/x11/dbus-tcl/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2015/07/13 00:56:55 stu Exp $ +# $OpenBSD: Makefile,v 1.7 2016/03/11 20:28:33 naddy Exp $ SHARED_ONLY = Yes @@ -30,8 +30,7 @@ TEST_FLAGS = LD_PRELOAD=/usr/lib/libpthread.so SEPARATE_BUILD =Yes CONFIGURE_STYLE=gnu -CONFIGURE_ARGS+=${CONFIGURE_SHARED} \ - --with-tcl=${MODTCL_LIBDIR} \ +CONFIGURE_ARGS+=--with-tcl=${MODTCL_LIBDIR} \ --mandir='$${prefix}/man' \ --enable-threads diff --git a/x11/eterm/Makefile b/x11/eterm/Makefile index e418e370b29..1314cd72c3f 100644 --- a/x11/eterm/Makefile +++ b/x11/eterm/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.43 2015/06/25 13:00:58 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.44 2016/03/11 20:28:33 naddy Exp $ COMMENT= color X11 terminal emulator with transparency support COMMENT-kanji= color japanese terminal emulator with transparency support @@ -29,8 +29,7 @@ LIB_DEPENDS= devel/libast \ print/freetype CONFIGURE_STYLE=gnu -CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ - --enable-trans \ +CONFIGURE_ARGS= --enable-trans \ --enable-utmp \ --enable-xim \ --without-pty-group \ diff --git a/x11/gmtk/Makefile b/x11/gmtk/Makefile index 5a9232ada7a..2e8d9b5d221 100644 --- a/x11/gmtk/Makefile +++ b/x11/gmtk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.28 2015/05/22 11:31:19 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.29 2016/03/11 20:28:33 naddy Exp $ COMMENT = gnome-mplayer toolkit DISTNAME = gmtk-1.0.9 @@ -39,8 +39,7 @@ CONFIGURE_STYLE = gnu CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS += ${CONFIGURE_SHARED} \ - --enable-gsettings \ +CONFIGURE_ARGS += --enable-gsettings \ --enable-gtk3 \ --disable-gconf \ --disable-keystore \ diff --git a/x11/itk/Makefile b/x11/itk/Makefile index 616e560884b..35bac128817 100644 --- a/x11/itk/Makefile +++ b/x11/itk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.13 2015/03/16 18:07:59 naddy Exp $ +# $OpenBSD: Makefile,v 1.14 2016/03/11 20:28:33 naddy Exp $ COMMENT= build mega-widgets using the Itcl object system @@ -29,8 +29,7 @@ SUBST_VARS= VERSION CONFIGURE_STYLE=gnu -CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ - --with-tcl=${MODTCL_LIBDIR} \ +CONFIGURE_ARGS= --with-tcl=${MODTCL_LIBDIR} \ --with-tk=${MODTK_LIBDIR} \ --with-itcl=${MODTCL_TCLDIR}/itcl \ --libdir=${MODTCL_TCLDIR}/itcl \ diff --git a/x11/libgdiplus/Makefile b/x11/libgdiplus/Makefile index 4465929b448..1042a2becbf 100644 --- a/x11/libgdiplus/Makefile +++ b/x11/libgdiplus/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.20 2014/07/18 16:00:28 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.21 2016/03/11 20:28:33 naddy Exp $ COMMENT= GDI+ comptible API @@ -35,7 +35,6 @@ LIB_DEPENDS= devel/pango \ CONFIGURE_STYLE=gnu CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \ CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" -CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ - --with-pango +CONFIGURE_ARGS= --with-pango .include diff --git a/x11/libxdg-basedir/Makefile b/x11/libxdg-basedir/Makefile index 7a774b58424..1279622f29d 100644 --- a/x11/libxdg-basedir/Makefile +++ b/x11/libxdg-basedir/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2015/03/16 18:07:59 naddy Exp $ +# $OpenBSD: Makefile,v 1.8 2016/03/11 20:28:33 naddy Exp $ COMMENT = implementation of the XDG Base Directory specification @@ -16,8 +16,7 @@ MASTER_SITES = http://nevill.ch/libxdg-basedir/downloads/ CONFIGURE_STYLE = gnu -CONFIGURE_ARGS += ${CONFIGURE_SHARED} \ - --disable-doxygen-doc +CONFIGURE_ARGS += --disable-doxygen-doc pre-configure: @${SUBST_CMD} ${WRKSRC}/src/basedir.c diff --git a/x11/nx/Makefile.inc b/x11/nx/Makefile.inc index 42e2b613b8d..d84bd6bb7d6 100644 --- a/x11/nx/Makefile.inc +++ b/x11/nx/Makefile.inc @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.12 2015/07/30 07:49:33 jasper Exp $ +# $OpenBSD: Makefile.inc,v 1.13 2016/03/11 20:28:33 naddy Exp $ SHARED_ONLY= Yes @@ -22,7 +22,6 @@ USE_GMAKE?= Yes NO_TEST?= Yes -CONFIGURE_ARGS += ${CONFIGURE_SHARED} \ - --bindir=${PREFIX}/NX/bin \ +CONFIGURE_ARGS += --bindir=${PREFIX}/NX/bin \ --sbindir=${PREFIX}/NX/sbin \ --datadir=${PREFIX}/NX/share diff --git a/x11/openbox/Makefile b/x11/openbox/Makefile index a322152e133..349916eb312 100644 --- a/x11/openbox/Makefile +++ b/x11/openbox/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.74 2015/09/25 09:49:52 dcoppa Exp $ +# $OpenBSD: Makefile,v 1.75 2016/03/11 20:28:33 naddy Exp $ COMMENT = small, fast & usable window manager @@ -49,8 +49,7 @@ MODPY_RUNDEP = No MODPY_ADJ_FILES =data/autostart/openbox-xdg-autostart CONFIGURE_STYLE = gnu -CONFIGURE_ARGS = ${CONFIGURE_SHARED} \ - --docdir=${PREFIX}/share/examples/openbox +CONFIGURE_ARGS = --docdir=${PREFIX}/share/examples/openbox CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" diff --git a/x11/pinot/Makefile b/x11/pinot/Makefile index bed032afb40..ff46885a67b 100644 --- a/x11/pinot/Makefile +++ b/x11/pinot/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.55 2015/10/30 12:59:18 sthen Exp $ +# $OpenBSD: Makefile,v 1.56 2016/03/11 20:28:33 naddy Exp $ SHARED_ONLY= Yes @@ -71,8 +71,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ CXXFLAGS="-std=c++11" \ LDFLAGS="-L${LOCALBASE}/lib" \ MKDIR_P="mkdir -p --" -CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ - --with-http=curl \ +CONFIGURE_ARGS= --with-http=curl \ --with-ssl=/usr \ --enable-gtkmm3 diff --git a/x11/sawfish/Makefile b/x11/sawfish/Makefile index fe0d3acbc3c..b36dbbad4b2 100644 --- a/x11/sawfish/Makefile +++ b/x11/sawfish/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.71 2015/05/05 17:00:21 sthen Exp $ +# $OpenBSD: Makefile,v 1.72 2016/03/11 20:28:33 naddy Exp $ COMMENT= extensible window manager @@ -43,8 +43,7 @@ MODULES= devel/gettext USE_GMAKE= Yes CONFIGURE_STYLE=gnu -CONFIGURE_ARGS+=${CONFIGURE_SHARED} \ - --disable-linguas \ +CONFIGURE_ARGS+=--disable-linguas \ --without-kde4session \ --with-gnome2session \ --with-xdmsession diff --git a/x11/spice-gtk/Makefile b/x11/spice-gtk/Makefile index 761a2ca5caf..fd0834beb75 100644 --- a/x11/spice-gtk/Makefile +++ b/x11/spice-gtk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.24 2015/10/01 08:49:45 jasper Exp $ +# $OpenBSD: Makefile,v 1.25 2016/03/11 20:28:33 naddy Exp $ COMMENT= GTK client and libraries for SPICE remote desktop servers @@ -59,8 +59,7 @@ MODGNU_CONFIG_GUESS_DIRS= \ ${WRKSRC}/spice-common CONFIGURE_STYLE=gnu -CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ - --disable-smartcard \ +CONFIGURE_ARGS= --disable-smartcard \ --disable-usbredir \ --enable-introspection \ --enable-vala \ diff --git a/x11/tellico/Makefile b/x11/tellico/Makefile index ca890c11f7b..377ba2e7fd0 100644 --- a/x11/tellico/Makefile +++ b/x11/tellico/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.34 2015/08/25 14:03:21 sthen Exp $ +# $OpenBSD: Makefile,v 1.35 2016/03/11 20:28:33 naddy Exp $ COMMENT= organizer for book/dvd/music collections @@ -34,7 +34,6 @@ CONFIGURE_STYLE=gnu CONFIGURE_ENV= ${MODKDE_CONFIGURE_ENV} CONFIGURE_ARGS= ${MODKDE_CONFIGURE_ARGS} \ - ${CONFIGURE_SHARED} \ --disable-libsuffix MAKE_FLAGS= ${MODKDE_MAKE_FLAGS} diff --git a/x11/tk/8.5/Makefile b/x11/tk/8.5/Makefile index 145ba5d9696..afacb27df40 100644 --- a/x11/tk/8.5/Makefile +++ b/x11/tk/8.5/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.39 2015/06/06 14:19:23 stu Exp $ +# $OpenBSD: Makefile,v 1.40 2016/03/11 20:28:33 naddy Exp $ COMMENT = graphical toolkit for Tcl @@ -37,8 +37,7 @@ SEPARATE_BUILD = Yes USE_GROFF = Yes CONFIGURE_STYLE = gnu old -CONFIGURE_ARGS += ${CONFIGURE_SHARED} \ - --includedir="${PREFIX}/include/tk8.5" \ +CONFIGURE_ARGS += --includedir="${PREFIX}/include/tk8.5" \ --mandir="${PREFIX}/lib/tcl/tk8.5/man" \ --sysconfdir="${SYSCONFDIR}" \ --enable-man-symlinks \ diff --git a/x11/tk/8.6/Makefile b/x11/tk/8.6/Makefile index 6c8832a48b9..8593ad7e44d 100644 --- a/x11/tk/8.6/Makefile +++ b/x11/tk/8.6/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2015/05/22 04:17:59 stu Exp $ +# $OpenBSD: Makefile,v 1.10 2016/03/11 20:28:33 naddy Exp $ COMMENT = graphical toolkit for Tcl @@ -37,8 +37,7 @@ SEPARATE_BUILD = Yes USE_GROFF = Yes CONFIGURE_STYLE = gnu old -CONFIGURE_ARGS += ${CONFIGURE_SHARED} \ - --includedir="${PREFIX}/include/tk8.6" \ +CONFIGURE_ARGS += --includedir="${PREFIX}/include/tk8.6" \ --mandir="${PREFIX}/lib/tcl/tk8.6/man" \ --sysconfdir="${SYSCONFDIR}" \ --enable-man-symlinks \ diff --git a/x11/tkdnd/Makefile b/x11/tkdnd/Makefile index c8b8d47fa42..523103f1772 100644 --- a/x11/tkdnd/Makefile +++ b/x11/tkdnd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2013/11/09 18:22:02 zhuk Exp $ +# $OpenBSD: Makefile,v 1.6 2016/03/11 20:28:33 naddy Exp $ SHARED_ONLY = Yes @@ -28,8 +28,7 @@ WANTLIB += freetype m z pthread-stubs xcb USE_GMAKE = yes WRKSRC = ${WRKDIR}/${DISTNAME}/unix CONFIGURE_STYLE = gnu -CONFIGURE_ARGS = ${CONFIGURE_SHARED} \ - --libdir=${MODTCL_TCLDIR} \ +CONFIGURE_ARGS = --libdir=${MODTCL_TCLDIR} \ --with-tclinclude=${MODTCL_INCDIR} \ --with-tcl=${MODTCL_LIBDIR} \ --with-tk=${MODTK_LIBDIR} \ diff --git a/x11/tkhtml/Makefile b/x11/tkhtml/Makefile index dbf40fef270..7875e3b275a 100644 --- a/x11/tkhtml/Makefile +++ b/x11/tkhtml/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2013/03/11 11:46:16 espie Exp $ +# $OpenBSD: Makefile,v 1.9 2016/03/11 20:28:33 naddy Exp $ SHARED_ONLY = Yes @@ -25,8 +25,7 @@ WRKDIST = ${WRKDIR}/htmlwidget USE_GMAKE = Yes SEPARATE_BUILD = Yes CONFIGURE_STYLE = gnu -CONFIGURE_ARGS = ${CONFIGURE_SHARED} \ - --libdir=${MODTCL_TCLDIR} \ +CONFIGURE_ARGS = --libdir=${MODTCL_TCLDIR} \ --with-tcl=${MODTCL_LIBDIR} \ --with-tclinclude=${MODTCL_INCDIR} \ --with-tk=${MODTK_LIBDIR} \ diff --git a/x11/tktable/Makefile b/x11/tktable/Makefile index 79d3b7a9cf1..b5bca94eb71 100644 --- a/x11/tktable/Makefile +++ b/x11/tktable/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.29 2015/03/16 18:08:00 naddy Exp $ +# $OpenBSD: Makefile,v 1.30 2016/03/11 20:28:33 naddy Exp $ COMMENT = table/matrix widget extension to Tcl/Tk @@ -23,8 +23,7 @@ RUN_DEPENDS = ${MODTK_RUN_DEPENDS} FAKE_FLAGS = INSTALL_PROGRAM="${INSTALL_DATA}" SEPARATE_BUILD = Yes CONFIGURE_STYLE = gnu -CONFIGURE_ARGS += ${CONFIGURE_SHARED} \ - --with-tcl=${MODTCL_LIBDIR} \ +CONFIGURE_ARGS += --with-tcl=${MODTCL_LIBDIR} \ --with-tk=${MODTK_LIBDIR} \ --with-tkinclude=${MODTK_INCDIR} USE_GROFF = Yes diff --git a/x11/tktray/Makefile b/x11/tktray/Makefile index 7f47d18cce1..8d0d4d8c68a 100644 --- a/x11/tktray/Makefile +++ b/x11/tktray/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2013/08/07 21:33:07 naddy Exp $ +# $OpenBSD: Makefile,v 1.9 2016/03/11 20:28:33 naddy Exp $ SHARED_ONLY = Yes @@ -29,8 +29,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-tk=${MODTK_LIBDIR} \ --libdir=${MODTCL_TCLDIR} \ --datadir=${PREFIX}/share/examples \ diff --git a/x11/tktreectrl/Makefile b/x11/tktreectrl/Makefile index 6a05d057d57..fef5041845f 100644 --- a/x11/tktreectrl/Makefile +++ b/x11/tktreectrl/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.13 2013/11/09 18:22:03 zhuk Exp $ +# $OpenBSD: Makefile,v 1.14 2016/03/11 20:28:33 naddy Exp $ SHARED_ONLY = Yes @@ -28,8 +28,7 @@ SEPARATE_BUILD = Yes USE_GROFF = Yes CONFIGURE_STYLE = gnu -CONFIGURE_ARGS += ${CONFIGURE_SHARED} \ - --libdir=${MODTCL_TCLDIR} \ +CONFIGURE_ARGS += --libdir=${MODTCL_TCLDIR} \ --with-tcl=${MODTCL_LIBDIR} \ --with-tk=${MODTK_LIBDIR} \ --datadir=${PREFIX}/share/examples \ diff --git a/x11/windowmaker/Makefile b/x11/windowmaker/Makefile index df1883cd81c..e603aacd58c 100644 --- a/x11/windowmaker/Makefile +++ b/x11/windowmaker/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.92 2015/12/07 18:24:11 jasper Exp $ +# $OpenBSD: Makefile,v 1.93 2016/03/11 20:28:33 naddy Exp $ COMMENT-main= window manager that emulates NEXTSTEP(tm) COMMENT-lang= language subpackage for Window Maker @@ -28,8 +28,7 @@ EXTRACT_SUFX= .tar.bz2 NO_TEST= Yes SEPARATE_BUILD= Yes CONFIGURE_STYLE= gnu -CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \ - --enable-static \ +CONFIGURE_ARGS+= --enable-static \ --enable-xinerama \ --with-datadir="${LOCALBASE}/share/WindowMaker" \ --with-nlsdir="${LOCALBASE}/share/locale" diff --git a/x11/x11vnc/Makefile b/x11/x11vnc/Makefile index 86b8fd89341..8cf50b09903 100644 --- a/x11/x11vnc/Makefile +++ b/x11/x11vnc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.40 2016/03/08 12:04:17 sthen Exp $ +# $OpenBSD: Makefile,v 1.41 2016/03/11 20:28:33 naddy Exp $ COMMENT = VNC server for real X displays @@ -27,8 +27,7 @@ LIB_DEPENDS = graphics/jpeg \ AUTOCONF_VERSION = 2.59 CONFIGURE_STYLE = autoconf -CONFIGURE_ARGS += ${CONFIGURE_SHARED} \ - --with-x \ +CONFIGURE_ARGS += --with-x \ --with-avahi CONFIGURE_ENV += CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/x11/xdrawchem/Makefile b/x11/xdrawchem/Makefile index 4ec402f5193..d9e6abfb5b6 100644 --- a/x11/xdrawchem/Makefile +++ b/x11/xdrawchem/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.20 2015/05/05 17:00:21 sthen Exp $ +# $OpenBSD: Makefile,v 1.21 2016/03/11 20:28:34 naddy Exp $ COMMENT= two-dimensional molecule drawing program @@ -27,8 +27,7 @@ USE_GMAKE= Yes MAKE_FLAGS= LDFLAGS+="-lqt-mt -pthread -L${X11BASE}/lib" CONFIGURE_STYLE=gnu -CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ - --with-qtincdir=${MODQT_INCDIR} \ +CONFIGURE_ARGS= --with-qtincdir=${MODQT_INCDIR} \ --with-qtlibdir=${MODQT_LIBDIR} .include diff --git a/x11/xforms/Makefile b/x11/xforms/Makefile index c380daf7c7c..60e4719fe5b 100644 --- a/x11/xforms/Makefile +++ b/x11/xforms/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.47 2016/01/17 17:29:12 sthen Exp $ +# $OpenBSD: Makefile,v 1.48 2016/03/11 20:28:34 naddy Exp $ COMMENT= GUI toolkit for X11 @@ -24,8 +24,7 @@ WANTLIB += xcb xcb-dri2 xcb-glx expat LIB_DEPENDS= graphics/jpeg CONFIGURE_STYLE= gnu -CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ - --with-extra-prefix=${LOCALBASE} \ +CONFIGURE_ARGS= --with-extra-prefix=${LOCALBASE} \ --disable-docs .include