Attachment 235276 Details for Bug 265105 – Refdb update to 1.0.3, fix setting of OPTIONS

[patch] Refdb update to 1.0.3, fix setting of OPTIONS

refdb_update_1.0.3_fixed_patch.txt (text/plain), 14.38 KB, created by Michael Gmelin on 2022-07-15 17:16:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Gmelin

Created: 2022-07-15 17:16:00 UTC

Size: 14.38 KB

patch

obsolete

>diff --git a/textproc/refdb/Makefile b/textproc/refdb/Makefile
>index ab4e0dc2b9..b0776291bc 100644
>--- a/textproc/refdb/Makefile
>+++ b/textproc/refdb/Makefile
>@@ -1,87 +1,98 @@
>-# Created by: paulh@logicsquad.net
>+PORTNAME=		refdb
>+PORTVERSION=	1.0.3
>+CATEGORIES=		textproc
>+MASTER_SITES=	https://sourceforge.net/projects/${PORTNAME}/files/latest/download/
> 
>-PORTNAME=	refdb
>-PORTVERSION=	0.9.9
>-DISTVERSIONSUFFIX=	-1
>-PORTREVISION=	11
>-CATEGORIES=	textproc
>-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-src/${PORTNAME}-src-${PORTVERSION}-1
>+MAINTAINER=		ohartmann@walstatt.org
>+COMMENT=		Bibliographic reference database
> 
>-MAINTAINER=	ohartman@zedat.fu-berlin.de
>-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
> 
> LIB_DEPENDS=	libexpat.so:textproc/expat2 \
> 		libbtparse.so:textproc/btparse \
>-		libdbi.so:databases/libdbi
>+		libdbi.so:databases/libdbi \
>+		libltdl.so:devel/libltdl
>+
>+RUN_DEPENDS=	xsltproc:textproc/libxslt \
>+		fop: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
>+
>+BUILD_DEPENDS=	svnversion:devel/subversion
>+
>+USES=			autoreconf gmake iconv php:web perl5 libtool pkgconfig pathfix readline shebangfix
> 
>-USES=		gmake iconv readline perl5 libtool pkgconfig pathfix shebangfix
>-HAS_CONFIGURE=	yes
>-INSTALL_TARGET=	install-strip
>-PORTDOCS=	*
>+HAS_CONFIGURE= 	yes
>+INSTALL_TARGET= install-strip
>+PORTDOCS=		*
> 
>-CFLAGS+=	-I${LOCALBASE}/include
>-LIBS+=		-lm
>+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
>+CONFIGURE_ARGS+=--with-expat-lib=${LOCALBASE}/lib \
>+				--with-classpath-root=${LOCALBASE}/share/java/classes
> 
>-OPTIONS_DEFINE=		DOCS CATALOG
>+XMLCATMGR=		${LOCALBASE}/bin/xmlcatmgr
>+
>+OPTIONS_DEFINE=		CATALOG DOCS
> OPTIONS_SINGLE=		DB
> OPTIONS_SINGLE_DB=	MYSQL PGSQL SQLITE
>-OPTIONS_EXCLUDE=	CATALOG		# may not be implemented correctly
>+OPTIONS_EXCLUDE=	CATALOG DOCS		# 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
>+DOCS_BUILD_DEPENDS=	docbook-xsl>=0:textproc/docbook-xsl
>+
>+SHEBANG_FILES=		${WRKSRC}/scripts/*
> 
>-SHEBANG_FILES=	${WRKSRC}/scripts/*
>+USE_RC_SUBR= 		refdbd
> 
>-USE_RC_SUBR=	refdbd
>+MYSQL_USES=		mysql
>+MYSQL_CONFIGURE_WITH=	mysql
>+PGSQL_USES=		pgsql
>+PGSQL_CONFIGURE_WITH=	pgsql
>+SQLITE3_USES=		sqlite
>+SQLITE3_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
> .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
> .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
> .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}
>+BUILD_DEPENDS+=	dtdparse:textproc/dtdparse
>+USE_JAVA=			YES
>+JAVA_VERSION=		8+
>+JAVA_BUILD=			YES
> CONFIGURE_ARGS+=	--with-docbook-xsl=${PREFIX}/share/xsl/docbook \
>-			--without-docbook-xsl-ns \
>-			--without-tei-xsl \
>-			--without-tei-xsl-ns
>+					--without-docbook-xsl-ns \
>+					--without-tei-xsl \
>+					--without-tei-xsl-ns
> .else
> CONFIGURE_ARGS+=	--disable-docs
> .endif
>@@ -91,14 +102,16 @@ RUN_DEPENDS+=	xmlcatmgr:textproc/xmlcatmgr
> .endif
> 
> post-patch:
>-	${REINPLACE_CMD} -e 's|$$(PACKAGE)-$$(VERSION)|refdb|g' \
>-		${WRKSRC}/doc/Makefile.in
>+		${REINPLACE_CMD} -e 's|$$(PACKAGE)-$$(VERSION)|refdb|g' \
>+		${WRKSRC}/doc/Makefile.am
> 
> 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
>+		@[ -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} ""
> 	@${ECHO_MSG} "To complete RefDB installation:"
> .if ${PORT_OPTIONS:MMYSQL}
> 	@${ECHO_MSG} ""
>@@ -118,6 +131,9 @@ post-install:
> 	@${ECHO_MSG} ""
> 	@${ECHO_MSG} "1. To initialise PostgreSQL, run the following commands:"
> 	@${ECHO_MSG} ""
>+	@${ECHO_MSG} "   createdb -U postgres -E UNICODE refdb"
>+	@${ECHO_MSG} "   psql -U postgres refdb < ${PREFIX}/share/refdb/sql/refdb.dump.pgsql"
>+	@${ECHO_MSG} "   or, on older PostgreSQL installations,"
> 	@${ECHO_MSG} "   createdb -U pgsql -E UNICODE refdb"
> 	@${ECHO_MSG} "   psql -U pgsql refdb < ${PREFIX}/share/refdb/sql/refdb.dump.pgsql"
> 	@${ECHO_MSG} ""
>diff --git a/textproc/refdb/distinfo b/textproc/refdb/distinfo
>index 5f2c3d3f12..fbf12afa99 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-doc_Makefile.in b/textproc/refdb/files/patch-doc_Makefile.in
>index 071c4f5419..e69de29bb2 100644
>--- a/textproc/refdb/files/patch-doc_Makefile.in
>+++ b/textproc/refdb/files/patch-doc_Makefile.in
>@@ -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-scripts-refdb.in b/textproc/refdb/files/patch-scripts-refdb.in
>index e1e844007f..5e663098ea 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/refdbd.in b/textproc/refdb/files/refdbd.in
>index a3f88433c2..ace40f88d6 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
>@@ -29,16 +29,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
>@@ -70,8 +68,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-plist b/textproc/refdb/pkg-plist
>index 6f21f5818f..82d53548e7 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,14 @@ bin/refdbd
> bin/refdbib
> bin/refdbjade
> bin/refdbnd
>+bin/refdbrtf
> bin/refdbsru
> bin/refdbxml
> bin/refdbxp
>+bin/rtfcitations
> bin/runbib
>+bin/runbib-missing
>+etc/rc.d/refdbd
> %%ETCDIR%%/bib2riscgirc.example
> %%ETCDIR%%/bib2risrc.example
> %%ETCDIR%%/db2risrc.example
>@@ -38,37 +44,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 +104,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 +134,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