Attachment #213532 for bug #245723

View | Details | Raw Unified | Return to bug 245723
Collapse All | Expand All




--- configure.orig	2012-05-14 20:40:27 UTC
+++ configure
@@ -3977,9 +3977,9 @@ fi
 	if test $ver_maj -lt 8; then
 		prog_version_ok="no"
 	fi
-	if test $ver_min -lt 4; then
-		prog_version_ok="no"
-	fi
+#	if test $ver_min -lt 4; then
+#		prog_version_ok="no"
+#	fi
 	if test $ver_rev -lt 0; then
 		prog_version_ok="no"
 	fi

Line 0 Link Here

(-)net/ntpsec/files/patch-wscript (+10 lines)
	1	--- wscript.orig 2019-11-18 00:23:32 UTC
	2	+++ wscript
	3	@@ -161,6 +161,7 @@ def configure(ctx):
	4	lines = ctx.cmd_and_log(cmd).split()[1].split(".")
	5	assert len(lines) == 3, "found %r lines, expected 3: %r" \
	6	% (len(lines), lines)
	7	+ lines[2] = '0'
	8	asciidocver_tuple = (int(lines[0]), int(lines[1]), int(lines[2]))
	9
	10	# Compare asciidoc version with the minimum required

Line 0 Link Here

(-)sysutils/nut-devel/files/patch-configure.ac (+11 lines)
	1	--- configure.ac.orig 2020-02-09 18:44:01 UTC
	2	+++ configure.ac
	3	@@ -818,7 +818,7 @@ dnl not fail if we have no tools to generate it (so ad
	4	AC_MSG_CHECKING([if we can build ${nut_doc_build_target_base}])
	5	can_build_doc_man=no
	6	if test "${nut_have_asciidoc}" = yes ; then
	7	- ( cd "$DOCTESTDIR" && ${A2X} --format manpage --destination-dir=. --xsltproc-opts "--nonet" "${abs_srcdir}"/docs/man/snmp-ups.txt && test -s snmp-ups.8 ) && can_build_doc_man=yes
	8	+ ( cd "$DOCTESTDIR" && ${A2X} --format manpage --destination-dir=. --xsltproc-opts="--nonet" "${abs_srcdir}"/docs/man/snmp-ups.txt && test -s snmp-ups.8 ) && can_build_doc_man=yes
	9	rm -f "${DOCTESTDIR}"/snmp-ups.8
	10	fi
	11	if test "${can_build_doc_man}" = yes ; then




--- docs/Makefile.am.orig	2020-02-09 18:44:01 UTC
+++ docs/Makefile.am
@@ -102,10 +102,10 @@ solaris-usb.html solaris-usb.chunked solaris-usb.pdf: 
 # variable ASCIIDOC_VERBOSE to "-v", ie:
 #   $ ASCIIDOC_VERBOSE=-v make
 A2X_COMMON_OPTS = $(ASCIIDOC_VERBOSE) --attribute icons \
-    --xsltproc-opts "--nonet" \
-    --xsltproc-opts "--stringparam nut.localdate \"`TZ=UTC date +%Y-%m-%d`\"" \
-    --xsltproc-opts "--stringparam nut.localtime \"`TZ=UTC date +%H:%M:%S`\"" \
-    --xsltproc-opts "--stringparam nut.nutversion \"@PACKAGE_VERSION@\"" \
+    --xsltproc-opts="--nonet" \
+    --xsltproc-opts="--stringparam nut.localdate \"`TZ=UTC date +%Y-%m-%d`\"" \
+    --xsltproc-opts="--stringparam nut.localtime \"`TZ=UTC date +%H:%M:%S`\"" \
+    --xsltproc-opts="--stringparam nut.nutversion \"@PACKAGE_VERSION@\"" \
     --attribute iconsdir=$(srcdir)/images \
     --attribute=badges \
     --attribute=external_title \

Line 0 Link Here

(-)sysutils/nut-devel/files/patch-docs_man_Makefile.am (+11 lines)
	1	--- docs/man/Makefile.am.orig 2020-02-09 18:44:01 UTC
	2	+++ docs/man/Makefile.am
	3	@@ -745,7 +745,7 @@ if HAVE_ASCIIDOC
	4	### Prior to Asciidoc ~8.6.8, the --destination-dir flag didn't seem to affect the location of the intermediate .xml file.
	5	### This parameter is currently required; see docs/Makefile.am for more detail.
	6	A2X_MANPAGE_OPTS = --doctype manpage --format manpage \
	7	- --xsltproc-opts "--nonet" \
	8	+ --xsltproc-opts="--nonet" \
	9	--attribute mansource="Network UPS Tools" \
	10	--attribute manversion="@PACKAGE_VERSION@" \
	11	--attribute manmanual="NUT Manual" \




# $FreeBSD$

PORTNAME=	asciidoc
DISTVERSION=	9.0.0rc2
PORTREVISION=	1
CATEGORIES=	textproc

MAINTAINER=	sunpoet@FreeBSD.org

BUILD_DEPENDS=	${RUN_DEPENDS}
RUN_DEPENDS=	docbook-xsl>=0:textproc/docbook-xsl

USES=		autoreconf gmake gnome python:3.5+ shebangfix
USE_GNOME=	libxml2 libxslt

GNU_CONFIGURE=	yes

NO_ARCH=	yes

USE_GITHUB=	yes
GH_PROJECT=	asciidoc-py3

SHEBANG_GLOB=	*.py
SHEBANG_LANG=	python2
python2_CMD=	${PYTHON_CMD}

post-patch:
	@${REINPLACE_CMD} -e '/^INSTALL_PROG/ s|INSTALL_PROGRAM|INSTALL_SCRIPT|; s|\.conf|&.sample|; s|python3 |${PYTHON_CMD} |' ${WRKSRC}/Makefile.in
	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/a2x.py
	@${FIND} ${WRKSRC} -name '*.conf' | ${XARGS} -I % ${LN} % %.sample


Lines 1-3 Link Here

(-)textproc/asciidoc/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1510440370	1	TIMESTAMP = 1587203997
2	SHA256 (asciidoc-asciidoc-8.6.10_GH0.tar.gz) = 9e52f8578d891beaef25730a92a6e723596ddbd07bfe0d2a56486fcf63a0b983	2	SHA256 (asciidoc-asciidoc-py3-9.0.0rc2_GH0.tar.gz) = ae4730dccaa9d5026e7d7f1bccc0cb28ebfc71e62f10151082e8a00d90708cbb
3	SIZE (asciidoc-asciidoc-8.6.10_GH0.tar.gz) = 577208	3	SIZE (asciidoc-asciidoc-py3-9.0.0rc2_GH0.tar.gz) = 1145229

Lines 1-6 Link Here

(-)textproc/asciidoc/files/patch-a2x.py (-2 / +2 lines)
1	--- a2x.py.orig 2018-01-13 22:10:35 UTC	1	--- a2x.py.orig 2020-03-12 00:31:53 UTC
2	+++ a2x.py	2	+++ a2x.py
3	@@ -498,7 +498,7 @@ class A2X(AttrDict):	3	@@ -514,7 +514,7 @@ class A2X(AttrDict):
4	self.asciidoc_opts += ' --doctype %s' % self.doctype	4	self.asciidoc_opts += ' --doctype %s' % self.doctype
5	for attr in self.attributes:	5	for attr in self.attributes:
6	self.asciidoc_opts += ' --attribute "%s"' % attr	6	self.asciidoc_opts += ' --attribute "%s"' % attr




%%ETCDIR%%/docbook-xsl/text.xsl
%%ETCDIR%%/docbook-xsl/xhtml.xsl
@sample %%ETCDIR%%/docbook45.conf.sample
@sample %%ETCDIR%%/docbook5.conf.sample
@sample %%ETCDIR%%/filters/code/code-filter.conf.sample
%%ETCDIR%%/filters/code/code-filter.py
@sample %%ETCDIR%%/filters/graphviz/graphviz-filter.conf.sample

@sample %%ETCDIR%%/filters/music/music-filter.conf.sample
%%ETCDIR%%/filters/music/music2png.py
@sample %%ETCDIR%%/filters/source/source-highlight-filter.conf.sample
%%ETCDIR%%/filters/unwraplatex.py
@sample %%ETCDIR%%/help.conf.sample
@sample %%ETCDIR%%/html4.conf.sample
@sample %%ETCDIR%%/html5.conf.sample

%%ETCDIR%%/javascripts/asciidoc.js
%%ETCDIR%%/javascripts/slidy.js
%%ETCDIR%%/javascripts/toc.js
@sample %%ETCDIR%%/lang-ca.conf.sample
@sample %%ETCDIR%%/lang-cs.conf.sample
@sample %%ETCDIR%%/lang-de.conf.sample
@sample %%ETCDIR%%/lang-el.conf.sample

@sample %%ETCDIR%%/lang-ru.conf.sample
@sample %%ETCDIR%%/lang-sv.conf.sample
@sample %%ETCDIR%%/lang-uk.conf.sample
@sample %%ETCDIR%%/lang-zh-CN.conf.sample
@sample %%ETCDIR%%/latex.conf.sample
@sample %%ETCDIR%%/slidy.conf.sample
%%ETCDIR%%/stylesheets/asciidoc.css

%%PYTHON_SITELIBDIR%%/asciidocapi.py
man/man1/a2x.1.gz
man/man1/asciidoc.1.gz
man/man1/testasciidoc.1.gz

Return to bug 245723

Line 0 Link Here

(-)devel/rsvndump/files/patch-configure (+15 lines)
	1	--- configure.orig 2012-05-14 20:40:27 UTC
	2	+++ configure
	3	@@ -3977,9 +3977,9 @@ fi
	4	if test $ver_maj -lt 8; then
	5	prog_version_ok="no"
	6	fi
	7	- if test $ver_min -lt 4; then
	8	- prog_version_ok="no"
	9	- fi
	10	+# if test $ver_min -lt 4; then
	11	+# prog_version_ok="no"
	12	+# fi
	13	if test $ver_rev -lt 0; then
	14	prog_version_ok="no"
	15	fi

Line 0 Link Here

(-)sysutils/nut-devel/files/patch-docs_Makefile.am (+17 lines)
	1	--- docs/Makefile.am.orig 2020-02-09 18:44:01 UTC
	2	+++ docs/Makefile.am
	3	@@ -102,10 +102,10 @@ solaris-usb.html solaris-usb.chunked solaris-usb.pdf:
	4	# variable ASCIIDOC_VERBOSE to "-v", ie:
	5	# $ ASCIIDOC_VERBOSE=-v make
	6	A2X_COMMON_OPTS = $(ASCIIDOC_VERBOSE) --attribute icons \
	7	- --xsltproc-opts "--nonet" \
	8	- --xsltproc-opts "--stringparam nut.localdate \"`TZ=UTC date +%Y-%m-%d`\"" \
	9	- --xsltproc-opts "--stringparam nut.localtime \"`TZ=UTC date +%H:%M:%S`\"" \
	10	- --xsltproc-opts "--stringparam nut.nutversion \"@PACKAGE_VERSION@\"" \
	11	+ --xsltproc-opts="--nonet" \
	12	+ --xsltproc-opts="--stringparam nut.localdate \"`TZ=UTC date +%Y-%m-%d`\"" \
	13	+ --xsltproc-opts="--stringparam nut.localtime \"`TZ=UTC date +%H:%M:%S`\"" \
	14	+ --xsltproc-opts="--stringparam nut.nutversion \"@PACKAGE_VERSION@\"" \
	15	--attribute iconsdir=$(srcdir)/images \
	16	--attribute=badges \
	17	--attribute=external_title \

Lines 2-9 Link Here

(-)textproc/asciidoc/Makefile (-6 / +4 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= asciidoc	4	PORTNAME= asciidoc
5	PORTVERSION= 8.6.10	5	DISTVERSION= 9.0.0rc2
6	PORTREVISION= 1
7	CATEGORIES= textproc	6	CATEGORIES= textproc
8		7
9	MAINTAINER= sunpoet@FreeBSD.org	8	MAINTAINER= sunpoet@FreeBSD.org
Lines 16-22 Link Here
16	BUILD_DEPENDS= ${RUN_DEPENDS}	15	BUILD_DEPENDS= ${RUN_DEPENDS}
17	RUN_DEPENDS= docbook-xsl>=0:textproc/docbook-xsl	16	RUN_DEPENDS= docbook-xsl>=0:textproc/docbook-xsl
18		17
19	USES= autoreconf gmake gnome python:2.7 shebangfix	18	USES= autoreconf gmake gnome python:3.5+ shebangfix
20	USE_GNOME= libxml2 libxslt	19	USE_GNOME= libxml2 libxslt
21		20
22	GNU_CONFIGURE= yes	21	GNU_CONFIGURE= yes
Lines 23-35 Link Here
23	NO_ARCH= yes	22	NO_ARCH= yes
24		23
25	USE_GITHUB= yes	24	USE_GITHUB= yes
		25	GH_PROJECT= asciidoc-py3
26		26
27	SHEBANG_GLOB= *.py	27	SHEBANG_GLOB= *.py
28	SHEBANG_LANG= python2
29	python2_CMD= ${PYTHON_CMD}
30		28
31	post-patch:	29	post-patch:
32	@${REINPLACE_CMD} -e '/^INSTALL_PROG/ s\|INSTALL_PROGRAM\|INSTALL_SCRIPT\|; s\|\.conf\|&.sample\|; s\|python\( a2x.py\)\|${PYTHON_CMD}\1\|' ${WRKSRC}/Makefile.in	30	@${REINPLACE_CMD} -e '/^INSTALL_PROG/ s\|INSTALL_PROGRAM\|INSTALL_SCRIPT\|; s\|\.conf\|&.sample\|; s\|python3 \|${PYTHON_CMD} \|' ${WRKSRC}/Makefile.in
33	@${REINPLACE_CMD} -e 's\|/usr/local\|${LOCALBASE}\|' ${WRKSRC}/a2x.py	31	@${REINPLACE_CMD} -e 's\|/usr/local\|${LOCALBASE}\|' ${WRKSRC}/a2x.py
34	@${FIND} ${WRKSRC} -name '*.conf' \| ${XARGS} -I % ${LN} % %.sample	32	@${FIND} ${WRKSRC} -name '*.conf' \| ${XARGS} -I % ${LN} % %.sample
35		33

Lines 14-19 Link Here

(-)textproc/asciidoc/pkg-plist (+5 lines)
14	%%ETCDIR%%/docbook-xsl/text.xsl	14	%%ETCDIR%%/docbook-xsl/text.xsl
15	%%ETCDIR%%/docbook-xsl/xhtml.xsl	15	%%ETCDIR%%/docbook-xsl/xhtml.xsl
16	@sample %%ETCDIR%%/docbook45.conf.sample	16	@sample %%ETCDIR%%/docbook45.conf.sample
		17	@sample %%ETCDIR%%/docbook5.conf.sample
17	@sample %%ETCDIR%%/filters/code/code-filter.conf.sample	18	@sample %%ETCDIR%%/filters/code/code-filter.conf.sample
18	%%ETCDIR%%/filters/code/code-filter.py	19	%%ETCDIR%%/filters/code/code-filter.py
19	@sample %%ETCDIR%%/filters/graphviz/graphviz-filter.conf.sample	20	@sample %%ETCDIR%%/filters/graphviz/graphviz-filter.conf.sample
Lines 23-28 Link Here
23	@sample %%ETCDIR%%/filters/music/music-filter.conf.sample	24	@sample %%ETCDIR%%/filters/music/music-filter.conf.sample
24	%%ETCDIR%%/filters/music/music2png.py	25	%%ETCDIR%%/filters/music/music2png.py
25	@sample %%ETCDIR%%/filters/source/source-highlight-filter.conf.sample	26	@sample %%ETCDIR%%/filters/source/source-highlight-filter.conf.sample
		27	%%ETCDIR%%/filters/unwraplatex.py
26	@sample %%ETCDIR%%/help.conf.sample	28	@sample %%ETCDIR%%/help.conf.sample
27	@sample %%ETCDIR%%/html4.conf.sample	29	@sample %%ETCDIR%%/html4.conf.sample
28	@sample %%ETCDIR%%/html5.conf.sample	30	@sample %%ETCDIR%%/html5.conf.sample
Lines 57-62 Link Here
57	%%ETCDIR%%/javascripts/asciidoc.js	59	%%ETCDIR%%/javascripts/asciidoc.js
58	%%ETCDIR%%/javascripts/slidy.js	60	%%ETCDIR%%/javascripts/slidy.js
59	%%ETCDIR%%/javascripts/toc.js	61	%%ETCDIR%%/javascripts/toc.js
		62	@sample %%ETCDIR%%/lang-ca.conf.sample
60	@sample %%ETCDIR%%/lang-cs.conf.sample	63	@sample %%ETCDIR%%/lang-cs.conf.sample
61	@sample %%ETCDIR%%/lang-de.conf.sample	64	@sample %%ETCDIR%%/lang-de.conf.sample
62	@sample %%ETCDIR%%/lang-el.conf.sample	65	@sample %%ETCDIR%%/lang-el.conf.sample
Lines 75-80 Link Here
75	@sample %%ETCDIR%%/lang-ru.conf.sample	78	@sample %%ETCDIR%%/lang-ru.conf.sample
76	@sample %%ETCDIR%%/lang-sv.conf.sample	79	@sample %%ETCDIR%%/lang-sv.conf.sample
77	@sample %%ETCDIR%%/lang-uk.conf.sample	80	@sample %%ETCDIR%%/lang-uk.conf.sample
		81	@sample %%ETCDIR%%/lang-zh-CN.conf.sample
78	@sample %%ETCDIR%%/latex.conf.sample	82	@sample %%ETCDIR%%/latex.conf.sample
79	@sample %%ETCDIR%%/slidy.conf.sample	83	@sample %%ETCDIR%%/slidy.conf.sample
80	%%ETCDIR%%/stylesheets/asciidoc.css	84	%%ETCDIR%%/stylesheets/asciidoc.css
Lines 91-93 Link Here
91	%%PYTHON_SITELIBDIR%%/asciidocapi.py	95	%%PYTHON_SITELIBDIR%%/asciidocapi.py
92	man/man1/a2x.1.gz	96	man/man1/a2x.1.gz
93	man/man1/asciidoc.1.gz	97	man/man1/asciidoc.1.gz
		98	man/man1/testasciidoc.1.gz