- Update to 1.6, also unbreak it!

PR:		79596
Submitted by:	maintainer

5 files changed, 27 insertions, 48 deletions

diff --git a/chinese/dictd-database/Makefile b/chinese/dictd-database/Makefile
index d3b8086..19bfe27 100644
--- a/chinese/dictd-database/Makefile
+++ b/chinese/dictd-database/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	dictd-database
-PORTVERSION=	1.5
+PORTVERSION=	1.6
 CATEGORIES=	chinese textproc
 MASTER_SITES=	ftp://freebsd.csie.ntu.edu.tw/users/rafan/ \
 		ftp://freebsd.sinica.edu.tw/pub/statue/dictd-database/
@@ -15,29 +15,32 @@ DISTNAME=	dict-zh-${PORTVERSION}
 MAINTAINER=	rafan@infor.org
 COMMENT=	A Chinese <-> English dictd words database
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/dictfmt:${PORTSDIR}/textproc/dictfmt \
-		${LOCALBASE}/bin/dictzip:${PORTSDIR}/net/dictd
+RUN_DEPENDS=	${LOCALBASE}/sbin/dictd:${PORTSDIR}/net/dictd
 
-BROKEN=		Does not build
-
-USE_LIBTOOL_VER=	13
-USE_GMAKE=	yes
-USE_PERL5_BUILD=yes
-USE_REINPLACE=	yes
+NO_BUILD=	yes
 
 MSG_FILE=	${PKGDIR}/pkg-message
 PKGMESSAGE=	${WRKSRC}/pkg-message
 
-post-patch:
-	@${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX}," ${WRKSRC}/configure
+DICTFILES=	cedict pydict moecomp netterm
+
+do-install:
+	${SED} 's|%%PREFIX%%|${PREFIX}|g' ${MSG_FILE} > ${PKGMESSAGE}
+	@${MKDIR} ${PREFIX}/lib/dict
+	for f in ${DICTFILES}; do \
+	  ${INSTALL_DATA} ${WRKSRC}/$${f}.dict.dz ${PREFIX}/lib/dict; \
+	  ${INSTALL_DATA} ${WRKSRC}/$${f}.index ${PREFIX}/lib/dict; \
+	done
 
 post-install:
-	@${SED} 's|%%PREFIX%%|${PREFIX}|g' ${MSG_FILE} > ${PKGMESSAGE}
+	@${ECHO}
+	@${CAT} ${PKGMESSAGE}
+	@${ECHO}
 
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 502110
-BUILD_DEPENDS+=	${LOCALBASE}/share/locale/zh_TW.UTF-8/LC_CTYPE:${PORTSDIR}/misc/utf8locale
+RUN_DEPENDS+=	${LOCALBASE}/share/locale/zh_TW.UTF-8/LC_CTYPE:${PORTSDIR}/misc/utf8locale
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/chinese/dictd-database/distinfo b/chinese/dictd-database/distinfo
index b9a07c8..e756b99 100644
--- a/chinese/dictd-database/distinfo
+++ b/chinese/dictd-database/distinfo
@@ -1,2 +1,2 @@
-MD5 (dict-zh-1.5.tar.gz) = 0f1afe9a123700aa6a2441d7128e11d9
-SIZE (dict-zh-1.5.tar.gz) = 8544336
+MD5 (dict-zh-1.6.tar.gz) = 34fbd4a0bd9fe28e6a8dd2a191ce1583
+SIZE (dict-zh-1.6.tar.gz) = 14928494
diff --git a/chinese/dictd-database/files/patch-aa b/chinese/dictd-database/files/patch-aa
deleted file mode 100644
index 4305e3d..0000000
--- a/chinese/dictd-database/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Wed Nov 28 02:53:55 2001
-+++ Makefile.in	Fri Jul 19 02:15:58 2002
-@@ -75,7 +75,7 @@
- 		(cd $$subdir && $(MAKE)) || exit 1; \
- 	done
- 
--all:: $(EXES)
-+all:: $(EXES) db
- 
- db :: $(DATABASES)
- 
diff --git a/chinese/dictd-database/files/patch-ac b/chinese/dictd-database/files/patch-ac
deleted file mode 100644
index 6376b47..0000000
--- a/chinese/dictd-database/files/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
---- configure.orig	Sun Oct 14 10:16:23 2001
-+++ configure	Sun Oct 14 10:16:55 2001
-@@ -542,8 +542,8 @@
- 
- 
- 
--prefix=/usr
--datadir=/usr/lib
-+prefix=%%PREFIX%%
-+datadir=%%PREFIX%%/lib
- 
- echo Configuring for dict-misc
- echo .
diff --git a/chinese/dictd-database/pkg-message b/chinese/dictd-database/pkg-message
index 77354db..a51994b 100644
--- a/chinese/dictd-database/pkg-message
+++ b/chinese/dictd-database/pkg-message
@@ -4,15 +4,15 @@ You need to add following to /etc/rc.conf:
 
 dictd_flags="--locale zh_TW.UTF-8"
 
-And, you also need adding the following to PREFIX/etc/dictd.conf:
+And, you also need adding the following to %%PREFIX%%/etc/dictd.conf:
 
-database moecomp   { data "PREFIX/lib/dict/moecomp.dict.dz"
-                     index "PREFIX/lib/dict/moecomp.index" }
-database netterm   { data "PREFIX/lib/dict/netterm.dict.dz"
-                     index "PREFIX/lib/dict/netterm.index" }
-database pydict    { data "PREFIX/lib/dict/pydict.dict.dz"
-                     index "PREFIX/lib/dict/pydict.index" }
-database cedict    { data "PREFIX/lib/dict/cedict.dict.dz"
-                     index "PREFIX/lib/dict/cedict.index" }
+database moecomp   { data "%%PREFIX%%/lib/dict/moecomp.dict.dz"
+                     index "%%PREFIX%%/lib/dict/moecomp.index" }
+database netterm   { data "%%PREFIX%%/lib/dict/netterm.dict.dz"
+                     index "%%PREFIX%%/lib/dict/netterm.index" }
+database pydict    { data "%%PREFIX%%/lib/dict/pydict.dict.dz"
+                     index "%%PREFIX%%/lib/dict/pydict.index" }
+database cedict    { data "%%PREFIX%%/lib/dict/cedict.dict.dz"
+                     index "%%PREFIX%%/lib/dict/cedict.index" }
 
 *****************************************************************************