CVS commit: pkgsrc/x11/wxGTK32

["Darrin B. Jewell" <dbj%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   dbj
Date:           Thu Jul 28 07:34:33 UTC 2022

Modified Files:
        pkgsrc/x11/wxGTK32: Makefile

Log Message:
x11/wxGTK32: cosmetic makefile reorg, no functional change


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/wxGTK32/Makefile

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

Modified files:

Index: pkgsrc/x11/wxGTK32/Makefile
diff -u pkgsrc/x11/wxGTK32/Makefile:1.3 pkgsrc/x11/wxGTK32/Makefile:1.4
--- pkgsrc/x11/wxGTK32/Makefile:1.3     Thu Jul 28 05:25:22 2022
+++ pkgsrc/x11/wxGTK32/Makefile Thu Jul 28 07:34:33 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2022/07/28 05:25:22 dbj Exp $
+# $NetBSD: Makefile,v 1.4 2022/07/28 07:34:33 dbj Exp $
 
 DISTNAME=      wxWidgets-3.2.0
 PKGNAME=       ${DISTNAME:S/wxWidgets/wxGTK32/}
@@ -43,19 +43,33 @@ PKG_SUPPORTED_OPTIONS=      cmake
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mcmake)
+
 USE_CMAKE=             yes
-CMAKE_ARGS+=           -DCMAKE_DISABLE_PRECOMPILE_HEADERS:BOOL=ON
-CMAKE_ARGS+=           -DCMAKE_INSTALL_BINDIR:STRING=libexec/wx-3.2
 PLIST_SRC+=            PLIST.cmake
 
+CMAKE_ARGS+=           -DCMAKE_DISABLE_PRECOMPILE_HEADERS:BOOL=ON
+CMAKE_ARGS+=           -DCMAKE_INSTALL_BINDIR:PATH=libexec/wx-3.2
+# https://github.com/wxWidgets/wxWidgets/issues/22646
+CMAKE_ARGS.Linux+=     -DwxUSE_JOYSTICK:BOOL=OFF
+
+SUBST_CLASSES+=                unwrap
+SUBST_STAGE.unwrap=    post-build
+SUBST_MESSAGE.unwrap=  Unwrapping wx-config.
 . if ${OPSYS} != "Darwin"
-WX_CONFIG=             lib/wx/config/gtk3-unicode-3.2
+SUBST_FILES.unwrap=    lib/wx/config/gtk3-unicode-3.2
 . else
-WX_CONFIG=             lib/wx/config/osx_cocoa-unicode-3.2
+SUBST_FILES.unwrap=    lib/wx/config/osx_cocoa-unicode-3.2
 . endif
+SUBST_SED.unwrap=      -e 's,EGREP=.*,EGREP=${EGREP},'
+SUBST_SED.unwrap+=     -e 's,echo.*/${CC}",echo "${CC}",'
+SUBST_SED.unwrap+=     -e 's,echo.*/${CXX}",echo "${CXX}",'
+SUBST_SED.unwrap+=     -e 's,echo.*/${CXX} -o",echo "${CXX} -o",'
+
+.else # empty(PKG_OPTIONS:Mcmake)
 
-.else
 GNU_CONFIGURE=         yes
+PLIST_SRC+=            PLIST.configure
+
 USE_GNU_CONFIGURE_HOST=        no
 CONFIGURE_ARGS+=       --with-libpng=sys
 CONFIGURE_ARGS+=       --with-libjpeg=sys
@@ -75,8 +89,6 @@ CONFIGURE_ARGS.Darwin+=       --without-macosx
 CONFIGURE_ARGS.Darwin+=        --disable-precomp-headers
 CONFIGURE_ARGS.SunOS+= --disable-xlocale
 
-PLIST_SRC+=            PLIST.configure
-
 SUBST_CLASSES+=                        fix-paths
 SUBST_STAGE.fix-paths=         pre-configure
 SUBST_MESSAGE.fix-paths=       Fixing absolute paths.
@@ -93,23 +105,6 @@ post-install:
        ${LN} -sf ../libexec/wx-3.2/wxrc ${DESTDIR}${PREFIX}/bin/wxrc-3.2
        ${LN} -sf ../libexec/wx-3.2/wx-config ${DESTDIR}${PREFIX}/bin/wx-config-3.2
 
-.if defined(USE_CMAKE)
-SUBST_CLASSES+=                unwrap
-SUBST_STAGE.unwrap=    post-build
-SUBST_FILES.unwrap=    ${WX_CONFIG}
-SUBST_SED.unwrap=      -e 's,EGREP=.*,EGREP=${EGREP},'
-SUBST_SED.unwrap+=     -e 's,echo.*/${CC}",echo "${CC}",'
-SUBST_SED.unwrap+=     -e 's,echo.*/${CXX}",echo "${CXX}",'
-SUBST_SED.unwrap+=     -e 's,echo.*/${CXX} -o",echo "${CXX} -o",'
-.endif
-
-.if defined(USE_CMAKE)
-# https://github.com/wxWidgets/wxWidgets/issues/22646
-.if ${OPSYS} != "Linux"
-CMAKE_ARGS+=           -DwxUSE_JOYSTICK:BOOL=OFF
-.endif
-.endif
-
 .if ${OPSYS} != "Darwin"
 .include "../../sysutils/libnotify/buildlink3.mk"
 .include "../../x11/gtk3/buildlink3.mk"