[pkgsrc/trunk]: pkgsrc/chat Get iconv right for both forms of everybuddy

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ee67a98ec82d
branches:  trunk
changeset: 460008:ee67a98ec82d
user:      jmc <jmc%pkgsrc.org@localhost>
date:      Fri Aug 15 22:48:04 2003 +0000

description:
Get iconv right for both forms of everybuddy

diffstat:

 chat/everybuddy-gnome/Makefile  |   3 +--
 chat/everybuddy/Makefile        |   9 +--------
 chat/everybuddy/Makefile.common |  10 +++++++++-
 3 files changed, 11 insertions(+), 11 deletions(-)

diffs (67 lines):

diff -r 08dc97b9f33e -r ee67a98ec82d chat/everybuddy-gnome/Makefile
--- a/chat/everybuddy-gnome/Makefile    Fri Aug 15 22:25:30 2003 +0000
+++ b/chat/everybuddy-gnome/Makefile    Fri Aug 15 22:48:04 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/07/13 13:50:44 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2003/08/15 22:48:04 jmc Exp $
 
 .include "../everybuddy/Makefile.common"
 
@@ -7,7 +7,6 @@
 CONFLICTS+=    everybuddy-[0-9]*
 COMMENT+=      with GNOME support
 
-USE_BUILDLINK2=                yes
 CONFIGURE_ARGS+=       --enable-panel
 
 .include "../../x11/gnome-core/buildlink2.mk"
diff -r 08dc97b9f33e -r ee67a98ec82d chat/everybuddy/Makefile
--- a/chat/everybuddy/Makefile  Fri Aug 15 22:25:30 2003 +0000
+++ b/chat/everybuddy/Makefile  Fri Aug 15 22:48:04 2003 +0000
@@ -1,17 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2003/08/09 17:11:04 seb Exp $
+# $NetBSD: Makefile,v 1.8 2003/08/15 22:48:04 jmc Exp $
 
 .include "Makefile.common"
 PKGREVISION=   4
 
-USE_BUILDLINK2=        yes
 CONFLICTS+=    everybuddy-gnome-[0-9]*
 
 .include "../../audio/esound/buildlink2.mk"
-.include "../../converters/libiconv/buildlink2.mk"
 .include "../../x11/gtk/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
-
-_ICONV_LIB=    ${BUILDLINK_LIBICONV_LDADD:M-l*:C/-l//}
-.if empty(_ICONV_LIB)
-BUILDLINK_TRANSFORM+=  S:-liconv:
-.endif
diff -r 08dc97b9f33e -r ee67a98ec82d chat/everybuddy/Makefile.common
--- a/chat/everybuddy/Makefile.common   Fri Aug 15 22:25:30 2003 +0000
+++ b/chat/everybuddy/Makefile.common   Fri Aug 15 22:48:04 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.9 2003/07/17 21:25:40 grant Exp $
+# $NetBSD: Makefile.common,v 1.10 2003/08/15 22:48:04 jmc Exp $
 
 DISTNAME=      everybuddy-0.2.0
 CATEGORIES=    chat
@@ -12,6 +12,7 @@
 
 USE_GMAKE=     YES
 GNU_CONFIGURE= YES
+USE_BUILDLINK2= yes
 
 DISTINFO_FILE= ${.CURDIR}/../everybuddy/distinfo
 FILESDIR=      ${.CURDIR}/../everybuddy/files
@@ -28,3 +29,10 @@
 
 post-install:
        ${INSTALL_SCRIPT} ${WRKDIR}/wrapper ${PREFIX}/bin/everybuddy
+
+.include "../../converters/libiconv/buildlink2.mk"
+
+_ICONV_LIB=     ${BUILDLINK_LIBICONV_LDADD:M-l*:C/-l//}
+.if empty(_ICONV_LIB)
+BUILDLINK_TRANSFORM+=   S:-liconv:
+.endif