10 files changed, 56 insertions, 305 deletions

diff --git a/textproc/sablotron/Makefile b/textproc/sablotron/Makefile
index 95bf8ddb765b..44ec6467fca3 100644
--- a/textproc/sablotron/Makefile
+++ b/textproc/sablotron/Makefile
@@ -6,14 +6,10 @@
 #
 
 PORTNAME=	Sablot
-PORTVERSION=	0.44
+PORTVERSION=	0.51
 CATEGORIES=	textproc
 MASTER_SITES=	http://download.gingerall.cz/sablot/
 
-PATCH_SITES=	http://www.gingerall.com/download/
-PATCHFILES=	Sablot-0.44.1.patch
-PATCH_DIST_STRIP=	-p1
-
 MAINTAINER=	skv@protey.ru
 
 LIB_DEPENDS=	iconv.2:${PORTSDIR}/converters/iconv \
@@ -21,15 +17,12 @@ LIB_DEPENDS=	iconv.2:${PORTSDIR}/converters/iconv \
 
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS=	%%PREFIX%%/lib
-
+CONFIGURE_ENV=	CPPFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib
 USE_GMAKE=	yes
 USE_AUTOCONF=	yes
 USE_LIBTOOL=	yes
 
 post-patch:
-.for f in configure.in
-	@${PERL} -pi -e 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/${f}
-.endfor
 .if defined(WITH_RUSSIAN)
 	@${ECHO_MSG} "Patching for russian support..."
 	@cd ${WRKDIR} ; \
diff --git a/textproc/sablotron/distinfo b/textproc/sablotron/distinfo
index b2fd1ffb53e7..67bec774b350 100644
--- a/textproc/sablotron/distinfo
+++ b/textproc/sablotron/distinfo
@@ -1,2 +1 @@
-MD5 (Sablot-0.44.tar.gz) = 35874ea80215fea45f1af28a419c2ce2
-MD5 (Sablot-0.44.1.patch) = 0baeae2c8387ff3d188a54797527a278
+MD5 (Sablot-0.51.tar.gz) = 86e30805258a3f61e16796b5ef84b64a
diff --git a/textproc/sablotron/files/patch-Makefile.am b/textproc/sablotron/files/patch-Makefile.am
deleted file mode 100644
index 9d4270029400..000000000000
--- a/textproc/sablotron/files/patch-Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-*** Makefile.am.orig	Sun Nov 12 17:30:56 2000
---- Makefile.am	Sun Nov 12 17:03:31 2000
-***************
-*** 1,4 ****
-! SUBDIRS=@EXPAT_DIR@ Sablot
-  
-  EXTRA_DIST=Makefile.nt
-  
---- 1,4 ----
-! SUBDIRS=Sablot
-  
-  EXTRA_DIST=Makefile.nt
-  
diff --git a/textproc/sablotron/files/patch-command-Makefile.am b/textproc/sablotron/files/patch-command-Makefile.am
deleted file mode 100644
index 5b545f8c4d11..000000000000
--- a/textproc/sablotron/files/patch-command-Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
-*** ../Sablot-0.44/Sablot/command/Makefile.am	Sun Nov 12 16:46:39 2000
---- Sablot/command/Makefile.am	Sun Nov 12 17:43:25 2000
-***************
-*** 1,15 ****
-! EXPATH=@EXPATH@
-! 
-! INCLUDES=-I../engine
-  
-  bin_PROGRAMS=sabcmd
-  
-  sabcmd_SOURCES=sabcmd.cpp
-  
-- if AM_HAS_EXPAT
-- sabcmd_LDADD=../engine/libsablot.la \
-- 	$(top_builddir)/$(EXPATH)/libxmlparse.la\
-- 	$(top_builddir)/$(EXPATH)/libxmltok.la
-- else
-  sabcmd_LDADD=../engine/libsablot.la
-! endif
---- 1,8 ----
-! INCLUDES=-I../engine -I@PREFIX@/include
-  
-  bin_PROGRAMS=sabcmd
-  
-  sabcmd_SOURCES=sabcmd.cpp
-  
-  sabcmd_LDADD=../engine/libsablot.la
-! 
diff --git a/textproc/sablotron/files/patch-configure.in b/textproc/sablotron/files/patch-configure.in
deleted file mode 100644
index 954d0057e182..000000000000
--- a/textproc/sablotron/files/patch-configure.in
+++ /dev/null
@@ -1,107 +0,0 @@
-*** configure.in.orig	Sun Nov 12 14:07:51 2000
---- configure.in	Sun Nov 12 17:15:20 2000
-***************
-*** 30,35 ****
---- 30,45 ----
-  AC_ARG_ENABLE(warnings, display all warnings , aux_warnings=1)
-  AM_CONDITIONAL(AM_WARNINGS, test x$aux_warnings = x1)
-  
-+ 
-+ PREFIX="%%PREFIX%%"
-+ echo "- setting PREFIX=$PREFIX"
-+ 
-+ CPPFLAGS="$CPPFLAGS -I${PREFIX}/include"
-+ echo "- setting CPPFLAGS=$CPPFLAGS"
-+ 
-+ LDFLAGS="$LDFLAGS -L${PREFIX}/lib"
-+ echo "- setting LDFLAGS=$LDFLAGS"
-+ 
-  dnl ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-  dnl end of initialization stuff
-  dnl --------------------------------------------------
-***************
-*** 38,75 ****
-  dnl Expat stuff - package specific
-  dnl vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
-  
-! AC_MSG_CHECKING(for presence of Expat)
-! if test -d Expat/distribution; then 
-!   has_expat_src=1
-!   AC_DEFINE(HAVE_EXPAT_SRC)
-!   AC_MSG_RESULT(yes);
-! else
-!   has_expat_src=0
-!   AC_MSG_RESULT(no);
-! fi
-! 
-! if test $has_expat_src = 1; then
-! dnl next assignment defines target for subdir
-!   EXPAT_DIR=Expat
-! else
-!   AC_CHECK_LIB(xmltok, main, [xmlt=1; SABLOT_LIBS=-lxmltok], xmlt=0)
-!   AC_CHECK_LIB(xmlparse, main, [xmlp=1; SABLOT_LIBS="$SABLOT_LIBS -lxmlparse"],
-! 		 xmlp=0, -lxmltok)
-!   if test $xmlp = 0 || test $xmlt = 0; then
-!     AC_MSG_ERROR(Can't find the expat libraries)
-!   fi
-! fi
-! 
-! EXPATH=Expat
-! AM_CONDITIONAL(AM_HAS_EXPAT, test x$has_expat_src = x1)
-! AC_SUBST(EXPATH)
-! 
-! dnl Expat headers location (according Linux distribution etc.)
-! if test ! $has_expat_src = 1; then
-!   AC_CHECK_HEADERS( xmlparse.h xmltok/xmlparse.h, break )
-! fi
-  
-! AC_SUBST(EXPAT_DIR)
-  AC_SUBST(SABLOT_LIBS)
-  
-  dnl ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
---- 48,58 ----
-  dnl Expat stuff - package specific
-  dnl vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
-  
-! AC_CHECK_LIB(expat, main, SABLOT_LIBS="$SABLOT_LIBS -lexpat", break)
-! 
-! AC_CHECK_LIB(iconv, main, SABLOT_LIBS="$SABLOT_LIBS -liconv",break)
-  
-! AC_SUBST(PREFIX)
-  AC_SUBST(SABLOT_LIBS)
-  
-  dnl ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-***************
-*** 81,87 ****
-  dnl for easier maintenance - keep synchronized!!
-  dnl vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
-  
-! AC_CHECK_HEADERS( iconv.h timeb.h sys/timeb.h sys/time.h \
-  	sys/types.h unistd.h ieeefp.h)
-  
-  dnl check for the presence of miscellaneous functions
---- 64,70 ----
-  dnl for easier maintenance - keep synchronized!!
-  dnl vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
-  
-! AC_CHECK_HEADERS( expat.h iconv.h timeb.h sys/timeb.h sys/time.h \
-  	sys/types.h unistd.h ieeefp.h)
-  
-  dnl check for the presence of miscellaneous functions
-***************
-*** 97,103 ****
-  dnl vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
-  
-  AC_OUTPUT( Makefile Sablot/Makefile Sablot/engine/Makefile \
-!            Sablot/command/Makefile Expat/Makefile)
-  
-  dnl ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-  dnl end of file
---- 80,86 ----
-  dnl vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
-  
-  AC_OUTPUT( Makefile Sablot/Makefile Sablot/engine/Makefile \
-!            Sablot/command/Makefile)
-  
-  dnl ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-  dnl end of file
diff --git a/textproc/sablotron/files/patch-engine-Makefile.am b/textproc/sablotron/files/patch-engine-Makefile.am
deleted file mode 100644
index b7a2fe9c42ef..000000000000
--- a/textproc/sablotron/files/patch-engine-Makefile.am
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -cr ../Sablot-0.44/Sablot/engine/Makefile.am Sablot/engine/Makefile.am
-*** ../Sablot-0.44/Sablot/engine/Makefile.am	Thu Sep 14 15:09:03 2000
---- Sablot/engine/Makefile.am	Sun Nov 12 17:01:52 2000
-***************
-*** 1,7 ****
-- EXPATH=@EXPATH@
-- 
-  if AM_WARNINGS
-! CPPFLAGS=-Wall
-  endif
-  
-  # sablot libs contains expat libraries checked in the configure script
---- 1,5 ----
-  if AM_WARNINGS
-! CPPFLAGS+= -Wall
-  endif
-  
-  # sablot libs contains expat libraries checked in the configure script
-***************
-*** 10,19 ****
-  
-  lib_LTLIBRARIES=libsablot.la
-  
-! if AM_HAS_EXPAT
-! INCLUDES=-I$(top_srcdir)/$(EXPATH)/distribution/xmltok \
-! 	-I$(top_srcdir)/$(EXPATH)/distribution/xmlparse
-! endif
-  
-  libsablot_la_SOURCES = \
-  	arena.h \
---- 8,14 ----
-  
-  lib_LTLIBRARIES=libsablot.la
-  
-! INCLUDES+=-I@PREFIX@/include
-  
-  libsablot_la_SOURCES = \
-  	arena.h \
diff --git a/textproc/sablotron/files/patch-engine-parser.h b/textproc/sablotron/files/patch-engine-parser.h
deleted file mode 100644
index 710b655f555f..000000000000
--- a/textproc/sablotron/files/patch-engine-parser.h
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -cr ../Sablot-0.44/Sablot/engine/parser.h Sablot/engine/parser.h
-*** ../Sablot-0.44/Sablot/engine/parser.h	Thu Sep 14 15:09:03 2000
---- Sablot/engine/parser.h	Sun Nov 12 17:07:31 2000
-***************
-*** 39,51 ****
-  #include "base.h"
-  #include "output.h"
-  
-! #if defined (HAVE_XMLPARSE_H) || defined (HAVE_EXPAT_SRC)
-! #include <xmlparse.h>
-! #elif defined (HAVE_XMLTOK_XMLPARSE_H)
-! #include <xmltok/xmlparse.h>
-! #elif defined (WIN32)
-! #include "xmlparse.h"
-! #endif
-  
-  class Tree;
-  class DataLine;
---- 39,45 ----
-  #include "base.h"
-  #include "output.h"
-  
-! #include <expat.h>
-  
-  class Tree;
-  class DataLine;
diff --git a/textproc/sablotron/files/patch-engine-utf8.cpp b/textproc/sablotron/files/patch-engine-utf8.cpp
deleted file mode 100644
index 41ba9deea3da..000000000000
--- a/textproc/sablotron/files/patch-engine-utf8.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -cr ../Sablot-0.44/Sablot/engine/utf8.cpp Sablot/engine/utf8.cpp
-*** ../Sablot-0.44/Sablot/engine/utf8.cpp	Sun Nov 12 16:21:25 2000
---- Sablot/engine/utf8.cpp	Sun Nov 12 17:29:08 2000
-***************
-*** 38,44 ****
---- 38,46 ----
-  #include "utf8.h"
-  
-  #ifdef HAVE_ICONV_H
-+ extern "C" {
-  #include <iconv.h>
-+ }
-  #endif
-  
-  /*  This MUST match the Encoding enum defined in utf8.h  */
diff --git a/textproc/sablotron/files/rus-patch b/textproc/sablotron/files/rus-patch
index 112ac5338adf..eb42747db15c 100644
--- a/textproc/sablotron/files/rus-patch
+++ b/textproc/sablotron/files/rus-patch
@@ -1,6 +1,6 @@
-diff -crN Sablot-0.44/Sablot/engine/enc_cyr.h Sablot-0.44.rus/Sablot/engine/enc_cyr.h
-*** Sablot-0.44/Sablot/engine/enc_cyr.h	Thu Jan  1 03:00:00 1970
---- Sablot/engine/enc_cyr.h	Sun Nov 12 19:08:27 2000
+diff -crN Sablot/engine/enc_cyr.h Sablot/engine/enc_cyr.h
+*** Sablot/engine/enc_cyr.h	Thu Jan  1 03:00:00 1970
+--- Sablot/engine/enc_cyr.h	Thu Feb 22 16:58:56 2001
 ***************
 *** 0 ****
 --- 1,80 ----
@@ -84,30 +84,32 @@ diff -crN Sablot-0.44/Sablot/engine/enc_cyr.h Sablot-0.44.rus/Sablot/engine/enc_
 + };
 + 
 + 
-diff -crN Sablot-0.44/Sablot/engine/output.cpp Sablot-0.44.rus/Sablot/engine/output.cpp
-*** Sablot-0.44/Sablot/engine/output.cpp	Sun Nov 12 19:07:52 2000
---- Sablot/engine/output.cpp	Sun Nov 12 19:12:54 2000
+diff -crN Sablot/engine/output.cpp Sablot/engine/output.cpp
+*** Sablot/engine/output.cpp	Thu Feb 22 17:29:40 2001
+--- Sablot/engine/output.cpp	Thu Feb 22 17:29:48 2001
 ***************
-*** 230,235 ****
---- 230,241 ----
-          return ENC_EUCJP;
-      else if (enc_.eqNoCase((char*) "shift-jis"))
-          return ENC_SJIS;
-+     else if (enc_.eqNoCase((char*) "cp1251"))
-+         return ENC_1251;
+*** 258,263 ****
+--- 258,271 ----
+          return ENC_8859_1;
+      else if (enc_.eqNoCase((char*) "iso-8859-2"))
+          return ENC_8859_2;
 +     else if (enc_.eqNoCase((char*) "koi8-r"))
 +         return ENC_KOI8R;
++     else if (enc_.eqNoCase((char*) "windows-1251"))
++         return ENC_1251;
++     else if (enc_.eqNoCase((char*) "cp1251"))
++         return ENC_1251;
 +     else if (enc_.eqNoCase((char*) "cp866" ))
-+         return ENC_866;
-      else return ENC_UTF8;
-  }
-  
-diff -crN Sablot-0.44/Sablot/engine/parser.cpp Sablot-0.44.rus/Sablot/engine/parser.cpp
-*** Sablot-0.44/Sablot/engine/parser.cpp	Sun Nov 12 19:07:58 2000
---- Sablot/engine/parser.cpp	Sun Nov 12 19:08:27 2000
++          return ENC_866;
+      else if (enc_.eqNoCase((char*) "euc-jp"))
+          return ENC_EUCJP;
+      else if (enc_.eqNoCase((char*) "shift-jis"))
+diff -crN Sablot/engine/parser.cpp Sablot/engine/parser.cpp
+*** Sablot/engine/parser.cpp	Thu Feb 22 17:29:40 2001
+--- Sablot/engine/parser.cpp	Thu Feb 22 17:29:48 2001
 ***************
-*** 41,46 ****
---- 41,48 ----
+*** 40,45 ****
+--- 40,47 ----
   
   // for the windows-1250 encoding:
   #include "enc1250.h"
@@ -117,82 +119,66 @@ diff -crN Sablot-0.44/Sablot/engine/parser.cpp Sablot-0.44.rus/Sablot/engine/par
   
   // 
 ***************
-*** 550,555 ****
---- 552,565 ----
+*** 552,557 ****
+--- 554,567 ----
           theTable = Enc1250;
       else if (strEqNoCase((char*) name,"iso-8859-2"))
           theTable = EncLatin2;
++     else if (strEqNoCase((char*) name,"koi8-r"))
++         theTable = EncKOI8_R;
 +     else if (strEqNoCase((char*) name,"windows-1251"))
 +         theTable = EncCP1251;
 +     else if (strEqNoCase((char*) name,"cp1251"))
 +         theTable = EncCP1251;
-+     else if (strEqNoCase((char*) name,"koi8-r"))
-+         theTable = EncKOI8_R;
 +     else if (strEqNoCase((char*) name,"cp866"))
 +         theTable = EncCP866;
       else
           return 0;
       int i;
-diff -crN Sablot-0.44/Sablot/engine/utf8.cpp Sablot-0.44.rus/Sablot/engine/utf8.cpp
-*** Sablot-0.44/Sablot/engine/utf8.cpp	Sun Nov 12 19:07:59 2000
---- Sablot/engine/utf8.cpp	Sun Nov 12 19:19:05 2000
+diff -crN Sablot/engine/utf8.cpp Sablot/engine/utf8.cpp
+*** Sablot/engine/utf8.cpp	Thu Feb 22 17:29:41 2001
+--- Sablot/engine/utf8.cpp	Thu Feb 22 17:29:48 2001
 ***************
-*** 44,50 ****
+*** 63,69 ****
   #endif
   
   /*  This MUST match the Encoding enum defined in utf8.h  */
-! static char* iconv_encoding[8] =
+! static const char* iconv_encoding[8] =
   {
       "UTF8",
       "UTF16",
---- 44,50 ----
+--- 63,69 ----
   #endif
   
   /*  This MUST match the Encoding enum defined in utf8.h  */
-! static char* iconv_encoding[11] =
+! static const char* iconv_encoding[11] =
   {
       "UTF8",
       "UTF16",
 ***************
-*** 53,59 ****
+*** 71,76 ****
+--- 71,79 ----
+      "ISO-8859-1",
       "ISO-8859-2",
       "CP1250",
++     "KOI8-R",
++     "CP1251",
++     "CP866",
       "EUC-JP",
-!     "SHIFT-JIS"
+      "SHIFT-JIS"
   };
-  
-  int utf8SingleCharLength (const char* text)
---- 53,62 ----
-      "ISO-8859-2",
-      "CP1250",
-      "EUC-JP",
-!     "SHIFT-JIS",
-!     "CP1251",
-!     "KOI8-R",
-!     "CP866"
-  };
-  
-  int utf8SingleCharLength (const char* text)
-diff -crN Sablot-0.44/Sablot/engine/utf8.h Sablot-0.44.rus/Sablot/engine/utf8.h
-*** Sablot-0.44/Sablot/engine/utf8.h	Sun Nov 12 19:07:52 2000
---- Sablot/engine/utf8.h	Sun Nov 12 19:19:18 2000
+diff -crN Sablot/engine/utf8.h Sablot/engine/utf8.h
+*** Sablot/engine/utf8.h	Thu Feb 22 17:29:40 2001
+--- Sablot/engine/utf8.h	Thu Feb 22 17:29:48 2001
 ***************
-*** 50,56 ****
+*** 49,54 ****
+--- 49,57 ----
+      ENC_8859_1,
       ENC_8859_2,
       ENC_1250,
++     ENC_KOI8R,
++     ENC_1251,
++     ENC_866,
       ENC_EUCJP,
-!     ENC_SJIS    
+      ENC_SJIS    
   };
-  
-  extern  int     utf8SingleCharLength(const char* text);
---- 50,59 ----
-      ENC_8859_2,
-      ENC_1250,
-      ENC_EUCJP,
-!     ENC_SJIS,
-!     ENC_1251,
-!     ENC_KOI8R,
-!     ENC_866
-  };
-  
-  extern  int     utf8SingleCharLength(const char* text);
diff --git a/textproc/sablotron/pkg-plist b/textproc/sablotron/pkg-plist
index edfab740acd4..8b7407d00e03 100644
--- a/textproc/sablotron/pkg-plist
+++ b/textproc/sablotron/pkg-plist
@@ -1,6 +1,6 @@
 include/sablot.h
 include/shandler.h
 bin/sabcmd
-lib/libsablot.so.44
+lib/libsablot.so.51
 lib/libsablot.so
 lib/libsablot.a