36 files changed, 72 insertions, 72 deletions

diff --git a/devel/gide/Makefile b/devel/gide/Makefile
index 3cd7b4968ef6..0806a6274d77 100644
--- a/devel/gide/Makefile
+++ b/devel/gide/Makefile
@@ -3,7 +3,7 @@
 # Date created:        29 Jul 1998
 # Whom:                rom
 #
-# $Id: Makefile,v 1.4 1998/08/25 01:53:21 vanilla Exp $
+# $Id: Makefile,v 1.5 1998/09/15 12:05:11 vanilla Exp $
 #
 
 DISTNAME= 	gIDE-0.0.7
@@ -13,7 +13,7 @@ MASTER_SITES=   http://gide.pn.org/
 
 MAINTAINER=	rom_glsa@ein-hashofet.co.il
 
-LIB_DEPENDS=	gtk11\\.1\\.:${PORTSDIR}/x11-toolkits/gtk11 \
+LIB_DEPENDS=	gtk11.1:${PORTSDIR}/x11-toolkits/gtk11 \
 		guile\\.2\\.:${PORTSDIR}/lang/guile
 
 USE_X_PREFIX=   yes
diff --git a/devel/glade/Makefile b/devel/glade/Makefile
index 906f474cf710..98e72c391e71 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.6 1998/08/07 23:56:15 asami Exp $
+# $Id: Makefile,v 1.7 1998/09/17 04:41:40 vanilla Exp $
 #
 
 DISTNAME=	glade-0.3.4
@@ -12,7 +12,7 @@ MASTER_SITES=   http://www.comp.lancs.ac.uk/~damon/builder/
 
 MAINTAINER=     dom@myrddin.demon.co.uk
 
-LIB_DEPENDS=	gtk11\\.1\\.:${PORTSDIR}/x11-toolkits/gtk11
+LIB_DEPENDS=	gtk11.1:${PORTSDIR}/x11-toolkits/gtk11
 
 GNU_CONFIGURE=	yes
 USE_X_PREFIX=	yes
diff --git a/devel/glade2/Makefile b/devel/glade2/Makefile
index 906f474cf710..98e72c391e71 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.6 1998/08/07 23:56:15 asami Exp $
+# $Id: Makefile,v 1.7 1998/09/17 04:41:40 vanilla Exp $
 #
 
 DISTNAME=	glade-0.3.4
@@ -12,7 +12,7 @@ MASTER_SITES=   http://www.comp.lancs.ac.uk/~damon/builder/
 
 MAINTAINER=     dom@myrddin.demon.co.uk
 
-LIB_DEPENDS=	gtk11\\.1\\.:${PORTSDIR}/x11-toolkits/gtk11
+LIB_DEPENDS=	gtk11.1:${PORTSDIR}/x11-toolkits/gtk11
 
 GNU_CONFIGURE=	yes
 USE_X_PREFIX=	yes
diff --git a/devel/mico/Makefile b/devel/mico/Makefile
index bca41d661f9a..e45d1fa426b6 100644
--- a/devel/mico/Makefile
+++ b/devel/mico/Makefile
@@ -3,7 +3,7 @@
 # Date created:        11 July 1998
 # Whom:                Marc G. Fournier <scrappy@freebsd.org>
 #
-# $Id: Makefile,v 1.7 1998/08/12 06:29:25 asami Exp $
+# $Id: Makefile,v 1.6 1998/08/23 04:36:04 scrappy Exp $
 #
 
 DISTNAME=	mico-2.1.0
@@ -12,7 +12,7 @@ MASTER_SITES=	http://diamant-atm.vsb.cs.uni-frankfurt.de/~mico/
 
 MAINTAINER=	scrappy@freebsd.org
 
-LIB_DEPENDS=	gtk\\.1\\.5:${PORTSDIR}/x11-toolkits/gtk
+LIB_DEPENDS=	gtk.1:${PORTSDIR}/x11-toolkits/gtk
 BUILD_DEPENDS=	g++28:${PORTSDIR}/lang/gcc28 \
 		${PREFIX}/lib/gcc-lib/i386-unknown-freebsd${OSREL}/2.8.1/libstdc++.a:${PORTSDIR}/lang/glibstdc++28
 
diff --git a/editors/gxedit/Makefile b/editors/gxedit/Makefile
index 2ed084cba28f..c7d7ffc63d81 100644
--- a/editors/gxedit/Makefile
+++ b/editors/gxedit/Makefile
@@ -3,7 +3,7 @@
 # Date created:		01 Jul 1998
 # Whom:			Dom Mitchell <dom@myrddin.demon.co.uk>
 #
-# $Id: Makefile,v 1.11 1998/08/25 04:04:39 vanilla Exp $
+# $Id: Makefile,v 1.12 1998/09/16 23:28:51 vanilla Exp $
 #
 
 DISTNAME=	GXedit1.14
@@ -13,7 +13,7 @@ MASTER_SITES=	http://devplanet.fastethernet.net/
 
 MAINTAINER=     dom@myrddin.demon.co.uk
 
-LIB_DEPENDS=	gtk11\\.1\\.:${PORTSDIR}/x11-toolkits/gtk11
+LIB_DEPENDS=	gtk11.1:${PORTSDIR}/x11-toolkits/gtk11
 
 USE_X_PREFIX=	yes
 ALL_TARGET=	gxedit
diff --git a/graphics/gimp-app-devel/Makefile b/graphics/gimp-app-devel/Makefile
index 3947fea2305f..82e0340c06b6 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.44 1998/09/21 08:54:25 asami Exp $
+# $Id: Makefile,v 1.45 1998/09/22 16:19:14 asami Exp $
 #
 
 DISTNAME=	gimp-1.0.0
@@ -18,7 +18,7 @@ MAINTAINER=	erich@FreeBSD.org
 LIB_DEPENDS+=	Xpm.4:${PORTSDIR}/graphics/xpm
 LIB_DEPENDS+=	aa.1:${PORTSDIR}/graphics/aalib
 LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg
-LIB_DEPENDS+=	gtk\\.1\\.5:${PORTSDIR}/x11-toolkits/gtk
+LIB_DEPENDS+=	gtk.1:${PORTSDIR}/x11-toolkits/gtk
 LIB_DEPENDS+=	mpeg.1:${PORTSDIR}/graphics/mpeg-lib
 LIB_DEPENDS+=	png.2:${PORTSDIR}/graphics/png
 LIB_DEPENDS+=	tiff34.1:${PORTSDIR}/graphics/tiff34
diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile
index 3947fea2305f..82e0340c06b6 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.44 1998/09/21 08:54:25 asami Exp $
+# $Id: Makefile,v 1.45 1998/09/22 16:19:14 asami Exp $
 #
 
 DISTNAME=	gimp-1.0.0
@@ -18,7 +18,7 @@ MAINTAINER=	erich@FreeBSD.org
 LIB_DEPENDS+=	Xpm.4:${PORTSDIR}/graphics/xpm
 LIB_DEPENDS+=	aa.1:${PORTSDIR}/graphics/aalib
 LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg
-LIB_DEPENDS+=	gtk\\.1\\.5:${PORTSDIR}/x11-toolkits/gtk
+LIB_DEPENDS+=	gtk.1:${PORTSDIR}/x11-toolkits/gtk
 LIB_DEPENDS+=	mpeg.1:${PORTSDIR}/graphics/mpeg-lib
 LIB_DEPENDS+=	png.2:${PORTSDIR}/graphics/png
 LIB_DEPENDS+=	tiff34.1:${PORTSDIR}/graphics/tiff34
diff --git a/graphics/gimp-devel/Makefile b/graphics/gimp-devel/Makefile
index 3947fea2305f..82e0340c06b6 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.44 1998/09/21 08:54:25 asami Exp $
+# $Id: Makefile,v 1.45 1998/09/22 16:19:14 asami Exp $
 #
 
 DISTNAME=	gimp-1.0.0
@@ -18,7 +18,7 @@ MAINTAINER=	erich@FreeBSD.org
 LIB_DEPENDS+=	Xpm.4:${PORTSDIR}/graphics/xpm
 LIB_DEPENDS+=	aa.1:${PORTSDIR}/graphics/aalib
 LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg
-LIB_DEPENDS+=	gtk\\.1\\.5:${PORTSDIR}/x11-toolkits/gtk
+LIB_DEPENDS+=	gtk.1:${PORTSDIR}/x11-toolkits/gtk
 LIB_DEPENDS+=	mpeg.1:${PORTSDIR}/graphics/mpeg-lib
 LIB_DEPENDS+=	png.2:${PORTSDIR}/graphics/png
 LIB_DEPENDS+=	tiff34.1:${PORTSDIR}/graphics/tiff34
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index 3947fea2305f..82e0340c06b6 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.44 1998/09/21 08:54:25 asami Exp $
+# $Id: Makefile,v 1.45 1998/09/22 16:19:14 asami Exp $
 #
 
 DISTNAME=	gimp-1.0.0
@@ -18,7 +18,7 @@ MAINTAINER=	erich@FreeBSD.org
 LIB_DEPENDS+=	Xpm.4:${PORTSDIR}/graphics/xpm
 LIB_DEPENDS+=	aa.1:${PORTSDIR}/graphics/aalib
 LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg
-LIB_DEPENDS+=	gtk\\.1\\.5:${PORTSDIR}/x11-toolkits/gtk
+LIB_DEPENDS+=	gtk.1:${PORTSDIR}/x11-toolkits/gtk
 LIB_DEPENDS+=	mpeg.1:${PORTSDIR}/graphics/mpeg-lib
 LIB_DEPENDS+=	png.2:${PORTSDIR}/graphics/png
 LIB_DEPENDS+=	tiff34.1:${PORTSDIR}/graphics/tiff34
diff --git a/graphics/gimp1/Makefile b/graphics/gimp1/Makefile
index 3947fea2305f..82e0340c06b6 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.44 1998/09/21 08:54:25 asami Exp $
+# $Id: Makefile,v 1.45 1998/09/22 16:19:14 asami Exp $
 #
 
 DISTNAME=	gimp-1.0.0
@@ -18,7 +18,7 @@ MAINTAINER=	erich@FreeBSD.org
 LIB_DEPENDS+=	Xpm.4:${PORTSDIR}/graphics/xpm
 LIB_DEPENDS+=	aa.1:${PORTSDIR}/graphics/aalib
 LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg
-LIB_DEPENDS+=	gtk\\.1\\.5:${PORTSDIR}/x11-toolkits/gtk
+LIB_DEPENDS+=	gtk.1:${PORTSDIR}/x11-toolkits/gtk
 LIB_DEPENDS+=	mpeg.1:${PORTSDIR}/graphics/mpeg-lib
 LIB_DEPENDS+=	png.2:${PORTSDIR}/graphics/png
 LIB_DEPENDS+=	tiff34.1:${PORTSDIR}/graphics/tiff34
diff --git a/graphics/gimpshop/Makefile b/graphics/gimpshop/Makefile
index 3947fea2305f..82e0340c06b6 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.44 1998/09/21 08:54:25 asami Exp $
+# $Id: Makefile,v 1.45 1998/09/22 16:19:14 asami Exp $
 #
 
 DISTNAME=	gimp-1.0.0
@@ -18,7 +18,7 @@ MAINTAINER=	erich@FreeBSD.org
 LIB_DEPENDS+=	Xpm.4:${PORTSDIR}/graphics/xpm
 LIB_DEPENDS+=	aa.1:${PORTSDIR}/graphics/aalib
 LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg
-LIB_DEPENDS+=	gtk\\.1\\.5:${PORTSDIR}/x11-toolkits/gtk
+LIB_DEPENDS+=	gtk.1:${PORTSDIR}/x11-toolkits/gtk
 LIB_DEPENDS+=	mpeg.1:${PORTSDIR}/graphics/mpeg-lib
 LIB_DEPENDS+=	png.2:${PORTSDIR}/graphics/png
 LIB_DEPENDS+=	tiff34.1:${PORTSDIR}/graphics/tiff34
diff --git a/graphics/gtkdps/Makefile b/graphics/gtkdps/Makefile
index 89586eca4ae8..bdb48572f860 100644
--- a/graphics/gtkdps/Makefile
+++ b/graphics/gtkdps/Makefile
@@ -3,7 +3,7 @@
 # Date created:        21 April 1998
 # Whom:                Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.3 1998/08/05 09:31:09 asami Exp $
+# $Id: Makefile,v 1.4 1998/08/07 23:56:25 asami Exp $
 #
 
 DISTNAME=	gtkDPS-0.2.11
@@ -13,7 +13,7 @@ MASTER_SITES= 	ftp://ftp.aist-nara.ac.jp/pub/personal/masata-y/gyve/fullkit/gyve
 
 MAINTAINER=	Nakai@technologist.com
 
-LIB_DEPENDS=	gtk\\.1:${PORTSDIR}/x11-toolkits/gtk
+LIB_DEPENDS=	gtk.1:${PORTSDIR}/x11-toolkits/gtk
 BUILD_DEPENDS=	pswrap:${PORTSDIR}/x11/dgs
 
 CONFIGURE_ARGS=	--with-dps-includes=${X11BASE}/include \
diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile
index f9ed45e49736..1ee64024399e 100644
--- a/graphics/imlib/Makefile
+++ b/graphics/imlib/Makefile
@@ -3,7 +3,7 @@
 # Date created:		10 June 1997
 # Whom:			Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.30 1998/09/17 00:50:47 asami Exp $
+# $Id: Makefile,v 1.31 1998/09/19 01:33:45 steve Exp $
 #
 
 DISTNAME=	imlib-1.7
@@ -18,7 +18,7 @@ LIB_DEPENDS=    png.2:${PORTSDIR}/graphics/png \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		tiff34.1:${PORTSDIR}/graphics/tiff34 \
 		gif.3:${PORTSDIR}/graphics/giflib \
-		gtk11\\.1\\.:${PORTSDIR}/x11-toolkits/gtk11
+		gtk11.1:${PORTSDIR}/x11-toolkits/gtk11
 
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
diff --git a/graphics/imlib2-tmp/Makefile b/graphics/imlib2-tmp/Makefile
index f9ed45e49736..1ee64024399e 100644
--- a/graphics/imlib2-tmp/Makefile
+++ b/graphics/imlib2-tmp/Makefile
@@ -3,7 +3,7 @@
 # Date created:		10 June 1997
 # Whom:			Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.30 1998/09/17 00:50:47 asami Exp $
+# $Id: Makefile,v 1.31 1998/09/19 01:33:45 steve Exp $
 #
 
 DISTNAME=	imlib-1.7
@@ -18,7 +18,7 @@ LIB_DEPENDS=    png.2:${PORTSDIR}/graphics/png \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		tiff34.1:${PORTSDIR}/graphics/tiff34 \
 		gif.3:${PORTSDIR}/graphics/giflib \
-		gtk11\\.1\\.:${PORTSDIR}/x11-toolkits/gtk11
+		gtk11.1:${PORTSDIR}/x11-toolkits/gtk11
 
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile
index f9ed45e49736..1ee64024399e 100644
--- a/graphics/imlib2/Makefile
+++ b/graphics/imlib2/Makefile
@@ -3,7 +3,7 @@
 # Date created:		10 June 1997
 # Whom:			Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.30 1998/09/17 00:50:47 asami Exp $
+# $Id: Makefile,v 1.31 1998/09/19 01:33:45 steve Exp $
 #
 
 DISTNAME=	imlib-1.7
@@ -18,7 +18,7 @@ LIB_DEPENDS=    png.2:${PORTSDIR}/graphics/png \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		tiff34.1:${PORTSDIR}/graphics/tiff34 \
 		gif.3:${PORTSDIR}/graphics/giflib \
-		gtk11\\.1\\.:${PORTSDIR}/x11-toolkits/gtk11
+		gtk11.1:${PORTSDIR}/x11-toolkits/gtk11
 
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile
index 457ec78de9d5..1ac23639439b 100644
--- a/graphics/sane-backends/Makefile
+++ b/graphics/sane-backends/Makefile
@@ -4,7 +4,7 @@
 # Whom:                 gary@hotlava.com
 #			obrien@FreeBSD.org
 #
-# $Id: Makefile,v 1.7 1998/09/15 11:44:07 vanilla Exp $
+# $Id: Makefile,v 1.8 1998/09/17 04:47:46 vanilla Exp $
 #
 
 DISTNAME=       sane-0.74
@@ -14,7 +14,7 @@ MASTER_SITES=	ftp://ftp.mostang.com/pub/sane/ \
 
 MAINTAINER=	gary@hotlava.com
 
-LIB_DEPENDS=	gtk11\\.1\\.:${PORTSDIR}/x11-toolkits/gtk11
+LIB_DEPENDS=	gtk11.1:${PORTSDIR}/x11-toolkits/gtk11
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
diff --git a/graphics/sane-frontends/Makefile b/graphics/sane-frontends/Makefile
index 457ec78de9d5..1ac23639439b 100644
--- a/graphics/sane-frontends/Makefile
+++ b/graphics/sane-frontends/Makefile
@@ -4,7 +4,7 @@
 # Whom:                 gary@hotlava.com
 #			obrien@FreeBSD.org
 #
-# $Id: Makefile,v 1.7 1998/09/15 11:44:07 vanilla Exp $
+# $Id: Makefile,v 1.8 1998/09/17 04:47:46 vanilla Exp $
 #
 
 DISTNAME=       sane-0.74
@@ -14,7 +14,7 @@ MASTER_SITES=	ftp://ftp.mostang.com/pub/sane/ \
 
 MAINTAINER=	gary@hotlava.com
 
-LIB_DEPENDS=	gtk11\\.1\\.:${PORTSDIR}/x11-toolkits/gtk11
+LIB_DEPENDS=	gtk11.1:${PORTSDIR}/x11-toolkits/gtk11
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
diff --git a/graphics/sane/Makefile b/graphics/sane/Makefile
index 457ec78de9d5..1ac23639439b 100644
--- a/graphics/sane/Makefile
+++ b/graphics/sane/Makefile
@@ -4,7 +4,7 @@
 # Whom:                 gary@hotlava.com
 #			obrien@FreeBSD.org
 #
-# $Id: Makefile,v 1.7 1998/09/15 11:44:07 vanilla Exp $
+# $Id: Makefile,v 1.8 1998/09/17 04:47:46 vanilla Exp $
 #
 
 DISTNAME=       sane-0.74
@@ -14,7 +14,7 @@ MASTER_SITES=	ftp://ftp.mostang.com/pub/sane/ \
 
 MAINTAINER=	gary@hotlava.com
 
-LIB_DEPENDS=	gtk11\\.1\\.:${PORTSDIR}/x11-toolkits/gtk11
+LIB_DEPENDS=	gtk11.1:${PORTSDIR}/x11-toolkits/gtk11
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
diff --git a/irc/yagirc/Makefile b/irc/yagirc/Makefile
index 936a6de460b8..04ff6c9b94d5 100644
--- a/irc/yagirc/Makefile
+++ b/irc/yagirc/Makefile
@@ -3,7 +3,7 @@
 # Date created:				6 July 1998
 # Whom:					mph
 #
-# $Id: Makefile,v 1.6 1998/08/25 04:09:28 vanilla Exp $
+# $Id: Makefile,v 1.7 1998/08/27 05:15:05 mph Exp $
 #
 
 DISTNAME=	yagirc-0.65.7
@@ -12,7 +12,7 @@ MASTER_SITES=	http://www.elpaso.net/~spoon/yagirc/
 
 MAINTAINER=	mph@freebsd.org
 
-LIB_DEPENDS=	gtk11\\.1\\.:${PORTSDIR}/x11-toolkits/gtk11 \
+LIB_DEPENDS=	gtk11.1:${PORTSDIR}/x11-toolkits/gtk11 \
 		Imlib\\.1\\.7:${PORTSDIR}/graphics/imlib \
 		esd\\.0\\.0:${PORTSDIR}/audio/esound
 
diff --git a/math/geg/Makefile b/math/geg/Makefile
index 6b280971c83f..ea71cbf534a6 100644
--- a/math/geg/Makefile
+++ b/math/geg/Makefile
@@ -3,7 +3,7 @@
 # Date created:        8 Aug 1998
 # Whom:                rom
 #
-# $Id: Makefile,v 1.1.1.1 1998/08/10 00:44:15 steve Exp $
+# $Id: Makefile,v 1.2 1998/09/16 21:47:38 vanilla Exp $
 #
 
 DISTNAME=	geg-0.12
@@ -12,7 +12,7 @@ MASTER_SITES=	http://www.geocities.com/SiliconValley/Park/2030/
 
 MAINTAINER=	rom_glsa@ein-hashofet.co.il
 
-LIB_DEPENDS=	gtk11\\.1\\.:${PORTSDIR}/x11-toolkits/gtk11
+LIB_DEPENDS=	gtk11.1:${PORTSDIR}/x11-toolkits/gtk11
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
diff --git a/net/ethereal/Makefile b/net/ethereal/Makefile
index 9281e793a95f..4c772d9645dc 100644
--- a/net/ethereal/Makefile
+++ b/net/ethereal/Makefile
@@ -3,7 +3,7 @@
 # Date created:        10 August 1998
 # Whom:                Bill Fumerola <billf@chc-chimes.com>
 #
-# $Id: $
+# $Id: Makefile,v 1.1.1.1 1998/09/18 21:53:24 vanilla Exp $
 #
 
 DISTNAME=	ethereal-0.3.16
@@ -13,7 +13,7 @@ MASTER_SITES=	http://ethereal.zing.org/distribution/ \
 
 MAINTAINER=	billf@chc-chimes.com
 
-LIB_DEPENDS=	gtk\\.1\\.5:${PORTSDIR}/x11-toolkits/gtk
+LIB_DEPENDS=	gtk.1:${PORTSDIR}/x11-toolkits/gtk
 
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
diff --git a/net/mtr/Makefile b/net/mtr/Makefile
index 930fc5f1d53a..8c961d8614d8 100644
--- a/net/mtr/Makefile
+++ b/net/mtr/Makefile
@@ -3,7 +3,7 @@
 # Date created:        12 August 1998
 # Whom:                Bill Fumerola <billf@chc-chimes.com>
 #
-# $Id: Makefile,v 1.1.1.1 1998/08/24 01:56:04 steve Exp $
+# $Id: Makefile,v 1.2 1998/08/25 00:04:05 steve Exp $
 #
 
 DISTNAME=	mtr-0.21
@@ -12,7 +12,7 @@ MASTER_SITES=	http://www.mkimball.org/
 
 MAINTAINER=	billf@chc-chimes.com
 
-LIB_DEPENDS=    gtk\\.1\\.5:${PORTSDIR}/x11-toolkits/gtk
+LIB_DEPENDS=    gtk.1:${PORTSDIR}/x11-toolkits/gtk
 
 FETCH_BEFORE_ARGS= -b
 USE_AUTOCONF=	yes
diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile
index 9281e793a95f..4c772d9645dc 100644
--- a/net/wireshark/Makefile
+++ b/net/wireshark/Makefile
@@ -3,7 +3,7 @@
 # Date created:        10 August 1998
 # Whom:                Bill Fumerola <billf@chc-chimes.com>
 #
-# $Id: $
+# $Id: Makefile,v 1.1.1.1 1998/09/18 21:53:24 vanilla Exp $
 #
 
 DISTNAME=	ethereal-0.3.16
@@ -13,7 +13,7 @@ MASTER_SITES=	http://ethereal.zing.org/distribution/ \
 
 MAINTAINER=	billf@chc-chimes.com
 
-LIB_DEPENDS=	gtk\\.1\\.5:${PORTSDIR}/x11-toolkits/gtk
+LIB_DEPENDS=	gtk.1:${PORTSDIR}/x11-toolkits/gtk
 
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
diff --git a/sysutils/xlogmaster/Makefile b/sysutils/xlogmaster/Makefile
index f9680ba696c1..ff98d2abd8a7 100644
--- a/sysutils/xlogmaster/Makefile
+++ b/sysutils/xlogmaster/Makefile
@@ -3,7 +3,7 @@
 # Date created:		1 August 1998
 # Whom:			Adrian Wontroba <aw1@stade.co.uk>
 #
-# $Id: Makefile,v 1.6 1998/09/15 12:06:45 vanilla Exp $
+# $Id: Makefile,v 1.7 1998/09/19 10:55:11 vanilla Exp $
 #
 
 DISTNAME=	xlogmaster-1.4.4
@@ -15,7 +15,7 @@ MASTER_SITES=	ftp://sunsite.doc.ic.ac.uk/packages/gnu/\
 
 MAINTAINER=	aw1@stade.co.uk
 
-LIB_DEPENDS=	gtk11\\.1\\.:${PORTSDIR}/x11-toolkits/gtk11
+LIB_DEPENDS=	gtk11.1:${PORTSDIR}/x11-toolkits/gtk11
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CXXFLAGS="${CFLAGS}" GTK_CONFIG="${PREFIX}/bin/gtk11-config"
diff --git a/sysutils/xwatch/Makefile b/sysutils/xwatch/Makefile
index 2ce9cac40dc4..b2840d4d446c 100644
--- a/sysutils/xwatch/Makefile
+++ b/sysutils/xwatch/Makefile
@@ -3,7 +3,7 @@
 # Date created:				17 July 1998
 # Whom:					mph
 #
-# $Id: Makefile,v 1.2 1998/08/07 23:56:48 asami Exp $
+# $Id: Makefile,v 1.3 1998/08/26 18:32:47 mph Exp $
 #
 
 DISTNAME=	xwatch-0.1.0
@@ -12,7 +12,7 @@ MASTER_SITES=	http://hem.passagen.se/osk/
 
 MAINTAINER=	mph@freebsd.org
 
-LIB_DEPENDS=	gtk\\.1:${PORTSDIR}/x11-toolkits/gtk
+LIB_DEPENDS=	gtk.1:${PORTSDIR}/x11-toolkits/gtk
 
 USE_XLIB=	yes
 GNU_CONFIGURE=	yes
diff --git a/x11-fm/workplace/Makefile b/x11-fm/workplace/Makefile
index 464be6183510..e2faf0b38903 100644
--- a/x11-fm/workplace/Makefile
+++ b/x11-fm/workplace/Makefile
@@ -3,7 +3,7 @@
 # Date created:				7 March 1998
 # Whom:					Andrey Zakhvatov
 #
-# $Id: Makefile,v 1.7 1998/08/20 07:56:20 asami Exp $
+# $Id: Makefile,v 1.8 1998/08/20 11:18:07 vanilla Exp $
 #
 
 DISTNAME=	workplace-1.0.a3
@@ -13,7 +13,7 @@ MASTER_SITES=	http://www2.osk.3web.ne.jp/~hideki70/src/
 
 MAINTAINER=	andy@icc.surw.chel.su
 
-LIB_DEPENDS=	gtk\\.1\\.:${PORTSDIR}/x11-toolkits/gtk
+LIB_DEPENDS=	gtk.1:${PORTSDIR}/x11-toolkits/gtk
 
 GNU_CONFIGURE=	yes
 USE_X_PREFIX=	yes
diff --git a/x11-toolkits/gtk--/Makefile b/x11-toolkits/gtk--/Makefile
index e62d212a4092..b6afb7d7bca1 100644
--- a/x11-toolkits/gtk--/Makefile
+++ b/x11-toolkits/gtk--/Makefile
@@ -3,7 +3,7 @@
 # Date created:        11 May 1998
 # Whom:                Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.1.1.1 1998/08/31 22:01:46 kuriyama Exp $
+# $Id: Makefile,v 1.2 1998/09/15 09:39:00 asami Exp $
 #
 
 DISTNAME=	Gtk---0.9.14
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://ftp.gimp.org/pub/gtk/gtk--/
 
 MAINTAINER=	Nakai@technologist.com
 
-LIB_DEPENDS=	gtk11\\.1\\.:${PORTSDIR}/x11-toolkits/gtk11
+LIB_DEPENDS=	gtk11.1:${PORTSDIR}/x11-toolkits/gtk11
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
 # Why gtk11 port renames gtk-config to gtk11-config? (patch-ae)
diff --git a/x11-toolkits/gtk--2/Makefile b/x11-toolkits/gtk--2/Makefile
index e62d212a4092..b6afb7d7bca1 100644
--- a/x11-toolkits/gtk--2/Makefile
+++ b/x11-toolkits/gtk--2/Makefile
@@ -3,7 +3,7 @@
 # Date created:        11 May 1998
 # Whom:                Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.1.1.1 1998/08/31 22:01:46 kuriyama Exp $
+# $Id: Makefile,v 1.2 1998/09/15 09:39:00 asami Exp $
 #
 
 DISTNAME=	Gtk---0.9.14
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://ftp.gimp.org/pub/gtk/gtk--/
 
 MAINTAINER=	Nakai@technologist.com
 
-LIB_DEPENDS=	gtk11\\.1\\.:${PORTSDIR}/x11-toolkits/gtk11
+LIB_DEPENDS=	gtk11.1:${PORTSDIR}/x11-toolkits/gtk11
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
 # Why gtk11 port renames gtk-config to gtk11-config? (patch-ae)
diff --git a/x11-toolkits/gtkmm12/Makefile b/x11-toolkits/gtkmm12/Makefile
index e62d212a4092..b6afb7d7bca1 100644
--- a/x11-toolkits/gtkmm12/Makefile
+++ b/x11-toolkits/gtkmm12/Makefile
@@ -3,7 +3,7 @@
 # Date created:        11 May 1998
 # Whom:                Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.1.1.1 1998/08/31 22:01:46 kuriyama Exp $
+# $Id: Makefile,v 1.2 1998/09/15 09:39:00 asami Exp $
 #
 
 DISTNAME=	Gtk---0.9.14
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://ftp.gimp.org/pub/gtk/gtk--/
 
 MAINTAINER=	Nakai@technologist.com
 
-LIB_DEPENDS=	gtk11\\.1\\.:${PORTSDIR}/x11-toolkits/gtk11
+LIB_DEPENDS=	gtk11.1:${PORTSDIR}/x11-toolkits/gtk11
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
 # Why gtk11 port renames gtk-config to gtk11-config? (patch-ae)
diff --git a/x11-toolkits/gtkmm20/Makefile b/x11-toolkits/gtkmm20/Makefile
index e62d212a4092..b6afb7d7bca1 100644
--- a/x11-toolkits/gtkmm20/Makefile
+++ b/x11-toolkits/gtkmm20/Makefile
@@ -3,7 +3,7 @@
 # Date created:        11 May 1998
 # Whom:                Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.1.1.1 1998/08/31 22:01:46 kuriyama Exp $
+# $Id: Makefile,v 1.2 1998/09/15 09:39:00 asami Exp $
 #
 
 DISTNAME=	Gtk---0.9.14
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://ftp.gimp.org/pub/gtk/gtk--/
 
 MAINTAINER=	Nakai@technologist.com
 
-LIB_DEPENDS=	gtk11\\.1\\.:${PORTSDIR}/x11-toolkits/gtk11
+LIB_DEPENDS=	gtk11.1:${PORTSDIR}/x11-toolkits/gtk11
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
 # Why gtk11 port renames gtk-config to gtk11-config? (patch-ae)
diff --git a/x11-toolkits/gtkmm24/Makefile b/x11-toolkits/gtkmm24/Makefile
index e62d212a4092..b6afb7d7bca1 100644
--- a/x11-toolkits/gtkmm24/Makefile
+++ b/x11-toolkits/gtkmm24/Makefile
@@ -3,7 +3,7 @@
 # Date created:        11 May 1998
 # Whom:                Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.1.1.1 1998/08/31 22:01:46 kuriyama Exp $
+# $Id: Makefile,v 1.2 1998/09/15 09:39:00 asami Exp $
 #
 
 DISTNAME=	Gtk---0.9.14
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://ftp.gimp.org/pub/gtk/gtk--/
 
 MAINTAINER=	Nakai@technologist.com
 
-LIB_DEPENDS=	gtk11\\.1\\.:${PORTSDIR}/x11-toolkits/gtk11
+LIB_DEPENDS=	gtk11.1:${PORTSDIR}/x11-toolkits/gtk11
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
 # Why gtk11 port renames gtk-config to gtk11-config? (patch-ae)
diff --git a/x11-toolkits/gtkmm30/Makefile b/x11-toolkits/gtkmm30/Makefile
index e62d212a4092..b6afb7d7bca1 100644
--- a/x11-toolkits/gtkmm30/Makefile
+++ b/x11-toolkits/gtkmm30/Makefile
@@ -3,7 +3,7 @@
 # Date created:        11 May 1998
 # Whom:                Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.1.1.1 1998/08/31 22:01:46 kuriyama Exp $
+# $Id: Makefile,v 1.2 1998/09/15 09:39:00 asami Exp $
 #
 
 DISTNAME=	Gtk---0.9.14
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://ftp.gimp.org/pub/gtk/gtk--/
 
 MAINTAINER=	Nakai@technologist.com
 
-LIB_DEPENDS=	gtk11\\.1\\.:${PORTSDIR}/x11-toolkits/gtk11
+LIB_DEPENDS=	gtk11.1:${PORTSDIR}/x11-toolkits/gtk11
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
 # Why gtk11 port renames gtk-config to gtk11-config? (patch-ae)
diff --git a/x11-toolkits/p5-Gtk/Makefile b/x11-toolkits/p5-Gtk/Makefile
index f824cb285e54..41bb199aeb06 100644
--- a/x11-toolkits/p5-Gtk/Makefile
+++ b/x11-toolkits/p5-Gtk/Makefile
@@ -3,7 +3,7 @@
 # Date created:		28 Oct 1997
 # Whom:	      		Vanilla I. Shu <vanilla@MinJe.com.TW>
 #
-# $Id: Makefile,v 1.13 1998/08/19 14:30:39 vanilla Exp $
+# $Id: Makefile,v 1.14 1998/09/15 21:31:58 asami Exp $
 #
 
 DISTNAME=	Gtk-0.3
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	Gtk
 
 MAINTAINER=	vanilla@FreeBSD.ORG
 
-LIB_DEPENDS=	gtk\\.1\\.:${PORTSDIR}/x11-toolkits/gtk
+LIB_DEPENDS=	gtk.1:${PORTSDIR}/x11-toolkits/gtk
 
 USE_PERL5=	YES
 
diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile
index 90c748610deb..5687f79de53e 100644
--- a/x11/gnome-libs/Makefile
+++ b/x11/gnome-libs/Makefile
@@ -3,7 +3,7 @@
 # Date created:        17 June 1998
 # Whom:                Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.7 1998/09/17 00:50:51 asami Exp $
+# $Id: Makefile,v 1.8 1998/09/19 01:33:47 steve Exp $
 #
 
 DISTNAME=	gnome-libs-0.27
@@ -16,7 +16,7 @@ MAINTAINER=	Nakai@technologist.com
 
 BUILD_DEPENDS=	gettext:${PORTSDIR}/devel/gettext
 LIB_DEPENDS=	gdk_imlib\\.1\\.7:${PORTSDIR}/graphics/imlib
-LIB_DEPENDS+=	gtk11\\.1\\.:${PORTSDIR}/x11-toolkits/gtk11
+LIB_DEPENDS+=	gtk11.1:${PORTSDIR}/x11-toolkits/gtk11
 LIB_DEPENDS+=	tiff34.1:${PORTSDIR}/graphics/tiff34
 LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg
 LIB_DEPENDS+=	gif.3:${PORTSDIR}/graphics/giflib
diff --git a/x11/gnomelibs/Makefile b/x11/gnomelibs/Makefile
index 90c748610deb..5687f79de53e 100644
--- a/x11/gnomelibs/Makefile
+++ b/x11/gnomelibs/Makefile
@@ -3,7 +3,7 @@
 # Date created:        17 June 1998
 # Whom:                Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.7 1998/09/17 00:50:51 asami Exp $
+# $Id: Makefile,v 1.8 1998/09/19 01:33:47 steve Exp $
 #
 
 DISTNAME=	gnome-libs-0.27
@@ -16,7 +16,7 @@ MAINTAINER=	Nakai@technologist.com
 
 BUILD_DEPENDS=	gettext:${PORTSDIR}/devel/gettext
 LIB_DEPENDS=	gdk_imlib\\.1\\.7:${PORTSDIR}/graphics/imlib
-LIB_DEPENDS+=	gtk11\\.1\\.:${PORTSDIR}/x11-toolkits/gtk11
+LIB_DEPENDS+=	gtk11.1:${PORTSDIR}/x11-toolkits/gtk11
 LIB_DEPENDS+=	tiff34.1:${PORTSDIR}/graphics/tiff34
 LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg
 LIB_DEPENDS+=	gif.3:${PORTSDIR}/graphics/giflib
diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile
index 90c748610deb..5687f79de53e 100644
--- a/x11/libgnome/Makefile
+++ b/x11/libgnome/Makefile
@@ -3,7 +3,7 @@
 # Date created:        17 June 1998
 # Whom:                Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.7 1998/09/17 00:50:51 asami Exp $
+# $Id: Makefile,v 1.8 1998/09/19 01:33:47 steve Exp $
 #
 
 DISTNAME=	gnome-libs-0.27
@@ -16,7 +16,7 @@ MAINTAINER=	Nakai@technologist.com
 
 BUILD_DEPENDS=	gettext:${PORTSDIR}/devel/gettext
 LIB_DEPENDS=	gdk_imlib\\.1\\.7:${PORTSDIR}/graphics/imlib
-LIB_DEPENDS+=	gtk11\\.1\\.:${PORTSDIR}/x11-toolkits/gtk11
+LIB_DEPENDS+=	gtk11.1:${PORTSDIR}/x11-toolkits/gtk11
 LIB_DEPENDS+=	tiff34.1:${PORTSDIR}/graphics/tiff34
 LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg
 LIB_DEPENDS+=	gif.3:${PORTSDIR}/graphics/giflib