diff options
| author | wiz <wiz> | 2007-12-09 20:56:40 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2007-12-09 20:56:40 +0000 |
| commit | 182ff2ab2380149ea6b3dcaa5c29c45e3f8cced4 (patch) | |
| tree | d29580844a184772cc35886918347c4b09c29f5e /textproc | |
| parent | 71e5f4aa6046a37f0068adc3bea1c7f8757f7768 (diff) | |
| download | pkgsrc-182ff2ab2380149ea6b3dcaa5c29c45e3f8cced4.tar.gz | |
Fix config file path in installed files. (Fixes scmgit build problem.)
Actually do require python-2.3 or newer, like a command indicated.
Install an additional file.
Bump PKGREVISION.
Diffstat (limited to 'textproc')
| -rw-r--r-- | textproc/asciidoc/Makefile | 14 | ||||
| -rw-r--r-- | textproc/asciidoc/PLIST | 3 |
2 files changed, 10 insertions, 7 deletions
diff --git a/textproc/asciidoc/Makefile b/textproc/asciidoc/Makefile index d2e8e5f594e..0b8f737f5d6 100644 --- a/textproc/asciidoc/Makefile +++ b/textproc/asciidoc/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.5 2007/11/29 22:20:29 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2007/12/09 20:56:40 wiz Exp $ # DISTNAME= asciidoc-8.2.5 +PKGREVISION= 1 CATEGORIES= textproc MASTER_SITES= ${HOMEPAGE} \ ${MASTER_SITE_SOURCEFORGE:=asciidoc/} @@ -14,14 +15,15 @@ DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl REPLACE_BASH+= a2x USE_TOOLS+= bash:run +PYTHON_VERSIONS_INCOMPATIBLE= 15 20 21 22 PYTHON_PATCH_SCRIPTS= asciidoc.py NO_BUILD= yes SUBST_CLASSES+= ad SUBST_STAGE.ad= pre-configure -SUBST_MESSAGE.ad= Fixing hard-coded paths. -SUBST_FILES.ad= asciidoc.py -SUBST_SED.ad= -e 's,^\(GLOBAL_CONFIG_DIR\).*=.*,\1 = "${PREFIX}/share/asciidoc",' +SUBST_MESSAGE.ad= Fixing hard-coded config file paths. +SUBST_FILES.ad= a2x asciidoc.py +SUBST_SED.ad= -e 's,^\(CONF_DIR\).*=.*,\1 = "${PREFIX}/share/asciidoc",' INSTALLATION_DIRS= bin share/asciidoc share/asciidoc/filters \ share/asciidoc/docbook-xsl share/asciidoc/stylesheets \ @@ -40,15 +42,15 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/doc/asciidoc.txt ${DOCDIR} ${INSTALL_DATA} ${WRKSRC}/doc/asciidoc.html ${DOCDIR} - cd ${WRKSRC} && ${PAX} -wr -pma *.conf stylesheets filters/*.py \ + cd ${WRKSRC} && ${PAX} -wr -pma *.conf filters/*.py \ filters/*.conf docbook-xsl/*.xsl stylesheets/*.css \ javascripts/*.js images/icons/callouts/* images/icons/*.png \ + images/icons/README \ ${PREFIX}/share/asciidoc/. do-test: cd ${WRKSRC} && ./asciidoc.py -v doc/asciidoc.txt -# requires Python 2.3 or newer .include "../../lang/python/application.mk" .include "../../textproc/libxslt/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/asciidoc/PLIST b/textproc/asciidoc/PLIST index d1f54b0711d..658a40420db 100644 --- a/textproc/asciidoc/PLIST +++ b/textproc/asciidoc/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2007/11/29 22:20:29 wiz Exp $ +@comment $NetBSD: PLIST,v 1.6 2007/12/09 20:56:41 wiz Exp $ bin/a2x bin/asciidoc man/man1/a2x.1 @@ -18,6 +18,7 @@ share/asciidoc/filters/music2png.py share/asciidoc/filters/source-highlight-filter.conf share/asciidoc/help.conf share/asciidoc/html4.conf +share/asciidoc/images/icons/README share/asciidoc/images/icons/callouts/1.png share/asciidoc/images/icons/callouts/10.png share/asciidoc/images/icons/callouts/11.png |