11 files changed, 295 insertions, 321 deletions

diff --git a/deskutils/bitnotes/Makefile b/deskutils/bitnotes/Makefile
index 04d0c3b29cb5..0fc66587aab9 100644
--- a/deskutils/bitnotes/Makefile
+++ b/deskutils/bitnotes/Makefile
@@ -15,22 +15,15 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	sobomax@FreeBSD.org
 
 BUILD_DEPENDS=	automake:${PORTSDIR}/devel/automake
-LIB_DEPENDS=	panel_applet.4:${PORTSDIR}/x11/gnomecore \
-		gnome.4:${PORTSDIR}/x11/gnomelibs
 
 WRKSRC=		${WRKDIR}/BitNotes
 
 USE_X_PREFIX=	yes
 USE_AUTOCONF=	yes
 USE_GMAKE=	yes
-
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-
-CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome
+USE_GNOME=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
-		GTK_CONFIG="${GTK_CONFIG}"
+		LIBS="-L${LOCALBASE}/lib"
 
 AUTOCONF=	autoconf && \
 			${PERL} -pi -e 's|-lpthread|-pthread|g ; \
diff --git a/deskutils/bulb/Makefile b/deskutils/bulb/Makefile
index b19b416fb595..cab2b75907c9 100644
--- a/deskutils/bulb/Makefile
+++ b/deskutils/bulb/Makefile
@@ -12,13 +12,16 @@ MASTER_SITES=	http://www.idiap.ch/~gobry/bulb/
 
 MAINTAINER=	smoberly@xavier.dyndns.org
 
-LIB_DEPENDS=	panel_applet.4:${PORTSDIR}/x11/gnomecore
+USE_X_PREFIX=	yes
+USE_GNOME=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LIBS="-L${LOCALBASE}/lib"
 
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-
-USE_X_PREFIX=	YES
-GNU_CONFIGURE=	YES
-CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}" LDFLAGS="-L${LOCALBASE}/lib -lintl"
-CONFIGURE_ARGS=	--datadir=${PREFIX}/share/gnome
+pre-patch:
+	@${PERL} -pi -e 's|-lpthread|-pthread|g ; \
+		 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
 
 .include <bsd.port.mk>
diff --git a/deskutils/genius/Makefile b/deskutils/genius/Makefile
index 3c762d3d936d..6dc3859ec9bd 100644
--- a/deskutils/genius/Makefile
+++ b/deskutils/genius/Makefile
@@ -12,20 +12,11 @@ MASTER_SITES=	http://ftp.5z.com/pub/genius/
 
 MAINTAINER=	ade@FreeBSD.org
 
-BUILD_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore
-RUN_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore
-
-GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
+USE_GNOME=	yes
 USE_LIBTOOL=	yes
-CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		GLIB_CONFIG="${GLIB_CONFIG}" \
-		GTK_CONFIG="${GTK_CONFIG}" \
 		LIBS="-L${LOCALBASE}/lib"
 
 pre-patch:
diff --git a/deskutils/gnofin/Makefile b/deskutils/gnofin/Makefile
index ee50298608c7..c7d26ec5c177 100644
--- a/deskutils/gnofin/Makefile
+++ b/deskutils/gnofin/Makefile
@@ -13,17 +13,24 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	jedgar@FreeBSD.org
 
-LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs \
-		xml.5:${PORTSDIR}/textproc/libxml
-
-GTK_CONFIG?=    ${X11BASE}/bin/gtk12-config
-
 USE_X_PREFIX=	yes
-USE_LIBTOOL=	yes
 USE_GMAKE=	yes
+USE_GNOME=	yes
+USE_LIBTOOL=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LIBS="-L${LOCALBASE}/lib"
 
 MAN1=		gnofin.1
 
-CONFIGURE_ENV=  GTK_CONFIG="${GTK_CONFIG}"
+pre-patch:
+	@${PERL} -pi -e 's|-lpthread|-pthread|g ; \
+		 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\)/gnome/|\$$\(datadir\)/|g ; \
+		 s|\$$\(datadir\)/locale|\$$\(prefix\)/share/locale|g'
+	@find ${WRKSRC}/plugins -name "Makefile.in" | xargs ${PERL} -pi -e \
+		's|_la_LDFLAGS =|_la_LDFLAGS = -avoid-version|g'
 
 .include <bsd.port.mk>
diff --git a/deskutils/gnofin/pkg-plist b/deskutils/gnofin/pkg-plist
index 02138384f313..acabc7d57fd0 100644
--- a/deskutils/gnofin/pkg-plist
+++ b/deskutils/gnofin/pkg-plist
@@ -1,28 +1,13 @@
 bin/gnofin
-lib/gnofin/plugins/libqif.so.0
-lib/gnofin/plugins/libqif.so
-lib/gnofin/plugins/libqif.a
-lib/gnofin/plugins/libhtml.so.0
-lib/gnofin/plugins/libhtml.so
-lib/gnofin/plugins/libhtml.a
-lib/gnofin/plugins/liblatex.so.0
-lib/gnofin/plugins/liblatex.so
-lib/gnofin/plugins/liblatex.a
-lib/gnofin/plugins/libtext.so.0
-lib/gnofin/plugins/libtext.so
-lib/gnofin/plugins/libtext.a
-lib/gnofin/plugins/libcbb.so.0
 lib/gnofin/plugins/libcbb.so
-lib/gnofin/plugins/libcbb.a
-lib/gnofin/plugins/libfind.so.0
 lib/gnofin/plugins/libfind.so
-lib/gnofin/plugins/libfind.a
-lib/gnofin/plugins/libreconcile.so.0
+lib/gnofin/plugins/libhtml.so
+lib/gnofin/plugins/liblatex.so
+lib/gnofin/plugins/libqif.so
 lib/gnofin/plugins/libreconcile.so
-lib/gnofin/plugins/libreconcile.a
-lib/gnofin/plugins/libsched.so.0
 lib/gnofin/plugins/libsched.so
-lib/gnofin/plugins/libsched.a
+lib/gnofin/plugins/libtext.so
 share/gnome/apps/Applications/gnofin.desktop
+share/locale/fr/LC_MESSAGES/gnofin.mo
 @dirrm lib/gnofin/plugins
 @dirrm lib/gnofin
diff --git a/deskutils/gnome-pim/Makefile b/deskutils/gnome-pim/Makefile
index 49b1d63975c2..b3bb8583a15d 100644
--- a/deskutils/gnome-pim/Makefile
+++ b/deskutils/gnome-pim/Makefile
@@ -14,28 +14,22 @@ DISTNAME=	gnome-pim-${PORTVERSION}
 
 MAINTAINER=	ade@FreeBSD.org
 
-LIB_DEPENDS=	panel_applet.4:${PORTSDIR}/x11/gnomecore
-
 .if defined(WITH_GNOMEPILOT)
 LIB_DEPENDS+=	gpilotd.0:${PORTSDIR}/palm/gnomepilot
 PILOTINC=	"-I${LOCALBASE}/pilot/include"
 PILOTLIB=	"-L${LOCALBASE}/pilot/lib"
 PLIST_SUB+=	GNOMEPILOT:=""
 .else
-PILOTARGS=	--without-pisock --disable-pilotlinktest
+CONFIGURE_ARGS=	--without-pisock --disable-pilotlinktest
 EXTRA_PATCHES=	${FILESDIR}/patch.nopilot
 PLIST_SUB+=	GNOMEPILOT:="@comment "
 .endif
 
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
+USE_GNOME=	yes
 USE_LIBTOOL=	yes
-CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome ${PILOTARGS}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PILOTINC}" \
-		GTK_CONFIG="${GTK_CONFIG}" \
 		LIBS="-L${LOCALBASE}/lib ${PILOTLIB}"
 
 .if !defined(WITH_GNOMEPILOT)
diff --git a/deskutils/gnomepim/Makefile b/deskutils/gnomepim/Makefile
index 49b1d63975c2..b3bb8583a15d 100644
--- a/deskutils/gnomepim/Makefile
+++ b/deskutils/gnomepim/Makefile
@@ -14,28 +14,22 @@ DISTNAME=	gnome-pim-${PORTVERSION}
 
 MAINTAINER=	ade@FreeBSD.org
 
-LIB_DEPENDS=	panel_applet.4:${PORTSDIR}/x11/gnomecore
-
 .if defined(WITH_GNOMEPILOT)
 LIB_DEPENDS+=	gpilotd.0:${PORTSDIR}/palm/gnomepilot
 PILOTINC=	"-I${LOCALBASE}/pilot/include"
 PILOTLIB=	"-L${LOCALBASE}/pilot/lib"
 PLIST_SUB+=	GNOMEPILOT:=""
 .else
-PILOTARGS=	--without-pisock --disable-pilotlinktest
+CONFIGURE_ARGS=	--without-pisock --disable-pilotlinktest
 EXTRA_PATCHES=	${FILESDIR}/patch.nopilot
 PLIST_SUB+=	GNOMEPILOT:="@comment "
 .endif
 
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
+USE_GNOME=	yes
 USE_LIBTOOL=	yes
-CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share/gnome \
-		--datadir=${PREFIX}/share/gnome ${PILOTARGS}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PILOTINC}" \
-		GTK_CONFIG="${GTK_CONFIG}" \
 		LIBS="-L${LOCALBASE}/lib ${PILOTLIB}"
 
 .if !defined(WITH_GNOMEPILOT)
diff --git a/deskutils/gnucash/Makefile b/deskutils/gnucash/Makefile
index 9f69b20d6a7e..ef1f3fa38ea4 100644
--- a/deskutils/gnucash/Makefile
+++ b/deskutils/gnucash/Makefile
@@ -19,30 +19,34 @@ MAINTAINER=     ade@FreeBSD.org
 BUILD_DEPENDS=	swig:${PORTSDIR}/devel/SWIG \
 		g-wrap:${PORTSDIR}/devel/g-wrap \
 		eperl:${PORTSDIR}/lang/eperl
-LIB_DEPENDS=	panel_applet.4:${PORTSDIR}/x11/gnomecore \
-		guile.9:${PORTSDIR}/lang/guile
+LIB_DEPENDS=	guile.9:${PORTSDIR}/lang/guile
 RUN_DEPENDS=	slib48:${PORTSDIR}/lang/slib \
 		gnuplot:${PORTSDIR}/math/gnuplot \
 		${site_perl}/HTML/Base.pm:${PORTSDIR}/www/p5-HTML \
 		${site_perl}/LWP.pm:${PORTSDIR}/www/p5-libwww
 
 site_perl=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
+
+USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_XPM=	yes
-USE_X_PREFIX=	yes
 USE_PERL5=	yes
+USE_GNOME=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
-CONFIGURE_ENV=	MAKE=gmake \
-		CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
-		GTK_CONFIG="${GTK_CONFIG}" \
-		GLIB_CONFIG="${GLIB_CONFIG}"
 CONFIGURE_ARGS=	--with-glib-config=${GLIB_CONFIG}
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+
 MAN1=		gnc-prices.1 gnucash.1
 
+pre-patch:
+	@${PERL} -pi -e 's^-l(pthread|c_r)^-pthread^g ; \
+		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
+	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+		's^\$\{datadir\}/gnome/^\$\(datadir\)/^g ; \
+		 s^\$\{datadir\}/aclocal^\$\(prefix\)/share/aclocal^g ; \
+		 s^\$\{datadir\}/locale^\$\(prefix\)/share/locale^g'
 
 post-install:
 	@strip ${PREFIX}/bin/gnucash
diff --git a/deskutils/gnucash/pkg-plist b/deskutils/gnucash/pkg-plist
index af03769fe596..bf9f7520019b 100644
--- a/deskutils/gnucash/pkg-plist
+++ b/deskutils/gnucash/pkg-plist
@@ -11,223 +11,223 @@ lib/gnucash/perl/libgncswig.so.1
 @exec /sbin/ldconfig -m %D/lib/gnucash
 @unexec /sbin/ldconfig -R
 share/gnome/apps/Applications/gnucash.desktop
-share/gnucash/doc/AUTHORS
-share/gnucash/doc/COPYING
-share/gnucash/doc/ChangeLog
-share/gnucash/doc/INSTALL
-share/gnucash/doc/NEWS
-share/gnucash/doc/README
-share/gnucash/doc/README.francais
-share/gnucash/doc/README.german
-share/gnucash/doc/examples/Money95bank_fr.qif
-share/gnucash/doc/examples/Money95invst_fr.qif
-share/gnucash/doc/examples/Money95mfunds_fr.qif
-share/gnucash/doc/examples/Money95stocks_fr.qif
-share/gnucash/doc/examples/README
-share/gnucash/doc/examples/abc-all.qif
-share/gnucash/doc/examples/abc.qif
-share/gnucash/doc/examples/bogus.qif
-share/gnucash/doc/examples/cbb-export.qif
-share/gnucash/doc/examples/currency.xac
-share/gnucash/doc/examples/every.qif
-share/gnucash/doc/examples/ms-money.qif
-share/gnucash/doc/examples/quicktest.qif
-share/gnucash/doc/examples/splitdemo.xac
-share/gnucash/doc/examples/swipe.qif
-share/gnucash/doc/examples/test.xac
-share/gnucash/doc/examples/test2.xac
-share/gnucash/doc/examples/test3.xac
-share/gnucash/doc/examples/test4.xac
-share/gnucash/doc/examples/trading.xac
-share/gnucash/doc/examples/trading2.xac
-share/gnucash/doc/examples/web.qif
-share/gnucash/doc/examples/xfer.xac
-share/gnucash/doc/gnc.html
-share/gnucash/doc/guile-hackers.txt
-share/gnucash/html/C/RAW-NOTES
-share/gnucash/html/C/bofa-mym.html
-share/gnucash/html/C/image/appr-asset1.gif
-share/gnucash/html/C/image/appr-asset2.gif
-share/gnucash/html/C/image/appr-income.gif
-share/gnucash/html/C/image/appr-main1.gif
-share/gnucash/html/C/image/appr-main2.gif
-share/gnucash/html/C/image/bal-graph.gif
-share/gnucash/html/C/image/contract.gif
-share/gnucash/html/C/image/depr-asset.gif
-share/gnucash/html/C/image/depr-main.gif
-share/gnucash/html/C/image/expand.gif
-share/gnucash/html/C/image/foliowin-single.gif
-share/gnucash/html/C/image/foliowin.gif
-share/gnucash/html/C/image/logo-NetBSD-banner.gif
-share/gnucash/html/C/image/logo-bullogogross.gif
-share/gnucash/html/C/image/logo-debian.jpg
-share/gnucash/html/C/image/logo-ibm.gif
-share/gnucash/html/C/image/logo-linux.gif
-share/gnucash/html/C/image/logo-sgi.gif
-share/gnucash/html/C/image/logo-skunkware.gif
-share/gnucash/html/C/image/newaccwin-code.gif
-share/gnucash/html/C/image/newaccwin-trade.gif
-share/gnucash/html/C/image/recnwin.gif
-share/gnucash/html/C/image/regwin-double.gif
-share/gnucash/html/C/image/regwin-multi.gif
-share/gnucash/html/C/image/regwin-single.gif
-share/gnucash/html/C/image/regwin-single2.gif
-share/gnucash/html/C/image/report-av-baln.gif
-share/gnucash/html/C/image/report-baln.gif
-share/gnucash/html/C/image/report-folio.gif
-share/gnucash/html/C/image/report-option.gif
-share/gnucash/html/C/image/report-pnl.gif
-share/gnucash/html/C/image/reportwin.gif
-share/gnucash/html/C/image/ticker-a.gif
-share/gnucash/html/C/image/ticker-b.gif
-share/gnucash/html/C/projects.html
-share/gnucash/html/C/xacc-about.html
-share/gnucash/html/C/xacc-accountedit.html
-share/gnucash/html/C/xacc-acctypes.html
-share/gnucash/html/C/xacc-accwin.html
-share/gnucash/html/C/xacc-adjbwin.html
-share/gnucash/html/C/xacc-apar.html
-share/gnucash/html/C/xacc-apprdepr.html
-share/gnucash/html/C/xacc-bal_tracker.html
-share/gnucash/html/C/xacc-balsheet.html
-share/gnucash/html/C/xacc-currency.html
-share/gnucash/html/C/xacc-date.html
-share/gnucash/html/C/xacc-double.html
-share/gnucash/html/C/xacc-euro.html
-share/gnucash/html/C/xacc-expense.html
-share/gnucash/html/C/xacc-find-transactions.html
-share/gnucash/html/C/xacc-globalprefs.html
-share/gnucash/html/C/xacc-globalprops.html
-share/gnucash/html/C/xacc-gpl.html
-share/gnucash/html/C/xacc-groups.html
-share/gnucash/html/C/xacc-main.html
-share/gnucash/html/C/xacc-mainwin.html
-share/gnucash/html/C/xacc-pnl.html
-share/gnucash/html/C/xacc-portfolio_report.html
-share/gnucash/html/C/xacc-print.html
-share/gnucash/html/C/xacc-qif-import.html
-share/gnucash/html/C/xacc-quicken.html
-share/gnucash/html/C/xacc-recnwin.html
-share/gnucash/html/C/xacc-regwin.html
-share/gnucash/html/C/xacc-regwin_kbd.html
-share/gnucash/html/C/xacc-reports.html
-share/gnucash/html/C/xacc-ticker.html
-share/gnucash/html/C/xacc-trans_report.html
-share/gnucash/html/C/xacc-y2k.html
-share/gnucash/html/fr/bofa-mym.html
-share/gnucash/html/fr/image/appr-asset1.gif
-share/gnucash/html/fr/image/appr-asset2.gif
-share/gnucash/html/fr/image/appr-income.gif
-share/gnucash/html/fr/image/appr-main1.gif
-share/gnucash/html/fr/image/appr-main2.gif
-share/gnucash/html/fr/image/contract.gif
-share/gnucash/html/fr/image/depr-asset.gif
-share/gnucash/html/fr/image/depr-main.gif
-share/gnucash/html/fr/image/expand.gif
-share/gnucash/html/fr/image/foliowin-single.gif
-share/gnucash/html/fr/image/foliowin.gif
-share/gnucash/html/fr/image/newaccwin-code.gif
-share/gnucash/html/fr/image/newaccwin-trade.gif
-share/gnucash/html/fr/image/newaccwin.gif
-share/gnucash/html/fr/image/recnwin.gif
-share/gnucash/html/fr/image/regwin-double.gif
-share/gnucash/html/fr/image/regwin-multi.gif
-share/gnucash/html/fr/image/regwin-single.gif
-share/gnucash/html/fr/image/regwin-single2.gif
-share/gnucash/html/fr/image/regwin.gif
-share/gnucash/html/fr/image/report-baln.gif
-share/gnucash/html/fr/image/report-folio.gif
-share/gnucash/html/fr/image/report-option.gif
-share/gnucash/html/fr/image/reportwin.gif
-share/gnucash/html/fr/image/ticker-a.gif
-share/gnucash/html/fr/image/ticker-b.gif
-share/gnucash/html/fr/projects.html
-share/gnucash/html/fr/xacc-about.html
-share/gnucash/html/fr/xacc-accountedit.html
-share/gnucash/html/fr/xacc-acctypes.html
-share/gnucash/html/fr/xacc-accwin.html
-share/gnucash/html/fr/xacc-adjbwin.html
-share/gnucash/html/fr/xacc-apar.html
-share/gnucash/html/fr/xacc-apprdepr.html
-share/gnucash/html/fr/xacc-bal_tracker.html
-share/gnucash/html/fr/xacc-balsheet.html
-share/gnucash/html/fr/xacc-currency.html
-share/gnucash/html/fr/xacc-date.html
-share/gnucash/html/fr/xacc-double.html
-share/gnucash/html/fr/xacc-expense.html
-share/gnucash/html/fr/xacc-globalprefs.html
-share/gnucash/html/fr/xacc-gpl-fr.html
-share/gnucash/html/fr/xacc-gpl.html
-share/gnucash/html/fr/xacc-groups.html
-share/gnucash/html/fr/xacc-main.html
-share/gnucash/html/fr/xacc-mainwin.html
-share/gnucash/html/fr/xacc-pnl.html
-share/gnucash/html/fr/xacc-print.html
-share/gnucash/html/fr/xacc-quicken.html
-share/gnucash/html/fr/xacc-recnwin.html
-share/gnucash/html/fr/xacc-regwin.html
-share/gnucash/html/fr/xacc-reports.html
-share/gnucash/html/fr/xacc-ticker.html
-share/gnucash/html/fr/xacc-trans_report.html
-share/gnucash/html/fr/xacc-y2k.html
-share/gnucash/html/gnucash.css
-share/gnucash/html/index.html
-share/gnucash/perl/Quote.pm
-share/gnucash/perl/gnucash.pm
-share/gnucash/scm/bootstrap.scm
-share/gnucash/scm/bs-interp.scm
-share/gnucash/scm/c-interface.scm
-share/gnucash/scm/command-line.scm
-share/gnucash/scm/config-var.scm
-share/gnucash/scm/currencies.scm
-share/gnucash/scm/date-utilities.scm
-share/gnucash/scm/depend.scm
-share/gnucash/scm/doc.scm
-share/gnucash/scm/engine-interface.scm
-share/gnucash/scm/engine-utilities.scm
-share/gnucash/scm/extensions.scm
-share/gnucash/scm/gnumeric/gnumeric-utilities.scm
-share/gnucash/scm/gnumeric/table-utils.scm
-share/gnucash/scm/graph.scm
-share/gnucash/scm/hooks.scm
-share/gnucash/scm/html-generator.scm
-share/gnucash/scm/main.scm
-share/gnucash/scm/options.scm
-share/gnucash/scm/path.scm
-share/gnucash/scm/prefs.scm
-share/gnucash/scm/printing/number-to-words.scm
-share/gnucash/scm/printing/print-check.scm
-share/gnucash/scm/qif-import/qif-dialog-utils.scm
-share/gnucash/scm/qif-import/qif-file.scm
-share/gnucash/scm/qif-import/qif-guess-map.scm
-share/gnucash/scm/qif-import/qif-import.scm
-share/gnucash/scm/qif-import/qif-objects.scm
-share/gnucash/scm/qif-import/qif-parse.scm
-share/gnucash/scm/qif-import/qif-to-gnc.scm
-share/gnucash/scm/qif-import/qif-utils.scm
-share/gnucash/scm/qif-import/simple-obj.scm
-share/gnucash/scm/report-utilities.scm
-share/gnucash/scm/report.scm
-share/gnucash/scm/report/average-balance.scm
-share/gnucash/scm/report/balance-and-pnl.scm
-share/gnucash/scm/report/budget-report.scm
-share/gnucash/scm/report/folio.scm
-share/gnucash/scm/report/hello-world.scm
-share/gnucash/scm/report/report-list.scm
-share/gnucash/scm/report/transaction-report.scm
-share/gnucash/scm/slib-backup.scm
-share/gnucash/scm/srfi/srfi-1.r5rs.scm
-share/gnucash/scm/srfi/srfi-1.unclear.scm
-share/gnucash/scm/srfi/srfi-19.scm
-share/gnucash/scm/srfi/srfi-8.guile.scm
-share/gnucash/scm/srfi/srfi-8.scm
-share/gnucash/scm/startup.scm
-share/gnucash/scm/structure.scm
-share/gnucash/scm/substring-search.scm
-share/gnucash/scm/testbed.scm
-share/gnucash/scm/text-export.scm
-share/gnucash/scm/utilities.scm
-share/gnucash/scm/xml-generator.scm
+share/gnome/gnucash/doc/AUTHORS
+share/gnome/gnucash/doc/COPYING
+share/gnome/gnucash/doc/ChangeLog
+share/gnome/gnucash/doc/INSTALL
+share/gnome/gnucash/doc/NEWS
+share/gnome/gnucash/doc/README
+share/gnome/gnucash/doc/README.francais
+share/gnome/gnucash/doc/README.german
+share/gnome/gnucash/doc/examples/Money95bank_fr.qif
+share/gnome/gnucash/doc/examples/Money95invst_fr.qif
+share/gnome/gnucash/doc/examples/Money95mfunds_fr.qif
+share/gnome/gnucash/doc/examples/Money95stocks_fr.qif
+share/gnome/gnucash/doc/examples/README
+share/gnome/gnucash/doc/examples/abc-all.qif
+share/gnome/gnucash/doc/examples/abc.qif
+share/gnome/gnucash/doc/examples/bogus.qif
+share/gnome/gnucash/doc/examples/cbb-export.qif
+share/gnome/gnucash/doc/examples/currency.xac
+share/gnome/gnucash/doc/examples/every.qif
+share/gnome/gnucash/doc/examples/ms-money.qif
+share/gnome/gnucash/doc/examples/quicktest.qif
+share/gnome/gnucash/doc/examples/splitdemo.xac
+share/gnome/gnucash/doc/examples/swipe.qif
+share/gnome/gnucash/doc/examples/test.xac
+share/gnome/gnucash/doc/examples/test2.xac
+share/gnome/gnucash/doc/examples/test3.xac
+share/gnome/gnucash/doc/examples/test4.xac
+share/gnome/gnucash/doc/examples/trading.xac
+share/gnome/gnucash/doc/examples/trading2.xac
+share/gnome/gnucash/doc/examples/web.qif
+share/gnome/gnucash/doc/examples/xfer.xac
+share/gnome/gnucash/doc/gnc.html
+share/gnome/gnucash/doc/guile-hackers.txt
+share/gnome/gnucash/html/C/RAW-NOTES
+share/gnome/gnucash/html/C/bofa-mym.html
+share/gnome/gnucash/html/C/image/appr-asset1.gif
+share/gnome/gnucash/html/C/image/appr-asset2.gif
+share/gnome/gnucash/html/C/image/appr-income.gif
+share/gnome/gnucash/html/C/image/appr-main1.gif
+share/gnome/gnucash/html/C/image/appr-main2.gif
+share/gnome/gnucash/html/C/image/bal-graph.gif
+share/gnome/gnucash/html/C/image/contract.gif
+share/gnome/gnucash/html/C/image/depr-asset.gif
+share/gnome/gnucash/html/C/image/depr-main.gif
+share/gnome/gnucash/html/C/image/expand.gif
+share/gnome/gnucash/html/C/image/foliowin-single.gif
+share/gnome/gnucash/html/C/image/foliowin.gif
+share/gnome/gnucash/html/C/image/logo-NetBSD-banner.gif
+share/gnome/gnucash/html/C/image/logo-bullogogross.gif
+share/gnome/gnucash/html/C/image/logo-debian.jpg
+share/gnome/gnucash/html/C/image/logo-ibm.gif
+share/gnome/gnucash/html/C/image/logo-linux.gif
+share/gnome/gnucash/html/C/image/logo-sgi.gif
+share/gnome/gnucash/html/C/image/logo-skunkware.gif
+share/gnome/gnucash/html/C/image/newaccwin-code.gif
+share/gnome/gnucash/html/C/image/newaccwin-trade.gif
+share/gnome/gnucash/html/C/image/recnwin.gif
+share/gnome/gnucash/html/C/image/regwin-double.gif
+share/gnome/gnucash/html/C/image/regwin-multi.gif
+share/gnome/gnucash/html/C/image/regwin-single.gif
+share/gnome/gnucash/html/C/image/regwin-single2.gif
+share/gnome/gnucash/html/C/image/report-av-baln.gif
+share/gnome/gnucash/html/C/image/report-baln.gif
+share/gnome/gnucash/html/C/image/report-folio.gif
+share/gnome/gnucash/html/C/image/report-option.gif
+share/gnome/gnucash/html/C/image/report-pnl.gif
+share/gnome/gnucash/html/C/image/reportwin.gif
+share/gnome/gnucash/html/C/image/ticker-a.gif
+share/gnome/gnucash/html/C/image/ticker-b.gif
+share/gnome/gnucash/html/C/projects.html
+share/gnome/gnucash/html/C/xacc-about.html
+share/gnome/gnucash/html/C/xacc-accountedit.html
+share/gnome/gnucash/html/C/xacc-acctypes.html
+share/gnome/gnucash/html/C/xacc-accwin.html
+share/gnome/gnucash/html/C/xacc-adjbwin.html
+share/gnome/gnucash/html/C/xacc-apar.html
+share/gnome/gnucash/html/C/xacc-apprdepr.html
+share/gnome/gnucash/html/C/xacc-bal_tracker.html
+share/gnome/gnucash/html/C/xacc-balsheet.html
+share/gnome/gnucash/html/C/xacc-currency.html
+share/gnome/gnucash/html/C/xacc-date.html
+share/gnome/gnucash/html/C/xacc-double.html
+share/gnome/gnucash/html/C/xacc-euro.html
+share/gnome/gnucash/html/C/xacc-expense.html
+share/gnome/gnucash/html/C/xacc-find-transactions.html
+share/gnome/gnucash/html/C/xacc-globalprefs.html
+share/gnome/gnucash/html/C/xacc-globalprops.html
+share/gnome/gnucash/html/C/xacc-gpl.html
+share/gnome/gnucash/html/C/xacc-groups.html
+share/gnome/gnucash/html/C/xacc-main.html
+share/gnome/gnucash/html/C/xacc-mainwin.html
+share/gnome/gnucash/html/C/xacc-pnl.html
+share/gnome/gnucash/html/C/xacc-portfolio_report.html
+share/gnome/gnucash/html/C/xacc-print.html
+share/gnome/gnucash/html/C/xacc-qif-import.html
+share/gnome/gnucash/html/C/xacc-quicken.html
+share/gnome/gnucash/html/C/xacc-recnwin.html
+share/gnome/gnucash/html/C/xacc-regwin.html
+share/gnome/gnucash/html/C/xacc-regwin_kbd.html
+share/gnome/gnucash/html/C/xacc-reports.html
+share/gnome/gnucash/html/C/xacc-ticker.html
+share/gnome/gnucash/html/C/xacc-trans_report.html
+share/gnome/gnucash/html/C/xacc-y2k.html
+share/gnome/gnucash/html/fr/bofa-mym.html
+share/gnome/gnucash/html/fr/image/appr-asset1.gif
+share/gnome/gnucash/html/fr/image/appr-asset2.gif
+share/gnome/gnucash/html/fr/image/appr-income.gif
+share/gnome/gnucash/html/fr/image/appr-main1.gif
+share/gnome/gnucash/html/fr/image/appr-main2.gif
+share/gnome/gnucash/html/fr/image/contract.gif
+share/gnome/gnucash/html/fr/image/depr-asset.gif
+share/gnome/gnucash/html/fr/image/depr-main.gif
+share/gnome/gnucash/html/fr/image/expand.gif
+share/gnome/gnucash/html/fr/image/foliowin-single.gif
+share/gnome/gnucash/html/fr/image/foliowin.gif
+share/gnome/gnucash/html/fr/image/newaccwin-code.gif
+share/gnome/gnucash/html/fr/image/newaccwin-trade.gif
+share/gnome/gnucash/html/fr/image/newaccwin.gif
+share/gnome/gnucash/html/fr/image/recnwin.gif
+share/gnome/gnucash/html/fr/image/regwin-double.gif
+share/gnome/gnucash/html/fr/image/regwin-multi.gif
+share/gnome/gnucash/html/fr/image/regwin-single.gif
+share/gnome/gnucash/html/fr/image/regwin-single2.gif
+share/gnome/gnucash/html/fr/image/regwin.gif
+share/gnome/gnucash/html/fr/image/report-baln.gif
+share/gnome/gnucash/html/fr/image/report-folio.gif
+share/gnome/gnucash/html/fr/image/report-option.gif
+share/gnome/gnucash/html/fr/image/reportwin.gif
+share/gnome/gnucash/html/fr/image/ticker-a.gif
+share/gnome/gnucash/html/fr/image/ticker-b.gif
+share/gnome/gnucash/html/fr/projects.html
+share/gnome/gnucash/html/fr/xacc-about.html
+share/gnome/gnucash/html/fr/xacc-accountedit.html
+share/gnome/gnucash/html/fr/xacc-acctypes.html
+share/gnome/gnucash/html/fr/xacc-accwin.html
+share/gnome/gnucash/html/fr/xacc-adjbwin.html
+share/gnome/gnucash/html/fr/xacc-apar.html
+share/gnome/gnucash/html/fr/xacc-apprdepr.html
+share/gnome/gnucash/html/fr/xacc-bal_tracker.html
+share/gnome/gnucash/html/fr/xacc-balsheet.html
+share/gnome/gnucash/html/fr/xacc-currency.html
+share/gnome/gnucash/html/fr/xacc-date.html
+share/gnome/gnucash/html/fr/xacc-double.html
+share/gnome/gnucash/html/fr/xacc-expense.html
+share/gnome/gnucash/html/fr/xacc-globalprefs.html
+share/gnome/gnucash/html/fr/xacc-gpl-fr.html
+share/gnome/gnucash/html/fr/xacc-gpl.html
+share/gnome/gnucash/html/fr/xacc-groups.html
+share/gnome/gnucash/html/fr/xacc-main.html
+share/gnome/gnucash/html/fr/xacc-mainwin.html
+share/gnome/gnucash/html/fr/xacc-pnl.html
+share/gnome/gnucash/html/fr/xacc-print.html
+share/gnome/gnucash/html/fr/xacc-quicken.html
+share/gnome/gnucash/html/fr/xacc-recnwin.html
+share/gnome/gnucash/html/fr/xacc-regwin.html
+share/gnome/gnucash/html/fr/xacc-reports.html
+share/gnome/gnucash/html/fr/xacc-ticker.html
+share/gnome/gnucash/html/fr/xacc-trans_report.html
+share/gnome/gnucash/html/fr/xacc-y2k.html
+share/gnome/gnucash/html/gnucash.css
+share/gnome/gnucash/html/index.html
+share/gnome/gnucash/perl/Quote.pm
+share/gnome/gnucash/perl/gnucash.pm
+share/gnome/gnucash/scm/bootstrap.scm
+share/gnome/gnucash/scm/bs-interp.scm
+share/gnome/gnucash/scm/c-interface.scm
+share/gnome/gnucash/scm/command-line.scm
+share/gnome/gnucash/scm/config-var.scm
+share/gnome/gnucash/scm/currencies.scm
+share/gnome/gnucash/scm/date-utilities.scm
+share/gnome/gnucash/scm/depend.scm
+share/gnome/gnucash/scm/doc.scm
+share/gnome/gnucash/scm/engine-interface.scm
+share/gnome/gnucash/scm/engine-utilities.scm
+share/gnome/gnucash/scm/extensions.scm
+share/gnome/gnucash/scm/gnumeric/gnumeric-utilities.scm
+share/gnome/gnucash/scm/gnumeric/table-utils.scm
+share/gnome/gnucash/scm/graph.scm
+share/gnome/gnucash/scm/hooks.scm
+share/gnome/gnucash/scm/html-generator.scm
+share/gnome/gnucash/scm/main.scm
+share/gnome/gnucash/scm/options.scm
+share/gnome/gnucash/scm/path.scm
+share/gnome/gnucash/scm/prefs.scm
+share/gnome/gnucash/scm/printing/number-to-words.scm
+share/gnome/gnucash/scm/printing/print-check.scm
+share/gnome/gnucash/scm/qif-import/qif-dialog-utils.scm
+share/gnome/gnucash/scm/qif-import/qif-file.scm
+share/gnome/gnucash/scm/qif-import/qif-guess-map.scm
+share/gnome/gnucash/scm/qif-import/qif-import.scm
+share/gnome/gnucash/scm/qif-import/qif-objects.scm
+share/gnome/gnucash/scm/qif-import/qif-parse.scm
+share/gnome/gnucash/scm/qif-import/qif-to-gnc.scm
+share/gnome/gnucash/scm/qif-import/qif-utils.scm
+share/gnome/gnucash/scm/qif-import/simple-obj.scm
+share/gnome/gnucash/scm/report-utilities.scm
+share/gnome/gnucash/scm/report.scm
+share/gnome/gnucash/scm/report/average-balance.scm
+share/gnome/gnucash/scm/report/balance-and-pnl.scm
+share/gnome/gnucash/scm/report/budget-report.scm
+share/gnome/gnucash/scm/report/folio.scm
+share/gnome/gnucash/scm/report/hello-world.scm
+share/gnome/gnucash/scm/report/report-list.scm
+share/gnome/gnucash/scm/report/transaction-report.scm
+share/gnome/gnucash/scm/slib-backup.scm
+share/gnome/gnucash/scm/srfi/srfi-1.r5rs.scm
+share/gnome/gnucash/scm/srfi/srfi-1.unclear.scm
+share/gnome/gnucash/scm/srfi/srfi-19.scm
+share/gnome/gnucash/scm/srfi/srfi-8.guile.scm
+share/gnome/gnucash/scm/srfi/srfi-8.scm
+share/gnome/gnucash/scm/startup.scm
+share/gnome/gnucash/scm/structure.scm
+share/gnome/gnucash/scm/substring-search.scm
+share/gnome/gnucash/scm/testbed.scm
+share/gnome/gnucash/scm/text-export.scm
+share/gnome/gnucash/scm/utilities.scm
+share/gnome/gnucash/scm/xml-generator.scm
 share/locale/de/LC_MESSAGES/gnucash.mo
 share/locale/en_GB/LC_MESSAGES/gnucash.mo
 share/locale/fr/LC_MESSAGES/gnucash.mo
@@ -239,18 +239,18 @@ share/locale/sv/LC_MESSAGES/gnucash.mo
 @dirrm etc/gnucash
 @dirrm lib/gnucash/perl
 @dirrm lib/gnucash
-@dirrm share/gnucash/doc/examples
-@dirrm share/gnucash/doc
-@dirrm share/gnucash/html/C/image
-@dirrm share/gnucash/html/C
-@dirrm share/gnucash/html/fr/image
-@dirrm share/gnucash/html/fr
-@dirrm share/gnucash/html
-@dirrm share/gnucash/perl
-@dirrm share/gnucash/scm/gnumeric
-@dirrm share/gnucash/scm/printing
-@dirrm share/gnucash/scm/qif-import
-@dirrm share/gnucash/scm/srfi
-@dirrm share/gnucash/scm/report
-@dirrm share/gnucash/scm
-@dirrm share/gnucash
+@dirrm share/gnome/gnucash/doc/examples
+@dirrm share/gnome/gnucash/doc
+@dirrm share/gnome/gnucash/html/C/image
+@dirrm share/gnome/gnucash/html/C
+@dirrm share/gnome/gnucash/html/fr/image
+@dirrm share/gnome/gnucash/html/fr
+@dirrm share/gnome/gnucash/html
+@dirrm share/gnome/gnucash/perl
+@dirrm share/gnome/gnucash/scm/gnumeric
+@dirrm share/gnome/gnucash/scm/printing
+@dirrm share/gnome/gnucash/scm/qif-import
+@dirrm share/gnome/gnucash/scm/srfi
+@dirrm share/gnome/gnucash/scm/report
+@dirrm share/gnome/gnucash/scm
+@dirrm share/gnome/gnucash
diff --git a/deskutils/yank/Makefile b/deskutils/yank/Makefile
index b17b8dc4f29f..b17f7750660c 100644
--- a/deskutils/yank/Makefile
+++ b/deskutils/yank/Makefile
@@ -12,18 +12,23 @@ MASTER_SITES=	http://home.ins.de/~m.hussmann/software/yank/
 
 MAINTAINER=	jedgar@FreeBSD.org
 
-LIB_DEPENDS=	panel_applet.4:${PORTSDIR}/x11/gnomecore
-
-GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
+PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
+USE_GNOME=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		GLIB_CONFIG="${GLIB_CONFIG}" \
-		GTK_CONFIG="${GTK_CONFIG}" \
 		LIBS="-L${LOCALBASE}/lib"
 
+pre-patch:
+	@${PERL} -pi -e 's^-l(pthread|c_r)^-pthread^g ; \
+		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
+	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+		's^\$\(datadir\)/gnome/^\$\(datadir\)/^g ; \
+		 s^\$\(datadir\)/locale^\$\(prefix\)/share/locale^g'
+	@find ${WRKSRC}/src/Plugins -name "Makefile.in" | xargs ${PERL} -pi -e \
+		's|_la_LDFLAGS =|_la_LDFLAGS = -avoid-version|g'
+
 .include <bsd.port.mk>
diff --git a/deskutils/yank/pkg-plist b/deskutils/yank/pkg-plist
index 4cb113ff5f66..baab9ccf4ee4 100644
--- a/deskutils/yank/pkg-plist
+++ b/deskutils/yank/pkg-plist
@@ -1,12 +1,10 @@
 bin/yank
+lib/yank/plugins/%%PORTVERSION%%/libPgp5.so
 share/gnome/apps/Applications/yank.desktop
 share/gnome/pixmaps/yank.png
 share/locale/de/LC_MESSAGES/yank.mo
 share/locale/ja/LC_MESSAGES/yank.mo
 share/locale/sv/LC_MESSAGES/yank.mo
-lib/yank/plugins/0.1.4/libPgp5.so.0
-lib/yank/plugins/0.1.4/libPgp5.so
-lib/yank/plugins/0.1.4/libPgp5.a
-@dirrm lib/yank/plugins/0.1.4
+@dirrm lib/yank/plugins/%%PORTVERSION%%
 @dirrm lib/yank/plugins
 @dirrm lib/yank