diff options
Diffstat (limited to 'devel/umbrello')
6 files changed, 8 insertions, 230 deletions
diff --git a/devel/umbrello/Makefile b/devel/umbrello/Makefile index cb5742d2311..b81268b05d4 100644 --- a/devel/umbrello/Makefile +++ b/devel/umbrello/Makefile @@ -1,39 +1,14 @@ -# $NetBSD: Makefile,v 1.17 2014/01/25 10:30:06 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2014/02/01 02:20:44 markd Exp $ -DISTNAME= umbrello-${_KDE_VERSION} -PKGREVISION= 4 +DISTNAME= poxml-${_KDE_VERSION} CATEGORIES= devel -COMMENT= UML Modeller - -PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of 4.11.3 +COMMENT= Translates DocBook XML files using gettext po files .include "../../meta-pkgs/kde4/Makefile.kde4" -REPLACE_PERL+= \ - umbrello/headings/heading.pm - -REPLACE_PYTHON+= \ - umbrello/headings/heading.py - -REPLACE_RUBY+= \ - umbrello/headings/heading.rb - -#BUILDLINK_DEPMETHOD.qt4-tools= full .include "../../meta-pkgs/kde4/kde4.mk" -.include "../../devel/boost-libs/buildlink3.mk" -#.include "../../devel/libltdl/buildlink3.mk" -#.include "../../devel/subversion-base/buildlink3.mk" -.include "../../graphics/hicolor-icon-theme/buildlink3.mk" -.include "../../lang/python/application.mk" -.include "../../lang/ruby/replace.mk" -#.include "../../misc/kdepimlibs4/buildlink3.mk" -#.include "../../security/qca2/buildlink3.mk" -.include "../../sysutils/desktop-file-utils/desktopdb.mk" -#.include "../../textproc/hunspell/buildlink3.mk" +.include "../../devel/gettext-tools/buildlink3.mk" .include "../../x11/kdelibs4/buildlink3.mk" -#.include "../../x11/kde-baseapps4/buildlink3.mk" -#.include "../../x11/kde-runtime4/buildlink3.mk" -#.include "../../x11/kde-workspace4/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/umbrello/distinfo b/devel/umbrello/distinfo index b709bae01c7..b396396a19c 100644 --- a/devel/umbrello/distinfo +++ b/devel/umbrello/distinfo @@ -1,9 +1,5 @@ -$NetBSD: distinfo,v 1.4 2013/11/11 16:47:07 joerg Exp $ +$NetBSD: distinfo,v 1.5 2014/02/01 02:20:44 markd Exp $ -SHA1 (umbrello-4.11.3.tar.xz) = 98274cfe91db7b56429a9de0d23ae490adee9ce0 -RMD160 (umbrello-4.11.3.tar.xz) = e3455869134019335ac47ce89b4f074fbdb9bc79 -Size (umbrello-4.11.3.tar.xz) = 1478632 bytes -SHA1 (patch-umbrello_CMakeLists.txt) = 9188a7d3b8a0b69def0cdfd2280a4f51eb4cde5b -SHA1 (patch-umbrello_codeimport_classimport.cpp) = 8c4be72436bba4696d3b3e88bca8b360259123d3 -SHA1 (patch-umbrello_codeimport_kdevcppparser_position.h) = 5a2d2e24df8fbbc56c910f2e800b21083319d8c5 -SHA1 (patch-umbrello_codeimport_kdevcppparser_preprocesslexer.cpp) = 87c6c12c1e19009723aa58c89ef7ca67eedc04f0 +SHA1 (poxml-4.11.5.tar.xz) = 073ab7ad98eff46ced66e234adbafa2afdb86138 +RMD160 (poxml-4.11.5.tar.xz) = ffc00d262eeea2d8501ba452f9affe67cd96a18d +Size (poxml-4.11.5.tar.xz) = 31044 bytes diff --git a/devel/umbrello/patches/patch-umbrello_CMakeLists.txt b/devel/umbrello/patches/patch-umbrello_CMakeLists.txt deleted file mode 100644 index 86db0cab1e0..00000000000 --- a/devel/umbrello/patches/patch-umbrello_CMakeLists.txt +++ /dev/null @@ -1,59 +0,0 @@ -$NetBSD: patch-umbrello_CMakeLists.txt,v 1.1 2013/11/11 16:47:07 joerg Exp $ - -Patches from upstream. - ---- umbrello/CMakeLists.txt.orig 2013-08-28 17:14:58.000000000 +0000 -+++ umbrello/CMakeLists.txt -@@ -268,37 +268,21 @@ set(libcodeimport_SRCS - codeimport/csharp/csharpimport.cpp - ) - --if (WIN32 AND NOT MSVC) -- # SunPRO CC have a problem with position.h; we try to put a -- # QChar into a spirit iterator, which, after a bunch of futzing, ends up in -- # the STL string_ref templates, which use -- # -- # union { -- # size_type _C_size; // Number of actual data values stored -- # _CharT _C_dummy; // force the alignment of the first char -- # } _C_size; // named to work around an HP aCC 3.30 bug -- # -- # and you can't have a class which requires an initializer in a union. -- # -- add_definitions(-DDISABLE_CPP_IMPORT) -- set(libkdevcppparser_SRCS) --else (WIN32 AND NOT MSVC) -- list(APPEND libcodeimport_SRCS -- codeimport/cppimport.cpp -- ) -- set(libkdevcppparser_SRCS -- codeimport/kdevcppparser/ast.cpp -- codeimport/kdevcppparser/driver.cpp -- codeimport/kdevcppparser/errors.cpp -- codeimport/kdevcppparser/lexer.cpp -- codeimport/kdevcppparser/lookup.cpp -- codeimport/kdevcppparser/parser.cpp -- codeimport/kdevcppparser/preprocesslexer.cpp -- codeimport/kdevcppparser/tree_parser.cpp -- codeimport/kdevcppparser/ast_utils.cpp -- codeimport/kdevcppparser/cpptree2uml.cpp -- ) --endif(WIN32 AND NOT MSVC) -+list(APPEND libcodeimport_SRCS -+ codeimport/cppimport.cpp -+) -+set(libkdevcppparser_SRCS -+ codeimport/kdevcppparser/ast.cpp -+ codeimport/kdevcppparser/driver.cpp -+ codeimport/kdevcppparser/errors.cpp -+ codeimport/kdevcppparser/lexer.cpp -+ codeimport/kdevcppparser/lookup.cpp -+ codeimport/kdevcppparser/parser.cpp -+ codeimport/kdevcppparser/preprocesslexer.cpp -+ codeimport/kdevcppparser/tree_parser.cpp -+ codeimport/kdevcppparser/ast_utils.cpp -+ codeimport/kdevcppparser/cpptree2uml.cpp -+) - - set(libclipboard_SRCS - clipboard/umldragdata.cpp diff --git a/devel/umbrello/patches/patch-umbrello_codeimport_classimport.cpp b/devel/umbrello/patches/patch-umbrello_codeimport_classimport.cpp deleted file mode 100644 index 5ffcc558d3f..00000000000 --- a/devel/umbrello/patches/patch-umbrello_codeimport_classimport.cpp +++ /dev/null @@ -1,30 +0,0 @@ -$NetBSD: patch-umbrello_codeimport_classimport.cpp,v 1.1 2013/11/11 16:47:07 joerg Exp $ - -Patches from upstream. - ---- umbrello/codeimport/classimport.cpp.orig 2013-06-28 18:06:03.000000000 +0000 -+++ umbrello/codeimport/classimport.cpp -@@ -20,9 +20,7 @@ - #include "javaimport.h" - #include "adaimport.h" - #include "pascalimport.h" --#ifndef DISABLE_CPP_IMPORT - #include "cppimport.h" --#endif - #include "csharpimport.h" - #include "codeimpthread.h" - -@@ -52,13 +50,8 @@ ClassImport *ClassImport::createImporter - classImporter = new PascalImport(thread); - else if (fileName.endsWith(QLatin1String(".cs"))) - classImporter = new CSharpImport(thread); --#ifndef DISABLE_CPP_IMPORT - else - classImporter = new CppImport(thread); // the default. --#else -- else -- classImporter = 0; --#endif - return classImporter; - } - diff --git a/devel/umbrello/patches/patch-umbrello_codeimport_kdevcppparser_position.h b/devel/umbrello/patches/patch-umbrello_codeimport_kdevcppparser_position.h deleted file mode 100644 index 2083bcb175b..00000000000 --- a/devel/umbrello/patches/patch-umbrello_codeimport_kdevcppparser_position.h +++ /dev/null @@ -1,65 +0,0 @@ -$NetBSD: patch-umbrello_codeimport_kdevcppparser_position.h,v 1.1 2013/11/11 16:47:07 joerg Exp $ - -Patches from upstream. - ---- umbrello/codeimport/kdevcppparser/position.h.orig 2013-06-28 18:06:03.000000000 +0000 -+++ umbrello/codeimport/kdevcppparser/position.h -@@ -20,22 +20,6 @@ - #ifndef POSITION_H - #define POSITION_H - --#ifdef _MSC_VER //Q_CC_MSVC isn't defined here --/* --workaround for the following msvc error --...\Microsoft Visual Studio 8\VC\INCLUDE\xstring(2044) : error C2620: -- member 'std::basic_string<_Elem>::_Bxty::_Buf ' of union 'std::basic_string<_Elem>::_Bxty' -- has user-defined constructor or non-trivial default constructor with [ _Elem=QChar] --...\Microsoft Visual Studio 8\VC\INCLUDE\xstring(2046) : see reference to class -- template instantiation 'std::basic_string<_Elem>::_Bxty' being compiled with [ _Elem=QChar] --..\umbrello\umbrello\codeimport\kdevcppparser\position.h(49) : see reference to class -- template instantiation 'std::basic_string<_Elem>' being compiled with [ _Elem=QChar] --*/ --#define union struct --#include <xstring> --#undef union --#endif -- - #include <limits.h> - #include <boost/version.hpp> - #include <boost/spirit/include/classic.hpp> -@@ -43,34 +27,7 @@ workaround for the following msvc error - #include <QChar> - #include <QDebug> - --typedef std::basic_string<QChar> PositionFilenameType; -- --class PositionFilename : public PositionFilenameType --{ --public: -- PositionFilename() -- { -- } -- -- explicit PositionFilename(const QString &p) : PositionFilenameType(p.data()) -- { -- } -- -- QString toString() const -- { -- QString result; -- for(unsigned int i = 0; i < size(); i++) -- result.append(at(i)); -- return result; -- } --}; -- --inline QDebug operator<<(QDebug out, const PositionFilename &p) --{ -- out << p.toString(); -- return out; --} -- -+typedef QString PositionFilename; - typedef boost::spirit::classic::file_position_base<PositionFilename> PositionType; - - class Position : public PositionType diff --git a/devel/umbrello/patches/patch-umbrello_codeimport_kdevcppparser_preprocesslexer.cpp b/devel/umbrello/patches/patch-umbrello_codeimport_kdevcppparser_preprocesslexer.cpp deleted file mode 100644 index f220ae548c7..00000000000 --- a/devel/umbrello/patches/patch-umbrello_codeimport_kdevcppparser_preprocesslexer.cpp +++ /dev/null @@ -1,39 +0,0 @@ -$NetBSD: patch-umbrello_codeimport_kdevcppparser_preprocesslexer.cpp,v 1.1 2013/11/11 16:47:07 joerg Exp $ - -Patches from upstream. - ---- umbrello/codeimport/kdevcppparser/preprocesslexer.cpp.orig 2013-06-28 18:06:03.000000000 +0000 -+++ umbrello/codeimport/kdevcppparser/preprocesslexer.cpp -@@ -41,13 +41,11 @@ - - #define PREPROCESSLEXER_DEBUG - --#ifdef Q_CC_MSVC - template <class _Tp> --struct _Identity : public std::unary_function<_Tp,_Tp> { -+struct identity : public std::unary_function<_Tp,_Tp> { - _Tp& operator()(_Tp& __x) const { return __x; } - const _Tp& operator()(const _Tp& __x) const { return __x; } - }; --#endif - - template <class _Tp> - struct tilde : public std::unary_function<_Tp, _Tp> { -@@ -593,7 +591,7 @@ void PreprocessLexer::dumpToFile() - if (!d.exists()) - d.mkdir(tempPath); - -- QString fileName = tempPath + '/' + currentPosition().file.toString().replace(QRegExp("[/:mn]"), "-"); -+ QString fileName = tempPath + '/' + currentPosition().file.replace(QRegExp("[/:mn]"), "-"); - QFile f(fileName); - if (f.open(QIODevice::WriteOnly | QIODevice::Text)) { - QTextStream out(&f); -@@ -839,7 +837,7 @@ int PreprocessLexer::macroPrimary() - if (!l_hit) - result = 0; - } else { -- boost::function < int (int) > l_op = _Identity<int>(); -+ boost::function < int (int) > l_op = identity<int>(); - if (m_source.parse(ch_p('+') - | ch_p('-')[var(l_op) = std::negate<int>()] - | ch_p('!')[var(l_op) = std::logical_not<int>()] |