Now that gettext includes a shared library, dependencies should

use it in LIB_DEPENDS. PR: ports/10647 Submitted by: Jeremy Lea <reg@shale.csir.co.za>
author: Jacques Vidrine <nectar@FreeBSD.org> 1999-03-19 04:40:10 +0000
committer: Jacques Vidrine <nectar@FreeBSD.org> 1999-03-19 04:40:10 +0000
commit: c1acc95b5a9252307f3f608056003afa5905e29a (patch)
tree: 9ab1a9e6c2b7d24e91beecfe7b420a1fa39aa87b
parent: Update to hanterm-xf-p16 (diff)
25 files changed, 76 insertions, 104 deletions
diff --git a/devel/glade/Makefile b/devel/glade/Makefile
index 8d2e80975fdf..192f25fcb4eb 100644
--- a/devel/glade/Makefile
+++ b/devel/glade/Makefile
@@ -3,7 +3,7 @@
 # Date created:		29 June 1998
 # Whom:			Dom Mitchell <dom@myrddin.demon.co.uk>
 #
-# $Id: Makefile,v 1.9 1998/10/10 14:35:08 vanilla Exp $
+# $Id: Makefile,v 1.10 1998/11/18 17:35:16 vanilla Exp $
 #
 
 DISTNAME=	glade-0.3.7
@@ -12,8 +12,8 @@ MASTER_SITES=   http://glade.pn.org/
 
 MAINTAINER=     dom@myrddin.demon.co.uk
 
-BUILD_DEPENS=	gettext:${PORTSDIR}/devel/gettext
-LIB_DEPENDS=	gtk11.1:${PORTSDIR}/x11-toolkits/gtk11
+LIB_DEPENDS=	gtk11.1:${PORTSDIR}/x11-toolkits/gtk11 \
+		intl.1:${PORTSDIR}/devel/gettext
 
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
diff --git a/devel/glade2/Makefile b/devel/glade2/Makefile
index 8d2e80975fdf..192f25fcb4eb 100644
--- a/devel/glade2/Makefile
+++ b/devel/glade2/Makefile
@@ -3,7 +3,7 @@
 # Date created:		29 June 1998
 # Whom:			Dom Mitchell <dom@myrddin.demon.co.uk>
 #
-# $Id: Makefile,v 1.9 1998/10/10 14:35:08 vanilla Exp $
+# $Id: Makefile,v 1.10 1998/11/18 17:35:16 vanilla Exp $
 #
 
 DISTNAME=	glade-0.3.7
@@ -12,8 +12,8 @@ MASTER_SITES=   http://glade.pn.org/
 
 MAINTAINER=     dom@myrddin.demon.co.uk
 
-BUILD_DEPENS=	gettext:${PORTSDIR}/devel/gettext
-LIB_DEPENDS=	gtk11.1:${PORTSDIR}/x11-toolkits/gtk11
+LIB_DEPENDS=	gtk11.1:${PORTSDIR}/x11-toolkits/gtk11 \
+		intl.1:${PORTSDIR}/devel/gettext
 
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
diff --git a/graphics/gimp-app-devel/Makefile b/graphics/gimp-app-devel/Makefile
index 270a68f64c86..53500407998b 100644
--- a/graphics/gimp-app-devel/Makefile
+++ b/graphics/gimp-app-devel/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.52 1999/01/23 07:05:22 vanilla Exp $
+# $Id: Makefile,v 1.53 1999/02/20 19:31:50 vanilla Exp $
 #
 
 DISTNAME=	gimp-1.1.2
@@ -14,12 +14,10 @@ MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/unstable/v1.1.2/ \
 
 MAINTAINER=	erich@FreeBSD.org
 
-BUILD_DEPENDS=	gettext:${PORTSDIR}/devel/gettext
-RUN_DEPENDS=	gettext:${PORTSDIR}/devel/gettext
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
 		aa.1:${PORTSDIR}/graphics/aalib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
-		gtk11d.1:${PORTSDIR}/x11-toolkits/gtk11-devel \
+		gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 \
 		mpeg.1:${PORTSDIR}/graphics/mpeg-lib \
 		png.3:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff34
@@ -29,7 +27,7 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	--disable-perl
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		GTK_CONFIG="${X11BASE}/bin/gtk11d-config" \
+		GTK_CONFIG="${X11BASE}/bin/gtk12-config" \
 		LIBS="-L${LOCALBASE}/lib" \
 		INSTALL_SCRIPT='$${INSTALL} -m 755'
 
diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index 270a68f64c86..53500407998b 100644
--- a/graphics/gimp-app/Makefile
+++ b/graphics/gimp-app/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.52 1999/01/23 07:05:22 vanilla Exp $
+# $Id: Makefile,v 1.53 1999/02/20 19:31:50 vanilla Exp $
 #
 
 DISTNAME=	gimp-1.1.2
@@ -14,12 +14,10 @@ MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/unstable/v1.1.2/ \
 
 MAINTAINER=	erich@FreeBSD.org
 
-BUILD_DEPENDS=	gettext:${PORTSDIR}/devel/gettext
-RUN_DEPENDS=	gettext:${PORTSDIR}/devel/gettext
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
 		aa.1:${PORTSDIR}/graphics/aalib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
-		gtk11d.1:${PORTSDIR}/x11-toolkits/gtk11-devel \
+		gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 \
 		mpeg.1:${PORTSDIR}/graphics/mpeg-lib \
 		png.3:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff34
@@ -29,7 +27,7 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	--disable-perl
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		GTK_CONFIG="${X11BASE}/bin/gtk11d-config" \
+		GTK_CONFIG="${X11BASE}/bin/gtk12-config" \
 		LIBS="-L${LOCALBASE}/lib" \
 		INSTALL_SCRIPT='$${INSTALL} -m 755'
 
diff --git a/graphics/gimp-devel/Makefile b/graphics/gimp-devel/Makefile
index 270a68f64c86..53500407998b 100644
--- a/graphics/gimp-devel/Makefile
+++ b/graphics/gimp-devel/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.52 1999/01/23 07:05:22 vanilla Exp $
+# $Id: Makefile,v 1.53 1999/02/20 19:31:50 vanilla Exp $
 #
 
 DISTNAME=	gimp-1.1.2
@@ -14,12 +14,10 @@ MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/unstable/v1.1.2/ \
 
 MAINTAINER=	erich@FreeBSD.org
 
-BUILD_DEPENDS=	gettext:${PORTSDIR}/devel/gettext
-RUN_DEPENDS=	gettext:${PORTSDIR}/devel/gettext
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
 		aa.1:${PORTSDIR}/graphics/aalib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
-		gtk11d.1:${PORTSDIR}/x11-toolkits/gtk11-devel \
+		gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 \
 		mpeg.1:${PORTSDIR}/graphics/mpeg-lib \
 		png.3:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff34
@@ -29,7 +27,7 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	--disable-perl
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		GTK_CONFIG="${X11BASE}/bin/gtk11d-config" \
+		GTK_CONFIG="${X11BASE}/bin/gtk12-config" \
 		LIBS="-L${LOCALBASE}/lib" \
 		INSTALL_SCRIPT='$${INSTALL} -m 755'
 
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index 270a68f64c86..53500407998b 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.52 1999/01/23 07:05:22 vanilla Exp $
+# $Id: Makefile,v 1.53 1999/02/20 19:31:50 vanilla Exp $
 #
 
 DISTNAME=	gimp-1.1.2
@@ -14,12 +14,10 @@ MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/unstable/v1.1.2/ \
 
 MAINTAINER=	erich@FreeBSD.org
 
-BUILD_DEPENDS=	gettext:${PORTSDIR}/devel/gettext
-RUN_DEPENDS=	gettext:${PORTSDIR}/devel/gettext
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
 		aa.1:${PORTSDIR}/graphics/aalib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
-		gtk11d.1:${PORTSDIR}/x11-toolkits/gtk11-devel \
+		gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 \
 		mpeg.1:${PORTSDIR}/graphics/mpeg-lib \
 		png.3:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff34
@@ -29,7 +27,7 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	--disable-perl
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		GTK_CONFIG="${X11BASE}/bin/gtk11d-config" \
+		GTK_CONFIG="${X11BASE}/bin/gtk12-config" \
 		LIBS="-L${LOCALBASE}/lib" \
 		INSTALL_SCRIPT='$${INSTALL} -m 755'
 
diff --git a/graphics/gimp1/Makefile b/graphics/gimp1/Makefile
index 270a68f64c86..53500407998b 100644
--- a/graphics/gimp1/Makefile
+++ b/graphics/gimp1/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.52 1999/01/23 07:05:22 vanilla Exp $
+# $Id: Makefile,v 1.53 1999/02/20 19:31:50 vanilla Exp $
 #
 
 DISTNAME=	gimp-1.1.2
@@ -14,12 +14,10 @@ MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/unstable/v1.1.2/ \
 
 MAINTAINER=	erich@FreeBSD.org
 
-BUILD_DEPENDS=	gettext:${PORTSDIR}/devel/gettext
-RUN_DEPENDS=	gettext:${PORTSDIR}/devel/gettext
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
 		aa.1:${PORTSDIR}/graphics/aalib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
-		gtk11d.1:${PORTSDIR}/x11-toolkits/gtk11-devel \
+		gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 \
 		mpeg.1:${PORTSDIR}/graphics/mpeg-lib \
 		png.3:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff34
@@ -29,7 +27,7 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	--disable-perl
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		GTK_CONFIG="${X11BASE}/bin/gtk11d-config" \
+		GTK_CONFIG="${X11BASE}/bin/gtk12-config" \
 		LIBS="-L${LOCALBASE}/lib" \
 		INSTALL_SCRIPT='$${INSTALL} -m 755'
 
diff --git a/graphics/gimpshop/Makefile b/graphics/gimpshop/Makefile
index 270a68f64c86..53500407998b 100644
--- a/graphics/gimpshop/Makefile
+++ b/graphics/gimpshop/Makefile
@@ -3,7 +3,7 @@
 # Date created:         Mon Nov 18 21:28:43 CST 1996
 # Whom:                 erich@FreeBSD.org
 #
-# $Id: Makefile,v 1.52 1999/01/23 07:05:22 vanilla Exp $
+# $Id: Makefile,v 1.53 1999/02/20 19:31:50 vanilla Exp $
 #
 
 DISTNAME=	gimp-1.1.2
@@ -14,12 +14,10 @@ MASTER_SITES=	ftp://ftp.gimp.org/pub/gimp/unstable/v1.1.2/ \
 
 MAINTAINER=	erich@FreeBSD.org
 
-BUILD_DEPENDS=	gettext:${PORTSDIR}/devel/gettext
-RUN_DEPENDS=	gettext:${PORTSDIR}/devel/gettext
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
 		aa.1:${PORTSDIR}/graphics/aalib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
-		gtk11d.1:${PORTSDIR}/x11-toolkits/gtk11-devel \
+		gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 \
 		mpeg.1:${PORTSDIR}/graphics/mpeg-lib \
 		png.3:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff34
@@ -29,7 +27,7 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	--disable-perl
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		GTK_CONFIG="${X11BASE}/bin/gtk11d-config" \
+		GTK_CONFIG="${X11BASE}/bin/gtk12-config" \
 		LIBS="-L${LOCALBASE}/lib" \
 		INSTALL_SCRIPT='$${INSTALL} -m 755'
 
diff --git a/mail/kbiff/Makefile b/mail/kbiff/Makefile
index 4e5237f67fdf..226eaba1cf7a 100644
--- a/mail/kbiff/Makefile
+++ b/mail/kbiff/Makefile
@@ -3,7 +3,7 @@
 # Date created:		So  14 Jun 1998 13:09:18 CEST
 # Whom:			andreas
 #
-# $Id: Makefile,v 1.7 1998/10/02 08:16:56 brian Exp $
+# $Id: Makefile,v 1.8 1998/12/28 23:44:04 dirk Exp $
 #
 
 DISTNAME=	kbiff-2.0
@@ -12,9 +12,8 @@ MASTER_SITES=	http://home.sprintmail.com/~granroth/kbiff/
 
 MAINTAINER=	andreas@FreeBSD.ORG
 
-BUILD_DEPENDS=	msgfmt:${PORTSDIR}/devel/gettext
 LIB_DEPENDS=	kdeui.1:${PORTSDIR}/x11/kdelibs \
-		kdecore.1:${PORTSDIR}/x11/kdelibs
+		intl.1:${PORTSDIR}/devel/gettext
 
 USE_QT=		yes
 GNU_CONFIGURE=	yes
diff --git a/misc/mc/Makefile b/misc/mc/Makefile
index 4d7e2717ba17..ab875f1ee11e 100644
--- a/misc/mc/Makefile
+++ b/misc/mc/Makefile
@@ -3,7 +3,7 @@
 # Date created:		15 Jul 1995
 # Whom:			torstenb@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.28 1999/02/22 04:27:44 steve Exp $
+# $Id: Makefile,v 1.29 1999/03/15 04:39:10 nectar Exp $
 #
 
 DISTNAME=	mc-4.5.23
@@ -13,9 +13,8 @@ MASTER_SITE_SUBDIR=	gnome-1.0/sources
 
 MAINTAINER=	reg@shale.csir.co.za
 
-BUILD_DEPENDS=	gettext:${PORTSDIR}/devel/gettext
-RUN_DEPENDS=	gettext:${PORTSDIR}/devel/gettext
-LIB_DEPENDS=	glib12.1:${PORTSDIR}/devel/glib12
+LIB_DEPENDS=	glib12.1:${PORTSDIR}/devel/glib12 \
+		intl.1:${PORTSDIR}/devel/gettext
 
 .if defined(USE_NCURSES_PORT)
 LIB_DEPENDS+=	ncurses.4:${PORTSDIR}/devel/ncurses
diff --git a/x11-toolkits/gtk12/Makefile b/x11-toolkits/gtk12/Makefile
index 0136c7202403..2d6a85691ed2 100644
--- a/x11-toolkits/gtk12/Makefile
+++ b/x11-toolkits/gtk12/Makefile
@@ -3,7 +3,7 @@
 # Date Created:			28 Sep 1997
 # Whom:				Vanilla I. Shu <vanilla@MinJe.com.TW>
 #
-# $Id: Makefile,v 1.44 1999/02/18 04:49:25 vanilla Exp $
+# $Id: Makefile,v 1.46 1999/03/09 01:09:08 nectar Exp $
 #
 
 DISTNAME=	gtk+-1.2.0
@@ -15,9 +15,8 @@ MASTER_SITES=	ftp://ftp.gimp.org/pub/gtk/v1.2/ \
 
 MAINTAINER=	vanilla@FreeBSD.ORG
 
-BUILD_DEPENDS=	gettext:${PORTSDIR}/devel/gettext
-RUN_DEPENDS=	gettext:${PORTSDIR}/devel/gettext
-LIB_DEPENDS=	glib12.1:${PORTSDIR}/devel/glib12
+LIB_DEPENDS=	glib12.1:${PORTSDIR}/devel/glib12 \
+		intl.1:${PORTSDIR}/devel/gettext
 
 USE_X_PREFIX=	yes
 USE_PERL5=	yes
diff --git a/x11-toolkits/gtk13/Makefile b/x11-toolkits/gtk13/Makefile
index 0136c7202403..2d6a85691ed2 100644
--- a/x11-toolkits/gtk13/Makefile
+++ b/x11-toolkits/gtk13/Makefile
@@ -3,7 +3,7 @@
 # Date Created:			28 Sep 1997
 # Whom:				Vanilla I. Shu <vanilla@MinJe.com.TW>
 #
-# $Id: Makefile,v 1.44 1999/02/18 04:49:25 vanilla Exp $
+# $Id: Makefile,v 1.46 1999/03/09 01:09:08 nectar Exp $
 #
 
 DISTNAME=	gtk+-1.2.0
@@ -15,9 +15,8 @@ MASTER_SITES=	ftp://ftp.gimp.org/pub/gtk/v1.2/ \
 
 MAINTAINER=	vanilla@FreeBSD.ORG
 
-BUILD_DEPENDS=	gettext:${PORTSDIR}/devel/gettext
-RUN_DEPENDS=	gettext:${PORTSDIR}/devel/gettext
-LIB_DEPENDS=	glib12.1:${PORTSDIR}/devel/glib12
+LIB_DEPENDS=	glib12.1:${PORTSDIR}/devel/glib12 \
+		intl.1:${PORTSDIR}/devel/gettext
 
 USE_X_PREFIX=	yes
 USE_PERL5=	yes
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index 0136c7202403..2d6a85691ed2 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -3,7 +3,7 @@
 # Date Created:			28 Sep 1997
 # Whom:				Vanilla I. Shu <vanilla@MinJe.com.TW>
 #
-# $Id: Makefile,v 1.44 1999/02/18 04:49:25 vanilla Exp $
+# $Id: Makefile,v 1.46 1999/03/09 01:09:08 nectar Exp $
 #
 
 DISTNAME=	gtk+-1.2.0
@@ -15,9 +15,8 @@ MASTER_SITES=	ftp://ftp.gimp.org/pub/gtk/v1.2/ \
 
 MAINTAINER=	vanilla@FreeBSD.ORG
 
-BUILD_DEPENDS=	gettext:${PORTSDIR}/devel/gettext
-RUN_DEPENDS=	gettext:${PORTSDIR}/devel/gettext
-LIB_DEPENDS=	glib12.1:${PORTSDIR}/devel/glib12
+LIB_DEPENDS=	glib12.1:${PORTSDIR}/devel/glib12 \
+		intl.1:${PORTSDIR}/devel/gettext
 
 USE_X_PREFIX=	yes
 USE_PERL5=	yes
diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index 0136c7202403..2d6a85691ed2 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -3,7 +3,7 @@
 # Date Created:			28 Sep 1997
 # Whom:				Vanilla I. Shu <vanilla@MinJe.com.TW>
 #
-# $Id: Makefile,v 1.44 1999/02/18 04:49:25 vanilla Exp $
+# $Id: Makefile,v 1.46 1999/03/09 01:09:08 nectar Exp $
 #
 
 DISTNAME=	gtk+-1.2.0
@@ -15,9 +15,8 @@ MASTER_SITES=	ftp://ftp.gimp.org/pub/gtk/v1.2/ \
 
 MAINTAINER=	vanilla@FreeBSD.ORG
 
-BUILD_DEPENDS=	gettext:${PORTSDIR}/devel/gettext
-RUN_DEPENDS=	gettext:${PORTSDIR}/devel/gettext
-LIB_DEPENDS=	glib12.1:${PORTSDIR}/devel/glib12
+LIB_DEPENDS=	glib12.1:${PORTSDIR}/devel/glib12 \
+		intl.1:${PORTSDIR}/devel/gettext
 
 USE_X_PREFIX=	yes
 USE_PERL5=	yes
diff --git a/x11-wm/icewm/Makefile b/x11-wm/icewm/Makefile
index a9ac1f16f105..57c158ffe829 100644
--- a/x11-wm/icewm/Makefile
+++ b/x11-wm/icewm/Makefile
@@ -3,7 +3,7 @@
 # Date created:		10 August 1997
 # Whom:			Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.31 1999/01/17 19:48:00 vanilla Exp $
+# $Id: Makefile,v 1.32 1999/03/17 06:41:24 nectar Exp $
 #
 
 DISTNAME=	icewm-0.9.34
@@ -15,11 +15,10 @@ EXTRACT_SUFX=	.src.tar.gz
 MAINTAINER=	nacai@iname.com
 
 .if defined(GNOME)
-BUILD_DEPENDS+=	gnome-config:${PORTSDIR}/x11/gnomelibs
-BUILD_DEPENDS+=	imlib-config:${PORTSDIR}/graphics/imlib
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libintl.a:${PORTSDIR}/devel/gettext
-.endif
+LIB_DEPENDS=	gnome.1:${PORTSDIR}/x11/gnomelibs
+.else
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
+.endif
 
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
diff --git a/x11-wm/windowmaker-i18n/Makefile b/x11-wm/windowmaker-i18n/Makefile
index 2d8743555eac..bb308c8e314f 100644
--- a/x11-wm/windowmaker-i18n/Makefile
+++ b/x11-wm/windowmaker-i18n/Makefile
@@ -3,7 +3,7 @@
 # Date created:		24 Nov 1998
 # Whom:			mac@jp.freebsd.org
 #
-# $Id: Makefile,v 1.51 1999/02/12 17:00:00 flathill Exp $
+# $Id: Makefile,v 1.52 1999/02/21 21:51:01 billf Exp $
 
 DISTNAME=	WindowMaker-0.51.0
 PKGNAME=	windowmaker-i18n-0.51.0
@@ -23,9 +23,9 @@ LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.3:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff34 \
-		PropList.1:${PORTSDIR}/devel/libPropList
-BUILD_DEPENDS=	${LOCALBASE}/lib/libintl.a:${PORTSDIR}/devel/gettext \
-		nkf:${PORTSDIR}/japanese/nkf
+		PropList.1:${PORTSDIR}/devel/libPropList \
+		intl.1:${PORTSDIR}/devel/gettext
+BUILD_DEPENDS=	nkf:${PORTSDIR}/japanese/nkf
 
 USE_PERL5=	yes
 USE_X_PREFIX=	yes
diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile
index 13826fcdf943..68c05279bd7c 100644
--- a/x11/kde4-baseapps/Makefile
+++ b/x11/kde4-baseapps/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan E�er <se@freebsd.org>
 #
-# $Id: Makefile,v 1.32 1999/02/28 06:06:23 obrien Exp $
+# $Id: Makefile,v 1.33 1999/02/28 21:48:08 asami Exp $
 #
 
 DISTNAME=	kdebase-1.1
@@ -16,9 +16,8 @@ MAINTAINER=	se@freebsd.org
 LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		kdecore.2:${PORTSDIR}/x11/kdelibs11 \
-		Xpm.4:${PORTSDIR}/graphics/xpm
-BUILD_DEPENDS=	msgfmt:${PORTSDIR}/devel/gettext
-RUN_DEPENDS=	msgfmt:${PORTSDIR}/devel/gettext
+		Xpm.4:${PORTSDIR}/graphics/xpm \
+		intl.1:${PORTSDIR}/devel/gettext
 
 USE_BZIP2=	yes
 USE_QT=		yes
diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile
index 13826fcdf943..68c05279bd7c 100644
--- a/x11/kde4-runtime/Makefile
+++ b/x11/kde4-runtime/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan E�er <se@freebsd.org>
 #
-# $Id: Makefile,v 1.32 1999/02/28 06:06:23 obrien Exp $
+# $Id: Makefile,v 1.33 1999/02/28 21:48:08 asami Exp $
 #
 
 DISTNAME=	kdebase-1.1
@@ -16,9 +16,8 @@ MAINTAINER=	se@freebsd.org
 LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		kdecore.2:${PORTSDIR}/x11/kdelibs11 \
-		Xpm.4:${PORTSDIR}/graphics/xpm
-BUILD_DEPENDS=	msgfmt:${PORTSDIR}/devel/gettext
-RUN_DEPENDS=	msgfmt:${PORTSDIR}/devel/gettext
+		Xpm.4:${PORTSDIR}/graphics/xpm \
+		intl.1:${PORTSDIR}/devel/gettext
 
 USE_BZIP2=	yes
 USE_QT=		yes
diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile
index 13826fcdf943..68c05279bd7c 100644
--- a/x11/kde4-workspace/Makefile
+++ b/x11/kde4-workspace/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan E�er <se@freebsd.org>
 #
-# $Id: Makefile,v 1.32 1999/02/28 06:06:23 obrien Exp $
+# $Id: Makefile,v 1.33 1999/02/28 21:48:08 asami Exp $
 #
 
 DISTNAME=	kdebase-1.1
@@ -16,9 +16,8 @@ MAINTAINER=	se@freebsd.org
 LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		kdecore.2:${PORTSDIR}/x11/kdelibs11 \
-		Xpm.4:${PORTSDIR}/graphics/xpm
-BUILD_DEPENDS=	msgfmt:${PORTSDIR}/devel/gettext
-RUN_DEPENDS=	msgfmt:${PORTSDIR}/devel/gettext
+		Xpm.4:${PORTSDIR}/graphics/xpm \
+		intl.1:${PORTSDIR}/devel/gettext
 
 USE_BZIP2=	yes
 USE_QT=		yes
diff --git a/x11/kdebase11/Makefile b/x11/kdebase11/Makefile
index 13826fcdf943..68c05279bd7c 100644
--- a/x11/kdebase11/Makefile
+++ b/x11/kdebase11/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan E�er <se@freebsd.org>
 #
-# $Id: Makefile,v 1.32 1999/02/28 06:06:23 obrien Exp $
+# $Id: Makefile,v 1.33 1999/02/28 21:48:08 asami Exp $
 #
 
 DISTNAME=	kdebase-1.1
@@ -16,9 +16,8 @@ MAINTAINER=	se@freebsd.org
 LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		kdecore.2:${PORTSDIR}/x11/kdelibs11 \
-		Xpm.4:${PORTSDIR}/graphics/xpm
-BUILD_DEPENDS=	msgfmt:${PORTSDIR}/devel/gettext
-RUN_DEPENDS=	msgfmt:${PORTSDIR}/devel/gettext
+		Xpm.4:${PORTSDIR}/graphics/xpm \
+		intl.1:${PORTSDIR}/devel/gettext
 
 USE_BZIP2=	yes
 USE_QT=		yes
diff --git a/x11/kdebase2/Makefile b/x11/kdebase2/Makefile
index 13826fcdf943..68c05279bd7c 100644
--- a/x11/kdebase2/Makefile
+++ b/x11/kdebase2/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan E�er <se@freebsd.org>
 #
-# $Id: Makefile,v 1.32 1999/02/28 06:06:23 obrien Exp $
+# $Id: Makefile,v 1.33 1999/02/28 21:48:08 asami Exp $
 #
 
 DISTNAME=	kdebase-1.1
@@ -16,9 +16,8 @@ MAINTAINER=	se@freebsd.org
 LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		kdecore.2:${PORTSDIR}/x11/kdelibs11 \
-		Xpm.4:${PORTSDIR}/graphics/xpm
-BUILD_DEPENDS=	msgfmt:${PORTSDIR}/devel/gettext
-RUN_DEPENDS=	msgfmt:${PORTSDIR}/devel/gettext
+		Xpm.4:${PORTSDIR}/graphics/xpm \
+		intl.1:${PORTSDIR}/devel/gettext
 
 USE_BZIP2=	yes
 USE_QT=		yes
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index 13826fcdf943..68c05279bd7c 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan E�er <se@freebsd.org>
 #
-# $Id: Makefile,v 1.32 1999/02/28 06:06:23 obrien Exp $
+# $Id: Makefile,v 1.33 1999/02/28 21:48:08 asami Exp $
 #
 
 DISTNAME=	kdebase-1.1
@@ -16,9 +16,8 @@ MAINTAINER=	se@freebsd.org
 LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		kdecore.2:${PORTSDIR}/x11/kdelibs11 \
-		Xpm.4:${PORTSDIR}/graphics/xpm
-BUILD_DEPENDS=	msgfmt:${PORTSDIR}/devel/gettext
-RUN_DEPENDS=	msgfmt:${PORTSDIR}/devel/gettext
+		Xpm.4:${PORTSDIR}/graphics/xpm \
+		intl.1:${PORTSDIR}/devel/gettext
 
 USE_BZIP2=	yes
 USE_QT=		yes
diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile
index 13826fcdf943..68c05279bd7c 100644
--- a/x11/kdebase4-runtime/Makefile
+++ b/x11/kdebase4-runtime/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan E�er <se@freebsd.org>
 #
-# $Id: Makefile,v 1.32 1999/02/28 06:06:23 obrien Exp $
+# $Id: Makefile,v 1.33 1999/02/28 21:48:08 asami Exp $
 #
 
 DISTNAME=	kdebase-1.1
@@ -16,9 +16,8 @@ MAINTAINER=	se@freebsd.org
 LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		kdecore.2:${PORTSDIR}/x11/kdelibs11 \
-		Xpm.4:${PORTSDIR}/graphics/xpm
-BUILD_DEPENDS=	msgfmt:${PORTSDIR}/devel/gettext
-RUN_DEPENDS=	msgfmt:${PORTSDIR}/devel/gettext
+		Xpm.4:${PORTSDIR}/graphics/xpm \
+		intl.1:${PORTSDIR}/devel/gettext
 
 USE_BZIP2=	yes
 USE_QT=		yes
diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile
index 13826fcdf943..68c05279bd7c 100644
--- a/x11/kdebase4-workspace/Makefile
+++ b/x11/kdebase4-workspace/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan E�er <se@freebsd.org>
 #
-# $Id: Makefile,v 1.32 1999/02/28 06:06:23 obrien Exp $
+# $Id: Makefile,v 1.33 1999/02/28 21:48:08 asami Exp $
 #
 
 DISTNAME=	kdebase-1.1
@@ -16,9 +16,8 @@ MAINTAINER=	se@freebsd.org
 LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		kdecore.2:${PORTSDIR}/x11/kdelibs11 \
-		Xpm.4:${PORTSDIR}/graphics/xpm
-BUILD_DEPENDS=	msgfmt:${PORTSDIR}/devel/gettext
-RUN_DEPENDS=	msgfmt:${PORTSDIR}/devel/gettext
+		Xpm.4:${PORTSDIR}/graphics/xpm \
+		intl.1:${PORTSDIR}/devel/gettext
 
 USE_BZIP2=	yes
 USE_QT=		yes
diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile
index 13826fcdf943..68c05279bd7c 100644
--- a/x11/kdebase4/Makefile
+++ b/x11/kdebase4/Makefile
@@ -3,7 +3,7 @@
 # Date created:        28 October 1997
 # Whom:                Stefan E�er <se@freebsd.org>
 #
-# $Id: Makefile,v 1.32 1999/02/28 06:06:23 obrien Exp $
+# $Id: Makefile,v 1.33 1999/02/28 21:48:08 asami Exp $
 #
 
 DISTNAME=	kdebase-1.1
@@ -16,9 +16,8 @@ MAINTAINER=	se@freebsd.org
 LIB_DEPENDS=	gif.3:${PORTSDIR}/graphics/giflib \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		kdecore.2:${PORTSDIR}/x11/kdelibs11 \
-		Xpm.4:${PORTSDIR}/graphics/xpm
-BUILD_DEPENDS=	msgfmt:${PORTSDIR}/devel/gettext
-RUN_DEPENDS=	msgfmt:${PORTSDIR}/devel/gettext
+		Xpm.4:${PORTSDIR}/graphics/xpm \
+		intl.1:${PORTSDIR}/devel/gettext
 
 USE_BZIP2=	yes
 USE_QT=		yes
author	Jacques Vidrine <nectar@FreeBSD.org>	1999-03-19 04:40:10 +0000
committer	Jacques Vidrine <nectar@FreeBSD.org>	1999-03-19 04:40:10 +0000
commit	c1acc95b5a9252307f3f608056003afa5905e29a (patch)
tree	9ab1a9e6c2b7d24e91beecfe7b420a1fa39aa87b
parent	Update to hanterm-xf-p16 (diff)