ports/130589: [MAINTAINER] textproc/asciidoc: update to 8.3.3

Peter Schuller peter.schuller at infidyne.com
Thu Jan 15 17:20:04 UTC 2009 

>Number:         130589
>Category:       ports
>Synopsis:       [MAINTAINER] textproc/asciidoc: update to 8.3.3
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jan 15 17:20:03 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     peter.schuller at infidyne.com
>Release:        FreeBSD 8.0-CURRENT amd64
>Organization:
>Environment:
System: FreeBSD prometheus.scode.org 8.0-CURRENT FreeBSD 8.0-CURRENT #0: Wed Dec  3 01:00:41 CET
>Description:
- Update to 8.3.3
- Port finally uses upstream provided configure script.
- Now depends on bash, since a2x needs it.
- Correctly substitutes interpreter paths in all Python scripts.
- Now installs all available filters as a result of the move to using
  the configure script.
- Still does not handle the vim syntax highlighting mode.

Added file(s):
- files/patch-Makefile

Generated with FreeBSD Port Tools 0.77

Upstream changelog:

Version 8.3.3 (2009-01-02)
--------------------------
This release supercedes 8.3.2.

.Bug fixes
- The broken and confusing numeration and numeration2 numbered list
  attributes have been dropped, use the style attribute instead.


Version 8.3.2 (2009-01-01)
--------------------------
.Additions and changes
- Added Gouichi Iisaka's Graphviz filter to distribution.
- The 'SidebarBlock' element can now be rendered with an 'abstract'
  style.
- Reorganized filters into a separate subdirectory for each filter.
- Updated `Makefile.in` and `MANIFEST` files to reflect new filters
  organization.
- Added 'listing' style to 'LiteralBlock' element so listings with
  nested listing blocks can be rendered as a listing block.
- Changed example 'code' filter to use preferred 'ListingBlock' syntax
  (the old `~` delimited filter syntax is no longer used).
- Implemented 'enumeration' and 'enumeration2' numbered list
  attributes for specifying the list numbering style ('arabic',
  'loweralpha', 'upperalpha', 'lowerroman' and 'upperroman').
- AsciiDoc now recognizes 'upperalpha', 'lowerroman' and 'upperroman'
  numbers in `listdef-numbered2` numbered lists and sets the number
  style based on the style of the first numbered list item
  (alternative to setting 'enumeration2' attribute).
- Updated `formatlistpat` definition in `.vimrc` example in User
  Guide.
- You can now backslash escape system block macros.
- Added 'Pychart' FAQ.
- Drop paragraph 'text' and list 'text', 'index' and 'label' match
  groups from attributes -- they are included in the element's text
  and we don't want them processed a second time as attributes.
- Changed comment line block macro to a passthrough block macro to
  ensure no substitutions.
- A 'subslist' no longer has to be appended to a 'PassthroughBlock'
  macro definition, if omitted no substitutions are performed.
- Code tidy up: replaced deprecated `<>` operator with `!=`.
- Removed unused linuxdoc code.
- Code tidy ups: dropped old types module reference; replaced
  `has_key()` with preferred `in` operator.

.Bug fixes
- Old syntax source highlight filter regression: special characters
  where not escaped in DocBook outputs.

>How-To-Repeat:
>Fix:

--- asciidoc-8.3.3.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/textproc/asciidoc.orig/Makefile /usr/ports/textproc/asciidoc/Makefile
--- /usr/ports/textproc/asciidoc.orig/Makefile	2008-12-17 17:08:05.000000000 +0100
+++ /usr/ports/textproc/asciidoc/Makefile	2009-01-15 18:11:18.906485263 +0100
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	asciidoc
-PORTVERSION=	8.3.1
+PORTVERSION=	8.3.3
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.methods.co.nz/asciidoc/ \
 		SF
@@ -14,56 +14,46 @@
 MAINTAINER=	peter.schuller at infidyne.com
 COMMENT=	A text document format for writing short documents and man pages
 
-USE_PYTHON=	2.4+
+RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
 
-NO_BUILD=	yes
+USE_PYTHON=	2.4+
+USE_GMAKE=	yes
 
+GNU_CONFIGURE=	yes
 MAN1=		a2x.1 asciidoc.1
 
+# a future improvement to this port is to also install the vim syntax
+# highlighing mode which is currently disabled by being patched away in
+# Makefile.in
+
 pre-patch:
-	${REINPLACE_CMD} \
-		-e "s|/bin/bash|/usr/bin/env bash|g" \
+	@${REINPLACE_CMD} \
+		-e "s|/bin/bash|${PREFIX}/bin/bash|g" \
 		-e "s|/etc/asciidoc|${PREFIX}/etc/asciidoc|g" \
 		${WRKSRC}/a2x
-	${REINPLACE_CMD} \
+	@${REINPLACE_CMD} \
 		-e "s|/etc/asciidoc|${PREFIX}/etc/asciidoc|g" \
+		-e "s|/usr/bin/env python|${PREFIX}/bin/python|g" \
 		${WRKSRC}/asciidoc.py
+	@${REINPLACE_CMD} \
+		-e "s|/usr/bin/env python|${PREFIX}/bin/python|g" \
+		${WRKSRC}/filters/music/music2png.py
+	@${REINPLACE_CMD} \
+		-e "s|/usr/bin/env python|${PREFIX}/bin/python|g" \
+		${WRKSRC}/filters/graphviz/graphviz2png.py
+	@${REINPLACE_CMD} \
+		-e "s|/usr/bin/env python|${PREFIX}/bin/python|g" \
+		${WRKSRC}/filters/code/code-filter.py
 
-# a future improvement to this port is to also install the vim syntax
-# highlighing mode in its proper location.
-#
-# also, starting with 8.3.1 the upstream has a configure script. this port
-# should be converted to use it.
-do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/asciidoc.py ${PREFIX}/bin/asciidoc
-	${INSTALL_SCRIPT} ${WRKSRC}/a2x ${PREFIX}/bin
-	${MKDIR} ${PREFIX}/etc/asciidoc
-	${INSTALL_DATA} ${WRKSRC}/*.conf ${PREFIX}/etc/asciidoc
-	${MKDIR} ${PREFIX}/etc/asciidoc/filters
-	${INSTALL_DATA} ${WRKSRC}/filters/code-filter.conf \
-		${PREFIX}/etc/asciidoc/filters
-	${INSTALL_SCRIPT} ${WRKSRC}/filters/code-filter.py \
-		${PREFIX}/etc/asciidoc/filters
-	${MKDIR} ${PREFIX}/etc/asciidoc/dblatex
-	${INSTALL_DATA} ${WRKSRC}/dblatex/*.xsl \
-		${PREFIX}/etc/asciidoc/dblatex
-	${INSTALL_DATA} ${WRKSRC}/dblatex/*.sty \
-		${PREFIX}/etc/asciidoc/dblatex
-	${MKDIR} ${PREFIX}/etc/asciidoc/docbook-xsl
-	${INSTALL_DATA} ${WRKSRC}/docbook-xsl/*.xsl \
-		${PREFIX}/etc/asciidoc/docbook-xsl
-	${MKDIR} ${PREFIX}/etc/asciidoc/javascripts
-	${INSTALL_DATA} ${WRKSRC}/javascripts/*.js \
-		${PREFIX}/etc/asciidoc/javascripts
-	${MKDIR} ${PREFIX}/etc/asciidoc/stylesheets
-	${INSTALL_DATA} ${WRKSRC}/stylesheets/*.css \
-		${PREFIX}/etc/asciidoc/stylesheets
-	${MKDIR} ${PREFIX}/etc/asciidoc/images/icons/callouts
-	${INSTALL_DATA} ${WRKSRC}/images/icons/*.png \
-		${PREFIX}/etc/asciidoc/images/icons
-	${INSTALL_DATA} ${WRKSRC}/images/icons/callouts/* \
-		${PREFIX}/etc/asciidoc/images/icons/callouts
-	${INSTALL_MAN} ${WRKSRC}/doc/a2x.1 ${WRKSRC}/doc/asciidoc.1 \
-		${PREFIX}/man/man1
+post-patch:
+	${REINPLACE_CMD} \
+		-e "s|%%INSTALL%%|${INSTALL}|g" \
+		${WRKSRC}/Makefile.in
+	${REINPLACE_CMD} \
+		-e "s|%%INSTALL_SCRIPT%%|${INSTALL_SCRIPT}|g" \
+		${WRKSRC}/Makefile.in
+	${REINPLACE_CMD} \
+		-e "s|%%INSTALL_DATA%%|${INSTALL_DATA}|g" \
+		${WRKSRC}/Makefile.in
 
 .include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/textproc/asciidoc.orig/distinfo /usr/ports/textproc/asciidoc/distinfo
--- /usr/ports/textproc/asciidoc.orig/distinfo	2008-12-17 17:08:05.000000000 +0100
+++ /usr/ports/textproc/asciidoc/distinfo	2009-01-13 22:03:45.891038981 +0100
@@ -1,3 +1,3 @@
-MD5 (asciidoc-8.3.1.tar.gz) = 3e8ea3eab6a6bd89f8fd49fb6d14bfb5
-SHA256 (asciidoc-8.3.1.tar.gz) = a2c4010473948271c074e980d835587a1af77550d87a6423d31ba56b821cb2a8
-SIZE (asciidoc-8.3.1.tar.gz) = 969092
+MD5 (asciidoc-8.3.3.tar.gz) = 1000c15a06efcb96df6b4f2df97cd95e
+SHA256 (asciidoc-8.3.3.tar.gz) = 5a9b82ae0760c05360e1b50edec56287abf4b3eb2abbc564fa5a084b6de201a0
+SIZE (asciidoc-8.3.3.tar.gz) = 1050151
diff -ruN --exclude=CVS /usr/ports/textproc/asciidoc.orig/files/patch-Makefile /usr/ports/textproc/asciidoc/files/patch-Makefile
--- /usr/ports/textproc/asciidoc.orig/files/patch-Makefile	1970-01-01 01:00:00.000000000 +0100
+++ /usr/ports/textproc/asciidoc/files/patch-Makefile	2009-01-15 17:54:47.900205008 +0100
@@ -0,0 +1,33 @@
+--- Makefile.in.orig	2008-12-31 05:33:56.000000000 +0100
++++ Makefile.in	2009-01-15 17:54:31.517567800 +0100
+@@ -4,9 +4,9 @@
+ 
+ .NOTPARALLEL:
+ 
+-INSTALL = @INSTALL@
+-INSTALL_PROG = @INSTALL_PROGRAM@
+-INSTALL_DATA = @INSTALL_DATA@
++INSTALL=%%INSTALL%%
++INSTALL_SCRIPT=%%INSTALL_SCRIPT%%
++INSTALL_DATA=%%INSTALL_DATA%%
+ 
+ SED = @SED@
+ 
+@@ -90,7 +90,7 @@
+ 	$(INSTALL) -d $(DESTDIR)/$($@)
+ 
+ $(PROGTARGETS): % : %dir
+-	$(INSTALL_PROG) $($@) $(DESTDIR)/$($<)/
++	$(INSTALL_SCRIPT) $($@) $(DESTDIR)/$($<)/
+ 
+ $(DATATARGETS): % : %dir
+ 	$(INSTALL_DATA) $($@) $(DESTDIR)/$($<)/
+@@ -147,7 +147,7 @@
+ 
+ build: fixconfpath
+ 
+-install: $(PROGTARGETS) $(DATATARGETS) renameprog install-vim
++install: $(PROGTARGETS) $(DATATARGETS) renameprog
+ 
+ uninstall: uninstall-vim
+ 	rm -f $(DESTDIR)/$(progdir)/asciidoc
diff -ruN --exclude=CVS /usr/ports/textproc/asciidoc.orig/pkg-plist /usr/ports/textproc/asciidoc/pkg-plist
--- /usr/ports/textproc/asciidoc.orig/pkg-plist	2008-12-12 00:32:09.000000000 +0100
+++ /usr/ports/textproc/asciidoc/pkg-plist	2009-01-15 18:05:07.259628298 +0100
@@ -11,10 +11,16 @@
 etc/asciidoc/docbook-xsl/text.xsl
 etc/asciidoc/docbook-xsl/xhtml.xsl
 etc/asciidoc/docbook.conf
-etc/asciidoc/filters/code-filter.conf
-etc/asciidoc/filters/code-filter.py
+etc/asciidoc/filters/code/code-filter.conf
+etc/asciidoc/filters/code/code-filter.py
+etc/asciidoc/filters/graphviz/graphviz-filter.conf
+etc/asciidoc/filters/graphviz/graphviz2png.py
+etc/asciidoc/filters/music/music-filter.conf
+etc/asciidoc/filters/music/music2png.py
+etc/asciidoc/filters/source/source-highlight-filter.conf
 etc/asciidoc/help.conf
 etc/asciidoc/html4.conf
+etc/asciidoc/images/icons/README
 etc/asciidoc/images/icons/callouts/1.png
 etc/asciidoc/images/icons/callouts/10.png
 etc/asciidoc/images/icons/callouts/11.png
@@ -55,6 +61,10 @@
 etc/asciidoc/xhtml11.conf
 @dirrm etc/asciidoc/dblatex
 @dirrm etc/asciidoc/docbook-xsl
+ at dirrm etc/asciidoc/filters/code
+ at dirrm etc/asciidoc/filters/graphviz
+ at dirrm etc/asciidoc/filters/music
+ at dirrm etc/asciidoc/filters/source
 @dirrm etc/asciidoc/filters
 @dirrm etc/asciidoc/images/icons/callouts
 @dirrm etc/asciidoc/images/icons
--- asciidoc-8.3.3.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list