Mon Feb 13 22:38:06 2012 UTC ()
- Simplify /usr/bin/env handling.
- Add an option to enable source highlighting, dragging in
textproc/source-highlight. Off by default.


(gls)
diff -r1.29 -r1.30 pkgsrc/textproc/asciidoc/Makefile
diff -r1.1 -r1.2 pkgsrc/textproc/asciidoc/options.mk
cvs diff -r1.29 -r1.30 pkgsrc/textproc/asciidoc/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/asciidoc/Makefile 2011/10/08 21:13:47 1.29
+++ pkgsrc/textproc/asciidoc/Makefile 2012/02/13 22:38:06 1.30
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.29 2011/10/08 21:13:47 gls Exp $ 1# $NetBSD: Makefile,v 1.30 2012/02/13 22:38:06 gls Exp $
2# 2#
3 3
4DISTNAME= asciidoc-8.6.6 4DISTNAME= asciidoc-8.6.6
5CATEGORIES= textproc 5CATEGORIES= textproc
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=asciidoc/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=asciidoc/}
7 7
8MAINTAINER= gls@NetBSD.org 8MAINTAINER= gls@NetBSD.org
9HOMEPAGE= http://www.methods.co.nz/asciidoc/ 9HOMEPAGE= http://www.methods.co.nz/asciidoc/
10COMMENT= ASCII to formatted document converter 10COMMENT= ASCII to formatted document converter
11LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
12 12
13PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
14 14
@@ -21,32 +21,30 @@ PYTHON_PATCH_SCRIPTS+= filters/code/code @@ -21,32 +21,30 @@ PYTHON_PATCH_SCRIPTS+= filters/code/code
21PYTHON_PATCH_SCRIPTS+= filters/latex/latex2png.py 21PYTHON_PATCH_SCRIPTS+= filters/latex/latex2png.py
22PYTHON_PATCH_SCRIPTS+= filters/music/music2png.py 22PYTHON_PATCH_SCRIPTS+= filters/music/music2png.py
23PYTHON_PATCH_SCRIPTS+= filters/graphviz/graphviz2png.py 23PYTHON_PATCH_SCRIPTS+= filters/graphviz/graphviz2png.py
24PYTHON_PATCH_SCRIPTS+= tests/testasciidoc.py tests/asciidocapi.py 24PYTHON_PATCH_SCRIPTS+= tests/testasciidoc.py tests/asciidocapi.py
25 25
26NO_BUILD= yes 26NO_BUILD= yes
27 27
28SUBST_CLASSES+= ad 28SUBST_CLASSES+= ad
29SUBST_STAGE.ad= pre-configure 29SUBST_STAGE.ad= pre-configure
30SUBST_MESSAGE.ad= Fixing hard-coded config file paths. 30SUBST_MESSAGE.ad= Fixing hard-coded config file paths.
31SUBST_FILES.ad= a2x.py asciidoc.py 31SUBST_FILES.ad= a2x.py asciidoc.py
32SUBST_SED.ad= -e 's,^\(CONF_DIR\).*=.*,\1="${PREFIX}/share/asciidoc",' 32SUBST_SED.ad= -e 's,^\(CONF_DIR\).*=.*,\1="${PREFIX}/share/asciidoc",'
33 33
34SUBST_CLASSES+= ae 34REPLACE_INTERPRETER+= python
35SUBST_STAGE.ae= pre-configure 35REPLACE.python.old= /usr/bin/env python
36SUBST_MESSAGE.ae= Fixing hard-coded Python interpreter paths. 36REPLACE.python.new= ${PYTHONBIN}
37SUBST_FILES.ae= a2x.py asciidoc.conf 37REPLACE_FILES.python= a2x.py asciidoc.conf html5.conf xhtml11.conf xhtml11-quirks.conf
38SUBST_FILES.ae+= html5.conf xhtml11.conf xhtml11-quirks.conf 
39SUBST_SED.ae= -e 's,python,${PYTHONBIN},' 
40 38
41INSTALLATION_DIRS= bin share/asciidoc share/asciidoc/filters \ 39INSTALLATION_DIRS= bin share/asciidoc share/asciidoc/filters \
42 share/asciidoc/docbook-xsl share/asciidoc/stylesheets \ 40 share/asciidoc/docbook-xsl share/asciidoc/stylesheets \
43 share/asciidoc/javascripts \ 41 share/asciidoc/javascripts \
44 share/asciidoc/images/icons/callouts \ 42 share/asciidoc/images/icons/callouts \
45 ${PKGMANDIR}/man1 ${DOCDIR} 43 ${PKGMANDIR}/man1 ${DOCDIR}
46 44
47DOCDIR= ${PREFIX}/share/doc/asciidoc 45DOCDIR= ${PREFIX}/share/doc/asciidoc
48 46
49.include "options.mk" 47.include "options.mk"
50 48
51do-install: 49do-install:
52 ${INSTALL_SCRIPT} ${WRKSRC}/asciidoc.py ${DESTDIR}${PREFIX}/bin/asciidoc 50 ${INSTALL_SCRIPT} ${WRKSRC}/asciidoc.py ${DESTDIR}${PREFIX}/bin/asciidoc
cvs diff -r1.1 -r1.2 pkgsrc/textproc/asciidoc/options.mk (expand / switch to unified diff)

--- pkgsrc/textproc/asciidoc/options.mk 2010/08/25 02:17:27 1.1
+++ pkgsrc/textproc/asciidoc/options.mk 2012/02/13 22:38:06 1.2
@@ -1,15 +1,18 @@ @@ -1,15 +1,18 @@
1# $NetBSD: options.mk,v 1.1 2010/08/25 02:17:27 gls Exp $ 1# $NetBSD: options.mk,v 1.2 2012/02/13 22:38:06 gls Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.asciidoc 3PKG_OPTIONS_VAR= PKG_OPTIONS.asciidoc
4PKG_SUPPORTED_OPTIONS= pdf epub 4PKG_SUPPORTED_OPTIONS= pdf epub highlight
5PKG_SUGGESTED_OPTIONS= 5PKG_SUGGESTED_OPTIONS=
6 6
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
9.if !empty(PKG_OPTIONS:Mpdf) 9.if !empty(PKG_OPTIONS:Mpdf)
10DEPENDS+= dblatex-[0-9]*:../../textproc/dblatex 10DEPENDS+= dblatex-[0-9]*:../../textproc/dblatex
11.endif 11.endif
12.if !empty(PKG_OPTIONS:Mepub) 12.if !empty(PKG_OPTIONS:Mepub)
13DEPENDS+= libxml2-[0-9]*:../../textproc/libxml2 13DEPENDS+= libxml2-[0-9]*:../../textproc/libxml2
14DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt 14DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
15.endif 15.endif
 16.if !empty(PKG_OPTIONS:Mhighlight)
 17DEPENDS+= source-highlight-[0-9]*:../../textproc/source-highlight
 18.endif