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

Collapse All | Expand All

(-)textproc/asciidoc/Makefile (-8 / +5 lines)
Lines 6-28 Link Here
6
#
6
#
7
7
8
PORTNAME=	asciidoc
8
PORTNAME=	asciidoc
9
PORTVERSION=	8.6.4
9
PORTVERSION=	8.6.8
10
CATEGORIES=	textproc
10
CATEGORIES=	textproc
11
MASTER_SITES=	SF
11
MASTER_SITES=	SF
12
12
13
MAINTAINER=	ports@FreeBSD.org
13
MAINTAINER=	ports@FreeBSD.org
14
COMMENT=	A text document format for writing short documents and man pages
14
COMMENT=	A text document format for writing short documents and man pages
15
15
16
LICENSE=	GPLv2 MIT
17
LICENSE_COMB=	multi
18
16
USE_PYTHON=	2.5+
19
USE_PYTHON=	2.5+
17
USE_GMAKE=	yes
20
USE_GMAKE=	yes
18
MAKE_ENV=	INSTALL="${INSTALL}" INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
19
		INSTALL_SCRIPT="${INSTALL_SCRIPT}" INSTALL_DATA="${INSTALL_DATA}"
20
21
GNU_CONFIGURE=	yes
21
GNU_CONFIGURE=	yes
22
MAN1=		a2x.1 asciidoc.1
23
22
24
# a future improvement to this port is to also install the vim syntax
23
MAN1=		a2x.1 asciidoc.1
25
# highlighing mode which is currently disabled by being patched away in
26
# Makefile.in
27
24
28
.include <bsd.port.mk>
25
.include <bsd.port.mk>
(-)textproc/asciidoc/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (asciidoc-8.6.4.tar.gz) = 6b405c0366ae432e1984b117e15c95f0935a617c90fe0a448aa03fece3927f8a
1
SHA256 (asciidoc-8.6.8.tar.gz) = ffb67f59dccaf6f15db72fcd04fdf21a2f9b703d31f94fcd0c49a424a9fcfbc4
2
SIZE (asciidoc-8.6.4.tar.gz) = 853136
2
SIZE (asciidoc-8.6.8.tar.gz) = 900422
(-)textproc/asciidoc/files/patch-Makefile.in (-25 / +35 lines)
Lines 1-30 Link Here
1
--- Makefile.in.orig	2009-05-08 23:41:23.568145042 +0200
1
--- Makefile.in.orig	2011-05-31 05:54:30.000000000 +0900
2
+++ Makefile.in	2009-05-08 23:41:57.495396294 +0200
2
+++ Makefile.in	2012-07-18 05:51:10.000000000 +0900
3
@@ -4,9 +4,6 @@
3
@@ -5,7 +5,7 @@
4
 
5
 .NOTPARALLEL:
4
 .NOTPARALLEL:
6
 
5
 
7
-INSTALL = @INSTALL@
6
 INSTALL = @INSTALL@
8
-INSTALL_PROG = @INSTALL_PROGRAM@
7
-INSTALL_PROG = @INSTALL_PROGRAM@
9
-INSTALL_DATA = @INSTALL_DATA@
8
+INSTALL_PROG = @INSTALL_SCRIPT@
9
 INSTALL_DATA = @INSTALL_DATA@
10
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
10
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
11
 SED = @SED@
11
 SED = @SED@
12
 
12
@@ -27,7 +27,7 @@
13
@@ -90,7 +87,7 @@
13
 prog = asciidoc.py a2x.py
14
 	$(INSTALL) -d $(DESTDIR)/$($@)
14
 progdir = $(bindir)
15
 
15
 
16
 $(PROGTARGETS): % : %dir
16
-vimdir = @sysconfdir@/vim
17
-	$(INSTALL_PROG) $($@) $(DESTDIR)/$($<)/
17
+vimdir = @datadir@/vim/vimfiles
18
+	$(INSTALL_SCRIPT) $($@) $(DESTDIR)/$($<)/
18
 
19
 
19
 manp = $(patsubst %1.txt,%1,$(wildcard doc/*.1.txt))
20
 $(DATATARGETS): % : %dir
20
 manpdir = $(mandir)/man1
21
 	$(INSTALL_DATA) $($@) $(DESTDIR)/$($<)/
21
@@ -145,8 +145,7 @@
22
@@ -147,7 +144,7 @@
22
 	done
23
 
23
 
24
 build: fixconfpath
24
 install-vim:
25
 
25
-	@for d in $(DESTDIR)/$(vimdir) /etc/vim; do \
26
-install: all $(PROGTARGETS) $(DATATARGETS) progsymlink install-vim
26
-		if ! test -d $$d; then continue; fi ; \
27
+install: all $(PROGTARGETS) $(DATATARGETS) progsymlink
27
+	@for d in $(DESTDIR)/$(vimdir); do \
28
 
28
 		echo "installing Vim files in $$d" ; \
29
 uninstall: uninstall-vim
29
 		$(INSTALL) -d $$d/syntax ; \
30
 	rm -f $(DESTDIR)/$(progdir)/asciidoc
30
 		$(INSTALL_DATA) vim/syntax/asciidoc.vim $$d/syntax ; \
31
@@ -155,8 +154,7 @@
32
 	done
33
 
34
 uninstall-vim:
35
-	@for d in $(DESTDIR)/$(vimdir) /etc/vim; do \
36
-		if ! test -d $$d; then continue; fi ; \
37
+	@for d in $(DESTDIR)/$(vimdir); do \
38
 		echo "uninstalling Vim files in $$d" ; \
39
 		rm -f $$d/syntax/asciidoc.vim ; \
40
 		rm -f $$d/ftdetect/asciidoc_filetype.vim ; \
(-)textproc/asciidoc/pkg-descr (-2 lines)
Lines 2-7 Link Here
2
and UNIX man pages. AsciiDoc files can be translated to HTML and DocBook
2
and UNIX man pages. AsciiDoc files can be translated to HTML and DocBook
3
markups using the asciidoc(1) command.
3
markups using the asciidoc(1) command.
4
4
5
This port currently does not install the VIM syntax highlighting mode.
6
7
WWW: http://www.methods.co.nz/asciidoc/
5
WWW: http://www.methods.co.nz/asciidoc/
(-)textproc/asciidoc/pkg-plist (-92 / +103 lines)
Lines 2-96 Link Here
2
bin/a2x.py
2
bin/a2x.py
3
bin/asciidoc
3
bin/asciidoc
4
bin/asciidoc.py
4
bin/asciidoc.py
5
etc/asciidoc/asciidoc.conf
5
%%ETCDIR%%/asciidoc.conf
6
etc/asciidoc/dblatex/asciidoc-dblatex.sty
6
%%ETCDIR%%/dblatex/asciidoc-dblatex.sty
7
etc/asciidoc/dblatex/asciidoc-dblatex.xsl
7
%%ETCDIR%%/dblatex/asciidoc-dblatex.xsl
8
etc/asciidoc/docbook-xsl/chunked.xsl
8
%%ETCDIR%%/docbook-xsl/chunked.xsl
9
etc/asciidoc/docbook-xsl/common.xsl
9
%%ETCDIR%%/docbook-xsl/common.xsl
10
etc/asciidoc/docbook-xsl/epub.xsl
10
%%ETCDIR%%/docbook-xsl/epub.xsl
11
etc/asciidoc/docbook-xsl/fo.xsl
11
%%ETCDIR%%/docbook-xsl/fo.xsl
12
etc/asciidoc/docbook-xsl/htmlhelp.xsl
12
%%ETCDIR%%/docbook-xsl/htmlhelp.xsl
13
etc/asciidoc/docbook-xsl/manpage.xsl
13
%%ETCDIR%%/docbook-xsl/manpage.xsl
14
etc/asciidoc/docbook-xsl/text.xsl
14
%%ETCDIR%%/docbook-xsl/text.xsl
15
etc/asciidoc/docbook-xsl/xhtml.xsl
15
%%ETCDIR%%/docbook-xsl/xhtml.xsl
16
etc/asciidoc/docbook45.conf
16
%%ETCDIR%%/docbook45.conf
17
etc/asciidoc/filters/code/code-filter.conf
17
%%ETCDIR%%/filters/code/code-filter.conf
18
etc/asciidoc/filters/code/code-filter.py
18
%%ETCDIR%%/filters/code/code-filter.py
19
etc/asciidoc/filters/graphviz/graphviz-filter.conf
19
%%ETCDIR%%/filters/graphviz/graphviz-filter.conf
20
etc/asciidoc/filters/graphviz/graphviz2png.py
20
%%ETCDIR%%/filters/graphviz/graphviz2png.py
21
etc/asciidoc/filters/latex/latex-filter.conf
21
%%ETCDIR%%/filters/latex/latex-filter.conf
22
etc/asciidoc/filters/latex/latex2png.py
22
%%ETCDIR%%/filters/latex/latex2png.py
23
etc/asciidoc/filters/music/music-filter.conf
23
%%ETCDIR%%/filters/music/music-filter.conf
24
etc/asciidoc/filters/music/music2png.py
24
%%ETCDIR%%/filters/music/music2png.py
25
etc/asciidoc/filters/source/source-highlight-filter.conf
25
%%ETCDIR%%/filters/source/source-highlight-filter.conf
26
etc/asciidoc/help.conf
26
%%ETCDIR%%/help.conf
27
etc/asciidoc/html4.conf
27
%%ETCDIR%%/html4.conf
28
etc/asciidoc/images/icons/README
28
%%ETCDIR%%/html5.conf
29
etc/asciidoc/images/icons/callouts/1.png
29
%%ETCDIR%%/images/icons/README
30
etc/asciidoc/images/icons/callouts/10.png
30
%%ETCDIR%%/images/icons/callouts/1.png
31
etc/asciidoc/images/icons/callouts/11.png
31
%%ETCDIR%%/images/icons/callouts/10.png
32
etc/asciidoc/images/icons/callouts/12.png
32
%%ETCDIR%%/images/icons/callouts/11.png
33
etc/asciidoc/images/icons/callouts/13.png
33
%%ETCDIR%%/images/icons/callouts/12.png
34
etc/asciidoc/images/icons/callouts/14.png
34
%%ETCDIR%%/images/icons/callouts/13.png
35
etc/asciidoc/images/icons/callouts/15.png
35
%%ETCDIR%%/images/icons/callouts/14.png
36
etc/asciidoc/images/icons/callouts/2.png
36
%%ETCDIR%%/images/icons/callouts/15.png
37
etc/asciidoc/images/icons/callouts/3.png
37
%%ETCDIR%%/images/icons/callouts/2.png
38
etc/asciidoc/images/icons/callouts/4.png
38
%%ETCDIR%%/images/icons/callouts/3.png
39
etc/asciidoc/images/icons/callouts/5.png
39
%%ETCDIR%%/images/icons/callouts/4.png
40
etc/asciidoc/images/icons/callouts/6.png
40
%%ETCDIR%%/images/icons/callouts/5.png
41
etc/asciidoc/images/icons/callouts/7.png
41
%%ETCDIR%%/images/icons/callouts/6.png
42
etc/asciidoc/images/icons/callouts/8.png
42
%%ETCDIR%%/images/icons/callouts/7.png
43
etc/asciidoc/images/icons/callouts/9.png
43
%%ETCDIR%%/images/icons/callouts/8.png
44
etc/asciidoc/images/icons/caution.png
44
%%ETCDIR%%/images/icons/callouts/9.png
45
etc/asciidoc/images/icons/example.png
45
%%ETCDIR%%/images/icons/caution.png
46
etc/asciidoc/images/icons/home.png
46
%%ETCDIR%%/images/icons/example.png
47
etc/asciidoc/images/icons/important.png
47
%%ETCDIR%%/images/icons/home.png
48
etc/asciidoc/images/icons/next.png
48
%%ETCDIR%%/images/icons/important.png
49
etc/asciidoc/images/icons/note.png
49
%%ETCDIR%%/images/icons/next.png
50
etc/asciidoc/images/icons/prev.png
50
%%ETCDIR%%/images/icons/note.png
51
etc/asciidoc/images/icons/tip.png
51
%%ETCDIR%%/images/icons/prev.png
52
etc/asciidoc/images/icons/up.png
52
%%ETCDIR%%/images/icons/tip.png
53
etc/asciidoc/images/icons/warning.png
53
%%ETCDIR%%/images/icons/up.png
54
etc/asciidoc/javascripts/ASCIIMathML.js
54
%%ETCDIR%%/images/icons/warning.png
55
etc/asciidoc/javascripts/LaTeXMathML.js
55
%%ETCDIR%%/javascripts/ASCIIMathML.js
56
etc/asciidoc/javascripts/asciidoc-xhtml11.js
56
%%ETCDIR%%/javascripts/LaTeXMathML.js
57
etc/asciidoc/javascripts/slidy.js
57
%%ETCDIR%%/javascripts/asciidoc.js
58
etc/asciidoc/javascripts/toc.js
58
%%ETCDIR%%/javascripts/slidy.js
59
etc/asciidoc/lang-de.conf
59
%%ETCDIR%%/javascripts/toc.js
60
etc/asciidoc/lang-en.conf
60
%%ETCDIR%%/lang-de.conf
61
etc/asciidoc/lang-es.conf
61
%%ETCDIR%%/lang-el.conf
62
etc/asciidoc/lang-fr.conf
62
%%ETCDIR%%/lang-en.conf
63
etc/asciidoc/lang-hu.conf
63
%%ETCDIR%%/lang-es.conf
64
etc/asciidoc/lang-it.conf
64
%%ETCDIR%%/lang-fr.conf
65
etc/asciidoc/lang-pt-BR.conf
65
%%ETCDIR%%/lang-hu.conf
66
etc/asciidoc/lang-ru.conf
66
%%ETCDIR%%/lang-it.conf
67
etc/asciidoc/lang-uk.conf
67
%%ETCDIR%%/lang-nl.conf
68
etc/asciidoc/latex.conf
68
%%ETCDIR%%/lang-pt-BR.conf
69
etc/asciidoc/slidy.conf
69
%%ETCDIR%%/lang-ru.conf
70
etc/asciidoc/stylesheets/docbook-xsl.css
70
%%ETCDIR%%/lang-uk.conf
71
etc/asciidoc/stylesheets/pygments.css
71
%%ETCDIR%%/latex.conf
72
etc/asciidoc/stylesheets/slidy.css
72
%%ETCDIR%%/slidy.conf
73
etc/asciidoc/stylesheets/volnitsky.css
73
%%ETCDIR%%/stylesheets/asciidoc.css
74
etc/asciidoc/stylesheets/volnitsky-manpage.css
74
%%ETCDIR%%/stylesheets/docbook-xsl.css
75
etc/asciidoc/stylesheets/volnitsky-quirks.css
75
%%ETCDIR%%/stylesheets/pygments.css
76
etc/asciidoc/stylesheets/xhtml11-manpage.css
76
%%ETCDIR%%/stylesheets/slidy.css
77
etc/asciidoc/stylesheets/xhtml11-quirks.css
77
%%ETCDIR%%/stylesheets/toc2.css
78
etc/asciidoc/stylesheets/xhtml11.css
78
%%ETCDIR%%/stylesheets/xhtml11-quirks.css
79
etc/asciidoc/text.conf
79
%%ETCDIR%%/text.conf
80
etc/asciidoc/wordpress.conf
80
%%ETCDIR%%/themes/flask/flask.css
81
etc/asciidoc/xhtml11-quirks.conf
81
%%ETCDIR%%/themes/volnitsky/volnitsky.css
82
etc/asciidoc/xhtml11.conf
82
%%ETCDIR%%/wordpress.conf
83
@dirrm etc/asciidoc/dblatex
83
%%ETCDIR%%/xhtml11-quirks.conf
84
@dirrm etc/asciidoc/docbook-xsl
84
%%ETCDIR%%/xhtml11.conf
85
@dirrm etc/asciidoc/filters/code
85
share/vim/vimfiles/ftdetect/asciidoc_filetype.vim
86
@dirrm etc/asciidoc/filters/graphviz
86
share/vim/vimfiles/syntax/asciidoc.vim
87
@dirrm etc/asciidoc/filters/latex
87
@dirrmtry share/vim/vimfiles/syntax
88
@dirrm etc/asciidoc/filters/music
88
@dirrmtry share/vim/vimfiles/ftdetect
89
@dirrm etc/asciidoc/filters/source
89
@dirrmtry share/vim/vimfiles
90
@dirrm etc/asciidoc/filters
90
@dirrmtry share/vim
91
@dirrm etc/asciidoc/images/icons/callouts
91
@dirrm %%ETCDIR%%/themes/volnitsky
92
@dirrm etc/asciidoc/images/icons
92
@dirrm %%ETCDIR%%/themes/flask
93
@dirrm etc/asciidoc/images
93
@dirrm %%ETCDIR%%/themes
94
@dirrm etc/asciidoc/javascripts
94
@dirrm %%ETCDIR%%/stylesheets
95
@dirrm etc/asciidoc/stylesheets
95
@dirrm %%ETCDIR%%/javascripts
96
@dirrm etc/asciidoc
96
@dirrm %%ETCDIR%%/images/icons/callouts
97
@dirrm %%ETCDIR%%/images/icons
98
@dirrm %%ETCDIR%%/images
99
@dirrm %%ETCDIR%%/filters/source
100
@dirrm %%ETCDIR%%/filters/music
101
@dirrm %%ETCDIR%%/filters/latex
102
@dirrm %%ETCDIR%%/filters/graphviz
103
@dirrm %%ETCDIR%%/filters/code
104
@dirrm %%ETCDIR%%/filters
105
@dirrm %%ETCDIR%%/docbook-xsl
106
@dirrm %%ETCDIR%%/dblatex
107
@dirrm %%ETCDIR%%

Return to bug 170170