CVS commit: pkgsrc

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

Module Name:    pkgsrc
Committed By:   rillig
Date:           Sun May 31 16:43:05 UTC 2020

Modified Files:
        pkgsrc/databases/pgadmin3: Makefile
        pkgsrc/x11/wxGTK30: buildlink3.mk

Log Message:
databases/pgadmin3: remove unknown configure option


To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 pkgsrc/databases/pgadmin3/Makefile
cvs rdiff -u -r1.22 -r1.23 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/databases/pgadmin3/Makefile
diff -u pkgsrc/databases/pgadmin3/Makefile:1.70 pkgsrc/databases/pgadmin3/Makefile:1.71
--- pkgsrc/databases/pgadmin3/Makefile:1.70     Tue Mar 10 22:09:32 2020
+++ pkgsrc/databases/pgadmin3/Makefile  Sun May 31 16:43:04 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.70 2020/03/10 22:09:32 wiz Exp $
+# $NetBSD: Makefile,v 1.71 2020/05/31 16:43:04 rillig Exp $
 
 DISTNAME=      pgadmin3-1.22.2
 PKGREVISION=   6
@@ -14,6 +14,8 @@ USE_LANGUAGES=                c99 c++11
 USE_TOOLS+=            echo gmake sed
 GNU_CONFIGURE=         yes
 
+GNU_CONFIGURE_WX_CONFIG=       no
+
 REPLACE_SH=            pgadmin/ver_svn.sh
 
 .include "options.mk"

Index: pkgsrc/x11/wxGTK30/buildlink3.mk
diff -u pkgsrc/x11/wxGTK30/buildlink3.mk:1.22 pkgsrc/x11/wxGTK30/buildlink3.mk:1.23
--- pkgsrc/x11/wxGTK30/buildlink3.mk:1.22       Thu May 21 14:00:51 2020
+++ pkgsrc/x11/wxGTK30/buildlink3.mk    Sun May 31 16:43:04 2020
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.22 2020/05/21 14:00:51 rillig Exp $
+# $NetBSD: buildlink3.mk,v 1.23 2020/05/31 16:43:04 rillig Exp $
 
 BUILDLINK_TREE+=       wxGTK30
 
@@ -14,7 +14,9 @@ PREPEND_PATH+=                        ${PREFIX}/libexec/wx-3.
 .if ${GNU_CONFIGURE_WX_VERSION:Uyes:tl} == yes
 CONFIGURE_ARGS+=               --with-wx-version=3.0
 .endif
+.if ${GNU_CONFIGURE_WX_CONFIG:Uyes:tl} == yes
 CONFIGURE_ARGS+=               --with-wx-config=${PREFIX}/libexec/wx-3.0/wx-config
+.endif
 
 pkgbase := wxGTK30
 .include "../../mk/pkg-build-options.mk"