3 files changed, 49 insertions, 141 deletions

diff --git a/devel/preps-gui/Makefile b/devel/preps-gui/Makefile
index a661caa3e369..e57a5598908c 100644
--- a/devel/preps-gui/Makefile
+++ b/devel/preps-gui/Makefile
@@ -5,31 +5,36 @@
 # $FreeBSD$
 #
 
-PORTNAME=	preps-gui
-PORTVERSION=	1.8.1
+PORTNAME=	preps
+PORTVERSION=	2.0.4
 CATEGORIES=	devel
 MASTER_SITES=	http://webpages.charter.net/stuffle/linux/preps/
+PKGNAMESUFFIX=	-gui
 DISTNAME=	preps-${PORTVERSION}
 DIST_SUBDIR=	prep
 
-MAINTAINER=	shadow@psoft.net
+MAINTAINER=	jmelo@freebsdbrasil.com.br
 COMMENT=	Problem reporting system
 
-LIB_DEPENDS+=	preps-1.6.1:${PORTSDIR}/devel/libpreps
-
-BROKEN=		Incomplete pkg-plist
-DEPRECATED=	${BROKEN}
-EXPIRATION_DATE=2005-09-22
+RUN_DEPENDS=	prepsdb_tool:${PORTSDIR}/devel/prepstools
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gtk12 gnomelibs
-MAN1=		preps.1
+USE_GNOME=	gtk20 gconf2 libgnomeui
+USE_PGSQL=	yes
+USE_REINPLACE=	yes
+INSTALLS_OMF=	yes
+GCONF_SCHEMAS=	preps.schema
 
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS+=	--with-pgsqldir=${LOCALBASE} \
 			--with-plpgsqldir=${LOCALBASE} \
-			--with-libprepsdir=${LOCALBASE}
+			--with-libprepsdir=${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
 
 .include <bsd.port.mk>
diff --git a/devel/preps-gui/distinfo b/devel/preps-gui/distinfo
index efb6c1ce6bfd..8f967d610323 100644
--- a/devel/preps-gui/distinfo
+++ b/devel/preps-gui/distinfo
@@ -1,2 +1,2 @@
-MD5 (prep/preps-1.8.1.tar.gz) = 172b68c29aab49ba6ef4b68388f0647a
-SIZE (prep/preps-1.8.1.tar.gz) = 769820
+MD5 (prep/preps-2.0.4.tar.gz) = 9e004ae5449c4352d1b6a0ce73287e62
+SIZE (prep/preps-2.0.4.tar.gz) = 1017121
diff --git a/devel/preps-gui/pkg-plist b/devel/preps-gui/pkg-plist
index 1edbb07af18b..afa26a75738c 100644
--- a/devel/preps-gui/pkg-plist
+++ b/devel/preps-gui/pkg-plist
@@ -1,130 +1,33 @@
+@comment $FreeBSD$
 bin/preps
-
-share/pixmaps/preps.png
-share/preps/new.xpm
-share/preps/edit.xpm
-share/preps/find.xpm
-share/preps/preps_logo.xpm
-share/preps/print.xpm
-share/preps/refresh.xpm
-share/preps/exit.xpm
-@dirrm share/preps
-
-%%PORTDOCS%%share/gnome/help/PRepS/C/a1234.html
-%%PORTDOCS%%share/gnome/help/PRepS/C/a1753.html
-%%PORTDOCS%%share/gnome/help/PRepS/C/a2128.html
-%%PORTDOCS%%share/gnome/help/PRepS/C/admin-tasks.html
-%%PORTDOCS%%share/gnome/help/PRepS/C/admin.html
-%%PORTDOCS%%share/gnome/help/PRepS/C/attrib.html
-%%PORTDOCS%%share/gnome/help/PRepS/C/building.html
-%%PORTDOCS%%share/gnome/help/PRepS/C/create.html
-%%PORTDOCS%%share/gnome/help/PRepS/C/db-adimin-introduction.html
-%%PORTDOCS%%share/gnome/help/PRepS/C/db-admin-manual.html
-%%PORTDOCS%%share/gnome/help/PRepS/C/db-conf-file.html
-%%PORTDOCS%%share/gnome/help/PRepS/C/db-conf-sections.html
-%%PORTDOCS%%share/gnome/help/PRepS/C/faqs.html
-%%PORTDOCS%%share/gnome/help/PRepS/C/general.html
-%%PORTDOCS%%share/gnome/help/PRepS/C/install.html
-%%PORTDOCS%%share/gnome/help/PRepS/C/libpreps-license.html
-%%PORTDOCS%%share/gnome/help/PRepS/C/ln12.html
-%%PORTDOCS%%share/gnome/help/PRepS/C/ln1342.html
-%%PORTDOCS%%share/gnome/help/PRepS/C/ln1861.html
-%%PORTDOCS%%share/gnome/help/PRepS/C/ln26.html
-%%PORTDOCS%%share/gnome/help/PRepS/C/main-win.html
-%%PORTDOCS%%share/gnome/help/PRepS/C/manual-introduction.html
-%%PORTDOCS%%share/gnome/help/PRepS/C/manual.html
-%%PORTDOCS%%share/gnome/help/PRepS/C/manuals.html
-%%PORTDOCS%%share/gnome/help/PRepS/C/preps-conf.html
-%%PORTDOCS%%share/gnome/help/PRepS/C/preps-license.html
-%%PORTDOCS%%share/gnome/help/PRepS/C/query-edit.html
-%%PORTDOCS%%share/gnome/help/PRepS/C/reports.html
-%%PORTDOCS%%share/gnome/help/PRepS/C/templates.html
-%%PORTDOCS%%share/gnome/help/PRepS/C/trouble.html
-%%PORTDOCS%%share/gnome/help/PRepS/C/topic.dat
-%%PORTDOCS%%share/gnome/help/PRepS/C/update.html
-%%PORTDOCS%%share/gnome/help/PRepS/C/usage.html
-%%PORTDOCS%%share/gnome/help/PRepS/C/users.html
-%%PORTDOCS%%share/gnome/help/PRepS/C/using.html
-%%PORTDOCS%%share/gnome/help/PRepS/C/work-prs.html
-%%PORTDOCS%%share/gnome/help/PRepS/C/x1169.html
-%%PORTDOCS%%share/gnome/help/PRepS/C/x1179.html
-%%PORTDOCS%%share/gnome/help/PRepS/C/x1209.html
-%%PORTDOCS%%share/gnome/help/PRepS/C/x1214.html
-%%PORTDOCS%%share/gnome/help/PRepS/C/x1244.html
-%%PORTDOCS%%share/gnome/help/PRepS/C/x1254.html
-%%PORTDOCS%%share/gnome/help/PRepS/C/x1258.html
-%%PORTDOCS%%share/gnome/help/PRepS/C/x1264.html
-%%PORTDOCS%%share/gnome/help/PRepS/C/x1300.html
-%%PORTDOCS%%share/gnome/help/PRepS/C/x1305.html
-%%PORTDOCS%%share/gnome/help/PRepS/C/x1309.html
-%%PORTDOCS%%share/gnome/help/PRepS/C/x1313.html
-%%PORTDOCS%%share/gnome/help/PRepS/C/x1316.html
-%%PORTDOCS%%share/gnome/help/PRepS/C/x1319.html
-%%PORTDOCS%%share/gnome/help/PRepS/C/x1324.html
-%%PORTDOCS%%share/gnome/help/PRepS/C/x1608.html
-%%PORTDOCS%%share/gnome/help/PRepS/C/x1633.html
-%%PORTDOCS%%share/gnome/help/PRepS/C/x1656.html
-%%PORTDOCS%%share/gnome/help/PRepS/C/x1688.html
-%%PORTDOCS%%share/gnome/help/PRepS/C/x1698.html
-%%PORTDOCS%%share/gnome/help/PRepS/C/x1728.html
-%%PORTDOCS%%share/gnome/help/PRepS/C/x1733.html
-%%PORTDOCS%%share/gnome/help/PRepS/C/x1763.html
-%%PORTDOCS%%share/gnome/help/PRepS/C/x1773.html
-%%PORTDOCS%%share/gnome/help/PRepS/C/x1777.html
-%%PORTDOCS%%share/gnome/help/PRepS/C/x1783.html
-%%PORTDOCS%%share/gnome/help/PRepS/C/x1819.html
-%%PORTDOCS%%share/gnome/help/PRepS/C/x1824.html
-%%PORTDOCS%%share/gnome/help/PRepS/C/x1828.html
-%%PORTDOCS%%share/gnome/help/PRepS/C/x1832.html
-%%PORTDOCS%%share/gnome/help/PRepS/C/x1835.html
-%%PORTDOCS%%share/gnome/help/PRepS/C/x1838.html
-%%PORTDOCS%%share/gnome/help/PRepS/C/x1843.html
-%%PORTDOCS%%share/gnome/help/PRepS/C/x2138.html
-%%PORTDOCS%%share/gnome/help/PRepS/C/x2148.html
-%%PORTDOCS%%share/gnome/help/PRepS/C/x2152.html
-%%PORTDOCS%%share/gnome/help/PRepS/C/x2158.html
-%%PORTDOCS%%share/gnome/help/PRepS/C/x2194.html
-%%PORTDOCS%%share/gnome/help/PRepS/C/x2199.html
-%%PORTDOCS%%share/gnome/help/PRepS/C/x2203.html
-%%PORTDOCS%%share/gnome/help/PRepS/C/x2207.html
-%%PORTDOCS%%share/gnome/help/PRepS/C/x2210.html
-%%PORTDOCS%%share/gnome/help/PRepS/C/x2213.html
-%%PORTDOCS%%share/gnome/help/PRepS/C/x2218.html
-
-%%PORTDOCS%%share/gnome/help/PRepS/C/stylesheet-images/caution.gif
-%%PORTDOCS%%share/gnome/help/PRepS/C/stylesheet-images/home.gif
-%%PORTDOCS%%share/gnome/help/PRepS/C/stylesheet-images/important.gif
-%%PORTDOCS%%share/gnome/help/PRepS/C/stylesheet-images/next.gif
-%%PORTDOCS%%share/gnome/help/PRepS/C/stylesheet-images/note.gif
-%%PORTDOCS%%share/gnome/help/PRepS/C/stylesheet-images/prev.gif
-%%PORTDOCS%%share/gnome/help/PRepS/C/stylesheet-images/tip.gif
-%%PORTDOCS%%share/gnome/help/PRepS/C/stylesheet-images/toc-blank.gif
-%%PORTDOCS%%share/gnome/help/PRepS/C/stylesheet-images/toc-minus.gif
-%%PORTDOCS%%share/gnome/help/PRepS/C/stylesheet-images/toc-plus.gif
-%%PORTDOCS%%share/gnome/help/PRepS/C/stylesheet-images/up.gif
-%%PORTDOCS%%share/gnome/help/PRepS/C/stylesheet-images/warning.gif
-
-%%PORTDOCS%%share/gnome/help/PRepS/C/images/attriblist.gif
-%%PORTDOCS%%share/gnome/help/PRepS/C/images/editpr.gif
-%%PORTDOCS%%share/gnome/help/PRepS/C/images/findpr.gif
-%%PORTDOCS%%share/gnome/help/PRepS/C/images/gentab.gif
-%%PORTDOCS%%share/gnome/help/PRepS/C/images/login.gif
-%%PORTDOCS%%share/gnome/help/PRepS/C/images/mainwin.gif
-%%PORTDOCS%%share/gnome/help/PRepS/C/images/mainwintab.gif
-%%PORTDOCS%%share/gnome/help/PRepS/C/images/newpr.gif
-%%PORTDOCS%%share/gnome/help/PRepS/C/images/printdlg.gif
-%%PORTDOCS%%share/gnome/help/PRepS/C/images/prjedit.gif
-%%PORTDOCS%%share/gnome/help/PRepS/C/images/prjvers.gif
-%%PORTDOCS%%share/gnome/help/PRepS/C/images/prquery.gif
-%%PORTDOCS%%share/gnome/help/PRepS/C/images/ptedit.gif
-%%PORTDOCS%%share/gnome/help/PRepS/C/images/rawsql.gif
-%%PORTDOCS%%share/gnome/help/PRepS/C/images/sevredit.gif
-%%PORTDOCS%%share/gnome/help/PRepS/C/images/statedit.gif
-%%PORTDOCS%%share/gnome/help/PRepS/C/images/useredit.gif
-
-@dirrm share/gnome/help/PRepS/C/stylesheet-images
-@dirrm share/gnome/help/PRepS/C/images/
-@dirrm share/gnome/help/PRepS/C
-@dirrm share/gnome/help/PRepS
-
 share/gnome/apps/Development/PRepS.desktop
+share/gnome/omf/preps/preps-C.omf
+%%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
+@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%%