View | Details | Raw Unified | Return to bug 130589 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-47 / +13 lines)
Lines 6-12 Link Here
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
21
MAKE_ENV=	INSTALL="${INSTALL}" INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
22
		INSTALL_SCRIPT="${INSTALL_SCRIPT}" INSTALL_DATA="${INSTALL_DATA}"
20
23
24
GNU_CONFIGURE=	yes
21
MAN1=		a2x.1 asciidoc.1
25
MAN1=		a2x.1 asciidoc.1
22
26
23
pre-patch:
24
	${REINPLACE_CMD} \
25
		-e "s|/bin/bash|/usr/bin/env bash|g" \
26
		-e "s|/etc/asciidoc|${PREFIX}/etc/asciidoc|g" \
27
		${WRKSRC}/a2x
28
	${REINPLACE_CMD} \
29
		-e "s|/etc/asciidoc|${PREFIX}/etc/asciidoc|g" \
30
		${WRKSRC}/asciidoc.py
31
32
# a future improvement to this port is to also install the vim syntax
27
# a future improvement to this port is to also install the vim syntax
33
# highlighing mode in its proper location.
28
# highlighing mode which is currently disabled by being patched away in
34
#
29
# Makefile.in
35
# also, starting with 8.3.1 the upstream has a configure script. this port
30
36
# should be converted to use it.
31
pre-patch:
37
do-install:
32
	@${REINPLACE_CMD} -e "s|/bin/bash|${LOCALBASE}/bin/bash|g" \
38
	${INSTALL_SCRIPT} ${WRKSRC}/asciidoc.py ${PREFIX}/bin/asciidoc
33
		${WRKSRC}/a2x ${WRKSRC}/asciidoc.py
39
	${INSTALL_SCRIPT} ${WRKSRC}/a2x ${PREFIX}/bin
40
	${MKDIR} ${PREFIX}/etc/asciidoc
41
	${INSTALL_DATA} ${WRKSRC}/*.conf ${PREFIX}/etc/asciidoc
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
34
69
.include <bsd.port.mk>
35
.include <bsd.port.mk>
(-)distinfo (-3 / +3 lines)
Lines 1-3 Link Here
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
(-)pkg-plist (-2 / +12 lines)
Lines 11-20 Link Here
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
(-)files/patch-Makefile.in (+30 lines)
Added Link Here
1
--- Makefile.in.orig	2008-12-31 07:33:56.000000000 +0300
2
+++ Makefile.in	2009-01-15 20:48:23.000000000 +0300
3
@@ -4,9 +4,6 @@
4
 
5
 .NOTPARALLEL:
6
 
7
-INSTALL = @INSTALL@
8
-INSTALL_PROG = @INSTALL_PROGRAM@
9
-INSTALL_DATA = @INSTALL_DATA@
10
 
11
 SED = @SED@
12
 
13
@@ -90,7 +87,7 @@
14
 	$(INSTALL) -d $(DESTDIR)/$($@)
15
 
16
 $(PROGTARGETS): % : %dir
17
-	$(INSTALL_PROG) $($@) $(DESTDIR)/$($<)/
18
+	$(INSTALL_SCRIPT) $($@) $(DESTDIR)/$($<)/
19
 
20
 $(DATATARGETS): % : %dir
21
 	$(INSTALL_DATA) $($@) $(DESTDIR)/$($<)/
22
@@ -147,7 +144,7 @@
23
 
24
 build: fixconfpath
25
 
26
-install: $(PROGTARGETS) $(DATATARGETS) renameprog install-vim
27
+install: $(PROGTARGETS) $(DATATARGETS) renameprog
28
 
29
 uninstall: uninstall-vim
30
 	rm -f $(DESTDIR)/$(progdir)/asciidoc

Return to bug 130589