diff -ruN --exclude=CVS /usr/ports/chinese/autoconvert/Makefile /root/ports/autoconvert/Makefile
--- /usr/ports/chinese/autoconvert/Makefile	Fri Oct 13 13:27:56 2006
+++ /root/ports/autoconvert/Makefile	Thu Dec 28 13:51:22 2006
@@ -6,14 +6,13 @@
 #
 
 PORTNAME=	autoconvert
-PORTVERSION=	0.3.14
+PORTVERSION=	0.3.16
 CATEGORIES=	chinese
-MASTER_SITES=	ftp://banyan.dlut.edu.cn/pub/PEOPLE/saka/
+MASTER_SITES=	http://people.debian.org/~ygh/
 
 MAINTAINER=	yinjieh@csie.nctu.edu.tw
 COMMENT=	Intelligent Chinese encoding converter
 
-DATADIR=	${TARGETDIR}/share/${PKGNAMEPREFIX}${PORTNAME}
 MAKE_ENV=	CFLAG="${CPPFLAGS}" LIBS="${LDFLAGS}"
 USE_GETOPT_LONG=	yes
 USE_LDCONFIG=	yes
@@ -24,7 +23,7 @@
 
 pre-install:
 	@${MKDIR} ${DATADIR}
-.for i in ChangeLog LICENSE Readme TODO Thanks Version hz.txt procmailrc.example shed.big5 shed.gb shed.uni shed.utf7 shed.utf8
+.for i in ChangeLog LICENSE Readme TODO Thanks Version
 	@${INSTALL_DATA} ${WRKSRC}/$i ${DATADIR}
 .endfor
 
diff -ruN --exclude=CVS /usr/ports/chinese/autoconvert/distinfo /root/ports/autoconvert/distinfo
--- /usr/ports/chinese/autoconvert/distinfo	Fri Oct 13 13:27:56 2006
+++ /root/ports/autoconvert/distinfo	Thu Dec 28 10:20:31 2006
@@ -1,3 +1,3 @@
-MD5 (autoconvert-0.3.14.tar.gz) = 3023068ab9cc7aaa25b8b294698c4b39
-SHA256 (autoconvert-0.3.14.tar.gz) = a246b403f21cf45c97eeccd0f3eb63ced8ec0b4c7c267a0ddafbf7e39214aa53
-SIZE (autoconvert-0.3.14.tar.gz) = 464192
+MD5 (autoconvert-0.3.16.tar.gz) = 1f4aa2332afc076910b5d510b8c81966
+SHA256 (autoconvert-0.3.16.tar.gz) = 9fe3df9864c63854dc3012d8e3f9ba94bc4e611d410ed1897fc94b612925cf76
+SIZE (autoconvert-0.3.16.tar.gz) = 275360
diff -ruN --exclude=CVS /usr/ports/chinese/autoconvert/files/patch-Makefile /root/ports/autoconvert/files/patch-Makefile
--- /usr/ports/chinese/autoconvert/files/patch-Makefile	Thu Jan  1 08:00:00 1970
+++ /root/ports/autoconvert/files/patch-Makefile	Thu Dec 28 15:12:20 2006
@@ -0,0 +1,33 @@
+--- Makefile.orig	Sat Apr 28 09:45:46 2001
++++ Makefile	Thu Dec 28 15:12:13 2006
+@@ -1,7 +1,7 @@
+ 
+ CC=gcc
+-CFLAG=-O2 -g -Wall -Iinclude
+-LIBS= -Llib -lhz
++CFLAG+=-Iinclude
++LIBS+=-Llib -lhz
+ 
+ .PHONY: all hzlib clean install-home install
+ 
+@@ -30,12 +30,11 @@
+ 	ln -s $(HOME)/bin/autogb $(HOME)/bin/autob5
+ 	chmod 755 $(HOME)/bin/autogb 
+ install:
+-	install -m 755 autogb $(DESTDIR)/usr/bin
+-	install -m 755 lib/libhz.so.0.0 $(DESTDIR)/usr/lib
+-	cd $(DESTDIR)/usr/lib;ln -s  libhz.so.0.0 libhz.so.0
+-	cd $(DESTDIR)/usr/lib;ln -s  libhz.so.0 libhz.so
+-	install -m 755 lib/libhz.a $(DESTDIR)/usr/lib
+-	install -m 755 contrib/xchat-plugins/xchat-autogb.so $(DESTDIR)/usr/share/zh-autoconvert
+-	install -m 755 contrib/xchat-plugins/xchat-autob5.so $(DESTDIR)/usr/share/zh-autoconvert
+-	install -m 644 include/*.h  $(DESTDIR)/usr/include
+-	ln -s autogb $(DESTDIR)/usr/bin/autob5
++	${BSD_INSTALL_PROGRAM} autogb $(PREFIX)/bin
++	${BSD_INSTALL_PROGRAM} lib/libhz.so.0.0 $(PREFIX)/lib/libhz.so.0
++	cd $(PREFIX)/lib;ln -s  libhz.so.0 libhz.so
++	${BSD_INSTALL_PROGRAM} lib/libhz.a $(PREFIX)/lib
++	#${BSD_INSTALL_PROGRAM} contrib/xchat-plugins/xchat-autogb.so $(PREFIX)/share/autoconvert
++	#${BSD_INSTALL_PROGRAM} contrib/xchat-plugins/xchat-autob5.so $(PREFIX)/share/autoconvert
++	${BSD_INSTALL_DATA} include/*.h  $(PREFIX)/include
++	ln -s autogb $(PREFIX)/bin/autob5
diff -ruN --exclude=CVS /usr/ports/chinese/autoconvert/files/patch-aa /root/ports/autoconvert/files/patch-aa
--- /usr/ports/chinese/autoconvert/files/patch-aa	Thu May 15 14:16:33 2003
+++ /root/ports/autoconvert/files/patch-aa	Thu Jan  1 08:00:00 1970
@@ -1,33 +0,0 @@
---- Makefile.orig	Sat Apr 28 09:45:46 2001
-+++ Makefile	Thu May 15 13:52:33 2003
-@@ -1,7 +1,7 @@
- 
- CC=gcc
--CFLAG=-O2 -g -Wall -Iinclude
--LIBS= -Llib -lhz
-+CFLAG+=-Iinclude
-+LIBS+=-Llib -lhz
- 
- .PHONY: all hzlib clean install-home install
- 
-@@ -30,12 +30,11 @@
- 	ln -s $(HOME)/bin/autogb $(HOME)/bin/autob5
- 	chmod 755 $(HOME)/bin/autogb 
- install:
--	install -m 755 autogb $(DESTDIR)/usr/bin
--	install -m 755 lib/libhz.so.0.0 $(DESTDIR)/usr/lib
--	cd $(DESTDIR)/usr/lib;ln -s  libhz.so.0.0 libhz.so.0
--	cd $(DESTDIR)/usr/lib;ln -s  libhz.so.0 libhz.so
--	install -m 755 lib/libhz.a $(DESTDIR)/usr/lib
--	install -m 755 contrib/xchat-plugins/xchat-autogb.so $(DESTDIR)/usr/share/zh-autoconvert
--	install -m 755 contrib/xchat-plugins/xchat-autob5.so $(DESTDIR)/usr/share/zh-autoconvert
--	install -m 644 include/*.h  $(DESTDIR)/usr/include
--	ln -s autogb $(DESTDIR)/usr/bin/autob5
-+	${BSD_INSTALL_PROGRAM} autogb $(PREFIX)/bin
-+	${BSD_INSTALL_PROGRAM} lib/libhz.so.0.0 $(PREFIX)/lib/libhz.so.0
-+	cd $(PREFIX)/lib;ln -s  libhz.so.0 libhz.so
-+	${BSD_INSTALL_PROGRAM} lib/libhz.a $(PREFIX)/lib
-+	${BSD_INSTALL_PROGRAM} contrib/xchat-plugins/xchat-autogb.so $(PREFIX)/share/zh-autoconvert
-+	${BSD_INSTALL_PROGRAM} contrib/xchat-plugins/xchat-autob5.so $(PREFIX)/share/zh-autoconvert
-+	${BSD_INSTALL_DATA} include/*.h  $(PREFIX)/include
-+	ln -s autogb $(PREFIX)/bin/autob5
diff -ruN --exclude=CVS /usr/ports/chinese/autoconvert/files/patch-ab /root/ports/autoconvert/files/patch-ab
--- /usr/ports/chinese/autoconvert/files/patch-ab	Mon Mar 22 16:43:56 2004
+++ /root/ports/autoconvert/files/patch-ab	Thu Jan  1 08:00:00 1970
@@ -1,25 +0,0 @@
---- hzconvert/Makefile.orig	Mon Jan  8 11:03:21 2001
-+++ hzconvert/Makefile	Mon Mar 22 09:39:15 2004
-@@ -1,18 +1,18 @@
- CC=gcc -I../include
--CFLAGS=-O2 -Wall -g
-+CFLAGS+=-fPIC -Wall -g
- SHARED_LIB=libhz.so
- SHARED_LIB_MAJOR=$(SHARED_LIB).0
- SHARED_LIB_MINOR=$(SHARED_LIB_MAJOR).0
- OBJS=b2g.o b2u.o g2u.o hz2gb.o b2g_tables.o b2u_tables.o g2u_tables.o io.o unicode.o judge.o judge3.o gbpercent.o b5percent.o search.o 
- 
-+all: libhzconvert
-+
- %.o: %.c
- 	$(CC) -fPIC $(CFLAGS) -c $<
- 
--all: libhzconvert
--
- libhzconvert: $(OBJS)
- 	ar rs  ../lib/libhz.a $(OBJS)
--	gcc -fPIC -shared -Wl,-soname,$(SHARED_LIB_MAJOR) -o ../lib/$(SHARED_LIB_MINOR)  $(OBJS) -ldl
-+	gcc -fPIC -shared -Wl,-soname,$(SHARED_LIB_MAJOR) -o ../lib/$(SHARED_LIB_MINOR)  $(OBJS)
- 	rm -f ../lib/$(SHARED_LIB_MAJOR)
- 	rm -f ../lib/$(SHARED_LIB)
- 	cd ../lib;ln -s $(SHARED_LIB_MINOR) $(SHARED_LIB_MAJOR)
diff -ruN --exclude=CVS /usr/ports/chinese/autoconvert/files/patch-hzconvert::Makefile /root/ports/autoconvert/files/patch-hzconvert::Makefile
--- /usr/ports/chinese/autoconvert/files/patch-hzconvert::Makefile	Thu Jan  1 08:00:00 1970
+++ /root/ports/autoconvert/files/patch-hzconvert::Makefile	Thu Dec 28 10:31:04 2006
@@ -0,0 +1,26 @@
+--- hzconvert/Makefile.orig	Mon Jan  8 18:03:21 2001
++++ hzconvert/Makefile	Thu Dec 28 10:30:43 2006
+@@ -1,18 +1,18 @@
+-CC=gcc -I../include
+-CFLAGS=-O2 -Wall -g
++CC=gcc
++CFLAGS+=-fPIC -Wall -g -I../include
+ SHARED_LIB=libhz.so
+ SHARED_LIB_MAJOR=$(SHARED_LIB).0
+ SHARED_LIB_MINOR=$(SHARED_LIB_MAJOR).0
+ OBJS=b2g.o b2u.o g2u.o hz2gb.o b2g_tables.o b2u_tables.o g2u_tables.o io.o unicode.o judge.o judge3.o gbpercent.o b5percent.o search.o 
+ 
++all: libhzconvert
++
+ %.o: %.c
+ 	$(CC) -fPIC $(CFLAGS) -c $<
+ 
+-all: libhzconvert
+-
+ libhzconvert: $(OBJS)
+ 	ar rs  ../lib/libhz.a $(OBJS)
+-	gcc -fPIC -shared -Wl,-soname,$(SHARED_LIB_MAJOR) -o ../lib/$(SHARED_LIB_MINOR)  $(OBJS) -ldl
++	gcc -fPIC -shared -Wl,-soname,$(SHARED_LIB_MAJOR) -o ../lib/$(SHARED_LIB_MINOR)  $(OBJS)
+ 	rm -f ../lib/$(SHARED_LIB_MAJOR)
+ 	rm -f ../lib/$(SHARED_LIB)
+ 	cd ../lib;ln -s $(SHARED_LIB_MINOR) $(SHARED_LIB_MAJOR)
diff -ruN --exclude=CVS /usr/ports/chinese/autoconvert/pkg-plist /root/ports/autoconvert/pkg-plist
--- /usr/ports/chinese/autoconvert/pkg-plist	Thu May 15 11:18:25 2003
+++ /root/ports/autoconvert/pkg-plist	Thu Dec 28 15:12:24 2006
@@ -11,13 +11,4 @@
 %%DATADIR%%/TODO
 %%DATADIR%%/Thanks
 %%DATADIR%%/Version
-%%DATADIR%%/hz.txt
-%%DATADIR%%/procmailrc.example
-%%DATADIR%%/shed.big5
-%%DATADIR%%/shed.gb
-%%DATADIR%%/shed.uni
-%%DATADIR%%/shed.utf7
-%%DATADIR%%/shed.utf8
-%%DATADIR%%/xchat-autob5.so
-%%DATADIR%%/xchat-autogb.so
 @dirrm %%DATADIR%%