From tkato432@yahoo.com  Wed Jul 25 18:04:03 2012
Return-Path: <tkato432@yahoo.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A91F61065673
	for <FreeBSD-gnats-submit@FreeBSD.org>; Wed, 25 Jul 2012 18:03:33 +0000 (UTC)
	(envelope-from tkato432@yahoo.com)
Received: from msa103lp.auone-net.jp (msa103lp.auone-net.jp [222.3.140.166])
	by mx1.freebsd.org (Postfix) with ESMTP id 184F18FC0C
	for <FreeBSD-gnats-submit@FreeBSD.org>; Wed, 25 Jul 2012 18:03:33 +0000 (UTC)
Received: from localhost.localdomain (ZT029177.ppp.dion.ne.jp [59.128.29.177])
	by msa103lp.auone-net.jp (au one net msa) with ESMTP id 9105E47C036
	for <FreeBSD-gnats-submit@FreeBSD.org>; Thu, 26 Jul 2012 03:03:28 +0900 (JST)
Message-Id: <20120726024435.6e5076b11ba8ed7ecd7abcc3@yahoo.com>
Date: Thu, 26 Jul 2012 02:44:35 +0900
From: KATO Tsuguru <tkato432@yahoo.com>
To: FreeBSD-gnats-submit@FreeBSD.org
Subject: textproc/asciidoc: Update to version 8.6.8

>Number:         170170
>Category:       ports
>Synopsis:       textproc/asciidoc: Update to version 8.6.8
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    sperber
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jul 25 18:10:18 UTC 2012
>Closed-Date:    Sat Dec 01 08:50:40 UTC 2012
>Last-Modified:  Sat Dec 01 08:50:40 UTC 2012
>Originator:     KATO Tsuguru
>Release:        FreeBSD 7.4-RELEASE-p9 i386
>Organization:
>Environment:
>Description:
- Update to version 8.6.8

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/textproc/asciidoc/Makefile textproc/asciidoc/Makefile
--- /usr/ports/textproc/asciidoc/Makefile	2012-07-13 23:14:13.000000000 +0900
+++ textproc/asciidoc/Makefile	2012-07-18 05:51:51.000000000 +0900
@@ -6,23 +6,20 @@
 #
 
 PORTNAME=	asciidoc
-PORTVERSION=	8.6.4
+PORTVERSION=	8.6.8
 CATEGORIES=	textproc
 MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A text document format for writing short documents and man pages
 
+LICENSE=	GPLv2 MIT
+LICENSE_COMB=	multi
+
 USE_PYTHON=	2.5+
 USE_GMAKE=	yes
-MAKE_ENV=	INSTALL="${INSTALL}" INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
-		INSTALL_SCRIPT="${INSTALL_SCRIPT}" INSTALL_DATA="${INSTALL_DATA}"
-
 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
+MAN1=		a2x.1 asciidoc.1
 
 .include <bsd.port.mk>
diff -urN /usr/ports/textproc/asciidoc/distinfo textproc/asciidoc/distinfo
--- /usr/ports/textproc/asciidoc/distinfo	2011-03-09 04:48:41.000000000 +0900
+++ textproc/asciidoc/distinfo	2012-07-18 02:57:23.000000000 +0900
@@ -1,2 +1,2 @@
-SHA256 (asciidoc-8.6.4.tar.gz) = 6b405c0366ae432e1984b117e15c95f0935a617c90fe0a448aa03fece3927f8a
-SIZE (asciidoc-8.6.4.tar.gz) = 853136
+SHA256 (asciidoc-8.6.8.tar.gz) = ffb67f59dccaf6f15db72fcd04fdf21a2f9b703d31f94fcd0c49a424a9fcfbc4
+SIZE (asciidoc-8.6.8.tar.gz) = 900422
diff -urN /usr/ports/textproc/asciidoc/files/patch-Makefile.in textproc/asciidoc/files/patch-Makefile.in
--- /usr/ports/textproc/asciidoc/files/patch-Makefile.in	2009-05-09 18:34:24.000000000 +0900
+++ textproc/asciidoc/files/patch-Makefile.in	2012-07-18 05:51:30.000000000 +0900
@@ -1,30 +1,40 @@
---- Makefile.in.orig	2009-05-08 23:41:23.568145042 +0200
-+++ Makefile.in	2009-05-08 23:41:57.495396294 +0200
-@@ -4,9 +4,6 @@
- 
+--- Makefile.in.orig	2011-05-31 05:54:30.000000000 +0900
++++ Makefile.in	2012-07-18 05:51:10.000000000 +0900
+@@ -5,7 +5,7 @@
  .NOTPARALLEL:
  
--INSTALL = @INSTALL@
+ INSTALL = @INSTALL@
 -INSTALL_PROG = @INSTALL_PROGRAM@
--INSTALL_DATA = @INSTALL_DATA@
++INSTALL_PROG = @INSTALL_SCRIPT@
+ INSTALL_DATA = @INSTALL_DATA@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
  SED = @SED@
- 
-@@ -90,7 +87,7 @@
- 	$(INSTALL) -d $(DESTDIR)/$($@)
- 
- $(PROGTARGETS): % : %dir
--	$(INSTALL_PROG) $($@) $(DESTDIR)/$($<)/
-+	$(INSTALL_SCRIPT) $($@) $(DESTDIR)/$($<)/
- 
- $(DATATARGETS): % : %dir
- 	$(INSTALL_DATA) $($@) $(DESTDIR)/$($<)/
-@@ -147,7 +144,7 @@
- 
- build: fixconfpath
- 
--install: all $(PROGTARGETS) $(DATATARGETS) progsymlink install-vim
-+install: all $(PROGTARGETS) $(DATATARGETS) progsymlink
- 
- uninstall: uninstall-vim
- 	rm -f $(DESTDIR)/$(progdir)/asciidoc
+@@ -27,7 +27,7 @@
+ prog = asciidoc.py a2x.py
+ progdir = $(bindir)
+ 
+-vimdir = @sysconfdir@/vim
++vimdir = @datadir@/vim/vimfiles
+ 
+ manp = $(patsubst %1.txt,%1,$(wildcard doc/*.1.txt))
+ manpdir = $(mandir)/man1
+@@ -145,8 +145,7 @@
+ 	done
+ 
+ install-vim:
+-	@for d in $(DESTDIR)/$(vimdir) /etc/vim; do \
+-		if ! test -d $$d; then continue; fi ; \
++	@for d in $(DESTDIR)/$(vimdir); do \
+ 		echo "installing Vim files in $$d" ; \
+ 		$(INSTALL) -d $$d/syntax ; \
+ 		$(INSTALL_DATA) vim/syntax/asciidoc.vim $$d/syntax ; \
+@@ -155,8 +154,7 @@
+ 	done
+ 
+ uninstall-vim:
+-	@for d in $(DESTDIR)/$(vimdir) /etc/vim; do \
+-		if ! test -d $$d; then continue; fi ; \
++	@for d in $(DESTDIR)/$(vimdir); do \
+ 		echo "uninstalling Vim files in $$d" ; \
+ 		rm -f $$d/syntax/asciidoc.vim ; \
+ 		rm -f $$d/ftdetect/asciidoc_filetype.vim ; \
diff -urN /usr/ports/textproc/asciidoc/pkg-descr textproc/asciidoc/pkg-descr
--- /usr/ports/textproc/asciidoc/pkg-descr	2011-10-24 13:17:03.000000000 +0900
+++ textproc/asciidoc/pkg-descr	2012-07-15 02:36:25.000000000 +0900
@@ -2,6 +2,4 @@
 and UNIX man pages. AsciiDoc files can be translated to HTML and DocBook
 markups using the asciidoc(1) command.
 
-This port currently does not install the VIM syntax highlighting mode.
-
 WWW: http://www.methods.co.nz/asciidoc/
diff -urN /usr/ports/textproc/asciidoc/pkg-plist textproc/asciidoc/pkg-plist
--- /usr/ports/textproc/asciidoc/pkg-plist	2011-03-09 04:48:41.000000000 +0900
+++ textproc/asciidoc/pkg-plist	2012-07-18 05:33:58.000000000 +0900
@@ -2,95 +2,106 @@
 bin/a2x.py
 bin/asciidoc
 bin/asciidoc.py
-etc/asciidoc/asciidoc.conf
-etc/asciidoc/dblatex/asciidoc-dblatex.sty
-etc/asciidoc/dblatex/asciidoc-dblatex.xsl
-etc/asciidoc/docbook-xsl/chunked.xsl
-etc/asciidoc/docbook-xsl/common.xsl
-etc/asciidoc/docbook-xsl/epub.xsl
-etc/asciidoc/docbook-xsl/fo.xsl
-etc/asciidoc/docbook-xsl/htmlhelp.xsl
-etc/asciidoc/docbook-xsl/manpage.xsl
-etc/asciidoc/docbook-xsl/text.xsl
-etc/asciidoc/docbook-xsl/xhtml.xsl
-etc/asciidoc/docbook45.conf
-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/latex/latex-filter.conf
-etc/asciidoc/filters/latex/latex2png.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
-etc/asciidoc/images/icons/callouts/12.png
-etc/asciidoc/images/icons/callouts/13.png
-etc/asciidoc/images/icons/callouts/14.png
-etc/asciidoc/images/icons/callouts/15.png
-etc/asciidoc/images/icons/callouts/2.png
-etc/asciidoc/images/icons/callouts/3.png
-etc/asciidoc/images/icons/callouts/4.png
-etc/asciidoc/images/icons/callouts/5.png
-etc/asciidoc/images/icons/callouts/6.png
-etc/asciidoc/images/icons/callouts/7.png
-etc/asciidoc/images/icons/callouts/8.png
-etc/asciidoc/images/icons/callouts/9.png
-etc/asciidoc/images/icons/caution.png
-etc/asciidoc/images/icons/example.png
-etc/asciidoc/images/icons/home.png
-etc/asciidoc/images/icons/important.png
-etc/asciidoc/images/icons/next.png
-etc/asciidoc/images/icons/note.png
-etc/asciidoc/images/icons/prev.png
-etc/asciidoc/images/icons/tip.png
-etc/asciidoc/images/icons/up.png
-etc/asciidoc/images/icons/warning.png
-etc/asciidoc/javascripts/ASCIIMathML.js
-etc/asciidoc/javascripts/LaTeXMathML.js
-etc/asciidoc/javascripts/asciidoc-xhtml11.js
-etc/asciidoc/javascripts/slidy.js
-etc/asciidoc/javascripts/toc.js
-etc/asciidoc/lang-de.conf
-etc/asciidoc/lang-en.conf
-etc/asciidoc/lang-es.conf
-etc/asciidoc/lang-fr.conf
-etc/asciidoc/lang-hu.conf
-etc/asciidoc/lang-it.conf
-etc/asciidoc/lang-pt-BR.conf
-etc/asciidoc/lang-ru.conf
-etc/asciidoc/lang-uk.conf
-etc/asciidoc/latex.conf
-etc/asciidoc/slidy.conf
-etc/asciidoc/stylesheets/docbook-xsl.css
-etc/asciidoc/stylesheets/pygments.css
-etc/asciidoc/stylesheets/slidy.css
-etc/asciidoc/stylesheets/volnitsky.css
-etc/asciidoc/stylesheets/volnitsky-manpage.css
-etc/asciidoc/stylesheets/volnitsky-quirks.css
-etc/asciidoc/stylesheets/xhtml11-manpage.css
-etc/asciidoc/stylesheets/xhtml11-quirks.css
-etc/asciidoc/stylesheets/xhtml11.css
-etc/asciidoc/text.conf
-etc/asciidoc/wordpress.conf
-etc/asciidoc/xhtml11-quirks.conf
-etc/asciidoc/xhtml11.conf
-@dirrm etc/asciidoc/dblatex
-@dirrm etc/asciidoc/docbook-xsl
-@dirrm etc/asciidoc/filters/code
-@dirrm etc/asciidoc/filters/graphviz
-@dirrm etc/asciidoc/filters/latex
-@dirrm etc/asciidoc/filters/music
-@dirrm etc/asciidoc/filters/source
-@dirrm etc/asciidoc/filters
-@dirrm etc/asciidoc/images/icons/callouts
-@dirrm etc/asciidoc/images/icons
-@dirrm etc/asciidoc/images
-@dirrm etc/asciidoc/javascripts
-@dirrm etc/asciidoc/stylesheets
-@dirrm etc/asciidoc
+%%ETCDIR%%/asciidoc.conf
+%%ETCDIR%%/dblatex/asciidoc-dblatex.sty
+%%ETCDIR%%/dblatex/asciidoc-dblatex.xsl
+%%ETCDIR%%/docbook-xsl/chunked.xsl
+%%ETCDIR%%/docbook-xsl/common.xsl
+%%ETCDIR%%/docbook-xsl/epub.xsl
+%%ETCDIR%%/docbook-xsl/fo.xsl
+%%ETCDIR%%/docbook-xsl/htmlhelp.xsl
+%%ETCDIR%%/docbook-xsl/manpage.xsl
+%%ETCDIR%%/docbook-xsl/text.xsl
+%%ETCDIR%%/docbook-xsl/xhtml.xsl
+%%ETCDIR%%/docbook45.conf
+%%ETCDIR%%/filters/code/code-filter.conf
+%%ETCDIR%%/filters/code/code-filter.py
+%%ETCDIR%%/filters/graphviz/graphviz-filter.conf
+%%ETCDIR%%/filters/graphviz/graphviz2png.py
+%%ETCDIR%%/filters/latex/latex-filter.conf
+%%ETCDIR%%/filters/latex/latex2png.py
+%%ETCDIR%%/filters/music/music-filter.conf
+%%ETCDIR%%/filters/music/music2png.py
+%%ETCDIR%%/filters/source/source-highlight-filter.conf
+%%ETCDIR%%/help.conf
+%%ETCDIR%%/html4.conf
+%%ETCDIR%%/html5.conf
+%%ETCDIR%%/images/icons/README
+%%ETCDIR%%/images/icons/callouts/1.png
+%%ETCDIR%%/images/icons/callouts/10.png
+%%ETCDIR%%/images/icons/callouts/11.png
+%%ETCDIR%%/images/icons/callouts/12.png
+%%ETCDIR%%/images/icons/callouts/13.png
+%%ETCDIR%%/images/icons/callouts/14.png
+%%ETCDIR%%/images/icons/callouts/15.png
+%%ETCDIR%%/images/icons/callouts/2.png
+%%ETCDIR%%/images/icons/callouts/3.png
+%%ETCDIR%%/images/icons/callouts/4.png
+%%ETCDIR%%/images/icons/callouts/5.png
+%%ETCDIR%%/images/icons/callouts/6.png
+%%ETCDIR%%/images/icons/callouts/7.png
+%%ETCDIR%%/images/icons/callouts/8.png
+%%ETCDIR%%/images/icons/callouts/9.png
+%%ETCDIR%%/images/icons/caution.png
+%%ETCDIR%%/images/icons/example.png
+%%ETCDIR%%/images/icons/home.png
+%%ETCDIR%%/images/icons/important.png
+%%ETCDIR%%/images/icons/next.png
+%%ETCDIR%%/images/icons/note.png
+%%ETCDIR%%/images/icons/prev.png
+%%ETCDIR%%/images/icons/tip.png
+%%ETCDIR%%/images/icons/up.png
+%%ETCDIR%%/images/icons/warning.png
+%%ETCDIR%%/javascripts/ASCIIMathML.js
+%%ETCDIR%%/javascripts/LaTeXMathML.js
+%%ETCDIR%%/javascripts/asciidoc.js
+%%ETCDIR%%/javascripts/slidy.js
+%%ETCDIR%%/javascripts/toc.js
+%%ETCDIR%%/lang-de.conf
+%%ETCDIR%%/lang-el.conf
+%%ETCDIR%%/lang-en.conf
+%%ETCDIR%%/lang-es.conf
+%%ETCDIR%%/lang-fr.conf
+%%ETCDIR%%/lang-hu.conf
+%%ETCDIR%%/lang-it.conf
+%%ETCDIR%%/lang-nl.conf
+%%ETCDIR%%/lang-pt-BR.conf
+%%ETCDIR%%/lang-ru.conf
+%%ETCDIR%%/lang-uk.conf
+%%ETCDIR%%/latex.conf
+%%ETCDIR%%/slidy.conf
+%%ETCDIR%%/stylesheets/asciidoc.css
+%%ETCDIR%%/stylesheets/docbook-xsl.css
+%%ETCDIR%%/stylesheets/pygments.css
+%%ETCDIR%%/stylesheets/slidy.css
+%%ETCDIR%%/stylesheets/toc2.css
+%%ETCDIR%%/stylesheets/xhtml11-quirks.css
+%%ETCDIR%%/text.conf
+%%ETCDIR%%/themes/flask/flask.css
+%%ETCDIR%%/themes/volnitsky/volnitsky.css
+%%ETCDIR%%/wordpress.conf
+%%ETCDIR%%/xhtml11-quirks.conf
+%%ETCDIR%%/xhtml11.conf
+share/vim/vimfiles/ftdetect/asciidoc_filetype.vim
+share/vim/vimfiles/syntax/asciidoc.vim
+@dirrmtry share/vim/vimfiles/syntax
+@dirrmtry share/vim/vimfiles/ftdetect
+@dirrmtry share/vim/vimfiles
+@dirrmtry share/vim
+@dirrm %%ETCDIR%%/themes/volnitsky
+@dirrm %%ETCDIR%%/themes/flask
+@dirrm %%ETCDIR%%/themes
+@dirrm %%ETCDIR%%/stylesheets
+@dirrm %%ETCDIR%%/javascripts
+@dirrm %%ETCDIR%%/images/icons/callouts
+@dirrm %%ETCDIR%%/images/icons
+@dirrm %%ETCDIR%%/images
+@dirrm %%ETCDIR%%/filters/source
+@dirrm %%ETCDIR%%/filters/music
+@dirrm %%ETCDIR%%/filters/latex
+@dirrm %%ETCDIR%%/filters/graphviz
+@dirrm %%ETCDIR%%/filters/code
+@dirrm %%ETCDIR%%/filters
+@dirrm %%ETCDIR%%/docbook-xsl
+@dirrm %%ETCDIR%%/dblatex
+@dirrm %%ETCDIR%%
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Wed Jul 25 18:13:40 UTC 2012 
Responsible-Changed-Why:  
miwi@ wants his PRs (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=170170 

From: KATO Tsuguru <tkato432@yahoo.com>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/170170: textproc/asciidoc: Update to version 8.6.8
Date: Sat, 18 Aug 2012 21:56:18 +0900

 This is a multi-part message in MIME format.
 
 --Multipart=_Sat__18_Aug_2012_21_56_18_+0900_ZfZRG1k1Mm_+G_fa
 Content-Type: text/plain; charset=US-ASCII
 Content-Transfer-Encoding: 7bit
 
 Remake of the patch against current tree.
 
 --Multipart=_Sat__18_Aug_2012_21_56_18_+0900_ZfZRG1k1Mm_+G_fa
 Content-Type: text/x-diff;
  name="textproc_asciidoc.diff"
 Content-Disposition: attachment;
  filename="textproc_asciidoc.diff"
 Content-Transfer-Encoding: 7bit
 
 diff -urN /usr/ports/textproc/asciidoc/Makefile textproc/asciidoc/Makefile
 --- /usr/ports/textproc/asciidoc/Makefile	2012-08-18 16:49:51.000000000 +0900
 +++ textproc/asciidoc/Makefile	2012-08-18 21:27:32.000000000 +0900
 @@ -6,35 +6,34 @@
  #
  
  PORTNAME=	asciidoc
 -PORTVERSION=	8.6.6
 +PORTVERSION=	8.6.8
  CATEGORIES=	textproc
  MASTER_SITES=	SF
  
  MAINTAINER=	ports@FreeBSD.org
  COMMENT=	A text document format for writing short documents and man pages
  
 +LICENSE=	GPLv2 MIT
 +LICENSE_COMB=	multi
 +
  USE_PYTHON=	2.5+
  USE_GMAKE=	yes
 -MAKE_ENV=	INSTALL="${INSTALL}" INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
 -		INSTALL_SCRIPT="${INSTALL_SCRIPT}" INSTALL_DATA="${INSTALL_DATA}"
 -
  GNU_CONFIGURE=	yes
 +
  MAN1=		a2x.1 asciidoc.1
  
 -CONFFILES=	asciidoc.conf docbook45.conf filters/code/code-filter.conf \
 +CONFFILES=	asciidoc.conf docbook45.conf \
 +		filters/code/code-filter.conf \
  		filters/graphviz/graphviz-filter.conf \
  		filters/latex/latex-filter.conf \
  		filters/music/music-filter.conf \
  		filters/source/source-highlight-filter.conf \
 -		help.conf html4.conf html5.conf lang-de.conf lang-en.conf \
 -		lang-es.conf lang-fr.conf lang-hu.conf lang-it.conf \
 -		lang-nl.conf lang-pt-BR.conf lang-ru.conf lang-uk.conf \
 +		help.conf html4.conf html5.conf \
 +		lang-de.conf lang-el.conf lang-en.conf lang-es.conf \
 +		lang-fr.conf lang-hu.conf lang-it.conf lang-nl.conf \
 +		lang-pt-BR.conf lang-ru.conf lang-uk.conf \
  		latex.conf slidy.conf text.conf wordpress.conf \
 -		xhtml11-quirks.conf xhtml11.conf
 -
 -# 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
 +		xhtml11.conf xhtml11-quirks.conf
  
  post-patch:
  .for f in ${CONFFILES}
 diff -urN /usr/ports/textproc/asciidoc/distinfo textproc/asciidoc/distinfo
 --- /usr/ports/textproc/asciidoc/distinfo	2012-08-18 16:49:51.000000000 +0900
 +++ textproc/asciidoc/distinfo	2012-07-18 02:57:23.000000000 +0900
 @@ -1,2 +1,2 @@
 -SHA256 (asciidoc-8.6.6.tar.gz) = 9d54c11716e4309ff4d942cf6a6d9745d6a28754ff1de01efed0dc659457ac71
 -SIZE (asciidoc-8.6.6.tar.gz) = 881704
 +SHA256 (asciidoc-8.6.8.tar.gz) = ffb67f59dccaf6f15db72fcd04fdf21a2f9b703d31f94fcd0c49a424a9fcfbc4
 +SIZE (asciidoc-8.6.8.tar.gz) = 900422
 diff -urN /usr/ports/textproc/asciidoc/files/patch-Makefile.in textproc/asciidoc/files/patch-Makefile.in
 --- /usr/ports/textproc/asciidoc/files/patch-Makefile.in	2012-08-18 16:49:51.000000000 +0900
 +++ textproc/asciidoc/files/patch-Makefile.in	2012-08-18 21:32:35.000000000 +0900
 @@ -1,16 +1,21 @@
 ---- Makefile.in.orig	2011-05-30 22:54:30.000000000 +0200
 -+++ Makefile.in	2012-08-17 14:22:11.031409140 +0200
 -@@ -4,9 +4,6 @@
 - 
 +--- Makefile.in.orig	2011-05-31 05:54:30.000000000 +0900
 ++++ Makefile.in	2012-08-18 21:30:48.000000000 +0900
 +@@ -5,7 +5,7 @@
   .NOTPARALLEL:
   
 --INSTALL = @INSTALL@
 + INSTALL = @INSTALL@
  -INSTALL_PROG = @INSTALL_PROGRAM@
 --INSTALL_DATA = @INSTALL_DATA@
 ++INSTALL_PROG = @INSTALL_SCRIPT@
 + INSTALL_DATA = @INSTALL_DATA@
   PACKAGE_TARNAME = @PACKAGE_TARNAME@
   SED = @SED@
 +@@ -27,37 +27,37 @@
 + prog = asciidoc.py a2x.py
 + progdir = $(bindir)
 + 
 +-vimdir = @sysconfdir@/vim
 ++vimdir = @datadir@/vim/vimfiles
   
 -@@ -32,32 +29,32 @@
   manp = $(patsubst %1.txt,%1,$(wildcard doc/*.1.txt))
   manpdir = $(mandir)/man1
   
 @@ -49,21 +54,23 @@
   latexfilterconfdir = $(filtersdir)/latex
   
   themesdir = $(ASCIIDOCCONF)/themes
 -@@ -103,7 +100,7 @@
 - 	$(INSTALL) -d $(DESTDIR)/$($@)
 - 
 - $(PROGTARGETS): % : %dir
 --	$(INSTALL_PROG) $($@) $(DESTDIR)/$($<)/
 -+	$(INSTALL_SCRIPT) $($@) $(DESTDIR)/$($<)/
 - 
 - $(DATATARGETS): % : %dir
 - 	$(INSTALL_DATA) $($@) $(DESTDIR)/$($<)/
 -@@ -166,7 +163,7 @@
 - build: fixconfpath $(manp)
 - 
 - 
 --install: all $(PROGTARGETS) $(DATATARGETS) progsymlink install-vim
 -+install: all $(PROGTARGETS) $(DATATARGETS) progsymlink
 +@@ -145,8 +145,7 @@
 + 	done
   
 - uninstall: uninstall-vim
 - 	rm -f $(DESTDIR)/$(progdir)/asciidoc
 + install-vim:
 +-	@for d in $(DESTDIR)/$(vimdir) /etc/vim; do \
 +-		if ! test -d $$d; then continue; fi ; \
 ++	@for d in $(DESTDIR)/$(vimdir); do \
 + 		echo "installing Vim files in $$d" ; \
 + 		$(INSTALL) -d $$d/syntax ; \
 + 		$(INSTALL_DATA) vim/syntax/asciidoc.vim $$d/syntax ; \
 +@@ -155,8 +154,7 @@
 + 	done
 + 
 + uninstall-vim:
 +-	@for d in $(DESTDIR)/$(vimdir) /etc/vim; do \
 +-		if ! test -d $$d; then continue; fi ; \
 ++	@for d in $(DESTDIR)/$(vimdir); do \
 + 		echo "uninstalling Vim files in $$d" ; \
 + 		rm -f $$d/syntax/asciidoc.vim ; \
 + 		rm -f $$d/ftdetect/asciidoc_filetype.vim ; \
 diff -urN /usr/ports/textproc/asciidoc/pkg-descr textproc/asciidoc/pkg-descr
 --- /usr/ports/textproc/asciidoc/pkg-descr	2011-10-24 13:17:03.000000000 +0900
 +++ textproc/asciidoc/pkg-descr	2012-07-15 02:36:25.000000000 +0900
 @@ -2,6 +2,4 @@
  and UNIX man pages. AsciiDoc files can be translated to HTML and DocBook
  markups using the asciidoc(1) command.
  
 -This port currently does not install the VIM syntax highlighting mode.
 -
  WWW: http://www.methods.co.nz/asciidoc/
 diff -urN /usr/ports/textproc/asciidoc/pkg-plist textproc/asciidoc/pkg-plist
 --- /usr/ports/textproc/asciidoc/pkg-plist	2012-08-18 16:49:51.000000000 +0900
 +++ textproc/asciidoc/pkg-plist	2012-08-18 21:33:28.000000000 +0900
 @@ -3,8 +3,8 @@
  bin/asciidoc
  bin/asciidoc.py
  @unexec if cmp -s %D/%%ETCDIR%%/asciidoc.conf.sample %D/%%ETCDIR%%/asciidoc.conf; then rm -f %D/%%ETCDIR%%/asciidoc.conf; fi
 -%%ETCDIR%%/asciidoc.conf.sample
  @exec if [ ! -f %D/%%ETCDIR%%/asciidoc.conf ] ; then cp -p %D/%F %B/asciidoc.conf; fi
 +%%ETCDIR%%/asciidoc.conf.sample
  %%ETCDIR%%/dblatex/asciidoc-dblatex.sty
  %%ETCDIR%%/dblatex/asciidoc-dblatex.xsl
  %%ETCDIR%%/docbook-xsl/chunked.xsl
 @@ -16,33 +16,33 @@
  %%ETCDIR%%/docbook-xsl/text.xsl
  %%ETCDIR%%/docbook-xsl/xhtml.xsl
  @unexec if cmp -s %D/%%ETCDIR%%/docbook45.conf.sample %D/%%ETCDIR%%/docbook45.conf; then rm -f %D/%%ETCDIR%%/docbook45.conf; fi
 -%%ETCDIR%%/docbook45.conf.sample
  @exec if [ ! -f %D/%%ETCDIR%%/docbook45.conf ] ; then cp -p %D/%F %B/docbook45.conf; fi
 +%%ETCDIR%%/docbook45.conf.sample
  @unexec if cmp -s %D/%%ETCDIR%%/filters/code/code-filter.conf.sample %D/%%ETCDIR%%/filters/code/code-filter.conf; then rm -f %D/%%ETCDIR%%/filters/code/code-filter.conf; fi
 -%%ETCDIR%%/filters/code/code-filter.conf.sample
  @exec if [ ! -f %D/%%ETCDIR%%/filters/code/code-filter.conf ] ; then cp -p %D/%F %B/code-filter.conf; fi
 +%%ETCDIR%%/filters/code/code-filter.conf.sample
  %%ETCDIR%%/filters/code/code-filter.py
  @unexec if cmp -s %D/%%ETCDIR%%/filters/graphviz/graphviz-filter.conf.sample %D/%%ETCDIR%%/filters/graphviz/graphviz-filter.conf; then rm -f %D/%%ETCDIR%%/filters/graphviz/graphviz-filter.conf; fi
 -%%ETCDIR%%/filters/graphviz/graphviz-filter.conf.sample
  @exec if [ ! -f %D/%%ETCDIR%%/filters/graphviz/graphviz-filter.conf ] ; then cp -p %D/%F %B/graphviz-filter.conf; fi
 +%%ETCDIR%%/filters/graphviz/graphviz-filter.conf.sample
  %%ETCDIR%%/filters/graphviz/graphviz2png.py
  @unexec if cmp -s %D/%%ETCDIR%%/filters/latex/latex-filter.conf.sample %D/%%ETCDIR%%/filters/latex/latex-filter.conf; then rm -f %D/%%ETCDIR%%/filters/latex/latex-filter.conf; fi
 -%%ETCDIR%%/filters/latex/latex-filter.conf.sample
  @exec if [ ! -f %D/%%ETCDIR%%/filters/latex/latex-filter.conf ] ; then cp -p %D/%F %B/latex-filter.conf; fi
 +%%ETCDIR%%/filters/latex/latex-filter.conf.sample
  %%ETCDIR%%/filters/latex/latex2png.py
  @unexec if cmp -s %D/%%ETCDIR%%/filters/music/music-filter.conf.sample %D/%%ETCDIR%%/filters/music/music-filter.conf; then rm -f %D/%%ETCDIR%%/filters/music/music-filter.conf; fi
 -%%ETCDIR%%/filters/music/music-filter.conf.sample
  @exec if [ ! -f %D/%%ETCDIR%%/filters/music/music-filter.conf ] ; then cp -p %D/%F %B/music-filter.conf; fi
 +%%ETCDIR%%/filters/music/music-filter.conf.sample
  %%ETCDIR%%/filters/music/music2png.py
  @unexec if cmp -s %D/%%ETCDIR%%/filters/source/source-highlight-filter.conf.sample %D/%%ETCDIR%%/filters/source/source-highlight-filter.conf; then rm -f %D/%%ETCDIR%%/filters/source/source-highlight-filter.conf; fi
 -%%ETCDIR%%/filters/source/source-highlight-filter.conf.sample
  @exec if [ ! -f %D/%%ETCDIR%%/filters/source/source-highlight-filter.conf ] ; then cp -p %D/%F %B/source-highlight-filter.conf; fi
 +%%ETCDIR%%/filters/source/source-highlight-filter.conf.sample
  @unexec if cmp -s %D/%%ETCDIR%%/help.conf.sample %D/%%ETCDIR%%/help.conf; then rm -f %D/%%ETCDIR%%/help.conf; fi
 -%%ETCDIR%%/help.conf.sample
  @exec if [ ! -f %D/%%ETCDIR%%/help.conf ] ; then cp -p %D/%F %B/help.conf; fi
 +%%ETCDIR%%/help.conf.sample
  @unexec if cmp -s %D/%%ETCDIR%%/html4.conf.sample %D/%%ETCDIR%%/html4.conf; then rm -f %D/%%ETCDIR%%/html4.conf; fi
 -%%ETCDIR%%/html4.conf.sample
  @exec if [ ! -f %D/%%ETCDIR%%/html4.conf ] ; then cp -p %D/%F %B/html4.conf; fi
 +%%ETCDIR%%/html4.conf.sample
  @unexec if cmp -s %D/%%ETCDIR%%/html5.conf.sample %D/%%ETCDIR%%/html5.conf; then rm -f %D/%%ETCDIR%%/html5.conf; fi
  %%ETCDIR%%/html5.conf.sample
  @exec if [ ! -f %D/%%ETCDIR%%/html5.conf ] ; then cp -p %D/%F %B/html5.conf; fi
 @@ -78,75 +78,85 @@
  %%ETCDIR%%/javascripts/slidy.js
  %%ETCDIR%%/javascripts/toc.js
  @unexec if cmp -s %D/%%ETCDIR%%/lang-de.conf.sample %D/%%ETCDIR%%/lang-de.conf; then rm -f %D/%%ETCDIR%%/lang-de.conf; fi
 -%%ETCDIR%%/lang-de.conf.sample
  @exec if [ ! -f %D/%%ETCDIR%%/lang-de.conf ] ; then cp -p %D/%F %B/lang-de.conf; fi
 +%%ETCDIR%%/lang-de.conf.sample
 +@unexec if cmp -s %D/%%ETCDIR%%/lang-el.conf.sample %D/%%ETCDIR%%/lang-el.conf; then rm -f %D/%%ETCDIR%%/lang-el.conf; fi
 +@exec if [ ! -f %D/%%ETCDIR%%/lang-el.conf ] ; then cp -p %D/%F %B/lang-el.conf; fi
 +%%ETCDIR%%/lang-el.conf.sample
  @unexec if cmp -s %D/%%ETCDIR%%/lang-en.conf.sample %D/%%ETCDIR%%/lang-en.conf; then rm -f %D/%%ETCDIR%%/lang-en.conf; fi
 -%%ETCDIR%%/lang-en.conf.sample
  @exec if [ ! -f %D/%%ETCDIR%%/lang-en.conf ] ; then cp -p %D/%F %B/lang-en.conf; fi
 +%%ETCDIR%%/lang-en.conf.sample
  @unexec if cmp -s %D/%%ETCDIR%%/lang-es.conf.sample %D/%%ETCDIR%%/lang-es.conf; then rm -f %D/%%ETCDIR%%/lang-es.conf; fi
 -%%ETCDIR%%/lang-es.conf.sample
  @exec if [ ! -f %D/%%ETCDIR%%/lang-es.conf ] ; then cp -p %D/%F %B/lang-es.conf; fi
 +%%ETCDIR%%/lang-es.conf.sample
  @unexec if cmp -s %D/%%ETCDIR%%/lang-fr.conf.sample %D/%%ETCDIR%%/lang-fr.conf; then rm -f %D/%%ETCDIR%%/lang-fr.conf; fi
 -%%ETCDIR%%/lang-fr.conf.sample
  @exec if [ ! -f %D/%%ETCDIR%%/lang-fr.conf ] ; then cp -p %D/%F %B/lang-fr.conf; fi
 +%%ETCDIR%%/lang-fr.conf.sample
  @unexec if cmp -s %D/%%ETCDIR%%/lang-hu.conf.sample %D/%%ETCDIR%%/lang-hu.conf; then rm -f %D/%%ETCDIR%%/lang-hu.conf; fi
 -%%ETCDIR%%/lang-hu.conf.sample
  @exec if [ ! -f %D/%%ETCDIR%%/lang-hu.conf ] ; then cp -p %D/%F %B/lang-hu.conf; fi
 +%%ETCDIR%%/lang-hu.conf.sample
 +
  @unexec if cmp -s %D/%%ETCDIR%%/lang-it.conf.sample %D/%%ETCDIR%%/lang-it.conf; then rm -f %D/%%ETCDIR%%/lang-it.conf; fi
 -%%ETCDIR%%/lang-it.conf.sample
  @exec if [ ! -f %D/%%ETCDIR%%/lang-it.conf ] ; then cp -p %D/%F %B/lang-it.conf; fi
 +%%ETCDIR%%/lang-it.conf.sample
  @unexec if cmp -s %D/%%ETCDIR%%/lang-nl.conf.sample %D/%%ETCDIR%%/lang-nl.conf; then rm -f %D/%%ETCDIR%%/lang-nl.conf; fi
 -%%ETCDIR%%/lang-nl.conf.sample
  @exec if [ ! -f %D/%%ETCDIR%%/lang-nl.conf ] ; then cp -p %D/%F %B/lang-nl.conf; fi
 +%%ETCDIR%%/lang-nl.conf.sample
  @unexec if cmp -s %D/%%ETCDIR%%/lang-pt-BR.conf.sample %D/%%ETCDIR%%/lang-pt-BR.conf; then rm -f %D/%%ETCDIR%%/lang-pt-BR.conf; fi
 -%%ETCDIR%%/lang-pt-BR.conf.sample
  @exec if [ ! -f %D/%%ETCDIR%%/lang-pt-BR.conf ] ; then cp -p %D/%F %B/lang-pt-BR.conf; fi
 +%%ETCDIR%%/lang-pt-BR.conf.sample
  @unexec if cmp -s %D/%%ETCDIR%%/lang-ru.conf.sample %D/%%ETCDIR%%/lang-ru.conf; then rm -f %D/%%ETCDIR%%/lang-ru.conf; fi
 -%%ETCDIR%%/lang-ru.conf.sample
  @exec if [ ! -f %D/%%ETCDIR%%/lang-ru.conf ] ; then cp -p %D/%F %B/lang-ru.conf; fi
 +%%ETCDIR%%/lang-ru.conf.sample
  @unexec if cmp -s %D/%%ETCDIR%%/lang-uk.conf.sample %D/%%ETCDIR%%/lang-uk.conf; then rm -f %D/%%ETCDIR%%/lang-uk.conf; fi
 -%%ETCDIR%%/lang-uk.conf.sample
  @exec if [ ! -f %D/%%ETCDIR%%/lang-uk.conf ] ; then cp -p %D/%F %B/lang-uk.conf; fi
 +%%ETCDIR%%/lang-uk.conf.sample
  @unexec if cmp -s %D/%%ETCDIR%%/latex.conf.sample %D/%%ETCDIR%%/latex.conf; then rm -f %D/%%ETCDIR%%/latex.conf; fi
 -%%ETCDIR%%/latex.conf.sample
  @exec if [ ! -f %D/%%ETCDIR%%/latex.conf ] ; then cp -p %D/%F %B/latex.conf; fi
 +%%ETCDIR%%/latex.conf.sample
  @unexec if cmp -s %D/%%ETCDIR%%/slidy.conf.sample %D/%%ETCDIR%%/slidy.conf; then rm -f %D/%%ETCDIR%%/slidy.conf; fi
 -%%ETCDIR%%/slidy.conf.sample
  @exec if [ ! -f %D/%%ETCDIR%%/slidy.conf ] ; then cp -p %D/%F %B/slidy.conf; fi
 +%%ETCDIR%%/slidy.conf.sample
  %%ETCDIR%%/stylesheets/asciidoc.css
  %%ETCDIR%%/stylesheets/docbook-xsl.css
  %%ETCDIR%%/stylesheets/pygments.css
  %%ETCDIR%%/stylesheets/slidy.css
  %%ETCDIR%%/stylesheets/toc2.css
  %%ETCDIR%%/stylesheets/xhtml11-quirks.css
 -%%ETCDIR%%/themes/flask/flask.css
 -%%ETCDIR%%/themes/volnitsky/volnitsky.css
  @unexec if cmp -s %D/%%ETCDIR%%/text.conf.sample %D/%%ETCDIR%%/text.conf; then rm -f %D/%%ETCDIR%%/text.conf; fi
 -%%ETCDIR%%/text.conf.sample
  @exec if [ ! -f %D/%%ETCDIR%%/text.conf ] ; then cp -p %D/%F %B/text.conf; fi
 +%%ETCDIR%%/text.conf.sample
 +%%ETCDIR%%/themes/flask/flask.css
 +%%ETCDIR%%/themes/volnitsky/volnitsky.css
  @unexec if cmp -s %D/%%ETCDIR%%/wordpress.conf.sample %D/%%ETCDIR%%/wordpress.conf; then rm -f %D/%%ETCDIR%%/wordpress.conf; fi
 -%%ETCDIR%%/wordpress.conf.sample
  @exec if [ ! -f %D/%%ETCDIR%%/wordpress.conf ] ; then cp -p %D/%F %B/wordpress.conf; fi
 -@unexec if cmp -s %D/%%ETCDIR%%/xhtml11-quirks.conf.sample %D/%%ETCDIR%%/xhtml11-quirks.conf; then rm -f %D/%%ETCDIR%%/xhtml11-quirks.conf; fi
 -%%ETCDIR%%/xhtml11-quirks.conf.sample
 -@exec if [ ! -f %D/%%ETCDIR%%/xhtml11-quirks.conf ] ; then cp -p %D/%F %B/xhtml11-quirks.conf; fi
 +%%ETCDIR%%/wordpress.conf.sample
  @unexec if cmp -s %D/%%ETCDIR%%/xhtml11.conf.sample %D/%%ETCDIR%%/xhtml11.conf; then rm -f %D/%%ETCDIR%%/xhtml11.conf; fi
  %%ETCDIR%%/xhtml11.conf.sample
  @exec if [ ! -f %D/%%ETCDIR%%/xhtml11.conf ] ; then cp -p %D/%F %B/xhtml11.conf; fi
 -@dirrm %%ETCDIR%%/dblatex
 -@dirrm %%ETCDIR%%/docbook-xsl
 -@dirrmtry %%ETCDIR%%/filters/code
 -@dirrmtry %%ETCDIR%%/filters/graphviz
 -@dirrmtry %%ETCDIR%%/filters/latex
 -@dirrmtry %%ETCDIR%%/filters/music
 -@dirrmtry %%ETCDIR%%/filters/source
 -@dirrmtry %%ETCDIR%%/filters
 +@unexec if cmp -s %D/%%ETCDIR%%/xhtml11-quirks.conf.sample %D/%%ETCDIR%%/xhtml11-quirks.conf; then rm -f %D/%%ETCDIR%%/xhtml11-quirks.conf; fi
 +@exec if [ ! -f %D/%%ETCDIR%%/xhtml11-quirks.conf ] ; then cp -p %D/%F %B/xhtml11-quirks.conf; fi
 +%%ETCDIR%%/xhtml11-quirks.conf.sample
 +share/vim/vimfiles/ftdetect/asciidoc_filetype.vim
 +share/vim/vimfiles/syntax/asciidoc.vim
 +@dirrmtry share/vim/vimfiles/syntax
 +@dirrmtry share/vim/vimfiles/ftdetect
 +@dirrmtry share/vim/vimfiles
 +@dirrmtry share/vim
 +@dirrm %%ETCDIR%%/themes/volnitsky
 +@dirrm %%ETCDIR%%/themes/flask
 +@dirrm %%ETCDIR%%/themes
 +@dirrm %%ETCDIR%%/stylesheets
 +@dirrm %%ETCDIR%%/javascripts
  @dirrm %%ETCDIR%%/images/icons/callouts
  @dirrm %%ETCDIR%%/images/icons
  @dirrm %%ETCDIR%%/images
 -@dirrm %%ETCDIR%%/javascripts
 -@dirrm %%ETCDIR%%/stylesheets
 -@dirrm %%ETCDIR%%/themes/flask
 -@dirrm %%ETCDIR%%/themes/volnitsky
 -@dirrm %%ETCDIR%%/themes
 +@dirrmtry %%ETCDIR%%/filters/source
 +@dirrmtry %%ETCDIR%%/filters/music
 +@dirrmtry %%ETCDIR%%/filters/latex
 +@dirrmtry %%ETCDIR%%/filters/graphviz
 +@dirrmtry %%ETCDIR%%/filters/code
 +@dirrmtry %%ETCDIR%%/filters
 +@dirrm %%ETCDIR%%/docbook-xsl
 +@dirrm %%ETCDIR%%/dblatex
  @dirrmtry %%ETCDIR%%
 
 --Multipart=_Sat__18_Aug_2012_21_56_18_+0900_ZfZRG1k1Mm_+G_fa--
Responsible-Changed-From-To: miwi->freebsd-ports-bugs 
Responsible-Changed-By: bapt 
Responsible-Changed-When: Mon Oct 29 09:53:35 UTC 2012 
Responsible-Changed-Why:  
Reassign to the heap miwi being overloaded for now 

http://www.freebsd.org/cgi/query-pr.cgi?pr=170170 
Responsible-Changed-From-To: freebsd-ports-bugs->sperber 
Responsible-Changed-By: sperber 
Responsible-Changed-When: Mon Oct 29 17:55:39 UTC 2012 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=170170 
State-Changed-From-To: open->closed 
State-Changed-By: sperber 
State-Changed-When: Sat Dec 1 08:50:39 UTC 2012 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=170170 
>Unformatted:
