From 9b7c2306af62d52407a0ff76b9756ebe73a2ff2f Mon Sep 17 00:00:00 2001
From: veego <veego>
Date: Sun, 14 Aug 2005 18:10:08 +0000
Subject: - Patch from Thomas Klausner to not install the local files, which
 would   conflict with the wxGTK package - The package removes the old
 wx-config prior before creating the link to   the real wx24-config,
 unfortunally it tried to remove wx-config instead   of wx24-config. wx-config
 is now used by the new wxGTK (v2.6) package. Bump the PKGREVISION.

---
 x11/wxGTK24/Makefile         |  4 ++--
 x11/wxGTK24/distinfo         |  4 ++--
 x11/wxGTK24/patches/patch-ab | 13 +++++++++++--
 3 files changed, 15 insertions(+), 6 deletions(-)

(limited to 'x11')

diff --git a/x11/wxGTK24/Makefile b/x11/wxGTK24/Makefile
index 20d1b23947b..254d3af36d6 100644
--- a/x11/wxGTK24/Makefile
+++ b/x11/wxGTK24/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/08/07 11:27:28 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2005/08/14 18:10:08 veego Exp $
 #
 
 .include "Makefile.common"
 
-PKGREVISION=		6
+PKGREVISION=		7
 COMMENT=		GTK-based implementation of the wxWidgets GUI library
 CONFLICTS+=		wxGTK<=2.4.2nb5
 
diff --git a/x11/wxGTK24/distinfo b/x11/wxGTK24/distinfo
index 978b78f58ca..1c9ecf7c901 100644
--- a/x11/wxGTK24/distinfo
+++ b/x11/wxGTK24/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/08/07 11:27:29 wiz Exp $
+$NetBSD: distinfo,v 1.2 2005/08/14 18:10:08 veego Exp $
 
 SHA1 (wxGTK-2.4.2.tar.bz2) = 3f1ebacaaf8eb5510c14ee10bafbc5f225be842c
 RMD160 (wxGTK-2.4.2.tar.bz2) = 8076d1ba31c9b23becb241cbad5a83763fee776e
 Size (wxGTK-2.4.2.tar.bz2) = 5381935 bytes
 SHA1 (patch-aa) = 82b31569686773cbdc2200417bed6a376fb12b29
-SHA1 (patch-ab) = dc6cfdc5e21186cfed240e27768ea2c4a6906152
+SHA1 (patch-ab) = bab52051778a93439cfd3144f052bdbcc7024e30
 SHA1 (patch-ac) = 06a047a28260d30516b87d85a4dd4d5a6c18cfc4
 SHA1 (patch-ad) = 809a12f89b018373910b31442dfd315276cafbdf
 SHA1 (patch-ae) = 81c2e33fbdd4a715da5a14ef3ae0a377d0d9aec2
diff --git a/x11/wxGTK24/patches/patch-ab b/x11/wxGTK24/patches/patch-ab
index 216a5ce1991..d2ef0cd5834 100644
--- a/x11/wxGTK24/patches/patch-ab
+++ b/x11/wxGTK24/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1.1.1 2005/08/07 11:27:29 wiz Exp $
+$NetBSD: patch-ab,v 1.2 2005/08/14 18:10:08 veego Exp $
 
 --- Makefile.in.orig	2003-09-21 13:31:27.000000000 +0200
 +++ Makefile.in
@@ -60,6 +60,15 @@ $NetBSD: patch-ab,v 1.1.1.1 2005/08/07 11:27:29 wiz Exp $
  REGEXDIR = $(WXDIR)/src/regex
  GTKDIR   = $(WXDIR)/src/gtk
  X11DIR   = $(WXDIR)/src/x11
+@@ -139,7 +132,7 @@ DISTDIR=./_dist_dir/$(DISTDIRNAME)
+ 
+ ############################## Files ##################################
+ 
+-WX_LINGUAS = `cd $(top_srcdir)/locale && ls *.mo 2> /dev/null | sed -n 's/\.mo//p'`
++WX_LINGUAS =
+ 
+ # this line will include a file which defines ALL_SOURCES, ALL_OBJECTS,
+ # ALL_DEPFILES and ALL_HEADERS variables with the complete list of .cpp, .o,
 @@ -161,124 +154,6 @@ REGEXOBJS = \
  		regerror.o \
  		regfree.o
@@ -296,7 +305,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2005/08/07 11:27:29 wiz Exp $
  	$(INSTALL_SCRIPT) $(top_builddir)/wx@TOOLCHAIN_NAME@-config $(bindir)/wx@TOOLCHAIN_NAME@-config
 -	cd $(bindir) && rm -f wx-config && $(LN_S) wx@TOOLCHAIN_NAME@-config wx-config
 -	@INSTALL_LIBRARY@ $(build_libdir)/@WX_TARGET_LIBRARY@ $(libdir)/@WX_TARGET_LIBRARY@
-+	cd $(bindir) && rm -f wx-config && $(LN_S) wx@TOOLCHAIN_NAME@-config wx24-config
++	cd $(bindir) && rm -f wx24-config && $(LN_S) wx@TOOLCHAIN_NAME@-config wx24-config
 +	${LIBTOOL} --mode=install ${INSTALL_DATA} $(build_libdir)/lib@WX_LIBRARY_BASENAME@.la $(libdir)
  	@if test "x@WX_LIBRARY_IMPORTLIB@" != "x"; then \
  		$(INSTALL_PROGRAM) $(top_builddir)/lib/@WX_LIBRARY_IMPORTLIB@ $(libdir)/@WX_LIBRARY_IMPORTLIB@; fi
-- 
cgit v1.2.3