diff options
| author | steve <steve@FreeBSD.org> | 1999-05-29 11:56:15 +0800 |
|---|---|---|
| committer | steve <steve@FreeBSD.org> | 1999-05-29 11:56:15 +0800 |
| commit | ff2c6bac0ded6793103b12ed47ec261ee75b026f (patch) | |
| tree | 5d44c4203ffb617246e3922b0cbae09608e0e203 | |
| parent | 09dcfd52af329c174b5aedbac6986cf817fe17d5 (diff) | |
| download | freebsd-ports-gnome-ff2c6bac0ded6793103b12ed47ec261ee75b026f.tar.gz freebsd-ports-gnome-ff2c6bac0ded6793103b12ed47ec261ee75b026f.tar.zst freebsd-ports-gnome-ff2c6bac0ded6793103b12ed47ec261ee75b026f.zip | |
Update to use gtk version 1.2.3.
PR: 11842
Submitted by: Jeremy Lea <reg@shale.csir.co.za>
76 files changed, 383 insertions, 247 deletions
diff --git a/audio/gmixer/Makefile b/audio/gmixer/Makefile index 921b8585effa..6955e2753a9e 100644 --- a/audio/gmixer/Makefile +++ b/audio/gmixer/Makefile @@ -3,7 +3,7 @@ # Date created: 25 February 1999 # Whom: Chris Piazza <cpiazza@home.net> # -# $Id: Makefile,v 1.1.1.1 1999/04/03 01:48:17 steve Exp $ +# $Id: Makefile,v 1.2 1999/04/06 09:36:42 jseger Exp $ # DISTNAME= gmixer-0.98c @@ -12,7 +12,7 @@ MASTER_SITES= http://junior.technion.ac.il/~sergey/linux/ MAINTAINER= cpiazza@home.net -LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 ALL_TARGET= gmixer diff --git a/audio/replay/Makefile b/audio/replay/Makefile index cc249a75dd0a..d1964a449c9c 100644 --- a/audio/replay/Makefile +++ b/audio/replay/Makefile @@ -3,7 +3,7 @@ # Date created: Oct 27 1998 # Whom: Vanilla Pooh Shu <vanilla@FreeBSD.ORG> # -# $Id: Makefile,v 1.8 1999/02/03 07:28:39 asami Exp $ +# $Id: Makefile,v 1.9 1999/04/22 04:40:42 mharo Exp $ # DISTNAME= replay-source-dgtk_0.61 @@ -13,7 +13,7 @@ MASTER_SITES= http://replay.linuxpower.org/files/ MAINTAINER= nacai@iname.com -LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 USE_X_PREFIX= yes GNU_CONFIGURE= yes diff --git a/cad/geda/Makefile b/cad/geda/Makefile index ec319d43ccb8..226af4bd45f4 100644 --- a/cad/geda/Makefile +++ b/cad/geda/Makefile @@ -3,7 +3,7 @@ # Date created: 24 Nov 1998 # Whom: Vanilla I. Shu <vanilla@FreeBSD.ORG> # -# $Id: Makefile,v 1.8 1999/02/19 04:28:52 vanilla Exp $ +# $Id: Makefile,v 1.9 1999/04/22 20:06:32 mharo Exp $ # DISTNAME= gEDA-19990327 @@ -15,15 +15,13 @@ MASTER_SITES= http://www.geda.seul.org/dist/ \ MAINTAINER= vanilla@FreeBSD.ORG -LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 \ +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ guile.4:${PORTSDIR}/lang/guile -USE_X_PREFIX= yes -GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${CFLAGS}" -CONFIGURE_ARGS= --with-gtk-config=${X11BASE}/bin/gtk12-config +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config -post-install: - @${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib +USE_X_PREFIX= yes +USE_LIBTOOL= yes +CONFIGURE_ARGS= --with-gtk-config=${GTK_CONFIG} .include <bsd.port.mk> diff --git a/cad/geda/pkg-plist b/cad/geda/pkg-plist index d9071a7f23eb..10cd61d0a298 100644 --- a/cad/geda/pkg-plist +++ b/cad/geda/pkg-plist @@ -8,7 +8,6 @@ bin/gsymcheck bin/mk_sym bin/smash_megafile lib/libgeda.a -lib/libgeda.la lib/libgeda.so lib/libgeda.so.2.2 share/gEDA/scheme/gnetlist.scm diff --git a/databases/gmysql/Makefile b/databases/gmysql/Makefile index 31e1d1411ce2..928a2adcd852 100644 --- a/databases/gmysql/Makefile +++ b/databases/gmysql/Makefile @@ -3,7 +3,7 @@ # Date created: Sun Nov 15 22:07:12 CET 1998 # Whom: Dirk Froemberg <ibex@physik.TU-Berlin.DE> # -# $Id: Makefile,v 1.10 1999/04/14 00:02:43 scrappy Exp $ +# $Id: Makefile,v 1.11 1999/04/22 07:42:49 mharo Exp $ # DISTNAME= gmysql-0.3.2 @@ -13,12 +13,14 @@ MASTER_SITES= http://www.loth.demon.co.uk/gmysql/ \ MAINTAINER= dirk@FreeBSD.ORG -LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 \ +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ mysqlclient.6:${PORTSDIR}/databases/mysql322 +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config + GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-mysql=${PREFIX} -CONFIGURE_ENV= GTK_CONFIG=${X11BASE}/bin/gtk12-config +CONFIGURE_ENV= GTK_CONFIG=${GTK_CONFIG} FETCH_BEFORE_ARGS= -b .include <bsd.port.mk> diff --git a/deskutils/gtimer/Makefile b/deskutils/gtimer/Makefile index c5b952be4a26..f41e5a38dcae 100644 --- a/deskutils/gtimer/Makefile +++ b/deskutils/gtimer/Makefile @@ -3,7 +3,7 @@ # Date created: 25 February 1999 # Whom: Chris Piazza <cpiazza@home.net> # -# $Id: Makefile,v 1.3 1999/05/05 14:22:22 flathill Exp $ +# $Id: Makefile,v 1.4 1999/05/06 14:18:54 flathill Exp $ # DISTNAME= gtimer-1.1.4 @@ -12,10 +12,12 @@ MASTER_SITES= http://www.radix.net/~cknudsen/gtimer/ MAINTAINER= cpiazza@home.net -LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 + +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config GNU_CONFIGURE= YES -CONFIGURE_ENV= GTK_CONFIG="${X11BASE}/bin/gtk12-config" +CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" USE_GMAKE= YES USE_BZIP2= YES MAN1= gtimer.1 diff --git a/devel/mico/Makefile b/devel/mico/Makefile index 5f3be34b095a..c98fd178609d 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.31 1999/05/02 21:21:57 mharo Exp $ +# $Id: Makefile,v 1.32 1999/05/13 00:15:48 asami Exp $ # DISTNAME= mico-2.2.3 @@ -20,9 +20,11 @@ CXX= eg++ BUILD_DEPENDS= egcc:${PORTSDIR}/lang/egcs .endif -LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 \ +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ tcl80.1:${PORTSDIR}/lang/tcl80 +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config + USE_QT= yes USE_AUTOCONF= yes USE_GMAKE= yes @@ -31,13 +33,13 @@ WRKSRC= ${WRKDIR}/mico CONFIGURE_ARGS= --with-qt --with-gtk --with-tcl \ --disable-optimize --disable-mini-stl -CONFIGURE_ENV= GTK_CONFIG="${X11BASE}/bin/gtk12-config" +CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" MAN1= idl.1 imr.1 nsadmin.1 MAN5= micorc.5 MAN8= ird.8 micod.8 nsd.8 post-install: - ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m + ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib .include <bsd.port.post.mk> diff --git a/editors/AbiWord/Makefile b/editors/AbiWord/Makefile index 95c88e1b823e..0b1d2f08a739 100644 --- a/editors/AbiWord/Makefile +++ b/editors/AbiWord/Makefile @@ -3,7 +3,7 @@ # Date created: 3 Mar 1999 # Whom: Donald Burr <dburr@FreeBSD.ORG> # -# $Id: Makefile,v 1.1.1.1 1999/05/04 12:26:01 dburr Exp $ +# $Id: Makefile,v 1.2 1999/05/12 05:20:46 asami Exp $ # DISTNAME= abi-0.5.5-src @@ -16,7 +16,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} expat.tar.gz \ MAINTAINER= dburr@FreeBSD.ORG BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash2 -LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 \ +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ png.3:${PORTSDIR}/graphics/png RUN_DEPENDS= ispell:${PORTSDIR}/textproc/ispell diff --git a/editors/AbiWord2/Makefile b/editors/AbiWord2/Makefile index 95c88e1b823e..0b1d2f08a739 100644 --- a/editors/AbiWord2/Makefile +++ b/editors/AbiWord2/Makefile @@ -3,7 +3,7 @@ # Date created: 3 Mar 1999 # Whom: Donald Burr <dburr@FreeBSD.ORG> # -# $Id: Makefile,v 1.1.1.1 1999/05/04 12:26:01 dburr Exp $ +# $Id: Makefile,v 1.2 1999/05/12 05:20:46 asami Exp $ # DISTNAME= abi-0.5.5-src @@ -16,7 +16,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} expat.tar.gz \ MAINTAINER= dburr@FreeBSD.ORG BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash2 -LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 \ +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ png.3:${PORTSDIR}/graphics/png RUN_DEPENDS= ispell:${PORTSDIR}/textproc/ispell diff --git a/editors/abiword-devel/Makefile b/editors/abiword-devel/Makefile index 95c88e1b823e..0b1d2f08a739 100644 --- a/editors/abiword-devel/Makefile +++ b/editors/abiword-devel/Makefile @@ -3,7 +3,7 @@ # Date created: 3 Mar 1999 # Whom: Donald Burr <dburr@FreeBSD.ORG> # -# $Id: Makefile,v 1.1.1.1 1999/05/04 12:26:01 dburr Exp $ +# $Id: Makefile,v 1.2 1999/05/12 05:20:46 asami Exp $ # DISTNAME= abi-0.5.5-src @@ -16,7 +16,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} expat.tar.gz \ MAINTAINER= dburr@FreeBSD.ORG BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash2 -LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 \ +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ png.3:${PORTSDIR}/graphics/png RUN_DEPENDS= ispell:${PORTSDIR}/textproc/ispell diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile index 95c88e1b823e..0b1d2f08a739 100644 --- a/editors/abiword/Makefile +++ b/editors/abiword/Makefile @@ -3,7 +3,7 @@ # Date created: 3 Mar 1999 # Whom: Donald Burr <dburr@FreeBSD.ORG> # -# $Id: Makefile,v 1.1.1.1 1999/05/04 12:26:01 dburr Exp $ +# $Id: Makefile,v 1.2 1999/05/12 05:20:46 asami Exp $ # DISTNAME= abi-0.5.5-src @@ -16,7 +16,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} expat.tar.gz \ MAINTAINER= dburr@FreeBSD.ORG BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash2 -LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 \ +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ png.3:${PORTSDIR}/graphics/png RUN_DEPENDS= ispell:${PORTSDIR}/textproc/ispell diff --git a/editors/gnotepad+/Makefile b/editors/gnotepad+/Makefile index 03b6389d11f5..46baefd6d804 100644 --- a/editors/gnotepad+/Makefile +++ b/editors/gnotepad+/Makefile @@ -3,7 +3,7 @@ # Date created: 08-March-1999 # Whom: brett@peloton.physics.montana.edu # -# $Id: Makefile,v 1.1.1.1 1999/04/30 08:33:54 taoka Exp $ +# $Id: Makefile,v 1.2 1999/05/09 16:29:36 steve Exp $ # DISTNAME= gnotepad+-1.1.4 @@ -13,10 +13,12 @@ MASTER_SITES= http://ack.netpedia.net/gnp/ MAINTAINER= brett@peloton.physics.montana.edu LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \ - gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 + gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 + +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config GNU_CONFIGURE= yes -CONFIGURE_ENV= GTK_CONFIG="${X11BASE}/bin/gtk12-config" +CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" MAN1= gnp.1 diff --git a/editors/gxedit/Makefile b/editors/gxedit/Makefile index b3552125a9c9..ba43bbcfeb07 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.19 1999/03/24 17:41:04 steve Exp $ +# $Id: Makefile,v 1.20 1999/04/16 10:38:30 kris Exp $ # DISTNAME= GXedit1.23 @@ -13,7 +13,7 @@ MASTER_SITES= http://devplanet.fastethernet.net/ MAINTAINER= dom@myrddin.demon.co.uk -LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 USE_X_PREFIX= yes ALL_TARGET= gxedit diff --git a/emulators/xsystem35/Makefile b/emulators/xsystem35/Makefile index 9180a50ae3fe..f808fe955eca 100644 --- a/emulators/xsystem35/Makefile +++ b/emulators/xsystem35/Makefile @@ -3,7 +3,7 @@ # Date created: 24 Oct 1998 # Whom: Seiichirou Hiraoka # -# $Id: Makefile,v 1.15 1999/04/26 02:33:57 mharo Exp $ +# $Id: Makefile,v 1.16 1999/05/01 02:21:08 steve Exp $ # DISTNAME= xsystem35-1.0.7 @@ -12,7 +12,7 @@ MASTER_SITES= http://www.aist-nara.ac.jp/~masaki-c/private/unitbase/xsys35/down/ MAINTAINER= k5@respo.or.jp -LIB_DEPENDS+= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 +LIB_DEPENDS+= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 USE_IMAKE= YES WRKSRC= ${WRKDIR}/${DISTNAME}/src diff --git a/ftp/IglooFTP/Makefile b/ftp/IglooFTP/Makefile index 917e999f4422..94da871b5838 100644 --- a/ftp/IglooFTP/Makefile +++ b/ftp/IglooFTP/Makefile @@ -3,7 +3,7 @@ # Date created: 3 May 1999 # Whom: Andrey Zakhvatov # -# $Id$ +# $Id: Makefile,v 1.1.1.1 1999/05/07 17:43:08 flathill Exp $ # DISTNAME= IglooFTP-0.6.1.src @@ -15,11 +15,8 @@ MASTER_SITE_SUBDIR= system/network/file-transfer MAINTAINER= andy@icc.surw.chel.su -LIB_DEPENDS= gdk12.1:${PORTSDIR}/x11-toolkits/gtk12 \ - glib12:${PORTSDIR}/devel/glib12 \ - gmodule12:${PORTSDIR}/devel/glib12 \ - gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 \ - intl:${PORTSDIR}/devel/gettext +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ + intl.1:${PORTSDIR}/devel/gettext USE_X_PREFIX= yes diff --git a/ftp/IglooFTP/files/patch-ab b/ftp/IglooFTP/files/patch-ab index 39f2101e438e..918fad7482b1 100644 --- a/ftp/IglooFTP/files/patch-ab +++ b/ftp/IglooFTP/files/patch-ab @@ -1,5 +1,5 @@ ---- src/Makefile Thu Apr 15 20:05:15 1999 -+++ /home/andy/tmp/wrk/src/Makefile Mon May 3 12:59:28 1999 +--- src/Makefile.orig Thu Apr 15 11:05:15 1999 ++++ src/Makefile Fri May 28 18:43:37 1999 @@ -1,14 +1,15 @@ SHELL=/bin/sh -CC = gcc @@ -22,6 +22,29 @@ BIN_PATH = $(DESTDIR)/bin MAN_PATH = $(DESTDIR)/man SHARE_PATH = $(DESTDIR)/share/$(PROGNAME) +@@ -50,14 +51,14 @@ + @if ! test -e $(SHARE_PATH)/app_ass; then \ + echo "Making $(SHARE_PATH)/app_ass directory ..."; mkdir -m 0755 $(SHARE_PATH)/app_ass; \ + else :; fi; +- /usr/bin/install -s -m 755 $(PROGNAME) $(BIN_PATH) +- /usr/bin/install -m 644 ../share/docs/* $(SHARE_PATH)/docs/ +- /usr/bin/install -m 644 ../share/html/*.* $(SHARE_PATH)/html/ +- /usr/bin/install -m 644 ../share/html/images/*.* $(SHARE_PATH)/html/images/ +- /usr/bin/install -m 644 ../share/xpm/* $(SHARE_PATH)/xpm/ +- /usr/bin/install -m 644 ../share/bookmarks/* $(SHARE_PATH)/bookmarks/ +- /usr/bin/install -m 644 ../share/app_ass/* $(SHARE_PATH)/app_ass/ +- /usr/bin/install -m 644 ../share/gtkrc $(SHARE_PATH)/gtkrc ++ /usr/bin/install -c -s -m 755 $(PROGNAME) $(BIN_PATH) ++ /usr/bin/install -c -m 644 ../share/docs/* $(SHARE_PATH)/docs/ ++ /usr/bin/install -c -m 644 ../share/html/*.* $(SHARE_PATH)/html/ ++ /usr/bin/install -c -m 644 ../share/html/images/*.* $(SHARE_PATH)/html/images/ ++ /usr/bin/install -c -m 644 ../share/xpm/* $(SHARE_PATH)/xpm/ ++ /usr/bin/install -c -m 644 ../share/bookmarks/* $(SHARE_PATH)/bookmarks/ ++ /usr/bin/install -c -m 644 ../share/app_ass/* $(SHARE_PATH)/app_ass/ ++ /usr/bin/install -c -m 644 ../share/gtkrc $(SHARE_PATH)/gtkrc + + + @@ -111,7 +112,7 @@ @echo "#define COMPILE_TIME \"`date +%T`\"" >> version.h @echo "#define COMPILE_BY \"`whoami`\"" >> version.h diff --git a/ftp/axyftp/Makefile b/ftp/axyftp/Makefile index a3afca94bba6..23f563ded822 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.5 1999/04/13 13:09:54 kris Exp $ +# $Id: Makefile,v 1.6 1999/04/21 06:38:07 mharo Exp $ # DISTNAME= wxftp-0.4.4.src @@ -16,7 +16,7 @@ MASTER_SITES= ftp://ftp.wxftp.seul.org/pub/wxftp/0.4.4/ \ MAINTAINER= kris@FreeBSD.ORG -LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 WRKSRC= ${WRKDIR}/${PKGNAME}/src USE_GMAKE= yes diff --git a/ftp/gftp/Makefile b/ftp/gftp/Makefile index 5f4bf92a4fda..a680b2e27607 100644 --- a/ftp/gftp/Makefile +++ b/ftp/gftp/Makefile @@ -3,7 +3,7 @@ # Date Created: 21 Feb 1999 # Whom: Damjan Marion <dmarion@open.hr> # -# $Id: Makefile,v 1.2 1999/04/27 00:37:35 taoka Exp $ +# $Id: Makefile,v 1.3 1999/05/17 19:52:00 mharo Exp $ # DISTNAME= gftp-2.0.1 @@ -12,7 +12,7 @@ MASTER_SITES= http://www.newwave.net/~masneyb/ MAINTAINER= dmarion@open.hr -LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 USE_AUTOCONF= yes USE_X_PREFIX= yes diff --git a/ftp/gftp/files/patch-ab b/ftp/gftp/files/patch-ab index 1c2c674228e9..3cfad0c8f18d 100644 --- a/ftp/gftp/files/patch-ab +++ b/ftp/gftp/files/patch-ab @@ -5,7 +5,7 @@ INSTALL=@INSTALL@ MACHINE=`uname -m`-`uname -p`-`uname -s` -CFLAGS=@CFLAGS@ -Wall -D_REENTRANT -DSHARE_DIR=\"$(SHARE_DIR)\" -+CFLAGS=@CFLAGS@ -pthread -DSHARE_DIR=\"$(SHARE_DIR)\" ++CFLAGS=@CFLAGS@ -DSHARE_DIR=\"$(SHARE_DIR)\" LIBS=@LIBS@ EXE=gftp OBJS=bookmarks.o cache.o chmod_dialog.o config_file.o \ diff --git a/games/garith/Makefile b/games/garith/Makefile index e37aa22fe2ad..6f77f384fdc9 100644 --- a/games/garith/Makefile +++ b/games/garith/Makefile @@ -3,7 +3,7 @@ # Date created: 5 August 1998 # Whom: Andrey Zakhvatov # -# $Id$ +# $Id: Makefile,v 1.1.1.1 1999/04/13 14:43:17 taoka Exp $ # DISTNAME= garith-2.1 @@ -12,7 +12,7 @@ MASTER_SITES= http://www.cnm-vra.com/micah/garith/ MAINTAINER= andy@icc.surw.chel.su -LIB_DEPENDS= gdk12.1:${PORTSDIR}/x11-toolkits/gtk12 +LIB_DEPENDS= gdk12.2:${PORTSDIR}/x11-toolkits/gtk12 ALL_TARGET= USE_X_PREFIX= yes diff --git a/games/gtkballs/Makefile b/games/gtkballs/Makefile index b2cb5b243ccf..19f6f489cf67 100644 --- a/games/gtkballs/Makefile +++ b/games/gtkballs/Makefile @@ -3,7 +3,7 @@ # Date created: 11 November 1998 # Whom: Andrey Zakhvatov # -# $Id: Makefile,v 1.2 1999/01/22 21:34:35 nectar Exp $ +# $Id: Makefile,v 1.3 1999/05/01 02:19:07 steve Exp $ # DISTNAME= gtkballs-1.04 @@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= games/strategy MAINTAINER= andy@icc.surw.chel.su -LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 MAN6= gtkballs.6 diff --git a/games/xqf/Makefile b/games/xqf/Makefile index 884a2b9d14dc..302d0367156e 100644 --- a/games/xqf/Makefile +++ b/games/xqf/Makefile @@ -3,7 +3,7 @@ # Date created: 08 February 1999 # Whom: steve farrell # -# $Id: Makefile,v 1.2 1999/04/22 03:20:14 mharo Exp $ +# $Id: Makefile,v 1.3 1999/05/09 16:59:17 steve Exp $ # DISTNAME= xqf-0.8.99.2 @@ -13,7 +13,7 @@ MASTER_SITES= ftp://ftp.linuxgames.com/xqf/ MAINTAINER= steve@farrell.org RUN_DEPENDS= qstat:${PORTSDIR}/games/qstat -LIB_DEPENDS= gtk12:${PORTSDIR}/x11-toolkits/gtk12 +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 USE_GMAKE= yes diff --git a/graphics/gtksee/Makefile b/graphics/gtksee/Makefile index 470bff47534f..65fe2b5707e3 100644 --- a/graphics/gtksee/Makefile +++ b/graphics/gtksee/Makefile @@ -3,7 +3,7 @@ # Date created: Sun Nov 22 12:08:18 CET 1998 # Whom: Dirk Froemberg <ibex@physik.TU-Berlin.DE> # -# $Id: Makefile,v 1.11 1999/04/22 07:39:06 mharo Exp $ +# $Id: Makefile,v 1.12 1999/05/04 12:17:48 dirk Exp $ # DISTNAME= gtksee-0.3.0 @@ -13,16 +13,18 @@ MASTER_SITES= http://www.zg169.net/~hotaru/gtksee/ \ MAINTAINER= dirk@FreeBSD.ORG -LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 \ +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ jpeg.9:${PORTSDIR}/graphics/jpeg \ png.3:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff34 RUN_DEPENDS= bzip:${PORTSDIR}/archivers/bzip \ bzip2:${PORTSDIR}/archivers/bzip2 +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config + GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CFLAGS} -I${PREFIX}/include" \ - GTK_CONFIG="${X11BASE}/bin/gtk12-config" \ + GTK_CONFIG="${GTK_CONFIG}" \ LDFLAGS=-L${PREFIX}/lib .include <bsd.port.mk> diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile index 0bb3213a11f3..50bce21f3ad3 100644 --- a/graphics/sane-backends/Makefile +++ b/graphics/sane-backends/Makefile @@ -1,9 +1,9 @@ # New ports collection makefile for: sane -# Version required: 1.00 +# Version required: 1.0.1 # Date created: Sat Jul 19 16:23:10 MET DST 1997 # Whom: gary@hotlava.com # -# $Id: Makefile,v 1.15 1999/04/07 19:10:45 fenner Exp $ +# $Id: Makefile,v 1.16 1999/05/22 04:36:03 obrien Exp $ # DISTNAME= sane-1.0.1 @@ -13,9 +13,11 @@ MASTER_SITES= ftp://ftp.mostang.com/pub/sane/ \ MAINTAINER= gary@hotlava.com -LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 \ +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ jpeg.9:${PORTSDIR}/graphics/jpeg +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config + .include <bsd.port.pre.mk> USE_GMAKE= yes @@ -23,11 +25,11 @@ GNU_CONFIGURE= yes .if ${OSVERSION} < 300000 CONFIGURE_ENV= CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" \ - GTK_CONFIG="${X11BASE}/bin/gtk12-config" + GTK_CONFIG="${GTK_CONFIG}" .else CONFIGURE_ENV= CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib -lcam" \ - GTK_CONFIG="${X11BASE}/bin/gtk12-config" + GTK_CONFIG="${GTK_CONFIG}" .endif MAN1= scanimage.1 \ @@ -58,7 +60,6 @@ pre-configure: @${ECHO} "*** the GIMP and GTK packages/ports." post-install: - ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib @${CAT} ${PKGDIR}/MESSAGE .include <bsd.port.post.mk> diff --git a/graphics/sane-backends/pkg-plist b/graphics/sane-backends/pkg-plist index 9582e68779e0..9cad93060579 100644 --- a/graphics/sane-backends/pkg-plist +++ b/graphics/sane-backends/pkg-plist @@ -19,6 +19,7 @@ etc/sane.d/net.conf etc/sane.d/ricoh.conf etc/sane.d/s9036.conf etc/sane.d/saned.conf +etc/sane.d/sharp.conf etc/sane.d/snapscan.conf etc/sane.d/tamarack.conf etc/sane.d/umax.conf @@ -112,6 +113,10 @@ lib/sane/libsane-s9036.a lib/sane/libsane-s9036.la lib/sane/libsane-s9036.so lib/sane/libsane-s9036.so.1 +lib/sane/libsane-sharp.a +lib/sane/libsane-sharp.la +lib/sane/libsane-sharp.so +lib/sane/libsane-sharp.so.1 lib/sane/libsane-snapscan.a lib/sane/libsane-snapscan.la lib/sane/libsane-snapscan.so diff --git a/graphics/sane-frontends/Makefile b/graphics/sane-frontends/Makefile index 0bb3213a11f3..50bce21f3ad3 100644 --- a/graphics/sane-frontends/Makefile +++ b/graphics/sane-frontends/Makefile @@ -1,9 +1,9 @@ # New ports collection makefile for: sane -# Version required: 1.00 +# Version required: 1.0.1 # Date created: Sat Jul 19 16:23:10 MET DST 1997 # Whom: gary@hotlava.com # -# $Id: Makefile,v 1.15 1999/04/07 19:10:45 fenner Exp $ +# $Id: Makefile,v 1.16 1999/05/22 04:36:03 obrien Exp $ # DISTNAME= sane-1.0.1 @@ -13,9 +13,11 @@ MASTER_SITES= ftp://ftp.mostang.com/pub/sane/ \ MAINTAINER= gary@hotlava.com -LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 \ +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ jpeg.9:${PORTSDIR}/graphics/jpeg +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config + .include <bsd.port.pre.mk> USE_GMAKE= yes @@ -23,11 +25,11 @@ GNU_CONFIGURE= yes .if ${OSVERSION} < 300000 CONFIGURE_ENV= CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" \ - GTK_CONFIG="${X11BASE}/bin/gtk12-config" + GTK_CONFIG="${GTK_CONFIG}" .else CONFIGURE_ENV= CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib -lcam" \ - GTK_CONFIG="${X11BASE}/bin/gtk12-config" + GTK_CONFIG="${GTK_CONFIG}" .endif MAN1= scanimage.1 \ @@ -58,7 +60,6 @@ pre-configure: @${ECHO} "*** the GIMP and GTK packages/ports." post-install: - ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib @${CAT} ${PKGDIR}/MESSAGE .include <bsd.port.post.mk> diff --git a/graphics/sane-frontends/pkg-plist b/graphics/sane-frontends/pkg-plist index 9582e68779e0..9cad93060579 100644 --- a/graphics/sane-frontends/pkg-plist +++ b/graphics/sane-frontends/pkg-plist @@ -19,6 +19,7 @@ etc/sane.d/net.conf etc/sane.d/ricoh.conf etc/sane.d/s9036.conf etc/sane.d/saned.conf +etc/sane.d/sharp.conf etc/sane.d/snapscan.conf etc/sane.d/tamarack.conf etc/sane.d/umax.conf @@ -112,6 +113,10 @@ lib/sane/libsane-s9036.a lib/sane/libsane-s9036.la lib/sane/libsane-s9036.so lib/sane/libsane-s9036.so.1 +lib/sane/libsane-sharp.a +lib/sane/libsane-sharp.la +lib/sane/libsane-sharp.so +lib/sane/libsane-sharp.so.1 lib/sane/libsane-snapscan.a lib/sane/libsane-snapscan.la lib/sane/libsane-snapscan.so diff --git a/graphics/sane/Makefile b/graphics/sane/Makefile index 0bb3213a11f3..50bce21f3ad3 100644 --- a/graphics/sane/Makefile +++ b/graphics/sane/Makefile @@ -1,9 +1,9 @@ # New ports collection makefile for: sane -# Version required: 1.00 +# Version required: 1.0.1 # Date created: Sat Jul 19 16:23:10 MET DST 1997 # Whom: gary@hotlava.com # -# $Id: Makefile,v 1.15 1999/04/07 19:10:45 fenner Exp $ +# $Id: Makefile,v 1.16 1999/05/22 04:36:03 obrien Exp $ # DISTNAME= sane-1.0.1 @@ -13,9 +13,11 @@ MASTER_SITES= ftp://ftp.mostang.com/pub/sane/ \ MAINTAINER= gary@hotlava.com -LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 \ +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ jpeg.9:${PORTSDIR}/graphics/jpeg +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config + .include <bsd.port.pre.mk> USE_GMAKE= yes @@ -23,11 +25,11 @@ GNU_CONFIGURE= yes .if ${OSVERSION} < 300000 CONFIGURE_ENV= CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" \ - GTK_CONFIG="${X11BASE}/bin/gtk12-config" + GTK_CONFIG="${GTK_CONFIG}" .else CONFIGURE_ENV= CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib -lcam" \ - GTK_CONFIG="${X11BASE}/bin/gtk12-config" + GTK_CONFIG="${GTK_CONFIG}" .endif MAN1= scanimage.1 \ @@ -58,7 +60,6 @@ pre-configure: @${ECHO} "*** the GIMP and GTK packages/ports." post-install: - ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib @${CAT} ${PKGDIR}/MESSAGE .include <bsd.port.post.mk> diff --git a/graphics/sane/pkg-plist b/graphics/sane/pkg-plist index 9582e68779e0..9cad93060579 100644 --- a/graphics/sane/pkg-plist +++ b/graphics/sane/pkg-plist @@ -19,6 +19,7 @@ etc/sane.d/net.conf etc/sane.d/ricoh.conf etc/sane.d/s9036.conf etc/sane.d/saned.conf +etc/sane.d/sharp.conf etc/sane.d/snapscan.conf etc/sane.d/tamarack.conf etc/sane.d/umax.conf @@ -112,6 +113,10 @@ lib/sane/libsane-s9036.a lib/sane/libsane-s9036.la lib/sane/libsane-s9036.so lib/sane/libsane-s9036.so.1 +lib/sane/libsane-sharp.a +lib/sane/libsane-sharp.la +lib/sane/libsane-sharp.so +lib/sane/libsane-sharp.so.1 lib/sane/libsane-snapscan.a lib/sane/libsane-snapscan.la lib/sane/libsane-snapscan.so diff --git a/graphics/xsane/Makefile b/graphics/xsane/Makefile index 325353484494..492b5248e82c 100644 --- a/graphics/xsane/Makefile +++ b/graphics/xsane/Makefile @@ -3,7 +3,7 @@ # Date created: Fri Apr 8 00:18:29 MET DST 1999 # Whom: domi@saargate.de # -# $Id: Makefile,v 1.1.1.1 1999/05/09 22:38:22 dirk Exp $ +# $Id: Makefile,v 1.2 1999/05/12 22:34:59 asami Exp $ # DISTNAME= xsane-0.22 @@ -13,20 +13,22 @@ MASTER_SITES= http://www.wolfsburg.de/~rauch/sane/ \ MAINTAINER= domi@saargate.de -LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 \ +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ sane.1:${PORTSDIR}/graphics/sane \ jpeg.9:${PORTSDIR}/graphics/jpeg \ tiff.4:${PORTSDIR}/graphics/tiff34 \ png.3:${PORTSDIR}/graphics/png +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config + USE_GMAKE= yes USE_X_PREFIX= yes GNU_CONFIGURE= yes MAN1= xsane.1 -CONFIGURE_ENV= CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ - GTK_CONFIG="${X11BASE}/bin/gtk12-config" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + GTK_CONFIG="${GTK_CONFIG}" .include <bsd.port.pre.mk> diff --git a/irc/irssi-devel/Makefile b/irc/irssi-devel/Makefile index 81555c96e176..c3661f9e1a9e 100644 --- a/irc/irssi-devel/Makefile +++ b/irc/irssi-devel/Makefile @@ -3,7 +3,7 @@ # Date created: 14 Apr 1999 # Whom: Jim Mock <jim@phrantic.phear.net> # -# $Id: Makefile,v 1.1.1.1 1999/04/30 17:08:24 taoka Exp $ +# $Id: Makefile,v 1.2 1999/05/09 14:29:10 flathill Exp $ # DISTNAME= irssi-0.7.9 @@ -12,7 +12,10 @@ MASTER_SITES= http://www.sicom.fi/~ikioma/irssi/ MAINTAINER= jim@phrantic.phear.net -LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 + +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config +GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config USE_BZIP2= yes USE_GMAKE= yes @@ -22,8 +25,8 @@ USE_X_PREFIX= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-gnome --without-dock --without-pthreads \ --without-socks --with-textui=none -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-install: @${ECHO} " " diff --git a/irc/irssi/Makefile b/irc/irssi/Makefile index 81555c96e176..c3661f9e1a9e 100644 --- a/irc/irssi/Makefile +++ b/irc/irssi/Makefile @@ -3,7 +3,7 @@ # Date created: 14 Apr 1999 # Whom: Jim Mock <jim@phrantic.phear.net> # -# $Id: Makefile,v 1.1.1.1 1999/04/30 17:08:24 taoka Exp $ +# $Id: Makefile,v 1.2 1999/05/09 14:29:10 flathill Exp $ # DISTNAME= irssi-0.7.9 @@ -12,7 +12,10 @@ MASTER_SITES= http://www.sicom.fi/~ikioma/irssi/ MAINTAINER= jim@phrantic.phear.net -LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 + +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config +GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config USE_BZIP2= yes USE_GMAKE= yes @@ -22,8 +25,8 @@ USE_X_PREFIX= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-gnome --without-dock --without-pthreads \ --without-socks --with-textui=none -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-install: @${ECHO} " " diff --git a/irc/xchat-devel/Makefile b/irc/xchat-devel/Makefile index ffd9c7e447bc..9787aecf89d2 100644 --- a/irc/xchat-devel/Makefile +++ b/irc/xchat-devel/Makefile @@ -3,7 +3,7 @@ # Date created: 17 Nov 1998 # Whom: Jim Mock <jim@phrantic.phear.net> # -# $Id: Makefile,v 1.9 1999/03/31 15:25:59 steve Exp $ +# $Id: Makefile,v 1.10 1999/05/09 16:57:20 steve Exp $ # DISTNAME= xchat-0.9.5 @@ -14,15 +14,16 @@ MASTER_SITES= http://xchat.linuxpower.org/files/ \ MAINTAINER= jim@phrantic.phear.net -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 USE_GMAKE= yes USE_PERL5= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-gnome -CONFIGURE_ENV= GTK_CONFIG="${X11BASE}/bin/gtk12-config" - -USE_X_PREFIX= yes +CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" post-install: strip ${PREFIX}/bin/xchat diff --git a/irc/xchat-gnome/Makefile b/irc/xchat-gnome/Makefile index ffd9c7e447bc..9787aecf89d2 100644 --- a/irc/xchat-gnome/Makefile +++ b/irc/xchat-gnome/Makefile @@ -3,7 +3,7 @@ # Date created: 17 Nov 1998 # Whom: Jim Mock <jim@phrantic.phear.net> # -# $Id: Makefile,v 1.9 1999/03/31 15:25:59 steve Exp $ +# $Id: Makefile,v 1.10 1999/05/09 16:57:20 steve Exp $ # DISTNAME= xchat-0.9.5 @@ -14,15 +14,16 @@ MASTER_SITES= http://xchat.linuxpower.org/files/ \ MAINTAINER= jim@phrantic.phear.net -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 USE_GMAKE= yes USE_PERL5= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-gnome -CONFIGURE_ENV= GTK_CONFIG="${X11BASE}/bin/gtk12-config" - -USE_X_PREFIX= yes +CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" post-install: strip ${PREFIX}/bin/xchat diff --git a/irc/xchat/Makefile b/irc/xchat/Makefile index ffd9c7e447bc..9787aecf89d2 100644 --- a/irc/xchat/Makefile +++ b/irc/xchat/Makefile @@ -3,7 +3,7 @@ # Date created: 17 Nov 1998 # Whom: Jim Mock <jim@phrantic.phear.net> # -# $Id: Makefile,v 1.9 1999/03/31 15:25:59 steve Exp $ +# $Id: Makefile,v 1.10 1999/05/09 16:57:20 steve Exp $ # DISTNAME= xchat-0.9.5 @@ -14,15 +14,16 @@ MASTER_SITES= http://xchat.linuxpower.org/files/ \ MAINTAINER= jim@phrantic.phear.net -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 USE_GMAKE= yes USE_PERL5= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-gnome -CONFIGURE_ENV= GTK_CONFIG="${X11BASE}/bin/gtk12-config" - -USE_X_PREFIX= yes +CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" post-install: strip ${PREFIX}/bin/xchat diff --git a/irc/xchat1/Makefile b/irc/xchat1/Makefile index ffd9c7e447bc..9787aecf89d2 100644 --- a/irc/xchat1/Makefile +++ b/irc/xchat1/Makefile @@ -3,7 +3,7 @@ # Date created: 17 Nov 1998 # Whom: Jim Mock <jim@phrantic.phear.net> # -# $Id: Makefile,v 1.9 1999/03/31 15:25:59 steve Exp $ +# $Id: Makefile,v 1.10 1999/05/09 16:57:20 steve Exp $ # DISTNAME= xchat-0.9.5 @@ -14,15 +14,16 @@ MASTER_SITES= http://xchat.linuxpower.org/files/ \ MAINTAINER= jim@phrantic.phear.net -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 USE_GMAKE= yes USE_PERL5= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-gnome -CONFIGURE_ENV= GTK_CONFIG="${X11BASE}/bin/gtk12-config" - -USE_X_PREFIX= yes +CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" post-install: strip ${PREFIX}/bin/xchat diff --git a/irc/xchat2/Makefile b/irc/xchat2/Makefile index ffd9c7e447bc..9787aecf89d2 100644 --- a/irc/xchat2/Makefile +++ b/irc/xchat2/Makefile @@ -3,7 +3,7 @@ # Date created: 17 Nov 1998 # Whom: Jim Mock <jim@phrantic.phear.net> # -# $Id: Makefile,v 1.9 1999/03/31 15:25:59 steve Exp $ +# $Id: Makefile,v 1.10 1999/05/09 16:57:20 steve Exp $ # DISTNAME= xchat-0.9.5 @@ -14,15 +14,16 @@ MASTER_SITES= http://xchat.linuxpower.org/files/ \ MAINTAINER= jim@phrantic.phear.net -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 USE_GMAKE= yes USE_PERL5= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-gnome -CONFIGURE_ENV= GTK_CONFIG="${X11BASE}/bin/gtk12-config" - -USE_X_PREFIX= yes +CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" post-install: strip ${PREFIX}/bin/xchat diff --git a/japanese/gicq/Makefile b/japanese/gicq/Makefile index ce925dfea578..e982aa079443 100644 --- a/japanese/gicq/Makefile +++ b/japanese/gicq/Makefile @@ -3,7 +3,7 @@ # Date Created: 31 Oct 1998 # Whom: Seiichirou Hiraoka # -# $Id: Makefile,v 1.5 1999/03/31 11:35:55 flathill Exp $ +# $Id: Makefile,v 1.6 1999/04/06 12:23:58 flathill Exp $ # DISTNAME= gicq-0.33 @@ -18,14 +18,16 @@ PATCH_DIST_STRIP= -p1 MAINTAINER= flathill@FreeBSD.ORG -LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 \ +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ icq.0:${PORTSDIR}/japanese/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" \ - LIBS="-lxpg4" +CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" \ + CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib" .include <bsd.port.mk> diff --git a/japanese/gtkicq/Makefile b/japanese/gtkicq/Makefile index 10c4483f7f09..f30de5d3d783 100644 --- a/japanese/gtkicq/Makefile +++ b/japanese/gtkicq/Makefile @@ -3,7 +3,7 @@ # Date created: 8 MAY 1999 # Whom: Shuichi Tanaka # -# $Id$ +# $Id: Makefile,v 1.1.1.1 1999/05/11 01:46:30 taoka Exp $ # DISTNAME= gtkicq-0.60 @@ -17,17 +17,18 @@ PATCH_DIST_STRIP= -p1 MAINTAINER= stanaka@bb.mbn.or.jp -LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 BUILD_DEPENDS= ${LOCALBASE}/lib/libjcode.a:${PORTSDIR}/japanese/libjcode \ ${LOCALBASE}/include/jlib.h:${PORTSDIR}/japanese/libjcode +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config + USE_X_PREFIX= yes USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-gnome CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - GTK_CONFIG="${X11BASE}/bin/gtk12-config" \ - LIBS="-L${LOCALBASE}/lib -lxpg4" \ - INSTALL_SCRIPT='$${INSTALL} -m 755' + GTK_CONFIG="${GTK_CONFIG}" \ + LIBS="-L${LOCALBASE}/lib" .include <bsd.port.mk> diff --git a/math/geg/Makefile b/math/geg/Makefile index 0391e3704e6e..cb0a7eb8288f 100644 --- a/math/geg/Makefile +++ b/math/geg/Makefile @@ -3,7 +3,7 @@ # Date created: 8 Aug 1998 # Whom: rom # -# $Id: Makefile,v 1.7 1999/02/24 22:06:26 vanilla Exp $ +# $Id: Makefile,v 1.8 1999/04/22 07:47:57 mharo Exp $ # DISTNAME= geg-0.99.0 @@ -12,11 +12,10 @@ MASTER_SITES= http://www.geocities.com/SiliconValley/Park/2030/ MAINTAINER= rom_glsa@ein-hashofet.co.il -LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 USE_X_PREFIX= yes USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" .include <bsd.port.mk> diff --git a/misc/gtkfind/Makefile b/misc/gtkfind/Makefile index 7d71fea78d6e..fd062b85a70b 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.4 1999/01/24 09:12:58 vanilla Exp $ +# $Id: Makefile,v 1.5 1999/04/22 08:04:20 mharo Exp $ # DISTNAME= gtkfind-0.10 @@ -12,7 +12,7 @@ MASTER_SITES= http://www.oz.net/~mattg/ MAINTAINER= billf@FreeBSD.org -LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 MAN1= gtkfind.1 mktmp.1 diff --git a/net-im/gaim/Makefile b/net-im/gaim/Makefile index 0dea7699e6a9..0a944c0c5e0f 100644 --- a/net-im/gaim/Makefile +++ b/net-im/gaim/Makefile @@ -3,7 +3,7 @@ # Date created: 26 Mar 1999 # Whom: Jim Mock <jim@phrantic.phear.net> # -# $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-im/gicq/Makefile b/net-im/gicq/Makefile index e299ef70dec1..d5bd29129b0d 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.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 <bsd.port.mk> diff --git a/net-im/gicq/pkg-plist b/net-im/gicq/pkg-plist index a8425957eda3..ec71b337f897 100644 --- a/net-im/gicq/pkg-plist +++ b/net-im/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/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 <billf@chc-chimes.com> # -# $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 <jim@phrantic.phear.net> # -# $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 <jim@phrantic.phear.net> # -# $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 <dima@chg.ru> # -# $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 <bsd.port.mk> 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 <billf@chc-chimes.com> # -# $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 <billf@chc-chimes.com> # -# $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 <kkennawa@physics.adelaide.edu.au> # -# $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 diff --git a/print/pdq/Makefile b/print/pdq/Makefile index e2cd41612252..55636a3bf467 100644 --- a/print/pdq/Makefile +++ b/print/pdq/Makefile @@ -3,7 +3,7 @@ # Date created: 15 May 1999 # Whom: Yin-Jieh Chen <yinjieh@csie.nctu.edu.tw> # -# $Id$ +# $Id: Makefile,v 1.1.1.1 1999/05/17 10:32:38 foxfair Exp $ # DISTNAME= pdq-2.1.1 @@ -13,11 +13,14 @@ EXTRACT_SUFX= .tgz MAINTAINER= yinjieh@csie.nctu.edu.tw -LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 + +GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config GNU_CONFIGURE= 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}" MAN1= lpd_cancel.1 lpd_print.1 lpd_status.1 pdq.1 xpdq.1 MAN5= printrc.5 @@ -29,11 +32,6 @@ post-install: strip ${PREFIX}/bin/lpd_cancel strip ${PREFIX}/bin/lpd_print strip ${PREFIX}/bin/lpd_status - @${ECHO} '*******************************************************' - @${ECHO} '* *' - @${ECHO} '* Please copy /usr/local/etc/printrc.sample to *' - @${ECHO} '* /usr/local/etc/printrc by yourself, thanks. *' - @${ECHO} '* *' - @${ECHO} '*******************************************************' + @${CAT} pkg/MESSAGE .include <bsd.port.mk> diff --git a/print/pdq/pkg-message b/print/pdq/pkg-message new file mode 100644 index 000000000000..36d7eacc8211 --- /dev/null +++ b/print/pdq/pkg-message @@ -0,0 +1,6 @@ +******************************************************* +* * +* Please copy /usr/local/etc/printrc.sample to * +* /usr/local/etc/printrc by yourself, thanks. * +* * +******************************************************* diff --git a/security/gtkportscan/Makefile b/security/gtkportscan/Makefile index a2fc6b9e07f3..2feeee7c6110 100644 --- a/security/gtkportscan/Makefile +++ b/security/gtkportscan/Makefile @@ -3,7 +3,7 @@ # Date created: 11 March 1999 # Whom: Chris Piazza <cpiazza@home.net> # -# $Id$ +# $Id: Makefile,v 1.1.1.1 1999/03/18 08:53:23 taoka Exp $ # DISTNAME= gtkportscan-1.1 @@ -12,7 +12,7 @@ MASTER_SITES= http://www.calpoly.edu/~rbarrero/ MAINTAINER= cpiazza@home.net -LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 WRKSRC= ${WRKDIR}/gtkscan diff --git a/security/gtkportscan/files/patch-aa b/security/gtkportscan/files/patch-aa index 077a2c39ee91..12c1636431e1 100644 --- a/security/gtkportscan/files/patch-aa +++ b/security/gtkportscan/files/patch-aa @@ -18,13 +18,14 @@ install: - cp portscan /usr/local/bin - cp gtkportscan /usr/X11/bin -+ ${BSD_INSTALL_PROGRAM} portscan /usr/local/bin -+ ${BSD_INSTALL_PROGRAM} gtkportscan /usr/local/bin ++ ${BSD_INSTALL_PROGRAM} portscan ${PREFIX}/bin ++ ${BSD_INSTALL_PROGRAM} gtkportscan ${PREFIX}/bin clean: rm -f portscan gtkportscan uninstall: - rm -f /usr/local/bin/portscan +- rm -f /usr/local/bin/portscan ++ rm -f ${PREFIX}/bin/portscan - rm -f /usr/X11/bin/gtkportscan -+ rm -f /usr/local/bin/gtkportscan ++ rm -f ${PREFIX}/bin/gtkportscan diff --git a/security/nessus-devel/Makefile b/security/nessus-devel/Makefile index 78bdb83ec9c1..2f42d9efdc36 100644 --- a/security/nessus-devel/Makefile +++ b/security/nessus-devel/Makefile @@ -3,7 +3,7 @@ # Date created: 1 May 1999 # Whom: Anders Nordby <anders@fix.no> # -# $Id$ +# $Id: Makefile,v 1.1.1.1 1999/05/17 10:26:38 foxfair Exp $ # DISTNAME= nessus-alpha2-fix4 @@ -22,10 +22,12 @@ EXTRACT_SUFX= .tgz MAINTAINER= anders@fix.no -LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 + +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config GNU_CONFIGURE= yes -CONFIGURE_ENV= GTKCONFIG="${X11BASE}/bin/gtk12-config" +CONFIGURE_ENV= GTKCONFIG="${GTK_CONFIG}" MAN1= nessus.1 post-install: diff --git a/security/nessus/Makefile b/security/nessus/Makefile index 78bdb83ec9c1..2f42d9efdc36 100644 --- a/security/nessus/Makefile +++ b/security/nessus/Makefile @@ -3,7 +3,7 @@ # Date created: 1 May 1999 # Whom: Anders Nordby <anders@fix.no> # -# $Id$ +# $Id: Makefile,v 1.1.1.1 1999/05/17 10:26:38 foxfair Exp $ # DISTNAME= nessus-alpha2-fix4 @@ -22,10 +22,12 @@ EXTRACT_SUFX= .tgz MAINTAINER= anders@fix.no -LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 + +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config GNU_CONFIGURE= yes -CONFIGURE_ENV= GTKCONFIG="${X11BASE}/bin/gtk12-config" +CONFIGURE_ENV= GTKCONFIG="${GTK_CONFIG}" MAN1= nessus.1 post-install: diff --git a/sysutils/xlogmaster/Makefile b/sysutils/xlogmaster/Makefile index 81cb69cd80ef..79b6fdb73988 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.9 1999/01/27 07:41:28 fenner Exp $ +# $Id: Makefile,v 1.10 1999/04/19 04:15:29 steve Exp $ # DISTNAME= xlogmaster-1.6.0 @@ -16,20 +16,19 @@ MASTER_SITE_SUBDIR= xlogmaster MAINTAINER= aw1@stade.co.uk -LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 + +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config NO_PACKAGE= ignores CFLAGS GNU_CONFIGURE= yes -CONFIGURE_ENV= CFLAGS="${CFLAGS}" CXXFLAGS="${CFLAGS}" GTK_CONFIG="${X11BASE}/bin/gtk12-config" +CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" USE_XLIB= yes USE_GMAKE= yes MAN1= xlogmaster.1 post-install: - @if [ ! -f ${PREFIX}/info/dir ]; then \ - ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \ - fi @install-info ${PREFIX}/info/xlogmaster.info ${PREFIX}/info/dir ${INSTALL_DATA} ${FILESDIR}/xlogmasterrc ${PREFIX}/etc/xlogmaster diff --git a/sysutils/xlogmaster/pkg-plist b/sysutils/xlogmaster/pkg-plist index 95250b7501bf..f06c22b258f7 100644 --- a/sysutils/xlogmaster/pkg-plist +++ b/sysutils/xlogmaster/pkg-plist @@ -30,7 +30,6 @@ etc/xlogmaster/xlogmaster.gtkrc etc/xlogmaster/xlogmasterrc @unexec install-info --delete %D/info/xlogmaster.info %D/info/dir info/xlogmaster.info -@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir @exec install-info %D/info/xlogmaster.info %D/info/dir @dirrm etc/xlogmaster/database @dirrm etc/xlogmaster/output-plugins diff --git a/sysutils/xwatch/Makefile b/sysutils/xwatch/Makefile index 5a6a9e2c83de..ebd0b3655cb6 100644 --- a/sysutils/xwatch/Makefile +++ b/sysutils/xwatch/Makefile @@ -3,7 +3,7 @@ # Date created: 17 July 1998 # Whom: mph # -# $Id: Makefile,v 1.5 1998/12/08 16:21:12 vanilla Exp $ +# $Id: Makefile,v 1.6 1999/04/22 07:56:33 mharo Exp $ # DISTNAME= xwatch-0.1.0 @@ -12,11 +12,13 @@ MASTER_SITES= http://hem.passagen.se/osk/ MAINTAINER= mph@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_XLIB= yes GNU_CONFIGURE= yes -CONFIGURE_ENV= GTK_CONFIG="${X11BASE}/bin/gtk12-config" +CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" post-install: .if !defined(NOPORTDOCS) diff --git a/x11-clocks/asclock-gtk/Makefile b/x11-clocks/asclock-gtk/Makefile index b24dc0a6cc0c..b07c0d3d93dd 100644 --- a/x11-clocks/asclock-gtk/Makefile +++ b/x11-clocks/asclock-gtk/Makefile @@ -3,7 +3,7 @@ # Date created: 16 March 1998 # Whom: Jun Kuriyama <kuriyama@FreeBSD.ORG> # -# $Id$ +# $Id: Makefile,v 1.1.1.1 1999/05/08 14:09:31 kuriyama Exp $ # DISTNAME= asclock-gtk-2.1.10beta @@ -13,7 +13,7 @@ MASTER_SITES= http://www.asclock.org/tar/ MAINTAINER= kuriyama@FreeBSD.ORG -LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 HAS_CONFIGURE= YES WRKSRC= ${WRKDIR}/asclock-gtk diff --git a/x11-fm/dfm/Makefile b/x11-fm/dfm/Makefile index 76b503967ada..609445ff378c 100644 --- a/x11-fm/dfm/Makefile +++ b/x11-fm/dfm/Makefile @@ -3,7 +3,7 @@ # Date created: 25 May 1998 # Whom: Andrey Zakhvatov # -# $Id: Makefile,v 1.10 1999/01/07 08:19:53 simokawa Exp $ +# $Id: Makefile,v 1.11 1999/05/01 03:00:49 steve Exp $ # DISTNAME= dfm-0.99.1 @@ -13,17 +13,14 @@ MASTER_SITES= http://www-c.informatik.uni-hannover.de/~kaiser/dfm/ MAINTAINER= andy@icc.surw.chel.su LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \ - intl.1:${PORTSDIR}/devel/gettext \ - gmodule12.1:${PORTSDIR}/devel/glib12 \ - glib12.1:${PORTSDIR}/devel/glib12 \ - gdk12.1:${PORTSDIR}/x11-toolkits/gtk12 \ - gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 + gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 -GNU_CONFIGURE= yes -CONFIGURE_ENV= CPPFLAGS="${CFLAGS} -I${X11BASE}/include" GTK_CONFIG="${X11BASE}/bin/gtk12-config" +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config -# depends on xforms -ONLY_FOR_ARCHS= i386 +GNU_CONFIGURE= yes +CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \ + GTK_CONFIG="${GTK_CONFIG}" \ + LIBS="-L${LOCALBASE}/lib" USE_X_PREFIX= yes diff --git a/x11-toolkits/gtk--/Makefile b/x11-toolkits/gtk--/Makefile index 65e0906afee2..fbf3723ec1d3 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.7 1999/05/07 02:20:32 mharo Exp $ +# $Id: Makefile,v 1.8 1999/05/12 11:37:22 asami Exp $ # DISTNAME= Gtk---1.0.0 @@ -13,15 +13,25 @@ MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/gtk--/ MAINTAINER= nacai@iname.com -LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config + +.include <bsd.port.pre.mk> + +.if ${OSVERSION} < 400004 +BUILD_DEPENDS= eg++:${PORTSDIR}/lang/egcs +CC= egcc +CXX= eg++ +.endif + USE_X_PREFIX= yes USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-static=yes \ --without-gnome -CONFIGURE_ENV= GTK_CONFIG="${X11BASE}/bin/gtk12-config" +CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" MAN3= G_IntList.3 G_IntList_Iterator.3 G_List.3 G_List_Cpp_Iterator.3 \ G_List_Iterator.3 G_SList_Iterator.3 GtkBase.3 GtkBaseClass.3 \ @@ -58,4 +68,4 @@ MAN3= G_IntList.3 G_IntList_Iterator.3 G_List.3 G_List_Cpp_Iterator.3 \ ToolbarConnector.3 ToolbarConnectorBase.3 Toolbar_Child.3 \ _gtk_string.3 gtkmm_add_signal_class.3 -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/x11-toolkits/gtk--/pkg-plist b/x11-toolkits/gtk--/pkg-plist index 4d4ac7b0dd6b..4fc958e96bab 100644 --- a/x11-toolkits/gtk--/pkg-plist +++ b/x11-toolkits/gtk--/pkg-plist @@ -208,4 +208,3 @@ share/aclocal/gtk--.m4 @dirrm include/gtk-- @dirrm include/gdk--/extra @dirrm include/gdk-- -@unexec rmdir %D/share/aclocal 2>/dev/null || true diff --git a/x11-toolkits/gtk--2/Makefile b/x11-toolkits/gtk--2/Makefile index 65e0906afee2..fbf3723ec1d3 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.7 1999/05/07 02:20:32 mharo Exp $ +# $Id: Makefile,v 1.8 1999/05/12 11:37:22 asami Exp $ # DISTNAME= Gtk---1.0.0 @@ -13,15 +13,25 @@ MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/gtk--/ MAINTAINER= nacai@iname.com -LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config + +.include <bsd.port.pre.mk> + +.if ${OSVERSION} < 400004 +BUILD_DEPENDS= eg++:${PORTSDIR}/lang/egcs +CC= egcc +CXX= eg++ +.endif + USE_X_PREFIX= yes USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-static=yes \ --without-gnome -CONFIGURE_ENV= GTK_CONFIG="${X11BASE}/bin/gtk12-config" +CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" MAN3= G_IntList.3 G_IntList_Iterator.3 G_List.3 G_List_Cpp_Iterator.3 \ G_List_Iterator.3 G_SList_Iterator.3 GtkBase.3 GtkBaseClass.3 \ @@ -58,4 +68,4 @@ MAN3= G_IntList.3 G_IntList_Iterator.3 G_List.3 G_List_Cpp_Iterator.3 \ ToolbarConnector.3 ToolbarConnectorBase.3 Toolbar_Child.3 \ _gtk_string.3 gtkmm_add_signal_class.3 -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/x11-toolkits/gtk--2/pkg-plist b/x11-toolkits/gtk--2/pkg-plist index 4d4ac7b0dd6b..4fc958e96bab 100644 --- a/x11-toolkits/gtk--2/pkg-plist +++ b/x11-toolkits/gtk--2/pkg-plist @@ -208,4 +208,3 @@ share/aclocal/gtk--.m4 @dirrm include/gtk-- @dirrm include/gdk--/extra @dirrm include/gdk-- -@unexec rmdir %D/share/aclocal 2>/dev/null || true diff --git a/x11-toolkits/gtkmm12/Makefile b/x11-toolkits/gtkmm12/Makefile index 65e0906afee2..fbf3723ec1d3 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.7 1999/05/07 02:20:32 mharo Exp $ +# $Id: Makefile,v 1.8 1999/05/12 11:37:22 asami Exp $ # DISTNAME= Gtk---1.0.0 @@ -13,15 +13,25 @@ MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/gtk--/ MAINTAINER= nacai@iname.com -LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config + +.include <bsd.port.pre.mk> + +.if ${OSVERSION} < 400004 +BUILD_DEPENDS= eg++:${PORTSDIR}/lang/egcs +CC= egcc +CXX= eg++ +.endif + USE_X_PREFIX= yes USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-static=yes \ --without-gnome -CONFIGURE_ENV= GTK_CONFIG="${X11BASE}/bin/gtk12-config" +CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" MAN3= G_IntList.3 G_IntList_Iterator.3 G_List.3 G_List_Cpp_Iterator.3 \ G_List_Iterator.3 G_SList_Iterator.3 GtkBase.3 GtkBaseClass.3 \ @@ -58,4 +68,4 @@ MAN3= G_IntList.3 G_IntList_Iterator.3 G_List.3 G_List_Cpp_Iterator.3 \ ToolbarConnector.3 ToolbarConnectorBase.3 Toolbar_Child.3 \ _gtk_string.3 gtkmm_add_signal_class.3 -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/x11-toolkits/gtkmm12/pkg-plist b/x11-toolkits/gtkmm12/pkg-plist index 4d4ac7b0dd6b..4fc958e96bab 100644 --- a/x11-toolkits/gtkmm12/pkg-plist +++ b/x11-toolkits/gtkmm12/pkg-plist @@ -208,4 +208,3 @@ share/aclocal/gtk--.m4 @dirrm include/gtk-- @dirrm include/gdk--/extra @dirrm include/gdk-- -@unexec rmdir %D/share/aclocal 2>/dev/null || true diff --git a/x11-toolkits/gtkmm20/Makefile b/x11-toolkits/gtkmm20/Makefile index 65e0906afee2..fbf3723ec1d3 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.7 1999/05/07 02:20:32 mharo Exp $ +# $Id: Makefile,v 1.8 1999/05/12 11:37:22 asami Exp $ # DISTNAME= Gtk---1.0.0 @@ -13,15 +13,25 @@ MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/gtk--/ MAINTAINER= nacai@iname.com -LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config + +.include <bsd.port.pre.mk> + +.if ${OSVERSION} < 400004 +BUILD_DEPENDS= eg++:${PORTSDIR}/lang/egcs +CC= egcc +CXX= eg++ +.endif + USE_X_PREFIX= yes USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-static=yes \ --without-gnome -CONFIGURE_ENV= GTK_CONFIG="${X11BASE}/bin/gtk12-config" +CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" MAN3= G_IntList.3 G_IntList_Iterator.3 G_List.3 G_List_Cpp_Iterator.3 \ G_List_Iterator.3 G_SList_Iterator.3 GtkBase.3 GtkBaseClass.3 \ @@ -58,4 +68,4 @@ MAN3= G_IntList.3 G_IntList_Iterator.3 G_List.3 G_List_Cpp_Iterator.3 \ ToolbarConnector.3 ToolbarConnectorBase.3 Toolbar_Child.3 \ _gtk_string.3 gtkmm_add_signal_class.3 -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/x11-toolkits/gtkmm20/pkg-plist b/x11-toolkits/gtkmm20/pkg-plist index 4d4ac7b0dd6b..4fc958e96bab 100644 --- a/x11-toolkits/gtkmm20/pkg-plist +++ b/x11-toolkits/gtkmm20/pkg-plist @@ -208,4 +208,3 @@ share/aclocal/gtk--.m4 @dirrm include/gtk-- @dirrm include/gdk--/extra @dirrm include/gdk-- -@unexec rmdir %D/share/aclocal 2>/dev/null || true diff --git a/x11-toolkits/gtkmm24/Makefile b/x11-toolkits/gtkmm24/Makefile index 65e0906afee2..fbf3723ec1d3 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.7 1999/05/07 02:20:32 mharo Exp $ +# $Id: Makefile,v 1.8 1999/05/12 11:37:22 asami Exp $ # DISTNAME= Gtk---1.0.0 @@ -13,15 +13,25 @@ MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/gtk--/ MAINTAINER= nacai@iname.com -LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config + +.include <bsd.port.pre.mk> + +.if ${OSVERSION} < 400004 +BUILD_DEPENDS= eg++:${PORTSDIR}/lang/egcs +CC= egcc +CXX= eg++ +.endif + USE_X_PREFIX= yes USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-static=yes \ --without-gnome -CONFIGURE_ENV= GTK_CONFIG="${X11BASE}/bin/gtk12-config" +CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" MAN3= G_IntList.3 G_IntList_Iterator.3 G_List.3 G_List_Cpp_Iterator.3 \ G_List_Iterator.3 G_SList_Iterator.3 GtkBase.3 GtkBaseClass.3 \ @@ -58,4 +68,4 @@ MAN3= G_IntList.3 G_IntList_Iterator.3 G_List.3 G_List_Cpp_Iterator.3 \ ToolbarConnector.3 ToolbarConnectorBase.3 Toolbar_Child.3 \ _gtk_string.3 gtkmm_add_signal_class.3 -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/x11-toolkits/gtkmm24/pkg-plist b/x11-toolkits/gtkmm24/pkg-plist index 4d4ac7b0dd6b..4fc958e96bab 100644 --- a/x11-toolkits/gtkmm24/pkg-plist +++ b/x11-toolkits/gtkmm24/pkg-plist @@ -208,4 +208,3 @@ share/aclocal/gtk--.m4 @dirrm include/gtk-- @dirrm include/gdk--/extra @dirrm include/gdk-- -@unexec rmdir %D/share/aclocal 2>/dev/null || true diff --git a/x11-toolkits/gtkmm30/Makefile b/x11-toolkits/gtkmm30/Makefile index 65e0906afee2..fbf3723ec1d3 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.7 1999/05/07 02:20:32 mharo Exp $ +# $Id: Makefile,v 1.8 1999/05/12 11:37:22 asami Exp $ # DISTNAME= Gtk---1.0.0 @@ -13,15 +13,25 @@ MASTER_SITES= ftp://ftp.gimp.org/pub/gtk/gtk--/ MAINTAINER= nacai@iname.com -LIB_DEPENDS= gtk12.1:${PORTSDIR}/x11-toolkits/gtk12 +LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config + +.include <bsd.port.pre.mk> + +.if ${OSVERSION} < 400004 +BUILD_DEPENDS= eg++:${PORTSDIR}/lang/egcs +CC= egcc +CXX= eg++ +.endif + USE_X_PREFIX= yes USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-static=yes \ --without-gnome -CONFIGURE_ENV= GTK_CONFIG="${X11BASE}/bin/gtk12-config" +CONFIGURE_ENV= GTK_CONFIG="${GTK_CONFIG}" MAN3= G_IntList.3 G_IntList_Iterator.3 G_List.3 G_List_Cpp_Iterator.3 \ G_List_Iterator.3 G_SList_Iterator.3 GtkBase.3 GtkBaseClass.3 \ @@ -58,4 +68,4 @@ MAN3= G_IntList.3 G_IntList_Iterator.3 G_List.3 G_List_Cpp_Iterator.3 \ ToolbarConnector.3 ToolbarConnectorBase.3 Toolbar_Child.3 \ _gtk_string.3 gtkmm_add_signal_class.3 -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/x11-toolkits/gtkmm30/pkg-plist b/x11-toolkits/gtkmm30/pkg-plist index 4d4ac7b0dd6b..4fc958e96bab 100644 --- a/x11-toolkits/gtkmm30/pkg-plist +++ b/x11-toolkits/gtkmm30/pkg-plist @@ -208,4 +208,3 @@ share/aclocal/gtk--.m4 @dirrm include/gtk-- @dirrm include/gdk--/extra @dirrm include/gdk-- -@unexec rmdir %D/share/aclocal 2>/dev/null || true |