diff options
| author | jmc <jmc@pkgsrc.org> | 2003-08-15 22:48:04 +0000 |
|---|---|---|
| committer | jmc <jmc@pkgsrc.org> | 2003-08-15 22:48:04 +0000 |
| commit | 43ba654f3cc694b6e731f810668793efbf4d61e0 (patch) | |
| tree | c3fc5ecc573886f2d502332d021e6043e9710779 | |
| parent | c1b72b269d4c11cc39fc0bfa1308d13ac624949f (diff) | |
| download | pkgsrc-43ba654f3cc694b6e731f810668793efbf4d61e0.tar.gz | |
Get iconv right for both forms of everybuddy
| -rw-r--r-- | chat/everybuddy-gnome/Makefile | 3 | ||||
| -rw-r--r-- | chat/everybuddy/Makefile | 9 | ||||
| -rw-r--r-- | chat/everybuddy/Makefile.common | 10 |
3 files changed, 11 insertions, 11 deletions
diff --git a/chat/everybuddy-gnome/Makefile b/chat/everybuddy-gnome/Makefile index ec2b49c8bd2..a2b89b64034 100644 --- a/chat/everybuddy-gnome/Makefile +++ b/chat/everybuddy-gnome/Makefile @@ -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 @@ PKGREVISION= 6 CONFLICTS+= everybuddy-[0-9]* COMMENT+= with GNOME support -USE_BUILDLINK2= yes CONFIGURE_ARGS+= --enable-panel .include "../../x11/gnome-core/buildlink2.mk" diff --git a/chat/everybuddy/Makefile b/chat/everybuddy/Makefile index e8bad8c60ba..f7f58a8c044 100644 --- a/chat/everybuddy/Makefile +++ b/chat/everybuddy/Makefile @@ -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 --git a/chat/everybuddy/Makefile.common b/chat/everybuddy/Makefile.common index 8a3fe413142..4e6b5992548 100644 --- a/chat/everybuddy/Makefile.common +++ b/chat/everybuddy/Makefile.common @@ -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 @@ DEPENDS+= gnome1-dirs>=1.0:../../misc/gnome1-dirs USE_GMAKE= YES GNU_CONFIGURE= YES +USE_BUILDLINK2= yes DISTINFO_FILE= ${.CURDIR}/../everybuddy/distinfo FILESDIR= ${.CURDIR}/../everybuddy/files @@ -28,3 +29,10 @@ post-build: 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 |