summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
Diffstat (limited to 'devel')
-rw-r--r--devel/kdesdk3/distinfo4
-rw-r--r--devel/kdesdk3/files/patch-cervisia-Makefile.in24
-rw-r--r--devel/kdesdk3/files/patch-scripts-Makefile.in26
-rw-r--r--devel/kdesdk3/pkg-plist18
-rw-r--r--devel/kdesdk4/distinfo4
-rw-r--r--devel/kdesdk4/files/patch-cervisia-Makefile.in24
-rw-r--r--devel/kdesdk4/files/patch-scripts-Makefile.in26
-rw-r--r--devel/kdesdk4/pkg-plist18
-rw-r--r--devel/kdevelop/Makefile2
-rw-r--r--devel/kdevelop/distinfo4
-rw-r--r--devel/kdevelop/pkg-plist36
11 files changed, 105 insertions, 81 deletions
diff --git a/devel/kdesdk3/distinfo b/devel/kdesdk3/distinfo
index 047845bff070..d5620a175213 100644
--- a/devel/kdesdk3/distinfo
+++ b/devel/kdesdk3/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kdesdk-3.2.1.tar.bz2) = f52a69718705b32f0068fb605b604b45
-SIZE (KDE/kdesdk-3.2.1.tar.bz2) = 3970806
+MD5 (KDE/kdesdk-3.2.2.tar.bz2) = dd3c690444fef79de620c26abfaafd37
+SIZE (KDE/kdesdk-3.2.2.tar.bz2) = 3931291
diff --git a/devel/kdesdk3/files/patch-cervisia-Makefile.in b/devel/kdesdk3/files/patch-cervisia-Makefile.in
index 0a591c1d00b6..866b9f165608 100644
--- a/devel/kdesdk3/files/patch-cervisia-Makefile.in
+++ b/devel/kdesdk3/files/patch-cervisia-Makefile.in
@@ -1,20 +1,18 @@
---- 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/Makefile.in.orig Wed Apr 7 09:09:30 2004
++++ cervisia/Makefile.in Wed Apr 7 09:09:58 2004
+@@ -571,11 +571,9 @@
+ cervisia_SOURCES = main.cpp cervisiashell.cpp
cervisia_LDFLAGS = $(all_libraries) $(KDE_RPATH)
cervisia_LDADD = $(LIB_KPARTS) $(LIB_KUTILS) cvsservice/libcvsservice.la libcervisia.la
-
-man_MANS = cervisia.1
--
#>- METASOURCES = AUTO
KDE_ICON = AUTO
-
EXTRA_DIST = cervisia.desktop cervisia.png cervisia-small.png
-CLEANFILES = cervisia.1
-
xdg_apps_DATA = cervisia.desktop
-
-@@ -1209,14 +1206,6 @@
+ partrcdir = $(kde_datadir)/cervisiapart
+ partrc_DATA = cervisiaui.rc
+@@ -1220,14 +1218,6 @@
srcdoc:
$(kde_bindir)/kdoc -a -p -d classdocs -n 'Cervisia' *.h -lqt -lkdecore -lkdeui -lkparts
@@ -29,12 +27,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:
-@@ -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
+@@ -1433,7 +1423,7 @@
+ -rm -f loglist.moc tagdlg.moc checkoutdlg.moc cervisiashell.moc repositorydlg.moc diffdlg.moc logplainview.moc resolvedlg.moc tiplabel.moc mergedlg.moc annotateview.moc diffview.moc updatedlg.moc logdlg.moc progressdlg.moc historydlg.moc logtree.moc updateview.moc qttableview.moc cvsprogressdlg.moc settingsdlg.moc commitdlg.moc addrepositorydlg.moc protocolview.moc cervisiapart.moc
#>+ 2
--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
+-KDE_DIST=repositories.h cr22-app-cervisia.png configutils.h cervisia.lsm cervisia.upd tiplabel.h loginfo.h annotatectl.h cervisiaui.rc repositorydlg.h cvsprogressdlg.h watchersdlg.h HACKING cr16-app-cervisia.png logdlg.h updateview_visitors.h watchdlg.h misc.h cervisia.1.in updateview_items.h annotateview.h updatedlg.h logplainview.h stringmatcher.h globalconfig.h cervisiashellui.rc checkoutdlg.h resolvedlg.h logtree.h move_repositories.pl protocolview.h changelogdlg.h LICENSE.QPL annotatedlg.h cr48-app-cervisia.png updateview.h qttableview.h diffview.h diffdlg.h loglist.h addrepositorydlg.h addremovedlg.h cervisiapart.h settingsdlg.h cr32-app-cervisia.png tagdlg.h cervisia.pod Makefile.in commitdlg.h version.h overview.h cvsdir.h mergedlg.h historydlg.h entry.h Makefile.am progressdlg.h cervisiashell.h change_colors.pl
++KDE_DIST=repositories.h cr22-app-cervisia.png configutils.h cervisia.lsm cervisia.upd tiplabel.h loginfo.h annotatectl.h cervisiaui.rc repositorydlg.h cvsprogressdlg.h watchersdlg.h HACKING cr16-app-cervisia.png logdlg.h updateview_visitors.h watchdlg.h misc.h updateview_items.h annotateview.h updatedlg.h logplainview.h stringmatcher.h globalconfig.h cervisiashellui.rc checkoutdlg.h resolvedlg.h logtree.h move_repositories.pl protocolview.h changelogdlg.h LICENSE.QPL annotatedlg.h cr48-app-cervisia.png updateview.h qttableview.h diffview.h diffdlg.h loglist.h addrepositorydlg.h addremovedlg.h cervisiapart.h settingsdlg.h cr32-app-cervisia.png tagdlg.h cervisia.pod Makefile.in commitdlg.h version.h overview.h cvsdir.h mergedlg.h historydlg.h entry.h Makefile.am progressdlg.h cervisiashell.h change_colors.pl
#>+ 5
clean-idl:
diff --git a/devel/kdesdk3/files/patch-scripts-Makefile.in b/devel/kdesdk3/files/patch-scripts-Makefile.in
index c2d77d483697..8fcf11e8249f 100644
--- a/devel/kdesdk3/files/patch-scripts-Makefile.in
+++ b/devel/kdesdk3/files/patch-scripts-Makefile.in
@@ -1,6 +1,6 @@
---- scripts/Makefile.in.orig Sat Feb 7 10:55:57 2004
-+++ scripts/Makefile.in Sat Feb 7 10:58:13 2004
-@@ -318,17 +318,6 @@
+--- scripts/Makefile.in.orig Thu Apr 8 08:22:21 2004
++++ scripts/Makefile.in Thu Apr 8 08:23:44 2004
+@@ -339,16 +339,6 @@
cxxmetric extend_dmalloc kdekillall kdelnk2desktop.py
@@ -12,20 +12,18 @@
- cvsblame.1 \
- includemocs.1
-
--
-CLEANFILES = $(man1_MANS)
-
# sorted alphabetically
noinst_SCRIPTS = \
add_trace.pl alldcop.rb authors2xml.pl check_licenses colorcvs \
-@@ -397,52 +386,6 @@
+@@ -435,51 +425,6 @@
+ distclean-libtool:
-rm -f libtool
uninstall-info-am:
-
--man1dir = $(mandir)/man1
-install-man1: $(man1_MANS) $(man_MANS)
- @$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(man1dir)
+- test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)"
- @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
- for i in $$l2; do \
@@ -44,8 +42,8 @@
- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
- inst=`echo $$inst | sed -e 's/^.*\///'`; \
- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \
-- $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \
+- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
+- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
- done
-uninstall-man1:
- @$(NORMAL_UNINSTALL)
@@ -65,14 +63,14 @@
- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
- inst=`echo $$inst | sed -e 's/^.*\///'`; \
- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \
-- rm -f $(DESTDIR)$(man1dir)/$$inst; \
+- echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
+- rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
- done
tags: TAGS
TAGS:
-@@ -576,22 +519,6 @@
- uninstall-man uninstall-man1
+@@ -610,22 +555,6 @@
+ uninstall-info-am uninstall-man uninstall-man1
-# it'd be too good if this worked everywhere ...
diff --git a/devel/kdesdk3/pkg-plist b/devel/kdesdk3/pkg-plist
index 66de7c788916..d85698980f0f 100644
--- a/devel/kdesdk3/pkg-plist
+++ b/devel/kdesdk3/pkg-plist
@@ -205,7 +205,7 @@ share/apps/kapptemplate/appframework/no-exe/INSTALL
share/apps/kapptemplate/appframework/po-Makefile.am
share/apps/kapptemplate/bin/mkinstalldirs
share/apps/kapptemplate/existing/app-Makefile.am
-share/apps/kapptemplate/existing/app.desktop
+share/apps/kapptemplate/existing/app-desktop
share/apps/kapptemplate/include/existing.module
share/apps/kapptemplate/include/kapptemplate.common
share/apps/kapptemplate/include/kapptemplate.module
@@ -213,8 +213,8 @@ share/apps/kapptemplate/include/kpartapp.module
share/apps/kapptemplate/include/kpartplugin.module
share/apps/kapptemplate/kapp/app-Makefile.am
share/apps/kapptemplate/kapp/app-configure.in.in
+share/apps/kapptemplate/kapp/app-desktop
share/apps/kapptemplate/kapp/app.cpp
-share/apps/kapptemplate/kapp/app.desktop
share/apps/kapptemplate/kapp/app.h
share/apps/kapptemplate/kapp/app_client.cpp
share/apps/kapptemplate/kapp/appiface.h
@@ -240,11 +240,11 @@ share/apps/kapptemplate/kapp/no-exe/lo32-app-app.png
share/apps/kapptemplate/kapp/pics-Makefile.am
share/apps/kapptemplate/kpartapp/app-Makefile.am
share/apps/kapptemplate/kpartapp/app-configure.in.in
+share/apps/kapptemplate/kpartapp/app-desktop
share/apps/kapptemplate/kpartapp/app.cpp
-share/apps/kapptemplate/kpartapp/app.desktop
share/apps/kapptemplate/kpartapp/app.h
+share/apps/kapptemplate/kpartapp/app_part-desktop
share/apps/kapptemplate/kpartapp/app_part.cpp
-share/apps/kapptemplate/kpartapp/app_part.desktop
share/apps/kapptemplate/kpartapp/app_part.h
share/apps/kapptemplate/kpartapp/app_part.rc
share/apps/kapptemplate/kpartapp/app_shell.rc
@@ -271,6 +271,7 @@ share/apps/kapptemplate/kpartplugin/plugin_app.cpp
share/apps/kapptemplate/kpartplugin/plugin_app.h
share/apps/kapptemplate/kpartplugin/plugin_app.rc
share/apps/kbabel/icons/hicolor/16x16/actions/autodiff.png
+share/apps/kbabel/icons/hicolor/16x16/actions/catalogmanager.png
share/apps/kbabel/icons/hicolor/16x16/actions/diff.png
share/apps/kbabel/icons/hicolor/16x16/actions/insert_arg.png
share/apps/kbabel/icons/hicolor/16x16/actions/insert_tag.png
@@ -299,6 +300,7 @@ share/apps/kbabel/icons/hicolor/16x16/actions/syntax.png
share/apps/kbabel/icons/hicolor/16x16/actions/togglefuzzy.png
share/apps/kbabel/icons/hicolor/16x16/actions/transsearch.png
share/apps/kbabel/icons/hicolor/22x22/actions/autodiff.png
+share/apps/kbabel/icons/hicolor/22x22/actions/catalogmanager.png
share/apps/kbabel/icons/hicolor/22x22/actions/diff.png
share/apps/kbabel/icons/hicolor/22x22/actions/insert_arg.png
share/apps/kbabel/icons/hicolor/22x22/actions/insert_tag.png
@@ -323,6 +325,7 @@ share/apps/kbabel/icons/hicolor/22x22/actions/syntax.png
share/apps/kbabel/icons/hicolor/22x22/actions/togglefuzzy.png
share/apps/kbabel/icons/hicolor/22x22/actions/transsearch.png
share/apps/kbabel/icons/hicolor/32x32/actions/autodiff.png
+share/apps/kbabel/icons/hicolor/32x32/actions/catalogmanager.png
share/apps/kbabel/icons/hicolor/32x32/actions/diff.png
share/apps/kbabel/icons/hicolor/32x32/actions/insert_arg.png
share/apps/kbabel/icons/hicolor/32x32/actions/insert_tag.png
@@ -347,6 +350,7 @@ share/apps/kbabel/icons/hicolor/32x32/actions/syntax.png
share/apps/kbabel/icons/hicolor/32x32/actions/togglefuzzy.png
share/apps/kbabel/icons/hicolor/32x32/actions/transsearch.png
share/apps/kbabel/icons/locolor/16x16/actions/autodiff.png
+share/apps/kbabel/icons/locolor/16x16/actions/catalogmanager.png
share/apps/kbabel/icons/locolor/16x16/actions/diff.png
share/apps/kbabel/icons/locolor/16x16/actions/insert_arg.png
share/apps/kbabel/icons/locolor/16x16/actions/insert_tag.png
@@ -377,6 +381,7 @@ share/apps/kbabel/icons/locolor/16x16/actions/transsearch.png
share/apps/kbabel/icons/locolor/22x22/actions/statistics.png
share/apps/kbabel/icons/locolor/22x22/actions/syntax.png
share/apps/kbabel/icons/locolor/32x32/actions/autodiff.png
+share/apps/kbabel/icons/locolor/32x32/actions/catalogmanager.png
share/apps/kbabel/icons/locolor/32x32/actions/diff.png
share/apps/kbabel/icons/locolor/32x32/actions/insert_arg.png
share/apps/kbabel/icons/locolor/32x32/actions/insert_tag.png
@@ -506,11 +511,6 @@ share/apps/umbrello/pics/datatype.xpm
share/apps/umbrello/pics/dependency.xpm
share/apps/umbrello/pics/end_state.xpm
share/apps/umbrello/pics/enum.xpm
-share/apps/umbrello/pics/folder_green.png
-share/apps/umbrello/pics/folder_green_open.png
-share/apps/umbrello/pics/folder_grey.png
-share/apps/umbrello/pics/folder_grey_open.png
-share/apps/umbrello/pics/folder_home.png
share/apps/umbrello/pics/fork.xpm
share/apps/umbrello/pics/generalization.xpm
share/apps/umbrello/pics/hline.xpm
diff --git a/devel/kdesdk4/distinfo b/devel/kdesdk4/distinfo
index 047845bff070..d5620a175213 100644
--- a/devel/kdesdk4/distinfo
+++ b/devel/kdesdk4/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kdesdk-3.2.1.tar.bz2) = f52a69718705b32f0068fb605b604b45
-SIZE (KDE/kdesdk-3.2.1.tar.bz2) = 3970806
+MD5 (KDE/kdesdk-3.2.2.tar.bz2) = dd3c690444fef79de620c26abfaafd37
+SIZE (KDE/kdesdk-3.2.2.tar.bz2) = 3931291
diff --git a/devel/kdesdk4/files/patch-cervisia-Makefile.in b/devel/kdesdk4/files/patch-cervisia-Makefile.in
index 0a591c1d00b6..866b9f165608 100644
--- a/devel/kdesdk4/files/patch-cervisia-Makefile.in
+++ b/devel/kdesdk4/files/patch-cervisia-Makefile.in
@@ -1,20 +1,18 @@
---- 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/Makefile.in.orig Wed Apr 7 09:09:30 2004
++++ cervisia/Makefile.in Wed Apr 7 09:09:58 2004
+@@ -571,11 +571,9 @@
+ cervisia_SOURCES = main.cpp cervisiashell.cpp
cervisia_LDFLAGS = $(all_libraries) $(KDE_RPATH)
cervisia_LDADD = $(LIB_KPARTS) $(LIB_KUTILS) cvsservice/libcvsservice.la libcervisia.la
-
-man_MANS = cervisia.1
--
#>- METASOURCES = AUTO
KDE_ICON = AUTO
-
EXTRA_DIST = cervisia.desktop cervisia.png cervisia-small.png
-CLEANFILES = cervisia.1
-
xdg_apps_DATA = cervisia.desktop
-
-@@ -1209,14 +1206,6 @@
+ partrcdir = $(kde_datadir)/cervisiapart
+ partrc_DATA = cervisiaui.rc
+@@ -1220,14 +1218,6 @@
srcdoc:
$(kde_bindir)/kdoc -a -p -d classdocs -n 'Cervisia' *.h -lqt -lkdecore -lkdeui -lkparts
@@ -29,12 +27,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:
-@@ -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
+@@ -1433,7 +1423,7 @@
+ -rm -f loglist.moc tagdlg.moc checkoutdlg.moc cervisiashell.moc repositorydlg.moc diffdlg.moc logplainview.moc resolvedlg.moc tiplabel.moc mergedlg.moc annotateview.moc diffview.moc updatedlg.moc logdlg.moc progressdlg.moc historydlg.moc logtree.moc updateview.moc qttableview.moc cvsprogressdlg.moc settingsdlg.moc commitdlg.moc addrepositorydlg.moc protocolview.moc cervisiapart.moc
#>+ 2
--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
+-KDE_DIST=repositories.h cr22-app-cervisia.png configutils.h cervisia.lsm cervisia.upd tiplabel.h loginfo.h annotatectl.h cervisiaui.rc repositorydlg.h cvsprogressdlg.h watchersdlg.h HACKING cr16-app-cervisia.png logdlg.h updateview_visitors.h watchdlg.h misc.h cervisia.1.in updateview_items.h annotateview.h updatedlg.h logplainview.h stringmatcher.h globalconfig.h cervisiashellui.rc checkoutdlg.h resolvedlg.h logtree.h move_repositories.pl protocolview.h changelogdlg.h LICENSE.QPL annotatedlg.h cr48-app-cervisia.png updateview.h qttableview.h diffview.h diffdlg.h loglist.h addrepositorydlg.h addremovedlg.h cervisiapart.h settingsdlg.h cr32-app-cervisia.png tagdlg.h cervisia.pod Makefile.in commitdlg.h version.h overview.h cvsdir.h mergedlg.h historydlg.h entry.h Makefile.am progressdlg.h cervisiashell.h change_colors.pl
++KDE_DIST=repositories.h cr22-app-cervisia.png configutils.h cervisia.lsm cervisia.upd tiplabel.h loginfo.h annotatectl.h cervisiaui.rc repositorydlg.h cvsprogressdlg.h watchersdlg.h HACKING cr16-app-cervisia.png logdlg.h updateview_visitors.h watchdlg.h misc.h updateview_items.h annotateview.h updatedlg.h logplainview.h stringmatcher.h globalconfig.h cervisiashellui.rc checkoutdlg.h resolvedlg.h logtree.h move_repositories.pl protocolview.h changelogdlg.h LICENSE.QPL annotatedlg.h cr48-app-cervisia.png updateview.h qttableview.h diffview.h diffdlg.h loglist.h addrepositorydlg.h addremovedlg.h cervisiapart.h settingsdlg.h cr32-app-cervisia.png tagdlg.h cervisia.pod Makefile.in commitdlg.h version.h overview.h cvsdir.h mergedlg.h historydlg.h entry.h Makefile.am progressdlg.h cervisiashell.h change_colors.pl
#>+ 5
clean-idl:
diff --git a/devel/kdesdk4/files/patch-scripts-Makefile.in b/devel/kdesdk4/files/patch-scripts-Makefile.in
index c2d77d483697..8fcf11e8249f 100644
--- a/devel/kdesdk4/files/patch-scripts-Makefile.in
+++ b/devel/kdesdk4/files/patch-scripts-Makefile.in
@@ -1,6 +1,6 @@
---- scripts/Makefile.in.orig Sat Feb 7 10:55:57 2004
-+++ scripts/Makefile.in Sat Feb 7 10:58:13 2004
-@@ -318,17 +318,6 @@
+--- scripts/Makefile.in.orig Thu Apr 8 08:22:21 2004
++++ scripts/Makefile.in Thu Apr 8 08:23:44 2004
+@@ -339,16 +339,6 @@
cxxmetric extend_dmalloc kdekillall kdelnk2desktop.py
@@ -12,20 +12,18 @@
- cvsblame.1 \
- includemocs.1
-
--
-CLEANFILES = $(man1_MANS)
-
# sorted alphabetically
noinst_SCRIPTS = \
add_trace.pl alldcop.rb authors2xml.pl check_licenses colorcvs \
-@@ -397,52 +386,6 @@
+@@ -435,51 +425,6 @@
+ distclean-libtool:
-rm -f libtool
uninstall-info-am:
-
--man1dir = $(mandir)/man1
-install-man1: $(man1_MANS) $(man_MANS)
- @$(NORMAL_INSTALL)
-- $(mkinstalldirs) $(DESTDIR)$(man1dir)
+- test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(man1dir)"
- @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
- l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
- for i in $$l2; do \
@@ -44,8 +42,8 @@
- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
- inst=`echo $$inst | sed -e 's/^.*\///'`; \
- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \
-- $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \
+- echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
+- $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
- done
-uninstall-man1:
- @$(NORMAL_UNINSTALL)
@@ -65,14 +63,14 @@
- inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
- inst=`echo $$inst | sed -e 's/^.*\///'`; \
- inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-- echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \
-- rm -f $(DESTDIR)$(man1dir)/$$inst; \
+- echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
+- rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
- done
tags: TAGS
TAGS:
-@@ -576,22 +519,6 @@
- uninstall-man uninstall-man1
+@@ -610,22 +555,6 @@
+ uninstall-info-am uninstall-man uninstall-man1
-# it'd be too good if this worked everywhere ...
diff --git a/devel/kdesdk4/pkg-plist b/devel/kdesdk4/pkg-plist
index 66de7c788916..d85698980f0f 100644
--- a/devel/kdesdk4/pkg-plist
+++ b/devel/kdesdk4/pkg-plist
@@ -205,7 +205,7 @@ share/apps/kapptemplate/appframework/no-exe/INSTALL
share/apps/kapptemplate/appframework/po-Makefile.am
share/apps/kapptemplate/bin/mkinstalldirs
share/apps/kapptemplate/existing/app-Makefile.am
-share/apps/kapptemplate/existing/app.desktop
+share/apps/kapptemplate/existing/app-desktop
share/apps/kapptemplate/include/existing.module
share/apps/kapptemplate/include/kapptemplate.common
share/apps/kapptemplate/include/kapptemplate.module
@@ -213,8 +213,8 @@ share/apps/kapptemplate/include/kpartapp.module
share/apps/kapptemplate/include/kpartplugin.module
share/apps/kapptemplate/kapp/app-Makefile.am
share/apps/kapptemplate/kapp/app-configure.in.in
+share/apps/kapptemplate/kapp/app-desktop
share/apps/kapptemplate/kapp/app.cpp
-share/apps/kapptemplate/kapp/app.desktop
share/apps/kapptemplate/kapp/app.h
share/apps/kapptemplate/kapp/app_client.cpp
share/apps/kapptemplate/kapp/appiface.h
@@ -240,11 +240,11 @@ share/apps/kapptemplate/kapp/no-exe/lo32-app-app.png
share/apps/kapptemplate/kapp/pics-Makefile.am
share/apps/kapptemplate/kpartapp/app-Makefile.am
share/apps/kapptemplate/kpartapp/app-configure.in.in
+share/apps/kapptemplate/kpartapp/app-desktop
share/apps/kapptemplate/kpartapp/app.cpp
-share/apps/kapptemplate/kpartapp/app.desktop
share/apps/kapptemplate/kpartapp/app.h
+share/apps/kapptemplate/kpartapp/app_part-desktop
share/apps/kapptemplate/kpartapp/app_part.cpp
-share/apps/kapptemplate/kpartapp/app_part.desktop
share/apps/kapptemplate/kpartapp/app_part.h
share/apps/kapptemplate/kpartapp/app_part.rc
share/apps/kapptemplate/kpartapp/app_shell.rc
@@ -271,6 +271,7 @@ share/apps/kapptemplate/kpartplugin/plugin_app.cpp
share/apps/kapptemplate/kpartplugin/plugin_app.h
share/apps/kapptemplate/kpartplugin/plugin_app.rc
share/apps/kbabel/icons/hicolor/16x16/actions/autodiff.png
+share/apps/kbabel/icons/hicolor/16x16/actions/catalogmanager.png
share/apps/kbabel/icons/hicolor/16x16/actions/diff.png
share/apps/kbabel/icons/hicolor/16x16/actions/insert_arg.png
share/apps/kbabel/icons/hicolor/16x16/actions/insert_tag.png
@@ -299,6 +300,7 @@ share/apps/kbabel/icons/hicolor/16x16/actions/syntax.png
share/apps/kbabel/icons/hicolor/16x16/actions/togglefuzzy.png
share/apps/kbabel/icons/hicolor/16x16/actions/transsearch.png
share/apps/kbabel/icons/hicolor/22x22/actions/autodiff.png
+share/apps/kbabel/icons/hicolor/22x22/actions/catalogmanager.png
share/apps/kbabel/icons/hicolor/22x22/actions/diff.png
share/apps/kbabel/icons/hicolor/22x22/actions/insert_arg.png
share/apps/kbabel/icons/hicolor/22x22/actions/insert_tag.png
@@ -323,6 +325,7 @@ share/apps/kbabel/icons/hicolor/22x22/actions/syntax.png
share/apps/kbabel/icons/hicolor/22x22/actions/togglefuzzy.png
share/apps/kbabel/icons/hicolor/22x22/actions/transsearch.png
share/apps/kbabel/icons/hicolor/32x32/actions/autodiff.png
+share/apps/kbabel/icons/hicolor/32x32/actions/catalogmanager.png
share/apps/kbabel/icons/hicolor/32x32/actions/diff.png
share/apps/kbabel/icons/hicolor/32x32/actions/insert_arg.png
share/apps/kbabel/icons/hicolor/32x32/actions/insert_tag.png
@@ -347,6 +350,7 @@ share/apps/kbabel/icons/hicolor/32x32/actions/syntax.png
share/apps/kbabel/icons/hicolor/32x32/actions/togglefuzzy.png
share/apps/kbabel/icons/hicolor/32x32/actions/transsearch.png
share/apps/kbabel/icons/locolor/16x16/actions/autodiff.png
+share/apps/kbabel/icons/locolor/16x16/actions/catalogmanager.png
share/apps/kbabel/icons/locolor/16x16/actions/diff.png
share/apps/kbabel/icons/locolor/16x16/actions/insert_arg.png
share/apps/kbabel/icons/locolor/16x16/actions/insert_tag.png
@@ -377,6 +381,7 @@ share/apps/kbabel/icons/locolor/16x16/actions/transsearch.png
share/apps/kbabel/icons/locolor/22x22/actions/statistics.png
share/apps/kbabel/icons/locolor/22x22/actions/syntax.png
share/apps/kbabel/icons/locolor/32x32/actions/autodiff.png
+share/apps/kbabel/icons/locolor/32x32/actions/catalogmanager.png
share/apps/kbabel/icons/locolor/32x32/actions/diff.png
share/apps/kbabel/icons/locolor/32x32/actions/insert_arg.png
share/apps/kbabel/icons/locolor/32x32/actions/insert_tag.png
@@ -506,11 +511,6 @@ share/apps/umbrello/pics/datatype.xpm
share/apps/umbrello/pics/dependency.xpm
share/apps/umbrello/pics/end_state.xpm
share/apps/umbrello/pics/enum.xpm
-share/apps/umbrello/pics/folder_green.png
-share/apps/umbrello/pics/folder_green_open.png
-share/apps/umbrello/pics/folder_grey.png
-share/apps/umbrello/pics/folder_grey_open.png
-share/apps/umbrello/pics/folder_home.png
share/apps/umbrello/pics/fork.xpm
share/apps/umbrello/pics/generalization.xpm
share/apps/umbrello/pics/hline.xpm
diff --git a/devel/kdevelop/Makefile b/devel/kdevelop/Makefile
index 9d5cc4dcaffd..c640c462e4ac 100644
--- a/devel/kdevelop/Makefile
+++ b/devel/kdevelop/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= kdevelop
-PORTVERSION= 3.0.2
+PORTVERSION= 3.0.3
CATEGORIES?= devel kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${KDE_VERSION}/src
diff --git a/devel/kdevelop/distinfo b/devel/kdevelop/distinfo
index fb34a84bce1b..72bdfb7db370 100644
--- a/devel/kdevelop/distinfo
+++ b/devel/kdevelop/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kdevelop-3.0.2.tar.bz2) = 1c7df5b7abfc1981922f8a681ab93bb0
-SIZE (KDE/kdevelop-3.0.2.tar.bz2) = 5531192
+MD5 (KDE/kdevelop-3.0.3.tar.bz2) = c362e32f793f30ba4cedcdc0a914328d
+SIZE (KDE/kdevelop-3.0.3.tar.bz2) = 5904393
diff --git a/devel/kdevelop/pkg-plist b/devel/kdevelop/pkg-plist
index 787892c00d31..3990ad278e5e 100644
--- a/devel/kdevelop/pkg-plist
+++ b/devel/kdevelop/pkg-plist
@@ -362,7 +362,7 @@ share/apps/kdevappwizard/template-common/kdevelop.pm
share/apps/kdevappwizard/template-common/wx-Makefile.am
share/apps/kdevappwizard/template-common/wx-Makefile.cvs
share/apps/kdevappwizard/template-common/wx-configure.in
-share/apps/kdevappwizard/template-common/wxwindows.tar.gz
+share/apps/kdevappwizard/template-common/wxwidgets.tar.gz
share/apps/kdevappwizard/template-cpphello/app.kdevelop
share/apps/kdevappwizard/template-cpphello/configure.in
share/apps/kdevappwizard/template-cpphello/cpp-Makefile.am
@@ -569,6 +569,19 @@ share/apps/kdevappwizard/template-khello/preview.png
share/apps/kdevappwizard/template-khello/script
share/apps/kdevappwizard/template-khello/src-Makefile.am
share/apps/kdevappwizard/template-khello/subdirs
+share/apps/kdevappwizard/template-khello2/app.cpp
+share/apps/kdevappwizard/template-khello2/app.desktop
+share/apps/kdevappwizard/template-khello2/app.h
+share/apps/kdevappwizard/template-khello2/app.kdevelop
+share/apps/kdevappwizard/template-khello2/appui.rc
+share/apps/kdevappwizard/template-khello2/main.cpp
+share/apps/kdevappwizard/template-khello2/preview.png
+share/apps/kdevappwizard/template-khello2/script
+share/apps/kdevappwizard/template-khello2/src-Makefile.am
+share/apps/kdevappwizard/template-khello2/subdirs
+share/apps/kdevappwizard/template-khello2/widget.cpp
+share/apps/kdevappwizard/template-khello2/widget.h
+share/apps/kdevappwizard/template-khello2/widgetbase.ui
share/apps/kdevappwizard/template-kicker/applet.cpp
share/apps/kdevappwizard/template-kicker/applet.desktop
share/apps/kdevappwizard/template-kicker/applet.h
@@ -777,6 +790,7 @@ share/apps/kdevappwizard/templates/kdevpart
share/apps/kdevappwizard/templates/kdevpart2
share/apps/kdevappwizard/templates/kfileplugin
share/apps/kdevappwizard/templates/khello
+share/apps/kdevappwizard/templates/khello2
share/apps/kdevappwizard/templates/kicker
share/apps/kdevappwizard/templates/kioslave
share/apps/kdevappwizard/templates/kmod
@@ -897,7 +911,7 @@ share/apps/kdevdoctreeview/tocs/sw.toc
share/apps/kdevdoctreeview/tocs/w3c-dom-level2-html.toc
share/apps/kdevdoctreeview/tocs/w3c-svg.toc
share/apps/kdevdoctreeview/tocs/w3c-uaag10.toc
-share/apps/kdevdoctreeview/tocs/wxwindows_bugs.toc
+share/apps/kdevdoctreeview/tocs/wxwidgets_bugs.toc
share/apps/kdevdoxygen/kdevdoxygen.rc
share/apps/kdevelop/eventsrc
share/apps/kdevelop/kdevelopui.rc
@@ -991,12 +1005,21 @@ 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/applicationwizard.docbook
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-adddialog-baselibs.png
+share/doc/HTML/en/kdevelop/configure-adddialog-qt.png
+share/doc/HTML/en/kdevelop/configure-adddialog.png
+share/doc/HTML/en/kdevelop/configure-doctree-DevHelp.png
+share/doc/HTML/en/kdevelop/configure-doctree-TOC.png
+share/doc/HTML/en/kdevelop/configure-doctree-bookmark.png
+share/doc/HTML/en/kdevelop/configure-doctree-general.png
+share/doc/HTML/en/kdevelop/configure-doctree-textsearch.png
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
@@ -1004,7 +1027,10 @@ 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/doctree-add-bookmark.png
+share/doc/HTML/en/kdevelop/doctree.png
share/doc/HTML/en/kdevelop/doctreeview.png
+share/doc/HTML/en/kdevelop/edit-doctree-TOC-entry.png
share/doc/HTML/en/kdevelop/file-selector.png
share/doc/HTML/en/kdevelop/filetree.png
share/doc/HTML/en/kdevelop/importdirectory.png
@@ -1012,14 +1038,19 @@ 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-install.docbook
share/doc/HTML/en/kdevelop/kdevelop-mdi-mode.png
+share/doc/HTML/en/kdevelop/kdevelop-survey.docbook
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/project-management.docbook
share/doc/HTML/en/kdevelop/select-user-interface-0.png
share/doc/HTML/en/kdevelop/select-user-interface.png
+share/doc/HTML/en/kdevelop/setup.docbook
+share/doc/HTML/en/kdevelop/unixdev.docbook
share/doc/HTML/en/kdevelop/wrong-project-location.png
share/icons/hicolor/16x16/actions/breakpoint_add.png
share/icons/hicolor/16x16/actions/breakpoint_delete.png
@@ -1274,6 +1305,7 @@ share/servicetypes/kdevelopversioncontrol.desktop
@dirrm share/apps/kdevappwizard/template-kmod
@dirrm share/apps/kdevappwizard/template-kioslave
@dirrm share/apps/kdevappwizard/template-kicker
+@dirrm share/apps/kdevappwizard/template-khello2
@dirrm share/apps/kdevappwizard/template-khello
@dirrm share/apps/kdevappwizard/template-kfileplugin
@dirrm share/apps/kdevappwizard/template-kdevpart2