3 files changed, 69 insertions, 36 deletions

diff --git a/ftp/gftp/Makefile b/ftp/gftp/Makefile
index 8c4692a144ed..a06c5b672592 100644
--- a/ftp/gftp/Makefile
+++ b/ftp/gftp/Makefile
@@ -13,26 +13,28 @@ MASTER_SITES=	http://gftp.seul.org/ \
 
 MAINTAINER=	dmarion@open.hr
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
-.if !defined(WITHOUT_GNOME)
-RUN_DEPENDS=	gnomecc:${PORTSDIR}/sysutils/gnomecontrolcenter
-.endif
-
 USE_X_PREFIX=	yes
+USE_GTK=	yes
+WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LIBS="-L${LOCALBASE}/lib"
 
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
+MAN1=		gftp.1
 
-CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}" \
-		CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+.include <bsd.port.pre.mk>
 
-MAN1=		gftp.1
+.if defined(HAVE_GNOME)
+USE_GNOME=	yes
+.endif
 
 pre-patch:
 	@${PERL} -pi -e 's|-lpthread|-pthread|g ; \
-		s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
+		 s|DATADIRNAME=lib|DATADIRNAME=share|g ; \
+		 s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \
+		 s|\$$\(top_builddir\)/intl/libintl.a|-lintl|g' ${WRKSRC}/configure
 	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
-		's|\$\(datadir\)/pixmaps|\$\(datadir\)/gnome/pixmaps|g'
+		's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g ; \
+		 s|\$$\(datadir\)/locale|\$$\(prefix\)/share/locale|g'
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/ftp/gftp/files/patch-ab b/ftp/gftp/files/patch-ab
new file mode 100644
index 000000000000..1246f8b0f0fe
--- /dev/null
+++ b/ftp/gftp/files/patch-ab
@@ -0,0 +1,31 @@
+--- docs/Makefile.in.orig	Sun Aug  6 19:53:16 2000
++++ docs/Makefile.in	Fri Sep  8 02:09:07 2000
+@@ -91,8 +91,10 @@
+ SUBDIRS = sample.gftp
+ EXTRA_DIST = USERS-GUIDE gftp.1 gftp.desktop gftp.lsm gftp.png
+ 
++.ifdef HAVE_GNOME
+ Utilitiesdir = $(datadir)/apps/Internet
+ Utilities_DATA = gftp.desktop
++.endif
+ 
+ Iconsdir = $(datadir)/pixmaps
+ Icons_DATA = gftp.png
+@@ -182,7 +184,6 @@
+ 
+ install-UtilitiesDATA: $(Utilities_DATA)
+ 	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(DESTDIR)$(Utilitiesdir)
+ 	@list='$(Utilities_DATA)'; for p in $$list; do \
+ 	  if test -f $(srcdir)/$$p; then \
+ 	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(Utilitiesdir)/$$p"; \
+@@ -338,8 +339,7 @@
+ 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+ installdirs: installdirs-recursive
+ installdirs-am:
+-	$(mkinstalldirs)  $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(Iconsdir) \
+-		$(DESTDIR)$(Utilitiesdir)
++	$(mkinstalldirs)  $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(Iconsdir)
+ 
+ 
+ mostlyclean-generic:
diff --git a/ftp/gftp/pkg-plist b/ftp/gftp/pkg-plist
index 1a7a575c0163..b2f62a214d41 100644
--- a/ftp/gftp/pkg-plist
+++ b/ftp/gftp/pkg-plist
@@ -1,26 +1,26 @@
 bin/gftp
-share/gftp/COPYING
-share/gftp/bookmarks
-share/gftp/deb.xpm
-share/gftp/diff.xpm
-share/gftp/dir.xpm
-share/gftp/doc.xpm
-share/gftp/dotdot.xpm
-share/gftp/exe.xpm
-share/gftp/gftp-logo.xpm
-share/gftp/gftprc
-share/gftp/img.xpm
-share/gftp/linkdir.xpm
-share/gftp/linkfile.xpm
-share/gftp/man.xpm
-share/gftp/open_dir.xpm
-share/gftp/rpm.xpm
-share/gftp/sound.xpm
-share/gftp/tar.xpm
-share/gftp/txt.xpm
-share/gftp/world.xpm
-share/gnome/apps/Internet/gftp.desktop
-share/gnome/pixmaps/gftp.png
+%%GNOME:%%share/gnome/apps/Internet/gftp.desktop
+%%DATADIR%%/gftp/COPYING
+%%DATADIR%%/gftp/bookmarks
+%%DATADIR%%/gftp/deb.xpm
+%%DATADIR%%/gftp/diff.xpm
+%%DATADIR%%/gftp/dir.xpm
+%%DATADIR%%/gftp/doc.xpm
+%%DATADIR%%/gftp/dotdot.xpm
+%%DATADIR%%/gftp/exe.xpm
+%%DATADIR%%/gftp/gftp-logo.xpm
+%%DATADIR%%/gftp/gftprc
+%%DATADIR%%/gftp/img.xpm
+%%DATADIR%%/gftp/linkdir.xpm
+%%DATADIR%%/gftp/linkfile.xpm
+%%DATADIR%%/gftp/man.xpm
+%%DATADIR%%/gftp/open_dir.xpm
+%%DATADIR%%/gftp/rpm.xpm
+%%DATADIR%%/gftp/sound.xpm
+%%DATADIR%%/gftp/tar.xpm
+%%DATADIR%%/gftp/txt.xpm
+%%DATADIR%%/gftp/world.xpm
+%%DATADIR%%/pixmaps/gftp.png
 share/locale/br/LC_MESSAGES/gftp.mo
 share/locale/cs/LC_MESSAGES/gftp.mo
 share/locale/da/LC_MESSAGES/gftp.mo
@@ -36,4 +36,4 @@ share/locale/pt_BR/LC_MESSAGES/gftp.mo
 share/locale/ru/LC_MESSAGES/gftp.mo
 share/locale/sv/LC_MESSAGES/gftp.mo
 share/locale/zh_TW.Big5/LC_MESSAGES/gftp.mo
-@dirrm share/gftp
+@dirrm %%DATADIR%%/gftp