wxGTK31: remove incomplete gtk2 support

[Thomas Klausner <tk%giga.or.at@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <tk%giga.or.at@localhost>
Pushed By:	wiz
Date:		Fri Apr 2 12:01:29 2021 +0200
Changeset:	25aeebc69cd49658c5484f655d2cd6f93fa82230

Modified Files:
	Makefile
	wxGTK31/Makefile
	wxGTK31/buildlink3.mk
	wxGTK31/distinfo
	wxGTK31/patches/patch-configure
Removed Files:
	wxGTK31/options.mk

Log Message:
wxGTK31: remove incomplete gtk2 support

remove cargo-culto includes

Fix pkglint warnings.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=25aeebc69cd49658c5484f655d2cd6f93fa82230

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

diffstat:
 Makefile                        |  1 -
 wxGTK31/Makefile                | 15 +++++----------
 wxGTK31/buildlink3.mk           |  8 --------
 wxGTK31/distinfo                |  2 +-
 wxGTK31/options.mk              | 18 ------------------
 wxGTK31/patches/patch-configure |  6 +++---
 6 files changed, 9 insertions(+), 41 deletions(-)

diffs:
diff --git a/Makefile b/Makefile
index 441c14cde2..fe62146bdd 100644
--- a/Makefile
+++ b/Makefile
@@ -1160,7 +1160,6 @@ SUBDIR+=	gnomebaker
 SUBDIR+=	gnomeradio
 SUBDIR+=	gnormalize
 SUBDIR+=	gnubg-cvs
-SUBDIR+=	gnucash
 SUBDIR+=	gnujump
 SUBDIR+=	gnump3d
 SUBDIR+=	gnunet
diff --git a/wxGTK31/Makefile b/wxGTK31/Makefile
index 0ed1dd2ae7..ad9a8730df 100644
--- a/wxGTK31/Makefile
+++ b/wxGTK31/Makefile
@@ -50,17 +50,19 @@ SUBST_VARS.fix-paths=		PREFIX
 
 .include "../../mk/bsd.prefs.mk"
 
+PLIST_SRC+=		${PLIST_SRC_DFLT}
+
 .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"
+CONFIGURE_ARGS+=	--with-gtk=3
+PLIST_SRC+=		PLIST.gtk3
+.include "../../x11/gtk3/buildlink3.mk"
 .endif
 
-PLIST_SRC+=		${PLIST_SRC_DFLT}
-
 CONFIGURE_ARGS.SunOS+=	--disable-xlocale
 
 post-configure:
@@ -97,11 +99,4 @@ post-install:
 .include "../../multimedia/gstreamer1/buildlink3.mk"
 .include "../../multimedia/gst-plugins1-base/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
-.if ${OPSYS} != "Darwin"
-.include "../../graphics/MesaLib/buildlink3.mk"
-.include "../../graphics/cairo/buildlink3.mk"
-.include "../../graphics/glu/buildlink3.mk"
-.include "../../x11/libSM/buildlink3.mk"
-.include "../../x11/libXxf86vm/buildlink3.mk"
-.endif
 .include "../../mk/bsd.pkg.mk"
diff --git a/wxGTK31/buildlink3.mk b/wxGTK31/buildlink3.mk
index 2255a4c9c6..d34013368d 100644
--- a/wxGTK31/buildlink3.mk
+++ b/wxGTK31/buildlink3.mk
@@ -23,15 +23,7 @@ pkgbase := wxGTK31
 .include "../../graphics/png/buildlink3.mk"
 .include "../../graphics/tiff/buildlink3.mk"
 .if ${OPSYS} != "Darwin"
-.include "../../graphics/MesaLib/buildlink3.mk"
-.include "../../graphics/glu/buildlink3.mk"
-.  if !empty(PKG_BUILD_OPTIONS.wxGTK31:Mgtk2)
-.include "../../x11/gtk2/buildlink3.mk"
-.  else
 .include "../../x11/gtk3/buildlink3.mk"
-.  endif
-.include "../../x11/libSM/buildlink3.mk"
-.include "../../x11/libXxf86vm/buildlink3.mk"
 .endif
 .endif # WXGTK31_BUILDLINK3_MK
 
diff --git a/wxGTK31/distinfo b/wxGTK31/distinfo
index 492e836938..e243ea036b 100644
--- a/wxGTK31/distinfo
+++ b/wxGTK31/distinfo
@@ -4,5 +4,5 @@ SHA1 (wxWidgets-3.1.4.tar.bz2) = f8c77e6336b5f6414b07e27baa489fb8abc620c4
 RMD160 (wxWidgets-3.1.4.tar.bz2) = 3e53350433b2b31b1f0bed683c165be9f8857383
 SHA512 (wxWidgets-3.1.4.tar.bz2) = aabb257fa222eb819f1e16086977b0ecfd3eb3406d695e0e642ffdb8b4dc586a9721404916be4756a2d92a1a8dc41b661b54717a64e03850a8a92d32d45ece14
 Size (wxWidgets-3.1.4.tar.bz2) = 21581661 bytes
-SHA1 (patch-configure) = 840b0698a98d34fd4563b982a19eec93220776cb
+SHA1 (patch-configure) = 0c287f8d0f24c62bbb0efae300043dd83a156fce
 SHA1 (patch-configure.in) = 9f01c9d0478ffbd399f5765de9cc1d4115085201
diff --git a/wxGTK31/options.mk b/wxGTK31/options.mk
deleted file mode 100644
index 9a9f5d3f51..0000000000
--- a/wxGTK31/options.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: options.mk,v 1.2 2018/12/13 21:21:55 adam Exp $
-
-PKG_OPTIONS_VAR=		PKG_OPTIONS.wxGTK31
-PKG_OPTIONS_REQUIRED_GROUPS=	gtk
-PKG_OPTIONS_GROUP.gtk=		gtk2 gtk3
-PKG_SUGGESTED_OPTIONS=		gtk3
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mgtk2)
-PLIST_SRC+=		PLIST.gtk2
-CONFIGURE_ARGS+=	--with-gtk=2
-.include "../../x11/gtk2/buildlink3.mk"
-.else
-PLIST_SRC+=		PLIST.gtk3
-CONFIGURE_ARGS+=	--with-gtk=3
-.include "../../x11/gtk3/buildlink3.mk"
-.endif
diff --git a/wxGTK31/patches/patch-configure b/wxGTK31/patches/patch-configure
index a85c3bb6f4..f30e6f0853 100644
--- a/wxGTK31/patches/patch-configure
+++ b/wxGTK31/patches/patch-configure
@@ -1,11 +1,11 @@
-$NetBSD: patch-configure,v 1.6 2020/03/18 14:11:37 gdt Exp $
+$NetBSD$
 
 Fix shell script portability
 tweak SEARCH_LIB
 
---- configure.orig	2014-06-14 21:48:48.000000000 +0000
+--- configure.orig	2020-07-22 17:20:06.000000000 +0000
 +++ configure
-@@ -40007,7 +40011,8 @@ EOF
+@@ -39240,7 +39240,8 @@ fi
        *-*-solaris2* )
          SONAME_FLAG="-h "
          USE_SOVERSION=1