Attachment 126418 Details for Bug 170170 – file.diff

[patch] file.diff

file.diff (text/plain), 10.99 KB, created by tkato432 on 2012-07-25 19:10:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2012-07-25 19:10:18 UTC

Size: 10.99 KB

patch

obsolete

>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%%

Actions: View | Diff

Attachments on bug 170170: 126418 | 126419