[Midnightbsd-cvs] mports [20546] trunk/textproc: update a large number of textproc ports

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Mon Oct 19 13:07:07 EDT 2015


Revision: 20546
          http://svnweb.midnightbsd.org/mports/?rev=20546
Author:   laffer1
Date:     2015-10-19 13:07:06 -0400 (Mon, 19 Oct 2015)
Log Message:
-----------
update a large number of textproc ports

Modified Paths:
--------------
    trunk/textproc/Makefile
    trunk/textproc/agrep/Makefile
    trunk/textproc/agrep/pkg-plist
    trunk/textproc/aspell/Makefile
    trunk/textproc/aspell/Makefile.inc
    trunk/textproc/aspell/files/aspell.ver.in
    trunk/textproc/aspell/files/patch-configure
    trunk/textproc/aspell/pkg-plist
    trunk/textproc/bsdgrep/Makefile
    trunk/textproc/bsdgrep/pkg-descr
    trunk/textproc/bsdgrep/pkg-plist
    trunk/textproc/cdiff/Makefile
    trunk/textproc/cdiff/pkg-descr
    trunk/textproc/clucene/Makefile
    trunk/textproc/clucene/files/patch-src__core__CLucene__index__IndexWriter.cpp
    trunk/textproc/clucene/files/patch-src__core__CLucene__util__VoidMap.h
    trunk/textproc/clucene/pkg-plist
    trunk/textproc/docbook/Makefile
    trunk/textproc/docbook-sgml/Makefile
    trunk/textproc/docbook-to-man/Makefile
    trunk/textproc/docbook-to-man/pkg-plist
    trunk/textproc/docbook-utils/Makefile
    trunk/textproc/docbook-utils/pkg-plist
    trunk/textproc/dsssl-docbook-modular/Makefile
    trunk/textproc/dsssl-docbook-modular/distinfo
    trunk/textproc/dsssl-docbook-modular/pkg-plist
    trunk/textproc/easydiff/Makefile
    trunk/textproc/ebook-tools/distinfo
    trunk/textproc/localize/Makefile
    trunk/textproc/py-libxml2/Makefile
    trunk/textproc/py-sphinx/Makefile
    trunk/textproc/py-sphinx/distinfo
    trunk/textproc/py-xml/Makefile

Added Paths:
-----------
    trunk/textproc/aspell/files/patch-interfaces__cc__aspell.h
    trunk/textproc/aspell/files/patch-prog__aspell.cpp
    trunk/textproc/aspell/files/patch-prog__checker_string.cpp
    trunk/textproc/aspell/files/patch-prog__checker_string.hpp
    trunk/textproc/cdiff/distinfo
    trunk/textproc/clucene/files/patch-src__contribs-lib__CLucene__analysis__cjk__CJKAnalyzer.h
    trunk/textproc/clucene/files/patch-src__contribs-lib__CLucene__snowball__Snowball.cpp
    trunk/textproc/clucene/files/patch-src__contribs-lib__CLucene__snowball__SnowballAnalyzer.h
    trunk/textproc/clucene/files/patch-src__contribs-lib__CLucene__snowball__libstemmer__libstemmer.c
    trunk/textproc/clucene/files/patch-src__core__CLucene__analysis__AnalysisHeader.cpp
    trunk/textproc/clucene/files/patch-src__core__CLucene__index__DocumentsWriterThreadState.cpp
    trunk/textproc/clucene/files/patch-src__core__CLucene__index__IndexFileDeleter.cpp
    trunk/textproc/clucene/files/patch-src__core__CLucene__index__IndexWriter.h
    trunk/textproc/clucene/files/patch-src__core__CLucene__index__TermInfosReader.cpp
    trunk/textproc/clucene/files/patch-src__core__CLucene__queryParser__QueryParser.cpp
    trunk/textproc/clucene/files/patch-src__core__CLucene__queryParser__QueryParserTokenManager.cpp
    trunk/textproc/clucene/files/patch-src__core__CLucene__queryParser__legacy__Lexer.cpp
    trunk/textproc/clucene/files/patch-src__core__CLucene__store__FSDirectory.cpp
    trunk/textproc/clucene/files/patch-src__core__CLucene__store__IndexInput.cpp
    trunk/textproc/clucene/files/patch-src__core__CLucene__util__BitSet.cpp
    trunk/textproc/clucene/files/patch-src__core__CLucene__util__BitSet.h
    trunk/textproc/clucene/files/patch-src__core__libclucene-core.pc.cmake
    trunk/textproc/clucene/files/patch-src__shared__CLucene__LuceneThreads.h
    trunk/textproc/clucene/files/patch-src__shared__cmake__CheckHashmaps.cmake
    trunk/textproc/py-alabaster/
    trunk/textproc/py-alabaster/Makefile
    trunk/textproc/py-alabaster/distinfo
    trunk/textproc/py-alabaster/pkg-descr
    trunk/textproc/py-pystemmer/
    trunk/textproc/py-pystemmer/Makefile
    trunk/textproc/py-pystemmer/distinfo
    trunk/textproc/py-pystemmer/pkg-descr
    trunk/textproc/py-snowballstemmer/
    trunk/textproc/py-snowballstemmer/Makefile
    trunk/textproc/py-snowballstemmer/distinfo
    trunk/textproc/py-snowballstemmer/pkg-descr
    trunk/textproc/py-sphinx_rtd_theme/
    trunk/textproc/py-sphinx_rtd_theme/Makefile
    trunk/textproc/py-sphinx_rtd_theme/distinfo
    trunk/textproc/py-sphinx_rtd_theme/pkg-descr

Removed Paths:
-------------
    trunk/textproc/alt-aspell-de/
    trunk/textproc/aspell/files/patch-prog::checker_string.cpp
    trunk/textproc/aspell-de/
    trunk/textproc/cdiff/src/

Property Changed:
----------------
    trunk/textproc/aspell/files/aspell.ver.in
    trunk/textproc/aspell/files/patch-Makefile.in
    trunk/textproc/aspell/files/patch-configure
    trunk/textproc/aspell/files/patch-modules__speller__default__affix.cpp
    trunk/textproc/clucene/files/patch-CMakeLists.txt
    trunk/textproc/clucene/files/patch-src__contribs-lib__CLucene__analysis__de__GermanStemmer.cpp
    trunk/textproc/clucene/files/patch-src__contribs-lib__CLucene__highlighter__Highlighter.cpp
    trunk/textproc/clucene/files/patch-src__contribs-lib__CLucene__highlighter__WeightedTerm.cpp
    trunk/textproc/clucene/files/patch-src__contribs-lib__CMakeLists.txt
    trunk/textproc/clucene/files/patch-src__core__CLucene__index__DocumentsWriter.cpp
    trunk/textproc/clucene/files/patch-src__core__CLucene__index__IndexWriter.cpp
    trunk/textproc/clucene/files/patch-src__core__CLucene__search__ConstantScoreQuery.cpp
    trunk/textproc/clucene/files/patch-src__core__CLucene__util__MD5Digester.cpp
    trunk/textproc/clucene/files/patch-src__core__CLucene__util__VoidMap.h
    trunk/textproc/clucene/files/patch-src__core__CMakeLists.txt
    trunk/textproc/clucene/files/patch-src__shared__CMakeLists.txt
    trunk/textproc/clucene/files/patch-src__shared__cmake__MacroCheckGccVisibility.cmake

Modified: trunk/textproc/Makefile
===================================================================
--- trunk/textproc/Makefile	2015-10-18 17:06:10 UTC (rev 20545)
+++ trunk/textproc/Makefile	2015-10-19 17:07:06 UTC (rev 20546)
@@ -3,10 +3,8 @@
 COMMENT = Text processing utilities (does not include desktop publishing)
 
 SUBDIR += agrep
-SUBDIR += alt-aspell-de
 SUBDIR += asciidoc
 SUBDIR += aspell
-SUBDIR += aspell-de
 SUBDIR += aspell-ispell
 SUBDIR += bsdgrep
 SUBDIR += cdiff
@@ -135,12 +133,16 @@
 SUBDIR += php5-xsl
 SUBDIR += popup
 SUBDIR += py-MarkupSafe
+SUBDIR += py-alabaster
 SUBDIR += py-docutils
 SUBDIR += py-libxml2
 SUBDIR += py-pygments
+SUBDIR += py-pystemmer
 SUBDIR += py-rdflib
+SUBDIR += py-snowballstemmer
 SUBDIR += py-sparqlwrapper
 SUBDIR += py-sphinx
+SUBDIR += py-sphinx_rtd_theme
 SUBDIR += py-xml
 SUBDIR += qt4-xml
 SUBDIR += qt4-xmlpatterns

Modified: trunk/textproc/agrep/Makefile
===================================================================
--- trunk/textproc/agrep/Makefile	2015-10-18 17:06:10 UTC (rev 20545)
+++ trunk/textproc/agrep/Makefile	2015-10-19 17:07:06 UTC (rev 20546)
@@ -2,7 +2,7 @@
 
 PORTNAME=	agrep
 PORTVERSION=	2.04
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc
 MASTER_SITES=	ftp://ftp.cs.arizona.edu/agrep/
 EXTRACT_SUFX=	.tar.Z
@@ -21,7 +21,6 @@
 
 ALL_TARGET=
 MAKE_ARGS=	CFLAGS="${CFLAGS}"
-MAN1=		agrep.1
 PORTDOCS=	COPYRIGHT agrep.algorithms agrep.ps.1.Z agrep.ps.2.Z
 
 post-extract:

Modified: trunk/textproc/agrep/pkg-plist
===================================================================
--- trunk/textproc/agrep/pkg-plist	2015-10-18 17:06:10 UTC (rev 20545)
+++ trunk/textproc/agrep/pkg-plist	2015-10-19 17:07:06 UTC (rev 20546)
@@ -1,3 +1,4 @@
 bin/agrep
+man/man1/agrep.1.gz
 %%DOCSDIR%%/agrep.algorithms
 @dirrm %%DOCSDIR%%

Modified: trunk/textproc/aspell/Makefile
===================================================================
--- trunk/textproc/aspell/Makefile	2015-10-18 17:06:10 UTC (rev 20545)
+++ trunk/textproc/aspell/Makefile	2015-10-19 17:07:06 UTC (rev 20546)
@@ -2,12 +2,13 @@
 
 PORTNAME=	aspell
 PORTVERSION=	0.60.6.1
+PORTREVISION=	1
 CATEGORIES=	textproc
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	aspell
+MASTER_SITES=	GNU/aspell
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	Spelling checker with better suggestion logic than ispell
+
 LICENSE=	lgpl2.1
 
 OPTIONS_DEFINE=	NLS DOCS ISPELL
@@ -20,10 +21,11 @@
 			--enable-curses=ncursesw \
 			--enable-static
 
-USE_GMAKE=		yes
-USE_ICONV=		yes
+USES=         cpe gmake iconv libtool perl5 shebangfix
+USE_LDCONFIG= yes
+SHEBANG_FILES=        scripts/aspell-import
+CPE_VENDOR=   gnu
 USE_PERL5_BUILD=	yes
-USE_LDCONFIG=		yes
 
 MAKE_ARGS=		NOPORTDOCS=${NOPORTDOCS}
 VERINST=		${PORTVERSION:R:R}

Modified: trunk/textproc/aspell/Makefile.inc
===================================================================
--- trunk/textproc/aspell/Makefile.inc	2015-10-18 17:06:10 UTC (rev 20545)
+++ trunk/textproc/aspell/Makefile.inc	2015-10-19 17:07:06 UTC (rev 20546)
@@ -1,18 +1,13 @@
 # $FreeBSD: ports/textproc/aspell/Makefile.inc,v 1.1 2006/07/15 14:28:41 thierry Exp $
 # To be included by dictionaries ports.
 
-MASTER_SITES?=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR?=	aspell/dict/${DICT}
+MASTER_SITES?=	GNU/aspell/dict/${DICT}
 DISTNAME?=	aspell${DISTVERSION}
+PORTVERSION?=	${DISTVERSION:tl:C/cvs/0_/:C/pt_../p/:C/[0-9]?-?[a-z]+-//g:C/([0-9])([a-z])/\1.\2/g:C/:(.)/\1/g:C/[^a-z0-9+]+/./g}
 
-.if ${PORTNAME} == "en-aspell" || defined(WITHOUT_DICTEN)
-LIB_DEPENDS=	aspell:${PORTSDIR}/textproc/aspell-without-dicten
-.else
-LIB_DEPENDS=	aspell:${PORTSDIR}/textproc/aspell
-.endif
+LIB_DEPENDS=	libaspell.so:${PORTSDIR}/textproc/aspell
 
-USE_BZIP2=	yes
-USE_GMAKE=	yes
+USES+=		gmake tar:bzip2
 HAS_CONFIGURE=	yes
 
 PLIST_SUB=	VER=${VER}

Modified: trunk/textproc/aspell/files/aspell.ver.in
===================================================================
--- trunk/textproc/aspell/files/aspell.ver.in	2015-10-18 17:06:10 UTC (rev 20545)
+++ trunk/textproc/aspell/files/aspell.ver.in	2015-10-19 17:07:06 UTC (rev 20546)
@@ -1,3 +1,3 @@
-# $FreeBSD$
+# $FreeBSD: head/textproc/aspell/files/aspell.ver.in 340872 2014-01-24 00:14:07Z mat $
 # Installed by textproc/aspell, please don't edit manually!
 VER=	%%VERINST%%


Property changes on: trunk/textproc/aspell/files/aspell.ver.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Index: trunk/textproc/aspell/files/patch-Makefile.in
===================================================================
--- trunk/textproc/aspell/files/patch-Makefile.in	2015-10-18 17:06:10 UTC (rev 20545)
+++ trunk/textproc/aspell/files/patch-Makefile.in	2015-10-19 17:07:06 UTC (rev 20546)

Property changes on: trunk/textproc/aspell/files/patch-Makefile.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.5
\ No newline at end of property
Modified: trunk/textproc/aspell/files/patch-configure
===================================================================
--- trunk/textproc/aspell/files/patch-configure	2015-10-18 17:06:10 UTC (rev 20545)
+++ trunk/textproc/aspell/files/patch-configure	2015-10-19 17:07:06 UTC (rev 20546)
@@ -9,18 +9,7 @@
  then
    CXXFLAGS="$CXXFLAGS -fno-exceptions"
  fi
-@@ -8101,6 +8101,10 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ltmain"
-+save_CC="$CC"
-+CC="$CXX"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
-+CC="$save_CC"
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -18179,7 +18183,7 @@
+@@ -18179,7 +18179,7 @@
    CURSES_LIB=-lncurses
  
  cat >>confdefs.h <<\_ACEOF
@@ -29,7 +18,7 @@
  _ACEOF
  
  else
-@@ -18366,8 +18370,8 @@
+@@ -18366,8 +18366,8 @@
       if test "$enable_wide_curses" != "no"
       then
  


Property changes on: trunk/textproc/aspell/files/patch-configure
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.4
\ No newline at end of property
Added: trunk/textproc/aspell/files/patch-interfaces__cc__aspell.h
===================================================================
--- trunk/textproc/aspell/files/patch-interfaces__cc__aspell.h	                        (rev 0)
+++ trunk/textproc/aspell/files/patch-interfaces__cc__aspell.h	2015-10-19 17:07:06 UTC (rev 20546)
@@ -0,0 +1,20 @@
+--- interfaces/cc/aspell.h.orig	2011-07-02 23:53:27.000000000 +0200
++++ interfaces/cc/aspell.h	2014-02-11 22:40:16.000000000 +0100
+@@ -236,7 +236,7 @@
+ 
+ /******************************** errors ********************************/
+ 
+-
++#ifndef ASPELL_ERRORS__HPP
+ extern const struct AspellErrorInfo * const aerror_other;
+ extern const struct AspellErrorInfo * const aerror_operation_not_supported;
+ extern const struct AspellErrorInfo * const   aerror_cant_copy;
+@@ -322,7 +322,7 @@
+ extern const struct AspellErrorInfo * const   aerror_bad_magic;
+ extern const struct AspellErrorInfo * const aerror_expression;
+ extern const struct AspellErrorInfo * const   aerror_invalid_expression;
+-
++#endif
+ 
+ /******************************* speller *******************************/
+ 


Property changes on: trunk/textproc/aspell/files/patch-interfaces__cc__aspell.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: trunk/textproc/aspell/files/patch-modules__speller__default__affix.cpp
===================================================================
--- trunk/textproc/aspell/files/patch-modules__speller__default__affix.cpp	2015-10-18 17:06:10 UTC (rev 20545)
+++ trunk/textproc/aspell/files/patch-modules__speller__default__affix.cpp	2015-10-19 17:07:06 UTC (rev 20546)

Property changes on: trunk/textproc/aspell/files/patch-modules__speller__default__affix.cpp
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: trunk/textproc/aspell/files/patch-prog::checker_string.cpp
===================================================================
--- trunk/textproc/aspell/files/patch-prog::checker_string.cpp	2015-10-18 17:06:10 UTC (rev 20545)
+++ trunk/textproc/aspell/files/patch-prog::checker_string.cpp	2015-10-19 17:07:06 UTC (rev 20546)
@@ -1,10 +0,0 @@
---- prog/checker_string.cpp.orig	Thu Jul 17 19:39:02 2003
-+++ prog/checker_string.cpp	Thu Jul 17 19:39:09 2003
-@@ -4,6 +4,7 @@
- // license along with this library if you did not you can find
- // it at http://www.gnu.org/.
- 
-+#include <assert.h>
- #include "checker_string.hpp"
- #include "speller.hpp"
- #include "document_checker.hpp"

Added: trunk/textproc/aspell/files/patch-prog__aspell.cpp
===================================================================
--- trunk/textproc/aspell/files/patch-prog__aspell.cpp	                        (rev 0)
+++ trunk/textproc/aspell/files/patch-prog__aspell.cpp	2015-10-19 17:07:06 UTC (rev 20546)
@@ -0,0 +1,18 @@
+--- prog/aspell.cpp.orig	2011-07-04 11:13:58.000000000 +0200
++++ prog/aspell.cpp	2014-02-11 22:42:04.000000000 +0100
+@@ -25,6 +25,7 @@
+ # include <langinfo.h>
+ #endif
+ 
++#include "errors.hpp"
+ #include "aspell.h"
+ 
+ #ifdef USE_FILE_INO
+@@ -40,7 +41,6 @@
+ #include "convert.hpp"
+ #include "document_checker.hpp"
+ #include "enumeration.hpp"
+-#include "errors.hpp"
+ #include "file_util.hpp"
+ #include "fstream.hpp"
+ #include "info.hpp"


Property changes on: trunk/textproc/aspell/files/patch-prog__aspell.cpp
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Copied: trunk/textproc/aspell/files/patch-prog__checker_string.cpp (from rev 20344, trunk/textproc/aspell/files/patch-prog::checker_string.cpp)
===================================================================
--- trunk/textproc/aspell/files/patch-prog__checker_string.cpp	                        (rev 0)
+++ trunk/textproc/aspell/files/patch-prog__checker_string.cpp	2015-10-19 17:07:06 UTC (rev 20546)
@@ -0,0 +1,10 @@
+--- prog/checker_string.cpp.orig	Thu Jul 17 19:39:02 2003
++++ prog/checker_string.cpp	Thu Jul 17 19:39:09 2003
+@@ -4,6 +4,7 @@
+ // license along with this library if you did not you can find
+ // it at http://www.gnu.org/.
+ 
++#include <assert.h>
+ #include "checker_string.hpp"
+ #include "speller.hpp"
+ #include "document_checker.hpp"

Added: trunk/textproc/aspell/files/patch-prog__checker_string.hpp
===================================================================
--- trunk/textproc/aspell/files/patch-prog__checker_string.hpp	                        (rev 0)
+++ trunk/textproc/aspell/files/patch-prog__checker_string.hpp	2015-10-19 17:07:06 UTC (rev 20546)
@@ -0,0 +1,10 @@
+--- prog/hecker_string.hpp.orig	2011-07-02 23:09:09.000000000 +0200
++++ prog/checker_string.hpp	2014-02-11 22:42:24.000000000 +0100
+@@ -6,6 +6,7 @@
+ 
+ #include <stdio.h>
+ 
++#include "errors.hpp"
+ #include "aspell.h"
+ 
+ #include "vector.hpp"


Property changes on: trunk/textproc/aspell/files/patch-prog__checker_string.hpp
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/textproc/aspell/pkg-plist
===================================================================
--- trunk/textproc/aspell/pkg-plist	2015-10-18 17:06:10 UTC (rev 20545)
+++ trunk/textproc/aspell/pkg-plist	2015-10-19 17:07:06 UTC (rev 20546)
@@ -1,6 +1,5 @@
 bin/aspell
 bin/aspell-import
-%%SCRIPTS%%bin/ispell
 bin/precat
 bin/preunzip
 bin/prezip
@@ -7,7 +6,6 @@
 bin/prezip-bin
 bin/pspell-config
 bin/run-with-aspell
-%%SCRIPTS%%bin/spell
 bin/word-list-compress
 etc/aspell.ver
 include/aspell.h
@@ -70,13 +68,19 @@
 lib/aspell-%%VER%%/split.kbd
 lib/aspell-%%VER%%/standard.kbd
 lib/libaspell.a
-lib/libaspell.la
 lib/libaspell.so
-lib/libaspell.so.16
+lib/libaspell.so.15
+lib/libaspell.so.15.1.5
 lib/libpspell.a
-lib/libpspell.la
 lib/libpspell.so
-lib/libpspell.so.16
+lib/libpspell.so.15
+lib/libpspell.so.15.1.5
+man/man1/aspell-import.1.gz
+man/man1/aspell.1.gz
+man/man1/prezip-bin.1.gz
+man/man1/pspell-config.1.gz
+man/man1/run-with-aspell.1.gz
+man/man1/word-list-compress.1.gz
 %%DATADIR%%/ccpp.amf
 %%DATADIR%%/comment.amf
 %%DATADIR%%/email.amf
@@ -118,12 +122,3 @@
 %%NLS%%share/locale/vi/LC_MESSAGES/aspell.mo
 %%NLS%%share/locale/wa/LC_MESSAGES/aspell.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/aspell.mo
- at dirrm include/pspell
-%%NLS%%@dirrmtry share/locale/zh_CN/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/zh_CN
-%%NLS%%@dirrmtry share/locale/rw/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/rw
-%%NLS%%@dirrmtry share/locale/fi/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/fi
-%%NLS%%@dirrmtry share/locale/ast/LC_MESSAGES
-%%NLS%%@dirrmtry share/locale/ast

Modified: trunk/textproc/bsdgrep/Makefile
===================================================================
--- trunk/textproc/bsdgrep/Makefile	2015-10-18 17:06:10 UTC (rev 20545)
+++ trunk/textproc/bsdgrep/Makefile	2015-10-19 17:07:06 UTC (rev 20546)
@@ -2,7 +2,7 @@
 
 PORTNAME=	grep
 PORTVERSION=	20111002
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_FREEBSD_LOCAL}
 MASTER_SITE_SUBDIR=	gabor
@@ -9,26 +9,10 @@
 PKGNAMEPREFIX=	bsd-
 
 MAINTAINER=	ports at MidnightBSD.org
-COMMENT=	BSD-licensed version of grep from OpenBSD
+COMMENT=	BSD-licensed version of grep
+
 LICENSE=	bsd3
 
-MANCOMPRESSED=	maybe
-MAN1=		grep.1
-MLINKS=		grep.1 bzegrep.1 \
-		grep.1 bzfgrep.1 \
-		grep.1 bzgrep.1 \
-		grep.1 egrep.1 \
-		grep.1 fgrep.1 \
-		grep.1 lzegrep.1 \
-		grep.1 lzfgrep.1 \
-		grep.1 lzgrep.1 \
-		grep.1 xzegrep.1 \
-		grep.1 xzfgrep.1 \
-		grep.1 xzgrep.1 \
-		grep.1 zgrep.1 \
-		grep.1 zegrep.1 \
-		grep.1 zfgrep.1
-
 MAKE_ENV+=	BINDIR="${PREFIX}/bin" \
 		MANDIR="${MANPREFIX}/man/man" \
 		CATDIR="${MANPREFIX}/man/man" \
@@ -42,13 +26,6 @@
 
 .include <bsd.port.pre.mk>
 
-.if !(${OSVERSION} >= 4016)
-LIB_DEPENDS+=	lzma.5:${PORTSDIR}/archivers/xz
-CFLAGS+=	-I${PREFIX}/include
-LDFLAGS+=	-L${PREFIX}/lib
-BROKEN=		overwrites files installed by dependency
-.endif
-
 .if ${PORT_OPTIONS:MNLS}
 PLIST_SUB+=	NLS=""
 .else
@@ -65,8 +42,4 @@
 	${MKDIR} ${PREFIX}/share/nls/gl_ES.ISO8859-1
 .endif
 
-post-install:
-	${LN} -s ${PREFIX}/bin/grep ${PREFIX}/bin/bsdgrep
-	${LN} -s /usr/bin/grep ${PREFIX}/bin/gnugrep
-
 .include <bsd.port.post.mk>

Modified: trunk/textproc/bsdgrep/pkg-descr
===================================================================
--- trunk/textproc/bsdgrep/pkg-descr	2015-10-18 17:06:10 UTC (rev 20545)
+++ trunk/textproc/bsdgrep/pkg-descr	2015-10-19 17:07:06 UTC (rev 20546)
@@ -2,3 +2,5 @@
 OpenBSD. It lacks some features of GNU grep. It is a proposed project idea
 to replace the GNU grep with this one, but it needs to be completed first.
 Patches are highly appreciated.
+
+WWW: http://www.freebsd.org/projects/ideas/#p-bsdtexttools

Modified: trunk/textproc/bsdgrep/pkg-plist
===================================================================
--- trunk/textproc/bsdgrep/pkg-plist	2015-10-18 17:06:10 UTC (rev 20545)
+++ trunk/textproc/bsdgrep/pkg-plist	2015-10-19 17:07:06 UTC (rev 20546)
@@ -1,12 +1,12 @@
- at exec /bin/ln -s %%PREFIX%%/bin/grep %%PREFIX%%/bin/bsdgrep
- at exec /bin/ln -s /usr/bin/grep %%PREFIX%%/bin/gnugrep
-bin/bsdgrep
+ at unexec rm -f %D/bin/bsdgrep
+ at exec /bin/ln -s %D/bin/grep %D/bin/bsdgrep
+ at unexec rm -f %D/bin/gnugrep
+ at exec /bin/ln -s /usr/bin/grep %D/bin/gnugrep
 bin/bzegrep
 bin/bzfgrep
 bin/bzgrep
 bin/egrep
 bin/fgrep
-bin/gnugrep
 bin/grep
 bin/lzegrep
 bin/lzfgrep
@@ -17,6 +17,21 @@
 bin/zgrep
 bin/zegrep
 bin/zfgrep
+man/man1/bzegrep.1.gz
+man/man1/bzfgrep.1.gz
+man/man1/bzgrep.1.gz
+man/man1/egrep.1.gz
+man/man1/fgrep.1.gz
+man/man1/grep.1.gz
+man/man1/lzegrep.1.gz
+man/man1/lzfgrep.1.gz
+man/man1/lzgrep.1.gz
+man/man1/xzegrep.1.gz
+man/man1/xzfgrep.1.gz
+man/man1/xzgrep.1.gz
+man/man1/zegrep.1.gz
+man/man1/zfgrep.1.gz
+man/man1/zgrep.1.gz
 %%NLS%%share/nls/es_ES.ISO8859-1/grep.cat
 %%NLS%%share/nls/gl_ES.ISO8859-1/grep.cat
 %%NLS%%share/nls/hu_HU.ISO8859-2/grep.cat
@@ -27,4 +42,3 @@
 %%NLS%%share/nls/ru_RU.KOI8-R/grep.cat
 %%NLS%%share/nls/uk_UA.UTF-8/grep.cat
 %%NLS%%share/nls/zh_CN.UTF-8/grep.cat
-%%NLS%%@dirrmtry share/nls/gl_ES.ISO8859-1

Modified: trunk/textproc/cdiff/Makefile
===================================================================
--- trunk/textproc/cdiff/Makefile	2015-10-18 17:06:10 UTC (rev 20545)
+++ trunk/textproc/cdiff/Makefile	2015-10-19 17:07:06 UTC (rev 20546)
@@ -1,38 +1,30 @@
-# New ports collection makefile for:		cdiff
-# Date created:					September 20th 2000
-# Whom:						eivind
-#
 # $MidnightBSD$
 # $FreeBSD: ports/textproc/cdiff/Makefile,v 1.9 2006/09/04 08:17:26 linimon Exp $
-#
-# This port is self contained in the src directory.
-#
 
 PORTNAME=	cdiff
-PORTVERSION=	1.5
+PORTVERSION=	0.9.7
+PORTEPOCH=	1
+MASTER_SITES=	FREEBSD_LOCAL/mat/cdiff GH
 CATEGORIES=	textproc
-MASTER_SITES=	# none
-DISTFILES=	# none
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	Diff readability enhancher for color terminals
+
 LICENSE=	bsd3
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
-NO_BUILD=	yes
-NO_WRKSUBDIR=	yes
-USE_PERL5=	yes
-MAKE_JOBS_SAFE=	yes
+USE_GITHUB=
+GH_ACCOUNT=	ymattw
 
-SRC=		${.CURDIR}/src
+USES=		python
+USE_PYTHON=	distutils autoplist
 
-MAN1=		cdiff.1
-PLIST_FILES=	bin/cdiff
+OPTIONS_DEFINE=	DOCS
 
-do-fetch:
-	@${DO_NADA}
+PORTDOCS=	README.rst
 
-do-install:
-	@${INSTALL_SCRIPT} ${SRC}/cdiff.sh ${PREFIX}/bin/cdiff
-	@${INSTALL_MAN} ${SRC}/cdiff.1 ${PREFIX}/man/man1
+post-install:
+	${INSTALL} -d ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Added: trunk/textproc/cdiff/distinfo
===================================================================
--- trunk/textproc/cdiff/distinfo	                        (rev 0)
+++ trunk/textproc/cdiff/distinfo	2015-10-19 17:07:06 UTC (rev 20546)
@@ -0,0 +1,2 @@
+SHA256 (cdiff-0.9.7_GH0.tar.gz) = 41eff442efc34e545d89b94f47da22ffc5edb4224476728746841b64b69f3512
+SIZE (cdiff-0.9.7_GH0.tar.gz) = 31964


Property changes on: trunk/textproc/cdiff/distinfo
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/textproc/cdiff/pkg-descr
===================================================================
--- trunk/textproc/cdiff/pkg-descr	2015-10-18 17:06:10 UTC (rev 20545)
+++ trunk/textproc/cdiff/pkg-descr	2015-10-19 17:07:06 UTC (rev 20546)
@@ -1,4 +1,5 @@
-cdiff is a readability enhancer for context diffs
-and unified diffs on color terminals.
+Term based tool to view colored, incremental diff in a Git/Mercurial/Svn
+workspace or from stdin, with side by side and auto pager support. Requires
+python (>= 2.5.0) and less.
 
-It uses less(1) as a backend.
+WWW: https://github.com/ymattw/cdiff

Modified: trunk/textproc/clucene/Makefile
===================================================================
--- trunk/textproc/clucene/Makefile	2015-10-18 17:06:10 UTC (rev 20545)
+++ trunk/textproc/clucene/Makefile	2015-10-19 17:07:06 UTC (rev 20546)
@@ -2,7 +2,7 @@
 
 PORTNAME=	clucene
 PORTVERSION=	2.3.3.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-core-unstable/2.3
 DISTNAME=	${PORTNAME}-core-${PORTVERSION}
@@ -10,15 +10,16 @@
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	CLucene is a C++ port of Lucene
 
-LICENSE=	apache2
+LICENSE=	apache2 lgpl2.1
+LICENSE_COMB=	dual
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libboost_regex.a:${PORTSDIR}/devel/boost-libs
 
-USES=		cmake iconv
+USES=		cmake iconv ninja
 USE_LDCONFIG=	yes
 
 CMAKE_ARGS=	-DBUILD_CONTRIBS_LIB=ON
-CXXFLAGS+=	-D__LONG_LONG_SUPPORTED
+CXXFLAGS+=	-D__LONG_LONG_SUPPORTED -D_WCHAR_H_CPLUSPLUS_98_CONFORMANCE_
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR_REL}|' \

Index: trunk/textproc/clucene/files/patch-CMakeLists.txt
===================================================================
--- trunk/textproc/clucene/files/patch-CMakeLists.txt	2015-10-18 17:06:10 UTC (rev 20545)
+++ trunk/textproc/clucene/files/patch-CMakeLists.txt	2015-10-19 17:07:06 UTC (rev 20546)

Property changes on: trunk/textproc/clucene/files/patch-CMakeLists.txt
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Added: trunk/textproc/clucene/files/patch-src__contribs-lib__CLucene__analysis__cjk__CJKAnalyzer.h
===================================================================
--- trunk/textproc/clucene/files/patch-src__contribs-lib__CLucene__analysis__cjk__CJKAnalyzer.h	                        (rev 0)
+++ trunk/textproc/clucene/files/patch-src__contribs-lib__CLucene__analysis__cjk__CJKAnalyzer.h	2015-10-19 17:07:06 UTC (rev 20546)
@@ -0,0 +1,11 @@
+--- src/contribs-lib/CLucene/analysis/cjk/CJKAnalyzer.h.orig	2011-03-16 20:21:07.000000000 -0400
++++ src/contribs-lib/CLucene/analysis/cjk/CJKAnalyzer.h	2013-03-29 18:46:22.000000000 -0400
+@@ -39,7 +39,7 @@
+      * character buffer, store the characters which are used to compose <br>
+      * the returned Token
+      */
+-    TCHAR buffer[LUCENE_MAX_WORD_LEN];
++    TCHAR buffer[LUCENE_MAX_WORD_LEN+1];
+ 
+     /**
+      * I/O buffer, used to store the content of the input(one of the <br>


Property changes on: trunk/textproc/clucene/files/patch-src__contribs-lib__CLucene__analysis__cjk__CJKAnalyzer.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: trunk/textproc/clucene/files/patch-src__contribs-lib__CLucene__analysis__de__GermanStemmer.cpp
===================================================================
--- trunk/textproc/clucene/files/patch-src__contribs-lib__CLucene__analysis__de__GermanStemmer.cpp	2015-10-18 17:06:10 UTC (rev 20545)
+++ trunk/textproc/clucene/files/patch-src__contribs-lib__CLucene__analysis__de__GermanStemmer.cpp	2015-10-19 17:07:06 UTC (rev 20546)

Property changes on: trunk/textproc/clucene/files/patch-src__contribs-lib__CLucene__analysis__de__GermanStemmer.cpp
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/textproc/clucene/files/patch-src__contribs-lib__CLucene__highlighter__Highlighter.cpp
===================================================================
--- trunk/textproc/clucene/files/patch-src__contribs-lib__CLucene__highlighter__Highlighter.cpp	2015-10-18 17:06:10 UTC (rev 20545)
+++ trunk/textproc/clucene/files/patch-src__contribs-lib__CLucene__highlighter__Highlighter.cpp	2015-10-19 17:07:06 UTC (rev 20546)

Property changes on: trunk/textproc/clucene/files/patch-src__contribs-lib__CLucene__highlighter__Highlighter.cpp
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/textproc/clucene/files/patch-src__contribs-lib__CLucene__highlighter__WeightedTerm.cpp
===================================================================
--- trunk/textproc/clucene/files/patch-src__contribs-lib__CLucene__highlighter__WeightedTerm.cpp	2015-10-18 17:06:10 UTC (rev 20545)
+++ trunk/textproc/clucene/files/patch-src__contribs-lib__CLucene__highlighter__WeightedTerm.cpp	2015-10-19 17:07:06 UTC (rev 20546)

Property changes on: trunk/textproc/clucene/files/patch-src__contribs-lib__CLucene__highlighter__WeightedTerm.cpp
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Added: trunk/textproc/clucene/files/patch-src__contribs-lib__CLucene__snowball__Snowball.cpp
===================================================================
--- trunk/textproc/clucene/files/patch-src__contribs-lib__CLucene__snowball__Snowball.cpp	                        (rev 0)
+++ trunk/textproc/clucene/files/patch-src__contribs-lib__CLucene__snowball__Snowball.cpp	2015-10-19 17:07:06 UTC (rev 20546)
@@ -0,0 +1,74 @@
+--- src/contribs-lib/CLucene/snowball/Snowball.cpp.orig	2011-03-16 20:21:07.000000000 -0400
++++ src/contribs-lib/CLucene/snowball/Snowball.cpp	2013-04-01 19:14:15.000000000 -0400
+@@ -19,16 +19,31 @@
+ 
+ CL_NS_DEF2(analysis,snowball)
+ 
++  class SnowballAnalyzer::SavedStreams : public TokenStream {
++  public:
++    StandardTokenizer* tokenStream;
++    TokenStream* filteredTokenStream;
++
++    SavedStreams():tokenStream(NULL), filteredTokenStream(NULL) {}
++    void close(){}
++    Token* next(Token* token) {return NULL;}
++  };
++  
+   /** Builds the named analyzer with no stop words. */
+   SnowballAnalyzer::SnowballAnalyzer(const TCHAR* language) {
+     this->language = STRDUP_TtoT(language);
+ 	stopSet = NULL;
+   }
+ 
+-  SnowballAnalyzer::~SnowballAnalyzer(){
+-	  _CLDELETE_CARRAY(language);
+-	  if ( stopSet != NULL )
+-		  _CLDELETE(stopSet);
++  SnowballAnalyzer::~SnowballAnalyzer() {
++    SavedStreams* streams = reinterpret_cast<SavedStreams*>(getPreviousTokenStream());
++    if (streams != NULL) {
++      _CLDELETE(streams->filteredTokenStream);
++      _CLDELETE(streams);
++    }
++    _CLDELETE_CARRAY(language);
++    if (stopSet != NULL)
++      _CLDELETE(stopSet);
+   }
+ 
+   /** Builds the named analyzer with the given stop words.
+@@ -62,12 +77,29 @@
+     result = _CLNEW SnowballFilter(result, language, true);
+     return result;
+   }
+-  
+-  
+-  
+-  
+-  
+-  
++
++  TokenStream* SnowballAnalyzer::reusableTokenStream(const TCHAR* fieldName, CL_NS(util)::Reader* reader) {
++    SavedStreams* streams = reinterpret_cast<SavedStreams*>(getPreviousTokenStream());
++
++    if (streams == NULL) {
++      streams = _CLNEW SavedStreams();
++      BufferedReader* bufferedReader = reader->__asBufferedReader();
++
++      if (bufferedReader == NULL)
++        streams->tokenStream = _CLNEW StandardTokenizer(_CLNEW FilteredBufferedReader(reader, false), true);
++      else
++        streams->tokenStream = _CLNEW StandardTokenizer(bufferedReader);
++
++      streams->filteredTokenStream = _CLNEW StandardFilter(streams->tokenStream, true);
++      streams->filteredTokenStream = _CLNEW LowerCaseFilter(streams->filteredTokenStream, true);
++      if (stopSet != NULL)
++        streams->filteredTokenStream = _CLNEW StopFilter(streams->filteredTokenStream, true, stopSet);
++      streams->filteredTokenStream = _CLNEW SnowballFilter(streams->filteredTokenStream, language, true);
++      setPreviousTokenStream(streams);
++    } else
++      streams->tokenStream->reset(reader);
++    return streams->filteredTokenStream;
++  }
+   
+     /** Construct the named stemming filter.
+    *


Property changes on: trunk/textproc/clucene/files/patch-src__contribs-lib__CLucene__snowball__Snowball.cpp
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/textproc/clucene/files/patch-src__contribs-lib__CLucene__snowball__SnowballAnalyzer.h
===================================================================
--- trunk/textproc/clucene/files/patch-src__contribs-lib__CLucene__snowball__SnowballAnalyzer.h	                        (rev 0)
+++ trunk/textproc/clucene/files/patch-src__contribs-lib__CLucene__snowball__SnowballAnalyzer.h	2015-10-19 17:07:06 UTC (rev 20546)
@@ -0,0 +1,19 @@
+--- src/contribs-lib/CLucene/snowball/SnowballAnalyzer.h.orig	2011-03-16 20:21:07.000000000 -0400
++++ src/contribs-lib/CLucene/snowball/SnowballAnalyzer.h	2013-04-01 18:25:10.000000000 -0400
+@@ -22,6 +22,7 @@
+ class CLUCENE_CONTRIBS_EXPORT SnowballAnalyzer: public Analyzer {
+   TCHAR* language;
+   CLTCSetList* stopSet;
++  class SavedStreams;
+ 
+ public:
+   /** Builds the named analyzer with no stop words. */
+@@ -37,6 +38,8 @@
+       StandardFilter}, a {@link LowerCaseFilter} and a {@link StopFilter}. */
+   TokenStream* tokenStream(const TCHAR* fieldName, CL_NS(util)::Reader* reader);
+   TokenStream* tokenStream(const TCHAR* fieldName, CL_NS(util)::Reader* reader, bool deleteReader);
++
++  TokenStream* reusableTokenStream(const TCHAR* fieldName, CL_NS(util)::Reader* reader);
+ };
+ 
+ CL_NS_END2


Property changes on: trunk/textproc/clucene/files/patch-src__contribs-lib__CLucene__snowball__SnowballAnalyzer.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/textproc/clucene/files/patch-src__contribs-lib__CLucene__snowball__libstemmer__libstemmer.c
===================================================================
--- trunk/textproc/clucene/files/patch-src__contribs-lib__CLucene__snowball__libstemmer__libstemmer.c	                        (rev 0)
+++ trunk/textproc/clucene/files/patch-src__contribs-lib__CLucene__snowball__libstemmer__libstemmer.c	2015-10-19 17:07:06 UTC (rev 20546)
@@ -0,0 +1,24 @@
+--- src/contribs-lib/CLucene/snowball/libstemmer/libstemmer.c.orig	2011-03-16 20:21:07.000000000 -0400
++++ src/contribs-lib/CLucene/snowball/libstemmer/libstemmer.c	2013-03-29 18:54:39.000000000 -0400
+@@ -35,9 +35,8 @@
+ {
+     stemmer_encoding enc;
+     struct stemmer_modules * module;
+-    struct sb_stemmer * stemmer =
+-	    (struct sb_stemmer *) malloc(sizeof(struct sb_stemmer));
+-    if (stemmer == NULL) return NULL;
++    struct sb_stemmer * stemmer;
++
+     enc = sb_getenc(charenc);
+     if (enc == ENC_UNKNOWN) return NULL;
+ 
+@@ -46,6 +45,9 @@
+     }
+     if (module->name == NULL) return NULL;
+     
++    stemmer = (struct sb_stemmer *) malloc(sizeof(struct sb_stemmer));
++    if (stemmer == NULL) return NULL;
++
+     stemmer->create = module->create;
+     stemmer->close = module->close;
+     stemmer->stem = module->stem;


Property changes on: trunk/textproc/clucene/files/patch-src__contribs-lib__CLucene__snowball__libstemmer__libstemmer.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: trunk/textproc/clucene/files/patch-src__contribs-lib__CMakeLists.txt
===================================================================
--- trunk/textproc/clucene/files/patch-src__contribs-lib__CMakeLists.txt	2015-10-18 17:06:10 UTC (rev 20545)
+++ trunk/textproc/clucene/files/patch-src__contribs-lib__CMakeLists.txt	2015-10-19 17:07:06 UTC (rev 20546)

Property changes on: trunk/textproc/clucene/files/patch-src__contribs-lib__CMakeLists.txt
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Added: trunk/textproc/clucene/files/patch-src__core__CLucene__analysis__AnalysisHeader.cpp
===================================================================
--- trunk/textproc/clucene/files/patch-src__core__CLucene__analysis__AnalysisHeader.cpp	                        (rev 0)
+++ trunk/textproc/clucene/files/patch-src__core__CLucene__analysis__AnalysisHeader.cpp	2015-10-19 17:07:06 UTC (rev 20546)
@@ -0,0 +1,11 @@
+--- src/core/CLucene/analysis/AnalysisHeader.cpp.orig	2011-03-16 20:21:07.000000000 -0400
++++ src/core/CLucene/analysis/AnalysisHeader.cpp	2014-06-24 18:57:17.000000000 -0400
+@@ -212,7 +212,7 @@
+     sb.append(_T(","));
+     sb.appendInt( _endOffset );
+ 
+-    if (!_tcscmp( _type, _T("word")) == 0 ){
++    if (_tcscmp( _type, _T("word")) != 0) {
+       sb.append(_T(",type="));
+       sb.append(_type);
+     }


Property changes on: trunk/textproc/clucene/files/patch-src__core__CLucene__analysis__AnalysisHeader.cpp
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: trunk/textproc/clucene/files/patch-src__core__CLucene__index__DocumentsWriter.cpp
===================================================================
--- trunk/textproc/clucene/files/patch-src__core__CLucene__index__DocumentsWriter.cpp	2015-10-18 17:06:10 UTC (rev 20545)
+++ trunk/textproc/clucene/files/patch-src__core__CLucene__index__DocumentsWriter.cpp	2015-10-19 17:07:06 UTC (rev 20546)

Property changes on: trunk/textproc/clucene/files/patch-src__core__CLucene__index__DocumentsWriter.cpp
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Added: trunk/textproc/clucene/files/patch-src__core__CLucene__index__DocumentsWriterThreadState.cpp
===================================================================
--- trunk/textproc/clucene/files/patch-src__core__CLucene__index__DocumentsWriterThreadState.cpp	                        (rev 0)
+++ trunk/textproc/clucene/files/patch-src__core__CLucene__index__DocumentsWriterThreadState.cpp	2015-10-19 17:07:06 UTC (rev 20546)
@@ -0,0 +1,21 @@
+--- src/core/CLucene/index/DocumentsWriterThreadState.cpp.orig	2011-03-16 20:21:07.000000000 -0400
++++ src/core/CLucene/index/DocumentsWriterThreadState.cpp	2014-06-24 18:37:18.000000000 -0400
+@@ -994,7 +994,7 @@
+   const TCHAR* tokenText = token->termBuffer();
+   const int32_t tokenTextLen = token->termLength();
+ 
+-  int32_t code = 0;
++  uint32_t code = 0;
+ 
+   // Compute hashcode
+   int32_t downto = tokenTextLen;
+@@ -1203,7 +1203,8 @@
+   const int32_t newMask = newSize-1;
+ 
+   ValueArray<Posting*> newHash(newSize);
+-  int32_t hashPos, code;
++  int32_t hashPos;
++  uint32_t code;
+   const TCHAR* pos = NULL;
+   const TCHAR* start = NULL;
+   Posting* p0;


Property changes on: trunk/textproc/clucene/files/patch-src__core__CLucene__index__DocumentsWriterThreadState.cpp
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/textproc/clucene/files/patch-src__core__CLucene__index__IndexFileDeleter.cpp
===================================================================
--- trunk/textproc/clucene/files/patch-src__core__CLucene__index__IndexFileDeleter.cpp	                        (rev 0)
+++ trunk/textproc/clucene/files/patch-src__core__CLucene__index__IndexFileDeleter.cpp	2015-10-19 17:07:06 UTC (rev 20546)
@@ -0,0 +1,11 @@
+--- src/core/CLucene/index/IndexFileDeleter.cpp.orig	2011-03-16 20:21:07.000000000 -0400
++++ src/core/CLucene/index/IndexFileDeleter.cpp	2014-06-24 19:06:58.000000000 -0400
+@@ -129,7 +129,7 @@
+ 
+ 	  string& fileName = files.at(i);
+ 
+-    if (filter->accept(NULL, fileName.c_str()) && !fileName.compare(IndexFileNames::SEGMENTS_GEN) == 0) {
++    if (filter->accept(NULL, fileName.c_str()) && fileName.compare(IndexFileNames::SEGMENTS_GEN) != 0) {
+ 
+ 	    // Add this file to refCounts with initial count 0:
+ 	    getRefCount(fileName.c_str());


Property changes on: trunk/textproc/clucene/files/patch-src__core__CLucene__index__IndexFileDeleter.cpp
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/textproc/clucene/files/patch-src__core__CLucene__index__IndexWriter.cpp
===================================================================
--- trunk/textproc/clucene/files/patch-src__core__CLucene__index__IndexWriter.cpp	2015-10-18 17:06:10 UTC (rev 20545)
+++ trunk/textproc/clucene/files/patch-src__core__CLucene__index__IndexWriter.cpp	2015-10-19 17:07:06 UTC (rev 20546)
@@ -1,6 +1,14 @@
 --- src/core/CLucene/index/IndexWriter.cpp.orig	2011-03-16 20:21:07.000000000 -0400
-+++ src/core/CLucene/index/IndexWriter.cpp	2013-03-27 16:56:54.000000000 -0400
-@@ -814,7 +814,7 @@
++++ src/core/CLucene/index/IndexWriter.cpp	2014-06-24 19:10:36.000000000 -0400
+@@ -53,7 +53,6 @@
+ 
+ DEFINE_MUTEX(IndexWriter::MESSAGE_ID_LOCK)
+ int32_t IndexWriter::MESSAGE_ID = 0;
+-const int32_t IndexWriter::MAX_TERM_LENGTH = DocumentsWriter::MAX_TERM_LENGTH;
+ 
+ class IndexWriter::Internal{
+ public:
+@@ -814,7 +813,7 @@
    ensureOpen();
  
    if (maxNumSegments < 1)
@@ -9,3 +17,30 @@
  
    if (infoStream != NULL)
      message("optimize: index now " + segString());
+@@ -1392,7 +1391,7 @@
+     // Check if the doc stores must be separately flushed
+     // because other segments, besides the one we are about
+     // to flush, reference it
+-    if (_flushDocStores && (!flushDocs || !docWriter->getSegment().compare(docWriter->getDocStoreSegment())==0 )) {
++    if (_flushDocStores && (!flushDocs || docWriter->getSegment().compare(docWriter->getDocStoreSegment()) != 0)) {
+       // We must separately flush the doc store
+       if (infoStream != NULL)
+         message("  flush shared docStore segment " + docStoreSegment);
+@@ -1631,7 +1630,7 @@
+         // Load deletes present @ start of merge, for this segment:
+         BitVector previousDeletes(previousInfo->dir, previousInfo->getDelFileName().c_str());
+ 
+-        if (!currentInfo->getDelFileName().compare(previousInfo->getDelFileName())==0 ){
++        if (currentInfo->getDelFileName().compare(previousInfo->getDelFileName()) != 0) {
+           // This means this segment has had new deletes
+           // committed since we started the merge, so we
+           // must merge them:
+@@ -1928,7 +1927,7 @@
+       mergeDocStores = true;
+     else if (lastDocStoreSegment.empty())
+       lastDocStoreSegment = docStoreSegment;
+-    else if (!lastDocStoreSegment.compare(docStoreSegment)==0 )
++    else if (lastDocStoreSegment.compare(docStoreSegment) != 0)
+       mergeDocStores = true;
+ 
+     // Segments' docScoreOffsets must be in-order,


Property changes on: trunk/textproc/clucene/files/patch-src__core__CLucene__index__IndexWriter.cpp
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Added: trunk/textproc/clucene/files/patch-src__core__CLucene__index__IndexWriter.h
===================================================================
--- trunk/textproc/clucene/files/patch-src__core__CLucene__index__IndexWriter.h	                        (rev 0)
+++ trunk/textproc/clucene/files/patch-src__core__CLucene__index__IndexWriter.h	2015-10-19 17:07:06 UTC (rev 20546)
@@ -0,0 +1,17 @@
+--- src/core/CLucene/index/IndexWriter.h.orig	2011-03-16 20:21:07.000000000 -0400
++++ src/core/CLucene/index/IndexWriter.h	2014-06-24 18:17:57.000000000 -0400
+@@ -384,14 +384,6 @@
+    */
+   static const int32_t DEFAULT_MAX_MERGE_DOCS;
+ 
+-  /**
+-   * Absolute hard maximum length for a term.  If a term
+-   * arrives from the analyzer longer than this length, it
+-   * is skipped and a message is printed to infoStream, if
+-   * set (see {@link #setInfoStream}).
+-   */
+-  static const int32_t MAX_TERM_LENGTH;
+-
+ 
+   /* Determines how often segment indices are merged by addDocument().  With
+    *  smaller values, less RAM is used while indexing, and searches on


Property changes on: trunk/textproc/clucene/files/patch-src__core__CLucene__index__IndexWriter.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/textproc/clucene/files/patch-src__core__CLucene__index__TermInfosReader.cpp
===================================================================
--- trunk/textproc/clucene/files/patch-src__core__CLucene__index__TermInfosReader.cpp	                        (rev 0)
+++ trunk/textproc/clucene/files/patch-src__core__CLucene__index__TermInfosReader.cpp	2015-10-19 17:07:06 UTC (rev 20546)
@@ -0,0 +1,11 @@
+--- src/core/CLucene/index/TermInfosReader.cpp.orig	2011-03-16 20:21:07.000000000 -0400
++++ src/core/CLucene/index/TermInfosReader.cpp	2014-06-24 18:19:42.000000000 -0400
+@@ -111,7 +111,7 @@
+ 	      //destroy their elements
+ #ifdef _DEBUG
+          for ( int32_t i=0; i<indexTermsLength;++i ){
+-            indexTerms[i].__cl_refcount--;
++            indexTerms[i].__cl_decref();
+          }
+ #endif
+          //Delete the arrays


Property changes on: trunk/textproc/clucene/files/patch-src__core__CLucene__index__TermInfosReader.cpp
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/textproc/clucene/files/patch-src__core__CLucene__queryParser__QueryParser.cpp
===================================================================
--- trunk/textproc/clucene/files/patch-src__core__CLucene__queryParser__QueryParser.cpp	                        (rev 0)
+++ trunk/textproc/clucene/files/patch-src__core__CLucene__queryParser__QueryParser.cpp	2015-10-19 17:07:06 UTC (rev 20546)
@@ -0,0 +1,11 @@
+--- src/core/CLucene/queryParser/QueryParser.cpp.orig	2011-03-16 20:21:07.000000000 -0400
++++ src/core/CLucene/queryParser/QueryParser.cpp	2014-06-24 18:33:06.000000000 -0400
+@@ -79,7 +79,7 @@
+     _T("<RANGEEX_GOOP>")
+ };
+ 
+-const int32_t QueryParser::jj_la1_0[] = {0x180,0x180,0xe00,0xe00,0x1f69f80,0x48000,0x10000,0x1f69000,0x1348000,0x80000,0x80000,0x10000,0x18000000,0x2000000,0x18000000,0x10000,0x80000000,0x20000000,0x80000000,0x10000,0x80000,0x10000,0x1f68000};
++const int32_t QueryParser::jj_la1_0[] = {0x180,0x180,0xe00,0xe00,0x1f69f80,0x48000,0x10000,0x1f69000,0x1348000,0x80000,0x80000,0x10000,0x18000000,0x2000000,0x18000000,0x10000,int32_t(0x80000000),0x20000000,int32_t(0x80000000),0x10000,0x80000,0x10000,0x1f68000};
+ const int32_t QueryParser::jj_la1_1[] = {0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x1,0x0,0x0,0x0,0x0};
+ 
+ struct QueryParser::JJCalls {


Property changes on: trunk/textproc/clucene/files/patch-src__core__CLucene__queryParser__QueryParser.cpp
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/textproc/clucene/files/patch-src__core__CLucene__queryParser__QueryParserTokenManager.cpp
===================================================================
--- trunk/textproc/clucene/files/patch-src__core__CLucene__queryParser__QueryParserTokenManager.cpp	                        (rev 0)
+++ trunk/textproc/clucene/files/patch-src__core__CLucene__queryParser__QueryParserTokenManager.cpp	2015-10-19 17:07:06 UTC (rev 20546)
@@ -0,0 +1,62 @@
+--- src/core/CLucene/queryParser/QueryParserTokenManager.cpp.orig	2011-03-16 20:21:07.000000000 -0400
++++ src/core/CLucene/queryParser/QueryParserTokenManager.cpp	2014-06-24 19:34:09.000000000 -0400
+@@ -15,9 +15,9 @@
+ 
+ CL_NS_DEF(queryParser)
+ 
+-const int64_t QueryParserTokenManager::jjbitVec2[]={0x0L, 0x0L, _ILONGLONG(0xffffffffffffffff), _ILONGLONG(0xffffffffffffffff)};
++const int64_t QueryParserTokenManager::jjbitVec2[]={0x0L, 0x0L, int64_t(_ILONGLONG(0xffffffffffffffff)), int64_t(_ILONGLONG(0xffffffffffffffff))};
+ const int64_t QueryParserTokenManager::jjbitVec0[] = {
+-	_ILONGLONG(0xfffffffffffffffe), _ILONGLONG(0xffffffffffffffff), _ILONGLONG(0xffffffffffffffff), _ILONGLONG(0xffffffffffffffff)
++	int64_t(_ILONGLONG(0xfffffffffffffffe)), int64_t(_ILONGLONG(0xffffffffffffffff)), int64_t(_ILONGLONG(0xffffffffffffffff)), int64_t(_ILONGLONG(0xffffffffffffffff))
+ };
+ const int32_t QueryParserTokenManager::jjnextStates[]={
+ 		15, 17, 18, 29, 32, 23, 33, 30, 20, 21, 32, 23, 33, 31, 34, 27,
+@@ -544,7 +544,10 @@
+ 			kind = 0x7fffffff;
+ 		}
+ 		++curPos;
+-		if ((i = jjnewStateCnt) == (startsAt = 36 - (jjnewStateCnt = startsAt)))
++		i = jjnewStateCnt;
++		jjnewStateCnt = startsAt;
++		startsAt = 36 - jjnewStateCnt;
++		if (i == startsAt)
+ 			return curPos;
+ 		try { curChar = input_stream->readChar(); }
+ 		catch(CLuceneError& e) {
+@@ -756,7 +759,10 @@
+ 			kind = 0x7fffffff;
+ 		}
+ 		++curPos;
+-		if ((i = jjnewStateCnt) == (startsAt = 7 - (jjnewStateCnt = startsAt)))
++		i = jjnewStateCnt;
++		jjnewStateCnt = startsAt;
++		startsAt = 7 - jjnewStateCnt;
++		if (i == startsAt)
+ 			return curPos;
+ 		try { curChar = input_stream->readChar(); }
+ 		catch(CLuceneError& e) {
+@@ -854,7 +860,10 @@
+ 			kind = 0x7fffffff;
+ 		}
+ 		++curPos;
+-		if ((i = jjnewStateCnt) == (startsAt = 3 - (jjnewStateCnt = startsAt)))
++		i = jjnewStateCnt;
++		jjnewStateCnt = startsAt;
++		startsAt = 3 - jjnewStateCnt;
++		if (i == startsAt)
+ 			return curPos;
+ 		try { curChar = input_stream->readChar(); }
+ 		catch(CLuceneError& e) {
+@@ -1066,7 +1075,10 @@
+ 			kind = 0x7fffffff;
+ 		}
+ 		++curPos;
+-		if ((i = jjnewStateCnt) == (startsAt = 7 - (jjnewStateCnt = startsAt)))
++		i = jjnewStateCnt;
++		jjnewStateCnt = startsAt;
++		startsAt = 7 - jjnewStateCnt;
++		if (i == startsAt)
+ 			return curPos;
+ 		try { curChar = input_stream->readChar(); }
+ 		catch(CLuceneError& e) {


Property changes on: trunk/textproc/clucene/files/patch-src__core__CLucene__queryParser__QueryParserTokenManager.cpp
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/textproc/clucene/files/patch-src__core__CLucene__queryParser__legacy__Lexer.cpp
===================================================================
--- trunk/textproc/clucene/files/patch-src__core__CLucene__queryParser__legacy__Lexer.cpp	                        (rev 0)
+++ trunk/textproc/clucene/files/patch-src__core__CLucene__queryParser__legacy__Lexer.cpp	2015-10-19 17:07:06 UTC (rev 20546)
@@ -0,0 +1,11 @@
+--- src/core/CLucene/queryParser/legacy/Lexer.cpp.orig	2011-03-16 20:21:07.000000000 -0400
++++ src/core/CLucene/queryParser/legacy/Lexer.cpp	2014-06-24 18:33:06.000000000 -0400
+@@ -117,7 +117,7 @@
+       if( _istspace(ch)!=0 ) {
+          continue;
+       }
+-      TCHAR buf[2] = {ch,'\0'};
++      TCHAR buf[2] = {TCHAR(ch),'\0'};
+       switch(ch) {
+          case '+':
+             token->set(buf, QueryToken::PLUS);


Property changes on: trunk/textproc/clucene/files/patch-src__core__CLucene__queryParser__legacy__Lexer.cpp
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: trunk/textproc/clucene/files/patch-src__core__CLucene__search__ConstantScoreQuery.cpp
===================================================================
--- trunk/textproc/clucene/files/patch-src__core__CLucene__search__ConstantScoreQuery.cpp	2015-10-18 17:06:10 UTC (rev 20545)
+++ trunk/textproc/clucene/files/patch-src__core__CLucene__search__ConstantScoreQuery.cpp	2015-10-19 17:07:06 UTC (rev 20546)

Property changes on: trunk/textproc/clucene/files/patch-src__core__CLucene__search__ConstantScoreQuery.cpp
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Added: trunk/textproc/clucene/files/patch-src__core__CLucene__store__FSDirectory.cpp
===================================================================
--- trunk/textproc/clucene/files/patch-src__core__CLucene__store__FSDirectory.cpp	                        (rev 0)
+++ trunk/textproc/clucene/files/patch-src__core__CLucene__store__FSDirectory.cpp	2015-10-19 17:07:06 UTC (rev 20546)
@@ -0,0 +1,14 @@
+--- src/core/CLucene/store/FSDirectory.cpp.orig	2011-03-16 20:21:07.000000000 -0400
++++ src/core/CLucene/store/FSDirectory.cpp	2014-06-24 18:26:54.000000000 -0400
+@@ -219,9 +219,8 @@
+ 		_CLDECDELETE(handle);
+ 
+ 		//printf("handle=%d\n", handle->__cl_refcount);
+-		if ( dounlock ){
+-			mutex->unlock();
+-		}else{
++		mutex->unlock();
++		if ( !dounlock ) {
+ 			delete mutex;
+ 		}
+ 	}


Property changes on: trunk/textproc/clucene/files/patch-src__core__CLucene__store__FSDirectory.cpp
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/textproc/clucene/files/patch-src__core__CLucene__store__IndexInput.cpp
===================================================================
--- trunk/textproc/clucene/files/patch-src__core__CLucene__store__IndexInput.cpp	                        (rev 0)
+++ trunk/textproc/clucene/files/patch-src__core__CLucene__store__IndexInput.cpp	2015-10-19 17:07:06 UTC (rev 20546)
@@ -0,0 +1,13 @@
+--- src/core/CLucene/store/IndexInput.cpp.orig	2011-03-16 20:21:07.000000000 -0400
++++ src/core/CLucene/store/IndexInput.cpp	2014-06-24 18:38:50.000000000 -0400
+@@ -41,8 +41,8 @@
+   }
+ 
+   int64_t IndexInput::readLong() {
+-    int64_t i = ((int64_t)readInt() << 32);
+-    return (i | ((int64_t)readInt() & 0xFFFFFFFFL));
++    uint64_t i = ((uint64_t)readInt() << 32);
++    return (i | ((uint64_t)readInt() & 0xFFFFFFFFL));
+   }
+ 
+   int64_t IndexInput::readVLong() {


Property changes on: trunk/textproc/clucene/files/patch-src__core__CLucene__store__IndexInput.cpp
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/textproc/clucene/files/patch-src__core__CLucene__util__BitSet.cpp
===================================================================
--- trunk/textproc/clucene/files/patch-src__core__CLucene__util__BitSet.cpp	                        (rev 0)
+++ trunk/textproc/clucene/files/patch-src__core__CLucene__util__BitSet.cpp	2015-10-19 17:07:06 UTC (rev 20546)
@@ -0,0 +1,67 @@
+--- src/core/CLucene/util/BitSet.cpp.orig	2011-03-16 20:21:07.000000000 -0400
++++ src/core/CLucene/util/BitSet.cpp	2013-03-29 17:57:05.000000000 -0400
+@@ -32,6 +32,25 @@
+     3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7,
+     4, 5, 5, 6, 5, 6, 6, 7, 5, 6, 6, 7, 6, 7, 7, 8};
+ 
++const uint8_t BitSet::BYTE_OFFSETS[256] = {
++    8, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0,
++    4, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0,
++    5, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0,
++    4, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0,
++    6, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0,
++    4, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0, 
++    5, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0, 
++    4, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0, 
++    7, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0, 
++    4, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0, 
++    5, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0, 
++    4, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0, 
++    6, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0, 
++    4, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0, 
++    5, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0, 
++    4, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0};
++
++
+ BitSet::BitSet( const BitSet& copy ) :
+ 	_size( copy._size ),
+ 	_count(-1)
+@@ -180,19 +199,32 @@
+     return                            factor * (4 + (8+40)*count()) < size();
+   }
+ 
+-  int32_t BitSet::nextSetBit(int32_t fromIndex) const {
++  int32_t BitSet::nextSetBit(int32_t fromIndex) const 
++  {
+       if (fromIndex < 0)
+           _CLTHROWT(CL_ERR_IndexOutOfBounds, _T("fromIndex < 0"));
+ 
+       if (fromIndex >= _size)
+           return -1;
+ 
+-      while (true) {
+-          if ((bits[fromIndex >> 3] & (1 << (fromIndex & 7))) != 0)
+-              return fromIndex;
+-          if (++fromIndex == _size)
+-              return -1;
++      int _max = ( _size+7 ) >> 3;
++
++      unsigned int i = (int)( fromIndex>>3 );
++      unsigned int subIndex = fromIndex & 0x7; // index within the byte
++      uint8_t byte = bits[i] >> subIndex;  // skip all the bits to the right of index
++
++      if ( byte != 0 ) 
++      {
++          return ( ( i<<3 ) + subIndex + BYTE_OFFSETS[ byte ] );
++      }
++
++      while( ++i < _max ) 
++      {
++          byte = bits[i];
++          if ( byte != 0 ) 
++              return ( ( i<<3 ) + BYTE_OFFSETS[ byte ] );
+       }
++      return -1;
+   }
+ 
+ CL_NS_END


Property changes on: trunk/textproc/clucene/files/patch-src__core__CLucene__util__BitSet.cpp
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/textproc/clucene/files/patch-src__core__CLucene__util__BitSet.h
===================================================================
--- trunk/textproc/clucene/files/patch-src__core__CLucene__util__BitSet.h	                        (rev 0)
+++ trunk/textproc/clucene/files/patch-src__core__CLucene__util__BitSet.h	2015-10-19 17:07:06 UTC (rev 20546)
@@ -0,0 +1,10 @@
+--- src/core/CLucene/util/BitSet.h.orig	2011-03-16 20:21:07.000000000 -0400
++++ src/core/CLucene/util/BitSet.h	2013-03-29 17:57:05.000000000 -0400
+@@ -39,6 +39,7 @@
+   /** Indicates if the bit vector is sparse and should be saved as a d-gaps list, or dense, and should be saved as a bit set. */
+   bool isSparse();
+   static const uint8_t BYTE_COUNTS[256];
++  static const uint8_t BYTE_OFFSETS[256];
+ protected:
+ 	BitSet( const BitSet& copy );
+ 


Property changes on: trunk/textproc/clucene/files/patch-src__core__CLucene__util__BitSet.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: trunk/textproc/clucene/files/patch-src__core__CLucene__util__MD5Digester.cpp
===================================================================
--- trunk/textproc/clucene/files/patch-src__core__CLucene__util__MD5Digester.cpp	2015-10-18 17:06:10 UTC (rev 20545)
+++ trunk/textproc/clucene/files/patch-src__core__CLucene__util__MD5Digester.cpp	2015-10-19 17:07:06 UTC (rev 20546)

Property changes on: trunk/textproc/clucene/files/patch-src__core__CLucene__util__MD5Digester.cpp
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/textproc/clucene/files/patch-src__core__CLucene__util__VoidMap.h
===================================================================
--- trunk/textproc/clucene/files/patch-src__core__CLucene__util__VoidMap.h	2015-10-18 17:06:10 UTC (rev 20545)
+++ trunk/textproc/clucene/files/patch-src__core__CLucene__util__VoidMap.h	2015-10-19 17:07:06 UTC (rev 20546)
@@ -1,6 +1,20 @@
 --- src/core/CLucene/util/VoidMap.h.orig	2011-03-16 20:21:07.000000000 -0400
-+++ src/core/CLucene/util/VoidMap.h	2013-01-08 17:37:43.000000000 -0500
-@@ -83,7 +83,7 @@
++++ src/core/CLucene/util/VoidMap.h	2014-06-24 18:48:01.000000000 -0400
+@@ -11,8 +11,13 @@
+ #include "CLucene/LuceneThreads.h"
+ 
+ #if defined(_CL_HAVE_TR1_UNORDERED_MAP) && defined(_CL_HAVE_TR1_UNORDERED_SET)
++#if defined(_LIBCPP_VERSION)
++	#include <unordered_map>
++	#include <unordered_set>
++#else
+ 	#include <tr1/unordered_map>
+ 	#include <tr1/unordered_set>
++#endif
+ #elif defined(_CL_HAVE_HASH_MAP) && defined(_CL_HAVE_HASH_SET)
+ 	//hashing is all or nothing!
+ 	#include <hash_map>
+@@ -83,7 +88,7 @@
  	_vt get( _kt k) const {
  		const_iterator itr = base::find(k);
  		if ( itr==base::end() )
@@ -9,7 +23,7 @@
  		else
  			return itr->second;
  	}
-@@ -316,6 +316,7 @@
+@@ -316,6 +321,7 @@
  		if ( _this::dk || _this::dv )
  			_this::remove(k);
  


Property changes on: trunk/textproc/clucene/files/patch-src__core__CLucene__util__VoidMap.h
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/textproc/clucene/files/patch-src__core__CMakeLists.txt
===================================================================
--- trunk/textproc/clucene/files/patch-src__core__CMakeLists.txt	2015-10-18 17:06:10 UTC (rev 20545)
+++ trunk/textproc/clucene/files/patch-src__core__CMakeLists.txt	2015-10-19 17:07:06 UTC (rev 20546)

Property changes on: trunk/textproc/clucene/files/patch-src__core__CMakeLists.txt
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Added: trunk/textproc/clucene/files/patch-src__core__libclucene-core.pc.cmake
===================================================================
--- trunk/textproc/clucene/files/patch-src__core__libclucene-core.pc.cmake	                        (rev 0)
+++ trunk/textproc/clucene/files/patch-src__core__libclucene-core.pc.cmake	2015-10-19 17:07:06 UTC (rev 20546)
@@ -0,0 +1,10 @@
+--- src/core/libclucene-core.pc.cmake.orig	2011-03-16 20:21:07.000000000 -0400
++++ src/core/libclucene-core.pc.cmake	2013-04-16 14:52:22.000000000 -0400
+@@ -6,6 +6,6 @@
+ Name: libclucene
+ Description: CLucene - a C++ search engine, ported from the popular Apache Lucene
+ Version: @CLUCENE_VERSION_MAJOR at .@CLUCENE_VERSION_MINOR at .@CLUCENE_VERSION_REVISION at .@CLUCENE_VERSION_PATCH@
+-Libs: -L${prefix}/@LIB_DESTINATION@/ -lclucene-core
++Libs: -L${prefix}/@LIB_DESTINATION@/ -lclucene-core -lclucene-shared
+ Cflags: -I${prefix}/include -I${prefix}/include/CLucene/ext
+ ~


Property changes on: trunk/textproc/clucene/files/patch-src__core__libclucene-core.pc.cmake
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/textproc/clucene/files/patch-src__shared__CLucene__LuceneThreads.h
===================================================================
--- trunk/textproc/clucene/files/patch-src__shared__CLucene__LuceneThreads.h	                        (rev 0)
+++ trunk/textproc/clucene/files/patch-src__shared__CLucene__LuceneThreads.h	2015-10-19 17:07:06 UTC (rev 20546)
@@ -0,0 +1,12 @@
+--- src/shared/CLucene/LuceneThreads.h.orig	2011-03-17 01:21:07.000000000 +0100
++++ src/shared/CLucene/LuceneThreads.h	2013-09-03 18:25:01.380067076 +0200
+@@ -7,6 +7,9 @@
+ #ifndef _LuceneThreads_h
+ #define  _LuceneThreads_h
+ 
++#if defined(_CL_HAVE_PTHREAD)
++#include <pthread.h>
++#endif
+ 
+ CL_NS_DEF(util)
+ class CLuceneThreadIdCompare;


Property changes on: trunk/textproc/clucene/files/patch-src__shared__CLucene__LuceneThreads.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: trunk/textproc/clucene/files/patch-src__shared__CMakeLists.txt
===================================================================
--- trunk/textproc/clucene/files/patch-src__shared__CMakeLists.txt	2015-10-18 17:06:10 UTC (rev 20545)
+++ trunk/textproc/clucene/files/patch-src__shared__CMakeLists.txt	2015-10-19 17:07:06 UTC (rev 20546)

Property changes on: trunk/textproc/clucene/files/patch-src__shared__CMakeLists.txt
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Added: trunk/textproc/clucene/files/patch-src__shared__cmake__CheckHashmaps.cmake
===================================================================
--- trunk/textproc/clucene/files/patch-src__shared__cmake__CheckHashmaps.cmake	                        (rev 0)
+++ trunk/textproc/clucene/files/patch-src__shared__cmake__CheckHashmaps.cmake	2015-10-19 17:07:06 UTC (rev 20546)
@@ -0,0 +1,15 @@
+--- src/shared/cmake/CheckHashmaps.cmake.orig	2011-03-16 20:21:07.000000000 -0400
++++ src/shared/cmake/CheckHashmaps.cmake	2014-06-24 19:20:14.000000000 -0400
+@@ -35,8 +35,12 @@
+ #elif defined(_CL_HAVE_EXT_HASH_MAP)
+ 	#include <ext/hash_map>
+ #elif defined(_CL_HAVE_TR1_UNORDERED_MAP)
++#if defined(_LIBCPP_VERSION)
++	#include <unordered_map>
++#else
+ 	#include <tr1/unordered_map>
+ #endif
++#endif
+ int main() {  
+     ${namespace}::${_CL_HASH_MAP}<int,char> a; 
+     return 0; 


Property changes on: trunk/textproc/clucene/files/patch-src__shared__cmake__CheckHashmaps.cmake
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: trunk/textproc/clucene/files/patch-src__shared__cmake__MacroCheckGccVisibility.cmake
===================================================================
--- trunk/textproc/clucene/files/patch-src__shared__cmake__MacroCheckGccVisibility.cmake	2015-10-18 17:06:10 UTC (rev 20545)
+++ trunk/textproc/clucene/files/patch-src__shared__cmake__MacroCheckGccVisibility.cmake	2015-10-19 17:07:06 UTC (rev 20546)

Property changes on: trunk/textproc/clucene/files/patch-src__shared__cmake__MacroCheckGccVisibility.cmake
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/textproc/clucene/pkg-plist
===================================================================
--- trunk/textproc/clucene/pkg-plist	2015-10-18 17:06:10 UTC (rev 20545)
+++ trunk/textproc/clucene/pkg-plist	2015-10-19 17:07:06 UTC (rev 20546)
@@ -359,37 +359,3 @@
 lib/libclucene-shared.so.2.3.3.4
 libdata/pkgconfig/libclucene-core.pc
 %%DATADIR%%/CLuceneConfig.cmake
- at dirrm %%DATADIR%%
- at dirrm include/CLucene/util
- at dirrm include/CLucene/store
- at dirrm include/CLucene/snowball/src_c
- at dirrm include/CLucene/snowball/runtime
- at dirrm include/CLucene/snowball/libstemmer
- at dirrm include/CLucene/snowball/include
- at dirrm include/CLucene/snowball
- at dirrm include/CLucene/search/spans
- at dirrm include/CLucene/search
- at dirrm include/CLucene/queryParser/legacy
- at dirrm include/CLucene/queryParser
- at dirrm include/CLucene/index
- at dirrm include/CLucene/highlighter
- at dirrm include/CLucene/ext/boost/smart_ptr/detail
- at dirrm include/CLucene/ext/boost/smart_ptr
- at dirrm include/CLucene/ext/boost/exception/detail
- at dirrm include/CLucene/ext/boost/exception
- at dirrm include/CLucene/ext/boost/detail
- at dirrm include/CLucene/ext/boost/config/stdlib
- at dirrm include/CLucene/ext/boost/config/platform
- at dirrm include/CLucene/ext/boost/config/no_tr1
- at dirrm include/CLucene/ext/boost/config/compiler
- at dirrm include/CLucene/ext/boost/config/abi
- at dirrm include/CLucene/ext/boost/config
- at dirrm include/CLucene/ext/boost
- at dirrm include/CLucene/ext
- at dirrm include/CLucene/document
- at dirrm include/CLucene/debug
- at dirrm include/CLucene/analysis/standard
- at dirrm include/CLucene/analysis/de
- at dirrm include/CLucene/analysis/cjk
- at dirrm include/CLucene/analysis
- at dirrm include/CLucene

Modified: trunk/textproc/docbook/Makefile
===================================================================
--- trunk/textproc/docbook/Makefile	2015-10-18 17:06:10 UTC (rev 20545)
+++ trunk/textproc/docbook/Makefile	2015-10-19 17:07:06 UTC (rev 20546)
@@ -1,13 +1,8 @@
-# New ports collection makefile for:   docbook
-# Date created:        7 April 1999
-# Whom:                Nik Clayton <nik at freebsd.org>
-#
 # $MidnightBSD$
 # $FreeBSD: ports/textproc/docbook/Makefile,v 1.22 2007/01/15 15:11:11 alepulver Exp $
-#
 
 PORTNAME=	docbook
-PORTVERSION=	1.3
+PORTVERSION=	1.5
 CATEGORIES=	textproc
 MASTER_SITES=	#
 DISTFILES=	#
@@ -14,78 +9,17 @@
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	Meta-port for the different versions of the DocBook DTD
+
 LICENSE=	unknown
 
+RUN_DEPENDS=	${LOCALBASE}/share/sgml/docbook/catalog:${PORTSDIR}/textproc/docbook-sgml \
+		${LOCALBASE}/share/xml/docbook/catalog.xml:${PORTSDIR}/textproc/docbook-xml \
+		sdocbook-xml>0:${PORTSDIR}/textproc/sdocbook-xml
+
 NO_BUILD=	yes
 
-OPTIONS=	DB241 "DocBook SGML DTD 2.4.1" on \
-		DB30 "DocBook SGML DTD 3.0" on \
-		DB31 "DocBook SGML DTD 3.1" on \
-		DB40 "DocBook SGML DTD 4.0" on \
-		DB41 "DocBook SGML DTD 4.1" on \
-		DB41_XML "DocBook XML DTD 4.1" off \
-		DB42 "DocBook SGML DTD 4.2" off \
-		DB42_XML "DocBook XML DTD 4.2" on \
-		DB43_XML "DocBook XML DTD 4.3" off \
-		DB44_XML "DocBook XML DTD 4.4" off \
-		DB45_XML "DocBook XML DTD 4.5" off \
-		ISO8879 "ISO 8879:1986 character entity sets (SGML)" on \
-		SDB_XML "Simplified DocBook XML DTD" off
-
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_DB241)
-RUN_DEPENDS+=	${LOCALBASE}/share/sgml/docbook/2.4.1:${PORTSDIR}/textproc/docbook-241
-.endif
-
-.if defined(WITH_DB30)
-RUN_DEPENDS+=	${LOCALBASE}/share/sgml/docbook/3.0:${PORTSDIR}/textproc/docbook-300
-.endif
-
-.if defined(WITH_DB31)
-RUN_DEPENDS+=	${LOCALBASE}/share/sgml/docbook/3.1:${PORTSDIR}/textproc/docbook-310
-.endif
-
-.if defined(WITH_DB40)
-RUN_DEPENDS+=	${LOCALBASE}/share/sgml/docbook/4.0:${PORTSDIR}/textproc/docbook-400
-.endif
-
-.if defined(WITH_DB41)
-RUN_DEPENDS+=	${LOCALBASE}/share/sgml/docbook/4.1:${PORTSDIR}/textproc/docbook-410
-.endif
-
-.if defined(WITH_DB41_XML)
-RUN_DEPENDS+=	${LOCALBASE}/share/xml/docbook/4.1.2:${PORTSDIR}/textproc/docbook-sk
-.endif
-
-.if defined(WITH_DB42)
-RUN_DEPENDS+=	${LOCALBASE}/share/sgml/docbook/4.2:${PORTSDIR}/textproc/docbook-420
-.endif
-
-.if defined(WITH_DB42_XML)
-RUN_DEPENDS+=	${LOCALBASE}/share/xml/docbook/4.2:${PORTSDIR}/textproc/docbook-xml
-.endif
-
-.if defined(WITH_DB43_XML)
-RUN_DEPENDS+=	${LOCALBASE}/share/xml/docbook/4.3:${PORTSDIR}/textproc/docbook-xml-430
-.endif
-
-.if defined(WITH_DB44_XML)
-RUN_DEPENDS+=	${LOCALBASE}/share/xml/docbook/4.4:${PORTSDIR}/textproc/docbook-xml-440
-.endif
-
-.if defined(WITH_DB45_XML)
-RUN_DEPENDS+=	${LOCALBASE}/share/xml/docbook/4.5:${PORTSDIR}/textproc/docbook-xml-450
-.endif
-
-.if defined(WITH_ISO8879)
-RUN_DEPENDS+=	${LOCALBASE}/share/sgml/iso8879:${PORTSDIR}/textproc/iso8879
-.endif
-
-.if defined(WITH_SDB_XML)
-RUN_DEPENDS+=	${LOCALBASE}/share/xml/sdocbook/1.1:${PORTSDIR}/textproc/sdocbook-xml
-.endif
-
 do-install:
 	@${DO_NADA}
 

Modified: trunk/textproc/docbook-sgml/Makefile
===================================================================
--- trunk/textproc/docbook-sgml/Makefile	2015-10-18 17:06:10 UTC (rev 20545)
+++ trunk/textproc/docbook-sgml/Makefile	2015-10-19 17:07:06 UTC (rev 20546)
@@ -2,7 +2,7 @@
 
 PORTNAME=	docbook
 PORTVERSION=	4.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	${DBFILES:C,(.*):(.*),http://www.oasis-open.org/docbook/sgml/\1/:\2,:C,:docbook-([0-9]+).([0-9]+),:db\1\2,}
 PKGNAMESUFFIX=	-sgml
@@ -13,6 +13,8 @@
 
 LICENSE=	unknown
 
+EXTRACT_DEPENDS=	${LOCALBASE}/bin/bsdtar:${PORTSDIR}/archivers/libarchive
+
 RUN_DEPENDS=	${LOCALBASE}/${ISOCAT}:${PORTSDIR}/textproc/iso8879 \
 		${LOCALBASE}/${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr
 
@@ -33,7 +35,7 @@
 	@${RM} -rf ${WRKDIR}
 	@${MKDIR} ${WRKDIR}
 .for df in ${DISTFILES:C,:.*,,}
-	@cd ${WRKDIR} && ${TAR} \
+	@cd ${WRKDIR} && /usr/local/bin/bsdtar \
 		${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${df} \
 		${EXTRACT_AFTER_ARGS} -s ,^,${df:R}/,
 .endfor

Modified: trunk/textproc/docbook-to-man/Makefile
===================================================================
--- trunk/textproc/docbook-to-man/Makefile	2015-10-18 17:06:10 UTC (rev 20545)
+++ trunk/textproc/docbook-to-man/Makefile	2015-10-19 17:07:06 UTC (rev 20546)
@@ -2,16 +2,18 @@
 
 PORTNAME=	docbook-to-man
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.oasis-open.org/docbook/tools/dtm/
 DISTNAME=	${PORTNAME}
 
 MAINTAINER=	ports at MidnightBSD.org
-COMMENT=	A DocBook SGML DTD into nroff/troff -man macros converter
+COMMENT=	DocBook SGML DTD into nroff/troff -man macros converter
 
 LICENSE=	unknown
 
+RUN_DEPENDS=	docbook>0:${PORTSDIR}/textproc/docbook
+
 FAKE_OPTS=	trueprefix
 
 .include <bsd.port.pre.mk>
@@ -27,16 +29,10 @@
 .else
 RUN_DEPENDS=	nsgmls:${PORTSDIR}/textproc/jade
 .endif
-RUN_DEPENDS+=	${LOCALBASE}/share/sgml/docbook:${PORTSDIR}/textproc/docbook
 
 USE_IMAKE=	yes
 XFREE86_HTML_MAN= no
 
-MAN1=	oinstant.1
-
-# Local variables
-#
-
 .if defined(WITH_OPENJADE)
 NSGMLS=		onsgmls
 .else

Modified: trunk/textproc/docbook-to-man/pkg-plist
===================================================================
--- trunk/textproc/docbook-to-man/pkg-plist	2015-10-18 17:06:10 UTC (rev 20545)
+++ trunk/textproc/docbook-to-man/pkg-plist	2015-10-19 17:07:06 UTC (rev 20546)
@@ -1,7 +1,6 @@
- at comment $FreeBSD: ports/textproc/docbook-to-man/pkg-plist,v 1.3 2002/11/10 22:30:18 kris Exp $
 bin/docbook-to-man
 bin/oinstant
+man/man1/oinstant.1.gz
 share/sgml/otranspec/docbook-to-man.ts
 share/sgml/otranspec/roff.cmap
 share/sgml/otranspec/roff.sdata
- at dirrm share/sgml/otranspec

Modified: trunk/textproc/docbook-utils/Makefile
===================================================================
--- trunk/textproc/docbook-utils/Makefile	2015-10-18 17:06:10 UTC (rev 20545)
+++ trunk/textproc/docbook-utils/Makefile	2015-10-19 17:07:06 UTC (rev 20546)
@@ -3,7 +3,7 @@
 
 PORTNAME=	docbook-utils
 PORTVERSION=	0.6.14
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc
 MASTER_SITES=	SOURCEWARE/docbook-tools/new-trials/SOURCES
 

Modified: trunk/textproc/docbook-utils/pkg-plist
===================================================================
--- trunk/textproc/docbook-utils/pkg-plist	2015-10-18 17:06:10 UTC (rev 20545)
+++ trunk/textproc/docbook-utils/pkg-plist	2015-10-19 17:07:06 UTC (rev 20546)
@@ -9,6 +9,20 @@
 bin/docbook2txt
 bin/jw
 bin/sgmldiff
+man/man1/docbook2dvi.1.gz
+man/man1/docbook2html.1.gz
+man/man1/docbook2man-spec.pl.1.gz
+man/man1/docbook2man.1.gz
+man/man1/docbook2pdf.1.gz
+man/man1/docbook2ps.1.gz
+man/man1/docbook2rtf.1.gz
+man/man1/docbook2tex.1.gz
+man/man1/docbook2texi-spec.pl.1.gz
+man/man1/docbook2texi.1.gz
+man/man1/jw.1.gz
+man/man1/sgmldiff.1.gz
+man/man7/backend-spec.7.gz
+man/man7/frontend-spec.7.gz
 share/sgml/docbook/utils-0.6.14/backends/dvi
 share/sgml/docbook/utils-0.6.14/backends/html
 share/sgml/docbook/utils-0.6.14/backends/man
@@ -18,12 +32,7 @@
 share/sgml/docbook/utils-0.6.14/backends/tex
 share/sgml/docbook/utils-0.6.14/backends/texi
 share/sgml/docbook/utils-0.6.14/backends/txt
+share/sgml/docbook/utils-0.6.14/docbook-utils.dsl
 share/sgml/docbook/utils-0.6.14/frontends/docbook
 share/sgml/docbook/utils-0.6.14/helpers/docbook2man-spec.pl
 share/sgml/docbook/utils-0.6.14/helpers/docbook2texi-spec.pl
-share/sgml/docbook/utils-0.6.14/docbook-utils.dsl
- at dirrm share/sgml/docbook/utils-0.6.14/backends
- at dirrm share/sgml/docbook/utils-0.6.14/frontends
- at dirrm share/sgml/docbook/utils-0.6.14/helpers
- at dirrm share/sgml/docbook/utils-0.6.14
- at dirrmtry share/sgml/docbook

Modified: trunk/textproc/dsssl-docbook-modular/Makefile
===================================================================
--- trunk/textproc/dsssl-docbook-modular/Makefile	2015-10-18 17:06:10 UTC (rev 20545)
+++ trunk/textproc/dsssl-docbook-modular/Makefile	2015-10-19 17:07:06 UTC (rev 20546)
@@ -8,22 +8,21 @@
 
 PORTNAME=	dsssl-docbook-modular
 PORTVERSION=	1.79
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	textproc
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	docbook
+MASTER_SITES=	SF/docbook/docbook-dsssl/${PORTVERSION}:1 \
+		SF/docbook/docbook-dsssl-doc/${PORTVERSION}:2
 DISTNAME=	docbook-dsssl-${PORTVERSION}
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} docbook-dsssl-doc-${PORTVERSION}${EXTRACT_SUFX}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:1 docbook-dsssl-doc-${PORTVERSION}${EXTRACT_SUFX}:2
 
-MAINTAINER=	ports at MidnightBSD.org
-COMMENT=	DSSSL stylesheets for the DocBook DTD by Norman Walsh
-LICENSE=	other
-
 PATCH_SITES=	http://dist.bsdlab.org/
 PATCHFILES=	docbook-dsssl-mn-20070525.diff.gz
 PATCH_DIST_STRIP=	-p1
 
+MAINTAINER=	ports at MidnightBSD.org
+COMMENT=	DSSSL stylesheets for the DocBook DTD by Norman Walsh
+LICENSE=	other
 BUILD_DEPENDS=	${XMLCATMGR}:${PORTSDIR}/textproc/xmlcatmgr
 RUN_DEPENDS=	${BUILD_DEPENDS}
 

Modified: trunk/textproc/dsssl-docbook-modular/distinfo
===================================================================
--- trunk/textproc/dsssl-docbook-modular/distinfo	2015-10-18 17:06:10 UTC (rev 20545)
+++ trunk/textproc/dsssl-docbook-modular/distinfo	2015-10-19 17:07:06 UTC (rev 20546)
@@ -1,9 +1,6 @@
 SHA256 (docbook-dsssl-1.79.tar.gz) = d5a199024a5fe0862bfaff9e3533817cd8d08bddf3cdfb5bfe6088cbb2cd62b3
-RMD160 (docbook-dsssl-1.79.tar.gz) = 4c3e84241d0fc5c712973e55dc4d89a31fcb1fe9
 SIZE (docbook-dsssl-1.79.tar.gz) = 355586
 SHA256 (docbook-dsssl-doc-1.79.tar.gz) = ea12a8127339c4ed2c34a73571331ffac4dbe07a9524892d28e5514e0efe033a
-RMD160 (docbook-dsssl-doc-1.79.tar.gz) = 81d30a843f84f5c8fc109079a60cbbbb210332c4
 SIZE (docbook-dsssl-doc-1.79.tar.gz) = 225797
 SHA256 (docbook-dsssl-mn-20070525.diff.gz) = d5525a08e8f286e42c23c2b56a6f4f8fb536146678ed93e3caf425104dc33b2f
-RMD160 (docbook-dsssl-mn-20070525.diff.gz) = 48251780190cc1cb6ba118ffdca9be57f6a3bc46
 SIZE (docbook-dsssl-mn-20070525.diff.gz) = 8301

Modified: trunk/textproc/dsssl-docbook-modular/pkg-plist
===================================================================
--- trunk/textproc/dsssl-docbook-modular/pkg-plist	2015-10-18 17:06:10 UTC (rev 20545)
+++ trunk/textproc/dsssl-docbook-modular/pkg-plist	2015-10-19 17:07:06 UTC (rev 20546)
@@ -1,4 +1,3 @@
- at comment $MidnightBSD$
 share/sgml/docbook/dsssl/modular/BUGS
 share/sgml/docbook/dsssl/modular/ChangeLog
 share/sgml/docbook/dsssl/modular/README
@@ -729,32 +728,3 @@
 share/sgml/docbook/dsssl/modular/print/version.dsl
 @unexec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% remove %%DTDDIR%%/catalog
 @exec %%XMLCATMGR%% -sc %%CATALOG_PORTS_SGML%% add CATALOG %%DTDDIR%%/catalog
- at dirrm share/sgml/docbook/dsssl/modular/print
- at dirrm share/sgml/docbook/dsssl/modular/olink
- at dirrm share/sgml/docbook/dsssl/modular/lib
- at dirrm share/sgml/docbook/dsssl/modular/images/callouts
- at dirrm share/sgml/docbook/dsssl/modular/images
- at dirrm share/sgml/docbook/dsssl/modular/html
- at dirrm share/sgml/docbook/dsssl/modular/frames
- at dirrm share/sgml/docbook/dsssl/modular/dtds/olink
- at dirrm share/sgml/docbook/dsssl/modular/dtds/imagelib
- at dirrm share/sgml/docbook/dsssl/modular/dtds/html
- at dirrm share/sgml/docbook/dsssl/modular/dtds/decls
- at dirrm share/sgml/docbook/dsssl/modular/dtds/dbdsssl
- at dirrm share/sgml/docbook/dsssl/modular/dtds
- at dirrm share/sgml/docbook/dsssl/modular/doc/testdata
- at dirrm share/sgml/docbook/dsssl/modular/doc/print
- at dirrm share/sgml/docbook/dsssl/modular/doc/lib
- at dirrm share/sgml/docbook/dsssl/modular/doc/html
- at dirrm share/sgml/docbook/dsssl/modular/doc
- at dirrm share/sgml/docbook/dsssl/modular/contrib/subdoc
- at dirrm share/sgml/docbook/dsssl/modular/contrib/renumberinpart
- at dirrm share/sgml/docbook/dsssl/modular/contrib/print
- at dirrm share/sgml/docbook/dsssl/modular/contrib/imagemap
- at dirrm share/sgml/docbook/dsssl/modular/contrib/html
- at dirrm share/sgml/docbook/dsssl/modular/contrib
- at dirrm share/sgml/docbook/dsssl/modular/common
- at dirrm share/sgml/docbook/dsssl/modular/bin
- at dirrm share/sgml/docbook/dsssl/modular
- at unexec /bin/rmdir %D/share/sgml/docbook/dsssl 2>/dev/null || true
- at unexec /bin/rmdir %D/share/sgml/docbook 2>/dev/null || true

Modified: trunk/textproc/easydiff/Makefile
===================================================================
--- trunk/textproc/easydiff/Makefile	2015-10-18 17:06:10 UTC (rev 20545)
+++ trunk/textproc/easydiff/Makefile	2015-10-19 17:07:06 UTC (rev 20546)
@@ -1,14 +1,9 @@
-# New ports collection makefile for:    easydiff
-# Date created:         15 Mar 2003
-# Whom:                 dirk.meyer at dinoex.sub.org
-#
 # $MidnightBSD$
 # $FreeBSD: ports/textproc/easydiff/Makefile,v 1.8 2006/03/19 04:35:47 dinoex Exp $
-#
 
 PORTNAME=	easydiff
 PORTVERSION=	0.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc gnustep
 MASTER_SITES=	GNUSTEP/usr-apps
 DISTNAME=	EasyDiff-${PORTVERSION}
@@ -15,6 +10,7 @@
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	GNUstep graphical diff
+
 LICENSE=	gpl3
 
 USES=		gnustep

Modified: trunk/textproc/ebook-tools/distinfo
===================================================================
--- trunk/textproc/ebook-tools/distinfo	2015-10-18 17:06:10 UTC (rev 20545)
+++ trunk/textproc/ebook-tools/distinfo	2015-10-19 17:07:06 UTC (rev 20546)
@@ -1,3 +1,2 @@
 SHA256 (ebook-tools-0.2.2.tar.gz) = cbc35996e911144fa62925366ad6a6212d6af2588f1e39075954973bbee627ae
-RMD160 (ebook-tools-0.2.2.tar.gz) = 2808a20b7bc9dc01b54be0e46dfb4cf96508d1a2
 SIZE (ebook-tools-0.2.2.tar.gz) = 46889

Modified: trunk/textproc/localize/Makefile
===================================================================
--- trunk/textproc/localize/Makefile	2015-10-18 17:06:10 UTC (rev 20545)
+++ trunk/textproc/localize/Makefile	2015-10-19 17:07:06 UTC (rev 20546)
@@ -2,7 +2,7 @@
 
 PORTNAME=	localize
 PORTVERSION=	0.0.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	textproc gnustep
 MASTER_SITES=	http://www.eskimo.com/~pburns/Localize/files/
 DISTNAME=	Localize-20040424
@@ -17,4 +17,7 @@
 
 WRKSRC=		${WRKDIR}/Localize
 
+post-install:
+	@${STRIP_CMD} ${PREFIX}/GNUstep/Local/Applications/Localize.app/Localize
+
 .include <bsd.port.mk>

Added: trunk/textproc/py-alabaster/Makefile
===================================================================
--- trunk/textproc/py-alabaster/Makefile	                        (rev 0)
+++ trunk/textproc/py-alabaster/Makefile	2015-10-19 17:07:06 UTC (rev 20546)
@@ -0,0 +1,18 @@
+# $MidnightBSD$
+# $FreeBSD: head/textproc/py-alabaster/Makefile 392000 2015-07-14 14:20:13Z kmoore $
+
+PORTNAME=	alabaster
+PORTVERSION=	0.7.6
+CATEGORIES=	textproc python
+MASTER_SITES=	CHEESESHOP
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	ports at MidnightBSD.org
+COMMENT=	Modified Kr Sphinx theme
+
+LICENSE=	mit
+
+USES=		python
+USE_PYTHON=	distutils autoplist
+
+.include <bsd.port.mk>


Property changes on: trunk/textproc/py-alabaster/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/textproc/py-alabaster/distinfo
===================================================================
--- trunk/textproc/py-alabaster/distinfo	                        (rev 0)
+++ trunk/textproc/py-alabaster/distinfo	2015-10-19 17:07:06 UTC (rev 20546)
@@ -0,0 +1,2 @@
+SHA256 (alabaster-0.7.6.tar.gz) = 309d33e0282c8209f792f3527f41ec04e508ff837c61fc1906dde988a256deeb
+SIZE (alabaster-0.7.6.tar.gz) = 16598


Property changes on: trunk/textproc/py-alabaster/distinfo
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/textproc/py-alabaster/pkg-descr
===================================================================
--- trunk/textproc/py-alabaster/pkg-descr	                        (rev 0)
+++ trunk/textproc/py-alabaster/pkg-descr	2015-10-19 17:07:06 UTC (rev 20546)
@@ -0,0 +1,4 @@
+Based off the original Flask and KR themes, this is a more
+extensible version of the prior.
+
+WWW: https://github.com/bitprophet/alabaster


Property changes on: trunk/textproc/py-alabaster/pkg-descr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/textproc/py-libxml2/Makefile
===================================================================
--- trunk/textproc/py-libxml2/Makefile	2015-10-18 17:06:10 UTC (rev 20545)
+++ trunk/textproc/py-libxml2/Makefile	2015-10-19 17:07:06 UTC (rev 20546)
@@ -1,6 +1,6 @@
 # $MidnightBSD$
 
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	textproc gnome python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 

Added: trunk/textproc/py-pystemmer/Makefile
===================================================================
--- trunk/textproc/py-pystemmer/Makefile	                        (rev 0)
+++ trunk/textproc/py-pystemmer/Makefile	2015-10-19 17:07:06 UTC (rev 20546)
@@ -0,0 +1,25 @@
+# Created by: Wen Heping <wenheping at gmail.com>
+# $MidnightBSD$
+# $FreeBSD: head/textproc/py-pystemmer/Makefile 393632 2015-08-06 06:25:34Z lwhsu $
+
+PORTNAME=	pystemmer
+PORTVERSION=	1.3.0
+CATEGORIES=	textproc python
+MASTER_SITES=	CHEESESHOP \
+		http://snowball.tartarus.org/wrappers/
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DISTNAME=	PyStemmer-${PORTVERSION}
+
+MAINTAINER=	ports at MidnightBSD.org
+COMMENT=	Snowball Stemming Algorithms for Information Retrieval
+
+LICENSE=	mit bsd3
+LICENSE_COMB=	dual
+
+USES=		python
+USE_PYTHON=	distutils autoplist
+
+post-install:
+	${STRIP_CMD} ${FAKE_DESTDIR}${PYTHONPREFIX_SITELIBDIR}/Stemmer.so
+
+.include <bsd.port.mk>


Property changes on: trunk/textproc/py-pystemmer/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/textproc/py-pystemmer/distinfo
===================================================================
--- trunk/textproc/py-pystemmer/distinfo	                        (rev 0)
+++ trunk/textproc/py-pystemmer/distinfo	2015-10-19 17:07:06 UTC (rev 20546)
@@ -0,0 +1,2 @@
+SHA256 (PyStemmer-1.3.0.tar.gz) = d1ac14eb64978c1697fcfba76e3ac7ebe24357c9428e775390f634648947cb91
+SIZE (PyStemmer-1.3.0.tar.gz) = 360102


Property changes on: trunk/textproc/py-pystemmer/distinfo
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/textproc/py-pystemmer/pkg-descr
===================================================================
--- trunk/textproc/py-pystemmer/pkg-descr	                        (rev 0)
+++ trunk/textproc/py-pystemmer/pkg-descr	2015-10-19 17:07:06 UTC (rev 20546)
@@ -0,0 +1,16 @@
+PyStemmer provides access to efficient algorithms for calculating a
+"stemmed" form of a word. This is a form with most of the common
+morphological endings removed; hopefully representing a common
+linguistic base form. This is most useful in building search engines
+and information retrieval software; for example, a search with stemming
+enabled should be able to find a document containing "cycling" given the
+query "cycles".
+
+PyStemmer provides algorithms for several (mainly european) languages,
+by wrapping the libstemmer library from the Snowball project in a Python
+module. It also provides access to the classic Porter stemming algorithm
+for english: although this has been superceded by an improved algorithm,
+the original algorithm may be of interest to information retrieval
+researchers wishing to reproduce results of earlier experiments.
+
+WWW: https://pypi.python.org/pypi/PyStemmer/


Property changes on: trunk/textproc/py-pystemmer/pkg-descr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/textproc/py-snowballstemmer/Makefile
===================================================================
--- trunk/textproc/py-snowballstemmer/Makefile	                        (rev 0)
+++ trunk/textproc/py-snowballstemmer/Makefile	2015-10-19 17:07:06 UTC (rev 20546)
@@ -0,0 +1,28 @@
+# $MidnightBSD$
+# $FreeBSD: head/textproc/py-snowballstemmer/Makefile 393635 2015-08-06 07:07:33Z lwhsu $
+
+PORTNAME=	snowballstemmer
+PORTVERSION=	1.2.0
+CATEGORIES=	textproc python
+MASTER_SITES=	CHEESESHOP
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	ports at MidnightBSD.org
+COMMENT=	Snowball stemming library collection for Python
+
+LICENSE=	bsd2
+
+USES=		python
+USE_PYTHON=	distutils autoplist
+
+OPTIONS_DEFINE=	PYSTEMMER
+OPTIONS_DEFAULT=PYSTEMMER
+PYSTEMMER_DESC=	Use PyStemmer to accelerate
+
+.include <bsd.mport.options.mk>
+
+.if ${PORT_OPTIONS:MPYSTEMMER}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pystemmer>0:${PORTSDIR}/textproc/py-pystemmer
+.endif
+
+.include <bsd.port.mk>


Property changes on: trunk/textproc/py-snowballstemmer/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/textproc/py-snowballstemmer/distinfo
===================================================================
--- trunk/textproc/py-snowballstemmer/distinfo	                        (rev 0)
+++ trunk/textproc/py-snowballstemmer/distinfo	2015-10-19 17:07:06 UTC (rev 20546)
@@ -0,0 +1,2 @@
+SHA256 (snowballstemmer-1.2.0.tar.gz) = 6d54f350e7a0e48903a4e3b6b2cabd1b43e23765fbc975065402893692954191
+SIZE (snowballstemmer-1.2.0.tar.gz) = 49639


Property changes on: trunk/textproc/py-snowballstemmer/distinfo
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/textproc/py-snowballstemmer/pkg-descr
===================================================================
--- trunk/textproc/py-snowballstemmer/pkg-descr	                        (rev 0)
+++ trunk/textproc/py-snowballstemmer/pkg-descr	2015-10-19 17:07:06 UTC (rev 20546)
@@ -0,0 +1,4 @@
+This is a pure Python stemming library. If PyStemmer is
+available, this module uses it to accelerate.
+
+WWW: https://pypi.python.org/pypi/snowballstemmer


Property changes on: trunk/textproc/py-snowballstemmer/pkg-descr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/textproc/py-sphinx/Makefile
===================================================================
--- trunk/textproc/py-sphinx/Makefile	2015-10-18 17:06:10 UTC (rev 20545)
+++ trunk/textproc/py-sphinx/Makefile	2015-10-19 17:07:06 UTC (rev 20546)
@@ -1,7 +1,7 @@
 # $MidnightBSD$
 
 PORTNAME=	sphinx
-PORTVERSION=	1.2.3
+PORTVERSION=	1.3.1
 CATEGORIES=	textproc python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -14,15 +14,20 @@
 LICENSE=	bsd2
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Jinja2>=2.3:${PORTSDIR}/devel/py-Jinja2 \
-		${PYTHON_PKGNAMEPREFIX}docutils>=0.7:${PORTSDIR}/textproc/py-docutils
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Jinja2>=2.3:${PORTSDIR}/devel/py-Jinja2 \
-		${PYTHON_PKGNAMEPREFIX}docutils>=0.7:${PORTSDIR}/textproc/py-docutils \
-		${PYTHON_PKGNAMEPREFIX}pygments>=1.2:${PORTSDIR}/textproc/py-pygments
+		${PYTHON_PKGNAMEPREFIX}docutils>=0.11:${PORTSDIR}/textproc/py-docutils \
+		${PYTHON_PKGNAMEPREFIX}six>=1.4:${PORTSDIR}/devel/py-six
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Babel>=1.3:${PORTSDIR}/devel/py-babel\
+		${PYTHON_PKGNAMEPREFIX}Jinja2>=2.3:${PORTSDIR}/devel/py-Jinja2 \
+		${PYTHON_PKGNAMEPREFIX}docutils>=0.11:${PORTSDIR}/textproc/py-docutils \
+		${PYTHON_PKGNAMEPREFIX}pygments>=2.0:${PORTSDIR}/textproc/py-pygments \
+		${PYTHON_PKGNAMEPREFIX}Babel>=1.3:${PORTSDIR}/devel/py-babel \
+		${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>=0.1:${PORTSDIR}/textproc/py-sphinx_rtd_theme \
+		${PYTHON_PKGNAMEPREFIX}alabaster>=0.7:${PORTSDIR}/textproc/py-alabaster \
+		${PYTHON_PKGNAMEPREFIX}snowballstemmer>=1.1:${PORTSDIR}/textproc/py-snowballstemmer \
+		${PYTHON_PKGNAMEPREFIX}six>=1.4:${PORTSDIR}/devel/py-six
 
 USES=		python
-USE_PYDISTUTILS=	easy_install
-PYDISTUTILS_AUTOPLIST=	yes
-PYDISTUTILS_PKGNAME=	Sphinx
+USE_PYTHON=	autoplist distutils
 
 post-build:
 	cd ${WRKSRC}/build/lib && \
@@ -31,8 +36,8 @@
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/build/lib/sphinx/pycode/Grammar-py${PYTHON_VER:R}-${PORTNAME}${PORTVERSION:R}.pickle \
-	${FAKE_DESTDIR}/${PYTHONPREFIX_SITELIBDIR}/${PYEASYINSTALL_EGG}/sphinx/pycode/
+	${FAKE_DESTDIR}/${PYTHONPREFIX_SITELIBDIR}/sphinx/pycode/
 
-	@${ECHO_CMD} ${PYTHON_SITELIBDIR:S;${PYTHONBASE}/;;}/${PYEASYINSTALL_EGG}/sphinx/pycode/Grammar-py${PYTHON_VER:R}-${PORTNAME}${PORTVERSION:R}.pickle >> ${TMPPLIST}
+	@${ECHO_CMD} ${PYTHON_SITELIBDIR:S;${PYTHONBASE}/;;}/sphinx/pycode/Grammar-py${PYTHON_VER:R}-${PORTNAME}${PORTVERSION:R}.pickle >> ${TMPPLIST}
 
 .include <bsd.port.mk>

Modified: trunk/textproc/py-sphinx/distinfo
===================================================================
--- trunk/textproc/py-sphinx/distinfo	2015-10-18 17:06:10 UTC (rev 20545)
+++ trunk/textproc/py-sphinx/distinfo	2015-10-19 17:07:06 UTC (rev 20546)
@@ -1,2 +1,2 @@
-SHA256 (python/Sphinx-1.2.3.tar.gz) = 94933b64e2fe0807da0612c574a021c0dac28c7bd3c4a23723ae5a39ea8f3d04
-SIZE (python/Sphinx-1.2.3.tar.gz) = 3200548
+SHA256 (python/Sphinx-1.3.1.tar.gz) = 1a6e5130c2b42d2de301693c299f78cc4bd3501e78b610c08e45efc70e2b5114
+SIZE (python/Sphinx-1.3.1.tar.gz) = 3469782

Added: trunk/textproc/py-sphinx_rtd_theme/Makefile
===================================================================
--- trunk/textproc/py-sphinx_rtd_theme/Makefile	                        (rev 0)
+++ trunk/textproc/py-sphinx_rtd_theme/Makefile	2015-10-19 17:07:06 UTC (rev 20546)
@@ -0,0 +1,18 @@
+# $MidnightBSD$
+# $FreeBSD: head/textproc/py-sphinx_rtd_theme/Makefile 392010 2015-07-14 14:50:44Z robak $
+
+PORTNAME=	sphinx_rtd_theme
+PORTVERSION=	0.1.8
+CATEGORIES=	textproc python
+MASTER_SITES=	CHEESESHOP
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	ports at MidnightBSD.org
+COMMENT=	Mobile-friendly py-sphinx theme
+
+LICENSE=	mit
+
+USES=		python
+USE_PYTHON=	distutils autoplist
+
+.include <bsd.port.mk>


Property changes on: trunk/textproc/py-sphinx_rtd_theme/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/textproc/py-sphinx_rtd_theme/distinfo
===================================================================
--- trunk/textproc/py-sphinx_rtd_theme/distinfo	                        (rev 0)
+++ trunk/textproc/py-sphinx_rtd_theme/distinfo	2015-10-19 17:07:06 UTC (rev 20546)
@@ -0,0 +1,2 @@
+SHA256 (sphinx_rtd_theme-0.1.8.tar.gz) = 74f633ed3a61da1d1d59c3185483c81a9d7346bf0e7b5f29ad0764a6f159b68a
+SIZE (sphinx_rtd_theme-0.1.8.tar.gz) = 424804


Property changes on: trunk/textproc/py-sphinx_rtd_theme/distinfo
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/textproc/py-sphinx_rtd_theme/pkg-descr
===================================================================
--- trunk/textproc/py-sphinx_rtd_theme/pkg-descr	                        (rev 0)
+++ trunk/textproc/py-sphinx_rtd_theme/pkg-descr	2015-10-19 17:07:06 UTC (rev 20546)
@@ -0,0 +1,3 @@
+Prototype mobile-friendly Read the Docs Sphinx theme.
+
+WWW: https://github.com/snide/sphinx_rtd_theme/


Property changes on: trunk/textproc/py-sphinx_rtd_theme/pkg-descr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/textproc/py-xml/Makefile
===================================================================
--- trunk/textproc/py-xml/Makefile	2015-10-18 17:06:10 UTC (rev 20545)
+++ trunk/textproc/py-xml/Makefile	2015-10-19 17:07:06 UTC (rev 20546)
@@ -2,7 +2,7 @@
 
 PORTNAME=	xml
 PORTVERSION=	0.8.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc python
 MASTER_SITES=	SF/py${PORTNAME}/py${PORTNAME}/${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -9,12 +9,12 @@
 DISTNAME=	PyXML-${PORTVERSION}
 
 MAINTAINER=	ports at MidnightBSD.org
-COMMENT=	PyXML: Python XML library enhancements
+COMMENT=	Python XML library enhancements
 
 LICENSE=	other
 
-USE_PYTHON=		yes
-USE_PYDISTUTILS=	yes
+USES=		python
+USE_PYTHON=	distutils autoplist
 PYDISTUTILS_PKGNAME=	PyXML
 
 .include <bsd.port.pre.mk>



More information about the Midnightbsd-cvs mailing list