diff options
author | markd <markd> | 2005-12-11 12:01:11 +0000 |
---|---|---|
committer | markd <markd> | 2005-12-11 12:01:11 +0000 |
commit | a7dfd5a5ab7f1846b9a710e9b28ec73f0b2def2d (patch) | |
tree | feb96d213fba489df9afd04d22fd509d0d900528 /devel/kdevelop-base/patches | |
parent | 1a8162f0d859b332b8c073d3dc7dd0941c43f6c5 (diff) | |
download | pkgsrc-a7dfd5a5ab7f1846b9a710e9b28ec73f0b2def2d.tar.gz |
Update kdevelop to 3.3.0 (part of KDE 3.5.0)
changes unknown
Diffstat (limited to 'devel/kdevelop-base/patches')
-rw-r--r-- | devel/kdevelop-base/patches/patch-ab | 22 | ||||
-rw-r--r-- | devel/kdevelop-base/patches/patch-ac | 33 | ||||
-rw-r--r-- | devel/kdevelop-base/patches/patch-ad | 26 | ||||
-rw-r--r-- | devel/kdevelop-base/patches/patch-ae | 28 |
4 files changed, 11 insertions, 98 deletions
diff --git a/devel/kdevelop-base/patches/patch-ab b/devel/kdevelop-base/patches/patch-ab index f9c92b1fda2..13b78a5c2f0 100644 --- a/devel/kdevelop-base/patches/patch-ab +++ b/devel/kdevelop-base/patches/patch-ab @@ -1,13 +1,13 @@ -$NetBSD: patch-ab,v 1.6 2005/03/23 22:38:45 markd Exp $ +$NetBSD: patch-ab,v 1.7 2005/12/11 12:01:11 markd Exp $ ---- Makefile.in.orig 2005-03-05 01:47:58.000000000 +1300 +--- Makefile.in.orig 2005-11-21 09:28:20.000000000 +1300 +++ Makefile.in -@@ -413,7 +413,7 @@ x_libraries = @x_libraries@ - xdg_appsdir = @xdg_appsdir@ - xdg_directorydir = @xdg_directorydir@ - xdg_menudir = @xdg_menudir@ --SUBDIRS = bdb lib parts languages buildtools editors vcs src pics doc mimetypes embedded kdevdesigner -+SUBDIRS = lib parts languages buildtools editors vcs src pics doc mimetypes embedded kdevdesigner - EXTRA_DIST = AUTHORS COPYING COPYING.LIB NEWS ChangeLog INSTALL README TODO HACKING HACKING.language admin configure.in.bot - xdg_apps_DATA = kdevelop.desktop kdevassistant.desktop kdevelop_ruby.desktop \ - kdevelop_c_cpp.desktop kdevelop_kde_cpp.desktop kdevelop_scripting.desktop +@@ -1022,7 +1022,7 @@ $(top_srcdir)/configure.files: $(top_src + $(top_srcdir)/Makefile.am: $(top_srcdir)/Makefile.am.in $(top_srcdir)/subdirs $(top_srcdir)/admin/cvs.sh + @cd $(top_srcdir) && $(SHELL) admin/cvs.sh Makefile_am + +-$(top_srcdir)/subdirs: $(top_srcdir)/Makefile.am.in $(top_srcdir)/admin/cvs.sh ++$(top_srcdir)/subdirs: $(top_srcdir)/admin/cvs.sh + @cd $(top_srcdir) && $(SHELL) admin/cvs.sh subdirs + + # defining default rules for files that may not be present diff --git a/devel/kdevelop-base/patches/patch-ac b/devel/kdevelop-base/patches/patch-ac deleted file mode 100644 index d9c113d02bd..00000000000 --- a/devel/kdevelop-base/patches/patch-ac +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-ac,v 1.8 2005/03/23 22:38:45 markd Exp $ - ---- languages/cpp/Makefile.in.orig 2005-03-05 01:47:59.000000000 +1300 -+++ languages/cpp/Makefile.in -@@ -73,8 +73,7 @@ libkdevcppsupport_la_DEPENDENCIES = \ - $(top_builddir)/lib/catalog/libkdevcatalog.la \ - $(top_builddir)/lib/cppparser/libkdevcppparser.la \ - $(top_builddir)/languages/lib/interfaces/liblang_interfaces.la \ -- $(top_builddir)/languages/lib/designer_integration/libdesignerintegration.la \ -- $(top_builddir)/bdb/build_unix/libdb.a -+ $(top_builddir)/languages/lib/designer_integration/libdesignerintegration.la - am_libkdevcppsupport_la_OBJECTS = cppsupportpart.lo ccconfigwidget.lo \ - kdevdriver.lo cppcodecompletion.lo problemreporter.lo \ - backgroundparser.lo ast_utils.lo store_walker.lo \ -@@ -483,15 +482,15 @@ INCLUDES = -I$(top_srcdir)/languages/lib - -I$(top_srcdir)/languages/lib/interfaces -I$(top_srcdir)/lib/catalog -I$(top_srcdir)/lib/compat \ - -I$(top_srcdir)/lib/cppparser -I$(top_srcdir)/lib/interfaces \ - -I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/interfaces/external -I$(top_srcdir)/lib/util \ -- -I$(top_builddir)/languages/lib/designer_integration -I$(top_builddir)/bdb/build_unix -I$(top_srcdir)/bdb/include \ -+ -I$(top_builddir)/languages/lib/designer_integration \ - $(all_includes) - - kde_module_LTLIBRARIES = libkdevcppsupport.la --libkdevcppsupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -L$(top_srcdir)/bdb/dist -+libkdevcppsupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) - libkdevcppsupport_la_LIBADD = $(top_builddir)/lib/libkdevelop.la \ - $(top_builddir)/lib/catalog/libkdevcatalog.la $(top_builddir)/lib/cppparser/libkdevcppparser.la \ - $(top_builddir)/languages/lib/interfaces/liblang_interfaces.la \ -- $(top_builddir)/languages/lib/designer_integration/libdesignerintegration.la $(top_builddir)/bdb/build_unix/libdb.a -+ $(top_builddir)/languages/lib/designer_integration/libdesignerintegration.la $(BDB_LIBS) - - #>- libkdevcppsupport_la_SOURCES = cppsupportpart.cpp ccconfigwidget.cpp \ - #>- ccconfigwidgetbase.ui kdevdriver.cpp cppcodecompletion.cpp problemreporter.cpp \ diff --git a/devel/kdevelop-base/patches/patch-ad b/devel/kdevelop-base/patches/patch-ad deleted file mode 100644 index 9b1bdddb1c4..00000000000 --- a/devel/kdevelop-base/patches/patch-ad +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-ad,v 1.8 2005/03/23 22:38:45 markd Exp $ - ---- languages/java/Makefile.in.orig 2005-03-05 01:48:00.000000000 +1300 -+++ languages/java/Makefile.in -@@ -64,7 +64,6 @@ am__installdirs = "$(DESTDIR)$(kde_modul - kde_moduleLTLIBRARIES_INSTALL = $(INSTALL) - LTLIBRARIES = $(kde_module_LTLIBRARIES) - libkdevjavasupport_la_DEPENDENCIES = \ -- $(top_builddir)/bdb/build_unix/libdb.a \ - $(top_builddir)/lib/libkdevelop.la \ - $(top_builddir)/lib/antlr/src/libantlr.la \ - $(top_builddir)/lib/catalog/libkdevcatalog.la -@@ -446,11 +445,11 @@ SUBDIRS = file_templates app_templates d - INCLUDES = -I$(top_srcdir)/lib/antlr -I$(top_srcdir)/lib/catalog \ - -I$(top_srcdir)/lib/compat -I$(top_srcdir)/lib/interfaces \ - -I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/interfaces/external -I$(top_srcdir)/lib/util \ -- -I$(top_builddir)/bdb/build_unix -I$(top_srcdir)/bdb/include $(all_includes) -+ $(all_includes) - - kde_module_LTLIBRARIES = libkdevjavasupport.la - libkdevjavasupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) --libkdevjavasupport_la_LIBADD = $(top_builddir)/bdb/build_unix/libdb.a $(top_builddir)/lib/libkdevelop.la $(top_builddir)/lib/antlr/src/libantlr.la $(top_builddir)/lib/catalog/libkdevcatalog.la -+libkdevjavasupport_la_LIBADD = $(BDB_LIBS) $(top_builddir)/lib/libkdevelop.la $(top_builddir)/lib/antlr/src/libantlr.la $(top_builddir)/lib/catalog/libkdevcatalog.la - #>- libkdevjavasupport_la_SOURCES = JavaLexer.cpp KDevJavaSupportIface.cpp javasupportfactory.cpp \ - #>- JavaRecognizer.cpp backgroundparser.cpp configproblemreporter.ui javasupportpart.cpp \ - #>- JavaStoreWalker.cpp javasupport_utils.cpp problemreporter.cpp driver.cpp kdevdriver.cpp KDevJavaSupportIface.skel diff --git a/devel/kdevelop-base/patches/patch-ae b/devel/kdevelop-base/patches/patch-ae deleted file mode 100644 index 06a13dd5f60..00000000000 --- a/devel/kdevelop-base/patches/patch-ae +++ /dev/null @@ -1,28 +0,0 @@ -$NetBSD: patch-ae,v 1.5 2005/03/23 22:38:45 markd Exp $ - ---- languages/pascal/Makefile.in.orig 2005-03-05 01:48:02.000000000 +1300 -+++ languages/pascal/Makefile.in -@@ -62,7 +62,6 @@ am__installdirs = "$(DESTDIR)$(kde_modul - kde_moduleLTLIBRARIES_INSTALL = $(INSTALL) - LTLIBRARIES = $(kde_module_LTLIBRARIES) - libkdevpascalsupport_la_DEPENDENCIES = \ -- $(top_builddir)/bdb/build_unix/libdb.a \ - $(top_builddir)/lib/libkdevelop.la \ - $(top_builddir)/lib/antlr/src/libantlr.la \ - $(top_builddir)/lib/catalog/libkdevcatalog.la -@@ -438,12 +437,12 @@ xdg_menudir = @xdg_menudir@ - KDE_CXXFLAGS = $(USE_EXCEPTIONS) - INCLUDES = -I$(top_srcdir)/lib/antlr -I$(top_srcdir)/lib/catalog \ - -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/interfaces/external -I$(top_srcdir)/lib/util \ -- -I$(top_builddir)/bdb/build_unix -I$(top_srcdir)/bdb/include $(all_includes) -+ $(all_includes) - - SUBDIRS = file_templates app_templates compiler doc - kde_module_LTLIBRARIES = libkdevpascalsupport.la --libkdevpascalsupport_la_LDFLAGS = $(LEXLIB) $(all_libraries) $(KDE_PLUGIN) --libkdevpascalsupport_la_LIBADD = $(top_builddir)/bdb/build_unix/libdb.a $(top_builddir)/lib/libkdevelop.la $(top_builddir)/lib/antlr/src/libantlr.la $(top_builddir)/lib/catalog/libkdevcatalog.la -+libkdevpascalsupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -+libkdevpascalsupport_la_LIBADD = $(BDB_LIBS) $(top_builddir)/lib/libkdevelop.la $(top_builddir)/lib/antlr/src/libantlr.la $(top_builddir)/lib/catalog/libkdevcatalog.la - #>- libkdevpascalsupport_la_SOURCES = pascalsupport_part.cpp PascalLexer.cpp PascalParser.cpp PascalStoreWalker.cpp backgroundparser.cpp configproblemreporter.ui problemreporter.cpp - #>+ 1 - libkdevpascalsupport_la_SOURCES=pascalsupport_part.cpp PascalLexer.cpp PascalParser.cpp PascalStoreWalker.cpp backgroundparser.cpp problemreporter.cpp configproblemreporter.cpp |