From 92103d6d5cd276d1373540bf8b9d97a23929f822 Mon Sep 17 00:00:00 2001 From: Steve Price Date: Sat, 29 May 1999 03:56:15 +0000 Subject: Update to use gtk version 1.2.3. PR: 11842 Submitted by: Jeremy Lea --- net/ethereal/Makefile | 9 +++++---- net/gaim-snapshot/Makefile | 14 ++++++++------ net/gaim/Makefile | 14 ++++++++------ net/ggsd/Makefile | 4 ++-- net/gicq/Makefile | 11 +++++++---- net/gicq/pkg-plist | 2 +- net/mtr/Makefile | 4 ++-- net/wireshark/Makefile | 9 +++++---- net/xwhois/Makefile | 8 +++++--- 9 files changed, 43 insertions(+), 32 deletions(-) (limited to 'net') diff --git a/net/ethereal/Makefile b/net/ethereal/Makefile index 869d2ecf76cd..2d3cc745ca62 100644 --- a/net/ethereal/Makefile +++ b/net/ethereal/Makefile @@ -3,7 +3,7 @@ # Date created: 10 August 1998 # Whom: Bill Fumerola # -# $Id: Makefile,v 1.9 1999/04/22 07:53:01 mharo Exp $ +# $Id: Makefile,v 1.10 1999/05/25 18:24:34 mharo Exp $ # DISTNAME= ethereal-0.6.2 @@ -13,12 +13,13 @@ MASTER_SITES= http://ethereal.zing.org/distribution/ \ MAINTAINER= billf@FreeBSD.ORG -LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 + +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config USE_X_PREFIX= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= GTK_CONFIG="${X11BASE}/bin/gtk12-config" \ - GLIB_CONFIG="${LOCALBASE}/bin/glib12-config" +CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" MAN1= ethereal.1 diff --git a/net/gaim-snapshot/Makefile b/net/gaim-snapshot/Makefile index 0dea7699e6a9..0a944c0c5e0f 100644 --- a/net/gaim-snapshot/Makefile +++ b/net/gaim-snapshot/Makefile @@ -3,7 +3,7 @@ # Date created: 26 Mar 1999 # Whom: Jim Mock # -# $Id: Makefile,v 1.3 1999/04/20 03:06:01 mharo Exp $ +# $Id: Makefile,v 1.4 1999/05/05 14:13:41 flathill Exp $ # DISTNAME= gaim-0.8.0 @@ -16,15 +16,17 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= jim@phrantic.phear.net -LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 \ - glib12.1:${PORTSDIR}/devel/glib12 +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ + glib12.2:${PORTSDIR}/devel/glib12 + +GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config GNU_CONFIGURE= yes USE_GMAKE= yes USE_X_PREFIX= yes - -CONFIGURE_ENV= GTK_CONFIG="${X11BASE}/bin/gtk12-config" \ - GLIB_CONFIG="${LOCALBASE}/bin/glib12-config" +CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" \ + GLIB_CONFIG="${GLIB_CONFIG}" post-patch: ${CP} ${DISTDIR}/logo.xpm.gz ${WRKSRC}/pixmaps diff --git a/net/gaim/Makefile b/net/gaim/Makefile index 0dea7699e6a9..0a944c0c5e0f 100644 --- a/net/gaim/Makefile +++ b/net/gaim/Makefile @@ -3,7 +3,7 @@ # Date created: 26 Mar 1999 # Whom: Jim Mock # -# $Id: Makefile,v 1.3 1999/04/20 03:06:01 mharo Exp $ +# $Id: Makefile,v 1.4 1999/05/05 14:13:41 flathill Exp $ # DISTNAME= gaim-0.8.0 @@ -16,15 +16,17 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= jim@phrantic.phear.net -LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 \ - glib12.1:${PORTSDIR}/devel/glib12 +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ + glib12.2:${PORTSDIR}/devel/glib12 + +GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config GNU_CONFIGURE= yes USE_GMAKE= yes USE_X_PREFIX= yes - -CONFIGURE_ENV= GTK_CONFIG="${X11BASE}/bin/gtk12-config" \ - GLIB_CONFIG="${LOCALBASE}/bin/glib12-config" +CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" \ + GLIB_CONFIG="${GLIB_CONFIG}" post-patch: ${CP} ${DISTDIR}/logo.xpm.gz ${WRKSRC}/pixmaps diff --git a/net/ggsd/Makefile b/net/ggsd/Makefile index be1367f2c70d..d4c8890c0e8d 100644 --- a/net/ggsd/Makefile +++ b/net/ggsd/Makefile @@ -3,7 +3,7 @@ # Date created: 14 February 1999 # Whom: Dima Sivachenko # -# $Id: Makefile,v 1.2 1999/02/27 19:32:09 billf Exp $ +# $Id: Makefile,v 1.3 1999/04/22 07:50:40 mharo Exp $ # DISTNAME= ggsd @@ -16,7 +16,7 @@ EXTRACT_SUFX= .tar MAINTAINER= dima@chg.ru -LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 WRKSRC= ${WRKDIR}/GGSD EXTRACT_CMD= ${TAR} diff --git a/net/gicq/Makefile b/net/gicq/Makefile index e299ef70dec1..d5bd29129b0d 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.6 1999/04/06 12:02:41 flathill Exp $ +# $Id: Makefile,v 1.7 1999/05/08 01:42:40 taoka Exp $ # DISTNAME= gicq-0.33 @@ -13,13 +13,16 @@ MASTER_SITES= ftp://ftp.korsoft.com/pub/gicq/ \ MAINTAINER= flathill@FreeBSD.ORG -LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 \ +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ icq.0:${PORTSDIR}/net/libicq +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config + USE_X_PREFIX= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-gnome --disable-nls -CONFIGURE_ENV= GTK_CONFIG="${X11BASE}/bin/gtk12-config" \ - CFLAGS="${CFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + GTK_CONFIG="${GTK_CONFIG}" \ + LIBS="-L${LOCALBASE}/lib" .include diff --git a/net/gicq/pkg-plist b/net/gicq/pkg-plist index a8425957eda3..ec71b337f897 100644 --- a/net/gicq/pkg-plist +++ b/net/gicq/pkg-plist @@ -1,6 +1,6 @@ bin/gicq +share/gnome/apps/Applications/gicq.desktop share/gnome/help/gicq/C/index.html share/gnome/help/gicq/C/topic.dat @dirrm share/gnome/help/gicq/C @dirrm share/gnome/help/gicq -share/gnome/apps/Applications/gicq.desktop diff --git a/net/mtr/Makefile b/net/mtr/Makefile index 4e0db7bc84e1..4cba652f2927 100644 --- a/net/mtr/Makefile +++ b/net/mtr/Makefile @@ -3,7 +3,7 @@ # Date created: 12 August 1998 # Whom: Bill Fumerola # -# $Id:$ +# $Id: Makefile,v 1.8 1999/04/13 20:53:16 billf Exp $ # DISTNAME= mtr-0.37 @@ -26,7 +26,7 @@ pre-fetch: CONFIGURE_ARGS=--with-gtk-prefix=/nopath .else USE_XLIB= yes -LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 CONFIGURE_ENV= GTK_CONFIG="${X11BASE}/bin/gtk12-config" .endif diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile index 869d2ecf76cd..2d3cc745ca62 100644 --- a/net/wireshark/Makefile +++ b/net/wireshark/Makefile @@ -3,7 +3,7 @@ # Date created: 10 August 1998 # Whom: Bill Fumerola # -# $Id: Makefile,v 1.9 1999/04/22 07:53:01 mharo Exp $ +# $Id: Makefile,v 1.10 1999/05/25 18:24:34 mharo Exp $ # DISTNAME= ethereal-0.6.2 @@ -13,12 +13,13 @@ MASTER_SITES= http://ethereal.zing.org/distribution/ \ MAINTAINER= billf@FreeBSD.ORG -LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 + +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config USE_X_PREFIX= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= GTK_CONFIG="${X11BASE}/bin/gtk12-config" \ - GLIB_CONFIG="${LOCALBASE}/bin/glib12-config" +CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" MAN1= ethereal.1 diff --git a/net/xwhois/Makefile b/net/xwhois/Makefile index 2c177f2cf1dd..a395f21757db 100644 --- a/net/xwhois/Makefile +++ b/net/xwhois/Makefile @@ -3,7 +3,7 @@ # Date created: 31 December 1998 # Whom: Kris Kennaway # -# $Id: Makefile,v 1.4 1999/04/24 14:13:34 kris Exp $ +# $Id: Makefile,v 1.5 1999/05/27 12:49:55 kris Exp $ # DISTNAME= xwhois-0.3.5 @@ -17,11 +17,13 @@ MASTER_SITES= http://c64.org/~nr/ \ MAINTAINER= kris@FreeBSD.ORG -LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 + +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config USE_X_PREFIX= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= GTK_CONFIG=${X11BASE}/bin/gtk12-config +CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/xwhois ${PREFIX}/bin -- cgit v1.2.3