From olivleh1@kartoffel.salatschuessel.net  Wed Feb  7 05:33:43 2007
Return-Path: <olivleh1@kartoffel.salatschuessel.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 7943D16A403;
	Wed,  7 Feb 2007 05:33:43 +0000 (UTC)
	(envelope-from olivleh1@kartoffel.salatschuessel.net)
Received: from kartoffel.salatschuessel.net (p5084DC4B.dip.t-dialin.net [80.132.220.75])
	by mx1.freebsd.org (Postfix) with ESMTP id 9431D13C474;
	Wed,  7 Feb 2007 05:33:41 +0000 (UTC)
	(envelope-from olivleh1@kartoffel.salatschuessel.net)
Received: from kartoffel.salatschuessel.net (localhost [127.0.0.1])
	by kartoffel.salatschuessel.net (8.13.8/8.13.8) with ESMTP id l175XfT5068850;
	Wed, 7 Feb 2007 06:33:41 +0100 (CET)
	(envelope-from olivleh1@kartoffel.salatschuessel.net)
Received: (from olivleh1@localhost)
	by kartoffel.salatschuessel.net (8.13.8/8.13.8/Submit) id l175Xedf068849;
	Wed, 7 Feb 2007 06:33:40 +0100 (CET)
	(envelope-from olivleh1)
Message-Id: <200702070533.l175Xedf068849@kartoffel.salatschuessel.net>
Date: Wed, 7 Feb 2007 06:33:40 +0100 (CET)
From: Oliver Lehmann <oliver@freebsd.org>
Reply-To: Oliver Lehmann <oliver@freebsd.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: Oliver Lehmann <oliver@freebsd.org>
Subject: move x11-wm/xfce4/bsd.xfce.mk to Mk/
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         108862
>Category:       ports
>Synopsis:       move x11-wm/xfce4/bsd.xfce.mk to Mk/
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    portmgr
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Feb 07 05:40:17 GMT 2007
>Closed-Date:    Wed Mar 14 04:14:58 GMT 2007
>Last-Modified:  Wed Mar 14 04:20:11 GMT 2007
>Originator:     Oliver Lehmann
>Release:        FreeBSD 6.2-PRERELEASE amd64
>Organization:
>Environment:
System: FreeBSD kartoffel.salatschuessel.net 6.2-PRERELEASE FreeBSD 6.2-PRERELEASE #0: Tue Dec 19 12:46:15 CET 2006 olivleh1@kartoffel.salatschuessel.net:/usr/obj/amd64-athlon64-6.1/usr/src/sys/KARTOFFEL amd64


>Description:
	1. please repocopy x11-wm/xfce4/bsd.xfce.mk to Mk/bsd.xfce.mk
	2. please appkly the attached patch to bsd.ports.mk for automatic
	   inclusion if USE_XFCE is defined

	when this is done, I'll go and remove all "by hand" bsd.xfce.mk
	include directives in the affected ports. I've tested this scenario,
	and they will handle the bsd.xfce.mk including via bsd.port.mk and
	via their Makefile so the removal of the Makefile "by hand" include
	can be done afterwards when x11-wm/xfce/bsd.xfce.mk gets removed
>How-To-Repeat:
>Fix:

--- bsd.port.mk.diff begins here ---
Index: bsd.port.mk
===================================================================
RCS file: /home/pcvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.545
diff -u -r1.545 bsd.port.mk
--- bsd.port.mk	8 Jan 2007 00:00:33 -0000	1.545
+++ bsd.port.mk	7 Feb 2007 05:29:39 -0000
@@ -1533,6 +1533,10 @@
 .include "${PORTSDIR}/Mk/bsd.sdl.mk"
 .endif
 
+.if defined(USE_XFCE)
+.include "${PORTSDIR}/Mk/bsd.xfce.mk"
+.endif
+
 # These do some path checks if DESTDIR is set correctly.
 # You can force skipping these test by defining IGNORE_PATH_CHECKS
 .if !defined(IGNORE_PATH_CHECKS)
@@ -2035,6 +2039,9 @@
 .include "${PORTSDIR}/Mk/bsd.gnome.mk"
 .endif
 
+.if defined(USE_XFCE)
+.include "${PORTSDIR}/Mk/bsd.xfce.mk"
+.endif
 
 .if exists(${PORTSDIR}/../Makefile.inc)
 .include "${PORTSDIR}/../Makefile.inc"
--- bsd.port.mk.diff ends here ---


>Release-Note:
>Audit-Trail:
Class-Changed-From-To: update->maintainer-update 
Class-Changed-By: edwin 
Class-Changed-When: Wed Feb 7 05:40:33 UTC 2007 
Class-Changed-Why:  
Fix category (submitter is maintainer) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=108862 
Responsible-Changed-From-To: freebsd-ports-bugs->oliver 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Wed Feb 7 05:40:55 UTC 2007 
Responsible-Changed-Why:  
Submitter is maintainer and has GNATS access 

http://www.freebsd.org/cgi/query-pr.cgi?pr=108862 
Responsible-Changed-From-To: oliver->pav 
Responsible-Changed-By: oliver 
Responsible-Changed-When: Wed Feb 7 05:42:37 UTC 2007 
Responsible-Changed-Why:  
assign to pav as discussed before 

http://www.freebsd.org/cgi/query-pr.cgi?pr=108862 
Responsible-Changed-From-To: pav->portmgr 
Responsible-Changed-By: pav 
Responsible-Changed-When: Wed Feb 7 09:31:46 UTC 2007 
Responsible-Changed-Why:  
Reassign to portmgr, I want this runned thru pointyhat 

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

From: Oliver Lehmann <oliver@FreeBSD.org>
To: bug-followup@FreeBSD.org, oliver@freebsd.org
Cc:  
Subject: Re: ports/108862: move x11-wm/xfce4/bsd.xfce.mk to Mk/
Date: Wed, 7 Feb 2007 16:31:56 +0100

 ATTENTION!
 
 please use revision 1.6 of x11-wm/xfce4/bsd.xfce.mk

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/108862: commit references a PR
Date: Wed, 14 Mar 2007 04:06:14 +0000 (UTC)

 linimon     2007-03-14 04:06:11 UTC
 
   FreeBSD ports repository
 
   Added files:
     Mk                   bsd.xfce.mk 
   Log:
   Move x11-wm/xfce4/bsd.xfce.mk to Mk/.
   
   PR:             ports/108862
   Submitted by:   oliver
   
   Revision  Changes    Path
   1.1       +61 -0     ports/Mk/bsd.xfce.mk (new)
 _______________________________________________
 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"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/108862: commit references a PR
Date: Wed, 14 Mar 2007 04:06:59 +0000 (UTC)

 linimon     2007-03-14 04:06:55 UTC
 
   FreeBSD ports repository
 
   Modified files:
     Mk                   bsd.port.mk 
   Log:
   * Add bsd.ocaml.mk to support OCaml packages [1]
   
   * Move x11-wm/xfce4/bsd.xfce.mk to Mk/ [2]
   
   * Refactoring of FETCH_CMD to allow parameters to be overridden
     separately from commands [3]
   
   PR:     101029 [1], 108862 [2], 109966 [3]
   
   Submitted by:   Stanislav Sedov <ssedov at mbsd dot msk dot ru> [1],
                   oliver [2], edwin [3], linimon [3]
   
   Note: this patch also adds 108738 and 108739 which the previous commit
   claimed were committed, but were not.  These are comment-only changes.
   
   Revision  Changes    Path
   1.556     +44 -14    ports/Mk/bsd.port.mk
 _______________________________________________
 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"
 
State-Changed-From-To: open->closed 
State-Changed-By: linimon 
State-Changed-When: Wed Mar 14 04:14:48 UTC 2007 
State-Changed-Why:  
Committed, thanks. 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/108862: commit references a PR
Date: Wed, 14 Mar 2007 04:12:38 +0000 (UTC)

 linimon     2007-03-14 04:12:32 UTC
 
   FreeBSD ports repository
 
   Modified files:
     archivers/ocaml-zip  Makefile 
     audio/thunar-media-tags-plugin Makefile 
     audio/xfce4-mixer    Makefile 
     audio/xfce4-mpc-plugin Makefile 
     deskutils/orage      Makefile 
     deskutils/xfce4-notes-plugin Makefile 
     deskutils/xfce4-xkb-plugin Makefile 
     devel/aifad          Makefile 
     devel/ocaml-annexlib Makefile 
     devel/ocaml-camljava Makefile 
     devel/ocaml-camomile Makefile 
     devel/ocaml-cfg      Makefile 
     devel/ocaml-lacaml   Makefile 
     devel/ocaml-pcre     Makefile 
     devel/ocaml-pomap    Makefile 
     devel/ocaml-res      Makefile 
     devel/ocaml-sdl      Makefile 
     devel/ocaml-sexplib  Makefile 
     devel/ocaml-xstr     Makefile 
     devel/ocaml-xstrp4   Makefile 
     devel/omake          Makefile 
     devel/xfce4-dev-tools Makefile 
     editors/mousepad     Makefile 
     graphics/ocaml-lablgl Makefile 
     lang/imp-interpreter Makefile 
     lang/ocaml-camlidl   Makefile 
     mail/xfce4-mailwatch-plugin Makefile 
     misc/xfce4-appfinder Makefile 
     misc/xfce4-weather-plugin Makefile 
     misc/xfce4-wm-themes Makefile 
     multimedia/xfce4-media Makefile 
     multimedia/xfce4-xmms-plugin Makefile 
     net/ocaml-netclient  Makefile 
     net-im/xfce4-messenger-plugin Makefile 
     print/advi           Makefile 
     print/xfce4-print    Makefile 
     security/ocaml-cryptgps Makefile 
     sysutils/thunar-volman-plugin Makefile 
     sysutils/xfce4-battery-plugin Makefile 
     sysutils/xfce4-cpugraph-plugin Makefile 
     sysutils/xfce4-fsguard-plugin Makefile 
     sysutils/xfce4-genmon-plugin Makefile 
     sysutils/xfce4-mcs-manager Makefile 
     sysutils/xfce4-mcs-plugins Makefile 
     sysutils/xfce4-minicmd-plugin Makefile 
     sysutils/xfce4-netload-plugin Makefile 
     sysutils/xfce4-systemload-plugin Makefile 
     sysutils/xfce4-utils Makefile 
     sysutils/xfce4-wavelan-plugin Makefile 
     textproc/xfce4-dict-plugin Makefile 
     www/xfce4-smartbookmark-plugin Makefile 
     x11/Terminal         Makefile 
     x11/libexo           Makefile 
     x11/libxfce4mcs      Makefile 
     x11/libxfce4util     Makefile 
     x11/xfce4-clipman-plugin Makefile 
     x11/xfce4-quicklauncher-plugin Makefile 
     x11/xfce4-screenshooter-plugin Makefile 
     x11/xfce4-taskmanager Makefile 
     x11/xfce4-xfapplet-plugin Makefile 
     x11-clocks/xfce4-datetime-plugin Makefile 
     x11-clocks/xfce4-timer-plugin Makefile 
     x11-fm/thunar        Makefile 
     x11-themes/gtk-xfce-engine Makefile 
     x11-themes/xfce4-icon-theme Makefile 
     x11-toolkits/libxfce4gui Makefile 
     x11-toolkits/ocaml-lablgtk Makefile 
     x11-toolkits/ocaml-lablgtk2 Makefile 
     x11-wm/xfce4-desktop Makefile 
     x11-wm/xfce4-panel   Makefile 
     x11-wm/xfce4-session Makefile 
     x11-wm/xfce4-wm      Makefile 
   Log:
   Switch to using new files Mk/bsd.ocaml.mk [1] and Mk/bsd.xfce.mk [2].
   
   PR:     101029 [1], 108862 [2]
   
   Submitted by:   Stanislav Sedov <ssedov at mbsd dot msk dot ru> [1], oliver [2]
   
   Revision  Changes    Path
   1.3       +0 -1      ports/archivers/ocaml-zip/Makefile
   1.2       +1 -3      ports/audio/thunar-media-tags-plugin/Makefile
   1.38      +1 -3      ports/audio/xfce4-mixer/Makefile
   1.3       +1 -3      ports/audio/xfce4-mpc-plugin/Makefile
   1.5       +0 -1      ports/deskutils/orage/Makefile
   1.19      +1 -3      ports/deskutils/xfce4-notes-plugin/Makefile
   1.14      +1 -3      ports/deskutils/xfce4-xkb-plugin/Makefile
   1.5       +0 -1      ports/devel/aifad/Makefile
   1.2       +0 -1      ports/devel/ocaml-annexlib/Makefile
   1.2       +0 -1      ports/devel/ocaml-camljava/Makefile
   1.15      +0 -1      ports/devel/ocaml-camomile/Makefile
   1.3       +0 -1      ports/devel/ocaml-cfg/Makefile
   1.5       +0 -1      ports/devel/ocaml-lacaml/Makefile
   1.26      +1 -3      ports/devel/ocaml-pcre/Makefile
   1.3       +0 -1      ports/devel/ocaml-pomap/Makefile
   1.3       +0 -1      ports/devel/ocaml-res/Makefile
   1.14      +0 -1      ports/devel/ocaml-sdl/Makefile
   1.2       +0 -1      ports/devel/ocaml-sexplib/Makefile
   1.2       +1 -3      ports/devel/ocaml-xstr/Makefile
   1.2       +0 -1      ports/devel/ocaml-xstrp4/Makefile
   1.3       +0 -1      ports/devel/omake/Makefile
   1.2       +1 -3      ports/devel/xfce4-dev-tools/Makefile
   1.3       +1 -3      ports/editors/mousepad/Makefile
   1.16      +0 -1      ports/graphics/ocaml-lablgl/Makefile
   1.3       +0 -1      ports/lang/imp-interpreter/Makefile
   1.3       +0 -1      ports/lang/ocaml-camlidl/Makefile
   1.3       +1 -3      ports/mail/xfce4-mailwatch-plugin/Makefile
   1.11      +1 -3      ports/misc/xfce4-appfinder/Makefile
   1.17      +1 -3      ports/misc/xfce4-weather-plugin/Makefile
   1.19      +1 -3      ports/misc/xfce4-wm-themes/Makefile
   1.23      +0 -1      ports/multimedia/xfce4-media/Makefile
   1.15      +0 -1      ports/multimedia/xfce4-xmms-plugin/Makefile
   1.3       +1 -3      ports/net-im/xfce4-messenger-plugin/Makefile
   1.3       +0 -1      ports/net/ocaml-netclient/Makefile
   1.2       +1 -3      ports/print/advi/Makefile
   1.44      +0 -1      ports/print/xfce4-print/Makefile
   1.2       +0 -1      ports/security/ocaml-cryptgps/Makefile
   1.2       +1 -3      ports/sysutils/thunar-volman-plugin/Makefile
   1.23      +1 -3      ports/sysutils/xfce4-battery-plugin/Makefile
   1.21      +1 -3      ports/sysutils/xfce4-cpugraph-plugin/Makefile
   1.22      +1 -3      ports/sysutils/xfce4-fsguard-plugin/Makefile
   1.17      +1 -3      ports/sysutils/xfce4-genmon-plugin/Makefile
   1.28      +1 -3      ports/sysutils/xfce4-mcs-manager/Makefile
   1.37      +1 -3      ports/sysutils/xfce4-mcs-plugins/Makefile
   1.11      +1 -3      ports/sysutils/xfce4-minicmd-plugin/Makefile
   1.20      +1 -3      ports/sysutils/xfce4-netload-plugin/Makefile
   1.21      +1 -3      ports/sysutils/xfce4-systemload-plugin/Makefile
   1.35      +0 -1      ports/sysutils/xfce4-utils/Makefile
   1.17      +1 -3      ports/sysutils/xfce4-wavelan-plugin/Makefile
   1.2       +1 -3      ports/textproc/xfce4-dict-plugin/Makefile
   1.2       +1 -3      ports/www/xfce4-smartbookmark-plugin/Makefile
   1.22      +1 -3      ports/x11-clocks/xfce4-datetime-plugin/Makefile
   1.2       +1 -3      ports/x11-clocks/xfce4-timer-plugin/Makefile
   1.9       +0 -2      ports/x11-fm/thunar/Makefile
   1.39      +1 -3      ports/x11-themes/gtk-xfce-engine/Makefile
   1.10      +1 -3      ports/x11-themes/xfce4-icon-theme/Makefile
   1.36      +0 -1      ports/x11-toolkits/libxfce4gui/Makefile
   1.14      +0 -1      ports/x11-toolkits/ocaml-lablgtk/Makefile
   1.14      +0 -1      ports/x11-toolkits/ocaml-lablgtk2/Makefile
   1.40      +5 -2      ports/x11-wm/xfce4-desktop/Makefile
   1.39      +0 -1      ports/x11-wm/xfce4-panel/Makefile
   1.30      +1 -3      ports/x11-wm/xfce4-session/Makefile
   1.38      +0 -1      ports/x11-wm/xfce4-wm/Makefile
   1.11      +0 -1      ports/x11/Terminal/Makefile
   1.20      +0 -1      ports/x11/libexo/Makefile
   1.31      +0 -1      ports/x11/libxfce4mcs/Makefile
   1.31      +1 -3      ports/x11/libxfce4util/Makefile
   1.24      +1 -3      ports/x11/xfce4-clipman-plugin/Makefile
   1.3       +1 -3      ports/x11/xfce4-quicklauncher-plugin/Makefile
   1.4       +1 -3      ports/x11/xfce4-screenshooter-plugin/Makefile
   1.7       +2 -4      ports/x11/xfce4-taskmanager/Makefile
   1.4       +1 -3      ports/x11/xfce4-xfapplet-plugin/Makefile
 _______________________________________________
 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:
