diff options
| author | gls <gls> | 2012-02-13 22:38:06 +0000 |
|---|---|---|
| committer | gls <gls> | 2012-02-13 22:38:06 +0000 |
| commit | b2a1f56c9529ff0358a9ab95bd892c6272f941f5 (patch) | |
| tree | c94ab05a1164c80d2004cc41940eb6de6605f64f /textproc/asciidoc | |
| parent | 6dc27e5592a654a913af7eed8b8f98221cf341f4 (diff) | |
| download | pkgsrc-b2a1f56c9529ff0358a9ab95bd892c6272f941f5.tar.gz | |
- Simplify /usr/bin/env handling.
- Add an option to enable source highlighting, dragging in
textproc/source-highlight. Off by default.
Diffstat (limited to 'textproc/asciidoc')
| -rw-r--r-- | textproc/asciidoc/Makefile | 12 | ||||
| -rw-r--r-- | textproc/asciidoc/options.mk | 7 |
2 files changed, 10 insertions, 9 deletions
diff --git a/textproc/asciidoc/Makefile b/textproc/asciidoc/Makefile index b3a0a28ae60..c7166ad2cbc 100644 --- a/textproc/asciidoc/Makefile +++ b/textproc/asciidoc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2011/10/08 21:13:47 gls Exp $ +# $NetBSD: Makefile,v 1.30 2012/02/13 22:38:06 gls Exp $ # DISTNAME= asciidoc-8.6.6 @@ -31,12 +31,10 @@ SUBST_MESSAGE.ad= Fixing hard-coded config file paths. SUBST_FILES.ad= a2x.py asciidoc.py SUBST_SED.ad= -e 's,^\(CONF_DIR\).*=.*,\1="${PREFIX}/share/asciidoc",' -SUBST_CLASSES+= ae -SUBST_STAGE.ae= pre-configure -SUBST_MESSAGE.ae= Fixing hard-coded Python interpreter paths. -SUBST_FILES.ae= a2x.py asciidoc.conf -SUBST_FILES.ae+= html5.conf xhtml11.conf xhtml11-quirks.conf -SUBST_SED.ae= -e 's,python,${PYTHONBIN},' +REPLACE_INTERPRETER+= python +REPLACE.python.old= /usr/bin/env python +REPLACE.python.new= ${PYTHONBIN} +REPLACE_FILES.python= a2x.py asciidoc.conf html5.conf xhtml11.conf xhtml11-quirks.conf INSTALLATION_DIRS= bin share/asciidoc share/asciidoc/filters \ share/asciidoc/docbook-xsl share/asciidoc/stylesheets \ diff --git a/textproc/asciidoc/options.mk b/textproc/asciidoc/options.mk index 4c5f0b50966..c08a1b6281f 100644 --- a/textproc/asciidoc/options.mk +++ b/textproc/asciidoc/options.mk @@ -1,7 +1,7 @@ -# $NetBSD: options.mk,v 1.1 2010/08/25 02:17:27 gls Exp $ +# $NetBSD: options.mk,v 1.2 2012/02/13 22:38:06 gls Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.asciidoc -PKG_SUPPORTED_OPTIONS= pdf epub +PKG_SUPPORTED_OPTIONS= pdf epub highlight PKG_SUGGESTED_OPTIONS= .include "../../mk/bsd.options.mk" @@ -13,3 +13,6 @@ DEPENDS+= dblatex-[0-9]*:../../textproc/dblatex DEPENDS+= libxml2-[0-9]*:../../textproc/libxml2 DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt .endif +.if !empty(PKG_OPTIONS:Mhighlight) +DEPENDS+= source-highlight-[0-9]*:../../textproc/source-highlight +.endif |