Date: Wed, 20 Aug 2008 15:22:49 +1100 From: "Dima Panov" <fluffy@fluffy.khv.ru> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Subject: ports/126669: deskutils/kdepim3: make kitchensync optional, resolve conflict with kdepim4 Message-ID: <1219206169.2576@Fluffy.Khv.RU> Resent-Message-ID: <200808200450.m7K4o1BZ055183@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 126669 >Category: ports >Synopsis: deskutils/kdepim3: make kitchensync optional, resolve conflict with kdepim4 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Wed Aug 20 04:50:01 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Dima Panov >Release: FreeBSD 8.0-800043-CURRENT i386 >Organization: >Environment: System: FreeBSD 8.0-800043-CURRENT #0: Sat Aug 16 19:27:03 VLAST 2008 root@Fluffy.Khv.RU:/usr/obj/usr/src/sys/Spot >Description: deskutils/kdepim3: make kitchensync optional, resolve conflict with kdepim4 By default, kdepim3 unconditionally require old libopensync, which lead to conflict with kdepim4 (based on new libopensync, if enabled). >How-To-Repeat: install kdepim4 with kithensync enabled, then try to install kdepim3 >Fix: --- deskutils::kdepim3.diff begins here --- Index: deskutils/kdepim3/Makefile =================================================================== RCS file: /home/ncvs/ports/deskutils/kdepim3/Makefile,v retrieving revision 1.80 diff -u -r1.80 Makefile --- deskutils/kdepim3/Makefile 18 Aug 2008 09:21:35 -0000 1.80 +++ deskutils/kdepim3/Makefile 19 Aug 2008 23:01:01 -0000 @@ -17,7 +17,6 @@ COMMENT= Personal Information Management tools for KDE LIB_DEPENDS= gpgme:${PORTSDIR}/security/gpgme \ - opensync.0:${PORTSDIR}/devel/libopensync022 \ pisock:${PORTSDIR}/palm/pilot-link \ sasl2:${PORTSDIR}/security/cyrus-sasl2 @@ -39,11 +38,20 @@ --with-gpgsm=${LOCALBASE}/bin/gpgsm \ --with-ssl-dir=${OPENSSLBASE} -OPTIONS= GNOKII "KAdressbook import/export for Nokia phones" off +OPTIONS= GNOKII "KAdressbook import/export for Nokia phones" off \ + KITCHENSYNC "PIM synchronization utility" off .include "${.CURDIR}/../../x11/kde3/Makefile.kde" .include <bsd.port.pre.mk> +.if defined(WITH_KITCHENSYNC) +LIB_DEPENDS+= opensync.0:${PORTSDIR}/devel/libopensync022 +PLIST_SUB+= KITCHENSYNC="" +.else +PLIST_SUB+= KITCHENSYNC="@comment " +DO_NOT_COMPILE+=kitchensync +.endif + .if exists(${LOCALBASE}/bin/gnokii) . if !defined(WITH_GNOKII) GNOKII_OVERRIDE=yes Index: deskutils/kdepim3/pkg-plist =================================================================== RCS file: /home/ncvs/ports/deskutils/kdepim3/pkg-plist,v retrieving revision 1.33 diff -u -r1.33 pkg-plist --- deskutils/kdepim3/pkg-plist 18 Aug 2008 09:21:35 -0000 1.33 +++ deskutils/kdepim3/pkg-plist 19 Aug 2008 23:25:23 -0000 @@ -12,7 +12,7 @@ bin/kandy bin/kandy_client bin/karm -bin/kitchensync +%%KITCHENSYNC%%bin/kitchensync bin/kleopatra bin/kmail bin/kmail_antivir.sh @@ -485,9 +485,9 @@ lib/kde3/libkarmpart.a lib/kde3/libkarmpart.la lib/kde3/libkarmpart.so -lib/kde3/libkitchensyncpart.a -lib/kde3/libkitchensyncpart.la -lib/kde3/libkitchensyncpart.so +%%KITCHENSYNC%%lib/kde3/libkitchensyncpart.a +%%KITCHENSYNC%%lib/kde3/libkitchensyncpart.la +%%KITCHENSYNC%%lib/kde3/libkitchensyncpart.so lib/kde3/libkmail_bodypartformatter_application_octetstream.a lib/kde3/libkmail_bodypartformatter_application_octetstream.la lib/kde3/libkmail_bodypartformatter_application_octetstream.so @@ -695,10 +695,10 @@ lib/libkholidays.la lib/libkholidays.so lib/libkholidays.so.1 -lib/libkitchensync.a -lib/libkitchensync.la -lib/libkitchensync.so -lib/libkitchensync.so.0 +%%KITCHENSYNC%%lib/libkitchensync.a +%%KITCHENSYNC%%lib/libkitchensync.la +%%KITCHENSYNC%%lib/libkitchensync.so +%%KITCHENSYNC%%lib/libkitchensync.so.0 lib/libkleopatra.a lib/libkleopatra.la lib/libkleopatra.so @@ -794,10 +794,10 @@ lib/libqgpgme.la lib/libqgpgme.so lib/libqgpgme.so.0 -lib/libqopensync.a -lib/libqopensync.la -lib/libqopensync.so -lib/libqopensync.so.0 +%%KITCHENSYNC%%lib/libqopensync.a +%%KITCHENSYNC%%lib/libqopensync.la +%%KITCHENSYNC%%lib/libqopensync.so +%%KITCHENSYNC%%lib/libqopensync.so.0 share/applications/kde/KMail.desktop share/applications/kde/KNode.desktop share/applications/kde/KOrn.desktop @@ -808,7 +808,7 @@ share/applications/kde/kalarm.desktop share/applications/kde/kandy.desktop share/applications/kde/karm.desktop -share/applications/kde/kitchensync.desktop +%%KITCHENSYNC%%share/applications/kde/kitchensync.desktop share/applications/kde/kleopatra_import.desktop share/applications/kde/kmail_view.desktop share/applications/kde/knotes.desktop @@ -975,20 +975,20 @@ share/apps/kgantt/icons/crystalsvg/32x32/actions/ganttSelect.png share/apps/kgantt/icons/crystalsvg/32x32/actions/ganttSelecttask.png share/apps/kgantt/icons/crystalsvg/32x32/actions/ganttUnselecttask.png -share/apps/kitchensync/about/kitchensync.css -share/apps/kitchensync/about/main.html -share/apps/kitchensync/about/top-right-kitchensync.png -share/apps/kitchensync/icons/crystalsvg/128x128/apps/mobile_phone.png -share/apps/kitchensync/icons/crystalsvg/16x16/actions/hotsync.png -share/apps/kitchensync/icons/crystalsvg/16x16/apps/mobile_phone.png -share/apps/kitchensync/icons/crystalsvg/22x22/actions/hotsync.png -share/apps/kitchensync/icons/crystalsvg/32x32/actions/hotsync.png -share/apps/kitchensync/icons/crystalsvg/32x32/apps/mobile_phone.png -share/apps/kitchensync/icons/crystalsvg/48x48/actions/hotsync.png -share/apps/kitchensync/icons/crystalsvg/48x48/apps/mobile_phone.png -share/apps/kitchensync/icons/crystalsvg/64x64/apps/mobile_phone.png -share/apps/kitchensync/kitchensync_part.rc -share/apps/kitchensync/kitchensyncui.rc +%%KITCHENSYNC%%share/apps/kitchensync/about/kitchensync.css +%%KITCHENSYNC%%share/apps/kitchensync/about/main.html +%%KITCHENSYNC%%share/apps/kitchensync/about/top-right-kitchensync.png +%%KITCHENSYNC%%share/apps/kitchensync/icons/crystalsvg/128x128/apps/mobile_phone.png +%%KITCHENSYNC%%share/apps/kitchensync/icons/crystalsvg/16x16/actions/hotsync.png +%%KITCHENSYNC%%share/apps/kitchensync/icons/crystalsvg/16x16/apps/mobile_phone.png +%%KITCHENSYNC%%share/apps/kitchensync/icons/crystalsvg/22x22/actions/hotsync.png +%%KITCHENSYNC%%share/apps/kitchensync/icons/crystalsvg/32x32/actions/hotsync.png +%%KITCHENSYNC%%share/apps/kitchensync/icons/crystalsvg/32x32/apps/mobile_phone.png +%%KITCHENSYNC%%share/apps/kitchensync/icons/crystalsvg/48x48/actions/hotsync.png +%%KITCHENSYNC%%share/apps/kitchensync/icons/crystalsvg/48x48/apps/mobile_phone.png +%%KITCHENSYNC%%share/apps/kitchensync/icons/crystalsvg/64x64/apps/mobile_phone.png +%%KITCHENSYNC%%share/apps/kitchensync/kitchensync_part.rc +%%KITCHENSYNC%%share/apps/kitchensync/kitchensyncui.rc share/apps/kleopatra/kleopatraui.rc share/apps/kmail/about/kmail.css share/apps/kmail/about/main.html @@ -2089,7 +2089,7 @@ share/icons/hicolor/16x16/apps/kaddressbook.png share/icons/hicolor/16x16/apps/kalarm.png share/icons/hicolor/16x16/apps/karm.png -share/icons/hicolor/16x16/apps/kitchensync.png +%%KITCHENSYNC%%share/icons/hicolor/16x16/apps/kitchensync.png share/icons/hicolor/16x16/apps/kmail.png share/icons/hicolor/16x16/apps/knode.png share/icons/hicolor/16x16/apps/knode2.png @@ -2100,7 +2100,7 @@ share/icons/hicolor/16x16/apps/kpilot.png share/icons/hicolor/22x22/apps/akregator.png share/icons/hicolor/22x22/apps/karm.png -share/icons/hicolor/22x22/apps/kitchensync.png +%%KITCHENSYNC%%share/icons/hicolor/22x22/apps/kitchensync.png share/icons/hicolor/22x22/apps/kmail.png share/icons/hicolor/22x22/apps/knotes.png share/icons/hicolor/22x22/apps/kontact.png @@ -2109,7 +2109,7 @@ share/icons/hicolor/32x32/apps/kaddressbook.png share/icons/hicolor/32x32/apps/kalarm.png share/icons/hicolor/32x32/apps/karm.png -share/icons/hicolor/32x32/apps/kitchensync.png +%%KITCHENSYNC%%share/icons/hicolor/32x32/apps/kitchensync.png share/icons/hicolor/32x32/apps/kmail.png share/icons/hicolor/32x32/apps/knode.png share/icons/hicolor/32x32/apps/knode2.png @@ -2122,7 +2122,7 @@ share/icons/hicolor/48x48/apps/kaddressbook.png share/icons/hicolor/48x48/apps/kalarm.png share/icons/hicolor/48x48/apps/karm.png -share/icons/hicolor/48x48/apps/kitchensync.png +%%KITCHENSYNC%%share/icons/hicolor/48x48/apps/kitchensync.png share/icons/hicolor/48x48/apps/kmail.png share/icons/hicolor/48x48/apps/knode.png share/icons/hicolor/48x48/apps/knode2.png @@ -2537,25 +2537,25 @@ @dirrm share/apps/kmail/about @dirrm share/apps/kmail @dirrm share/apps/kleopatra -@dirrm share/apps/kitchensync/icons/crystalsvg/64x64/apps -@dirrm share/apps/kitchensync/icons/crystalsvg/64x64 -@dirrm share/apps/kitchensync/icons/crystalsvg/48x48/apps -@dirrm share/apps/kitchensync/icons/crystalsvg/48x48/actions -@dirrm share/apps/kitchensync/icons/crystalsvg/48x48 -@dirrm share/apps/kitchensync/icons/crystalsvg/32x32/apps -@dirrm share/apps/kitchensync/icons/crystalsvg/32x32/actions -@dirrm share/apps/kitchensync/icons/crystalsvg/32x32 -@dirrm share/apps/kitchensync/icons/crystalsvg/22x22/actions -@dirrm share/apps/kitchensync/icons/crystalsvg/22x22 -@dirrm share/apps/kitchensync/icons/crystalsvg/16x16/apps -@dirrm share/apps/kitchensync/icons/crystalsvg/16x16/actions -@dirrm share/apps/kitchensync/icons/crystalsvg/16x16 -@dirrm share/apps/kitchensync/icons/crystalsvg/128x128/apps -@dirrm share/apps/kitchensync/icons/crystalsvg/128x128 -@dirrm share/apps/kitchensync/icons/crystalsvg -@dirrm share/apps/kitchensync/icons -@dirrm share/apps/kitchensync/about -@dirrm share/apps/kitchensync +%%KITCHENSYNC%%@dirrm share/apps/kitchensync/icons/crystalsvg/64x64/apps +%%KITCHENSYNC%%@dirrm share/apps/kitchensync/icons/crystalsvg/64x64 +%%KITCHENSYNC%%@dirrm share/apps/kitchensync/icons/crystalsvg/48x48/apps +%%KITCHENSYNC%%@dirrm share/apps/kitchensync/icons/crystalsvg/48x48/actions +%%KITCHENSYNC%%@dirrm share/apps/kitchensync/icons/crystalsvg/48x48 +%%KITCHENSYNC%%@dirrm share/apps/kitchensync/icons/crystalsvg/32x32/apps +%%KITCHENSYNC%%@dirrm share/apps/kitchensync/icons/crystalsvg/32x32/actions +%%KITCHENSYNC%%@dirrm share/apps/kitchensync/icons/crystalsvg/32x32 +%%KITCHENSYNC%%@dirrm share/apps/kitchensync/icons/crystalsvg/22x22/actions +%%KITCHENSYNC%%@dirrm share/apps/kitchensync/icons/crystalsvg/22x22 +%%KITCHENSYNC%%@dirrm share/apps/kitchensync/icons/crystalsvg/16x16/apps +%%KITCHENSYNC%%@dirrm share/apps/kitchensync/icons/crystalsvg/16x16/actions +%%KITCHENSYNC%%@dirrm share/apps/kitchensync/icons/crystalsvg/16x16 +%%KITCHENSYNC%%@dirrm share/apps/kitchensync/icons/crystalsvg/128x128/apps +%%KITCHENSYNC%%@dirrm share/apps/kitchensync/icons/crystalsvg/128x128 +%%KITCHENSYNC%%@dirrm share/apps/kitchensync/icons/crystalsvg +%%KITCHENSYNC%%@dirrm share/apps/kitchensync/icons +%%KITCHENSYNC%%@dirrm share/apps/kitchensync/about +%%KITCHENSYNC%%@dirrm share/apps/kitchensync @dirrm share/apps/kgantt/icons/crystalsvg/32x32/actions @dirrm share/apps/kgantt/icons/crystalsvg/32x32 @dirrm share/apps/kgantt/icons/crystalsvg/22x22/actions --- deskutils::kdepim3.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1219206169.2576>