2 files changed, 59 insertions, 56 deletions

diff --git a/x11-toolkits/vdkbuilder/Makefile b/x11-toolkits/vdkbuilder/Makefile
index 722e3123c988..98f6115b35e8 100644
--- a/x11-toolkits/vdkbuilder/Makefile
+++ b/x11-toolkits/vdkbuilder/Makefile
@@ -14,15 +14,23 @@ MAINTAINER=	nakai@FreeBSD.org
 
 LIB_DEPENDS=	vdk.3:${PORTSDIR}/x11-toolkits/vdk
 
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-
 USE_NEWGCC=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
+USE_GTK=	yes
+WANT_GNOME=	yes
+USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
-GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		GTK_CONFIG="${GTK_CONFIG}" \
 		LIBS="-L${LOCALBASE}/lib -lgnuregex"
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if defined(HAVE_GNOME)
+USE_GNOME=	yes
+CONFIGURE_ARGS+=--enable-gnome
+.else
+CONFIGURE_ARGS+=--enable-gnome=no
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/x11-toolkits/vdkbuilder/pkg-plist b/x11-toolkits/vdkbuilder/pkg-plist
index 858b07971d1a..8ca1c1e0f70c 100644
--- a/x11-toolkits/vdkbuilder/pkg-plist
+++ b/x11-toolkits/vdkbuilder/pkg-plist
@@ -112,72 +112,67 @@ include/vdkb/vdksynted.h
 include/vdkb/vdkxpmbrowser.h
 include/vdkb/waitcursor.h
 lib/libvdkbcalendar.a
-lib/libvdkbcalendar.la
 lib/libvdkbcalendar.so
 lib/libvdkbcalendar.so.0
 lib/libvdkbdatabox.a
-lib/libvdkbdatabox.la
 lib/libvdkbdatabox.so
 lib/libvdkbdatabox.so.1
 lib/libvdkbdclock.a
-lib/libvdkbdclock.la
 lib/libvdkbdclock.so
 lib/libvdkbdclock.so.0
 lib/libvdkcalendar.a
-lib/libvdkcalendar.la
 lib/libvdkcalendar.so
 lib/libvdkcalendar.so.1
 lib/libvdkdclock.a
-lib/libvdkdclock.la
 lib/libvdkdclock.so
 lib/libvdkdclock.so.1
+share/gnome/pixmaps/vdkb.png
+%%DATADIR%%/vdkb/res/AUTHORS
+%%DATADIR%%/vdkb/res/COPYING
+%%DATADIR%%/vdkb/res/ChangeLog
+%%DATADIR%%/vdkb/res/INSTALL
+%%DATADIR%%/vdkb/res/NEWS
+%%DATADIR%%/vdkb/res/README
+%%DATADIR%%/vdkb/res/autogen.sh
+%%DATADIR%%/vdkb/res/cpphints
+%%DATADIR%%/vdkb/res/desk.gif
+%%DATADIR%%/vdkb/res/filedlg.gif
+%%DATADIR%%/vdkb/res/fixed.gif
+%%DATADIR%%/vdkb/res/index.htm
+%%DATADIR%%/vdkb/res/logo.gif
+%%DATADIR%%/vdkb/res/logo.xpm
+%%DATADIR%%/vdkb/res/newprj.gif
+%%DATADIR%%/vdkb/res/plugins.db
+%%DATADIR%%/vdkb/res/prjman.gif
+%%DATADIR%%/vdkb/res/prjwiz.gif
+%%DATADIR%%/vdkb/res/refindex.htm
+%%DATADIR%%/vdkb/res/run.gif
+%%DATADIR%%/vdkb/res/saveprj.gif
+%%DATADIR%%/vdkb/res/step1.0.gif
+%%DATADIR%%/vdkb/res/step2.gif
+%%DATADIR%%/vdkb/res/step3.gif
+%%DATADIR%%/vdkb/res/tokens.db
+%%DATADIR%%/vdkb/res/tutor1.htm
+%%DATADIR%%/vdkb/res/tutor2.htm
+%%DATADIR%%/vdkb/res/tutor3.htm
+%%DATADIR%%/vdkb/res/tutor4.htm
+%%DATADIR%%/vdkb/res/vdkapp.htm
+%%DATADIR%%/vdkb/res/vdkb.png
+%%DATADIR%%/vdkb/res/vdkbide.defaults
+%%DATADIR%%/vdkb/res/vdkbmaker.gif
+%%DATADIR%%/vdkb/res/vdkbrc
+%%DATADIR%%/vdkb/res/vdkcanvas.htm
+%%DATADIR%%/vdkb/res/vdkchkbut.htm
+%%DATADIR%%/vdkb/res/vdkform.htm
+%%DATADIR%%/vdkb/res/vdklogo.gif
+%%DATADIR%%/vdkb/res/vdkobjcont.htm
+%%DATADIR%%/vdkb/res/vdkobject.htm
+%%DATADIR%%/vdkb/res/vdkpaned.htm
+%%DATADIR%%/vdkb/res/vdkscrolled.htm
+%%DATADIR%%/vdkb/res/wi1.gif
 share/locale/da/LC_MESSAGES/vdkbuilder.mo
 share/locale/de/LC_MESSAGES/vdkbuilder.mo
 share/locale/it/LC_MESSAGES/vdkbuilder.mo
-share/pixmaps/vdkb.png
-share/vdkb/res/AUTHORS
-share/vdkb/res/COPYING
-share/vdkb/res/ChangeLog
-share/vdkb/res/INSTALL
-share/vdkb/res/NEWS
-share/vdkb/res/README
-share/vdkb/res/autogen.sh
-share/vdkb/res/cpphints
-share/vdkb/res/desk.gif
-share/vdkb/res/filedlg.gif
-share/vdkb/res/fixed.gif
-share/vdkb/res/index.htm
-share/vdkb/res/logo.gif
-share/vdkb/res/logo.xpm
-share/vdkb/res/newprj.gif
-share/vdkb/res/plugins.db
-share/vdkb/res/prjman.gif
-share/vdkb/res/prjwiz.gif
-share/vdkb/res/refindex.htm
-share/vdkb/res/run.gif
-share/vdkb/res/saveprj.gif
-share/vdkb/res/step1.0.gif
-share/vdkb/res/step2.gif
-share/vdkb/res/step3.gif
-share/vdkb/res/tokens.db
-share/vdkb/res/tutor1.htm
-share/vdkb/res/tutor2.htm
-share/vdkb/res/tutor3.htm
-share/vdkb/res/tutor4.htm
-share/vdkb/res/vdkapp.htm
-share/vdkb/res/vdkb.png
-share/vdkb/res/vdkbide.defaults
-share/vdkb/res/vdkbmaker.gif
-share/vdkb/res/vdkbrc
-share/vdkb/res/vdkcanvas.htm
-share/vdkb/res/vdkchkbut.htm
-share/vdkb/res/vdkform.htm
-share/vdkb/res/vdklogo.gif
-share/vdkb/res/vdkobjcont.htm
-share/vdkb/res/vdkobject.htm
-share/vdkb/res/vdkpaned.htm
-share/vdkb/res/vdkscrolled.htm
-share/vdkb/res/wi1.gif
+@dirrm %%DATADIR%%/vdkb/res
+@dirrm %%DATADIR%%/vdkb
 @dirrm include/vdkb
-@dirrm share/vdkb/res
-@dirrm share/vdkb