Attachment #235144 for bug #265105

View | Details | Raw Unified | Return to bug 265105 | Differences between

and this patch

Lines 1-5 Link Here

(-)b/devel/opencl/Makefile (-3 / +3 lines)
1	PORTNAME= opencl	1	PORTNAME= opencl
2	PORTVERSION= 3.0.8	2	PORTVERSION= 3.0.11
3	CATEGORIES= devel	3	CATEGORIES= devel
4		4
5	MAINTAINER= ohartmann@walstatt.org	5	MAINTAINER= ohartmann@walstatt.org
Lines 13-20 GH_PROJECT= OpenCL-Headers OpenCL-CLHPP:clhpp Link Here
13	GH_TAGNAME= ${HEADER_TAG} ${CLHPP_TAG}:clhpp	13	GH_TAGNAME= ${HEADER_TAG} ${CLHPP_TAG}:clhpp
14		14
15	# the header releases don't have tags yet, so use git commit for now	15	# the header releases don't have tags yet, so use git commit for now
16	HEADER_TAG= v2021.06.30	16	HEADER_TAG= v2022.05.18
17	CLHPP_TAG= v2.0.15 # include missing CL/opencl.hpp	17	CLHPP_TAG= v2022.05.18 # include missing CL/opencl.hpp
18		18
19	NO_BUILD= yes	19	NO_BUILD= yes
20	NO_ARCH= yes	20	NO_ARCH= yes

Lines 1-5 Link Here

(-)b/devel/opencl/distinfo (-5 / +5 lines)
1	TIMESTAMP = 1635006419	1	TIMESTAMP = 1656909792
2	SHA256 (KhronosGroup-OpenCL-Headers-3.0.8-v2021.06.30_GH0.tar.gz) = 6640d590c30d90f89351f5e3043ae6363feeb19ac5e64bc35f8cfa1a6cd5498e	2	SHA256 (KhronosGroup-OpenCL-Headers-3.0.11-v2022.05.18_GH0.tar.gz) = 88a1177853b279eaf574e2aafad26a84be1a6f615ab1b00c20d5af2ace95c42e
3	SIZE (KhronosGroup-OpenCL-Headers-3.0.8-v2021.06.30_GH0.tar.gz) = 59866	3	SIZE (KhronosGroup-OpenCL-Headers-3.0.11-v2022.05.18_GH0.tar.gz) = 64518
4	SHA256 (KhronosGroup-OpenCL-CLHPP-v2.0.15_GH0.tar.gz) = 0175806508abc699586fc9a9387e01eb37bf812ca534e3b493ff3091ec2a9246	4	SHA256 (KhronosGroup-OpenCL-CLHPP-v2022.05.18_GH0.tar.gz) = d29affd740c5037b4499790613f5af0718ffc88c325e793b73cb35b7592fc0f7
5	SIZE (KhronosGroup-OpenCL-CLHPP-v2.0.15_GH0.tar.gz) = 99826	5	SIZE (KhronosGroup-OpenCL-CLHPP-v2022.05.18_GH0.tar.gz) = 106799

Lines 1-5 Link Here

(-)b/lang/pocl/Makefile (-3 / +3 lines)
1	PORTNAME= pocl	1	PORTNAME= pocl
2	PORTVERSION= 1.8	2	PORTVERSION= 3.0
3	DISTVERSIONPREFIX=v	3	DISTVERSIONPREFIX=v
4	CATEGORIES= lang	4	CATEGORIES= lang
5		5
Lines 13-19 ONLY_FOR_ARCHS= aarch64 amd64 i386 powerpc64 powerpc64le Link Here
13	ONLY_FOR_ARCHS_REASON= only tested on ${ONLY_FOR_ARCHS:tW:S/ /, /g}	13	ONLY_FOR_ARCHS_REASON= only tested on ${ONLY_FOR_ARCHS:tW:S/ /, /g}
14		14
15	BUILD_DEPENDS= llvm${LLVM_VERSION}>=10:devel/llvm${LLVM_VERSION} \	15	BUILD_DEPENDS= llvm${LLVM_VERSION}>=10:devel/llvm${LLVM_VERSION} \
16	opencl>=2.2:devel/opencl	16	opencl>=3:devel/opencl
17	LIB_DEPENDS= libhwloc.so:devel/hwloc2 libOpenCL.so:devel/ocl-icd	17	LIB_DEPENDS= libhwloc.so:devel/hwloc2 libOpenCL.so:devel/ocl-icd
18	RUN_DEPENDS= ${BUILD_DEPENDS}	18	RUN_DEPENDS= ${BUILD_DEPENDS}
19		19
Lines 21-27 USES= cmake localbase:ldflags ncurses pkgconfig Link Here
21	USE_GITHUB= yes	21	USE_GITHUB= yes
22	USE_LDCONFIG= yes	22	USE_LDCONFIG= yes
23		23
24	LLVM_VERSION= ${MESA_LLVM_VER:U13}	24	LLVM_VERSION= ${MESA_LLVM_VER:U14}
25	CMAKE_ARGS= -DWITH_LLVM_CONFIG="${LOCALBASE}/llvm${LLVM_VERSION}/bin/llvm-config" \	25	CMAKE_ARGS= -DWITH_LLVM_CONFIG="${LOCALBASE}/llvm${LLVM_VERSION}/bin/llvm-config" \
26	-DPOCL_INSTALL_PKGCONFIG_DIR="${PREFIX}/libdata/pkgconfig" \	26	-DPOCL_INSTALL_PKGCONFIG_DIR="${PREFIX}/libdata/pkgconfig" \
27	-DSINGLE_LLVM_LIB=ON \	27	-DSINGLE_LLVM_LIB=ON \

Lines 1-3 Link Here

(-)b/lang/pocl/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1634367852	1	TIMESTAMP = 1656906684
2	SHA256 (pocl-pocl-v1.8_GH0.tar.gz) = 0f63377ae1826e16e90038fc8e7f65029be4ff6f9b059f6907174b5c0d1f8ab2	2	SHA256 (pocl-pocl-v3.0_GH0.tar.gz) = a3fd3889ef7854b90b8e4c7899c5de48b7494bf770e39fba5ad268a5cbcc719d
3	SIZE (pocl-pocl-v1.8_GH0.tar.gz) = 1614545	3	SIZE (pocl-pocl-v3.0_GH0.tar.gz) = 1722809




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
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,...).

The code base is modularized to allow easy adding of new "device drivers"
in the host-device layer. A generic multithreaded "target driver" is





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)

Lines 2-9 bin/poclcc Link Here

(-)b/lang/pocl/pkg-plist (-2 / +1 lines)
2	etc/OpenCL/vendors/pocl.icd	2	etc/OpenCL/vendors/pocl.icd
3	lib/libpocl.so	3	lib/libpocl.so
4	lib/libpocl.so.2	4	lib/libpocl.so.2
5	lib/libpocl.so.2.8.0	5	lib/libpocl.so.2.9.0
6	lib/pocl/libllvmopencl.so
7	lib/pocl/libpocl-devices-basic.so	6	lib/pocl/libpocl-devices-basic.so
8	lib/pocl/libpocl-devices-pthread.so	7	lib/pocl/libpocl-devices-pthread.so
9	libdata/pkgconfig/pocl.pc	8	libdata/pkgconfig/pocl.pc

Lines 37-42 reload_cmd="%%PREFIX%%/bin/clamdscan --reload" Link Here

(-)b/security/clamav/files/clamav-clamd.in (+5 lines)
37	#clamav .93 won't start without a valid main.c[vl]d file	37	#clamav .93 won't start without a valid main.c[vl]d file
38	clamav_clamd_precmd()	38	clamav_clamd_precmd()
39	{	39	{
		40	if [ ! -d "$( dirname $pidfile )" ]; then
		41	echo "Missing \"$( dirname $pidfile )\" - creating ..."
		42	install -d -o clamav -g clamav $( dirname $pidfile )
		43	fi
		44
40	if [ ! -f %%DBDIR%%/main.cvd -a ! -f %%DBDIR%%/main.cld ];then	45	if [ ! -f %%DBDIR%%/main.cvd -a ! -f %%DBDIR%%/main.cld ];then
41	echo "Missing %%DBDIR%%/.cvd or .cld files. You must run freshclam first"	46	echo "Missing %%DBDIR%%/.cvd or .cld files. You must run freshclam first"
42	exit 1	47	exit 1




PORTNAME=		refdb
PORTVERSION=	1.0.3
CATEGORIES=		textproc
MASTER_SITES=	https://sourceforge.net/projects/${PORTNAME}/files/latest/download/

MAINTAINER=		ohartmann@walstatt.org
COMMENT=		Bibliographic reference database
DISTVERSIONSUFFIX=	-1
PORTREVISION=	11
CATEGORIES=	textproc
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-src/${PORTNAME}-src-${PORTVERSION}-1

LICENSE=		GPLv2+
LICENSE_FILE=	${WRKSRC}/COPYING

BROKEN_FreeBSD_13=	ld: error: duplicate symbol: thecommandlist
BROKEN_FreeBSD_14=	ld: error: duplicate symbol: thecommandlist

LIB_DEPENDS=	libexpat.so:textproc/expat2 \
		libbtparse.so:textproc/btparse \
		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

HAS_CONFIGURE= 	yes
INSTALL_TARGET= install-strip
PORTDOCS=		*
PORTDOCS=	*

CFLAGS+=		-I${LOCALBASE}/include
LIBS+=			-lm

CONFIGURE_ARGS+=--with-expat-lib=${LOCALBASE}/lib \
				--with-classpath-root=${LOCALBASE}/share/java/classes
		--with-refdb-url=http://localhost/refdb
XMLCATMGR=	${LOCALBASE}/bin/xmlcatmgr

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=	docbook-xsl>=0:textproc/docbook-xsl
			docbook-xsl>=0:textproc/docbook-xsl

SHEBANG_FILES=		${WRKSRC}/scripts/*

USE_RC_SUBR= 		refdbd

.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
MYSQL_USES= mysql
MYSQL_CONFIGURE_WITH=   mysql
.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
PGSQL_USES= pgsql
PGSQL_CONFIGURE_WITH=   pgsql
.endif
CONFIGURE_ARGS+=	--with-db-server=pgsql

.elif ${PORT_OPTIONS:MSQLITE}
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

.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
.else
CONFIGURE_ARGS+=	--disable-docs
.endif

.endif

post-patch:
		${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
.endif
	@${ECHO_MSG} ""
	@${ECHO_MSG} "To complete RefDB installation:"
.if ${PORT_OPTIONS:MMYSQL}
	@${ECHO_MSG} ""

	@${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} ""

Lines 1-2 Link Here

(-)b/textproc/refdb/distinfo (-2 / +3 lines)
1	SHA256 (refdb-0.9.9-1.tar.gz) = 99f8146d646e97a32b248f7d5b530119066c2d108a8335f864816eadcfc3dec6	1	TIMESTAMP = 1644836370
2	SIZE (refdb-0.9.9-1.tar.gz) = 3209712	2	SHA256 (refdb-1.0.3.tar.gz) = bd13e788dc4ae7293a4220c0ba65330980fd123c3209b5b59f963ae85e6c26e5
		3	SIZE (refdb-1.0.3.tar.gz) = 3500489




--- 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




--- 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




--- 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";

Lines 1-5 Link Here

(-)b/textproc/refdb/files/patch-scripts-refdb.in (-2 / +3 lines)
1	--- scripts/refdb.in.orig Fri Aug 25 03:53:55 2006	1	--- scripts/refdb.in.orig Fri Aug 25 03:53:55 2006
2	+++ scripts/refdb.in Tue Jan 30 11:25:47 2007	2	+++ scripts/refdb.in Tue Jan 30 11:25:47 2007
3	@@ -44,7 +44,7 @@	3	@@ -44,7 +44,7 @@
4	# true for BSD-UNIX and Unices derived thereof, as well as for the	4	# true for BSD-UNIX and Unices derived thereof, as well as for the
5	# Slackware Linux distribution). This setting does not perform any black	5	# Slackware Linux distribution). This setting does not perform any black
Lines 9-11 Link Here
9		9
10	# don't get interrupted	10	# don't get interrupted
11	trap "" 1	11	trap "" 1
		12

Added Link Here

(-)b/textproc/refdb/files/patch-scripts-refdb_latex2utf8txt (+69 lines)
1	--- scripts/refdb_latex2utf8txt.orig 2014-09-07 11:30:26.000000000 +0200
2	+++ scripts/refdb_latex2utf8txt 2014-09-07 14:19:53.000000000 +0200
3	@@ -26,8 +26,14 @@
4	s/\{\\~A\}\|\\~A\|\\~\{A\}/Ã/g;
5	s/\{\\~a\}\|\\~a\|\\~\{a\}/ã/g;
6	s/\{\\"a\}\|\\"a/ä/g;
7	- s/\{\\v\{c\}\|\{\\v c\}\|\\v c/č/g;
8	+ s/\{\\aa\}\|\\a\{a\}\|\\aa/å/g;
9	+ s/\{\\aA\}\|\\a\{A\}\|\\aA/Å/g;
10	+ s/\{\\ae\}\|\\a\{e\}\|\\ae/æ/g;
11	+ s/\{\\AE\}\|\\A\{E\}\|\\AE/Æ/g;
12	+ s/\{\\v\{c\}\|\{\\v c\}\|\\vc\|\\v c/č/g;
13	+ s/\{\\vC\}\|\{\\v C\}\|\\v\{C\}\|\\v C/Č/g;
14	s/\{\\'\{c\}\|\{\\'c\}\|\\'c/ć/g;
15	+ s/\{\\'\{C\}\|\{\\'C\}\|\\'C/Ć/g;
16	s/\{\\'e\}\|\\'e/é/g;
17	s/\{\\'E\}\|\\'E/É/g;
18	s/\{\\`e\}\|\\`e/è/g;
19	@@ -36,12 +42,17 @@
20	s/\{\\^E\}\|\\^E/Ê/g;
21	s/\{\\~e\}\|\\~e\|\\~\{e\}/ẽ/g;
22	s/\{\\~E\}\|\\~E\|\\~\{E\}/Ẽ/g;
23	+ s/\{\\ve\}\|\\ve\|\\v\{e\}/ě/g;
24	s/\{\\'\\i\}\|\\'\\i/í/g;
25	s/\{\\'I\}\|\\'I/Í/g;
26	s/\{\\`\\i\}\|\\`\\i/ì/g;
27	s/\{\\`I\}\|\\`I/Ì/g;
28	s/\{\\^\\i\}\|\\^\\i/î/g;
29	s/\{\\^I\}\|\\^I/Î/g;
30	+ s/\{\\vj\}\|\\v\{j\}\|\\v j\|\\vj/ǰ/g;
31	+ s/\{\\vJ\}\|\\v\{J\}\|\\v J\|\\vJ/ǰ/g;
32	+ s/\{\\l\}\|\\l/ł/g;
33	+ s/\{\\L\}\|\\L/Ł/g;
34	s/\{\\'o\}\|\\'o/ó/g;
35	s/\{\\'O\}\|\\'O/Ó/g;
36	s/\{\\`o\}\|\\`o/ò/g;
37	@@ -50,10 +61,18 @@
38	s/\{\\"O\}\|\\"O/Ö/g;
39	s/\{\\~o\}\|\\~o\|\\~\{o\}/õ/g;
40	s/\{\\~O\}\|\\~O\|\\~\{O\}/Õ/g;
41	+ s/\{\\~n\}\|\\~n\|\\~\{n\}/ñ/g;
42	+ s/\{\\~N\}\|\\~N\|\\~\{N\}/Ñ/g;
43	s/\{\\^o\}\|\\^o/ô/g;
44	s/\{\\^O\}\|\\^O/Ô/g;
45	+ s/\{\o\}\|\\o/ø/g;
46	+ s/\{\O\}\|\\O/Ø/g;
47	+ s/\{\oe\}\|\\oe/œ/g;
48	+ s/\{\OE\}\|\\OE/Œ/g;
49	s/\{\\H o\}\|\\H o/ő/g;
50	s/\{\\H O\}\|\\H O/Ő/g;
51	+ s/\{\\vo\}\|\\v\{o\}\|\\v c/ǒ/g;
52	+ s/\{\\vO\}\|\\v\{O\}\|\\v O/Ǒ/g;
53	s/\{\\'u\}\|\\'u/ú/g;
54	s/\{\\'U\}\|\\'U/Ú/g;
55	s/\{\\`u\}\|\\`u/ù/g;
56	@@ -67,7 +86,12 @@
57	s/\{\\H u\}\|\\H u/ű/g;
58	s/\{\\H U\}\|\\H U/Ű/g;
59	s/\{\\ss\}\|\\ss \|\\"s/ß/g;
60	- s/\{\\v\{S\}\|\{\\v S\}/Š/g;
61	+ s/\{\\vS\}\|\\v\{S\}\|\\v S/Š/g;
62	+ s/\{\\vs\}\|\\v\{s\}\|\\v s/š/g;
63	+ s/\{\\'y\}\|\\'\{y\}\|\\'y/ý/g;
64	+ s/\{\\vZ\}\|\\v\{Z\}\|\\v Z/Ž/g;
65	+ s/\{\\vz\}\|\\v\{z\}\|\\v z/ž/g;
66	+ s/\{\\SS\}\|\\SS/ϟϟ/g;
67	s/\{\\[^ ]+//g;
68	s/([^\\])\{+/$1/g;
69	s/([^\\])\}+/$1/g;




#!/bin/sh

# O. Hartmann, 2014 - 2022
#
#
# PROVIDE: refdbd

# 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

		done
	fi

	piddir=$( dirname ${pidfile} )
	if [ ! -d "${piddir}" ] ; then
		install -d ${piddir}
	fi

	refdbd_pid_flags="-P ${pidfile}"
}

Lines 6-13 bin/en2ris Link Here

(-)b/textproc/refdb/pkg-plist (-28 / +61 lines)
6	bin/marc2ris	6	bin/marc2ris
7	bin/med2ris	7	bin/med2ris
8	bin/refdb-backup	8	bin/refdb-backup
		9	bin/refdb-bug
9	bin/refdb-init	10	bin/refdb-init
10	bin/refdb-ms	11	bin/refdb-ms
		12	bin/refdb-pubmed
11	bin/refdb-restore	13	bin/refdb-restore
12	bin/refdb-sruserver	14	bin/refdb-sruserver
13	bin/refdb_dos2unix	15	bin/refdb_dos2unix
Lines 19-28 bin/refdbd Link Here
19	bin/refdbib	21	bin/refdbib
20	bin/refdbjade	22	bin/refdbjade
21	bin/refdbnd	23	bin/refdbnd
		24	bin/refdbrtf
22	bin/refdbsru	25	bin/refdbsru
23	bin/refdbxml	26	bin/refdbxml
24	bin/refdbxp	27	bin/refdbxp
		28	bin/rtfcitations
25	bin/runbib	29	bin/runbib
		30	bin/runbib-missing
		31	etc/rc.d/refdbd
26	%%ETCDIR%%/bib2riscgirc.example	32	%%ETCDIR%%/bib2riscgirc.example
27	%%ETCDIR%%/bib2risrc.example	33	%%ETCDIR%%/bib2risrc.example
28	%%ETCDIR%%/db2risrc.example	34	%%ETCDIR%%/db2risrc.example
Lines 38-74 bin/runbib Link Here
38	%%ETCDIR%%/refdbdrc.sqlite3.example	44	%%ETCDIR%%/refdbdrc.sqlite3.example
39	%%ETCDIR%%/refdbibrc.example	45	%%ETCDIR%%/refdbibrc.example
40	%%ETCDIR%%/refdbjaderc.example	46	%%ETCDIR%%/refdbjaderc.example
		47	%%ETCDIR%%/refdbrtfrc.example
41	%%ETCDIR%%/refdbsrurc.example	48	%%ETCDIR%%/refdbsrurc.example
42	%%ETCDIR%%/refdbxmlrc.example	49	%%ETCDIR%%/refdbxmlrc.example
43	%%ETCDIR%%/runbibrc.example	50	%%ETCDIR%%/runbibrc.example
44	man/man1/bib2ris-utf8.1.gz	51	share/man/man1/bib2ris-utf8.1.gz
45	man/man1/bib2ris.1.gz	52	share/man/man1/bib2ris.1.gz
46	man/man1/db2ris.1.gz	53	share/man/man1/db2ris.1.gz
47	man/man1/eenc.1.gz	54	share/man/man1/eenc.1.gz
48	man/man1/en2ris.1.gz	55	share/man/man1/en2ris.1.gz
49	man/man1/marc2ris.1.gz	56	share/man/man1/marc2ris.1.gz
50	man/man1/med2ris.1.gz	57	share/man/man1/med2ris.1.gz
51	man/man1/refdb-backup.1.gz	58	share/man/man1/refdb-backup.1.gz
52	man/man1/refdb-bug.1.gz	59	share/man/man1/refdb-bug.1.gz
53	man/man1/refdb-ms.1.gz	60	share/man/man1/refdb-ms.1.gz
54	man/man1/refdb-restore.1.gz	61	share/man/man1/refdb-pubmed.1.gz
55	man/man1/refdb-sruserver.1.gz	62	share/man/man1/refdb-restore.1.gz
56	man/man1/refdb_dos2unix.1.gz	63	share/man/man1/refdb-sruserver.1.gz
57	man/man1/refdb_latex2utf8txt.1.gz	64	share/man/man1/refdb_dos2unix.1.gz
58	man/man1/refdba.1.gz	65	share/man/man1/refdb_latex2utf8txt.1.gz
59	man/man1/refdbc.1.gz	66	share/man/man1/refdba.1.gz
60	man/man1/refdbctl.1.gz	67	share/man/man1/refdbc.1.gz
61	man/man1/refdbd.1.gz	68	share/man/man1/refdbctl.1.gz
62	man/man1/refdbib.1.gz	69	share/man/man1/refdbd.1.gz
63	man/man1/refdbjade.1.gz	70	share/man/man1/refdbib.1.gz
64	man/man1/refdbnd.1.gz	71	share/man/man1/refdbjade.1.gz
65	man/man1/refdbsru.1.gz	72	share/man/man1/refdbnd.1.gz
66	man/man1/refdbxml.1.gz	73	share/man/man1/refdbrtf.1.gz
67	man/man1/refdbxp.1.gz	74	share/man/man1/refdbsru.1.gz
68	man/man1/runbib.1.gz	75	share/man/man1/refdbxml.1.gz
69	man/man8/refdb-init.8.gz	76	share/man/man1/refdbxp.1.gz
70	man/man8/refdb.8.gz	77	share/man/man1/rtfcitations.1.gz
71	man/man8/refdb.sh.8.gz	78	share/man/man1/runbib-missing.1.gz
		79	share/man/man1/runbib.1.gz
		80	share/man/man8/refdb-init.8.gz
		81	share/man/man8/refdb.8.gz
		82	share/man/man8/refdb.sh.8.gz
72	%%DATADIR%%/declarations/docbook.dcl	83	%%DATADIR%%/declarations/docbook.dcl
73	%%DATADIR%%/declarations/xml.dcl	84	%%DATADIR%%/declarations/xml.dcl
74	%%DATADIR%%/dsssl/bibdb2tei.dsl	85	%%DATADIR%%/dsssl/bibdb2tei.dsl
Lines 93-98 man/man8/refdb.sh.8.gz Link Here
93	%%DATADIR%%/dtd/xnote.dtd	104	%%DATADIR%%/dtd/xnote.dtd
94	%%DATADIR%%/dtd/xnote.rnc	105	%%DATADIR%%/dtd/xnote.rnc
95	%%DATADIR%%/dtd/xnote.rng	106	%%DATADIR%%/dtd/xnote.rng
		107	%%DATADIR%%/examples/Makefile.rtf.template
96	%%DATADIR%%/examples/Makefile.template	108	%%DATADIR%%/examples/Makefile.template
97	%%DATADIR%%/examples/dbtest.sgml	109	%%DATADIR%%/examples/dbtest.sgml
98	%%DATADIR%%/examples/dbtest.short.sgml	110	%%DATADIR%%/examples/dbtest.short.sgml
Lines 122-136 man/man8/refdb.sh.8.gz Link Here
122	%%DATADIR%%/sru/refdbsru.css	134	%%DATADIR%%/sru/refdbsru.css
123	%%DATADIR%%/sru/refdbsru.xsl	135	%%DATADIR%%/sru/refdbsru.xsl
124	%%DATADIR%%/sru/risx.xsl	136	%%DATADIR%%/sru/risx.xsl
		137	%%DATADIR%%/styles/AMA.xml
125	%%DATADIR%%/styles/APA.xml	138	%%DATADIR%%/styles/APA.xml
		139	%%DATADIR%%/styles/Anesth.Analg.xml
		140	%%DATADIR%%/styles/Ann.Biomed.Eng.xml
		141	%%DATADIR%%/styles/Ann.Thorac.Surg.xml
		142	%%DATADIR%%/styles/Artif.Organs.xml
		143	%%DATADIR%%/styles/Biochem.Biophys.Res.Commun.xml
		144	%%DATADIR%%/styles/Biochem.Pharmacol.xml
126	%%DATADIR%%/styles/Biomaterials.xml	145	%%DATADIR%%/styles/Biomaterials.xml
		146	%%DATADIR%%/styles/Br.J.Pharmacol.xml
		147	%%DATADIR%%/styles/CHA-MC.xml
		148	%%DATADIR%%/styles/Chicago.xml
		149	%%DATADIR%%/styles/Eur.J.Cardiothorac.Surg.xml
127	%%DATADIR%%/styles/Eur.J.Pharmacol.xml	150	%%DATADIR%%/styles/Eur.J.Pharmacol.xml
		151	%%DATADIR%%/styles/Harvard.xml
128	%%DATADIR%%/styles/J.Biol.Chem.xml	152	%%DATADIR%%/styles/J.Biol.Chem.xml
		153	%%DATADIR%%/styles/J.Pharmacol.Exp.Ther.xml
		154	%%DATADIR%%/styles/J.Tissue_Eng.Regen.Med.xml
		155	%%DATADIR%%/styles/J.Vasc.Res.xml
		156	%%DATADIR%%/styles/MLA.xml
129	%%DATADIR%%/styles/Murdoch.Law.xml	157	%%DATADIR%%/styles/Murdoch.Law.xml
		158	%%DATADIR%%/styles/Thromb.Haemost.xml
130	%%DATADIR%%/styles/Tissue_Eng.xml	159	%%DATADIR%%/styles/Tissue_Eng.xml
		160	%%DATADIR%%/styles/Turabian.xml
		161	%%DATADIR%%/styles/Z.Geburtsh.Neonatol.xml
		162	%%DATADIR%%/styles/authoryear-de.xml
131	%%DATADIR%%/styles/bibtex-abbrev.xml	163	%%DATADIR%%/styles/bibtex-abbrev.xml
132	%%DATADIR%%/styles/bibtex-full.xml	164	%%DATADIR%%/styles/bibtex-full.xml
133	%%DATADIR%%/styles/citekey.xml	165	%%DATADIR%%/styles/citekey.xml
		166	%%DATADIR%%/styles/ifmbe_proceedings.xml
134	%%DATADIR%%/styles/schemas.xml	167	%%DATADIR%%/styles/schemas.xml
135	%%DATADIR%%/www/css/main.css	168	%%DATADIR%%/www/css/main.css
136	%%DATADIR%%/www/css/navigationlist.css	169	%%DATADIR%%/www/css/navigationlist.css

Return to bug 265105

Lines 1-15 Link Here

(-)b/lang/pocl/pkg-descr (-5 / +9 lines)
1	Portable OpenCL aims to be an efficient open source (MIT-licensed)	1	Portable OpenCL (pocl)
2	implementation of the OpenCL 1.2 standard.	2	----------------------
		3
		4	Portable OpenCL (>= 3.0) aims to be an efficient open source
		5	(MIT-licensed) implementation of the OpenCL 2.X standard with
		6	adaptions of OpenCL 3.0.
3		7
4	In addition to producing an easily portable open source OpenCL	8	In addition to producing an easily portable open source OpenCL
5	implementation, another major goal of the project is improving	9	implementation, another major goal of the project is improving
6	performance portability of OpenCL programs with compiler	10	performance portability of OpenCL programs with compiler
7	optimizations, reducing the need for target-dependent manual	11	optimizations, reducing the need for target-dependent manual
8	optimizations. At the core of POCL is a set of LLVM passes used	12	optimizations. At the core of pocl is a set of LLVM passes
9	to statically parallelize multiple work-items with the kernel	13	used to statically parallelize multiple work-items with the kernel
10	compiler, even in the presence of work-group barriers. This enables	14	compiler, even in the presence of work-group barriers. This enables
11	parallelization of the fine-grained static concurrency in the work	15	parallelization of the fine-grained static concurrency in the work
12	groups in multiple ways (SIMD, VLIW, superscalar, ...).	16	groups in multiple ways (SIMD, VLIW, superscalar,...).
13		17
14	The code base is modularized to allow easy adding of new "device drivers"	18	The code base is modularized to allow easy adding of new "device drivers"
15	in the host-device layer. A generic multithreaded "target driver" is	19	in the host-device layer. A generic multithreaded "target driver" is

Added Link Here

(-)b/lang/pocl/pkg-message (+12 lines)
1
2	Deadlocks (freezes) on FreeBSD:
3
4	OpenCL applications using pocl on FreeBSD must be compiled with
5	options CFLAGS+=-pthread or CXXFLAGS+=-pthread, otherwise someone risk
6	that a library may not initialize the threading on BSD independently,
7	even if an ICD loader is used.
8
9	See:
10	http://www.freebsd.org/cgi/query-pr.cgi?pr=163512
11
12	(Source: http://portablecl.org/docs/html/faq.html?highlight=freebsd)

Lines 1-87 Link Here

(-)b/textproc/refdb/Makefile (-41 / +59 lines)
1	# Created by: paulh@logicsquad.net	1	PORTNAME= refdb
		2	PORTVERSION= 1.0.3
		3	CATEGORIES= textproc
		4	MASTER_SITES= https://sourceforge.net/projects/${PORTNAME}/files/latest/download/
2		5
3	PORTNAME= refdb	6	MAINTAINER= ohartmann@walstatt.org
4	PORTVERSION= 0.9.9	7	COMMENT= Bibliographic reference database
5	DISTVERSIONSUFFIX= -1
6	PORTREVISION= 11
7	CATEGORIES= textproc
8	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-src/${PORTNAME}-src-${PORTVERSION}-1
9		8
10	MAINTAINER= ohartman@zedat.fu-berlin.de	9	LICENSE= GPLv2+
11	COMMENT= Bibliographic reference database	10	LICENSE_FILE= ${WRKSRC}/COPYING
12
13	BROKEN_FreeBSD_13= ld: error: duplicate symbol: thecommandlist
14	BROKEN_FreeBSD_14= ld: error: duplicate symbol: thecommandlist
15		11
16	LIB_DEPENDS= libexpat.so:textproc/expat2 \	12	LIB_DEPENDS= libexpat.so:textproc/expat2 \
17	libbtparse.so:textproc/btparse \	13	libbtparse.so:textproc/btparse \
18	libdbi.so:databases/libdbi	14	libdbi.so:databases/libdbi \
		15	libltdl.so:devel/libltdl
		16
		17	RUN_DEPENDS= xsltproc:textproc/libxslt \
		18	fop:textproc/fop \
		19	p5-XML-Parser>0:textproc/p5-XML-Parser \
		20	p5-MARC-Record>0:textproc/p5-MARC-Record \
		21	p5-MARC-XML>0:textproc/p5-MARC-XML
		22
		23	BUILD_DEPENDS= svnversion:devel/subversion
		24
		25	USES= autoreconf gmake iconv php:web perl5 libtool pkgconfig pathfix readline shebangfix
19		26
20	USES= gmake iconv readline perl5 libtool pkgconfig pathfix shebangfix	27	HAS_CONFIGURE= yes
21	HAS_CONFIGURE= yes	28	INSTALL_TARGET= install-strip
22	INSTALL_TARGET= install-strip	29	PORTDOCS= *
23	PORTDOCS= *
24		30
25	CFLAGS+= -I${LOCALBASE}/include	31	CFLAGS+= -I${LOCALBASE}/include
26	LIBS+= -lm	32	LIBS+= -lm
27		33
28	CONFIGURE_ARGS= --with-expat-lib=${LOCALBASE}/lib \	34	CONFIGURE_ARGS+=--with-expat-lib=${LOCALBASE}/lib \
29	--with-classpath-root=${PREFIX}/share/java/classes \	35	--with-classpath-root=${LOCALBASE}/share/java/classes
30	--with-refdb-url=http://localhost/refdb
31	XMLCATMGR= ${LOCALBASE}/bin/xmlcatmgr
32		36
33	OPTIONS_DEFINE= DOCS CATALOG	37	XMLCATMGR= ${LOCALBASE}/bin/xmlcatmgr
		38
		39	OPTIONS_DEFINE= CATALOG
34	OPTIONS_SINGLE= DB	40	OPTIONS_SINGLE= DB
35	OPTIONS_SINGLE_DB= MYSQL PGSQL SQLITE	41	OPTIONS_SINGLE_DB= MYSQL PGSQL SQLITE
36	OPTIONS_EXCLUDE= CATALOG # may not be implemented correctly	42	OPTIONS_EXCLUDE= CATALOG # may not be implemented correctly
37	CATALOG_DESC= Install SGML catalog	43	CATALOG_DESC= Install SGML catalog
38		44
39	OPTIONS_DEFAULT= PGSQL	45	OPTIONS_DEFAULT= PGSQL
40	DOCS_BUILD_DEPENDS= xsltproc:textproc/libxslt \	46	DOCS_BUILD_DEPENDS= docbook-xsl>=0:textproc/docbook-xsl
41	docbook-xsl>=0:textproc/docbook-xsl
42		47
43	SHEBANG_FILES= ${WRKSRC}/scripts/*	48	SHEBANG_FILES= ${WRKSRC}/scripts/*
44		49
45	USE_RC_SUBR= refdbd	50	USE_RC_SUBR= refdbd
46		51
47	.include <bsd.port.options.mk>	52	.include <bsd.port.options.mk>
48		53
49	.if ${PORT_OPTIONS:MMYSQL}	54	.if ${PORT_OPTIONS:MMYSQL}
50	USES+= mysql	55	USES+= mysql
51	# If libdbi-drivers has been built without MySQL driver, abort	56	# If libdbi-drivers has been built without MySQL driver, abort
52	.if exists(${LOCALBASE}/lib/dbd) && !exists(${LOCALBASE}/lib/dbd/libdbdmysql.so)	57	.if exists(${LOCALBASE}/lib/dbd) && !exists(${LOCALBASE}/lib/dbd/libdbdmysql.so)
53	IGNORE= rebuild databases/libdbi-drivers with MySQL support	58	IGNORE= rebuild databases/libdbi-drivers with MySQL support
54	.elif !exists(${LOCALBASE}/lib/dbd)	59	.elif !exists(${LOCALBASE}/lib/dbd)
55	BUILD_DEPENDS+= ${LOCALBASE}/lib/dbd:databases/libdbi-drivers	60	BUILD_DEPENDS+= ${LOCALBASE}/lib/dbd:databases/libdbi-drivers
		61	MYSQL_USES= mysql
		62	MYSQL_CONFIGURE_WITH= mysql
56	.endif	63	.endif
57	CONFIGURE_ARGS+= --with-db-server=mysql
58		64
59	.elif ${PORT_OPTIONS:MPGSQL}	65	.elif ${PORT_OPTIONS:MPGSQL}
60	USES+= pgsql	66	USES+= pgsql
61	# If libdbi-drivers has been built without PostgreSQL driver, abort	67	# If libdbi-drivers has been built without PostgreSQL driver, abort
62	.if exists(${LOCALBASE}/lib/dbd) && !exists(${LOCALBASE}/lib/dbd/libdbdpgsql.so)	68	.if exists(${LOCALBASE}/lib/dbd) && !exists(${LOCALBASE}/lib/dbd/libdbdpgsql.so)
63	IGNORE= rebuild databases/libdbi-drivers with PostgreSQL support	69	IGNORE= rebuild databases/libdbi-drivers with PostgreSQL support
64	.elif !exists(${LOCALBASE}/lib/dbd)	70	.elif !exists(${LOCALBASE}/lib/dbd)
65	BUILD_DEPENDS+= ${LOCALBASE}/lib/dbd:databases/libdbi-drivers	71	BUILD_DEPENDS+= ${LOCALBASE}/lib/dbd:databases/libdbi-drivers
		72	PGSQL_USES= pgsql
		73	PGSQL_CONFIGURE_WITH= pgsql
66	.endif	74	.endif
67	CONFIGURE_ARGS+= --with-db-server=pgsql
68		75
69	.elif ${PORT_OPTIONS:MSQLITE}	76	.elif ${PORT_OPTIONS:MSQLITE}
70	LIB_DEPENDS+= libsqlite3.so:databases/sqlite3	77	USES+= sqlite
71	# If libdbi-drivers has been built without SQLite driver, abort	78	# If libdbi-drivers has been built without SQLite driver, abort
72	.if exists(${LOCALBASE}/lib/dbd) && !exists(${LOCALBASE}/lib/dbd/libdbdsqlite3.so)	79	.if exists(${LOCALBASE}/lib/dbd) && !exists(${LOCALBASE}/lib/dbd/libdbdsqlite3.so)
73	IGNORE= rebuild databases/libdbi-drivers with SQLite support	80	IGNORE= rebuild databases/libdbi-drivers with SQLite support
74	.elif !exists(${LOCALBASE}/lib/dbd)	81	.elif !exists(${LOCALBASE}/lib/dbd)
75	BUILD_DEPENDS+= ${LOCALBASE}/lib/dbd:databases/libdbi-drivers	82	BUILD_DEPENDS+= ${LOCALBASE}/lib/dbd:databases/libdbi-drivers
		83	SQLITE3_USES= sqlite
		84	SQLITE3_CONFIGURE_WITH= sqlite3
76	.endif	85	.endif
77	CONFIGURE_ARGS+= --with-db-server=sqlite	86
78	.endif	87	.endif
79		88
80	.if ${PORT_OPTIONS:MDOCS}	89	.if ${PORT_OPTIONS:MDOCS}
		90	BUILD_DEPENDS+= dtdparse:textproc/dtdparse
		91	USE_JAVA= YES
		92	JAVA_VERSION= 8+
		93	JAVA_BUILD= YES
81	CONFIGURE_ARGS+= --with-docbook-xsl=${PREFIX}/share/xsl/docbook \	94	CONFIGURE_ARGS+= --with-docbook-xsl=${PREFIX}/share/xsl/docbook \
82	--without-docbook-xsl-ns \	95	--without-docbook-xsl-ns \
83	--without-tei-xsl \	96	--without-tei-xsl \
84	--without-tei-xsl-ns	97	--without-tei-xsl-ns
85	.else	98	.else
86	CONFIGURE_ARGS+= --disable-docs	99	CONFIGURE_ARGS+= --disable-docs
87	.endif	100	.endif
Lines 91-104 RUN_DEPENDS+= xmlcatmgr:textproc/xmlcatmgr Link Here
91	.endif	104	.endif
92		105
93	post-patch:	106	post-patch:
94	${REINPLACE_CMD} -e 's\|$$(PACKAGE)-$$(VERSION)\|refdb\|g' \	107	${REINPLACE_CMD} -e 's\|$$(PACKAGE)-$$(VERSION)\|refdb\|g' \
95	${WRKSRC}/doc/Makefile.in	108	${WRKSRC}/doc/Makefile.am
96		109
97	post-install:	110	post-install:
98	.if ${PORT_OPTIONS:MCATALOG}	111	.if ${PORT_OPTIONS:MCATALOG}
99	@[ -f ${STAGEDIR}${PREFIX}/share/sgml/catalog.ports ] \|\| ${TOUCH} ${STAGEDIR}${PREFIX}/share/sgml/catalog.ports	112	@[ -f ${STAGEDIR}${PREFIX}/share/sgml/catalog.ports ] \|\| ${TOUCH} ${STAGEDIR}${PREFIX}/share/sgml/catalog.ports
100	@${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	113	@${XMLCATMGR} -s -c ${STAGEDIR}${PREFIX}/share/sgml/catalog.ports lookup "${STAGEDIR}${PREFIX}/share/refdb/refdb.cat" > /dev/null \|\| \
		114	${XMLCATMGR} -s -c ${STAGEDIR}${PREFIX}/share/sgml/catalog.ports add CATALOG "${STAGEDIR}${PREFIX}/share/refdb/refdb.cat" -- > /dev/null
101	.endif	115	.endif
		116	@${ECHO_MSG} ""
102	@${ECHO_MSG} "To complete RefDB installation:"	117	@${ECHO_MSG} "To complete RefDB installation:"
103	.if ${PORT_OPTIONS:MMYSQL}	118	.if ${PORT_OPTIONS:MMYSQL}
104	@${ECHO_MSG} ""	119	@${ECHO_MSG} ""
Lines 118-123 post-install: Link Here
118	@${ECHO_MSG} ""	133	@${ECHO_MSG} ""
119	@${ECHO_MSG} "1. To initialise PostgreSQL, run the following commands:"	134	@${ECHO_MSG} "1. To initialise PostgreSQL, run the following commands:"
120	@${ECHO_MSG} ""	135	@${ECHO_MSG} ""
		136	@${ECHO_MSG} " createdb -U postgres -E UNICODE refdb"
		137	@${ECHO_MSG} " psql -U postgres refdb < ${PREFIX}/share/refdb/sql/refdb.dump.pgsql"
		138	@${ECHO_MSG} " or, on older PostgreSQL installations,"
121	@${ECHO_MSG} " createdb -U pgsql -E UNICODE refdb"	139	@${ECHO_MSG} " createdb -U pgsql -E UNICODE refdb"
122	@${ECHO_MSG} " psql -U pgsql refdb < ${PREFIX}/share/refdb/sql/refdb.dump.pgsql"	140	@${ECHO_MSG} " psql -U pgsql refdb < ${PREFIX}/share/refdb/sql/refdb.dump.pgsql"
123	@${ECHO_MSG} ""	141	@${ECHO_MSG} ""

Removed Link Here

(-)a/textproc/refdb/files/patch-doc_Makefile.in (-33 lines)
1	--- doc/Makefile.in.orig 2014-09-10 12:40:48 UTC
2	+++ doc/Makefile.in
3	@@ -227,8 +227,8 @@ tei_xsl_ns = @tei_xsl_ns@
4	trang_cmd = @trang_cmd@
5	var_dir = @var_dir@
6	xml_decl = @xml_decl@
7	-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/refdb-manual
8	-doc_DATA = refdb-manual.pdf refdb-manual/*
9	+docdir = $(datadir)/doc/refdb
10	+doc_DATA = refdb-manual/*
11	indexdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/
12	index_DATA = index.html
13	citestylexdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/citestylex
14	@@ -779,7 +779,7 @@ uninstall-am: uninstall-citationlistxDAT
15	uninstall-xnoteelementsDATA
16
17
18	-all: refdb-manual.pdf refdb-manual/* citestylex/elements.html risx/elements.html citationlistx/elements.html xnote/elements.html
19	+all: refdb-manual-html citestylex/elements.html risx/elements.html citationlistx/elements.html xnote/elements.html
20
21	####################################################################
22	# building the manual
23	@@ -804,9 +804,8 @@ refdb-manual.pdf: $(manual_sources) $(ma
24	# we have to give Java a little extra memory lest fop will die a horrible death
25	JAVA_OPTS=-Xmx256M fop -fo refdb-manual.fo -pdf refdb-manual.pdf
26
27	-refdb-manual/*: $(manual_sources) $(manpage_sources) $(png_images) refdb-manual-statustable.xml include/manual-xhtml.xsl
28	+refdb-manual-html: $(manual_sources) $(manpage_sources) $(png_images) refdb-manual-statustable.xml include/manual-xhtml.xsl
29	@echo "Creating HTML manual...";
30	- rm -rf refdb-manual/*
31	# building outside the source dir won't work here because the docbook
32	# stylesheets screw up the location of the image files for HTML output
33	mkdir -p refdb-manual && cp $(html_extra_files) refdb-manual/ && xsltproc -o refdb-manual/ --nonet --xinclude include/manual-xhtml.xsl refdb-manual.xml

Added Link Here

(-)b/textproc/refdb/files/patch-doc__Makefile.am (+12 lines)
1	--- doc/Makefile.am.orig 2013-12-05 02:09:56.000000000 +0100
2	+++ doc/Makefile.am 2014-09-14 20:44:38.000000000 +0200
3	@@ -1,7 +1,7 @@
4	## Process this with automake to create Makefile.in
5
6	-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/refdb-manual
7	-doc_DATA = refdb-manual.pdf refdb-manual/*
8	+docdir = $(datadir)/doc/refdb
9	+doc_DATA = refdb-manual/*
10
11	indexdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/
12	index_DATA = index.html

Added Link Here

(-)b/textproc/refdb/files/patch-phpweb-index.php.in (+13 lines)
1	--- phpweb/index.php.in.orig 2014-09-03 09:11:03.813133477 +0200
2	+++ phpweb/index.php.in 2014-09-03 09:22:31.877086743 +0200
3	@@ -504,8 +504,8 @@
4	echo "<div class=\"warning\"><p><strong class=\"warning\">" . $warning . "</strong></p></div>\n";
5	unset($warning);
6	}
7	- echo " <p>Username:<br/><input type=\"text\" name=\"name\" size=\"16\" maxlength=\"16\"/></p>\n";
8	- echo " <p>Password:<br/><input type=\"password\" name=\"passwd\" size=\"16\" maxlength=\"16\"/></p>\n";
9	+ echo " <p>Username (max 16):<br/><input type=\"text\" name=\"name\" size=\"16\" maxlength=\"16\"/></p>\n";
10	+ echo " <p>Password (max. 128):<br/><input type=\"password\" name=\"passwd\" size=\"16\" maxlength=\"128\"/></p>\n";
11	echo " <p>Remember me on this computer <input type=\"checkbox\" name=\"rememberMe\" value=\"rememberMe\"/></p>\n";
12	echo " <p><input id=\"loginbutton\" type=\"submit\" name=\"sendQuery\" value=\"Login\"/></p>\n";
13	echo " </form>\n";

Lines 1-6 Link Here

(-)b/textproc/refdb/files/refdbd.in (-8 / +8 lines)
1	#!/bin/sh	1	#!/bin/sh
2		2
3	# O. Hartmann, Berlin, 2014	3	# O. Hartmann, 2014 - 2022
4	#	4	#
5	#	5	#
6	# PROVIDE: refdbd	6	# PROVIDE: refdbd
Lines 29-44 rcvar=refdbd_enable Link Here
29	# read settings, set defaults	29	# read settings, set defaults
30	load_rc_config ${name}	30	load_rc_config ${name}
31		31
		32	: ${refdbd_enable:="NO"}
		33	: ${refdbd_local:="NO"}
		34
32	command="%%PREFIX%%/bin/${name}"	35	command="%%PREFIX%%/bin/${name}"
33	globalconfig="%%PREFIX%%/etc/refdb/refdbdrc"	36	globalconfig="%%PREFIX%%/etc/refdb/refdbdrc"
34	pidfile="/var/run/${name}.pid"	37	pidfile="/var/run/${name}.pid"
35	extra_commands="reload"	38	extra_commands="reload"
36		39
37	load_rc_config ${name}
38
39	: ${refdbd_enable:="NO"}
40	: ${refdbd_local:="NO"}
41
42	if checkyesno refdbd_local; then	40	if checkyesno refdbd_local; then
43	refdbd_local_flags="-I"	41	refdbd_local_flags="-I"
44	else	42	else
Lines 70-77 refdbd_prestart() Link Here
70	done	68	done
71	fi	69	fi
72		70
73	piddir=`dirname ${pidfile}`	71	piddir=$( dirname ${pidfile} )
74	mkdir -p ${piddir}	72	if [ ! -d "${piddir}" ] ; then
		73	install -d ${piddir}
		74	fi
75		75
76	refdbd_pid_flags="-P ${pidfile}"	76	refdbd_pid_flags="-P ${pidfile}"
77	}	77	}