From sunpoet@sunpoet.net  Wed Feb 29 15:38:44 2012
Return-Path: <sunpoet@sunpoet.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8DC8010656D2
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 29 Feb 2012 15:38:44 +0000 (UTC)
	(envelope-from sunpoet@sunpoet.net)
Received: from sunpoet.net (sunpoet.net [220.133.12.240])
	by mx1.freebsd.org (Postfix) with ESMTP id 543BC8FC0C
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 29 Feb 2012 15:38:44 +0000 (UTC)
Received: by sunpoet.net (Postfix, from userid 1000)
	id 3TygqT0ZQzz4Gw; Wed, 29 Feb 2012 23:36:37 +0800 (CST)
Message-Id: <3TygqT0ZQzz4Gw@sunpoet.net>
Date: Wed, 29 Feb 2012 23:36:37 +0800 (CST)
From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: ruby@FreeBSD.org
Subject: [PATCH] devel/ruby-gems: fix and cleanup PLIST
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         165554
>Category:       ports
>Synopsis:       [PATCH] devel/ruby-gems: fix and cleanup PLIST
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    sunpoet
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Feb 29 15:40:10 UTC 2012
>Closed-Date:    Fri Mar 02 03:12:09 UTC 2012
>Last-Modified:  Fri Mar  2 03:20:05 UTC 2012
>Originator:     Sunpoet Po-Chuan Hsieh
>Release:        FreeBSD 9.0-STABLE amd64
>Organization:
The FreeBSD Project
>Environment:
System: FreeBSD bonjour.sunpoet.net 9.0-STABLE FreeBSD 9.0-STABLE #0: Sun Jan 29 23:36:49 CST 2012
>Description:
- Fix and cleanup PLIST
  - GEMS_DOC_DIR does not exist if NOPORTDOCS is set [1]
  - 4 entries in PLIST are no-op [2]
    (they are equivalent to the TMPPLIST manipulation in post-patch:)
    (they should occur after the entries of doc files)

Port maintainer (ruby@FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:

[1]
% make NOPORTDOCS=yes install deinstall
...
===>  Deinstalling for devel/ruby-gems
===>   Deinstalling ruby19-gems-1.8.11
pkg_delete: file '/usr/local/lib/ruby/gems/1.9/doc/rubygems-1.8.11' doesn't exist
pkg_delete: unable to completely remove directory '/usr/local/lib/ruby/gems/1.9/doc/rubygems-1.8.11'
pkg_delete: couldn't entirely delete package `ruby19-gems-1.8.11'
(perhaps the packing list is incorrectly specified?)

[2]
% make install
% grep lib/ruby/gems/`make -V RUBY_VER` `make -V TMPPLIST`

>Fix:

--- ruby-gems-1.8.11.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/ruby-gems/Makefile,v
retrieving revision 1.48
diff -u -u -r1.48 Makefile
--- Makefile	18 Jan 2012 05:22:52 -0000	1.48
+++ Makefile	28 Feb 2012 17:22:57 -0000
@@ -59,9 +59,9 @@
 	    ${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
 	@${FIND} -ds ${PREFIX}/${GEMS_DOC_DIR}/ -type d -mindepth 1 | \
 	    ${SED} -E -e 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
+	@${ECHO_CMD} "@dirrm ${GEMS_DOC_DIR}" >> ${TMPPLIST}
 .endif
 
-	@${ECHO_CMD} "@dirrm ${GEMS_DOC_DIR}" >> ${TMPPLIST}
 	@${ECHO_CMD} "@unexec rmdir %D/lib/ruby/gems/${RUBY_VER}/doc 2>/dev/null || true" >> ${TMPPLIST}
 	@${ECHO_CMD} "@unexec rmdir %D/lib/ruby/gems/${RUBY_VER} 2>/dev/null || true" >> ${TMPPLIST}
 	@${ECHO_CMD} "@unexec rmdir %D/lib/ruby/gems 2>/dev/null || true" >> ${TMPPLIST}
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/devel/ruby-gems/pkg-plist,v
retrieving revision 1.28
diff -u -u -r1.28 pkg-plist
--- pkg-plist	28 Aug 2011 20:01:09 -0000	1.28
+++ pkg-plist	28 Feb 2012 17:22:57 -0000
@@ -100,7 +100,3 @@
 @dirrm %%RUBY_SITELIBDIR%%/rbconfig
 @dirrmtry %%RUBY_SITELIBDIR%%
 @dirrmtry lib/ruby/site_ruby
-@dirrmtry lib/ruby/gems/%%RUBY_VER%%/doc
-@dirrmtry lib/ruby/gems/%%RUBY_VER%%
-@dirrmtry lib/ruby/gems
-@dirrmtry lib/ruby
--- ruby-gems-1.8.11.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->ruby 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Wed Feb 29 15:40:53 UTC 2012 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=165554 
State-Changed-From-To: open->closed 
State-Changed-By: sunpoet 
State-Changed-When: Fri Mar 2 03:11:35 UTC 2012 
State-Changed-Why:  
Committed. Thanks! 


Responsible-Changed-From-To: ruby->sunpoet 
Responsible-Changed-By: sunpoet 
Responsible-Changed-When: Fri Mar 2 03:11:35 UTC 2012 
Responsible-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=165554 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/165554: commit references a PR
Date: Fri,  2 Mar 2012 03:11:36 +0000 (UTC)

 sunpoet     2012-03-02 03:11:26 UTC
 
   FreeBSD ports repository
 
   Modified files:
     devel/ruby-gems      Makefile pkg-plist 
   Log:
   - Fix and cleanup PLIST
     - GEMS_DOC_DIR does not exist if NOPORTDOCS is set
     - 4 entries in PLIST are no-op
       They are equivalent to the TMPPLIST manipulation in post-patch:
       They should occur after the entries of doc files
   
   PR:             ports/165554
   Submitted by:   sunpoet (myself)
   Approved by:    swills (with ruby hat)
   
   Revision  Changes    Path
   1.49      +1 -1      ports/devel/ruby-gems/Makefile
   1.29      +0 -4      ports/devel/ruby-gems/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
