From f64c6af4f4d0803346188ad60d5055ea8b8d63dc Mon Sep 17 00:00:00 2001 From: Michael Nottebrock Date: Tue, 9 Mar 2004 19:41:12 +0000 Subject: Update to KDE 3.2.1 / QT 3.3.1 Important changes: ================== KDE: - Audio/arts does not install artswrapper anymore, instead it is provided by audio/artswrapper. See UPDATING. - misc/kdeaddons3 is now a metaport with editors/kate-plugins editors/vimpart games/atlantikdesigner misc/kaddressbook-plugins misc/kfile-plugins misc/kicker-applets misc/knewsticker-scripts misc/konq-plugins misc/ksig misc/renamedlgplugins multimedia/noatun-plugins net/kontact-plugins as slave ports. - A number of KDE ports now uses OPTIONS do make various WITH_* options more visible. - Plist fixes - devel/kdevelop should be able to detect FreeBSD's autoconf/automake now for newly created projects. - kdebase will no longer remove previous KDM configurations. This won't take effect during the update from 3.2.0 to 3.2.1 (as deinstalling 3.2.0 will still remove the configuration), but subsequent updates will merge old configs. QT: - Previous versions of QT could be compiled with debugging-support enabled by defining DEBUG. This switch has been renamed to the more unambiguous WANT_QT_DEBUG (similar to WANT_KDE_DEBUG in the KDE ports). --- devel/kdesdk3/Makefile | 3 +- devel/kdesdk3/distinfo | 3 +- devel/kdesdk3/files/patch-cervisia-Makefile.in | 14 +++--- devel/kdesdk3/pkg-plist | 53 ++++++---------------- devel/kdesdk4/Makefile | 3 +- devel/kdesdk4/distinfo | 3 +- devel/kdesdk4/files/patch-cervisia-Makefile.in | 14 +++--- devel/kdesdk4/pkg-plist | 53 ++++++---------------- devel/kdevelop/Makefile | 28 ++++++------ devel/kdevelop/distinfo | 3 +- ...parts-appwizard-common-admin-detect-autoconf.sh | 31 +++++++++++++ devel/kdevelop/pkg-plist | 53 +++++++++++----------- 12 files changed, 121 insertions(+), 140 deletions(-) create mode 100644 devel/kdevelop/files/patch-parts-appwizard-common-admin-detect-autoconf.sh (limited to 'devel') diff --git a/devel/kdesdk3/Makefile b/devel/kdesdk3/Makefile index 1444276572b3..b80d46ad87a6 100644 --- a/devel/kdesdk3/Makefile +++ b/devel/kdesdk3/Makefile @@ -7,10 +7,9 @@ PORTNAME= kdesdk PORTVERSION= ${KDE_VERSION} -PORTREVISION= 1 CATEGORIES= devel kde MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src +MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org diff --git a/devel/kdesdk3/distinfo b/devel/kdesdk3/distinfo index f0631e87a0be..047845bff070 100644 --- a/devel/kdesdk3/distinfo +++ b/devel/kdesdk3/distinfo @@ -1 +1,2 @@ -MD5 (KDE/kdesdk-3.2.0.tar.bz2) = 170baf93150c231605bec047d49d0742 +MD5 (KDE/kdesdk-3.2.1.tar.bz2) = f52a69718705b32f0068fb605b604b45 +SIZE (KDE/kdesdk-3.2.1.tar.bz2) = 3970806 diff --git a/devel/kdesdk3/files/patch-cervisia-Makefile.in b/devel/kdesdk3/files/patch-cervisia-Makefile.in index bed8323e0023..0a591c1d00b6 100644 --- a/devel/kdesdk3/files/patch-cervisia-Makefile.in +++ b/devel/kdesdk3/files/patch-cervisia-Makefile.in @@ -1,5 +1,5 @@ ---- cervisia/Makefile.in.orig Sat Feb 7 10:55:48 2004 -+++ cervisia/Makefile.in Sat Feb 7 10:57:08 2004 +--- cervisia/Makefile.in.orig Sun Feb 29 22:52:03 2004 ++++ cervisia/Makefile.in Wed Mar 3 00:16:46 2004 @@ -351,13 +351,10 @@ cervisia_LDFLAGS = $(all_libraries) $(KDE_RPATH) cervisia_LDADD = $(LIB_KPARTS) $(LIB_KUTILS) cvsservice/libcvsservice.la libcervisia.la @@ -14,7 +14,7 @@ xdg_apps_DATA = cervisia.desktop -@@ -1185,14 +1182,6 @@ +@@ -1209,14 +1206,6 @@ srcdoc: $(kde_bindir)/kdoc -a -p -d classdocs -n 'Cervisia' *.h -lqt -lkdecore -lkdeui -lkparts @@ -29,12 +29,12 @@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: -@@ -1398,7 +1387,7 @@ - -rm -f checkoutdlg.moc tagdlg.moc logdlg.moc updatedlg.moc loglist.moc historydlg.moc cvsprogressdlg.moc updateview.moc mergedlg.moc settingsdlg.moc logtree.moc resolvedlg.moc tiplabel.moc annotateview.moc qttableview.moc cervisiapart.moc diffdlg.moc repositorydlg.moc cervisiashell.moc logplainview.moc addrepositorydlg.moc protocolview.moc progressdlg.moc diffview.moc commitdlg.moc +@@ -1422,7 +1411,7 @@ + -rm -f cvsprogressdlg.moc updatedlg.moc cervisiashell.moc updateview.moc protocolview.moc annotateview.moc historydlg.moc tagdlg.moc diffview.moc qttableview.moc commitdlg.moc cervisiapart.moc mergedlg.moc loglist.moc settingsdlg.moc tiplabel.moc logtree.moc logplainview.moc checkoutdlg.moc repositorydlg.moc progressdlg.moc resolvedlg.moc addrepositorydlg.moc logdlg.moc diffdlg.moc #>+ 2 --KDE_DIST=LICENSE.QPL annotatectl.h diffdlg.h changelogdlg.h annotateview.h protocolview.h cervisiashellui.rc updateview_items.h move_repositories.pl tiplabel.h qttableview.h version.h logdlg.h misc.h updatedlg.h loginfo.h cervisiapart.h overview.h watchersdlg.h watchdlg.h cvsprogressdlg.h checkoutdlg.h repositorydlg.h resolvedlg.h cr32-app-cervisia.png globalconfig.h loglist.h cervisiashell.h change_colors.pl progressdlg.h cr16-app-cervisia.png logtree.h cr48-app-cervisia.png cr22-app-cervisia.png entry.h addremovedlg.h cervisiaui.rc settingsdlg.h tagdlg.h mergedlg.h historydlg.h annotatedlg.h updateview_visitors.h cervisia.upd HACKING cervisia.pod diffview.h cvsdir.h repositories.h stringmatcher.h configutils.h commitdlg.h logplainview.h cervisia.1.in updateview.h cervisia.lsm addrepositorydlg.h -+KDE_DIST=LICENSE.QPL annotatectl.h diffdlg.h changelogdlg.h annotateview.h protocolview.h cervisiashellui.rc updateview_items.h move_repositories.pl tiplabel.h qttableview.h version.h logdlg.h misc.h updatedlg.h loginfo.h cervisiapart.h overview.h watchersdlg.h watchdlg.h cvsprogressdlg.h checkoutdlg.h repositorydlg.h resolvedlg.h cr32-app-cervisia.png globalconfig.h loglist.h cervisiashell.h change_colors.pl progressdlg.h cr16-app-cervisia.png logtree.h cr48-app-cervisia.png cr22-app-cervisia.png entry.h addremovedlg.h cervisiaui.rc settingsdlg.h tagdlg.h mergedlg.h historydlg.h annotatedlg.h updateview_visitors.h cervisia.upd HACKING cervisia.pod diffview.h cvsdir.h repositories.h stringmatcher.h configutils.h commitdlg.h logplainview.h updateview.h cervisia.lsm addrepositorydlg.h +-KDE_DIST=stringmatcher.h HACKING logtree.h misc.h cervisia.1.in updateview_items.h cervisiashell.h repositories.h cvsprogressdlg.h addrepositorydlg.h loginfo.h LICENSE.QPL annotatedlg.h settingsdlg.h overview.h annotateview.h resolvedlg.h annotatectl.h cervisiaui.rc cr16-app-cervisia.png diffdlg.h globalconfig.h updateview_visitors.h historydlg.h changelogdlg.h checkoutdlg.h protocolview.h cvsdir.h qttableview.h tiplabel.h cervisiapart.h updatedlg.h addremovedlg.h progressdlg.h cervisiashellui.rc diffview.h logdlg.h tagdlg.h cr22-app-cervisia.png configutils.h mergedlg.h change_colors.pl move_repositories.pl version.h logplainview.h loglist.h cervisia.pod watchdlg.h updateview.h cr48-app-cervisia.png entry.h repositorydlg.h cr32-app-cervisia.png commitdlg.h cervisia.upd watchersdlg.h cervisia.lsm ++KDE_DIST=stringmatcher.h HACKING logtree.h misc.h updateview_items.h cervisiashell.h repositories.h cvsprogressdlg.h addrepositorydlg.h loginfo.h LICENSE.QPL annotatedlg.h settingsdlg.h overview.h annotateview.h resolvedlg.h annotatectl.h cervisiaui.rc cr16-app-cervisia.png diffdlg.h globalconfig.h updateview_visitors.h historydlg.h changelogdlg.h checkoutdlg.h protocolview.h cvsdir.h qttableview.h tiplabel.h cervisiapart.h updatedlg.h addremovedlg.h progressdlg.h cervisiashellui.rc diffview.h logdlg.h tagdlg.h cr22-app-cervisia.png configutils.h mergedlg.h change_colors.pl move_repositories.pl version.h logplainview.h loglist.h cervisia.pod watchdlg.h updateview.h cr48-app-cervisia.png entry.h repositorydlg.h cr32-app-cervisia.png commitdlg.h cervisia.upd watchersdlg.h cervisia.lsm #>+ 5 clean-idl: diff --git a/devel/kdesdk3/pkg-plist b/devel/kdesdk3/pkg-plist index 9a900ea84719..66de7c788916 100644 --- a/devel/kdesdk3/pkg-plist +++ b/devel/kdesdk3/pkg-plist @@ -644,25 +644,39 @@ share/doc/HTML/en/umbrello/pics/use-case-diagram.png share/doc/HTML/en/umbrello/uml_basics.docbook share/doc/HTML/en/umbrello/working_with_umbrello.docbook share/icons/crystalsvg/128x128/apps/kompare.png +share/icons/crystalsvg/128x128/apps/umbrello.png +share/icons/crystalsvg/128x128/mimetypes/umbrellofile.png share/icons/crystalsvg/16x16/apps/catalogmanager.png share/icons/crystalsvg/16x16/apps/cervisia.png share/icons/crystalsvg/16x16/apps/kbabel.png share/icons/crystalsvg/16x16/apps/kbabeldict.png share/icons/crystalsvg/16x16/apps/kbugbuster.png share/icons/crystalsvg/16x16/apps/kompare.png +share/icons/crystalsvg/16x16/apps/umbrello.png +share/icons/crystalsvg/16x16/mimetypes/umbrellofile.png share/icons/crystalsvg/22x22/apps/cervisia.png +share/icons/crystalsvg/22x22/apps/umbrello.png +share/icons/crystalsvg/22x22/mimetypes/umbrellofile.png share/icons/crystalsvg/32x32/apps/catalogmanager.png share/icons/crystalsvg/32x32/apps/cervisia.png share/icons/crystalsvg/32x32/apps/kbabel.png share/icons/crystalsvg/32x32/apps/kbabeldict.png share/icons/crystalsvg/32x32/apps/kbugbuster.png share/icons/crystalsvg/32x32/apps/kompare.png +share/icons/crystalsvg/32x32/apps/umbrello.png +share/icons/crystalsvg/32x32/mimetypes/umbrellofile.png share/icons/crystalsvg/48x48/apps/catalogmanager.png share/icons/crystalsvg/48x48/apps/cervisia.png share/icons/crystalsvg/48x48/apps/kbabel.png share/icons/crystalsvg/48x48/apps/kbabeldict.png share/icons/crystalsvg/48x48/apps/kbugbuster.png share/icons/crystalsvg/48x48/apps/kompare.png +share/icons/crystalsvg/48x48/apps/umbrello.png +share/icons/crystalsvg/48x48/mimetypes/umbrellofile.png +share/icons/crystalsvg/64x64/apps/umbrello.png +share/icons/crystalsvg/64x64/mimetypes/umbrellofile.png +share/icons/crystalsvg/scalable/apps/umbrello.svgz +share/icons/crystalsvg/scalable/mimetypes/umbrellofile.svgz share/icons/hicolor/16x16/apps/kuiviewer.png share/icons/hicolor/16x16/apps/umbrello.png share/icons/hicolor/16x16/mimetypes/umbrellofile.png @@ -728,38 +742,12 @@ share/servicetypes/kbabeldict_module.desktop share/servicetypes/kbabelfilter.desktop share/servicetypes/komparenavigationpart.desktop share/servicetypes/kompareviewpart.desktop -@dirrm share/servicetypes -@dirrm share/services -@dirrm share/mimelnk/application -@dirrm share/mimelnk @dirrm share/icons/locolor/32x32/mimetypes -@dirrm share/icons/locolor/32x32/apps -@dirrm share/icons/locolor/32x32 @dirrm share/icons/locolor/16x16/mimetypes -@dirrm share/icons/locolor/16x16/apps -@dirrm share/icons/locolor/16x16 -@dirrm share/icons/locolor @dirrm share/icons/hicolor/48x48/apps @dirrm share/icons/hicolor/48x48 @dirrm share/icons/hicolor/32x32/mimetypes -@dirrm share/icons/hicolor/32x32/apps -@dirrm share/icons/hicolor/32x32 @dirrm share/icons/hicolor/16x16/mimetypes -@dirrm share/icons/hicolor/16x16/apps -@dirrm share/icons/hicolor/16x16 -@dirrm share/icons/hicolor -@dirrm share/icons/crystalsvg/48x48/apps -@dirrm share/icons/crystalsvg/48x48 -@dirrm share/icons/crystalsvg/32x32/apps -@dirrm share/icons/crystalsvg/32x32 -@dirrm share/icons/crystalsvg/22x22/apps -@dirrm share/icons/crystalsvg/22x22 -@dirrm share/icons/crystalsvg/16x16/apps -@dirrm share/icons/crystalsvg/16x16 -@dirrm share/icons/crystalsvg/128x128/apps -@dirrm share/icons/crystalsvg/128x128 -@dirrm share/icons/crystalsvg -@dirrm share/icons @dirrm share/doc/HTML/en/umbrello/pics @dirrm share/doc/HTML/en/umbrello @dirrm share/doc/HTML/en/kompare @@ -767,15 +755,11 @@ share/servicetypes/kompareviewpart.desktop @dirrm share/doc/HTML/en/kbugbuster @dirrm share/doc/HTML/en/kbabel @dirrm share/doc/HTML/en/cervisia -@dirrm share/doc/HTML/en -@dirrm share/doc/HTML @dirrm share/apps/umbrello/pics @dirrm share/apps/umbrello/headings @dirrm share/apps/umbrello @dirrm share/apps/kuiviewerpart @dirrm share/apps/kuiviewer -@dirrm share/apps/kstyle/themes -@dirrm share/apps/kstyle @dirrm share/apps/komparepart @dirrm share/apps/kompare/icons/locolor/32x32/apps @dirrm share/apps/kompare/icons/locolor/32x32 @@ -793,7 +777,6 @@ share/servicetypes/kompareviewpart.desktop @dirrm share/apps/kompare/icons/crystalsvg @dirrm share/apps/kompare/icons @dirrm share/apps/kompare -@dirrm share/apps/kconf_update @dirrm share/apps/kcachegrind/icons/hicolor/32x32/actions @dirrm share/apps/kcachegrind/icons/hicolor/32x32 @dirrm share/apps/kcachegrind/icons/hicolor/22x22/actions @@ -835,15 +818,7 @@ share/servicetypes/kompareviewpart.desktop @dirrm share/apps/kapptemplate/appframework @dirrm share/apps/kapptemplate/admin @dirrm share/apps/kapptemplate -@dirrm share/apps/kabc/formats -@dirrm share/apps/kabc @dirrm share/apps/cervisiapart @dirrm share/apps/cervisia @dirrm share/apps/catalogmanager -@dirrm share/apps -@dirrm share/applications/kde -@dirrm share/applications -@dirrm lib/kde3/plugins/styles -@dirrm lib/kde3/plugins -@dirrm lib/kde3 @dirrm include/kbabel diff --git a/devel/kdesdk4/Makefile b/devel/kdesdk4/Makefile index 1444276572b3..b80d46ad87a6 100644 --- a/devel/kdesdk4/Makefile +++ b/devel/kdesdk4/Makefile @@ -7,10 +7,9 @@ PORTNAME= kdesdk PORTVERSION= ${KDE_VERSION} -PORTREVISION= 1 CATEGORIES= devel kde MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src +MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org diff --git a/devel/kdesdk4/distinfo b/devel/kdesdk4/distinfo index f0631e87a0be..047845bff070 100644 --- a/devel/kdesdk4/distinfo +++ b/devel/kdesdk4/distinfo @@ -1 +1,2 @@ -MD5 (KDE/kdesdk-3.2.0.tar.bz2) = 170baf93150c231605bec047d49d0742 +MD5 (KDE/kdesdk-3.2.1.tar.bz2) = f52a69718705b32f0068fb605b604b45 +SIZE (KDE/kdesdk-3.2.1.tar.bz2) = 3970806 diff --git a/devel/kdesdk4/files/patch-cervisia-Makefile.in b/devel/kdesdk4/files/patch-cervisia-Makefile.in index bed8323e0023..0a591c1d00b6 100644 --- a/devel/kdesdk4/files/patch-cervisia-Makefile.in +++ b/devel/kdesdk4/files/patch-cervisia-Makefile.in @@ -1,5 +1,5 @@ ---- cervisia/Makefile.in.orig Sat Feb 7 10:55:48 2004 -+++ cervisia/Makefile.in Sat Feb 7 10:57:08 2004 +--- cervisia/Makefile.in.orig Sun Feb 29 22:52:03 2004 ++++ cervisia/Makefile.in Wed Mar 3 00:16:46 2004 @@ -351,13 +351,10 @@ cervisia_LDFLAGS = $(all_libraries) $(KDE_RPATH) cervisia_LDADD = $(LIB_KPARTS) $(LIB_KUTILS) cvsservice/libcvsservice.la libcervisia.la @@ -14,7 +14,7 @@ xdg_apps_DATA = cervisia.desktop -@@ -1185,14 +1182,6 @@ +@@ -1209,14 +1206,6 @@ srcdoc: $(kde_bindir)/kdoc -a -p -d classdocs -n 'Cervisia' *.h -lqt -lkdecore -lkdeui -lkparts @@ -29,12 +29,12 @@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: -@@ -1398,7 +1387,7 @@ - -rm -f checkoutdlg.moc tagdlg.moc logdlg.moc updatedlg.moc loglist.moc historydlg.moc cvsprogressdlg.moc updateview.moc mergedlg.moc settingsdlg.moc logtree.moc resolvedlg.moc tiplabel.moc annotateview.moc qttableview.moc cervisiapart.moc diffdlg.moc repositorydlg.moc cervisiashell.moc logplainview.moc addrepositorydlg.moc protocolview.moc progressdlg.moc diffview.moc commitdlg.moc +@@ -1422,7 +1411,7 @@ + -rm -f cvsprogressdlg.moc updatedlg.moc cervisiashell.moc updateview.moc protocolview.moc annotateview.moc historydlg.moc tagdlg.moc diffview.moc qttableview.moc commitdlg.moc cervisiapart.moc mergedlg.moc loglist.moc settingsdlg.moc tiplabel.moc logtree.moc logplainview.moc checkoutdlg.moc repositorydlg.moc progressdlg.moc resolvedlg.moc addrepositorydlg.moc logdlg.moc diffdlg.moc #>+ 2 --KDE_DIST=LICENSE.QPL annotatectl.h diffdlg.h changelogdlg.h annotateview.h protocolview.h cervisiashellui.rc updateview_items.h move_repositories.pl tiplabel.h qttableview.h version.h logdlg.h misc.h updatedlg.h loginfo.h cervisiapart.h overview.h watchersdlg.h watchdlg.h cvsprogressdlg.h checkoutdlg.h repositorydlg.h resolvedlg.h cr32-app-cervisia.png globalconfig.h loglist.h cervisiashell.h change_colors.pl progressdlg.h cr16-app-cervisia.png logtree.h cr48-app-cervisia.png cr22-app-cervisia.png entry.h addremovedlg.h cervisiaui.rc settingsdlg.h tagdlg.h mergedlg.h historydlg.h annotatedlg.h updateview_visitors.h cervisia.upd HACKING cervisia.pod diffview.h cvsdir.h repositories.h stringmatcher.h configutils.h commitdlg.h logplainview.h cervisia.1.in updateview.h cervisia.lsm addrepositorydlg.h -+KDE_DIST=LICENSE.QPL annotatectl.h diffdlg.h changelogdlg.h annotateview.h protocolview.h cervisiashellui.rc updateview_items.h move_repositories.pl tiplabel.h qttableview.h version.h logdlg.h misc.h updatedlg.h loginfo.h cervisiapart.h overview.h watchersdlg.h watchdlg.h cvsprogressdlg.h checkoutdlg.h repositorydlg.h resolvedlg.h cr32-app-cervisia.png globalconfig.h loglist.h cervisiashell.h change_colors.pl progressdlg.h cr16-app-cervisia.png logtree.h cr48-app-cervisia.png cr22-app-cervisia.png entry.h addremovedlg.h cervisiaui.rc settingsdlg.h tagdlg.h mergedlg.h historydlg.h annotatedlg.h updateview_visitors.h cervisia.upd HACKING cervisia.pod diffview.h cvsdir.h repositories.h stringmatcher.h configutils.h commitdlg.h logplainview.h updateview.h cervisia.lsm addrepositorydlg.h +-KDE_DIST=stringmatcher.h HACKING logtree.h misc.h cervisia.1.in updateview_items.h cervisiashell.h repositories.h cvsprogressdlg.h addrepositorydlg.h loginfo.h LICENSE.QPL annotatedlg.h settingsdlg.h overview.h annotateview.h resolvedlg.h annotatectl.h cervisiaui.rc cr16-app-cervisia.png diffdlg.h globalconfig.h updateview_visitors.h historydlg.h changelogdlg.h checkoutdlg.h protocolview.h cvsdir.h qttableview.h tiplabel.h cervisiapart.h updatedlg.h addremovedlg.h progressdlg.h cervisiashellui.rc diffview.h logdlg.h tagdlg.h cr22-app-cervisia.png configutils.h mergedlg.h change_colors.pl move_repositories.pl version.h logplainview.h loglist.h cervisia.pod watchdlg.h updateview.h cr48-app-cervisia.png entry.h repositorydlg.h cr32-app-cervisia.png commitdlg.h cervisia.upd watchersdlg.h cervisia.lsm ++KDE_DIST=stringmatcher.h HACKING logtree.h misc.h updateview_items.h cervisiashell.h repositories.h cvsprogressdlg.h addrepositorydlg.h loginfo.h LICENSE.QPL annotatedlg.h settingsdlg.h overview.h annotateview.h resolvedlg.h annotatectl.h cervisiaui.rc cr16-app-cervisia.png diffdlg.h globalconfig.h updateview_visitors.h historydlg.h changelogdlg.h checkoutdlg.h protocolview.h cvsdir.h qttableview.h tiplabel.h cervisiapart.h updatedlg.h addremovedlg.h progressdlg.h cervisiashellui.rc diffview.h logdlg.h tagdlg.h cr22-app-cervisia.png configutils.h mergedlg.h change_colors.pl move_repositories.pl version.h logplainview.h loglist.h cervisia.pod watchdlg.h updateview.h cr48-app-cervisia.png entry.h repositorydlg.h cr32-app-cervisia.png commitdlg.h cervisia.upd watchersdlg.h cervisia.lsm #>+ 5 clean-idl: diff --git a/devel/kdesdk4/pkg-plist b/devel/kdesdk4/pkg-plist index 9a900ea84719..66de7c788916 100644 --- a/devel/kdesdk4/pkg-plist +++ b/devel/kdesdk4/pkg-plist @@ -644,25 +644,39 @@ share/doc/HTML/en/umbrello/pics/use-case-diagram.png share/doc/HTML/en/umbrello/uml_basics.docbook share/doc/HTML/en/umbrello/working_with_umbrello.docbook share/icons/crystalsvg/128x128/apps/kompare.png +share/icons/crystalsvg/128x128/apps/umbrello.png +share/icons/crystalsvg/128x128/mimetypes/umbrellofile.png share/icons/crystalsvg/16x16/apps/catalogmanager.png share/icons/crystalsvg/16x16/apps/cervisia.png share/icons/crystalsvg/16x16/apps/kbabel.png share/icons/crystalsvg/16x16/apps/kbabeldict.png share/icons/crystalsvg/16x16/apps/kbugbuster.png share/icons/crystalsvg/16x16/apps/kompare.png +share/icons/crystalsvg/16x16/apps/umbrello.png +share/icons/crystalsvg/16x16/mimetypes/umbrellofile.png share/icons/crystalsvg/22x22/apps/cervisia.png +share/icons/crystalsvg/22x22/apps/umbrello.png +share/icons/crystalsvg/22x22/mimetypes/umbrellofile.png share/icons/crystalsvg/32x32/apps/catalogmanager.png share/icons/crystalsvg/32x32/apps/cervisia.png share/icons/crystalsvg/32x32/apps/kbabel.png share/icons/crystalsvg/32x32/apps/kbabeldict.png share/icons/crystalsvg/32x32/apps/kbugbuster.png share/icons/crystalsvg/32x32/apps/kompare.png +share/icons/crystalsvg/32x32/apps/umbrello.png +share/icons/crystalsvg/32x32/mimetypes/umbrellofile.png share/icons/crystalsvg/48x48/apps/catalogmanager.png share/icons/crystalsvg/48x48/apps/cervisia.png share/icons/crystalsvg/48x48/apps/kbabel.png share/icons/crystalsvg/48x48/apps/kbabeldict.png share/icons/crystalsvg/48x48/apps/kbugbuster.png share/icons/crystalsvg/48x48/apps/kompare.png +share/icons/crystalsvg/48x48/apps/umbrello.png +share/icons/crystalsvg/48x48/mimetypes/umbrellofile.png +share/icons/crystalsvg/64x64/apps/umbrello.png +share/icons/crystalsvg/64x64/mimetypes/umbrellofile.png +share/icons/crystalsvg/scalable/apps/umbrello.svgz +share/icons/crystalsvg/scalable/mimetypes/umbrellofile.svgz share/icons/hicolor/16x16/apps/kuiviewer.png share/icons/hicolor/16x16/apps/umbrello.png share/icons/hicolor/16x16/mimetypes/umbrellofile.png @@ -728,38 +742,12 @@ share/servicetypes/kbabeldict_module.desktop share/servicetypes/kbabelfilter.desktop share/servicetypes/komparenavigationpart.desktop share/servicetypes/kompareviewpart.desktop -@dirrm share/servicetypes -@dirrm share/services -@dirrm share/mimelnk/application -@dirrm share/mimelnk @dirrm share/icons/locolor/32x32/mimetypes -@dirrm share/icons/locolor/32x32/apps -@dirrm share/icons/locolor/32x32 @dirrm share/icons/locolor/16x16/mimetypes -@dirrm share/icons/locolor/16x16/apps -@dirrm share/icons/locolor/16x16 -@dirrm share/icons/locolor @dirrm share/icons/hicolor/48x48/apps @dirrm share/icons/hicolor/48x48 @dirrm share/icons/hicolor/32x32/mimetypes -@dirrm share/icons/hicolor/32x32/apps -@dirrm share/icons/hicolor/32x32 @dirrm share/icons/hicolor/16x16/mimetypes -@dirrm share/icons/hicolor/16x16/apps -@dirrm share/icons/hicolor/16x16 -@dirrm share/icons/hicolor -@dirrm share/icons/crystalsvg/48x48/apps -@dirrm share/icons/crystalsvg/48x48 -@dirrm share/icons/crystalsvg/32x32/apps -@dirrm share/icons/crystalsvg/32x32 -@dirrm share/icons/crystalsvg/22x22/apps -@dirrm share/icons/crystalsvg/22x22 -@dirrm share/icons/crystalsvg/16x16/apps -@dirrm share/icons/crystalsvg/16x16 -@dirrm share/icons/crystalsvg/128x128/apps -@dirrm share/icons/crystalsvg/128x128 -@dirrm share/icons/crystalsvg -@dirrm share/icons @dirrm share/doc/HTML/en/umbrello/pics @dirrm share/doc/HTML/en/umbrello @dirrm share/doc/HTML/en/kompare @@ -767,15 +755,11 @@ share/servicetypes/kompareviewpart.desktop @dirrm share/doc/HTML/en/kbugbuster @dirrm share/doc/HTML/en/kbabel @dirrm share/doc/HTML/en/cervisia -@dirrm share/doc/HTML/en -@dirrm share/doc/HTML @dirrm share/apps/umbrello/pics @dirrm share/apps/umbrello/headings @dirrm share/apps/umbrello @dirrm share/apps/kuiviewerpart @dirrm share/apps/kuiviewer -@dirrm share/apps/kstyle/themes -@dirrm share/apps/kstyle @dirrm share/apps/komparepart @dirrm share/apps/kompare/icons/locolor/32x32/apps @dirrm share/apps/kompare/icons/locolor/32x32 @@ -793,7 +777,6 @@ share/servicetypes/kompareviewpart.desktop @dirrm share/apps/kompare/icons/crystalsvg @dirrm share/apps/kompare/icons @dirrm share/apps/kompare -@dirrm share/apps/kconf_update @dirrm share/apps/kcachegrind/icons/hicolor/32x32/actions @dirrm share/apps/kcachegrind/icons/hicolor/32x32 @dirrm share/apps/kcachegrind/icons/hicolor/22x22/actions @@ -835,15 +818,7 @@ share/servicetypes/kompareviewpart.desktop @dirrm share/apps/kapptemplate/appframework @dirrm share/apps/kapptemplate/admin @dirrm share/apps/kapptemplate -@dirrm share/apps/kabc/formats -@dirrm share/apps/kabc @dirrm share/apps/cervisiapart @dirrm share/apps/cervisia @dirrm share/apps/catalogmanager -@dirrm share/apps -@dirrm share/applications/kde -@dirrm share/applications -@dirrm lib/kde3/plugins/styles -@dirrm lib/kde3/plugins -@dirrm lib/kde3 @dirrm include/kbabel diff --git a/devel/kdevelop/Makefile b/devel/kdevelop/Makefile index 719ce6219fbb..cd9d40c2d41f 100644 --- a/devel/kdevelop/Makefile +++ b/devel/kdevelop/Makefile @@ -6,24 +6,24 @@ # PORTNAME= kdevelop -PORTVERSION= 3.0.0 +PORTVERSION= 3.0.2 CATEGORIES?= devel kde MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= stable/${KDE_VERSION:S/.0//}/src +MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src # DISTNAME= ${KDE_DISTNAME} DIST_SUBDIR= KDE MAINTAINER?= kde@FreeBSD.org COMMENT= Powerful IDE for developing KDE/Qt-based apps -BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext -LIB_DEPENDS= db41:${PORTSDIR}/databases/db41 +BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext +LIB_DEPENDS= db4:${PORTSDIR}/databases/db4 RUN_DEPENDS= extractrc:${PORTSDIR}/devel/kdesdk3 \ - gmake:${PORTSDIR}/devel/gmake + gmake:${PORTSDIR}/devel/gmake \ + autoconf257:${PORTSDIR}/devel/autoconf257 \ + automake17:${PORTSDIR}/devel/automake17 .if defined(WITH_OPTIONAL_DEPENDS) -RUN_DEPENDS+= autoconf:${PORTSDIR}/devel/autoconf \ - automake:${PORTSDIR}/devel/automake \ - kiconedit:${PORTSDIR}/graphics/kdegraphics3 \ +RUN_DEPENDS+= kiconedit:${PORTSDIR}/graphics/kdegraphics3 \ ark:${PORTSDIR}/misc/kdeutils3 \ glimpse:${PORTSDIR}/textproc/glimpse \ a2ps:${PORTSDIR}/print/a2ps-letter @@ -53,11 +53,11 @@ post-patch: pre-configure: ${REINPLACE_CMD} -e 's@extractrc@@g' ${WRKSRC}/Makefile.in - ${REINPLACE_CMD} -e 's@$$CXXFLAGS $$X_CFLAGS -ldb@-I/usr/local/include/db41 $$CXXFLAGS $$X_CFLAGS -L/usr/local/lib -ldb41@' ${WRKSRC}/configure - ${REINPLACE_CMD} -e 's@INCLUDES = $$(all_includes)@INCLUDES = -I/usr/local/include/db41 $$(all_includes)@' ${WRKSRC}/lib/catalog/Makefile.in - ${REINPLACE_CMD} -e 's@libkdevcatalog_la_LIBADD = -ldb@libkdevcatalog_la_LIBADD = -L/usr/local/lib -ldb41@' ${WRKSRC}/lib/catalog/Makefile.in - ${REINPLACE_CMD} -e 's@^all_includes = @all_includes = -I/usr/local/include/db41 @' ${WRKSRC}/languages/cpp/Makefile.in - ${REINPLACE_CMD} -e 's@^all_includes = @all_includes = -I/usr/local/include/db41 @' ${WRKSRC}/languages/java/Makefile.in - ${REINPLACE_CMD} -e 's@^all_includes = @all_includes = -I/usr/local/include/db41 @' ${WRKSRC}/languages/pascal/Makefile.in + ${REINPLACE_CMD} -e 's@$$CXXFLAGS $$X_CFLAGS -ldb@-I/usr/local/include/db4 $$CXXFLAGS $$X_CFLAGS -L/usr/local/lib -ldb4@' ${WRKSRC}/configure + ${REINPLACE_CMD} -e 's@INCLUDES = $$(all_includes)@INCLUDES = -I/usr/local/include/db4 $$(all_includes)@' ${WRKSRC}/lib/catalog/Makefile.in + ${REINPLACE_CMD} -e 's@libkdevcatalog_la_LIBADD = -ldb@libkdevcatalog_la_LIBADD = -L/usr/local/lib -ldb4@' ${WRKSRC}/lib/catalog/Makefile.in + ${REINPLACE_CMD} -e 's@^all_includes = @all_includes = -I/usr/local/include/db4 @' ${WRKSRC}/languages/cpp/Makefile.in + ${REINPLACE_CMD} -e 's@^all_includes = @all_includes = -I/usr/local/include/db4 @' ${WRKSRC}/languages/java/Makefile.in + ${REINPLACE_CMD} -e 's@^all_includes = @all_includes = -I/usr/local/include/db4 @' ${WRKSRC}/languages/pascal/Makefile.in .include diff --git a/devel/kdevelop/distinfo b/devel/kdevelop/distinfo index 0df7b8c9bda8..fb34a84bce1b 100644 --- a/devel/kdevelop/distinfo +++ b/devel/kdevelop/distinfo @@ -1 +1,2 @@ -MD5 (KDE/kdevelop-3.0.0.tar.bz2) = fa823d9fa2444938ecafb97949500c27 +MD5 (KDE/kdevelop-3.0.2.tar.bz2) = 1c7df5b7abfc1981922f8a681ab93bb0 +SIZE (KDE/kdevelop-3.0.2.tar.bz2) = 5531192 diff --git a/devel/kdevelop/files/patch-parts-appwizard-common-admin-detect-autoconf.sh b/devel/kdevelop/files/patch-parts-appwizard-common-admin-detect-autoconf.sh new file mode 100644 index 000000000000..b87cf3d715b5 --- /dev/null +++ b/devel/kdevelop/files/patch-parts-appwizard-common-admin-detect-autoconf.sh @@ -0,0 +1,31 @@ +--- parts/appwizard/common/admin/detect-autoconf.sh.orig Wed Mar 3 22:22:59 2004 ++++ parts/appwizard/common/admin/detect-autoconf.sh Wed Mar 3 21:47:49 2004 +@@ -17,6 +17,8 @@ + AUTOCONF="`$WHICH autoconf-2.5x`" + elif test -x "`$WHICH autoconf-2.57 2>/dev/null`" ; then + AUTOCONF="`$WHICH autoconf-2.57`" ++ elif test -x "`$WHICH autoconf257 2>/dev/null`" ; then ++ AUTOCONF="`$WHICH autoconf257`" + elif test -x "`$WHICH autoconf-2.56 2>/dev/null`" ; then + AUTOCONF="`$WHICH autoconf-2.56`" + elif test -x "`$WHICH autoconf-2.55 2>/dev/null`" ; then +@@ -42,6 +44,9 @@ + elif test -x "`$WHICH autoheader-2.57 2>/dev/null`" ; then + AUTOHEADER="`$WHICH autoheader-2.57`" + AUTOM4TE="`$WHICH autom4te-2.57`" ++ elif test -x "`$WHICH autoheader257 2>/dev/null`" ; then ++ AUTOHEADER="`$WHICH autoheader257`" ++ AUTOM4TE="`$WHICH autom4te257`" + elif test -x "`$WHICH autoheader-2.56 2>/dev/null`" ; then + AUTOHEADER="`$WHICH autoheader-2.56`" + AUTOM4TE="`$WHICH autom4te-2.56`" +@@ -72,6 +77,9 @@ + elif test -x "`$WHICH automake-1.7 2>/dev/null`" ; then + AUTOMAKE="`$WHICH automake-1.7`" + ACLOCAL="`$WHICH aclocal-1.7`" ++ elif test -x "`$WHICH automake17 2>/dev/null`" ; then ++ AUTOMAKE="`$WHICH automake17`" ++ ACLOCAL="`$WHICH aclocal17`" + fi + if test -n "$UNSERMAKE"; then + AUTOMAKE="$UNSERMAKE" diff --git a/devel/kdevelop/pkg-plist b/devel/kdevelop/pkg-plist index db2fb87923b0..787892c00d31 100644 --- a/devel/kdevelop/pkg-plist +++ b/devel/kdevelop/pkg-plist @@ -15,6 +15,7 @@ include/kdevelop/catalog/tag.h include/kdevelop/codemodel.h include/kdevelop/codemodel_treeparser.h include/kdevelop/codemodel_utils.h +include/kdevelop/configwidgetproxy.h include/kdevelop/cppparser/ast.h include/kdevelop/cppparser/driver.h include/kdevelop/cppparser/errors.h @@ -162,6 +163,8 @@ lib/kde3/libkdevghcoptions.la lib/kde3/libkdevghcoptions.so lib/kde3/libkdevgrepview.la lib/kde3/libkdevgrepview.so +lib/kde3/libkdevhaskellproject.la +lib/kde3/libkdevhaskellproject.so lib/kde3/libkdevhaskellsupport.la lib/kde3/libkdevhaskellsupport.so lib/kde3/libkdevhistory.la @@ -516,6 +519,7 @@ share/apps/kdevappwizard/template-kdedcop/mainclass.h share/apps/kdevappwizard/template-kdedcop/script share/apps/kdevappwizard/template-kdedcop/src-Makefile.am share/apps/kdevappwizard/template-kdedcop/subdirs +share/apps/kdevappwizard/template-kdevlang/README.dox share/apps/kdevappwizard/template-kdevlang/app.kdevelop share/apps/kdevappwizard/template-kdevlang/kdevlang-configure.in.in share/apps/kdevappwizard/template-kdevlang/kdevlang.desktop @@ -534,6 +538,7 @@ share/apps/kdevappwizard/template-kdevpart/kdevpart_widget.cpp share/apps/kdevappwizard/template-kdevpart/kdevpart_widget.h share/apps/kdevappwizard/template-kdevpart/script share/apps/kdevappwizard/template-kdevpart/src-Makefile.am +share/apps/kdevappwizard/template-kdevpart2/README.dox share/apps/kdevappwizard/template-kdevpart2/app.kdevelop share/apps/kdevappwizard/template-kdevpart2/kdevpart-configure.in.in share/apps/kdevappwizard/template-kdevpart2/kdevpart.desktop @@ -945,6 +950,7 @@ share/apps/kdevfortransupport/kdevfortransupport.rc share/apps/kdevfullscreen/kdevpart_fullscreen.rc share/apps/kdevgenericproject/kdevgenericproject.rc share/apps/kdevgrepview/kdevgrepview.rc +share/apps/kdevhaskellproject/kdevhaskellproject.rc share/apps/kdevhaskellsupport/kdevhaskellsupport.rc share/apps/kdevhistory/kdevhistory.rc share/apps/kdevjavadebugger/kdevjavadebugger.rc @@ -982,23 +988,37 @@ share/doc/HTML/en/kde_app_devel/common share/doc/HTML/en/kde_app_devel/index.cache.bz2 share/doc/HTML/en/kde_app_devel/index.docbook share/doc/HTML/en/kde_app_devel/kscribblefiles.png +share/doc/HTML/en/kdevelop/SF-general.png +share/doc/HTML/en/kdevelop/SF-indent.png +share/doc/HTML/en/kdevelop/SF-other.png share/doc/HTML/en/kdevelop/automake-file-popup.png share/doc/HTML/en/kdevelop/automake-subproject-popup.png share/doc/HTML/en/kdevelop/automake-target-popup.png share/doc/HTML/en/kdevelop/automakemanager.png share/doc/HTML/en/kdevelop/classview.png share/doc/HTML/en/kdevelop/common +share/doc/HTML/en/kdevelop/configure-editor.png +share/doc/HTML/en/kdevelop/configure-file-selector.png +share/doc/HTML/en/kdevelop/configure-general.png +share/doc/HTML/en/kdevelop/configure-select.png +share/doc/HTML/en/kdevelop/configure-snippets.png share/doc/HTML/en/kdevelop/create-new-project-cvs.png share/doc/HTML/en/kdevelop/createnewproject.png share/doc/HTML/en/kdevelop/doctreeview.png +share/doc/HTML/en/kdevelop/file-selector.png share/doc/HTML/en/kdevelop/filetree.png -share/doc/HTML/en/kdevelop/gideon-ideal-mode.png -share/doc/HTML/en/kdevelop/gideon-mdi-mode.png -share/doc/HTML/en/kdevelop/gideon-tabbed-mode.png -share/doc/HTML/en/kdevelop/gideon-toplevel-mode.png share/doc/HTML/en/kdevelop/importdirectory.png share/doc/HTML/en/kdevelop/index.cache.bz2 share/doc/HTML/en/kdevelop/index.docbook +share/doc/HTML/en/kdevelop/kdevelop-ideal-mode-0.png +share/doc/HTML/en/kdevelop/kdevelop-ideal-mode.png +share/doc/HTML/en/kdevelop/kdevelop-mdi-mode.png +share/doc/HTML/en/kdevelop/kdevelop-tabbed-mode.png +share/doc/HTML/en/kdevelop/kdevelop-toplevel-mode.png +share/doc/HTML/en/kdevelop/loading-progress-bar.png +share/doc/HTML/en/kdevelop/open-project.png +share/doc/HTML/en/kdevelop/open-recent-project.png +share/doc/HTML/en/kdevelop/select-user-interface-0.png share/doc/HTML/en/kdevelop/select-user-interface.png share/doc/HTML/en/kdevelop/wrong-project-location.png share/icons/hicolor/16x16/actions/breakpoint_add.png @@ -1103,6 +1123,7 @@ share/services/kdevgenericproject.desktop share/services/kdevghcoptions.desktop share/services/kdevgppoptions.desktop share/services/kdevgrepview.desktop +share/services/kdevhaskellproject.desktop share/services/kdevhaskellsupport.desktop share/services/kdevhistory.desktop share/services/kdevjavadebugger.desktop @@ -1159,35 +1180,15 @@ share/servicetypes/kdevelopplugin.desktop share/servicetypes/kdevelopproject.desktop share/servicetypes/kdevelopsourceformatter.desktop share/servicetypes/kdevelopversioncontrol.desktop -@dirrm share/servicetypes -@dirrm share/services -@dirrm share/mimelnk/text -@dirrm share/mimelnk/application -@dirrm share/mimelnk @dirrm share/icons/locolor/32x32/actions -@dirrm share/icons/locolor/32x32 @dirrm share/icons/locolor/16x16/actions -@dirrm share/icons/locolor/16x16 -@dirrm share/icons/locolor -@dirrm share/icons/hicolor/48x48/apps @dirrm share/icons/hicolor/48x48/actions -@dirrm share/icons/hicolor/48x48 -@dirrm share/icons/hicolor/32x32/mimetypes -@dirrm share/icons/hicolor/32x32/apps @dirrm share/icons/hicolor/32x32/actions -@dirrm share/icons/hicolor/32x32 @dirrm share/icons/hicolor/22x22/actions @dirrm share/icons/hicolor/22x22 -@dirrm share/icons/hicolor/16x16/apps @dirrm share/icons/hicolor/16x16/actions -@dirrm share/icons/hicolor/16x16 -@dirrm share/icons/hicolor -@dirrm share/icons @dirrm share/doc/HTML/en/kdevelop @dirrm share/doc/HTML/en/kde_app_devel -@dirrm share/doc/HTML/en -@dirrm share/doc/HTML -@dirrm share/config @dirrm share/apps/qeditorpart/highlight @dirrm share/apps/qeditorpart @dirrm share/apps/manager @@ -1215,6 +1216,7 @@ share/servicetypes/kdevelopversioncontrol.desktop @dirrm share/apps/kdevjavadebugger @dirrm share/apps/kdevhistory @dirrm share/apps/kdevhaskellsupport +@dirrm share/apps/kdevhaskellproject @dirrm share/apps/kdevgrepview @dirrm share/apps/kdevgenericproject @dirrm share/apps/kdevfullscreen @@ -1311,10 +1313,7 @@ share/servicetypes/kdevelopversioncontrol.desktop @dirrm share/apps/kdevabbrev @dirrm share/apps/devdoctreeview/indices @dirrm share/apps/devdoctreeview -@dirrm share/apps @dirrm share/applnk/Development -@dirrm share/applnk -@dirrm lib/kde3 @dirrm include/kdevelop/cppparser @dirrm include/kdevelop/catalog @dirrm include/kdevelop -- cgit v1.2.3