Attachment 235144 Details for Bug 265105 – refdb patch v 1.0.3

[patch] refdb patch v 1.0.3

refdb_103.patch (text/plain), 24.78 KB, created by O. Hartmann on 2022-07-09 08:12:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: O. Hartmann

Created: 2022-07-09 08:12:23 UTC

Size: 24.78 KB

patch

obsolete

>diff --git a/devel/opencl/Makefile b/devel/opencl/Makefile
>index 506049f58925..a7f18a0f85e9 100644
>--- a/devel/opencl/Makefile
>+++ b/devel/opencl/Makefile
>@@ -1,5 +1,5 @@
> PORTNAME=	opencl
>-PORTVERSION=	3.0.8
>+PORTVERSION=	3.0.11
> CATEGORIES=	devel
> 
> MAINTAINER=	ohartmann@walstatt.org
>@@ -13,8 +13,8 @@ GH_PROJECT=	OpenCL-Headers OpenCL-CLHPP:clhpp
> GH_TAGNAME=	${HEADER_TAG} ${CLHPP_TAG}:clhpp
> 
> # the header releases don't have tags yet, so use git commit for now
>-HEADER_TAG=	v2021.06.30
>-CLHPP_TAG=	v2.0.15	#  include missing CL/opencl.hpp
>+HEADER_TAG=	v2022.05.18
>+CLHPP_TAG=	v2022.05.18	#  include missing CL/opencl.hpp
> 
> NO_BUILD=	yes
> NO_ARCH=	yes
>diff --git a/devel/opencl/distinfo b/devel/opencl/distinfo
>index 5fdd4e77efaf..87cee7055b12 100644
>--- a/devel/opencl/distinfo
>+++ b/devel/opencl/distinfo
>@@ -1,5 +1,5 @@
>-TIMESTAMP = 1635006419
>-SHA256 (KhronosGroup-OpenCL-Headers-3.0.8-v2021.06.30_GH0.tar.gz) = 6640d590c30d90f89351f5e3043ae6363feeb19ac5e64bc35f8cfa1a6cd5498e
>-SIZE (KhronosGroup-OpenCL-Headers-3.0.8-v2021.06.30_GH0.tar.gz) = 59866
>-SHA256 (KhronosGroup-OpenCL-CLHPP-v2.0.15_GH0.tar.gz) = 0175806508abc699586fc9a9387e01eb37bf812ca534e3b493ff3091ec2a9246
>-SIZE (KhronosGroup-OpenCL-CLHPP-v2.0.15_GH0.tar.gz) = 99826
>+TIMESTAMP = 1656909792
>+SHA256 (KhronosGroup-OpenCL-Headers-3.0.11-v2022.05.18_GH0.tar.gz) = 88a1177853b279eaf574e2aafad26a84be1a6f615ab1b00c20d5af2ace95c42e
>+SIZE (KhronosGroup-OpenCL-Headers-3.0.11-v2022.05.18_GH0.tar.gz) = 64518
>+SHA256 (KhronosGroup-OpenCL-CLHPP-v2022.05.18_GH0.tar.gz) = d29affd740c5037b4499790613f5af0718ffc88c325e793b73cb35b7592fc0f7
>+SIZE (KhronosGroup-OpenCL-CLHPP-v2022.05.18_GH0.tar.gz) = 106799
>diff --git a/lang/pocl/Makefile b/lang/pocl/Makefile
>index 15d285260bd2..4ed315988ff8 100644
>--- a/lang/pocl/Makefile
>+++ b/lang/pocl/Makefile
>@@ -1,5 +1,5 @@
> PORTNAME=	pocl
>-PORTVERSION=	1.8
>+PORTVERSION=	3.0
> DISTVERSIONPREFIX=v
> CATEGORIES=	lang
> 
>@@ -13,7 +13,7 @@ ONLY_FOR_ARCHS=	aarch64 amd64 i386 powerpc64 powerpc64le
> ONLY_FOR_ARCHS_REASON=	only tested on ${ONLY_FOR_ARCHS:tW:S/ /, /g}
> 
> BUILD_DEPENDS=	llvm${LLVM_VERSION}>=10:devel/llvm${LLVM_VERSION} \
>-		opencl>=2.2:devel/opencl
>+		opencl>=3:devel/opencl
> LIB_DEPENDS=	libhwloc.so:devel/hwloc2 libOpenCL.so:devel/ocl-icd
> RUN_DEPENDS=	${BUILD_DEPENDS}
> 
>@@ -21,7 +21,7 @@ USES=		cmake localbase:ldflags ncurses pkgconfig
> USE_GITHUB=	yes
> USE_LDCONFIG=	yes
> 
>-LLVM_VERSION=	${MESA_LLVM_VER:U13}
>+LLVM_VERSION=	${MESA_LLVM_VER:U14}
> CMAKE_ARGS=	-DWITH_LLVM_CONFIG="${LOCALBASE}/llvm${LLVM_VERSION}/bin/llvm-config" \
> 		-DPOCL_INSTALL_PKGCONFIG_DIR="${PREFIX}/libdata/pkgconfig" \
> 		-DSINGLE_LLVM_LIB=ON \
>diff --git a/lang/pocl/distinfo b/lang/pocl/distinfo
>index 5b95d2ff1d4f..a6ffe7171126 100644
>--- a/lang/pocl/distinfo
>+++ b/lang/pocl/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1634367852
>-SHA256 (pocl-pocl-v1.8_GH0.tar.gz) = 0f63377ae1826e16e90038fc8e7f65029be4ff6f9b059f6907174b5c0d1f8ab2
>-SIZE (pocl-pocl-v1.8_GH0.tar.gz) = 1614545
>+TIMESTAMP = 1656906684
>+SHA256 (pocl-pocl-v3.0_GH0.tar.gz) = a3fd3889ef7854b90b8e4c7899c5de48b7494bf770e39fba5ad268a5cbcc719d
>+SIZE (pocl-pocl-v3.0_GH0.tar.gz) = 1722809
>diff --git a/lang/pocl/pkg-descr b/lang/pocl/pkg-descr
>index ebf154f496d4..8959ecfc7d82 100644
>--- a/lang/pocl/pkg-descr
>+++ b/lang/pocl/pkg-descr
>@@ -1,15 +1,19 @@
>-Portable OpenCL aims to be an efficient open source (MIT-licensed)
>-implementation of the OpenCL 1.2 standard.
>+Portable OpenCL (pocl)
>+----------------------
>+
>+Portable OpenCL (>= 3.0) aims to be an efficient open source 
>+(MIT-licensed) implementation of the OpenCL 2.X standard with 
>+adaptions of OpenCL 3.0.
> 
> In addition to producing an easily portable open source OpenCL
> implementation, another major goal of the project is improving
> performance portability of OpenCL programs with compiler
> optimizations, reducing the need for target-dependent manual
>-optimizations. At the core of POCL is a set of LLVM passes used
>-to statically parallelize multiple work-items with the kernel
>+optimizations. At the core of pocl is a set of LLVM passes
>+used to statically parallelize multiple work-items with the kernel
> compiler, even in the presence of work-group barriers. This enables
> parallelization of the fine-grained static concurrency in the work
>-groups in multiple ways (SIMD, VLIW, superscalar, ...).
>+groups in multiple ways (SIMD, VLIW, superscalar,...).
> 
> The code base is modularized to allow easy adding of new "device drivers"
> in the host-device layer. A generic multithreaded "target driver" is
>diff --git a/lang/pocl/pkg-message b/lang/pocl/pkg-message
>new file mode 100644
>index 000000000000..3dfd31c876d7
>--- /dev/null
>+++ b/lang/pocl/pkg-message
>@@ -0,0 +1,12 @@
>+
>+Deadlocks (freezes) on FreeBSD:
>+
>+OpenCL applications using pocl on FreeBSD must be compiled with 
>+options CFLAGS+=-pthread or CXXFLAGS+=-pthread, otherwise someone risk
>+that a library may not initialize the threading on BSD independently, 
>+even if an ICD loader is used.
>+
>+See: 
>+	http://www.freebsd.org/cgi/query-pr.cgi?pr=163512
>+
>+(Source: http://portablecl.org/docs/html/faq.html?highlight=freebsd)
>diff --git a/lang/pocl/pkg-plist b/lang/pocl/pkg-plist
>index 20639933c7bc..4858203a74a2 100644
>--- a/lang/pocl/pkg-plist
>+++ b/lang/pocl/pkg-plist
>@@ -2,8 +2,7 @@ bin/poclcc
> etc/OpenCL/vendors/pocl.icd
> lib/libpocl.so
> lib/libpocl.so.2
>-lib/libpocl.so.2.8.0
>-lib/pocl/libllvmopencl.so
>+lib/libpocl.so.2.9.0
> lib/pocl/libpocl-devices-basic.so
> lib/pocl/libpocl-devices-pthread.so
> libdata/pkgconfig/pocl.pc
>diff --git a/security/clamav/files/clamav-clamd.in b/security/clamav/files/clamav-clamd.in
>index c6de79538080..e11cc893d8df 100644
>--- a/security/clamav/files/clamav-clamd.in
>+++ b/security/clamav/files/clamav-clamd.in
>@@ -37,6 +37,11 @@ reload_cmd="%%PREFIX%%/bin/clamdscan --reload"
> #clamav .93 won't start without a valid main.c[vl]d file
> clamav_clamd_precmd()
> {
>+	if [ ! -d "$( dirname $pidfile )" ]; then
>+		echo "Missing \"$( dirname $pidfile )\" - creating ..."
>+		install -d -o clamav -g clamav $( dirname $pidfile )
>+	fi
>+
> 	if [ ! -f %%DBDIR%%/main.cvd -a ! -f %%DBDIR%%/main.cld ];then
> 		echo "Missing %%DBDIR%%/*.cvd or *.cld files.  You must run freshclam first"
> 		exit 1
>diff --git a/textproc/refdb/Makefile b/textproc/refdb/Makefile
>index ab4e0dc2b9af..8267744f79e7 100644
>--- a/textproc/refdb/Makefile
>+++ b/textproc/refdb/Makefile
>@@ -1,87 +1,100 @@
>-# 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
> 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
>+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
> 
> .include <bsd.port.options.mk>
> 
> .if ${PORT_OPTIONS:MMYSQL}
>-USES+=		mysql
>+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
>+MYSQL_USES= mysql
>+MYSQL_CONFIGURE_WITH=   mysql
> .endif
>-CONFIGURE_ARGS+=	--with-db-server=mysql
> 
> .elif ${PORT_OPTIONS:MPGSQL}
>-USES+=	pgsql
>+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
>+PGSQL_USES= pgsql
>+PGSQL_CONFIGURE_WITH=   pgsql
> .endif
>-CONFIGURE_ARGS+=	--with-db-server=pgsql
> 
> .elif ${PORT_OPTIONS:MSQLITE}
>-LIB_DEPENDS+=	libsqlite3.so:databases/sqlite3
>+USES+= 	sqlite
> # 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
>+SQLITE3_USES=       sqlite
>+SQLITE3_CONFIGURE_WITH= sqlite3
> .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 +104,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 +133,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 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-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..53d86825d2b9
>--- /dev/null
>+++ b/textproc/refdb/files/patch-doc__Makefile.am
>@@ -0,0 +1,12 @@
>+--- doc/Makefile.am.orig	2013-12-05 02:09:56.000000000 +0100
>++++ doc/Makefile.am	2014-09-14 20:44:38.000000000 +0200
>+@@ -1,7 +1,7 @@
>+ ## 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)/
>+ index_DATA = index.html
>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..a90efcc2ee57
>--- /dev/null
>+++ b/textproc/refdb/files/patch-phpweb-index.php.in
>@@ -0,0 +1,13 @@
>+--- phpweb/index.php.in.orig	2014-09-03 09:11:03.813133477 +0200
>++++ phpweb/index.php.in	2014-09-03 09:22:31.877086743 +0200
>+@@ -504,8 +504,8 @@
>+      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..b49341c4823d 100644
>--- a/textproc/refdb/files/patch-scripts-refdb.in
>+++ b/textproc/refdb/files/patch-scripts-refdb.in
>@@ -1,5 +1,5 @@
>---- scripts/refdb.in.orig	Fri Aug 25 03:53:55 2006
>-+++ scripts/refdb.in	Tue Jan 30 11:25:47 2007
>+--- 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 @@
>  # true for BSD-UNIX and Unices derived thereof, as well as for the
>  # Slackware Linux distribution). This setting does not perform any black
>@@ -9,3 +9,4 @@
>  
>  # don't get interrupted
>  trap "" 1
>+
>diff --git a/textproc/refdb/files/patch-scripts-refdb_latex2utf8txt b/textproc/refdb/files/patch-scripts-refdb_latex2utf8txt
>new file mode 100644
>index 000000000000..c55613dc4cde
>--- /dev/null
>+++ b/textproc/refdb/files/patch-scripts-refdb_latex2utf8txt
>@@ -0,0 +1,69 @@
>+--- scripts/refdb_latex2utf8txt.orig	2014-09-07 11:30:26.000000000 +0200
>++++ scripts/refdb_latex2utf8txt	2014-09-07 14:19:53.000000000 +0200
>+@@ -26,8 +26,14 @@
>+     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 @@
>+     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 @@
>+     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 @@
>+     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..ace40f88d695 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 6f21f5818f0d..82d53548e7d0 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