6 files changed, 38 insertions, 48 deletions

diff --git a/chinese/libtabe/Makefile b/chinese/libtabe/Makefile
index 55dff76bc047..446cf3141c04 100644
--- a/chinese/libtabe/Makefile
+++ b/chinese/libtabe/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	libtabe
-PORTVERSION=	0.1.9
+PORTVERSION=	0.2.2
 CATEGORIES=	chinese
-MASTER_SITES=	ftp://xcin.linux.org.tw/pub/xcin/libtabe/
+MASTER_SITES=	ftp://xcin.linux.org.tw/pub/xcin/libtabe/devel/
 
 MAINTAINER=	keith@FreeBSD.org
 
@@ -37,17 +37,7 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/${DOC} ${PREFIX}/share/doc/tabe
 .endfor
 .endif
-	${TOUCH} ${PREFIX}/share/tabe/libtabe-0.1.9
-.if ${PORTOBJFORMAT} == "elf"
-	${RM} -f ${PREFIX}/lib/libbims.so ${PREFIX}/lib/libbims.so.0
-	${MV} ${PREFIX}/lib/libbims.so.0.1 ${PREFIX}/lib/libbims.so.0
-	${LN} -s libbims.so.0 ${PREFIX}/lib/libbims.so
-	${RM} -f ${PREFIX}/lib/libtabe.so ${PREFIX}/lib/libtabe.so.0
-	${MV} ${PREFIX}/lib/libtabe.so.0.1 ${PREFIX}/lib/libtabe.so.0
-	${LN} -s libtabe.so.0 ${PREFIX}/lib/libtabe.so
-.else
-	${RM} -f ${PREFIX}/lib/libbims.so.0
-	${RM} -f ${PREFIX}/lib/libtabe.so.0
-.endif
+	${TOUCH} ${PREFIX}/share/tabe/libtabe-0.2.2
+	${RM} -f ${PREFIX}/lib/libtabe.la ${PREFIX}/lib/libbims.la
 
 .include <bsd.port.post.mk>
diff --git a/chinese/libtabe/distinfo b/chinese/libtabe/distinfo
index 668bb39d249b..8546aec86d6e 100644
--- a/chinese/libtabe/distinfo
+++ b/chinese/libtabe/distinfo
@@ -1 +1 @@
-MD5 (libtabe-0.1.9.tar.gz) = 0b7e960085113899653bbade18e181ad
+MD5 (libtabe-0.2.2.tar.gz) = 53a4eadc12fe736cdaf7b6924fca811f
diff --git a/chinese/libtabe/files/patch-aa b/chinese/libtabe/files/patch-aa
index 21d5494674fb..c142eb033ce2 100644
--- a/chinese/libtabe/files/patch-aa
+++ b/chinese/libtabe/files/patch-aa
@@ -1,26 +1,25 @@
---- src/Makefile.in.orig	Mon Jul 24 08:10:05 2000
-+++ src/Makefile.in	Sat Aug 12 15:07:23 2000
-@@ -29,8 +29,8 @@
- bindir	    = @bindir@
- includedir  = @includedir@
+--- src/Makefile.in.orig	Thu Jun  7 00:26:26 2001
++++ src/Makefile.in	Sun Jun 17 09:49:05 2001
+@@ -60,8 +60,7 @@
  
--version	    = 0.1.9
--major_ver   = 0.1
-+version	    = 0.1
-+major_ver   = 0
+ $(LIBNAME): $(LIBOBJS)
+ 	$(LIBTOOL) --mode=link $(CC) -o $@ $(LIBOBJS) -rpath $(libdir) \
+-		-version-info $(CURRENT_VER):$(REVISION_VER):$(AGE_VER) \
+-		-release $(RELEASE_VER)
++		-version-info $(CURRENT_VER):$(REVISION_VER):$(AGE_VER)
  
- #
- # libtabe main makefile.
-@@ -162,7 +162,7 @@
+ subsys:
+ 	(cd supports/bims; $(MAKE))
+@@ -110,7 +109,7 @@
  
  install: install_binary install_data
  
 -install_binary: binary
 +install_binary:
  	if [ ! -d $(libdir) ]; then $(INSTALL) -d $(libdir); fi
- 	$(INSTALL_DATA) $(unsharelib) $(libdir)
- 	if [ -f $(sharelib) ]; then \
-@@ -178,6 +178,6 @@
+ 	if [ ! -d $(includedir) ]; then $(INSTALL) -d $(includedir); fi
+ 	$(LIBTOOL) --mode=install $(INSTALL_DATA) $(LIBNAME) $(libdir)
+@@ -118,6 +117,6 @@
  	(cd supports/bims; $(MAKE) install)
  	(cd util; $(MAKE) install)
  
diff --git a/chinese/libtabe/files/patch-ab b/chinese/libtabe/files/patch-ab
index 14c5f86a6e15..297db5e6637c 100644
--- a/chinese/libtabe/files/patch-ab
+++ b/chinese/libtabe/files/patch-ab
@@ -1,22 +1,21 @@
---- src/supports/bims/Makefile.in.orig	Mon Jul 24 08:10:05 2000
-+++ src/supports/bims/Makefile.in	Sat Aug 12 15:07:30 2000
-@@ -30,8 +30,8 @@
- ld_sharelib = @ld_sharelib@
- slib_ext    = @slib_ext@
+--- src/supports/bims/Makefile.in.orig	Thu Jun  7 00:26:26 2001
++++ src/supports/bims/Makefile.in	Sun Jun 17 09:48:49 2001
+@@ -45,8 +45,7 @@
  
--version     = 0.1.9
--major_ver   = 0.1
-+version     = 0.1
-+major_ver   = 0
+ $(LIBNAME): $(LIBOBJS)
+ 	$(LIBTOOL) --mode=link $(CC) -o $@ $(LIBOBJS) -rpath $(libdir) \
+-		-version-info $(CURRENT_VER):$(REVISION_VER):$(AGE_VER) \
+-		-release $(RELEASE_VER)
++		-version-info $(CURRENT_VER):$(REVISION_VER):$(AGE_VER)
  
- AR          = ar cr
- RM          = rm -rf
-@@ -78,7 +78,7 @@
+ bims.lo: bims.c bims.h
+ 	$(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $(DEFS) $(INC) -o $@ bims.c
+@@ -59,7 +58,7 @@
  	if [ -d obj-s ]; then rmdir obj-s; fi
- 	$(RM) Makefile 
+ 	$(RM) Makefile
  
 -install: all
 +install:
  	if [ ! -d $(libdir) ]; then $(INSTALL) -d $(libdir); fi
- 	$(INSTALL_DATA) $(unsharelib) $(libdir)
- 	if [ -f $(sharelib) ]; then \
+ 	if [ ! -d $(includedir) ]; then $(INSTALL) -d $(includedir); fi
+ 	$(LIBTOOL) --mode=install $(INSTALL_DATA) $(LIBNAME) $(libdir)
diff --git a/chinese/libtabe/pkg-descr b/chinese/libtabe/pkg-descr
index 839e8c654d94..384e3f1d8977 100644
--- a/chinese/libtabe/pkg-descr
+++ b/chinese/libtabe/pkg-descr
@@ -3,3 +3,5 @@ provides unified interface and library dealing with
 Chinese words, phrases, sentences, and phonetic symbols.
 It is intended to be used as the foundation of Chinese
 text processing.
+
+WWW: http://libtabe.sourceforge.net/
diff --git a/chinese/libtabe/pkg-plist b/chinese/libtabe/pkg-plist
index 6961a38856af..fd750dad9b93 100644
--- a/chinese/libtabe/pkg-plist
+++ b/chinese/libtabe/pkg-plist
@@ -6,10 +6,10 @@ include/tabe/bims.h
 include/tabe/tabe.h
 lib/libbims.a
 lib/libbims.so
-lib/libbims.so.0.1
+lib/libbims.so.0
 lib/libtabe.a
 lib/libtabe.so
-lib/libtabe.so.0.1
+lib/libtabe.so.0
 share/doc/tabe/BoPoMoFo.shtml
 share/doc/tabe/Changes
 share/doc/tabe/Changes.pre-0.1
@@ -19,7 +19,7 @@ share/doc/tabe/TODO
 share/doc/tabe/ZuYinCode.txt
 share/doc/tabe/et26.txt
 share/doc/tabe/libtabe.sgml
-share/tabe/libtabe-0.1.9
+share/tabe/libtabe-0.2.2
 share/tabe/tsiyin/tsi.db
 share/tabe/tsiyin/yin.db
 @dirrm include/tabe