Use ${PKGLOCALEDIR} for location of installed locale files.

5 files changed, 46 insertions, 34 deletions

diff --git a/graphics/gqview/Makefile b/graphics/gqview/Makefile
index b4c556fcb3a..f284e615fd8 100644
--- a/graphics/gqview/Makefile
+++ b/graphics/gqview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2001/03/01 14:35:07 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2001/03/04 09:12:06 jlam Exp $
 #
 
 DISTNAME=	gqview-0.10.1
@@ -17,10 +17,13 @@ USE_LIBINTL=	yes
 USE_X11BASE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	ac_cv_path_GNOME_CONFIG=no
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}"
+CONFIGURE_ENV+=	CFLAGS="${CFLAGS}"
+CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}"
+CONFIGURE_ENV+=	PKGLOCALEDIR="${PKGLOCALEDIR}"
 
 # for libpng recognition
-CFLAGS+=	"-I${LOCALBASE}/include"
-CPPFLAGS+=	"-I${LOCALBASE}/include"
+EVAL_PREFIX+=	PNGDIR=png
+CFLAGS+=	-I${PNGDIR}/include
+CPPFLAGS+=	-I${PNGDIR}/include
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gqview/files/patch-sum b/graphics/gqview/files/patch-sum
index d648d915712..cf65d8a307a 100644
--- a/graphics/gqview/files/patch-sum
+++ b/graphics/gqview/files/patch-sum
@@ -1,3 +1,3 @@
-$NetBSD: patch-sum,v 1.6 2001/02/16 13:19:22 wiz Exp $
+$NetBSD: patch-sum,v 1.7 2001/03/04 09:12:07 jlam Exp $
 
-MD5 (patch-ac) = a161888ca59546a7ec368da022090850
+MD5 (patch-aa) = 74c65eca3ecef6cf3d2466bd47fdf184
diff --git a/graphics/gqview/patches/patch-aa b/graphics/gqview/patches/patch-aa
new file mode 100644
index 00000000000..b73526fd57f
--- /dev/null
+++ b/graphics/gqview/patches/patch-aa
@@ -0,0 +1,22 @@
+$NetBSD: patch-aa,v 1.7 2001/03/04 09:12:07 jlam Exp $
+
+--- configure.orig	Mon Feb 26 15:35:33 2001
++++ configure
+@@ -2168,7 +2168,6 @@
+   FALSE_FALSE=
+ fi
+ 
+-localedir='${prefix}/share/locale'
+ 
+ 
+ ALL_LINGUAS="de es fr hu it ja pl pt_BR ru sk sl tr zh_CN.GB2312 zh_TW.Big5"
+@@ -3999,6 +3998,9 @@
+ 	< $srcdir/po/POTFILES.in > po/POTFILES
+   
+ 
++# Use ${PKGLOCALEDIR} for the location of installed locale files.
++DATADIRNAME="${PKGLOCALEDIR}"
++localedir='${prefix}/share/locale'
+ 
+ 
+ 
diff --git a/graphics/gqview/patches/patch-ac b/graphics/gqview/patches/patch-ac
deleted file mode 100644
index 32f1faf2df6..00000000000
--- a/graphics/gqview/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2000/11/29 20:01:04 wiz Exp $
-
---- po/Makefile.in.in.orig	Sun Sep 10 15:46:38 2000
-+++ po/Makefile.in.in
-@@ -19,7 +19,7 @@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
- datadir = $(prefix)/@DATADIRNAME@
--localedir = $(datadir)/locale
-+localedir = @localedir@
- gnulocaledir = $(prefix)/share/locale
- gettextsrcdir = $(prefix)/share/gettext/po
- subdir = po
diff --git a/graphics/gqview/pkg/PLIST b/graphics/gqview/pkg/PLIST
index 0d3a0edac2a..0fbe698fac0 100644
--- a/graphics/gqview/pkg/PLIST
+++ b/graphics/gqview/pkg/PLIST
@@ -1,17 +1,17 @@
-@comment $NetBSD: PLIST,v 1.6 2001/03/01 14:35:07 wiz Exp $
+@comment $NetBSD: PLIST,v 1.7 2001/03/04 09:12:08 jlam Exp $
 bin/gqview
 man/man1/gqview.1
-share/locale/de/LC_MESSAGES/gqview.mo
-share/locale/es/LC_MESSAGES/gqview.mo
-share/locale/fr/LC_MESSAGES/gqview.mo
-share/locale/hu/LC_MESSAGES/gqview.mo
-share/locale/it/LC_MESSAGES/gqview.mo
-share/locale/ja/LC_MESSAGES/gqview.mo
-share/locale/pt_BR/LC_MESSAGES/gqview.mo
-share/locale/pl/LC_MESSAGES/gqview.mo
-share/locale/ru/LC_MESSAGES/gqview.mo
-share/locale/sk/LC_MESSAGES/gqview.mo
-share/locale/sl/LC_MESSAGES/gqview.mo
-share/locale/tr/LC_MESSAGES/gqview.mo
-share/locale/zh_CN.GB2312/LC_MESSAGES/gqview.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/gqview.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gqview.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gqview.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gqview.mo
+${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/gqview.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gqview.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gqview.mo
+${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/gqview.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gqview.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gqview.mo
+${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/gqview.mo
+${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/gqview.mo
+${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gqview.mo
+${PKGLOCALEDIR}/locale/zh_CN.GB2312/LC_MESSAGES/gqview.mo
+${PKGLOCALEDIR}/locale/zh_TW.Big5/LC_MESSAGES/gqview.mo