23 files changed, 76 insertions, 804 deletions
diff --git a/MOVED b/MOVED
index 5c8ad38d9ebd..78e46f7fbdb4 100644
--- a/MOVED
+++ b/MOVED
@@ -1644,3 +1644,5 @@ multimedia/gpac-libm4systems|multimedia/gpac-libgpac|2005-10-09|Library renamed
 games/marbles|games/lmarbles|2005-10-10|renamed to reflect right name
 games/py-slune|games/slune|2005-10-10|renamed to reflect right name
 games/kxl|devel/kxl|2005-10-12|accurate category
+devel/libpreps-devel||2005-10-13|obsolete
+devel/libpreps|devel/prepstools|2005-10-13|project was renamed
diff --git a/devel/Makefile b/devel/Makefile
index 9a6b15decbd4..35fc970ac2c2 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -498,8 +498,6 @@
     SUBDIR += libpci
     SUBDIR += libpdel
     SUBDIR += libpeak
-    SUBDIR += libpreps
-    SUBDIR += libpreps-devel
     SUBDIR += libredblack
     SUBDIR += libshbuf
     SUBDIR += libshhmsg
@@ -1328,6 +1326,7 @@
     SUBDIR += prcs
     SUBDIR += premake
     SUBDIR += preps-gui
+    SUBDIR += prepstools
     SUBDIR += privman
     SUBDIR += projectcenter.app
     SUBDIR += prototype
diff --git a/devel/libpreps-devel/Makefile b/devel/libpreps-devel/Makefile
deleted file mode 100644
index 65056280b63f..000000000000
--- a/devel/libpreps-devel/Makefile
+++ /dev/null
@@ -1,55 +0,0 @@
-# New ports collection makefile for:	libpreps
-# Date created:		Fri Mar 19 14:27:30 EET 2004
-# Whom:			shadow@psoft.net
-#
-# $FreeBSD$
-#
-
-PORTNAME=	libpreps
-PORTVERSION=	1.9.0
-PORTREVISION=	1
-CATEGORIES=	devel
-MASTER_SITES=	http://webpages.charter.net/stuffle/linux/preps/
-PKGNAMESUFFIX=	-devel
-DIST_SUBDIR=	prep
-
-MAINTAINER=	shadow@psoft.net
-COMMENT=	Problem reporting system
-
-CONFLICTS=	libpreps-1.6.*
-LATEST_LINK=	libpreps-devel
-
-INSTALLS_SHLIB=	yes
-
-USE_PGSQL=	yes
-USE_GMAKE=	yes
-USE_REINPLACE=	yes
-USE_GNOME=	glib12
-
-GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS+=--with-pgsqldir=${LOCALBASE} --with-plpgsqldir=${LOCALBASE}
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITHOUT_SERVER)
-CONFIGURE_ARGS+=--disable-server
-PKGNAMESUFFIX=	-client
-PLIST_SUB+=	SERVER="@comment "
-.else
-MAN1=		create_prepsdb.1 update_prepsdb.1
-PLIST_SUB+=	SERVER=""
-.endif
-
-# Setting/finding PostgreSQL version we want.
-.if exists(${LOCALBASE}/bin/postmaster)
-PGSQL_VER!=	${LOCALBASE}/bin/postmaster -V | \
-		${SED} -n 's/postmaster.*PostgreSQL[^0-9]*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\..*/\1\2/p'
-.else
-PGSQL_VER=	${DEFAULT_PGSQL_VER}
-.endif
-PGSQL_PORT=	${PORTSDIR}/databases/postgresql${PGSQL_VER}-server
-BUILD_DEPENDS+=	postgres:${PGSQL_PORT}
-RUN_DEPENDS+=	postgres:${PGSQL_PORT}
-
-.include <bsd.port.post.mk>
diff --git a/devel/libpreps-devel/distinfo b/devel/libpreps-devel/distinfo
deleted file mode 100644
index e10d086b8c98..000000000000
--- a/devel/libpreps-devel/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (prep/libpreps-1.9.0.tar.gz) = a23d6fb06a4bb09eca4f8f7da3e139ae
-SIZE (prep/libpreps-1.9.0.tar.gz) = 319183
diff --git a/devel/libpreps-devel/files/patch-configure b/devel/libpreps-devel/files/patch-configure
deleted file mode 100644
index 37af22051244..000000000000
--- a/devel/libpreps-devel/files/patch-configure
+++ /dev/null
@@ -1,29 +0,0 @@
---- configure.orig	Sat Mar 20 14:40:18 2004
-+++ configure	Sat Mar 20 14:44:11 2004
-@@ -9947,7 +9947,7 @@
- if test "x$pgheaderfound" = xno; then
-    echo "$as_me:$LINENO: checking Alternate Locations for postgres.h" >&5
- echo $ECHO_N "checking Alternate Locations for postgres.h... $ECHO_C" >&6
--   pgserv_incdirs="$ac_pgsql_dir/include /usr/include/pgsql /usr/include/postgresql /opt/postgres/include"
-+   pgserv_incdirs="$ac_pgsql_dir/include/postgresql /usr/include/pgsql /usr/include/postgresql /opt/postgres/include"
- 
- pgserv_incdir=NO
- for i in $pgserv_incdirs;
-@@ -9990,7 +9990,7 @@
-    fi
-    echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
--   PG_CFLAGS="-I$pgserv_incdir $PG_CFLAGS"
-+   PG_CFLAGS="-I$pgserv_incdir -I$pgserv_incdir/server $PG_CFLAGS"
- else
- 
- cat >>confdefs.h <<\_ACEOF
-@@ -10001,7 +10001,7 @@
- 
- echo "$as_me:$LINENO: checking for PL/pgSQL" >&5
- echo $ECHO_N "checking for PL/pgSQL... $ECHO_C" >&6
--plpgsql_dirs="$ac_plpgsql_dir/lib /usr/lib/pgsql /usr/lib /usr/local/lib /opt/postgres/lib"
-+plpgsql_dirs="$ac_plpgsql_dir/lib $ac_plpgsql_dir/lib/postgresql /usr/lib/pgsql /usr/lib /usr/local/lib /opt/postgres/lib"
- 
- plpgsql_dir=NO
- for i in $plpgsql_dirs;
diff --git a/devel/libpreps-devel/files/patch-nodocs b/devel/libpreps-devel/files/patch-nodocs
deleted file mode 100644
index 32c29889cbc5..000000000000
--- a/devel/libpreps-devel/files/patch-nodocs
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur doc.orig/C/Makefile.in doc/C/Makefile.in
---- doc.orig/C/Makefile.in	Mon Oct 28 03:50:24 2002
-+++ doc/C/Makefile.in	Fri Mar 19 14:05:19 2004
-@@ -108,7 +108,7 @@
- CONFIG_CLEAN_FILES =
- DIST_SOURCES =
- DIST_COMMON = Makefile.am Makefile.in
--all: all-am
-+all: 
- 
- .SUFFIXES:
- $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
diff --git a/devel/libpreps-devel/pkg-descr b/devel/libpreps-devel/pkg-descr
deleted file mode 100644
index fa5ca38d1e31..000000000000
--- a/devel/libpreps-devel/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-PRepS is a tool for reporting and tracking problems or tasks. 
-
-It is designed for tracking problems with software, but can also be used for 
-tracking other types of problems or tasks. Be creative.
-
-For more information see:
-WWW: http://webpages.charter.net/stuffle/linux/preps/preps.html
diff --git a/devel/libpreps-devel/pkg-plist b/devel/libpreps-devel/pkg-plist
deleted file mode 100644
index fd0eff85c662..000000000000
--- a/devel/libpreps-devel/pkg-plist
+++ /dev/null
@@ -1,117 +0,0 @@
-bin/create_prepsdb
-bin/update_prepsdb
-include/preps/sendmsg.h
-include/preps/version.h
-lib/libpreps.a
-lib/libpreps.la
-lib/libpreps.so
-lib/libpreps.so.2
-share/libpreps/assign.msg
-share/libpreps/create_defdata.in
-share/libpreps/doc/preps-FAQ/a279.html
-share/libpreps/doc/preps-FAQ/admin.html
-share/libpreps/doc/preps-FAQ/faqs.html
-share/libpreps/doc/preps-FAQ/general.html
-share/libpreps/doc/preps-FAQ/install.html
-share/libpreps/doc/preps-FAQ/ln12.html
-share/libpreps/doc/preps-FAQ/stylesheet-images/caution.gif
-share/libpreps/doc/preps-FAQ/stylesheet-images/home.gif
-share/libpreps/doc/preps-FAQ/stylesheet-images/important.gif
-share/libpreps/doc/preps-FAQ/stylesheet-images/next.gif
-share/libpreps/doc/preps-FAQ/stylesheet-images/note.gif
-share/libpreps/doc/preps-FAQ/stylesheet-images/prev.gif
-share/libpreps/doc/preps-FAQ/stylesheet-images/tip.gif
-share/libpreps/doc/preps-FAQ/stylesheet-images/toc-blank.gif
-share/libpreps/doc/preps-FAQ/stylesheet-images/toc-minus.gif
-share/libpreps/doc/preps-FAQ/stylesheet-images/toc-plus.gif
-share/libpreps/doc/preps-FAQ/stylesheet-images/up.gif
-share/libpreps/doc/preps-FAQ/stylesheet-images/warning.gif
-share/libpreps/doc/preps-FAQ/trouble.html
-share/libpreps/doc/preps-FAQ/using.html
-share/libpreps/doc/preps-FAQ/x289.html
-share/libpreps/doc/preps-FAQ/x299.html
-share/libpreps/doc/preps-FAQ/x303.html
-share/libpreps/doc/preps-FAQ/x309.html
-share/libpreps/doc/preps-FAQ/x345.html
-share/libpreps/doc/preps-FAQ/x350.html
-share/libpreps/doc/preps-FAQ/x354.html
-share/libpreps/doc/preps-FAQ/x358.html
-share/libpreps/doc/preps-FAQ/x361.html
-share/libpreps/doc/preps-FAQ/x364.html
-share/libpreps/doc/preps-FAQ/x369.html
-share/libpreps/doc/prepsdb-admin-manual/a421.html
-share/libpreps/doc/prepsdb-admin-manual/building.html
-share/libpreps/doc/prepsdb-admin-manual/create.html
-share/libpreps/doc/prepsdb-admin-manual/introduction.html
-share/libpreps/doc/prepsdb-admin-manual/license.html
-share/libpreps/doc/prepsdb-admin-manual/ln12.html
-share/libpreps/doc/prepsdb-admin-manual/manual.html
-share/libpreps/doc/prepsdb-admin-manual/stylesheet-images/caution.gif
-share/libpreps/doc/prepsdb-admin-manual/stylesheet-images/home.gif
-share/libpreps/doc/prepsdb-admin-manual/stylesheet-images/important.gif
-share/libpreps/doc/prepsdb-admin-manual/stylesheet-images/next.gif
-share/libpreps/doc/prepsdb-admin-manual/stylesheet-images/note.gif
-share/libpreps/doc/prepsdb-admin-manual/stylesheet-images/prev.gif
-share/libpreps/doc/prepsdb-admin-manual/stylesheet-images/tip.gif
-share/libpreps/doc/prepsdb-admin-manual/stylesheet-images/toc-blank.gif
-share/libpreps/doc/prepsdb-admin-manual/stylesheet-images/toc-minus.gif
-share/libpreps/doc/prepsdb-admin-manual/stylesheet-images/toc-plus.gif
-share/libpreps/doc/prepsdb-admin-manual/stylesheet-images/up.gif
-share/libpreps/doc/prepsdb-admin-manual/stylesheet-images/warning.gif
-share/libpreps/doc/prepsdb-admin-manual/templates.html
-share/libpreps/doc/prepsdb-admin-manual/update.html
-share/libpreps/doc/prepsdb-admin-manual/x276.html
-share/libpreps/doc/prepsdb-admin-manual/x301.html
-share/libpreps/doc/prepsdb-admin-manual/x324.html
-share/libpreps/doc/prepsdb-admin-manual/x356.html
-share/libpreps/doc/prepsdb-admin-manual/x366.html
-share/libpreps/doc/prepsdb-admin-manual/x396.html
-share/libpreps/doc/prepsdb-admin-manual/x401.html
-share/libpreps/doc/prepsdb-admin-manual/x431.html
-share/libpreps/doc/prepsdb-admin-manual/x441.html
-share/libpreps/doc/prepsdb-admin-manual/x445.html
-share/libpreps/doc/prepsdb-admin-manual/x451.html
-share/libpreps/doc/prepsdb-admin-manual/x487.html
-share/libpreps/doc/prepsdb-admin-manual/x492.html
-share/libpreps/doc/prepsdb-admin-manual/x496.html
-share/libpreps/doc/prepsdb-admin-manual/x500.html
-share/libpreps/doc/prepsdb-admin-manual/x503.html
-share/libpreps/doc/prepsdb-admin-manual/x506.html
-share/libpreps/doc/prepsdb-admin-manual/x511.html
-share/libpreps/doc/programmer/audit__trail_8h-source.html
-share/libpreps/doc/programmer/audit__trail_8h.html
-share/libpreps/doc/programmer/change__log_8h-source.html
-share/libpreps/doc/programmer/change__log_8h.html
-share/libpreps/doc/programmer/doxygen.css
-share/libpreps/doc/programmer/doxygen.gif
-share/libpreps/doc/programmer/files.html
-share/libpreps/doc/programmer/globals.html
-share/libpreps/doc/programmer/gstr__utils_8h-source.html
-share/libpreps/doc/programmer/gstr__utils_8h.html
-share/libpreps/doc/programmer/index.html
-share/libpreps/doc/programmer/pr__query_8h-source.html
-share/libpreps/doc/programmer/pr__query_8h.html
-share/libpreps/doc/programmer/prj__rpts__html_8h-source.html
-share/libpreps/doc/programmer/prj__rpts__html_8h.html
-share/libpreps/doc/programmer/prq__utils_8h-source.html
-share/libpreps/doc/programmer/prq__utils_8h.html
-share/libpreps/doc/programmer/sendmsg_8h-source.html
-share/libpreps/doc/programmer/sendmsg_8h.html
-share/libpreps/doc/programmer/tex__utils_8h-source.html
-share/libpreps/doc/programmer/tex__utils_8h.html
-share/libpreps/doc/programmer/version_8h-source.html
-share/libpreps/doc/programmer/version_8h.html
-share/libpreps/doc/table_layout.fig
-share/libpreps/drop_seq.sql
-share/libpreps/final_cleanup.sql
-share/libpreps/new_pr.msg
-share/libpreps/schema.in
-share/libpreps/update.msg
-@dirrm include/preps
-@dirrm share/libpreps/doc/programmer
-@dirrm share/libpreps/doc/prepsdb-admin-manual/stylesheet-images
-@dirrm share/libpreps/doc/prepsdb-admin-manual
-@dirrm share/libpreps/doc/preps-FAQ/stylesheet-images
-@dirrm share/libpreps/doc/preps-FAQ
-@dirrm share/libpreps/doc
-@dirrm share/libpreps
diff --git a/devel/libpreps/Makefile b/devel/libpreps/Makefile
deleted file mode 100644
index e6544784ed1b..000000000000
--- a/devel/libpreps/Makefile
+++ /dev/null
@@ -1,52 +0,0 @@
-# New ports collection makefile for:	libpreps
-# Date created:		Fri Mar 19 14:27:30 EET 2004
-# Whom:			shadow@psoft.net
-#
-# $FreeBSD$
-#
-
-PORTNAME=	libpreps
-PORTVERSION=	1.6.6
-CATEGORIES=	devel
-MASTER_SITES=	http://webpages.charter.net/stuffle/linux/preps/
-DIST_SUBDIR=	prep
-
-MAINTAINER=	shadow@psoft.net
-COMMENT=	Problem reporting system
-
-CONFLICTS=	libpreps-devel-1.9.*
-
-USE_PGSQL=	yes
-USE_GMAKE=	yes
-USE_REINPLACE=	yes
-USE_GNOME=	glib12
-USE_INC_LIBTOOL_VER=13
-
-GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS+=--with-pgsqldir=${LOCALBASE} --with-plpgsqldir=${LOCALBASE}
-
-INSTALLS_SHLIB=	yes
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITHOUT_SERVER)
-CONFIGURE_ARGS+=--disable-server
-PKGNAMESUFFIX=	-client
-PLIST_SUB+=	SERVER="@comment "
-.else
-MAN1=		create_prepsdb.1 update_prepsdb.1
-PLIST_SUB+=	SERVER=""
-# Setting/finding PostgreSQL version we want.
-.  if exists(${LOCALBASE}/bin/postmaster)
-PGSQL_VER!=	${LOCALBASE}/bin/postmaster -V | \
-		${SED} -n 's/postmaster.*PostgreSQL[^0-9]*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\..*/\1\2/p'
-.  else
-PGSQL_VER=	${DEFAULT_PGSQL_VER}
-.  endif
-PGSQL_PORT=	${PORTSDIR}/databases/postgresql${PGSQL_VER}-server
-BUILD_DEPENDS+=	postgres:${PGSQL_PORT}
-RUN_DEPENDS+=	postgres:${PGSQL_PORT}
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/devel/libpreps/distinfo b/devel/libpreps/distinfo
deleted file mode 100644
index 9516186e59ff..000000000000
--- a/devel/libpreps/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (prep/libpreps-1.6.6.tar.gz) = 032d91f81221dc5d2ef4e29cfffaf262
-SIZE (prep/libpreps-1.6.6.tar.gz) = 346547
diff --git a/devel/libpreps/files/patch-configure b/devel/libpreps/files/patch-configure
deleted file mode 100644
index de4853a0d369..000000000000
--- a/devel/libpreps/files/patch-configure
+++ /dev/null
@@ -1,29 +0,0 @@
---- configure.orig	Fri Mar 19 13:07:52 2004
-+++ configure	Fri Mar 19 13:45:16 2004
-@@ -9978,7 +9978,7 @@
-    if test "x$pgheaderfound" = xno; then
-       echo "$as_me:$LINENO: checking Alternate Locations for postgres.h" >&5
- echo $ECHO_N "checking Alternate Locations for postgres.h... $ECHO_C" >&6
--      pgserv_incdirs="$ac_pgsql_dir/include /usr/include/pgsql /usr/include/postgresql /opt/postgres/include"
-+      pgserv_incdirs="$ac_pgsql_dir/include/postgresql/server /usr/include/pgsql /usr/include/postgresql /opt/postgres/include"
- 
- pgserv_incdir=NO
- for i in $pgserv_incdirs;
-@@ -10021,7 +10021,7 @@
-       fi
-       echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
--      PG_CFLAGS="-I$pgserv_incdir $PG_CFLAGS"
-+      PG_CFLAGS="-I$pgserv_incdir -I$pgserv_incdir/server $PG_CFLAGS"
-    else
- 
- cat >>confdefs.h <<\_ACEOF
-@@ -10032,7 +10032,7 @@
- 
-    echo "$as_me:$LINENO: checking for PL/pgSQL" >&5
- echo $ECHO_N "checking for PL/pgSQL... $ECHO_C" >&6
--   plpgsql_dirs="$ac_plpgsql_dir/lib /usr/lib/pgsql /usr/lib /usr/local/lib /opt/postgres/lib"
-+   plpgsql_dirs="$ac_plpgsql_dir/lib/postgresql /usr/lib/pgsql /usr/lib /usr/local/lib /opt/postgres/lib"
- 
- plpgsql_dir=NO
- for i in $plpgsql_dirs;
diff --git a/devel/libpreps/files/patch-nodocs b/devel/libpreps/files/patch-nodocs
deleted file mode 100644
index 32c29889cbc5..000000000000
--- a/devel/libpreps/files/patch-nodocs
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur doc.orig/C/Makefile.in doc/C/Makefile.in
---- doc.orig/C/Makefile.in	Mon Oct 28 03:50:24 2002
-+++ doc/C/Makefile.in	Fri Mar 19 14:05:19 2004
-@@ -108,7 +108,7 @@
- CONFIG_CLEAN_FILES =
- DIST_SOURCES =
- DIST_COMMON = Makefile.am Makefile.in
--all: all-am
-+all: 
- 
- .SUFFIXES:
- $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
diff --git a/devel/libpreps/pkg-descr b/devel/libpreps/pkg-descr
deleted file mode 100644
index fa5ca38d1e31..000000000000
--- a/devel/libpreps/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-PRepS is a tool for reporting and tracking problems or tasks. 
-
-It is designed for tracking problems with software, but can also be used for 
-tracking other types of problems or tasks. Be creative.
-
-For more information see:
-WWW: http://webpages.charter.net/stuffle/linux/preps/preps.html
diff --git a/devel/libpreps/pkg-plist b/devel/libpreps/pkg-plist
deleted file mode 100644
index 5b98770bf39c..000000000000
--- a/devel/libpreps/pkg-plist
+++ /dev/null
@@ -1,131 +0,0 @@
-include/preps/audit_trail.h
-include/preps/change_log.h
-include/preps/gstr_utils.h
-include/preps/pr_query.h
-include/preps/prj_rpts_html.h
-include/preps/prq_utils.h
-%%SERVER%%include/preps/sendmsg.h
-include/preps/tex_utils.h
-include/preps/version.h
-lib/libpreps-1.6.so.1
-lib/libpreps-1.6.so
-lib/libpreps.a
-lib/libpreps.la
-lib/libpreps.so
-
-%%SERVER%%bin/create_prepsdb
-%%SERVER%%bin/update_prepsdb
-
-%%PORTDOCS%%%%SERVER%%share/libpreps/assign.msg
-%%PORTDOCS%%%%SERVER%%share/libpreps/create_defdata.in
-%%PORTDOCS%%%%SERVER%%share/libpreps/drop_seq.sql
-%%PORTDOCS%%%%SERVER%%share/libpreps/final_cleanup.sql
-%%PORTDOCS%%%%SERVER%%share/libpreps/new_pr.msg
-%%PORTDOCS%%%%SERVER%%share/libpreps/schema.in
-%%PORTDOCS%%%%SERVER%%share/libpreps/update.msg
-%%PORTDOCS%%share/libpreps/doc/table_layout.fig
-
-%%PORTDOCS%%share/libpreps/doc/preps-FAQ/a279.html
-%%PORTDOCS%%share/libpreps/doc/preps-FAQ/admin.html
-%%PORTDOCS%%share/libpreps/doc/preps-FAQ/faqs.html
-%%PORTDOCS%%share/libpreps/doc/preps-FAQ/general.html
-%%PORTDOCS%%share/libpreps/doc/preps-FAQ/install.html
-%%PORTDOCS%%share/libpreps/doc/preps-FAQ/ln12.html
-%%PORTDOCS%%share/libpreps/doc/preps-FAQ/trouble.html
-%%PORTDOCS%%share/libpreps/doc/preps-FAQ/using.html
-%%PORTDOCS%%share/libpreps/doc/preps-FAQ/x289.html
-%%PORTDOCS%%share/libpreps/doc/preps-FAQ/x299.html
-%%PORTDOCS%%share/libpreps/doc/preps-FAQ/x303.html
-%%PORTDOCS%%share/libpreps/doc/preps-FAQ/x309.html
-%%PORTDOCS%%share/libpreps/doc/preps-FAQ/x345.html
-%%PORTDOCS%%share/libpreps/doc/preps-FAQ/x350.html
-%%PORTDOCS%%share/libpreps/doc/preps-FAQ/x354.html
-%%PORTDOCS%%share/libpreps/doc/preps-FAQ/x358.html
-%%PORTDOCS%%share/libpreps/doc/preps-FAQ/x361.html
-%%PORTDOCS%%share/libpreps/doc/preps-FAQ/x364.html
-%%PORTDOCS%%share/libpreps/doc/preps-FAQ/x369.html
-%%PORTDOCS%%share/libpreps/doc/preps-FAQ/stylesheet-images/caution.gif
-%%PORTDOCS%%share/libpreps/doc/preps-FAQ/stylesheet-images/home.gif
-%%PORTDOCS%%share/libpreps/doc/preps-FAQ/stylesheet-images/important.gif
-%%PORTDOCS%%share/libpreps/doc/preps-FAQ/stylesheet-images/next.gif
-%%PORTDOCS%%share/libpreps/doc/preps-FAQ/stylesheet-images/note.gif
-%%PORTDOCS%%share/libpreps/doc/preps-FAQ/stylesheet-images/prev.gif
-%%PORTDOCS%%share/libpreps/doc/preps-FAQ/stylesheet-images/tip.gif
-%%PORTDOCS%%share/libpreps/doc/preps-FAQ/stylesheet-images/toc-blank.gif
-%%PORTDOCS%%share/libpreps/doc/preps-FAQ/stylesheet-images/toc-minus.gif
-%%PORTDOCS%%share/libpreps/doc/preps-FAQ/stylesheet-images/toc-plus.gif
-%%PORTDOCS%%share/libpreps/doc/preps-FAQ/stylesheet-images/up.gif
-%%PORTDOCS%%share/libpreps/doc/preps-FAQ/stylesheet-images/warning.gif
-
-%%PORTDOCS%%share/libpreps/doc/prepsdb-admin-manual/a421.html
-%%PORTDOCS%%share/libpreps/doc/prepsdb-admin-manual/building.html
-%%PORTDOCS%%share/libpreps/doc/prepsdb-admin-manual/create.html
-%%PORTDOCS%%share/libpreps/doc/prepsdb-admin-manual/introduction.html
-%%PORTDOCS%%share/libpreps/doc/prepsdb-admin-manual/license.html
-%%PORTDOCS%%share/libpreps/doc/prepsdb-admin-manual/ln12.html
-%%PORTDOCS%%share/libpreps/doc/prepsdb-admin-manual/manual.html
-%%PORTDOCS%%share/libpreps/doc/prepsdb-admin-manual/templates.html
-%%PORTDOCS%%share/libpreps/doc/prepsdb-admin-manual/update.html
-%%PORTDOCS%%share/libpreps/doc/prepsdb-admin-manual/x276.html
-%%PORTDOCS%%share/libpreps/doc/prepsdb-admin-manual/x301.html
-%%PORTDOCS%%share/libpreps/doc/prepsdb-admin-manual/x324.html
-%%PORTDOCS%%share/libpreps/doc/prepsdb-admin-manual/x356.html
-%%PORTDOCS%%share/libpreps/doc/prepsdb-admin-manual/x366.html
-%%PORTDOCS%%share/libpreps/doc/prepsdb-admin-manual/x396.html
-%%PORTDOCS%%share/libpreps/doc/prepsdb-admin-manual/x401.html
-%%PORTDOCS%%share/libpreps/doc/prepsdb-admin-manual/x431.html
-%%PORTDOCS%%share/libpreps/doc/prepsdb-admin-manual/x441.html
-%%PORTDOCS%%share/libpreps/doc/prepsdb-admin-manual/x445.html
-%%PORTDOCS%%share/libpreps/doc/prepsdb-admin-manual/x451.html
-%%PORTDOCS%%share/libpreps/doc/prepsdb-admin-manual/x487.html
-%%PORTDOCS%%share/libpreps/doc/prepsdb-admin-manual/x492.html
-%%PORTDOCS%%share/libpreps/doc/prepsdb-admin-manual/x496.html
-%%PORTDOCS%%share/libpreps/doc/prepsdb-admin-manual/x500.html
-%%PORTDOCS%%share/libpreps/doc/prepsdb-admin-manual/x503.html
-%%PORTDOCS%%share/libpreps/doc/prepsdb-admin-manual/x506.html
-%%PORTDOCS%%share/libpreps/doc/prepsdb-admin-manual/x511.html
-%%PORTDOCS%%share/libpreps/doc/prepsdb-admin-manual/stylesheet-images/caution.gif
-%%PORTDOCS%%share/libpreps/doc/prepsdb-admin-manual/stylesheet-images/home.gif
-%%PORTDOCS%%share/libpreps/doc/prepsdb-admin-manual/stylesheet-images/important.gif
-%%PORTDOCS%%share/libpreps/doc/prepsdb-admin-manual/stylesheet-images/next.gif
-%%PORTDOCS%%share/libpreps/doc/prepsdb-admin-manual/stylesheet-images/note.gif
-%%PORTDOCS%%share/libpreps/doc/prepsdb-admin-manual/stylesheet-images/prev.gif
-%%PORTDOCS%%share/libpreps/doc/prepsdb-admin-manual/stylesheet-images/tip.gif
-%%PORTDOCS%%share/libpreps/doc/prepsdb-admin-manual/stylesheet-images/toc-blank.gif
-%%PORTDOCS%%share/libpreps/doc/prepsdb-admin-manual/stylesheet-images/toc-minus.gif
-%%PORTDOCS%%share/libpreps/doc/prepsdb-admin-manual/stylesheet-images/toc-plus.gif
-%%PORTDOCS%%share/libpreps/doc/prepsdb-admin-manual/stylesheet-images/up.gif
-%%PORTDOCS%%share/libpreps/doc/prepsdb-admin-manual/stylesheet-images/warning.gif
-
-%%PORTDOCS%%share/libpreps/doc/programmer/audit__trail_8h-source.html
-%%PORTDOCS%%share/libpreps/doc/programmer/audit__trail_8h.html
-%%PORTDOCS%%share/libpreps/doc/programmer/change__log_8h-source.html
-%%PORTDOCS%%share/libpreps/doc/programmer/change__log_8h.html
-%%PORTDOCS%%share/libpreps/doc/programmer/doxygen.css
-%%PORTDOCS%%share/libpreps/doc/programmer/doxygen.gif
-%%PORTDOCS%%share/libpreps/doc/programmer/files.html
-%%PORTDOCS%%share/libpreps/doc/programmer/globals.html
-%%PORTDOCS%%share/libpreps/doc/programmer/gstr__utils_8h-source.html
-%%PORTDOCS%%share/libpreps/doc/programmer/gstr__utils_8h.html
-%%PORTDOCS%%share/libpreps/doc/programmer/index.html
-%%PORTDOCS%%share/libpreps/doc/programmer/pr__query_8h-source.html
-%%PORTDOCS%%share/libpreps/doc/programmer/pr__query_8h.html
-%%PORTDOCS%%share/libpreps/doc/programmer/prj__rpts__html_8h-source.html
-%%PORTDOCS%%share/libpreps/doc/programmer/prj__rpts__html_8h.html
-%%PORTDOCS%%share/libpreps/doc/programmer/prq__utils_8h-source.html
-%%PORTDOCS%%share/libpreps/doc/programmer/prq__utils_8h.html
-%%PORTDOCS%%share/libpreps/doc/programmer/sendmsg_8h-source.html
-%%PORTDOCS%%share/libpreps/doc/programmer/sendmsg_8h.html
-%%PORTDOCS%%share/libpreps/doc/programmer/tex__utils_8h-source.html
-%%PORTDOCS%%share/libpreps/doc/programmer/tex__utils_8h.html
-%%PORTDOCS%%share/libpreps/doc/programmer/version_8h-source.html
-%%PORTDOCS%%share/libpreps/doc/programmer/version_8h.html
-
-@dirrm include/preps
-%%PORTDOCS%%@dirrm share/libpreps/doc/preps-FAQ/stylesheet-images/
-%%PORTDOCS%%@dirrm share/libpreps/doc/preps-FAQ/
-%%PORTDOCS%%@dirrm share/libpreps/doc/prepsdb-admin-manual/stylesheet-images/
-%%PORTDOCS%%@dirrm share/libpreps/doc/prepsdb-admin-manual/
-%%PORTDOCS%%@dirrm share/libpreps/doc/programmer/
-%%PORTDOCS%%@dirrm share/libpreps/doc
-%%PORTDOCS%%@dirrm share/libpreps
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%%
diff --git a/devel/prepstools/Makefile b/devel/prepstools/Makefile
index e6544784ed1b..2233dfc6000d 100644
--- a/devel/prepstools/Makefile
+++ b/devel/prepstools/Makefile
@@ -1,26 +1,25 @@
-# New ports collection makefile for:	libpreps
-# Date created:		Fri Mar 19 14:27:30 EET 2004
-# Whom:			shadow@psoft.net
+# New ports collection makefile for:	prepstools
+# Date created:		2005-08-02
+# Whom:			jmelo@freebsdbrasil.com.br
 #
 # $FreeBSD$
 #
 
-PORTNAME=	libpreps
-PORTVERSION=	1.6.6
+PORTNAME=	prepstools
+PORTVERSION=	2.0.2
 CATEGORIES=	devel
 MASTER_SITES=	http://webpages.charter.net/stuffle/linux/preps/
-DIST_SUBDIR=	prep
 
-MAINTAINER=	shadow@psoft.net
+MAINTAINER=	jmelo@freebsdbrasil.com.br
 COMMENT=	Problem reporting system
 
-CONFLICTS=	libpreps-devel-1.9.*
+RUN_DEPENDS=	postgres:${PORTSDIR}/databases/postgresql${DEFAULT_PGSQL_VER}-server
 
 USE_PGSQL=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
-USE_GNOME=	glib12
-USE_INC_LIBTOOL_VER=13
+USE_GNOME=	gtk20 gconf2 glib20 libgnomeui
+USE_LIBTOOL_VER=15
 
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
@@ -28,25 +27,4 @@ CONFIGURE_ARGS+=--with-pgsqldir=${LOCALBASE} --with-plpgsqldir=${LOCALBASE}
 
 INSTALLS_SHLIB=	yes
 
-.include <bsd.port.pre.mk>
-
-.if defined(WITHOUT_SERVER)
-CONFIGURE_ARGS+=--disable-server
-PKGNAMESUFFIX=	-client
-PLIST_SUB+=	SERVER="@comment "
-.else
-MAN1=		create_prepsdb.1 update_prepsdb.1
-PLIST_SUB+=	SERVER=""
-# Setting/finding PostgreSQL version we want.
-.  if exists(${LOCALBASE}/bin/postmaster)
-PGSQL_VER!=	${LOCALBASE}/bin/postmaster -V | \
-		${SED} -n 's/postmaster.*PostgreSQL[^0-9]*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\..*/\1\2/p'
-.  else
-PGSQL_VER=	${DEFAULT_PGSQL_VER}
-.  endif
-PGSQL_PORT=	${PORTSDIR}/databases/postgresql${PGSQL_VER}-server
-BUILD_DEPENDS+=	postgres:${PGSQL_PORT}
-RUN_DEPENDS+=	postgres:${PGSQL_PORT}
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/prepstools/distinfo b/devel/prepstools/distinfo
index 9516186e59ff..d14d68dff30b 100644
--- a/devel/prepstools/distinfo
+++ b/devel/prepstools/distinfo
@@ -1,2 +1,2 @@
-MD5 (prep/libpreps-1.6.6.tar.gz) = 032d91f81221dc5d2ef4e29cfffaf262
-SIZE (prep/libpreps-1.6.6.tar.gz) = 346547
+MD5 (prepstools-2.0.2.tar.gz) = e700b2971560b5d4a05ed08e6f504201
+SIZE (prepstools-2.0.2.tar.gz) = 391857
diff --git a/devel/prepstools/files/patch-configure b/devel/prepstools/files/patch-configure
deleted file mode 100644
index de4853a0d369..000000000000
--- a/devel/prepstools/files/patch-configure
+++ /dev/null
@@ -1,29 +0,0 @@
---- configure.orig	Fri Mar 19 13:07:52 2004
-+++ configure	Fri Mar 19 13:45:16 2004
-@@ -9978,7 +9978,7 @@
-    if test "x$pgheaderfound" = xno; then
-       echo "$as_me:$LINENO: checking Alternate Locations for postgres.h" >&5
- echo $ECHO_N "checking Alternate Locations for postgres.h... $ECHO_C" >&6
--      pgserv_incdirs="$ac_pgsql_dir/include /usr/include/pgsql /usr/include/postgresql /opt/postgres/include"
-+      pgserv_incdirs="$ac_pgsql_dir/include/postgresql/server /usr/include/pgsql /usr/include/postgresql /opt/postgres/include"
- 
- pgserv_incdir=NO
- for i in $pgserv_incdirs;
-@@ -10021,7 +10021,7 @@
-       fi
-       echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
--      PG_CFLAGS="-I$pgserv_incdir $PG_CFLAGS"
-+      PG_CFLAGS="-I$pgserv_incdir -I$pgserv_incdir/server $PG_CFLAGS"
-    else
- 
- cat >>confdefs.h <<\_ACEOF
-@@ -10032,7 +10032,7 @@
- 
-    echo "$as_me:$LINENO: checking for PL/pgSQL" >&5
- echo $ECHO_N "checking for PL/pgSQL... $ECHO_C" >&6
--   plpgsql_dirs="$ac_plpgsql_dir/lib /usr/lib/pgsql /usr/lib /usr/local/lib /opt/postgres/lib"
-+   plpgsql_dirs="$ac_plpgsql_dir/lib/postgresql /usr/lib/pgsql /usr/lib /usr/local/lib /opt/postgres/lib"
- 
- plpgsql_dir=NO
- for i in $plpgsql_dirs;
diff --git a/devel/prepstools/files/patch-nodocs b/devel/prepstools/files/patch-nodocs
deleted file mode 100644
index 32c29889cbc5..000000000000
--- a/devel/prepstools/files/patch-nodocs
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur doc.orig/C/Makefile.in doc/C/Makefile.in
---- doc.orig/C/Makefile.in	Mon Oct 28 03:50:24 2002
-+++ doc/C/Makefile.in	Fri Mar 19 14:05:19 2004
-@@ -108,7 +108,7 @@
- CONFIG_CLEAN_FILES =
- DIST_SOURCES =
- DIST_COMMON = Makefile.am Makefile.in
--all: all-am
-+all: 
- 
- .SUFFIXES:
- $(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
diff --git a/devel/prepstools/pkg-descr b/devel/prepstools/pkg-descr
index fa5ca38d1e31..65c27a395950 100644
--- a/devel/prepstools/pkg-descr
+++ b/devel/prepstools/pkg-descr
@@ -1,7 +1,8 @@
-PRepS is a tool for reporting and tracking problems or tasks. 
-
-It is designed for tracking problems with software, but can also be used for 
-tracking other types of problems or tasks. Be creative.
+The PRepS Tools package contains a tool called prepsdb_tool that is used to
+create and update PRepS databases.  This package also contains libpreps.
+libpreps is a library  that contains routines used by the database server.
+libPRepS only needs to be installed on the machine where the PRepS
+database(s) reside.
 
 For more information see:
 WWW: http://webpages.charter.net/stuffle/linux/preps/preps.html
diff --git a/devel/prepstools/pkg-plist b/devel/prepstools/pkg-plist
index 5b98770bf39c..cba8777cb13d 100644
--- a/devel/prepstools/pkg-plist
+++ b/devel/prepstools/pkg-plist
@@ -1,131 +1,11 @@
-include/preps/audit_trail.h
-include/preps/change_log.h
-include/preps/gstr_utils.h
-include/preps/pr_query.h
-include/preps/prj_rpts_html.h
-include/preps/prq_utils.h
-%%SERVER%%include/preps/sendmsg.h
-include/preps/tex_utils.h
+bin/prepsdb_tool
+include/preps/sendmsg.h
 include/preps/version.h
-lib/libpreps-1.6.so.1
-lib/libpreps-1.6.so
 lib/libpreps.a
-lib/libpreps.la
 lib/libpreps.so
-
-%%SERVER%%bin/create_prepsdb
-%%SERVER%%bin/update_prepsdb
-
-%%PORTDOCS%%%%SERVER%%share/libpreps/assign.msg
-%%PORTDOCS%%%%SERVER%%share/libpreps/create_defdata.in
-%%PORTDOCS%%%%SERVER%%share/libpreps/drop_seq.sql
-%%PORTDOCS%%%%SERVER%%share/libpreps/final_cleanup.sql
-%%PORTDOCS%%%%SERVER%%share/libpreps/new_pr.msg
-%%PORTDOCS%%%%SERVER%%share/libpreps/schema.in
-%%PORTDOCS%%%%SERVER%%share/libpreps/update.msg
-%%PORTDOCS%%share/libpreps/doc/table_layout.fig
-
-%%PORTDOCS%%share/libpreps/doc/preps-FAQ/a279.html
-%%PORTDOCS%%share/libpreps/doc/preps-FAQ/admin.html
-%%PORTDOCS%%share/libpreps/doc/preps-FAQ/faqs.html
-%%PORTDOCS%%share/libpreps/doc/preps-FAQ/general.html
-%%PORTDOCS%%share/libpreps/doc/preps-FAQ/install.html
-%%PORTDOCS%%share/libpreps/doc/preps-FAQ/ln12.html
-%%PORTDOCS%%share/libpreps/doc/preps-FAQ/trouble.html
-%%PORTDOCS%%share/libpreps/doc/preps-FAQ/using.html
-%%PORTDOCS%%share/libpreps/doc/preps-FAQ/x289.html
-%%PORTDOCS%%share/libpreps/doc/preps-FAQ/x299.html
-%%PORTDOCS%%share/libpreps/doc/preps-FAQ/x303.html
-%%PORTDOCS%%share/libpreps/doc/preps-FAQ/x309.html
-%%PORTDOCS%%share/libpreps/doc/preps-FAQ/x345.html
-%%PORTDOCS%%share/libpreps/doc/preps-FAQ/x350.html
-%%PORTDOCS%%share/libpreps/doc/preps-FAQ/x354.html
-%%PORTDOCS%%share/libpreps/doc/preps-FAQ/x358.html
-%%PORTDOCS%%share/libpreps/doc/preps-FAQ/x361.html
-%%PORTDOCS%%share/libpreps/doc/preps-FAQ/x364.html
-%%PORTDOCS%%share/libpreps/doc/preps-FAQ/x369.html
-%%PORTDOCS%%share/libpreps/doc/preps-FAQ/stylesheet-images/caution.gif
-%%PORTDOCS%%share/libpreps/doc/preps-FAQ/stylesheet-images/home.gif
-%%PORTDOCS%%share/libpreps/doc/preps-FAQ/stylesheet-images/important.gif
-%%PORTDOCS%%share/libpreps/doc/preps-FAQ/stylesheet-images/next.gif
-%%PORTDOCS%%share/libpreps/doc/preps-FAQ/stylesheet-images/note.gif
-%%PORTDOCS%%share/libpreps/doc/preps-FAQ/stylesheet-images/prev.gif
-%%PORTDOCS%%share/libpreps/doc/preps-FAQ/stylesheet-images/tip.gif
-%%PORTDOCS%%share/libpreps/doc/preps-FAQ/stylesheet-images/toc-blank.gif
-%%PORTDOCS%%share/libpreps/doc/preps-FAQ/stylesheet-images/toc-minus.gif
-%%PORTDOCS%%share/libpreps/doc/preps-FAQ/stylesheet-images/toc-plus.gif
-%%PORTDOCS%%share/libpreps/doc/preps-FAQ/stylesheet-images/up.gif
-%%PORTDOCS%%share/libpreps/doc/preps-FAQ/stylesheet-images/warning.gif
-
-%%PORTDOCS%%share/libpreps/doc/prepsdb-admin-manual/a421.html
-%%PORTDOCS%%share/libpreps/doc/prepsdb-admin-manual/building.html
-%%PORTDOCS%%share/libpreps/doc/prepsdb-admin-manual/create.html
-%%PORTDOCS%%share/libpreps/doc/prepsdb-admin-manual/introduction.html
-%%PORTDOCS%%share/libpreps/doc/prepsdb-admin-manual/license.html
-%%PORTDOCS%%share/libpreps/doc/prepsdb-admin-manual/ln12.html
-%%PORTDOCS%%share/libpreps/doc/prepsdb-admin-manual/manual.html
-%%PORTDOCS%%share/libpreps/doc/prepsdb-admin-manual/templates.html
-%%PORTDOCS%%share/libpreps/doc/prepsdb-admin-manual/update.html
-%%PORTDOCS%%share/libpreps/doc/prepsdb-admin-manual/x276.html
-%%PORTDOCS%%share/libpreps/doc/prepsdb-admin-manual/x301.html
-%%PORTDOCS%%share/libpreps/doc/prepsdb-admin-manual/x324.html
-%%PORTDOCS%%share/libpreps/doc/prepsdb-admin-manual/x356.html
-%%PORTDOCS%%share/libpreps/doc/prepsdb-admin-manual/x366.html
-%%PORTDOCS%%share/libpreps/doc/prepsdb-admin-manual/x396.html
-%%PORTDOCS%%share/libpreps/doc/prepsdb-admin-manual/x401.html
-%%PORTDOCS%%share/libpreps/doc/prepsdb-admin-manual/x431.html
-%%PORTDOCS%%share/libpreps/doc/prepsdb-admin-manual/x441.html
-%%PORTDOCS%%share/libpreps/doc/prepsdb-admin-manual/x445.html
-%%PORTDOCS%%share/libpreps/doc/prepsdb-admin-manual/x451.html
-%%PORTDOCS%%share/libpreps/doc/prepsdb-admin-manual/x487.html
-%%PORTDOCS%%share/libpreps/doc/prepsdb-admin-manual/x492.html
-%%PORTDOCS%%share/libpreps/doc/prepsdb-admin-manual/x496.html
-%%PORTDOCS%%share/libpreps/doc/prepsdb-admin-manual/x500.html
-%%PORTDOCS%%share/libpreps/doc/prepsdb-admin-manual/x503.html
-%%PORTDOCS%%share/libpreps/doc/prepsdb-admin-manual/x506.html
-%%PORTDOCS%%share/libpreps/doc/prepsdb-admin-manual/x511.html
-%%PORTDOCS%%share/libpreps/doc/prepsdb-admin-manual/stylesheet-images/caution.gif
-%%PORTDOCS%%share/libpreps/doc/prepsdb-admin-manual/stylesheet-images/home.gif
-%%PORTDOCS%%share/libpreps/doc/prepsdb-admin-manual/stylesheet-images/important.gif
-%%PORTDOCS%%share/libpreps/doc/prepsdb-admin-manual/stylesheet-images/next.gif
-%%PORTDOCS%%share/libpreps/doc/prepsdb-admin-manual/stylesheet-images/note.gif
-%%PORTDOCS%%share/libpreps/doc/prepsdb-admin-manual/stylesheet-images/prev.gif
-%%PORTDOCS%%share/libpreps/doc/prepsdb-admin-manual/stylesheet-images/tip.gif
-%%PORTDOCS%%share/libpreps/doc/prepsdb-admin-manual/stylesheet-images/toc-blank.gif
-%%PORTDOCS%%share/libpreps/doc/prepsdb-admin-manual/stylesheet-images/toc-minus.gif
-%%PORTDOCS%%share/libpreps/doc/prepsdb-admin-manual/stylesheet-images/toc-plus.gif
-%%PORTDOCS%%share/libpreps/doc/prepsdb-admin-manual/stylesheet-images/up.gif
-%%PORTDOCS%%share/libpreps/doc/prepsdb-admin-manual/stylesheet-images/warning.gif
-
-%%PORTDOCS%%share/libpreps/doc/programmer/audit__trail_8h-source.html
-%%PORTDOCS%%share/libpreps/doc/programmer/audit__trail_8h.html
-%%PORTDOCS%%share/libpreps/doc/programmer/change__log_8h-source.html
-%%PORTDOCS%%share/libpreps/doc/programmer/change__log_8h.html
-%%PORTDOCS%%share/libpreps/doc/programmer/doxygen.css
-%%PORTDOCS%%share/libpreps/doc/programmer/doxygen.gif
-%%PORTDOCS%%share/libpreps/doc/programmer/files.html
-%%PORTDOCS%%share/libpreps/doc/programmer/globals.html
-%%PORTDOCS%%share/libpreps/doc/programmer/gstr__utils_8h-source.html
-%%PORTDOCS%%share/libpreps/doc/programmer/gstr__utils_8h.html
-%%PORTDOCS%%share/libpreps/doc/programmer/index.html
-%%PORTDOCS%%share/libpreps/doc/programmer/pr__query_8h-source.html
-%%PORTDOCS%%share/libpreps/doc/programmer/pr__query_8h.html
-%%PORTDOCS%%share/libpreps/doc/programmer/prj__rpts__html_8h-source.html
-%%PORTDOCS%%share/libpreps/doc/programmer/prj__rpts__html_8h.html
-%%PORTDOCS%%share/libpreps/doc/programmer/prq__utils_8h-source.html
-%%PORTDOCS%%share/libpreps/doc/programmer/prq__utils_8h.html
-%%PORTDOCS%%share/libpreps/doc/programmer/sendmsg_8h-source.html
-%%PORTDOCS%%share/libpreps/doc/programmer/sendmsg_8h.html
-%%PORTDOCS%%share/libpreps/doc/programmer/tex__utils_8h-source.html
-%%PORTDOCS%%share/libpreps/doc/programmer/tex__utils_8h.html
-%%PORTDOCS%%share/libpreps/doc/programmer/version_8h-source.html
-%%PORTDOCS%%share/libpreps/doc/programmer/version_8h.html
-
+lib/libpreps.so.2
+%%DATADIR%%/assign.msg
+%%DATADIR%%/new_pr.msg
+%%DATADIR%%/update.msg
 @dirrm include/preps
-%%PORTDOCS%%@dirrm share/libpreps/doc/preps-FAQ/stylesheet-images/
-%%PORTDOCS%%@dirrm share/libpreps/doc/preps-FAQ/
-%%PORTDOCS%%@dirrm share/libpreps/doc/prepsdb-admin-manual/stylesheet-images/
-%%PORTDOCS%%@dirrm share/libpreps/doc/prepsdb-admin-manual/
-%%PORTDOCS%%@dirrm share/libpreps/doc/programmer/
-%%PORTDOCS%%@dirrm share/libpreps/doc
-%%PORTDOCS%%@dirrm share/libpreps
+@unexec rmdir %D/%%DATADIR%% 2>/dev/null || true