Implement USE_GTK, part 1.

8 files changed, 33 insertions, 32 deletions

diff --git a/ftp/IglooFTP/Makefile b/ftp/IglooFTP/Makefile
index 890b13ec8e9d..d87d12816efa 100644
--- a/ftp/IglooFTP/Makefile
+++ b/ftp/IglooFTP/Makefile
@@ -15,24 +15,18 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}.src
 
 MAINTAINER=	will@FreeBSD.org
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
 
 USE_X_PREFIX=	yes
-MAKE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
-ALL_TARGET=	IglooFTP
+USE_GTK=	yes
 
 post-extract:
 	@${RM} ${WRKSRC}/../share/docs/LICENSE~
 
 post-install:
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/IglooFTP
 .for file in AUTHORS BUGS COPYRIGHT THANKS TODO
-	${INSTALL_DATA} ${WRKSRC}/../${file} ${PREFIX}/share/doc/IglooFTP
+	${INSTALL_DATA} ${WRKSRC}/../${file} ${PREFIX}/share/IglooFTP/docs
 .endfor
 .endif
 
diff --git a/ftp/IglooFTP/files/patch-aa b/ftp/IglooFTP/files/patch-aa
index 662e5bc3babe..fa17c07fb535 100644
--- a/ftp/IglooFTP/files/patch-aa
+++ b/ftp/IglooFTP/files/patch-aa
@@ -1,5 +1,5 @@
---- FTP.c	Thu Apr 15 20:05:13 1999
-+++ /home/andy/tmp/wrk/src/FTP.c	Mon May  3 12:59:56 1999
+--- FTP.c.orig	Thu Apr 15 20:05:13 1999
++++ FTP.c	Mon May  3 12:59:56 1999
 @@ -15,12 +15,12 @@
   */
  
diff --git a/ftp/IglooFTP/files/patch-ab b/ftp/IglooFTP/files/patch-ab
index d80b3a665b5f..f2fb956b61fc 100644
--- a/ftp/IglooFTP/files/patch-ab
+++ b/ftp/IglooFTP/files/patch-ab
@@ -18,11 +18,20 @@
  VERSION = 0.6.1
  VERSION_DATE = 1999
 -DESTDIR = /usr/local
-+DESTDIR?= /usr/X11R6
++DESTDIR?= ${PREFIX}
  BIN_PATH = $(DESTDIR)/bin
  MAN_PATH = $(DESTDIR)/man
  SHARE_PATH = $(DESTDIR)/share/$(PROGNAME)
-@@ -50,14 +51,14 @@
+@@ -16,6 +17,8 @@
+ RPM_BUILDPATH = /usr/src/redhat
+ CODE_LINES = `cat *.c *.h | grep -ch -e "[[:alpha:]|[:punct:]]"` 
+ 
++all: $(PROGNAME)
++
+ $(PROGNAME): main.o GTKmisc.o menu.o toolbar.o connectbar.o statusbar.o\
+ 	dirlist.o ftplist.o queue.o log.o console.o dialog.o chmod.o\
+ 	version.o custom.o string.o pixmaps.o color.o cursor.o\
+@@ -50,14 +53,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;
@@ -45,7 +54,7 @@
  
  
  
-@@ -111,7 +112,7 @@
+@@ -111,7 +114,7 @@
  	@echo "#define COMPILE_TIME \"`date +%T`\"" >> version.h
  	@echo "#define COMPILE_BY \"`whoami`\"" >> version.h
  	@echo "#define COMPILE_HOST \"`hostname`\"" >> version.h
diff --git a/ftp/IglooFTP/files/patch-ac b/ftp/IglooFTP/files/patch-ac
index 2d45efc8ac97..dddf22599db0 100644
--- a/ftp/IglooFTP/files/patch-ac
+++ b/ftp/IglooFTP/files/patch-ac
@@ -1,5 +1,5 @@
---- main.c	Thu Apr 15 20:05:15 1999
-+++ /home/andy/tmp/wrk/src/main.c	Mon May  3 13:42:28 1999
+--- main.c.orig	Thu Apr 15 20:05:15 1999
++++ main.c	Mon May  3 13:42:28 1999
 @@ -20,6 +20,9 @@
  #include <stdlib.h>
  #include <unistd.h>
diff --git a/ftp/IglooFTP/pkg-plist b/ftp/IglooFTP/pkg-plist
index 836ea1a52fce..6d4a56d48163 100644
--- a/ftp/IglooFTP/pkg-plist
+++ b/ftp/IglooFTP/pkg-plist
@@ -1,13 +1,18 @@
 bin/IglooFTP
-share/IglooFTP/gtkrc
 share/IglooFTP/app_ass/app_ass.GNOME
 share/IglooFTP/app_ass/app_ass.KDE
 share/IglooFTP/app_ass/app_ass.default
 share/IglooFTP/bookmarks/default.bmk
+share/IglooFTP/docs/AUTHORS
+share/IglooFTP/docs/BUGS
+share/IglooFTP/docs/COPYRIGHT
 share/IglooFTP/docs/ChangeLog
 share/IglooFTP/docs/LICENSE
 share/IglooFTP/docs/README
+share/IglooFTP/docs/THANKS
+share/IglooFTP/docs/TODO
 share/IglooFTP/docs/welcome.msg
+share/IglooFTP/gtkrc
 share/IglooFTP/html/default.html
 share/IglooFTP/html/images/amazon_mini.gif
 share/IglooFTP/html/images/banner.gif
@@ -44,11 +49,6 @@ share/IglooFTP/html/images/softwares.jpg
 share/IglooFTP/html/images/viglooftp.gif
 share/IglooFTP/xpm/iglooftp.xpm
 share/IglooFTP/xpm/little_igloo.xpm
-share/doc/IglooFTP/AUTHORS
-share/doc/IglooFTP/BUGS
-share/doc/IglooFTP/COPYRIGHT
-share/doc/IglooFTP/THANKS
-share/doc/IglooFTP/TODO
 @dirrm share/IglooFTP/app_ass
 @dirrm share/IglooFTP/bookmarks
 @dirrm share/IglooFTP/docs
@@ -56,4 +56,3 @@ share/doc/IglooFTP/TODO
 @dirrm share/IglooFTP/html
 @dirrm share/IglooFTP/xpm
 @dirrm share/IglooFTP
-@dirrm share/doc/IglooFTP
diff --git a/ftp/axyftp/Makefile b/ftp/axyftp/Makefile
index 71a4d509d266..5ee67842a44e 100644
--- a/ftp/axyftp/Makefile
+++ b/ftp/axyftp/Makefile
@@ -14,12 +14,10 @@ MASTER_SITES=	ftp://ftp.wxftp.seul.org/pub/wxftp/${PORTVERSION}/ \
 
 MAINTAINER=	kris@FreeBSD.org
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-
+USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-GNU_CONFIGURE=  yes
-CONFIGURE_ENV=  GTK_CONFIG=${X11BASE}/bin/gtk12-config
-USE_X_PREFIX=   yes
+USE_GTK=	yes
+GNU_CONFIGURE=	yes
 
 MAN1=		axyftp.1
 
diff --git a/ftp/downloader/Makefile b/ftp/downloader/Makefile
index 32a04c66c765..fb353f42957c 100644
--- a/ftp/downloader/Makefile
+++ b/ftp/downloader/Makefile
@@ -15,13 +15,14 @@ DISTNAME=	nt-${PORTVERSION}
 
 MAINTAINER=	andrew@chg.ru
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
+LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext
 
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 MSGFMT_CMD=	${LOCALBASE}/bin/msgfmt
+
 WRKSRC=		${WRKDIR}/${DISTNAME}/main
-MAKE_ENV=	GTK_CONFIG="${GTK_CONFIG}" \
-		MSGFMT_CMD="${MSGFMT_CMD}"
+
+USE_GTK=	yes
+MAKE_ENV=	MSGFMT_CMD="${MSGFMT_CMD}"
 
 MAN1=		nt.1
 
diff --git a/ftp/downloader/files/patch-aa b/ftp/downloader/files/patch-aa
index c876c378daee..f87009420937 100644
--- a/ftp/downloader/files/patch-aa
+++ b/ftp/downloader/files/patch-aa
@@ -4,7 +4,7 @@
 -CXXFLAGS=-Wall -O2 -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
 -# -ggdb
 -# -DDEBUG_ALL
-+CXXFLAGS += -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
++CXXFLAGS += -D_THREAD_SAFE -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS
  
 -export CXXFLAGS LOCALEDIR
 -