Update to use gtk version 1.2.3.

PR:		11842
Submitted by:	Jeremy Lea <reg@shale.csir.co.za>

5 files changed, 33 insertions, 13 deletions

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 \