From dryice@hotpop.com  Fri Dec 17 04:37:30 2004
Return-Path: <dryice@hotpop.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 74B4C16A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 17 Dec 2004 04:37:30 +0000 (GMT)
Received: from smtp-out.hotpop.com (smtp-out.hotpop.com [38.113.3.61])
	by mx1.FreeBSD.org (Postfix) with ESMTP id F167143D2F
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 17 Dec 2004 04:37:29 +0000 (GMT)
	(envelope-from dryice@hotpop.com)
Received: from hotpop.com (kubrick.hotpop.com [38.113.3.103])
	by smtp-out.hotpop.com (Postfix) with SMTP id 4A320B5C47B
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 17 Dec 2004 04:37:24 +0000 (UTC)
Received: from hotpop.com (unknown [219.146.249.202])
	by smtp-1.hotpop.com (Postfix) with ESMTP
	id EB2B31A0196; Fri, 17 Dec 2004 04:37:15 +0000 (UTC)
Received: by hotpop.com (sSMTP sendmail emulation); Fri, 17 Dec 2004 12:37:10 +0800
Message-Id: <20041217043715.EB2B31A0196@smtp-1.hotpop.com>
Date: Fri, 17 Dec 2004 12:37:10 +0800
From: Dryice Liu <dryice@hotpop.com>
Reply-To: Dryice Liu <dryice@liu.com.cn>
To: FreeBSD-gnats-submit@freebsd.org
Cc: Dryice Liu <dryice@liu.com.cn>
Subject: [maintainer update] chinese/xpdf: fix file permission changes
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         75176
>Category:       ports
>Synopsis:       [maintainer update] chinese/xpdf: fix file permission changes
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Dec 17 04:40:21 GMT 2004
>Closed-Date:    Sat Dec 18 16:51:50 GMT 2004
>Last-Modified:  Sat Dec 18 16:51:50 GMT 2004
>Originator:     Dryice Liu
>Release:        FreeBSD 5.3-STABLE i386
>Organization:
>Environment:
System: FreeBSD dryice.3322.org 5.3-STABLE FreeBSD 5.3-STABLE #0: Tue Dec 7 10:38:59 CST 2004 

>Description:
	Changes:
		- fix file permission changes pointed out by Kris
		- utilize DATADIR in pkg-plist
>How-To-Repeat:
	$ ll /usr/X11R6/etc/xpdfrc
	-r--r--r--    1 root     wheel        4993 12 17 12:34 /usr/X11R6/etc/xpdfrc
	$ cd /usr/ports/chinese/xpdf; make install deinstall
	[...snip]
	$ ll /usr/X11R6/etc/xpdfrc
	-rw-r--r--    1 root     wheel        4993 12 17 12:38 /usr/X11R6/etc/xpdfrc

>Fix:



--- xpdf.diff begins here ---
diff -ruN xpdf.old/pkg-install xpdf/pkg-install
--- xpdf.old/pkg-install	Sun Aug  4 03:32:54 2002
+++ xpdf/pkg-install	Fri Dec 17 11:32:44 2004
@@ -5,6 +5,5 @@
 XPDFRC=${PKG_PREFIX}/etc/xpdfrc
 ADDRESOURCE=${PKG_PREFIX}/share/xpdf/chinese-traditional/dot.xpdfrc
 /usr/bin/grep -F -v --file=${ADDRESOURCE} ${XPDFRC} > ${XPDFRC}.nochinese-traditional
-/bin/rm -f ${XPDFRC}
 /bin/cat ${XPDFRC}.nochinese-traditional ${ADDRESOURCE} > ${XPDFRC}
 /bin/rm -f ${XPDFRC}.nochinese-traditional
diff -ruN xpdf.old/pkg-plist xpdf/pkg-plist
--- xpdf.old/pkg-plist	Mon Aug  2 10:35:54 2004
+++ xpdf/pkg-plist	Fri Dec 17 12:23:51 2004
@@ -1,15 +1,15 @@
-share/xpdf/chinese-simplified/Adobe-GB1.cidToUnicode
-share/xpdf/chinese-simplified/EUC-CN.unicodeMap
-share/xpdf/chinese-simplified/GBK.unicodeMap
-share/xpdf/chinese-simplified/ISO-2022-CN.unicodeMap
-share/xpdf/chinese-simplified/README
-share/xpdf/chinese-traditional/Adobe-CNS1.cidToUnicode
-share/xpdf/chinese-traditional/Big5.unicodeMap
-share/xpdf/chinese-traditional/Big5ascii.unicodeMap
-share/xpdf/chinese-traditional/README
-@unexec mv -f %D/etc/xpdfrc %D/etc/xpdfrc.chinese-traditional
-@unexec grep -F -v --file=%D/share/xpdf/chinese-traditional/dot.xpdfrc %D/etc/xpdfrc.chinese-traditional > %D/etc/xpdfrc
-share/xpdf/chinese-traditional/dot.xpdfrc
+%%DATADIR%%/chinese-simplified/Adobe-GB1.cidToUnicode
+%%DATADIR%%/chinese-simplified/EUC-CN.unicodeMap
+%%DATADIR%%/chinese-simplified/GBK.unicodeMap
+%%DATADIR%%/chinese-simplified/ISO-2022-CN.unicodeMap
+%%DATADIR%%/chinese-simplified/README
+%%DATADIR%%/chinese-traditional/Adobe-CNS1.cidToUnicode
+%%DATADIR%%/chinese-traditional/Big5.unicodeMap
+%%DATADIR%%/chinese-traditional/Big5ascii.unicodeMap
+%%DATADIR%%/chinese-traditional/README
+@unexec cp %D/etc/xpdfrc %D/etc/xpdfrc.chinese-traditional
+@unexec grep -F -v --file=%D/%%DATADIR%%/chinese-traditional/dot.xpdfrc %D/etc/xpdfrc.chinese-traditional > %D/etc/xpdfrc
+%%DATADIR%%/chinese-traditional/dot.xpdfrc
 @unexec rm -f %D/etc/xpdfrc.chinese-traditional
-@dirrm share/xpdf/chinese-simplified
-@dirrm share/xpdf/chinese-traditional
+@dirrm %%DATADIR%%/chinese-simplified
+@dirrm %%DATADIR%%/chinese-traditional
--- xpdf.diff ends here ---



>Release-Note:
>Audit-Trail:

From: Dryice Liu <dryice@hotpop.com>
To: freebsd-gnats-submit@FreeBSD.org, dryice@liu.com.cn
Cc:  
Subject: Re: ports/75176: [maintainer update] chinese/xpdf: fix file
 permission changes
Date: Fri, 17 Dec 2004 16:16:57 +0800

 Thanks Kris for pointing me a better solution. It also fix the
 maybe-not-empty directory share/xpdf problem. Please use this diff:
 
 ======================================================================
 diff -ruN xpdf.old/pkg-install xpdf/pkg-install
 --- xpdf.old/pkg-install	Sun Aug  4 03:32:54 2002
 +++ xpdf/pkg-install	Fri Dec 17 11:32:44 2004
 @@ -5,6 +5,5 @@
  XPDFRC=${PKG_PREFIX}/etc/xpdfrc
  ADDRESOURCE=${PKG_PREFIX}/share/xpdf/chinese-traditional/dot.xpdfrc
  /usr/bin/grep -F -v --file=${ADDRESOURCE} ${XPDFRC} > ${XPDFRC}.nochinese-traditional
 -/bin/rm -f ${XPDFRC}
  /bin/cat ${XPDFRC}.nochinese-traditional ${ADDRESOURCE} > ${XPDFRC}
  /bin/rm -f ${XPDFRC}.nochinese-traditional
 diff -ruN xpdf.old/pkg-plist xpdf/pkg-plist
 --- xpdf.old/pkg-plist	Mon Aug  2 10:35:54 2004
 +++ xpdf/pkg-plist	Fri Dec 17 16:06:47 2004
 @@ -1,15 +1,16 @@
 -share/xpdf/chinese-simplified/Adobe-GB1.cidToUnicode
 -share/xpdf/chinese-simplified/EUC-CN.unicodeMap
 -share/xpdf/chinese-simplified/GBK.unicodeMap
 -share/xpdf/chinese-simplified/ISO-2022-CN.unicodeMap
 -share/xpdf/chinese-simplified/README
 -share/xpdf/chinese-traditional/Adobe-CNS1.cidToUnicode
 -share/xpdf/chinese-traditional/Big5.unicodeMap
 -share/xpdf/chinese-traditional/Big5ascii.unicodeMap
 -share/xpdf/chinese-traditional/README
 -@unexec mv -f %D/etc/xpdfrc %D/etc/xpdfrc.chinese-traditional
 -@unexec grep -F -v --file=%D/share/xpdf/chinese-traditional/dot.xpdfrc %D/etc/xpdfrc.chinese-traditional > %D/etc/xpdfrc
 -share/xpdf/chinese-traditional/dot.xpdfrc
 +%%DATADIR%%/chinese-simplified/Adobe-GB1.cidToUnicode
 +%%DATADIR%%/chinese-simplified/EUC-CN.unicodeMap
 +%%DATADIR%%/chinese-simplified/GBK.unicodeMap
 +%%DATADIR%%/chinese-simplified/ISO-2022-CN.unicodeMap
 +%%DATADIR%%/chinese-simplified/README
 +%%DATADIR%%/chinese-traditional/Adobe-CNS1.cidToUnicode
 +%%DATADIR%%/chinese-traditional/Big5.unicodeMap
 +%%DATADIR%%/chinese-traditional/Big5ascii.unicodeMap
 +%%DATADIR%%/chinese-traditional/README
 +@unexec cp %D/etc/xpdfrc %D/etc/xpdfrc.chinese-traditional
 +@unexec grep -F -v --file=%D/%%DATADIR%%/chinese-traditional/dot.xpdfrc %D/etc/xpdfrc.chinese-traditional > %D/etc/xpdfrc
 +%%DATADIR%%/chinese-traditional/dot.xpdfrc
  @unexec rm -f %D/etc/xpdfrc.chinese-traditional
 -@dirrm share/xpdf/chinese-simplified
 -@dirrm share/xpdf/chinese-traditional
 +@dirrm %%DATADIR%%/chinese-simplified
 +@dirrm %%DATADIR%%/chinese-traditional
 +@unexec rmdir %%DATADIR%% 2> /dev/null || true
 ======================================================================
 
 
 -- 
 Cheers,
 Dryice
 
 http://dryice.3322.org
 

From: Dryice Liu <dryice@hotpop.com>
To: freebsd-gnats-submit@FreeBSD.org, dryice@liu.com.cn
Cc:  
Subject: Re: ports/75176: [maintainer update] chinese/xpdf: fix file
 permission changes
Date: Fri, 17 Dec 2004 08:23:06 +0000 (UTC)

 --text follows this line--
 Thanks Kris for pointing me a better solution. It also fix the
 maybe-not-empty directory share/xpdf problem. Please use this diff:
 Date: Fri, 17 Dec 2004 16:23:08 +0800
 Message-ID: <86r7lpwcyb.fsf@dryice.3322.org>
 MIME-Version: 1.0
 Content-Type: text/plain; charset=us-ascii
 
 ======================================================================
 diff -ruN xpdf.old/pkg-install xpdf/pkg-install
 --- xpdf.old/pkg-install	Sun Aug  4 03:32:54 2002
 +++ xpdf/pkg-install	Fri Dec 17 11:32:44 2004
 @@ -5,6 +5,5 @@
  XPDFRC=${PKG_PREFIX}/etc/xpdfrc
  ADDRESOURCE=${PKG_PREFIX}/share/xpdf/chinese-traditional/dot.xpdfrc
  /usr/bin/grep -F -v --file=${ADDRESOURCE} ${XPDFRC} > ${XPDFRC}.nochinese-traditional
 -/bin/rm -f ${XPDFRC}
  /bin/cat ${XPDFRC}.nochinese-traditional ${ADDRESOURCE} > ${XPDFRC}
  /bin/rm -f ${XPDFRC}.nochinese-traditional
 diff -ruN xpdf.old/pkg-plist xpdf/pkg-plist
 --- xpdf.old/pkg-plist	Mon Aug  2 10:35:54 2004
 +++ xpdf/pkg-plist	Fri Dec 17 16:06:47 2004
 @@ -1,15 +1,16 @@
 -share/xpdf/chinese-simplified/Adobe-GB1.cidToUnicode
 -share/xpdf/chinese-simplified/EUC-CN.unicodeMap
 -share/xpdf/chinese-simplified/GBK.unicodeMap
 -share/xpdf/chinese-simplified/ISO-2022-CN.unicodeMap
 -share/xpdf/chinese-simplified/README
 -share/xpdf/chinese-traditional/Adobe-CNS1.cidToUnicode
 -share/xpdf/chinese-traditional/Big5.unicodeMap
 -share/xpdf/chinese-traditional/Big5ascii.unicodeMap
 -share/xpdf/chinese-traditional/README
 -@unexec mv -f %D/etc/xpdfrc %D/etc/xpdfrc.chinese-traditional
 -@unexec grep -F -v --file=%D/share/xpdf/chinese-traditional/dot.xpdfrc %D/etc/xpdfrc.chinese-traditional > %D/etc/xpdfrc
 -share/xpdf/chinese-traditional/dot.xpdfrc
 +%%DATADIR%%/chinese-simplified/Adobe-GB1.cidToUnicode
 +%%DATADIR%%/chinese-simplified/EUC-CN.unicodeMap
 +%%DATADIR%%/chinese-simplified/GBK.unicodeMap
 +%%DATADIR%%/chinese-simplified/ISO-2022-CN.unicodeMap
 +%%DATADIR%%/chinese-simplified/README
 +%%DATADIR%%/chinese-traditional/Adobe-CNS1.cidToUnicode
 +%%DATADIR%%/chinese-traditional/Big5.unicodeMap
 +%%DATADIR%%/chinese-traditional/Big5ascii.unicodeMap
 +%%DATADIR%%/chinese-traditional/README
 +@unexec cp %D/etc/xpdfrc %D/etc/xpdfrc.chinese-traditional
 +@unexec grep -F -v --file=%D/%%DATADIR%%/chinese-traditional/dot.xpdfrc %D/etc/xpdfrc.chinese-traditional > %D/etc/xpdfrc
 +%%DATADIR%%/chinese-traditional/dot.xpdfrc
  @unexec rm -f %D/etc/xpdfrc.chinese-traditional
 -@dirrm share/xpdf/chinese-simplified
 -@dirrm share/xpdf/chinese-traditional
 +@dirrm %%DATADIR%%/chinese-simplified
 +@dirrm %%DATADIR%%/chinese-traditional
 +@unexec rmdir %%DATADIR%% 2> /dev/null || true
 ======================================================================
 
 
 -- 
 Cheers,
 Dryice
 
 http://dryice.3322.org
 
State-Changed-From-To: open->closed 
State-Changed-By: pav 
State-Changed-When: Sat Dec 18 16:51:40 GMT 2004 
State-Changed-Why:  
Committed, thanks! 

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