diff options
| author | rillig <rillig@pkgsrc.org> | 2018-01-07 13:03:53 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2018-01-07 13:03:53 +0000 |
| commit | 38bd22beeece26d04cb970a43f9267b5382adf10 (patch) | |
| tree | 4a2ef468139f2589e7c95eea0981f044b96c087e | |
| parent | 1e0283c10b471605924a7dee9fd3d78139114483 (diff) | |
| download | pkgsrc-38bd22beeece26d04cb970a43f9267b5382adf10.tar.gz | |
Fix indentation in buildlink3.mk files.
The actual fix as been done by "pkglint -F */*/buildlink3.mk", and was
reviewed manually.
There are some .include lines that still are indented with zero spaces
although the surrounding .if is indented. This is existing practice.
583 files changed, 1390 insertions, 1382 deletions
diff --git a/archivers/karchive/buildlink3.mk b/archivers/karchive/buildlink3.mk index b64a335fd6c..39df6ab6561 100644 --- a/archivers/karchive/buildlink3.mk +++ b/archivers/karchive/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2017/11/30 16:45:00 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2018/01/07 13:03:53 rillig Exp $ BUILDLINK_TREE+= karchive @@ -7,7 +7,7 @@ KARCHIVE_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.karchive+= karchive>=5.18.0 BUILDLINK_ABI_DEPENDS.karchive?= karchive>=5.25.0nb6 -BUILDLINK_PKGSRCDIR.karchive?= ../../archivers/karchive +BUILDLINK_PKGSRCDIR.karchive?= ../../archivers/karchive .include "../../x11/qt5-qtbase/buildlink3.mk" .endif # KARCHIVE_BUILDLINK3_MK diff --git a/archivers/libcomprex/buildlink3.mk b/archivers/libcomprex/buildlink3.mk index 4cd2127a05a..489ff1e6d09 100644 --- a/archivers/libcomprex/buildlink3.mk +++ b/archivers/libcomprex/buildlink3.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.24 2018/01/01 21:18:06 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.25 2018/01/07 13:03:53 rillig Exp $ BUILDLINK_TREE+= libcomprex .if !defined(LIBCOMPREX_BUILDLINK3_MK) LIBCOMPREX_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.libcomprex+= libcomprex>=0.3.2 +BUILDLINK_API_DEPENDS.libcomprex+= libcomprex>=0.3.2 BUILDLINK_ABI_DEPENDS.libcomprex+= libcomprex>=0.3.3nb14 BUILDLINK_PKGSRCDIR.libcomprex?= ../../archivers/libcomprex diff --git a/archivers/lzo/buildlink3.mk b/archivers/lzo/buildlink3.mk index eb81f85533f..134cb82ea7f 100644 --- a/archivers/lzo/buildlink3.mk +++ b/archivers/lzo/buildlink3.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:23:51 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2018/01/07 13:03:53 rillig Exp $ BUILDLINK_TREE+= lzo .if !defined(LZO_BUILDLINK3_MK) LZO_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.lzo+= lzo>=2.01 +BUILDLINK_API_DEPENDS.lzo+= lzo>=2.01 BUILDLINK_PKGSRCDIR.lzo?= ../../archivers/lzo .endif # LZO_BUILDLINK3_MK diff --git a/archivers/ocaml-zip/buildlink3.mk b/archivers/ocaml-zip/buildlink3.mk index 4f97cf55655..31a8415eb96 100644 --- a/archivers/ocaml-zip/buildlink3.mk +++ b/archivers/ocaml-zip/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2017/07/11 10:00:51 jaapb Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:03:53 rillig Exp $ BUILDLINK_TREE+= ocaml-zip @@ -7,7 +7,7 @@ OCAML_ZIP_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ocaml-zip+= ocaml-zip>=1.05nb6 BUILDLINK_ABI_DEPENDS.ocaml-zip+= ocaml-zip>=1.07 -BUILDLINK_PKGSRCDIR.ocaml-zip?= ../../archivers/ocaml-zip +BUILDLINK_PKGSRCDIR.ocaml-zip?= ../../archivers/ocaml-zip .include "../../devel/zlib/buildlink3.mk" .endif # OCAML_ZIP_BUILDLINK3_MK diff --git a/archivers/unshield/buildlink3.mk b/archivers/unshield/buildlink3.mk index 8335879f240..6dde379960a 100644 --- a/archivers/unshield/buildlink3.mk +++ b/archivers/unshield/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2009/03/28 15:47:12 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:03:53 rillig Exp $ BUILDLINK_TREE+= unshield @@ -6,7 +6,7 @@ BUILDLINK_TREE+= unshield UNSHIELD_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.unshield+= unshield>=0.5.1 -BUILDLINK_PKGSRCDIR.unshield?= ../../archivers/unshield +BUILDLINK_PKGSRCDIR.unshield?= ../../archivers/unshield .include "../../devel/zlib/buildlink3.mk" .endif # UNSHIELD_BUILDLINK3_MK diff --git a/audio/SDL_mixer/buildlink3.mk b/audio/SDL_mixer/buildlink3.mk index 69e214df1b3..d07380b3a3e 100644 --- a/audio/SDL_mixer/buildlink3.mk +++ b/audio/SDL_mixer/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.18 2015/04/25 14:20:17 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.19 2018/01/07 13:03:53 rillig Exp $ BUILDLINK_TREE+= SDL_mixer @@ -7,8 +7,8 @@ SDL_MIXER_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.SDL_mixer+= SDL_mixer>=1.2.5nb2 BUILDLINK_ABI_DEPENDS.SDL_mixer+= SDL_mixer>=1.2.12nb6 -BUILDLINK_PKGSRCDIR.SDL_mixer?= ../../audio/SDL_mixer -BUILDLINK_INCDIRS.SDL_mixer?= include/SDL +BUILDLINK_PKGSRCDIR.SDL_mixer?= ../../audio/SDL_mixer +BUILDLINK_INCDIRS.SDL_mixer?= include/SDL .include "../../devel/SDL/buildlink3.mk" .endif # SDL_MIXER_BUILDLINK3_MK diff --git a/audio/SDL_sound/buildlink3.mk b/audio/SDL_sound/buildlink3.mk index a487dc282f4..b8c79e8ad0a 100644 --- a/audio/SDL_sound/buildlink3.mk +++ b/audio/SDL_sound/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.19 2015/04/25 14:20:18 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.20 2018/01/07 13:03:53 rillig Exp $ BUILDLINK_TREE+= SDL_sound @@ -7,7 +7,7 @@ SDL_SOUND_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.SDL_sound+= SDL_sound>=1.0.3 BUILDLINK_ABI_DEPENDS.SDL_sound+= SDL_sound>=1.0.3nb6 -BUILDLINK_PKGSRCDIR.SDL_sound?= ../../audio/SDL_sound +BUILDLINK_PKGSRCDIR.SDL_sound?= ../../audio/SDL_sound .include "../../audio/flac/buildlink3.mk" .include "../../audio/libmikmod/buildlink3.mk" diff --git a/audio/alsa-lib/buildlink3.mk b/audio/alsa-lib/buildlink3.mk index bae7881eb18..e46a44d85b2 100644 --- a/audio/alsa-lib/buildlink3.mk +++ b/audio/alsa-lib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2016/12/03 20:14:05 wiedi Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2018/01/07 13:03:53 rillig Exp $ BUILDLINK_TREE+= alsa-lib @@ -6,7 +6,7 @@ BUILDLINK_TREE+= alsa-lib ALSA_LIB_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.alsa-lib+= alsa-lib>=1.0.18 -BUILDLINK_PKGSRCDIR.alsa-lib?= ../../audio/alsa-lib +BUILDLINK_PKGSRCDIR.alsa-lib?= ../../audio/alsa-lib CPPFLAGS.SunOS+= -Du_int8_t=uint8_t -Du_int16_t=uint16_t -Du_int32_t=uint32_t -Du_int64_t=uint64_t diff --git a/audio/audacious/buildlink3.mk b/audio/audacious/buildlink3.mk index 6ff857bfffa..8b0fc21c3f7 100644 --- a/audio/audacious/buildlink3.mk +++ b/audio/audacious/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.34 2017/11/23 17:19:40 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.35 2018/01/07 13:03:54 rillig Exp $ BUILDLINK_TREE+= audacious @@ -7,7 +7,7 @@ AUDACIOUS_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.audacious+= audacious>=3.5.1 BUILDLINK_ABI_DEPENDS.audacious+= audacious>=3.5.2nb6 -BUILDLINK_PKGSRCDIR.audacious?= ../../audio/audacious +BUILDLINK_PKGSRCDIR.audacious?= ../../audio/audacious .include "../../devel/atk/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" diff --git a/audio/buzztard/buildlink3.mk b/audio/buzztard/buildlink3.mk index 2a73e06da67..c27a631a34d 100644 --- a/audio/buzztard/buildlink3.mk +++ b/audio/buzztard/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2009/09/10 20:19:18 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:03:54 rillig Exp $ BUILDLINK_TREE+= buzztard @@ -6,7 +6,7 @@ BUILDLINK_TREE+= buzztard BUZZTARD_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.buzztard+= buzztard>=0.5.0 -BUILDLINK_PKGSRCDIR.buzztard?= ../../audio/buzztard +BUILDLINK_PKGSRCDIR.buzztard?= ../../audio/buzztard .endif # BUZZTARD_BUILDLINK3_MK diff --git a/audio/cdparanoia/buildlink3.mk b/audio/cdparanoia/buildlink3.mk index 7e6e42e587c..0750ed2fe35 100644 --- a/audio/cdparanoia/buildlink3.mk +++ b/audio/cdparanoia/buildlink3.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.11 2012/05/07 01:53:13 dholland Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2018/01/07 13:03:54 rillig Exp $ BUILDLINK_TREE+= cdparanoia .if !defined(CDPARANOIA_BUILDLINK3_MK) CDPARANOIA_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.cdparanoia+= cdparanoia>=3.0 +BUILDLINK_API_DEPENDS.cdparanoia+= cdparanoia>=3.0 BUILDLINK_ABI_DEPENDS.cdparanoia+= cdparanoia>=3.0.9.8nb5 BUILDLINK_PKGSRCDIR.cdparanoia?= ../../audio/cdparanoia .endif # CDPARANOIA_BUILDLINK3_MK diff --git a/audio/cdplayer/buildlink3.mk b/audio/cdplayer/buildlink3.mk index d173c5207d1..8a658bfd747 100644 --- a/audio/cdplayer/buildlink3.mk +++ b/audio/cdplayer/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.9 2012/05/07 01:53:13 dholland Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2018/01/07 13:03:54 rillig Exp $ BUILDLINK_TREE+= cdplayer @@ -7,7 +7,7 @@ CDPLAYER_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.cdplayer+= cdplayer>=0.4.2 BUILDLINK_ABI_DEPENDS.cdplayer+= cdplayer>=0.4.2nb3 -BUILDLINK_PKGSRCDIR.cdplayer?= ../../audio/cdplayer +BUILDLINK_PKGSRCDIR.cdplayer?= ../../audio/cdplayer .include "../../audio/libcdaudio/buildlink3.mk" .include "../../audio/cddb-bundle/buildlink3.mk" diff --git a/audio/celt/buildlink3.mk b/audio/celt/buildlink3.mk index d0c3ec87f51..e0115e4093f 100644 --- a/audio/celt/buildlink3.mk +++ b/audio/celt/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2012/08/14 07:02:09 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:03:54 rillig Exp $ BUILDLINK_TREE+= celt @@ -8,7 +8,7 @@ CELT_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.celt+= celt>=0.11.3 BUILDLINK_PKGSRCDIR.celt?= ../../audio/celt pkgbase:= celt -. include "../../mk/pkg-build-options.mk" +.include "../../mk/pkg-build-options.mk" .if !empty(PKG_BUILD_OPTIONS.celt:Mogg) . include "../../multimedia/libogg/buildlink3.mk" diff --git a/audio/freealut/buildlink3.mk b/audio/freealut/buildlink3.mk index ebfb18e8697..36870dc69ff 100644 --- a/audio/freealut/buildlink3.mk +++ b/audio/freealut/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2016/07/16 00:15:31 markd Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:03:54 rillig Exp $ BUILDLINK_TREE+= freealut @@ -6,7 +6,7 @@ BUILDLINK_TREE+= freealut FREEALUT_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.freealut+= freealut>=1.1.0 -BUILDLINK_PKGSRCDIR.freealut?= ../../audio/freealut +BUILDLINK_PKGSRCDIR.freealut?= ../../audio/freealut .include "../../audio/openal-soft/buildlink3.mk" .endif # FREEALUT_BUILDLINK3_MK diff --git a/audio/gsm/buildlink3.mk b/audio/gsm/buildlink3.mk index cc8e2438c2f..e3fd81e3abf 100644 --- a/audio/gsm/buildlink3.mk +++ b/audio/gsm/buildlink3.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:23:53 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2018/01/07 13:03:54 rillig Exp $ BUILDLINK_TREE+= gsm .if !defined(GSM_BUILDLINK3_MK) GSM_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.gsm+= gsm>=1.0.10 +BUILDLINK_API_DEPENDS.gsm+= gsm>=1.0.10 BUILDLINK_ABI_DEPENDS.gsm+= gsm>=1.0.12 BUILDLINK_PKGSRCDIR.gsm?= ../../audio/gsm .endif # GSM_BUILDLINK3_MK diff --git a/audio/libao/buildlink3.mk b/audio/libao/buildlink3.mk index 306305bfc16..614b46c5ed3 100644 --- a/audio/libao/buildlink3.mk +++ b/audio/libao/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.15 2010/05/19 18:17:27 drochner Exp $ +# $NetBSD: buildlink3.mk,v 1.16 2018/01/07 13:03:54 rillig Exp $ BUILDLINK_TREE+= libao @@ -9,20 +9,20 @@ BUILDLINK_API_DEPENDS.libao+= libao>=0.8.4 BUILDLINK_ABI_DEPENDS.libao+= libao>=1.0.0 BUILDLINK_PKGSRCDIR.libao?= ../../audio/libao -. if !defined(_LIBAO_BUILDING_PLUGIN) -. include "../../mk/bsd.fast.prefs.mk" -. if ${OPSYS} != "Darwin" && ${OPSYS} != "Interix" && ${OPSYS} != "SunOS" +.if !defined(_LIBAO_BUILDING_PLUGIN) +. include "../../mk/bsd.fast.prefs.mk" +. if ${OPSYS} != "Darwin" && ${OPSYS} != "Interix" && ${OPSYS} != "SunOS" _LIBAO_DEFAULT_PLUGIN= oss -. elif ${OPSYS} == "NetBSD" || ${OPSYS} == "SunOS" +. elif ${OPSYS} == "NetBSD" || ${OPSYS} == "SunOS" _LIBAO_DEFAULT_PLUGIN= sun -. else +. else _LIBAO_DEFAULT_PLUGIN= -. endif +. endif -. if !empty(_LIBAO_DEFAULT_PLUGIN) +. if !empty(_LIBAO_DEFAULT_PLUGIN) DEPENDS+= libao-[a-z]*-[0-9]*:../../audio/libao-${_LIBAO_DEFAULT_PLUGIN} -. endif . endif +.endif .endif # LIBAO_BUILDLINK3_MK diff --git a/audio/libcdaudio/buildlink3.mk b/audio/libcdaudio/buildlink3.mk index 29152389783..33ee1967e4f 100644 --- a/audio/libcdaudio/buildlink3.mk +++ b/audio/libcdaudio/buildlink3.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:23:54 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2018/01/07 13:03:54 rillig Exp $ BUILDLINK_TREE+= libcdaudio .if !defined(LIBCDAUDIO_BUILDLINK3_MK) LIBCDAUDIO_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.libcdaudio+= libcdaudio>=0.99.4nb1 +BUILDLINK_API_DEPENDS.libcdaudio+= libcdaudio>=0.99.4nb1 BUILDLINK_ABI_DEPENDS.libcdaudio+= libcdaudio>=0.99.12nb1 BUILDLINK_PKGSRCDIR.libcdaudio?= ../../audio/libcdaudio .endif # LIBCDAUDIO_BUILDLINK3_MK diff --git a/audio/libdiscid/buildlink3.mk b/audio/libdiscid/buildlink3.mk index 35bf56fdcfa..34ef884c751 100644 --- a/audio/libdiscid/buildlink3.mk +++ b/audio/libdiscid/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2014/11/21 22:59:47 mef Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:03:55 rillig Exp $ BUILDLINK_TREE+= libdiscid @@ -7,7 +7,7 @@ LIBDISCID_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libdiscid+= libdiscid>=0.1.0 BUILDLINK_ABI_DEPENDS.libdiscid?= libdiscid>=0.6.1 -BUILDLINK_PKGSRCDIR.libdiscid?= ../../audio/libdiscid +BUILDLINK_PKGSRCDIR.libdiscid?= ../../audio/libdiscid .endif # LIBDISCID_BUILDLINK3_MK BUILDLINK_TREE+= -libdiscid diff --git a/audio/libid3tag/buildlink3.mk b/audio/libid3tag/buildlink3.mk index a5190de8066..62d09efe687 100644 --- a/audio/libid3tag/buildlink3.mk +++ b/audio/libid3tag/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:23:55 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2018/01/07 13:03:55 rillig Exp $ BUILDLINK_TREE+= libid3tag @@ -7,7 +7,7 @@ LIBID3TAG_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libid3tag+= libid3tag>=0.15.0b BUILDLINK_ABI_DEPENDS.libid3tag+= libid3tag>=0.15.1bnb1 -BUILDLINK_PKGSRCDIR.libid3tag?= ../../audio/libid3tag +BUILDLINK_PKGSRCDIR.libid3tag?= ../../audio/libid3tag .include "../../devel/zlib/buildlink3.mk" .endif # LIBID3TAG_BUILDLINK3_MK diff --git a/audio/liblastfm/buildlink3.mk b/audio/liblastfm/buildlink3.mk index bde1d9d3948..ba8c212ec24 100644 --- a/audio/liblastfm/buildlink3.mk +++ b/audio/liblastfm/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.24 2016/03/05 11:27:40 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.25 2018/01/07 13:03:55 rillig Exp $ BUILDLINK_TREE+= liblastfm @@ -7,7 +7,7 @@ LIBLASTFM_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.liblastfm+= liblastfm>=0.3.0 BUILDLINK_ABI_DEPENDS.liblastfm+= liblastfm>=0.3.3nb23 -BUILDLINK_PKGSRCDIR.liblastfm?= ../../audio/liblastfm +BUILDLINK_PKGSRCDIR.liblastfm?= ../../audio/liblastfm .include "../../audio/libsamplerate/buildlink3.mk" .include "../../math/fftwf/buildlink3.mk" diff --git a/audio/libmpcdec/buildlink3.mk b/audio/libmpcdec/buildlink3.mk index 61deb31e910..7e48ea3aedc 100644 --- a/audio/libmpcdec/buildlink3.mk +++ b/audio/libmpcdec/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:23:55 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:03:55 rillig Exp $ BUILDLINK_TREE+= libmpcdec @@ -7,7 +7,7 @@ LIBMPCDEC_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libmpcdec+= libmpcdec>=1.2.4 BUILDLINK_ABI_DEPENDS.libmpcdec+= libmpcdec>=1.2.6 -BUILDLINK_PKGSRCDIR.libmpcdec?= ../../audio/libmpcdec +BUILDLINK_PKGSRCDIR.libmpcdec?= ../../audio/libmpcdec .endif # LIBMPCDEC_BUILDLINK3_MK BUILDLINK_TREE+= -libmpcdec diff --git a/audio/libmusepack/buildlink3.mk b/audio/libmusepack/buildlink3.mk index 249433a29ed..515e79119bd 100644 --- a/audio/libmusepack/buildlink3.mk +++ b/audio/libmusepack/buildlink3.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:23:56 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2018/01/07 13:03:55 rillig Exp $ BUILDLINK_TREE+= libmusepack .if !defined(LIBMUSEPACK_BUILDLINK3_MK) LIBMUSEPACK_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.libmusepack+= libmusepack>=1.0.3 +BUILDLINK_API_DEPENDS.libmusepack+= libmusepack>=1.0.3 BUILDLINK_PKGSRCDIR.libmusepack?= ../../audio/libmusepack .endif # LIBMUSEPACK_BUILDLINK3_MK diff --git a/audio/libsbsms/buildlink3.mk b/audio/libsbsms/buildlink3.mk index 2544c3461a4..a183f05ce8e 100644 --- a/audio/libsbsms/buildlink3.mk +++ b/audio/libsbsms/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2015/04/19 17:29:21 rodent Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:03:55 rillig Exp $ BUILDLINK_TREE+= libsbsms @@ -6,7 +6,7 @@ BUILDLINK_TREE+= libsbsms LIBSBSMS_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libsbsms+= libsbsms>=2.0.2 -BUILDLINK_PKGSRCDIR.libsbsms?= ../../audio/libsbsms +BUILDLINK_PKGSRCDIR.libsbsms?= ../../audio/libsbsms .endif # LIBSBSMS_BUILDLINK3_MK BUILDLINK_TREE+= -libsbsms diff --git a/audio/libshout/buildlink3.mk b/audio/libshout/buildlink3.mk index d03121a8ee8..dd39456f3fd 100644 --- a/audio/libshout/buildlink3.mk +++ b/audio/libshout/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.12 2015/11/27 10:34:23 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2018/01/07 13:03:55 rillig Exp $ BUILDLINK_TREE+= libshout @@ -7,7 +7,7 @@ LIBSHOUT_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libshout+= libshout>=2.0 BUILDLINK_ABI_DEPENDS.libshout+= libshout>=2.0nb1 -BUILDLINK_PKGSRCDIR.libshout?= ../../audio/libshout +BUILDLINK_PKGSRCDIR.libshout?= ../../audio/libshout .include "../../audio/libvorbis/buildlink3.mk" .include "../../audio/speex/buildlink3.mk" diff --git a/audio/libsidplay/buildlink3.mk b/audio/libsidplay/buildlink3.mk index 25b55cc0d5c..0dc1fb1d211 100644 --- a/audio/libsidplay/buildlink3.mk +++ b/audio/libsidplay/buildlink3.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:23:56 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2018/01/07 13:03:55 rillig Exp $ BUILDLINK_TREE+= libsidplay .if !defined(LIBSIDPLAY_BUILDLINK3_MK) LIBSIDPLAY_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.libsidplay+= libsidplay>=1.36.38 +BUILDLINK_API_DEPENDS.libsidplay+= libsidplay>=1.36.38 BUILDLINK_ABI_DEPENDS.libsidplay+= libsidplay>=1.36.59nb2 BUILDLINK_PKGSRCDIR.libsidplay?= ../../audio/libsidplay .endif # LIBSIDPLAY_BUILDLINK3_MK diff --git a/audio/libspiff/buildlink3.mk b/audio/libspiff/buildlink3.mk index 84d879a6e33..21118ddd953 100644 --- a/audio/libspiff/buildlink3.mk +++ b/audio/libspiff/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:23:57 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2018/01/07 13:03:55 rillig Exp $ BUILDLINK_TREE+= libspiff @@ -6,7 +6,7 @@ BUILDLINK_TREE+= libspiff LIBSPIFF_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libspiff+= libspiff>=1.0.0 -BUILDLINK_PKGSRCDIR.libspiff?= ../../audio/libspiff +BUILDLINK_PKGSRCDIR.libspiff?= ../../audio/libspiff .include "../../textproc/expat/buildlink3.mk" .include "../../textproc/uriparser/buildlink3.mk" diff --git a/audio/libvisual/buildlink3.mk b/audio/libvisual/buildlink3.mk index 9909545f37a..402bdd82d2a 100644 --- a/audio/libvisual/buildlink3.mk +++ b/audio/libvisual/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.13 2012/05/07 01:53:14 dholland Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2018/01/07 13:03:55 rillig Exp $ BUILDLINK_TREE+= libvisual @@ -6,7 +6,7 @@ BUILDLINK_TREE+= libvisual LIBVISUAL_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libvisual+= libvisual>=0.4.0 -BUILDLINK_ABI_DEPENDS.libvisual+= libvisual>=0.4.0nb3 +BUILDLINK_ABI_DEPENDS.libvisual+= libvisual>=0.4.0nb3 BUILDLINK_PKGSRCDIR.libvisual?= ../../audio/libvisual .include "../../devel/gettext-lib/buildlink3.mk" diff --git a/audio/libvorbis/buildlink3.mk b/audio/libvorbis/buildlink3.mk index 3430e9d13e7..23162105b7a 100644 --- a/audio/libvorbis/buildlink3.mk +++ b/audio/libvorbis/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:23:57 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2018/01/07 13:03:55 rillig Exp $ BUILDLINK_TREE+= libvorbis @@ -7,7 +7,7 @@ LIBVORBIS_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libvorbis+= libvorbis>=1.0.1 BUILDLINK_ABI_DEPENDS.libvorbis+= libvorbis>=1.1.0nb1 -BUILDLINK_PKGSRCDIR.libvorbis?= ../../audio/libvorbis +BUILDLINK_PKGSRCDIR.libvorbis?= ../../audio/libvorbis .include "../../multimedia/libogg/buildlink3.mk" .endif # LIBVORBIS_BUILDLINK3_MK diff --git a/audio/libxspf/buildlink3.mk b/audio/libxspf/buildlink3.mk index a3354da9296..29da79c892a 100644 --- a/audio/libxspf/buildlink3.mk +++ b/audio/libxspf/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2013/10/03 11:15:39 drochner Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:03:55 rillig Exp $ BUILDLINK_TREE+= libspiff @@ -6,7 +6,7 @@ BUILDLINK_TREE+= libspiff LIBSPIFF_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libspiff+= libxspf>=1.2.0 -BUILDLINK_PKGSRCDIR.libspiff?= ../../audio/libxspf +BUILDLINK_PKGSRCDIR.libspiff?= ../../audio/libxspf .include "../../textproc/expat/buildlink3.mk" .include "../../textproc/uriparser/buildlink3.mk" diff --git a/audio/musepack/buildlink3.mk b/audio/musepack/buildlink3.mk index 885f753b70c..544ab1a3979 100644 --- a/audio/musepack/buildlink3.mk +++ b/audio/musepack/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2014/04/18 12:43:42 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:03:56 rillig Exp $ BUILDLINK_TREE+= musepack @@ -6,7 +6,7 @@ BUILDLINK_TREE+= musepack MUSEPACK_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.musepack+= musepack>=0rc475 -BUILDLINK_PKGSRCDIR.musepack?= ../../audio/musepack +BUILDLINK_PKGSRCDIR.musepack?= ../../audio/musepack .endif # MUSEPACK_BUILDLINK3_MK diff --git a/audio/musicbrainz/buildlink3.mk b/audio/musicbrainz/buildlink3.mk index 7be5641d894..c9374ddf33a 100644 --- a/audio/musicbrainz/buildlink3.mk +++ b/audio/musicbrainz/buildlink3.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.14 2009/03/20 19:23:58 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2018/01/07 13:03:56 rillig Exp $ BUILDLINK_TREE+= musicbrainz .if !defined(MUSICBRAINZ_BUILDLINK3_MK) MUSICBRAINZ_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.musicbrainz+= musicbrainz>=2.0.2 +BUILDLINK_API_DEPENDS.musicbrainz+= musicbrainz>=2.0.2 BUILDLINK_ABI_DEPENDS.musicbrainz+= musicbrainz>=2.1.2nb2 BUILDLINK_PKGSRCDIR.musicbrainz?= ../../audio/musicbrainz diff --git a/audio/opusfile/buildlink3.mk b/audio/opusfile/buildlink3.mk index 97484c0423f..2ff177a6c8c 100644 --- a/audio/opusfile/buildlink3.mk +++ b/audio/opusfile/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2016/03/07 19:36:57 nros Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:03:56 rillig Exp $ BUILDLINK_TREE+= opusfile @@ -7,7 +7,7 @@ OPUSFILE_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.opusfile+= opusfile>=0.5 BUILDLINK_ABI_DEPENDS.opusfile?= opusfile>=0.7 -BUILDLINK_PKGSRCDIR.opusfile?= ../../audio/opusfile +BUILDLINK_PKGSRCDIR.opusfile?= ../../audio/opusfile .include "../../security/openssl/buildlink3.mk" .include "../../audio/libopus/buildlink3.mk" diff --git a/audio/portaudio/buildlink3.mk b/audio/portaudio/buildlink3.mk index 278baba6121..1588a3a0293 100644 --- a/audio/portaudio/buildlink3.mk +++ b/audio/portaudio/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.10 2012/05/07 01:53:15 dholland Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2018/01/07 13:03:56 rillig Exp $ BUILDLINK_TREE+= portaudio @@ -7,7 +7,7 @@ PORTAUDIO_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.portaudio+= portaudio>=18.1 BUILDLINK_ABI_DEPENDS.portaudio+= portaudio>=18.1nb2 -BUILDLINK_PKGSRCDIR.portaudio?= ../../audio/portaudio +BUILDLINK_PKGSRCDIR.portaudio?= ../../audio/portaudio .endif # PORTAUDIO_BUILDLINK3_MK BUILDLINK_TREE+= -portaudio diff --git a/audio/pulseaudio/buildlink3.mk b/audio/pulseaudio/buildlink3.mk index 3086463345f..484f41e0120 100644 --- a/audio/pulseaudio/buildlink3.mk +++ b/audio/pulseaudio/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.28 2017/09/08 02:27:44 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.29 2018/01/07 13:03:56 rillig Exp $ BUILDLINK_TREE+= pulseaudio @@ -21,7 +21,7 @@ BUILDLINK_RPATHDIRS.pulseaudio+= lib/pulseaudio _WRAP_EXTRA_ARGS.LIBTOOL+= -L${PREFIX}/lib/pulseaudio pkgbase:= pulseaudio -. include "../../mk/pkg-build-options.mk" +.include "../../mk/pkg-build-options.mk" .include "../../mk/bsd.fast.prefs.mk" diff --git a/audio/speexdsp/buildlink3.mk b/audio/speexdsp/buildlink3.mk index 17bfdcf3bba..221ba499fdf 100644 --- a/audio/speexdsp/buildlink3.mk +++ b/audio/speexdsp/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2015/01/17 00:16:12 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:03:56 rillig Exp $ BUILDLINK_TREE+= speexdsp @@ -6,7 +6,7 @@ BUILDLINK_TREE+= speexdsp SPEEXDSP_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.speexdsp+= speexdsp>=1.2rc3 -BUILDLINK_PKGSRCDIR.speexdsp?= ../../audio/speexdsp +BUILDLINK_PKGSRCDIR.speexdsp?= ../../audio/speexdsp .include "../../audio/speex/buildlink3.mk" .endif # SPEEXDSP_BUILDLINK3_MK diff --git a/audio/streamtuner/buildlink3.mk b/audio/streamtuner/buildlink3.mk index 1b1865d8c3b..28c22082a26 100644 --- a/audio/streamtuner/buildlink3.mk +++ b/audio/streamtuner/buildlink3.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.48 2018/01/01 21:18:06 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.49 2018/01/07 13:03:56 rillig Exp $ BUILDLINK_TREE+= streamtuner .if !defined(STREAMTUNER_BUILDLINK3_MK) STREAMTUNER_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.streamtuner+= streamtuner>=0.99 +BUILDLINK_API_DEPENDS.streamtuner+= streamtuner>=0.99 BUILDLINK_ABI_DEPENDS.streamtuner+= streamtuner>=0.99.99nb45 BUILDLINK_PKGSRCDIR.streamtuner?= ../../audio/streamtuner diff --git a/benchmarks/google-benchmark/buildlink3.mk b/benchmarks/google-benchmark/buildlink3.mk index 8c65391c947..0af8ca83d5b 100644 --- a/benchmarks/google-benchmark/buildlink3.mk +++ b/benchmarks/google-benchmark/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2016/11/21 18:20:30 minskim Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:03:56 rillig Exp $ BUILDLINK_TREE+= google-benchmark @@ -6,8 +6,8 @@ BUILDLINK_TREE+= google-benchmark GOOGLE_BENCHMARK_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.google-benchmark+= google-benchmark>=1.1.0 -BUILDLINK_DEPMETHOD.google-benchmark?= build -BUILDLINK_PKGSRCDIR.google-benchmark?= ../../benchmarks/google-benchmark +BUILDLINK_DEPMETHOD.google-benchmark?= build +BUILDLINK_PKGSRCDIR.google-benchmark?= ../../benchmarks/google-benchmark .endif # GOOGLE_BENCHMARK_BUILDLINK3_MK BUILDLINK_TREE+= -google-benchmark diff --git a/biology/openbabel/buildlink3.mk b/biology/openbabel/buildlink3.mk index 474a560e647..066b3bfec6c 100644 --- a/biology/openbabel/buildlink3.mk +++ b/biology/openbabel/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2012/06/14 07:43:21 sbd Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:03:56 rillig Exp $ BUILDLINK_TREE+= openbabel @@ -7,7 +7,7 @@ OPENBABEL_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.openbabel+= openbabel>=2.3.0 BUILDLINK_ABI_DEPENDS.openbabel?= openbabel>=2.3.0nb4 -BUILDLINK_PKGSRCDIR.openbabel?= ../../biology/openbabel +BUILDLINK_PKGSRCDIR.openbabel?= ../../biology/openbabel .include "../../devel/zlib/buildlink3.mk" .include "../../math/eigen2/buildlink3.mk" diff --git a/cad/iverilog/buildlink3.mk b/cad/iverilog/buildlink3.mk index 46d2a367554..e9cb1d61d2e 100644 --- a/cad/iverilog/buildlink3.mk +++ b/cad/iverilog/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2016/10/08 23:01:45 kamil Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:03:56 rillig Exp $ BUILDLINK_TREE+= iverilog @@ -6,7 +6,7 @@ BUILDLINK_TREE+= iverilog IVERILOG_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.iverilog+= iverilog>=10.1.1 -BUILDLINK_PKGSRCDIR.iverilog?= ../../cad/iverilog +BUILDLINK_PKGSRCDIR.iverilog?= ../../cad/iverilog .include "../../devel/gperf/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" diff --git a/cad/libwcalc/buildlink3.mk b/cad/libwcalc/buildlink3.mk index 0d2c3835064..afca2154a8b 100644 --- a/cad/libwcalc/buildlink3.mk +++ b/cad/libwcalc/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.10 2012/05/07 01:53:16 dholland Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2018/01/07 13:03:56 rillig Exp $ # BUILDLINK_TREE+= libwcalc @@ -8,7 +8,7 @@ LIBWCALC_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libwcalc+= libwcalc-1.0* BUILDLINK_ABI_DEPENDS.libwcalc+= libwcalc>=1.0nb2 -BUILDLINK_PKGSRCDIR.libwcalc?= ../../cad/libwcalc +BUILDLINK_PKGSRCDIR.libwcalc?= ../../cad/libwcalc .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" diff --git a/chat/farstream/buildlink3.mk b/chat/farstream/buildlink3.mk index 69b115b1f78..bdebdca3ef4 100644 --- a/chat/farstream/buildlink3.mk +++ b/chat/farstream/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2015/12/01 12:59:52 jaapb Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:03:57 rillig Exp $ BUILDLINK_TREE+= farstream @@ -6,7 +6,7 @@ BUILDLINK_TREE+= farstream FARSTREAM_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.farstream+= farstream>=0.2.7 -BUILDLINK_PKGSRCDIR.farstream?= ../../chat/farstream +BUILDLINK_PKGSRCDIR.farstream?= ../../chat/farstream .endif # FARSTREAM_BUILDLINK3_MK diff --git a/chat/ktp-contact-list/buildlink3.mk b/chat/ktp-contact-list/buildlink3.mk index b023b7a772d..25c4ebfaa88 100644 --- a/chat/ktp-contact-list/buildlink3.mk +++ b/chat/ktp-contact-list/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2016/01/17 15:03:14 jaapb Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:03:57 rillig Exp $ BUILDLINK_TREE+= ktp-contact-list @@ -6,7 +6,7 @@ BUILDLINK_TREE+= ktp-contact-list KTP_CONTACT_LIST_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ktp-contact-list+= ktp-contact-list>=0.9.0 -BUILDLINK_PKGSRCDIR.ktp-contact-list?= ../../chat/ktp-contact-list +BUILDLINK_PKGSRCDIR.ktp-contact-list?= ../../chat/ktp-contact-list .endif # KTP_CONTACT_LIST_BUILDLINK3_MK diff --git a/chat/libfolks/buildlink3.mk b/chat/libfolks/buildlink3.mk index 8e0d8c72cdf..971bccff765 100644 --- a/chat/libfolks/buildlink3.mk +++ b/chat/libfolks/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.8 2014/10/27 08:57:06 jnemeth Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2018/01/07 13:03:57 rillig Exp $ BUILDLINK_TREE+= libfolks @@ -7,7 +7,7 @@ LIBFOLKS_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libfolks+= libfolks>=0.3.6 BUILDLINK_ABI_DEPENDS.libfolks+= libfolks>=0.4.2nb4 -BUILDLINK_PKGSRCDIR.libfolks?= ../../chat/libfolks +BUILDLINK_PKGSRCDIR.libfolks?= ../../chat/libfolks .include "../../devel/glib2/buildlink3.mk" #.include "../../devel/gobject-introspection/buildlink3.mk" diff --git a/chat/libpurple/buildlink3.mk b/chat/libpurple/buildlink3.mk index 692ba604655..77eefe64a22 100644 --- a/chat/libpurple/buildlink3.mk +++ b/chat/libpurple/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.43 2017/03/11 03:02:39 khorben Exp $ +# $NetBSD: buildlink3.mk,v 1.44 2018/01/07 13:03:57 rillig Exp $ BUILDLINK_TREE+= libpurple @@ -7,7 +7,7 @@ LIBPURPLE_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libpurple+= libpurple>=2.11.0 BUILDLINK_ABI_DEPENDS.libpurple+= libpurple>=2.11.0 -BUILDLINK_PKGSRCDIR.libpurple?= ../../chat/libpurple +BUILDLINK_PKGSRCDIR.libpurple?= ../../chat/libpurple pkgbase := libpurple .include "../../mk/pkg-build-options.mk" diff --git a/chat/loudmouth/buildlink3.mk b/chat/loudmouth/buildlink3.mk index 2bfd5e2e4fc..82e4f037dc6 100644 --- a/chat/loudmouth/buildlink3.mk +++ b/chat/loudmouth/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.22 2012/09/15 10:03:52 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.23 2018/01/07 13:03:57 rillig Exp $ BUILDLINK_TREE+= loudmouth @@ -7,7 +7,7 @@ LOUDMOUTH_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.loudmouth+= loudmouth>=1.0 BUILDLINK_ABI_DEPENDS.loudmouth+= loudmouth>=1.4.3nb6 -BUILDLINK_PKGSRCDIR.loudmouth?= ../../chat/loudmouth +BUILDLINK_PKGSRCDIR.loudmouth?= ../../chat/loudmouth .include "../../devel/glib2/buildlink3.mk" .include "../../converters/libiconv/buildlink3.mk" diff --git a/chat/meanwhile/buildlink3.mk b/chat/meanwhile/buildlink3.mk index 8cdda8eb7e3..9191395fa03 100644 --- a/chat/meanwhile/buildlink3.mk +++ b/chat/meanwhile/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:01 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:03:57 rillig Exp $ BUILDLINK_TREE+= meanwhile @@ -6,7 +6,7 @@ BUILDLINK_TREE+= meanwhile MEANWHILE_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.meanwhile+= meanwhile>=1.0.2 -BUILDLINK_PKGSRCDIR.meanwhile?= ../../chat/meanwhile +BUILDLINK_PKGSRCDIR.meanwhile?= ../../chat/meanwhile .endif # MEANWHILE_BUILDLINK3_MK BUILDLINK_TREE+= -meanwhile diff --git a/chat/telepathy-logger/buildlink3.mk b/chat/telepathy-logger/buildlink3.mk index 8ebc15e8f8f..5dba365432d 100644 --- a/chat/telepathy-logger/buildlink3.mk +++ b/chat/telepathy-logger/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.20 2017/11/30 16:45:00 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.21 2018/01/07 13:03:57 rillig Exp $ BUILDLINK_TREE+= telepathy-logger @@ -7,7 +7,7 @@ TELEPATHY_LOGGER_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.telepathy-logger+= telepathy-logger>=0.1.4 BUILDLINK_ABI_DEPENDS.telepathy-logger+= telepathy-logger>=0.2.7nb21 -BUILDLINK_PKGSRCDIR.telepathy-logger?= ../../chat/telepathy-logger +BUILDLINK_PKGSRCDIR.telepathy-logger?= ../../chat/telepathy-logger .include "../../devel/glib2/buildlink3.mk" .include "../../devel/GConf/buildlink3.mk" diff --git a/chat/telepathy-mission-control/buildlink3.mk b/chat/telepathy-mission-control/buildlink3.mk index 39c17381676..af99bf7c7e5 100644 --- a/chat/telepathy-mission-control/buildlink3.mk +++ b/chat/telepathy-mission-control/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.27 2017/02/12 06:24:37 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.28 2018/01/07 13:03:57 rillig Exp $ BUILDLINK_TREE+= telepathy-mission-control @@ -7,7 +7,7 @@ TELEPATHY_MISSION_CONTROL_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.telepathy-mission-control+= telepathy-mission-control>=4.67 BUILDLINK_ABI_DEPENDS.telepathy-mission-control+= telepathy-mission-control>=4.67nb31 -BUILDLINK_PKGSRCDIR.telepathy-mission-control?= ../../chat/telepathy-mission-control +BUILDLINK_PKGSRCDIR.telepathy-mission-control?= ../../chat/telepathy-mission-control .include "../../chat/libtelepathy/buildlink3.mk" .include "../../chat/telepathy-glib/buildlink3.mk" diff --git a/comms/asterisk/buildlink3.mk b/comms/asterisk/buildlink3.mk index df64c5e776f..de03a57995f 100644 --- a/comms/asterisk/buildlink3.mk +++ b/comms/asterisk/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2017/02/21 05:25:13 cherry Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:03:57 rillig Exp $ BUILDLINK_TREE+= asterisk @@ -7,7 +7,7 @@ ASTERISK_BUILDLINK3_MK:= # Current user is comms/asterisk-chan-dongle, which is tied to v11.x BUILDLINK_API_DEPENDS.asterisk+= asterisk>=11.25.1nb1<12 -BUILDLINK_PKGSRCDIR.asterisk?= ../../comms/asterisk +BUILDLINK_PKGSRCDIR.asterisk?= ../../comms/asterisk .endif # ASTERISK_BUILDLINK3_MK BUILDLINK_TREE+= -asterisk diff --git a/comms/gnome-pilot/buildlink3.mk b/comms/gnome-pilot/buildlink3.mk index 2f8faf7bd9f..3629c45d8b3 100644 --- a/comms/gnome-pilot/buildlink3.mk +++ b/comms/gnome-pilot/buildlink3.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.76 2017/11/30 16:45:00 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.77 2018/01/07 13:03:57 rillig Exp $ BUILDLINK_TREE+= gnome-pilot .if !defined(GNOME_PILOT_BUILDLINK3_MK) GNOME_PILOT_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.gnome-pilot+= gnome-pilot>=2.0.12nb2 +BUILDLINK_API_DEPENDS.gnome-pilot+= gnome-pilot>=2.0.12nb2 BUILDLINK_ABI_DEPENDS.gnome-pilot+= gnome-pilot>=2.0.17nb61 BUILDLINK_PKGSRCDIR.gnome-pilot?= ../../comms/gnome-pilot diff --git a/comms/libsyncml/buildlink3.mk b/comms/libsyncml/buildlink3.mk index b6559eaf7b2..731e82c3334 100644 --- a/comms/libsyncml/buildlink3.mk +++ b/comms/libsyncml/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2012/02/16 17:22:39 hans Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:03:57 rillig Exp $ BUILDLINK_TREE+= libsyncml @@ -6,7 +6,7 @@ BUILDLINK_TREE+= libsyncml LIBSYNCML_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libsyncml+= libsyncml>=0.4.5 -BUILDLINK_PKGSRCDIR.libsyncml?= ../../comms/libsyncml +BUILDLINK_PKGSRCDIR.libsyncml?= ../../comms/libsyncml .include "../../textproc/wbxml2/buildlink3.mk" .endif # LIBSYNCML_BUILDLINK3_MK diff --git a/comms/libticables2/buildlink3.mk b/comms/libticables2/buildlink3.mk index ebc42cb4bea..c7d9082a5fe 100644 --- a/comms/libticables2/buildlink3.mk +++ b/comms/libticables2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2013/05/26 22:57:53 rodent Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:03:57 rillig Exp $ BUILDLINK_TREE+= libticables2 @@ -13,9 +13,9 @@ pkgbase := libticables2 .if !empty(PKG_BUILD_OPTIONS.libticables2:Mlibusb) -.if empty(PKG_BUILD_OPTIONS.libticables2:Mlibusb1) +. if empty(PKG_BUILD_OPTIONS.libticables2:Mlibusb1) .include "../../devel/libusb/buildlink3.mk" -.endif +. endif .endif .if !empty(PKG_BUILD_OPTIONS.libticables2:Mlibusb1) diff --git a/comms/libticonv/buildlink3.mk b/comms/libticonv/buildlink3.mk index 4041a312a6f..ce188e8b30f 100644 --- a/comms/libticonv/buildlink3.mk +++ b/comms/libticonv/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2013/05/26 22:59:06 rodent Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:03:58 rillig Exp $ BUILDLINK_TREE+= libticonv @@ -6,7 +6,7 @@ BUILDLINK_TREE+= libticonv LIBTICONV_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libticonv+= libticonv>=1.1.3 -BUILDLINK_PKGSRCDIR.libticonv?= ../../comms/libticonv +BUILDLINK_PKGSRCDIR.libticonv?= ../../comms/libticonv .include "../../devel/glib2/buildlink3.mk" .endif # LIBTICONV_BUILDLINK3_MK diff --git a/comms/openobex/buildlink3.mk b/comms/openobex/buildlink3.mk index 3e3f6d455c3..9c2ff4d9410 100644 --- a/comms/openobex/buildlink3.mk +++ b/comms/openobex/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.13 2013/03/15 08:10:04 plunky Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2018/01/07 13:03:58 rillig Exp $ BUILDLINK_TREE+= openobex @@ -6,7 +6,7 @@ BUILDLINK_TREE+= openobex OPENOBEX_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.openobex+= openobex>=1.7 -BUILDLINK_PKGSRCDIR.openobex?= ../../comms/openobex +BUILDLINK_PKGSRCDIR.openobex?= ../../comms/openobex .include "../../devel/libusb/buildlink3.mk" .endif # OPENOBEX_BUILDLINK3_MK diff --git a/comms/synce-rra/buildlink3.mk b/comms/synce-rra/buildlink3.mk index 82111f9ed3b..b8836df1cf2 100644 --- a/comms/synce-rra/buildlink3.mk +++ b/comms/synce-rra/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2009/03/28 15:58:37 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:03:58 rillig Exp $ BUILDLINK_TREE+= synce-rra @@ -6,7 +6,7 @@ BUILDLINK_TREE+= synce-rra SYNCE_RRA_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.synce-rra+= synce-rra>=0.9.1nb2 -BUILDLINK_PKGSRCDIR.synce-rra?= ../../comms/synce-rra +BUILDLINK_PKGSRCDIR.synce-rra?= ../../comms/synce-rra .include "../../comms/synce-librapi2/buildlink3.mk" .include "../../comms/synce-libsynce/buildlink3.mk" diff --git a/converters/hs-aeson/buildlink3.mk b/converters/hs-aeson/buildlink3.mk index ff0dff39e55..5155ee18346 100644 --- a/converters/hs-aeson/buildlink3.mk +++ b/converters/hs-aeson/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.17 2016/01/10 11:49:09 szptvlfn Exp $ +# $NetBSD: buildlink3.mk,v 1.18 2018/01/07 13:03:58 rillig Exp $ BUILDLINK_TREE+= hs-aeson @@ -7,7 +7,7 @@ HS_AESON_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.hs-aeson+= hs-aeson>=0.7.0 BUILDLINK_ABI_DEPENDS.hs-aeson+= hs-aeson>=0.7.0.6nb16 -BUILDLINK_PKGSRCDIR.hs-aeson?= ../../converters/hs-aeson +BUILDLINK_PKGSRCDIR.hs-aeson?= ../../converters/hs-aeson .include "../../textproc/hs-attoparsec/buildlink3.mk" .include "../../devel/hs-dlist/buildlink3.mk" diff --git a/converters/libe-book/buildlink3.mk b/converters/libe-book/buildlink3.mk index 38780ef3820..3946076b547 100644 --- a/converters/libe-book/buildlink3.mk +++ b/converters/libe-book/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.9 2018/01/01 21:18:06 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2018/01/07 13:03:58 rillig Exp $ BUILDLINK_TREE+= libe-book @@ -7,7 +7,7 @@ LIBE_BOOK_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libe-book+= libe-book>=0.0.2 BUILDLINK_ABI_DEPENDS.libe-book?= libe-book>=0.1.2nb14 -BUILDLINK_PKGSRCDIR.libe-book?= ../../converters/libe-book +BUILDLINK_PKGSRCDIR.libe-book?= ../../converters/libe-book .include "../../converters/librevenge/buildlink3.mk" .include "../../converters/libwpd/buildlink3.mk" diff --git a/converters/libmspub/buildlink3.mk b/converters/libmspub/buildlink3.mk index c78c99bfbd8..1dcd29e6a58 100644 --- a/converters/libmspub/buildlink3.mk +++ b/converters/libmspub/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.9 2018/01/01 21:18:06 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2018/01/07 13:03:58 rillig Exp $ BUILDLINK_TREE+= libmspub @@ -7,7 +7,7 @@ LIBMSPUB_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libmspub+= libmspub>=0.0.6 BUILDLINK_ABI_DEPENDS.libmspub?= libmspub>=0.1.2nb14 -BUILDLINK_PKGSRCDIR.libmspub?= ../../converters/libmspub +BUILDLINK_PKGSRCDIR.libmspub?= ../../converters/libmspub .include "../../converters/libwpd/buildlink3.mk" .include "../../converters/libwpg/buildlink3.mk" diff --git a/converters/orcus0.12/buildlink3.mk b/converters/orcus0.12/buildlink3.mk index 32d35cce364..644b0cb2750 100644 --- a/converters/orcus0.12/buildlink3.mk +++ b/converters/orcus0.12/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2016/09/20 10:52:53 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:03:58 rillig Exp $ BUILDLINK_TREE+= orcus012 @@ -6,7 +6,7 @@ BUILDLINK_TREE+= orcus012 ORCUS012_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.orcus012+= orcus0.12>=0.12.0 -BUILDLINK_PKGSRCDIR.orcus012?= ../../converters/orcus0.12 +BUILDLINK_PKGSRCDIR.orcus012?= ../../converters/orcus0.12 .include "../../devel/mdds1.2/buildlink3.mk" .include "../../math/libixion/buildlink3.mk" diff --git a/converters/qrencode/buildlink3.mk b/converters/qrencode/buildlink3.mk index 01a6828ced0..855c869c753 100644 --- a/converters/qrencode/buildlink3.mk +++ b/converters/qrencode/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2012/12/16 14:23:07 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:03:58 rillig Exp $ BUILDLINK_TREE+= qrencode @@ -6,7 +6,7 @@ BUILDLINK_TREE+= qrencode QRENCODE_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.qrencode+= qrencode>=3.4.1 -BUILDLINK_PKGSRCDIR.qrencode?= ../../converters/qrencode +BUILDLINK_PKGSRCDIR.qrencode?= ../../converters/qrencode .endif # QRENCODE_BUILDLINK3_MK BUILDLINK_TREE+= -qrencode diff --git a/cross/avr-binutils/buildlink3.mk b/cross/avr-binutils/buildlink3.mk index 6fecdc8e0b0..6afdf81b16c 100644 --- a/cross/avr-binutils/buildlink3.mk +++ b/cross/avr-binutils/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2013/08/08 03:29:59 mef Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:03:58 rillig Exp $ BUILDLINK_TREE+= avr-binutils @@ -6,7 +6,7 @@ BUILDLINK_TREE+= avr-binutils AVR_BINUTILS_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.avr-binutils+= avr-binutils>=2.23 -BUILDLINK_PKGSRCDIR.avr-binutils?= ../../cross/avr-binutils +BUILDLINK_PKGSRCDIR.avr-binutils?= ../../cross/avr-binutils #BUILDLINK_FNAME_TRANSFORM.avr-binutils+= -e "s,${AVR_TARGET}/lib,lib/,g" .endif # AVR_BINUTILS_BUILDLINK3_MK diff --git a/cross/nios2-gcc/buildlink3.mk b/cross/nios2-gcc/buildlink3.mk index 69cbf3f9011..9e1f13220e8 100644 --- a/cross/nios2-gcc/buildlink3.mk +++ b/cross/nios2-gcc/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2013/11/18 06:41:27 mef Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:03:58 rillig Exp $ BUILDLINK_TREE+= nios2-gcc @@ -6,9 +6,9 @@ BUILDLINK_TREE+= nios2-gcc NIOS2_GCC_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.nios2-gcc+= nios2-gcc>=4.7.3 -BUILDLINK_PKGSRCDIR.nios2-gcc?= ../../cross/nios2-gcc -BUILDLINK_FNAME_TRANSFORM.nios2-gcc+= -e "s,${NIOS2_TARGET}/lib,lib/,g" +BUILDLINK_API_DEPENDS.nios2-gcc+= nios2-gcc>=4.7.3 +BUILDLINK_PKGSRCDIR.nios2-gcc?= ../../cross/nios2-gcc +BUILDLINK_FNAME_TRANSFORM.nios2-gcc+= -e "s,${NIOS2_TARGET}/lib,lib/,g" .endif # NIOS2-GCC_BUILDLINK3_MK BUILDLINK_TREE+= -nios2-gcc diff --git a/databases/db/buildlink3.mk b/databases/db/buildlink3.mk index 4709f420b1d..81eb1194ab2 100644 --- a/databases/db/buildlink3.mk +++ b/databases/db/buildlink3.mk @@ -1,21 +1,21 @@ -# $NetBSD: buildlink3.mk,v 1.27 2012/02/05 12:16:56 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.28 2018/01/07 13:03:58 rillig Exp $ BUILDLINK_TREE+= db2 .if !defined(DB_BUILDLINK3_MK) DB_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.db2+= db>=2.7.3 +BUILDLINK_API_DEPENDS.db2+= db>=2.7.3 BUILDLINK_ABI_DEPENDS.db2+= db>=2.7.7nb2 BUILDLINK_PKGSRCDIR.db2?= ../../databases/db BUILDLINK_INCDIRS.db2?= include/db2 BUILDLINK_LDADD.db2= -ldb2 -. include "../../mk/bsd.fast.prefs.mk" -. if defined(USE_DB185) && !empty(USE_DB185:M[yY][eE][sS]) +.include "../../mk/bsd.fast.prefs.mk" +.if defined(USE_DB185) && !empty(USE_DB185:M[yY][eE][sS]) #BUILDLINK_LIBS.db2= ${BUILDLINK_LDADD.db2} BUILDLINK_TRANSFORM+= l:db:db2 -. endif +.endif .endif # DB_BUILDLINK3_MK BUILDLINK_TREE+= -db2 diff --git a/databases/db3/buildlink3.mk b/databases/db3/buildlink3.mk index ee3435f1e94..c6a7c54e87d 100644 --- a/databases/db3/buildlink3.mk +++ b/databases/db3/buildlink3.mk @@ -1,22 +1,22 @@ -# $NetBSD: buildlink3.mk,v 1.23 2012/02/05 12:16:56 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.24 2018/01/07 13:03:59 rillig Exp $ BUILDLINK_TREE+= db3 .if !defined(DB3_BUILDLINK3_MK) DB3_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.db3+= db3>=2.9.2 +BUILDLINK_API_DEPENDS.db3+= db3>=2.9.2 BUILDLINK_ABI_DEPENDS.db3+= db3>=3.11.2nb3 BUILDLINK_PKGSRCDIR.db3?= ../../databases/db3 BUILDLINK_INCDIRS.db3?= include/db3 BUILDLINK_LDADD.db3= -ldb3 BUILDLINK_TRANSFORM+= l:db-3:db3 -. include "../../mk/bsd.fast.prefs.mk" -. if defined(USE_DB185) && !empty(USE_DB185:M[yY][eE][sS]) +.include "../../mk/bsd.fast.prefs.mk" +.if defined(USE_DB185) && !empty(USE_DB185:M[yY][eE][sS]) #BUILDLINK_LIBS.db3= ${BUILDLINK_LDADD.db3} BUILDLINK_TRANSFORM+= l:db:db3 -. endif +.endif .include "../../mk/pthread.buildlink3.mk" .endif # DB3_BUILDLINK3_MK diff --git a/databases/libdbh2/buildlink3.mk b/databases/libdbh2/buildlink3.mk index 1211766445e..86e73c9b49a 100644 --- a/databases/libdbh2/buildlink3.mk +++ b/databases/libdbh2/buildlink3.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.1 2015/01/19 02:07:41 mef Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:03:59 rillig Exp $ BUILDLINK_TREE+= libdbh2 .if !defined(LIBDBH2_BUILDLINK3_MK) LIBDBH2_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.libdbh2+= libdbh2>=5.0.16 +BUILDLINK_API_DEPENDS.libdbh2+= libdbh2>=5.0.16 BUILDLINK_PKGSRCDIR.libdbh2?= ../../databases/libdbh2 .endif # LIBDBH2_BUILDLINK3_MK diff --git a/databases/mariadb55-client/buildlink3.mk b/databases/mariadb55-client/buildlink3.mk index 3a9997fdc7d..d654e0821fc 100644 --- a/databases/mariadb55-client/buildlink3.mk +++ b/databases/mariadb55-client/buildlink3.mk @@ -1,6 +1,6 @@ -# $NetBSD: buildlink3.mk,v 1.5 2016/03/05 11:27:41 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2018/01/07 13:03:59 rillig Exp $ -# This buildlink file uses mysql-client and not mariadb-client, +# This buildlink file uses mysql-client and not mariadb-client, # because some packages depending on it expect BUILDLINK_*.mysql-client # to be set and will fail build if they get BUILDLINK_*.mariadb-client # instead. diff --git a/databases/ocaml-dbm/buildlink3.mk b/databases/ocaml-dbm/buildlink3.mk index e545e589001..482ef37ac98 100644 --- a/databases/ocaml-dbm/buildlink3.mk +++ b/databases/ocaml-dbm/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.10 2017/09/08 09:51:19 jaapb Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2018/01/07 13:03:59 rillig Exp $ BUILDLINK_TREE+= ocaml-dbm @@ -7,7 +7,7 @@ OCAML_DBM_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ocaml-dbm+= ocaml-dbm>=1.0 BUILDLINK_ABI_DEPENDS.ocaml-dbm?= ocaml-dbm>=1.0nb12 -BUILDLINK_PKGSRCDIR.ocaml-dbm?= ../../databases/ocaml-dbm +BUILDLINK_PKGSRCDIR.ocaml-dbm?= ../../databases/ocaml-dbm .include "../../databases/gdbm/buildlink3.mk" .include "../../lang/ocaml/buildlink3.mk" diff --git a/databases/openldap-client/buildlink3.mk b/databases/openldap-client/buildlink3.mk index 87efd9fdae1..9e8f11b2ecb 100644 --- a/databases/openldap-client/buildlink3.mk +++ b/databases/openldap-client/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.18 2016/03/05 11:27:43 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.19 2018/01/07 13:03:59 rillig Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -18,15 +18,15 @@ CHECK_BUILTIN.openldap-client:= yes .include "../../databases/openldap-client/builtin.mk" CHECK_BUILTIN.openldap-client:= no -. if empty(USE_BUILTIN.openldap-client:M[yY][eE][sS]) +.if empty(USE_BUILTIN.openldap-client:M[yY][eE][sS]) pkgbase := openldap-client -. include "../../mk/pkg-build-options.mk" +. include "../../mk/pkg-build-options.mk" -. if !empty(PKG_BUILD_OPTIONS.openldap-client:Mkerberos) || \ +. if !empty(PKG_BUILD_OPTIONS.openldap-client:Mkerberos) || \ !empty(PKG_BUILD_OPTIONS.openldap-client:Msasl) -. include "../../security/cyrus-sasl/buildlink3.mk" -. endif +. include "../../security/cyrus-sasl/buildlink3.mk" . endif +.endif .include "../../security/openssl/buildlink3.mk" .endif # OPENLDAP_BUILDLINK3_MK diff --git a/databases/p5-DBI/buildlink3.mk b/databases/p5-DBI/buildlink3.mk index 43bf35c8b3b..788b00d1552 100644 --- a/databases/p5-DBI/buildlink3.mk +++ b/databases/p5-DBI/buildlink3.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.21 2017/06/05 14:22:26 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.22 2018/01/07 13:03:59 rillig Exp $ BUILDLINK_TREE+= p5-DBI .if !defined(P5_DBI_BUILDLINK3_MK) P5_DBI_BUILDLINK3_MK:= -. include "../../mk/bsd.fast.prefs.mk" +.include "../../mk/bsd.fast.prefs.mk" BUILDLINK_API_DEPENDS.p5-DBI+= p5-DBI>=1.612 BUILDLINK_ABI_DEPENDS.p5-DBI?= p5-DBI>=1.636nb3 diff --git a/databases/poco-data-sqlite/buildlink3.mk b/databases/poco-data-sqlite/buildlink3.mk index c9da3b904ae..36ec6e111bf 100644 --- a/databases/poco-data-sqlite/buildlink3.mk +++ b/databases/poco-data-sqlite/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.20 2017/11/30 16:45:01 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.21 2018/01/07 13:03:59 rillig Exp $ BUILDLINK_TREE+= poco-data-sqlite @@ -7,7 +7,7 @@ POCO_DATA_SQLITE_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.poco-data-sqlite+= poco-data-sqlite>=1.6.1 BUILDLINK_ABI_DEPENDS.poco-data-sqlite+= poco-data-sqlite>=1.6.1nb6 -BUILDLINK_PKGSRCDIR.poco-data-sqlite?= ../../databases/poco-data-sqlite +BUILDLINK_PKGSRCDIR.poco-data-sqlite?= ../../databases/poco-data-sqlite .include "../../databases/sqlite3/buildlink3.mk" .include "../../databases/poco-data/buildlink3.mk" diff --git a/databases/poco-data/buildlink3.mk b/databases/poco-data/buildlink3.mk index 5ccb4a47467..13a8136d26b 100644 --- a/databases/poco-data/buildlink3.mk +++ b/databases/poco-data/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.10 2016/03/05 11:27:43 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2018/01/07 13:03:59 rillig Exp $ BUILDLINK_TREE+= poco-data @@ -7,7 +7,7 @@ POCO_DATA_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.poco-data+= poco-data>=1.6.1 BUILDLINK_ABI_DEPENDS.poco-data+= poco-data>=1.6.1nb1 -BUILDLINK_PKGSRCDIR.poco-data?= ../../databases/poco-data +BUILDLINK_PKGSRCDIR.poco-data?= ../../databases/poco-data .include "../../devel/poco/buildlink3.mk" .endif # POCO_DATA_BUILDLINK3_MK diff --git a/databases/py-metakit/buildlink3.mk b/databases/py-metakit/buildlink3.mk index 130ae5fab8b..46077d46a46 100644 --- a/databases/py-metakit/buildlink3.mk +++ b/databases/py-metakit/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:07 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2018/01/07 13:03:59 rillig Exp $ BUILDLINK_TREE+= pymetakit @@ -9,7 +9,7 @@ PY_METAKIT_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.pymetakit+= ${PYPKGPREFIX}-metakit-[0-9]* BUILDLINK_ABI_DEPENDS.pymetakit+= ${PYPKGPREFIX}-metakit>=2.4.9.3nb2 -BUILDLINK_PKGSRCDIR.pymetakit?= ../../databases/py-metakit +BUILDLINK_PKGSRCDIR.pymetakit?= ../../databases/py-metakit .endif # PY_METAKIT_BUILDLINK3_MK BUILDLINK_TREE+= -pymetakit diff --git a/databases/qdbm/buildlink3.mk b/databases/qdbm/buildlink3.mk index 4080d4ef924..068853accdf 100644 --- a/databases/qdbm/buildlink3.mk +++ b/databases/qdbm/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:24:07 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2018/01/07 13:03:59 rillig Exp $ BUILDLINK_TREE+= qdbm @@ -11,11 +11,11 @@ BUILDLINK_PKGSRCDIR.qdbm?= ../../databases/qdbm .include "../../mk/pthread.buildlink3.mk" -. if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} != "none" +.if defined(PTHREAD_TYPE) && ${PTHREAD_TYPE} != "none" CONFIGURE_ARGS+= --enable-pthread BUILDLINK_CFLAGS.qdbm+= ${PTHREAD_CFLAGS} BUILDLINK_LDFLAGS.qdbm+=${PTHREAD_LDFLAGS} -. endif +.endif .include "../../archivers/bzip2/buildlink3.mk" .include "../../archivers/lzo/buildlink3.mk" diff --git a/databases/qore-mysql-module/buildlink3.mk b/databases/qore-mysql-module/buildlink3.mk index 4f9af74c4ca..421a8df36f2 100644 --- a/databases/qore-mysql-module/buildlink3.mk +++ b/databases/qore-mysql-module/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2017/10/12 18:21:23 nros Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2018/01/07 13:03:59 rillig Exp $ # BUILDLINK_TREE+= qore-mysql-module @@ -8,7 +8,7 @@ QORE_MYSQL_MODULE_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.qore-mysql-module+= qore-mysql-module>=2.0.1 BUILDLINK_ABI_DEPENDS.qore-mysql-module?= qore-mysql-module>=2.0.1nb7 -BUILDLINK_PKGSRCDIR.qore-mysql-module?= ../../databases/qore-mysql-module +BUILDLINK_PKGSRCDIR.qore-mysql-module?= ../../databases/qore-mysql-module .include "../../lang/qore/buildlink3.mk" .endif # QORE_MYSQL_MODULE_BUILDLINK3_MK diff --git a/databases/shared-mime-info/buildlink3.mk b/databases/shared-mime-info/buildlink3.mk index 9a9d3b3fb82..3e07c94e48f 100644 --- a/databases/shared-mime-info/buildlink3.mk +++ b/databases/shared-mime-info/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.15 2012/03/07 19:31:32 drochner Exp $ +# $NetBSD: buildlink3.mk,v 1.16 2018/01/07 13:04:00 rillig Exp $ BUILDLINK_TREE+= shared-mime-info @@ -7,7 +7,7 @@ SHARED_MIME_INFO_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.shared-mime-info+= shared-mime-info>=0.15 BUILDLINK_ABI_DEPENDS.shared-mime-info+= shared-mime-info>=1.0nb1 -BUILDLINK_PKGSRCDIR.shared-mime-info?= ../../databases/shared-mime-info +BUILDLINK_PKGSRCDIR.shared-mime-info?= ../../databases/shared-mime-info BUILDLINK_TARGETS+= shared-mime-info-buildlink-fake diff --git a/databases/tdb/buildlink3.mk b/databases/tdb/buildlink3.mk index 98afc6b095c..e8af487312d 100644 --- a/databases/tdb/buildlink3.mk +++ b/databases/tdb/buildlink3.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:24:08 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2018/01/07 13:04:00 rillig Exp $ BUILDLINK_TREE+= tdb .if !defined(TDB_BUILDLINK3_MK) TDB_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.tdb+= tdb>=1.0.6 +BUILDLINK_API_DEPENDS.tdb+= tdb>=1.0.6 BUILDLINK_ABI_DEPENDS.tdb+= tdb>=1.0.6nb2 BUILDLINK_PKGSRCDIR.tdb?= ../../databases/tdb .endif # TDB_BUILDLINK3_MK diff --git a/databases/unixodbc/buildlink3.mk b/databases/unixodbc/buildlink3.mk index a90c15c5957..cbeabd416e9 100644 --- a/databases/unixodbc/buildlink3.mk +++ b/databases/unixodbc/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.9 2015/04/26 11:37:07 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2018/01/07 13:04:00 rillig Exp $ BUILDLINK_TREE+= unixodbc @@ -7,7 +7,7 @@ UNIXODBC_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.unixodbc+= unixodbc>=2.3.2 BUILDLINK_ABI_DEPENDS.unixodbc+= unixodbc>=2.3.2 -BUILDLINK_PKGSRCDIR.unixodbc?= ../../databases/unixodbc +BUILDLINK_PKGSRCDIR.unixodbc?= ../../databases/unixodbc .endif # UNIXODBC_BUILDLINK3_MK BUILDLINK_TREE+= -unixodbc diff --git a/databases/vsqlite++/buildlink3.mk b/databases/vsqlite++/buildlink3.mk index 648e3216742..0296a7f5f56 100644 --- a/databases/vsqlite++/buildlink3.mk +++ b/databases/vsqlite++/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2017/11/30 16:45:01 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2018/01/07 13:04:00 rillig Exp $ BUILDLINK_TREE+= vsqlite++ @@ -7,7 +7,7 @@ VSQLITE++_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.vsqlite+++= vsqlite++>=0.3.13 BUILDLINK_ABI_DEPENDS.vsqlite++?= vsqlite++>=0.3.13nb7 -BUILDLINK_PKGSRCDIR.vsqlite++?= ../../databases/vsqlite++ +BUILDLINK_PKGSRCDIR.vsqlite++?= ../../databases/vsqlite++ .include "../../databases/sqlite3/buildlink3.mk" .endif # VSQLITE++_BUILDLINK3_MK diff --git a/devel/GConf-ui/buildlink3.mk b/devel/GConf-ui/buildlink3.mk index 02bb9f044bf..106596e3691 100644 --- a/devel/GConf-ui/buildlink3.mk +++ b/devel/GConf-ui/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.28 2017/02/12 06:24:37 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.29 2018/01/07 13:04:00 rillig Exp $ BUILDLINK_TREE+= GConf-ui @@ -7,7 +7,7 @@ GCONF_UI_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.GConf-ui+= GConf-ui>=2.8.0.1 BUILDLINK_ABI_DEPENDS.GConf-ui+= GConf-ui>=2.32.4nb18 -BUILDLINK_PKGSRCDIR.GConf-ui?= ../../devel/GConf-ui +BUILDLINK_PKGSRCDIR.GConf-ui?= ../../devel/GConf-ui .include "../../devel/GConf/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/devel/apel/buildlink3.mk b/devel/apel/buildlink3.mk index 01af086ea61..4bab3c7a96a 100644 --- a/devel/apel/buildlink3.mk +++ b/devel/apel/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:09 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:00 rillig Exp $ # .include "../../editors/emacs/modules.mk" @@ -6,7 +6,7 @@ BUILDLINK_TREE+= apel -.if !defined(APEL_BUILDLINK3_MK) +. if !defined(APEL_BUILDLINK3_MK) APEL_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.apel+= ${EMACS_PKGNAME_PREFIX}apel>=10 @@ -14,12 +14,12 @@ BUILDLINK_PKGSRCDIR.apel?= ../../devel/apel BUILDLINK_CONTENTS_FILTER.apel= ${EGREP} '.*\.el$$|.*\.elc$$' -.else +. else # XEmacs has apel in xemacs-packages EMACS_MODULES+= base -.endif +. endif .endif # APEL_BUILDLINK3_MK BUILDLINK_TREE+= -apel diff --git a/devel/apr-util/buildlink3.mk b/devel/apr-util/buildlink3.mk index ffcb1941238..bcd67f4295b 100644 --- a/devel/apr-util/buildlink3.mk +++ b/devel/apr-util/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.17 2016/03/05 11:27:44 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.18 2018/01/07 13:04:00 rillig Exp $ BUILDLINK_TREE+= apr-util @@ -7,7 +7,7 @@ APR_UTIL_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.apr-util+= apr-util>=1.2.8 BUILDLINK_ABI_DEPENDS.apr-util+= apr-util>=1.5.4nb4 -BUILDLINK_PKGSRCDIR.apr-util?= ../../devel/apr-util +BUILDLINK_PKGSRCDIR.apr-util?= ../../devel/apr-util BUILDLINK_FILES.apr-util+= bin/apu-1-config BUILDLINK_FILES.apr-util+= lib/aprutil.exp diff --git a/devel/atk/buildlink3.mk b/devel/atk/buildlink3.mk index 8ce4ab5159c..7f0fc58894d 100644 --- a/devel/atk/buildlink3.mk +++ b/devel/atk/buildlink3.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.19 2012/10/08 20:19:31 prlw1 Exp $ +# $NetBSD: buildlink3.mk,v 1.20 2018/01/07 13:04:00 rillig Exp $ BUILDLINK_TREE+= atk .if !defined(ATK_BUILDLINK3_MK) ATK_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.atk+= atk>=1.11.4 +BUILDLINK_API_DEPENDS.atk+= atk>=1.11.4 BUILDLINK_ABI_DEPENDS.atk+= atk>=2.6.0 BUILDLINK_PKGSRCDIR.atk?= ../../devel/atk diff --git a/devel/binutils/buildlink3.mk b/devel/binutils/buildlink3.mk index dcc4431a410..e6172958c67 100644 --- a/devel/binutils/buildlink3.mk +++ b/devel/binutils/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.24 2012/07/23 12:24:34 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.25 2018/01/07 13:04:00 rillig Exp $ BUILDLINK_TREE+= binutils @@ -6,8 +6,8 @@ BUILDLINK_TREE+= binutils BINUTILS_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.binutils+= binutils>=2.22 -BUILDLINK_PKGSRCDIR.binutils?= ../../devel/binutils -BUILDLINK_DEPMETHOD.binutils?= build +BUILDLINK_PKGSRCDIR.binutils?= ../../devel/binutils +BUILDLINK_DEPMETHOD.binutils?= build .endif # BINUTILS_BUILDLINK3_MK BUILDLINK_TREE+= -binutils diff --git a/devel/boehm-gc/buildlink3.mk b/devel/boehm-gc/buildlink3.mk index 90a06903bb8..df0a761a86f 100644 --- a/devel/boehm-gc/buildlink3.mk +++ b/devel/boehm-gc/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.14 2014/04/21 13:25:41 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2018/01/07 13:04:00 rillig Exp $ BUILDLINK_TREE+= boehm-gc @@ -6,7 +6,7 @@ BUILDLINK_TREE+= boehm-gc BOEHM_GC_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.boehm-gc+= boehm-gc>=7.4 -BUILDLINK_PKGSRCDIR.boehm-gc?= ../../devel/boehm-gc +BUILDLINK_PKGSRCDIR.boehm-gc?= ../../devel/boehm-gc .include "../../devel/libatomic_ops/buildlink3.mk" .endif # BOEHM_GC_BUILDLINK3_MK diff --git a/devel/cdk/buildlink3.mk b/devel/cdk/buildlink3.mk index abd972b4c30..46c4bca7a89 100644 --- a/devel/cdk/buildlink3.mk +++ b/devel/cdk/buildlink3.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.10 2015/08/18 07:31:00 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2018/01/07 13:04:00 rillig Exp $ BUILDLINK_TREE+= cdk .if !defined(CDK_BUILDLINK3_MK) CDK_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.cdk+= cdk>=4.9.9nb1 +BUILDLINK_API_DEPENDS.cdk+= cdk>=4.9.9nb1 BUILDLINK_ABI_DEPENDS.cdk+= cdk>=4.9.9nb5 BUILDLINK_PKGSRCDIR.cdk?= ../../devel/cdk diff --git a/devel/dlcompat/buildlink3.mk b/devel/dlcompat/buildlink3.mk index f7a9a710fae..365aaf488a2 100644 --- a/devel/dlcompat/buildlink3.mk +++ b/devel/dlcompat/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:24:12 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2018/01/07 13:04:00 rillig Exp $ BUILDLINK_TREE+= dlcompat @@ -6,8 +6,8 @@ BUILDLINK_TREE+= dlcompat DLCOMPAT_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.dlcompat+= dlcompat>=20030629 -BUILDLINK_PKGSRCDIR.dlcompat?= ../../devel/dlcompat -BUILDLINK_LDFLAGS.dlcompat+= -ldl +BUILDLINK_PKGSRCDIR.dlcompat?= ../../devel/dlcompat +BUILDLINK_LDFLAGS.dlcompat+= -ldl .endif # DLCOMPAT_BUILDLINK3_MK BUILDLINK_TREE+= -dlcompat diff --git a/devel/edcommon/buildlink3.mk b/devel/edcommon/buildlink3.mk index 0f7317bd0e3..2dd2c825958 100644 --- a/devel/edcommon/buildlink3.mk +++ b/devel/edcommon/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.10 2012/05/07 01:53:21 dholland Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2018/01/07 13:04:01 rillig Exp $ BUILDLINK_TREE+= edcommon @@ -7,7 +7,7 @@ EDCOMMON_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.edcommon+= edcommon>=32nb6 BUILDLINK_ABI_DEPENDS.edcommon+= edcommon>=32nb6 -BUILDLINK_PKGSRCDIR.edcommon?= ../../devel/edcommon +BUILDLINK_PKGSRCDIR.edcommon?= ../../devel/edcommon .endif # EDCOMMON_BUILDLINK3_MK BUILDLINK_TREE+= -edcommon diff --git a/devel/editline/buildlink3.mk b/devel/editline/buildlink3.mk index 18e9e5afd54..cca70953d7a 100644 --- a/devel/editline/buildlink3.mk +++ b/devel/editline/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2013/08/11 07:42:51 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:01 rillig Exp $ BUILDLINK_TREE+= editline @@ -6,7 +6,7 @@ BUILDLINK_TREE+= editline EDITLINE_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.editline+= editline>=3.0.20130712nb1 -BUILDLINK_PKGSRCDIR.editline?= ../../devel/editline +BUILDLINK_PKGSRCDIR.editline?= ../../devel/editline BUILDLINK_FILES.editline+= include/history.h BUILDLINK_FILES.editline+= include/readline.h diff --git a/devel/editorconfig-core/buildlink3.mk b/devel/editorconfig-core/buildlink3.mk index 0eeadd1d95a..5f30755be96 100644 --- a/devel/editorconfig-core/buildlink3.mk +++ b/devel/editorconfig-core/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2017/05/28 19:43:46 nros Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:01 rillig Exp $ BUILDLINK_TREE+= editorconfig-core @@ -6,7 +6,7 @@ BUILDLINK_TREE+= editorconfig-core EDITORCONFIG_CORE_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.editorconfig-core+= editorconfig-core>=0.12.1 -BUILDLINK_PKGSRCDIR.editorconfig-core?= ../../devel/editorconfig-core +BUILDLINK_PKGSRCDIR.editorconfig-core?= ../../devel/editorconfig-core .endif # EDITORCONFIG_CORE_BUILDLINK3_MK BUILDLINK_TREE+= -editorconfig-core diff --git a/devel/gettext-asprintf/buildlink3.mk b/devel/gettext-asprintf/buildlink3.mk index 98203496019..4aff2008cfa 100644 --- a/devel/gettext-asprintf/buildlink3.mk +++ b/devel/gettext-asprintf/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2011/04/12 17:41:28 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2018/01/07 13:04:01 rillig Exp $ BUILDLINK_TREE+= gettext-asprintf @@ -6,7 +6,7 @@ BUILDLINK_TREE+= gettext-asprintf GETTEXT_ASPRINTF_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.gettext-asprintf+= gettext-asprintf>=0.18 -BUILDLINK_PKGSRCDIR.gettext-asprintf?= ../../devel/gettext-asprintf +BUILDLINK_PKGSRCDIR.gettext-asprintf?= ../../devel/gettext-asprintf .endif # GETTEXT_ASPRINTF_BUILDLINK3_MK BUILDLINK_TREE+= -gettext-asprintf diff --git a/devel/gnustep-objc-lf2/buildlink3.mk b/devel/gnustep-objc-lf2/buildlink3.mk index 53ebc8c8bb0..7d5a719e666 100644 --- a/devel/gnustep-objc-lf2/buildlink3.mk +++ b/devel/gnustep-objc-lf2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.10 2012/05/07 01:53:22 dholland Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2018/01/07 13:04:01 rillig Exp $ BUILDLINK_TREE+= gnustep-objc-lf2 @@ -7,9 +7,9 @@ GNUSTEP_OBJC_LF2_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.gnustep-objc-lf2+= gnustep-objc-lf2>=2.95.3.88nb3 BUILDLINK_ABI_DEPENDS.gnustep-objc-lf2+= gnustep-objc-lf2>=2.95.3.88nb3 -BUILDLINK_PKGSRCDIR.gnustep-objc-lf2?= ../../devel/gnustep-objc-lf2 +BUILDLINK_PKGSRCDIR.gnustep-objc-lf2?= ../../devel/gnustep-objc-lf2 BUILDLINK_FNAME_TRANSFORM.gnustep-objc-lf2?= -e "s|include/objc_lf2/|include/objc/|g" -BUILDLINK_TRANSFORM+= l:objc:objc_lf2 +BUILDLINK_TRANSFORM+= l:objc:objc_lf2 .include "../../devel/gnustep-make/buildlink3.mk" .endif # GNUSTEP_OBJC_LF2_BUILDLINK3_MK diff --git a/devel/go-check/buildlink3.mk b/devel/go-check/buildlink3.mk index 256f3350e67..57fb7704b58 100644 --- a/devel/go-check/buildlink3.mk +++ b/devel/go-check/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2016/01/16 23:56:23 rillig Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:01 rillig Exp $ BUILDLINK_TREE+= go-check @@ -9,7 +9,7 @@ BUILDLINK_CONTENTS_FILTER.go-check= ${EGREP} gopkg/ BUILDLINK_DEPMETHOD.go-check?= build BUILDLINK_API_DEPENDS.go-check+= go-check>=1 -BUILDLINK_PKGSRCDIR.go-check?= ../../devel/go-check +BUILDLINK_PKGSRCDIR.go-check?= ../../devel/go-check .endif # GO_CHECK_BUILDLINK3_MK BUILDLINK_TREE+= -go-check diff --git a/devel/go-ed25519/buildlink3.mk b/devel/go-ed25519/buildlink3.mk index d4cb6df603e..a0bce45156e 100644 --- a/devel/go-ed25519/buildlink3.mk +++ b/devel/go-ed25519/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2017/09/29 06:11:41 alnsn Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:01 rillig Exp $ BUILDLINK_TREE+= go-ed25519 @@ -6,7 +6,7 @@ BUILDLINK_TREE+= go-ed25519 GO_ED25519_BUILDLINK3_MK:= BUILDLINK_CONTENTS_FILTER.go-ed25519= ${EGREP} gopkg/ -BUILDLINK_DEPMETHOD.go-ed25519?= build +BUILDLINK_DEPMETHOD.go-ed25519?= build BUILDLINK_API_DEPENDS.go-ed25519+= go-ed25519>=20171601 BUILDLINK_PKGSRCDIR.go-ed25519?= ../../devel/go-ed25519 diff --git a/devel/go-gitmap/buildlink3.mk b/devel/go-gitmap/buildlink3.mk index d748ad7b935..7cedec01ee5 100644 --- a/devel/go-gitmap/buildlink3.mk +++ b/devel/go-gitmap/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2017/08/25 16:49:13 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:01 rillig Exp $ BUILDLINK_TREE+= go-gitmap @@ -8,7 +8,7 @@ GO_GITMAP_BUILDLINK3_MK:= BUILDLINK_CONTENTS_FILTER.go-gitmap= ${EGREP} gopkg/ BUILDLINK_DEPMETHOD.go-gitmap?= build -BUILDLINK_API_DEPENDS.go-gitmap+= go-gitmap>=0.0 +BUILDLINK_API_DEPENDS.go-gitmap+= go-gitmap>=0.0 BUILDLINK_PKGSRCDIR.go-gitmap?= ../../devel/go-gitmap .endif # GO_GITMAP_BUILDLINK3_MK diff --git a/devel/go-goorgeous/buildlink3.mk b/devel/go-goorgeous/buildlink3.mk index 0691b122c41..5b05fbcbc77 100644 --- a/devel/go-goorgeous/buildlink3.mk +++ b/devel/go-goorgeous/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2017/08/25 16:49:13 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:01 rillig Exp $ BUILDLINK_TREE+= go-goorgeous @@ -6,7 +6,7 @@ BUILDLINK_TREE+= go-goorgeous GO_GOORGEOUS_BUILDLINK3_MK:= BUILDLINK_CONTENTS_FILTER.go-goorgeous= ${EGREP} gopkg/ -BUILDLINK_DEPMETHOD.go-goorgeous?= build +BUILDLINK_DEPMETHOD.go-goorgeous?= build BUILDLINK_API_DEPENDS.go-goorgeous+= go-goorgeous>=0.0 BUILDLINK_PKGSRCDIR.go-goorgeous?= ../../devel/go-goorgeous diff --git a/devel/go-goptlib/buildlink3.mk b/devel/go-goptlib/buildlink3.mk index 39519501e82..e0d20bb96b1 100644 --- a/devel/go-goptlib/buildlink3.mk +++ b/devel/go-goptlib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2017/09/29 06:17:06 alnsn Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:01 rillig Exp $ BUILDLINK_TREE+= go-goptlib @@ -6,7 +6,7 @@ BUILDLINK_TREE+= go-goptlib GO_GOPTLIB_BUILDLINK3_MK:= BUILDLINK_CONTENTS_FILTER.go-goptlib= ${EGREP} gopkg/ -BUILDLINK_DEPMETHOD.go-goptlib?= build +BUILDLINK_DEPMETHOD.go-goptlib?= build BUILDLINK_API_DEPENDS.go-goptlib+= go-goptlib>=0.7 BUILDLINK_PKGSRCDIR.go-goptlib?= ../../devel/go-goptlib diff --git a/devel/go-homedir/buildlink3.mk b/devel/go-homedir/buildlink3.mk index ac7a6e54cdb..6b00065a455 100644 --- a/devel/go-homedir/buildlink3.mk +++ b/devel/go-homedir/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2017/08/25 16:49:13 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:01 rillig Exp $ BUILDLINK_TREE+= go-homedir @@ -6,7 +6,7 @@ BUILDLINK_TREE+= go-homedir GO_HOMEDIR_BUILDLINK3_MK:= BUILDLINK_CONTENTS_FILTER.go-homedir= ${EGREP} gopkg/ -BUILDLINK_DEPMETHOD.go-homedir?= build +BUILDLINK_DEPMETHOD.go-homedir?= build BUILDLINK_API_DEPENDS.go-homedir+= go-homedir>=0.0 BUILDLINK_PKGSRCDIR.go-homedir?= ../../devel/go-homedir diff --git a/devel/go-immutable-radix/buildlink3.mk b/devel/go-immutable-radix/buildlink3.mk index d72aa239df3..1183a9b66fd 100644 --- a/devel/go-immutable-radix/buildlink3.mk +++ b/devel/go-immutable-radix/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2017/08/25 16:49:13 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:01 rillig Exp $ BUILDLINK_TREE+= go-immutable-radix @@ -6,7 +6,7 @@ BUILDLINK_TREE+= go-immutable-radix GO_IMMUTABLE_RADIX_BUILDLINK3_MK:= BUILDLINK_CONTENTS_FILTER.go-immutable-radix= ${EGREP} gopkg/ -BUILDLINK_DEPMETHOD.go-immutable-radix?= build +BUILDLINK_DEPMETHOD.go-immutable-radix?= build BUILDLINK_API_DEPENDS.go-immutable-radix+= go-immutable-radix>=0.0 BUILDLINK_PKGSRCDIR.go-immutable-radix?= ../../devel/go-immutable-radix diff --git a/devel/go-jwalterweatherman/buildlink3.mk b/devel/go-jwalterweatherman/buildlink3.mk index b9e23c98879..853a1c2467d 100644 --- a/devel/go-jwalterweatherman/buildlink3.mk +++ b/devel/go-jwalterweatherman/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2017/08/25 16:49:13 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:02 rillig Exp $ BUILDLINK_TREE+= go-jwalterweatherman @@ -6,7 +6,7 @@ BUILDLINK_TREE+= go-jwalterweatherman GO_JWALTERWEATHERMAN_BUILDLINK3_MK:= BUILDLINK_CONTENTS_FILTER.go-jwalterweatherman= ${EGREP} gopkg/ -BUILDLINK_DEPMETHOD.go-jwalterweatherman?= build +BUILDLINK_DEPMETHOD.go-jwalterweatherman?= build BUILDLINK_API_DEPENDS.go-jwalterweatherman+= go-jWalterWeatherman>=20170523 BUILDLINK_PKGSRCDIR.go-jwalterweatherman?= ../../devel/go-jwalterweatherman diff --git a/devel/go-mapstructure/buildlink3.mk b/devel/go-mapstructure/buildlink3.mk index 1dfbf708f2d..fbaf29016ad 100644 --- a/devel/go-mapstructure/buildlink3.mk +++ b/devel/go-mapstructure/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2017/08/25 16:49:13 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:02 rillig Exp $ BUILDLINK_TREE+= go-mapstructure @@ -6,7 +6,7 @@ BUILDLINK_TREE+= go-mapstructure GO_MAPSTRUCTURE_BUILDLINK3_MK:= BUILDLINK_CONTENTS_FILTER.go-mapstructure= ${EGREP} gopkg/ -BUILDLINK_DEPMETHOD.go-mapstructure?= build +BUILDLINK_DEPMETHOD.go-mapstructure?= build BUILDLINK_API_DEPENDS.go-mapstructure+= go-mapstructure>=0.0 BUILDLINK_PKGSRCDIR.go-mapstructure?= ../../devel/go-mapstructure diff --git a/devel/go-mow-cli/buildlink3.mk b/devel/go-mow-cli/buildlink3.mk index 00eb86bff54..fe33d31430f 100644 --- a/devel/go-mow-cli/buildlink3.mk +++ b/devel/go-mow-cli/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2016/07/16 13:03:42 bsiegert Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:02 rillig Exp $ BUILDLINK_TREE+= go-mow-cli @@ -6,7 +6,7 @@ BUILDLINK_TREE+= go-mow-cli GO_MOW_CLI_BUILDLINK3_MK:= BUILDLINK_CONTENTS_FILTER.go-mow-cli= ${EGREP} gopkg/ -BUILDLINK_DEPMETHOD.go-mow-cli?= build +BUILDLINK_DEPMETHOD.go-mow-cli?= build BUILDLINK_API_DEPENDS.go-mow-cli+= go-mow-cli>=0.0.20160221 BUILDLINK_PKGSRCDIR.go-mow-cli?= ../../devel/go-mow-cli diff --git a/devel/go-nbreader/buildlink3.mk b/devel/go-nbreader/buildlink3.mk index c695640ed1e..098e1766cf0 100644 --- a/devel/go-nbreader/buildlink3.mk +++ b/devel/go-nbreader/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2015/12/29 21:47:48 bsiegert Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:02 rillig Exp $ BUILDLINK_TREE+= go-nbreader @@ -6,7 +6,7 @@ BUILDLINK_TREE+= go-nbreader GO_NBREADER_BUILDLINK3_MK:= BUILDLINK_CONTENTS_FILTER.go-nbreader= ${EGREP} gopkg/ -BUILDLINK_DEPMETHOD.go-nbreader?= build +BUILDLINK_DEPMETHOD.go-nbreader?= build BUILDLINK_API_DEPENDS.go-nbreader+= go-nbreader>=0.0.20150201 BUILDLINK_PKGSRCDIR.go-nbreader?= ../../devel/go-nbreader diff --git a/devel/go-protobuf/buildlink3.mk b/devel/go-protobuf/buildlink3.mk index 69784fdafb1..ea92dc97e1d 100644 --- a/devel/go-protobuf/buildlink3.mk +++ b/devel/go-protobuf/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2016/09/11 08:02:30 bsiegert Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:02 rillig Exp $ BUILDLINK_TREE+= go-protobuf @@ -6,7 +6,7 @@ BUILDLINK_TREE+= go-protobuf GO_PROTOBUF_BUILDLINK3_MK:= BUILDLINK_CONTENTS_FILTER.go-protobuf= ${EGREP} gopkg/ -BUILDLINK_DEPMETHOD.go-protobuf?= build +BUILDLINK_DEPMETHOD.go-protobuf?= build BUILDLINK_API_DEPENDS.go-protobuf+= go-protobuf>=20160829 BUILDLINK_PKGSRCDIR.go-protobuf?= ../../devel/go-protobuf diff --git a/devel/go-ratelimit/buildlink3.mk b/devel/go-ratelimit/buildlink3.mk index a63bd4dae1e..e41c21fa4e6 100644 --- a/devel/go-ratelimit/buildlink3.mk +++ b/devel/go-ratelimit/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2016/07/16 12:51:46 bsiegert Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:02 rillig Exp $ BUILDLINK_TREE+= go-ratelimit @@ -6,7 +6,7 @@ BUILDLINK_TREE+= go-ratelimit GO_RATELIMIT_BUILDLINK3_MK:= BUILDLINK_CONTENTS_FILTER.go-ratelimit= ${EGREP} gopkg/ -BUILDLINK_DEPMETHOD.go-ratelimit?= build +BUILDLINK_DEPMETHOD.go-ratelimit?= build BUILDLINK_API_DEPENDS.go-ratelimit+= go-ratelimit>=0.0.20151125 BUILDLINK_PKGSRCDIR.go-ratelimit?= ../../devel/go-ratelimit diff --git a/devel/go-sanitized_anchor_name/buildlink3.mk b/devel/go-sanitized_anchor_name/buildlink3.mk index 9dc44ee019b..7a98447eac8 100644 --- a/devel/go-sanitized_anchor_name/buildlink3.mk +++ b/devel/go-sanitized_anchor_name/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2017/08/25 16:49:14 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:02 rillig Exp $ BUILDLINK_TREE+= go-sanitized_anchor_name @@ -8,7 +8,7 @@ GO_SANITIZED_ANCHOR_NAME_BUILDLINK3_MK:= BUILDLINK_CONTENTS_FILTER.go-sanitized_anchor_name= ${EGREP} gopkg/ BUILDLINK_DEPMETHOD.go-sanitized_anchor_name?= build -BUILDLINK_API_DEPENDS.go-sanitized_anchor_name+= go-sanitized_anchor_name>=0.0 +BUILDLINK_API_DEPENDS.go-sanitized_anchor_name+= go-sanitized_anchor_name>=0.0 BUILDLINK_PKGSRCDIR.go-sanitized_anchor_name?= ../../devel/go-sanitized_anchor_name .endif # GO_SANITIZED_ANCHOR_NAME_BUILDLINK3_MK diff --git a/devel/go-shuffle/buildlink3.mk b/devel/go-shuffle/buildlink3.mk index 5df25685fa6..29fab30b1dc 100644 --- a/devel/go-shuffle/buildlink3.mk +++ b/devel/go-shuffle/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2017/08/25 16:49:14 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:02 rillig Exp $ BUILDLINK_TREE+= go-shuffle @@ -6,7 +6,7 @@ BUILDLINK_TREE+= go-shuffle GO_SHUFFLE_BUILDLINK3_MK:= BUILDLINK_CONTENTS_FILTER.go-shuffle= ${EGREP} gopkg/ -BUILDLINK_DEPMETHOD.go-shuffle?= build +BUILDLINK_DEPMETHOD.go-shuffle?= build BUILDLINK_API_DEPENDS.go-shuffle+= go-shuffle>=0.0 BUILDLINK_PKGSRCDIR.go-shuffle?= ../../devel/go-shuffle diff --git a/devel/go-siphash/buildlink3.mk b/devel/go-siphash/buildlink3.mk index ff247d87bde..c8d1ad861e1 100644 --- a/devel/go-siphash/buildlink3.mk +++ b/devel/go-siphash/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2017/09/29 06:14:39 alnsn Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:02 rillig Exp $ BUILDLINK_TREE+= go-siphash @@ -6,7 +6,7 @@ BUILDLINK_TREE+= go-siphash GO_SIPHASH_BUILDLINK3_MK:= BUILDLINK_CONTENTS_FILTER.go-siphash= ${EGREP} gopkg/ -BUILDLINK_DEPMETHOD.go-siphash?= build +BUILDLINK_DEPMETHOD.go-siphash?= build BUILDLINK_API_DEPENDS.go-siphash+= go-siphash>=1.0.0 BUILDLINK_PKGSRCDIR.go-siphash?= ../../devel/go-siphash diff --git a/devel/go-termbox/buildlink3.mk b/devel/go-termbox/buildlink3.mk index c26ee3917db..d42ee4cdebe 100644 --- a/devel/go-termbox/buildlink3.mk +++ b/devel/go-termbox/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2016/08/20 09:30:41 bsiegert Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:02 rillig Exp $ BUILDLINK_TREE+= go-termbox @@ -6,7 +6,7 @@ BUILDLINK_TREE+= go-termbox GO_TERMBOX_BUILDLINK3_MK:= BUILDLINK_CONTENTS_FILTER.go-termbox= ${EGREP} gopkg/ -BUILDLINK_DEPMETHOD.go-termbox?= build +BUILDLINK_DEPMETHOD.go-termbox?= build BUILDLINK_API_DEPENDS.go-termbox+= go-termbox>=20160808 BUILDLINK_PKGSRCDIR.go-termbox?= ../../devel/go-termbox diff --git a/devel/go-testify/buildlink3.mk b/devel/go-testify/buildlink3.mk index 002912d268c..49536e9fdfc 100644 --- a/devel/go-testify/buildlink3.mk +++ b/devel/go-testify/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2016/07/16 13:21:41 bsiegert Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:02 rillig Exp $ BUILDLINK_TREE+= go-testify @@ -6,7 +6,7 @@ BUILDLINK_TREE+= go-testify GO_TESTIFY_BUILDLINK3_MK:= BUILDLINK_CONTENTS_FILTER.go-testify= ${EGREP} gopkg/ -BUILDLINK_DEPMETHOD.go-testify?= build +BUILDLINK_DEPMETHOD.go-testify?= build BUILDLINK_API_DEPENDS.go-testify+= go-testify>=1.1.3 BUILDLINK_PKGSRCDIR.go-testify?= ../../devel/go-testify diff --git a/devel/go-tools/buildlink3.mk b/devel/go-tools/buildlink3.mk index d262feefc73..af302bf2e44 100644 --- a/devel/go-tools/buildlink3.mk +++ b/devel/go-tools/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2017/03/20 22:53:45 bsiegert Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:03 rillig Exp $ BUILDLINK_TREE+= go-tools @@ -9,7 +9,7 @@ BUILDLINK_CONTENTS_FILTER.go-tools= ${EGREP} gopkg/ BUILDLINK_DEPMETHOD.go-tools?= build BUILDLINK_API_DEPENDS.go-tools+= go-tools>=1.8 -BUILDLINK_PKGSRCDIR.go-tools?= ../../devel/go-tools +BUILDLINK_PKGSRCDIR.go-tools?= ../../devel/go-tools .include "../../devel/google-api-go-client/buildlink3.mk" .include "../../security/go-crypto-acme/buildlink3.mk" diff --git a/devel/grantlee/buildlink3.mk b/devel/grantlee/buildlink3.mk index 127db987281..fc8e07d536a 100644 --- a/devel/grantlee/buildlink3.mk +++ b/devel/grantlee/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2016/03/05 11:27:44 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2018/01/07 13:04:03 rillig Exp $ BUILDLINK_TREE+= grantlee @@ -7,7 +7,7 @@ GRANTLEE_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.grantlee+= grantlee>=0.3.0 BUILDLINK_ABI_DEPENDS.grantlee?= grantlee>=0.5.1nb2 -BUILDLINK_PKGSRCDIR.grantlee?= ../../devel/grantlee +BUILDLINK_PKGSRCDIR.grantlee?= ../../devel/grantlee .include "../../x11/qt4-libs/buildlink3.mk" .endif # GRANTLEE_BUILDLINK3_MK diff --git a/devel/gtl/buildlink3.mk b/devel/gtl/buildlink3.mk index 1defa18874c..86df617499e 100644 --- a/devel/gtl/buildlink3.mk +++ b/devel/gtl/buildlink3.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:15 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2018/01/07 13:04:03 rillig Exp $ BUILDLINK_TREE+= gtl .if !defined(GTL_BUILDLINK3_MK) GTL_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.gtl+= gtl>=1.2.0 +BUILDLINK_API_DEPENDS.gtl+= gtl>=1.2.0 BUILDLINK_PKGSRCDIR.gtl?= ../../devel/gtl .endif # GTL_BUILDLINK3_MK diff --git a/devel/guile-gnome/buildlink3.mk b/devel/guile-gnome/buildlink3.mk index 47e9f432d67..6e6d2de2ce4 100644 --- a/devel/guile-gnome/buildlink3.mk +++ b/devel/guile-gnome/buildlink3.mk @@ -1,13 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.4 2016/09/15 21:13:03 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2018/01/07 13:04:03 rillig Exp $ -BUILDLINK_TREE+= guile-gnome-platform +BUILDLINK_TREE+= guile-gnome-platform .if !defined(GUILE_GNOME_PLATFORM_BUILDLINK3_MK) GUILE_GNOME_PLATFORM_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.guile-gnome-platform+= guile-gnome-platform>=2.16.1nb10 -BUILDLINK_ABI_DEPENDS.guile-gnome-platform?= guile-gnome-platform>=2.16.2nb3 -BUILDLINK_PKGSRCDIR.guile-gnome-platform?= ../../devel/guile-gnome +BUILDLINK_API_DEPENDS.guile-gnome-platform+= guile-gnome-platform>=2.16.1nb10 +BUILDLINK_ABI_DEPENDS.guile-gnome-platform?= guile-gnome-platform>=2.16.2nb3 +BUILDLINK_PKGSRCDIR.guile-gnome-platform?= ../../devel/guile-gnome .include "../../devel/g-wrap/buildlink3.mk" .include "../../graphics/guile-cairo/buildlink3.mk" diff --git a/devel/hdf5-c++/buildlink3.mk b/devel/hdf5-c++/buildlink3.mk index 83f28e29a93..6b32d60712a 100644 --- a/devel/hdf5-c++/buildlink3.mk +++ b/devel/hdf5-c++/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2015/08/21 16:42:25 gdt Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:03 rillig Exp $ BUILDLINK_TREE+= hdf5-c++ @@ -6,7 +6,7 @@ BUILDLINK_TREE+= hdf5-c++ HDF5_C++_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.hdf5-c+++= hdf5-c++>=1.8.14 -BUILDLINK_PKGSRCDIR.hdf5-c++?= ../../devel/hdf5-c++ +BUILDLINK_PKGSRCDIR.hdf5-c++?= ../../devel/hdf5-c++ .include "../../devel/hdf5/buildlink3.mk" .endif # HDF5_C++_BUILDLINK3_MK diff --git a/devel/hs-ansi-terminal/buildlink3.mk b/devel/hs-ansi-terminal/buildlink3.mk index 89e3936940f..cdac2581ce9 100644 --- a/devel/hs-ansi-terminal/buildlink3.mk +++ b/devel/hs-ansi-terminal/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2014/11/06 13:00:44 szptvlfn Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:03 rillig Exp $ BUILDLINK_TREE+= hs-ansi-terminal @@ -7,7 +7,7 @@ HS_ANSI_TERMINAL_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.hs-ansi-terminal+= hs-ansi-terminal>=0.6.2 BUILDLINK_ABI_DEPENDS.hs-ansi-terminal+= hs-ansi-terminal>=0.6.2.1 -BUILDLINK_PKGSRCDIR.hs-ansi-terminal?= ../../devel/hs-ansi-terminal +BUILDLINK_PKGSRCDIR.hs-ansi-terminal?= ../../devel/hs-ansi-terminal .endif # HS_ANSI_TERMINAL_BUILDLINK3_MK BUILDLINK_TREE+= -hs-ansi-terminal diff --git a/devel/hs-blaze-builder/buildlink3.mk b/devel/hs-blaze-builder/buildlink3.mk index 64c5820e456..0b3751e6a56 100644 --- a/devel/hs-blaze-builder/buildlink3.mk +++ b/devel/hs-blaze-builder/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.8 2016/01/10 11:49:09 szptvlfn Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2018/01/07 13:04:03 rillig Exp $ BUILDLINK_TREE+= hs-blaze-builder @@ -7,7 +7,7 @@ HS_BLAZE_BUILDER_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.hs-blaze-builder+= hs-blaze-builder>=0.3.3 BUILDLINK_ABI_DEPENDS.hs-blaze-builder+= hs-blaze-builder>=0.3.3.3nb5 -BUILDLINK_PKGSRCDIR.hs-blaze-builder?= ../../devel/hs-blaze-builder +BUILDLINK_PKGSRCDIR.hs-blaze-builder?= ../../devel/hs-blaze-builder .include "../../devel/hs-text/buildlink3.mk" .endif # HS_BLAZE_BUILDER_BUILDLINK3_MK diff --git a/devel/hs-cpphs/buildlink3.mk b/devel/hs-cpphs/buildlink3.mk index 39031dc07fe..7ed3998eb62 100644 --- a/devel/hs-cpphs/buildlink3.mk +++ b/devel/hs-cpphs/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.10 2016/01/10 11:49:09 szptvlfn Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2018/01/07 13:04:03 rillig Exp $ BUILDLINK_TREE+= hs-cpphs @@ -7,7 +7,7 @@ HS_CPPHS_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.hs-cpphs+= hs-cpphs>=1.19.2 BUILDLINK_ABI_DEPENDS.hs-cpphs+= hs-cpphs>=1.19.2nb1 -BUILDLINK_PKGSRCDIR.hs-cpphs?= ../../devel/hs-cpphs +BUILDLINK_PKGSRCDIR.hs-cpphs?= ../../devel/hs-cpphs .include "../../textproc/hs-polyparse/buildlink3.mk" .endif # HS_CPPHS_BUILDLINK3_MK diff --git a/devel/hs-dlist/buildlink3.mk b/devel/hs-dlist/buildlink3.mk index 496110a5bc9..64fa88ee1af 100644 --- a/devel/hs-dlist/buildlink3.mk +++ b/devel/hs-dlist/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2016/01/04 12:21:11 szptvlfn Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2018/01/07 13:04:03 rillig Exp $ BUILDLINK_TREE+= hs-dlist @@ -7,7 +7,7 @@ HS_DLIST_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.hs-dlist+= hs-dlist>=0.7.1 BUILDLINK_ABI_DEPENDS.hs-dlist+= hs-dlist>=0.7.1.2 -BUILDLINK_PKGSRCDIR.hs-dlist?= ../../devel/hs-dlist +BUILDLINK_PKGSRCDIR.hs-dlist?= ../../devel/hs-dlist .endif # HS_DLIST_BUILDLINK3_MK BUILDLINK_TREE+= -hs-dlist diff --git a/devel/hs-extensible-exceptions/buildlink3.mk b/devel/hs-extensible-exceptions/buildlink3.mk index f6b94b0889a..c236daee083 100644 --- a/devel/hs-extensible-exceptions/buildlink3.mk +++ b/devel/hs-extensible-exceptions/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2014/08/29 14:08:39 szptvlfn Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:03 rillig Exp $ BUILDLINK_TREE+= hs-extensible-exceptions @@ -7,7 +7,7 @@ HS_EXTENSIBLE_EXCEPTIONS_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.hs-extensible-exceptions+= hs-extensible-exceptions>=0.1.1 BUILDLINK_ABI_DEPENDS.hs-extensible-exceptions+= hs-extensible-exceptions>=0.1.1.4 -BUILDLINK_PKGSRCDIR.hs-extensible-exceptions?= ../../devel/hs-extensible-exceptions +BUILDLINK_PKGSRCDIR.hs-extensible-exceptions?= ../../devel/hs-extensible-exceptions .endif # HS_EXTENSIBLE_EXCEPTIONS_BUILDLINK3_MK BUILDLINK_TREE+= -hs-extensible-exceptions diff --git a/devel/hs-mmorph/buildlink3.mk b/devel/hs-mmorph/buildlink3.mk index 58aefaf262c..5f6f7c55381 100644 --- a/devel/hs-mmorph/buildlink3.mk +++ b/devel/hs-mmorph/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2014/11/23 12:52:32 szptvlfn Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2018/01/07 13:04:03 rillig Exp $ BUILDLINK_TREE+= hs-mmorph @@ -7,7 +7,7 @@ HS_MMORPH_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.hs-mmorph+= hs-mmorph>=1.0.4 BUILDLINK_ABI_DEPENDS.hs-mmorph+= hs-mmorph>=1.0.4nb1 -BUILDLINK_PKGSRCDIR.hs-mmorph?= ../../devel/hs-mmorph +BUILDLINK_PKGSRCDIR.hs-mmorph?= ../../devel/hs-mmorph .include "../../devel/hs-transformers/buildlink3.mk" .endif # HS_MMORPH_BUILDLINK3_MK diff --git a/devel/hs-monad-control/buildlink3.mk b/devel/hs-monad-control/buildlink3.mk index 710725b97aa..c28c987b1fc 100644 --- a/devel/hs-monad-control/buildlink3.mk +++ b/devel/hs-monad-control/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2014/11/23 12:52:32 szptvlfn Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:03 rillig Exp $ BUILDLINK_TREE+= hs-monad-control @@ -7,7 +7,7 @@ HS_MONAD_CONTROL_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.hs-monad-control+= hs-monad-control>=0.3.3 BUILDLINK_ABI_DEPENDS.hs-monad-control+= hs-monad-control>=0.3.3.0nb2 -BUILDLINK_PKGSRCDIR.hs-monad-control?= ../../devel/hs-monad-control +BUILDLINK_PKGSRCDIR.hs-monad-control?= ../../devel/hs-monad-control .include "../../devel/hs-transformers/buildlink3.mk" .include "../../devel/hs-transformers-base/buildlink3.mk" diff --git a/devel/hs-random/buildlink3.mk b/devel/hs-random/buildlink3.mk index 9bfe9ee73f6..c78af25c927 100644 --- a/devel/hs-random/buildlink3.mk +++ b/devel/hs-random/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2014/10/21 21:27:51 szptvlfn Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:04 rillig Exp $ BUILDLINK_TREE+= hs-random @@ -7,7 +7,7 @@ HS_RANDOM_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.hs-random+= hs-random>=1.1 BUILDLINK_ABI_DEPENDS.hs-random+= hs-random>=1.1 -BUILDLINK_PKGSRCDIR.hs-random?= ../../devel/hs-random +BUILDLINK_PKGSRCDIR.hs-random?= ../../devel/hs-random .endif # HS_RANDOM_BUILDLINK3_MK BUILDLINK_TREE+= -hs-random diff --git a/devel/hs-split/buildlink3.mk b/devel/hs-split/buildlink3.mk index 3d427074a9f..6114eb795ef 100644 --- a/devel/hs-split/buildlink3.mk +++ b/devel/hs-split/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2014/08/29 14:08:39 szptvlfn Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:04 rillig Exp $ BUILDLINK_TREE+= hs-split @@ -7,7 +7,7 @@ HS_SPLIT_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.hs-split+= hs-split>=0.2.2 BUILDLINK_ABI_DEPENDS.hs-split+= hs-split>=0.2.2 -BUILDLINK_PKGSRCDIR.hs-split?= ../../devel/hs-split +BUILDLINK_PKGSRCDIR.hs-split?= ../../devel/hs-split .endif # HS_SPLIT_BUILDLINK3_MK BUILDLINK_TREE+= -hs-split diff --git a/devel/hs-tagged/buildlink3.mk b/devel/hs-tagged/buildlink3.mk index df4433553cd..a1d531c6188 100644 --- a/devel/hs-tagged/buildlink3.mk +++ b/devel/hs-tagged/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2014/08/29 14:08:40 szptvlfn Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:04 rillig Exp $ BUILDLINK_TREE+= hs-tagged @@ -7,7 +7,7 @@ HS_TAGGED_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.hs-tagged+= hs-tagged>=0.7.2 BUILDLINK_ABI_DEPENDS.hs-tagged+= hs-tagged>=0.7.2 -BUILDLINK_PKGSRCDIR.hs-tagged?= ../../devel/hs-tagged +BUILDLINK_PKGSRCDIR.hs-tagged?= ../../devel/hs-tagged .endif # HS_TAGGED_BUILDLINK3_MK BUILDLINK_TREE+= -hs-tagged diff --git a/devel/hs-vault/buildlink3.mk b/devel/hs-vault/buildlink3.mk index f00c1786322..b4e8ee727f8 100644 --- a/devel/hs-vault/buildlink3.mk +++ b/devel/hs-vault/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.10 2016/01/10 11:49:10 szptvlfn Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2018/01/07 13:04:04 rillig Exp $ BUILDLINK_TREE+= hs-vault @@ -7,7 +7,7 @@ HS_VAULT_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.hs-vault+= hs-vault>=0.3.0 BUILDLINK_ABI_DEPENDS.hs-vault+= hs-vault>=0.3.0.3nb9 -BUILDLINK_PKGSRCDIR.hs-vault?= ../../devel/hs-vault +BUILDLINK_PKGSRCDIR.hs-vault?= ../../devel/hs-vault .include "../../devel/hs-hashable/buildlink3.mk" .include "../../devel/hs-unordered-containers/buildlink3.mk" diff --git a/devel/hs-vector/buildlink3.mk b/devel/hs-vector/buildlink3.mk index ec36f909077..576392aba6c 100644 --- a/devel/hs-vector/buildlink3.mk +++ b/devel/hs-vector/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2015/12/13 14:08:12 szptvlfn Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2018/01/07 13:04:04 rillig Exp $ BUILDLINK_TREE+= hs-vector @@ -7,7 +7,7 @@ HS_VECTOR_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.hs-vector+= hs-vector>=0.11.0 BUILDLINK_ABI_DEPENDS.hs-vector+= hs-vector>=0.11.0.0 -BUILDLINK_PKGSRCDIR.hs-vector?= ../../devel/hs-vector +BUILDLINK_PKGSRCDIR.hs-vector?= ../../devel/hs-vector .include "../../devel/hs-primitive/buildlink3.mk" .endif # HS_VECTOR_BUILDLINK3_MK diff --git a/devel/iniparser/buildlink3.mk b/devel/iniparser/buildlink3.mk index b2cdea5e146..ceccfacf831 100644 --- a/devel/iniparser/buildlink3.mk +++ b/devel/iniparser/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2013/11/22 11:49:42 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:04 rillig Exp $ BUILDLINK_TREE+= iniparser @@ -6,7 +6,7 @@ BUILDLINK_TREE+= iniparser INIPARSER_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.iniparser+= iniparser>=3.1 -BUILDLINK_PKGSRCDIR.iniparser?= ../../devel/iniparser +BUILDLINK_PKGSRCDIR.iniparser?= ../../devel/iniparser .endif # INIPARSER_BUILDLINK3_MK BUILDLINK_TREE+= -iniparser diff --git a/devel/jemalloc/buildlink3.mk b/devel/jemalloc/buildlink3.mk index 7132719ddb2..b7b5aa00e36 100644 --- a/devel/jemalloc/buildlink3.mk +++ b/devel/jemalloc/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2016/02/18 15:51:59 gson Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:04 rillig Exp $ BUILDLINK_TREE+= jemalloc @@ -6,7 +6,7 @@ BUILDLINK_TREE+= jemalloc JEMALLOC_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.jemalloc+= jemalloc>=4.0.0 -BUILDLINK_PKGSRCDIR.jemalloc?= ../../devel/jemalloc +BUILDLINK_PKGSRCDIR.jemalloc?= ../../devel/jemalloc .endif # JEMALLOC_BUILDLINK3_MK BUILDLINK_TREE+= -jemalloc diff --git a/devel/kcmutils/buildlink3.mk b/devel/kcmutils/buildlink3.mk index 7770c167370..9ff36486788 100644 --- a/devel/kcmutils/buildlink3.mk +++ b/devel/kcmutils/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.12 2017/11/30 16:45:01 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2018/01/07 13:04:04 rillig Exp $ BUILDLINK_TREE+= kcmutils @@ -7,7 +7,7 @@ KCMUTILS_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.kcmutils+= kcmutils>=5.21.0 BUILDLINK_ABI_DEPENDS.kcmutils?= kcmutils>=5.25.0nb11 -BUILDLINK_PKGSRCDIR.kcmutils?= ../../devel/kcmutils +BUILDLINK_PKGSRCDIR.kcmutils?= ../../devel/kcmutils .include "../../devel/kdeclarative/buildlink3.mk" .include "../../x11/qt5-qtbase/buildlink3.mk" diff --git a/devel/kdoctools/buildlink3.mk b/devel/kdoctools/buildlink3.mk index b0a0f5be4a4..5259d1f8bc4 100644 --- a/devel/kdoctools/buildlink3.mk +++ b/devel/kdoctools/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2017/11/30 16:45:02 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2018/01/07 13:04:04 rillig Exp $ BUILDLINK_TREE+= kdoctools @@ -7,7 +7,7 @@ KDOCTOOLS_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.kdoctools+= kdoctools>=5.21.0 BUILDLINK_ABI_DEPENDS.kdoctools?= kdoctools>=5.25.0nb6 -BUILDLINK_PKGSRCDIR.kdoctools?= ../../devel/kdoctools +BUILDLINK_PKGSRCDIR.kdoctools?= ../../devel/kdoctools .include "../../textproc/libxslt/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" diff --git a/devel/kidletime/buildlink3.mk b/devel/kidletime/buildlink3.mk index d99cff6da31..82e7e219321 100644 --- a/devel/kidletime/buildlink3.mk +++ b/devel/kidletime/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2017/11/30 16:45:02 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2018/01/07 13:04:04 rillig Exp $ BUILDLINK_TREE+= kidletime @@ -7,7 +7,7 @@ KIDLETIME_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.kidletime+= kidletime>=5.18.0 BUILDLINK_ABI_DEPENDS.kidletime?= kidletime>=5.25.0nb6 -BUILDLINK_PKGSRCDIR.kidletime?= ../../devel/kidletime +BUILDLINK_PKGSRCDIR.kidletime?= ../../devel/kidletime .include "../../x11/libXScrnSaver/buildlink3.mk" .include "../../x11/qt5-qtbase/buildlink3.mk" diff --git a/devel/kpackage/buildlink3.mk b/devel/kpackage/buildlink3.mk index a7538ef5df9..493409d3cb7 100644 --- a/devel/kpackage/buildlink3.mk +++ b/devel/kpackage/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2017/11/30 16:45:02 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2018/01/07 13:04:04 rillig Exp $ BUILDLINK_TREE+= kpackage @@ -7,7 +7,7 @@ KPACKAGE_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.kpackage+= kpackage>=5.19.0 BUILDLINK_ABI_DEPENDS.kpackage?= kpackage>=5.25.0nb10 -BUILDLINK_PKGSRCDIR.kpackage?= ../../devel/kpackage +BUILDLINK_PKGSRCDIR.kpackage?= ../../devel/kpackage .include "../../archivers/karchive/buildlink3.mk" .include "../../devel/kconfig/buildlink3.mk" diff --git a/devel/kservice/buildlink3.mk b/devel/kservice/buildlink3.mk index 11a0411a91a..04da54fd5ae 100644 --- a/devel/kservice/buildlink3.mk +++ b/devel/kservice/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2017/11/30 16:45:03 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2018/01/07 13:04:05 rillig Exp $ BUILDLINK_TREE+= kservice @@ -7,7 +7,7 @@ KSERVICE_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.kservice+= kservice>=5.18.0 BUILDLINK_ABI_DEPENDS.kservice?= kservice>=5.25.0nb6 -BUILDLINK_PKGSRCDIR.kservice?= ../../devel/kservice +BUILDLINK_PKGSRCDIR.kservice?= ../../devel/kservice .include "../../devel/kconfig/buildlink3.mk" .include "../../devel/kcrash/buildlink3.mk" diff --git a/devel/libFoundation/buildlink3.mk b/devel/libFoundation/buildlink3.mk index ea36ab021ba..dd2c617bd6c 100644 --- a/devel/libFoundation/buildlink3.mk +++ b/devel/libFoundation/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.11 2009/06/14 22:58:00 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2018/01/07 13:04:05 rillig Exp $ BUILDLINK_TREE+= libFoundation @@ -8,13 +8,13 @@ LIBFOUNDATION_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libFoundation+= libFoundation>=1.1.7.168 BUILDLINK_PKGSRCDIR.libFoundation?= ../../devel/libFoundation -FOUNDATION_LIB?= fd -ADDITIONAL_INCLUDE_DIRS+=-I${GNUSTEP_SYSTEM_ROOT}/Library/Headers/libFoundation/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}/GNU +FOUNDATION_LIB?= fd +ADDITIONAL_INCLUDE_DIRS+= -I${GNUSTEP_SYSTEM_ROOT}/Library/Headers/libFoundation/${GNUSTEP_HOST_CPU}/${LOWER_OPSYS}/GNU .if !defined(NO_FOUNDATION_ENV) -CONFIGURE_ENV+= FOUNDATION_LIB=${FOUNDATION_LIB:Q} -CONFIGURE_ENV+= ADDITIONAL_INCLUDE_DIRS=${ADDITIONAL_INCLUDE_DIRS:Q} -MAKE_ENV+= FOUNDATION_LIB=${FOUNDATION_LIB:Q} -MAKE_ENV+= ADDITIONAL_INCLUDE_DIRS=${ADDITIONAL_INCLUDE_DIRS:Q} +CONFIGURE_ENV+= FOUNDATION_LIB=${FOUNDATION_LIB:Q} +CONFIGURE_ENV+= ADDITIONAL_INCLUDE_DIRS=${ADDITIONAL_INCLUDE_DIRS:Q} +MAKE_ENV+= FOUNDATION_LIB=${FOUNDATION_LIB:Q} +MAKE_ENV+= ADDITIONAL_INCLUDE_DIRS=${ADDITIONAL_INCLUDE_DIRS:Q} .endif .include "../../devel/gnustep-make/buildlink3.mk" diff --git a/devel/libappindicator3/buildlink3.mk b/devel/libappindicator3/buildlink3.mk index f062fcfb4d5..62755ee7168 100644 --- a/devel/libappindicator3/buildlink3.mk +++ b/devel/libappindicator3/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2017/11/23 17:19:40 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2018/01/07 13:04:05 rillig Exp $ BUILDLINK_TREE+= libappindicator3 @@ -6,7 +6,7 @@ BUILDLINK_TREE+= libappindicator3 LIBAPPINDICATOR3_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libappindicator3+= libappindicator3>=12.10.0 -BUILDLINK_ABI_DEPENDS.libappindicator3?= libappindicator3>=12.10.0nb4 +BUILDLINK_ABI_DEPENDS.libappindicator3?= libappindicator3>=12.10.0nb4 BUILDLINK_PKGSRCDIR.libappindicator3?= ../../devel/libappindicator3 .include "../../devel/libindicator3/buildlink3.mk" diff --git a/devel/libbonobo/buildlink3.mk b/devel/libbonobo/buildlink3.mk index 13b424bcab4..6e158594fe5 100644 --- a/devel/libbonobo/buildlink3.mk +++ b/devel/libbonobo/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.24 2012/09/15 10:04:12 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.25 2018/01/07 13:04:05 rillig Exp $ BUILDLINK_TREE+= libbonobo @@ -7,7 +7,7 @@ LIBBONOBO_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libbonobo+= libbonobo>=2.8.0 BUILDLINK_ABI_DEPENDS.libbonobo+= libbonobo>=2.32.0nb6 -BUILDLINK_PKGSRCDIR.libbonobo?= ../../devel/libbonobo +BUILDLINK_PKGSRCDIR.libbonobo?= ../../devel/libbonobo BUILDLINK_FILES.libbonobo+= share/idl/bonobo-2.0/* BUILDLINK_FILES.libbonobo+= share/idl/bonobo-activation-2.0/* diff --git a/devel/libbonoboui/buildlink3.mk b/devel/libbonoboui/buildlink3.mk index 9a324b40728..2a424abfe87 100644 --- a/devel/libbonoboui/buildlink3.mk +++ b/devel/libbonoboui/buildlink3.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.54 2017/11/23 17:19:40 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.55 2018/01/07 13:04:05 rillig Exp $ BUILDLINK_TREE+= libbonoboui .if !defined(LIBBONOBOUI_BUILDLINK3_MK) LIBBONOBOUI_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.libbonoboui+= libbonoboui>=2.8.0 +BUILDLINK_API_DEPENDS.libbonoboui+= libbonoboui>=2.8.0 BUILDLINK_ABI_DEPENDS.libbonoboui+= libbonoboui>=2.24.4nb30 BUILDLINK_PKGSRCDIR.libbonoboui?= ../../devel/libbonoboui diff --git a/devel/libdatrie/buildlink3.mk b/devel/libdatrie/buildlink3.mk index 6a20c7aa0cb..37e609f9e02 100644 --- a/devel/libdatrie/buildlink3.mk +++ b/devel/libdatrie/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2014/02/27 12:42:05 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2018/01/07 13:04:05 rillig Exp $ BUILDLINK_TREE+= libdatrie @@ -7,7 +7,7 @@ LIBDATRIE_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libdatrie+= libdatrie>=0.2.0 BUILDLINK_ABI_DEPENDS.libdatrie+= libdatrie>=0.2.7.1 -BUILDLINK_PKGSRCDIR.libdatrie?= ../../devel/libdatrie +BUILDLINK_PKGSRCDIR.libdatrie?= ../../devel/libdatrie .endif # LIBDATRIE_BUILDLINK3_MK BUILDLINK_TREE+= -libdatrie diff --git a/devel/libdnsres/buildlink3.mk b/devel/libdnsres/buildlink3.mk index 900a433e81a..3852b4a5a0c 100644 --- a/devel/libdnsres/buildlink3.mk +++ b/devel/libdnsres/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2012/05/07 01:53:23 dholland Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2018/01/07 13:04:05 rillig Exp $ BUILDLINK_TREE+= libdnsres @@ -7,7 +7,7 @@ LIBDNSRES_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libdnsres+= libdnsres>=0.1a BUILDLINK_ABI_DEPENDS.libdnsres+= libdnsres>=0.1anb4 -BUILDLINK_PKGSRCDIR.libdnsres?= ../../devel/libdnsres +BUILDLINK_PKGSRCDIR.libdnsres?= ../../devel/libdnsres .endif # LIBDNSRES_BUILDLINK3_MK BUILDLINK_TREE+= -libdnsres diff --git a/devel/libdockapp/buildlink3.mk b/devel/libdockapp/buildlink3.mk index 009dfbe1627..da22b7a7171 100644 --- a/devel/libdockapp/buildlink3.mk +++ b/devel/libdockapp/buildlink3.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:17 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2018/01/07 13:04:05 rillig Exp $ BUILDLINK_TREE+= libdockapp .if !defined(LIBDOCKAPP_BUILDLINK3_MK) LIBDOCKAPP_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.libdockapp+= libdockapp>=0.4.0 +BUILDLINK_API_DEPENDS.libdockapp+= libdockapp>=0.4.0 BUILDLINK_ABI_DEPENDS.libdockapp+= libdockapp>=0.4.0nb2 BUILDLINK_PKGSRCDIR.libdockapp?= ../../devel/libdockapp diff --git a/devel/libffcall/buildlink3.mk b/devel/libffcall/buildlink3.mk index 310731e02ea..7c3236e4343 100644 --- a/devel/libffcall/buildlink3.mk +++ b/devel/libffcall/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2017/09/10 20:00:49 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:05 rillig Exp $ BUILDLINK_TREE+= libffcall @@ -6,7 +6,7 @@ BUILDLINK_TREE+= libffcall LIBFFCALL_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libffcall+= libffcall>=2.0 -BUILDLINK_PKGSRCDIR.libffcall?= ../../devel/libffcall +BUILDLINK_PKGSRCDIR.libffcall?= ../../devel/libffcall .endif # LIBFFCALL_BUILDLINK3_MK BUILDLINK_TREE+= -libffcall diff --git a/devel/libftdi1/buildlink3.mk b/devel/libftdi1/buildlink3.mk index b8420165ae0..b74a0777ea7 100644 --- a/devel/libftdi1/buildlink3.mk +++ b/devel/libftdi1/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2013/12/03 01:40:14 mef Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:05 rillig Exp $ BUILDLINK_TREE+= libftdi1 @@ -6,7 +6,7 @@ BUILDLINK_TREE+= libftdi1 LIBFTDI1_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libftdi1+= libftdi1>=1.0 -BUILDLINK_PKGSRCDIR.libftdi1?= ../../devel/libftdi1 +BUILDLINK_PKGSRCDIR.libftdi1?= ../../devel/libftdi1 .include "../../devel/libusb/buildlink3.mk" .endif # LIBFTDI1_BUILDLINK3_MK diff --git a/devel/libgee0.6/buildlink3.mk b/devel/libgee0.6/buildlink3.mk index 822603a8125..b61c65fabd8 100644 --- a/devel/libgee0.6/buildlink3.mk +++ b/devel/libgee0.6/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2014/10/25 19:00:14 prlw1 Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:05 rillig Exp $ BUILDLINK_TREE+= libgee0.6 @@ -8,7 +8,7 @@ LIBGEE0.6_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libgee0.6+= libgee0.6>=0.5.3 BUILDLINK_ABI_DEPENDS.libgee0.6+= libgee0.6>=0.6.5nb1 BUILDLINK_ABI_DEPENDS.libgee0.6+= libgee0.6<0.8 -BUILDLINK_PKGSRCDIR.libgee0.6?= ../../devel/libgee0.6 +BUILDLINK_PKGSRCDIR.libgee0.6?= ../../devel/libgee0.6 .include "../../devel/glib2/buildlink3.mk" .endif # LIBGEE0.6_BUILDLINK3_MK diff --git a/devel/libglade/buildlink3.mk b/devel/libglade/buildlink3.mk index 3979d796615..049d837e789 100644 --- a/devel/libglade/buildlink3.mk +++ b/devel/libglade/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.40 2017/02/12 06:24:40 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.41 2018/01/07 13:04:05 rillig Exp $ BUILDLINK_TREE+= libglade @@ -7,7 +7,7 @@ LIBGLADE_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libglade+= libglade>=2.3.6 BUILDLINK_ABI_DEPENDS.libglade+= libglade>=2.6.4nb25 -BUILDLINK_PKGSRCDIR.libglade?= ../../devel/libglade +BUILDLINK_PKGSRCDIR.libglade?= ../../devel/libglade .include "../../textproc/libxml2/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/devel/libgnome/buildlink3.mk b/devel/libgnome/buildlink3.mk index ba9872337f5..d944369207b 100644 --- a/devel/libgnome/buildlink3.mk +++ b/devel/libgnome/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.54 2017/11/23 17:19:40 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.55 2018/01/07 13:04:06 rillig Exp $ BUILDLINK_TREE+= libgnome @@ -7,7 +7,7 @@ LIBGNOME_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libgnome+= libgnome>=2.8.0 BUILDLINK_ABI_DEPENDS.libgnome+= libgnome>=2.32.1nb28 -BUILDLINK_PKGSRCDIR.libgnome?= ../../devel/libgnome +BUILDLINK_PKGSRCDIR.libgnome?= ../../devel/libgnome .include "../../mk/bsd.fast.prefs.mk" diff --git a/devel/libgnomeui/buildlink3.mk b/devel/libgnomeui/buildlink3.mk index 32abc0cdeca..7a94641b015 100644 --- a/devel/libgnomeui/buildlink3.mk +++ b/devel/libgnomeui/buildlink3.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.64 2017/11/23 17:19:41 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.65 2018/01/07 13:04:06 rillig Exp $ BUILDLINK_TREE+= libgnomeui .if !defined(LIBGNOMEUI_BUILDLINK3_MK) LIBGNOMEUI_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.libgnomeui+= libgnomeui>=2.8.0 +BUILDLINK_API_DEPENDS.libgnomeui+= libgnomeui>=2.8.0 BUILDLINK_ABI_DEPENDS.libgnomeui+= libgnomeui>=2.24.5nb36 BUILDLINK_PKGSRCDIR.libgnomeui?= ../../devel/libgnomeui diff --git a/devel/libgphoto2/buildlink3.mk b/devel/libgphoto2/buildlink3.mk index 2f0f3e29016..0cb044326ce 100644 --- a/devel/libgphoto2/buildlink3.mk +++ b/devel/libgphoto2/buildlink3.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.19 2015/10/05 04:47:02 richard Exp $ +# $NetBSD: buildlink3.mk,v 1.20 2018/01/07 13:04:06 rillig Exp $ BUILDLINK_TREE+= libgphoto2 .if !defined(LIBGPHOTO2_BUILDLINK3_MK) LIBGPHOTO2_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.libgphoto2+= libgphoto2>=2.1.2 +BUILDLINK_API_DEPENDS.libgphoto2+= libgphoto2>=2.1.2 BUILDLINK_ABI_DEPENDS.libgphoto2+= libgphoto2>=2.4.7nb3 BUILDLINK_PKGSRCDIR.libgphoto2?= ../../devel/libgphoto2 diff --git a/devel/libiberty/buildlink3.mk b/devel/libiberty/buildlink3.mk index b945125dea0..909d442424a 100644 --- a/devel/libiberty/buildlink3.mk +++ b/devel/libiberty/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.9 2012/05/07 01:53:24 dholland Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2018/01/07 13:04:06 rillig Exp $ BUILDLINK_TREE+= libiberty @@ -7,8 +7,8 @@ LIBIBERTY_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libiberty+= libiberty>=1.0nb1 BUILDLINK_ABI_DEPENDS.libiberty+= libiberty>=1.0nb2 -BUILDLINK_PKGSRCDIR.libiberty?= ../../devel/libiberty -BUILDLINK_DEPMETHOD.libiberty?= build +BUILDLINK_PKGSRCDIR.libiberty?= ../../devel/libiberty +BUILDLINK_DEPMETHOD.libiberty?= build .endif # LIBIBERTY_BUILDLINK3_MK BUILDLINK_TREE+= -libiberty diff --git a/devel/libkgapi/buildlink3.mk b/devel/libkgapi/buildlink3.mk index 86f81dfb583..8bc6ffd6859 100644 --- a/devel/libkgapi/buildlink3.mk +++ b/devel/libkgapi/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2014/11/13 11:13:45 markd Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:06 rillig Exp $ BUILDLINK_TREE+= libkgapi @@ -6,7 +6,7 @@ BUILDLINK_TREE+= libkgapi LIBKGAPI_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libkgapi+= libkgapi>=2.2.0 -BUILDLINK_PKGSRCDIR.libkgapi?= ../../devel/libkgapi +BUILDLINK_PKGSRCDIR.libkgapi?= ../../devel/libkgapi .endif # LIBKGAPI_BUILDLINK3_MK diff --git a/devel/libmemmgr/buildlink3.mk b/devel/libmemmgr/buildlink3.mk index c335af4473e..aa997b1f9c2 100644 --- a/devel/libmemmgr/buildlink3.mk +++ b/devel/libmemmgr/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:24:20 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2018/01/07 13:04:06 rillig Exp $ BUILDLINK_TREE+= libmemmgr @@ -6,8 +6,8 @@ BUILDLINK_TREE+= libmemmgr LIBMEMMGR_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libmemmgr+= libmemmgr>=1.04 -BUILDLINK_PKGSRCDIR.libmemmgr?= ../../devel/libmemmgr -BUILDLINK_DEPMETHOD.libmemmgr?= build +BUILDLINK_PKGSRCDIR.libmemmgr?= ../../devel/libmemmgr +BUILDLINK_DEPMETHOD.libmemmgr?= build .include "../../devel/libetm/buildlink3.mk" .endif # LIBMEMMGR_BUILDLINK3_MK diff --git a/devel/libosip/buildlink3.mk b/devel/libosip/buildlink3.mk index aaec5b23e10..c06c9dadbfb 100644 --- a/devel/libosip/buildlink3.mk +++ b/devel/libosip/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.12 2011/12/19 13:04:45 schwarz Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2018/01/07 13:04:06 rillig Exp $ BUILDLINK_TREE+= libosip2 @@ -7,7 +7,7 @@ LIBOSIP2_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libosip2+= libosip2>=3.6.0 BUILDLINK_ABI_DEPENDS.libosip2+= libosip2>=3.6.0 -BUILDLINK_PKGSRCDIR.libosip2?= ../../devel/libosip +BUILDLINK_PKGSRCDIR.libosip2?= ../../devel/libosip .endif # LIBOSIP2_BUILDLINK3_MK BUILDLINK_TREE+= -libosip2 diff --git a/devel/libproplist/buildlink3.mk b/devel/libproplist/buildlink3.mk index 0696aa27191..10e49e2b088 100644 --- a/devel/libproplist/buildlink3.mk +++ b/devel/libproplist/buildlink3.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:21 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2018/01/07 13:04:06 rillig Exp $ BUILDLINK_TREE+= libproplist .if !defined(LIBPROPLIST_BUILDLINK3_MK) LIBPROPLIST_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.libproplist+= libproplist>=0.10.1 +BUILDLINK_API_DEPENDS.libproplist+= libproplist>=0.10.1 BUILDLINK_ABI_DEPENDS.libproplist+= libproplist>=0.10.1nb1 BUILDLINK_PKGSRCDIR.libproplist?= ../../devel/libproplist .endif # LIBPROPLIST_BUILDLINK3_MK diff --git a/devel/librfuncs/buildlink3.mk b/devel/librfuncs/buildlink3.mk index 3913dede324..395bbbc6dbf 100644 --- a/devel/librfuncs/buildlink3.mk +++ b/devel/librfuncs/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.11 2010/08/30 17:27:11 drochner Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2018/01/07 13:04:06 rillig Exp $ BUILDLINK_TREE+= librfuncs @@ -6,7 +6,7 @@ BUILDLINK_TREE+= librfuncs LIBRFUNCS_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.librfuncs+= librfuncs>=1.0.4 -BUILDLINK_PKGSRCDIR.librfuncs?= ../../devel/librfuncs +BUILDLINK_PKGSRCDIR.librfuncs?= ../../devel/librfuncs .endif # LIBRFUNCS_BUILDLINK3_MK BUILDLINK_TREE+= -librfuncs diff --git a/devel/libsexymm/buildlink3.mk b/devel/libsexymm/buildlink3.mk index dbc5b1cd9a3..b1b72b05d89 100644 --- a/devel/libsexymm/buildlink3.mk +++ b/devel/libsexymm/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.28 2017/02/12 06:24:41 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.29 2018/01/07 13:04:06 rillig Exp $ BUILDLINK_TREE+= libsexymm @@ -7,7 +7,7 @@ LIBSEXYMM_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libsexymm+= libsexymm>=0.1.9 BUILDLINK_ABI_DEPENDS.libsexymm+= libsexymm>=0.1.9nb26 -BUILDLINK_PKGSRCDIR.libsexymm?= ../../devel/libsexymm +BUILDLINK_PKGSRCDIR.libsexymm?= ../../devel/libsexymm .include "../../x11/gtkmm/buildlink3.mk" .include "../../devel/libsexy/buildlink3.mk" diff --git a/devel/libslang/buildlink3.mk b/devel/libslang/buildlink3.mk index 835fa12495c..454fb95d844 100644 --- a/devel/libslang/buildlink3.mk +++ b/devel/libslang/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.18 2009/03/20 19:24:22 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.19 2018/01/07 13:04:06 rillig Exp $ BUILDLINK_TREE+= libslang @@ -7,7 +7,7 @@ LIBSLANG_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libslang+= libslang>=1.4.9nb1 BUILDLINK_ABI_DEPENDS.libslang+= libslang>=1.4.9nb4 -BUILDLINK_PKGSRCDIR.libslang?= ../../devel/libslang +BUILDLINK_PKGSRCDIR.libslang?= ../../devel/libslang .endif # LIBSLANG_BUILDLINK3_MK BUILDLINK_TREE+= -libslang diff --git a/devel/libslang2/buildlink3.mk b/devel/libslang2/buildlink3.mk index 7165eb00b45..adcd85ffafe 100644 --- a/devel/libslang2/buildlink3.mk +++ b/devel/libslang2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.8 2013/02/16 11:17:57 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2018/01/07 13:04:07 rillig Exp $ BUILDLINK_TREE+= libslang2 @@ -11,7 +11,7 @@ BUILDLINK_PKGSRCDIR.libslang2?= ../../devel/libslang2 BUILDLINK_FNAME_TRANSFORM.libslang2+= -e 's|include/slang2/|include/|g' BUILDLINK_TRANSFORM+= l:slang:slang2 pkgbase:= libslang2 -. include "../../mk/pkg-build-options.mk" +.include "../../mk/pkg-build-options.mk" .if !empty(PKG_BUILD_OPTIONS.libslang2:Mpng) . include "../../graphics/png/buildlink3.mk" diff --git a/devel/libstroke/buildlink3.mk b/devel/libstroke/buildlink3.mk index 3469b6b235a..caed11b5175 100644 --- a/devel/libstroke/buildlink3.mk +++ b/devel/libstroke/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.14 2012/08/22 20:39:48 drochner Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2018/01/07 13:04:07 rillig Exp $ BUILDLINK_TREE+= libstroke @@ -7,7 +7,7 @@ LIBSTROKE_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libstroke+= libstroke>=0.5.1 BUILDLINK_ABI_DEPENDS.libstroke+= libstroke>=0.5.1nb4 -BUILDLINK_PKGSRCDIR.libstroke?= ../../devel/libstroke +BUILDLINK_PKGSRCDIR.libstroke?= ../../devel/libstroke .endif # LIBSTROKE_BUILDLINK3_MK diff --git a/devel/libtecla/buildlink3.mk b/devel/libtecla/buildlink3.mk index 5fe85c019ae..03bc3a1f637 100644 --- a/devel/libtecla/buildlink3.mk +++ b/devel/libtecla/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.8 2012/05/07 01:53:25 dholland Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2018/01/07 13:04:07 rillig Exp $ BUILDLINK_TREE+= libtecla @@ -7,7 +7,7 @@ LIBTECLA_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libtecla+= libtecla>=1.5.0 BUILDLINK_ABI_DEPENDS.libtecla+= libtecla>=1.6.1nb1 -BUILDLINK_PKGSRCDIR.libtecla?= ../../devel/libtecla +BUILDLINK_PKGSRCDIR.libtecla?= ../../devel/libtecla .endif # LIBTECLA_BUILDLINK3_MK BUILDLINK_TREE+= -libtecla diff --git a/devel/libwnck3/buildlink3.mk b/devel/libwnck3/buildlink3.mk index 1adf6aaf6c2..0b78141eba2 100644 --- a/devel/libwnck3/buildlink3.mk +++ b/devel/libwnck3/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.14 2017/11/23 17:19:41 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2018/01/07 13:04:07 rillig Exp $ BUILDLINK_TREE+= libwnck3 @@ -7,7 +7,7 @@ LIBWNCK3_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libwnck3+= libwnck3>=3.2.1 BUILDLINK_ABI_DEPENDS.libwnck3?= libwnck3>=3.24.1nb1 -BUILDLINK_PKGSRCDIR.libwnck3?= ../../devel/libwnck3 +BUILDLINK_PKGSRCDIR.libwnck3?= ../../devel/libwnck3 .include "../../devel/gettext-lib/buildlink3.mk" .include "../../x11/gtk3/buildlink3.mk" diff --git a/devel/linenoise/buildlink3.mk b/devel/linenoise/buildlink3.mk index c81a76c4587..9446d214928 100644 --- a/devel/linenoise/buildlink3.mk +++ b/devel/linenoise/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2016/09/18 16:47:55 kamil Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:07 rillig Exp $ BUILDLINK_TREE+= linenoise @@ -6,7 +6,7 @@ BUILDLINK_TREE+= linenoise LINENOISE_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.linenoise+= linenoise>=1.0 -BUILDLINK_PKGSRCDIR.linenoise?= ../../devel/linenoise +BUILDLINK_PKGSRCDIR.linenoise?= ../../devel/linenoise .endif # LINENOISE_BUILDLINK3_MK BUILDLINK_TREE+= -linenoise diff --git a/devel/log4cplus/buildlink3.mk b/devel/log4cplus/buildlink3.mk index 186b4df0acc..98fe1120fdc 100644 --- a/devel/log4cplus/buildlink3.mk +++ b/devel/log4cplus/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2013/07/02 08:59:03 sno Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:07 rillig Exp $ BUILDLINK_TREE+= log4cplus @@ -6,7 +6,7 @@ BUILDLINK_TREE+= log4cplus LOG4CPLUS_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.log4cplus+= log4cplus>=1.1.0 -BUILDLINK_PKGSRCDIR.log4cplus?= ../../devel/log4cplus +BUILDLINK_PKGSRCDIR.log4cplus?= ../../devel/log4cplus .endif # LOG4CPLUS_BUILDLINK3_MK BUILDLINK_TREE+= -log4cplus diff --git a/devel/log4shib/buildlink3.mk b/devel/log4shib/buildlink3.mk index 5dcfa6f03ce..2b734ddfd5e 100644 --- a/devel/log4shib/buildlink3.mk +++ b/devel/log4shib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2010/03/15 08:18:53 pettai Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:07 rillig Exp $ # BUILDLINK_TREE+= log4shib @@ -7,7 +7,7 @@ BUILDLINK_TREE+= log4shib LOG4SHIB_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.log4shib+= log4shib>=1.0.4 -BUILDLINK_PKGSRCDIR.log4shib?= ../../devel/log4shib +BUILDLINK_PKGSRCDIR.log4shib?= ../../devel/log4shib .endif # LOG4SHIB_BUILDLINK3_MK BUILDLINK_TREE+= -log4shib diff --git a/devel/m17n-lib/buildlink3.mk b/devel/m17n-lib/buildlink3.mk index 1acc95971bd..d56dba9c31c 100644 --- a/devel/m17n-lib/buildlink3.mk +++ b/devel/m17n-lib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.21 2017/02/28 15:19:59 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.22 2018/01/07 13:04:07 rillig Exp $ BUILDLINK_TREE+= m17n-lib @@ -7,7 +7,7 @@ M17N_LIB_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.m17n-lib+= m17n-lib>=1.5.1 BUILDLINK_ABI_DEPENDS.m17n-lib+= m17n-lib>=1.7.0nb5 -BUILDLINK_PKGSRCDIR.m17n-lib?= ../../devel/m17n-lib +BUILDLINK_PKGSRCDIR.m17n-lib?= ../../devel/m17n-lib pkgbase := m17n-lib .include "../../mk/pkg-build-options.mk" diff --git a/devel/mell/buildlink3.mk b/devel/mell/buildlink3.mk index 767af3c1701..bb292ca2fd6 100644 --- a/devel/mell/buildlink3.mk +++ b/devel/mell/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:24 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:07 rillig Exp $ .include "../../editors/emacs/modules.mk" @@ -10,7 +10,7 @@ MELL_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.mell+= ${EMACS_PKGNAME_PREFIX}mell>=1.0.0 BUILDLINK_PKGSRCDIR.mell?= ../../devel/mell -BUILDLINK_CONTENTS_FILTER.mell= ${EGREP} '.*\.el$$|.*\.elc$$' +BUILDLINK_CONTENTS_FILTER.mell= ${EGREP} '.*\.el$$|.*\.elc$$' .endif # MELL_BUILDLINK3_MK BUILDLINK_TREE+= -mell diff --git a/devel/mm-common/buildlink3.mk b/devel/mm-common/buildlink3.mk index a2bfc290b04..50b499e8b1d 100644 --- a/devel/mm-common/buildlink3.mk +++ b/devel/mm-common/buildlink3.mk @@ -1,14 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.1 2013/07/07 15:04:28 rodent Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:07 rillig Exp $ BUILDLINK_TREE+= mm-common .if !defined(MM_COMMON_BUILDLINK3_MK) MM_COMMON_BUILDLINK3_MK:= -BUILDLINK_DEPMETHOD.mm-common?= build +BUILDLINK_DEPMETHOD.mm-common?= build BUILDLINK_API_DEPENDS.mm-common+= mm-common>=0.9.6 -BUILDLINK_PKGSRCDIR.mm-common?= ../../devel/mm-common +BUILDLINK_PKGSRCDIR.mm-common?= ../../devel/mm-common .endif # MM_COMMON_BUILDLINK3_MK BUILDLINK_TREE+= -mm-common diff --git a/devel/ncurses/buildlink3.mk b/devel/ncurses/buildlink3.mk index b7fe07f59bd..3d1d0ab2186 100644 --- a/devel/ncurses/buildlink3.mk +++ b/devel/ncurses/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.46 2015/08/17 17:10:31 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.47 2018/01/07 13:04:07 rillig Exp $ BUILDLINK_TREE+= ncurses @@ -26,15 +26,15 @@ BUILDLINK_INCDIRS.ncurses+= include/ncurses # a native library), so unless this file is being included by ncursesw # don't allow ncursesw to be used by causing linkage failure. # -. include "../../mk/bsd.fast.prefs.mk" -. if !empty(PKGPATH:Mdevel/ncursesw) +.include "../../mk/bsd.fast.prefs.mk" +.if !empty(PKGPATH:Mdevel/ncursesw) BUILDLINK_TRANSFORM+= l:curses:${BUILDLINK_LIBNAME.ncurses} -. elif empty(BUILDLINK_TREE:Mncursesw) +.elif empty(BUILDLINK_TREE:Mncursesw) BUILDLINK_TRANSFORM+= l:ncursesw:__nonexistent__ BUILDLINK_TRANSFORM+= l:curses:${BUILDLINK_LIBNAME.ncurses} -. else +.else BUILDLINK_TRANSFORM+= l:curses:${BUILDLINK_LIBNAME.ncursesw} -. endif +.endif .PHONY: buildlink-ncurses-curses-h buildlink-ncurses-ncurses-h .PHONY: buildlink-ncurses-term-h diff --git a/devel/ncursesw/buildlink3.mk b/devel/ncursesw/buildlink3.mk index 0c4c4ed2955..ba3de926656 100644 --- a/devel/ncursesw/buildlink3.mk +++ b/devel/ncursesw/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2015/08/17 17:10:32 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2018/01/07 13:04:07 rillig Exp $ BUILDLINK_TREE+= ncursesw @@ -13,18 +13,18 @@ BUILDLINK_LIBNAME.ncursesw= ncursesw BUILDLINK_LDADD.ncursesw= ${BUILDLINK_LIBNAME.ncursesw:S/^/-l/:S/^-l$//} CHECK_BUILTIN.ncursesw:= yes -. include "builtin.mk" +.include "builtin.mk" CHECK_BUILTIN.ncursesw:= no -. if defined(IS_BUILTIN.ncursesw) && !empty(IS_BUILTIN.ncursesw:M[nN][oO]) +.if defined(IS_BUILTIN.ncursesw) && !empty(IS_BUILTIN.ncursesw:M[nN][oO]) PKG_BUILD_DEPENDS.ncurses!= \ echo ""; \ ${PKG_INFO} -qn ncursesw 2> /dev/null \ || { cd ../../devel/ncursesw && ${MAKE} ${MAKEFLAGS} show-depends; } -. for d in ${PKG_BUILD_DEPENDS.ncurses:Mncurses[-><]*} +. for d in ${PKG_BUILD_DEPENDS.ncurses:Mncurses[-><]*} BUILDLINK_API_DEPENDS.ncurses+= ${d} -. endfor +. endfor USE_NCURSES= yes -. endif +.endif .include "../../devel/ncurses/buildlink3.mk" .endif # NCURSESW_BUILDLINK3_MK diff --git a/devel/netbsd-iscsi-lib/buildlink3.mk b/devel/netbsd-iscsi-lib/buildlink3.mk index bc9c43e988a..0186b6858f1 100644 --- a/devel/netbsd-iscsi-lib/buildlink3.mk +++ b/devel/netbsd-iscsi-lib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2011/10/06 14:19:25 sborrill Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:08 rillig Exp $ BUILDLINK_TREE+= netbsd-iscsi-lib @@ -7,7 +7,7 @@ NETBSD_ISCSI_LIB_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.netbsd-iscsi-lib+= netbsd-iscsi-lib>=20111006 BUILDLINK_ABI_DEPENDS.netbsd-iscsi-lib+= netbsd-iscsi-lib>=20111006 -BUILDLINK_PKGSRCDIR.netbsd-iscsi-lib?= ../../devel/netbsd-iscsi-lib +BUILDLINK_PKGSRCDIR.netbsd-iscsi-lib?= ../../devel/netbsd-iscsi-lib .endif # NETBSD_ISCSI_LIB_BUILDLINK3_MK BUILDLINK_TREE+= -netbsd-iscsi-lib diff --git a/devel/npapi-sdk/buildlink3.mk b/devel/npapi-sdk/buildlink3.mk index 122a8c6bfd7..2c92e76980e 100644 --- a/devel/npapi-sdk/buildlink3.mk +++ b/devel/npapi-sdk/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2011/12/17 14:11:07 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:08 rillig Exp $ # BUILDLINK_TREE+= npapi-sdk @@ -6,9 +6,9 @@ BUILDLINK_TREE+= npapi-sdk .if !defined(NPAPI_SDK_BUILDLINK3_MK) NPAPI_SDK_BUILDLINK3_MK:= -BUILDLINK_DEPMETHOD.npapi-sdk?= build +BUILDLINK_DEPMETHOD.npapi-sdk?= build BUILDLINK_API_DEPENDS.npapi-sdk+= npapi-sdk>=0.27 -BUILDLINK_PKGSRCDIR.npapi-sdk?= ../../devel/npapi-sdk +BUILDLINK_PKGSRCDIR.npapi-sdk?= ../../devel/npapi-sdk .endif # NPAPI_SDK_BUILDLINK3_MK BUILDLINK_TREE+= -npapi-sdk diff --git a/devel/nspr/buildlink3.mk b/devel/nspr/buildlink3.mk index 59a11d280c8..5dc5f55ca8a 100644 --- a/devel/nspr/buildlink3.mk +++ b/devel/nspr/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.24 2014/10/13 09:14:29 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.25 2018/01/07 13:04:08 rillig Exp $ BUILDLINK_TREE+= nspr @@ -8,9 +8,9 @@ NSPR_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.nspr+= nspr>=4.9.3.2 BUILDLINK_PKGSRCDIR.nspr?= ../../devel/nspr -BUILDLINK_FILES.nspr+= lib/nspr/* -BUILDLINK_FILES.nspr+= include/nspr/* -BUILDLINK_FILES.nspr+= include/nspr/obsolete/* +BUILDLINK_FILES.nspr+= lib/nspr/* +BUILDLINK_FILES.nspr+= include/nspr/* +BUILDLINK_FILES.nspr+= include/nspr/obsolete/* BUILDLINK_LIBDIRS.nspr+= lib/nspr BUILDLINK_RPATHDIRS.nspr+= lib/nspr diff --git a/devel/nss/buildlink3.mk b/devel/nss/buildlink3.mk index 825ed350333..f41fccff9a0 100644 --- a/devel/nss/buildlink3.mk +++ b/devel/nss/buildlink3.mk @@ -1,4 +1,5 @@ -# $NetBSD: buildlink3.mk,v 1.20 2013/09/14 10:29:22 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.21 2018/01/07 13:04:08 rillig Exp $ + BUILDLINK_TREE+= nss .if !defined(NSS_BUILDLINK3_MK) diff --git a/devel/ocaml-findlib/buildlink3.mk b/devel/ocaml-findlib/buildlink3.mk index 3cbe03685a9..a392f408c52 100644 --- a/devel/ocaml-findlib/buildlink3.mk +++ b/devel/ocaml-findlib/buildlink3.mk @@ -1,12 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.7 2017/07/11 09:57:11 jaapb Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2018/01/07 13:04:08 rillig Exp $ BUILDLINK_TREE+= ocaml-findlib .if !defined(OCAML_FINDLIB_BUILDLINK3_MK) OCAML_FINDLIB_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.ocaml-findlib+=ocaml-findlib>=1.2 -BUILDLINK_ABI_DEPENDS.ocaml-findlib+=ocaml-findlib>=1.7.3 +BUILDLINK_API_DEPENDS.ocaml-findlib+= ocaml-findlib>=1.2 +BUILDLINK_ABI_DEPENDS.ocaml-findlib+= ocaml-findlib>=1.7.3 BUILDLINK_PKGSRCDIR.ocaml-findlib?= ../../devel/ocaml-findlib BUILDLINK_TARGETS+= ocaml-findlib-wrappers ocaml-findlib-ldconf diff --git a/devel/ocaml-lwt/buildlink3.mk b/devel/ocaml-lwt/buildlink3.mk index 679f714bc95..3759a9bf98d 100644 --- a/devel/ocaml-lwt/buildlink3.mk +++ b/devel/ocaml-lwt/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2017/09/08 16:54:31 jaapb Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2018/01/07 13:04:08 rillig Exp $ BUILDLINK_TREE+= ocaml-lwt @@ -7,7 +7,7 @@ OCAML_LWT_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ocaml-lwt+= ocaml-lwt>=3.0.0 BUILDLINK_ABI_DEPENDS.ocaml-lwt+= ocaml-lwt>=3.1.0nb1 -BUILDLINK_PKGSRCDIR.ocaml-lwt?= ../../devel/ocaml-lwt +BUILDLINK_PKGSRCDIR.ocaml-lwt?= ../../devel/ocaml-lwt #.include "../../devel/libev/buildlink3.mk" .endif # OCAMLLWT_BUILDLINK3_MK diff --git a/devel/ocaml-odn/buildlink3.mk b/devel/ocaml-odn/buildlink3.mk index b642316c8c0..07b884638db 100644 --- a/devel/ocaml-odn/buildlink3.mk +++ b/devel/ocaml-odn/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.10 2017/09/08 09:51:21 jaapb Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2018/01/07 13:04:08 rillig Exp $ BUILDLINK_TREE+= ocaml-odn @@ -7,7 +7,7 @@ OCAML_ODN_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ocaml-odn+= ocaml-odn>=0.0.11 BUILDLINK_ABI_DEPENDS.ocaml-odn?= ocaml-odn>=0.0.11nb9 -BUILDLINK_PKGSRCDIR.ocaml-odn?= ../../devel/ocaml-odn +BUILDLINK_PKGSRCDIR.ocaml-odn?= ../../devel/ocaml-odn .include "../../lang/ocaml/buildlink3.mk" .endif # OCAML_ODN_BUILDLINK3_MK diff --git a/devel/ocaml-ppx_compare/buildlink3.mk b/devel/ocaml-ppx_compare/buildlink3.mk index 24cc0bd6838..8f23216a3c6 100644 --- a/devel/ocaml-ppx_compare/buildlink3.mk +++ b/devel/ocaml-ppx_compare/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2017/10/11 13:51:55 jaapb Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:08 rillig Exp $ BUILDLINK_TREE+= ocaml-ppx_compare @@ -6,7 +6,7 @@ BUILDLINK_TREE+= ocaml-ppx_compare OCAML_PPX_COMPARE_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ocaml-ppx_compare+= ocaml-ppx_compare>=0.9.0 -BUILDLINK_PKGSRCDIR.ocaml-ppx_compare?= ../../devel/ocaml-ppx_compare +BUILDLINK_PKGSRCDIR.ocaml-ppx_compare?= ../../devel/ocaml-ppx_compare .endif # OCAML_PPX_COMPARE_BUILDLINK3_MK BUILDLINK_TREE+= -ocaml-ppx_compare diff --git a/devel/ocaml-ppx_driver/buildlink3.mk b/devel/ocaml-ppx_driver/buildlink3.mk index 591c9e487b8..49a70f0c615 100644 --- a/devel/ocaml-ppx_driver/buildlink3.mk +++ b/devel/ocaml-ppx_driver/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2017/07/21 13:45:42 jaapb Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:08 rillig Exp $ BUILDLINK_TREE+= ocaml-ppx_driver @@ -7,7 +7,7 @@ OCAML_PPX_DRIVER_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ocaml-ppx_driver+= ocaml-ppx_driver>=0.9.0 BUILDLINK_ABI_DEPENDS.ocaml-ppx_driver+= ocaml-ppx_driver>=0.9.0 -BUILDLINK_PKGSRCDIR.ocaml-ppx_driver?= ../../devel/ocaml-ppx_driver +BUILDLINK_PKGSRCDIR.ocaml-ppx_driver?= ../../devel/ocaml-ppx_driver #.include "../../devel/ocaml-ppx_optcomp/buildlink3.mk" .endif # OCAML_PPX_DRIVER_BUILDLINK3_MK diff --git a/devel/ocaml-ppx_optcomp/buildlink3.mk b/devel/ocaml-ppx_optcomp/buildlink3.mk index 763b16a2ae9..84433b89cbb 100644 --- a/devel/ocaml-ppx_optcomp/buildlink3.mk +++ b/devel/ocaml-ppx_optcomp/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2017/07/21 13:34:18 jaapb Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:08 rillig Exp $ BUILDLINK_TREE+= ocaml-ppx_optcomp @@ -7,7 +7,7 @@ OCAML_PPX_OPTCOMP_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ocaml-ppx_optcomp+= ocaml-ppx_optcomp>=0.9.0 BUILDLINK_ABI_DEPENDS.ocaml-ppx_optcomp+= ocaml-ppx_optcomp>=0.9.0 -BUILDLINK_PKGSRCDIR.ocaml-ppx_optcomp?= ../../devel/ocaml-ppx_optcomp +BUILDLINK_PKGSRCDIR.ocaml-ppx_optcomp?= ../../devel/ocaml-ppx_optcomp .include "../../devel/ocaml-ppx_core/buildlink3.mk" #.include "../../devel/ocaml-ppx_tools/buildlink3.mk" diff --git a/devel/ocaml-ppx_tools_versioned/buildlink3.mk b/devel/ocaml-ppx_tools_versioned/buildlink3.mk index e9a2b601225..c2f9b0fabad 100644 --- a/devel/ocaml-ppx_tools_versioned/buildlink3.mk +++ b/devel/ocaml-ppx_tools_versioned/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2017/07/23 14:42:08 jaapb Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:08 rillig Exp $ BUILDLINK_TREE+= ocaml-ppx_tools_versioned @@ -6,7 +6,7 @@ BUILDLINK_TREE+= ocaml-ppx_tools_versioned OCAML_PPX_TOOLS_VERSIONED_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ocaml-ppx_tools_versioned+= ocaml-ppx_tools_versioned>=5.0.1 -BUILDLINK_PKGSRCDIR.ocaml-ppx_tools_versioned?= ../../devel/ocaml-ppx_tools_versioned +BUILDLINK_PKGSRCDIR.ocaml-ppx_tools_versioned?= ../../devel/ocaml-ppx_tools_versioned .endif # OCAML_PPX_TOOLS_VERSIONED_BUILDLINK3_MK BUILDLINK_TREE+= -ocaml-ppx_tools_versioned diff --git a/devel/ocaml-re/buildlink3.mk b/devel/ocaml-re/buildlink3.mk index 9153ac484dc..4a06dff1c36 100644 --- a/devel/ocaml-re/buildlink3.mk +++ b/devel/ocaml-re/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2017/09/28 09:15:24 jaapb Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2018/01/07 13:04:09 rillig Exp $ BUILDLINK_TREE+= ocaml-re @@ -7,7 +7,7 @@ OCAML_RE_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ocaml-re+= ocaml-re>=1.6.0 BUILDLINK_ABI_DEPENDS.ocaml-re+= ocaml-re>=1.7.1nb2 -BUILDLINK_PKGSRCDIR.ocaml-re?= ../../devel/ocaml-re +BUILDLINK_PKGSRCDIR.ocaml-re?= ../../devel/ocaml-re .endif # OCAML_RE_BUILDLINK3_MK BUILDLINK_TREE+= -ocaml-re diff --git a/devel/ocamlify/buildlink3.mk b/devel/ocamlify/buildlink3.mk index ed907bbd06d..df1105859f9 100644 --- a/devel/ocamlify/buildlink3.mk +++ b/devel/ocamlify/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2017/07/11 14:19:22 jaapb Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:09 rillig Exp $ BUILDLINK_TREE+= ocamlify @@ -7,7 +7,7 @@ OCAMLIFY_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ocamlify+= ocamlify>=0.0.2nb1 BUILDLINK_ABI_DEPENDS.ocamlify+= ocamlify>=0.0.2nb5 -BUILDLINK_PKGSRCDIR.ocamlify?= ../../devel/ocamlify +BUILDLINK_PKGSRCDIR.ocamlify?= ../../devel/ocamlify .endif # OCAMLIFY_BUILDLINK3_MK BUILDLINK_TREE+= -ocamlify diff --git a/devel/ocamlmod/buildlink3.mk b/devel/ocamlmod/buildlink3.mk index dcf6a19e115..e888a1c109b 100644 --- a/devel/ocamlmod/buildlink3.mk +++ b/devel/ocamlmod/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2017/07/11 14:11:14 jaapb Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:09 rillig Exp $ BUILDLINK_TREE+= ocamlmod @@ -7,7 +7,7 @@ OCAMLMOD_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ocamlmod+= ocamlmod>=0.0.7nb1 BUILDLINK_ABI_DEPENDS.ocamlmod+= ocamlmod>=0.0.8 -BUILDLINK_PKGSRCDIR.ocamlmod?= ../../devel/ocamlmod +BUILDLINK_PKGSRCDIR.ocamlmod?= ../../devel/ocamlmod .endif # OCAMLMOD_BUILDLINK3_MK BUILDLINK_TREE+= -ocamlmod diff --git a/devel/p5-B-Hooks-OP-Annotation/buildlink3.mk b/devel/p5-B-Hooks-OP-Annotation/buildlink3.mk index d931885c987..b1ed2ee47e9 100644 --- a/devel/p5-B-Hooks-OP-Annotation/buildlink3.mk +++ b/devel/p5-B-Hooks-OP-Annotation/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2017/06/05 14:22:36 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2018/01/07 13:04:09 rillig Exp $ BUILDLINK_TREE+= p5-B-Hooks-OP-Annotation @@ -7,8 +7,8 @@ P5_B_HOOKS_OP_ANNOTATION_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.p5-B-Hooks-OP-Annotation+= p5-B-Hooks-OP-Annotation>=0.43 BUILDLINK_ABI_DEPENDS.p5-B-Hooks-OP-Annotation?= p5-B-Hooks-OP-Annotation>=0.44nb7 -BUILDLINK_PKGSRCDIR.p5-B-Hooks-OP-Annotation?= ../../devel/p5-B-Hooks-OP-Annotation -BUILDLINK_INCDIRS.p5-B-Hooks-OP-Annotation?= ${PERL5_SUB_INSTALLVENDORARCH}/B/Hooks/OP/Annotation +BUILDLINK_PKGSRCDIR.p5-B-Hooks-OP-Annotation?= ../../devel/p5-B-Hooks-OP-Annotation +BUILDLINK_INCDIRS.p5-B-Hooks-OP-Annotation?= ${PERL5_SUB_INSTALLVENDORARCH}/B/Hooks/OP/Annotation BUILDLINK_CONTENTS_FILTER.p5-B-Hooks-OP-Annotation?= ${GREP} '${PERL5_SUB_INSTALLVENDORARCH}/B/Hooks/OP/Annotation' .include "../../lang/perl5/buildlink3.mk" diff --git a/devel/p5-B-Hooks-OP-Check-EntersubForCV/buildlink3.mk b/devel/p5-B-Hooks-OP-Check-EntersubForCV/buildlink3.mk index 6e8c03e3d6a..97a4d890ebd 100644 --- a/devel/p5-B-Hooks-OP-Check-EntersubForCV/buildlink3.mk +++ b/devel/p5-B-Hooks-OP-Check-EntersubForCV/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2011/11/15 16:05:35 sno Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:09 rillig Exp $ BUILDLINK_TREE+= p5-B-Hooks-OP-Check-EntersubForCV @@ -6,7 +6,7 @@ BUILDLINK_TREE+= p5-B-Hooks-OP-Check-EntersubForCV P5_B_HOOKS_OP_CHECK_ENTERSUBFORCV_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.p5-B-Hooks-OP-Check-EntersubForCV+= p5-B-Hooks-OP-Check-EntersubForCV>=0.08 -BUILDLINK_PKGSRCDIR.p5-B-Hooks-OP-Check-EntersubForCV?= ../../devel/p5-B-Hooks-OP-Check-EntersubForCV +BUILDLINK_PKGSRCDIR.p5-B-Hooks-OP-Check-EntersubForCV?= ../../devel/p5-B-Hooks-OP-Check-EntersubForCV .endif # P5_B_HOOKS_OP_CHECK_ENTERSUBFORCV_BUILDLINK3_MK BUILDLINK_TREE+= -p5-B-Hooks-OP-Check-EntersubForCV diff --git a/devel/p5-B-Hooks-Parser/buildlink3.mk b/devel/p5-B-Hooks-Parser/buildlink3.mk index 6a2440a1e53..9642a26828f 100644 --- a/devel/p5-B-Hooks-Parser/buildlink3.mk +++ b/devel/p5-B-Hooks-Parser/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2009/10/19 10:14:52 abs Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:09 rillig Exp $ BUILDLINK_TREE+= p5-B-Hooks-Parser @@ -6,7 +6,7 @@ BUILDLINK_TREE+= p5-B-Hooks-Parser P5_B_HOOKS_PARSER_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.p5-B-Hooks-Parser+= p5-B-Hooks-Parser>=0.08 -BUILDLINK_PKGSRCDIR.p5-B-Hooks-Parser?= ../../devel/p5-B-Hooks-Parser +BUILDLINK_PKGSRCDIR.p5-B-Hooks-Parser?= ../../devel/p5-B-Hooks-Parser .endif # P5_B_HOOKS_PARSER_BUILDLINK3_MK BUILDLINK_TREE+= -p5-B-Hooks-Parser diff --git a/devel/p5-Event/buildlink3.mk b/devel/p5-Event/buildlink3.mk index 3a4cd996931..5a225021068 100644 --- a/devel/p5-Event/buildlink3.mk +++ b/devel/p5-Event/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2017/06/05 14:22:55 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2018/01/07 13:04:09 rillig Exp $ BUILDLINK_TREE+= p5-Event @@ -7,7 +7,7 @@ P5_EVENT_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.p5-Event+= p5-Event>=1.13 BUILDLINK_ABI_DEPENDS.p5-Event?= p5-Event>=1.26nb2 -BUILDLINK_PKGSRCDIR.p5-Event?= ../../devel/p5-Event +BUILDLINK_PKGSRCDIR.p5-Event?= ../../devel/p5-Event .include "../../lang/perl5/buildlink3.mk" .endif # P5_EVENT_BUILDLINK3_MK diff --git a/devel/p5-glib2/buildlink3.mk b/devel/p5-glib2/buildlink3.mk index e3c228a3f04..55d7076c522 100644 --- a/devel/p5-glib2/buildlink3.mk +++ b/devel/p5-glib2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.15 2012/09/15 10:04:18 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.16 2018/01/07 13:04:09 rillig Exp $ BUILDLINK_TREE+= p5-glib2 @@ -7,7 +7,7 @@ P5_GLIB2_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.p5-glib2+= p5-glib2>=1.103 BUILDLINK_ABI_DEPENDS.p5-glib2+= p5-glib2>=1.262nb1 -BUILDLINK_PKGSRCDIR.p5-glib2?= ../../devel/p5-glib2 +BUILDLINK_PKGSRCDIR.p5-glib2?= ../../devel/p5-glib2 .include "../../devel/glib2/buildlink3.mk" .endif # P5_GLIB2_BUILDLINK3_MK diff --git a/devel/p5-pango/buildlink3.mk b/devel/p5-pango/buildlink3.mk index 76c982b652d..9e728862f4e 100644 --- a/devel/p5-pango/buildlink3.mk +++ b/devel/p5-pango/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.23 2017/02/12 06:24:41 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.24 2018/01/07 13:04:09 rillig Exp $ BUILDLINK_TREE+= p5-pango @@ -6,7 +6,7 @@ BUILDLINK_TREE+= p5-pango P5_PANGO_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.p5-pango+= p5-pango>=1.200 -BUILDLINK_ABI_DEPENDS.p5-pango+= p5-pango>=1.227nb2 +BUILDLINK_ABI_DEPENDS.p5-pango+= p5-pango>=1.227nb2 BUILDLINK_PKGSRCDIR.p5-pango?= ../../devel/p5-pango .include "../../devel/pango/buildlink3.mk" diff --git a/devel/pdcurses/buildlink3.mk b/devel/pdcurses/buildlink3.mk index 18f95abbe42..62c783d4db7 100644 --- a/devel/pdcurses/buildlink3.mk +++ b/devel/pdcurses/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2015/08/18 07:31:00 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2018/01/07 13:04:09 rillig Exp $ BUILDLINK_TREE+= pdcurses @@ -6,7 +6,7 @@ BUILDLINK_TREE+= pdcurses PDCURSES_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.pdcurses+= pdcurses>=3.3 -BUILDLINK_ABI_DEPENDS.pdcurses?= pdcurses>=3.3nb2 +BUILDLINK_ABI_DEPENDS.pdcurses?= pdcurses>=3.3nb2 BUILDLINK_PKGSRCDIR.pdcurses?= ../../devel/pdcurses BUILDLINK_LIBNAME.pdcurses= XCurses @@ -15,10 +15,10 @@ BUILDLINK_LDADD.pdcurses?= ${BUILDLINK_LIBNAME.pdcurses:S/^/-l/:S/^-l$//} # _PKG_USE_CURSES is defined by curses.buildlink3.mk to indicate that # the headers and libraries should be usable as <curses.h> and -lcurses. # -. if defined(_PKG_USE_CURSES) +.if defined(_PKG_USE_CURSES) BUILDLINK_INCDIRS.pdcurses+= include/xcurses -BUILDLINK_TRANSFORM+= l:curses:XCurses -. endif +BUILDLINK_TRANSFORM+= l:curses:XCurses +.endif .include "../../mk/xaw.buildlink3.mk" diff --git a/devel/protobuf/buildlink3.mk b/devel/protobuf/buildlink3.mk index 16c97446c19..8f7dbe898de 100644 --- a/devel/protobuf/buildlink3.mk +++ b/devel/protobuf/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2016/08/06 11:40:14 kamil Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:09 rillig Exp $ BUILDLINK_TREE+= protobuf @@ -6,7 +6,7 @@ BUILDLINK_TREE+= protobuf PROTOBUF_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.protobuf+= protobuf>=3.0.0 -BUILDLINK_PKGSRCDIR.protobuf?= ../../devel/protobuf +BUILDLINK_PKGSRCDIR.protobuf?= ../../devel/protobuf .include "../../devel/zlib/buildlink3.mk" .endif # PROTOBUF_BUILDLINK3_MK diff --git a/devel/pstreams/buildlink3.mk b/devel/pstreams/buildlink3.mk index dd57deeacb9..e907c51792e 100644 --- a/devel/pstreams/buildlink3.mk +++ b/devel/pstreams/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2011/10/29 10:39:31 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:09 rillig Exp $ BUILDLINK_TREE+= pstreams @@ -8,7 +8,7 @@ PSTREAMS_BUILDLINK3_MK:= BUILDLINK_DEPMETHOD.pstreams?= build BUILDLINK_API_DEPENDS.pstreams+= pstreams>=0.7.0 -BUILDLINK_PKGSRCDIR.pstreams?= ../../devel/pstreams +BUILDLINK_PKGSRCDIR.pstreams?= ../../devel/pstreams .endif # PSTREAMS_BUILDLINK3_MK BUILDLINK_TREE+= -pstreams diff --git a/devel/pth/buildlink3.mk b/devel/pth/buildlink3.mk index 96777273156..85c05baa2fc 100644 --- a/devel/pth/buildlink3.mk +++ b/devel/pth/buildlink3.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.11 2011/09/14 16:52:19 hans Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2018/01/07 13:04:10 rillig Exp $ BUILDLINK_TREE+= pth .if !defined(PTH_BUILDLINK3_MK) PTH_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.pth+= pth>=2.0.0 +BUILDLINK_API_DEPENDS.pth+= pth>=2.0.0 BUILDLINK_ABI_DEPENDS.pth+= pth>=2.0.0nb2 BUILDLINK_PKGSRCDIR.pth?= ../../devel/pth diff --git a/devel/pthread-sem/buildlink3.mk b/devel/pthread-sem/buildlink3.mk index c49307670bf..8984d6059ef 100644 --- a/devel/pthread-sem/buildlink3.mk +++ b/devel/pthread-sem/buildlink3.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:27 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2018/01/07 13:04:10 rillig Exp $ BUILDLINK_TREE+= pthread-sem .if !defined(PTHREAD_SEM_BUILDLINK3_MK) PTHREAD_SEM_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.pthread-sem+= pthread-sem>=1.0 +BUILDLINK_API_DEPENDS.pthread-sem+= pthread-sem>=1.0 BUILDLINK_PKGSRCDIR.pthread-sem?= ../../devel/pthread-sem .endif # PTHREAD_SEM_BUILDLINK3_MK diff --git a/devel/pthread-stublib/buildlink3.mk b/devel/pthread-stublib/buildlink3.mk index 2e2b53bf0b1..c3d8647b6f1 100644 --- a/devel/pthread-stublib/buildlink3.mk +++ b/devel/pthread-stublib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2015/02/25 20:41:44 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2018/01/07 13:04:10 rillig Exp $ BUILDLINK_TREE+= pthread-stublib @@ -8,7 +8,7 @@ PTHREAD_STUBLIB_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.pthread-stublib+= pthread-stublib>=1.0 BUILDLINK_PKGSRCDIR.pthread-stublib?= ../../devel/pthread-stublib -IS_BUILTIN.pthread-stublib=no +IS_BUILTIN.pthread-stublib= no .endif # PTHREAD_STUBLIB_BUILDLINK3_MK BUILDLINK_TREE+= -pthread-stublib diff --git a/devel/ptlib/buildlink3.mk b/devel/ptlib/buildlink3.mk index d99116835a3..985a2fb8d0a 100644 --- a/devel/ptlib/buildlink3.mk +++ b/devel/ptlib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.15 2016/03/05 11:27:46 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.16 2018/01/07 13:04:10 rillig Exp $ BUILDLINK_TREE+= ptlib @@ -9,8 +9,8 @@ BUILDLINK_API_DEPENDS.ptlib+= ptlib>=2.6.1 BUILDLINK_ABI_DEPENDS.ptlib+= ptlib>=2.10.7nb10 BUILDLINK_PKGSRCDIR.ptlib?= ../../devel/ptlib -PTLIB_CONFIG?= ${BUILDLINK_PREFIX.ptlib}/bin/ptlib-config -CONFIGURE_ENV+= PTLIB_CONFIG=${PTLIB_CONFIG:Q} +PTLIB_CONFIG?= ${BUILDLINK_PREFIX.ptlib}/bin/ptlib-config +CONFIGURE_ENV+= PTLIB_CONFIG=${PTLIB_CONFIG:Q} .include "../../devel/SDL/buildlink3.mk" .include "../../databases/openldap-client/buildlink3.mk" diff --git a/devel/py-boost/buildlink3.mk b/devel/py-boost/buildlink3.mk index 40b81d28946..f2e5df1194c 100644 --- a/devel/py-boost/buildlink3.mk +++ b/devel/py-boost/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.9 2018/01/01 20:36:09 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2018/01/07 13:04:10 rillig Exp $ BUILDLINK_TREE+= py-boost @@ -10,7 +10,7 @@ PY_BOOST_BUILDLINK3_MK:= # Use a dependency pattern that guarantees the proper ABI. BUILDLINK_API_DEPENDS.py-boost+= ${PYPKGPREFIX}-boost-1.66.* BUILDLINK_ABI_DEPENDS.py-boost+= ${PYPKGPREFIX}-boost-1.66.* -BUILDLINK_PKGSRCDIR.py-boost?= ../../devel/py-boost +BUILDLINK_PKGSRCDIR.py-boost?= ../../devel/py-boost .include "../../devel/boost-headers/buildlink3.mk" .endif # PY_BOOST_BUILDLINK3_MK diff --git a/devel/py-gobject-shared/buildlink3.mk b/devel/py-gobject-shared/buildlink3.mk index fa2d630ec6d..af7188399ee 100644 --- a/devel/py-gobject-shared/buildlink3.mk +++ b/devel/py-gobject-shared/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.11 2012/09/15 10:04:19 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2018/01/07 13:04:10 rillig Exp $ BUILDLINK_TREE+= py-gobject-shared @@ -6,7 +6,7 @@ BUILDLINK_TREE+= py-gobject-shared PY_GOBJECT_SHARED_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.py-gobject-shared+= py-gobject-shared>=2.10.1 -BUILDLINK_ABI_DEPENDS.py-gobject-shared+= py-gobject-shared>=2.28.6nb5 +BUILDLINK_ABI_DEPENDS.py-gobject-shared+= py-gobject-shared>=2.28.6nb5 BUILDLINK_PKGSRCDIR.py-gobject-shared?= ../../devel/py-gobject-shared BUILDLINK_DEPMETHOD.py-gobject-shared?= build diff --git a/devel/py-gobject/buildlink3.mk b/devel/py-gobject/buildlink3.mk index de9ecec3c3d..4267a6ff1bd 100644 --- a/devel/py-gobject/buildlink3.mk +++ b/devel/py-gobject/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.13 2012/09/15 10:04:19 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2018/01/07 13:04:10 rillig Exp $ BUILDLINK_TREE+= pygobject @@ -9,7 +9,7 @@ PY_GOBJECT_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.pygobject+= ${PYPKGPREFIX}-gobject>=2.10.1nb1 BUILDLINK_ABI_DEPENDS.pygobject+= ${PYPKGPREFIX}-gobject>=2.28.6nb6 -BUILDLINK_PKGSRCDIR.pygobject?= ../../devel/py-gobject +BUILDLINK_PKGSRCDIR.pygobject?= ../../devel/py-gobject .include "../../devel/py-gobject-shared/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" diff --git a/devel/qtscriptgenerator/buildlink3.mk b/devel/qtscriptgenerator/buildlink3.mk index db3bb2489a3..c2ca8d3a22f 100644 --- a/devel/qtscriptgenerator/buildlink3.mk +++ b/devel/qtscriptgenerator/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.24 2016/03/05 11:27:46 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.25 2018/01/07 13:04:10 rillig Exp $ BUILDLINK_TREE+= qtscriptgenerator @@ -7,7 +7,7 @@ QTSCRIPTGENERATOR_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.qtscriptgenerator+= qtscriptgenerator>=0.1.0 BUILDLINK_ABI_DEPENDS.qtscriptgenerator+= qtscriptgenerator>=0.2.0nb9 -BUILDLINK_PKGSRCDIR.qtscriptgenerator?= ../../devel/qtscriptgenerator +BUILDLINK_PKGSRCDIR.qtscriptgenerator?= ../../devel/qtscriptgenerator .include "../../x11/qt4-libs/buildlink3.mk" .endif # QTSCRIPTGENERATOR_BUILDLINK3_MK diff --git a/devel/readline/buildlink3.mk b/devel/readline/buildlink3.mk index 7132682fe16..572860b11b1 100644 --- a/devel/readline/buildlink3.mk +++ b/devel/readline/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.33 2011/02/23 11:00:17 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.34 2018/01/07 13:04:10 rillig Exp $ BUILDLINK_TREE+= readline @@ -18,7 +18,7 @@ BUILDLINK_FNAME_TRANSFORM.readline+= -e 's|include/readline\.h|include/readline/ # Many GNU configure scripts don't check for the correct terminal library # when testing for -lreadline. If BROKEN_READLINE_DETECTION is set to # "yes", then automatically add the right one. -. include "../../mk/bsd.fast.prefs.mk" +.include "../../mk/bsd.fast.prefs.mk" BROKEN_READLINE_DETECTION?= no .if !empty(BROKEN_READLINE_DETECTION:M[yY][eE][sS]) BUILDLINK_TRANSFORM+= l:readline:readline:${BUILDLINK_LIBNAME.termcap} diff --git a/devel/ruby-gnome2-gio/buildlink3.mk b/devel/ruby-gnome2-gio/buildlink3.mk index 7f5f9998aab..bd40429270c 100644 --- a/devel/ruby-gnome2-gio/buildlink3.mk +++ b/devel/ruby-gnome2-gio/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2013/02/07 13:41:55 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:10 rillig Exp $ BUILDLINK_TREE+= ruby-gnome2-gio @@ -6,7 +6,7 @@ BUILDLINK_TREE+= ruby-gnome2-gio RUBY_GNOME2_GIO_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ruby-gnome2-gio+= ${RUBY_PKGPREFIX}-gnome2-gio>=1.2.0 -BUILDLINK_PKGSRCDIR.ruby-gnome2-gio?= ../../devel/ruby-gnome2-gio +BUILDLINK_PKGSRCDIR.ruby-gnome2-gio?= ../../devel/ruby-gnome2-gio .include "../../devel/glib2/buildlink3.mk" .include "../../lang/ruby/buildlink3.mk" diff --git a/devel/ruby-gnome2-pango/buildlink3.mk b/devel/ruby-gnome2-pango/buildlink3.mk index c6ffcb3b9a6..e225885c429 100644 --- a/devel/ruby-gnome2-pango/buildlink3.mk +++ b/devel/ruby-gnome2-pango/buildlink3.mk @@ -1,13 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.43 2017/02/15 00:43:11 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.44 2018/01/07 13:04:10 rillig Exp $ BUILDLINK_TREE+= ruby-gnome2-pango .if !defined(RUBY_GNOME2_PANGO_BUILDLINK3_MK) RUBY_GNOME2_PANGO_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.ruby-gnome2-pango+=${RUBY_PKGPREFIX}-gnome2-pango>=0.16.0 -BUILDLINK_ABI_DEPENDS.ruby-gnome2-pango+=${RUBY_PKGPREFIX}-gnome2-pango>=3.1.1nb2 -BUILDLINK_PKGSRCDIR.ruby-gnome2-pango?= ../../devel/ruby-gnome2-pango +BUILDLINK_API_DEPENDS.ruby-gnome2-pango+= ${RUBY_PKGPREFIX}-gnome2-pango>=0.16.0 +BUILDLINK_ABI_DEPENDS.ruby-gnome2-pango+= ${RUBY_PKGPREFIX}-gnome2-pango>=3.1.1nb2 +BUILDLINK_PKGSRCDIR.ruby-gnome2-pango?= ../../devel/ruby-gnome2-pango .include "../../devel/ruby-gnome2-glib/buildlink3.mk" .include "../../devel/pango/buildlink3.mk" diff --git a/devel/rx/buildlink3.mk b/devel/rx/buildlink3.mk index be81cd568f0..5b3907f02b8 100644 --- a/devel/rx/buildlink3.mk +++ b/devel/rx/buildlink3.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:29 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2018/01/07 13:04:10 rillig Exp $ BUILDLINK_TREE+= rx .if !defined(RX_BUILDLINK3_MK) RX_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.rx+= rx>=1.5 +BUILDLINK_API_DEPENDS.rx+= rx>=1.5 BUILDLINK_PKGSRCDIR.rx?= ../../devel/rx .endif # RX_BUILDLINK3_MK diff --git a/devel/scintilla/buildlink3.mk b/devel/scintilla/buildlink3.mk index 224235606b0..24ab0482892 100644 --- a/devel/scintilla/buildlink3.mk +++ b/devel/scintilla/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.12 2013/02/16 11:18:47 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2018/01/07 13:04:11 rillig Exp $ BUILDLINK_TREE+= scintilla @@ -9,7 +9,7 @@ BUILDLINK_DEPMETHOD.scintilla?= build BUILDLINK_API_DEPENDS.scintilla+= scintilla>=2.23 BUILDLINK_ABI_DEPENDS.scintilla+= scintilla>=2.29nb7 -BUILDLINK_PKGSRCDIR.scintilla?= ../../devel/scintilla +BUILDLINK_PKGSRCDIR.scintilla?= ../../devel/scintilla #.include "../../x11/gtk2/buildlink3.mk" .endif # SCINTILLA_BUILDLINK3_MK diff --git a/devel/semantic/buildlink3.mk b/devel/semantic/buildlink3.mk index 4df92886466..a02c6f9db4e 100644 --- a/devel/semantic/buildlink3.mk +++ b/devel/semantic/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:29 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:11 rillig Exp $ # BUILDLINK_TREE+= semantic @@ -7,7 +7,7 @@ BUILDLINK_TREE+= semantic SEMANTIC_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.semantic+= ${EMACS_PKGNAME_PREFIX}semantic>=10 -BUILDLINK_PKGSRCDIR.semantic?= ../../devel/semantic +BUILDLINK_PKGSRCDIR.semantic?= ../../devel/semantic BUILDLINK_CONTENTS_FILTER.semantic= ${EGREP} '.*\.el$$|.*\.elc$$' .endif # SEMANTIC_BUILDLINK3_MK diff --git a/devel/sofia-sip/buildlink3.mk b/devel/sofia-sip/buildlink3.mk index 58a95d192e9..ece0c7e000c 100644 --- a/devel/sofia-sip/buildlink3.mk +++ b/devel/sofia-sip/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2016/03/05 11:27:46 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2018/01/07 13:04:11 rillig Exp $ BUILDLINK_TREE+= sofia-sip @@ -6,7 +6,7 @@ BUILDLINK_TREE+= sofia-sip SOFIA_SIP_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.sofia-sip+= sofia-sip>=1.12.10 -BUILDLINK_ABI_DEPENDS.sofia-sip?= sofia-sip>=1.12.11nb3 +BUILDLINK_ABI_DEPENDS.sofia-sip?= sofia-sip>=1.12.11nb3 BUILDLINK_PKGSRCDIR.sofia-sip?= ../../devel/sofia-sip .include "../../devel/glib2/buildlink3.mk" diff --git a/devel/sysexits/buildlink3.mk b/devel/sysexits/buildlink3.mk index f8d658cf60f..73e6b91070f 100644 --- a/devel/sysexits/buildlink3.mk +++ b/devel/sysexits/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:24:30 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2018/01/07 13:04:11 rillig Exp $ BUILDLINK_TREE+= sysexits @@ -6,8 +6,8 @@ BUILDLINK_TREE+= sysexits SYSEXITS_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.sysexits+= sysexits>=1.1 -BUILDLINK_DEPMETHOD.sysexits?= build -BUILDLINK_PKGSRCDIR.sysexits?= ../../devel/sysexits +BUILDLINK_DEPMETHOD.sysexits?= build +BUILDLINK_PKGSRCDIR.sysexits?= ../../devel/sysexits .endif # SYSEXITS_BUILDLINK3_MK BUILDLINK_TREE+= -sysexits diff --git a/devel/tcl-tclcl/buildlink3.mk b/devel/tcl-tclcl/buildlink3.mk index 780da5b3da7..a9b919fef59 100644 --- a/devel/tcl-tclcl/buildlink3.mk +++ b/devel/tcl-tclcl/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.14 2014/01/11 14:42:00 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2018/01/07 13:04:11 rillig Exp $ BUILDLINK_TREE+= tcl-tclcl @@ -7,7 +7,7 @@ TCL_TCLCL_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.tcl-tclcl+= tcl-tclcl>=1.15 BUILDLINK_ABI_DEPENDS.tcl-tclcl+= tcl-tclcl>=1.19nb5 -BUILDLINK_PKGSRCDIR.tcl-tclcl?= ../../devel/tcl-tclcl +BUILDLINK_PKGSRCDIR.tcl-tclcl?= ../../devel/tcl-tclcl .include "../../lang/tcl/buildlink3.mk" .include "../../lang/tcl-otcl/buildlink3.mk" diff --git a/devel/xorg-util-macros/buildlink3.mk b/devel/xorg-util-macros/buildlink3.mk index 3884347402d..b1e724cb22f 100644 --- a/devel/xorg-util-macros/buildlink3.mk +++ b/devel/xorg-util-macros/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2012/04/29 11:30:23 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:11 rillig Exp $ BUILDLINK_TREE+= xorg-util-macros @@ -7,7 +7,7 @@ XORG_UTIL_MACROS_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.xorg-util-macros+= xorg-util-macros>=1.17 BUILDLINK_ABI_DEPENDS.xorg-util-macros+= xorg-util-macros>=1.17 -BUILDLINK_PKGSRCDIR.xorg-util-macros?= ../../devel/xorg-util-macros +BUILDLINK_PKGSRCDIR.xorg-util-macros?= ../../devel/xorg-util-macros BUILDLINK_DEPMETHOD.xorg-util-macros?= build .endif # XORG_UTIL_MACROS_BUILDLINK3_MK diff --git a/devel/xulrunner192/buildlink3.mk b/devel/xulrunner192/buildlink3.mk index 7524a4bc7a4..0b4e079c87a 100644 --- a/devel/xulrunner192/buildlink3.mk +++ b/devel/xulrunner192/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.33 2017/11/23 17:19:41 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.34 2018/01/07 13:04:11 rillig Exp $ BUILDLINK_TREE+= xulrunner192 @@ -17,8 +17,8 @@ BUILDLINK_PKGSRCDIR.xulrunner192?= ../../devel/xulrunner192 pkgbase := xulrunner192 .include "../../mk/pkg-build-options.mk" .if !empty(PKG_BUILD_OPTIONS.xulrunner192:Mgnome) -. include "../../devel/libgnomeui/buildlink3.mk" -. include "../../sysutils/gnome-vfs/buildlink3.mk" +. include "../../devel/libgnomeui/buildlink3.mk" +. include "../../sysutils/gnome-vfs/buildlink3.mk" .endif .endif # XULRUNNER192_BUILDLINK3_MK diff --git a/devel/xulrunner45/buildlink3.mk b/devel/xulrunner45/buildlink3.mk index c39b53f636e..2204ce2a8fd 100644 --- a/devel/xulrunner45/buildlink3.mk +++ b/devel/xulrunner45/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2017/11/23 17:19:41 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2018/01/07 13:04:11 rillig Exp $ BUILDLINK_TREE+= xulrunner45 @@ -21,8 +21,8 @@ BUILDLINK_FNAME_TRANSFORM.xulrunner45+= -e "s|lib/xulrunner45/pkgconfig|lib/pkgc pkgbase := xulrunner45 .include "../../mk/pkg-build-options.mk" .if !empty(PKG_BUILD_OPTIONS.xulrunner45:Mgnome) -. include "../../devel/libgnomeui/buildlink3.mk" -. include "../../sysutils/gnome-vfs/buildlink3.mk" +. include "../../devel/libgnomeui/buildlink3.mk" +. include "../../sysutils/gnome-vfs/buildlink3.mk" .endif .include "../../devel/nspr/buildlink3.mk" .endif # XULRUNNER45_BUILDLINK3_MK diff --git a/editors/mule-ucs/buildlink3.mk b/editors/mule-ucs/buildlink3.mk index 5208ccc7606..97b5796f479 100644 --- a/editors/mule-ucs/buildlink3.mk +++ b/editors/mule-ucs/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2011/04/14 18:23:40 hans Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2018/01/07 13:04:11 rillig Exp $ # # @@ -11,15 +11,15 @@ BUILDLINK_TREE+= mule-ucs -.if !defined(MULE_UCS_BUILDLINK3_MK) +. if !defined(MULE_UCS_BUILDLINK3_MK) MULE_UCS_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.mule-ucs+= ${EMACS_PKGNAME_PREFIX}Mule-UCS>=0.84 -BUILDLINK_PKGSRCDIR.mule-ucs?= ../../editors/mule-ucs +BUILDLINK_PKGSRCDIR.mule-ucs?= ../../editors/mule-ucs BUILDLINK_CONTENTS_FILTER.mule-ucs= ${EGREP} '.*\.el$$|.*\.elc$$' -.endif # MULE_UCS_BUILDLINK3_MK +. endif # MULE_UCS_BUILDLINK3_MK BUILDLINK_TREE+= -mule-ucs .endif diff --git a/editors/speedbar/buildlink3.mk b/editors/speedbar/buildlink3.mk index 40a64530823..2de05b7739d 100644 --- a/editors/speedbar/buildlink3.mk +++ b/editors/speedbar/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:32 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:11 rillig Exp $ # BUILDLINK_TREE+= speedbar @@ -7,7 +7,7 @@ BUILDLINK_TREE+= speedbar SPEEDBAR_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.speedbar+= ${EMACS_PKGNAME_PREFIX}speedbar>=0.14rc0 -BUILDLINK_PKGSRCDIR.speedbar?= ../../editors/speedbar +BUILDLINK_PKGSRCDIR.speedbar?= ../../editors/speedbar BUILDLINK_CONTENTS_FILTER.speedbar= ${EGREP} '.*\.el$$|.*\.elc$$' .endif # SPEEDBAR_BUILDLINK3_MK diff --git a/emulators/cygwin_lib/buildlink3.mk b/emulators/cygwin_lib/buildlink3.mk index fd0866af54c..1107c3c3cec 100644 --- a/emulators/cygwin_lib/buildlink3.mk +++ b/emulators/cygwin_lib/buildlink3.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:24:32 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2018/01/07 13:04:11 rillig Exp $ BUILDLINK_TREE+= cygwin_lib .if !defined(CYGWIN_LIB_BUILDLINK3_MK) CYGWIN_LIB_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.cygwin_lib+= cygwin_lib>=1.5.11.1 +BUILDLINK_API_DEPENDS.cygwin_lib+= cygwin_lib>=1.5.11.1 BUILDLINK_PKGSRCDIR.cygwin_lib?= ../../emulators/cygwin_lib .endif # CYGWIN_LIB_BUILDLINK3_MK diff --git a/filesystems/py-fuse-bindings/buildlink3.mk b/filesystems/py-fuse-bindings/buildlink3.mk index 212a7e24f69..7f7f08247a7 100644 --- a/filesystems/py-fuse-bindings/buildlink3.mk +++ b/filesystems/py-fuse-bindings/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:24:33 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:12 rillig Exp $ BUILDLINK_TREE+= py-fuse-bindings @@ -6,7 +6,7 @@ BUILDLINK_TREE+= py-fuse-bindings PY_FUSE_BINDINGS_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.py-fuse-bindings+= ${PYPKGPREFIX}-fuse-bindings>=0.2pre1 -BUILDLINK_PKGSRCDIR.py-fuse-bindings?= ../../filesystems/py-fuse-bindings +BUILDLINK_PKGSRCDIR.py-fuse-bindings?= ../../filesystems/py-fuse-bindings .endif # PY_FUSE_BINDINGS_BUILDLINK3_MK BUILDLINK_TREE+= -py-fuse-bindings diff --git a/fonts/SDL2_ttf/buildlink3.mk b/fonts/SDL2_ttf/buildlink3.mk index 6234fb82118..cbe2c7b3656 100644 --- a/fonts/SDL2_ttf/buildlink3.mk +++ b/fonts/SDL2_ttf/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2016/01/17 15:21:34 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2018/01/07 13:04:12 rillig Exp $ BUILDLINK_TREE+= SDL2_ttf @@ -7,7 +7,7 @@ SDL2_TTF_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.SDL2_ttf+= SDL2_ttf>=2.0.12 BUILDLINK_ABI_DEPENDS.SDL2_ttf+= SDL2_ttf>=2.0.12nb2 -BUILDLINK_PKGSRCDIR.SDL2_ttf?= ../../fonts/SDL2_ttf +BUILDLINK_PKGSRCDIR.SDL2_ttf?= ../../fonts/SDL2_ttf .include "../../devel/SDL2/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" diff --git a/fonts/font-util/buildlink3.mk b/fonts/font-util/buildlink3.mk index 464940f42d4..1735d976eb6 100644 --- a/fonts/font-util/buildlink3.mk +++ b/fonts/font-util/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2009/08/08 23:18:58 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:12 rillig Exp $ BUILDLINK_TREE+= font-util @@ -6,7 +6,7 @@ BUILDLINK_TREE+= font-util FONT_UTIL_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.font-util+= font-util>=1.0.1 -BUILDLINK_PKGSRCDIR.font-util?= ../../fonts/font-util +BUILDLINK_PKGSRCDIR.font-util?= ../../fonts/font-util BUILDLINK_DEPMETHOD.font-util?= build .endif # FONT_UTIL_BUILDLINK3_MK diff --git a/fonts/gucharmap/buildlink3.mk b/fonts/gucharmap/buildlink3.mk index 1140b78a795..be756d39dc6 100644 --- a/fonts/gucharmap/buildlink3.mk +++ b/fonts/gucharmap/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.51 2017/02/12 06:24:43 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.52 2018/01/07 13:04:12 rillig Exp $ BUILDLINK_TREE+= gucharmap @@ -7,7 +7,7 @@ GUCHARMAP_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.gucharmap+= gucharmap>=2.24.1 BUILDLINK_ABI_DEPENDS.gucharmap+= gucharmap>=2.32.1nb22 -BUILDLINK_PKGSRCDIR.gucharmap?= ../../fonts/gucharmap +BUILDLINK_PKGSRCDIR.gucharmap?= ../../fonts/gucharmap .include "../../devel/gettext-lib/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/geography/gdal-lib/buildlink3.mk b/geography/gdal-lib/buildlink3.mk index 3b106ddfc0e..f6aaecd0a8a 100644 --- a/geography/gdal-lib/buildlink3.mk +++ b/geography/gdal-lib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.47 2018/01/01 21:18:08 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.48 2018/01/07 13:04:12 rillig Exp $ BUILDLINK_TREE+= gdal-lib @@ -7,7 +7,7 @@ GDAL_LIB_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.gdal-lib+= gdal-lib>=1.6.1 BUILDLINK_ABI_DEPENDS.gdal-lib+= gdal-lib>=2.0.3nb8 -BUILDLINK_PKGSRCDIR.gdal-lib?= ../../geography/gdal-lib +BUILDLINK_PKGSRCDIR.gdal-lib?= ../../geography/gdal-lib pkgbase := gdal-lib .include "../../mk/pkg-build-options.mk" diff --git a/geography/libchamplain012/buildlink3.mk b/geography/libchamplain012/buildlink3.mk index d1e1d69d37a..6507fa62426 100644 --- a/geography/libchamplain012/buildlink3.mk +++ b/geography/libchamplain012/buildlink3.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.10 2017/11/30 16:45:03 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2018/01/07 13:04:12 rillig Exp $ BUILDLINK_TREE+= libchamplain012 .if !defined(LIBCHAMPLAIN012_BUILDLINK3_MK) LIBCHAMPLAIN012_BUILDLINK3_MK:= -BUILDLINK_ABI_DEPENDS.libchamplain012+= libchamplain012>=0.12.10nb11 +BUILDLINK_ABI_DEPENDS.libchamplain012+= libchamplain012>=0.12.10nb11 BUILDLINK_API_DEPENDS.libchamplain012+= libchamplain012>=0.12.9 BUILDLINK_PKGSRCDIR.libchamplain012?= ../../geography/libchamplain012 diff --git a/geography/shapelib/buildlink3.mk b/geography/shapelib/buildlink3.mk index 33c641f5ec8..c12ece8c716 100644 --- a/geography/shapelib/buildlink3.mk +++ b/geography/shapelib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2009/03/20 19:24:35 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2018/01/07 13:04:12 rillig Exp $ BUILDLINK_TREE+= shapelib @@ -6,7 +6,7 @@ BUILDLINK_TREE+= shapelib SHAPELIB_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.shapelib+= shapelib>=1.2.10 -BUILDLINK_PKGSRCDIR.shapelib?= ../../geography/shapelib +BUILDLINK_PKGSRCDIR.shapelib?= ../../geography/shapelib .endif # SHAPELIB_BUILDLINK3_MK BUILDLINK_TREE+= -shapelib diff --git a/graphics/MesaLib/buildlink3.mk b/graphics/MesaLib/buildlink3.mk index 9ce2ccd1abb..8afa47f5113 100644 --- a/graphics/MesaLib/buildlink3.mk +++ b/graphics/MesaLib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.54 2015/09/27 21:58:03 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.55 2018/01/07 13:04:12 rillig Exp $ BUILDLINK_TREE+= MesaLib @@ -14,9 +14,9 @@ BUILDLINK_PKGSRCDIR.MesaLib?= ../../graphics/MesaLib .if ${X11_TYPE} == "modular" BUILDLINK_ABI_DEPENDS.MesaLib+= MesaLib>=10.5.3 # This is needed to avoid linking conflicting libstdc++ versions -.if defined(USE_LANGUAGES) && !empty(USE_LANGUAGES:Mc++) -GCC_REQD+= 4.2 -.endif +. if defined(USE_LANGUAGES) && !empty(USE_LANGUAGES:Mc++) +GCC_REQD+= 4.2 +. endif .endif # See <http://developer.apple.com/qa/qa2007/qa1567.html>. diff --git a/graphics/MesaLib7/buildlink3.mk b/graphics/MesaLib7/buildlink3.mk index 032cded7cce..46480e3e7bd 100644 --- a/graphics/MesaLib7/buildlink3.mk +++ b/graphics/MesaLib7/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2015/09/25 00:40:11 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:12 rillig Exp $ BUILDLINK_TREE+= MesaLib7 @@ -8,7 +8,7 @@ MESALIB7_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.MesaLib7+= MesaLib7>=7.11.2 BUILDLINK_PKGSRCDIR.MesaLib7?= ../../graphics/MesaLib7 BUILDLINK_FNAME_TRANSFORM.MesaLib7+= -e 's|MesaLib7/||' -BUILDLINK_RPATHDIRS+= MesaLib7/lib +BUILDLINK_RPATHDIRS+= MesaLib7/lib .include "../../mk/bsd.fast.prefs.mk" diff --git a/graphics/SDL_image/buildlink3.mk b/graphics/SDL_image/buildlink3.mk index 7c979905ff0..f46b245175d 100644 --- a/graphics/SDL_image/buildlink3.mk +++ b/graphics/SDL_image/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.25 2015/04/25 14:23:07 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.26 2018/01/07 13:04:12 rillig Exp $ BUILDLINK_TREE+= SDL_image @@ -7,8 +7,8 @@ SDL_IMAGE_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.SDL_image+= SDL_image>=1.2.3nb1 BUILDLINK_ABI_DEPENDS.SDL_image+= SDL_image>=1.2.12nb6 -BUILDLINK_PKGSRCDIR.SDL_image?= ../../graphics/SDL_image -BUILDLINK_INCDIRS.SDL_image?= include/SDL +BUILDLINK_PKGSRCDIR.SDL_image?= ../../graphics/SDL_image +BUILDLINK_INCDIRS.SDL_image?= include/SDL .include "../../devel/SDL/buildlink3.mk" .endif # SDL_IMAGE_BUILDLINK3_MK diff --git a/graphics/compface/buildlink3.mk b/graphics/compface/buildlink3.mk index 03fe4f4dc6e..bb6e8c74f22 100644 --- a/graphics/compface/buildlink3.mk +++ b/graphics/compface/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.9 2012/05/07 01:53:33 dholland Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2018/01/07 13:04:12 rillig Exp $ BUILDLINK_TREE+= compface @@ -7,7 +7,7 @@ COMPFACE_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.compface+= compface>=1.4 BUILDLINK_ABI_DEPENDS.compface+= compface>=1.5.1nb1 -BUILDLINK_PKGSRCDIR.compface?= ../../graphics/compface +BUILDLINK_PKGSRCDIR.compface?= ../../graphics/compface .endif # COMPFACE_BUILDLINK3_MK BUILDLINK_TREE+= -compface diff --git a/graphics/evas-edb/buildlink3.mk b/graphics/evas-edb/buildlink3.mk index da4e7287133..14ff59c2dc5 100644 --- a/graphics/evas-edb/buildlink3.mk +++ b/graphics/evas-edb/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2016/03/05 11:27:48 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:12 rillig Exp $ BUILDLINK_TREE+= evas-edb @@ -7,7 +7,7 @@ EVAS_EDB_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.evas-edb+= evas-edb>=1.7.7 BUILDLINK_ABI_DEPENDS.evas-edb?= evas-edb>=1.7.7nb2 -BUILDLINK_PKGSRCDIR.evas-edb?= ../../graphics/evas-edb +BUILDLINK_PKGSRCDIR.evas-edb?= ../../graphics/evas-edb .include "../../databases/edb/buildlink3.mk" .include "../../fonts/fontconfig/buildlink3.mk" diff --git a/graphics/evas-eet/buildlink3.mk b/graphics/evas-eet/buildlink3.mk index 51f8786b5ba..2e5b5dfd9af 100644 --- a/graphics/evas-eet/buildlink3.mk +++ b/graphics/evas-eet/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2016/03/05 11:27:48 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:13 rillig Exp $ BUILDLINK_TREE+= evas-eet @@ -7,7 +7,7 @@ EVAS_EET_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.evas-eet+= evas-eet>=1.7.7 BUILDLINK_ABI_DEPENDS.evas-eet?= evas-eet>=1.7.7nb2 -BUILDLINK_PKGSRCDIR.evas-eet?= ../../graphics/evas-eet +BUILDLINK_PKGSRCDIR.evas-eet?= ../../graphics/evas-eet .include "../../devel/eet/buildlink3.mk" .include "../../fonts/fontconfig/buildlink3.mk" diff --git a/graphics/evas-gif/buildlink3.mk b/graphics/evas-gif/buildlink3.mk index 15f559fb465..0913982759a 100644 --- a/graphics/evas-gif/buildlink3.mk +++ b/graphics/evas-gif/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2016/03/05 11:27:48 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2018/01/07 13:04:13 rillig Exp $ BUILDLINK_TREE+= evas-gif @@ -7,7 +7,7 @@ EVAS_GIF_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.evas-gif+= evas-gif>=1.7.7 BUILDLINK_ABI_DEPENDS.evas-gif?= evas-gif>=1.7.7nb5 -BUILDLINK_PKGSRCDIR.evas-gif?= ../../graphics/evas-gif +BUILDLINK_PKGSRCDIR.evas-gif?= ../../graphics/evas-gif .include "../../fonts/fontconfig/buildlink3.mk" .include "../../graphics/evas/buildlink3.mk" diff --git a/graphics/evas-jpeg/buildlink3.mk b/graphics/evas-jpeg/buildlink3.mk index 5ac91ce8b49..8c68581c4e2 100644 --- a/graphics/evas-jpeg/buildlink3.mk +++ b/graphics/evas-jpeg/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2016/03/05 11:27:48 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:13 rillig Exp $ BUILDLINK_TREE+= evas-jpeg @@ -7,7 +7,7 @@ EVAS_JPEG_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.evas-jpeg+= evas-jpeg>=1.7.7 BUILDLINK_ABI_DEPENDS.evas-jpeg?= evas-jpeg>=1.7.7nb2 -BUILDLINK_PKGSRCDIR.evas-jpeg?= ../../graphics/evas-jpeg +BUILDLINK_PKGSRCDIR.evas-jpeg?= ../../graphics/evas-jpeg .include "../../fonts/fontconfig/buildlink3.mk" .include "../../graphics/evas/buildlink3.mk" diff --git a/graphics/evas-png/buildlink3.mk b/graphics/evas-png/buildlink3.mk index dafe875fed6..1aa309ffcaa 100644 --- a/graphics/evas-png/buildlink3.mk +++ b/graphics/evas-png/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2016/03/05 11:27:48 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:13 rillig Exp $ BUILDLINK_TREE+= evas-png @@ -7,7 +7,7 @@ EVAS_PNG_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.evas-png+= evas-png>=1.7.7 BUILDLINK_ABI_DEPENDS.evas-png?= evas-png>=1.7.7nb2 -BUILDLINK_PKGSRCDIR.evas-png?= ../../graphics/evas-png +BUILDLINK_PKGSRCDIR.evas-png?= ../../graphics/evas-png .include "../../fonts/fontconfig/buildlink3.mk" .include "../../graphics/evas/buildlink3.mk" diff --git a/graphics/evas-software-x11/buildlink3.mk b/graphics/evas-software-x11/buildlink3.mk index 24c7e7c19b3..2ee1417d0b7 100644 --- a/graphics/evas-software-x11/buildlink3.mk +++ b/graphics/evas-software-x11/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2013/06/16 18:56:05 sno Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2018/01/07 13:04:13 rillig Exp $ BUILDLINK_TREE+= evas-software-x11 @@ -6,7 +6,7 @@ BUILDLINK_TREE+= evas-software-x11 EVAS_SOFTWARE_X11_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.evas-software-x11+= evas-software-x11>=1.7.0alpha -BUILDLINK_PKGSRCDIR.evas-software-x11?= ../../graphics/evas-software-x11 +BUILDLINK_PKGSRCDIR.evas-software-x11?= ../../graphics/evas-software-x11 .include "../../x11/libX11/buildlink3.mk" .endif # EVAS_SOFTWARE_X11_BUILDLINK3_MK diff --git a/graphics/evas-tiff/buildlink3.mk b/graphics/evas-tiff/buildlink3.mk index 7f45e999008..da7dd79fd30 100644 --- a/graphics/evas-tiff/buildlink3.mk +++ b/graphics/evas-tiff/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2016/03/05 11:27:48 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:13 rillig Exp $ BUILDLINK_TREE+= evas-tiff @@ -7,7 +7,7 @@ EVAS_TIFF_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.evas-tiff+= evas-tiff>=1.7.7 BUILDLINK_ABI_DEPENDS.evas-tiff?= evas-tiff>=1.7.7nb2 -BUILDLINK_PKGSRCDIR.evas-tiff?= ../../graphics/evas-tiff +BUILDLINK_PKGSRCDIR.evas-tiff?= ../../graphics/evas-tiff .include "../../fonts/fontconfig/buildlink3.mk" .include "../../graphics/evas/buildlink3.mk" diff --git a/graphics/evas-xpm/buildlink3.mk b/graphics/evas-xpm/buildlink3.mk index 46b229ab6dd..eb0ec149808 100644 --- a/graphics/evas-xpm/buildlink3.mk +++ b/graphics/evas-xpm/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2016/03/05 11:27:48 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:13 rillig Exp $ BUILDLINK_TREE+= evas-xpm @@ -7,7 +7,7 @@ EVAS_XPM_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.evas-xpm+= evas-xpm>=1.7.7 BUILDLINK_ABI_DEPENDS.evas-xpm?= evas-xpm>=1.7.7nb2 -BUILDLINK_PKGSRCDIR.evas-xpm?= ../../graphics/evas-xpm +BUILDLINK_PKGSRCDIR.evas-xpm?= ../../graphics/evas-xpm .include "../../fonts/fontconfig/buildlink3.mk" .include "../../graphics/evas/buildlink3.mk" diff --git a/graphics/flickrnet/buildlink3.mk b/graphics/flickrnet/buildlink3.mk index 91d15f96971..1df30e7959c 100644 --- a/graphics/flickrnet/buildlink3.mk +++ b/graphics/flickrnet/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2015/05/23 09:01:20 kefren Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:13 rillig Exp $ BUILDLINK_TREE+= flickrnet @@ -6,7 +6,7 @@ BUILDLINK_TREE+= flickrnet FLICKRNET_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.flickrnet+= flickrnet>=3.16 -BUILDLINK_PKGSRCDIR.flickrnet?= ../../graphics/flickrnet +BUILDLINK_PKGSRCDIR.flickrnet?= ../../graphics/flickrnet BUILDLINK_CONTENTS_FILTER.flickrnet= ${EGREP} '(^lib/)' .endif # FLICKRNET_BUILDLINK3_MK diff --git a/graphics/freeglut/buildlink3.mk b/graphics/freeglut/buildlink3.mk index fa13ff49c74..ac851ad2050 100644 --- a/graphics/freeglut/buildlink3.mk +++ b/graphics/freeglut/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.11 2015/04/25 14:23:10 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2018/01/07 13:04:13 rillig Exp $ BUILDLINK_TREE+= freeglut @@ -7,7 +7,7 @@ FREEGLUT_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.freeglut+= freeglut>=2.2.0 BUILDLINK_ABI_DEPENDS.freeglut+= freeglut>=2.8.1nb1 -BUILDLINK_PKGSRCDIR.freeglut?= ../../graphics/freeglut +BUILDLINK_PKGSRCDIR.freeglut?= ../../graphics/freeglut .include "../../graphics/MesaLib/buildlink3.mk" .include "../../x11/libXi/buildlink3.mk" diff --git a/graphics/freeimage/buildlink3.mk b/graphics/freeimage/buildlink3.mk index 531f2673c46..1cb6ae3c805 100644 --- a/graphics/freeimage/buildlink3.mk +++ b/graphics/freeimage/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2015/02/12 22:40:05 snj Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:13 rillig Exp $ BUILDLINK_TREE+= freeimage @@ -6,7 +6,7 @@ BUILDLINK_TREE+= freeimage FREEIMAGE_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.freeimage+= freeimage>=3.16.0 -BUILDLINK_PKGSRCDIR.freeimage?= ../../graphics/freeimage +BUILDLINK_PKGSRCDIR.freeimage?= ../../graphics/freeimage .endif # FREEIMAGE_BUILDLINK3_MK BUILDLINK_TREE+= -freeimage diff --git a/graphics/freetype-lib/buildlink3.mk b/graphics/freetype-lib/buildlink3.mk index 65ab3337e80..59c5c27311d 100644 --- a/graphics/freetype-lib/buildlink3.mk +++ b/graphics/freetype-lib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.17 2012/05/07 01:53:33 dholland Exp $ +# $NetBSD: buildlink3.mk,v 1.18 2018/01/07 13:04:13 rillig Exp $ BUILDLINK_TREE+= freetype @@ -6,9 +6,9 @@ BUILDLINK_TREE+= freetype FREETYPE_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.freetype+= freetype-lib>=1.3.1nb1 -BUILDLINK_ABI_DEPENDS.freetype+=freetype-lib>=1.3.1nb2 +BUILDLINK_ABI_DEPENDS.freetype+= freetype-lib>=1.3.1nb2 BUILDLINK_ABI_DEPENDS.freetype+= freetype-lib>=1.5nb1 -BUILDLINK_PKGSRCDIR.freetype?= ../../graphics/freetype-lib +BUILDLINK_PKGSRCDIR.freetype?= ../../graphics/freetype-lib .include "../../devel/gettext-lib/buildlink3.mk" .endif # FREETYPE_BUILDLINK3_MK diff --git a/graphics/freetype2/buildlink3.mk b/graphics/freetype2/buildlink3.mk index c4728332ec5..4ce6e223b04 100644 --- a/graphics/freetype2/buildlink3.mk +++ b/graphics/freetype2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.46 2016/07/09 12:23:16 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.47 2018/01/07 13:04:14 rillig Exp $ BUILDLINK_TREE+= freetype2 @@ -27,7 +27,7 @@ CHECK_BUILTIN.freetype2:= yes CHECK_BUILTIN.freetype2:= no . if empty(USE_BUILTIN.freetype2:M[yY][eE][sS]) -. include "../../graphics/png/buildlink3.mk" +. include "../../graphics/png/buildlink3.mk" . endif .endif diff --git a/graphics/gdk-pixbuf/buildlink3.mk b/graphics/gdk-pixbuf/buildlink3.mk index 0cb5509ed25..03d59d9c9fc 100644 --- a/graphics/gdk-pixbuf/buildlink3.mk +++ b/graphics/gdk-pixbuf/buildlink3.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.24 2016/08/03 10:22:14 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.25 2018/01/07 13:04:14 rillig Exp $ BUILDLINK_TREE+= gdk-pixbuf .if !defined(GDK_PIXBUF_BUILDLINK3_MK) GDK_PIXBUF_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.gdk-pixbuf+= gdk-pixbuf>=0.22.0nb2 +BUILDLINK_API_DEPENDS.gdk-pixbuf+= gdk-pixbuf>=0.22.0nb2 BUILDLINK_ABI_DEPENDS.gdk-pixbuf+= gdk-pixbuf>=0.22.0nb20 BUILDLINK_PKGSRCDIR.gdk-pixbuf?= ../../graphics/gdk-pixbuf BUILDLINK_CPPFLAGS.gdk-pixbuf+= \ diff --git a/graphics/gdk-pixbuf2-xlib/buildlink3.mk b/graphics/gdk-pixbuf2-xlib/buildlink3.mk index 81afa9a93fb..048b9f094ae 100644 --- a/graphics/gdk-pixbuf2-xlib/buildlink3.mk +++ b/graphics/gdk-pixbuf2-xlib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.8 2016/08/03 10:22:14 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2018/01/07 13:04:14 rillig Exp $ BUILDLINK_TREE+= gdk-pixbuf2-xlib @@ -7,7 +7,7 @@ GDK_PIXBUF2_XLIB_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.gdk-pixbuf2-xlib+= gdk-pixbuf2-xlib>=2.22.1 BUILDLINK_ABI_DEPENDS.gdk-pixbuf2-xlib+= gdk-pixbuf2-xlib>=2.34.0nb1 -BUILDLINK_PKGSRCDIR.gdk-pixbuf2-xlib?= ../../graphics/gdk-pixbuf2-xlib +BUILDLINK_PKGSRCDIR.gdk-pixbuf2-xlib?= ../../graphics/gdk-pixbuf2-xlib .include "../../graphics/gdk-pixbuf2/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" diff --git a/graphics/gle/buildlink3.mk b/graphics/gle/buildlink3.mk index 4d7d07d9389..375283ed965 100644 --- a/graphics/gle/buildlink3.mk +++ b/graphics/gle/buildlink3.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.13 2015/04/25 14:23:11 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2018/01/07 13:04:14 rillig Exp $ BUILDLINK_TREE+= gle .if !defined(GLE_BUILDLINK3_MK) GLE_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.gle+= gle>=3.0.3 +BUILDLINK_API_DEPENDS.gle+= gle>=3.0.3 BUILDLINK_ABI_DEPENDS.gle+= gle>=3.1.0nb4 BUILDLINK_PKGSRCDIR.gle?= ../../graphics/gle diff --git a/graphics/gnome-icon-theme/buildlink3.mk b/graphics/gnome-icon-theme/buildlink3.mk index 3e5057ef4cb..e47e37826f3 100644 --- a/graphics/gnome-icon-theme/buildlink3.mk +++ b/graphics/gnome-icon-theme/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.21 2017/06/14 16:23:09 prlw1 Exp $ +# $NetBSD: buildlink3.mk,v 1.22 2018/01/07 13:04:14 rillig Exp $ BUILDLINK_TREE+= gnome-icon-theme @@ -7,7 +7,7 @@ GNOME_ICON_THEME_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.gnome-icon-theme+= gnome-icon-theme>=2.8.0 BUILDLINK_ABI_DEPENDS.gnome-icon-theme+= gnome-icon-theme>=2.12.1nb2 -BUILDLINK_PKGSRCDIR.gnome-icon-theme?= ../../graphics/gnome-icon-theme +BUILDLINK_PKGSRCDIR.gnome-icon-theme?= ../../graphics/gnome-icon-theme # intltool-{extract,merge,update} are Perl scripts included in the sources # of packages that use gnome-icon-theme and are executed during build. @@ -19,10 +19,10 @@ USE_TOOLS+= perl .if !defined(GNOME_ICON_THEME_DEPEND_ONLY) ICON_THEMES= yes -.if !defined(NOOP_GTK_UPDATE_ICON_CACHE) +. if !defined(NOOP_GTK_UPDATE_ICON_CACHE) NOOP_GTK_UPDATE_ICON_CACHE= -TOOLS_NOOP+= gtk-update-icon-cache -.endif +TOOLS_NOOP+= gtk-update-icon-cache +. endif .endif # GNOME_ICON_THEME_DEPEND_ONLY .endif # GNOME_ICON_THEME_BUILDLINK3_MK diff --git a/graphics/go-image/buildlink3.mk b/graphics/go-image/buildlink3.mk index 67f49ae5d6c..ded8975c276 100644 --- a/graphics/go-image/buildlink3.mk +++ b/graphics/go-image/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2017/08/17 02:02:56 gavan Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:14 rillig Exp $ BUILDLINK_TREE+= go-image @@ -9,7 +9,7 @@ BUILDLINK_CONTENTS_FILTER.go-image= ${EGREP} gopkg/ BUILDLINK_DEPMETHOD.go-image?= build BUILDLINK_API_DEPENDS.go-image+= go-image>=20170405 -BUILDLINK_PKGSRCDIR.go-image?= ../../graphics/go-image +BUILDLINK_PKGSRCDIR.go-image?= ../../graphics/go-image .include "../../textproc/go-text/buildlink3.mk" .endif # GO_IMAGE_BUILDLINK3_MK diff --git a/graphics/goocanvas/buildlink3.mk b/graphics/goocanvas/buildlink3.mk index fb5d33e384f..f97a65c70fd 100644 --- a/graphics/goocanvas/buildlink3.mk +++ b/graphics/goocanvas/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.27 2017/02/12 06:24:44 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.28 2018/01/07 13:04:14 rillig Exp $ # BUILDLINK_TREE+= goocanvas @@ -8,7 +8,7 @@ GOOCANVAS_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.goocanvas+= goocanvas>=0.12 BUILDLINK_ABI_DEPENDS.goocanvas+= goocanvas>=1.0.0nb20 -BUILDLINK_PKGSRCDIR.goocanvas?= ../../graphics/goocanvas +BUILDLINK_PKGSRCDIR.goocanvas?= ../../graphics/goocanvas .include "../../devel/glib2/buildlink3.mk" .include "../../graphics/cairo/buildlink3.mk" diff --git a/graphics/gtkglext/buildlink3.mk b/graphics/gtkglext/buildlink3.mk index 77eb8a6ace8..8bb6b4938da 100644 --- a/graphics/gtkglext/buildlink3.mk +++ b/graphics/gtkglext/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.42 2017/02/12 06:24:44 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.43 2018/01/07 13:04:14 rillig Exp $ BUILDLINK_TREE+= gtkglext @@ -7,7 +7,7 @@ GTKGLEXT_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.gtkglext+= gtkglext>=1.2.0 BUILDLINK_ABI_DEPENDS.gtkglext+= gtkglext>=1.2.0nb33 -BUILDLINK_PKGSRCDIR.gtkglext?= ../../graphics/gtkglext +BUILDLINK_PKGSRCDIR.gtkglext?= ../../graphics/gtkglext .include "../../devel/pangox-compat/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" diff --git a/graphics/hicolor-icon-theme/buildlink3.mk b/graphics/hicolor-icon-theme/buildlink3.mk index 4ae329dfb10..f620bdba427 100644 --- a/graphics/hicolor-icon-theme/buildlink3.mk +++ b/graphics/hicolor-icon-theme/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.20 2017/06/14 16:23:09 prlw1 Exp $ +# $NetBSD: buildlink3.mk,v 1.21 2018/01/07 13:04:14 rillig Exp $ BUILDLINK_TREE+= hicolor-icon-theme @@ -7,7 +7,7 @@ HICOLOR_ICON_THEME_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.hicolor-icon-theme+= hicolor-icon-theme>=0.4 BUILDLINK_ABI_DEPENDS.hicolor-icon-theme+= hicolor-icon-theme>=0.9nb1 -BUILDLINK_PKGSRCDIR.hicolor-icon-theme?=../../graphics/hicolor-icon-theme +BUILDLINK_PKGSRCDIR.hicolor-icon-theme?= ../../graphics/hicolor-icon-theme .include "../../mk/bsd.fast.prefs.mk" @@ -15,10 +15,10 @@ BUILDLINK_PKGSRCDIR.hicolor-icon-theme?=../../graphics/hicolor-icon-theme ICON_THEMES= yes -.if !defined(NOOP_GTK_UPDATE_ICON_CACHE) +. if !defined(NOOP_GTK_UPDATE_ICON_CACHE) NOOP_GTK_UPDATE_ICON_CACHE= -TOOLS_NOOP+= gtk-update-icon-cache -.endif +TOOLS_NOOP+= gtk-update-icon-cache +. endif .endif # HICOLOR_ICON_THEME_DEPEND_ONLY .endif # HICOLOR_ICON_THEME_BUILDLINK3_MK diff --git a/graphics/imlib-gtk/buildlink3.mk b/graphics/imlib-gtk/buildlink3.mk index 9d63e858fe2..915e8a1a48b 100644 --- a/graphics/imlib-gtk/buildlink3.mk +++ b/graphics/imlib-gtk/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.8 2014/05/15 14:41:51 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2018/01/07 13:04:14 rillig Exp $ BUILDLINK_TREE+= imlib-gtk @@ -7,7 +7,7 @@ IMLIB_GTK_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.imlib-gtk+= imlib-gtk>=1.9.15 BUILDLINK_ABI_DEPENDS.imlib-gtk+= imlib-gtk>=1.9.15nb6 -BUILDLINK_PKGSRCDIR.imlib-gtk?= ../../graphics/imlib-gtk +BUILDLINK_PKGSRCDIR.imlib-gtk?= ../../graphics/imlib-gtk .include "../../graphics/imlib/buildlink3.mk" .include "../../x11/gtk/buildlink3.mk" diff --git a/graphics/jbig2dec/buildlink3.mk b/graphics/jbig2dec/buildlink3.mk index 12d681500f8..42f6dc23179 100644 --- a/graphics/jbig2dec/buildlink3.mk +++ b/graphics/jbig2dec/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2010/09/09 02:13:50 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:14 rillig Exp $ BUILDLINK_TREE+= jbig2dec @@ -6,7 +6,7 @@ BUILDLINK_TREE+= jbig2dec JBIG2DEC_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.jbig2dec+= jbig2dec>=0.11 -BUILDLINK_PKGSRCDIR.jbig2dec?= ../../graphics/jbig2dec +BUILDLINK_PKGSRCDIR.jbig2dec?= ../../graphics/jbig2dec .endif # JBIG2DEC_BUILDLINK3_MK BUILDLINK_TREE+= -jbig2dec diff --git a/graphics/kplotting/buildlink3.mk b/graphics/kplotting/buildlink3.mk index d5236e70dee..6fcb3398b77 100644 --- a/graphics/kplotting/buildlink3.mk +++ b/graphics/kplotting/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2017/11/30 16:45:04 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2018/01/07 13:04:14 rillig Exp $ BUILDLINK_TREE+= kplotting @@ -7,7 +7,7 @@ KPLOTTING_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.kplotting+= kplotting>=5.21.0 BUILDLINK_ABI_DEPENDS.kplotting?= kplotting>=5.25.0nb6 -BUILDLINK_PKGSRCDIR.kplotting?= ../../graphics/kplotting +BUILDLINK_PKGSRCDIR.kplotting?= ../../graphics/kplotting .include "../../x11/qt5-qtbase/buildlink3.mk" .endif # KPLOTTING_BUILDLINK3_MK diff --git a/graphics/libggiwmh/buildlink3.mk b/graphics/libggiwmh/buildlink3.mk index acc3efb414f..1dc8e492f13 100644 --- a/graphics/libggiwmh/buildlink3.mk +++ b/graphics/libggiwmh/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.9 2015/08/17 17:11:19 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2018/01/07 13:04:15 rillig Exp $ BUILDLINK_TREE+= libggiwmh @@ -7,7 +7,7 @@ LIBGGIWMH_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libggiwmh+= libggiwmh>=0.2.0 BUILDLINK_ABI_DEPENDS.libggiwmh+= libggiwmh>=0.3.2nb1 -BUILDLINK_PKGSRCDIR.libggiwmh?= ../../graphics/libggiwmh +BUILDLINK_PKGSRCDIR.libggiwmh?= ../../graphics/libggiwmh .include "../../graphics/libggi/buildlink3.mk" .endif # LIBGGIWMH_BUILDLINK3_MK diff --git a/graphics/libgnomecanvasmm/buildlink3.mk b/graphics/libgnomecanvasmm/buildlink3.mk index d11f3f07d3a..faf2c35b63b 100644 --- a/graphics/libgnomecanvasmm/buildlink3.mk +++ b/graphics/libgnomecanvasmm/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.35 2017/02/12 06:24:45 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.36 2018/01/07 13:04:15 rillig Exp $ BUILDLINK_TREE+= libgnomecanvasmm @@ -7,7 +7,7 @@ LIBGNOMECANVASMM_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libgnomecanvasmm+= libgnomecanvasmm>=2.10.0 BUILDLINK_ABI_DEPENDS.libgnomecanvasmm+= libgnomecanvasmm>=2.26.0nb25 -BUILDLINK_PKGSRCDIR.libgnomecanvasmm?= ../../graphics/libgnomecanvasmm +BUILDLINK_PKGSRCDIR.libgnomecanvasmm?= ../../graphics/libgnomecanvasmm .include "../../graphics/libgnomecanvas/buildlink3.mk" .include "../../x11/gtkmm/buildlink3.mk" diff --git a/graphics/libkdcraw/buildlink3.mk b/graphics/libkdcraw/buildlink3.mk index 7d7895e2d68..039565d9cbb 100644 --- a/graphics/libkdcraw/buildlink3.mk +++ b/graphics/libkdcraw/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.44 2018/01/01 21:18:08 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.45 2018/01/07 13:04:15 rillig Exp $ BUILDLINK_TREE+= libkdcraw @@ -7,7 +7,7 @@ LIBKDCRAW_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libkdcraw+= libkdcraw>=4.8.0 BUILDLINK_ABI_DEPENDS.libkdcraw?= libkdcraw>=15.08.3nb6 -BUILDLINK_PKGSRCDIR.libkdcraw?= ../../graphics/libkdcraw +BUILDLINK_PKGSRCDIR.libkdcraw?= ../../graphics/libkdcraw .include "../../x11/kdelibs4/buildlink3.mk" .endif # LIBKDCRAW_BUILDLINK3_MK diff --git a/graphics/libkexiv2/buildlink3.mk b/graphics/libkexiv2/buildlink3.mk index 83ac9db28c3..b219882fd72 100644 --- a/graphics/libkexiv2/buildlink3.mk +++ b/graphics/libkexiv2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.19 2012/03/19 23:12:19 markd Exp $ +# $NetBSD: buildlink3.mk,v 1.20 2018/01/07 13:04:15 rillig Exp $ BUILDLINK_TREE+= libkexiv2 @@ -6,7 +6,7 @@ BUILDLINK_TREE+= libkexiv2 LIBKEXIV2_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libkexiv2+= libkexiv2>=4.8.0 -BUILDLINK_PKGSRCDIR.libkexiv2?= ../../graphics/libkexiv2 +BUILDLINK_PKGSRCDIR.libkexiv2?= ../../graphics/libkexiv2 .endif # LIBKEXIV2_BUILDLINK3_MK diff --git a/graphics/libkface/buildlink3.mk b/graphics/libkface/buildlink3.mk index 339d380e3e4..551087e408b 100644 --- a/graphics/libkface/buildlink3.mk +++ b/graphics/libkface/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.28 2018/01/01 21:18:09 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.29 2018/01/07 13:04:15 rillig Exp $ BUILDLINK_TREE+= libkface @@ -7,7 +7,7 @@ LIBKFACE_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libkface+= libkface>=2.5.0 BUILDLINK_ABI_DEPENDS.libkface?= libkface>=4.13.0nb7 -BUILDLINK_PKGSRCDIR.libkface?= ../../graphics/libkface +BUILDLINK_PKGSRCDIR.libkface?= ../../graphics/libkface .include "../../graphics/opencv/buildlink3.mk" .include "../../x11/kdelibs4/buildlink3.mk" diff --git a/graphics/libksane/buildlink3.mk b/graphics/libksane/buildlink3.mk index 295ba17c585..ac24ab7ad52 100644 --- a/graphics/libksane/buildlink3.mk +++ b/graphics/libksane/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.28 2018/01/01 21:18:09 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.29 2018/01/07 13:04:15 rillig Exp $ BUILDLINK_TREE+= libksane @@ -7,7 +7,7 @@ LIBKSANE_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libksane+= libksane>=4.8.0 BUILDLINK_ABI_DEPENDS.libksane?= libksane>=15.08.3nb6 -BUILDLINK_PKGSRCDIR.libksane?= ../../graphics/libksane +BUILDLINK_PKGSRCDIR.libksane?= ../../graphics/libksane .include "../../x11/kdelibs4/buildlink3.mk" .endif # LIBKSANE_BUILDLINK3_MK diff --git a/graphics/libpuzzle/buildlink3.mk b/graphics/libpuzzle/buildlink3.mk index 380ef7fe901..41377c0342c 100644 --- a/graphics/libpuzzle/buildlink3.mk +++ b/graphics/libpuzzle/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.17 2017/02/28 15:19:59 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.18 2018/01/07 13:04:15 rillig Exp $ BUILDLINK_TREE+= libpuzzle @@ -7,7 +7,7 @@ LIBPUZZLE_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libpuzzle+= libpuzzle>=0.9 BUILDLINK_ABI_DEPENDS.libpuzzle+= libpuzzle>=0.11nb16 -BUILDLINK_PKGSRCDIR.libpuzzle?= ../../graphics/libpuzzle +BUILDLINK_PKGSRCDIR.libpuzzle?= ../../graphics/libpuzzle .include "../../graphics/gd/buildlink3.mk" .endif # LIBPUZZLE_BUILDLINK3_MK diff --git a/graphics/libsixel/buildlink3.mk b/graphics/libsixel/buildlink3.mk index 872751c82c2..950a90b8abc 100644 --- a/graphics/libsixel/buildlink3.mk +++ b/graphics/libsixel/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2016/08/21 11:17:44 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:15 rillig Exp $ # BUILDLINK_TREE+= libsixel @@ -8,7 +8,7 @@ LIBSIXEL_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libsixel+= libsixel>=1.7.0 BUILDLINK_ABI_DEPENDS.libsixel+= libsixel>=1.7.0 -BUILDLINK_PKGSRCDIR.libsixel?= ../../graphics/libsixel +BUILDLINK_PKGSRCDIR.libsixel?= ../../graphics/libsixel .endif # LIBSIXEL_BUILDLINK3_MK BUILDLINK_TREE+= -libsixel diff --git a/graphics/mng/buildlink3.mk b/graphics/mng/buildlink3.mk index 8cd9fbe9e99..062d7c88b6a 100644 --- a/graphics/mng/buildlink3.mk +++ b/graphics/mng/buildlink3.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.16 2013/10/09 17:38:26 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.17 2018/01/07 13:04:15 rillig Exp $ BUILDLINK_TREE+= mng .if !defined(MNG_BUILDLINK3_MK) MNG_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.mng+= mng>=1.0.0 +BUILDLINK_API_DEPENDS.mng+= mng>=1.0.0 BUILDLINK_ABI_DEPENDS.mng+= mng>=2.0.2 BUILDLINK_PKGSRCDIR.mng?= ../../graphics/mng diff --git a/graphics/openjpeg/buildlink3.mk b/graphics/openjpeg/buildlink3.mk index f2727847323..0f0ef7d53f6 100644 --- a/graphics/openjpeg/buildlink3.mk +++ b/graphics/openjpeg/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2014/05/15 14:14:54 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2018/01/07 13:04:15 rillig Exp $ BUILDLINK_TREE+= openjpeg @@ -7,7 +7,7 @@ OPENJPEG_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.openjpeg+= openjpeg>=2.1.0 BUILDLINK_ABI_DEPENDS.openjpeg+= openjpeg>=2.1.0 -BUILDLINK_PKGSRCDIR.openjpeg?= ../../graphics/openjpeg +BUILDLINK_PKGSRCDIR.openjpeg?= ../../graphics/openjpeg .endif # OPENJPEG_BUILDLINK3_MK BUILDLINK_TREE+= -openjpeg diff --git a/graphics/p5-Gnome2-Canvas/buildlink3.mk b/graphics/p5-Gnome2-Canvas/buildlink3.mk index dd4b7a7072b..ac1c715e1c9 100644 --- a/graphics/p5-Gnome2-Canvas/buildlink3.mk +++ b/graphics/p5-Gnome2-Canvas/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.25 2017/02/12 06:24:45 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.26 2018/01/07 13:04:15 rillig Exp $ BUILDLINK_TREE+= p5-Gnome2-Canvas @@ -6,7 +6,7 @@ BUILDLINK_TREE+= p5-Gnome2-Canvas P5_GNOME2_CANVAS_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.p5-Gnome2-Canvas+= p5-Gnome2-Canvas>=1.002 -BUILDLINK_ABI_DEPENDS.p5-Gnome2-Canvas+= p5-Gnome2-Canvas>=1.002nb29 +BUILDLINK_ABI_DEPENDS.p5-Gnome2-Canvas+= p5-Gnome2-Canvas>=1.002nb29 BUILDLINK_PKGSRCDIR.p5-Gnome2-Canvas?= ../../graphics/p5-Gnome2-Canvas .include "../../graphics/libgnomecanvas/buildlink3.mk" diff --git a/graphics/p5-cairo/buildlink3.mk b/graphics/p5-cairo/buildlink3.mk index b952d7a4ae6..2b2be2eba5b 100644 --- a/graphics/p5-cairo/buildlink3.mk +++ b/graphics/p5-cairo/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.15 2015/04/25 14:23:17 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.16 2018/01/07 13:04:16 rillig Exp $ BUILDLINK_TREE+= p5-cairo @@ -7,7 +7,7 @@ P5_CAIRO_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.p5-cairo+= p5-cairo>=1.023 BUILDLINK_ABI_DEPENDS.p5-cairo+= p5-cairo>=1.104nb3 -BUILDLINK_PKGSRCDIR.p5-cairo?= ../../graphics/p5-cairo +BUILDLINK_PKGSRCDIR.p5-cairo?= ../../graphics/p5-cairo .include "../../graphics/cairo/buildlink3.mk" .endif # P5_CAIRO_BUILDLINK3_MK diff --git a/graphics/plotutils/buildlink3.mk b/graphics/plotutils/buildlink3.mk index 4b2cb3d5c24..3cf20c97483 100644 --- a/graphics/plotutils/buildlink3.mk +++ b/graphics/plotutils/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.17 2013/02/16 11:17:56 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.18 2018/01/07 13:04:16 rillig Exp $ BUILDLINK_TREE+= plotutils @@ -7,7 +7,7 @@ PLOTUTILS_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.plotutils+= plotutils>=2.4.1nb2 BUILDLINK_ABI_DEPENDS.plotutils+= plotutils>=2.6nb4 -BUILDLINK_PKGSRCDIR.plotutils?= ../../graphics/plotutils +BUILDLINK_PKGSRCDIR.plotutils?= ../../graphics/plotutils pkgbase := plotutils .include "../../mk/pkg-build-options.mk" diff --git a/graphics/py-cairo/buildlink3.mk b/graphics/py-cairo/buildlink3.mk index 52e6dfd8600..2fcd4aaf3f6 100644 --- a/graphics/py-cairo/buildlink3.mk +++ b/graphics/py-cairo/buildlink3.mk @@ -1,15 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.24 2015/04/25 14:23:17 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.25 2018/01/07 13:04:16 rillig Exp $ BUILDLINK_TREE+= py-cairo .if !defined(PY_CAIRO_BUILDLINK3_MK) PY_CAIRO_BUILDLINK3_MK:= -. include "../../lang/python/pyversion.mk" +.include "../../lang/python/pyversion.mk" BUILDLINK_API_DEPENDS.py-cairo+= ${PYPKGPREFIX}-cairo>=1.10.0 BUILDLINK_ABI_DEPENDS.py-cairo?= ${PYPKGPREFIX}-cairo>=1.10.0nb4 -BUILDLINK_PKGSRCDIR.py-cairo?= ../../graphics/py-cairo +BUILDLINK_PKGSRCDIR.py-cairo?= ../../graphics/py-cairo .include "../../graphics/cairo/buildlink3.mk" .endif # PY_CAIRO_BUILDLINK3_MK diff --git a/graphics/py-imaging/buildlink3.mk b/graphics/py-imaging/buildlink3.mk index bc49e28514b..a0c55cfd615 100644 --- a/graphics/py-imaging/buildlink3.mk +++ b/graphics/py-imaging/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.18 2013/02/16 12:07:26 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.19 2018/01/07 13:04:16 rillig Exp $ BUILDLINK_TREE+= pyimaging @@ -9,7 +9,7 @@ PY_IMAGING_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.pyimaging+= ${PYPKGPREFIX}-imaging>=1.1.4 BUILDLINK_ABI_DEPENDS.pyimaging+= ${PYPKGPREFIX}-imaging>=1.1.7nb5 -BUILDLINK_PKGSRCDIR.pyimaging?= ../../graphics/py-imaging +BUILDLINK_PKGSRCDIR.pyimaging?= ../../graphics/py-imaging .include "../../mk/jpeg.buildlink3.mk" .endif # PY_IMAGING_BUILDLINK3_MK diff --git a/graphics/py-imagingtk/buildlink3.mk b/graphics/py-imagingtk/buildlink3.mk index 779cdb77287..74a990c61ca 100644 --- a/graphics/py-imagingtk/buildlink3.mk +++ b/graphics/py-imagingtk/buildlink3.mk @@ -1,9 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.6 2013/06/04 22:16:25 tron Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2018/01/07 13:04:16 rillig Exp $ BUILDLINK_TREE+= py-imagingtk .if !defined(PY_IMAGINGTK_BUILDLINK3_MK) PY_IMAGINGTK_BUILDLINK3_MK:= + .include "../../lang/python/pyversion.mk" # guesstimate diff --git a/graphics/qore-glut-module/buildlink3.mk b/graphics/qore-glut-module/buildlink3.mk index 5f5dfc557fb..47f66aa6d29 100644 --- a/graphics/qore-glut-module/buildlink3.mk +++ b/graphics/qore-glut-module/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2017/10/12 18:21:24 nros Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2018/01/07 13:04:16 rillig Exp $ # BUILDLINK_TREE+= qore-glut-module @@ -8,7 +8,7 @@ QORE_GLUT_MODULE_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.qore-glut-module+= qore-glut-module>=0.0.3 BUILDLINK_ABI_DEPENDS.qore-glut-module?= qore-glut-module>=0.0.3nb7 -BUILDLINK_PKGSRCDIR.qore-glut-module?= ../../graphics/qore-glut-module +BUILDLINK_PKGSRCDIR.qore-glut-module?= ../../graphics/qore-glut-module .include "../../graphics/qore-opengl-module/buildlink3.mk" .endif # QORE_GLUT_MODULE_BUILDLINK3_MK diff --git a/graphics/quesoglc/buildlink3.mk b/graphics/quesoglc/buildlink3.mk index 2c3846ff0cb..778e80063a8 100644 --- a/graphics/quesoglc/buildlink3.mk +++ b/graphics/quesoglc/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:44 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:16 rillig Exp $ BUILDLINK_TREE+= quesoglc @@ -6,7 +6,7 @@ BUILDLINK_TREE+= quesoglc QUESOGLC_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.quesoglc+= quesoglc>=0.7.1 -BUILDLINK_PKGSRCDIR.quesoglc?= ../../graphics/quesoglc +BUILDLINK_PKGSRCDIR.quesoglc?= ../../graphics/quesoglc .endif # QUESOGLC_BUILDLINK3_MK BUILDLINK_TREE+= -quesoglc diff --git a/graphics/ruby-gnome2-gdk3/buildlink3.mk b/graphics/ruby-gnome2-gdk3/buildlink3.mk index a1ac667f0e7..5d0f0e69a1e 100644 --- a/graphics/ruby-gnome2-gdk3/buildlink3.mk +++ b/graphics/ruby-gnome2-gdk3/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.16 2017/11/23 17:19:42 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.17 2018/01/07 13:04:16 rillig Exp $ BUILDLINK_TREE+= ruby-gnome2-gdk3 @@ -7,7 +7,7 @@ RUBY_GNOME2_GDK3_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ruby-gnome2-gdk3+= ${RUBY_PKGPREFIX}-gnome2-gtk3>=1.2 BUILDLINK_ABI_DEPENDS.ruby-gnome2-gdk3+= ruby23-gnome2-gdk3>=3.1.9nb1 -BUILDLINK_PKGSRCDIR.ruby-gnome2-gdk3?= ../../graphics/ruby-gnome2-gdk3 +BUILDLINK_PKGSRCDIR.ruby-gnome2-gdk3?= ../../graphics/ruby-gnome2-gdk3 .include "../../x11/gtk3/buildlink3.mk" .endif # RUBY_GNOME2_GDK3_BUILDLINK3_MK diff --git a/graphics/sane-backends/buildlink3.mk b/graphics/sane-backends/buildlink3.mk index 202d097da41..a148f6d29ac 100644 --- a/graphics/sane-backends/buildlink3.mk +++ b/graphics/sane-backends/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.19 2016/04/09 14:19:25 richard Exp $ +# $NetBSD: buildlink3.mk,v 1.20 2018/01/07 13:04:16 rillig Exp $ BUILDLINK_TREE+= sane-backends @@ -11,7 +11,7 @@ BUILDLINK_PKGSRCDIR.sane-backends?= ../../graphics/sane-backends .include "../../mk/bsd.fast.prefs.mk" -. include "../../devel/libusb1/buildlink3.mk" +.include "../../devel/libusb1/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" .include "../../mk/jpeg.buildlink3.mk" .endif # SANE_BACKENDS_BUILDLINK3_MK diff --git a/graphics/tango-icon-theme/buildlink3.mk b/graphics/tango-icon-theme/buildlink3.mk index ea9d79e0566..9f916c97e11 100644 --- a/graphics/tango-icon-theme/buildlink3.mk +++ b/graphics/tango-icon-theme/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/11/29 21:47:36 snj Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:16 rillig Exp $ BUILDLINK_TREE+= tango-icon-theme @@ -6,7 +6,7 @@ BUILDLINK_TREE+= tango-icon-theme TANGO_ICON_THEME_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.tango-icon-theme+= tango-icon-theme>=0.8.90 -BUILDLINK_PKGSRCDIR.tango-icon-theme?= ../../graphics/tango-icon-theme +BUILDLINK_PKGSRCDIR.tango-icon-theme?= ../../graphics/tango-icon-theme .endif # TANGO_ICON_THEME_BUILDLINK3_MK BUILDLINK_TREE+= -tango-icon-theme diff --git a/graphics/wm-icons/buildlink3.mk b/graphics/wm-icons/buildlink3.mk index 3f093fa0e8c..6f1a708fe59 100644 --- a/graphics/wm-icons/buildlink3.mk +++ b/graphics/wm-icons/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2015/12/28 15:08:54 tsutsui Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:16 rillig Exp $ BUILDLINK_TREE+= wm-icons @@ -6,7 +6,7 @@ BUILDLINK_TREE+= wm-icons WM_ICONS_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.wm-icons+= wm-icons>=0.4.0 -BUILDLINK_PKGSRCDIR.wm-icons?= ../../graphics/wm-icons +BUILDLINK_PKGSRCDIR.wm-icons?= ../../graphics/wm-icons .endif # WM_ICONS_BUILDLINK3_MK BUILDLINK_TREE+= -wm-icons diff --git a/graphics/xfce4-icon-theme/buildlink3.mk b/graphics/xfce4-icon-theme/buildlink3.mk index b07c341ed55..a3964f4a4f0 100644 --- a/graphics/xfce4-icon-theme/buildlink3.mk +++ b/graphics/xfce4-icon-theme/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.42 2017/02/12 06:24:45 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.43 2018/01/07 13:04:16 rillig Exp $ BUILDLINK_TREE+= xfce4-icon-theme @@ -7,7 +7,7 @@ XFCE4_ICON_THEME_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.xfce4-icon-theme+= xfce4-icon-theme>=4.4.3 BUILDLINK_ABI_DEPENDS.xfce4-icon-theme+= xfce4-icon-theme>=4.4.3nb22 -BUILDLINK_PKGSRCDIR.xfce4-icon-theme?= ../../graphics/xfce4-icon-theme +BUILDLINK_PKGSRCDIR.xfce4-icon-theme?= ../../graphics/xfce4-icon-theme .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../x11/libSM/buildlink3.mk" diff --git a/ham/flxmlrpc/buildlink3.mk b/ham/flxmlrpc/buildlink3.mk index 66b15a9a5a5..f83f9d0aa7b 100644 --- a/ham/flxmlrpc/buildlink3.mk +++ b/ham/flxmlrpc/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2017/05/05 00:05:40 mef Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:17 rillig Exp $ BUILDLINK_TREE+= flxmlrpc @@ -6,7 +6,7 @@ BUILDLINK_TREE+= flxmlrpc FLXMLRPC_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.flxmlrpc+= flxmlrpc>=0.1.4 -BUILDLINK_PKGSRCDIR.flxmlrpc?= ../../ham/flxmlrpc +BUILDLINK_PKGSRCDIR.flxmlrpc?= ../../ham/flxmlrpc .endif # FLXMLRPC_BUILDLINK3_MK diff --git a/ham/gnuradio-digital/buildlink3.mk b/ham/gnuradio-digital/buildlink3.mk index 8e2bfd6a935..855c1476f5d 100644 --- a/ham/gnuradio-digital/buildlink3.mk +++ b/ham/gnuradio-digital/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2014/10/13 12:51:09 mef Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:17 rillig Exp $ BUILDLINK_TREE+= gnuradio-digital @@ -7,7 +7,7 @@ GNURADIO_DIGITAL_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.gnuradio-digital+= gnuradio-digital>=3.7.5 BUILDLINK_ABI_DEPENDS.gnuradio-digital+= gnuradio-digital>=3.7.5 -BUILDLINK_PKGSRCDIR.gnuradio-digital?= ../../ham/gnuradio-digital +BUILDLINK_PKGSRCDIR.gnuradio-digital?= ../../ham/gnuradio-digital .endif # GNURADIO_DIGITAL_BUILDLINK3_MK BUILDLINK_TREE+= -gnuradio-digital diff --git a/ham/gnuradio-trellis/buildlink3.mk b/ham/gnuradio-trellis/buildlink3.mk index 1ea4c1434d3..ad3f195498b 100644 --- a/ham/gnuradio-trellis/buildlink3.mk +++ b/ham/gnuradio-trellis/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2014/10/13 12:51:10 mef Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:17 rillig Exp $ BUILDLINK_TREE+= gnuradio-trellis @@ -7,7 +7,7 @@ GNURADIO_TRELLIS_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.gnuradio-trellis+= gnuradio-trellis>=3.7.5 BUILDLINK_ABI_DEPENDS.gnuradio-trellis+= gnuradio-trellis>=3.7.5 -BUILDLINK_PKGSRCDIR.gnuradio-trellis?= ../../ham/gnuradio-trellis +BUILDLINK_PKGSRCDIR.gnuradio-trellis?= ../../ham/gnuradio-trellis .endif # GNURADIO_TRELLIS_BUILDLINK3_MK BUILDLINK_TREE+= -gnuradio-trellis diff --git a/ham/gnuradio-vocoder/buildlink3.mk b/ham/gnuradio-vocoder/buildlink3.mk index 09496d9601f..d6df8bc3652 100644 --- a/ham/gnuradio-vocoder/buildlink3.mk +++ b/ham/gnuradio-vocoder/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2014/10/13 12:51:10 mef Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:17 rillig Exp $ BUILDLINK_TREE+= gnuradio-vocoder @@ -7,7 +7,7 @@ GNURADIO_VOCODER_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.gnuradio-vocoder+= gnuradio-vocoder>=3.7.5 BUILDLINK_ABI_DEPENDS.gnuradio-vocoder+= gnuradio-vocoder>=3.7.5 -BUILDLINK_PKGSRCDIR.gnuradio-vocoder?= ../../ham/gnuradio-vocoder +BUILDLINK_PKGSRCDIR.gnuradio-vocoder?= ../../ham/gnuradio-vocoder .endif # GNURADIO_VOCODER_BUILDLINK3_MK BUILDLINK_TREE+= -gnuradio-vocoder diff --git a/ham/gnuradio-wavelet/buildlink3.mk b/ham/gnuradio-wavelet/buildlink3.mk index 48772ad9937..76fbf75cffb 100644 --- a/ham/gnuradio-wavelet/buildlink3.mk +++ b/ham/gnuradio-wavelet/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2014/10/13 12:51:10 mef Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:17 rillig Exp $ BUILDLINK_TREE+= gnuradio-wavelet @@ -7,7 +7,7 @@ GNURADIO_WAVELET_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.gnuradio-wavelet+= gnuradio-wavelet>=3.7.5 BUILDLINK_ABI_DEPENDS.gnuradio-wavelet+= gnuradio-wavelet>=3.7.5 -BUILDLINK_PKGSRCDIR.gnuradio-wavelet?= ../../ham/gnuradio-wavelet +BUILDLINK_PKGSRCDIR.gnuradio-wavelet?= ../../ham/gnuradio-wavelet .endif # GNURADIO_WAVELET_BUILDLINK3_MK BUILDLINK_TREE+= -gnuradio-wavelet diff --git a/ham/hackrf/buildlink3.mk b/ham/hackrf/buildlink3.mk index 0e28bd21a4b..bed9145c547 100644 --- a/ham/hackrf/buildlink3.mk +++ b/ham/hackrf/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2014/10/13 13:46:23 mef Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:17 rillig Exp $ BUILDLINK_TREE+= hackrf @@ -7,7 +7,7 @@ HACKRF_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.hackrf+= hackrf>=0.1 BUILDLINK_ABI_DEPENDS.hackrf+= hackrf>=0.1 -BUILDLINK_PKGSRCDIR.hackrf?= ../../ham/hackrf +BUILDLINK_PKGSRCDIR.hackrf?= ../../ham/hackrf .endif # HACKRF_BUILDLINK3_MK BUILDLINK_TREE+= -hackrf diff --git a/ham/uhd/buildlink3.mk b/ham/uhd/buildlink3.mk index d0a5f711f6a..6796b89c163 100644 --- a/ham/uhd/buildlink3.mk +++ b/ham/uhd/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2017/07/31 21:09:27 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:17 rillig Exp $ BUILDLINK_TREE+= uhd @@ -9,7 +9,7 @@ BUILDLINK_API_DEPENDS.uhd+= uhd>=2.22 BUILDLINK_PKGSRCDIR.uhd?= ../../ham/uhd # gnuradio-uhd FindUHD.cmake uses this env var as a hint for finding uhd -CONFIGURE_ENV+= UHD_DIR=${BUILDLINK_DIR:Q} +CONFIGURE_ENV+= UHD_DIR=${BUILDLINK_DIR} .endif # UHD_BUILDLINK3_MK diff --git a/inputmethod/canna-lib/buildlink3.mk b/inputmethod/canna-lib/buildlink3.mk index b0a51e6ed87..c961b031e1a 100644 --- a/inputmethod/canna-lib/buildlink3.mk +++ b/inputmethod/canna-lib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.8 2015/10/18 03:58:31 tsutsui Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2018/01/07 13:04:17 rillig Exp $ BUILDLINK_TREE+= Canna-lib @@ -6,7 +6,7 @@ BUILDLINK_TREE+= Canna-lib CANNA_LIB_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.Canna-lib+= Canna-lib>=3.7pl3 -BUILDLINK_PKGSRCDIR.Canna-lib?= ../../inputmethod/canna-lib +BUILDLINK_PKGSRCDIR.Canna-lib?= ../../inputmethod/canna-lib .endif # CANNA_LIB_BUILDLINK3_MK BUILDLINK_TREE+= -Canna-lib diff --git a/inputmethod/input-pad/buildlink3.mk b/inputmethod/input-pad/buildlink3.mk index 6949b1ffb68..ac685202957 100644 --- a/inputmethod/input-pad/buildlink3.mk +++ b/inputmethod/input-pad/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.29 2017/11/23 17:19:42 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.30 2018/01/07 13:04:17 rillig Exp $ # BUILDLINK_TREE+= input-pad @@ -8,7 +8,7 @@ INPUT_PAD_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.input-pad+= input-pad>=1.0.2 BUILDLINK_ABI_DEPENDS.input-pad?= input-pad>=1.0.3nb7 -BUILDLINK_PKGSRCDIR.input-pad?= ../../inputmethod/input-pad +BUILDLINK_PKGSRCDIR.input-pad?= ../../inputmethod/input-pad .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" diff --git a/inputmethod/libchewing/buildlink3.mk b/inputmethod/libchewing/buildlink3.mk index 9f6b72b6a63..077fac196ca 100644 --- a/inputmethod/libchewing/buildlink3.mk +++ b/inputmethod/libchewing/buildlink3.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.15 2017/11/30 16:45:04 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.16 2018/01/07 13:04:17 rillig Exp $ BUILDLINK_TREE+= libchewing .if !defined(LIBCHEWING_BUILDLINK3_MK) LIBCHEWING_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.libchewing+= libchewing>=0.3.2 +BUILDLINK_API_DEPENDS.libchewing+= libchewing>=0.3.2 BUILDLINK_ABI_DEPENDS.libchewing+= libchewing>=0.4.0nb8 BUILDLINK_PKGSRCDIR.libchewing?= ../../inputmethod/libchewing diff --git a/inputmethod/libhangul/buildlink3.mk b/inputmethod/libhangul/buildlink3.mk index db0dec85330..de5a5cad17d 100644 --- a/inputmethod/libhangul/buildlink3.mk +++ b/inputmethod/libhangul/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2011/11/10 10:40:11 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2018/01/07 13:04:17 rillig Exp $ BUILDLINK_TREE+= libhangul @@ -7,7 +7,7 @@ LIBHANGUL_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libhangul+= libhangul>=0.0.4 BUILDLINK_ABI_DEPENDS.libhangul+= libhangul>=0.1.0 -BUILDLINK_PKGSRCDIR.libhangul?= ../../inputmethod/libhangul +BUILDLINK_PKGSRCDIR.libhangul?= ../../inputmethod/libhangul .endif # LIBHANGUL_BUILDLINK3_MK BUILDLINK_TREE+= -libhangul diff --git a/inputmethod/tomoe-gtk/buildlink3.mk b/inputmethod/tomoe-gtk/buildlink3.mk index 7fde376e261..622dec52fdc 100644 --- a/inputmethod/tomoe-gtk/buildlink3.mk +++ b/inputmethod/tomoe-gtk/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.29 2017/02/12 06:24:46 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.30 2018/01/07 13:04:18 rillig Exp $ BUILDLINK_TREE+= tomoe-gtk @@ -7,7 +7,7 @@ TOMOE_GTK_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.tomoe-gtk+= tomoe-gtk>=0.6.0 BUILDLINK_ABI_DEPENDS.tomoe-gtk+= tomoe-gtk>=0.6.0nb28 -BUILDLINK_PKGSRCDIR.tomoe-gtk?= ../../inputmethod/tomoe-gtk +BUILDLINK_PKGSRCDIR.tomoe-gtk?= ../../inputmethod/tomoe-gtk .include "../../inputmethod/tomoe/buildlink3.mk" .include "../../fonts/gucharmap/buildlink3.mk" diff --git a/inputmethod/unicon-im/buildlink3.mk b/inputmethod/unicon-im/buildlink3.mk index 9af3e8400c3..0ea60cdbd7c 100644 --- a/inputmethod/unicon-im/buildlink3.mk +++ b/inputmethod/unicon-im/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:47 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2018/01/07 13:04:18 rillig Exp $ BUILDLINK_TREE+= unicon-im @@ -7,7 +7,7 @@ UNICON_IM_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.unicon-im+= unicon-im>=1.2nb2 BUILDLINK_ABI_DEPENDS.unicon-im+= unicon-im>=1.2nb4 -BUILDLINK_PKGSRCDIR.unicon-im?= ../../inputmethod/unicon-im +BUILDLINK_PKGSRCDIR.unicon-im?= ../../inputmethod/unicon-im .include "../../devel/pth/buildlink3.mk" .endif # UNICON_IM_BUILDLINK3_MK diff --git a/lang/gcc-aux/buildlink3.mk b/lang/gcc-aux/buildlink3.mk index f7c1ccfa361..da7f5cfe7e2 100644 --- a/lang/gcc-aux/buildlink3.mk +++ b/lang/gcc-aux/buildlink3.mk @@ -1,12 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.4 2014/04/30 16:24:39 marino Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2018/01/07 13:04:18 rillig Exp $ -BUILDLINK_TREE+= gcc-aux +BUILDLINK_TREE+= gcc-aux .if !defined(GCC_AUX_BUILDLINK3_MK) GCC_AUX_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.gcc-aux+= gcc-aux>=20140422 -BUILDLINK_PKGSRCDIR.gcc-aux?= ../../lang/gcc-aux +BUILDLINK_API_DEPENDS.gcc-aux+= gcc-aux>=20140422 +BUILDLINK_PKGSRCDIR.gcc-aux?= ../../lang/gcc-aux .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/gmp/buildlink3.mk" @@ -21,4 +21,4 @@ pkgbase := gcc-aux .endif .endif -BUILDLINK_TREE+= -gcc-aux +BUILDLINK_TREE+= -gcc-aux diff --git a/lang/gcc2/buildlink3.mk b/lang/gcc2/buildlink3.mk index dbb19759d01..7c11b2378c2 100644 --- a/lang/gcc2/buildlink3.mk +++ b/lang/gcc2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2015/04/25 10:32:07 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:18 rillig Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -15,11 +15,11 @@ BUILDLINK_LIBDIRS.gcc2?= \ ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc2}\///} # Packages that link against shared libraries need a full dependency. -. if defined(_USE_GCC_SHLIB) +.if defined(_USE_GCC_SHLIB) BUILDLINK_DEPMETHOD.gcc2+= full -. else +.else BUILDLINK_DEPMETHOD.gcc2?= build -. endif +.endif .endif # GCC2_BUILDLINK3_MK BUILDLINK_TREE+= -gcc2 diff --git a/lang/gcc3-c++/buildlink3.mk b/lang/gcc3-c++/buildlink3.mk index b4b391ce825..400791e1333 100644 --- a/lang/gcc3-c++/buildlink3.mk +++ b/lang/gcc3-c++/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.20 2014/09/06 08:20:28 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.21 2018/01/07 13:04:18 rillig Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -7,23 +7,23 @@ BUILDLINK_TREE+= gcc3-cxx .if !defined(GCC3_CXX_BUILDLINK3_MK) GCC3_CXX_BUILDLINK3_MK:= -. if defined(GCC3_INSTALLTO_SUBPREFIX) -. if ${GCC3_INSTALLTO_SUBPREFIX} != "gcc3" -GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX} -. endif +.if defined(GCC3_INSTALLTO_SUBPREFIX) +. if ${GCC3_INSTALLTO_SUBPREFIX} != "gcc3" +GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX} . endif +.endif BUILDLINK_API_DEPENDS.gcc3-cxx+= gcc3${GCC3_PKGMODIF}-c++>=3.0 BUILDLINK_ABI_DEPENDS.gcc3-cxx+= gcc3-c++>=3.3.5nb1 -BUILDLINK_PKGSRCDIR.gcc3-cxx?= ../../lang/gcc3-c++ +BUILDLINK_PKGSRCDIR.gcc3-cxx?= ../../lang/gcc3-c++ BUILDLINK_LIBDIRS.gcc3-cxx?= \ lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3-cxx}\///} # Packages that link against shared libraries need a full dependency. -. if defined(_USE_GCC_SHLIB) +.if defined(_USE_GCC_SHLIB) BUILDLINK_DEPMETHOD.gcc3-cxx+= full -. else +.else BUILDLINK_DEPMETHOD.gcc3-cxx?= build -. endif +.endif .endif # GCC3_CXX_BUILDLINK3_MK BUILDLINK_TREE+= -gcc3-cxx diff --git a/lang/gcc3-c/buildlink3.mk b/lang/gcc3-c/buildlink3.mk index b27200ec848..dc63932b5f9 100644 --- a/lang/gcc3-c/buildlink3.mk +++ b/lang/gcc3-c/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.19 2014/09/06 08:20:29 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.20 2018/01/07 13:04:18 rillig Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -7,34 +7,34 @@ BUILDLINK_TREE+= gcc3-c .if !defined(GCC3_C_BUILDLINK3_MK) GCC3_C_BUILDLINK3_MK:= -. include "../../mk/bsd.prefs.mk" -. if defined(GCC3_INSTALLTO_SUBPREFIX) +.include "../../mk/bsd.prefs.mk" +.if defined(GCC3_INSTALLTO_SUBPREFIX) # # "gcc3" is the directory named in pkgsrc/lang/gcc3-c/Makefile.common" # as GCC3_DEFAULT_SUBPREFIX. # -. if ${GCC3_INSTALLTO_SUBPREFIX} != "gcc3" +. if ${GCC3_INSTALLTO_SUBPREFIX} != "gcc3" GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX} -. endif . endif +.endif BUILDLINK_API_DEPENDS.gcc3-c+= gcc3${GCC3_PKGMODIF}-c>=3.0 BUILDLINK_ABI_DEPENDS.gcc3-c+= gcc3-c>=3.3.5nb1 BUILDLINK_PKGSRCDIR.gcc3-c?= ../../lang/gcc3-c BUILDLINK_GCC3_LIBDIRS= lib -. if defined(GCC3_INSTALLTO_SUBPREFIX) +.if defined(GCC3_INSTALLTO_SUBPREFIX) BUILDLINK_GCC3_LIBDIRS+= ${GCC3_INSTALLTO_SUBPREFIX}/lib -. else +.else BUILDLINK_GCC3_LIBDIRS+= gcc3/lib -. endif +.endif BUILDLINK_GCC3_LIBDIRS+= ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3-c}\///} BUILDLINK_LIBDIRS.gcc3-c+= ${BUILDLINK_GCC3_LIBDIRS} # Packages that link against shared libraries need a full dependency. -. if defined(_USE_GCC_SHLIB) +.if defined(_USE_GCC_SHLIB) BUILDLINK_DEPMETHOD.gcc3-c+= full -. else +.else BUILDLINK_DEPMETHOD.gcc3-c?= build -. endif +.endif .endif # GCC3_C_BUILDLINK3_MK BUILDLINK_TREE+= -gcc3-c diff --git a/lang/gcc3-f77/buildlink3.mk b/lang/gcc3-f77/buildlink3.mk index 6bf5861f397..89436ce8a35 100644 --- a/lang/gcc3-f77/buildlink3.mk +++ b/lang/gcc3-f77/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.20 2014/09/06 08:20:29 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.21 2018/01/07 13:04:18 rillig Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -7,23 +7,23 @@ BUILDLINK_TREE+= gcc3-f77 .if !defined(GCC3_F77_BUILDLINK3_MK) GCC3_F77_BUILDLINK3_MK:= -. if defined(GCC3_INSTALLTO_SUBPREFIX) -. if ${GCC3_INSTALLTO_SUBPREFIX} != "gcc3" -GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX} -. endif +.if defined(GCC3_INSTALLTO_SUBPREFIX) +. if ${GCC3_INSTALLTO_SUBPREFIX} != "gcc3" +GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX} . endif +.endif BUILDLINK_API_DEPENDS.gcc3-f77+= gcc3${GCC3_PKGMODIF}-f77>=3.0 BUILDLINK_ABI_DEPENDS.gcc3-f77+= gcc3-f77>=3.3.5nb2 -BUILDLINK_PKGSRCDIR.gcc3-f77?= ../../lang/gcc3-f77 +BUILDLINK_PKGSRCDIR.gcc3-f77?= ../../lang/gcc3-f77 BUILDLINK_LIBDIRS.gcc3-f77?= \ lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3-f77}\///} # Packages that link against shared libraries need a full dependency. -. if defined(_USE_GCC_SHLIB) +.if defined(_USE_GCC_SHLIB) BUILDLINK_DEPMETHOD.gcc3-f77+= full -. else +.else BUILDLINK_DEPMETHOD.gcc3-f77?= build -. endif +.endif .endif # GCC3_F77_BUILDLINK3_MK BUILDLINK_TREE+= -gcc3-f77 diff --git a/lang/gcc3-objc/buildlink3.mk b/lang/gcc3-objc/buildlink3.mk index 6ed138bcfe3..d415685cd2b 100644 --- a/lang/gcc3-objc/buildlink3.mk +++ b/lang/gcc3-objc/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.20 2014/09/06 08:20:29 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.21 2018/01/07 13:04:18 rillig Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -7,23 +7,23 @@ BUILDLINK_TREE+= gcc3-objc .if !defined(GCC3_OBJC_BUILDLINK3_MK) GCC3_OBJC_BUILDLINK3_MK:= -. if defined(GCC3_INSTALLTO_SUBPREFIX) -. if ${GCC3_INSTALLTO_SUBPREFIX} != "gcc3" -GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX} -. endif +.if defined(GCC3_INSTALLTO_SUBPREFIX) +. if ${GCC3_INSTALLTO_SUBPREFIX} != "gcc3" +GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX} . endif +.endif BUILDLINK_API_DEPENDS.gcc3-objc+= gcc3${GCC3_PKGMODIF}-objc>=3.0 BUILDLINK_ABI_DEPENDS.gcc3-objc+= gcc3-objc>=3.3.5nb1 -BUILDLINK_PKGSRCDIR.gcc3-objc?= ../../lang/gcc3-objc +BUILDLINK_PKGSRCDIR.gcc3-objc?= ../../lang/gcc3-objc BUILDLINK_LIBDIRS.gcc3-objc?= \ lib ${_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc3-objc}\///} # Packages that link against shared libraries need a full dependency. -. if defined(_USE_GCC_SHLIB) +.if defined(_USE_GCC_SHLIB) BUILDLINK_DEPMETHOD.gcc3-objc+= full -. else +.else BUILDLINK_DEPMETHOD.gcc3-objc?= build -. endif +.endif .endif # GCC3_OBJC_BUILDLINK3_MK BUILDLINK_TREE+= -gcc3-objc diff --git a/lang/gcc34/buildlink3.mk b/lang/gcc34/buildlink3.mk index 13903279d74..8c779371b82 100644 --- a/lang/gcc34/buildlink3.mk +++ b/lang/gcc34/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.23 2015/11/25 12:51:16 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.24 2018/01/07 13:04:18 rillig Exp $ BUILDLINK_TREE+= gcc34 @@ -12,12 +12,12 @@ BUILDLINK_API_DEPENDS.gcc34+= gcc34>=3.4 BUILDLINK_ABI_DEPENDS.gcc34+= gcc34>=3.4.6nb4 BUILDLINK_PKGSRCDIR.gcc34?= ../../lang/gcc34 -. if exists(${_GCC34_PREFIX}/bin/gcc) +.if exists(${_GCC34_PREFIX}/bin/gcc) # logic for detecting the ADA compiler -gcc34_GNAT1!=${_GCC34_PREFIX}/bin/gcc -print-prog-name=gnat1 -. if exists(${gcc34_GNAT1}) +gcc34_GNAT1!= ${_GCC34_PREFIX}/bin/gcc -print-prog-name=gnat1 +. if exists(${gcc34_GNAT1}) BUILDLINK_ENV+= ADAC=${_GCC34_PREFIX}/bin/gcc -. endif +. endif # add libraries BUILDLINK_LIBDIRS.gcc34+= ${_GCC34_SUBDIR}/lib @@ -26,18 +26,18 @@ BUILDLINK_LIBDIRS.gcc34+= ${_GCC34_SUBDIR}/lib gcc34_GCC_ARCHDIR!= ${DIRNAME} `${_GCC34_PREFIX}/bin/gcc --print-libgcc-file-name` # add the architecture dep libraries -. if empty(gcc34_GCC_ARCHDIR:M*not_found*) +. if empty(gcc34_GCC_ARCHDIR:M*not_found*) BUILDLINK_LIBDIRS.gcc34+= ${gcc34_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc34}\///}/ # add the ada libraries -. if exists(${gcc34_GNAT1}) +. if exists(${gcc34_GNAT1}) BUILDLINK_LIBDIRS.gcc34+= ${gcc34_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc34}\///}/adalib -. endif +. endif # add the header files BUILDLINK_INCDIRS.gcc34+= ${_GCC34_SUBDIR}/include ${gcc34_GCC_ARCHDIR:S/^${BUILDLINK_PREFIX.gcc34}\///}/include -. endif . endif +.endif BUILDLINK_FILES_CMD.gcc34= \ (cd ${BUILDLINK_PREFIX.gcc34} && \ @@ -52,11 +52,11 @@ _USE_GCC_SHLIB= yes .endif # Packages that link against shared libraries need a full dependency. -. if defined(_USE_GCC_SHLIB) +.if defined(_USE_GCC_SHLIB) BUILDLINK_DEPMETHOD.gcc34+= full -. else +.else BUILDLINK_DEPMETHOD.gcc34?= build -. endif +.endif .include "../../mk/pthread.buildlink3.mk" pkgbase := gcc34 diff --git a/lang/gcc49/buildlink3.mk b/lang/gcc49/buildlink3.mk index 1573d18af4b..3d3fd0d7211 100644 --- a/lang/gcc49/buildlink3.mk +++ b/lang/gcc49/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2015/11/25 12:51:17 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:18 rillig Exp $ BUILDLINK_TREE+= gcc49 @@ -29,4 +29,5 @@ pkgbase := gcc49 .include "../../mk/dlopen.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .endif # GCC49_BUILDLINK3_MK + BUILDLINK_TREE+= -gcc49 diff --git a/lang/gcc5-aux/buildlink3.mk b/lang/gcc5-aux/buildlink3.mk index bed464c2204..e6e35781a0e 100644 --- a/lang/gcc5-aux/buildlink3.mk +++ b/lang/gcc5-aux/buildlink3.mk @@ -1,12 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.2 2016/11/26 18:23:25 marino Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:18 rillig Exp $ -BUILDLINK_TREE+= gcc5-aux +BUILDLINK_TREE+= gcc5-aux .if !defined(GCC5_AUX_BUILDLINK3_MK) GCC5_AUX_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.gcc5-aux+= gcc5-aux>=20150422 -BUILDLINK_PKGSRCDIR.gcc5-aux?= ../../lang/gcc5-aux +BUILDLINK_PKGSRCDIR.gcc5-aux?= ../../lang/gcc5-aux BUILDLINK_DEPMETHOD.gcc5-aux?= build .include "../../converters/libiconv/buildlink3.mk" @@ -19,4 +19,4 @@ pkgbase := gcc5-aux .endif -BUILDLINK_TREE+= -gcc5-aux +BUILDLINK_TREE+= -gcc5-aux diff --git a/lang/gcc5-libs/buildlink3.mk b/lang/gcc5-libs/buildlink3.mk index 7efa8209053..78aa5aa4a54 100644 --- a/lang/gcc5-libs/buildlink3.mk +++ b/lang/gcc5-libs/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2018/01/01 18:16:37 rillig Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:19 rillig Exp $ BUILDLINK_TREE+= gcc5-libs @@ -11,7 +11,7 @@ BUILDLINK_API_DEPENDS.gcc5-libs+= gcc5-libs>=5.1.0 BUILDLINK_API_DEPENDS.gcc5-libs+= {gcc5,gcc5-libs}>=5.1.0 .endif BUILDLINK_PKGSRCDIR.gcc5-libs= ../../lang/gcc5-libs -BUILDLINK_DEPMETHOD.gcc5-libs?= full +BUILDLINK_DEPMETHOD.gcc5-libs?= full BUILDLINK_PASSTHRU_DIRS+= ${BUILDLINK_PREFIX.gcc5-libs}/gcc5 diff --git a/lang/gcc5/buildlink3.mk b/lang/gcc5/buildlink3.mk index 8bf39153573..73b8163f020 100644 --- a/lang/gcc5/buildlink3.mk +++ b/lang/gcc5/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2015/11/25 12:51:17 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:18 rillig Exp $ BUILDLINK_TREE+= gcc5 @@ -30,4 +30,5 @@ pkgbase := gcc5 .include "../../mk/dlopen.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .endif # GCC5_BUILDLINK3_MK + BUILDLINK_TREE+= -gcc5 diff --git a/lang/gcc6-aux/buildlink3.mk b/lang/gcc6-aux/buildlink3.mk index ed5119704cc..a13f4e55862 100644 --- a/lang/gcc6-aux/buildlink3.mk +++ b/lang/gcc6-aux/buildlink3.mk @@ -1,12 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.1 2016/12/13 01:19:20 marino Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:19 rillig Exp $ -BUILDLINK_TREE+= gcc6-aux +BUILDLINK_TREE+= gcc6-aux .if !defined(GCC5_AUX_BUILDLINK3_MK) GCC5_AUX_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.gcc6-aux+= gcc6-aux>=20160822 -BUILDLINK_PKGSRCDIR.gcc6-aux?= ../../lang/gcc6-aux +BUILDLINK_PKGSRCDIR.gcc6-aux?= ../../lang/gcc6-aux BUILDLINK_DEPMETHOD.gcc6-aux?= build .include "../../converters/libiconv/buildlink3.mk" @@ -19,4 +19,4 @@ pkgbase := gcc6-aux .endif -BUILDLINK_TREE+= -gcc6-aux +BUILDLINK_TREE+= -gcc6-aux diff --git a/lang/gcc6-libs/buildlink3.mk b/lang/gcc6-libs/buildlink3.mk index f7808b8b772..cb2e4a80529 100644 --- a/lang/gcc6-libs/buildlink3.mk +++ b/lang/gcc6-libs/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2018/01/01 18:16:37 rillig Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:19 rillig Exp $ BUILDLINK_TREE+= gcc6-libs @@ -11,7 +11,7 @@ BUILDLINK_API_DEPENDS.gcc6-libs+= gcc6-libs>=6.1.0 BUILDLINK_API_DEPENDS.gcc6-libs+= {gcc6,gcc6-libs}>=6.1.0 .endif BUILDLINK_PKGSRCDIR.gcc6-libs= ../../lang/gcc6-libs -BUILDLINK_DEPMETHOD.gcc6-libs?= full +BUILDLINK_DEPMETHOD.gcc6-libs?= full BUILDLINK_PASSTHRU_DIRS+= ${BUILDLINK_PREFIX.gcc6-libs}/gcc6 diff --git a/lang/gcc6/buildlink3.mk b/lang/gcc6/buildlink3.mk index 4dcc31c3cc2..74df7a1155b 100644 --- a/lang/gcc6/buildlink3.mk +++ b/lang/gcc6/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2016/09/12 22:13:54 maya Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:19 rillig Exp $ BUILDLINK_TREE+= gcc6 @@ -28,4 +28,5 @@ pkgbase := gcc6 .include "../../mk/dlopen.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .endif # GCC6_BUILDLINK3_MK + BUILDLINK_TREE+= -gcc6 diff --git a/lang/gnat_util/buildlink3.mk b/lang/gnat_util/buildlink3.mk index d7493766f5f..002ac376f05 100644 --- a/lang/gnat_util/buildlink3.mk +++ b/lang/gnat_util/buildlink3.mk @@ -1,13 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.1 2014/04/30 16:25:20 marino Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:19 rillig Exp $ -BUILDLINK_TREE+= gnat_util +BUILDLINK_TREE+= gnat_util .if !defined(GNAT_UTIL_BUILDLINK3_MK) GNAT_UTIL_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.gnat_util+= gnat_util>=20140422 -BUILDLINK_PKGSRCDIR.gnat_util?= ../../lang/gnat_util +BUILDLINK_PKGSRCDIR.gnat_util?= ../../lang/gnat_util .endif -BUILDLINK_TREE+= -gnat_util +BUILDLINK_TREE+= -gnat_util diff --git a/lang/libLLVM34/buildlink3.mk b/lang/libLLVM34/buildlink3.mk index 28514aaab1f..f35635cb5ef 100644 --- a/lang/libLLVM34/buildlink3.mk +++ b/lang/libLLVM34/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2015/04/06 17:25:05 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:19 rillig Exp $ BUILDLINK_TREE+= libLLVM34 @@ -9,7 +9,7 @@ BUILDLINK_API_DEPENDS.libLLVM34+= libLLVM34>=3.4.2nb1 BUILDLINK_PKGSRCDIR.libLLVM34?= ../../lang/libLLVM34 BUILDLINK_INCDIRS.libLLVM34?= include/libLLVM34 BUILDLINK_LIBDIRS.libLLVM34?= lib/libLLVM34 -LLVM_CONFIG_PATH?= ${BUILDLINK_PREFIX.libLLVM34}/libexec/libLLVM34/llvm-config +LLVM_CONFIG_PATH?= ${BUILDLINK_PREFIX.libLLVM34}/libexec/libLLVM34/llvm-config .endif # LIBLLVM34_BUILDLINK3_MK diff --git a/lang/libunwind/buildlink3.mk b/lang/libunwind/buildlink3.mk index 203e960af34..6f32a42b4f5 100644 --- a/lang/libunwind/buildlink3.mk +++ b/lang/libunwind/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2017/07/11 19:47:37 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:19 rillig Exp $ BUILDLINK_TREE+= libunwind @@ -6,7 +6,7 @@ BUILDLINK_TREE+= libunwind LIBUNWIND_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libunwind+= libunwind>=4.0.1 -BUILDLINK_PKGSRCDIR.libunwind?= ../../lang/libunwind +BUILDLINK_PKGSRCDIR.libunwind?= ../../lang/libunwind .include "../../lang/llvm/buildlink3.mk" .endif # LIBUNWIND_BUILDLINK3_MK diff --git a/lang/llvm/buildlink3.mk b/lang/llvm/buildlink3.mk index fbc758b5443..c2c22bf9fa5 100644 --- a/lang/llvm/buildlink3.mk +++ b/lang/llvm/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2017/07/11 19:47:37 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2018/01/07 13:04:19 rillig Exp $ BUILDLINK_TREE+= llvm @@ -12,9 +12,9 @@ LLVM_CONFIG_PATH?= ${BUILDLINK_PREFIX.llvm}/bin/llvm-config pkgbase := llvm .include "../../mk/pkg-build-options.mk" -. if !empty(PKG_BUILD_OPTIONS.llvm:Mterminfo) +.if !empty(PKG_BUILD_OPTIONS.llvm:Mterminfo) .include "../../mk/terminfo.buildlink3.mk" -. endif +.endif .include "../../devel/zlib/buildlink3.mk" .endif # LLVM_BUILDLINK3_MK diff --git a/lang/lua/buildlink3.mk b/lang/lua/buildlink3.mk index b4779513b31..9a0566960f2 100644 --- a/lang/lua/buildlink3.mk +++ b/lang/lua/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.18 2015/07/20 11:30:54 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.19 2018/01/07 13:04:19 rillig Exp $ # # This is a fake buildlink3.mk file. It figures out the Lua version # and then includes the real buildlink3.mk file for that Lua version. @@ -14,7 +14,7 @@ BUILDLINK_PREFIX.lua= ${BUILDLINK_PREFIX.${LUA_PACKAGE}} .if !defined(LUA_BUILDLINK3_MK) LUA_BUILDLINK3_MK:= -BUILDLINK_TARGETS+= buildlink-bin-unversioned +BUILDLINK_TARGETS+= buildlink-bin-unversioned buildlink-bin-unversioned: ${LN} -s ${BUILDLINK_DIR}/lib/pkgconfig/lua-${_LUA_DOT_VERSION}.pc ${BUILDLINK_DIR}/lib/pkgconfig/lua.pc diff --git a/lang/mono/buildlink3.mk b/lang/mono/buildlink3.mk index 56f796577f1..629ee532fdb 100644 --- a/lang/mono/buildlink3.mk +++ b/lang/mono/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.57 2017/11/30 16:45:04 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.58 2018/01/07 13:04:19 rillig Exp $ BUILDLINK_TREE+= mono @@ -8,7 +8,7 @@ MONO_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.mono+= mono>=4 BUILDLINK_ABI_DEPENDS.mono?= mono>=4.0.4.1nb9 BUILDLINK_PKGSRCDIR.mono?= ../../lang/mono -ALL_ENV+= MONO_SHARED_DIR=${WRKDIR:Q} +ALL_ENV+= MONO_SHARED_DIR=${WRKDIR} BUILDLINK_CONTENTS_FILTER.mono= ${EGREP} '(^include/|^lib/)' .include "../../textproc/icu/buildlink3.mk" diff --git a/lang/mono2/buildlink3.mk b/lang/mono2/buildlink3.mk index 2385923a910..36aabd9a812 100644 --- a/lang/mono2/buildlink3.mk +++ b/lang/mono2/buildlink3.mk @@ -1,14 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.10 2017/11/30 16:45:04 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2018/01/07 13:04:19 rillig Exp $ BUILDLINK_TREE+= mono .if !defined(MONO_BUILDLINK3_MK) MONO_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.mono+= mono>=2.8<3 -BUILDLINK_ABI_DEPENDS.mono+= mono>=2.10.9nb22 -BUILDLINK_PKGSRCDIR.mono?= ../../lang/mono2 -ALL_ENV+= MONO_SHARED_DIR=${WRKDIR:Q} +BUILDLINK_API_DEPENDS.mono+= mono>=2.8<3 +BUILDLINK_ABI_DEPENDS.mono+= mono>=2.10.9nb22 +BUILDLINK_PKGSRCDIR.mono?= ../../lang/mono2 +ALL_ENV+= MONO_SHARED_DIR=${WRKDIR} BUILDLINK_CONTENTS_FILTER.mono+= ${EGREP} '(^include/|^lib/)' .include "../../textproc/icu/buildlink3.mk" diff --git a/lang/ocaml/buildlink3.mk b/lang/ocaml/buildlink3.mk index 7cdb9f4dc80..f7fc419280a 100644 --- a/lang/ocaml/buildlink3.mk +++ b/lang/ocaml/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.41 2017/09/08 09:12:44 jaapb Exp $ +# $NetBSD: buildlink3.mk,v 1.42 2018/01/07 13:04:20 rillig Exp $ BUILDLINK_TREE+= ocaml @@ -10,7 +10,7 @@ BUILDLINK_ABI_DEPENDS.ocaml+= ocaml>=4.05.0 BUILDLINK_PKGSRCDIR.ocaml?= ../../lang/ocaml #BUILDLINK_DEPMETHOD.ocaml?= build -BUILDLINK_PASSTHRU_DIRS+= ${BUILDLINK_PREFIX.ocaml}/lib/ocaml +BUILDLINK_PASSTHRU_DIRS+= ${BUILDLINK_PREFIX.ocaml}/lib/ocaml BUILDLINK_TARGETS+= ocaml-wrappers OCAML_WRAPPERS= ocamlc ocamlc.opt ocamlcp ocamlmklib ocamlmktop \ @@ -23,8 +23,8 @@ ocaml-wrappers: for w in ${OCAML_WRAPPERS}; do \ ${SED} -e 's|@SH@|'${SH:Q}'|g' \ -e 's|@OCAML_PREFIX@|${BUILDLINK_PREFIX.ocaml}|g' \ - -e 's|@CFLAGS@|'${CFLAGS:Q}'|g' \ - -e 's|@LDFLAGS@|'${LDFLAGS:Q}'|g' \ + -e 's|@CFLAGS@|'${CFLAGS:M*:Q}'|g' \ + -e 's|@LDFLAGS@|'${LDFLAGS:M*:Q}'|g' \ -e 's|@WRAPPEE@|'$$w'|g' \ < ${.CURDIR}/../../lang/ocaml/files/wrapper.sh \ > ${BUILDLINK_DIR}/bin/"$$w"; \ diff --git a/lang/openjdk8/buildlink3.mk b/lang/openjdk8/buildlink3.mk index c15e6d64f6b..727672cf0c4 100644 --- a/lang/openjdk8/buildlink3.mk +++ b/lang/openjdk8/buildlink3.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.3 2017/08/03 12:34:03 bsiegert Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:20 rillig Exp $ BUILDLINK_TREE+= openjdk8 .if !defined(OPENJDK8_BUILDLINK3_MK) OPENJDK8_BUILDLINK3_MK:= -LIBDIR_ARCH= ${MACHINE_ARCH:S/x86_64/amd64/:S/sparc64/sparcv9/:C/^e?arm.*$/arm/} +LIBDIR_ARCH= ${MACHINE_ARCH:S/x86_64/amd64/:S/sparc64/sparcv9/:C/^e?arm.*$/arm/} BUILDLINK_LIBDIRS.openjdk8+= java/openjdk8/jre/lib/${LIBDIR_ARCH}/server BUILDLINK_LIBDIRS.openjdk8+= java/openjdk8/jre/lib/${LIBDIR_ARCH} diff --git a/lang/oracle-jdk8/buildlink3.mk b/lang/oracle-jdk8/buildlink3.mk index d2ed6c2b398..27c61d8762d 100644 --- a/lang/oracle-jdk8/buildlink3.mk +++ b/lang/oracle-jdk8/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2015/05/30 09:51:11 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:20 rillig Exp $ BUILDLINK_TREE+= oracle-jdk8 @@ -8,7 +8,7 @@ ORACLE_JDK8_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.oracle-jdk8+= oracle-jdk8-[0-9]* BUILDLINK_ABI_DEPENDS.oracle-jdk8+= oracle-jdk8>=8.0.45 BUILDLINK_PKGSRCDIR.oracle-jdk8?= ../../lang/oracle-jdk8 -BUILDLINK_DEPMETHOD.oracle-jdk8?= build +BUILDLINK_DEPMETHOD.oracle-jdk8?= build BUILDLINK_PASSTHRU_DIRS+= ${BUILDLINK_JAVA_PREFIX.oracle-jre8} diff --git a/lang/ossp-js/buildlink3.mk b/lang/ossp-js/buildlink3.mk index 22c712c2b88..82dd5de92b5 100644 --- a/lang/ossp-js/buildlink3.mk +++ b/lang/ossp-js/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:24:51 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2018/01/07 13:04:20 rillig Exp $ BUILDLINK_TREE+= ossp-js @@ -7,7 +7,7 @@ OSSP_JS_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ossp-js+= ossp-js>=1.6.20070208nb1 BUILDLINK_PKGSRCDIR.ossp-js?= ../../lang/ossp-js -. include "../../lang/ossp-js/libm.mk" +.include "../../lang/ossp-js/libm.mk" .include "../../mk/dlopen.buildlink3.mk" .endif # OSSP_JS_BUILDLINK3_MK diff --git a/lang/ruby/buildlink3.mk b/lang/ruby/buildlink3.mk index fcc86c0d375..074d2f2183a 100644 --- a/lang/ruby/buildlink3.mk +++ b/lang/ruby/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.18 2014/03/13 17:06:42 taca Exp $ +# $NetBSD: buildlink3.mk,v 1.19 2018/01/07 13:04:20 rillig Exp $ BUILDLINK_TREE+= ${RUBY_BASE} @@ -13,13 +13,13 @@ BUILDLINK_API_DEPENDS.${RUBY_BASE}+= ${RUBY_BASE}>=${RUBY_VERSION} BUILDLINK_ABI_DEPENDS.${RUBY_BASE}+= ${RUBY_BASE}>=${RUBY_ABI_VERSION} BUILDLINK_PKGSRCDIR.${RUBY_BASE}?= ${RUBY_SRCDIR} BUILDLINK_FILES.${RUBY_BASE}+= lib/libruby${RUBY_SUFFIX}.* -BUILDLINK_FILES.${RUBY_BASE}+= lib/ruby/${RUBY_VER_DIR}/${RUBY_ARCH}/*.h +BUILDLINK_FILES.${RUBY_BASE}+= lib/ruby/${RUBY_VER_DIR}/${RUBY_ARCH}/*.h BUILDLINK_TARGETS+= buildlink-bin-ruby buildlink-bin-ruby: ${RUN} \ - f=${BUILDLINK_PREFIX.${RUBY_BASE}:Q}"/bin/ruby${RUBY_SUFFIX}"; \ + f=${BUILDLINK_PREFIX.${RUBY_BASE}}"/bin/ruby${RUBY_SUFFIX}"; \ if ${TEST} -f $$f; then \ ${LN} -s $$f ${BUILDLINK_DIR}/bin/ruby; \ fi diff --git a/lang/sun-jdk6/buildlink3.mk b/lang/sun-jdk6/buildlink3.mk index 1ec9d8472ec..a87efa70f50 100644 --- a/lang/sun-jdk6/buildlink3.mk +++ b/lang/sun-jdk6/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2013/02/28 23:03:58 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2018/01/07 13:04:20 rillig Exp $ BUILDLINK_TREE+= sun-jdk6 @@ -7,8 +7,8 @@ SUN_JDK6_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.sun-jdk6+= sun-jdk6-[0-9]* BUILDLINK_ABI_DEPENDS.sun-jdk6+= sun-jdk6>=6.0.4 -BUILDLINK_PKGSRCDIR.sun-jdk6?= ../../lang/sun-jdk6 -BUILDLINK_DEPMETHOD.sun-jdk6?= build +BUILDLINK_PKGSRCDIR.sun-jdk6?= ../../lang/sun-jdk6 +BUILDLINK_DEPMETHOD.sun-jdk6?= build BUILDLINK_PASSTHRU_DIRS+= ${BUILDLINK_JAVA_PREFIX.sun-jre6} diff --git a/lang/sun-jdk7/buildlink3.mk b/lang/sun-jdk7/buildlink3.mk index ca0d4efa39f..8371b01d649 100644 --- a/lang/sun-jdk7/buildlink3.mk +++ b/lang/sun-jdk7/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2013/10/16 16:48:55 richard Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:20 rillig Exp $ BUILDLINK_TREE+= sun-jdk7 @@ -7,8 +7,8 @@ SUN_JDK7_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.sun-jdk7+= sun-jdk7-[0-9]* BUILDLINK_ABI_DEPENDS.sun-jdk7+= sun-jdk7>=7.0.9 -BUILDLINK_PKGSRCDIR.sun-jdk7?= ../../lang/sun-jdk7 -BUILDLINK_DEPMETHOD.sun-jdk7?= build +BUILDLINK_PKGSRCDIR.sun-jdk7?= ../../lang/sun-jdk7 +BUILDLINK_DEPMETHOD.sun-jdk7?= build BUILDLINK_PASSTHRU_DIRS+= ${BUILDLINK_JAVA_PREFIX.sun-jre7} diff --git a/lang/sun-jre6/buildlink3.mk b/lang/sun-jre6/buildlink3.mk index 2d18dad2100..dbd05cb7216 100644 --- a/lang/sun-jre6/buildlink3.mk +++ b/lang/sun-jre6/buildlink3.mk @@ -1,14 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.6 2012/05/07 01:53:43 dholland Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2018/01/07 13:04:20 rillig Exp $ BUILDLINK_TREE+= sun-jre6 .if !defined(SUN_JRE6_BUILDLINK3_MK) SUN_JRE6_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.sun-jre6+= sun-jre6-[0-9]* -BUILDLINK_ABI_DEPENDS.sun-jre6+= sun-jre6>=6.0.4 +BUILDLINK_API_DEPENDS.sun-jre6+= sun-jre6-[0-9]* +BUILDLINK_ABI_DEPENDS.sun-jre6+= sun-jre6>=6.0.4 BUILDLINK_PKGSRCDIR.sun-jre6?= ../../lang/sun-jre6 -BUILDLINK_JAVA_PREFIX.sun-jre6= ${PREFIX}/java/sun-6 +BUILDLINK_JAVA_PREFIX.sun-jre6= ${PREFIX}/java/sun-6 UNLIMIT_RESOURCES+= datasize # Must be at least 131204 .endif # SUN_JRE6_BUILDLINK3_MK diff --git a/lang/sun-jre7/buildlink3.mk b/lang/sun-jre7/buildlink3.mk index 0a4c138e94f..c200e68f881 100644 --- a/lang/sun-jre7/buildlink3.mk +++ b/lang/sun-jre7/buildlink3.mk @@ -1,12 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.2 2013/10/16 16:47:29 richard Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:20 rillig Exp $ BUILDLINK_TREE+= sun-jre7 .if !defined(SUN_JRE7_BUILDLINK3_MK) SUN_JRE7_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.sun-jre7+= sun-jre7-[0-9]* -BUILDLINK_ABI_DEPENDS.sun-jre7+= sun-jre7>=7.0.9 +BUILDLINK_API_DEPENDS.sun-jre7+= sun-jre7-[0-9]* +BUILDLINK_ABI_DEPENDS.sun-jre7+= sun-jre7>=7.0.9 BUILDLINK_PKGSRCDIR.sun-jre7?= ../../lang/sun-jre7 CHECK_BUILTIN.sun-jre7:= yes diff --git a/lang/tcl-otcl/buildlink3.mk b/lang/tcl-otcl/buildlink3.mk index c1b44042cc2..b798ef2bde3 100644 --- a/lang/tcl-otcl/buildlink3.mk +++ b/lang/tcl-otcl/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.13 2014/01/11 14:42:01 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2018/01/07 13:04:20 rillig Exp $ BUILDLINK_TREE+= tcl-otcl @@ -7,7 +7,7 @@ TCL_OTCL_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.tcl-otcl+= tcl-otcl>=1.8 BUILDLINK_ABI_DEPENDS.tcl-otcl+= tcl-otcl>=1.14nb4 -BUILDLINK_PKGSRCDIR.tcl-otcl?= ../../lang/tcl-otcl +BUILDLINK_PKGSRCDIR.tcl-otcl?= ../../lang/tcl-otcl .include "../../lang/tcl/buildlink3.mk" .include "../../x11/tk/buildlink3.mk" diff --git a/lang/vala/buildlink3.mk b/lang/vala/buildlink3.mk index 682da5d6137..8f414fb27a3 100644 --- a/lang/vala/buildlink3.mk +++ b/lang/vala/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.16 2017/10/03 12:31:54 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.17 2018/01/07 13:04:20 rillig Exp $ BUILDLINK_TREE+= vala @@ -8,8 +8,8 @@ VALA_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.vala+= vala>=0.38 BUILDLINK_PKGSRCDIR.vala?= ../../lang/vala -VALAC=${LOCALBASE}/bin/valac-0.38 -VAPIGEN=${LOCALBASE}/bin/vapigen-0.38 +VALAC= ${LOCALBASE}/bin/valac-0.38 +VAPIGEN= ${LOCALBASE}/bin/vapigen-0.38 .if defined(GNU_CONFIGURE) CONFIGURE_ENV+= VALAC=${VALAC} VAPIGEN=${VAPIGEN} .endif diff --git a/mail/Pantomime/buildlink3.mk b/mail/Pantomime/buildlink3.mk index 19a09b73a5b..3e02b02b439 100644 --- a/mail/Pantomime/buildlink3.mk +++ b/mail/Pantomime/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.21 2017/11/30 16:45:04 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.22 2018/01/07 13:04:20 rillig Exp $ BUILDLINK_TREE+= Pantomime @@ -7,12 +7,12 @@ PANTOMIME_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.Pantomime+= Pantomime>1.1.9 BUILDLINK_ABI_DEPENDS.Pantomime+= Pantomime>=1.2.0nb12 -BUILDLINK_PKGSRCDIR.Pantomime?= ../../mail/Pantomime +BUILDLINK_PKGSRCDIR.Pantomime?= ../../mail/Pantomime .include "../../devel/gnustep-make/gnustep.mk" BUILDLINK_INCDIRS.Pantomime+= lib/GNUstep/Frameworks/Pantomime.framework/Headers -BUILDLINK_FILES.Pantomime+= include/Pantomime/*.h +BUILDLINK_FILES.Pantomime+= include/Pantomime/*.h .include "../../devel/gnustep-base/buildlink3.mk" .endif # PANTOMIME_BUILDLINK3_MK diff --git a/mail/claws-mail/buildlink3.mk b/mail/claws-mail/buildlink3.mk index 7b01e6a7d9f..76ebe77efff 100644 --- a/mail/claws-mail/buildlink3.mk +++ b/mail/claws-mail/buildlink3.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.12 2015/04/03 12:34:44 nros Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2018/01/07 13:04:21 rillig Exp $ BUILDLINK_TREE+= claws-mail .if !defined(CLAWS_MAIL_BUILDLINK3_MK) CLAWS_MAIL_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.claws-mail+= claws-mail>=3.7.0 +BUILDLINK_API_DEPENDS.claws-mail+= claws-mail>=3.7.0 BUILDLINK_ABI_DEPENDS.claws-mail+= claws-mail>=3.11.1 BUILDLINK_PKGSRCDIR.claws-mail?= ../../mail/claws-mail diff --git a/mail/evolution/buildlink3.mk b/mail/evolution/buildlink3.mk index b4d459a1d5b..806cd8f6e2d 100644 --- a/mail/evolution/buildlink3.mk +++ b/mail/evolution/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.76 2017/11/30 16:45:05 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.77 2018/01/07 13:04:21 rillig Exp $ BUILDLINK_TREE+= evolution @@ -7,7 +7,7 @@ EVOLUTION_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.evolution+= evolution>=2.8.0 BUILDLINK_ABI_DEPENDS.evolution+= evolution>=2.32.3nb47 -BUILDLINK_PKGSRCDIR.evolution?= ../../mail/evolution +BUILDLINK_PKGSRCDIR.evolution?= ../../mail/evolution .include "../../devel/nspr/buildlink3.mk" .include "../../devel/nss/buildlink3.mk" diff --git a/mail/imap-uw/buildlink3.mk b/mail/imap-uw/buildlink3.mk index 772fa1e2c04..884b49c0987 100644 --- a/mail/imap-uw/buildlink3.mk +++ b/mail/imap-uw/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.21 2016/03/05 11:27:50 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.22 2018/01/07 13:04:21 rillig Exp $ BUILDLINK_TREE+= imap-uw @@ -10,9 +10,9 @@ IMAP_UW_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.imap-uw+= imap-uw>=2007dnb1 BUILDLINK_ABI_DEPENDS.imap-uw+= imap-uw>=2007fnb3 BUILDLINK_PKGSRCDIR.imap-uw?= ../../mail/imap-uw -. if ${OPSYS} == "Darwin" +.if ${OPSYS} == "Darwin" BUILDLINK_LDFLAGS.imap-uw+= -flat_namespace -. endif +.endif .include "../../security/openssl/buildlink3.mk" .endif # IMAP_UW_BUILDLINK3_MK diff --git a/mail/libesmtp/buildlink3.mk b/mail/libesmtp/buildlink3.mk index aecce9c6256..a9b4cc17e66 100644 --- a/mail/libesmtp/buildlink3.mk +++ b/mail/libesmtp/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.18 2016/03/05 11:27:50 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.19 2018/01/07 13:04:21 rillig Exp $ BUILDLINK_TREE+= libesmtp @@ -7,7 +7,7 @@ LIBESMTP_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libesmtp+= libesmtp>=1.0rc1nb1 BUILDLINK_ABI_DEPENDS.libesmtp+= libesmtp>=1.0.6nb3 -BUILDLINK_PKGSRCDIR.libesmtp?= ../../mail/libesmtp +BUILDLINK_PKGSRCDIR.libesmtp?= ../../mail/libesmtp LIBESMTP= -lesmtp diff --git a/mail/libetpan/buildlink3.mk b/mail/libetpan/buildlink3.mk index d2e0d3e0f75..2e8c92d26a0 100644 --- a/mail/libetpan/buildlink3.mk +++ b/mail/libetpan/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.35 2018/01/01 21:18:09 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.36 2018/01/07 13:04:21 rillig Exp $ BUILDLINK_TREE+= libetpan @@ -7,7 +7,7 @@ LIBETPAN_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libetpan+= libetpan>=1.0 BUILDLINK_ABI_DEPENDS.libetpan+= libetpan>=1.8nb2 -BUILDLINK_PKGSRCDIR.libetpan?= ../../mail/libetpan +BUILDLINK_PKGSRCDIR.libetpan?= ../../mail/libetpan BDB_ACCEPTED?= db4 db5 db6 .include "../../converters/libiconv/buildlink3.mk" diff --git a/mail/libmilter/buildlink3.mk b/mail/libmilter/buildlink3.mk index 18e5d3b2481..836134e39a6 100644 --- a/mail/libmilter/buildlink3.mk +++ b/mail/libmilter/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:55 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2018/01/07 13:04:21 rillig Exp $ BUILDLINK_TREE+= libmilter @@ -6,8 +6,8 @@ BUILDLINK_TREE+= libmilter LIBMILTER_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libmilter+= libmilter>=8.14 -BUILDLINK_PKGSRCDIR.libmilter?= ../../mail/libmilter -BUILDLINK_DEPMETHOD.libmilter?= build +BUILDLINK_PKGSRCDIR.libmilter?= ../../mail/libmilter +BUILDLINK_DEPMETHOD.libmilter?= build PTHREAD_OPTS+= require diff --git a/mail/libsieve/buildlink3.mk b/mail/libsieve/buildlink3.mk index a99f8f0d9de..8ee59c3cc0e 100644 --- a/mail/libsieve/buildlink3.mk +++ b/mail/libsieve/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:24:55 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:21 rillig Exp $ BUILDLINK_TREE+= libsieve @@ -6,7 +6,7 @@ BUILDLINK_TREE+= libsieve LIBSIEVE_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libsieve+= libsieve>=2.2.5 -BUILDLINK_PKGSRCDIR.libsieve?= ../../mail/libsieve +BUILDLINK_PKGSRCDIR.libsieve?= ../../mail/libsieve .endif # LIBSIEVE_BUILDLINK3_MK BUILDLINK_TREE+= -libsieve diff --git a/mail/libsylph/buildlink3.mk b/mail/libsylph/buildlink3.mk index 0da40f199da..e7435bd364c 100644 --- a/mail/libsylph/buildlink3.mk +++ b/mail/libsylph/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.12 2016/03/05 11:27:50 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2018/01/07 13:04:21 rillig Exp $ BUILDLINK_TREE+= libsylph @@ -7,7 +7,7 @@ LIBSYLPH_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libsylph+= libsylph>=0.3.0 BUILDLINK_ABI_DEPENDS.libsylph+= libsylph>=1.1.0nb4 -BUILDLINK_PKGSRCDIR.libsylph?= ../../mail/libsylph +BUILDLINK_PKGSRCDIR.libsylph?= ../../mail/libsylph .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" diff --git a/mail/libytnef/buildlink3.mk b/mail/libytnef/buildlink3.mk index 181fe7b516d..2caf8048bab 100644 --- a/mail/libytnef/buildlink3.mk +++ b/mail/libytnef/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2017/08/17 09:49:47 nros Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:21 rillig Exp $ BUILDLINK_TREE+= libytnef @@ -7,7 +7,7 @@ LIBYTNEF_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libytnef+= libytnef>=1.5 BUILDLINK_ABI_DEPENDS.libytnef?= libytnef>=1.9.2 -BUILDLINK_PKGSRCDIR.libytnef?= ../../mail/libytnef +BUILDLINK_PKGSRCDIR.libytnef?= ../../mail/libytnef .endif # LIBYTNEF_BUILDLINK3_MK BUILDLINK_TREE+= -libytnef diff --git a/mail/opendmarc/buildlink3.mk b/mail/opendmarc/buildlink3.mk index 74b850034ff..28a008d27b6 100644 --- a/mail/opendmarc/buildlink3.mk +++ b/mail/opendmarc/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2016/03/05 11:27:50 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:21 rillig Exp $ BUILDLINK_TREE+= opendmarc @@ -7,7 +7,7 @@ OPENDMARC_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.opendmarc+= opendmarc>=1.1.3nb2 BUILDLINK_ABI_DEPENDS.opendmarc?= opendmarc>=1.3.1nb2 -BUILDLINK_PKGSRCDIR.opendmarc?= ../../mail/opendmarc +BUILDLINK_PKGSRCDIR.opendmarc?= ../../mail/opendmarc .include "../../security/openssl/buildlink3.mk" .include "../../mail/libmilter/buildlink3.mk" diff --git a/mail/perdition/buildlink3.mk b/mail/perdition/buildlink3.mk index 8614d86f16a..5c3c262f815 100644 --- a/mail/perdition/buildlink3.mk +++ b/mail/perdition/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.9 2011/04/22 13:42:44 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2018/01/07 13:04:21 rillig Exp $ BUILDLINK_TREE+= perdition @@ -7,7 +7,7 @@ PERDITION_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.perdition+= perdition>=1.17 BUILDLINK_ABI_DEPENDS.perdition+= perdition>=1.18nb1 -BUILDLINK_PKGSRCDIR.perdition?= ../../mail/perdition +BUILDLINK_PKGSRCDIR.perdition?= ../../mail/perdition # The following are included in Makefile.common for "configure"'s sake. #.include "../../devel/popt/buildlink3.mk" diff --git a/math/R/buildlink3.mk b/math/R/buildlink3.mk index 98260e94c0b..b66750d79be 100644 --- a/math/R/buildlink3.mk +++ b/math/R/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.11 2017/04/21 13:14:04 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2018/01/07 13:04:21 rillig Exp $ BUILDLINK_TREE+= R @@ -7,7 +7,7 @@ R_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.R+= R>=1.7.0 BUILDLINK_ABI_DEPENDS.R+= R>=2.2.1nb2 -BUILDLINK_PKGSRCDIR.R?= ../../math/R +BUILDLINK_PKGSRCDIR.R?= ../../math/R .endif # R_BUILDLINK3_MK .include "../../archivers/bzip2/buildlink3.mk" diff --git a/math/analitza/buildlink3.mk b/math/analitza/buildlink3.mk index 98b8d207db2..717b190ab4e 100644 --- a/math/analitza/buildlink3.mk +++ b/math/analitza/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.28 2018/01/01 21:18:09 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.29 2018/01/07 13:04:22 rillig Exp $ BUILDLINK_TREE+= analitza @@ -7,7 +7,7 @@ ANALITZA_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.analitza+= analitza>=4.8.0 BUILDLINK_ABI_DEPENDS.analitza?= analitza>=4.14.3nb11 -BUILDLINK_PKGSRCDIR.analitza?= ../../math/analitza +BUILDLINK_PKGSRCDIR.analitza?= ../../math/analitza .include "../../x11/kdelibs4/buildlink3.mk" .endif # ANALITZA_BUILDLINK3_MK diff --git a/math/classias/buildlink3.mk b/math/classias/buildlink3.mk index 0b456fad134..c33b5eb431d 100644 --- a/math/classias/buildlink3.mk +++ b/math/classias/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2016/07/22 02:45:44 cheusov Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:22 rillig Exp $ BUILDLINK_TREE+= classias @@ -6,7 +6,7 @@ BUILDLINK_TREE+= classias CLASSIAS_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.classias+= classias>=1.1.0 -BUILDLINK_PKGSRCDIR.classias?= ../../math/classias +BUILDLINK_PKGSRCDIR.classias?= ../../math/classias .endif # CLASSIAS_BUILDLINK3_MK BUILDLINK_TREE+= -classias diff --git a/math/cln/buildlink3.mk b/math/cln/buildlink3.mk index 8c70dd82da7..de314c2f3a7 100644 --- a/math/cln/buildlink3.mk +++ b/math/cln/buildlink3.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.11 2011/11/20 05:40:27 sbd Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2018/01/07 13:04:22 rillig Exp $ BUILDLINK_TREE+= cln .if !defined(CLN_BUILDLINK3_MK) CLN_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.cln+= cln>=1.1.6 +BUILDLINK_API_DEPENDS.cln+= cln>=1.1.6 BUILDLINK_ABI_DEPENDS.cln+= cln>=1.3.2nb1 BUILDLINK_PKGSRCDIR.cln?= ../../math/cln diff --git a/math/crfsuite/buildlink3.mk b/math/crfsuite/buildlink3.mk index c0d145025ab..3524fd0f029 100644 --- a/math/crfsuite/buildlink3.mk +++ b/math/crfsuite/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2014/10/29 23:13:21 cheusov Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:22 rillig Exp $ BUILDLINK_TREE+= crfsuite @@ -6,7 +6,7 @@ BUILDLINK_TREE+= crfsuite CRFSUITE_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.crfsuite+= crfsuite>=0.12 -BUILDLINK_PKGSRCDIR.crfsuite?= ../../math/crfsuite +BUILDLINK_PKGSRCDIR.crfsuite?= ../../math/crfsuite .endif # CRFSUITE_BUILDLINK3_MK BUILDLINK_TREE+= -crfsuite diff --git a/math/go-stats/buildlink3.mk b/math/go-stats/buildlink3.mk index 9efe925df6c..610fa1844c2 100644 --- a/math/go-stats/buildlink3.mk +++ b/math/go-stats/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2017/08/25 16:49:14 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:22 rillig Exp $ BUILDLINK_TREE+= go-stats @@ -8,7 +8,7 @@ GO_STATS_BUILDLINK3_MK:= BUILDLINK_CONTENTS_FILTER.go-stats= ${EGREP} gopkg/ BUILDLINK_DEPMETHOD.go-stats?= build -BUILDLINK_API_DEPENDS.go-stats+= go-stats>=0.0 +BUILDLINK_API_DEPENDS.go-stats+= go-stats>=0.0 BUILDLINK_PKGSRCDIR.go-stats?= ../../math/go-stats .endif # GO_STATS_BUILDLINK3_MK diff --git a/math/gsl/buildlink3.mk b/math/gsl/buildlink3.mk index bfa24953ada..7bcc1c63423 100644 --- a/math/gsl/buildlink3.mk +++ b/math/gsl/buildlink3.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:24:57 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2018/01/07 13:04:22 rillig Exp $ BUILDLINK_TREE+= gsl .if !defined(GSL_BUILDLINK3_MK) GSL_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.gsl+= gsl>=1.4 +BUILDLINK_API_DEPENDS.gsl+= gsl>=1.4 BUILDLINK_ABI_DEPENDS.gsl+= gsl>=1.5nb1 BUILDLINK_PKGSRCDIR.gsl?= ../../math/gsl .endif # GSL_BUILDLINK3_MK diff --git a/math/libixion/buildlink3.mk b/math/libixion/buildlink3.mk index 6fd74ed294e..7e3496df9bb 100644 --- a/math/libixion/buildlink3.mk +++ b/math/libixion/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2016/09/20 10:43:02 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:22 rillig Exp $ BUILDLINK_TREE+= libixion @@ -6,7 +6,7 @@ BUILDLINK_TREE+= libixion LIBIXION_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libixion+= libixion>=0.12.1 -BUILDLINK_PKGSRCDIR.libixion?= ../../math/libixion +BUILDLINK_PKGSRCDIR.libixion?= ../../math/libixion .include "../../devel/mdds1.2/buildlink3.mk" .endif # LIBIXION_BUILDLINK3_MK diff --git a/math/liblbfgs/buildlink3.mk b/math/liblbfgs/buildlink3.mk index 964eda08c78..d6052fa4197 100644 --- a/math/liblbfgs/buildlink3.mk +++ b/math/liblbfgs/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2014/10/29 23:10:29 cheusov Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:22 rillig Exp $ BUILDLINK_TREE+= liblbfgs @@ -6,7 +6,7 @@ BUILDLINK_TREE+= liblbfgs LIBLBFGS_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.liblbfgs+= liblbfgs>=1.10 -BUILDLINK_PKGSRCDIR.liblbfgs?= ../../math/liblbfgs +BUILDLINK_PKGSRCDIR.liblbfgs?= ../../math/liblbfgs .endif # LIBLBFGS_BUILDLINK3_MK BUILDLINK_TREE+= -liblbfgs diff --git a/math/lp_solve/buildlink3.mk b/math/lp_solve/buildlink3.mk index f942fe31902..88326c9fc30 100644 --- a/math/lp_solve/buildlink3.mk +++ b/math/lp_solve/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2011/05/08 11:52:40 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:22 rillig Exp $ BUILDLINK_TREE+= lp_solve @@ -6,7 +6,7 @@ BUILDLINK_TREE+= lp_solve LP_SOLVE_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.lp_solve+= lp_solve>=5.5.2.0 -BUILDLINK_PKGSRCDIR.lp_solve?= ../../math/lp_solve +BUILDLINK_PKGSRCDIR.lp_solve?= ../../math/lp_solve .endif # LP_SOLVE_BUILDLINK3_MK BUILDLINK_TREE+= -lp_solve diff --git a/math/mpcomplex/buildlink3.mk b/math/mpcomplex/buildlink3.mk index c358fe0b231..4e92b093400 100644 --- a/math/mpcomplex/buildlink3.mk +++ b/math/mpcomplex/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2014/02/23 15:32:10 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:22 rillig Exp $ BUILDLINK_TREE+= mpcomplex @@ -6,7 +6,7 @@ BUILDLINK_TREE+= mpcomplex MPCOMPLEX_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.mpcomplex+= mpcomplex>=0.8.2 -BUILDLINK_PKGSRCDIR.mpcomplex?= ../../math/mpcomplex +BUILDLINK_PKGSRCDIR.mpcomplex?= ../../math/mpcomplex BUILDLINK_API_DEPENDS.gmp+= gmp>=4.3.2 .include "../../devel/gmp/buildlink3.mk" diff --git a/math/muparser/buildlink3.mk b/math/muparser/buildlink3.mk index 460b8bb7bd4..2ad5d7ec880 100644 --- a/math/muparser/buildlink3.mk +++ b/math/muparser/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2012/08/15 17:38:49 drochner Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:22 rillig Exp $ BUILDLINK_TREE+= muparser @@ -7,7 +7,7 @@ MUPARSER_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.muparser+= muparser>=130 BUILDLINK_ABI_DEPENDS.muparser+= muparser>=200 -BUILDLINK_PKGSRCDIR.muparser?= ../../math/muparser +BUILDLINK_PKGSRCDIR.muparser?= ../../math/muparser .endif # MUPARSER_BUILDLINK3_MK BUILDLINK_TREE+= -muparser diff --git a/math/nlopt/buildlink3.mk b/math/nlopt/buildlink3.mk index 0a31219fcaa..99eceb15150 100644 --- a/math/nlopt/buildlink3.mk +++ b/math/nlopt/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2015/11/28 07:33:38 wen Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:23 rillig Exp $ BUILDLINK_TREE+= nlopt @@ -7,7 +7,7 @@ NLOPT_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.nlopt+= nlopt>=2.4.2 BUILDLINK_ABI_DEPENDS.nlopt+= nlopt>=2.4.2 -BUILDLINK_PKGSRCDIR.nlopt?= ../../math/nlopt +BUILDLINK_PKGSRCDIR.nlopt?= ../../math/nlopt .endif # NLOPT_BUILDLINK3_MK BUILDLINK_TREE+= -nlopt diff --git a/math/py-Numeric/buildlink3.mk b/math/py-Numeric/buildlink3.mk index 0ff98324850..2134896ad4a 100644 --- a/math/py-Numeric/buildlink3.mk +++ b/math/py-Numeric/buildlink3.mk @@ -1,15 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.15 2009/03/20 19:24:58 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.16 2018/01/07 13:04:23 rillig Exp $ BUILDLINK_TREE+= pynumeric .if !defined(PY_NUMERIC_BUILDLINK3_MK) PY_NUMERIC_BUILDLINK3_MK:= -. include "../../lang/python/pyversion.mk" +.include "../../lang/python/pyversion.mk" BUILDLINK_API_DEPENDS.pynumeric+= ${PYPKGPREFIX}-Numeric-[0-9]* BUILDLINK_ABI_DEPENDS.pynumeric+= ${PYPKGPREFIX}-Numeric>=23.7nb1 -BUILDLINK_PKGSRCDIR.pynumeric?= ../../math/py-Numeric +BUILDLINK_PKGSRCDIR.pynumeric?= ../../math/py-Numeric .endif # PY_NUMERIC_BUILDLINK3_MK BUILDLINK_TREE+= -pynumeric diff --git a/math/qalculate/buildlink3.mk b/math/qalculate/buildlink3.mk index fd1f944328c..f85ff1e2b65 100644 --- a/math/qalculate/buildlink3.mk +++ b/math/qalculate/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.17 2012/09/15 10:05:32 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.18 2018/01/07 13:04:23 rillig Exp $ BUILDLINK_TREE+= qalculate @@ -7,7 +7,7 @@ QALCULATE_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.qalculate+= qalculate>=0.8.2 BUILDLINK_ABI_DEPENDS.qalculate+= qalculate>=0.9.7nb6 -BUILDLINK_PKGSRCDIR.qalculate?= ../../math/qalculate +BUILDLINK_PKGSRCDIR.qalculate?= ../../math/qalculate .include "../../devel/glib2/buildlink3.mk" .include "../../math/cln/buildlink3.mk" diff --git a/math/scilab/buildlink3.mk b/math/scilab/buildlink3.mk index f6a4cdfce08..9f641f2250f 100644 --- a/math/scilab/buildlink3.mk +++ b/math/scilab/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.14 2012/05/07 01:53:46 dholland Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2018/01/07 13:04:23 rillig Exp $ # BUILDLINK_TREE+= scilab @@ -12,7 +12,7 @@ BUILDLINK_PKGSRCDIR.scilab?= ../../math/scilab BUILDLINK_FILES.scilab+= lib/scilab-${SCIVERSION}/Version.incl -SCI= ${BUILDLINK_DIR}/lib/scilab-4.1 +SCI= ${BUILDLINK_DIR}/lib/scilab-4.1 CONFIGURE_ENV+= SCI=${SCI:Q} MAKE_ENV+= SCI=${SCI:Q} diff --git a/misc/Addresses/buildlink3.mk b/misc/Addresses/buildlink3.mk index 1e59fab10f4..9ceeaccb139 100644 --- a/misc/Addresses/buildlink3.mk +++ b/misc/Addresses/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.24 2017/11/30 16:45:05 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.25 2018/01/07 13:04:23 rillig Exp $ BUILDLINK_TREE+= Addresses @@ -7,15 +7,15 @@ ADDRESSES_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.Addresses+= Addresses>=0.4.8 BUILDLINK_ABI_DEPENDS.Addresses+= Addresses>=0.4.8nb12 -BUILDLINK_PKGSRCDIR.Addresses?= ../../misc/Addresses +BUILDLINK_PKGSRCDIR.Addresses?= ../../misc/Addresses .include "../../devel/gnustep-make/gnustep.mk" BUILDLINK_INCDIRS.Addresses+= lib/GNUstep/Frameworks/Addresses.framework/Headers BUILDLINK_INCDIRS.Addresses+= lib/GNUstep/Frameworks/AddresView.framework/Headers -BUILDLINK_FILES.Addresses+= include/AddressBook/*.h -BUILDLINK_FILES.Addresses+= include/Addresses/*.h -BUILDLINK_FILES.Addresses+= include/AddressView/*.h +BUILDLINK_FILES.Addresses+= include/AddressBook/*.h +BUILDLINK_FILES.Addresses+= include/Addresses/*.h +BUILDLINK_FILES.Addresses+= include/AddressView/*.h .include "../../x11/gnustep-back/buildlink3.mk" .endif # ADDRESSES_BUILDLINK3_MK diff --git a/misc/bbdb/buildlink3.mk b/misc/bbdb/buildlink3.mk index fac9e488af2..55c2db7e477 100644 --- a/misc/bbdb/buildlink3.mk +++ b/misc/bbdb/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:00 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:23 rillig Exp $ # .include "../../editors/emacs/modules.mk" @@ -6,7 +6,7 @@ BUILDLINK_TREE+= bbdb -.if !defined(BBDB_BUILDLINK3_MK) +. if !defined(BBDB_BUILDLINK3_MK) BBDB_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.bbdb+= ${EMACS_PKGNAME_PREFIX}bbdb>=2 @@ -14,12 +14,12 @@ BUILDLINK_PKGSRCDIR.bbdb?= ../../misc/bbdb BUILDLINK_CONTENTS_FILTER.bbdb= ${EGREP} '.*\.el$$|.*\.elc$$' -.else +. else # XEmacs has bbdb in xemacs-packages EMACS_MODULES+= base -.endif +. endif .endif # BBDB_BUILDLINK3_MK BUILDLINK_TREE+= -bbdb diff --git a/misc/go-genproto/buildlink3.mk b/misc/go-genproto/buildlink3.mk index 08d5975f6f3..97a48c72a9a 100644 --- a/misc/go-genproto/buildlink3.mk +++ b/misc/go-genproto/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2016/09/13 20:42:12 bsiegert Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:23 rillig Exp $ BUILDLINK_TREE+= go-genproto @@ -6,7 +6,7 @@ BUILDLINK_TREE+= go-genproto GO_GENPROTO_BUILDLINK3_MK:= BUILDLINK_CONTENTS_FILTER.go-genproto= ${EGREP} gopkg/ -BUILDLINK_DEPMETHOD.go-genproto?= build +BUILDLINK_DEPMETHOD.go-genproto?= build BUILDLINK_API_DEPENDS.go-genproto+= go-genproto>=20160816 BUILDLINK_PKGSRCDIR.go-genproto?= ../../misc/go-genproto diff --git a/misc/libkdeedu/buildlink3.mk b/misc/libkdeedu/buildlink3.mk index b3ae9314dac..34c5187d37c 100644 --- a/misc/libkdeedu/buildlink3.mk +++ b/misc/libkdeedu/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.28 2018/01/01 21:18:09 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.29 2018/01/07 13:04:23 rillig Exp $ BUILDLINK_TREE+= libkdeedu @@ -7,7 +7,7 @@ LIBKDEEDU_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libkdeedu+= libkdeedu>=4.8.0 BUILDLINK_ABI_DEPENDS.libkdeedu?= libkdeedu>=4.14.3nb9 -BUILDLINK_PKGSRCDIR.libkdeedu?= ../../misc/libkdeedu +BUILDLINK_PKGSRCDIR.libkdeedu?= ../../misc/libkdeedu .include "../../x11/kdelibs4/buildlink3.mk" .endif # LIBKDEEDU_BUILDLINK3_MK diff --git a/multimedia/bsdav/buildlink3.mk b/multimedia/bsdav/buildlink3.mk index 3752a7d2d70..6cbb7a2f2d2 100644 --- a/multimedia/bsdav/buildlink3.mk +++ b/multimedia/bsdav/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:02 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:23 rillig Exp $ BUILDLINK_TREE+= bsdav @@ -8,11 +8,11 @@ BSDAV_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.bsdav+= bsdav>=1.4 BUILDLINK_PKGSRCDIR.bsdav?= ../../multimedia/bsdav BUILDLINK_LDADD.bsdav= -lbsdav -BUILDLINK_FILES.bsdav= include/bsdav.h -LIBBSDAV?= ${BUILDLINK_LDADD.bsdav} +BUILDLINK_FILES.bsdav= include/bsdav.h +LIBBSDAV?= ${BUILDLINK_LDADD.bsdav} pkgbase := bsdav -. include "../../mk/pkg-build-options.mk" +.include "../../mk/pkg-build-options.mk" .if !empty(PKG_BUILD_OPTIONS.bsdav:Mx11) . include "../../x11/libXv/buildlink3.mk" diff --git a/multimedia/farsight2/buildlink3.mk b/multimedia/farsight2/buildlink3.mk index 34932922384..e5f864fcb34 100644 --- a/multimedia/farsight2/buildlink3.mk +++ b/multimedia/farsight2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.25 2013/02/16 11:19:22 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.26 2018/01/07 13:04:23 rillig Exp $ BUILDLINK_TREE+= farsight2 @@ -7,7 +7,7 @@ FARSIGHT2_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.farsight2+= farsight2>=0.0.14 BUILDLINK_ABI_DEPENDS.farsight2+= farsight2>=0.0.26nb15 -BUILDLINK_PKGSRCDIR.farsight2?= ../../multimedia/farsight2 +BUILDLINK_PKGSRCDIR.farsight2?= ../../multimedia/farsight2 # unsure which are needed exactly #.include "../../devel/py-gobject/buildlink3.mk" diff --git a/multimedia/ffmpeg010/buildlink3.mk b/multimedia/ffmpeg010/buildlink3.mk index c6cedd2b5a9..71643458edf 100644 --- a/multimedia/ffmpeg010/buildlink3.mk +++ b/multimedia/ffmpeg010/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.11 2017/01/16 23:45:10 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2018/01/07 13:04:23 rillig Exp $ BUILDLINK_TREE+= ffmpeg010 @@ -7,14 +7,14 @@ FFMPEG010_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ffmpeg010+= ffmpeg010>=20120609.0.10.4 BUILDLINK_ABI_DEPENDS.ffmpeg010?= ffmpeg010>=20150312.0.10.16nb5 -BUILDLINK_PKGSRCDIR.ffmpeg010?= ../../multimedia/ffmpeg010 +BUILDLINK_PKGSRCDIR.ffmpeg010?= ../../multimedia/ffmpeg010 BUILDLINK_INCDIRS.ffmpeg010+= include/ffmpeg010 BUILDLINK_LIBDIRS.ffmpeg010+= lib/ffmpeg010 -BUILDLINK_FNAME_TRANSFORM.ffmpeg010+= -e 's|lib/ffmpeg010/pkgconfig/|lib/pkgconfig/|' +BUILDLINK_FNAME_TRANSFORM.ffmpeg010+= -e 's|lib/ffmpeg010/pkgconfig/|lib/pkgconfig/|' pkgbase := ffmpeg010 -. include "../../mk/pkg-build-options.mk" +.include "../../mk/pkg-build-options.mk" .include "../../mk/bsd.fast.prefs.mk" diff --git a/multimedia/ffmpeg1/buildlink3.mk b/multimedia/ffmpeg1/buildlink3.mk index f07d30138d9..0f497ea4c1d 100644 --- a/multimedia/ffmpeg1/buildlink3.mk +++ b/multimedia/ffmpeg1/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2017/01/16 23:45:10 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2018/01/07 13:04:23 rillig Exp $ BUILDLINK_TREE+= ffmpeg1 @@ -10,7 +10,7 @@ BUILDLINK_ABI_DEPENDS.ffmpeg1?= ffmpeg1>=1.2.12nb5 BUILDLINK_PKGSRCDIR.ffmpeg1?= ../../multimedia/ffmpeg1 pkgbase := ffmpeg1 -. include "../../mk/pkg-build-options.mk" +.include "../../mk/pkg-build-options.mk" .include "../../mk/bsd.fast.prefs.mk" diff --git a/multimedia/ffmpegthumbnailer/buildlink3.mk b/multimedia/ffmpegthumbnailer/buildlink3.mk index 7bc8954ebc7..1bd9e0f0e40 100644 --- a/multimedia/ffmpegthumbnailer/buildlink3.mk +++ b/multimedia/ffmpegthumbnailer/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2014/08/11 23:09:45 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2018/01/07 13:04:24 rillig Exp $ BUILDLINK_TREE+= ffmpegthumbnailer @@ -7,7 +7,7 @@ FFMPEGTHUMBNAILER_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ffmpegthumbnailer+= ffmpegthumbnailer>=2.0.6nb1 BUILDLINK_ABI_DEPENDS.ffmpegthumbnailer?= ffmpegthumbnailer>=2.0.8nb1 -BUILDLINK_PKGSRCDIR.ffmpegthumbnailer?= ../../multimedia/ffmpegthumbnailer +BUILDLINK_PKGSRCDIR.ffmpegthumbnailer?= ../../multimedia/ffmpegthumbnailer #.include "../../graphics/png/buildlink3.mk" #.include "../../multimedia/ffmpeg1/buildlink3.mk" diff --git a/multimedia/gnome-media/buildlink3.mk b/multimedia/gnome-media/buildlink3.mk index 5616db41dfe..76f125a8918 100644 --- a/multimedia/gnome-media/buildlink3.mk +++ b/multimedia/gnome-media/buildlink3.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.33 2017/02/12 06:24:47 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.34 2018/01/07 13:04:24 rillig Exp $ BUILDLINK_TREE+= gnome-media .if !defined(GNOME_MEDIA_BUILDLINK3_MK) GNOME_MEDIA_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.gnome-media+= gnome-media>=2.12.0nb1 +BUILDLINK_API_DEPENDS.gnome-media+= gnome-media>=2.12.0nb1 BUILDLINK_ABI_DEPENDS.gnome-media+= gnome-media>=2.28.5nb41 BUILDLINK_PKGSRCDIR.gnome-media?= ../../multimedia/gnome-media diff --git a/multimedia/gst-plugins0.10-bad/buildlink3.mk b/multimedia/gst-plugins0.10-bad/buildlink3.mk index 31a9d2b4c24..282e2df1622 100644 --- a/multimedia/gst-plugins0.10-bad/buildlink3.mk +++ b/multimedia/gst-plugins0.10-bad/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.11 2012/09/15 10:05:47 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2018/01/07 13:04:24 rillig Exp $ BUILDLINK_TREE+= gst-plugins0.10-bad @@ -7,7 +7,7 @@ GST_PLUGINS0.10_BAD_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.gst-plugins0.10-bad+= gst-plugins0.10-bad>=0.10.3 BUILDLINK_ABI_DEPENDS.gst-plugins0.10-bad+= gst-plugins0.10-bad>=0.10.23nb3 -BUILDLINK_PKGSRCDIR.gst-plugins0.10-bad?= ../../multimedia/gst-plugins0.10-bad +BUILDLINK_PKGSRCDIR.gst-plugins0.10-bad?= ../../multimedia/gst-plugins0.10-bad .include "../../multimedia/gstreamer0.10/buildlink3.mk" .include "../../multimedia/gst-plugins0.10-base/buildlink3.mk" diff --git a/multimedia/gst-plugins1-bad/buildlink3.mk b/multimedia/gst-plugins1-bad/buildlink3.mk index ac58ab4bc36..85b6c7059a6 100644 --- a/multimedia/gst-plugins1-bad/buildlink3.mk +++ b/multimedia/gst-plugins1-bad/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2012/11/29 08:26:09 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:24 rillig Exp $ BUILDLINK_TREE+= gst-plugins1-bad @@ -7,7 +7,7 @@ GST_PLUGINS1_BAD_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.gst-plugins1-bad+= gst-plugins1-bad>=1.0.3 BUILDLINK_ABI_DEPENDS.gst-plugins1-bad+= gst-plugins1-bad>=1.0.3 -BUILDLINK_PKGSRCDIR.gst-plugins1-bad?= ../../multimedia/gst-plugins1-bad +BUILDLINK_PKGSRCDIR.gst-plugins1-bad?= ../../multimedia/gst-plugins1-bad .include "../../multimedia/gstreamer1/buildlink3.mk" .include "../../multimedia/gst-plugins1-base/buildlink3.mk" diff --git a/multimedia/gst-plugins1-good/buildlink3.mk b/multimedia/gst-plugins1-good/buildlink3.mk index b03ad32999c..e66d724e93b 100644 --- a/multimedia/gst-plugins1-good/buildlink3.mk +++ b/multimedia/gst-plugins1-good/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2012/11/29 08:24:42 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:24 rillig Exp $ BUILDLINK_TREE+= gst-plugins1-good @@ -7,7 +7,7 @@ GST_PLUGINS1_GOOD_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.gst-plugins1-good+= gst-plugins1-good>=1.0.3 BUILDLINK_ABI_DEPENDS.gst-plugins1-good+= gst-plugins1-good>=1.0.3 -BUILDLINK_PKGSRCDIR.gst-plugins1-good?= ../../multimedia/gst-plugins1-good +BUILDLINK_PKGSRCDIR.gst-plugins1-good?= ../../multimedia/gst-plugins1-good .include "../../multimedia/gstreamer1/buildlink3.mk" .include "../../multimedia/gst-plugins1-base/buildlink3.mk" diff --git a/multimedia/gst-plugins1-ugly/buildlink3.mk b/multimedia/gst-plugins1-ugly/buildlink3.mk index 20452109673..ca1cbb7f7bb 100644 --- a/multimedia/gst-plugins1-ugly/buildlink3.mk +++ b/multimedia/gst-plugins1-ugly/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2012/11/29 08:27:25 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:24 rillig Exp $ BUILDLINK_TREE+= gst-plugins1-ugly @@ -7,7 +7,7 @@ GST_PLUGINS1_UGLY_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.gst-plugins1-ugly+= gst-plugins1-ugly>=1.0.3 BUILDLINK_ABI_DEPENDS.gst-plugins1-ugly+= gst-plugins1-ugly>=1.0.3 -BUILDLINK_PKGSRCDIR.gst-plugins1-ugly?= ../../multimedia/gst-plugins1-ugly +BUILDLINK_PKGSRCDIR.gst-plugins1-ugly?= ../../multimedia/gst-plugins1-ugly .include "../../multimedia/gstreamer1/buildlink3.mk" .include "../../multimedia/gst-plugins1-base/buildlink3.mk" diff --git a/multimedia/gstreamer0.10/buildlink3.mk b/multimedia/gstreamer0.10/buildlink3.mk index d1209348098..5cbc5f2069c 100644 --- a/multimedia/gstreamer0.10/buildlink3.mk +++ b/multimedia/gstreamer0.10/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.19 2012/09/15 10:05:49 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.20 2018/01/07 13:04:24 rillig Exp $ BUILDLINK_TREE+= gstreamer0.10 @@ -12,9 +12,9 @@ BUILDLINK_PKGSRCDIR.gstreamer0.10?= ../../multimedia/gstreamer0.10 pkgbase := gstreamer0.10 .include "../../mk/pkg-build-options.mk" -.if !empty(PKG_BUILD_OPTIONS.gstreamer0.10:Mgstcheck) +. if !empty(PKG_BUILD_OPTIONS.gstreamer0.10:Mgstcheck) .include "../../devel/check/buildlink3.mk" -.endif +. endif .include "../../devel/glib2/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" diff --git a/multimedia/libdvdcss/buildlink3.mk b/multimedia/libdvdcss/buildlink3.mk index 8a3f825c536..42aa40916b2 100644 --- a/multimedia/libdvdcss/buildlink3.mk +++ b/multimedia/libdvdcss/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.8 2015/01/31 21:24:11 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2018/01/07 13:04:24 rillig Exp $ BUILDLINK_TREE+= libdvdcss @@ -7,7 +7,7 @@ LIBDVDCSS_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libdvdcss+= libdvdcss>=1.3.99 BUILDLINK_ABI_DEPENDS.libdvdcss+= libdvdcss>=1.3.99 -BUILDLINK_PKGSRCDIR.libdvdcss?= ../../multimedia/libdvdcss +BUILDLINK_PKGSRCDIR.libdvdcss?= ../../multimedia/libdvdcss .endif # LIBDVDCSS_BUILDLINK3_MK BUILDLINK_TREE+= -libdvdcss diff --git a/multimedia/libdvdnav/buildlink3.mk b/multimedia/libdvdnav/buildlink3.mk index 76b4cce2ac4..6dd36069519 100644 --- a/multimedia/libdvdnav/buildlink3.mk +++ b/multimedia/libdvdnav/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.10 2014/10/04 12:49:05 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2018/01/07 13:04:24 rillig Exp $ BUILDLINK_TREE+= libdvdnav @@ -7,7 +7,7 @@ LIBDVDNAV_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libdvdnav+= libdvdnav>=4.1.3 BUILDLINK_ABI_DEPENDS.libdvdnav+= libdvdnav>=5.0 -BUILDLINK_PKGSRCDIR.libdvdnav?= ../../multimedia/libdvdnav +BUILDLINK_PKGSRCDIR.libdvdnav?= ../../multimedia/libdvdnav .include "../../multimedia/libdvdread/buildlink3.mk" .endif # LIBDVDNAV_BUILDLINK3_MK diff --git a/multimedia/libdvdplay/buildlink3.mk b/multimedia/libdvdplay/buildlink3.mk index 202cc926564..7820e597210 100644 --- a/multimedia/libdvdplay/buildlink3.mk +++ b/multimedia/libdvdplay/buildlink3.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:03 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2018/01/07 13:04:24 rillig Exp $ BUILDLINK_TREE+= libdvdplay .if !defined(LIBDVDPLAY_BUILDLINK3_MK) LIBDVDPLAY_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.libdvdplay+= libdvdplay>=1.0.1 +BUILDLINK_API_DEPENDS.libdvdplay+= libdvdplay>=1.0.1 BUILDLINK_ABI_DEPENDS.libdvdplay+= libdvdplay>=1.0.1nb3 BUILDLINK_PKGSRCDIR.libdvdplay?= ../../multimedia/libdvdplay diff --git a/multimedia/libflash/buildlink3.mk b/multimedia/libflash/buildlink3.mk index d3526be94dd..b9c8bf4d196 100644 --- a/multimedia/libflash/buildlink3.mk +++ b/multimedia/libflash/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.12 2013/01/26 21:36:38 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2018/01/07 13:04:24 rillig Exp $ BUILDLINK_TREE+= libflash @@ -7,7 +7,7 @@ LIBFLASH_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libflash+= libflash>=0.4.10nb4 BUILDLINK_ABI_DEPENDS.libflash+= libflash>=0.4.10nb9 -BUILDLINK_PKGSRCDIR.libflash?= ../../multimedia/libflash +BUILDLINK_PKGSRCDIR.libflash?= ../../multimedia/libflash .include "../../devel/zlib/buildlink3.mk" .include "../../mk/jpeg.buildlink3.mk" diff --git a/multimedia/libkcddb/buildlink3.mk b/multimedia/libkcddb/buildlink3.mk index 76ffd1f1db9..771e347fbaa 100644 --- a/multimedia/libkcddb/buildlink3.mk +++ b/multimedia/libkcddb/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2013/04/03 12:23:51 markd Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:25 rillig Exp $ BUILDLINK_TREE+= libkcddb @@ -6,7 +6,7 @@ BUILDLINK_TREE+= libkcddb LIBKCDDB_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libkcddb+= libkcddb>=4.10.2 -BUILDLINK_PKGSRCDIR.libkcddb?= ../../multimedia/libkcddb +BUILDLINK_PKGSRCDIR.libkcddb?= ../../multimedia/libkcddb .endif # LIBKCDDB_BUILDLINK3_MK diff --git a/multimedia/libmp4v2/buildlink3.mk b/multimedia/libmp4v2/buildlink3.mk index 3015f25d3d3..577597ad54d 100644 --- a/multimedia/libmp4v2/buildlink3.mk +++ b/multimedia/libmp4v2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:04 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:25 rillig Exp $ BUILDLINK_TREE+= libmp4v2 @@ -6,7 +6,7 @@ BUILDLINK_TREE+= libmp4v2 LIBMP4V2_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libmp4v2+= libmp4v2>=1.5.0.1 -BUILDLINK_PKGSRCDIR.libmp4v2?= ../../multimedia/libmp4v2 +BUILDLINK_PKGSRCDIR.libmp4v2?= ../../multimedia/libmp4v2 .endif # LIBMP4V2_BUILDLINK3_MK BUILDLINK_TREE+= -libmp4v2 diff --git a/multimedia/libmpeg2/buildlink3.mk b/multimedia/libmpeg2/buildlink3.mk index 48a15dd84ce..d39c5128d9f 100644 --- a/multimedia/libmpeg2/buildlink3.mk +++ b/multimedia/libmpeg2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:25:04 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2018/01/07 13:04:25 rillig Exp $ BUILDLINK_TREE+= libmpeg2 @@ -7,7 +7,7 @@ LIBMPEG2_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libmpeg2+= libmpeg2>=0.4.0 BUILDLINK_ABI_DEPENDS.libmpeg2+= libmpeg2>=0.4.0bnb5 -BUILDLINK_PKGSRCDIR.libmpeg2?= ../../multimedia/libmpeg2 +BUILDLINK_PKGSRCDIR.libmpeg2?= ../../multimedia/libmpeg2 .endif # LIBMPEG2_BUILDLINK3_MK BUILDLINK_TREE+= -libmpeg2 diff --git a/multimedia/liboggz/buildlink3.mk b/multimedia/liboggz/buildlink3.mk index 1280d8edf03..67832ba1bfa 100644 --- a/multimedia/liboggz/buildlink3.mk +++ b/multimedia/liboggz/buildlink3.mk @@ -1,6 +1,6 @@ -# $NetBSD: buildlink3.mk,v 1.1 2013/05/09 00:40:12 rodent Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:25 rillig Exp $ -BUILDLINK_TREE+= liboggz +BUILDLINK_TREE+= liboggz .if !defined(LIBOGGZ_BUILDLINK3_MK) LIBOGGZ_BUILDLINK3_MK:= diff --git a/multimedia/libtheora/buildlink3.mk b/multimedia/libtheora/buildlink3.mk index 47b194b643d..bc42fc89d75 100644 --- a/multimedia/libtheora/buildlink3.mk +++ b/multimedia/libtheora/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:04 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2018/01/07 13:04:25 rillig Exp $ BUILDLINK_TREE+= libtheora @@ -7,7 +7,7 @@ LIBTHEORA_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libtheora+= libtheora>=1.0alpha3 BUILDLINK_ABI_DEPENDS.libtheora+= libtheora>=1.0alpha3nb1 -BUILDLINK_PKGSRCDIR.libtheora?= ../../multimedia/libtheora +BUILDLINK_PKGSRCDIR.libtheora?= ../../multimedia/libtheora .include "../../audio/libvorbis/buildlink3.mk" .include "../../multimedia/libogg/buildlink3.mk" diff --git a/multimedia/libva/buildlink3.mk b/multimedia/libva/buildlink3.mk index a790872c8b4..5e3dcdd3d7b 100644 --- a/multimedia/libva/buildlink3.mk +++ b/multimedia/libva/buildlink3.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.2 2013/04/14 00:30:02 cheusov Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:25 rillig Exp $ .include "../../multimedia/libva/available.mk" .if ${VAAPI_AVAILABLE} == "yes" BUILDLINK_TREE+= libva -.if !defined(LIBVA_BUILDLINK3_MK) +. if !defined(LIBVA_BUILDLINK3_MK) LIBVA_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libva+= libva>=1.0.6 @@ -14,7 +14,7 @@ BUILDLINK_PKGSRCDIR.libva?= ../../multimedia/libva .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libdrm/buildlink3.mk" -.endif # LIBVA_BUILDLINK3_MK +. endif # LIBVA_BUILDLINK3_MK BUILDLINK_TREE+= -libva diff --git a/multimedia/libvdpau/buildlink3.mk b/multimedia/libvdpau/buildlink3.mk index a3b0982dffb..26e34bf55e4 100644 --- a/multimedia/libvdpau/buildlink3.mk +++ b/multimedia/libvdpau/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2010/09/01 20:54:09 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:25 rillig Exp $ # # For linking use LDFLAGS.vdpau variable @@ -14,7 +14,7 @@ BUILDLINK_TREE+= libvdpau LIBVDPAU_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libvdpau+= libvdpau>=0.3 -BUILDLINK_PKGSRCDIR.libvdpau?= ../../multimedia/libvdpau +BUILDLINK_PKGSRCDIR.libvdpau?= ../../multimedia/libvdpau .include "../../x11/libX11/buildlink3.mk" . endif # LIBVDPAU_BUILDLINK3_MK diff --git a/multimedia/mjpegtools/buildlink3.mk b/multimedia/mjpegtools/buildlink3.mk index 985c829889f..3e92dbb4013 100644 --- a/multimedia/mjpegtools/buildlink3.mk +++ b/multimedia/mjpegtools/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.24 2015/04/25 14:23:40 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.25 2018/01/07 13:04:25 rillig Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -7,7 +7,7 @@ BUILDLINK_TREE+= mjpegtools .if !defined(MJPEGTOOLS_BUILDLINK3_MK) MJPEGTOOLS_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.mjpegtools+= mjpegtools>=1.8.0 +BUILDLINK_API_DEPENDS.mjpegtools+= mjpegtools>=1.8.0 BUILDLINK_ABI_DEPENDS.mjpegtools+= mjpegtools>=2.0.0nb4 BUILDLINK_PKGSRCDIR.mjpegtools?= ../../multimedia/mjpegtools diff --git a/multimedia/xine-lib/buildlink3.mk b/multimedia/xine-lib/buildlink3.mk index becb6b67755..209f7e76244 100644 --- a/multimedia/xine-lib/buildlink3.mk +++ b/multimedia/xine-lib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.34 2017/01/16 23:45:10 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.35 2018/01/07 13:04:25 rillig Exp $ BUILDLINK_TREE+= xine-lib @@ -7,7 +7,7 @@ XINE_LIB_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.xine-lib+= xine-lib>=1rc3c BUILDLINK_ABI_DEPENDS.xine-lib+= xine-lib>=1.2.6nb9 -BUILDLINK_PKGSRCDIR.xine-lib?= ../../multimedia/xine-lib +BUILDLINK_PKGSRCDIR.xine-lib?= ../../multimedia/xine-lib .include "../../multimedia/ffmpeg2/buildlink3.mk" .endif # XINE_LIB_BUILDLINK3_MK diff --git a/multimedia/xvidcore/buildlink3.mk b/multimedia/xvidcore/buildlink3.mk index 7bb5bb40bdd..9a386676ef2 100644 --- a/multimedia/xvidcore/buildlink3.mk +++ b/multimedia/xvidcore/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.13 2012/05/07 01:53:51 dholland Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2018/01/07 13:04:25 rillig Exp $ BUILDLINK_TREE+= xvidcore @@ -7,7 +7,7 @@ XVIDCORE_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.xvidcore+= xvidcore>=1.0.0 BUILDLINK_ABI_DEPENDS.xvidcore+= xvidcore>=1.1.0nb1 -BUILDLINK_PKGSRCDIR.xvidcore?= ../../multimedia/xvidcore +BUILDLINK_PKGSRCDIR.xvidcore?= ../../multimedia/xvidcore .endif # XVIDCORE_BUILDLINK3_MK BUILDLINK_TREE+= -xvidcore diff --git a/net/SDL2_net/buildlink3.mk b/net/SDL2_net/buildlink3.mk index 1e204ed1ba2..a237ccb83ce 100644 --- a/net/SDL2_net/buildlink3.mk +++ b/net/SDL2_net/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2016/11/06 00:18:05 kamil Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:26 rillig Exp $ BUILDLINK_TREE+= SDL2_net @@ -6,7 +6,7 @@ BUILDLINK_TREE+= SDL2_net SDL2_NET_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.SDL2_net+= SDL2_net>=2.0.0nb2 -BUILDLINK_PKGSRCDIR.SDL2_net?= ../../net/SDL2_net +BUILDLINK_PKGSRCDIR.SDL2_net?= ../../net/SDL2_net .include "../../devel/SDL2/buildlink3.mk" .endif # SDL2_NET_BUILDLINK3_MK diff --git a/net/aws-sdk-go/buildlink3.mk b/net/aws-sdk-go/buildlink3.mk index 5bd6b55cb7c..45d1aaf0ef7 100644 --- a/net/aws-sdk-go/buildlink3.mk +++ b/net/aws-sdk-go/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2016/09/04 19:29:33 bsiegert Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:26 rillig Exp $ BUILDLINK_TREE+= aws-sdk-go @@ -6,7 +6,7 @@ BUILDLINK_TREE+= aws-sdk-go AWS_SDK_GO_BUILDLINK3_MK:= BUILDLINK_CONTENTS_FILTER.aws-sdk-go= ${EGREP} gopkg/ -BUILDLINK_DEPMETHOD.aws-sdk-go?= build +BUILDLINK_DEPMETHOD.aws-sdk-go?= build BUILDLINK_API_DEPENDS.aws-sdk-go+= aws-sdk-go>=1.4.3 BUILDLINK_PKGSRCDIR.aws-sdk-go?= ../../net/aws-sdk-go diff --git a/net/flickcurl/buildlink3.mk b/net/flickcurl/buildlink3.mk index 9b65a8587c8..064f8e68fee 100644 --- a/net/flickcurl/buildlink3.mk +++ b/net/flickcurl/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2012/03/21 08:13:27 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:26 rillig Exp $ BUILDLINK_TREE+= flickcurl @@ -7,7 +7,7 @@ FLICKCURL_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.flickcurl+= flickcurl>=1.21 BUILDLINK_ABI_DEPENDS.flickcurl+= flickcurl>=1.22nb1 -BUILDLINK_PKGSRCDIR.flickcurl?= ../../net/flickcurl +BUILDLINK_PKGSRCDIR.flickcurl?= ../../net/flickcurl .endif # FLICKCURL_BUILDLINK3_MK diff --git a/net/go-vultr/buildlink3.mk b/net/go-vultr/buildlink3.mk index 20e198fc351..c96aebe1a6a 100644 --- a/net/go-vultr/buildlink3.mk +++ b/net/go-vultr/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2016/07/16 13:31:20 bsiegert Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:26 rillig Exp $ BUILDLINK_TREE+= go-vultr @@ -9,7 +9,7 @@ BUILDLINK_CONTENTS_FILTER.go-vultr= ${EGREP} gopkg/ BUILDLINK_DEPMETHOD.go-vultr?= build BUILDLINK_API_DEPENDS.go-vultr+= go-vultr>=1.8 -BUILDLINK_PKGSRCDIR.go-vultr?= ../../net/go-vultr +BUILDLINK_PKGSRCDIR.go-vultr?= ../../net/go-vultr .include "../../devel/go-mow-cli/buildlink3.mk" .include "../../devel/go-ratelimit/buildlink3.mk" diff --git a/net/gupnp-av/buildlink3.mk b/net/gupnp-av/buildlink3.mk index b8e062987f5..aa3d173e9e6 100644 --- a/net/gupnp-av/buildlink3.mk +++ b/net/gupnp-av/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.28 2017/11/30 16:45:06 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.29 2018/01/07 13:04:26 rillig Exp $ BUILDLINK_TREE+= gupnp-av @@ -7,7 +7,7 @@ GUPNP_AV_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.gupnp-av+= gupnp-av>=0.12.2 BUILDLINK_ABI_DEPENDS.gupnp-av+= gupnp-av>=0.12.7nb9 -BUILDLINK_PKGSRCDIR.gupnp-av?= ../../net/gupnp-av +BUILDLINK_PKGSRCDIR.gupnp-av?= ../../net/gupnp-av .include "../../net/gupnp/buildlink3.mk" .endif # GUPNP_AV_BUILDLINK3_MK diff --git a/net/gupnp-igd/buildlink3.mk b/net/gupnp-igd/buildlink3.mk index f8bf11c0ab1..5ae3e62d662 100644 --- a/net/gupnp-igd/buildlink3.mk +++ b/net/gupnp-igd/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.28 2017/11/30 16:45:06 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.29 2018/01/07 13:04:26 rillig Exp $ BUILDLINK_TREE+= gupnp-igd @@ -7,7 +7,7 @@ GUPNP_IGD_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.gupnp-igd+= gupnp-igd>=0.2.1 BUILDLINK_ABI_DEPENDS.gupnp-igd+= gupnp-igd>=0.2.4nb1 -BUILDLINK_PKGSRCDIR.gupnp-igd?= ../../net/gupnp-igd +BUILDLINK_PKGSRCDIR.gupnp-igd?= ../../net/gupnp-igd .include "../../net/gupnp/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" diff --git a/net/isc-dhcp4/buildlink3.mk b/net/isc-dhcp4/buildlink3.mk index 26bc537de76..bdcbc1f968d 100644 --- a/net/isc-dhcp4/buildlink3.mk +++ b/net/isc-dhcp4/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2017/08/13 14:21:03 taca Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2018/01/07 13:04:26 rillig Exp $ BUILDLINK_TREE+= isc-dhcp @@ -6,7 +6,7 @@ BUILDLINK_TREE+= isc-dhcp ISC_DHCP_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.isc-dhcp+= isc-dhcp>=4.3.0 -BUILDLINK_PKGSRCDIR.isc-dhcp?= ../../net/isc-dhcp4 +BUILDLINK_PKGSRCDIR.isc-dhcp?= ../../net/isc-dhcp4 .endif # ISC_DHCP_BUILDLINK3_MK BUILDLINK_TREE+= -isc-dhcp diff --git a/net/knewstuff/buildlink3.mk b/net/knewstuff/buildlink3.mk index b64b88846f1..e582ff2566e 100644 --- a/net/knewstuff/buildlink3.mk +++ b/net/knewstuff/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.12 2017/11/30 16:45:06 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2018/01/07 13:04:26 rillig Exp $ BUILDLINK_TREE+= knewstuff @@ -7,7 +7,7 @@ KNEWSTUFF_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.knewstuff+= knewstuff>=5.21.0 BUILDLINK_ABI_DEPENDS.knewstuff?= knewstuff>=5.25.0nb11 -BUILDLINK_PKGSRCDIR.knewstuff?= ../../net/knewstuff +BUILDLINK_PKGSRCDIR.knewstuff?= ../../net/knewstuff .include "../../devel/kio/buildlink3.mk" .include "../../x11/qt5-qtbase/buildlink3.mk" diff --git a/net/libcares/buildlink3.mk b/net/libcares/buildlink3.mk index ab8b4d17915..df865d84b3d 100644 --- a/net/libcares/buildlink3.mk +++ b/net/libcares/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.8 2010/07/25 13:09:42 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2018/01/07 13:04:26 rillig Exp $ BUILDLINK_TREE+= libcares @@ -7,7 +7,7 @@ LIBCARES_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libcares+= libcares>=1.3.0nb1 BUILDLINK_ABI_DEPENDS.libcares+= libcares>=1.6.0 -BUILDLINK_PKGSRCDIR.libcares?= ../../net/libcares +BUILDLINK_PKGSRCDIR.libcares?= ../../net/libcares .endif # LIBCARES_BUILDLINK3_MK BUILDLINK_TREE+= -libcares diff --git a/net/libfetch/buildlink3.mk b/net/libfetch/buildlink3.mk index 0a2df15e610..cd29a4bc897 100644 --- a/net/libfetch/buildlink3.mk +++ b/net/libfetch/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.13 2016/03/05 11:27:52 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2018/01/07 13:04:26 rillig Exp $ BUILDLINK_TREE+= libfetch @@ -9,7 +9,7 @@ BUILDLINK_DEPMETHOD.libfetch?= build BUILDLINK_API_DEPENDS.libfetch+= libfetch>=2.28 BUILDLINK_ABI_DEPENDS.libfetch?= libfetch>=2.36nb3 -BUILDLINK_PKGSRCDIR.libfetch?= ../../net/libfetch +BUILDLINK_PKGSRCDIR.libfetch?= ../../net/libfetch pkgbase := libfetch .include "../../mk/pkg-build-options.mk" diff --git a/net/libgdata/buildlink3.mk b/net/libgdata/buildlink3.mk index b0b6c8524a2..b982007b07a 100644 --- a/net/libgdata/buildlink3.mk +++ b/net/libgdata/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.32 2018/01/01 21:18:10 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.33 2018/01/07 13:04:26 rillig Exp $ BUILDLINK_TREE+= libgdata @@ -7,7 +7,7 @@ LIBGDATA_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libgdata+= libgdata>=0.6.4 BUILDLINK_ABI_DEPENDS.libgdata+= libgdata>=0.16.1nb13 -BUILDLINK_PKGSRCDIR.libgdata?= ../../net/libgdata +BUILDLINK_PKGSRCDIR.libgdata?= ../../net/libgdata .include "../../devel/glib2/buildlink3.mk" diff --git a/net/liblive/buildlink3.mk b/net/liblive/buildlink3.mk index 16923eea528..d3903bfe8eb 100644 --- a/net/liblive/buildlink3.mk +++ b/net/liblive/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:09 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2018/01/07 13:04:27 rillig Exp $ BUILDLINK_TREE+= liblive @@ -8,10 +8,10 @@ LIBLIVE_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.liblive+= liblive>=20080706 BUILDLINK_ABI_DEPENDS.liblive+= liblive>=20080706 BUILDLINK_PKGSRCDIR.liblive?= ../../net/liblive -BUILDLINK_INCDIRS.liblive+= include/BasicUsageEnvironment -BUILDLINK_INCDIRS.liblive+= include/UsageEnvironment -BUILDLINK_INCDIRS.liblive+= include/groupsock -BUILDLINK_INCDIRS.liblive+= include/liveMedia +BUILDLINK_INCDIRS.liblive+= include/BasicUsageEnvironment +BUILDLINK_INCDIRS.liblive+= include/UsageEnvironment +BUILDLINK_INCDIRS.liblive+= include/groupsock +BUILDLINK_INCDIRS.liblive+= include/liveMedia .endif # LIBLIVE_BUILDLINK3_MK BUILDLINK_TREE+= -liblive diff --git a/net/libnipper/buildlink3.mk b/net/libnipper/buildlink3.mk index 5d350ab0a23..ed6c723751a 100644 --- a/net/libnipper/buildlink3.mk +++ b/net/libnipper/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:10 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:27 rillig Exp $ BUILDLINK_TREE+= libnipper @@ -6,7 +6,7 @@ BUILDLINK_TREE+= libnipper LIBNIPPER_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libnipper+= libnipper>=0.12.1 -BUILDLINK_PKGSRCDIR.libnipper?= ../../net/libnipper +BUILDLINK_PKGSRCDIR.libnipper?= ../../net/libnipper .endif # LIBNIPPER_BUILDLINK3_MK BUILDLINK_TREE+= -libnipper diff --git a/net/libradius/buildlink3.mk b/net/libradius/buildlink3.mk index aeda1becce4..b5bebadbcc8 100644 --- a/net/libradius/buildlink3.mk +++ b/net/libradius/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:25:10 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2018/01/07 13:04:27 rillig Exp $ BUILDLINK_TREE+= libradius @@ -6,14 +6,14 @@ BUILDLINK_TREE+= libradius LIBRADIUS_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libradius+= libradius>=20040827 -BUILDLINK_PKGSRCDIR.libradius?= ../../net/libradius -BUILDLINK_DEPMETHOD.libradius?= build +BUILDLINK_PKGSRCDIR.libradius?= ../../net/libradius +BUILDLINK_DEPMETHOD.libradius?= build -. include "../../mk/bsd.fast.prefs.mk" -. if ${OPSYS} == "FreeBSD" +.include "../../mk/bsd.fast.prefs.mk" +.if ${OPSYS} == "FreeBSD" BUILDLINK_LDADD.libradius+= -lmd BUILDLINK_LDFLAGS.libradius?= ${BUILDLINK_LDADD.libradius} -. endif +.endif .endif # LIBRADIUS_BUILDLINK3_MK BUILDLINK_TREE+= -libradius diff --git a/net/librsync/buildlink3.mk b/net/librsync/buildlink3.mk index c9f9238bc7c..a9e011bab14 100644 --- a/net/librsync/buildlink3.mk +++ b/net/librsync/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2016/09/01 16:18:08 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:27 rillig Exp $ BUILDLINK_TREE+= librsync @@ -7,7 +7,7 @@ LIBRSYNC_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.librsync+= librsync>=1.0.1 BUILDLINK_ABI_DEPENDS.librsync+= librsync>=2.0 -BUILDLINK_PKGSRCDIR.librsync?= ../../net/librsync +BUILDLINK_PKGSRCDIR.librsync?= ../../net/librsync .endif # LIBRSYNC_BUILDLINK3_MK BUILDLINK_TREE+= -librsync diff --git a/net/mono-nat/buildlink3.mk b/net/mono-nat/buildlink3.mk index be285b38426..0d257d58e18 100644 --- a/net/mono-nat/buildlink3.mk +++ b/net/mono-nat/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.18 2017/11/30 16:45:07 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.19 2018/01/07 13:04:27 rillig Exp $ BUILDLINK_TREE+= mono-nat @@ -7,7 +7,7 @@ MONO_NAT_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.mono-nat+= mono-nat>=1.0.2 BUILDLINK_ABI_DEPENDS.mono-nat+= mono-nat>=1.0.2nb18 -BUILDLINK_PKGSRCDIR.mono-nat?= ../../net/mono-nat +BUILDLINK_PKGSRCDIR.mono-nat?= ../../net/mono-nat .include "../../lang/mono/buildlink3.mk" diff --git a/net/net-snmp/buildlink3.mk b/net/net-snmp/buildlink3.mk index 6a84a2554b9..ad395d233ce 100644 --- a/net/net-snmp/buildlink3.mk +++ b/net/net-snmp/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.14 2016/03/05 11:27:52 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2018/01/07 13:04:27 rillig Exp $ BUILDLINK_TREE+= net-snmp @@ -7,7 +7,7 @@ NET_SNMP_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.net-snmp+= net-snmp>=5.0.9nb3 BUILDLINK_ABI_DEPENDS.net-snmp+= net-snmp>=5.7.3nb3 -BUILDLINK_PKGSRCDIR.net-snmp?= ../../net/net-snmp +BUILDLINK_PKGSRCDIR.net-snmp?= ../../net/net-snmp pkgbase := net-snmp .include "../../mk/pkg-build-options.mk" diff --git a/net/netatalk22/buildlink3.mk b/net/netatalk22/buildlink3.mk index d17cc971948..d86f0cd548d 100644 --- a/net/netatalk22/buildlink3.mk +++ b/net/netatalk22/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2014/09/08 16:02:35 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:27 rillig Exp $ BUILDLINK_TREE+= netatalk @@ -7,8 +7,8 @@ NETATALK_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.netatalk+= netatalk22>=2.0.3nb2 BUILDLINK_ABI_DEPENDS.netatalk+= netatalk22>=2.0.3nb3 -BUILDLINK_PKGSRCDIR.netatalk?= ../../net/netatalk22 -BUILDLINK_DEPMETHOD.netatalk?= build +BUILDLINK_PKGSRCDIR.netatalk?= ../../net/netatalk22 +BUILDLINK_DEPMETHOD.netatalk?= build .endif # NETATALK_BUILDLINK3_MK BUILDLINK_TREE+= -netatalk diff --git a/net/ocaml-ipaddr/buildlink3.mk b/net/ocaml-ipaddr/buildlink3.mk index c1bfd5f4c01..b830846b804 100644 --- a/net/ocaml-ipaddr/buildlink3.mk +++ b/net/ocaml-ipaddr/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.10 2017/09/08 09:51:24 jaapb Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2018/01/07 13:04:27 rillig Exp $ BUILDLINK_TREE+= ocaml-ipaddr @@ -8,7 +8,7 @@ OCAML_IPADDR_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ocaml-ipaddr+= ocaml-ipaddr>=2.0.0 BUILDLINK_ABI_DEPENDS.ocaml-ipaddr?= ocaml-ipaddr>=2.8.0nb1 BUILDLINK_PKGSRCDIR.ocaml-ipaddr?= ../../net/ocaml-ipaddr -BUILDLINK_FILES.ocaml-ipaddr+= lib/ocaml/site-lib/* +BUILDLINK_FILES.ocaml-ipaddr+= lib/ocaml/site-lib/* .include "../../lang/ocaml/buildlink3.mk" .endif # OCAML_IPADDR_BUILDLINK3_MK diff --git a/net/ocamlnet/buildlink3.mk b/net/ocamlnet/buildlink3.mk index ad41438623f..d96841af1c6 100644 --- a/net/ocamlnet/buildlink3.mk +++ b/net/ocamlnet/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.8 2017/10/04 13:08:20 jaapb Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2018/01/07 13:04:27 rillig Exp $ BUILDLINK_TREE+= ocamlnet @@ -7,7 +7,7 @@ OCAMLNET_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ocamlnet+= ocamlnet>=4.1.2 BUILDLINK_ABI_DEPENDS.ocamlnet+= ocamlnet>=4.1.4nb3 -BUILDLINK_PKGSRCDIR.ocamlnet?= ../../net/ocamlnet +BUILDLINK_PKGSRCDIR.ocamlnet?= ../../net/ocamlnet .endif # OCAMLNET_BUILDLINK3_MK diff --git a/net/openh323/buildlink3.mk b/net/openh323/buildlink3.mk index 0a4395ab028..07b517875d0 100644 --- a/net/openh323/buildlink3.mk +++ b/net/openh323/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.13 2016/03/05 11:27:52 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2018/01/07 13:04:27 rillig Exp $ BUILDLINK_TREE+= openh323 @@ -7,7 +7,7 @@ OPENH323_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.openh323+= openh323>=1.15.1 BUILDLINK_ABI_DEPENDS.openh323+= openh323>=1.15.2nb6 -BUILDLINK_PKGSRCDIR.openh323?= ../../net/openh323 +BUILDLINK_PKGSRCDIR.openh323?= ../../net/openh323 .include "../../devel/pwlib/buildlink3.mk" .endif # OPENH323_BUILDLINK3_MK diff --git a/net/py-irclib/buildlink3.mk b/net/py-irclib/buildlink3.mk index e2efb94ed9a..ea34f0a1705 100644 --- a/net/py-irclib/buildlink3.mk +++ b/net/py-irclib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2012/11/03 14:18:06 imil Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:27 rillig Exp $ BUILDLINK_TREE+= py-irclib @@ -6,7 +6,7 @@ BUILDLINK_TREE+= py-irclib PY_IRCLIB_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.py-irclib+= ${PYPKGPREFIX}-irclib>=3.4.2 -BUILDLINK_PKGSRCDIR.py-irclib?= ../../net/py-irclib +BUILDLINK_PKGSRCDIR.py-irclib?= ../../net/py-irclib .endif # PY_IRCLIB_BUILDLINK3_MK diff --git a/net/radiusclient-ng/buildlink3.mk b/net/radiusclient-ng/buildlink3.mk index a2c7a23c13d..39153d4907f 100644 --- a/net/radiusclient-ng/buildlink3.mk +++ b/net/radiusclient-ng/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:12 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:27 rillig Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -11,10 +11,10 @@ BUILDLINK_API_DEPENDS.radiusclient-ng+= radiusclient-ng>=0.5.5.1 BUILDLINK_PKGSRCDIR.radiusclient-ng?= ../../net/radiusclient-ng BUILDLINK_DEPMETHOD.radiusclient-ng?= build -. if ${OPSYS} == "FreeBSD" +.if ${OPSYS} == "FreeBSD" BUILDLINK_LDADD.radiusclient-ng+= -lmd BUILDLINK_LDFLAGS.radiusclient-ng?= ${BUILDLINK_LDADD.radiusclient-ng} -. endif +.endif .endif # RADIUSCLIENT_NG_BUILDLINK3_MK BUILDLINK_TREE+= -radiusclient-ng diff --git a/parallel/pvm3/buildlink3.mk b/parallel/pvm3/buildlink3.mk index 152701e13cc..12e96d6987c 100644 --- a/parallel/pvm3/buildlink3.mk +++ b/parallel/pvm3/buildlink3.mk @@ -1,15 +1,15 @@ -# $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:25:13 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2018/01/07 13:04:28 rillig Exp $ BUILDLINK_TREE+= pvm .if !defined(PVM_BUILDLINK3_MK) PVM_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.pvm+= pvm>=3.4.3 +BUILDLINK_API_DEPENDS.pvm+= pvm>=3.4.3 BUILDLINK_ABI_DEPENDS.pvm+= pvm>=3.4.5nb1 BUILDLINK_PKGSRCDIR.pvm?= ../../parallel/pvm3 -. include "${BUILDLINK_PKGSRCDIR.pvm}/arch.mk" +.include "${BUILDLINK_PKGSRCDIR.pvm}/arch.mk" BUILDLINK_INCDIRS.pvm?= pvm3/include BUILDLINK_LIBDIRS.pvm?= pvm3/lib/${PVM_ARCH} .endif # PVM_BUILDLINK3_MK diff --git a/pkgtools/x11-links/buildlink3.mk b/pkgtools/x11-links/buildlink3.mk index 0115a7c6361..66da7914706 100644 --- a/pkgtools/x11-links/buildlink3.mk +++ b/pkgtools/x11-links/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.70 2017/09/02 19:17:37 tron Exp $ +# $NetBSD: buildlink3.mk,v 1.71 2018/01/07 13:04:28 rillig Exp $ # # Don't include this file manually! It will be included as necessary # by bsd.buildlink3.mk. @@ -13,8 +13,8 @@ BUILDLINK_TREE+= x11-links X11_LINKS_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.x11-links+= x11-links>=1.06 -BUILDLINK_PKGSRCDIR.x11-links?= ../../pkgtools/x11-links -BUILDLINK_DEPMETHOD.x11-links?= build +BUILDLINK_PKGSRCDIR.x11-links?= ../../pkgtools/x11-links +BUILDLINK_DEPMETHOD.x11-links?= build # Force all of the helper programs, headers and libraries to be symlinked # into ${BUILDLINK_X11_DIR}. diff --git a/print/ghostscript/buildlink3.mk b/print/ghostscript/buildlink3.mk index abf57e699f9..5950efc6ce9 100644 --- a/print/ghostscript/buildlink3.mk +++ b/print/ghostscript/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.20 2017/11/23 17:19:43 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.21 2018/01/07 13:04:28 rillig Exp $ BUILDLINK_TREE+= ghostscript @@ -6,7 +6,7 @@ BUILDLINK_TREE+= ghostscript GHOSTSCRIPT_BUILDLINK3_MK:= 1 BUILDLINK_API_DEPENDS.ghostscript+= ghostscript>=8.63nb1 -BUILDLINK_ABI_DEPENDS.ghostscript+= ghostscript>=9.05nb9 +BUILDLINK_ABI_DEPENDS.ghostscript+= ghostscript>=9.05nb9 BUILDLINK_PKGSRCDIR.ghostscript= ../../print/ghostscript pkgbase := ghostscript diff --git a/print/kpathsea/buildlink3.mk b/print/kpathsea/buildlink3.mk index e7acd8e2981..f70d3cae8e4 100644 --- a/print/kpathsea/buildlink3.mk +++ b/print/kpathsea/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2010/09/13 04:06:12 minskim Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2018/01/07 13:04:28 rillig Exp $ BUILDLINK_TREE+= kpathsea @@ -6,8 +6,8 @@ BUILDLINK_TREE+= kpathsea KPATHSEA_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.kpathsea+= kpathsea>=6.0.0 -BUILDLINK_PKGSRCDIR.kpathsea?= ../../print/kpathsea -BUILDLINK_FILES.kpathsea+= bin/kpsewhich +BUILDLINK_PKGSRCDIR.kpathsea?= ../../print/kpathsea +BUILDLINK_FILES.kpathsea+= bin/kpsewhich .endif # KPATHSEA_BUILDLINK3_MK BUILDLINK_TREE+= -kpathsea diff --git a/print/libpaper/buildlink3.mk b/print/libpaper/buildlink3.mk index 34b72f67163..e06e030ac37 100644 --- a/print/libpaper/buildlink3.mk +++ b/print/libpaper/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:15 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:28 rillig Exp $ BUILDLINK_TREE+= libpaper @@ -6,7 +6,7 @@ BUILDLINK_TREE+= libpaper LIBPAPER_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libpaper+= libpaper>=1.1.22 -BUILDLINK_PKGSRCDIR.libpaper?= ../../print/libpaper +BUILDLINK_PKGSRCDIR.libpaper?= ../../print/libpaper .endif # LIBPAPER_BUILDLINK3_MK BUILDLINK_TREE+= -libpaper diff --git a/print/poppler-includes/buildlink3.mk b/print/poppler-includes/buildlink3.mk index 00440ad327b..ac17b90262e 100644 --- a/print/poppler-includes/buildlink3.mk +++ b/print/poppler-includes/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.28 2017/12/08 08:52:56 maya Exp $ +# $NetBSD: buildlink3.mk,v 1.29 2018/01/07 13:04:28 rillig Exp $ BUILDLINK_TREE+= poppler-includes @@ -9,7 +9,7 @@ BUILDLINK_DEPMETHOD.poppler-includes?= build BUILDLINK_API_DEPENDS.poppler-includes+= poppler-includes>=0.22.2 BUILDLINK_ABI_DEPENDS.poppler-includes?= poppler-includes>=0.61.1nb1 -BUILDLINK_PKGSRCDIR.poppler-includes?= ../../print/poppler-includes +BUILDLINK_PKGSRCDIR.poppler-includes?= ../../print/poppler-includes .endif # POPPLER_INCLUDES_BUILDLINK3_MK BUILDLINK_TREE+= -poppler-includes diff --git a/security/beecrypt/buildlink3.mk b/security/beecrypt/buildlink3.mk index 5a3dae4b0a4..594ff77fa69 100644 --- a/security/beecrypt/buildlink3.mk +++ b/security/beecrypt/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:25:16 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2018/01/07 13:04:28 rillig Exp $ BUILDLINK_TREE+= beecrypt @@ -7,7 +7,7 @@ BEECRYPT_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.beecrypt+= beecrypt>=3.0.0 BUILDLINK_ABI_DEPENDS.beecrypt+= beecrypt>=3.0.0nb1 -BUILDLINK_PKGSRCDIR.beecrypt?= ../../security/beecrypt +BUILDLINK_PKGSRCDIR.beecrypt?= ../../security/beecrypt .endif # BEECRYPT_BUILDLINK3_MK BUILDLINK_TREE+= -beecrypt diff --git a/security/cvm/buildlink3.mk b/security/cvm/buildlink3.mk index fd83306e03d..0b21ef601cc 100644 --- a/security/cvm/buildlink3.mk +++ b/security/cvm/buildlink3.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.10 2010/03/15 03:21:15 schmonz Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2018/01/07 13:04:28 rillig Exp $ BUILDLINK_TREE+= cvm .if !defined(CVM_BUILDLINK3_MK) CVM_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.cvm+= cvm>=0.90 +BUILDLINK_API_DEPENDS.cvm+= cvm>=0.90 BUILDLINK_PKGSRCDIR.cvm?= ../../security/cvm .endif # CVM_BUILDLINK3_MK diff --git a/security/go-crypto/buildlink3.mk b/security/go-crypto/buildlink3.mk index e0b3afb5c20..d67e997ec80 100644 --- a/security/go-crypto/buildlink3.mk +++ b/security/go-crypto/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2017/03/20 22:53:45 bsiegert Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:28 rillig Exp $ BUILDLINK_TREE+= go-crypto @@ -9,7 +9,7 @@ BUILDLINK_CONTENTS_FILTER.go-crypto= ${EGREP} gopkg/ BUILDLINK_DEPMETHOD.go-crypto?= build BUILDLINK_API_DEPENDS.go-crypto+= go-crypto>=0.0.20170317 -BUILDLINK_PKGSRCDIR.go-crypto?= ../../security/go-crypto +BUILDLINK_PKGSRCDIR.go-crypto?= ../../security/go-crypto .endif # GO_CRYPTO_BUILDLINK3_MK diff --git a/security/go-oauth2/buildlink3.mk b/security/go-oauth2/buildlink3.mk index 887837557fb..5a18f9c66ee 100644 --- a/security/go-oauth2/buildlink3.mk +++ b/security/go-oauth2/buildlink3.mk @@ -1,14 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.2 2015/12/29 21:47:48 bsiegert Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:28 rillig Exp $ BUILDLINK_TREE+= go-oauth2 .if !defined(GO_OAUTH2_BUILDLINK3_MK) GO_OAUTH2_BUILDLINK3_MK:= -BUILDLINK_CONTENTS_FILTER.go-oauth2= ${EGREP} gopkg/ -BUILDLINK_DEPMETHOD.go-oauth2?= build +BUILDLINK_CONTENTS_FILTER.go-oauth2= ${EGREP} gopkg/ +BUILDLINK_DEPMETHOD.go-oauth2?= build BUILDLINK_API_DEPENDS.go-oauth2+= go-oauth2>=20150310 -BUILDLINK_PKGSRCDIR.go-oauth2?= ../../security/go-oauth2 +BUILDLINK_PKGSRCDIR.go-oauth2?= ../../security/go-oauth2 .include "../../textproc/go-text/buildlink3.mk" .include "../../net/gcloud-golang-metadata/buildlink3.mk" diff --git a/security/gss/buildlink3.mk b/security/gss/buildlink3.mk index 83e79628de0..7da2bfe07f9 100644 --- a/security/gss/buildlink3.mk +++ b/security/gss/buildlink3.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:17 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2018/01/07 13:04:28 rillig Exp $ BUILDLINK_TREE+= gss .if !defined(GSS_BUILDLINK3_MK) GSS_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.gss+= gss>=0.0.6nb1 +BUILDLINK_API_DEPENDS.gss+= gss>=0.0.6nb1 BUILDLINK_ABI_DEPENDS.gss+= gss>=0.0.13nb1 BUILDLINK_PKGSRCDIR.gss?= ../../security/gss .endif # GSS_BUILDLINK3_MK diff --git a/security/hs-digest/buildlink3.mk b/security/hs-digest/buildlink3.mk index a24298021d2..8cc58992304 100644 --- a/security/hs-digest/buildlink3.mk +++ b/security/hs-digest/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2014/08/29 14:08:41 szptvlfn Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:28 rillig Exp $ BUILDLINK_TREE+= hs-digest @@ -7,7 +7,7 @@ HS_DIGEST_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.hs-digest+= hs-digest>=0.0.1 BUILDLINK_ABI_DEPENDS.hs-digest+= hs-digest>=0.0.1.2 -BUILDLINK_PKGSRCDIR.hs-digest?= ../../security/hs-digest +BUILDLINK_PKGSRCDIR.hs-digest?= ../../security/hs-digest .endif # HS_DIGEST_BUILDLINK3_MK BUILDLINK_TREE+= -hs-digest diff --git a/security/libcrack/buildlink3.mk b/security/libcrack/buildlink3.mk index f38d78f96cd..9707968f5af 100644 --- a/security/libcrack/buildlink3.mk +++ b/security/libcrack/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.11 2009/03/20 19:25:18 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2018/01/07 13:04:29 rillig Exp $ BUILDLINK_TREE+= libcrack @@ -7,7 +7,7 @@ LIBCRACK_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libcrack+= libcrack>=2.7 BUILDLINK_ABI_DEPENDS.libcrack+= libcrack>=2.7nb1 -BUILDLINK_PKGSRCDIR.libcrack?= ../../security/libcrack +BUILDLINK_PKGSRCDIR.libcrack?= ../../security/libcrack .endif # LIBCRACK_BUILDLINK3_MK BUILDLINK_TREE+= -libcrack diff --git a/security/libglobalplatform/buildlink3.mk b/security/libglobalplatform/buildlink3.mk index a9065f029dd..a47f6ed3594 100644 --- a/security/libglobalplatform/buildlink3.mk +++ b/security/libglobalplatform/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2016/03/05 11:27:54 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:29 rillig Exp $ BUILDLINK_TREE+= libglobalplatform @@ -7,7 +7,7 @@ LIBGLOBALPLATFORM_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libglobalplatform+= libglobalplatform>=6.0.0 BUILDLINK_ABI_DEPENDS.libglobalplatform?= libglobalplatform>=6.0.0nb1 -BUILDLINK_PKGSRCDIR.libglobalplatform?= ../../security/libglobalplatform +BUILDLINK_PKGSRCDIR.libglobalplatform?= ../../security/libglobalplatform .include "../../security/pcsc-lite/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" diff --git a/security/libgnome-keyring/buildlink3.mk b/security/libgnome-keyring/buildlink3.mk index 564a3e72968..d547137729b 100644 --- a/security/libgnome-keyring/buildlink3.mk +++ b/security/libgnome-keyring/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.9 2014/01/01 11:52:02 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2018/01/07 13:04:29 rillig Exp $ BUILDLINK_TREE+= libgnome-keyring @@ -7,7 +7,7 @@ LIBGNOME_KEYRING_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libgnome-keyring+= libgnome-keyring>=2.32.0 BUILDLINK_ABI_DEPENDS.libgnome-keyring+= libgnome-keyring>=3.4.1nb2 -BUILDLINK_PKGSRCDIR.libgnome-keyring?= ../../security/libgnome-keyring +BUILDLINK_PKGSRCDIR.libgnome-keyring?= ../../security/libgnome-keyring .include "../../devel/glib2/buildlink3.mk" .include "../../security/libgcrypt/buildlink3.mk" diff --git a/security/libident/buildlink3.mk b/security/libident/buildlink3.mk index 799e782dad5..e2e5361e9ab 100644 --- a/security/libident/buildlink3.mk +++ b/security/libident/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:25:19 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2018/01/07 13:04:29 rillig Exp $ BUILDLINK_TREE+= libident @@ -7,7 +7,7 @@ LIBIDENT_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libident+= libident>=0.22 BUILDLINK_ABI_DEPENDS.libident+= libident>=0.22nb1 -BUILDLINK_PKGSRCDIR.libident?= ../../security/libident +BUILDLINK_PKGSRCDIR.libident?= ../../security/libident .endif # LIBIDENT_BUILDLINK3_MK BUILDLINK_TREE+= -libident diff --git a/security/libmcrypt/buildlink3.mk b/security/libmcrypt/buildlink3.mk index 31bf57e252a..7a10669b0e3 100644 --- a/security/libmcrypt/buildlink3.mk +++ b/security/libmcrypt/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:25:19 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2018/01/07 13:04:29 rillig Exp $ BUILDLINK_TREE+= libmcrypt @@ -7,7 +7,7 @@ LIBMCRYPT_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libmcrypt+= libmcrypt>=2.5.6 BUILDLINK_ABI_DEPENDS.libmcrypt+= libmcrypt>=2.5.7nb1 -BUILDLINK_PKGSRCDIR.libmcrypt?= ../../security/libmcrypt +BUILDLINK_PKGSRCDIR.libmcrypt?= ../../security/libmcrypt .endif # LIBMCRYPT_BUILDLINK3_MK BUILDLINK_TREE+= -libmcrypt diff --git a/security/liboauth/buildlink3.mk b/security/liboauth/buildlink3.mk index 04fbd0acdd3..cbaa97aa620 100644 --- a/security/liboauth/buildlink3.mk +++ b/security/liboauth/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.11 2018/01/01 21:18:10 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2018/01/07 13:04:29 rillig Exp $ BUILDLINK_TREE+= liboauth @@ -7,7 +7,7 @@ LIBOAUTH_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.liboauth+= liboauth>=0.8.9 BUILDLINK_ABI_DEPENDS.liboauth?= liboauth>=1.0.3nb6 -BUILDLINK_PKGSRCDIR.liboauth?= ../../security/liboauth +BUILDLINK_PKGSRCDIR.liboauth?= ../../security/liboauth .include "../../security/openssl/buildlink3.mk" .include "../../www/curl/buildlink3.mk" diff --git a/security/libprelude-python/buildlink3.mk b/security/libprelude-python/buildlink3.mk index 003c4580cc5..291673d75a0 100644 --- a/security/libprelude-python/buildlink3.mk +++ b/security/libprelude-python/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/08/23 19:05:56 hasso Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:29 rillig Exp $ BUILDLINK_TREE+= libprelude-python @@ -6,7 +6,7 @@ BUILDLINK_TREE+= libprelude-python LIBPRELUDE_PYTHON_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libprelude-python+= libprelude-python>=0.9.24 -BUILDLINK_PKGSRCDIR.libprelude-python?= ../../security/libprelude-python +BUILDLINK_PKGSRCDIR.libprelude-python?= ../../security/libprelude-python .endif # LIBPRELUDE_PYTHON_BUILDLINK3_MK BUILDLINK_TREE+= -libprelude-python diff --git a/security/libpreludedb-perl/buildlink3.mk b/security/libpreludedb-perl/buildlink3.mk index 0700488169f..be940edc207 100644 --- a/security/libpreludedb-perl/buildlink3.mk +++ b/security/libpreludedb-perl/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2009/10/02 09:59:40 hasso Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:29 rillig Exp $ BUILDLINK_TREE+= libpreludedb-perl @@ -6,7 +6,7 @@ BUILDLINK_TREE+= libpreludedb-perl LIBPRELUDEDB_PERL_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libpreludedb-perl+= libpreludedb-perl>=0.9.15.3 -BUILDLINK_PKGSRCDIR.libpreludedb-perl?= ../../security/libpreludedb-perl +BUILDLINK_PKGSRCDIR.libpreludedb-perl?= ../../security/libpreludedb-perl .endif # LIBPRELUDEDB_PERL_BUILDLINK3_MK diff --git a/security/libressl/buildlink3.mk b/security/libressl/buildlink3.mk index 68edd24f509..daaa3efa53b 100644 --- a/security/libressl/buildlink3.mk +++ b/security/libressl/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2016/07/26 11:53:24 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:29 rillig Exp $ BUILDLINK_TREE+= libressl @@ -6,7 +6,7 @@ BUILDLINK_TREE+= libressl LIBRESSL_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libressl+= libressl>=2.2.6 -BUILDLINK_PKGSRCDIR.libressl?= ../../security/libressl +BUILDLINK_PKGSRCDIR.libressl?= ../../security/libressl BUILDLINK_PASSTHRU_DIRS+= ${LOCALBASE}/libressl/include BUILDLINK_PASSTHRU_DIRS+= ${LOCALBASE}/libressl/lib diff --git a/security/libsecret/buildlink3.mk b/security/libsecret/buildlink3.mk index 459a46d3d93..f72b50863b9 100644 --- a/security/libsecret/buildlink3.mk +++ b/security/libsecret/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2014/01/01 11:52:03 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:29 rillig Exp $ BUILDLINK_TREE+= libsecret @@ -7,7 +7,7 @@ LIBSECRET_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libsecret+= libsecret>=0.12 BUILDLINK_ABI_DEPENDS.libsecret?= libsecret>=0.15nb1 -BUILDLINK_PKGSRCDIR.libsecret?= ../../security/libsecret +BUILDLINK_PKGSRCDIR.libsecret?= ../../security/libsecret .include "../../devel/glib2/buildlink3.mk" .include "../../security/libgcrypt/buildlink3.mk" diff --git a/security/nettle/buildlink3.mk b/security/nettle/buildlink3.mk index 8741f0e29ab..47cce1cd92a 100644 --- a/security/nettle/buildlink3.mk +++ b/security/nettle/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2016/02/01 13:27:36 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2018/01/07 13:04:29 rillig Exp $ BUILDLINK_TREE+= nettle @@ -7,7 +7,7 @@ NETTLE_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.nettle+= nettle>=2.4 BUILDLINK_ABI_DEPENDS.nettle?= nettle>=3.1.1 -BUILDLINK_PKGSRCDIR.nettle?= ../../security/nettle +BUILDLINK_PKGSRCDIR.nettle?= ../../security/nettle .include "../../devel/gmp/buildlink3.mk" .endif # NETTLE_BUILDLINK3_MK diff --git a/security/ocaml-ssl/buildlink3.mk b/security/ocaml-ssl/buildlink3.mk index 505e075db33..0f74e040c41 100644 --- a/security/ocaml-ssl/buildlink3.mk +++ b/security/ocaml-ssl/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.20 2017/09/08 09:51:25 jaapb Exp $ +# $NetBSD: buildlink3.mk,v 1.21 2018/01/07 13:04:30 rillig Exp $ BUILDLINK_TREE+= ocaml-ssl @@ -7,7 +7,7 @@ OCAML_SSL_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ocaml-ssl+= ocaml-ssl>=0.4.0 BUILDLINK_ABI_DEPENDS.ocaml-ssl+= ocaml-ssl>=0.5.3nb2 -BUILDLINK_PKGSRCDIR.ocaml-ssl?= ../../security/ocaml-ssl +BUILDLINK_PKGSRCDIR.ocaml-ssl?= ../../security/ocaml-ssl .include "../../lang/ocaml/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" diff --git a/security/openssl/buildlink3.mk b/security/openssl/buildlink3.mk index 31d0b69b422..eb0c7e36140 100644 --- a/security/openssl/buildlink3.mk +++ b/security/openssl/buildlink3.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.51 2016/03/05 11:27:55 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.52 2018/01/07 13:04:30 rillig Exp $ BUILDLINK_TREE+= openssl .if !defined(OPENSSL_BUILDLINK3_MK) OPENSSL_BUILDLINK3_MK:= -. include "../../mk/bsd.fast.prefs.mk" +.include "../../mk/bsd.fast.prefs.mk" BUILDLINK_API_DEPENDS.openssl+= openssl>=1.0.1c BUILDLINK_ABI_DEPENDS.openssl+= openssl>=1.0.2gnb1 diff --git a/security/openvas-libraries/buildlink3.mk b/security/openvas-libraries/buildlink3.mk index 17c140214ec..6417b5abe5c 100644 --- a/security/openvas-libraries/buildlink3.mk +++ b/security/openvas-libraries/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:21 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:30 rillig Exp $ BUILDLINK_TREE+= openvas-libraries @@ -6,7 +6,7 @@ BUILDLINK_TREE+= openvas-libraries OPENVAS_LIBRARIES_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.openvas-libraries+= openvas-libraries>=2.0.0 -BUILDLINK_PKGSRCDIR.openvas-libraries?= ../../security/openvas-libraries +BUILDLINK_PKGSRCDIR.openvas-libraries?= ../../security/openvas-libraries .endif # OPENVAS_LIBRARIES_BUILDLINK3_MK BUILDLINK_TREE+= -openvas-libraries diff --git a/security/pakchois/buildlink3.mk b/security/pakchois/buildlink3.mk index c2c797c839a..4230359c1ad 100644 --- a/security/pakchois/buildlink3.mk +++ b/security/pakchois/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2012/05/07 01:53:57 dholland Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2018/01/07 13:04:30 rillig Exp $ BUILDLINK_TREE+= pakchois @@ -7,7 +7,7 @@ PAKCHOIS_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.pakchois+= pakchois>=0.4 BUILDLINK_ABI_DEPENDS.pakchois+= pakchois>=0.4nb1 -BUILDLINK_PKGSRCDIR.pakchois?= ../../security/pakchois +BUILDLINK_PKGSRCDIR.pakchois?= ../../security/pakchois .include "../../devel/gettext-lib/buildlink3.mk" .include "../../mk/dlopen.buildlink3.mk" diff --git a/security/pcsc-lite/buildlink3.mk b/security/pcsc-lite/buildlink3.mk index 8aba47976ec..30ec805f02a 100644 --- a/security/pcsc-lite/buildlink3.mk +++ b/security/pcsc-lite/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2014/03/17 17:44:23 gdt Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2018/01/07 13:04:30 rillig Exp $ BUILDLINK_TREE+= pcsc-lite @@ -6,7 +6,7 @@ BUILDLINK_TREE+= pcsc-lite PCSC_LITE_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.pcsc-lite+= pcsc-lite>=1.6.5 -BUILDLINK_PKGSRCDIR.pcsc-lite?= ../../security/pcsc-lite +BUILDLINK_PKGSRCDIR.pcsc-lite?= ../../security/pcsc-lite .endif # PCSC_LITE_BUILDLINK3_MK diff --git a/security/pinentry/buildlink3.mk b/security/pinentry/buildlink3.mk index 68e7dda36d1..68d1d8e7096 100644 --- a/security/pinentry/buildlink3.mk +++ b/security/pinentry/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:21 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2018/01/07 13:04:30 rillig Exp $ BUILDLINK_TREE+= pinentry @@ -7,7 +7,7 @@ PINENTRY_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.pinentry+= pinentry>=0.7.1 BUILDLINK_ABI_DEPENDS.pinentry+= pinentry>=0.7.1nb3 -BUILDLINK_PKGSRCDIR.pinentry?= ../../security/pinentry +BUILDLINK_PKGSRCDIR.pinentry?= ../../security/pinentry .endif # PINENTRY_BUILDLINK3_MK BUILDLINK_TREE+= -pinentry diff --git a/security/policykit/buildlink3.mk b/security/policykit/buildlink3.mk index 963b11aa7b3..42763b54304 100644 --- a/security/policykit/buildlink3.mk +++ b/security/policykit/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2012/09/15 10:06:17 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2018/01/07 13:04:30 rillig Exp $ BUILDLINK_TREE+= policykit @@ -7,7 +7,7 @@ POLICYKIT_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.policykit+= policykit>=0.9 BUILDLINK_ABI_DEPENDS.policykit+= policykit>=0.9nb12 -BUILDLINK_PKGSRCDIR.policykit?= ../../security/policykit +BUILDLINK_PKGSRCDIR.policykit?= ../../security/policykit .include "../../sysutils/dbus/buildlink3.mk" .include "../../sysutils/dbus-glib/buildlink3.mk" diff --git a/security/polkit-qt/buildlink3.mk b/security/polkit-qt/buildlink3.mk index e2187c9e32f..934e085ff7b 100644 --- a/security/polkit-qt/buildlink3.mk +++ b/security/polkit-qt/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.25 2016/03/05 11:27:55 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.26 2018/01/07 13:04:30 rillig Exp $ BUILDLINK_TREE+= polkit-qt @@ -7,7 +7,7 @@ POLKIT_QT_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.polkit-qt+= polkit-qt>=0.9.2 BUILDLINK_ABI_DEPENDS.polkit-qt+= polkit-qt>=0.9.4nb19 -BUILDLINK_PKGSRCDIR.polkit-qt?= ../../security/polkit-qt +BUILDLINK_PKGSRCDIR.polkit-qt?= ../../security/polkit-qt .include "../../security/policykit/buildlink3.mk" .include "../../x11/qt4-libs/buildlink3.mk" diff --git a/security/qore-ssh2-module/buildlink3.mk b/security/qore-ssh2-module/buildlink3.mk index 79fdb17f1ff..6c9e4268201 100644 --- a/security/qore-ssh2-module/buildlink3.mk +++ b/security/qore-ssh2-module/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2016/07/20 14:54:57 nros Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:30 rillig Exp $ BUILDLINK_TREE+= qore-ssh2-module @@ -7,7 +7,7 @@ QORE_SSH2_MODULE_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.qore-ssh2-module+= qore-ssh2-module>=0.9.9 BUILDLINK_ABI_DEPENDS.qore-ssh2-module?= qore-ssh2-module>=1.0 -BUILDLINK_PKGSRCDIR.qore-ssh2-module?= ../../security/qore-ssh2-module +BUILDLINK_PKGSRCDIR.qore-ssh2-module?= ../../security/qore-ssh2-module .include "../../lang/qore/buildlink3.mk" .endif # QORE_SSH2_MODULE_BUILDLINK3_MK diff --git a/security/seahorse/buildlink3.mk b/security/seahorse/buildlink3.mk index ab0d7d9b057..e338c594576 100644 --- a/security/seahorse/buildlink3.mk +++ b/security/seahorse/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.38 2017/02/12 06:24:49 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.39 2018/01/07 13:04:30 rillig Exp $ BUILDLINK_TREE+= seahorse @@ -7,7 +7,7 @@ SEAHORSE_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.seahorse+= seahorse>=2.24.1 BUILDLINK_ABI_DEPENDS.seahorse+= seahorse>=2.32.0nb42 -BUILDLINK_PKGSRCDIR.seahorse?= ../../security/seahorse +BUILDLINK_PKGSRCDIR.seahorse?= ../../security/seahorse .include "../../sysutils/dbus-glib/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/security/sleuthkit/buildlink3.mk b/security/sleuthkit/buildlink3.mk index 4e1a8db6a2e..20e7c03c573 100644 --- a/security/sleuthkit/buildlink3.mk +++ b/security/sleuthkit/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2015/06/18 13:01:44 pettai Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:30 rillig Exp $ BUILDLINK_TREE+= sleuthkit @@ -6,7 +6,7 @@ BUILDLINK_TREE+= sleuthkit SLEUTHKIT_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.sleuthkit+= sleuthkit>=4.1.3nb3 -BUILDLINK_PKGSRCDIR.sleuthkit?= ../../security/sleuthkit +BUILDLINK_PKGSRCDIR.sleuthkit?= ../../security/sleuthkit .endif # SLEUTHKIT_BUILDLINK3_MK diff --git a/security/ykclient/buildlink3.mk b/security/ykclient/buildlink3.mk index 72b03e05325..a4255b4d293 100644 --- a/security/ykclient/buildlink3.mk +++ b/security/ykclient/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.10 2018/01/01 21:18:11 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2018/01/07 13:04:30 rillig Exp $ BUILDLINK_TREE+= ykclient @@ -7,7 +7,7 @@ YKCLIENT_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ykclient+= ykclient>=2.7 BUILDLINK_ABI_DEPENDS.ykclient?= ykclient>=2.13nb7 -BUILDLINK_PKGSRCDIR.ykclient?= ../../security/ykclient +BUILDLINK_PKGSRCDIR.ykclient?= ../../security/ykclient .include "../../www/curl/buildlink3.mk" .endif # YKCLIENT_BUILDLINK3_MK diff --git a/sysutils/amanda-common/buildlink3.mk b/sysutils/amanda-common/buildlink3.mk index deed7ebd850..d17938907e5 100644 --- a/sysutils/amanda-common/buildlink3.mk +++ b/sysutils/amanda-common/buildlink3.mk @@ -1,9 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.14 2012/07/30 07:21:11 sbd Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2018/01/07 13:04:31 rillig Exp $ BUILDLINK_TREE+= amanda-common .if !defined(AMANDA_COMMON_BUILDLINK3_MK) AMANDA_COMMON_BUILDLINK3_MK:= + .include "version.mk" BUILDLINK_API_DEPENDS.amanda-common+= amanda-common>=${AMANDA_VERSION} @@ -14,10 +15,10 @@ BUILDLINK_LIBDIRS.amanda-common= lib/amanda pkgbase := amanda-common .include "../../mk/pkg-build-options.mk" -. if !empty(PKG_BUILD_OPTIONS.amanda-common:Mamanda-krb5) -CONFIGURE_ARGS+= --with-krb5-security=${KRB5BASE:Q} -. include "../../mk/krb5.buildlink3.mk" -. endif +.if !empty(PKG_BUILD_OPTIONS.amanda-common:Mamanda-krb5) +CONFIGURE_ARGS+= --with-krb5-security=${KRB5BASE} +. include "../../mk/krb5.buildlink3.mk" +.endif .endif # AMANDA_COMMON_BUILDLINK3_MK BUILDLINK_TREE+= -amanda-common diff --git a/sysutils/augeas/buildlink3.mk b/sysutils/augeas/buildlink3.mk index 84c6a089ec0..8a7baf68120 100644 --- a/sysutils/augeas/buildlink3.mk +++ b/sysutils/augeas/buildlink3.mk @@ -1,4 +1,5 @@ -# $NetBSD: buildlink3.mk,v 1.1 2014/12/30 15:03:32 bsiegert Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:31 rillig Exp $ + BUILDLINK_TREE+= augeas .if !defined(AUGEAS_BUILDLINK3_MK) diff --git a/sysutils/dbus-glib/buildlink3.mk b/sysutils/dbus-glib/buildlink3.mk index 51558629252..ea951c68da4 100644 --- a/sysutils/dbus-glib/buildlink3.mk +++ b/sysutils/dbus-glib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.16 2012/09/15 10:06:22 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.17 2018/01/07 13:04:31 rillig Exp $ BUILDLINK_TREE+= dbus-glib @@ -7,7 +7,7 @@ DBUS_GLIB_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.dbus-glib+= dbus-glib>=0.61 BUILDLINK_ABI_DEPENDS.dbus-glib+= dbus-glib>=0.100nb1 -BUILDLINK_PKGSRCDIR.dbus-glib?= ../../sysutils/dbus-glib +BUILDLINK_PKGSRCDIR.dbus-glib?= ../../sysutils/dbus-glib .include "../../devel/glib2/buildlink3.mk" .include "../../sysutils/dbus/buildlink3.mk" diff --git a/sysutils/dbus/buildlink3.mk b/sysutils/dbus/buildlink3.mk index 758438963c0..69ae8dc2a94 100644 --- a/sysutils/dbus/buildlink3.mk +++ b/sysutils/dbus/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.16 2014/01/29 13:01:53 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.17 2018/01/07 13:04:31 rillig Exp $ BUILDLINK_TREE+= dbus @@ -10,7 +10,7 @@ BUILDLINK_PKGSRCDIR.dbus?= ../../sysutils/dbus .if defined(USE_DBUS-ARCH-DEPS_H) . if !empty(USE_DBUS-ARCH-DEPS_H:M[yY][eE][sS]) -BUILDLINK_INCDIRS.dbus+= lib/dbus-1.0/include/dbus +BUILDLINK_INCDIRS.dbus+= lib/dbus-1.0/include/dbus BUILDLINK_FNAME_TRANSFORM.dbus+= -e "s|lib/dbus-1.0/||" . endif .endif diff --git a/sysutils/deforaos-browser/buildlink3.mk b/sysutils/deforaos-browser/buildlink3.mk index 7a39247bb49..6a69cd076e4 100644 --- a/sysutils/deforaos-browser/buildlink3.mk +++ b/sysutils/deforaos-browser/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.15 2017/02/12 06:24:49 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.16 2018/01/07 13:04:31 rillig Exp $ BUILDLINK_TREE+= deforaos-browser @@ -7,7 +7,7 @@ DEFORAOS_BROWSER_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.deforaos-browser+= deforaos-browser>=0.5.0 BUILDLINK_ABI_DEPENDS.deforaos-browser?= deforaos-browser>=0.5.1nb3 -BUILDLINK_PKGSRCDIR.deforaos-browser?= ../../sysutils/deforaos-browser +BUILDLINK_PKGSRCDIR.deforaos-browser?= ../../sysutils/deforaos-browser .include "../../x11/deforaos-libdesktop/buildlink3.mk" .endif # DEFORAOS_BROWSER_BUILDLINK3_MK diff --git a/sysutils/desktop-file-utils/buildlink3.mk b/sysutils/desktop-file-utils/buildlink3.mk index ecafdf8f3ba..5f8cbeec2a2 100644 --- a/sysutils/desktop-file-utils/buildlink3.mk +++ b/sysutils/desktop-file-utils/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:25:23 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2018/01/07 13:04:31 rillig Exp $ BUILDLINK_TREE+= desktop-file-utils @@ -7,7 +7,7 @@ DESKTOP_FILE_UTILS_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.desktop-file-utils+= desktop-file-utils>=0.8 BUILDLINK_ABI_DEPENDS.desktop-file-utils+= desktop-file-utils>=0.10nb1 -BUILDLINK_PKGSRCDIR.desktop-file-utils?=../../sysutils/desktop-file-utils +BUILDLINK_PKGSRCDIR.desktop-file-utils?= ../../sysutils/desktop-file-utils BUILDLINK_TARGETS+= desktop-file-utils-buildlink-fake diff --git a/sysutils/eventlog/buildlink3.mk b/sysutils/eventlog/buildlink3.mk index 366c5624cdb..69f535ebe75 100644 --- a/sysutils/eventlog/buildlink3.mk +++ b/sysutils/eventlog/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2011/09/21 19:29:24 bouyer Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:31 rillig Exp $ BUILDLINK_TREE+= eventlog @@ -6,7 +6,7 @@ BUILDLINK_TREE+= eventlog EVENTLOG_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.eventlog+= eventlog>=0.2.12 -BUILDLINK_PKGSRCDIR.eventlog?= ../../sysutils/eventlog +BUILDLINK_PKGSRCDIR.eventlog?= ../../sysutils/eventlog .endif # EVENTLOG_BUILDLINK3_MK BUILDLINK_TREE+= -eventlog diff --git a/sysutils/fam/buildlink3.mk b/sysutils/fam/buildlink3.mk index b95c6e22796..afba7bd2a1f 100644 --- a/sysutils/fam/buildlink3.mk +++ b/sysutils/fam/buildlink3.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:23 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2018/01/07 13:04:31 rillig Exp $ BUILDLINK_TREE+= fam .if !defined(FAM_BUILDLINK3_MK) FAM_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.fam+= fam>=2.6.10 +BUILDLINK_API_DEPENDS.fam+= fam>=2.6.10 BUILDLINK_ABI_DEPENDS.fam+= fam>=2.7.0nb7 BUILDLINK_PKGSRCDIR.fam?= ../../sysutils/fam .endif # FAM_BUILDLINK3_MK diff --git a/sysutils/file/buildlink3.mk b/sysutils/file/buildlink3.mk index 99c0c8e35f8..b55e765538a 100644 --- a/sysutils/file/buildlink3.mk +++ b/sysutils/file/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:24 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2018/01/07 13:04:31 rillig Exp $ # BUILDLINK_TREE+= file @@ -6,7 +6,7 @@ BUILDLINK_TREE+= file .if !defined(FILE_BUILDLINK3_MK) FILE_BUILDLINK3_MK:= -. include "../../mk/bsd.fast.prefs.mk" +.include "../../mk/bsd.fast.prefs.mk" BUILDLINK_API_DEPENDS.file+= file>=4.17 BUILDLINK_ABI_DEPENDS.file+= file>=4.17 diff --git a/sysutils/gnome-menus/buildlink3.mk b/sysutils/gnome-menus/buildlink3.mk index 62234c03811..1d648d3916b 100644 --- a/sysutils/gnome-menus/buildlink3.mk +++ b/sysutils/gnome-menus/buildlink3.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.21 2012/09/15 10:06:24 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.22 2018/01/07 13:04:31 rillig Exp $ BUILDLINK_TREE+= gnome-menus .if !defined(GNOME_MENUS_BUILDLINK3_MK) GNOME_MENUS_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.gnome-menus+= gnome-menus>=2.13.5 +BUILDLINK_API_DEPENDS.gnome-menus+= gnome-menus>=2.13.5 BUILDLINK_ABI_DEPENDS.gnome-menus+= gnome-menus>=2.30.5nb4 BUILDLINK_PKGSRCDIR.gnome-menus?= ../../sysutils/gnome-menus diff --git a/sysutils/gsettings-desktop-schemas/buildlink3.mk b/sysutils/gsettings-desktop-schemas/buildlink3.mk index 9784fab0f61..7e2f7e1b054 100644 --- a/sysutils/gsettings-desktop-schemas/buildlink3.mk +++ b/sysutils/gsettings-desktop-schemas/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2012/08/23 13:38:03 prlw1 Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:31 rillig Exp $ # Just for the pkg_config .pc file BUILDLINK_TREE+= gsettings-desktop-schemas @@ -7,7 +7,7 @@ BUILDLINK_TREE+= gsettings-desktop-schemas GSETTINGS_DESKTOP_SCHEMAS_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.gsettings-desktop-schemas+= gsettings-desktop-schemas>=3.4.2 -BUILDLINK_PKGSRCDIR.gsettings-desktop-schemas?= ../../sysutils/gsettings-desktop-schemas +BUILDLINK_PKGSRCDIR.gsettings-desktop-schemas?= ../../sysutils/gsettings-desktop-schemas .endif # GSETTINGS_DESKTOP_SCHEMAS_BUILDLINK3_MK diff --git a/sysutils/hal-info/buildlink3.mk b/sysutils/hal-info/buildlink3.mk index 5c35cc03001..2783bb5625f 100644 --- a/sysutils/hal-info/buildlink3.mk +++ b/sysutils/hal-info/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:24 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:32 rillig Exp $ BUILDLINK_TREE+= hal-info @@ -6,7 +6,7 @@ BUILDLINK_TREE+= hal-info HAL_INFO_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.hal-info+= hal-info>=20081022 -BUILDLINK_PKGSRCDIR.hal-info?= ../../sysutils/hal-info +BUILDLINK_PKGSRCDIR.hal-info?= ../../sysutils/hal-info .endif # HAL_INFO_BUILDLINK3_MK BUILDLINK_TREE+= -hal-info diff --git a/sysutils/libbaloo4/buildlink3.mk b/sysutils/libbaloo4/buildlink3.mk index 7a102588b7d..a0ffd293787 100644 --- a/sysutils/libbaloo4/buildlink3.mk +++ b/sysutils/libbaloo4/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2016/04/28 07:01:13 markd Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:32 rillig Exp $ BUILDLINK_TREE+= libbaloo4 @@ -6,7 +6,7 @@ BUILDLINK_TREE+= libbaloo4 LIBBALOO4_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libbaloo4+= libbaloo4>=4.14.3 -BUILDLINK_PKGSRCDIR.libbaloo4?= ../../sysutils/libbaloo4 +BUILDLINK_PKGSRCDIR.libbaloo4?= ../../sysutils/libbaloo4 .include "../../sysutils/kfilemetadata/buildlink3.mk" .endif # LIBBALOO4_BUILDLINK3_MK diff --git a/sysutils/libdevkit-gobject/buildlink3.mk b/sysutils/libdevkit-gobject/buildlink3.mk index d6cf305a970..c011b83168d 100644 --- a/sysutils/libdevkit-gobject/buildlink3.mk +++ b/sysutils/libdevkit-gobject/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2012/09/15 10:06:29 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2018/01/07 13:04:32 rillig Exp $ BUILDLINK_TREE+= libdevkit-gobject @@ -7,7 +7,7 @@ LIBDEVKIT_GOBJECT_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libdevkit-gobject+= libdevkit-gobject>=003 BUILDLINK_ABI_DEPENDS.libdevkit-gobject+= libdevkit-gobject>=003nb6 -BUILDLINK_PKGSRCDIR.libdevkit-gobject?= ../../sysutils/libdevkit-gobject +BUILDLINK_PKGSRCDIR.libdevkit-gobject?= ../../sysutils/libdevkit-gobject .include "../../devel/glib2/buildlink3.mk" .include "../../sysutils/dbus-glib/buildlink3.mk" diff --git a/sysutils/libgamin/buildlink3.mk b/sysutils/libgamin/buildlink3.mk index f0aa2eb793d..999de47620b 100644 --- a/sysutils/libgamin/buildlink3.mk +++ b/sysutils/libgamin/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:24 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:32 rillig Exp $ BUILDLINK_TREE+= libgamin @@ -6,7 +6,7 @@ BUILDLINK_TREE+= libgamin LIBGAMIN_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libgamin+= libgamin>=0.1.10 -BUILDLINK_PKGSRCDIR.libgamin?= ../../sysutils/libgamin +BUILDLINK_PKGSRCDIR.libgamin?= ../../sysutils/libgamin .endif # LIBGAMIN_BUILDLINK3_MK BUILDLINK_TREE+= -libgamin diff --git a/sysutils/libisofs/buildlink3.mk b/sysutils/libisofs/buildlink3.mk index 515c90548e8..0e935080924 100644 --- a/sysutils/libisofs/buildlink3.mk +++ b/sysutils/libisofs/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2014/04/29 20:03:06 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:32 rillig Exp $ BUILDLINK_TREE+= libisofs @@ -6,7 +6,7 @@ BUILDLINK_TREE+= libisofs LIBISOFS_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libisofs+= libisofs>=1.1.6 -BUILDLINK_PKGSRCDIR.libisofs?= ../../sysutils/libisofs +BUILDLINK_PKGSRCDIR.libisofs?= ../../sysutils/libisofs .include "../../devel/zlib/buildlink3.mk" .endif # LIBISOFS_BUILDLINK3_MK diff --git a/sysutils/libnotify/buildlink3.mk b/sysutils/libnotify/buildlink3.mk index 6fa01f3b8a9..67e07f65701 100644 --- a/sysutils/libnotify/buildlink3.mk +++ b/sysutils/libnotify/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.27 2016/08/03 10:22:19 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.28 2018/01/07 13:04:32 rillig Exp $ BUILDLINK_TREE+= libnotify @@ -7,7 +7,7 @@ LIBNOTIFY_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libnotify+= libnotify>=0.7.0 BUILDLINK_ABI_DEPENDS.libnotify?= libnotify>=0.7.6nb3 -BUILDLINK_PKGSRCDIR.libnotify?= ../../sysutils/libnotify +BUILDLINK_PKGSRCDIR.libnotify?= ../../sysutils/libnotify pkgbase := libnotify .include "../../mk/pkg-build-options.mk" diff --git a/sysutils/libpciaccess/buildlink3.mk b/sysutils/libpciaccess/buildlink3.mk index 4647f8c0761..53d663db02b 100644 --- a/sysutils/libpciaccess/buildlink3.mk +++ b/sysutils/libpciaccess/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2014/04/29 06:18:42 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2018/01/07 13:04:32 rillig Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -10,14 +10,14 @@ BUILDLINK_TREE+= libpciaccess -.if !defined(LIBPCIACCESS_BUILDLINK3_MK) +. if !defined(LIBPCIACCESS_BUILDLINK3_MK) LIBPCIACCESS_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libpciaccess+= libpciaccess>=0.10.4 BUILDLINK_PKGSRCDIR.libpciaccess?= ../../sysutils/libpciaccess .include "../../devel/zlib/buildlink3.mk" -.endif # LIBPCIACCESS_BUILDLINK3_MK +. endif # LIBPCIACCESS_BUILDLINK3_MK BUILDLINK_TREE+= -libpciaccess diff --git a/sysutils/nautilus/buildlink3.mk b/sysutils/nautilus/buildlink3.mk index 1bebf7bff9e..7c188d3df88 100644 --- a/sysutils/nautilus/buildlink3.mk +++ b/sysutils/nautilus/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.63 2017/02/12 06:24:50 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.64 2018/01/07 13:04:32 rillig Exp $ BUILDLINK_TREE+= nautilus @@ -7,7 +7,7 @@ NAUTILUS_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.nautilus+= nautilus>=2.12.1nb1 BUILDLINK_ABI_DEPENDS.nautilus+= nautilus>=2.32.2.1nb25 -BUILDLINK_PKGSRCDIR.nautilus?= ../../sysutils/nautilus +BUILDLINK_PKGSRCDIR.nautilus?= ../../sysutils/nautilus .include "../../devel/GConf/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" diff --git a/sysutils/pciutils/buildlink3.mk b/sysutils/pciutils/buildlink3.mk index 006fbc95659..52d456a1571 100644 --- a/sysutils/pciutils/buildlink3.mk +++ b/sysutils/pciutils/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:26 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2018/01/07 13:04:32 rillig Exp $ BUILDLINK_TREE+= pciutils @@ -6,8 +6,8 @@ BUILDLINK_TREE+= pciutils PCIUTILS_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.pciutils+= pciutils>=3.0.2 -BUILDLINK_PKGSRCDIR.pciutils?= ../../sysutils/pciutils -BUILDLINK_DEPMETHOD.pciutils?= build +BUILDLINK_PKGSRCDIR.pciutils?= ../../sysutils/pciutils +BUILDLINK_DEPMETHOD.pciutils?= build .endif # PCIUTILS_BUILDLINK3_MK BUILDLINK_TREE+= -pciutils diff --git a/sysutils/py-notify-python/buildlink3.mk b/sysutils/py-notify-python/buildlink3.mk index 3410e6f4f7c..cbcfa6c5277 100644 --- a/sysutils/py-notify-python/buildlink3.mk +++ b/sysutils/py-notify-python/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.11 2017/02/12 06:24:50 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2018/01/07 13:04:32 rillig Exp $ BUILDLINK_TREE+= py-notify-python @@ -9,7 +9,7 @@ PY_NOTIFY_PYTHON_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.py-notify-python+= ${PYPKGPREFIX}-notify-python>=0.1.1 BUILDLINK_ABI_DEPENDS.py-notify-python+= ${PYPKGPREFIX}-notify-python>=0.1.1nb29 -BUILDLINK_PKGSRCDIR.py-notify-python?= ../../sysutils/py-notify-python +BUILDLINK_PKGSRCDIR.py-notify-python?= ../../sysutils/py-notify-python .include "../../x11/py-gtk2/buildlink3.mk" .endif # PY_NOTIFY_PYTHON_BUILDLINK3_MK diff --git a/sysutils/vcdimager-devel/buildlink3.mk b/sysutils/vcdimager-devel/buildlink3.mk index 967d883cd22..f23fd82eb4d 100644 --- a/sysutils/vcdimager-devel/buildlink3.mk +++ b/sysutils/vcdimager-devel/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.12 2012/09/23 05:36:24 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2018/01/07 13:04:32 rillig Exp $ BUILDLINK_TREE+= vcdimager @@ -7,7 +7,7 @@ VCDIMAGER_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.vcdimager+= vcdimager>=0.7.20 BUILDLINK_ABI_DEPENDS.vcdimager+= vcdimager>=0.7.24nb2 -BUILDLINK_PKGSRCDIR.vcdimager?= ../../sysutils/vcdimager-devel +BUILDLINK_PKGSRCDIR.vcdimager?= ../../sysutils/vcdimager-devel .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/popt/buildlink3.mk" diff --git a/textproc/aiksaurus/buildlink3.mk b/textproc/aiksaurus/buildlink3.mk index dcad0d5b0d5..cb45fbdd7e1 100644 --- a/textproc/aiksaurus/buildlink3.mk +++ b/textproc/aiksaurus/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:28 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2018/01/07 13:04:32 rillig Exp $ BUILDLINK_TREE+= aiksaurus @@ -6,7 +6,7 @@ BUILDLINK_TREE+= aiksaurus AIKSAURUS_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.aiksaurus+= aiksaurus>=1.2.1 -BUILDLINK_PKGSRCDIR.aiksaurus?= ../../textproc/aiksaurus +BUILDLINK_PKGSRCDIR.aiksaurus?= ../../textproc/aiksaurus .endif # AIKSAURUS_BUILDLINK3_MK BUILDLINK_TREE+= -aiksaurus diff --git a/textproc/cityhash/buildlink3.mk b/textproc/cityhash/buildlink3.mk index d4fc0fa5b1e..28309ba1bc2 100644 --- a/textproc/cityhash/buildlink3.mk +++ b/textproc/cityhash/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2013/07/02 11:22:21 rodent Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:33 rillig Exp $ BUILDLINK_TREE+= cityhash @@ -6,7 +6,7 @@ BUILDLINK_TREE+= cityhash CITYHASH_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.cityhash+= cityhash>=1.1.0 -BUILDLINK_PKGSRCDIR.cityhash?= ../../textproc/cityhash +BUILDLINK_PKGSRCDIR.cityhash?= ../../textproc/cityhash .endif # CITYHASH_BUILDLINK3_MK BUILDLINK_TREE+= -cityhash diff --git a/textproc/gnome-spell/buildlink3.mk b/textproc/gnome-spell/buildlink3.mk index da476bebbbf..d8e3d5d99d8 100644 --- a/textproc/gnome-spell/buildlink3.mk +++ b/textproc/gnome-spell/buildlink3.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.55 2017/11/23 17:19:44 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.56 2018/01/07 13:04:33 rillig Exp $ BUILDLINK_TREE+= gnome-spell .if !defined(GNOME_SPELL_BUILDLINK3_MK) GNOME_SPELL_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.gnome-spell+= gnome-spell>=1.0.5 +BUILDLINK_API_DEPENDS.gnome-spell+= gnome-spell>=1.0.5 BUILDLINK_ABI_DEPENDS.gnome-spell+= gnome-spell>=1.0.8nb37 BUILDLINK_PKGSRCDIR.gnome-spell?= ../../textproc/gnome-spell diff --git a/textproc/go-prose/buildlink3.mk b/textproc/go-prose/buildlink3.mk index 6cbc1aa1643..eda94360c68 100644 --- a/textproc/go-prose/buildlink3.mk +++ b/textproc/go-prose/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2017/08/25 16:49:15 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:33 rillig Exp $ BUILDLINK_TREE+= go-prose @@ -8,7 +8,7 @@ GO_PROSE_BUILDLINK3_MK:= BUILDLINK_CONTENTS_FILTER.go-prose= ${EGREP} gopkg/ BUILDLINK_DEPMETHOD.go-prose?= build -BUILDLINK_API_DEPENDS.go-prose+= go-prose>=0.0 +BUILDLINK_API_DEPENDS.go-prose+= go-prose>=0.0 BUILDLINK_PKGSRCDIR.go-prose?= ../../textproc/go-prose .endif # GO_PROSE_BUILDLINK3_MK diff --git a/textproc/go-runewidth/buildlink3.mk b/textproc/go-runewidth/buildlink3.mk index 27ed1cb35b0..520b5ec21d7 100644 --- a/textproc/go-runewidth/buildlink3.mk +++ b/textproc/go-runewidth/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2016/08/13 20:21:08 bsiegert Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:33 rillig Exp $ BUILDLINK_TREE+= go-runewidth @@ -6,7 +6,7 @@ BUILDLINK_TREE+= go-runewidth GO_RUNEWIDTH_BUILDLINK3_MK:= BUILDLINK_CONTENTS_FILTER.go-runewidth= ${EGREP} gopkg/ -BUILDLINK_DEPMETHOD.go-runewidth?= build +BUILDLINK_DEPMETHOD.go-runewidth?= build BUILDLINK_API_DEPENDS.go-runewidth+= go-runewidth>=0.0.1 BUILDLINK_PKGSRCDIR.go-runewidth?= ../../textproc/go-runewidth diff --git a/textproc/go-sentences/buildlink3.mk b/textproc/go-sentences/buildlink3.mk index ff97355b8f5..9a1e383d983 100644 --- a/textproc/go-sentences/buildlink3.mk +++ b/textproc/go-sentences/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2017/08/25 16:49:15 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:33 rillig Exp $ BUILDLINK_TREE+= go-sentences @@ -6,7 +6,7 @@ BUILDLINK_TREE+= go-sentences GO_SENTENCES_BUILDLINK3_MK:= BUILDLINK_CONTENTS_FILTER.go-sentences= ${EGREP} gopkg/ -BUILDLINK_DEPMETHOD.go-sentences?= build +BUILDLINK_DEPMETHOD.go-sentences?= build BUILDLINK_API_DEPENDS.go-sentences+= go-sentences>=1.0.6 BUILDLINK_PKGSRCDIR.go-sentences?= ../../textproc/go-sentences diff --git a/textproc/gtkspell/buildlink3.mk b/textproc/gtkspell/buildlink3.mk index ba0ce66dd00..ed679403bac 100644 --- a/textproc/gtkspell/buildlink3.mk +++ b/textproc/gtkspell/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.38 2017/02/12 06:24:50 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.39 2018/01/07 13:04:33 rillig Exp $ BUILDLINK_TREE+= gtkspell @@ -7,7 +7,7 @@ GTKSPELL_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.gtkspell+= gtkspell>=2.0.13 BUILDLINK_ABI_DEPENDS.gtkspell+= gtkspell>=2.0.16nb24 -BUILDLINK_PKGSRCDIR.gtkspell?= ../../textproc/gtkspell +BUILDLINK_PKGSRCDIR.gtkspell?= ../../textproc/gtkspell .include "../../textproc/enchant/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/textproc/hre/buildlink3.mk b/textproc/hre/buildlink3.mk index 899d0a6052a..8298f475b0c 100644 --- a/textproc/hre/buildlink3.mk +++ b/textproc/hre/buildlink3.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.7 2009/03/20 19:25:29 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2018/01/07 13:04:33 rillig Exp $ BUILDLINK_TREE+= hre .if !defined(HRE_BUILDLINK3_MK) HRE_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.hre+= hre>=0.9.7 +BUILDLINK_API_DEPENDS.hre+= hre>=0.9.7 BUILDLINK_ABI_DEPENDS.hre+= hre>=0.9.8anb1 BUILDLINK_PKGSRCDIR.hre?= ../../textproc/hre .endif # HRE_BUILDLINK3_MK diff --git a/textproc/hs-parsec/buildlink3.mk b/textproc/hs-parsec/buildlink3.mk index ed073d285d3..8dd4ad43690 100644 --- a/textproc/hs-parsec/buildlink3.mk +++ b/textproc/hs-parsec/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.11 2016/01/10 11:49:11 szptvlfn Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2018/01/07 13:04:33 rillig Exp $ BUILDLINK_TREE+= hs-parsec @@ -7,7 +7,7 @@ HS_PARSEC_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.hs-parsec+= hs-parsec>=3.1.9 BUILDLINK_ABI_DEPENDS.hs-parsec+= hs-parsec>=3.1.9nb2 -BUILDLINK_PKGSRCDIR.hs-parsec?= ../../textproc/hs-parsec +BUILDLINK_PKGSRCDIR.hs-parsec?= ../../textproc/hs-parsec .include "../../devel/hs-mtl/buildlink3.mk" .include "../../devel/hs-text/buildlink3.mk" diff --git a/textproc/iso-codes/buildlink3.mk b/textproc/iso-codes/buildlink3.mk index f4f3161906e..3e48cf31f71 100644 --- a/textproc/iso-codes/buildlink3.mk +++ b/textproc/iso-codes/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:29 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2018/01/07 13:04:33 rillig Exp $ BUILDLINK_TREE+= iso-codes @@ -6,7 +6,7 @@ BUILDLINK_TREE+= iso-codes ISO_CODES_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.iso-codes+= iso-codes>=0.50 -BUILDLINK_PKGSRCDIR.iso-codes?= ../../textproc/iso-codes +BUILDLINK_PKGSRCDIR.iso-codes?= ../../textproc/iso-codes .endif # ISO_CODES_BUILDLINK3_MK BUILDLINK_TREE+= -iso-codes diff --git a/textproc/jansson/buildlink3.mk b/textproc/jansson/buildlink3.mk index 675fa98d3ad..02bd9ac9b54 100644 --- a/textproc/jansson/buildlink3.mk +++ b/textproc/jansson/buildlink3.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.3 2015/01/16 11:50:28 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:33 rillig Exp $ BUILDLINK_TREE+= jansson .if !defined(JANSSON_BUILDLINK3_MK) JANSSON_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.jansson+=jansson>=2.0 +BUILDLINK_API_DEPENDS.jansson+= jansson>=2.0 BUILDLINK_ABI_DEPENDS.jansson?= jansson>=2.4nb1 BUILDLINK_PKGSRCDIR.jansson?= ../../textproc/jansson diff --git a/textproc/json-glib/buildlink3.mk b/textproc/json-glib/buildlink3.mk index 32880993140..72cc500a445 100644 --- a/textproc/json-glib/buildlink3.mk +++ b/textproc/json-glib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.11 2014/01/02 12:19:00 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2018/01/07 13:04:33 rillig Exp $ # BUILDLINK_TREE+= json-glib @@ -7,7 +7,7 @@ BUILDLINK_TREE+= json-glib JSON_GLIB_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.json-glib+= json-glib>=0.6.2 -BUILDLINK_ABI_DEPENDS.json-glib+= json-glib>=0.14.2nb3 +BUILDLINK_ABI_DEPENDS.json-glib+= json-glib>=0.14.2nb3 BUILDLINK_PKGSRCDIR.json-glib?= ../../textproc/json-glib pkgbase := json-glib diff --git a/textproc/kakasi/buildlink3.mk b/textproc/kakasi/buildlink3.mk index 1f3d8707055..a3de9c22f03 100644 --- a/textproc/kakasi/buildlink3.mk +++ b/textproc/kakasi/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.9 2014/06/06 12:09:47 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2018/01/07 13:04:34 rillig Exp $ BUILDLINK_TREE+= kakasi @@ -12,9 +12,9 @@ BUILDLINK_PKGSRCDIR.kakasi?= ../../textproc/kakasi pkgbase := kakasi .include "../../mk/pkg-build-options.mk" -. if !empty(PKG_BUILD_OPTIONS.kakasi:Mutf8) +.if !empty(PKG_BUILD_OPTIONS.kakasi:Mutf8) .include "../../converters/libiconv/buildlink3.mk" -. endif +.endif .endif # KAKASI_BUILDLINK3_MK diff --git a/textproc/libcroco/buildlink3.mk b/textproc/libcroco/buildlink3.mk index 801b5c5fcc8..21547d0663f 100644 --- a/textproc/libcroco/buildlink3.mk +++ b/textproc/libcroco/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.29 2015/11/23 12:54:53 szptvlfn Exp $ +# $NetBSD: buildlink3.mk,v 1.30 2018/01/07 13:04:34 rillig Exp $ BUILDLINK_TREE+= libcroco @@ -7,7 +7,7 @@ LIBCROCO_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libcroco+= libcroco>=0.6.0 BUILDLINK_ABI_DEPENDS.libcroco+= libcroco>=0.6.5nb2 -BUILDLINK_PKGSRCDIR.libcroco?= ../../textproc/libcroco +BUILDLINK_PKGSRCDIR.libcroco?= ../../textproc/libcroco .include "../../devel/glib2/buildlink3.mk" .include "../../textproc/libxml2/buildlink3.mk" diff --git a/textproc/libexttextcat/buildlink3.mk b/textproc/libexttextcat/buildlink3.mk index 85a207e921b..bb26ddd62f0 100644 --- a/textproc/libexttextcat/buildlink3.mk +++ b/textproc/libexttextcat/buildlink3.mk @@ -1,9 +1,10 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2012/03/16 17:30:16 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:34 rillig Exp $ BUILDLINK_TREE+= libexttextcat .if !defined(LIBEXTTEXTCAT_BUILDLINK3_MK) LIBEXTTEXTCAT_BUILDLINK3_MK:= + BUILDLINK_API_DEPENDS.libexttextcat+= libexttextcat>=3.2 BUILDLINK_PKGSRCDIR.libexttextcat?= ../../textproc/libexttextcat .endif diff --git a/textproc/libodfgen/buildlink3.mk b/textproc/libodfgen/buildlink3.mk index a5a719890e6..fa43fe4c0ac 100644 --- a/textproc/libodfgen/buildlink3.mk +++ b/textproc/libodfgen/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.10 2018/01/01 21:18:11 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2018/01/07 13:04:34 rillig Exp $ BUILDLINK_TREE+= libodfgen @@ -7,7 +7,7 @@ LIBODFGEN_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libodfgen+= libodfgen>=0.0.3 BUILDLINK_ABI_DEPENDS.libodfgen?= libodfgen>=0.1.6nb5 -BUILDLINK_PKGSRCDIR.libodfgen?= ../../textproc/libodfgen +BUILDLINK_PKGSRCDIR.libodfgen?= ../../textproc/libodfgen .include "../../converters/librevenge/buildlink3.mk" .include "../../converters/libwpd/buildlink3.mk" diff --git a/textproc/libpinyin/buildlink3.mk b/textproc/libpinyin/buildlink3.mk index bc4a0387cd4..4a4be7ab7da 100644 --- a/textproc/libpinyin/buildlink3.mk +++ b/textproc/libpinyin/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2014/06/01 13:25:55 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:34 rillig Exp $ # BUILDLINK_TREE+= libpinyin @@ -7,7 +7,7 @@ BUILDLINK_TREE+= libpinyin LIBPINYIN_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libpinyin+= libpinyin>=1.0.0 -BUILDLINK_PKGSRCDIR.libpinyin?= ../../textproc/libpinyin +BUILDLINK_PKGSRCDIR.libpinyin?= ../../textproc/libpinyin .include "../../devel/glib2/buildlink3.mk" .include "../../databases/db4/buildlink3.mk" diff --git a/textproc/libplist/buildlink3.mk b/textproc/libplist/buildlink3.mk index b747d72ff65..036fa785d0c 100644 --- a/textproc/libplist/buildlink3.mk +++ b/textproc/libplist/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2016/03/07 18:36:05 nros Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2018/01/07 13:04:34 rillig Exp $ BUILDLINK_TREE+= libplist @@ -7,7 +7,7 @@ LIBPLIST_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libplist+= libplist>=1.8 BUILDLINK_ABI_DEPENDS.libplist+= libplist>=1.12 -BUILDLINK_PKGSRCDIR.libplist?= ../../textproc/libplist +BUILDLINK_PKGSRCDIR.libplist?= ../../textproc/libplist .include "../../textproc/libxml2/buildlink3.mk" .endif # LIBPLIST_BUILDLINK3_MK diff --git a/textproc/libunicode/buildlink3.mk b/textproc/libunicode/buildlink3.mk index a02fa5ed53e..f2c2fe3c31d 100644 --- a/textproc/libunicode/buildlink3.mk +++ b/textproc/libunicode/buildlink3.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:30 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2018/01/07 13:04:34 rillig Exp $ BUILDLINK_TREE+= libunicode .if !defined(LIBUNICODE_BUILDLINK3_MK) LIBUNICODE_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.libunicode+= libunicode>=0.4 +BUILDLINK_API_DEPENDS.libunicode+= libunicode>=0.4 BUILDLINK_ABI_DEPENDS.libunicode+= libunicode>=0.4nb1 BUILDLINK_PKGSRCDIR.libunicode?= ../../textproc/libunicode .endif # LIBUNICODE_BUILDLINK3_MK diff --git a/textproc/libxml++/buildlink3.mk b/textproc/libxml++/buildlink3.mk index 925f00d141e..75bbde9dcab 100644 --- a/textproc/libxml++/buildlink3.mk +++ b/textproc/libxml++/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.10 2016/03/10 21:00:45 nros Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2018/01/07 13:04:34 rillig Exp $ BUILDLINK_TREE+= libxmlpp @@ -7,7 +7,7 @@ LIBXMLPP_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libxmlpp+= libxml++>=2.10.0 BUILDLINK_ABI_DEPENDS.libxmlpp+= libxml++>=2.40.1 -BUILDLINK_PKGSRCDIR.libxmlpp?= ../../textproc/libxml++ +BUILDLINK_PKGSRCDIR.libxmlpp?= ../../textproc/libxml++ .include "../../textproc/libxml2/buildlink3.mk" .include "../../devel/glibmm/buildlink3.mk" diff --git a/textproc/libxml++1/buildlink3.mk b/textproc/libxml++1/buildlink3.mk index 1d7ff41f978..cd56192fe13 100644 --- a/textproc/libxml++1/buildlink3.mk +++ b/textproc/libxml++1/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2012/06/14 07:43:21 sbd Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:34 rillig Exp $ BUILDLINK_TREE+= libxmlpp1 @@ -6,7 +6,7 @@ BUILDLINK_TREE+= libxmlpp1 LIBXMLPP1_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libxmlpp1+= libxml++1>=1.0.5 -BUILDLINK_ABI_DEPENDS.libxmlpp1?= libxml++1>=1.0.5nb1 +BUILDLINK_ABI_DEPENDS.libxmlpp1?= libxml++1>=1.0.5nb1 BUILDLINK_PKGSRCDIR.libxmlpp1?= ../../textproc/libxml++1 .include "../../textproc/libxml2/buildlink3.mk" diff --git a/textproc/lucene++/buildlink3.mk b/textproc/lucene++/buildlink3.mk index c578d8aa84b..0752d348e51 100644 --- a/textproc/lucene++/buildlink3.mk +++ b/textproc/lucene++/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2015/10/17 03:02:47 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:34 rillig Exp $ BUILDLINK_TREE+= lucene++ @@ -6,7 +6,7 @@ BUILDLINK_TREE+= lucene++ LUCENE++_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.lucene+++= lucene++>=3.0.7 -BUILDLINK_PKGSRCDIR.lucene++?= ../../textproc/lucene++ +BUILDLINK_PKGSRCDIR.lucene++?= ../../textproc/lucene++ .endif # LUCENE++_BUILDLINK3_MK diff --git a/textproc/ocaml-csv/buildlink3.mk b/textproc/ocaml-csv/buildlink3.mk index c07a7549791..13d9d9da568 100644 --- a/textproc/ocaml-csv/buildlink3.mk +++ b/textproc/ocaml-csv/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2017/10/10 09:47:25 jaapb Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2018/01/07 13:04:34 rillig Exp $ BUILDLINK_TREE+= ocaml-csv @@ -7,7 +7,7 @@ OCAML_CSV_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ocaml-csv+= ocaml-csv>=2.0 BUILDLINK_ABI_DEPENDS.ocaml-csv+= ocaml-csv>=2.0 -BUILDLINK_PKGSRCDIR.ocaml-csv?= ../../textproc/ocaml-csv +BUILDLINK_PKGSRCDIR.ocaml-csv?= ../../textproc/ocaml-csv .endif # OCAML_CSV_BUILDLINK3_MK diff --git a/textproc/ocaml-easy-format/buildlink3.mk b/textproc/ocaml-easy-format/buildlink3.mk index dfa37251aa1..9738454d698 100644 --- a/textproc/ocaml-easy-format/buildlink3.mk +++ b/textproc/ocaml-easy-format/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2017/07/11 11:20:12 jaapb Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:34 rillig Exp $ BUILDLINK_TREE+= ocaml-easy-format @@ -6,7 +6,7 @@ BUILDLINK_TREE+= ocaml-easy-format OCAML_EASY_FORMAT_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ocaml-easy-format+= ocaml-easy-format>=1.2.0 -BUILDLINK_PKGSRCDIR.ocaml-easy-format?= ../../textproc/ocaml-easy-format +BUILDLINK_PKGSRCDIR.ocaml-easy-format?= ../../textproc/ocaml-easy-format .endif # OCAML_EASY_FORMAT_BUILDLINK3_MK BUILDLINK_TREE+= -ocaml-easy-format diff --git a/textproc/ocaml-tyxml/buildlink3.mk b/textproc/ocaml-tyxml/buildlink3.mk index 21133f2f7c5..61f9b118166 100644 --- a/textproc/ocaml-tyxml/buildlink3.mk +++ b/textproc/ocaml-tyxml/buildlink3.mk @@ -1,13 +1,13 @@ -# $NetBSD: buildlink3.mk,v 1.5 2017/07/11 11:12:22 jaapb Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2018/01/07 13:04:35 rillig Exp $ -BUILDLINK_TREE+= ocaml-tyxml +BUILDLINK_TREE+= ocaml-tyxml .if !defined(OCAML_TYXML_BUILDLINK3_MK) OCAML_TYXML_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.ocaml-tyxml+= ocaml-tyxml>=4.0.1 -BUILDLINK_ABI_DEPENDS.ocaml-tyxml+= ocaml-tyxml>=4.1.0 -BUILDLINK_PKGSRCDIR.ocaml-tyxml?= ../../textproc/ocaml-tyxml +BUILDLINK_API_DEPENDS.ocaml-tyxml+= ocaml-tyxml>=4.0.1 +BUILDLINK_ABI_DEPENDS.ocaml-tyxml+= ocaml-tyxml>=4.1.0 +BUILDLINK_PKGSRCDIR.ocaml-tyxml?= ../../textproc/ocaml-tyxml .endif # OCAML_TYXML_BUILDLINK3_MK diff --git a/textproc/oniguruma/buildlink3.mk b/textproc/oniguruma/buildlink3.mk index 218994e04ab..3e496b643c0 100644 --- a/textproc/oniguruma/buildlink3.mk +++ b/textproc/oniguruma/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:31 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:35 rillig Exp $ BUILDLINK_TREE+= oniguruma @@ -6,7 +6,7 @@ BUILDLINK_TREE+= oniguruma ONIGURUMA_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.oniguruma+= oniguruma>=5.9.1 -BUILDLINK_PKGSRCDIR.oniguruma?= ../../textproc/oniguruma +BUILDLINK_PKGSRCDIR.oniguruma?= ../../textproc/oniguruma .endif # ONIGURUMA_BUILDLINK3_MK BUILDLINK_TREE+= -oniguruma diff --git a/textproc/opensp/buildlink3.mk b/textproc/opensp/buildlink3.mk index 3df45d9e3cc..b3fae05dcf1 100644 --- a/textproc/opensp/buildlink3.mk +++ b/textproc/opensp/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.13 2011/04/22 13:41:59 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2018/01/07 13:04:35 rillig Exp $ BUILDLINK_TREE+= opensp @@ -9,7 +9,7 @@ BUILDLINK_API_DEPENDS.opensp+= opensp>=1.5.1 BUILDLINK_ABI_DEPENDS.opensp+= opensp>=1.5.2nb1 BUILDLINK_PKGSRCDIR.opensp?= ../../textproc/opensp -PTHREAD_OPTS+= require +PTHREAD_OPTS+= require .include "../../devel/gettext-lib/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" diff --git a/textproc/p5-Encode/buildlink3.mk b/textproc/p5-Encode/buildlink3.mk index 1afc16851c1..6a126be61e3 100644 --- a/textproc/p5-Encode/buildlink3.mk +++ b/textproc/p5-Encode/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2017/08/01 13:06:00 markd Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:35 rillig Exp $ BUILDLINK_TREE+= p5-Encode @@ -6,7 +6,7 @@ BUILDLINK_TREE+= p5-Encode P5_ENCODE_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.p5-Encode+= p5-Encode>=2.89nb1 -BUILDLINK_PKGSRCDIR.p5-Encode?= ../../textproc/p5-Encode +BUILDLINK_PKGSRCDIR.p5-Encode?= ../../textproc/p5-Encode .endif # P5_ENCODE_BUILDLINK3_MK BUILDLINK_TREE+= -p5-Encode diff --git a/textproc/qore-json-module/buildlink3.mk b/textproc/qore-json-module/buildlink3.mk index 903a28ed2c5..1e7c8b90a98 100644 --- a/textproc/qore-json-module/buildlink3.mk +++ b/textproc/qore-json-module/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2017/10/12 18:38:47 nros Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2018/01/07 13:04:35 rillig Exp $ BUILDLINK_TREE+= qore-json-module @@ -7,7 +7,7 @@ QORE_JSON_MODULE_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.qore-json-module+= qore-json-module>=1.4 BUILDLINK_ABI_DEPENDS.qore-json-module?= qore-json-module>=1.5nb1 -BUILDLINK_PKGSRCDIR.qore-json-module?= ../../textproc/qore-json-module +BUILDLINK_PKGSRCDIR.qore-json-module?= ../../textproc/qore-json-module .include "../../lang/qore/buildlink3.mk" .endif # QORE_JSON_MODULE_BUILDLINK3_MK diff --git a/textproc/qore-yaml-module/buildlink3.mk b/textproc/qore-yaml-module/buildlink3.mk index f3c30bb1eeb..d6f71303f63 100644 --- a/textproc/qore-yaml-module/buildlink3.mk +++ b/textproc/qore-yaml-module/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2016/07/22 12:39:22 nros Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:35 rillig Exp $ # BUILDLINK_TREE+= qore-yaml-module @@ -8,7 +8,7 @@ QORE_YAML_MODULE_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.qore-yaml-module+= qore-yaml-module>=0.4 BUILDLINK_ABI_DEPENDS.qore-yaml-module?= qore-yaml-module>=0.5 -BUILDLINK_PKGSRCDIR.qore-yaml-module?= ../../textproc/qore-yaml-module +BUILDLINK_PKGSRCDIR.qore-yaml-module?= ../../textproc/qore-yaml-module .include "../../lang/qore/buildlink3.mk" diff --git a/textproc/sablotron/buildlink3.mk b/textproc/sablotron/buildlink3.mk index 109fb438ab8..af448f3238c 100644 --- a/textproc/sablotron/buildlink3.mk +++ b/textproc/sablotron/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.9 2009/03/20 19:25:33 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2018/01/07 13:04:35 rillig Exp $ BUILDLINK_TREE+= sablotron @@ -7,7 +7,7 @@ SABLOTRON_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.sablotron+= sablotron>=1.0 BUILDLINK_ABI_DEPENDS.sablotron+= sablotron>=1.0.2nb2 -BUILDLINK_PKGSRCDIR.sablotron?= ../../textproc/sablotron +BUILDLINK_PKGSRCDIR.sablotron?= ../../textproc/sablotron .include "../../converters/libiconv/buildlink3.mk" .include "../../textproc/expat/buildlink3.mk" diff --git a/textproc/shared-desktop-ontologies/buildlink3.mk b/textproc/shared-desktop-ontologies/buildlink3.mk index 55ad4fa85ef..3b04f3dfb61 100644 --- a/textproc/shared-desktop-ontologies/buildlink3.mk +++ b/textproc/shared-desktop-ontologies/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2010/04/09 23:36:21 markd Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:35 rillig Exp $ BUILDLINK_TREE+= shared-desktop-ontologies @@ -6,7 +6,7 @@ BUILDLINK_TREE+= shared-desktop-ontologies SHARED_DESKTOP_ONTOLOGIES_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.shared-desktop-ontologies+= shared-desktop-ontologies>=0.3 -BUILDLINK_PKGSRCDIR.shared-desktop-ontologies?= ../../textproc/shared-desktop-ontologies +BUILDLINK_PKGSRCDIR.shared-desktop-ontologies?= ../../textproc/shared-desktop-ontologies .endif # SHARED_DESKTOP_ONTOLOGIES_BUILDLINK3_MK BUILDLINK_TREE+= -shared-desktop-ontologies diff --git a/textproc/source-highlight/buildlink3.mk b/textproc/source-highlight/buildlink3.mk index e48e3273fca..d13bec1691b 100644 --- a/textproc/source-highlight/buildlink3.mk +++ b/textproc/source-highlight/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2018/01/01 21:18:12 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2018/01/07 13:04:35 rillig Exp $ BUILDLINK_TREE+= source-highlight @@ -7,7 +7,7 @@ SOURCE_HIGHLIGHT_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.source-highlight+= source-highlight>=3.1.7nb2 BUILDLINK_ABI_DEPENDS.source-highlight?= source-highlight>=3.1.8nb5 -BUILDLINK_PKGSRCDIR.source-highlight?= ../../textproc/source-highlight +BUILDLINK_PKGSRCDIR.source-highlight?= ../../textproc/source-highlight .include "../../devel/boost-libs/buildlink3.mk" .endif # SOURCE_HIGHLIGHT_BUILDLINK3_MK diff --git a/textproc/uriparser/buildlink3.mk b/textproc/uriparser/buildlink3.mk index b4373345ee1..a7e7c061d3f 100644 --- a/textproc/uriparser/buildlink3.mk +++ b/textproc/uriparser/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:33 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:35 rillig Exp $ BUILDLINK_TREE+= uriparser @@ -6,7 +6,7 @@ BUILDLINK_TREE+= uriparser URIPARSER_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.uriparser+= uriparser>=0.6.0 -BUILDLINK_PKGSRCDIR.uriparser?= ../../textproc/uriparser +BUILDLINK_PKGSRCDIR.uriparser?= ../../textproc/uriparser .endif # URIPARSER_BUILDLINK3_MK BUILDLINK_TREE+= -uriparser diff --git a/textproc/xmlada/buildlink3.mk b/textproc/xmlada/buildlink3.mk index db5b85e3ed0..a2fd05629d5 100644 --- a/textproc/xmlada/buildlink3.mk +++ b/textproc/xmlada/buildlink3.mk @@ -1,6 +1,6 @@ -# $NetBSD: buildlink3.mk,v 1.2 2012/07/08 20:03:08 marino Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:35 rillig Exp $ -BUILDLINK_TREE+= xmlada +BUILDLINK_TREE+= xmlada .if !defined(XMLADA_BUILDLINK3_MK) XMLADA_BUILDLINK3_MK:= @@ -10,4 +10,4 @@ BUILDLINK_PKGSRCDIR.xmlada?= ../../textproc/xmlada .endif # XMLADA_BUILDLINK3_MK -BUILDLINK_TREE+= -xmlada +BUILDLINK_TREE+= -xmlada diff --git a/textproc/xmlcatmgr/buildlink3.mk b/textproc/xmlcatmgr/buildlink3.mk index 51b8d59901d..8084cc070f4 100644 --- a/textproc/xmlcatmgr/buildlink3.mk +++ b/textproc/xmlcatmgr/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.12 2015/11/25 12:53:42 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2018/01/07 13:04:35 rillig Exp $ # # This Makefile fragment is included by packages that use xmlcatmgr. # @@ -17,7 +17,7 @@ BUILDLINK_TREE+= xmlcatmgr .if !defined(XMLCATMGR_BUILDLINK3_MK) XMLCATMGR_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.xmlcatmgr+= xmlcatmgr>=2.0beta1 +BUILDLINK_API_DEPENDS.xmlcatmgr+= xmlcatmgr>=2.0beta1 BUILDLINK_PKGSRCDIR.xmlcatmgr?= ../../textproc/xmlcatmgr # Location of the xmlcatmgr binary program. diff --git a/textproc/xmlrpc-c/buildlink3.mk b/textproc/xmlrpc-c/buildlink3.mk index 34bdd0f9659..97e018b7baf 100644 --- a/textproc/xmlrpc-c/buildlink3.mk +++ b/textproc/xmlrpc-c/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.18 2018/01/01 21:18:12 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.19 2018/01/07 13:04:36 rillig Exp $ BUILDLINK_TREE+= xmlrpc-c @@ -7,7 +7,7 @@ XMLRPC_C_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.xmlrpc-c+= xmlrpc-c-ss>=1.16.34 BUILDLINK_ABI_DEPENDS.xmlrpc-c+= xmlrpc-c-ss>=1.25.26nb7 -BUILDLINK_PKGSRCDIR.xmlrpc-c?= ../../textproc/xmlrpc-c +BUILDLINK_PKGSRCDIR.xmlrpc-c?= ../../textproc/xmlrpc-c .include "../../www/libwww/buildlink3.mk" .include "../../www/curl/buildlink3.mk" diff --git a/textproc/yaml-cpp/buildlink3.mk b/textproc/yaml-cpp/buildlink3.mk index 673adce3bba..0c2a7d1b108 100644 --- a/textproc/yaml-cpp/buildlink3.mk +++ b/textproc/yaml-cpp/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2014/11/24 11:27:52 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:36 rillig Exp $ # BUILDLINK_TREE+= yaml-cpp @@ -7,7 +7,7 @@ BUILDLINK_TREE+= yaml-cpp YAML_CPP_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.yaml-cpp+= yaml-cpp>=0.5.0 -BUILDLINK_PKGSRCDIR.yaml-cpp?= ../../textproc/yaml-cpp +BUILDLINK_PKGSRCDIR.yaml-cpp?= ../../textproc/yaml-cpp .include "../../devel/boost-headers/buildlink3.mk" .endif # YAML_CPP_BUILDLINK3_MK diff --git a/textproc/yelp-xsl/buildlink3.mk b/textproc/yelp-xsl/buildlink3.mk index b088575e644..4524a9e62be 100644 --- a/textproc/yelp-xsl/buildlink3.mk +++ b/textproc/yelp-xsl/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1.1.1 2012/02/10 17:57:38 drochner Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:36 rillig Exp $ BUILDLINK_TREE+= yelp-xsl @@ -6,7 +6,7 @@ BUILDLINK_TREE+= yelp-xsl YELP_XSL_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.yelp-xsl+= yelp-xsl>=3.3.1 -BUILDLINK_PKGSRCDIR.yelp-xsl?= ../../textproc/yelp-xsl +BUILDLINK_PKGSRCDIR.yelp-xsl?= ../../textproc/yelp-xsl .endif # YELP_XSL_BUILDLINK3_MK BUILDLINK_TREE+= -yelp-xsl diff --git a/time/hs-timezone-olson/buildlink3.mk b/time/hs-timezone-olson/buildlink3.mk index 2347dd1fb63..e805497d851 100644 --- a/time/hs-timezone-olson/buildlink3.mk +++ b/time/hs-timezone-olson/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2015/11/15 08:22:15 szptvlfn Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:36 rillig Exp $ BUILDLINK_TREE+= hs-timezone-olson @@ -7,7 +7,7 @@ HS_TIMEZONE_OLSON_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.hs-timezone-olson+= hs-timezone-olson>=0.1.7 BUILDLINK_ABI_DEPENDS.hs-timezone-olson+= hs-timezone-olson>=0.1.7 -BUILDLINK_PKGSRCDIR.hs-timezone-olson?= ../../time/hs-timezone-olson +BUILDLINK_PKGSRCDIR.hs-timezone-olson?= ../../time/hs-timezone-olson .include "../../devel/hs-extensible-exceptions/buildlink3.mk" .include "../../time/hs-timezone-series/buildlink3.mk" diff --git a/wm/afterstep/buildlink3.mk b/wm/afterstep/buildlink3.mk index 367bf963515..ee03acb7f47 100644 --- a/wm/afterstep/buildlink3.mk +++ b/wm/afterstep/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2017/02/12 06:24:51 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2018/01/07 13:04:36 rillig Exp $ BUILDLINK_TREE+= afterstep @@ -6,7 +6,7 @@ BUILDLINK_TREE+= afterstep AFTERSTEP_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.afterstep+= afterstep>=2.2.11 -BUILDLINK_ABI_DEPENDS.afterstep?= afterstep>=2.2.11nb17 +BUILDLINK_ABI_DEPENDS.afterstep?= afterstep>=2.2.11nb17 BUILDLINK_PKGSRCDIR.afterstep?= ../../wm/afterstep BUILDLINK_DEPMETHOD.afterstep?= build diff --git a/wm/i3/buildlink3.mk b/wm/i3/buildlink3.mk index f6b033fa263..292ba2e70e0 100644 --- a/wm/i3/buildlink3.mk +++ b/wm/i3/buildlink3.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.2 2017/08/09 10:27:44 nros Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:36 rillig Exp $ BUILDLINK_TREE+= i3 .if !defined(I3_BUILDLINK3_MK) I3_BUILDLINK3_MK:= -BUILDLINK_DEPMETHOD.i3?= build +BUILDLINK_DEPMETHOD.i3?= build BUILDLINK_API_DEPENDS.i3+= i3>=4.10.1 BUILDLINK_PKGSRCDIR.i3?= ../../wm/i3 diff --git a/wm/metacity/buildlink3.mk b/wm/metacity/buildlink3.mk index 1b53f81cacf..ec15cafe0e7 100644 --- a/wm/metacity/buildlink3.mk +++ b/wm/metacity/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.45 2017/02/12 06:24:51 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.46 2018/01/07 13:04:36 rillig Exp $ BUILDLINK_TREE+= metacity @@ -7,7 +7,7 @@ METACITY_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.metacity+= metacity>=2.8.5 BUILDLINK_ABI_DEPENDS.metacity+= metacity>=2.34.13nb4 -BUILDLINK_PKGSRCDIR.metacity?= ../../wm/metacity +BUILDLINK_PKGSRCDIR.metacity?= ../../wm/metacity .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/pango/buildlink3.mk" diff --git a/www/apache24/buildlink3.mk b/www/apache24/buildlink3.mk index ba8ffe7aa2a..ca628213a74 100644 --- a/www/apache24/buildlink3.mk +++ b/www/apache24/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.8 2016/03/05 11:27:57 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2018/01/07 13:04:36 rillig Exp $ BUILDLINK_TREE+= apache @@ -19,10 +19,10 @@ ${BUILDLINK_DIR}/bin/apxs: buildlink-directories buildlink-apache-cookie: ${BUILDLINK_DIR}/bin/apxs -USE_TOOLS+= perl # for "apxs" -CONFIGURE_ENV+= APR_LIBTOOL=${LIBTOOL:Q} # make apxs use the libtool we specify -MAKE_ENV+= APR_LIBTOOL=${LIBTOOL:Q} -APXS?= ${BUILDLINK_PREFIX.apache}/bin/apxs +USE_TOOLS+= perl # for "apxs" +CONFIGURE_ENV+= APR_LIBTOOL=${LIBTOOL:Q} # make apxs use the libtool we specify +MAKE_ENV+= APR_LIBTOOL=${LIBTOOL:Q} +APXS?= ${BUILDLINK_PREFIX.apache}/bin/apxs .if defined(GNU_CONFIGURE) CONFIGURE_ARGS+= --with-apxs2=${APXS:Q} .endif diff --git a/www/emacs-w3m/buildlink3.mk b/www/emacs-w3m/buildlink3.mk index c047da877f2..7181be963be 100644 --- a/www/emacs-w3m/buildlink3.mk +++ b/www/emacs-w3m/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:36 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:36 rillig Exp $ # BUILDLINK_TREE+= emacs-w3m @@ -7,7 +7,7 @@ BUILDLINK_TREE+= emacs-w3m EMACS_W3M_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.emacs-w3m+= ${EMACS_PKGNAME_PREFIX}emacs-w3m>=1.4 -BUILDLINK_PKGSRCDIR.emacs-w3m?= ../../www/emacs-w3m +BUILDLINK_PKGSRCDIR.emacs-w3m?= ../../www/emacs-w3m BUILDLINK_CONTENTS_FILTER.emacs-w3m= ${EGREP} '.*\.el$$|.*\.elc$$' .endif # EMACS_W3M_BUILDLINK3_MK diff --git a/www/epiphany/buildlink3.mk b/www/epiphany/buildlink3.mk index 77e91e037e0..5442fd31ce9 100644 --- a/www/epiphany/buildlink3.mk +++ b/www/epiphany/buildlink3.mk @@ -1,12 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.81 2017/11/30 16:45:09 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.82 2018/01/07 13:04:36 rillig Exp $ BUILDLINK_TREE+= epiphany .if !defined(EPIPHANY_BUILDLINK3_MK) EPIPHANY_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.epiphany+= epiphany>=2.28 -BUILDLINK_ABI_DEPENDS.epiphany+= epiphany>=2.30.6nb56 +BUILDLINK_API_DEPENDS.epiphany+= epiphany>=2.28 +BUILDLINK_ABI_DEPENDS.epiphany+= epiphany>=2.30.6nb56 BUILDLINK_PKGSRCDIR.epiphany?= ../../www/epiphany .include "../../mk/bsd.fast.prefs.mk" diff --git a/www/go-toml-burntsushi/buildlink3.mk b/www/go-toml-burntsushi/buildlink3.mk index 29617ae5f76..21457064ea5 100644 --- a/www/go-toml-burntsushi/buildlink3.mk +++ b/www/go-toml-burntsushi/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2017/08/25 16:49:15 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:36 rillig Exp $ BUILDLINK_TREE+= go-toml-burntsushi @@ -6,7 +6,7 @@ BUILDLINK_TREE+= go-toml-burntsushi GO_TOML_BURNTSUSHI_BUILDLINK3_MK:= BUILDLINK_CONTENTS_FILTER.go-toml-burntsushi= ${EGREP} gopkg/ -BUILDLINK_DEPMETHOD.go-toml-burntsushi?= build +BUILDLINK_DEPMETHOD.go-toml-burntsushi?= build BUILDLINK_API_DEPENDS.go-toml-burntsushi+= go-toml-burntsushi>=0.2.0 BUILDLINK_PKGSRCDIR.go-toml-burntsushi?= ../../www/go-toml-burntsushi diff --git a/www/go-toml-pelletier/buildlink3.mk b/www/go-toml-pelletier/buildlink3.mk index cb808859d1b..aeb775567ef 100644 --- a/www/go-toml-pelletier/buildlink3.mk +++ b/www/go-toml-pelletier/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2017/08/25 16:49:15 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:37 rillig Exp $ BUILDLINK_TREE+= go-toml-pelletier @@ -8,7 +8,7 @@ GO_TOML_PELLETIER_BUILDLINK3_MK:= BUILDLINK_CONTENTS_FILTER.go-toml-pelletier= ${EGREP} gopkg/ BUILDLINK_DEPMETHOD.go-toml-pelletier?= build -BUILDLINK_API_DEPENDS.go-toml-pelletier+= go-toml-pelletier>=1.0.0 +BUILDLINK_API_DEPENDS.go-toml-pelletier+= go-toml-pelletier>=1.0.0 BUILDLINK_PKGSRCDIR.go-toml-pelletier?= ../../www/go-toml-pelletier .include "../../devel/go-buffruneio/buildlink3.mk" diff --git a/www/kdewebkit/buildlink3.mk b/www/kdewebkit/buildlink3.mk index 02898840603..fefef0f1452 100644 --- a/www/kdewebkit/buildlink3.mk +++ b/www/kdewebkit/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.12 2017/11/30 16:45:09 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2018/01/07 13:04:37 rillig Exp $ BUILDLINK_TREE+= kdewebkit @@ -7,7 +7,7 @@ KDEWEBKIT_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.kdewebkit+= kdewebkit>=5.21.0 BUILDLINK_ABI_DEPENDS.kdewebkit?= kdewebkit>=5.25.0nb11 -BUILDLINK_PKGSRCDIR.kdewebkit?= ../../www/kdewebkit +BUILDLINK_PKGSRCDIR.kdewebkit?= ../../www/kdewebkit .include "../../devel/kparts/buildlink3.mk" .include "../../x11/qt5-qtbase/buildlink3.mk" diff --git a/www/kjsembed/buildlink3.mk b/www/kjsembed/buildlink3.mk index cd091679d7c..5ef7baec972 100644 --- a/www/kjsembed/buildlink3.mk +++ b/www/kjsembed/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.10 2017/11/30 16:45:09 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2018/01/07 13:04:37 rillig Exp $ BUILDLINK_TREE+= kjsembed @@ -7,7 +7,7 @@ KJSEMBED_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.kjsembed+= kjsembed>=5.21.0 BUILDLINK_ABI_DEPENDS.kjsembed?= kjsembed>=5.25.0nb10 -BUILDLINK_PKGSRCDIR.kjsembed?= ../../www/kjsembed +BUILDLINK_PKGSRCDIR.kjsembed?= ../../www/kjsembed .include "../../devel/ki18n/buildlink3.mk" .include "../../www/kjs/buildlink3.mk" diff --git a/www/libghttp/buildlink3.mk b/www/libghttp/buildlink3.mk index 6edf0d9009c..4a406821f18 100644 --- a/www/libghttp/buildlink3.mk +++ b/www/libghttp/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.8 2009/03/20 19:25:37 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2018/01/07 13:04:37 rillig Exp $ BUILDLINK_TREE+= libghttp @@ -7,7 +7,7 @@ LIBGHTTP_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libghttp+= libghttp>=1.0.9 BUILDLINK_ABI_DEPENDS.libghttp+= libghttp>=1.0.9nb1 -BUILDLINK_PKGSRCDIR.libghttp?= ../../www/libghttp +BUILDLINK_PKGSRCDIR.libghttp?= ../../www/libghttp .endif # LIBGHTTP_BUILDLINK3_MK BUILDLINK_TREE+= -libghttp diff --git a/www/libgtkhtml/buildlink3.mk b/www/libgtkhtml/buildlink3.mk index 6653803010f..4694c314200 100644 --- a/www/libgtkhtml/buildlink3.mk +++ b/www/libgtkhtml/buildlink3.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.47 2017/02/12 06:24:52 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.48 2018/01/07 13:04:37 rillig Exp $ BUILDLINK_TREE+= libgtkhtml .if !defined(LIBGTKHTML_BUILDLINK3_MK) LIBGTKHTML_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.libgtkhtml+= libgtkhtml>=2.6.0 +BUILDLINK_API_DEPENDS.libgtkhtml+= libgtkhtml>=2.6.0 BUILDLINK_ABI_DEPENDS.libgtkhtml+= libgtkhtml>=2.6.3nb36 BUILDLINK_PKGSRCDIR.libgtkhtml?= ../../www/libgtkhtml diff --git a/www/mono-xsp/buildlink3.mk b/www/mono-xsp/buildlink3.mk index 0b0cf54e83c..356b13e41e7 100644 --- a/www/mono-xsp/buildlink3.mk +++ b/www/mono-xsp/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.20 2017/11/30 16:45:10 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.21 2018/01/07 13:04:37 rillig Exp $ BUILDLINK_TREE+= mono-xsp @@ -7,7 +7,7 @@ MONO_XSP_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.mono-xsp+= mono-xsp>=2.0 BUILDLINK_ABI_DEPENDS.mono-xsp+= mono-xsp>=3.8nb6 -BUILDLINK_PKGSRCDIR.mono-xsp?= ../../www/mono-xsp +BUILDLINK_PKGSRCDIR.mono-xsp?= ../../www/mono-xsp .include "../../databases/sqlite3/buildlink3.mk" .include "../../lang/mono/buildlink3.mk" diff --git a/www/py-gdata/buildlink3.mk b/www/py-gdata/buildlink3.mk index 212f2c70749..54ebbb45b9e 100644 --- a/www/py-gdata/buildlink3.mk +++ b/www/py-gdata/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:37 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:37 rillig Exp $ BUILDLINK_TREE+= py-gdata @@ -8,7 +8,7 @@ PY_GDATA_BUILDLINK3_MK:= .include "../../lang/python/pyversion.mk" BUILDLINK_API_DEPENDS.py-gdata+= ${PYPKGPREFIX}-gdata>=1.2.1 -BUILDLINK_PKGSRCDIR.py-gdata?= ../../www/py-gdata +BUILDLINK_PKGSRCDIR.py-gdata?= ../../www/py-gdata .endif # PY_GDATA_BUILDLINK3_MK BUILDLINK_TREE+= -py-gdata diff --git a/www/uhttpmock/buildlink3.mk b/www/uhttpmock/buildlink3.mk index 4db6ae0559e..19d83718232 100644 --- a/www/uhttpmock/buildlink3.mk +++ b/www/uhttpmock/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2017/11/30 16:45:10 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2018/01/07 13:04:37 rillig Exp $ BUILDLINK_TREE+= uhttpmock @@ -7,7 +7,7 @@ UHTTPMOCK_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.uhttpmock+= uhttpmock>=0.4.0 BUILDLINK_ABI_DEPENDS.uhttpmock?= uhttpmock>=0.4.0nb11 -BUILDLINK_PKGSRCDIR.uhttpmock?= ../../www/uhttpmock +BUILDLINK_PKGSRCDIR.uhttpmock?= ../../www/uhttpmock .include "../../devel/glib2/buildlink3.mk" .include "../../net/libsoup/buildlink3.mk" diff --git a/x11/blt/buildlink3.mk b/x11/blt/buildlink3.mk index b16b6cf3aa2..c7034c4c732 100644 --- a/x11/blt/buildlink3.mk +++ b/x11/blt/buildlink3.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.17 2014/01/11 14:42:01 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.18 2018/01/07 13:04:37 rillig Exp $ BUILDLINK_TREE+= blt .if !defined(BLT_BUILDLINK3_MK) BLT_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.blt+= blt>=2.4z +BUILDLINK_API_DEPENDS.blt+= blt>=2.4z BUILDLINK_ABI_DEPENDS.blt+= blt>=2.4znb7 BUILDLINK_PKGSRCDIR.blt?= ../../x11/blt diff --git a/x11/deforaos-keyboard/buildlink3.mk b/x11/deforaos-keyboard/buildlink3.mk index 3dc6498c89f..b5a0910d21a 100644 --- a/x11/deforaos-keyboard/buildlink3.mk +++ b/x11/deforaos-keyboard/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.13 2017/02/12 06:24:52 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2018/01/07 13:04:37 rillig Exp $ # BUILDLINK_TREE+= deforaos-keyboard @@ -8,7 +8,7 @@ DEFORAOS_KEYBOARD_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.deforaos-keyboard+= deforaos-keyboard>=0.3.0 BUILDLINK_ABI_DEPENDS.deforaos-keyboard?= deforaos-keyboard>=0.3.0nb3 -BUILDLINK_PKGSRCDIR.deforaos-keyboard?= ../../x11/deforaos-keyboard +BUILDLINK_PKGSRCDIR.deforaos-keyboard?= ../../x11/deforaos-keyboard .include "../../x11/deforaos-libdesktop/buildlink3.mk" .endif # DEFORAOS_KEYBOARD_BUILDLINK3_MK diff --git a/x11/dri3proto/buildlink3.mk b/x11/dri3proto/buildlink3.mk index a110aa7a60f..3785e629e88 100644 --- a/x11/dri3proto/buildlink3.mk +++ b/x11/dri3proto/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2015/03/09 21:33:28 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:37 rillig Exp $ BUILDLINK_TREE+= dri3proto @@ -8,7 +8,7 @@ DRI3PROTO_BUILDLINK3_MK:= BUILDLINK_DEPMETHOD.dri3proto?= build BUILDLINK_API_DEPENDS.dri3proto+= dri3proto>=1.0 -BUILDLINK_PKGSRCDIR.dri3proto?= ../../x11/dri3proto +BUILDLINK_PKGSRCDIR.dri3proto?= ../../x11/dri3proto .endif # DRI3PROTO_BUILDLINK3_MK BUILDLINK_TREE+= -dri3proto diff --git a/x11/eekboard/buildlink3.mk b/x11/eekboard/buildlink3.mk index 4d9659cf0e0..98156c89358 100644 --- a/x11/eekboard/buildlink3.mk +++ b/x11/eekboard/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.30 2017/11/23 17:19:45 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.31 2018/01/07 13:04:37 rillig Exp $ # BUILDLINK_TREE+= eekboard @@ -8,7 +8,7 @@ EEKBOARD_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.eekboard+= eekboard>=1.0.6 BUILDLINK_ABI_DEPENDS.eekboard?= eekboard>=1.0.8nb14 -BUILDLINK_PKGSRCDIR.eekboard?= ../../x11/eekboard +BUILDLINK_PKGSRCDIR.eekboard?= ../../x11/eekboard .include "../../devel/glib2/buildlink3.mk" .include "../../devel/pango/buildlink3.mk" diff --git a/x11/fixesproto/buildlink3.mk b/x11/fixesproto/buildlink3.mk index 94a59b9f73d..91d63c6db93 100644 --- a/x11/fixesproto/buildlink3.mk +++ b/x11/fixesproto/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.10 2015/06/18 21:48:52 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2018/01/07 13:04:38 rillig Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -13,7 +13,7 @@ BUILDLINK_DEPMETHOD.fixesproto?= build BUILDLINK_TREE+= fixesproto -.if !defined(FIXESPROTO_BUILDLINK3_MK) +. if !defined(FIXESPROTO_BUILDLINK3_MK) FIXESPROTO_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.fixesproto+= fixesproto>=4.0.0 @@ -31,7 +31,7 @@ BUILDLINK_API_DEPENDS.xextproto+= xextproto>=7.0.99.1 .include "../../x11/xextproto/buildlink3.mk" .include "../../x11/xproto/buildlink3.mk" -.endif # FIXESPROTO_BUILDLINK3_MK +. endif # FIXESPROTO_BUILDLINK3_MK BUILDLINK_TREE+= -fixesproto diff --git a/x11/gnome-mag/buildlink3.mk b/x11/gnome-mag/buildlink3.mk index 5988940a4b6..0d337310bc6 100644 --- a/x11/gnome-mag/buildlink3.mk +++ b/x11/gnome-mag/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.43 2017/02/12 06:24:53 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.44 2018/01/07 13:04:38 rillig Exp $ BUILDLINK_TREE+= gnome-mag @@ -7,7 +7,7 @@ GNOME_MAG_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.gnome-mag+= gnome-mag>=0.12.0 BUILDLINK_ABI_DEPENDS.gnome-mag+= gnome-mag>=0.16.3nb24 -BUILDLINK_PKGSRCDIR.gnome-mag?= ../../x11/gnome-mag +BUILDLINK_PKGSRCDIR.gnome-mag?= ../../x11/gnome-mag .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/libbonobo/buildlink3.mk" diff --git a/x11/gnome-panel/buildlink3.mk b/x11/gnome-panel/buildlink3.mk index d215d0db15b..1b0e3227e69 100644 --- a/x11/gnome-panel/buildlink3.mk +++ b/x11/gnome-panel/buildlink3.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.82 2017/11/30 16:45:10 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.83 2018/01/07 13:04:38 rillig Exp $ BUILDLINK_TREE+= gnome-panel .if !defined(GNOME_PANEL_BUILDLINK3_MK) GNOME_PANEL_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.gnome-panel+= gnome-panel>=2.12.1nb3 +BUILDLINK_API_DEPENDS.gnome-panel+= gnome-panel>=2.12.1nb3 BUILDLINK_ABI_DEPENDS.gnome-panel+= gnome-panel>=2.32.1nb57 BUILDLINK_PKGSRCDIR.gnome-panel?= ../../x11/gnome-panel diff --git a/x11/gtk+extra/buildlink3.mk b/x11/gtk+extra/buildlink3.mk index f8a0948fef0..41c4a716148 100644 --- a/x11/gtk+extra/buildlink3.mk +++ b/x11/gtk+extra/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.10 2012/05/07 01:54:08 dholland Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2018/01/07 13:04:38 rillig Exp $ BUILDLINK_TREE+= gtk+extra @@ -7,7 +7,7 @@ GTK_EXTRA_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.gtk+extra+= gtk+extra>=0.99.17nb2 BUILDLINK_ABI_DEPENDS.gtk+extra+= gtk+extra>=0.99.17nb6 -BUILDLINK_PKGSRCDIR.gtk+extra?= ../../x11/gtk+extra +BUILDLINK_PKGSRCDIR.gtk+extra?= ../../x11/gtk+extra .include "../../x11/gtk/buildlink3.mk" .endif # GTK_EXTRA_BUILDLINK3_MK diff --git a/x11/gtk/buildlink3.mk b/x11/gtk/buildlink3.mk index bf752c31ccf..f18f6d10acd 100644 --- a/x11/gtk/buildlink3.mk +++ b/x11/gtk/buildlink3.mk @@ -1,11 +1,11 @@ -# $NetBSD: buildlink3.mk,v 1.19 2011/04/22 13:42:06 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.20 2018/01/07 13:04:38 rillig Exp $ BUILDLINK_TREE+= gtk .if !defined(GTK_BUILDLINK3_MK) GTK_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.gtk+= gtk+>=1.2.10 +BUILDLINK_API_DEPENDS.gtk+= gtk+>=1.2.10 BUILDLINK_ABI_DEPENDS.gtk+= gtk+>=1.2.10nb10 BUILDLINK_PKGSRCDIR.gtk?= ../../x11/gtk diff --git a/x11/gtk3/buildlink3.mk b/x11/gtk3/buildlink3.mk index 1e94ea2fb7b..1c900e56ee1 100644 --- a/x11/gtk3/buildlink3.mk +++ b/x11/gtk3/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.31 2017/11/23 17:19:45 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.32 2018/01/07 13:04:38 rillig Exp $ BUILDLINK_TREE+= gtk3 @@ -26,7 +26,7 @@ pkgbase := gtk3 .include "../../graphics/libepoxy/buildlink3.mk" .if !empty(PKG_BUILD_OPTIONS.gtk3:Mx11) . if !empty(PKG_BUILD_OPTIONS.gtk3:Mgtk3-atk-bridge) -. include "../../devel/at-spi2-atk/buildlink3.mk" +. include "../../devel/at-spi2-atk/buildlink3.mk" . endif .include "../../x11/libXcursor/buildlink3.mk" BUILDLINK_API_DEPENDS.Xft2+= Xft2>=2.1.2nb2 diff --git a/x11/gtkglarea/buildlink3.mk b/x11/gtkglarea/buildlink3.mk index 8331b79cc4a..9a41694eb4d 100644 --- a/x11/gtkglarea/buildlink3.mk +++ b/x11/gtkglarea/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.11 2015/04/25 14:25:06 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2018/01/07 13:04:38 rillig Exp $ BUILDLINK_TREE+= gtkglarea @@ -7,7 +7,7 @@ GTKGLAREA_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.gtkglarea+= gtkglarea>=1.2.2nb3 BUILDLINK_ABI_DEPENDS.gtkglarea+= gtkglarea>=1.2.3nb4 -BUILDLINK_PKGSRCDIR.gtkglarea?= ../../x11/gtkglarea +BUILDLINK_PKGSRCDIR.gtkglarea?= ../../x11/gtkglarea .include "../../graphics/MesaLib/buildlink3.mk" .include "../../graphics/glu/buildlink3.mk" diff --git a/x11/keybinder/buildlink3.mk b/x11/keybinder/buildlink3.mk index 17c4b6f4837..c18a491b425 100644 --- a/x11/keybinder/buildlink3.mk +++ b/x11/keybinder/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2017/02/12 06:24:55 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2018/01/07 13:04:38 rillig Exp $ BUILDLINK_TREE+= keybinder @@ -7,7 +7,7 @@ KEYBINDER_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.keybinder+= keybinder>=0.3.0 BUILDLINK_ABI_DEPENDS.keybinder?= keybinder>=0.3.0nb3 -BUILDLINK_PKGSRCDIR.keybinder?= ../../x11/keybinder +BUILDLINK_PKGSRCDIR.keybinder?= ../../x11/keybinder .include "../../devel/gobject-introspection/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" diff --git a/x11/libICE/buildlink3.mk b/x11/libICE/buildlink3.mk index c1d85a60124..92494cc09df 100644 --- a/x11/libICE/buildlink3.mk +++ b/x11/libICE/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2014/03/10 11:05:52 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2018/01/07 13:04:38 rillig Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -10,12 +10,12 @@ BUILDLINK_TREE+= libICE -.if !defined(LIBICE_BUILDLINK3_MK) +. if !defined(LIBICE_BUILDLINK3_MK) LIBICE_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libICE+= libICE>=0.99.1 BUILDLINK_PKGSRCDIR.libICE?= ../../x11/libICE -.endif # LIBICE_BUILDLINK3_MK +. endif # LIBICE_BUILDLINK3_MK BUILDLINK_TREE+= -libICE diff --git a/x11/libSM/buildlink3.mk b/x11/libSM/buildlink3.mk index 8b6e4422c88..f59f86e30f3 100644 --- a/x11/libSM/buildlink3.mk +++ b/x11/libSM/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2014/03/10 11:05:52 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2018/01/07 13:04:38 rillig Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -10,14 +10,14 @@ BUILDLINK_TREE+= libSM -.if !defined(LIBSM_BUILDLINK3_MK) +. if !defined(LIBSM_BUILDLINK3_MK) LIBSM_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libSM+= libSM>=0.99.2 BUILDLINK_PKGSRCDIR.libSM?= ../../x11/libSM .include "../../x11/libICE/buildlink3.mk" -.endif # LIBSM_BUILDLINK3_MK +. endif # LIBSM_BUILDLINK3_MK BUILDLINK_TREE+= -libSM diff --git a/x11/libX11/buildlink3.mk b/x11/libX11/buildlink3.mk index c69cbae1f2d..5c3ad3c9671 100644 --- a/x11/libX11/buildlink3.mk +++ b/x11/libX11/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.11 2014/07/30 20:34:50 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2018/01/07 13:04:38 rillig Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -10,7 +10,7 @@ BUILDLINK_TREE+= libX11 -.if !defined(LIBX11_BUILDLINK3_MK) +. if !defined(LIBX11_BUILDLINK3_MK) LIBX11_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libX11+= libX11>=1.1 @@ -20,22 +20,22 @@ BUILDLINK_PKGSRCDIR.libX11?= ../../x11/libX11 X11_LDFLAGS+= ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.libX11}/lib X11_LDFLAGS+= -L${BUILDLINK_PREFIX.libX11}/lib -.if ${OPSYS} == "OSF1" || ${OPSYS} == "MirBSD" || ${OPSYS} == "OpenBSD" +. if ${OPSYS} == "OSF1" || ${OPSYS} == "MirBSD" || ${OPSYS} == "OpenBSD" .include "../../mk/pthread.buildlink3.mk" -.endif +. endif .include "../../x11/kbproto/buildlink3.mk" .include "../../x11/libXau/buildlink3.mk" .include "../../x11/libXdmcp/buildlink3.mk" -.if ${X11_TYPE} == "modular" || \ +. if ${X11_TYPE} == "modular" || \ exists(${X11BASE}/lib/pkgconfig/xcb.pc) || \ exists(${X11BASE}/lib${LIBABISUFFIX}/pkgconfig/xcb.pc) .include "../../x11/libxcb/buildlink3.mk" -.endif +. endif .include "../../x11/xproto/buildlink3.mk" -.endif # LIBX11_BUILDLINK3_MK +. endif # LIBX11_BUILDLINK3_MK BUILDLINK_TREE+= -libX11 diff --git a/x11/libXTrap/buildlink3.mk b/x11/libXTrap/buildlink3.mk index e5d72a0e219..6d219284bfd 100644 --- a/x11/libXTrap/buildlink3.mk +++ b/x11/libXTrap/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:44 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:39 rillig Exp $ BUILDLINK_TREE+= libXTrap @@ -6,7 +6,7 @@ BUILDLINK_TREE+= libXTrap LIBXTRAP_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libXTrap+= libXTrap>=1.0.0 -BUILDLINK_PKGSRCDIR.libXTrap?= ../../x11/libXTrap +BUILDLINK_PKGSRCDIR.libXTrap?= ../../x11/libXTrap .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" diff --git a/x11/libXaw/buildlink3.mk b/x11/libXaw/buildlink3.mk index b741e8aa3f2..84ac86dbf93 100644 --- a/x11/libXaw/buildlink3.mk +++ b/x11/libXaw/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2012/10/23 10:24:18 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2018/01/07 13:04:39 rillig Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -8,7 +8,7 @@ BUILDLINK_TREE+= libXaw -.if !defined(LIBXAW_BUILDLINK3_MK) +. if !defined(LIBXAW_BUILDLINK3_MK) LIBXAW_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libXaw+= libXaw>=1.0.5 @@ -23,7 +23,7 @@ BUILDLINK_TRANSFORM+= l:Xaw:Xaw7 .include "../../x11/libXpm/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" .include "../../x11/xproto/buildlink3.mk" -.endif # LIBXAW_BUILDLINK3_MK +. endif # LIBXAW_BUILDLINK3_MK BUILDLINK_TREE+= -libXaw diff --git a/x11/libXaw3d/buildlink3.mk b/x11/libXaw3d/buildlink3.mk index 4d21f7575b4..c6d0a90a512 100644 --- a/x11/libXaw3d/buildlink3.mk +++ b/x11/libXaw3d/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2016/01/23 03:04:00 markd Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:39 rillig Exp $ BUILDLINK_TREE+= libXaw3d @@ -6,16 +6,16 @@ BUILDLINK_TREE+= libXaw3d LIBXAW3D_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libXaw3d+= libXaw3d>=1.6.2 -BUILDLINK_PKGSRCDIR.libXaw3d?= ../../x11/libXaw3d +BUILDLINK_PKGSRCDIR.libXaw3d?= ../../x11/libXaw3d BUILDLINK_TRANSFORM+= l:Xaw:Xaw3d - + .include "../../mk/bsd.fast.prefs.mk" .if ${X11_TYPE} == "modular" .PHONY: buildlink-libXaw3d-inc-hack buildlink-libXaw3d-cookie: buildlink-libXaw3d-inc-hack - + buildlink-libXaw3d-inc-hack: buildlink-directories [ ! -h ${BUILDLINK_DIR}/include/X11/Xaw ] && \ ${MKDIR} ${BUILDLINK_DIR}/include/X11 && \ diff --git a/x11/libXcursor/buildlink3.mk b/x11/libXcursor/buildlink3.mk index 8f306f4d4f4..a9dfe489eb1 100644 --- a/x11/libXcursor/buildlink3.mk +++ b/x11/libXcursor/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:44 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:39 rillig Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -8,7 +8,7 @@ BUILDLINK_TREE+= libXcursor -.if !defined(LIBXCURSOR_BUILDLINK3_MK) +. if !defined(LIBXCURSOR_BUILDLINK3_MK) LIBXCURSOR_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libXcursor+= libXcursor>=1.1.1 @@ -18,7 +18,7 @@ BUILDLINK_PKGSRCDIR.libXcursor?= ../../x11/libXcursor .include "../../x11/libXfixes/buildlink3.mk" .include "../../x11/libXrender/buildlink3.mk" .include "../../x11/xproto/buildlink3.mk" -.endif # LIBXCURSOR_BUILDLINK3_MK +. endif # LIBXCURSOR_BUILDLINK3_MK BUILDLINK_TREE+= -libXcursor diff --git a/x11/libXdmcp/buildlink3.mk b/x11/libXdmcp/buildlink3.mk index 193fb39eddb..21008227cab 100644 --- a/x11/libXdmcp/buildlink3.mk +++ b/x11/libXdmcp/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:44 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:39 rillig Exp $ BUILDLINK_TREE+= libXdmcp @@ -6,7 +6,7 @@ BUILDLINK_TREE+= libXdmcp LIBXDMCP_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libXdmcp+= libXdmcp>=0.99 -BUILDLINK_PKGSRCDIR.libXdmcp?= ../../x11/libXdmcp +BUILDLINK_PKGSRCDIR.libXdmcp?= ../../x11/libXdmcp .endif # LIBXDMCP_BUILDLINK3_MK BUILDLINK_TREE+= -libXdmcp diff --git a/x11/libXevie/buildlink3.mk b/x11/libXevie/buildlink3.mk index 9b25712c3ab..337cb5d7a6a 100644 --- a/x11/libXevie/buildlink3.mk +++ b/x11/libXevie/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:44 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:39 rillig Exp $ BUILDLINK_TREE+= libXevie @@ -6,7 +6,7 @@ BUILDLINK_TREE+= libXevie LIBXEVIE_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libXevie+= libXevie>=1.0.2 -BUILDLINK_PKGSRCDIR.libXevie?= ../../x11/libXevie +BUILDLINK_PKGSRCDIR.libXevie?= ../../x11/libXevie .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" diff --git a/x11/libXext/buildlink3.mk b/x11/libXext/buildlink3.mk index b874cbe0b91..0fcd21471f3 100644 --- a/x11/libXext/buildlink3.mk +++ b/x11/libXext/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.10 2014/03/10 11:05:52 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2018/01/07 13:04:39 rillig Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -10,7 +10,7 @@ BUILDLINK_TREE+= libXext -.if !defined(LIBXEXT_BUILDLINK3_MK) +. if !defined(LIBXEXT_BUILDLINK3_MK) LIBXEXT_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libXext+= libXext>=0.99.0 @@ -18,7 +18,7 @@ BUILDLINK_PKGSRCDIR.libXext?= ../../x11/libXext .include "../../x11/libX11/buildlink3.mk" .include "../../x11/xextproto/buildlink3.mk" -.endif # LIBXEXT_BUILDLINK3_MK +. endif # LIBXEXT_BUILDLINK3_MK BUILDLINK_TREE+= -libXext diff --git a/x11/libXfixes/buildlink3.mk b/x11/libXfixes/buildlink3.mk index 7995f8e8321..60bb9d027b1 100644 --- a/x11/libXfixes/buildlink3.mk +++ b/x11/libXfixes/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2014/04/24 12:18:09 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2018/01/07 13:04:39 rillig Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -10,15 +10,15 @@ BUILDLINK_TREE+= libXfixes -.if !defined(LIBXFIXES_BUILDLINK3_MK) +. if !defined(LIBXFIXES_BUILDLINK3_MK) LIBXFIXES_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libXfixes+= libXfixes>=4.0.1 -BUILDLINK_PKGSRCDIR.libXfixes?= ../../x11/libXfixes +BUILDLINK_PKGSRCDIR.libXfixes?= ../../x11/libXfixes .include "../../x11/fixesproto/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" -.endif # LIBXFIXES_BUILDLINK3_MK +. endif # LIBXFIXES_BUILDLINK3_MK BUILDLINK_TREE+= -libXfixes diff --git a/x11/libXfont/buildlink3.mk b/x11/libXfont/buildlink3.mk index 86c5604a610..ce1abd9b2ab 100644 --- a/x11/libXfont/buildlink3.mk +++ b/x11/libXfont/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2013/06/04 22:17:27 tron Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2018/01/07 13:04:39 rillig Exp $ BUILDLINK_TREE+= libXfont @@ -7,7 +7,7 @@ LIBXFONT_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libXfont+= libXfont>=1.2.0 BUILDLINK_ABI_DEPENDS.libXfont+= libXfont>=1.4.5nb2 -BUILDLINK_PKGSRCDIR.libXfont?= ../../x11/libXfont +BUILDLINK_PKGSRCDIR.libXfont?= ../../x11/libXfont .include "../../graphics/freetype2/buildlink3.mk" .include "../../fonts/libfontenc/buildlink3.mk" diff --git a/x11/libXfont2/buildlink3.mk b/x11/libXfont2/buildlink3.mk index 13e8e3dddb7..10b1214e4f8 100644 --- a/x11/libXfont2/buildlink3.mk +++ b/x11/libXfont2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2015/12/11 14:04:23 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:39 rillig Exp $ BUILDLINK_TREE+= libXfont2 @@ -6,7 +6,7 @@ BUILDLINK_TREE+= libXfont2 LIBXFONT2_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libXfont2+= libXfont2>=2.0 -BUILDLINK_PKGSRCDIR.libXfont2?= ../../x11/libXfont2 +BUILDLINK_PKGSRCDIR.libXfont2?= ../../x11/libXfont2 .include "../../graphics/freetype2/buildlink3.mk" .include "../../fonts/libfontenc/buildlink3.mk" diff --git a/x11/libXft/buildlink3.mk b/x11/libXft/buildlink3.mk index 07a0ac9ea24..c378d8d6e16 100644 --- a/x11/libXft/buildlink3.mk +++ b/x11/libXft/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.13 2014/03/10 11:05:52 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2018/01/07 13:04:39 rillig Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -10,7 +10,7 @@ BUILDLINK_TREE+= libXft -.if !defined(LIBXFT_BUILDLINK3_MK) +. if !defined(LIBXFT_BUILDLINK3_MK) LIBXFT_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libXft+= libXft>=2.1.10 @@ -22,7 +22,7 @@ BUILDLINK_PKGSRCDIR.libXft?= ../../x11/libXft .include "../../x11/libXrender/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" .include "../../x11/xproto/buildlink3.mk" -.endif # LIBXFT_BUILDLINK3_MK +. endif # LIBXFT_BUILDLINK3_MK BUILDLINK_TREE+= -libXft diff --git a/x11/libXi/buildlink3.mk b/x11/libXi/buildlink3.mk index a294b95f820..15e80699d83 100644 --- a/x11/libXi/buildlink3.mk +++ b/x11/libXi/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.8 2014/04/23 12:22:48 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2018/01/07 13:04:39 rillig Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -9,7 +9,7 @@ BUILDLINK_TREE+= libXi -.if !defined(LIBXI_BUILDLINK3_MK) +. if !defined(LIBXI_BUILDLINK3_MK) LIBXI_BUILDLINK3_MK:= . if !defined(USE_BUILTIN.libXi) @@ -33,7 +33,7 @@ BUILDLINK_API_DEPENDS.xproto+= xproto>=7.0.13 .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXfixes/buildlink3.mk" .include "../../x11/xproto/buildlink3.mk" -.endif # LIBXI_BUILDLINK3_MK +. endif # LIBXI_BUILDLINK3_MK BUILDLINK_TREE+= -libXi diff --git a/x11/libXinerama/buildlink3.mk b/x11/libXinerama/buildlink3.mk index 67178517f69..8af017bc387 100644 --- a/x11/libXinerama/buildlink3.mk +++ b/x11/libXinerama/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.8 2014/03/10 11:05:52 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.9 2018/01/07 13:04:40 rillig Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -10,7 +10,7 @@ BUILDLINK_TREE+= libXinerama -.if !defined(LIBXINERAMA_BUILDLINK3_MK) +. if !defined(LIBXINERAMA_BUILDLINK3_MK) LIBXINERAMA_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libXinerama+= libXinerama>=1.0.1 @@ -19,7 +19,7 @@ BUILDLINK_PKGSRCDIR.libXinerama?= ../../x11/libXinerama .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/xineramaproto/buildlink3.mk" -.endif # LIBXINERAMA_BUILDLINK3_MK +. endif # LIBXINERAMA_BUILDLINK3_MK BUILDLINK_TREE+= -libXinerama diff --git a/x11/libXmu/buildlink3.mk b/x11/libXmu/buildlink3.mk index c1de050f377..ed663b41330 100644 --- a/x11/libXmu/buildlink3.mk +++ b/x11/libXmu/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2014/03/10 11:05:52 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2018/01/07 13:04:40 rillig Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -10,7 +10,7 @@ BUILDLINK_TREE+= libXmu -.if !defined(LIBXMU_BUILDLINK3_MK) +. if !defined(LIBXMU_BUILDLINK3_MK) LIBXMU_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libXmu+= libXmu>=1.0.0 @@ -20,7 +20,7 @@ BUILDLINK_PKGSRCDIR.libXmu?= ../../x11/libXmu .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" .include "../../x11/xproto/buildlink3.mk" -.endif # LIBXMU_BUILDLINK3_MK +. endif # LIBXMU_BUILDLINK3_MK BUILDLINK_TREE+= -libXmu diff --git a/x11/libXprintAppUtil/buildlink3.mk b/x11/libXprintAppUtil/buildlink3.mk index 413d6741948..1c3bead4877 100644 --- a/x11/libXprintAppUtil/buildlink3.mk +++ b/x11/libXprintAppUtil/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2015/07/02 12:38:32 rodent Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:40 rillig Exp $ BUILDLINK_TREE+= libXprintAppUtil @@ -6,7 +6,7 @@ BUILDLINK_TREE+= libXprintAppUtil LIBXPRINTAPPUTIL_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libXprintAppUtil+= libXprintAppUtil>=1.0.1 -BUILDLINK_PKGSRCDIR.libXprintAppUtil?= ../../x11/libXprintAppUtil +BUILDLINK_PKGSRCDIR.libXprintAppUtil?= ../../x11/libXprintAppUtil .include "../../x11/libXau/buildlink3.mk" .include "../../x11/libXprintUtil/buildlink3.mk" diff --git a/x11/libXrandr/buildlink3.mk b/x11/libXrandr/buildlink3.mk index 2c4c61b7e7f..e8641dbe81c 100644 --- a/x11/libXrandr/buildlink3.mk +++ b/x11/libXrandr/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.7 2014/03/10 11:05:52 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.8 2018/01/07 13:04:40 rillig Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -10,17 +10,17 @@ BUILDLINK_TREE+= libXrandr -.if !defined(LIBXRANDR_BUILDLINK3_MK) +. if !defined(LIBXRANDR_BUILDLINK3_MK) LIBXRANDR_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libXrandr+= libXrandr>=1.1.2 -BUILDLINK_PKGSRCDIR.libXrandr?= ../../x11/libXrandr +BUILDLINK_PKGSRCDIR.libXrandr?= ../../x11/libXrandr .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXrender/buildlink3.mk" .include "../../x11/randrproto/buildlink3.mk" -.endif # LIBXRANDR_BUILDLINK3_MK +. endif # LIBXRANDR_BUILDLINK3_MK BUILDLINK_TREE+= -libXrandr diff --git a/x11/libXrender/buildlink3.mk b/x11/libXrender/buildlink3.mk index 91bb91d249d..61e65d8ff13 100644 --- a/x11/libXrender/buildlink3.mk +++ b/x11/libXrender/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2014/03/10 11:05:52 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2018/01/07 13:04:40 rillig Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -10,7 +10,7 @@ BUILDLINK_TREE+= libXrender -.if !defined(LIBXRENDER_BUILDLINK3_MK) +. if !defined(LIBXRENDER_BUILDLINK3_MK) LIBXRENDER_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libXrender+= libXrender>=0.9.2 @@ -18,7 +18,7 @@ BUILDLINK_PKGSRCDIR.libXrender?= ../../x11/libXrender .include "../../x11/renderproto/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" -.endif # LIBXRENDER_BUILDLINK3_MK +. endif # LIBXRENDER_BUILDLINK3_MK BUILDLINK_TREE+= -libXrender diff --git a/x11/libXt/buildlink3.mk b/x11/libXt/buildlink3.mk index df327c81e15..1d1efdbcf5d 100644 --- a/x11/libXt/buildlink3.mk +++ b/x11/libXt/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2014/03/10 11:05:53 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2018/01/07 13:04:40 rillig Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -10,7 +10,7 @@ BUILDLINK_TREE+= libXt -.if !defined(LIBXT_BUILDLINK3_MK) +. if !defined(LIBXT_BUILDLINK3_MK) LIBXT_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libXt+= libXt>=1.0.0 @@ -19,7 +19,7 @@ BUILDLINK_PKGSRCDIR.libXt?= ../../x11/libXt .include "../../x11/libSM/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" .include "../../x11/xproto/buildlink3.mk" -.endif # LIBXT_BUILDLINK3_MK +. endif # LIBXT_BUILDLINK3_MK BUILDLINK_TREE+= -libXt diff --git a/x11/libXxf86dga/buildlink3.mk b/x11/libXxf86dga/buildlink3.mk index a4db95885da..a1a705ba765 100644 --- a/x11/libXxf86dga/buildlink3.mk +++ b/x11/libXxf86dga/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2009/03/20 19:25:46 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:40 rillig Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -8,7 +8,7 @@ BUILDLINK_TREE+= libXxf86dga -.if !defined(LIBXXF86DGA_BUILDLINK3_MK) +. if !defined(LIBXXF86DGA_BUILDLINK3_MK) LIBXXF86DGA_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libXxf86dga+= libXxf86dga>=1.0.1 @@ -17,7 +17,7 @@ BUILDLINK_PKGSRCDIR.libXxf86dga?= ../../x11/libXxf86dga .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/xf86dgaproto/buildlink3.mk" -.endif # LIBXXF86DGA_BUILDLINK3_MK +. endif # LIBXXF86DGA_BUILDLINK3_MK BUILDLINK_TREE+= -libXxf86dga diff --git a/x11/libXxf86misc/buildlink3.mk b/x11/libXxf86misc/buildlink3.mk index 3aeea0aedbc..b992cfd7be3 100644 --- a/x11/libXxf86misc/buildlink3.mk +++ b/x11/libXxf86misc/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2009/03/20 19:25:46 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:40 rillig Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -8,7 +8,7 @@ BUILDLINK_TREE+= libXxf86misc -.if !defined(LIBXXF86MISC_BUILDLINK3_MK) +. if !defined(LIBXXF86MISC_BUILDLINK3_MK) LIBXXF86MISC_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libXxf86misc+= libXxf86misc>=1.0.0 @@ -17,7 +17,7 @@ BUILDLINK_PKGSRCDIR.libXxf86misc?= ../../x11/libXxf86misc .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/xf86miscproto/buildlink3.mk" -.endif # LIBXXF86MISC_BUILDLINK3_MK +. endif # LIBXXF86MISC_BUILDLINK3_MK BUILDLINK_TREE+= -libXxf86misc diff --git a/x11/libXxf86vm/buildlink3.mk b/x11/libXxf86vm/buildlink3.mk index 0ab130511e8..021ae95b955 100644 --- a/x11/libXxf86vm/buildlink3.mk +++ b/x11/libXxf86vm/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2010/02/25 17:10:49 reed Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2018/01/07 13:04:40 rillig Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -8,7 +8,7 @@ BUILDLINK_TREE+= libXxf86vm -.if !defined(LIBXXF86VM_BUILDLINK3_MK) +. if !defined(LIBXXF86VM_BUILDLINK3_MK) LIBXXF86VM_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libXxf86vm+= libXxf86vm>=1.1.0 @@ -17,7 +17,7 @@ BUILDLINK_PKGSRCDIR.libXxf86vm?= ../../x11/libXxf86vm .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/xf86vidmodeproto/buildlink3.mk" -.endif # LIBXXF86VM_BUILDLINK3_MK +. endif # LIBXXF86VM_BUILDLINK3_MK BUILDLINK_TREE+= -libXxf86vm diff --git a/x11/libunique/buildlink3.mk b/x11/libunique/buildlink3.mk index f90a551fa08..b9f457f3bdb 100644 --- a/x11/libunique/buildlink3.mk +++ b/x11/libunique/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.27 2017/02/12 06:24:56 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.28 2018/01/07 13:04:40 rillig Exp $ BUILDLINK_TREE+= libunique @@ -7,7 +7,7 @@ LIBUNIQUE_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libunique+= libunique>=1.0.4 BUILDLINK_ABI_DEPENDS.libunique+= libunique>=1.1.6nb24 -BUILDLINK_PKGSRCDIR.libunique?= ../../x11/libunique +BUILDLINK_PKGSRCDIR.libunique?= ../../x11/libunique pkgbase := libunique .include "../../mk/pkg-build-options.mk" diff --git a/x11/libxkbfile/buildlink3.mk b/x11/libxkbfile/buildlink3.mk index 67ae09f6c3b..e483e511c49 100644 --- a/x11/libxkbfile/buildlink3.mk +++ b/x11/libxkbfile/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2009/03/20 19:25:47 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2018/01/07 13:04:40 rillig Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -8,7 +8,7 @@ BUILDLINK_TREE+= libxkbfile -.if !defined(LIBXKBFILE_BUILDLINK3_MK) +. if !defined(LIBXKBFILE_BUILDLINK3_MK) LIBXKBFILE_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libxkbfile+= libxkbfile>=0.99.1 @@ -16,7 +16,7 @@ BUILDLINK_PKGSRCDIR.libxkbfile?= ../../x11/libxkbfile .include "../../x11/kbproto/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" -.endif # LIBXKBFILE_BUILDLINK3_MK +. endif # LIBXKBFILE_BUILDLINK3_MK BUILDLINK_TREE+= -libxkbfile diff --git a/x11/libxkbui/buildlink3.mk b/x11/libxkbui/buildlink3.mk index cd35a7e4c41..f91ad329037 100644 --- a/x11/libxkbui/buildlink3.mk +++ b/x11/libxkbui/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:47 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2018/01/07 13:04:41 rillig Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -8,15 +8,15 @@ BUILDLINK_TREE+= libxkbui -.if !defined(LIBXKBUI_BUILDLINK3_MK) +. if !defined(LIBXKBUI_BUILDLINK3_MK) LIBXKBUI_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.libxkbui+= libxkbui>=1.0.2 -BUILDLINK_PKGSRCDIR.libxkbui?= ../../x11/libxkbui +BUILDLINK_PKGSRCDIR.libxkbui?= ../../x11/libxkbui .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libxkbfile/buildlink3.mk" -.endif # LIBXKBUI_BUILDLINK3_MK +. endif # LIBXKBUI_BUILDLINK3_MK BUILDLINK_TREE+= -libxkbui diff --git a/x11/p5-Wx/buildlink3.mk b/x11/p5-Wx/buildlink3.mk index 75480aea6a0..32b8e1db9b8 100644 --- a/x11/p5-Wx/buildlink3.mk +++ b/x11/p5-Wx/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.33 2017/09/17 14:42:16 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.34 2018/01/07 13:04:41 rillig Exp $ BUILDLINK_TREE+= p5-Wx @@ -14,8 +14,8 @@ BUILDLINK_LIBDIRS.p5-Wx?= ${PERL5_SUB_INSTALLVENDORARCH}/auto/Wx # We want all of the arch-dependent Wx files. BUILDLINK_CONTENTS_FILTER.p5-Wx?= ${GREP} ${PERL5_SUB_INSTALLVENDORARCH} -BUILD_DEPENDS+= p5-Alien-wxWidgets>=0.69:../../x11/p5-Alien-wxWidgets -BUILD_DEPENDS+= p5-ExtUtils-XSpp>=0.05:../../devel/p5-ExtUtils-XSpp +BUILD_DEPENDS+= p5-Alien-wxWidgets>=0.69:../../x11/p5-Alien-wxWidgets +BUILD_DEPENDS+= p5-ExtUtils-XSpp>=0.05:../../devel/p5-ExtUtils-XSpp .include "../../lang/perl5/buildlink3.mk" .include "../../x11/wxGTK30/buildlink3.mk" diff --git a/x11/plasma-framework/buildlink3.mk b/x11/plasma-framework/buildlink3.mk index 08c1a5174e9..7383125e735 100644 --- a/x11/plasma-framework/buildlink3.mk +++ b/x11/plasma-framework/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.12 2017/11/30 16:45:12 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2018/01/07 13:04:41 rillig Exp $ BUILDLINK_TREE+= plasma-framework @@ -7,7 +7,7 @@ PLASMA_FRAMEWORK_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.plasma-framework+= plasma-framework>=5.21.0 BUILDLINK_ABI_DEPENDS.plasma-framework?= plasma-framework>=5.25.0nb12 -BUILDLINK_PKGSRCDIR.plasma-framework?= ../../x11/plasma-framework +BUILDLINK_PKGSRCDIR.plasma-framework?= ../../x11/plasma-framework .include "../../devel/kdeclarative/buildlink3.mk" .include "../../x11/kactivities5/buildlink3.mk" diff --git a/x11/py-gnome2-desktop/buildlink3.mk b/x11/py-gnome2-desktop/buildlink3.mk index ab27cf96e0f..dbb0df502f4 100644 --- a/x11/py-gnome2-desktop/buildlink3.mk +++ b/x11/py-gnome2-desktop/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.38 2017/11/23 17:19:46 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.39 2018/01/07 13:04:41 rillig Exp $ BUILDLINK_TREE+= py-gnome2-desktop @@ -7,10 +7,10 @@ PY_GNOME2_DESKTOP_BUILDLINK3_MK:= .include "../../lang/python/pyversion.mk" -BUILDLINK_API_DEPENDS.py-gnome2-desktop+=${PYPKGPREFIX}-gnome2-desktop>=2.16.0 -BUILDLINK_ABI_DEPENDS.py-gnome2-desktop?=${PYPKGPREFIX}-gnome2-desktop>=2.32.0nb36 +BUILDLINK_API_DEPENDS.py-gnome2-desktop+= ${PYPKGPREFIX}-gnome2-desktop>=2.16.0 +BUILDLINK_ABI_DEPENDS.py-gnome2-desktop?= ${PYPKGPREFIX}-gnome2-desktop>=2.32.0nb36 BUILDLINK_ABI_DEPENDS.py-gnome2-desktop?= ${PYPKGPREFIX}-gnome2-desktop>=2.32.0nb51 -BUILDLINK_PKGSRCDIR.py-gnome2-desktop?= ../../x11/py-gnome2-desktop +BUILDLINK_PKGSRCDIR.py-gnome2-desktop?= ../../x11/py-gnome2-desktop .include "../../x11/py-gnome2/buildlink3.mk" .endif # PY_GNOME2_DESKTOP_BUILDLINK3_MK diff --git a/x11/py-gnome2/buildlink3.mk b/x11/py-gnome2/buildlink3.mk index 664bce3c707..b1176f6ecda 100644 --- a/x11/py-gnome2/buildlink3.mk +++ b/x11/py-gnome2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.59 2017/11/23 17:19:46 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.60 2018/01/07 13:04:41 rillig Exp $ BUILDLINK_TREE+= pygnome2 @@ -9,7 +9,7 @@ PYGNOME2_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.pygnome2+= ${PYPKGPREFIX}-gnome2>=2.10.0 BUILDLINK_ABI_DEPENDS.pygnome2+= ${PYPKGPREFIX}-gnome2>=2.28.1nb34 -BUILDLINK_PKGSRCDIR.pygnome2?= ../../x11/py-gnome2 +BUILDLINK_PKGSRCDIR.pygnome2?= ../../x11/py-gnome2 .include "../../net/py-ORBit/buildlink3.mk" .include "../../x11/py-gtk2/buildlink3.mk" diff --git a/x11/py-gtksourceview/buildlink3.mk b/x11/py-gtksourceview/buildlink3.mk index 8c9c78fd559..43ecbcc8359 100644 --- a/x11/py-gtksourceview/buildlink3.mk +++ b/x11/py-gtksourceview/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2012/09/15 10:07:12 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2018/01/07 13:04:41 rillig Exp $ BUILDLINK_TREE+= py_gtksourceview @@ -9,7 +9,7 @@ PY_GTKSOURCEVIEW_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.py_gtksourceview+= ${PYPKGPREFIX}-gtksourceview>=2.8.0nb1 BUILDLINK_ABI_DEPENDS.py_gtksourceview+= ${PYPKGPREFIX}-gtksourceview>=2.10.1nb9 -BUILDLINK_PKGSRCDIR.py_gtksourceview?= ../../x11/py-gtksourceview +BUILDLINK_PKGSRCDIR.py_gtksourceview?= ../../x11/py-gtksourceview #.include "../../devel/py-gobject-shared/buildlink3.mk" #.include "../../devel/glib2/buildlink3.mk" diff --git a/x11/py-qt4-qscintilla/buildlink3.mk b/x11/py-qt4-qscintilla/buildlink3.mk index 3bec9454480..baf145f4be0 100644 --- a/x11/py-qt4-qscintilla/buildlink3.mk +++ b/x11/py-qt4-qscintilla/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.26 2016/03/05 11:27:59 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.27 2018/01/07 13:04:41 rillig Exp $ BUILDLINK_TREE+= py-qt4-qscintilla @@ -7,7 +7,7 @@ PY_QT4_QSCINTILLA_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.py-qt4-qscintilla+= ${PYPKGPREFIX}-qt4-qscintilla>=2.4.3 BUILDLINK_ABI_DEPENDS.py-qt4-qscintilla+= ${PYPKGPREFIX}-qt4-qscintilla>=2.9.1nb1 -BUILDLINK_PKGSRCDIR.py-qt4-qscintilla?= ../../x11/py-qt4-qscintilla +BUILDLINK_PKGSRCDIR.py-qt4-qscintilla?= ../../x11/py-qt4-qscintilla .include "../../x11/py-sip/buildlink3.mk" .include "../../x11/py-qt4/buildlink3.mk" diff --git a/x11/py-wxWidgets/buildlink3.mk b/x11/py-wxWidgets/buildlink3.mk index 2bea0ea4699..09c070ad22d 100644 --- a/x11/py-wxWidgets/buildlink3.mk +++ b/x11/py-wxWidgets/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.46 2017/02/12 06:24:57 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.47 2018/01/07 13:04:41 rillig Exp $ BUILDLINK_TREE+= ${PYPKGPREFIX}-wxWidgets @@ -7,10 +7,10 @@ PY_WXWIDGETS_BUILDLINK3_MK:= .include "../../lang/python/pyversion.mk" -BUILDLINK_API_DEPENDS.${PYPKGPREFIX}-wxWidgets+=${PYPKGPREFIX}-wxWidgets>=2.6.1.0 -BUILDLINK_ABI_DEPENDS.${PYPKGPREFIX}-wxWidgets+=${PYPKGPREFIX}-wxWidgets>=2.8.10.1nb26 +BUILDLINK_API_DEPENDS.${PYPKGPREFIX}-wxWidgets+= ${PYPKGPREFIX}-wxWidgets>=2.6.1.0 +BUILDLINK_ABI_DEPENDS.${PYPKGPREFIX}-wxWidgets+= ${PYPKGPREFIX}-wxWidgets>=2.8.10.1nb26 BUILDLINK_ABI_DEPENDS.${PYPKGPREFIX}-wxWidgets?= ${PYPKGPREFIX}-wxWidgets>=2.8.12.0nb6 -BUILDLINK_PKGSRCDIR.${PYPKGPREFIX}-wxWidgets?= ../../x11/py-wxWidgets +BUILDLINK_PKGSRCDIR.${PYPKGPREFIX}-wxWidgets?= ../../x11/py-wxWidgets .include "../../x11/wxGTK28/buildlink3.mk" .endif # PY_WXWIDGETS_BUILDLINK3_MK diff --git a/x11/qt4-libs/buildlink3.mk b/x11/qt4-libs/buildlink3.mk index 1ffede6c198..69545606ff0 100644 --- a/x11/qt4-libs/buildlink3.mk +++ b/x11/qt4-libs/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.45 2016/03/05 11:27:59 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.46 2018/01/07 13:04:41 rillig Exp $ BUILDLINK_TREE+= qt4-libs @@ -7,7 +7,7 @@ QT4_LIBS_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.qt4-libs+= qt4-libs>=4.6.1nb2 BUILDLINK_ABI_DEPENDS.qt4-libs+= qt4-libs>=4.8.7nb1 -BUILDLINK_PKGSRCDIR.qt4-libs?= ../../x11/qt4-libs +BUILDLINK_PKGSRCDIR.qt4-libs?= ../../x11/qt4-libs BUILDLINK_INCDIRS.qt4-libs+= qt4/include BUILDLINK_LIBDIRS.qt4-libs+= qt4/lib @@ -31,7 +31,7 @@ PTHREAD_OPTS+= require .include "../../x11/libXmu/buildlink3.mk" .include "../../x11/libXrandr/buildlink3.mk" . if ${X11_TYPE} == "modular" -. include "../../x11/libXinerama/buildlink3.mk" +. include "../../x11/libXinerama/buildlink3.mk" . endif .endif .include "../../security/openssl/buildlink3.mk" diff --git a/x11/qt4-qdbus/buildlink3.mk b/x11/qt4-qdbus/buildlink3.mk index 706780673b4..d17b7cf38a7 100644 --- a/x11/qt4-qdbus/buildlink3.mk +++ b/x11/qt4-qdbus/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.27 2016/03/05 11:27:59 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.28 2018/01/07 13:04:41 rillig Exp $ BUILDLINK_TREE+= qt4-qdbus @@ -7,7 +7,7 @@ QT4_QDBUS_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.qt4-qdbus+= qt4-qdbus>=4.3.2 BUILDLINK_ABI_DEPENDS.qt4-qdbus+= qt4-qdbus>=4.8.7nb1 -BUILDLINK_PKGSRCDIR.qt4-qdbus?= ../../x11/qt4-qdbus +BUILDLINK_PKGSRCDIR.qt4-qdbus?= ../../x11/qt4-qdbus .include "../../x11/qt4-libs/buildlink3.mk" .include "../../sysutils/dbus/buildlink3.mk" diff --git a/x11/qt4-tools/buildlink3.mk b/x11/qt4-tools/buildlink3.mk index 393c7f88501..cbc9f819ed7 100644 --- a/x11/qt4-tools/buildlink3.mk +++ b/x11/qt4-tools/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.35 2016/03/05 11:28:00 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.36 2018/01/07 13:04:41 rillig Exp $ BUILDLINK_TREE+= qt4-tools @@ -7,8 +7,8 @@ QT4_TOOLS_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.qt4-tools+= qt4-tools>=4.1.0 BUILDLINK_ABI_DEPENDS.qt4-tools+= qt4-tools>=4.8.7nb1 -BUILDLINK_PKGSRCDIR.qt4-tools?= ../../x11/qt4-tools -BUILDLINK_DEPMETHOD.qt4-tools?= build +BUILDLINK_PKGSRCDIR.qt4-tools?= ../../x11/qt4-tools +BUILDLINK_DEPMETHOD.qt4-tools?= build .include "../../x11/qt4-libs/buildlink3.mk" diff --git a/x11/qt5-mysql/buildlink3.mk b/x11/qt5-mysql/buildlink3.mk index 3561b219d77..3d484dab793 100644 --- a/x11/qt5-mysql/buildlink3.mk +++ b/x11/qt5-mysql/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.17 2017/11/30 16:45:12 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.18 2018/01/07 13:04:41 rillig Exp $ BUILDLINK_TREE+= qt5-mysql @@ -7,7 +7,7 @@ QT5_MYSQL_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.qt5-mysql+= qt5-mysql>=5.5.1 BUILDLINK_ABI_DEPENDS.qt5-mysql+= qt5-mysql>=5.5.1nb9 -BUILDLINK_PKGSRCDIR.qt5-mysql?= ../../x11/qt5-mysql +BUILDLINK_PKGSRCDIR.qt5-mysql?= ../../x11/qt5-mysql BUILDLINK_LIBDIRS.qt5-mysql+= qt5/plugins diff --git a/x11/qt5-odbc/buildlink3.mk b/x11/qt5-odbc/buildlink3.mk index aef7d9a591f..cc83266b89d 100644 --- a/x11/qt5-odbc/buildlink3.mk +++ b/x11/qt5-odbc/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.17 2017/11/30 16:45:12 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.18 2018/01/07 13:04:42 rillig Exp $ BUILDLINK_TREE+= qt5-odbc @@ -7,7 +7,7 @@ QT5_ODBC_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.qt5-odbc+= qt5-odbc>=5.5.1 BUILDLINK_ABI_DEPENDS.qt5-odbc+= qt5-odbc>=5.5.1nb9 -BUILDLINK_PKGSRCDIR.qt5-odbc?= ../../x11/qt5-odbc +BUILDLINK_PKGSRCDIR.qt5-odbc?= ../../x11/qt5-odbc BUILDLINK_LIBDIRS.qt5-odbc+= qt5/plugins diff --git a/x11/qt5-psql/buildlink3.mk b/x11/qt5-psql/buildlink3.mk index 9d987827d5f..7b8b2524141 100644 --- a/x11/qt5-psql/buildlink3.mk +++ b/x11/qt5-psql/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.17 2017/11/30 16:45:12 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.18 2018/01/07 13:04:42 rillig Exp $ BUILDLINK_TREE+= qt5-psql @@ -7,7 +7,7 @@ QT5_PSQL_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.qt5-psql+= qt5-psql>=5.5.1 BUILDLINK_ABI_DEPENDS.qt5-psql+= qt5-psql>=5.5.1nb10 -BUILDLINK_PKGSRCDIR.qt5-psql?= ../../x11/qt5-psql +BUILDLINK_PKGSRCDIR.qt5-psql?= ../../x11/qt5-psql BUILDLINK_LIBDIRS.qt5-psql+= qt5/plugins diff --git a/x11/qt5-qtbase/buildlink3.mk b/x11/qt5-qtbase/buildlink3.mk index 5d2a31eff7c..b8be28cc9fb 100644 --- a/x11/qt5-qtbase/buildlink3.mk +++ b/x11/qt5-qtbase/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.21 2017/11/30 16:45:12 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.22 2018/01/07 13:04:42 rillig Exp $ BUILDLINK_TREE+= qt5-qtbase @@ -13,11 +13,11 @@ BUILDLINK_INCDIRS.qt5-qtbase+= qt5/include BUILDLINK_LIBDIRS.qt5-qtbase+= qt5/lib BUILDLINK_LIBDIRS.qt5-qtbase+= qt5/plugins -QTDIR= ${BUILDLINK_PREFIX.qt5-qtbase}/qt5 +QTDIR= ${BUILDLINK_PREFIX.qt5-qtbase}/qt5 CMAKE_PREFIX_PATH+= ${QTDIR} CONFIGURE_ENV+= QTDIR=${QTDIR} -MAKE_ENV+= QTDIR=${QTDIR} +MAKE_ENV+= QTDIR=${QTDIR} PTHREAD_OPTS+= require diff --git a/x11/qt5-qtdeclarative/buildlink3.mk b/x11/qt5-qtdeclarative/buildlink3.mk index 82114df61fb..8c6f703ad13 100644 --- a/x11/qt5-qtdeclarative/buildlink3.mk +++ b/x11/qt5-qtdeclarative/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.18 2017/11/30 16:45:12 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.19 2018/01/07 13:04:42 rillig Exp $ BUILDLINK_TREE+= qt5-qtdeclarative @@ -7,7 +7,7 @@ QT5_QTDECLARATIVE_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.qt5-qtdeclarative+= qt5-qtdeclarative>=5.5.1 BUILDLINK_ABI_DEPENDS.qt5-qtdeclarative+= qt5-qtdeclarative>=5.5.1nb9 -BUILDLINK_PKGSRCDIR.qt5-qtdeclarative?= ../../x11/qt5-qtdeclarative +BUILDLINK_PKGSRCDIR.qt5-qtdeclarative?= ../../x11/qt5-qtdeclarative BUILDLINK_INCDIRS.qt5-qtdeclarative+= qt5/include BUILDLINK_LIBDIRS.qt5-qtdeclarative+= qt5/lib diff --git a/x11/qt5-qtmultimedia/buildlink3.mk b/x11/qt5-qtmultimedia/buildlink3.mk index 4d597c2a826..7ffe9df3661 100644 --- a/x11/qt5-qtmultimedia/buildlink3.mk +++ b/x11/qt5-qtmultimedia/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.24 2017/11/30 16:45:12 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.25 2018/01/07 13:04:42 rillig Exp $ BUILDLINK_TREE+= qt5-qtmultimedia @@ -7,7 +7,7 @@ QT5_QTMULTIMEDIA_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.qt5-qtmultimedia+= qt5-qtmultimedia>=5.5.1 BUILDLINK_ABI_DEPENDS.qt5-qtmultimedia+= qt5-qtmultimedia>=5.5.1nb13 -BUILDLINK_PKGSRCDIR.qt5-qtmultimedia?= ../../x11/qt5-qtmultimedia +BUILDLINK_PKGSRCDIR.qt5-qtmultimedia?= ../../x11/qt5-qtmultimedia BUILDLINK_INCDIRS.qt5-qtmultimedia+= qt5/include BUILDLINK_LIBDIRS.qt5-qtmultimedia+= qt5/lib diff --git a/x11/qt5-qtserialport/buildlink3.mk b/x11/qt5-qtserialport/buildlink3.mk index 3b24f6c9434..d6fca07e36f 100644 --- a/x11/qt5-qtserialport/buildlink3.mk +++ b/x11/qt5-qtserialport/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.17 2017/11/30 16:45:13 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.18 2018/01/07 13:04:42 rillig Exp $ BUILDLINK_TREE+= qt5-qtserialport @@ -7,7 +7,7 @@ QT5_QTSERIALPORT_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.qt5-qtserialport+= qt5-qtserialport>=5.5.1 BUILDLINK_ABI_DEPENDS.qt5-qtserialport+= qt5-qtserialport>=5.5.1nb9 -BUILDLINK_PKGSRCDIR.qt5-qtserialport?= ../../x11/qt5-qtserialport +BUILDLINK_PKGSRCDIR.qt5-qtserialport?= ../../x11/qt5-qtserialport BUILDLINK_INCDIRS.qt5-qtserialport+= qt5/include BUILDLINK_LIBDIRS.qt5-qtserialport+= qt5/lib diff --git a/x11/qt5-qtsvg/buildlink3.mk b/x11/qt5-qtsvg/buildlink3.mk index f708df04e2e..6be4a127ab9 100644 --- a/x11/qt5-qtsvg/buildlink3.mk +++ b/x11/qt5-qtsvg/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.17 2017/11/30 16:45:13 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.18 2018/01/07 13:04:42 rillig Exp $ BUILDLINK_TREE+= qt5-qtsvg @@ -7,7 +7,7 @@ QT5_QTSVG_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.qt5-qtsvg+= qt5-qtsvg>=5.5.1 BUILDLINK_ABI_DEPENDS.qt5-qtsvg+= qt5-qtsvg>=5.5.1nb9 -BUILDLINK_PKGSRCDIR.qt5-qtsvg?= ../../x11/qt5-qtsvg +BUILDLINK_PKGSRCDIR.qt5-qtsvg?= ../../x11/qt5-qtsvg BUILDLINK_INCDIRS.qt5-qtsvg+= qt5/include BUILDLINK_LIBDIRS.qt5-qtsvg+= qt5/lib diff --git a/x11/qt5-qtwebchannel/buildlink3.mk b/x11/qt5-qtwebchannel/buildlink3.mk index 83ea6721d1d..15d5fe6f8f3 100644 --- a/x11/qt5-qtwebchannel/buildlink3.mk +++ b/x11/qt5-qtwebchannel/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.12 2017/11/30 16:45:13 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2018/01/07 13:04:42 rillig Exp $ BUILDLINK_TREE+= qt5-qtwebchannel @@ -7,7 +7,7 @@ QT5_QTWEBCHANNEL_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.qt5-qtwebchannel+= qt5-qtwebchannel>=5.5.1 BUILDLINK_ABI_DEPENDS.qt5-qtwebchannel+= qt5-qtwebchannel>=5.5.1nb10 -BUILDLINK_PKGSRCDIR.qt5-qtwebchannel?= ../../x11/qt5-qtwebchannel +BUILDLINK_PKGSRCDIR.qt5-qtwebchannel?= ../../x11/qt5-qtwebchannel BUILDLINK_INCDIRS.qt5-qtwebchannel+= qt5/include BUILDLINK_LIBDIRS.qt5-qtwebchannel+= qt5/lib diff --git a/x11/qt5-qtxmlpatterns/buildlink3.mk b/x11/qt5-qtxmlpatterns/buildlink3.mk index e905a21c628..bdab9cc4fa0 100644 --- a/x11/qt5-qtxmlpatterns/buildlink3.mk +++ b/x11/qt5-qtxmlpatterns/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.17 2017/11/30 16:45:14 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.18 2018/01/07 13:04:42 rillig Exp $ BUILDLINK_TREE+= qt5-qtxmlpatterns @@ -7,7 +7,7 @@ QT5_QTXMLPATTERNS_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.qt5-qtxmlpatterns+= qt5-qtxmlpatterns>=5.5.1 BUILDLINK_ABI_DEPENDS.qt5-qtxmlpatterns+= qt5-qtxmlpatterns>=5.5.1nb9 -BUILDLINK_PKGSRCDIR.qt5-qtxmlpatterns?= ../../x11/qt5-qtxmlpatterns +BUILDLINK_PKGSRCDIR.qt5-qtxmlpatterns?= ../../x11/qt5-qtxmlpatterns BUILDLINK_INCDIRS.qt5-qtxmlpatterns+= qt5/include BUILDLINK_LIBDIRS.qt5-qtxmlpatterns+= qt5/lib diff --git a/x11/qwtplot3d-qt4/buildlink3.mk b/x11/qwtplot3d-qt4/buildlink3.mk index 65433eda60b..40170cba684 100644 --- a/x11/qwtplot3d-qt4/buildlink3.mk +++ b/x11/qwtplot3d-qt4/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.24 2016/03/05 11:28:02 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.25 2018/01/07 13:04:42 rillig Exp $ BUILDLINK_TREE+= qwtplot3d @@ -7,7 +7,7 @@ QWTPLOT3D_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.qwtplot3d+= qwtplot3d>=0.2.7 BUILDLINK_ABI_DEPENDS.qwtplot3d+= qwtplot3d>=0.2.7nb23 -BUILDLINK_PKGSRCDIR.qwtplot3d?= ../../x11/qwtplot3d-qt4 +BUILDLINK_PKGSRCDIR.qwtplot3d?= ../../x11/qwtplot3d-qt4 .include "../../x11/qt4-libs/buildlink3.mk" .endif # QWTPLOT3D_BUILDLINK3_MK diff --git a/x11/renderproto/buildlink3.mk b/x11/renderproto/buildlink3.mk index fe1e2698d8c..a98e39c0a5a 100644 --- a/x11/renderproto/buildlink3.mk +++ b/x11/renderproto/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.15 2011/04/20 10:00:01 hauke Exp $ +# $NetBSD: buildlink3.mk,v 1.16 2018/01/07 13:04:42 rillig Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -8,12 +8,12 @@ BUILDLINK_TREE+= renderproto RENDERPROTO_BUILDLINK3_MK:= .if ${X11_TYPE} == "native" -. include "../../mk/x11.buildlink3.mk" -. if ${BUILTIN_X11_TYPE.native} == "XFree86" || \ +. include "../../mk/x11.buildlink3.mk" +. if ${BUILTIN_X11_TYPE.native} == "XFree86" || \ ${BUILTIN_X11_TYPE.native} == "xorg" && \ empty(BUILTIN_X11_VERSION.xorg) RENDERPROTO_RENDERPROTO9=1 -. endif +. endif .endif .if defined(RENDERPROTO_RENDERPROTO9) diff --git a/x11/rep-gtk2/buildlink3.mk b/x11/rep-gtk2/buildlink3.mk index 5facc6f42b7..a914bf080d2 100644 --- a/x11/rep-gtk2/buildlink3.mk +++ b/x11/rep-gtk2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2014/01/03 05:03:51 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:43 rillig Exp $ BUILDLINK_TREE+= rep-gtk2 @@ -6,7 +6,7 @@ BUILDLINK_TREE+= rep-gtk2 REP_GTK2_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.rep-gtk2+= rep-gtk2>=0.90.8.1 -BUILDLINK_PKGSRCDIR.rep-gtk2?= ../../x11/rep-gtk2 +BUILDLINK_PKGSRCDIR.rep-gtk2?= ../../x11/rep-gtk2 .endif # REP_GTK2_BUILDLINK3_MK diff --git a/x11/ruby-gnome2-gtk3/buildlink3.mk b/x11/ruby-gnome2-gtk3/buildlink3.mk index abc7dd0020a..d82ece4f344 100644 --- a/x11/ruby-gnome2-gtk3/buildlink3.mk +++ b/x11/ruby-gnome2-gtk3/buildlink3.mk @@ -1,14 +1,14 @@ -# $NetBSD: buildlink3.mk,v 1.17 2017/11/23 17:19:46 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.18 2018/01/07 13:04:43 rillig Exp $ BUILDLINK_TREE+= ruby-gnome2-gtk3 .if !defined(RUBY_GNOME2_GTK3_BUILDLINK3_MK) RUBY_GNOME2_GTK3_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.ruby-gnome2-gtk3+=${RUBY_PKGPREFIX}-gnome2-gtk3>=1.2.0 -BUILDLINK_ABI_DEPENDS.ruby-gnome2-gtk3+=${RUBY_PKGPREFIX}-gnome2-gtk3>=3.1.1nb2 +BUILDLINK_API_DEPENDS.ruby-gnome2-gtk3+= ${RUBY_PKGPREFIX}-gnome2-gtk3>=1.2.0 +BUILDLINK_ABI_DEPENDS.ruby-gnome2-gtk3+= ${RUBY_PKGPREFIX}-gnome2-gtk3>=3.1.1nb2 BUILDLINK_ABI_DEPENDS.ruby-gnome2-gtk3?= ruby23-gnome2-gtk3>=3.1.9nb1 -BUILDLINK_PKGSRCDIR.ruby-gnome2-gtk3?= ../../x11/ruby-gnome2-gtk3 +BUILDLINK_PKGSRCDIR.ruby-gnome2-gtk3?= ../../x11/ruby-gnome2-gtk3 .include "../../devel/ruby-gnome2-glib/buildlink3.mk" .include "../../x11/gtk3/buildlink3.mk" diff --git a/x11/tk/buildlink3.mk b/x11/tk/buildlink3.mk index cf8e978a73a..d231b130d94 100644 --- a/x11/tk/buildlink3.mk +++ b/x11/tk/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.35 2015/11/25 12:54:23 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.36 2018/01/07 13:04:43 rillig Exp $ BUILDLINK_TREE+= tk @@ -27,7 +27,7 @@ pkgbase := tk .include "../../mk/pkg-build-options.mk" .if !empty(PKG_BUILD_OPTIONS.tk:Mxft2) -. include "../../x11/libXft/buildlink3.mk" +. include "../../x11/libXft/buildlink3.mk" .endif .include "../../mk/bsd.fast.prefs.mk" diff --git a/x11/tk85/buildlink3.mk b/x11/tk85/buildlink3.mk index 62b0cfdbe46..489ee0353a8 100644 --- a/x11/tk85/buildlink3.mk +++ b/x11/tk85/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2015/11/25 12:54:23 jperkin Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:43 rillig Exp $ BUILDLINK_TREE+= tk @@ -27,7 +27,7 @@ pkgbase := tk .include "../../mk/pkg-build-options.mk" .if !empty(PKG_BUILD_OPTIONS.tk:Mxft2) -. include "../../x11/libXft/buildlink3.mk" +. include "../../x11/libXft/buildlink3.mk" .endif .include "../../mk/bsd.fast.prefs.mk" diff --git a/x11/trapproto/buildlink3.mk b/x11/trapproto/buildlink3.mk index 4043843c065..8349e6e9c02 100644 --- a/x11/trapproto/buildlink3.mk +++ b/x11/trapproto/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2013/04/06 13:46:35 rodent Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2018/01/07 13:04:43 rillig Exp $ BUILDLINK_TREE+= trapproto @@ -8,7 +8,7 @@ TRAPPROTO_BUILDLINK3_MK:= BUILDLINK_DEPMETHOD.trapproto?= build BUILDLINK_API_DEPENDS.trapproto+= trapproto>=3.4.3 -BUILDLINK_PKGSRCDIR.trapproto?= ../../x11/trapproto +BUILDLINK_PKGSRCDIR.trapproto?= ../../x11/trapproto .include "../../x11/libX11/buildlink3.mk" .include "../../x11/xproto/buildlink3.mk" diff --git a/x11/wxGTK30/buildlink3.mk b/x11/wxGTK30/buildlink3.mk index 056af041c4f..9ab6e93a789 100644 --- a/x11/wxGTK30/buildlink3.mk +++ b/x11/wxGTK30/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.9 2017/02/12 06:25:00 ryoon Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2018/01/07 13:04:43 rillig Exp $ BUILDLINK_TREE+= wxGTK30 @@ -10,7 +10,7 @@ BUILDLINK_ABI_DEPENDS.wxGTK30+= wxGTK30>=3.0.2nb10 BUILDLINK_PKGSRCDIR.wxGTK30?= ../../x11/wxGTK30 BUILDLINK_INCDIRS.wxGTK30+= include/wx-3.0 -PREPEND_PATH+= ${PREFIX}/libexec/wx-3.0 +PREPEND_PATH+= ${PREFIX}/libexec/wx-3.0 CONFIGURE_ARGS+= --with-wx-version=3.0 CONFIGURE_ARGS+= --with-wx-config=${PREFIX}/libexec/wx-3.0/wx-config diff --git a/x11/xbitmaps/buildlink3.mk b/x11/xbitmaps/buildlink3.mk index f9d10b067e1..907ed3412ea 100644 --- a/x11/xbitmaps/buildlink3.mk +++ b/x11/xbitmaps/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2013/04/06 13:46:35 rodent Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2018/01/07 13:04:43 rillig Exp $ BUILDLINK_TREE+= xbitmaps @@ -8,7 +8,7 @@ XBITMAPS_BUILDLINK3_MK:= BUILDLINK_DEPMETHOD.xbitmaps?= build BUILDLINK_API_DEPENDS.xbitmaps+= xbitmaps>=1.0 -BUILDLINK_PKGSRCDIR.xbitmaps?= ../../x11/xbitmaps +BUILDLINK_PKGSRCDIR.xbitmaps?= ../../x11/xbitmaps .endif # XBITMAPS_BUILDLINK3_MK BUILDLINK_TREE+= -xbitmaps diff --git a/x11/xcb-proto/buildlink3.mk b/x11/xcb-proto/buildlink3.mk index 1943f8335af..ed94039d556 100644 --- a/x11/xcb-proto/buildlink3.mk +++ b/x11/xcb-proto/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.2 2012/05/07 02:45:47 dholland Exp $ +# $NetBSD: buildlink3.mk,v 1.3 2018/01/07 13:04:43 rillig Exp $ BUILDLINK_TREE+= xcb-proto @@ -6,8 +6,8 @@ BUILDLINK_TREE+= xcb-proto XCB_PROTO_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.xcb-proto+= xcb-proto>=1.4 -BUILDLINK_PKGSRCDIR.xcb-proto?= ../../x11/xcb-proto -BUILDLINK_DEPMETHOD.xcb-proto?= build +BUILDLINK_PKGSRCDIR.xcb-proto?= ../../x11/xcb-proto +BUILDLINK_DEPMETHOD.xcb-proto?= build .endif # XCB_PROTO_BUILDLINK3_MK BUILDLINK_TREE+= -xcb-proto diff --git a/x11/xcb-util-keysyms/buildlink3.mk b/x11/xcb-util-keysyms/buildlink3.mk index 463eb757a27..f2ac79d4be9 100644 --- a/x11/xcb-util-keysyms/buildlink3.mk +++ b/x11/xcb-util-keysyms/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2012/07/24 18:02:07 drochner Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2018/01/07 13:04:43 rillig Exp $ BUILDLINK_TREE+= xcb-util-keysyms @@ -6,7 +6,7 @@ BUILDLINK_TREE+= xcb-util-keysyms XCB_UTIL_KEYSYMS_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.xcb-util-keysyms+= xcb-util-keysyms>=0.3.9 -BUILDLINK_PKGSRCDIR.xcb-util-keysyms?= ../../x11/xcb-util-keysyms +BUILDLINK_PKGSRCDIR.xcb-util-keysyms?= ../../x11/xcb-util-keysyms .include "../../x11/libxcb/buildlink3.mk" .endif # XCB_UTIL_KEYSYMS_BUILDLINK3_MK diff --git a/x11/xextproto/buildlink3.mk b/x11/xextproto/buildlink3.mk index e928a7c692b..1da66a717e2 100644 --- a/x11/xextproto/buildlink3.mk +++ b/x11/xextproto/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.11 2010/04/10 21:09:21 tnn Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2018/01/07 13:04:43 rillig Exp $ .include "../../mk/bsd.fast.prefs.mk" @@ -10,7 +10,7 @@ BUILDLINK_TREE+= xextproto XEXTPROTO_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.xextproto+= xextproto>=7.0 -BUILDLINK_PKGSRCDIR.xextproto?= ../../x11/xextproto +BUILDLINK_PKGSRCDIR.xextproto?= ../../x11/xextproto .include "../../x11/inputproto/buildlink3.mk" .endif # XEXTPROTO_BUILDLINK3_MK diff --git a/x11/xf86bigfontproto/buildlink3.mk b/x11/xf86bigfontproto/buildlink3.mk index 05f4af6c898..f8ab85b5656 100644 --- a/x11/xf86bigfontproto/buildlink3.mk +++ b/x11/xf86bigfontproto/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2013/04/06 13:46:36 rodent Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:43 rillig Exp $ BUILDLINK_TREE+= xf86bigfontproto @@ -8,7 +8,7 @@ XF86BIGFONTPROTO_BUILDLINK3_MK:= BUILDLINK_DEPMETHOD.xf86bigfontproto?= build BUILDLINK_API_DEPENDS.xf86bigfontproto+= xf86bigfontproto>=1.1 -BUILDLINK_PKGSRCDIR.xf86bigfontproto?= ../../x11/xf86bigfontproto +BUILDLINK_PKGSRCDIR.xf86bigfontproto?= ../../x11/xf86bigfontproto .endif # XF86BIGFONTPROTO_BUILDLINK3_MK BUILDLINK_TREE+= -xf86bigfontproto diff --git a/x11/xf86vidmodeproto/buildlink3.mk b/x11/xf86vidmodeproto/buildlink3.mk index 2015e047e53..5691baed884 100644 --- a/x11/xf86vidmodeproto/buildlink3.mk +++ b/x11/xf86vidmodeproto/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.4 2013/04/06 13:46:36 rodent Exp $ +# $NetBSD: buildlink3.mk,v 1.5 2018/01/07 13:04:43 rillig Exp $ BUILDLINK_TREE+= xf86vidmodeproto @@ -8,7 +8,7 @@ XF86VIDMODEPROTO_BUILDLINK3_MK:= BUILDLINK_DEPMETHOD.xf86vidmodeproto?= build BUILDLINK_API_DEPENDS.xf86vidmodeproto+= xf86vidmodeproto>=2.3 -BUILDLINK_PKGSRCDIR.xf86vidmodeproto?= ../../x11/xf86vidmodeproto +BUILDLINK_PKGSRCDIR.xf86vidmodeproto?= ../../x11/xf86vidmodeproto .include "../../x11/xproto/buildlink3.mk" .endif # XF86VIDMODEPROTO_BUILDLINK3_MK diff --git a/x11/xproxymanagementprotocol/buildlink3.mk b/x11/xproxymanagementprotocol/buildlink3.mk index a539553572c..ac6c7fbc091 100644 --- a/x11/xproxymanagementprotocol/buildlink3.mk +++ b/x11/xproxymanagementprotocol/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.3 2013/04/06 13:46:36 rodent Exp $ +# $NetBSD: buildlink3.mk,v 1.4 2018/01/07 13:04:44 rillig Exp $ BUILDLINK_TREE+= xproxymanagementprotocol @@ -8,7 +8,7 @@ XPROXYMANAGEMENTPROTOCOL_BUILDLINK3_MK:= BUILDLINK_DEPMETHOD.xproxymanagementprotocol?= build BUILDLINK_API_DEPENDS.xproxymanagementprotocol+= xproxymanagementprotocol>=1.0.2 -BUILDLINK_PKGSRCDIR.xproxymanagementprotocol?= ../../x11/xproxymanagementprotocol +BUILDLINK_PKGSRCDIR.xproxymanagementprotocol?= ../../x11/xproxymanagementprotocol .endif # XPROXYMANAGEMENTPROTOCOL_BUILDLINK3_MK BUILDLINK_TREE+= -xproxymanagementprotocol diff --git a/x11/xview-lib/buildlink3.mk b/x11/xview-lib/buildlink3.mk index 4c505b79556..508a1170a9f 100644 --- a/x11/xview-lib/buildlink3.mk +++ b/x11/xview-lib/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.11 2012/05/07 01:54:16 dholland Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2018/01/07 13:04:44 rillig Exp $ BUILDLINK_TREE+= xview-lib @@ -7,7 +7,7 @@ XVIEW_LIB_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.xview-lib+= xview-lib>=3.2.1 BUILDLINK_ABI_DEPENDS.xview-lib+= xview-lib>=3.2.1nb8 -BUILDLINK_PKGSRCDIR.xview-lib?= ../../x11/xview-lib +BUILDLINK_PKGSRCDIR.xview-lib?= ../../x11/xview-lib .include "../../x11/libX11/buildlink3.mk" .endif # XVIEW_LIB_BUILDLINK3_MK |