Sun May 16 17:16:27 2010 UTC ()
Fix a2x CONF_DIR.
Thanks wiz!


(gls)
diff -r1.20 -r1.21 pkgsrc/textproc/asciidoc/Makefile
cvs diff -r1.20 -r1.21 pkgsrc/textproc/asciidoc/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/asciidoc/Makefile 2010/05/15 20:23:38 1.20
+++ pkgsrc/textproc/asciidoc/Makefile 2010/05/16 17:16:27 1.21
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.20 2010/05/15 20:23:38 gls Exp $ 1# $NetBSD: Makefile,v 1.21 2010/05/16 17:16:27 gls Exp $
2# 2#
3 3
4DISTNAME= asciidoc-8.5.3 4DISTNAME= asciidoc-8.5.3
5CATEGORIES= textproc 5CATEGORIES= textproc
6MASTER_SITES= ${HOMEPAGE:Q} \ 6MASTER_SITES= ${HOMEPAGE:Q} \
7 ${MASTER_SITE_SOURCEFORGE:=asciidoc/} 7 ${MASTER_SITE_SOURCEFORGE:=asciidoc/}
8 8
9MAINTAINER= gdt@NetBSD.org 9MAINTAINER= gdt@NetBSD.org
10HOMEPAGE= http://www.methods.co.nz/asciidoc/ 10HOMEPAGE= http://www.methods.co.nz/asciidoc/
11COMMENT= ASCII to formatted document converter 11COMMENT= ASCII to formatted document converter
12 12
13PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
14 14
@@ -16,27 +16,27 @@ DEPENDS+= docbook-xsl-[0-9]*:../../text @@ -16,27 +16,27 @@ DEPENDS+= docbook-xsl-[0-9]*:../../text
16DEPENDS+= getopt-[0-9]*:../../misc/getopt 16DEPENDS+= getopt-[0-9]*:../../misc/getopt
17 17
18USE_TOOLS+= pax 18USE_TOOLS+= pax
19PYTHON_PATCH_SCRIPTS= a2x.py asciidoc.py 19PYTHON_PATCH_SCRIPTS= a2x.py asciidoc.py
20PYTHON_PATCH_SCRIPTS+= filters/code/code-filter.py 20PYTHON_PATCH_SCRIPTS+= filters/code/code-filter.py
21PYTHON_PATCH_SCRIPTS+= filters/music/music2png.py 21PYTHON_PATCH_SCRIPTS+= filters/music/music2png.py
22PYTHON_PATCH_SCRIPTS+= filters/graphviz/graphviz2png.py 22PYTHON_PATCH_SCRIPTS+= filters/graphviz/graphviz2png.py
23 23
24NO_BUILD= yes 24NO_BUILD= yes
25 25
26SUBST_CLASSES+= ad 26SUBST_CLASSES+= ad
27SUBST_STAGE.ad= pre-configure 27SUBST_STAGE.ad= pre-configure
28SUBST_MESSAGE.ad= Fixing hard-coded config file paths. 28SUBST_MESSAGE.ad= Fixing hard-coded config file paths.
29SUBST_FILES.ad= a2x asciidoc.py 29SUBST_FILES.ad= a2x.py asciidoc.py
30SUBST_SED.ad= -e 's,^\(CONF_DIR\).*=.*,\1="${PREFIX}/share/asciidoc",' 30SUBST_SED.ad= -e 's,^\(CONF_DIR\).*=.*,\1="${PREFIX}/share/asciidoc",'
31 31
32SUBST_CLASSES+= ae 32SUBST_CLASSES+= ae
33SUBST_STAGE.ae= pre-configure 33SUBST_STAGE.ae= pre-configure
34SUBST_MESSAGE.ae= Fixing hard-coded Python interpreter paths. 34SUBST_MESSAGE.ae= Fixing hard-coded Python interpreter paths.
35SUBST_FILES.ae= a2x.py asciidoc.conf 35SUBST_FILES.ae= a2x.py asciidoc.conf
36SUBST_SED.ae= -e 's,python,${PYTHONBIN},' 36SUBST_SED.ae= -e 's,python,${PYTHONBIN},'
37 37
38INSTALLATION_DIRS= bin share/asciidoc share/asciidoc/filters \ 38INSTALLATION_DIRS= bin share/asciidoc share/asciidoc/filters \
39 share/asciidoc/docbook-xsl share/asciidoc/stylesheets \ 39 share/asciidoc/docbook-xsl share/asciidoc/stylesheets \
40 share/asciidoc/javascripts \ 40 share/asciidoc/javascripts \
41 share/asciidoc/images/icons/callouts \ 41 share/asciidoc/images/icons/callouts \
42 ${PKGMANDIR}/man1 ${DOCDIR} \ 42 ${PKGMANDIR}/man1 ${DOCDIR} \