USE_PKGLOCALEDIR, remove unnecessary patch, delint.

9 files changed, 59 insertions, 69 deletions

diff --git a/chat/centericq/Makefile b/chat/centericq/Makefile
index 87fe99a8167..f3bef4a67cd 100644
--- a/chat/centericq/Makefile
+++ b/chat/centericq/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2002/09/29 06:20:23 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2002/11/30 12:41:05 salo Exp $
 #
 
 DISTNAME=	centericq-4.6.5
@@ -9,10 +9,11 @@ MAINTAINER=	hubertf@netbsd.org
 HOMEPAGE=	http://konst.org.ua/eng/software/centericq/info.html
 COMMENT=	Instant Messenger interface (ICQ2000, Yahoo!, and MSN support)
 
-USE_BUILDLINK2=	yes
-USE_NCURSES=	yes
-USE_CXX=	yes
-GNU_CONFIGURE=	yes
+USE_BUILDLINK2=		yes
+USE_PKGLOCALEDIR=	yes
+USE_NCURSES=		yes
+USE_CXX=		yes
+GNU_CONFIGURE=		yes
 LIBS=		${LDFLAGS}
 
 .include "../../devel/gettext-lib/buildlink2.mk"
@@ -26,4 +27,3 @@ LIBS=		${LDFLAGS}
 # avoid toolchain bugs
 CFLAGS:=	${CFLAGS:C/-O[0-9]*//g}
 .endif
-
diff --git a/chat/centericq/PLIST b/chat/centericq/PLIST
index 9fcbdf4ff6a..136c1d87fe9 100644
--- a/chat/centericq/PLIST
+++ b/chat/centericq/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/03/10 11:01:59 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/11/30 12:41:05 salo Exp $
 bin/centericq
 bin/cicqconv
 bin/cicqsync
@@ -13,17 +13,17 @@ share/centericq/msg.wav
 share/centericq/online.wav
 share/centericq/sms.wav
 share/centericq/url.wav
-share/locale/cs/LC_MESSAGES/centericq.mo
-share/locale/de/LC_MESSAGES/centericq.mo
-share/locale/es/LC_MESSAGES/centericq.mo
-share/locale/hu/LC_MESSAGES/centericq.mo
-share/locale/it/LC_MESSAGES/centericq.mo
-share/locale/nl/LC_MESSAGES/centericq.mo
-share/locale/pl/LC_MESSAGES/centericq.mo
-share/locale/pt_BR/LC_MESSAGES/centericq.mo
-share/locale/ro/LC_MESSAGES/centericq.mo
-share/locale/ru/LC_MESSAGES/centericq.mo
-share/locale/zh_TW.Big5/LC_MESSAGES/centericq.mo
+${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/centericq.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/centericq.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/centericq.mo
+${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/centericq.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/centericq.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/centericq.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/centericq.mo
+${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/centericq.mo
+${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/centericq.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/centericq.mo
+${PKGLOCALEDIR}/locale/zh_TW.Big5/LC_MESSAGES/centericq.mo
 @dirrm share/centericq/contrib/spanish
 @dirrm share/centericq/contrib
 @dirrm share/centericq
diff --git a/chat/gabber/Makefile b/chat/gabber/Makefile
index 434208e7434..b8113a7a2df 100644
--- a/chat/gabber/Makefile
+++ b/chat/gabber/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2002/09/29 03:29:47 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2002/11/30 12:41:06 salo Exp $
 
 DISTNAME=	gabber-0.8.7
 PKGREVISION=	2
@@ -10,6 +10,7 @@ HOMEPAGE=	http://gabber.sourceforge.net/
 COMMENT=	Gnome Jabber Client
 
 USE_BUILDLINK2=		YES
+USE_PKGLOCALEDIR=	YES
 USE_GMAKE=		YES
 USE_X11BASE=		YES
 USE_LIBTOOL=		YES
diff --git a/chat/gaim/Makefile.common b/chat/gaim/Makefile.common
index 36a999aaaad..3f6a8bfbd1c 100644
--- a/chat/gaim/Makefile.common
+++ b/chat/gaim/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2002/11/14 21:33:49 mycroft Exp $
+# $NetBSD: Makefile.common,v 1.8 2002/11/30 12:41:06 salo Exp $
 #
 
 DISTNAME=	gaim-0.59.6
@@ -18,6 +18,7 @@ PLIST_SRC=      ${.CURDIR}/../gaim/PLIST.common
 
 USE_GMAKE=		YES
 USE_X11BASE=		YES
+USE_PKGLOCALEDIR=	YES
 
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
diff --git a/chat/gnomeicu/Makefile b/chat/gnomeicu/Makefile
index 33740c8e64b..1876b3bd5f9 100644
--- a/chat/gnomeicu/Makefile
+++ b/chat/gnomeicu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2002/11/01 16:34:35 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2002/11/30 12:41:07 salo Exp $
 
 DISTNAME=	gnomeicu-0.96
 PKGREVISION=	3
@@ -10,10 +10,11 @@ MAINTAINER=	tron@netbsd.org
 HOMEPAGE=	http://gnomeicu.sourceforge.net/
 COMMENT=	GNOME ICQ client
 
-USE_BUILDLINK2=	YES
-GNU_CONFIGURE=	YES
-USE_X11BASE=	YES
-USE_GMAKE=	YES
+USE_BUILDLINK2=		YES
+USE_PKGLOCALEDIR=	YES
+GNU_CONFIGURE=		YES
+USE_X11BASE=		YES
+USE_GMAKE=		YES
 
 LIBS+=		-liconv
 
diff --git a/chat/gnomeicu/PLIST b/chat/gnomeicu/PLIST
index c74a5b28247..4d90da68c85 100644
--- a/chat/gnomeicu/PLIST
+++ b/chat/gnomeicu/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/07/19 04:54:23 mycroft Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/11/30 12:41:07 salo Exp $
 bin/gnomeicu
 bin/gnomeicu-client
 etc/CORBA/servers/GnomeICU.gnorba
@@ -85,31 +85,31 @@ share/gnomeicu/icons/reDubbed/gnomeicu-online.png
 share/gnomeicu/icons/reDubbed/gnomeicu-rename.png
 share/gnomeicu/icons/reDubbed/gnomeicu-still.png
 share/gnomeicu/icons/reDubbed/gnomeicu-url.png
-share/locale/ca/LC_MESSAGES/gnomeicu.mo
-share/locale/da/LC_MESSAGES/gnomeicu.mo
-share/locale/de/LC_MESSAGES/gnomeicu.mo
-share/locale/el/LC_MESSAGES/gnomeicu.mo
-share/locale/es/LC_MESSAGES/gnomeicu.mo
-share/locale/fi/LC_MESSAGES/gnomeicu.mo
-share/locale/fr/LC_MESSAGES/gnomeicu.mo
-share/locale/ga/LC_MESSAGES/gnomeicu.mo
-share/locale/gl/LC_MESSAGES/gnomeicu.mo
-share/locale/hu/LC_MESSAGES/gnomeicu.mo
-share/locale/it/LC_MESSAGES/gnomeicu.mo
-share/locale/ja/LC_MESSAGES/gnomeicu.mo
-share/locale/ko/LC_MESSAGES/gnomeicu.mo
-share/locale/lt/LC_MESSAGES/gnomeicu.mo
-share/locale/nl/LC_MESSAGES/gnomeicu.mo
-share/locale/no/LC_MESSAGES/gnomeicu.mo
-share/locale/pl/LC_MESSAGES/gnomeicu.mo
-share/locale/pt/LC_MESSAGES/gnomeicu.mo
-share/locale/pt_BR/LC_MESSAGES/gnomeicu.mo
-share/locale/ro/LC_MESSAGES/gnomeicu.mo
-share/locale/ru/LC_MESSAGES/gnomeicu.mo
-share/locale/sl/LC_MESSAGES/gnomeicu.mo
-share/locale/sv/LC_MESSAGES/gnomeicu.mo
-share/locale/tr/LC_MESSAGES/gnomeicu.mo
-share/locale/uk/LC_MESSAGES/gnomeicu.mo
+${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/gnomeicu.mo
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gnomeicu.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gnomeicu.mo
+${PKGLOCALEDIR}/locale/el/LC_MESSAGES/gnomeicu.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gnomeicu.mo
+${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/gnomeicu.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gnomeicu.mo
+${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/gnomeicu.mo
+${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/gnomeicu.mo
+${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/gnomeicu.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gnomeicu.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gnomeicu.mo
+${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gnomeicu.mo
+${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/gnomeicu.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gnomeicu.mo
+${PKGLOCALEDIR}/locale/no/LC_MESSAGES/gnomeicu.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gnomeicu.mo
+${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/gnomeicu.mo
+${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/gnomeicu.mo
+${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/gnomeicu.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gnomeicu.mo
+${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/gnomeicu.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gnomeicu.mo
+${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gnomeicu.mo
+${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/gnomeicu.mo
 share/pixmaps/gnome-gnomeicu.xpm
 share/sounds/gnomeicu/message.wav
 @dirrm share/gnome/help/gnomeicu/C/images
diff --git a/chat/xchat/Makefile.common b/chat/xchat/Makefile.common
index 16a30b10b93..2020a22d41c 100644
--- a/chat/xchat/Makefile.common
+++ b/chat/xchat/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.9 2002/11/29 17:17:48 drochner Exp $
+# $NetBSD: Makefile.common,v 1.10 2002/11/30 12:41:07 salo Exp $
 
 DISTNAME=	xchat-1.8.10
 PKGREVISION=	2
@@ -14,6 +14,8 @@ PATCH_SITES=		${HOMEPAGE}files/source/1.8/patches/
 PATCHFILES=		xc1810fixme3.diff
 PATCH_DIST_STRIP=	-p1
 
+BUILD_USES_MSGFMT=	YES
+
 DISTINFO_FILE=	${.CURDIR}/../xchat/distinfo
 FILESDIR=	${.CURDIR}/../xchat/files
 PATCHDIR=	${.CURDIR}/../xchat/patches
@@ -21,15 +23,14 @@ PKGDIR=		${.CURDIR}/../xchat
 PLIST_SRC=	${.CURDIR}/../xchat/PLIST
 
 USE_BUILDLINK2=		YES
+USE_PKGLOCALEDIR=	YES
 USE_X11BASE=		YES
 USE_GMAKE=		YES
 USE_PERL5=		YES
-BUILD_USES_MSGFMT=	YES
 CONFIGURE_ARGS+=	--with-libintl-prefix=${BUILDLINK_PREFIX.gettext}
 CONFIGURE_ARGS+=	--enable-python
 
 BUILD_DEFS+=		USE_INET6 USE_SOCKS
-MAKE_ENV+=		PKGLOCALEDIR="${PKGLOCALEDIR}"
 
 GNU_CONFIGURE=		YES
 CONFIGURE_ENV+=		pythonpath=${PYTHONBIN}
diff --git a/chat/xchat/distinfo b/chat/xchat/distinfo
index 354931b1bd5..a03fff628cc 100644
--- a/chat/xchat/distinfo
+++ b/chat/xchat/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.18 2002/11/24 13:40:47 tron Exp $
+$NetBSD: distinfo,v 1.19 2002/11/30 12:41:07 salo Exp $
 
 SHA1 (xchat-1.8.10.tar.bz2) = 10c85bd23faa58f2f962eec6a96364e9743ac91c
 Size (xchat-1.8.10.tar.bz2) = 824407 bytes
 SHA1 (xc1810fixme3.diff) = de114fe9eaa0e53dab8023c9d11a44583eae9170
 Size (xc1810fixme3.diff) = 1025 bytes
-SHA1 (patch-ac) = 10dce1c565b8d95fd6b4941ddb1fbf7bb82e52ed
 SHA1 (patch-ad) = 7453ab165db9c166dae6221f80884de8de7511a7
 SHA1 (patch-ae) = baee878728bb33317258e43919ccabfcf3fd2f4a
diff --git a/chat/xchat/patches/patch-ac b/chat/xchat/patches/patch-ac
deleted file mode 100644
index 429e8e7e1b0..00000000000
--- a/chat/xchat/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2001/07/31 09:48:54 tron Exp $
-
---- po/Makefile.in.in.orig	Sun Oct 31 12:17:50 1999
-+++ po/Makefile.in.in	Mon Sep  4 19:30:55 2000
-@@ -19,7 +19,7 @@
- prefix = @prefix@
- exec_prefix = @exec_prefix@
- datadir = $(prefix)/@DATADIRNAME@
--localedir = $(datadir)/locale
-+localedir = $(prefix)/$(PKGLOCALEDIR)/locale
- gnulocaledir = $(prefix)/share/locale
- gettextsrcdir = $(prefix)/share/gettext/po
- subdir = po