summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2002-10-29 18:52:01 +0000
committerwiz <wiz@pkgsrc.org>2002-10-29 18:52:01 +0000
commite30fb75dbd71410d2f42257e4322638e3facdaa2 (patch)
treeded3cb924f650759f9c30e88ac0c0d77b13e27bd
parentf82f931bbb95bba5c8e1cbf8ada524f673759bb6 (diff)
downloadpkgsrc-e30fb75dbd71410d2f42257e4322638e3facdaa2.tar.gz
Tell configure script to look for iconv; move iconv dependency to common Makefile.
-rw-r--r--chat/gaim-gnome/Makefile3
-rw-r--r--chat/gaim/Makefile3
-rw-r--r--chat/gaim/Makefile.common6
3 files changed, 6 insertions, 6 deletions
diff --git a/chat/gaim-gnome/Makefile b/chat/gaim-gnome/Makefile
index abe977e7e06..c89467e7bd6 100644
--- a/chat/gaim-gnome/Makefile
+++ b/chat/gaim-gnome/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/10/05 17:11:45 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2002/10/29 18:52:02 wiz Exp $
.include "../gaim/Makefile.common"
@@ -16,7 +16,6 @@ CONFIGURE_ARGS+= --enable-panel
USE_BUILDLINK2= YES
.include "../../audio/esound/buildlink2.mk"
-.include "../../converters/libiconv/buildlink2.mk"
.include "../../graphics/gdk-pixbuf/buildlink2.mk"
.include "../../lang/perl5/buildlink2.mk"
.include "../../x11/gnome-core/buildlink2.mk"
diff --git a/chat/gaim/Makefile b/chat/gaim/Makefile
index 66c0c4c86da..a0786f50b2a 100644
--- a/chat/gaim/Makefile
+++ b/chat/gaim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2002/10/22 05:59:40 itojun Exp $
+# $NetBSD: Makefile,v 1.23 2002/10/29 18:52:01 wiz Exp $
#
.include "Makefile.common"
@@ -15,6 +15,5 @@ PLIST_SRC+= ${.CURDIR}/../gaim/PLIST
.include "../../audio/esound/buildlink2.mk"
.include "../../graphics/gdk-pixbuf/buildlink2.mk"
.include "../../lang/perl5/buildlink2.mk"
-.include "../../converters/libiconv/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/chat/gaim/Makefile.common b/chat/gaim/Makefile.common
index 1545fb20867..2697e52e5ee 100644
--- a/chat/gaim/Makefile.common
+++ b/chat/gaim/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2002/09/28 03:49:18 hubertf Exp $
+# $NetBSD: Makefile.common,v 1.5 2002/10/29 18:52:01 wiz Exp $
#
DISTNAME= gaim-0.59.3
@@ -27,7 +27,7 @@ CONFIGURE_ARGS+= --disable-artsc
CONFIGURE_ARGS+= --disable-nas
CONFIGURE_ARGS+= --disable-perl
CONFIGURE_ARGS+= --disable-screensaver
-CONFIGURE_ARGS+= --with-libiconv-prefix=/nonexistant
+CONFIGURE_ARGS+= --with-libiconv-prefix=${BUILDLINK_PREFIX.libiconv}
CONFIGURE_ARGS+= --enable-esd
CONFIGURE_ARGS+= --enable-perl
@@ -38,3 +38,5 @@ CONFIGURE_ARGS+= --enable-pixbuf
#
CONFIGURE_ARGS+= --without-included-gettext
CONFIGURE_ENV+= gt_cv_func_gnugettext1_libc=yes
+
+.include "../../converters/libiconv/buildlink2.mk"