CVS commit: pkgsrc

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Thu May 21 14:00:51 UTC 2020

Modified Files:
        pkgsrc/games/asc: Makefile
        pkgsrc/x11/wxGTK30: buildlink3.mk

Log Message:
games/asc: remove unknown configure option --with-wx-version

This is needed to build the package with GNU_CONFIGURE_STRICT=yes.


To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 pkgsrc/games/asc/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/x11/wxGTK30/buildlink3.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/games/asc/Makefile
diff -u pkgsrc/games/asc/Makefile:1.70 pkgsrc/games/asc/Makefile:1.71
--- pkgsrc/games/asc/Makefile:1.70      Wed May  6 14:04:31 2020
+++ pkgsrc/games/asc/Makefile   Thu May 21 14:00:51 2020
@@ -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
 

Index: pkgsrc/x11/wxGTK30/buildlink3.mk
diff -u pkgsrc/x11/wxGTK30/buildlink3.mk:1.21 pkgsrc/x11/wxGTK30/buildlink3.mk:1.22
--- pkgsrc/x11/wxGTK30/buildlink3.mk:1.21       Tue Mar 10 22:09:17 2020
+++ pkgsrc/x11/wxGTK30/buildlink3.mk    Thu May 21 14:00:51 2020
@@ -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/
 
 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