4 files changed, 47 insertions, 17 deletions

diff --git a/x11/gdkxft/Makefile b/x11/gdkxft/Makefile
index e9d0a3c65d97..efef386a751f 100644
--- a/x11/gdkxft/Makefile
+++ b/x11/gdkxft/Makefile
@@ -6,31 +6,56 @@
 #
 
 PORTNAME=	gdkxft
-PORTVERSION=	1.1
+PORTVERSION=	1.4
 CATEGORIES=	x11
-MASTER_SITES=	http://philrsss.anu.edu.au/~josh/gdkxft/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
 USE_X_PREFIX=	yes
 USE_GTK=	yes
-USE_LIBTOOL=	yes
-LIBTOOLFLAGS=	--disable-ltlibs --disable-static
-INSTALLS_SHLIB=	yes
+WANT_GNOME=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	LDFLAGS=-lgnuregex
-PKGMESSAGE=	${WRKDIR}/.message
+CONFIGURE_ARGS=	--sbindir=${PREFIX}/bin
+INSTALLS_SHLIB=	yes
+
+MAN8=		gdkxft_sysinstall.8
 
 .include <bsd.port.pre.mk>
 
-.if $(XFREE86_VERSION) < 4
+.if ${XFREE86_VERSION} < 4
 IGNORE=		"requires XFree86-4.x or later to run"
 .endif
 
+.if defined(HAVE_GNOME)
+USE_GNOME=	yes
+.else
+CONFIGURE_ARGS+=	--without-gnome
+.endif
+
+post-patch:
+	@${PERL} -pi -e 's|gtk-config --prefix|\$$GTK_CONFIG --prefix|g ; \
+		 s|libgdk.la|libgdk12.so|g ; \
+		 s|libgdk.so|libgdk12.so|g ; \
+		 s|GDK_DLOPEN_NAME=.*$$|GDK_DLOPEN_NAME="libgdk12.so"|g' \
+			${WRKSRC}/configure
+	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+		's|src capplet|src \@BUILD_CAPPLET_TRUE\@capplet|g ; \
+		 s|DESTDIR\)\$$\(datadir|DESTDIR\)\$$\(pkgdatadir|g ; \
+		 s|/gnome/apps/|/apps/|g ; \
+		 s|la_LDFLAGS =.*$$|la_LDFLAGS = -module -avoid-version|g'
+.for file in gdkxft_sysinstall.in gdkxft.c generate.pl
+	@${PERL} -pi -e 's|<regex.h>|<gnuregex.h>|g ; \
+		 s|gtk-config |${GTK_CONFIG:T} |g' ${WRKSRC}/src/${file}
+.endfor
+
 post-install:
+.if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_MAN} ${WRKSRC}/README ${DOCSDIR}
-	@/usr/bin/printf "\nRefer to ${DOCSDIR}/README for details on how to enable gdkxft.\n\n" > \
-		${PKGMESSAGE}
-	@${CAT} ${PKGMESSAGE}
+	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/x11/gdkxft/distinfo b/x11/gdkxft/distinfo
index c3b0c1c3f1ae..08943dd32e47 100644
--- a/x11/gdkxft/distinfo
+++ b/x11/gdkxft/distinfo
@@ -1 +1 @@
-MD5 (gdkxft-1.1.tar.gz) = df59414611e76d0c6d9de3ab4dd57044
+MD5 (gdkxft-1.4.tar.gz) = 6c4d593ff119020a9d737a1d76b2f8b2
diff --git a/x11/gdkxft/pkg-descr b/x11/gdkxft/pkg-descr
index e458bb655cc5..ba7d652d4561 100644
--- a/x11/gdkxft/pkg-descr
+++ b/x11/gdkxft/pkg-descr
@@ -3,4 +3,4 @@ you have installed it, you can run any (well, nearly any) existing
 gtk+ binary and see anti-aliased fonts in the gtk widgets.  You don't
 need to recompile gtk+ or your applications.
 
-WWW: http://philrsss.anu.edu.au/~josh/gdkxft/
+WWW: http://gdkxft.sourceforge.net/
diff --git a/x11/gdkxft/pkg-plist b/x11/gdkxft/pkg-plist
index 600e8c9b2adc..ba2195cf0e59 100644
--- a/x11/gdkxft/pkg-plist
+++ b/x11/gdkxft/pkg-plist
@@ -1,6 +1,11 @@
+%%GNOME:%%bin/gdkxft-capplet
 bin/gdkxft_sysinstall
+etc/gdkxft.conf
 lib/libgdkxft.so
-share/doc/gdkxft/README
-share/gdkxft/gdkxft.conf
-@dirrm share/gdkxft
-@dirrm share/doc/gdkxft
+%%PORTDOCS%%share/doc/gdkxft/README
+%%GNOME:%%share/gnome/apps/Settings/UIOptions/gdkxft.desktop
+%%GNOME:%%share/gnome/control-center/UIOptions/gdkxft.desktop
+%%GNOME:%%share/gnome/gdkxft/gdkxft-capplet.glade
+%%GNOME:%%share/gnome/pixmaps/gdkxft.png
+%%GNOME:%%@dirrm share/gnome/gdkxft
+%%PORTDOCS%%@dirrm share/doc/gdkxft