Attachment 235847 Details for Bug 265105 – Working patch

[patch] Working patch

refdb-1.0.3.diff (text/plain), 24.67 KB, created by Fernando Apesteguía on 2022-08-11 13:52:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Fernando Apesteguía

Created: 2022-08-11 13:52:31 UTC

Size: 24.67 KB

patch

obsolete

>diff --git a/textproc/refdb/Makefile b/textproc/refdb/Makefile
>index f7c57369b213..35615cc2ff6c 100644
>--- a/textproc/refdb/Makefile
>+++ b/textproc/refdb/Makefile
>@@ -1,131 +1,92 @@
> PORTNAME=	refdb
>-PORTVERSION=	0.9.9
>-DISTVERSIONSUFFIX=	-1
>-PORTREVISION=	11
>-CATEGORIES=	textproc
>-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-src/${PORTNAME}-src-${PORTVERSION}-1
>+PORTVERSION=	1.0.3
>+CATEGORIES=	textproc java
>+MASTER_SITES=	https://sourceforge.net/projects/${PORTNAME}/files/latest/download/
> 
>-MAINTAINER=	ohartman@zedat.fu-berlin.de
>+MAINTAINER=	ohartmann@walstatt.org
> COMMENT=	Bibliographic reference database
> 
>-BROKEN_FreeBSD_13=	ld: error: duplicate symbol: thecommandlist
>-BROKEN_FreeBSD_14=	ld: error: duplicate symbol: thecommandlist
>+LICENSE=	GPLv2+
>+#LICENSE_FILE=	${WRKSRC}/COPYING
>+
>+BUILD_DEPENDS=	${RUN_DEPENDS} \
>+		svnversion:devel/subversion
> 
> LIB_DEPENDS=	libexpat.so:textproc/expat2 \
> 		libbtparse.so:textproc/btparse \
>-		libdbi.so:databases/libdbi
>+		libdbi.so:databases/libdbi \
>+		libltdl.so:devel/libltdl
>+
>+RUN_DEPENDS=	libxslt>=0:textproc/libxslt \
>+		xmlcatmgr>=0:textproc/xmlcatmgr \
>+		fop>=0:textproc/fop \
>+		p5-XML-Parser>=0:textproc/p5-XML-Parser \
>+		p5-MARC-Record>=0:textproc/p5-MARC-Record \
>+		p5-MARC-XML>=0:textproc/p5-MARC-XML
>+
>+USES=		autoreconf gmake iconv php:web perl5 libtool \
>+		localbase pkgconfig pathfix readline shebangfix gettext
>+
>+USE_RC_SUBR=	refdbd
>+
>+SHEBANG_FILES=	${WRKSRC}/scripts/*
> 
>-USES=		gmake iconv readline perl5 libtool pkgconfig pathfix shebangfix
> HAS_CONFIGURE=	yes
>+CONFIGURE_ARGS+=--with-expat-lib=${LOCALBASE}/lib \
>+		--with-classpath-root=${LOCALBASE}/share/java/classes
>+
> INSTALL_TARGET=	install-strip
>-PORTDOCS=	*
> 
>-CFLAGS+=	-I${LOCALBASE}/include
> LIBS+=		-lm
> 
>-CONFIGURE_ARGS=	--with-expat-lib=${LOCALBASE}/lib \
>-		--with-classpath-root=${PREFIX}/share/java/classes \
>-		--with-refdb-url=http://localhost/refdb
>-XMLCATMGR=	${LOCALBASE}/bin/xmlcatmgr
>+PORTDOCS=	*
> 
>-OPTIONS_DEFINE=		DOCS CATALOG
>+OPTIONS_DEFINE=		DOCS
>+OPTIONS_DEFAULT=	PGSQL DOCS
> OPTIONS_SINGLE=		DB
> OPTIONS_SINGLE_DB=	MYSQL PGSQL SQLITE
>-OPTIONS_EXCLUDE=	CATALOG		# may not be implemented correctly
>-CATALOG_DESC=		Install SGML catalog
>-
>-OPTIONS_DEFAULT=	PGSQL
>-DOCS_BUILD_DEPENDS=	xsltproc:textproc/libxslt \
>-			docbook-xsl>=0:textproc/docbook-xsl
>-
>-SHEBANG_FILES=	${WRKSRC}/scripts/*
>-
>-USE_RC_SUBR=	refdbd
>+OPTIONS_SUB=		yes
>+DOCS_BUILD_DEPENDS=	docbook-xsl>0:textproc/docbook-xsl \
>+			dtdparse>0:textproc/dtdparse
>+DOCS_USE=		java:8+,build
>+DOCS_CONFIGURE_ON=	--without-docbook-xsl-ns \
>+			--without-tei-xsl \
>+			--without-tei-xsl-ns
>+DOCS_CONFIGURE_OFF=	--disable-docs
>+DOCS_CONFIGURE_WITH=	docbook-xsl=${PREFIX}/share/xsl/docbook
>+MYSQL_USES=		mysql
>+MYSQL_CONFIGURE_WITH=	mysql
>+PGSQL_USES=		pgsql
>+PGSQL_CONFIGURE_WITH=	pgsql
>+SQLITE_USES=		sqlite
>+SQLITE_CONFIGURE_WITH=	sqlite3
> 
> .include <bsd.port.options.mk>
> 
> .if ${PORT_OPTIONS:MMYSQL}
>-USES+=		mysql
> # If libdbi-drivers has been built without MySQL driver, abort
> .if exists(${LOCALBASE}/lib/dbd) && !exists(${LOCALBASE}/lib/dbd/libdbdmysql.so)
>-IGNORE=		rebuild databases/libdbi-drivers with MySQL support
>+IGNORE=		please rebuild databases/libdbi-drivers with MySQL support
> .elif !exists(${LOCALBASE}/lib/dbd)
> BUILD_DEPENDS+=	${LOCALBASE}/lib/dbd:databases/libdbi-drivers
> .endif
>-CONFIGURE_ARGS+=	--with-db-server=mysql
> 
> .elif ${PORT_OPTIONS:MPGSQL}
>-USES+=	pgsql
> # If libdbi-drivers has been built without PostgreSQL driver, abort
> .if exists(${LOCALBASE}/lib/dbd) && !exists(${LOCALBASE}/lib/dbd/libdbdpgsql.so)
>-IGNORE=		rebuild databases/libdbi-drivers with PostgreSQL support
>+IGNORE=		please rebuild databases/libdbi-drivers with PostgreSQL support
> .elif !exists(${LOCALBASE}/lib/dbd)
> BUILD_DEPENDS+=	${LOCALBASE}/lib/dbd:databases/libdbi-drivers
> .endif
>-CONFIGURE_ARGS+=	--with-db-server=pgsql
> 
> .elif ${PORT_OPTIONS:MSQLITE}
>-LIB_DEPENDS+=	libsqlite3.so:databases/sqlite3
> # If libdbi-drivers has been built without SQLite driver, abort
> .if exists(${LOCALBASE}/lib/dbd) && !exists(${LOCALBASE}/lib/dbd/libdbdsqlite3.so)
>-IGNORE=		rebuild databases/libdbi-drivers with SQLite support
>+IGNORE=		please rebuild databases/libdbi-drivers with SQLite support
> .elif !exists(${LOCALBASE}/lib/dbd)
> BUILD_DEPENDS+=	${LOCALBASE}/lib/dbd:databases/libdbi-drivers
> .endif
>-CONFIGURE_ARGS+=	--with-db-server=sqlite
>-.endif
>-
>-.if ${PORT_OPTIONS:MDOCS}
>-CONFIGURE_ARGS+=	--with-docbook-xsl=${PREFIX}/share/xsl/docbook \
>-			--without-docbook-xsl-ns \
>-			--without-tei-xsl \
>-			--without-tei-xsl-ns
>-.else
>-CONFIGURE_ARGS+=	--disable-docs
>-.endif
> 
>-.if ${PORT_OPTIONS:MCATALOG}
>-RUN_DEPENDS+=	xmlcatmgr:textproc/xmlcatmgr
>-.endif
>-
>-post-patch:
>-	${REINPLACE_CMD} -e 's|$$(PACKAGE)-$$(VERSION)|refdb|g' \
>-		${WRKSRC}/doc/Makefile.in
>-
>-post-install:
>-.if ${PORT_OPTIONS:MCATALOG}
>-	@[ -f ${STAGEDIR}${PREFIX}/share/sgml/catalog.ports ] || ${TOUCH} ${STAGEDIR}${PREFIX}/share/sgml/catalog.ports
>-	@${XMLCATMGR} -s -c ${STAGEDIR}${PREFIX}/share/sgml/catalog.ports lookup "${STAGEDIR}${PREFIX}/share/refdb/refdb.cat" > /dev/null || ${XMLCATMGR} -s -c ${STAGEDIR}${PREFIX}/share/sgml/catalog.ports add CATALOG "${STAGEDIR}${PREFIX}/share/refdb/refdb.cat" -- > /dev/null
>-.endif
>-	@${ECHO_MSG} "To complete RefDB installation:"
>-.if ${PORT_OPTIONS:MMYSQL}
>-	@${ECHO_MSG} ""
>-	@${ECHO_MSG} "1. To initialise MySQL, run the following command:"
>-	@${ECHO_MSG} ""
>-	@${ECHO_MSG} "   mysql -u root -e \"CREATE DATABASE refdb\""
>-	@${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 ${PORT_OPTIONS:MPGSQL}
>-	@${ECHO_MSG} ""
>-	@${ECHO_MSG} "1. To initialise PostgreSQL, run the following commands:"
>-	@${ECHO_MSG} ""
>-	@${ECHO_MSG} "   createdb -U pgsql -E UNICODE refdb"
>-	@${ECHO_MSG} "   psql -U pgsql refdb < ${PREFIX}/share/refdb/sql/refdb.dump.pgsql"
>-	@${ECHO_MSG} ""
>-.elif ${PORT_OPTIONS:MSQLITE}
>-	@${ECHO_MSG} ""
>-	@${ECHO_MSG} "1. To initialise SQLite, run the following commands:"
>-	@${ECHO_MSG} ""
>-	@${ECHO_MSG} "   cd ${PREFIX}/share/refdb/db"
>-	@${ECHO_MSG} "   sqlite refdb < ${PREFIX}/share/refdb/sql/refdb.dump.sqlite"
>-	@${ECHO_MSG} ""
> .endif
> 
> .include <bsd.port.mk>
>diff --git a/textproc/refdb/distinfo b/textproc/refdb/distinfo
>index 5f2c3d3f1252..fbf12afa9971 100644
>--- a/textproc/refdb/distinfo
>+++ b/textproc/refdb/distinfo
>@@ -1,2 +1,3 @@
>-SHA256 (refdb-0.9.9-1.tar.gz) = 99f8146d646e97a32b248f7d5b530119066c2d108a8335f864816eadcfc3dec6
>-SIZE (refdb-0.9.9-1.tar.gz) = 3209712
>+TIMESTAMP = 1644836370
>+SHA256 (refdb-1.0.3.tar.gz) = bd13e788dc4ae7293a4220c0ba65330980fd123c3209b5b59f963ae85e6c26e5
>+SIZE (refdb-1.0.3.tar.gz) = 3500489
>diff --git a/textproc/refdb/files/patch-configure b/textproc/refdb/files/patch-configure
>new file mode 100644
>index 000000000000..676ce048f26c
>--- /dev/null
>+++ b/textproc/refdb/files/patch-configure
>@@ -0,0 +1,11 @@
>+--- configure.orig	2022-08-06 16:56:40 UTC
>++++ configure
>+@@ -848,7 +848,7 @@ sharedstatedir='${prefix}/com'
>+ datadir='${datarootdir}'
>+ sysconfdir='${prefix}/etc'
>+ sharedstatedir='${prefix}/com'
>+-localstatedir='${prefix}/var'
>++localstatedir='/var'
>+ includedir='${prefix}/include'
>+ oldincludedir='/usr/include'
>+ docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
>diff --git a/textproc/refdb/files/patch-doc_Makefile.in b/textproc/refdb/files/patch-doc_Makefile.in
>deleted file mode 100644
>index 071c4f541912..000000000000
>--- a/textproc/refdb/files/patch-doc_Makefile.in
>+++ /dev/null
>@@ -1,33 +0,0 @@
>---- doc/Makefile.in.orig	2014-09-10 12:40:48 UTC
>-+++ doc/Makefile.in
>-@@ -227,8 +227,8 @@ tei_xsl_ns = @tei_xsl_ns@
>- trang_cmd = @trang_cmd@
>- var_dir = @var_dir@
>- xml_decl = @xml_decl@
>--docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/refdb-manual
>--doc_DATA = refdb-manual.pdf refdb-manual/*
>-+docdir = $(datadir)/doc/refdb
>-+doc_DATA = refdb-manual/*
>- indexdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/
>- index_DATA = index.html
>- citestylexdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/citestylex
>-@@ -779,7 +779,7 @@ uninstall-am: uninstall-citationlistxDAT
>- 	uninstall-xnoteelementsDATA
>- 
>- 
>--all: refdb-manual.pdf refdb-manual/* citestylex/elements.html risx/elements.html citationlistx/elements.html xnote/elements.html
>-+all: refdb-manual-html citestylex/elements.html risx/elements.html citationlistx/elements.html xnote/elements.html
>- 
>- ####################################################################
>- # building the manual
>-@@ -804,9 +804,8 @@ refdb-manual.pdf: $(manual_sources) $(ma
>- # we have to give Java a little extra memory lest fop will die a horrible death
>- 	JAVA_OPTS=-Xmx256M fop -fo refdb-manual.fo -pdf refdb-manual.pdf
>- 
>--refdb-manual/*: $(manual_sources) $(manpage_sources) $(png_images) refdb-manual-statustable.xml include/manual-xhtml.xsl
>-+refdb-manual-html: $(manual_sources) $(manpage_sources) $(png_images) refdb-manual-statustable.xml include/manual-xhtml.xsl
>- 	@echo "Creating HTML manual...";
>--	rm -rf refdb-manual/*
>- # building outside the source dir won't work here because the docbook
>- # stylesheets screw up the location of the image files for HTML output
>- 	mkdir -p refdb-manual && cp $(html_extra_files) refdb-manual/ && xsltproc -o refdb-manual/ --nonet --xinclude include/manual-xhtml.xsl refdb-manual.xml
>diff --git a/textproc/refdb/files/patch-doc__Makefile.am b/textproc/refdb/files/patch-doc__Makefile.am
>new file mode 100644
>index 000000000000..21188146f7b0
>--- /dev/null
>+++ b/textproc/refdb/files/patch-doc__Makefile.am
>@@ -0,0 +1,67 @@
>+--- doc/Makefile.am.orig	2022-07-12 11:47:34 UTC
>++++ doc/Makefile.am
>+@@ -1,45 +1,45 @@
>+ ## Process this with automake to create Makefile.in
>+ 
>+-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/refdb-manual
>+-doc_DATA = refdb-manual.pdf refdb-manual/*
>++docdir = $(datadir)/doc/refdb
>++doc_DATA = refdb-manual/*
>+ 
>+-indexdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/
>++indexdir = $(datadir)/doc/refdb/
>+ index_DATA = index.html
>+ 
>+-citestylexdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/citestylex
>++citestylexdir = $(datadir)/doc/refdb/citestylex
>+ citestylex_DATA = citestylex/*.html
>+-citestylexdtdelemdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/citestylex/dtdelem
>++citestylexdtdelemdir = $(datadir)/doc/refdb/citestylex/dtdelem
>+ citestylexdtdelem_DATA = citestylex/dtdelem/*
>+-citestylexeledescdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/citestylex/ele-desc
>++citestylexeledescdir = $(datadir)/doc/refdb/citestylex/ele-desc
>+ citestylexeledesc_DATA = $(top_srcdir)/doc/citestylex/ele-desc/*.html
>+-citestylexelementsdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/citestylex/elements
>++citestylexelementsdir = $(datadir)/doc/refdb/citestylex/elements
>+ citestylexelements_DATA = citestylex/elements/*
>+ 
>+-risxdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/risx
>++risxdir = $(datadir)/doc/refdb/risx
>+ risx_DATA = risx/*.html
>+-risxdtdelemdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/risx/dtdelem
>++risxdtdelemdir = $(datadir)/doc/refdb/risx/dtdelem
>+ risxdtdelem_DATA = risx/dtdelem/*
>+-risxeledescdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/risx/ele-desc
>++risxeledescdir = $(datadir)/doc/refdb/risx/ele-desc
>+ risxeledesc_DATA = $(top_srcdir)/doc/risx/ele-desc/*.html
>+-risxelementsdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/risx/elements
>++risxelementsdir = $(datadir)/doc/refdb/risx/elements
>+ risxelements_DATA = risx/elements/*
>+ 
>+-citationlistxdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/citationlistx
>++citationlistxdir = $(datadir)/doc/refdb/citationlistx
>+ citationlistx_DATA = citationlistx/*.html
>+-citationlistxdtdelemdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/citationlistx/dtdelem
>++citationlistxdtdelemdir = $(datadir)/doc/refdb/citationlistx/dtdelem
>+ citationlistxdtdelem_DATA = citationlistx/dtdelem/*
>+-citationlistxeledescdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/citationlistx/ele-desc
>++citationlistxeledescdir = $(datadir)/doc/refdb/citationlistx/ele-desc
>+ citationlistxeledesc_DATA = $(top_srcdir)/doc/citationlistx/ele-desc/*.html
>+-citationlistxelementsdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/citationlistx/elements
>++citationlistxelementsdir = $(datadir)/doc/refdb/citationlistx/elements
>+ citationlistxelements_DATA = citationlistx/elements/*
>+ 
>+-xnotedir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/xnote
>++xnotedir = $(datadir)/doc/refdb/xnote
>+ xnote_DATA = xnote/*.html
>+-xnotedtdelemdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/xnote/dtdelem
>++xnotedtdelemdir = $(datadir)/doc/refdb/xnote/dtdelem
>+ xnotedtdelem_DATA = xnote/dtdelem/*
>+-xnoteeledescdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/xnote/ele-desc
>++xnoteeledescdir = $(datadir)/doc/refdb/xnote/ele-desc
>+ xnoteeledesc_DATA = $(top_srcdir)/doc/xnote/ele-desc/*.html
>+-xnoteelementsdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/xnote/elements
>++xnoteelementsdir = $(datadir)/doc/refdb/xnote/elements
>+ xnoteelements_DATA = xnote/elements/*
>+ 
>+ ####################################################################
>diff --git a/textproc/refdb/files/patch-phpweb-index.php.in b/textproc/refdb/files/patch-phpweb-index.php.in
>new file mode 100644
>index 000000000000..e1efdad7bb10
>--- /dev/null
>+++ b/textproc/refdb/files/patch-phpweb-index.php.in
>@@ -0,0 +1,13 @@
>+--- phpweb/index.php.in.orig	2017-03-01 22:44:01 UTC
>++++ phpweb/index.php.in
>+@@ -504,8 +504,8 @@ switch($thisPage) {
>+      echo "<div class=\"warning\"><p><strong class=\"warning\">" . $warning . "</strong></p></div>\n";
>+      unset($warning);
>+    }
>+-   echo "        <p>Username:<br/><input type=\"text\" name=\"name\" size=\"16\" maxlength=\"16\"/></p>\n";
>+-   echo "        <p>Password:<br/><input type=\"password\" name=\"passwd\" size=\"16\" maxlength=\"16\"/></p>\n";
>++   echo "        <p>Username (max 16):<br/><input type=\"text\" name=\"name\" size=\"16\" maxlength=\"16\"/></p>\n";
>++   echo "        <p>Password (max. 128):<br/><input type=\"password\" name=\"passwd\" size=\"16\" maxlength=\"128\"/></p>\n";
>+    echo "        <p>Remember me on this computer <input type=\"checkbox\" name=\"rememberMe\" value=\"rememberMe\"/></p>\n";
>+    echo "        <p><input id=\"loginbutton\" type=\"submit\" name=\"sendQuery\" value=\"Login\"/></p>\n";
>+    echo "    </form>\n";
>diff --git a/textproc/refdb/files/patch-scripts-refdb.in b/textproc/refdb/files/patch-scripts-refdb.in
>index e1e844007f2f..5e663098ea05 100644
>--- a/textproc/refdb/files/patch-scripts-refdb.in
>+++ b/textproc/refdb/files/patch-scripts-refdb.in
>@@ -1,6 +1,6 @@
>---- scripts/refdb.in.orig	Fri Aug 25 03:53:55 2006
>-+++ scripts/refdb.in	Tue Jan 30 11:25:47 2007
>-@@ -44,7 +44,7 @@
>+--- scripts/refdb.in.orig	2022-07-12 11:47:34 UTC
>++++ scripts/refdb.in
>+@@ -43,7 +43,7 @@ REFDBCTL=<prefix>/bin/<program_prefix>refdbctl<program
>  # true for BSD-UNIX and Unices derived thereof, as well as for the
>  # Slackware Linux distribution). This setting does not perform any black
>  # magic, but it makes the screen messages at startup match the OS style
>diff --git a/textproc/refdb/files/patch-scripts-refdb_latex2utf8txt b/textproc/refdb/files/patch-scripts-refdb_latex2utf8txt
>new file mode 100644
>index 000000000000..1f744c5ad2d4
>--- /dev/null
>+++ b/textproc/refdb/files/patch-scripts-refdb_latex2utf8txt
>@@ -0,0 +1,69 @@
>+--- scripts/refdb_latex2utf8txt.orig	2022-07-12 11:47:34 UTC
>++++ scripts/refdb_latex2utf8txt
>+@@ -26,8 +26,14 @@ while(<>) {
>+     s/\{\\~A\}|\\~A|\\~\{A\}/Ã/g;
>+     s/\{\\~a\}|\\~a|\\~\{a\}/Ã£/g;
>+     s/\{\\"a\}|\\"a/Ã¤/g;
>+-    s/\{\\v\{c\}|\{\\v c\}|\\v c/Ä/g;
>++    s/\{\\aa\}|\\a\{a\}|\\aa/Ã¥/g;
>++    s/\{\\aA\}|\\a\{A\}|\\aA/Ã/g;
>++    s/\{\\ae\}|\\a\{e\}|\\ae/Ã¦/g;
>++    s/\{\\AE\}|\\A\{E\}|\\AE/Ã/g;
>++    s/\{\\v\{c\}|\{\\v c\}|\\vc|\\v c/Ä/g;
>++    s/\{\\vC\}|\{\\v C\}|\\v\{C\}|\\v C/Ä/g;
>+     s/\{\\'\{c\}|\{\\'c\}|\\'c/Ä/g;
>++    s/\{\\'\{C\}|\{\\'C\}|\\'C/Ä/g;
>+     s/\{\\'e\}|\\'e/Ã©/g;
>+     s/\{\\'E\}|\\'E/Ã/g;
>+     s/\{\\`e\}|\\`e/Ã¨/g;
>+@@ -36,12 +42,17 @@ while(<>) {
>+     s/\{\\^E\}|\\^E/Ã/g;
>+     s/\{\\~e\}|\\~e|\\~\{e\}/áº½/g;
>+     s/\{\\~E\}|\\~E|\\~\{E\}/áº¼/g;
>++    s/\{\\ve\}|\\ve|\\v\{e\}/Ä/g;
>+     s/\{\\'\\i\}|\\'\\i/Ã/g;
>+     s/\{\\'I\}|\\'I/Ã/g;
>+     s/\{\\`\\i\}|\\`\\i/Ã¬/g;
>+     s/\{\\`I\}|\\`I/Ã/g;
>+     s/\{\\^\\i\}|\\^\\i/Ã®/g;
>+     s/\{\\^I\}|\\^I/Ã/g;
>++    s/\{\\vj\}|\\v\{j\}|\\v j|\\vj/Ç°/g;
>++    s/\{\\vJ\}|\\v\{J\}|\\v J|\\vJ/Ç°/g;
>++    s/\{\\l\}|\\l/Å/g;
>++    s/\{\\L\}|\\L/Å/g;
>+     s/\{\\'o\}|\\'o/Ã³/g;
>+     s/\{\\'O\}|\\'O/Ã/g;
>+     s/\{\\`o\}|\\`o/Ã²/g;
>+@@ -50,10 +61,18 @@ while(<>) {
>+     s/\{\\"O\}|\\"O/Ã/g;
>+     s/\{\\~o\}|\\~o|\\~\{o\}/Ãµ/g;
>+     s/\{\\~O\}|\\~O|\\~\{O\}/Ã/g;
>++    s/\{\\~n\}|\\~n|\\~\{n\}/Ã±/g;
>++    s/\{\\~N\}|\\~N|\\~\{N\}/Ã/g;
>+     s/\{\\^o\}|\\^o/Ã´/g;
>+     s/\{\\^O\}|\\^O/Ã/g;
>++    s/\{\o\}|\\o/Ã¸/g;
>++    s/\{\O\}|\\O/Ã/g;
>++    s/\{\oe\}|\\oe/Å/g;
>++    s/\{\OE\}|\\OE/Å/g;
>+     s/\{\\H o\}|\\H o/Å/g;
>+     s/\{\\H O\}|\\H O/Å/g;
>++    s/\{\\vo\}|\\v\{o\}|\\v c/Ç/g;
>++    s/\{\\vO\}|\\v\{O\}|\\v O/Ç/g;
>+     s/\{\\'u\}|\\'u/Ãº/g;
>+     s/\{\\'U\}|\\'U/Ã/g;
>+     s/\{\\`u\}|\\`u/Ã¹/g;
>+@@ -67,7 +86,12 @@ while(<>) {
>+     s/\{\\H u\}|\\H u/Å±/g;
>+     s/\{\\H U\}|\\H U/Å°/g;
>+     s/\{\\ss\}|\\ss |\\"s/Ã/g;
>+-    s/\{\\v\{S\}|\{\\v S\}/Å /g;
>++    s/\{\\vS\}|\\v\{S\}|\\v S/Å /g;
>++    s/\{\\vs\}|\\v\{s\}|\\v s/Å¡/g;
>++    s/\{\\'y\}|\\'\{y\}|\\'y/Ã½/g;
>++    s/\{\\vZ\}|\\v\{Z\}|\\v Z/Å½/g;
>++    s/\{\\vz\}|\\v\{z\}|\\v z/Å¾/g;
>++    s/\{\\SS\}|\\SS/ÏÏ/g;
>+     s/\{\\[^ ]+//g;
>+     s/([^\\])\{+/$1/g;
>+     s/([^\\])\}+/$1/g;
>diff --git a/textproc/refdb/files/refdbd.in b/textproc/refdb/files/refdbd.in
>index a3f88433c263..ac3c46cb84d8 100644
>--- a/textproc/refdb/files/refdbd.in
>+++ b/textproc/refdb/files/refdbd.in
>@@ -1,6 +1,6 @@
> #!/bin/sh
> 
>-# O. Hartmann, Berlin, 2014
>+# O. Hartmann, 2014 - 2022
> #
> #
> # PROVIDE: refdbd
>@@ -13,13 +13,14 @@
> #
> # in /etc/rc.conf[.local]
> # 
>-# and optionally set the the following variables upon your environment:
>+# and optionally set the the following variables according to your environment:
> #
> # Choose another PIDFILE as the configured and/or default one:
> # refdbd_pidfile="/var/run/refdbd.pid"
> #
>-# To make the refdbd daemon accessible local only (127.0.0.1):
>+# To make the refdbd daemon accessible local only (127.0.0.1), set:
> # refdbd_local="YES"
>+#
> 
> . /etc/rc.subr
> 
>@@ -29,16 +30,14 @@ rcvar=refdbd_enable
> # read settings, set defaults
> load_rc_config ${name}
> 
>+: ${refdbd_enable:="NO"}
>+: ${refdbd_local:="NO"}
>+
> command="%%PREFIX%%/bin/${name}"
> globalconfig="%%PREFIX%%/etc/refdb/refdbdrc"
> pidfile="/var/run/${name}.pid"
> extra_commands="reload"
> 
>-load_rc_config ${name}
>-
>-: ${refdbd_enable:="NO"}
>-: ${refdbd_local:="NO"}
>-
> if checkyesno refdbd_local; then
>   refdbd_local_flags="-I"
> else
>@@ -55,10 +54,11 @@ refdbd_prestart()
> 	if [ "x${refdbd_pidfile}" != "x" ]; then
> 		pidfile="${refdbd_pidfile}"
> 
>-	# ... if not configured via rc.conf[.local],
>-	# read the settings in the configure file. We're only interested in
>-	# nonstandard PID file settings
> 	else
>+		# ... if not configured via rc.conf[.local],
>+		# read the settings in the configure file. We're only interested in
>+		# nonstandard PID file settings
>+
> 		for config in ${globalconfig}; do
> 			while read refdbvar refdbval; do
> 				if [ -n "${refdbvar}" ]; then
>@@ -70,8 +70,10 @@ refdbd_prestart()
> 		done
> 	fi
> 
>-	piddir=`dirname ${pidfile}`
>-	mkdir -p ${piddir}
>+	piddir=$( dirname ${pidfile} )
>+	if [ ! -d "${piddir}" ] ; then
>+		install -d ${piddir}
>+	fi
> 
> 	refdbd_pid_flags="-P ${pidfile}"
> }
>diff --git a/textproc/refdb/pkg-message b/textproc/refdb/pkg-message
>new file mode 100644
>index 000000000000..c4314cead627
>--- /dev/null
>+++ b/textproc/refdb/pkg-message
>@@ -0,0 +1,42 @@
>+[
>+{	type: install
>+	message: <<EOM
>+
>+To complete RefDB installation, perform according to DB selection the following:
>+
>+For option MYSQL:
>+
>+To initialise MySQL, run the following command:
>+  mysql -u root -e "CREATE DATABASE refdb"
>+  Then, for MySQL older than 4.1, run:
>+  mysql -u root refdb < ${PREFIX}/share/refdb/sql/refdb.dump.mysql
>+
>+MySQL 4.1 and later, run:
>+  mysql -u root refdb < ${PREFIX}/share/refdb/sql/refdb.dump.mysql41
>+
>+
>+For option PGSQL:
>+
>+To initialise PostgreSQL, run the following commands:
>+  createdb -U postgres -E UNICODE refdb
>+  psql -U postgres refdb < ${PREFIX}/share/refdb/sql/refdb.dump.pgsql
>+
>+or, on older PostgreSQL installations, run
>+
>+  createdb -U pgsql -E UNICODE refdb
>+  psql -U pgsql refdb < ${PREFIX}/share/refdb/sql/refdb.dump.pgsql
>+
>+
>+For option SQLITE:
>+
>+To initialise SQLite, run the following commands:
>+  cd ${PREFIX}/share/refdb/db
>+  sqlite refdb < ${PREFIX}/share/refdb/sql/refdb.dump.sqlite
>+
>+
>+For more informations, please feel free to visit
>+	
>+	http://refdb.sourceforge.net/index.html
>+EOM
>+}
>+]
>diff --git a/textproc/refdb/pkg-plist b/textproc/refdb/pkg-plist
>index 6f21f5818f0d..7b9970f5ecef 100644
>--- a/textproc/refdb/pkg-plist
>+++ b/textproc/refdb/pkg-plist
>@@ -6,8 +6,10 @@ bin/en2ris
> bin/marc2ris
> bin/med2ris
> bin/refdb-backup
>+bin/refdb-bug
> bin/refdb-init
> bin/refdb-ms
>+bin/refdb-pubmed
> bin/refdb-restore
> bin/refdb-sruserver
> bin/refdb_dos2unix
>@@ -19,10 +21,13 @@ bin/refdbd
> bin/refdbib
> bin/refdbjade
> bin/refdbnd
>+bin/refdbrtf
> bin/refdbsru
> bin/refdbxml
> bin/refdbxp
>+bin/rtfcitations
> bin/runbib
>+bin/runbib-missing
> %%ETCDIR%%/bib2riscgirc.example
> %%ETCDIR%%/bib2risrc.example
> %%ETCDIR%%/db2risrc.example
>@@ -38,37 +43,42 @@ bin/runbib
> %%ETCDIR%%/refdbdrc.sqlite3.example
> %%ETCDIR%%/refdbibrc.example
> %%ETCDIR%%/refdbjaderc.example
>+%%ETCDIR%%/refdbrtfrc.example
> %%ETCDIR%%/refdbsrurc.example
> %%ETCDIR%%/refdbxmlrc.example
> %%ETCDIR%%/runbibrc.example
>-man/man1/bib2ris-utf8.1.gz
>-man/man1/bib2ris.1.gz
>-man/man1/db2ris.1.gz
>-man/man1/eenc.1.gz
>-man/man1/en2ris.1.gz
>-man/man1/marc2ris.1.gz
>-man/man1/med2ris.1.gz
>-man/man1/refdb-backup.1.gz
>-man/man1/refdb-bug.1.gz
>-man/man1/refdb-ms.1.gz
>-man/man1/refdb-restore.1.gz
>-man/man1/refdb-sruserver.1.gz
>-man/man1/refdb_dos2unix.1.gz
>-man/man1/refdb_latex2utf8txt.1.gz
>-man/man1/refdba.1.gz
>-man/man1/refdbc.1.gz
>-man/man1/refdbctl.1.gz
>-man/man1/refdbd.1.gz
>-man/man1/refdbib.1.gz
>-man/man1/refdbjade.1.gz
>-man/man1/refdbnd.1.gz
>-man/man1/refdbsru.1.gz
>-man/man1/refdbxml.1.gz
>-man/man1/refdbxp.1.gz
>-man/man1/runbib.1.gz
>-man/man8/refdb-init.8.gz
>-man/man8/refdb.8.gz
>-man/man8/refdb.sh.8.gz
>+share/man/man1/bib2ris-utf8.1.gz
>+share/man/man1/bib2ris.1.gz
>+share/man/man1/db2ris.1.gz
>+share/man/man1/eenc.1.gz
>+share/man/man1/en2ris.1.gz
>+share/man/man1/marc2ris.1.gz
>+share/man/man1/med2ris.1.gz
>+share/man/man1/refdb-backup.1.gz
>+share/man/man1/refdb-bug.1.gz
>+share/man/man1/refdb-ms.1.gz
>+share/man/man1/refdb-pubmed.1.gz
>+share/man/man1/refdb-restore.1.gz
>+share/man/man1/refdb-sruserver.1.gz
>+share/man/man1/refdb_dos2unix.1.gz
>+share/man/man1/refdb_latex2utf8txt.1.gz
>+share/man/man1/refdba.1.gz
>+share/man/man1/refdbc.1.gz
>+share/man/man1/refdbctl.1.gz
>+share/man/man1/refdbd.1.gz
>+share/man/man1/refdbib.1.gz
>+share/man/man1/refdbjade.1.gz
>+share/man/man1/refdbnd.1.gz
>+share/man/man1/refdbrtf.1.gz
>+share/man/man1/refdbsru.1.gz
>+share/man/man1/refdbxml.1.gz
>+share/man/man1/refdbxp.1.gz
>+share/man/man1/rtfcitations.1.gz
>+share/man/man1/runbib-missing.1.gz
>+share/man/man1/runbib.1.gz
>+share/man/man8/refdb-init.8.gz
>+share/man/man8/refdb.8.gz
>+share/man/man8/refdb.sh.8.gz
> %%DATADIR%%/declarations/docbook.dcl
> %%DATADIR%%/declarations/xml.dcl
> %%DATADIR%%/dsssl/bibdb2tei.dsl
>@@ -93,6 +103,7 @@ man/man8/refdb.sh.8.gz
> %%DATADIR%%/dtd/xnote.dtd
> %%DATADIR%%/dtd/xnote.rnc
> %%DATADIR%%/dtd/xnote.rng
>+%%DATADIR%%/examples/Makefile.rtf.template
> %%DATADIR%%/examples/Makefile.template
> %%DATADIR%%/examples/dbtest.sgml
> %%DATADIR%%/examples/dbtest.short.sgml
>@@ -122,15 +133,36 @@ man/man8/refdb.sh.8.gz
> %%DATADIR%%/sru/refdbsru.css
> %%DATADIR%%/sru/refdbsru.xsl
> %%DATADIR%%/sru/risx.xsl
>+%%DATADIR%%/styles/AMA.xml
> %%DATADIR%%/styles/APA.xml
>+%%DATADIR%%/styles/Anesth.Analg.xml
>+%%DATADIR%%/styles/Ann.Biomed.Eng.xml
>+%%DATADIR%%/styles/Ann.Thorac.Surg.xml
>+%%DATADIR%%/styles/Artif.Organs.xml
>+%%DATADIR%%/styles/Biochem.Biophys.Res.Commun.xml
>+%%DATADIR%%/styles/Biochem.Pharmacol.xml
> %%DATADIR%%/styles/Biomaterials.xml
>+%%DATADIR%%/styles/Br.J.Pharmacol.xml
>+%%DATADIR%%/styles/CHA-MC.xml
>+%%DATADIR%%/styles/Chicago.xml
>+%%DATADIR%%/styles/Eur.J.Cardiothorac.Surg.xml
> %%DATADIR%%/styles/Eur.J.Pharmacol.xml
>+%%DATADIR%%/styles/Harvard.xml
> %%DATADIR%%/styles/J.Biol.Chem.xml
>+%%DATADIR%%/styles/J.Pharmacol.Exp.Ther.xml
>+%%DATADIR%%/styles/J.Tissue_Eng.Regen.Med.xml
>+%%DATADIR%%/styles/J.Vasc.Res.xml
>+%%DATADIR%%/styles/MLA.xml
> %%DATADIR%%/styles/Murdoch.Law.xml
>+%%DATADIR%%/styles/Thromb.Haemost.xml
> %%DATADIR%%/styles/Tissue_Eng.xml
>+%%DATADIR%%/styles/Turabian.xml
>+%%DATADIR%%/styles/Z.Geburtsh.Neonatol.xml
>+%%DATADIR%%/styles/authoryear-de.xml
> %%DATADIR%%/styles/bibtex-abbrev.xml
> %%DATADIR%%/styles/bibtex-full.xml
> %%DATADIR%%/styles/citekey.xml
>+%%DATADIR%%/styles/ifmbe_proceedings.xml
> %%DATADIR%%/styles/schemas.xml
> %%DATADIR%%/www/css/main.css
> %%DATADIR%%/www/css/navigationlist.css

Actions: View | Diff

Attachments on bug 265105: 235143 | 235144 | 235207 | 235213 | 235276 | 235716 | 235725 | 235726 | 235782 | 235784 | 235785 | 235800 | 235819 | 235820 | 235821 | 235847 | 235851 | 235858 | 236264 | 236287 | 236302 | 236331 | 236362 | 236363 | 237162