From mel@smoochies.rachie.is-a-geek.net  Sat Sep 12 18:01:27 2009
Return-Path: <mel@smoochies.rachie.is-a-geek.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C7D5E1065694
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 12 Sep 2009 18:01:27 +0000 (UTC)
	(envelope-from mel@smoochies.rachie.is-a-geek.net)
Received: from smoochies.rachie.is-a-geek.net (h60097.upc-h.chello.nl [62.194.60.97])
	by mx1.freebsd.org (Postfix) with ESMTP id 880E58FC16
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 12 Sep 2009 18:01:27 +0000 (UTC)
Received: by smoochies.rachie.is-a-geek.net (Postfix, from userid 1003)
	id D6C208445B; Sat, 12 Sep 2009 20:01:25 +0200 (CEST)
Message-Id: <20090912180125.D6C208445B@smoochies.rachie.is-a-geek.net>
Date: Sat, 12 Sep 2009 20:01:25 +0200 (CEST)
From: Mel Flynn <mel@rachie.is-a-geek.net>
Reply-To: Mel Flynn <mel@rachie.is-a-geek.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc: MAINTAINER <kde@FreeBSD.org>
Subject: [patch] deskutils/kdeplasma-addons: Don't force kdeedu dependency
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         138768
>Category:       ports
>Synopsis:       [patch] deskutils/kdeplasma-addons: Don't force kdeedu dependency
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    kde
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Sep 12 18:10:05 UTC 2009
>Closed-Date:    Thu Sep 24 20:47:19 UTC 2009
>Last-Modified:  Thu Sep 24 20:50:02 UTC 2009
>Originator:     Mel Flynn
>Release:        FreeBSD 8.0-BETA4 i386
>Organization:
>Environment:
System: FreeBSD smoochies.rachie.is-a-geek.net 8.0-BETA4 FreeBSD 8.0-BETA4 #14 r196875M: Mon Sep 7 18:00:45 CEST 2009 mel@smoochies.rachie.is-a-geek.net:/usr/obj/usr/src/sys/HPDV9000 i386


        
>Description:
deskutils/kdeplasma-addons forces dependency on the rather large package kdeedu,
yet the CMakeLists.txt supports it as optional.

Patch below doesn't change the default behavior, but allows user to set WITHOUT_KDEEDU
so that Kdeedu isn't pulled in.

>How-To-Repeat:
make -C /usr/ports/deskutils/kdeplasma-addons install

>Fix:

	

--- patch-deskutils__kdeplasma-addons-nomarble begins here ---
Index: deskutils/kdeplasma-addons/Makefile
===================================================================
RCS file: /home/ncvs/ports/deskutils/kdeplasma-addons/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- deskutils/kdeplasma-addons/Makefile	1 Sep 2009 22:19:27 -0000	1.14
+++ deskutils/kdeplasma-addons/Makefile	12 Sep 2009 12:53:23 -0000
@@ -16,8 +16,13 @@
 COMMENT=	Extra plasmoids for KDE4
 
 BUILD_DEPENDS=	eigen>=2.0.b3:${PORTSDIR}/math/eigen2
-LIB_DEPENDS=	marblewidget.5:${PORTSDIR}/misc/kdeedu4 \
-		kipi.6:${PORTSDIR}/graphics/kdegraphics4
+LIB_DEPENDS=	kipi.6:${PORTSDIR}/graphics/kdegraphics4
+.if exists(${KDE4_PREFIX}/lib/marblewidget.so) || !defined(WITHOUT_KDEEDU)
+LIB_DEPENDS+=	marblewidget.5:${PORTSDIR}/misc/kdeedu4
+PLIST_SUB+=	MARBLE=""
+.else
+PLIST_SUB+=	MARBLE="@comment "
+.endif
 
 USE_KDE4=	kdelibs pimlibs workspace kdeprefix kdehier automoc4 sharedmime
 KDE4_BUILDENV=	yes
Index: deskutils/kdeplasma-addons/pkg-plist
===================================================================
RCS file: /home/ncvs/ports/deskutils/kdeplasma-addons/pkg-plist,v
retrieving revision 1.3
diff -u -r1.3 pkg-plist
--- deskutils/kdeplasma-addons/pkg-plist	4 Aug 2009 21:13:38 -0000	1.3
+++ deskutils/kdeplasma-addons/pkg-plist	12 Sep 2009 12:53:46 -0000
@@ -87,7 +87,7 @@
 lib/kde4/plasma_potd_oseiprovider.so
 lib/kde4/plasma_potd_wcpotdprovider.so
 lib/kde4/plasma_wallpaper_mandelbrot.so
-lib/kde4/plasma_wallpaper_marble.so
+%%MARBLE%%lib/kde4/plasma_wallpaper_marble.so
 lib/kde4/plasma_wallpaper_pattern.so
 lib/kde4/plasma_wallpaper_virus.so
 lib/kde4/plasma_wallpaper_weather.so
@@ -358,7 +358,7 @@
 share/kde4/services/plasma-runner-spellchecker.desktop
 share/kde4/services/plasma-runner-spellchecker_config.desktop
 share/kde4/services/plasma-wallpaper-mandelbrot.desktop
-share/kde4/services/plasma-wallpaper-marble.desktop
+%%MARBLE%%share/kde4/services/plasma-wallpaper-marble.desktop
 share/kde4/services/plasma-wallpaper-pattern.desktop
 share/kde4/services/plasma-wallpaper-virus.desktop
 share/kde4/services/plasma-wallpaper-weather.desktop
--- patch-deskutils__kdeplasma-addons-nomarble ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->kde 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sat Sep 12 18:10:15 UTC 2009 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

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

Date: Sun, 13 Sep 2009 00:30:02 +0200
From: Alberto Villa <villa.alberto@gmail.com>
To: kde-freebsd@kde.org,
 Mel Flynn <mel@rachie.is-a-geek.net>
Cc: FreeBSD-gnats-submit@freebsd.org,
 MAINTAINER <kde@freebsd.org>
Subject: Re: [kde-freebsd] [patch] deskutils/kdeplasma-addons: Don't force kdeedu dependency

 On Saturday 12 September 2009 20:01:25 Mel Flynn wrote:
 > deskutils/kdeplasma-addons forces dependency on the rather large package
 >  kdeedu, yet the CMakeLists.txt supports it as optional.
 > 
 > Patch below doesn't change the default behavior, but allows user to set
 >  WITHOUT_KDEEDU so that Kdeedu isn't pulled in.
 
 i suggest providing an OPTION for this...
 -- 
 Alberto Villa <villa.alberto@gmail.com>
 
 "How many people work here?" "Oh, about half."

Date: Sun, 13 Sep 2009 02:50:45 +0200
From: Mel <mel@rachie.is-a-geek.net>
To: Alberto Villa <villa.alberto@gmail.com>
Cc: kde-freebsd@kde.org,
 bug-followup@freebsd.org
Subject: Re: [kde-freebsd] [patch] deskutils/kdeplasma-addons: Don't force kdeedu dependency

 On Sunday 13 September 2009 00:30:02 Alberto Villa wrote:
 > i suggest providing an OPTION for this...
 
 I'll take a look, but I didn't on first glance see that the 
 MacroOptionalDependency allows for a command line switch to disable it. Hence, 
 if kdeedu is installed and one selects the WITHOUT option during make config, 
 the net result will be that the marble addons will be built and installed, 
 without the dependency being recorded by the FreeBSD ports system and a broken 
 package list.
 -- 
 Mel

Date: Sun, 13 Sep 2009 03:09:56 +0200
From: Alberto Villa <villa.alberto@gmail.com>
To: Mel <mel@rachie.is-a-geek.net>
Cc: kde-freebsd@kde.org,
 bug-followup@freebsd.org
Subject: Re: [kde-freebsd] [patch] deskutils/kdeplasma-addons: Don't force kdeedu dependency

 On Sunday 13 September 2009 02:50:45 Mel wrote:
 > I'll take a look, but I didn't on first glance see that the
 > MacroOptionalDependency allows for a command line switch to disable it.
 
 if i remember correctly, you should be allowed to use something like this:
 -DBUILD_$package:BOOL=Off
 have a look at sysutils/kdeadmin4 and at cmake documentation
 -- 
 Alberto Villa <villa.alberto@gmail.com>
 
 The government of the United States is not in any sense founded on the 
 Christian Religion -- George Washington

From: Mel <mel@rachie.is-a-geek.net>
To: bug-followup@freebsd.org
Cc: kde@freebsd.org
Subject: Re: ports/138768: [patch] deskutils/kdeplasma-addons: Don't force kdeedu dependency
Date: Tue, 15 Sep 2009 13:37:53 +0200

 --Boundary-00=_Ry3rKc8lTeielRr
 Content-Type: Text/Plain;
   charset="us-ascii"
 Content-Transfer-Encoding: 7bit
 
 Better patch, using OPTIONS.
 
 Tested with kdeedu4 installed and running configure, shows correct output for 
 both options.
 -- 
 Mel
 
 --Boundary-00=_Ry3rKc8lTeielRr
 Content-Type: text/x-patch;
   charset="UTF-8";
   name="plasma.diff"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
 	filename="plasma.diff"
 
 Index: deskutils/kdeplasma-addons/files/patch-CMakeLists.txt
 ===================================================================
 --- deskutils/kdeplasma-addons/files/patch-CMakeLists.txt	(revision 5360)
 +++ deskutils/kdeplasma-addons/files/patch-CMakeLists.txt	(working copy)
 @@ -1,7 +1,25 @@
 ---- ./CMakeLists.txt.orig	2009-04-06 07:00:39.000000000 +1100
 -+++ ./CMakeLists.txt	2009-06-26 11:00:58.000000000 +1100
 -@@ -26,16 +26,20 @@
 - endif (DEPEND_PACKAGE_Marble)
 +--- CMakeLists.txt.orig	2009-04-05 12:00:39.000000000 -0800
 ++++ CMakeLists.txt	2009-09-15 03:07:18.000000000 -0800
 +@@ -18,24 +18,33 @@
 + macro_log_feature(NEPOMUK_FOUND "Nepomuk" "Handles all kinds of metadata on the KDE desktop to provide a semantic desktop" "http://nepomuk.kde.org/" FALSE "" "STRONGLY_RECOMMENDED: Nepomuk is used to provide metadata on objects like files, emails etc. to provide a semantic desktop.")
 + macro_bool_to_01(NEPOMUK_FOUND HAVE_NEPOMUK)
 + 
 +-macro_optional_depend_package(Marble "Marble")
 +-if (DEPEND_PACKAGE_Marble)
 +-  macro_optional_find_package(Marble)
 +-else (DEPEND_PACKAGE_Marble)
 ++if (DONT_DEPEND_PACKAGE_Marble)
 +   set (MARBLE_FOUND FALSE)
 +-endif (DEPEND_PACKAGE_Marble)
 ++  set (DEPEND_PACKAGE_Marble FALSE)
 ++else (DONT_DEPEND_PACKAGE_Marble)
 ++  macro_optional_depend_package(Marble "Marble")
 ++  if (DEPEND_PACKAGE_Marble)
 ++    macro_optional_find_package(Marble)
 ++  else (DEPEND_PACKAGE_Marble)
 ++    set (MARBLE_FOUND FALSE)
 ++  endif (DEPEND_PACKAGE_Marble)
 ++endif(DONT_DEPEND_PACKAGE_Marble)
   macro_log_feature(MARBLE_FOUND "Marble" "Desktop Globe" "http://marble.kde.org" FALSE "" "RECOMMENDED: Marble is used to provide a desktop globe wallpaper for Plasma.")
   
  -if (NEPOMUK_FOUND)
 Index: deskutils/kdeplasma-addons/pkg-plist
 ===================================================================
 --- deskutils/kdeplasma-addons/pkg-plist	(revision 5360)
 +++ deskutils/kdeplasma-addons/pkg-plist	(working copy)
 @@ -87,7 +87,7 @@
  lib/kde4/plasma_potd_oseiprovider.so
  lib/kde4/plasma_potd_wcpotdprovider.so
  lib/kde4/plasma_wallpaper_mandelbrot.so
 -lib/kde4/plasma_wallpaper_marble.so
 +%%MARBLE%%lib/kde4/plasma_wallpaper_marble.so
  lib/kde4/plasma_wallpaper_pattern.so
  lib/kde4/plasma_wallpaper_virus.so
  lib/kde4/plasma_wallpaper_weather.so
 @@ -358,7 +358,7 @@
  share/kde4/services/plasma-runner-spellchecker.desktop
  share/kde4/services/plasma-runner-spellchecker_config.desktop
  share/kde4/services/plasma-wallpaper-mandelbrot.desktop
 -share/kde4/services/plasma-wallpaper-marble.desktop
 +%%MARBLE%%share/kde4/services/plasma-wallpaper-marble.desktop
  share/kde4/services/plasma-wallpaper-pattern.desktop
  share/kde4/services/plasma-wallpaper-virus.desktop
  share/kde4/services/plasma-wallpaper-weather.desktop
 Index: deskutils/kdeplasma-addons/Makefile
 ===================================================================
 --- deskutils/kdeplasma-addons/Makefile	(revision 5360)
 +++ deskutils/kdeplasma-addons/Makefile	(working copy)
 @@ -16,9 +16,9 @@
  COMMENT=	Extra plasmoids for KDE4
  
  BUILD_DEPENDS=	eigen>=2.0.b3:${PORTSDIR}/math/eigen2
 -LIB_DEPENDS=	marblewidget.5:${PORTSDIR}/misc/kdeedu4 \
 -		kipi.6:${PORTSDIR}/graphics/kdegraphics4
 +LIB_DEPENDS=	kipi.6:${PORTSDIR}/graphics/kdegraphics4
  
 +
  USE_KDE4=	kdelibs pimlibs workspace kdeprefix kdehier automoc4 sharedmime
  KDE4_BUILDENV=	yes
  USE_BZIP2=	yes
 @@ -27,8 +27,24 @@
  		designer network svg qtestlib xml \
  		qmake_build moc_build rcc_build uic_build
  
 +.if exists(${KDE4_PREFIX}/lib/libmarblewidget.so.5)
 +OPTIONS=	MARBLE	"Build desktop marble (requires Kdeedu)"	on
 +.else
 +OPTIONS=	MARBLE	"Build desktop marble (requires Kdeedu)"	off
 +.endif
 +
  MAKE_JOBS_SAFE=	yes
  
 +.include <bsd.port.pre.mk>
 +.if !defined(WITHOUT_MARBLE)
 +LIB_DEPENDS=	marblewidget.5:${PORTSDIR}/misc/kdeedu4
 +PLIST_SUB+=	MARBLE=""
 +CMAKE_ARGS+=	-DDONT_DEPEND_PACKAGE_Marble:BOOL=off
 +.else
 +CMAKE_ARGS+=	-DDONT_DEPEND_PACKAGE_Marble:BOOL=on
 +PLIST_SUB+=	MARBLE="@comment "
 +.endif
 +
  post-patch:
  	${GREP} -H -r "#include <q" ${WRKSRC} | ${CUT} -d: -f1 | uniq | \
  		${XARGS} ${REINPLACE_CMD} -f ${FILESDIR}/qt3to4headers.txt
 @@ -42,4 +58,4 @@
  post-install:
  	@-update-mime-database ${PREFIX}/share/mime
  
 -.include <bsd.port.mk>
 +.include <bsd.port.post.mk>
 
 --Boundary-00=_Ry3rKc8lTeielRr--
State-Changed-From-To: open->patched 
State-Changed-By: makc 
State-Changed-When: Tue Sep 22 20:52:08 UTC 2009 
State-Changed-Why:  
Patched in area51, will be commited later 

http://www.freebsd.org/cgi/query-pr.cgi?pr=138768 
State-Changed-From-To: patched->closed 
State-Changed-By: makc 
State-Changed-When: Thu Sep 24 20:47:18 UTC 2009 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/138768: commit references a PR
Date: Thu, 24 Sep 2009 20:40:43 +0000 (UTC)

 makc        2009-09-24 20:40:34 UTC
 
   FreeBSD ports repository
 
   Modified files:
     deskutils/kdeplasma-addons Makefile pkg-plist 
   Removed files:
     deskutils/kdeplasma-addons/files 
                                      patch-applets__frame__CMakeLists.txt 
   Log:
   Make Marble wallpaper plugin optional.
   Remove needless patch.
   
   PR:             based on ports/138768
   Submitted by:   Mel Flynn <mel at rachie.is-a-geek.net>
   Feature safe:   yes
   
   Revision  Changes    Path
   1.15      +18 -4     ports/deskutils/kdeplasma-addons/Makefile
   1.3       +0 -24     ports/deskutils/kdeplasma-addons/files/patch-applets__frame__CMakeLists.txt (dead)
   1.4       +2 -2      ports/deskutils/kdeplasma-addons/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:
