Fix PKGLOCALEDIR changes.

wm/sawfish/Makefile

@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.79 2014/01/05 21:46:55 wiz Exp $
+# $NetBSD: Makefile,v 1.80 2014/01/10 15:19:20 jperkin Exp $
 
 DISTNAME=		sawfish-1.10
 PKGREVISION=		1
@@ -21,9 +21,8 @@ USE_TOOLS+=		gtar:run	# for librep run-time theme extraction
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 
+CONFIGURE_ARGS+=	--localedir=${PREFIX}/${PKGLOCALEDIR}/locale
 CONFIGURE_ARGS+=	--mandir=${PREFIX}/${PKGMANDIR}
-CONFIGURE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR}
-MAKE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR}
 CONFIGURE_ENV+=		REP_ENV_PKGSRC=${REP_ENV_PKGSRC:Q}
 MAKE_ENV+=		REP_ENV_PKGSRC=${REP_ENV_PKGSRC:Q}
 

wm/sawfish/distinfo

@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.21 2014/01/03 05:06:40 ryoon Exp $
+$NetBSD: distinfo,v 1.22 2014/01/10 15:19:20 jperkin Exp $
 
 SHA1 (sawfish-1.10.tar.bz2) = b6d42ddcf8ebab2e192f12cf7d032a660ca0959c
 RMD160 (sawfish-1.10.tar.bz2) = c1ec9bd099b8c1b4b47b757116deecdf851ba3f0
 Size (sawfish-1.10.tar.bz2) = 3900698 bytes
-SHA1 (patch-aa) = 78a125466b8bacf2971a6d8c73b915b8b70a2d7b
+SHA1 (patch-aa) = 4f9326890b0082a8715d37cf9be529c1540c5fd3
 SHA1 (patch-ab) = 21a89c87afa9cb5fdf3b028109b0db9c5991fb1e
 SHA1 (patch-af) = 59269b6ea71be20f086b12c19eaa35a0385a2c84
 SHA1 (patch-themes_Makefile.in) = 6484654d6d1fc9126f989a075b6fbf4b5ffb045d

wm/sawfish/patches/patch-aa

@@ -1,17 +1,19 @@
-$NetBSD: patch-aa,v 1.11 2011/01/31 15:39:12 tnn Exp $
+$NetBSD: patch-aa,v 1.12 2014/01/10 15:19:20 jperkin Exp $
 
---- configure.orig	2010-12-10 20:04:17.000000000 +0000
+Fix PKGLOCALEDIR
+
+--- configure.orig	2013-09-25 18:50:23.000000000 +0000
 +++ configure
-@@ -863,7 +863,7 @@ dvidir='${docdir}'
- pdfdir='${docdir}'
- psdir='${docdir}'
- libdir='${exec_prefix}/lib'
--localedir='${datarootdir}/locale'
-+localedir='${prefix}/${PKGLOCALEDIR}/locale'
- mandir='${datarootdir}/man'
+@@ -10858,7 +10858,7 @@ SUBDIRS="src lisp scripts themes sounds
  
- ac_prev=
-@@ -12778,12 +12778,12 @@ fi
+ sawfishdir='${datadir}/sawfish'
+ lispdir='${sawfishdir}/lisp'
+-localedir='${datadir}/locale'
++#localedir='${datadir}/locale'
+ sawfishexecdir='${libdir}/sawfish'
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
+@@ -13525,12 +13525,12 @@ fi
  
  KDE4_SESSION="$with_kde4session"