From ld@cogito.daemonspace.com  Mon Feb 16 02:46:14 2004
Return-Path: <ld@cogito.daemonspace.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 0F43F16A4CE; Mon, 16 Feb 2004 02:46:14 -0800 (PST)
Received: from cogito.daemonspace.com (AGrenoble-203-1-18-232.w81-53.abo.wanadoo.fr [81.53.97.232])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 56DA043D1F; Mon, 16 Feb 2004 02:46:12 -0800 (PST)
	(envelope-from ld@cogito.daemonspace.com)
Received: from cogito.daemonspace.com (localhost.daemonspace.com [127.0.0.1])
	by cogito.daemonspace.com (8.12.10/8.12.10) with ESMTP id i1GAjoFg001008;
	Mon, 16 Feb 2004 11:45:51 +0100 (CET)
	(envelope-from ld@cogito.daemonspace.com)
Received: (from ld@localhost)
	by cogito.daemonspace.com (8.12.10/8.12.10/Submit) id i1GAjnG6001007;
	Mon, 16 Feb 2004 11:45:49 +0100 (CET)
	(envelope-from ld)
Message-Id: <200402161045.i1GAjnG6001007@cogito.daemonspace.com>
Date: Mon, 16 Feb 2004 11:45:49 +0100 (CET)
From: LI Dong <ld@FreeBSD.org.cn>
Reply-To: LI Dong <ld@FreeBSD.org.cn>
To: FreeBSD-gnats-submit@freebsd.org
Cc: krion@freebsd.org
Subject: Update port: chinese/stardict2, re-send with a diff format
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         62905
>Category:       ports
>Synopsis:       Update port: chinese/stardict2, re-send with a diff format
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pav
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Feb 16 02:50:21 PST 2004
>Closed-Date:    Sun Feb 29 03:55:20 PST 2004
>Last-Modified:  Sun Feb 29 03:55:20 PST 2004
>Originator:     LI Dong
>Release:        FreeBSD 5.2.1-RC i386
>Organization:
FreeBSD China
>Environment:
System: FreeBSD cogito.daemonspace.com 5.2.1-RC FreeBSD 5.2.1-RC #1: Mon Feb 16 02:08:08 CET 2004 root@cogito.daemonspace.com:/usr/obj/usr/src/sys/cogito i386


	
>Description:
	Update and request repocopy. See 61465 for details.
	And, please include 61462,61463,61514.
	Take maintainer of stardict2-* (descripted in both
	61462,61463,61514 and 61465).
>How-To-Repeat:
	
>Fix:

	

--- stardict2.diff begins here ---
--- stardict2-old.txt	Mon Feb 16 11:30:01 2004
+++ stardict2.txt	Mon Feb 16 11:31:50 2004
@@ -16,27 +16,21 @@
 echo x - stardict2/Makefile
 sed 's/^X//' >stardict2/Makefile << 'END-of-stardict2/Makefile'
 X# Ports collection makefile for:	stardict2
-X# Date created:			13 April 2003
-X# Whom:				Shen Chuan-Hsing <statue@freebsd.sinica.edu.tw>
-X#
-X# $FreeBSD: ports/chinese/stardict2/Makefile,v 1.9 2004/02/04 05:18:55 marcus Exp $
+X# Date created:			16 Jan 2004
+X# Whom:				LI Dong <ld@FreeBSD.org.cn>
+X# $FreeBSD$
 X#
 X
 XPORTNAME=	stardict
-XPORTVERSION=	2.2.1
-XPORTREVISION=	2
-XCATEGORIES=	chinese textproc
+XPORTVERSION=	2.4.2
+XCATEGORIES=	textproc
 XMASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 XMASTER_SITE_SUBDIR=	${PORTNAME}
-XDISTFILES=	stardict-${PORTVERSION}.tar.bz2 \
-X		stardict-cdict-big5-2.1.0.tar.bz2 \
-X		stardict-cedict-big5-2.1.0.tar.bz2 \
-X		stardict-oxford-big5-2.1.0.tar.bz2 \
-X		stardict-xdict-big5-2.1.0.tar.bz2 \
-X		stardict-xdict-ce-big5-2.1.0.tar.bz2
+XDISTFILES=	stardict-${PORTVERSION}.tar.bz2
+XDIST_SUBDIR=	stardict
 X
-XMAINTAINER=	ports@FreeBSD.org
-XCOMMENT=	English-Chinese dictionary
+XMAINTAINER=	ld@FreeBSD.org.cn
+XCOMMENT=	A Cross-Platform and international dictionary written in Gtk2
 X
 XGNU_CONFIGURE=	yes
 XCONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
@@ -48,132 +42,86 @@
 X
 XMAN1=		stardict.1
 X
-Xpost-install:
-X		${MKDIR} ${PREFIX}/share/stardict/dic/
-X		${INSTALL_DATA} ${WRKDIR}/stardict-cdict-big5-2.1.0/* ${PREFIX}/share/stardict/dic/
-X		${INSTALL_DATA} ${WRKDIR}/stardict-cedict-big5-2.1.0/* ${PREFIX}/share/stardict/dic/
-X		${INSTALL_DATA} ${WRKDIR}/stardict-oxford-big5-2.1.0/* ${PREFIX}/share/stardict/dic/
-X		${INSTALL_DATA} ${WRKDIR}/stardict-xdict-big5-2.1.0/* ${PREFIX}/share/stardict/dic/
-X		${INSTALL_DATA} ${WRKDIR}/stardict-xdict-ce-big5-2.1.0/* ${PREFIX}/share/stardict/dic/
-X
 X.include <bsd.port.mk>
 END-of-stardict2/Makefile
 echo x - stardict2/distinfo
 sed 's/^X//' >stardict2/distinfo << 'END-of-stardict2/distinfo'
-XMD5 (stardict-2.2.1.tar.bz2) = fd9a7b46a0bdf0b2a5a9920ab1ccd2fa
-XSIZE (stardict-2.2.1.tar.bz2) = 608829
-XMD5 (stardict-cdict-big5-2.1.0.tar.bz2) = 2dc9784e735e43516fc2bf6f382923be
-XSIZE (stardict-cdict-big5-2.1.0.tar.bz2) = 4482485
-XMD5 (stardict-cedict-big5-2.1.0.tar.bz2) = d0743c765b789dc66d0a6a533fcd851e
-XSIZE (stardict-cedict-big5-2.1.0.tar.bz2) = 542006
-XMD5 (stardict-oxford-big5-2.1.0.tar.bz2) = e5e429d6355470114f80014d9ee1d4cb
-XSIZE (stardict-oxford-big5-2.1.0.tar.bz2) = 7663495
-XMD5 (stardict-xdict-big5-2.1.0.tar.bz2) = 5b2de427b9af5f4b5baaf5d80dad63a3
-XSIZE (stardict-xdict-big5-2.1.0.tar.bz2) = 3658067
-XMD5 (stardict-xdict-ce-big5-2.1.0.tar.bz2) = 7ca866de79faeea494c5e6e1cce8aa80
-XSIZE (stardict-xdict-ce-big5-2.1.0.tar.bz2) = 2540912
+XMD5 (stardict/stardict-2.4.2.tar.bz2) = ed4b56fe446564dd377b577287048c6a
 END-of-stardict2/distinfo
 echo x - stardict2/pkg-descr
 sed 's/^X//' >stardict2/pkg-descr << 'END-of-stardict2/pkg-descr'
-XStarDict is a international dictionary that run in Gnome envornment.
-XIt have powerful features such as "Glob-style pattern matching",
-X"Scan seletion word","Fuzzy search" and etc.
+XStarDict is a Cross-Platform and international dictionary written in Gtk2.
+XIt has powerful features such as "Glob-style pattern matching," "Scan
+Xselection word," "Fuzzy query," etc.
 X
-XWWW: http://stardict.cosoft.org.cn/
+XWWW: http://stardict.sourceforge.net/
 END-of-stardict2/pkg-descr
 echo x - stardict2/pkg-plist
 sed 's/^X//' >stardict2/pkg-plist << 'END-of-stardict2/pkg-plist'
 Xbin/stardict
-Xshare/idl/GNOME_Stardict.idl
-Xshare/pixmaps/stardict.png
-Xshare/stardict/dic/cdict-big5.dict.dz
-Xshare/stardict/dic/cdict-big5.idx.gz
-Xshare/stardict/dic/cedict-big5.dict.dz
-Xshare/stardict/dic/cedict-big5.idx.gz
-Xshare/stardict/dic/oxford-big5.dict.dz
-Xshare/stardict/dic/oxford-big5.idx.gz
-Xshare/stardict/dic/xdict-big5.dict.dz
-Xshare/stardict/dic/xdict-big5.idx.gz
-Xshare/stardict/dic/xdict-ce-big5.dict.dz
-Xshare/stardict/dic/xdict-ce-big5.idx.gz
-Xshare/stardict/pixmaps/about_menu.png
-Xshare/stardict/pixmaps/docklet_normal.png
-Xshare/stardict/pixmaps/docklet_scan.png
-Xshare/stardict/pixmaps/docklet_stop.png
-Xshare/stardict/pixmaps/index_appendix.png
-Xshare/stardict/pixmaps/index_wazard.png
-Xshare/stardict/pixmaps/splash.png
-Xshare/stardict/sounds/menushow.wav
-Xshare/stardict/sounds/buttonactive.wav
-Xshare/gnome/help/stardict/C/legal.xml
-Xshare/gnome/help/stardict/C/stardict.xml
+Xetc/gconf/schemas/stardict.schemas
+Xlib/bonobo/servers/GNOME_Stardict.server
+Xshare/applications/stardict.desktop
 Xshare/gnome/help/stardict/C/figures/stardict_float_window.png
 Xshare/gnome/help/stardict/C/figures/stardict_main_window.png
 Xshare/gnome/help/stardict/C/figures/stardict_notification_area.png
-Xshare/gnome/help/stardict/ru/legal.xml
-Xshare/gnome/help/stardict/ru/stardict.xml
+Xshare/gnome/help/stardict/C/legal.xml
+Xshare/gnome/help/stardict/C/stardict.xml
+Xshare/gnome/help/stardict/mk/figures/stardict_float_window.png
+Xshare/gnome/help/stardict/mk/figures/stardict_main_window.png
+Xshare/gnome/help/stardict/mk/figures/stardict_notification_area.png
+Xshare/gnome/help/stardict/mk/legal.xml
+Xshare/gnome/help/stardict/mk/stardict.xml
 Xshare/gnome/help/stardict/ru/figures/stardict_float_window.png
 Xshare/gnome/help/stardict/ru/figures/stardict_main_window.png
 Xshare/gnome/help/stardict/ru/figures/stardict_notification_area.png
-Xshare/gnome/help/stardict/zh_CN/legal.xml
-Xshare/gnome/help/stardict/zh_CN/stardict.xml
+Xshare/gnome/help/stardict/ru/legal.xml
+Xshare/gnome/help/stardict/ru/stardict.xml
 Xshare/gnome/help/stardict/zh_CN/figures/stardict_float_window.png
 Xshare/gnome/help/stardict/zh_CN/figures/stardict_main_window.png
 Xshare/gnome/help/stardict/zh_CN/figures/stardict_notification_area.png
+Xshare/gnome/help/stardict/zh_CN/legal.xml
+Xshare/gnome/help/stardict/zh_CN/stardict.xml
+Xshare/idl/GNOME_Stardict.idl
+Xshare/locale/cs/LC_MESSAGES/stardict.mo
+Xshare/locale/de/LC_MESSAGES/stardict.mo
+Xshare/locale/mk/LC_MESSAGES/stardict.mo
+Xshare/locale/ru/LC_MESSAGES/stardict.mo
+Xshare/locale/zh_CN/LC_MESSAGES/stardict.mo
 Xshare/omf/stardict/stardict-C.omf
 X@exec scrollkeeper-install -q %D/share/omf/stardict/stardict-C.omf 2>/dev/null || /usr/bin/true
 X@unexec scrollkeeper-uninstall -q %D/share/omf/stardict/stardict-C.omf 2>/dev/null || /usr/bin/true
+Xshare/omf/stardict/stardict-mk.omf
+X@exec scrollkeeper-install -q %D/share/omf/stardict/stardict-mk.omf 2>/dev/null || /usr/bin/true
+X@unexec scrollkeeper-uninstall -q %D/share/omf/stardict/stardict-mk.omf 2>/dev/null || /usr/bin/true
 Xshare/omf/stardict/stardict-ru.omf
 X@exec scrollkeeper-install -q %D/share/omf/stardict/stardict-ru.omf 2>/dev/null || /usr/bin/true
 X@unexec scrollkeeper-uninstall -q %D/share/omf/stardict/stardict-ru.omf 2>/dev/null || /usr/bin/true
 Xshare/omf/stardict/stardict-zh_CN.omf
 X@exec scrollkeeper-install -q %D/share/omf/stardict/stardict-zh_CN.omf 2>/dev/null || /usr/bin/true
 X@unexec scrollkeeper-uninstall -q %D/share/omf/stardict/stardict-zh_CN.omf 2>/dev/null || /usr/bin/true
-Xshare/applications/stardict.desktop
-Xetc/gconf/schemas/stardict.schemas
-Xlib/bonobo/servers/GNOME_Stardict.server
-Xlib/locale/ru/LC_MESSAGES/stardict.mo
-Xlib/locale/zh_CN/LC_MESSAGES/stardict.mo
-Xetc/gconf/gconf.xml.defaults/apps/stardict/%gconf.xml
-Xetc/gconf/gconf.xml.defaults/apps/stardict/manage_dictionaries/%gconf.xml
-Xetc/gconf/gconf.xml.defaults/apps/stardict/preferences/%gconf.xml
-Xetc/gconf/gconf.xml.defaults/apps/stardict/preferences/dictionary/%gconf.xml
-Xetc/gconf/gconf.xml.defaults/apps/stardict/preferences/floating_window/%gconf.xml
-Xetc/gconf/gconf.xml.defaults/apps/stardict/preferences/main_window/%gconf.xml
-Xetc/gconf/gconf.xml.defaults/apps/stardict/preferences/notification_area_icon/%gconf.xml
-Xetc/gconf/gconf.xml.defaults/schemas/apps/stardict/%gconf.xml
-Xetc/gconf/gconf.xml.defaults/schemas/apps/stardict/manage_dictionaries/%gconf.xml
-Xetc/gconf/gconf.xml.defaults/schemas/apps/stardict/preferences/%gconf.xml
-Xetc/gconf/gconf.xml.defaults/schemas/apps/stardict/preferences/dictionary/%gconf.xml
-Xetc/gconf/gconf.xml.defaults/schemas/apps/stardict/preferences/floating_window/%gconf.xml
-Xetc/gconf/gconf.xml.defaults/schemas/apps/stardict/preferences/main_window/%gconf.xml
-Xetc/gconf/gconf.xml.defaults/schemas/apps/stardict/preferences/notification_area_icon/%gconf.xml
+Xshare/pixmaps/stardict.png
+Xshare/stardict/pixmaps/docklet_normal.png
+Xshare/stardict/pixmaps/docklet_scan.png
+Xshare/stardict/pixmaps/docklet_stop.png
+Xshare/stardict/pixmaps/index_appendix.png
+Xshare/stardict/pixmaps/index_wazard.png
+Xshare/stardict/pixmaps/splash.png
+Xshare/stardict/sounds/buttonactive.wav
+Xshare/stardict/sounds/menushow.wav
+X@dirrm share/stardict/sounds
+X@dirrm share/stardict/pixmaps
+X@dirrm share/stardict
+X@dirrm share/omf/stardict
 X@dirrm share/gnome/help/stardict/zh_CN/figures
 X@dirrm share/gnome/help/stardict/zh_CN
 X@dirrm share/gnome/help/stardict/ru/figures
 X@dirrm share/gnome/help/stardict/ru
+X@dirrm share/gnome/help/stardict/mk/figures
+X@dirrm share/gnome/help/stardict/mk
 X@dirrm share/gnome/help/stardict/C/figures
 X@dirrm share/gnome/help/stardict/C
 X@dirrm share/gnome/help/stardict
-X@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/stardict/preferences/notification_area_icon
-X@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/stardict/preferences/main_window
-X@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/stardict/preferences/floating_window
-X@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/stardict/preferences/dictionary
-X@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/stardict/preferences
-X@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/stardict/manage_dictionaries
-X@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/stardict
-X@dirrm etc/gconf/gconf.xml.defaults/apps/stardict/preferences/notification_area_icon
-X@dirrm etc/gconf/gconf.xml.defaults/apps/stardict/preferences/main_window
-X@dirrm etc/gconf/gconf.xml.defaults/apps/stardict/preferences/floating_window
-X@dirrm etc/gconf/gconf.xml.defaults/apps/stardict/preferences/dictionary
-X@dirrm etc/gconf/gconf.xml.defaults/apps/stardict/preferences
-X@dirrm etc/gconf/gconf.xml.defaults/apps/stardict/manage_dictionaries
-X@dirrm etc/gconf/gconf.xml.defaults/apps/stardict
-X@dirrm share/omf/stardict
-X@dirrm share/stardict/dic
-X@dirrm share/stardict/pixmaps
-X@dirrm share/stardict/sounds
-X@dirrm share/stardict
 END-of-stardict2/pkg-plist
 exit
 
--- stardict2.diff ends here ---


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->repocopy 
State-Changed-By: pav 
State-Changed-When: Sat Feb 28 09:14:49 PST 2004 
State-Changed-Why:  
I would like to request a repocopy chinese/stardict2->textproc/stardict2. 
It's a general dictionary application. Once the repocopy 
is complete, port will be broken into engine which will stay in textproc/ 
and dictonary data files for chinese and japanese (three ports). 


Responsible-Changed-From-To: freebsd-ports-bugs->portmgr 
Responsible-Changed-By: pav 
Responsible-Changed-When: Sat Feb 28 09:14:49 PST 2004 
Responsible-Changed-Why:  
I would like to request a repocopy chinese/stardict2->textproc/stardict2. 
It's a general dictionary application. Once the repocopy 
is complete, port will be broken into engine which will stay in textproc/ 
and dictonary data files for chinese and japanese (three ports). 

http://www.freebsd.org/cgi/query-pr.cgi?pr=62905 
State-Changed-From-To: repocopy->open 
State-Changed-By: marcus 
State-Changed-When: Sat Feb 28 23:00:27 PST 2004 
State-Changed-Why:  
Repo-copy performed. 


Responsible-Changed-From-To: portmgr->pav 
Responsible-Changed-By: marcus 
Responsible-Changed-When: Sat Feb 28 23:00:27 PST 2004 
Responsible-Changed-Why:  
Repo-copy performed. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=62905 
State-Changed-From-To: open->closed 
State-Changed-By: pav 
State-Changed-When: Sun Feb 29 03:54:03 PST 2004 
State-Changed-Why:  
Committed, thanks! 

Please note that by "diff format" we mean diff between two directories 
with old and new port, not a diff between two shars. I patched it by hand. 

Also I made the port use GNOME hierarchy, fixed packing list, 
and fixed build on FreeBSD 4.x 

http://www.freebsd.org/cgi/query-pr.cgi?pr=62905 
>Unformatted:
