Attachment #102305 for bug #142081

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




#

PORTNAME=	asciidoc
PORTVERSION=	8.5.2
PORTREVISION=	1
CATEGORIES=	textproc
MASTER_SITES=	http://www.methods.co.nz/asciidoc/ \

# highlighing mode which is currently disabled by being patched away in
# Makefile.in

pre-patch:
	@${REINPLACE_CMD} -e "s|/bin/bash|${LOCALBASE}/bin/bash|g" \
		${WRKSRC}/a2x ${WRKSRC}/asciidoc.py

post-patch:
	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${LOCALBASE}|g" \
		${WRKSRC}/a2x

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)/usr/ports/textproc/asciidoc/distinfo (-3 / +3 lines)
1	MD5 (asciidoc-8.4.5.tar.gz) = 9f21d6e352b3ab668f9def3eb7497da2	1	MD5 (asciidoc-8.5.2.tar.gz) = 3ed69184645b233b83a52f8a722d1461
2	SHA256 (asciidoc-8.4.5.tar.gz) = e7e4df8fd984520ee692bb639679d51f5be279ef96dc23efd229e2bc100152db	2	SHA256 (asciidoc-8.5.2.tar.gz) = 357bb224f18c65d9755f2359318c5b6aeda07a93764e3f35cad2478d597769f3
3	SIZE (asciidoc-8.4.5.tar.gz) = 1189280	3	SIZE (asciidoc-8.5.2.tar.gz) = 1256406




--- a2x.orig	2009-07-23 18:51:01.485493322 +0200
+++ a2x	2009-07-23 18:52:01.107211768 +0200
@@ -9,11 +9,12 @@
 
 VERSION=1.0.0
 BASENAME=$(basename "$0")
+GETOPT=%%PREFIX%%/bin/getopt
 REALNAME="$0"
 if [ ! -e "$REALNAME" ]; then
     REALNAME=$(which "$REALNAME")
 fi
-REALNAME="$(readlink -f "$REALNAME")"
+REALNAME="$(/bin/realpath "$REALNAME")"
 CONF_DIR=/etc/asciidoc
 # FOP executable is named fop on some systems.
 FOP_COMMAND="fop.sh"
@@ -244,14 +245,14 @@
     if [ -z "$*" ]; then
         help; exit 0
     fi
-    require "getopt"
-    getopt -T >/dev/null
+    require "$GETOPT"
+    $GETOPT -T >/dev/null
     if [ $? -ne 4 ]; then
         quit "enhanced getopt(1) required"
     fi
     short_opts="a:d:D:f:hLnsv"
     long_opts="attribute:,asciidoc-opts:,destination-dir:,doctype:,help,icons-dir:,dry-run,format:,copy,icons,skip-asciidoc,stylesheet:,unsafe,version,verbose,xsltproc-opts:,dblatex-opts:,fop,fop-opts:,no-xmllint"
-    args=$(getopt -o $short_opts -l $long_opts -n $BASENAME -- "$@" 2>/dev/null)
+    args=$($GETOPT -o $short_opts -l $long_opts -n $BASENAME -- "$@" 2>/dev/null)
     if [ $? -ne 0 ]; then
         quit "invalid command options, run: a2x --help"
     fi
@@ -494,7 +495,7 @@
         quit "file not found: $xsl"
     fi
     to_docbook
-    xml=$(readlink -f "$SRC_DIR/$SRC_NAME.xml")
+    xml=$(/bin/realpath "$SRC_DIR/$SRC_NAME.xml")
     html="$SRC_NAME.html"
     copy_stylesheet_and_icons "$DESTINATION_DIR"
     execute_command_2 "cd \"$DESTINATION_DIR\""
@@ -527,7 +528,7 @@
         quit "file not found: $xsl"
     fi
     to_docbook
-    xml=$(readlink -f "$SRC_DIR/$SRC_NAME.xml")
+    xml=$(/bin/realpath "$SRC_DIR/$SRC_NAME.xml")
     if [ ! -d "$chunkdir" ]; then
         execute_command_2 "mkdir \"$chunkdir\""
     fi
@@ -549,7 +550,7 @@
         quit "file not found: $xsl"
     fi
     to_docbook "-d manpage"
-    xml=$(readlink -f "$SRC_DIR/$SRC_NAME.xml")
+    xml=$(/bin/realpath "$SRC_DIR/$SRC_NAME.xml")
     execute_command_2 "cd \"$DESTINATION_DIR\""
     execute_command_2 "xsltproc $XSLTPROC_OPTS --nonet \
         \"$xsl\" \"$xml\""

Lines 1-4 Link Here

(-)/usr/ports/textproc/asciidoc/pkg-plist (+5 lines)
1	bin/a2x	1	bin/a2x
		2	bin/a2x.py
2	bin/asciidoc	3	bin/asciidoc
3	bin/asciidoc.py	4	bin/asciidoc.py
4	etc/asciidoc/asciidoc.conf	5	etc/asciidoc/asciidoc.conf
Lines 6-11 Link Here
6	etc/asciidoc/dblatex/asciidoc-dblatex.xsl	7	etc/asciidoc/dblatex/asciidoc-dblatex.xsl
7	etc/asciidoc/docbook-xsl/chunked.xsl	8	etc/asciidoc/docbook-xsl/chunked.xsl
8	etc/asciidoc/docbook-xsl/common.xsl	9	etc/asciidoc/docbook-xsl/common.xsl
		10	etc/asciidoc/docbook-xsl/epub.xsl
9	etc/asciidoc/docbook-xsl/fo.xsl	11	etc/asciidoc/docbook-xsl/fo.xsl
10	etc/asciidoc/docbook-xsl/htmlhelp.xsl	12	etc/asciidoc/docbook-xsl/htmlhelp.xsl
11	etc/asciidoc/docbook-xsl/manpage.xsl	13	etc/asciidoc/docbook-xsl/manpage.xsl
Lines 49-60 Link Here
49	etc/asciidoc/images/icons/warning.png	51	etc/asciidoc/images/icons/warning.png
50	etc/asciidoc/javascripts/ASCIIMathML.js	52	etc/asciidoc/javascripts/ASCIIMathML.js
51	etc/asciidoc/javascripts/LaTeXMathML.js	53	etc/asciidoc/javascripts/LaTeXMathML.js
		54	etc/asciidoc/javascripts/asciidoc-xhtml11.js
52	etc/asciidoc/javascripts/toc.js	55	etc/asciidoc/javascripts/toc.js
53	etc/asciidoc/lang-de.conf	56	etc/asciidoc/lang-de.conf
54	etc/asciidoc/lang-en.conf	57	etc/asciidoc/lang-en.conf
55	etc/asciidoc/lang-es.conf	58	etc/asciidoc/lang-es.conf
56	etc/asciidoc/lang-fr.conf	59	etc/asciidoc/lang-fr.conf
57	etc/asciidoc/lang-hu.conf	60	etc/asciidoc/lang-hu.conf
		61	etc/asciidoc/lang-it.conf
		62	etc/asciidoc/lang-pt-BR.conf
58	etc/asciidoc/lang-ru.conf	63	etc/asciidoc/lang-ru.conf
59	etc/asciidoc/latex.conf	64	etc/asciidoc/latex.conf
60	etc/asciidoc/stylesheets/docbook-xsl.css	65	etc/asciidoc/stylesheets/docbook-xsl.css

Return to bug 142081

Lines 6-12 Link Here

(-)/usr/ports/textproc/asciidoc/Makefile (-9 / +1 lines)
6	#	6	#
7		7
8	PORTNAME= asciidoc	8	PORTNAME= asciidoc
9	PORTVERSION= 8.4.5	9	PORTVERSION= 8.5.2
10	PORTREVISION= 1	10	PORTREVISION= 1
11	CATEGORIES= textproc	11	CATEGORIES= textproc
12	MASTER_SITES= http://www.methods.co.nz/asciidoc/ \	12	MASTER_SITES= http://www.methods.co.nz/asciidoc/ \
Lines 30-41 Link Here
30	# highlighing mode which is currently disabled by being patched away in	30	# highlighing mode which is currently disabled by being patched away in
31	# Makefile.in	31	# Makefile.in
32		32
33	pre-patch:
34	@${REINPLACE_CMD} -e "s\|/bin/bash\|${LOCALBASE}/bin/bash\|g" \
35	${WRKSRC}/a2x ${WRKSRC}/asciidoc.py
36
37	post-patch:
38	@${REINPLACE_CMD} -e "s\|%%PREFIX%%\|${LOCALBASE}\|g" \
39	${WRKSRC}/a2x
40
41	.include <bsd.port.mk>	33	.include <bsd.port.mk>

Lines 1-61 Link Here

(-)/usr/ports/textproc/asciidoc/files/patch-a2x (-61 lines)
1	--- a2x.orig 2009-07-23 18:51:01.485493322 +0200
2	+++ a2x 2009-07-23 18:52:01.107211768 +0200
3	@@ -9,11 +9,12 @@
4
5	VERSION=1.0.0
6	BASENAME=$(basename "$0")
7	+GETOPT=%%PREFIX%%/bin/getopt
8	REALNAME="$0"
9	if [ ! -e "$REALNAME" ]; then
10	REALNAME=$(which "$REALNAME")
11	fi
12	-REALNAME="$(readlink -f "$REALNAME")"
13	+REALNAME="$(/bin/realpath "$REALNAME")"
14	CONF_DIR=/etc/asciidoc
15	# FOP executable is named fop on some systems.
16	FOP_COMMAND="fop.sh"
17	@@ -244,14 +245,14 @@
18	if [ -z "$*" ]; then
19	help; exit 0
20	fi
21	- require "getopt"
22	- getopt -T >/dev/null
23	+ require "$GETOPT"
24	+ $GETOPT -T >/dev/null
25	if [ $? -ne 4 ]; then
26	quit "enhanced getopt(1) required"
27	fi
28	short_opts="a:d:D:f:hLnsv"
29	long_opts="attribute:,asciidoc-opts:,destination-dir:,doctype:,help,icons-dir:,dry-run,format:,copy,icons,skip-asciidoc,stylesheet:,unsafe,version,verbose,xsltproc-opts:,dblatex-opts:,fop,fop-opts:,no-xmllint"
30	- args=$(getopt -o $short_opts -l $long_opts -n $BASENAME -- "$@" 2>/dev/null)
31	+ args=$($GETOPT -o $short_opts -l $long_opts -n $BASENAME -- "$@" 2>/dev/null)
32	if [ $? -ne 0 ]; then
33	quit "invalid command options, run: a2x --help"
34	fi
35	@@ -494,7 +495,7 @@
36	quit "file not found: $xsl"
37	fi
38	to_docbook
39	- xml=$(readlink -f "$SRC_DIR/$SRC_NAME.xml")
40	+ xml=$(/bin/realpath "$SRC_DIR/$SRC_NAME.xml")
41	html="$SRC_NAME.html"
42	copy_stylesheet_and_icons "$DESTINATION_DIR"
43	execute_command_2 "cd \"$DESTINATION_DIR\""
44	@@ -527,7 +528,7 @@
45	quit "file not found: $xsl"
46	fi
47	to_docbook
48	- xml=$(readlink -f "$SRC_DIR/$SRC_NAME.xml")
49	+ xml=$(/bin/realpath "$SRC_DIR/$SRC_NAME.xml")
50	if [ ! -d "$chunkdir" ]; then
51	execute_command_2 "mkdir \"$chunkdir\""
52	fi
53	@@ -549,7 +550,7 @@
54	quit "file not found: $xsl"
55	fi
56	to_docbook "-d manpage"
57	- xml=$(readlink -f "$SRC_DIR/$SRC_NAME.xml")
58	+ xml=$(/bin/realpath "$SRC_DIR/$SRC_NAME.xml")
59	execute_command_2 "cd \"$DESTINATION_DIR\""
60	execute_command_2 "xsltproc $XSLTPROC_OPTS --nonet \
61	\"$xsl\" \"$xml\""