diff options
| author | rillig <rillig@pkgsrc.org> | 2020-05-21 14:00:51 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2020-05-21 14:00:51 +0000 |
| commit | cf581c540b2190c4a494020017aa8f540e5f83e1 (patch) | |
| tree | fd162e3b8a7b99115d5a639db09eac4a6a166a89 | |
| parent | df1a74bfe871c63a818d17a22247b4ae8cf75389 (diff) | |
| download | pkgsrc-cf581c540b2190c4a494020017aa8f540e5f83e1.tar.gz | |
games/asc: remove unknown configure option --with-wx-version
This is needed to build the package with GNU_CONFIGURE_STRICT=yes.
| -rw-r--r-- | games/asc/Makefile | 4 | ||||
| -rw-r--r-- | x11/wxGTK30/buildlink3.mk | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/games/asc/Makefile b/games/asc/Makefile index a7b458236fc..d688bc8a93e 100644 --- a/games/asc/Makefile +++ b/games/asc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.70 2020/05/06 14:04:31 adam Exp $ +# $NetBSD: Makefile,v 1.71 2020/05/21 14:00:51 rillig Exp $ DISTNAME= asc-2.6.1.0 PKGREVISION= 5 @@ -49,6 +49,8 @@ CONFIGURE_ARGS+= --disable-oggtest CONFIGURE_ARGS+= --disable-vorbistest CONFIGURE_ARGS+= --disable-ft2test +GNU_CONFIGURE_WX_VERSION= no + INSTALLATION_DIRS+= share/applications INSTALLATION_DIRS+= share/pixmaps diff --git a/x11/wxGTK30/buildlink3.mk b/x11/wxGTK30/buildlink3.mk index 910cc81d96d..fd73c3bb2c4 100644 --- a/x11/wxGTK30/buildlink3.mk +++ b/x11/wxGTK30/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.21 2020/03/10 22:09:17 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.22 2020/05/21 14:00:51 rillig Exp $ BUILDLINK_TREE+= wxGTK30 @@ -11,7 +11,9 @@ BUILDLINK_PKGSRCDIR.wxGTK30?= ../../x11/wxGTK30 BUILDLINK_INCDIRS.wxGTK30+= include/wx-3.0 PREPEND_PATH+= ${PREFIX}/libexec/wx-3.0 +.if ${GNU_CONFIGURE_WX_VERSION:Uyes:tl} == yes CONFIGURE_ARGS+= --with-wx-version=3.0 +.endif CONFIGURE_ARGS+= --with-wx-config=${PREFIX}/libexec/wx-3.0/wx-config pkgbase := wxGTK30 |