From owner-freebsd-ports-bugs@FreeBSD.ORG Wed May 7 21:50:13 2003 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 12D5A37B401 for ; Wed, 7 May 2003 21:50:13 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 11F2143F85 for ; Wed, 7 May 2003 21:50:12 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h484oBUp057128 for ; Wed, 7 May 2003 21:50:11 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h484oBdZ057127; Wed, 7 May 2003 21:50:11 -0700 (PDT) Resent-Date: Wed, 7 May 2003 21:50:11 -0700 (PDT) Resent-Message-Id: <200305080450.h484oBdZ057127@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Statue Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B0A6437B401 for ; Wed, 7 May 2003 21:48:43 -0700 (PDT) Received: from freebsd.sinica.edu.tw (freebsd.sinica.edu.tw [140.109.13.51]) by mx1.FreeBSD.org (Postfix) with ESMTP id D549E43F85 for ; Wed, 7 May 2003 21:48:42 -0700 (PDT) (envelope-from statue@freebsd.sinica.edu.tw) Received: by freebsd.sinica.edu.tw (Postfix, from userid 1014) id 1D203BE; Thu, 8 May 2003 12:47:42 +0800 (CST) Message-Id: <20030508044742.1D203BE@freebsd.sinica.edu.tw> Date: Thu, 8 May 2003 12:47:42 +0800 (CST) From: Statue To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/51950: Update port: chinese/pyDict X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Statue List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 May 2003 04:50:13 -0000 >Number: 51950 >Category: ports >Synopsis: Update port: chinese/pyDict >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Wed May 07 21:50:11 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Statue >Release: FreeBSD 4.7-PRERELEASE i386 >Organization: >Environment: System: FreeBSD freebsd.sinica.edu.tw 4.7-PRERELEASE FreeBSD 4.7-PRERELEASE #2: Mon Sep 9 10:45:46 CST 2002 ycheng@freebsd.sinica.edu.tw:/usr/src/sys/compile/GENERIC i386 >Description: o update to 0.2.6.3 o remove files/patch-aa o make prefix clean o change MASTER_SITES o add author's WWW >How-To-Repeat: >Fix: diff -ruN pyDict.orig/Makefile pyDict/Makefile --- pyDict.orig/Makefile Thu May 8 12:12:00 2003 +++ pyDict/Makefile Thu May 8 12:43:22 2003 @@ -6,11 +6,9 @@ # PORTNAME= pyDict -PORTVERSION= 0.2.5 -PORTREVISION= 1 +PORTVERSION= 0.2.6.3 CATEGORIES= chinese -MASTER_SITES= ftp://freebsd.sinica.edu.tw/pub/keith/ -DISTNAME= pyDict-0.2.5.1 +MASTER_SITES= ftp://freebsd.sinica.edu.tw/pub/statue/pyDict/ MAINTAINER= keith@FreeBSD.org COMMENT= A Chinese <-> English dictionary, under both console and X11 @@ -25,8 +23,14 @@ SHAREMODE= 644 DICTDIR= ${PREFIX}/lib/X11/pyDict DOCDIR= ${PREFIX}/share/doc/pyDict +USE_REINPLACE= yes .include + +do-patch: + ${REINPLACE_CMD} -e 's,/bin/grep,${GREP},g' \ + -e 's,--after-context=20,-A 20,g' \ + -e 's,/usr/X11R6,${PREFIX},g' ${WRKSRC}/dict.py do-install: @${MKDIR} ${DICTDIR} diff -ruN pyDict.orig/distinfo pyDict/distinfo --- pyDict.orig/distinfo Thu May 8 12:12:00 2003 +++ pyDict/distinfo Thu May 8 12:28:26 2003 @@ -1 +1 @@ -MD5 (pyDict-0.2.5.1.tar.gz) = ec92b0ed24ee48e483b1d4ea3713c012 +MD5 (pyDict-0.2.6.3.tar.gz) = 1f22abea9810aee0fc25962db64f92a9 diff -ruN pyDict.orig/files/patch-aa pyDict/files/patch-aa --- pyDict.orig/files/patch-aa Thu May 8 12:12:00 2003 +++ pyDict/files/patch-aa Thu Jan 1 08:00:00 1970 @@ -1,47 +0,0 @@ ---- dict.py.orig Mon Sep 18 07:31:48 2000 -+++ dict.py Sat Mar 17 02:23:23 2001 -@@ -252,7 +252,7 @@ - def execute(self,word): # English to Chinese - # move self.index to top - self.index = 0 -- command = g_command + ' --after-context=20 "^' + word + '.*=.*$" ' + dict_path + lower(word[0]) + '.lib' + '|awk "NR < 19 "' -+ command = g_command + ' -A 20 "^' + word + '.*=.*$" ' + dict_path + lower(word[0]) + '.lib' + '|awk "NR < 19 "' - result_lines = os.popen(command,'r').readlines() - #if result_lines: - if result_lines: -@@ -488,7 +488,7 @@ - - def console_e_dict(input=None): - #set up g_command -- g_command = '/bin/grep --ignore-case' -+ g_command = '/usr/bin/grep --ignore-case' - if input == None: - inp = raw_input('word:') - else: -@@ -503,7 +503,7 @@ - console_c_dict() - return - else: -- command = g_command + " '^" + inp + "=.*$' " + dict_path + lower(word[0]) + '.lib' -+ command = g_command + " '^" + inp + "=.*$' " + dict_path + lower(inp[0]) + '.lib' - result_line = os.popen(command,'r').readline() - #if result_lines: - if result_line: -@@ -532,7 +532,7 @@ - - def console_c_dict(input=None): - #set up g_command -- g_command = '/bin/grep ' -+ g_command = '/usr/bin/grep ' - if input == None: - inp = raw_input('word:') - else: -@@ -603,7 +603,7 @@ - print 'type -e to English-Chinese mode' - - # set up grep command -- g_command = '/bin/grep --ignore-case' -+ g_command = '/usr/bin/grep --ignore-case' - dict_path = '/usr/X11R6/lib/X11/pyDict/' - - # check if there is an DISPLAY environment variable diff -ruN pyDict.orig/pkg-descr pyDict/pkg-descr --- pyDict.orig/pkg-descr Thu May 8 12:12:00 2003 +++ pyDict/pkg-descr Thu May 8 12:16:55 2003 @@ -4,3 +4,4 @@ to traditional Chinese by CLE(Chinese Linux Extension) team. Author: Daniel Gau +WWW: http://www.linux.org.tw/~plateau/linux_notes/ >Release-Note: >Audit-Trail: >Unformatted: