diff options
| author | adam <adam@pkgsrc.org> | 2018-12-13 21:21:55 +0000 |
|---|---|---|
| committer | adam <adam@pkgsrc.org> | 2018-12-13 21:21:55 +0000 |
| commit | 9a6e472ecfbdeae8890f5f813619e513a5652f1e (patch) | |
| tree | 4f7994db235f8cd106b6137b088b34ce71cd6992 /x11 | |
| parent | 159fa43c466daa35d86aa12a411174d15736a44b (diff) | |
| download | pkgsrc-9a6e472ecfbdeae8890f5f813619e513a5652f1e.tar.gz | |
wxGTK30: allow building on Darwin
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/wxGTK30/Makefile | 10 | ||||
| -rw-r--r-- | x11/wxGTK30/buildlink3.mk | 9 | ||||
| -rw-r--r-- | x11/wxGTK30/options.mk | 23 |
3 files changed, 20 insertions, 22 deletions
diff --git a/x11/wxGTK30/Makefile b/x11/wxGTK30/Makefile index 6985cb43132..892fdae2949 100644 --- a/x11/wxGTK30/Makefile +++ b/x11/wxGTK30/Makefile @@ -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,/usr/pkg/include,${PREFIX}/include,g' 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 --git a/x11/wxGTK30/buildlink3.mk b/x11/wxGTK30/buildlink3.mk index 14f30d30f93..4852dbeac5f 100644 --- a/x11/wxGTK30/buildlink3.mk +++ b/x11/wxGTK30/buildlink3.mk @@ -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 @@ CONFIGURE_ARGS+= --with-wx-config=${PREFIX}/libexec/wx-3.0/wx-config 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 @@ pkgbase := wxGTK30 .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 --git a/x11/wxGTK30/options.mk b/x11/wxGTK30/options.mk index 09b98bb29dd..d12d3a7feb8 100644 --- a/x11/wxGTK30/options.mk +++ b/x11/wxGTK30/options.mk @@ -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 |