- Update to 0.3.16

  This builds on newer gcc.
- Respect CC, CFLAGS
- Comply new style patch filename
- xchat plugin is disabled for now

PR:		ports/107264
Submitted by:	Ying-Chieh Chen (maintainer)

5 files changed, 14 insertions, 23 deletions

diff --git a/chinese/autoconvert/Makefile b/chinese/autoconvert/Makefile
index 17c113ccd1c2..94e3cbe7c294 100644
--- a/chinese/autoconvert/Makefile
+++ b/chinese/autoconvert/Makefile
@@ -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 @@ post-patch:
 
 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 --git a/chinese/autoconvert/distinfo b/chinese/autoconvert/distinfo
index 860f670d3113..817e751d5f1d 100644
--- a/chinese/autoconvert/distinfo
+++ b/chinese/autoconvert/distinfo
@@ -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 --git a/chinese/autoconvert/files/patch-aa b/chinese/autoconvert/files/patch-Makefile
index acb87a179abb..996d6a1f35cd 100644
--- a/chinese/autoconvert/files/patch-aa
+++ b/chinese/autoconvert/files/patch-Makefile
@@ -1,5 +1,5 @@
 --- Makefile.orig	Sat Apr 28 09:45:46 2001
-+++ Makefile	Thu May 15 13:52:33 2003
++++ Makefile	Thu Dec 28 15:12:13 2006
 @@ -1,7 +1,7 @@
  
  CC=gcc
@@ -27,7 +27,7 @@
 +	${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_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 --git a/chinese/autoconvert/files/patch-ab b/chinese/autoconvert/files/patch-hzconvert-Makefile
index f1e7e8e4e3b7..525332066480 100644
--- a/chinese/autoconvert/files/patch-ab
+++ b/chinese/autoconvert/files/patch-hzconvert-Makefile
@@ -1,9 +1,10 @@
---- hzconvert/Makefile.orig	Mon Jan  8 11:03:21 2001
-+++ hzconvert/Makefile	Mon Mar 22 09:39:15 2004
+--- 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
+-CC=gcc -I../include
 -CFLAGS=-O2 -Wall -g
-+CFLAGS+=-fPIC -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
diff --git a/chinese/autoconvert/pkg-plist b/chinese/autoconvert/pkg-plist
index 3274bed5e35c..025616ece2ee 100644
--- a/chinese/autoconvert/pkg-plist
+++ b/chinese/autoconvert/pkg-plist
@@ -11,13 +11,4 @@ lib/libhz.so.0
 %%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%%