Make sure we follow PKGLOCALEDIR when installing the locale files. Fixes

install on solaris.  Bump PKGREVISION.

4 files changed, 23 insertions, 16 deletions

diff --git a/x11/wxGTK/Makefile b/x11/wxGTK/Makefile
index 89595430617..a48797b18d5 100644
--- a/x11/wxGTK/Makefile
+++ b/x11/wxGTK/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.43 2005/08/07 11:26:17 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2005/08/11 00:47:23 dmcmahill Exp $
 #
 
 .include "Makefile.common"
 
+PKGREVISION=	1
 COMMENT=		GTK-based implementation of the wxWidgets GUI library
 
 post-install:
diff --git a/x11/wxGTK/Makefile.common b/x11/wxGTK/Makefile.common
index 53c5f5b673b..2e7f367b04e 100644
--- a/x11/wxGTK/Makefile.common
+++ b/x11/wxGTK/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2005/08/10 20:56:30 jlam Exp $
+# $NetBSD: Makefile.common,v 1.4 2005/08/11 00:47:23 dmcmahill Exp $
 #
 
 DISTNAME=		wxGTK-2.6.1
@@ -24,6 +24,7 @@ CONFIGURE_ARGS+=	--with-libtiff=sys
 CONFIGURE_ARGS+=	--with-opengl
 CONFIGURE_ARGS+=	--with-zlib=sys
 CONFIGURE_ENV+=		BUILDLINK_DIR=${BUILDLINK_DIR}
+MAKE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR}
 
 CPPFLAGS+=		-Dunix=1	# src/common/unzip.c needs this
 
diff --git a/x11/wxGTK/distinfo b/x11/wxGTK/distinfo
index 5b113331833..93b402085c5 100644
--- a/x11/wxGTK/distinfo
+++ b/x11/wxGTK/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.20 2005/08/07 11:26:17 wiz Exp $
+$NetBSD: distinfo,v 1.21 2005/08/11 00:47:23 dmcmahill Exp $
 
 SHA1 (wxGTK-2.6.1.tar.bz2) = 49142a4b827a4c8187eb60c76c85355f50058e8e
 RMD160 (wxGTK-2.6.1.tar.bz2) = 66f4a499b69dcffec7579472d238b637b986e7cd
 Size (wxGTK-2.6.1.tar.bz2) = 7205374 bytes
 SHA1 (patch-aa) = 884ab5b352119a37b2611e0538bf10914530a5d5
-SHA1 (patch-ab) = c7f91bffe1f5ac0a1d077f9625c61ad4c1c691bd
+SHA1 (patch-ab) = d39eaa09e91ac3da1b8b1b59f0fae6a42b31f2e4
 SHA1 (patch-ah) = c384584623b63004f59b4755ef32156f3d5687a0
diff --git a/x11/wxGTK/patches/patch-ab b/x11/wxGTK/patches/patch-ab
index 52f7b237bbd..0c22f665907 100644
--- a/x11/wxGTK/patches/patch-ab
+++ b/x11/wxGTK/patches/patch-ab
@@ -1,9 +1,6 @@
-$NetBSD: patch-ab,v 1.12 2005/08/07 11:26:17 wiz Exp $
-
---- Makefile.in.orig	2005-06-02 18:03:05.000000000 +0200
-+++ Makefile.in
-@@ -23,7 +23,9 @@ PIC_FLAG = @PIC_FLAG@
- SONAME_FLAG = @SONAME_FLAG@
+--- Makefile.in.orig	2005-06-02 12:03:05.000000000 -0400
++++ Makefile.in	2005-08-10 15:28:16.561533000 -0400
+@@ -24,5 +24,7 @@
  STRIP = @STRIP@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
 +INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -11,18 +8,14 @@ $NetBSD: patch-ab,v 1.12 2005/08/07 11:26:17 wiz Exp $
 +INSTALL_DATA_DIR = @INSTALL_DATA_DIR@
  INSTALL_DIR = @INSTALL_DIR@
  srcdir = @srcdir@
- top_srcdir = @top_srcdir@
-@@ -1180,7 +1182,7 @@ LOCALE_LINGUAS = ca cs da de el es fi fr
- @COND_DEPS_TRACKING_1@CCC = $(top_builddir)./bk-deps $(CC)
+@@ -1181,5 +1183,5 @@
  @COND_DEPS_TRACKING_0@CXXC = $(CXX)
  @COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
 -@COND_USE_PLUGINS_0@PLUGIN_ADV_EXTRALIBS = $(EXTRALIBS_SDL)
 +@COND_USE_PLUGINS_0@PLUGIN_ADV_EXTRALIBS = $(EXTRALIBS_SDL) $(LIBOSSAUDIO)
  @COND_USE_GUI_0@PORTNAME = base
  @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
- @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
-@@ -9673,7 +9675,7 @@ samples: 
- install-wxconfig: 
+@@ -9674,14 +9676,14 @@
  	$(INSTALL_DIR) $(DESTDIR)$(bindir)
  	$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config
 -	$(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config
@@ -30,3 +23,15 @@ $NetBSD: patch-ab,v 1.12 2005/08/07 11:26:17 wiz Exp $
  	(cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
  
  locale_install: 
+-	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
++	$(INSTALL_DIR) $(DESTDIR)$(prefix)/${PKGLOCALEDIR}/locale
+ 	for l in $(LOCALE_LINGUAS) ; do \
+-	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \
+-	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \
++	$(INSTALL_DIR) $(DESTDIR)$(prefix)/${PKGLOCALEDIR}/locale/$$l ; \
++	$(INSTALL_DIR) $(DESTDIR)$(prefix)/${PKGLOCALEDIR}/locale/$$l/LC_MESSAGES ; \
+ 	if test -f $(srcdir)/locale/$$l.mo ; then \
+-	$(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd.mo ; \
++	$(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(prefix)/${PKGLOCALEDIR}/locale/$$l/LC_MESSAGES/wxstd.mo ; \
+ 	fi ; \
+ 	done