From nobody@FreeBSD.org  Sat Dec 10 06:08:49 2005
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 528C816A41F
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 10 Dec 2005 06:08:49 +0000 (GMT)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [216.136.204.117])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 16BF343D45
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 10 Dec 2005 06:08:49 +0000 (GMT)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.13.1/8.13.1) with ESMTP id jBA68m4J032881
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 10 Dec 2005 06:08:48 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.13.1/8.13.1/Submit) id jBA68mkB032880;
	Sat, 10 Dec 2005 06:08:48 GMT
	(envelope-from nobody)
Message-Id: <200512100608.jBA68mkB032880@www.freebsd.org>
Date: Sat, 10 Dec 2005 06:08:48 GMT
From: Stephen Hurd <shurd@sasktel.net>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [MAINTAINER-UPDATE] unbreak misc/freeguide
X-Send-Pr-Version: www-2.3

>Number:         90172
>Category:       ports
>Synopsis:       [MAINTAINER-UPDATE] unbreak misc/freeguide
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    hq
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Dec 10 06:10:02 GMT 2005
>Closed-Date:    Mon Dec 19 15:10:26 GMT 2005
>Last-Modified:  Mon Dec 19 15:10:26 GMT 2005
>Originator:     Stephen Hurd
>Release:        6.0-STABLE
>Organization:
>Environment:
FreeBSD server.hurd.local 6.0-STABLE FreeBSD 6.0-STABLE #2: Sun Nov 20 12:45:37 CST 2005     admin@server.hurd.local:/usr/src/sys/i386/compile/SERVER  i386

>Description:
              Unbreak port
>How-To-Repeat:
              
>Fix:
              Apply patch:
diff -c ../freeguide-old/Makefile ./Makefile
*** ../freeguide-old/Makefile   Fri Dec  9 23:58:36 2005
--- ./Makefile  Sat Dec 10 00:06:32 2005
***************
*** 17,24 ****
  
  RUN_DEPENDS=  tv_cat:${PORTSDIR}/textproc/p5-xmltv
  
- BROKEN=               Incomplete pkg-plist
- 
  USE_JAVA=     yes
  USE_JIKES=    no
  JAVA_VERSION= 1.4+
--- 17,22 ----
Common subdirectories: ../freeguide-old/files and ./files
diff -c ../freeguide-old/pkg-plist ./pkg-plist
*** ../freeguide-old/pkg-plist  Fri Dec  9 23:58:36 2005
--- ./pkg-plist Sat Dec 10 00:04:51 2005
***************
*** 25,29 ****
  share/java/pixmaps/freeguide/logo-64x64.png
  share/java/pixmaps/freeguide/logo-72x72.png
  share/java/pixmaps/freeguide/logo-96x96.png
! @dirrm share/java/pixmaps/freeguide
  @dirrm %%DOCSDIR%%
--- 25,30 ----
  share/java/pixmaps/freeguide/logo-64x64.png
  share/java/pixmaps/freeguide/logo-72x72.png
  share/java/pixmaps/freeguide/logo-96x96.png
! @unexec rmdir %D/share/java/pixmaps 2>/dev/null || true
! @unexec rmdir %D/share/applications 2>/dev/null || true
  @dirrm %%DOCSDIR%%

>Release-Note:
>Audit-Trail:

From: Stephen Hurd <shurd@sasktel.net>
To: bug-followup@FreeBSD.org, shurd@sasktel.net
Cc:  
Subject: Re: ports/90172: [MAINTAINER-UPDATE] unbreak misc/freeguide
Date: Sat, 10 Dec 2005 00:17:40 -0600

 This is a multi-part message in MIME format.
 
 --Boundary_(ID_zGbknHeV9Sho1XJ0RgKR/Q)
 Content-type: text/plain; charset=us-ascii; format=flowed
 Content-transfer-encoding: 7BIT
 
 Whoops, still need to remove pixmaps/freevo *blush*
 
 
 --Boundary_(ID_zGbknHeV9Sho1XJ0RgKR/Q)
 Content-type: text/x-patch; name=freeguide.patch
 Content-transfer-encoding: 7BIT
 Content-disposition: inline; filename=freeguide.patch
 
 diff -c ../freeguide-old/Makefile ./Makefile
 *** ../freeguide-old/Makefile	Fri Dec  9 23:58:36 2005
 --- ./Makefile	Sat Dec 10 00:06:32 2005
 ***************
 *** 17,24 ****
   
   RUN_DEPENDS=	tv_cat:${PORTSDIR}/textproc/p5-xmltv
   
 - BROKEN=		Incomplete pkg-plist
 - 
   USE_JAVA=	yes
   USE_JIKES=	no
   JAVA_VERSION=	1.4+
 --- 17,22 ----
 Common subdirectories: ../freeguide-old/files and ./files
 diff -c ../freeguide-old/pkg-plist ./pkg-plist
 *** ../freeguide-old/pkg-plist	Fri Dec  9 23:58:36 2005
 --- ./pkg-plist	Sat Dec 10 00:10:18 2005
 ***************
 *** 26,29 ****
 --- 26,31 ----
   share/java/pixmaps/freeguide/logo-72x72.png
   share/java/pixmaps/freeguide/logo-96x96.png
   @dirrm share/java/pixmaps/freeguide
 + @unexec rmdir %D/share/java/pixmaps 2>/dev/null || true
 + @unexec rmdir %D/share/applications 2>/dev/null || true
   @dirrm %%DOCSDIR%%
 
 --Boundary_(ID_zGbknHeV9Sho1XJ0RgKR/Q)--
Responsible-Changed-From-To: freebsd-ports-bugs->hq 
Responsible-Changed-By: hq 
Responsible-Changed-When: Sat Dec 10 15:53:10 UTC 2005 
Responsible-Changed-Why:  
I'll handle this. 

Could you please re-send the last patch? It seems to have be corrupted. 


http://www.freebsd.org/cgi/query-pr.cgi?pr=90172 
State-Changed-From-To: open->feedback 
State-Changed-By: hq 
State-Changed-When: Mon Dec 12 17:30:20 UTC 2005 
State-Changed-Why:  
Submiter asked to re-submit the patch. 

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

From: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/90172 : [MAINTAINER-UPDATE] unbreak misc/freeguide
Date: Tue, 13 Dec 2005 15:26:03 -0200

 --dDRMvlgZJXvWKvBx
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
 	The attached patch should be enough. :) I hope this helps.
 
 	Regards,
 
 -- 
 Mario S F Ferreira - DF - Brazil - "I guess this is a signature."
 feature, n: a documented bug | bug, n: an undocumented feature
 
 --dDRMvlgZJXvWKvBx
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: attachment; filename=patch
 
 Index: Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/misc/freeguide/Makefile,v
 retrieving revision 1.2
 diff -d -u -u -r1.2 Makefile
 --- Makefile	21 Nov 2005 01:31:13 -0000	1.2
 +++ Makefile	13 Dec 2005 17:24:57 -0000
 @@ -17,8 +17,6 @@
  
  RUN_DEPENDS=	tv_cat:${PORTSDIR}/textproc/p5-xmltv
  
 -BROKEN=		Incomplete pkg-plist
 -
  USE_JAVA=	yes
  USE_JIKES=	no
  JAVA_VERSION=	1.4+
 Index: pkg-plist
 ===================================================================
 RCS file: /home/pcvs/ports/misc/freeguide/pkg-plist,v
 retrieving revision 1.1
 diff -d -u -u -r1.1 pkg-plist
 --- pkg-plist	1 Nov 2005 21:41:24 -0000	1.1
 +++ pkg-plist	13 Dec 2005 17:24:57 -0000
 @@ -18,12 +18,14 @@
  %%DOCSDIR%%/timezone.html
  %%DOCSDIR%%/userguide.html
  %%JAVAJARDIR%%/FreeGuide.jar
 -share/java/pixmaps/freeguide.png
 -share/java/pixmaps/freeguide/logo-16x16.png
 -share/java/pixmaps/freeguide/logo-32x32.png
 -share/java/pixmaps/freeguide/logo-48x48.png
 -share/java/pixmaps/freeguide/logo-64x64.png
 -share/java/pixmaps/freeguide/logo-72x72.png
 -share/java/pixmaps/freeguide/logo-96x96.png
 -@dirrm share/java/pixmaps/freeguide
 +%%JAVASHAREDIR%%/pixmaps/freeguide.png
 +%%JAVASHAREDIR%%/pixmaps/freeguide/logo-16x16.png
 +%%JAVASHAREDIR%%/pixmaps/freeguide/logo-32x32.png
 +%%JAVASHAREDIR%%/pixmaps/freeguide/logo-48x48.png
 +%%JAVASHAREDIR%%/pixmaps/freeguide/logo-64x64.png
 +%%JAVASHAREDIR%%/pixmaps/freeguide/logo-72x72.png
 +%%JAVASHAREDIR%%/pixmaps/freeguide/logo-96x96.png
 +@dirrm %%JAVASHAREDIR%%/pixmaps/freeguide
 +@unexec rmdir %D/%%JAVASHAREDIR%%/pixmaps 2>/dev/null || true
  @dirrm %%DOCSDIR%%
 +@unexec rmdir %D/share/applications 2>/dev/null || true
 
 --dDRMvlgZJXvWKvBx--

From: Herve Quiroz <herve.quiroz@esil.univ-mrs.fr>
To: shurd@sasktel.net
Cc: bug-followup@FreeBSD.org, lioux@FreeBSD.org
Subject: Re: ports/90172: [MAINTAINER-UPDATE] unbreak misc/freeguide
Date: Thu, 15 Dec 2005 17:53:44 +0100

 The patch from Mario looks good to me. Awaiting maintainer approval.
 
 BTW, Mario, since the patch is yours, do you want to handle the PR
 yourself? In such case, you may re-assign it.
 
 Herve

From: Stephen Hurd <shurd@sasktel.net>
To: Herve Quiroz <herve.quiroz@esil.univ-mrs.fr>
Cc: bug-followup@FreeBSD.org, lioux@FreeBSD.org
Subject: Re: ports/90172: [MAINTAINER-UPDATE] unbreak misc/freeguide
Date: Sat, 17 Dec 2005 04:09:05 -0600

 Herve Quiroz wrote:
 
 >The patch from Mario looks good to me. Awaiting maintainer approval.
 >
 >BTW, Mario, since the patch is yours, do you want to handle the PR
 >yourself? In such case, you may re-assign it.
 >
 >Herve
 >
 >  
 >
 I'm a n00b maintainer... nothing like%%JAVASHAREDIR%% was mentioned in 
 the ports docs.  If this looks good to someone with more ports-fu than 
 me, I'll assume it's good.  The issue was the share/java/pixmaps and 
 share/applications existing after an uninstall on pointyhat.  I had 
 figured those dirs were SEP (someone elses problem) after reading the 
 ports docs.  I had pulled verbatim the:
 
  + @unexec rmdir %D/share/java/pixmaps 2>/dev/null || true
  + @unexec rmdir %D/share/applications 2>/dev/null || true
 
 bits from the ports docs for removing dirs without B&W (bitching and whining).
 
 Incidentally, it seems to me that every time I submit a patch via e-mail it's broken somehow... is there a specific "right" way to submit these that I missed?
 
 
State-Changed-From-To: feedback->closed 
State-Changed-By: hq 
State-Changed-When: Mon Dec 19 15:10:07 UTC 2005 
State-Changed-Why:  
Patch commited. 

Thanks for your contribution! 

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