From 7d19d37ca5de4e18a5b0f5aaba8599bc1d4b85dc Mon Sep 17 00:00:00 2001
From: hans <hans>
Date: Sun, 1 Apr 2012 18:30:34 +0000
Subject: Revert the patch that added locale support by buildlinking against
 converters/libiconv, which did break on NetBSD. Instead, disable nls
 explicitly and set CFLAGS.SunOS when using gcc>=4.6.

---
 chat/licq-core/Makefile | 12 +++++++-----
 chat/licq-core/PLIST    |  4 +---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/chat/licq-core/Makefile b/chat/licq-core/Makefile
index d6d621d741c..03d28ec2865 100644
--- a/chat/licq-core/Makefile
+++ b/chat/licq-core/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2012/02/16 15:26:41 hans Exp $
+# $NetBSD: Makefile,v 1.14 2012/04/01 18:30:34 hans Exp $
 #
 
 DISTNAME=	licq-1.3.5
@@ -17,10 +17,8 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 USE_LANGUAGES=	c c++
 USE_LIBTOOL=	YES
 GNU_CONFIGURE=	YES
-USE_TOOLS+=	msgmerge msgfmt
-USE_PKGLOCALEDIR=	yes
 
-CONFIGURE_ARGS+=	--localedir=${LOCALBASE}/${PKGLOCALEDIR}/locale
+CONFIGURE_ARGS+=	--disable-nls
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -29,6 +27,10 @@ CONFIGURE_ARGS+=	--localedir=${LOCALBASE}/${PKGLOCALEDIR}/locale
 INSTALL_UNSTRIPPED=	yes
 .endif
 
-.include "../../converters/libiconv/buildlink3.mk"
+.include "../../mk/compiler.mk"
+.if !empty(CC_VERSION:Mgcc-4.[6-9].*)
+CFLAGS.SunOS+=		-std=c99 -D_XOPEN_SOURCE=600
+.endif
+
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/licq-core/PLIST b/chat/licq-core/PLIST
index 7bb5faf3902..3c995ae2cc0 100644
--- a/chat/licq-core/PLIST
+++ b/chat/licq-core/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2012/02/16 15:26:41 hans Exp $
+@comment $NetBSD: PLIST,v 1.6 2012/04/01 18:30:34 hans Exp $
 bin/licq
 bin/viewurl-firefox.sh
 bin/viewurl-lynx.sh
@@ -111,6 +111,4 @@ share/licq/utilities/talk.utility
 share/licq/utilities/traceroute.utility
 share/licq/utilities/vnc.utility
 share/licq/utilities/xtraceroute.utility
-share/locale/de/LC_MESSAGES/licq.mo
-share/locale/es/LC_MESSAGES/licq.mo
 @pkgdir lib/licq
-- 
cgit v1.2.3