Attachment #92832 for bug #130589




#

PORTNAME=	asciidoc
PORTVERSION=	8.3.3
CATEGORIES=	textproc
MASTER_SITES=	http://www.methods.co.nz/asciidoc/ \
		SF

MAINTAINER=	peter.schuller@infidyne.com
COMMENT=	A text document format for writing short documents and man pages

RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash

USE_PYTHON=	2.4+
USE_GMAKE=	yes

GNU_CONFIGURE=	yes
MAN1=		a2x.1 asciidoc.1

# a future improvement to this port is to also install the vim syntax
# highlighing mode which is currently disabled by being patched away in
# Makefile.in

pre-patch:
	@${REINPLACE_CMD} \
		-e "s|/bin/bash|${PREFIX}/bin/bash|g" \
		-e "s|/etc/asciidoc|${PREFIX}/etc/asciidoc|g" \
		${WRKSRC}/a2x
	@${REINPLACE_CMD} \
		-e "s|/etc/asciidoc|${PREFIX}/etc/asciidoc|g" \
		-e "s|/usr/bin/env python|${PREFIX}/bin/python|g" \
		${WRKSRC}/asciidoc.py
	@${REINPLACE_CMD} \
		-e "s|/usr/bin/env python|${PREFIX}/bin/python|g" \
		${WRKSRC}/filters/music/music2png.py
	@${REINPLACE_CMD} \
		-e "s|/usr/bin/env python|${PREFIX}/bin/python|g" \
		${WRKSRC}/filters/graphviz/graphviz2png.py
	@${REINPLACE_CMD} \
		-e "s|/usr/bin/env python|${PREFIX}/bin/python|g" \
		${WRKSRC}/filters/code/code-filter.py

post-patch:
	${REINPLACE_CMD} \
		-e "s|%%INSTALL%%|${INSTALL}|g" \
		${WRKSRC}/Makefile.in
	${REINPLACE_CMD} \
		-e "s|%%INSTALL_SCRIPT%%|${INSTALL_SCRIPT}|g" \
		${WRKSRC}/Makefile.in
	${REINPLACE_CMD} \
		-e "s|%%INSTALL_DATA%%|${INSTALL_DATA}|g" \
		${WRKSRC}/Makefile.in
	${MKDIR} ${PREFIX}/etc/asciidoc/filters
	${INSTALL_DATA} ${WRKSRC}/filters/code-filter.conf \
		${PREFIX}/etc/asciidoc/filters
	${INSTALL_SCRIPT} ${WRKSRC}/filters/code-filter.py \
		${PREFIX}/etc/asciidoc/filters
	${MKDIR} ${PREFIX}/etc/asciidoc/dblatex
	${INSTALL_DATA} ${WRKSRC}/dblatex/*.xsl \
		${PREFIX}/etc/asciidoc/dblatex
	${INSTALL_DATA} ${WRKSRC}/dblatex/*.sty \
		${PREFIX}/etc/asciidoc/dblatex
	${MKDIR} ${PREFIX}/etc/asciidoc/docbook-xsl
	${INSTALL_DATA} ${WRKSRC}/docbook-xsl/*.xsl \
		${PREFIX}/etc/asciidoc/docbook-xsl
	${MKDIR} ${PREFIX}/etc/asciidoc/javascripts
	${INSTALL_DATA} ${WRKSRC}/javascripts/*.js \
		${PREFIX}/etc/asciidoc/javascripts
	${MKDIR} ${PREFIX}/etc/asciidoc/stylesheets
	${INSTALL_DATA} ${WRKSRC}/stylesheets/*.css \
		${PREFIX}/etc/asciidoc/stylesheets
	${MKDIR} ${PREFIX}/etc/asciidoc/images/icons/callouts
	${INSTALL_DATA} ${WRKSRC}/images/icons/*.png \
		${PREFIX}/etc/asciidoc/images/icons
	${INSTALL_DATA} ${WRKSRC}/images/icons/callouts/* \
		${PREFIX}/etc/asciidoc/images/icons/callouts
	${INSTALL_MAN} ${WRKSRC}/doc/a2x.1 ${WRKSRC}/doc/asciidoc.1 \
		${PREFIX}/man/man1

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)/usr/ports/textproc/asciidoc/distinfo (-3 / +3 lines)
1	MD5 (asciidoc-8.3.1.tar.gz) = 3e8ea3eab6a6bd89f8fd49fb6d14bfb5	1	MD5 (asciidoc-8.3.3.tar.gz) = 1000c15a06efcb96df6b4f2df97cd95e
2	SHA256 (asciidoc-8.3.1.tar.gz) = a2c4010473948271c074e980d835587a1af77550d87a6423d31ba56b821cb2a8	2	SHA256 (asciidoc-8.3.3.tar.gz) = 5a9b82ae0760c05360e1b50edec56287abf4b3eb2abbc564fa5a084b6de201a0
3	SIZE (asciidoc-8.3.1.tar.gz) = 969092	3	SIZE (asciidoc-8.3.3.tar.gz) = 1050151




--- Makefile.in.orig	2008-12-31 05:33:56.000000000 +0100
+++ Makefile.in	2009-01-15 17:54:31.517567800 +0100
@@ -4,9 +4,9 @@
 
 .NOTPARALLEL:
 
-INSTALL = @INSTALL@
-INSTALL_PROG = @INSTALL_PROGRAM@
-INSTALL_DATA = @INSTALL_DATA@
+INSTALL=%%INSTALL%%
+INSTALL_SCRIPT=%%INSTALL_SCRIPT%%
+INSTALL_DATA=%%INSTALL_DATA%%
 
 SED = @SED@
 
@@ -90,7 +90,7 @@
 	$(INSTALL) -d $(DESTDIR)/$($@)
 
 $(PROGTARGETS): % : %dir
-	$(INSTALL_PROG) $($@) $(DESTDIR)/$($<)/
+	$(INSTALL_SCRIPT) $($@) $(DESTDIR)/$($<)/
 
 $(DATATARGETS): % : %dir
 	$(INSTALL_DATA) $($@) $(DESTDIR)/$($<)/
@@ -147,7 +147,7 @@
 
 build: fixconfpath
 
-install: $(PROGTARGETS) $(DATATARGETS) renameprog install-vim
+install: $(PROGTARGETS) $(DATATARGETS) renameprog
 
 uninstall: uninstall-vim
 	rm -f $(DESTDIR)/$(progdir)/asciidoc

Lines 11-20 Link Here

(-)/usr/ports/textproc/asciidoc/pkg-plist (-2 / +12 lines)
11	etc/asciidoc/docbook-xsl/text.xsl	11	etc/asciidoc/docbook-xsl/text.xsl
12	etc/asciidoc/docbook-xsl/xhtml.xsl	12	etc/asciidoc/docbook-xsl/xhtml.xsl
13	etc/asciidoc/docbook.conf	13	etc/asciidoc/docbook.conf
14	etc/asciidoc/filters/code-filter.conf	14	etc/asciidoc/filters/code/code-filter.conf
15	etc/asciidoc/filters/code-filter.py	15	etc/asciidoc/filters/code/code-filter.py
		16	etc/asciidoc/filters/graphviz/graphviz-filter.conf
		17	etc/asciidoc/filters/graphviz/graphviz2png.py
		18	etc/asciidoc/filters/music/music-filter.conf
		19	etc/asciidoc/filters/music/music2png.py
		20	etc/asciidoc/filters/source/source-highlight-filter.conf
16	etc/asciidoc/help.conf	21	etc/asciidoc/help.conf
17	etc/asciidoc/html4.conf	22	etc/asciidoc/html4.conf
		23	etc/asciidoc/images/icons/README
18	etc/asciidoc/images/icons/callouts/1.png	24	etc/asciidoc/images/icons/callouts/1.png
19	etc/asciidoc/images/icons/callouts/10.png	25	etc/asciidoc/images/icons/callouts/10.png
20	etc/asciidoc/images/icons/callouts/11.png	26	etc/asciidoc/images/icons/callouts/11.png
Lines 55-60 Link Here
55	etc/asciidoc/xhtml11.conf	61	etc/asciidoc/xhtml11.conf
56	@dirrm etc/asciidoc/dblatex	62	@dirrm etc/asciidoc/dblatex
57	@dirrm etc/asciidoc/docbook-xsl	63	@dirrm etc/asciidoc/docbook-xsl
		64	@dirrm etc/asciidoc/filters/code
		65	@dirrm etc/asciidoc/filters/graphviz
		66	@dirrm etc/asciidoc/filters/music
		67	@dirrm etc/asciidoc/filters/source
58	@dirrm etc/asciidoc/filters	68	@dirrm etc/asciidoc/filters
59	@dirrm etc/asciidoc/images/icons/callouts	69	@dirrm etc/asciidoc/images/icons/callouts
60	@dirrm etc/asciidoc/images/icons	70	@dirrm etc/asciidoc/images/icons

Return to bug 130589

Lines 6-12 Link Here

(-)/usr/ports/textproc/asciidoc/Makefile (-42 / +32 lines)
6	#	6	#
7		7
8	PORTNAME= asciidoc	8	PORTNAME= asciidoc
9	PORTVERSION= 8.3.1	9	PORTVERSION= 8.3.3
10	CATEGORIES= textproc	10	CATEGORIES= textproc
11	MASTER_SITES= http://www.methods.co.nz/asciidoc/ \	11	MASTER_SITES= http://www.methods.co.nz/asciidoc/ \
12	SF	12	SF
Lines 14-69 Link Here
14	MAINTAINER= peter.schuller@infidyne.com	14	MAINTAINER= peter.schuller@infidyne.com
15	COMMENT= A text document format for writing short documents and man pages	15	COMMENT= A text document format for writing short documents and man pages
16		16
17	USE_PYTHON= 2.4+	17	RUN_DEPENDS= bash:${PORTSDIR}/shells/bash
18		18
19	NO_BUILD= yes	19	USE_PYTHON= 2.4+
		20	USE_GMAKE= yes
20		21
		22	GNU_CONFIGURE= yes
21	MAN1= a2x.1 asciidoc.1	23	MAN1= a2x.1 asciidoc.1
22		24
		25	# a future improvement to this port is to also install the vim syntax
		26	# highlighing mode which is currently disabled by being patched away in
		27	# Makefile.in
		28
23	pre-patch:	29	pre-patch:
24	${REINPLACE_CMD} \	30	@${REINPLACE_CMD} \
25	-e "s\|/bin/bash\|/usr/bin/env bash\|g" \	31	-e "s\|/bin/bash\|${PREFIX}/bin/bash\|g" \
26	-e "s\|/etc/asciidoc\|${PREFIX}/etc/asciidoc\|g" \	32	-e "s\|/etc/asciidoc\|${PREFIX}/etc/asciidoc\|g" \
27	${WRKSRC}/a2x	33	${WRKSRC}/a2x
28	${REINPLACE_CMD} \	34	@${REINPLACE_CMD} \
29	-e "s\|/etc/asciidoc\|${PREFIX}/etc/asciidoc\|g" \	35	-e "s\|/etc/asciidoc\|${PREFIX}/etc/asciidoc\|g" \
		36	-e "s\|/usr/bin/env python\|${PREFIX}/bin/python\|g" \
30	${WRKSRC}/asciidoc.py	37	${WRKSRC}/asciidoc.py
		38	@${REINPLACE_CMD} \
		39	-e "s\|/usr/bin/env python\|${PREFIX}/bin/python\|g" \
		40	${WRKSRC}/filters/music/music2png.py
		41	@${REINPLACE_CMD} \
		42	-e "s\|/usr/bin/env python\|${PREFIX}/bin/python\|g" \
		43	${WRKSRC}/filters/graphviz/graphviz2png.py
		44	@${REINPLACE_CMD} \
		45	-e "s\|/usr/bin/env python\|${PREFIX}/bin/python\|g" \
		46	${WRKSRC}/filters/code/code-filter.py
31		47
32	# a future improvement to this port is to also install the vim syntax	48	post-patch:
33	# highlighing mode in its proper location.	49	${REINPLACE_CMD} \
34	#	50	-e "s\|%%INSTALL%%\|${INSTALL}\|g" \
35	# also, starting with 8.3.1 the upstream has a configure script. this port	51	${WRKSRC}/Makefile.in
36	# should be converted to use it.	52	${REINPLACE_CMD} \
37	do-install:	53	-e "s\|%%INSTALL_SCRIPT%%\|${INSTALL_SCRIPT}\|g" \
38	${INSTALL_SCRIPT} ${WRKSRC}/asciidoc.py ${PREFIX}/bin/asciidoc	54	${WRKSRC}/Makefile.in
39	${INSTALL_SCRIPT} ${WRKSRC}/a2x ${PREFIX}/bin	55	${REINPLACE_CMD} \
40	${MKDIR} ${PREFIX}/etc/asciidoc	56	-e "s\|%%INSTALL_DATA%%\|${INSTALL_DATA}\|g" \
41	${INSTALL_DATA} ${WRKSRC}/*.conf ${PREFIX}/etc/asciidoc	57	${WRKSRC}/Makefile.in
42	${MKDIR} ${PREFIX}/etc/asciidoc/filters
43	${INSTALL_DATA} ${WRKSRC}/filters/code-filter.conf \
44	${PREFIX}/etc/asciidoc/filters
45	${INSTALL_SCRIPT} ${WRKSRC}/filters/code-filter.py \
46	${PREFIX}/etc/asciidoc/filters
47	${MKDIR} ${PREFIX}/etc/asciidoc/dblatex
48	${INSTALL_DATA} ${WRKSRC}/dblatex/*.xsl \
49	${PREFIX}/etc/asciidoc/dblatex
50	${INSTALL_DATA} ${WRKSRC}/dblatex/*.sty \
51	${PREFIX}/etc/asciidoc/dblatex
52	${MKDIR} ${PREFIX}/etc/asciidoc/docbook-xsl
53	${INSTALL_DATA} ${WRKSRC}/docbook-xsl/*.xsl \
54	${PREFIX}/etc/asciidoc/docbook-xsl
55	${MKDIR} ${PREFIX}/etc/asciidoc/javascripts
56	${INSTALL_DATA} ${WRKSRC}/javascripts/*.js \
57	${PREFIX}/etc/asciidoc/javascripts
58	${MKDIR} ${PREFIX}/etc/asciidoc/stylesheets
59	${INSTALL_DATA} ${WRKSRC}/stylesheets/*.css \
60	${PREFIX}/etc/asciidoc/stylesheets
61	${MKDIR} ${PREFIX}/etc/asciidoc/images/icons/callouts
62	${INSTALL_DATA} ${WRKSRC}/images/icons/*.png \
63	${PREFIX}/etc/asciidoc/images/icons
64	${INSTALL_DATA} ${WRKSRC}/images/icons/callouts/* \
65	${PREFIX}/etc/asciidoc/images/icons/callouts
66	${INSTALL_MAN} ${WRKSRC}/doc/a2x.1 ${WRKSRC}/doc/asciidoc.1 \
67	${PREFIX}/man/man1
68		58
69	.include <bsd.port.mk>	59	.include <bsd.port.mk>

Line 0 Link Here

(-)/usr/ports/textproc/asciidoc/files/patch-Makefile (+33 lines)
	1	--- Makefile.in.orig 2008-12-31 05:33:56.000000000 +0100
	2	+++ Makefile.in 2009-01-15 17:54:31.517567800 +0100
	3	@@ -4,9 +4,9 @@
	4
	5	.NOTPARALLEL:
	6
	7	-INSTALL = @INSTALL@
	8	-INSTALL_PROG = @INSTALL_PROGRAM@
	9	-INSTALL_DATA = @INSTALL_DATA@
	10	+INSTALL=%%INSTALL%%
	11	+INSTALL_SCRIPT=%%INSTALL_SCRIPT%%
	12	+INSTALL_DATA=%%INSTALL_DATA%%
	13
	14	SED = @SED@
	15
	16	@@ -90,7 +90,7 @@
	17	$(INSTALL) -d $(DESTDIR)/$($@)
	18
	19	$(PROGTARGETS): % : %dir
	20	- $(INSTALL_PROG) $($@) $(DESTDIR)/$($<)/
	21	+ $(INSTALL_SCRIPT) $($@) $(DESTDIR)/$($<)/
	22
	23	$(DATATARGETS): % : %dir
	24	$(INSTALL_DATA) $($@) $(DESTDIR)/$($<)/
	25	@@ -147,7 +147,7 @@
	26
	27	build: fixconfpath
	28
	29	-install: $(PROGTARGETS) $(DATATARGETS) renameprog install-vim
	30	+install: $(PROGTARGETS) $(DATATARGETS) renameprog
	31
	32	uninstall: uninstall-vim
	33	rm -f $(DESTDIR)/$(progdir)/asciidoc