From keith@freebsd.sinica.edu.tw  Wed Feb 23 10:49:14 2000
Return-Path: <keith@freebsd.sinica.edu.tw>
Received: from freebsd.sinica.edu.tw (freebsd.sinica.edu.tw [140.109.13.51])
	by hub.freebsd.org (Postfix) with ESMTP id 3C74C37B96D
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 23 Feb 2000 10:49:13 -0800 (PST)
	(envelope-from keith@freebsd.sinica.edu.tw)
Received: (from keith@localhost)
	by freebsd.sinica.edu.tw (8.9.3/8.9.2) id CAA30218;
	Thu, 24 Feb 2000 02:49:16 +0800 (CST)
	(envelope-from keith)
Message-Id: <200002231849.CAA30218@freebsd.sinica.edu.tw>
Date: Thu, 24 Feb 2000 02:49:16 +0800 (CST)
From: keith@ml.tw.freebsd.org
Sender: keith@freebsd.sinica.edu.tw
To: FreeBSD-gnats-submit@freebsd.org
Subject: Fix chinese/libtabe
X-Send-Pr-Version: 3.2

>Number:         16939
>Category:       ports
>Synopsis:       Fix chinese/libtabe
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    foxfair
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Feb 23 10:50:01 PST 2000
>Closed-Date:    Sun Feb 27 03:51:32 PST 2000
>Last-Modified:  Sun Feb 27 03:51:50 PST 2000
>Originator:     Keith Jang
>Release:        FreeBSD 3.4-STABLE i386
>Organization:
End user
>Environment:

4.0-current
	

>Description:

chinese/libtabe is currently broken due to distfile location.
	

>How-To-Repeat:

	

>Fix:

Please apply the following patch. It also upgrades libtabe
to the latest version.	
	


diff -urN libtabe.old/Makefile libtabe/Makefile
--- libtabe.old/Makefile	Thu Feb 24 02:25:56 2000
+++ libtabe/Makefile	Thu Feb 24 01:29:55 2000
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	libtabe
-# Version required:			0.1 beta 8
+# Version required:			0.1.2
 # Date created:				2 Nov 1999
 # Whom:					Keith Jang <keith@freebsd.sinica.edu.tw>
 #
 # $FreeBSD: ports/chinese/libtabe/Makefile,v 1.6 1999/12/24 04:15:10 steve Exp $
 #
 
-DISTNAME=	libtabe-0.1-pre8
-PKGNAME=	zh-libtabe-0.1b8
+DISTNAME=	libtabe-0.1-2
+PKGNAME=	zh-libtabe-0.1.2
 CATEGORIES=	chinese
 MASTER_SITES=	ftp://xcin.linux.org.tw/pub/xcin/libtabe/devel/
 
@@ -31,20 +31,24 @@
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/tabe
-	${INSTALL_DATA} ${WRKSRC}/doc/libtabe.sgml ${PREFIX}/share/doc/tabe
-	${INSTALL_DATA} ${WRKSRC}/doc/Changes ${PREFIX}/share/doc/tabe
 	${INSTALL_DATA} ${WRKSRC}/src/tsi-src/README ${PREFIX}/share/doc/tabe
+.for DOC in BoPoMoFo.shtml Changes Changes.pre-0.1 TODO ZuYinCode.txt \
+		et26.txt libtabe.sgml
+	${INSTALL_DATA} ${WRKSRC}/doc/${DOC} ${PREFIX}/share/doc/tabe
+.endfor
 .endif
 .if ${PORTOBJFORMAT} == "elf"
-	${RM} ${PREFIX}/lib/libbims.so ${PREFIX}/lib/libbims.so.0
-	${MV} ${PREFIX}/lib/libbims.so.0.1 ${PREFIX}/lib/libbims.so.0
+	${RM} -f ${PREFIX}/lib/libbims.so ${PREFIX}/lib/libbims.so.0
+	${MV} ${PREFIX}/lib/libbims.so.0.1-2 ${PREFIX}/lib/libbims.so.0
 	${LN} -s libbims.so.0 ${PREFIX}/lib/libbims.so
-	${RM} ${PREFIX}/lib/libtabe.so ${PREFIX}/lib/libtabe.so.0
-	${MV} ${PREFIX}/lib/libtabe.so.0.1 ${PREFIX}/lib/libtabe.so.0
+	${RM} -f ${PREFIX}/lib/libtabe.so ${PREFIX}/lib/libtabe.so.0
+	${MV} ${PREFIX}/lib/libtabe.so.0.1-2 ${PREFIX}/lib/libtabe.so.0
 	${LN} -s libtabe.so.0 ${PREFIX}/lib/libtabe.so
 .else
-	${RM} ${PREFIX}/lib/libbims.so.0
-	${RM} ${PREFIX}/lib/libtabe.so.0
+	${RM} -f ${PREFIX}/lib/libbims.so.0
+	${MV} ${PREFIX}/lib/libbims.so.0.1-2 ${PREFIX}/lib/libbims.so.0.1
+	${RM} -f ${PREFIX}/lib/libtabe.so.0
+	${MV} ${PREFIX}/lib/libtabe.so.0.1-2 ${PREFIX}/lib/libtabe.so.0.1
 .endif
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 
diff -urN libtabe.old/files/md5 libtabe/files/md5
--- libtabe.old/files/md5	Thu Feb 24 02:25:56 2000
+++ libtabe/files/md5	Thu Feb 24 00:36:02 2000
@@ -1 +1 @@
-MD5 (libtabe-0.1-pre8.tar.gz) = e6d07230898d8e4fde7daa4e3d2163ed
+MD5 (libtabe-0.1-2.tar.gz) = 337982ce290de8e9a1e0b56d117ad9eb
diff -urN libtabe.old/pkg/PLIST libtabe/pkg/PLIST
--- libtabe.old/pkg/PLIST	Thu Feb 24 02:25:56 2000
+++ libtabe/pkg/PLIST	Thu Feb 24 01:22:11 2000
@@ -12,8 +12,13 @@
 lib/libtabe.so.0.1
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
+share/doc/tabe/BoPoMoFo.shtml
 share/doc/tabe/Changes
+share/doc/tabe/Changes.pre-0.1
 share/doc/tabe/README
+share/doc/tabe/TODO
+share/doc/tabe/ZuYinCode.txt
+share/doc/tabe/et26.txt
 share/doc/tabe/libtabe.sgml
 share/tabe/tsiyin/tsi.db
 share/tabe/tsiyin/yin.db

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: gnats-admin->freebsd-ports 
Responsible-Changed-By: jedgar 
Responsible-Changed-When: Wed Feb 23 15:21:16 PST 2000 
Responsible-Changed-Why:  
Misfiled PR 
Responsible-Changed-From-To: freebsd-ports->foxfair 
Responsible-Changed-By: foxfair 
Responsible-Changed-When: Fri Feb 25 00:03:27 PST 2000 
Responsible-Changed-Why:  
I'll do this. 
State-Changed-From-To: open->closed 
State-Changed-By: vanilla 
State-Changed-When: Sun Feb 27 03:51:32 PST 2000 
State-Changed-Why:  
Committed, thanks 
>Unformatted:
