4 files changed, 45 insertions, 36 deletions

diff --git a/textproc/refdb/Makefile b/textproc/refdb/Makefile
index 294e7a1dd47e..5be2d4bc8c36 100644
--- a/textproc/refdb/Makefile
+++ b/textproc/refdb/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	refdb
-PORTVERSION=	0.9.5a
+PORTVERSION=	0.9.6
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -14,9 +14,9 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	paulh@logicsquad.net
 COMMENT=	Bibliographic reference database
 
-LIB_DEPENDS=	expat.5:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	expat.5:${PORTSDIR}/textproc/expat2 \
+		dbi.0:${PORTSDIR}/databases/libdbi
 
-WRKSRC=		${WRKDIR}/refdb-0.9.5
 USE_GMAKE=	yes
 HAS_CONFIGURE=	yes
 ALL_TARGET=
@@ -29,9 +29,6 @@ CONFIGURE_ARGS+=	--with-refdb-url=http://localhost/refdb
 
 XMLCATMGR=	${LOCALBASE}/bin/xmlcatmgr
 
-# For testing:
-#CONFIGURE_ARGS+=	--prefix=/home/paulh/ports/textproc/refdb/install
-
 OPTIONS=	MYSQL	"Use MySQL" on \
 		PGSQL	"Use PostgreSQL" off \
 		SQLITE	"Use SQLite" off \
@@ -86,10 +83,17 @@ post-install:
 	@${ECHO_MSG} "To complete RefDB installation:"
 .if defined(WITH_MYSQL)
 	@${ECHO_MSG} ""
-	@${ECHO_MSG} "1. To initialise MySQL, run the following commands:"
+	@${ECHO_MSG} "1. To initialise MySQL, run the following command:"
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "   mysql -u root -e \"CREATE DATABASE refdb\""
-	@${ECHO_MSG} "   mysql -u root refdb < ${PREFIX}/share/refdb/sql/refdb.dump"
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "   Then, for MySQL older than 4.1, run:"
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "   mysql -u root refdb < ${PREFIX}/share/refdb/sql/refdb.dump.mysql"
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "   For MySQL 4.1 and later, run:"
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "   mysql -u root refdb < ${PREFIX}/share/refdb/sql/refdb.dump.mysql41"
 	@${ECHO_MSG} ""
 .elif defined(WITH_PGSQL)
 	@${ECHO_MSG} ""
@@ -114,6 +118,6 @@ post-install:
 	@${ECHO_MSG} "3. Customise the configuration scripts in ${PREFIX}/etc/refdb,"
 	@${ECHO_MSG} "   as described in the RefDB documentation at:"
 	@${ECHO_MSG} ""
-	@${ECHO_MSG} "   http://refdb.sourceforge.net/manual/x1390.html#AEN1484"
+	@${ECHO_MSG} "   http://refdb.sourceforge.net/manual/x593.html#SECT1-MYSTERY-INIT-FILES"
 
 .include <bsd.port.post.mk>
diff --git a/textproc/refdb/distinfo b/textproc/refdb/distinfo
index febb4c9a4874..a38fb80d97a2 100644
--- a/textproc/refdb/distinfo
+++ b/textproc/refdb/distinfo
@@ -1,2 +1,2 @@
-MD5 (refdb-0.9.5a.tar.gz) = cc8dde53bd1e483c260a6e92d570e610
-SIZE (refdb-0.9.5a.tar.gz) = 1035533
+MD5 (refdb-0.9.6.tar.gz) = 4e03995c0f9fffe50c7caf77be37cd82
+SIZE (refdb-0.9.6.tar.gz) = 2899044
diff --git a/textproc/refdb/files/patch-scripts-refdb b/textproc/refdb/files/patch-scripts-refdb
index 7ac4ff1d40cd..2d0d308fc002 100644
--- a/textproc/refdb/files/patch-scripts-refdb
+++ b/textproc/refdb/files/patch-scripts-refdb
@@ -1,18 +1,18 @@
-*** scripts/refdb.orig	Sat Apr 30 16:45:49 2005
---- scripts/refdb	Sat Apr 30 16:46:18 2005
+*** scripts/refdb.orig	Thu Nov 10 12:29:22 2005
+--- scripts/refdb	Thu Nov 10 12:29:40 2005
 ***************
-*** 43,49 ****
-  # set to 'YES' if the OS uses a BSD-style daemon startup system (this is
+*** 45,51 ****
   # true for BSD-UNIX and Unices derived thereof, as well as for the
-  # Slackware Linux distribution)
+  # Slackware Linux distribution). This setting does not perform any black
+  # magic, but it makes the screen messages at startup match the OS style
 ! BSDSTYLE=NO
   
   # don't get interrupted
   trap "" 1
---- 43,49 ----
-  # set to 'YES' if the OS uses a BSD-style daemon startup system (this is
+--- 45,51 ----
   # true for BSD-UNIX and Unices derived thereof, as well as for the
-  # Slackware Linux distribution)
+  # Slackware Linux distribution). This setting does not perform any black
+  # magic, but it makes the screen messages at startup match the OS style
 ! BSDSTYLE=YES
   
   # don't get interrupted
diff --git a/textproc/refdb/pkg-plist b/textproc/refdb/pkg-plist
index a709aa947bdd..a342ee6a1f43 100644
--- a/textproc/refdb/pkg-plist
+++ b/textproc/refdb/pkg-plist
@@ -15,10 +15,19 @@
 %%DATADIR%%/dtd/citationlistx.dtd
 %%DATADIR%%/dtd/risx.dtd
 %%DATADIR%%/dtd/xnote.dtd
+%%DATADIR%%/dtd/citationlistx.rnc
+%%DATADIR%%/dtd/citestylex.rnc
+%%DATADIR%%/dtd/risx.rnc
+%%DATADIR%%/dtd/xnote.rnc
+%%DATADIR%%/dtd/citationlistx.rng
+%%DATADIR%%/dtd/citestylex.rng
+%%DATADIR%%/dtd/risx.rng
+%%DATADIR%%/dtd/xnote.rng
 %%DATADIR%%/styles/Eur.J.Pharmacol.xml
 %%DATADIR%%/styles/J.Biol.Chem.xml
 %%DATADIR%%/styles/bibtex-abbrev.xml
 %%DATADIR%%/styles/bibtex-full.xml
+%%DATADIR%%/styles/schemas.xml
 %%DATADIR%%/xsl/common-refdb/refdbvar.xsl
 %%DATADIR%%/xsl/docbk-refdb-xsl/docbk-fo/docbk-refdb-fo.xsl
 %%DATADIR%%/xsl/docbk-refdb-xsl/docbk-html/docbk-refdb-html.xsl
@@ -30,21 +39,21 @@
 %%DATADIR%%/xsl/citations.xsl
 %%DATADIR%%/xsl/bibdb2tei.xsl
 %%DATADIR%%/xsl/makecss.xsl
-%%DATADIR%%/templates/refdbq_foot.html
-%%DATADIR%%/templates/refdbqp_foot.html
-%%DATADIR%%/templates/refdbq_head.html
-%%DATADIR%%/templates/refdbqp_head.html
-%%DATADIR%%/templates/refdbadd_foot.html
-%%DATADIR%%/templates/refdbadd_head.html
 %%DATADIR%%/www/refdbadd.html
-%%DATADIR%%/www/refdbdbquery.html
 %%DATADIR%%/www/refdbkajquery.html
-%%DATADIR%%/www/refdblogout.html
 %%DATADIR%%/www/refdbquery.html
-%%DATADIR%%/www/refdbquerynl.html
 %%DATADIR%%/www/refdbq.css
-%%DATADIR%%/www/access.js
 %%DATADIR%%/www/index.html
+%%DATADIR%%/www/admin.php
+%%DATADIR%%/www/include.php
+%%DATADIR%%/www/login.php
+%%DATADIR%%/www/refdb-prl-del.php
+%%DATADIR%%/www/refdbadd.php
+%%DATADIR%%/www/refdbadmin.php
+%%DATADIR%%/www/refdbdbquery.php
+%%DATADIR%%/www/refdbkajsearch.php
+%%DATADIR%%/www/refdblogout.php
+%%DATADIR%%/www/refdbsearch.php
 %%DATADIR%%/css/refdb.css
 %%DATADIR%%/examples/readme.examples
 %%DATADIR%%/examples/dbtest.short.sgml
@@ -59,7 +68,8 @@
 %%DATADIR%%/examples/testrefs.usmarc
 %%DATADIR%%/examples/Makefile.template
 %%DATADIR%%/examples/xnoteset.xml
-%%DATADIR%%/sql/refdb.dump
+%%DATADIR%%/sql/refdb.dump.mysql
+%%DATADIR%%/sql/refdb.dump.mysql41
 %%DATADIR%%/sql/refdb.dump.pgsql
 %%DATADIR%%/sql/refdb.dump.sqlite
 %%DATADIR%%/sql/empty.mysql.dump
@@ -84,14 +94,9 @@ bin/refdb-bug
 bin/refdbctl
 bin/refdbjade
 bin/runbib
-bin/tex2mail
 bin/db2ris
 bin/refdbxml
-bin/marc2ris.pl
-bin/med2ris.pl
-bin/en2ris.pl
 bin/refdbnd
-bin/dos2unix
 bin/refdbd
 bin/refdbib
 bin/refdbc
@@ -117,9 +122,9 @@ bin/eenc
 @dirrm share/refdb/xsl/tei-refdb-xsl/tei-lib
 @dirrm share/refdb/xsl/tei-refdb-xsl
 @dirrm share/refdb/xsl
-@dirrm share/refdb/templates
 @dirrm share/refdb/www
 @dirrm share/refdb/css
+@exec mkdir -p %D/share/refdb/db
 @dirrm share/refdb/db
 @dirrm share/refdb/examples
 @dirrm share/refdb/sql