2 files changed, 32 insertions, 34 deletions

diff --git a/devel/preps-gui/Makefile b/devel/preps-gui/Makefile
index 1cce9ff6c30e..ba2d833063d0 100644
--- a/devel/preps-gui/Makefile
+++ b/devel/preps-gui/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	preps
 PORTVERSION=	2.0.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://webpages.charter.net/stuffle/preps/download/files/
 PKGNAMESUFFIX=	-gui
@@ -19,9 +19,9 @@ COMMENT=	Problem reporting system
 
 RUN_DEPENDS=	prepsdb_tool:${PORTSDIR}/devel/prepstools
 
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gtk20 gconf2 libgnomeui
+USE_GNOME=	gnomehack gnomeprefix gtk20 gconf2 libgnomeui
 USE_PGSQL=	yes
 INSTALLS_OMF=	yes
 GCONF_SCHEMAS=	preps.schema
@@ -34,7 +34,7 @@ CONFIGURE_ARGS+=	--with-pgsqldir=${LOCALBASE} \
 			--localstatedir=/var
 
 post-patch:
-	@${REINPLACE_CMD} -e 's#^\(omf_dest_dir\).*#\1=${PREFIX}/share/gnome/omf/@PACKAGE@#' \
-		${WRKSRC}/omf.make ${WRKSRC}/help/C/Makefile.in
+	@${REINPLACE_CMD} -e 's|@PACKAGE@/gnome/help|help|g' \
+		${WRKSRC}/help/C/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/devel/preps-gui/pkg-plist b/devel/preps-gui/pkg-plist
index 2e674abb8e3f..d35c0dc66ee3 100644
--- a/devel/preps-gui/pkg-plist
+++ b/devel/preps-gui/pkg-plist
@@ -1,34 +1,32 @@
 @comment $FreeBSD$
 bin/preps
 share/gnome/apps/Development/PRepS.desktop
+share/gnome/help/preps/C/figures/arch_dlg.png
+share/gnome/help/preps/C/figures/attriblist.png
+share/gnome/help/preps/C/figures/editpr.png
+share/gnome/help/preps/C/figures/findpr.png
+share/gnome/help/preps/C/figures/gentab.png
+share/gnome/help/preps/C/figures/login.png
+share/gnome/help/preps/C/figures/main_win_arch.png
+share/gnome/help/preps/C/figures/mainwin.png
+share/gnome/help/preps/C/figures/mainwintab.png
+share/gnome/help/preps/C/figures/newpr.png
+share/gnome/help/preps/C/figures/printdlg.png
+share/gnome/help/preps/C/figures/prjedit.png
+share/gnome/help/preps/C/figures/prjvers.png
+share/gnome/help/preps/C/figures/prquery.png
+share/gnome/help/preps/C/figures/ptedit.png
+share/gnome/help/preps/C/figures/rawsql.png
+share/gnome/help/preps/C/figures/sevredit.png
+share/gnome/help/preps/C/figures/statedit.png
+share/gnome/help/preps/C/figures/useredit.png
+share/gnome/help/preps/C/legal.xml
+share/gnome/help/preps/C/preps.xml
 share/gnome/omf/preps/preps-C.omf
-share/pixmaps/preps.png
-%%DATADIR%%/preps_logo.xpm
-%%DATADIR%%/gnome/help/preps/C/legal.xml
-%%DATADIR%%/gnome/help/preps/C/preps.xml
-%%DATADIR%%/gnome/help/preps/C/figures/arch_dlg.png
-%%DATADIR%%/gnome/help/preps/C/figures/attriblist.png
-%%DATADIR%%/gnome/help/preps/C/figures/editpr.png
-%%DATADIR%%/gnome/help/preps/C/figures/findpr.png
-%%DATADIR%%/gnome/help/preps/C/figures/gentab.png
-%%DATADIR%%/gnome/help/preps/C/figures/login.png
-%%DATADIR%%/gnome/help/preps/C/figures/main_win_arch.png
-%%DATADIR%%/gnome/help/preps/C/figures/mainwin.png
-%%DATADIR%%/gnome/help/preps/C/figures/mainwintab.png
-%%DATADIR%%/gnome/help/preps/C/figures/newpr.png
-%%DATADIR%%/gnome/help/preps/C/figures/printdlg.png
-%%DATADIR%%/gnome/help/preps/C/figures/prjedit.png
-%%DATADIR%%/gnome/help/preps/C/figures/prjvers.png
-%%DATADIR%%/gnome/help/preps/C/figures/prquery.png
-%%DATADIR%%/gnome/help/preps/C/figures/ptedit.png
-%%DATADIR%%/gnome/help/preps/C/figures/rawsql.png
-%%DATADIR%%/gnome/help/preps/C/figures/sevredit.png
-%%DATADIR%%/gnome/help/preps/C/figures/statedit.png
-%%DATADIR%%/gnome/help/preps/C/figures/useredit.png
+share/gnome/pixmaps/preps.png
+share/gnome/preps/preps_logo.xpm
+@dirrm share/gnome/preps
 @dirrm share/gnome/omf/preps
-@dirrm %%DATADIR%%/gnome/help/preps/C/figures
-@dirrm %%DATADIR%%/gnome/help/preps/C
-@dirrm %%DATADIR%%/gnome/help/preps
-@dirrm %%DATADIR%%/gnome/help
-@dirrm %%DATADIR%%/gnome
-@dirrm %%DATADIR%%
+@dirrm share/gnome/help/preps/C/figures
+@dirrm share/gnome/help/preps/C
+@dirrm share/gnome/help/preps