[pkgsrc/trunk]: pkgsrc/x11/wxGTK30 wxGTK30: allow building on Darwin

[adam <adam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/83015b610b0b
branches:  trunk
changeset: 388751:83015b610b0b
user:      adam <adam%pkgsrc.org@localhost>
date:      Thu Dec 13 21:21:55 2018 +0000

description:
wxGTK30: allow building on Darwin

diffstat:

 x11/wxGTK30/Makefile      |  10 +++++++++-
 x11/wxGTK30/buildlink3.mk |   9 ++++-----
 x11/wxGTK30/options.mk    |  23 +++++++----------------
 3 files changed, 20 insertions(+), 22 deletions(-)

diffs (95 lines):

diff -r 9497d0083714 -r 83015b610b0b x11/wxGTK30/Makefile
--- a/x11/wxGTK30/Makefile      Thu Dec 13 21:20:38 2018 +0000
+++ b/x11/wxGTK30/Makefile      Thu Dec 13 21:21:55 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2018/12/08 10:47:17 bouyer Exp $
+# $NetBSD: Makefile,v 1.32 2018/12/13 21:21:55 adam Exp $
 
 DISTNAME=      wxWidgets-3.0.4
 PKGNAME=       ${DISTNAME:S/wxWidgets/wxGTK30/}
@@ -50,7 +50,15 @@
 SUBST_SED.fix-paths+=          -e 's,@PREFIX@,${PREFIX},g'
 
 .include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "Darwin"
+CONFIGURE_ARGS+=       --with-osx_cocoa
+CONFIGURE_ARGS+=       --without-macosx-sdk
+CONFIGURE_ARGS+=       --without-macosx-version-min
+CPPFLAGS+=             -D__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES=1
+.else
 .include "options.mk"
+.endif
 
 PLIST_SRC+=            ${PLIST_SRC_DFLT}
 
diff -r 9497d0083714 -r 83015b610b0b x11/wxGTK30/buildlink3.mk
--- a/x11/wxGTK30/buildlink3.mk Thu Dec 13 21:20:38 2018 +0000
+++ b/x11/wxGTK30/buildlink3.mk Thu Dec 13 21:21:55 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2018/12/08 10:47:17 bouyer Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2018/12/13 21:21:55 adam Exp $
 
 BUILDLINK_TREE+=       wxGTK30
 
@@ -17,7 +17,6 @@
 pkgbase := wxGTK30
 .include "../../mk/pkg-build-options.mk"
 
-
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
@@ -26,11 +25,11 @@
 .if ${OPSYS} != "Darwin"
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
-.if !empty(PKG_BUILD_OPTIONS.wxGTK30:Mgtk2)
+.  if !empty(PKG_BUILD_OPTIONS.wxGTK30:Mgtk2)
 .include "../../x11/gtk2/buildlink3.mk"
-.else
+.  else
 .include "../../x11/gtk3/buildlink3.mk"
-.endif
+.  endif
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libXxf86vm/buildlink3.mk"
 .endif
diff -r 9497d0083714 -r 83015b610b0b x11/wxGTK30/options.mk
--- a/x11/wxGTK30/options.mk    Thu Dec 13 21:20:38 2018 +0000
+++ b/x11/wxGTK30/options.mk    Thu Dec 13 21:21:55 2018 +0000
@@ -1,27 +1,18 @@
-# $NetBSD: options.mk,v 1.1 2018/12/08 10:47:17 bouyer Exp $
+# $NetBSD: options.mk,v 1.2 2018/12/13 21:21:55 adam Exp $
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.wxGTK30
-.if ${OPSYS} != "Darwin"
-PKG_OPTIONS_REQUIRED_GROUPS= gtk
-PKG_OPTIONS_GROUP.gtk= gtk2 gtk3
-PKG_SUGGESTED_OPTIONS= gtk3
-.endif
+PKG_OPTIONS_VAR=               PKG_OPTIONS.wxGTK30
+PKG_OPTIONS_REQUIRED_GROUPS=   gtk
+PKG_OPTIONS_GROUP.gtk=         gtk2 gtk3
+PKG_SUGGESTED_OPTIONS=         gtk3
 
 .include "../../mk/bsd.options.mk"
 
-.if ${OPSYS} == "Darwin"
-CONFIGURE_ARGS+=       --with-osx_cocoa
-CONFIGURE_ARGS+=       --without-macosx-sdk
-CONFIGURE_ARGS+=       --without-macosx-version-min
-CPPFLAGS+=             -D__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES=1
-.else
-.  if !empty(PKG_OPTIONS:Mgtk2)
+.if !empty(PKG_OPTIONS:Mgtk2)
 PLIST_SRC+=            PLIST.gtk2
 CONFIGURE_ARGS+=       --with-gtk=2
 .include "../../x11/gtk2/buildlink3.mk"
-. else
+.else
 PLIST_SRC+=            PLIST.gtk3
 CONFIGURE_ARGS+=       --with-gtk=3
 .include "../../x11/gtk3/buildlink3.mk"
-. endif
 .endif