ports/51950: Update port: chinese/pyDict

[Statue]

>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 at 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 at 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 <bsd.port.pre.mk>
+
+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 <plateau at pagic.net>
+WWW: http://www.linux.org.tw/~plateau/linux_notes/
	


>Release-Note:
>Audit-Trail:
>Unformatted: