summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacques Vidrine <nectar@FreeBSD.org>1999-01-22 22:18:10 +0000
committerJacques Vidrine <nectar@FreeBSD.org>1999-01-22 22:18:10 +0000
commitc7470ab0c2c3a173a27354ead594260c5d649fd9 (patch)
tree080f901629e4aedcbdf0fe34e206e76b13c4a7b3
parentOops, forgot to update depends. (diff)
Fixup: Ports that want gtk+ 1.0.x should now reference gtk10-config.
Notes
Notes: svn path=/head/; revision=16271
-rw-r--r--ftp/axyftp/Makefile4
-rw-r--r--graphics/sane-backends/Makefile10
-rw-r--r--graphics/sane-frontends/Makefile10
-rw-r--r--graphics/sane/Makefile10
-rw-r--r--misc/gtkfind/Makefile5
-rw-r--r--net-im/gicq/Makefile7
-rw-r--r--net/gicq/Makefile7
-rw-r--r--net/mtr/Makefile5
8 files changed, 34 insertions, 24 deletions
diff --git a/ftp/axyftp/Makefile b/ftp/axyftp/Makefile
index 0c76dfad3aee..23ddb48503c8 100644
--- a/ftp/axyftp/Makefile
+++ b/ftp/axyftp/Makefile
@@ -3,7 +3,7 @@
# Date created: 22 October 1998
# Whom: Antti Kaipila <anttik@iki.fi>
#
-# $Id: Makefile,v 1.1.1.1 1998/12/01 22:11:59 billf Exp $
+# $Id: Makefile,v 1.2 1999/01/18 03:26:43 steve Exp $
#
DISTNAME= wxftp-0.4.1.src
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= system/network/file-transfer
MAINTAINER= anttik@iki.fi
-LIB_DEPENDS= gtk.1:${PORTSDIR}/x11-toolkits/gtk
+LIB_DEPENDS= gtk10.1:${PORTSDIR}/x11-toolkits/gtk10
WRKSRC= ${WRKDIR}/${PKGNAME}/src
USE_GMAKE= yes
diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile
index 6e89b6e9daf4..6f5706fca32b 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.11 1998/10/05 03:04:39 steve Exp $
+# $Id: Makefile,v 1.12 1998/12/06 09:37:28 vanilla Exp $
#
DISTNAME= sane-1.00
@@ -14,7 +14,7 @@ MASTER_SITES= ftp://ftp.mostang.com/pub/sane/ \
MAINTAINER= gary@hotlava.com
-LIB_DEPENDS= gtk.1:${PORTSDIR}/x11-toolkits/gtk \
+LIB_DEPENDS= gtk10.1:${PORTSDIR}/x11-toolkits/gtk10 \
jpeg.9:${PORTSDIR}/graphics/jpeg
VERSION!= sysctl -n kern.osreldate
@@ -23,10 +23,12 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
.if ${VERSION} < 300000
CONFIGURE_ENV= CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib"
+ LIBS="-L${LOCALBASE}/lib" \
+ GTK_CONFIG="${X11BASE}/bin/gtk10-config"
.else
CONFIGURE_ENV= CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib -lcam"
+ LIBS="-L${LOCALBASE}/lib -lcam" \
+ GTK_CONFIG="${X11BASE}/bin/gtk10-config"
.endif
MAN1= scanimage.1 \
diff --git a/graphics/sane-frontends/Makefile b/graphics/sane-frontends/Makefile
index 6e89b6e9daf4..6f5706fca32b 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.11 1998/10/05 03:04:39 steve Exp $
+# $Id: Makefile,v 1.12 1998/12/06 09:37:28 vanilla Exp $
#
DISTNAME= sane-1.00
@@ -14,7 +14,7 @@ MASTER_SITES= ftp://ftp.mostang.com/pub/sane/ \
MAINTAINER= gary@hotlava.com
-LIB_DEPENDS= gtk.1:${PORTSDIR}/x11-toolkits/gtk \
+LIB_DEPENDS= gtk10.1:${PORTSDIR}/x11-toolkits/gtk10 \
jpeg.9:${PORTSDIR}/graphics/jpeg
VERSION!= sysctl -n kern.osreldate
@@ -23,10 +23,12 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
.if ${VERSION} < 300000
CONFIGURE_ENV= CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib"
+ LIBS="-L${LOCALBASE}/lib" \
+ GTK_CONFIG="${X11BASE}/bin/gtk10-config"
.else
CONFIGURE_ENV= CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib -lcam"
+ LIBS="-L${LOCALBASE}/lib -lcam" \
+ GTK_CONFIG="${X11BASE}/bin/gtk10-config"
.endif
MAN1= scanimage.1 \
diff --git a/graphics/sane/Makefile b/graphics/sane/Makefile
index 6e89b6e9daf4..6f5706fca32b 100644
--- a/graphics/sane/Makefile
+++ b/graphics/sane/Makefile
@@ -4,7 +4,7 @@
# Whom: gary@hotlava.com
# obrien@FreeBSD.org
#
-# $Id: Makefile,v 1.11 1998/10/05 03:04:39 steve Exp $
+# $Id: Makefile,v 1.12 1998/12/06 09:37:28 vanilla Exp $
#
DISTNAME= sane-1.00
@@ -14,7 +14,7 @@ MASTER_SITES= ftp://ftp.mostang.com/pub/sane/ \
MAINTAINER= gary@hotlava.com
-LIB_DEPENDS= gtk.1:${PORTSDIR}/x11-toolkits/gtk \
+LIB_DEPENDS= gtk10.1:${PORTSDIR}/x11-toolkits/gtk10 \
jpeg.9:${PORTSDIR}/graphics/jpeg
VERSION!= sysctl -n kern.osreldate
@@ -23,10 +23,12 @@ USE_GMAKE= yes
GNU_CONFIGURE= yes
.if ${VERSION} < 300000
CONFIGURE_ENV= CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib"
+ LIBS="-L${LOCALBASE}/lib" \
+ GTK_CONFIG="${X11BASE}/bin/gtk10-config"
.else
CONFIGURE_ENV= CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib -lcam"
+ LIBS="-L${LOCALBASE}/lib -lcam" \
+ GTK_CONFIG="${X11BASE}/bin/gtk10-config"
.endif
MAN1= scanimage.1 \
diff --git a/misc/gtkfind/Makefile b/misc/gtkfind/Makefile
index af2508841494..c03d5aa01587 100644
--- a/misc/gtkfind/Makefile
+++ b/misc/gtkfind/Makefile
@@ -3,7 +3,7 @@
# Date created: 28 Sept 1998
# Whom: Bill Fumerola <billf@chc-chimes.com>
#
-# $Id: Makefile,v 1.1.1.1 1998/11/17 21:53:22 billf Exp $
+# $Id: Makefile,v 1.2 1998/11/18 19:25:17 billf Exp $
#
DISTNAME= gtkfind-0.9
@@ -12,9 +12,10 @@ MASTER_SITES= http://www.oz.net/~mattg/
MAINTAINER= billf@FreeBSD.org
-LIB_DEPENDS= gtk.1:${PORTSDIR}/x11-toolkits/gtk
+LIB_DEPENDS= gtk10.1:${PORTSDIR}/x11-toolkits/gtk10
ALL_TARGET= gtkfind
+CONFIGURE_ENV= GTK_CONFIG="${X11BASE}/bin/gtk10-config"
MAN1= gtkfind.1
diff --git a/net-im/gicq/Makefile b/net-im/gicq/Makefile
index 316d1f655066..cfa150ed5ba9 100644
--- a/net-im/gicq/Makefile
+++ b/net-im/gicq/Makefile
@@ -3,7 +3,7 @@
# Date Created: 31 Oct 1998
# Whom: Seiichirou Hiraoka
#
-# $Id: Makefile,v 1.2 1998/11/23 08:34:52 asami Exp $
+# $Id: Makefile,v 1.3 1998/12/11 02:30:32 flathill Exp $
#
DISTNAME= gicq-0.22
@@ -12,12 +12,13 @@ MASTER_SITES= http://www.montana.com/gabriel/gicq/files/
MAINTAINER= flathill@FreeBSD.ORG
-LIB_DEPENDS= gtk.1:${PORTSDIR}/x11-toolkits/gtk \
+LIB_DEPENDS= gtk10.1:${PORTSDIR}/x11-toolkits/gtk10 \
icq.0:${PORTSDIR}/devel/libicq
USE_X_PREFIX= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --without-gnome --disable-nls
-CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib"
+CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib" \
+ GTK_CONFIG="${X11BASE}/bin/gtk10-config"
.include <bsd.port.mk>
diff --git a/net/gicq/Makefile b/net/gicq/Makefile
index 316d1f655066..cfa150ed5ba9 100644
--- a/net/gicq/Makefile
+++ b/net/gicq/Makefile
@@ -3,7 +3,7 @@
# Date Created: 31 Oct 1998
# Whom: Seiichirou Hiraoka
#
-# $Id: Makefile,v 1.2 1998/11/23 08:34:52 asami Exp $
+# $Id: Makefile,v 1.3 1998/12/11 02:30:32 flathill Exp $
#
DISTNAME= gicq-0.22
@@ -12,12 +12,13 @@ MASTER_SITES= http://www.montana.com/gabriel/gicq/files/
MAINTAINER= flathill@FreeBSD.ORG
-LIB_DEPENDS= gtk.1:${PORTSDIR}/x11-toolkits/gtk \
+LIB_DEPENDS= gtk10.1:${PORTSDIR}/x11-toolkits/gtk10 \
icq.0:${PORTSDIR}/devel/libicq
USE_X_PREFIX= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --without-gnome --disable-nls
-CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib"
+CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib" \
+ GTK_CONFIG="${X11BASE}/bin/gtk10-config"
.include <bsd.port.mk>
diff --git a/net/mtr/Makefile b/net/mtr/Makefile
index afc731b2a225..1c822fd424b2 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.4 1998/11/04 03:47:08 jkoshy Exp $
+# $Id: Makefile,v 1.5 1998/12/29 18:22:58 billf Exp $
#
DISTNAME= mtr-0.28
@@ -12,10 +12,11 @@ MASTER_SITES= ftp://ftp.bitwizard.nl/mtr/
MAINTAINER= billf@FreeBSD.org
-LIB_DEPENDS= gtk.1:${PORTSDIR}/x11-toolkits/gtk
+LIB_DEPENDS= gtk10.1:${PORTSDIR}/x11-toolkits/gtk10
USE_AUTOCONF= yes
USE_XLIB= yes
+CONFIGURE_ENV= GTK_CONFIG="${X11BASE}/bin/gtk10-config"
MAN8= mtr.8