[pkgsrc/trunk]: pkgsrc/x11/controlcenter Short: make this compile on Linux

[jschauma <jschauma%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4fbf758cbbe3
branches:  trunk
changeset: 476382:4fbf758cbbe3
user:      jschauma <jschauma%pkgsrc.org@localhost>
date:      Tue Jun 08 17:48:24 2004 +0000

description:
Short: make this compile on Linux

Long:
Some OS have libintl functionality in libc, so we do not necessarily
have to link against (a possibly non-existent) -lintl.  For now, only
deal with Linux -- those who know for a fact which OS also behave
this way should adjust/add.

diffstat:

 x11/controlcenter/Makefile         |  9 ++++++++-
 x11/controlcenter/patches/patch-ab |  4 ++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diffs (41 lines):

diff -r 865d4c9f6fe3 -r 4fbf758cbbe3 x11/controlcenter/Makefile
--- a/x11/controlcenter/Makefile        Tue Jun 08 16:38:58 2004 +0000
+++ b/x11/controlcenter/Makefile        Tue Jun 08 17:48:24 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2004/04/25 04:16:44 xtraeme Exp $
+# $NetBSD: Makefile,v 1.63 2004/06/08 17:48:24 jschauma Exp $
 
 DISTNAME=              control-center-1.4.0.4
 PKGREVISION=           7
@@ -24,6 +24,13 @@
 GNU_CONFIGURE=         YES
 CONFIGURE_ARGS+=       --localstatedir=${LOCALSTATEDIR}
 
+.include "../../mk/bsd.prefs.mk"
+
+# Linux has libintl functionality in libc
+.if ${OPSYS} != "Linux"
+CONFIGURE_ENV+=                INTLLIBS="-lintl"
+.endif
+
 post-patch:
        @${ECHO} >>${WRKSRC}/control-center/cappletConf.sh.in ""
 
diff -r 865d4c9f6fe3 -r 4fbf758cbbe3 x11/controlcenter/patches/patch-ab
--- a/x11/controlcenter/patches/patch-ab        Tue Jun 08 16:38:58 2004 +0000
+++ b/x11/controlcenter/patches/patch-ab        Tue Jun 08 17:48:24 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.5 2002/08/29 08:42:52 jlam Exp $
+$NetBSD: patch-ab,v 1.6 2004/06/08 17:48:25 jschauma Exp $
 
 --- configure.orig     Sun Feb 10 16:36:55 2002
 +++ configure
@@ -18,7 +18,7 @@
 +# NetBSD: set DATADIRNAME to "share"
 +DATADIRNAME="share"
 +INTLDEPS=
-+INTLLIBS="-lintl"
++INTLLIBS="${INTLLIBS}"
 +
  for ac_hdr in dlfcn.h dl.h
  do