From 5382189e4f66cee9c32a1de493052e8074474d0c Mon Sep 17 00:00:00 2001 From: drochner Date: Fri, 27 Feb 2009 19:51:13 +0000 Subject: This pkg didn't build anymore due to incompatible changes in the "scons" build system, so update to 1.0.7 Didn't find a changelog, but an obvious one is that it uses "waf" to build now. --- editors/kdissert/Makefile | 18 +++++++++------- editors/kdissert/PLIST | 44 ++++++++++++++++----------------------- editors/kdissert/distinfo | 10 ++++----- editors/kdissert/patches/patch-aa | 14 ------------- editors/kdissert/patches/patch-ad | 13 ------------ 5 files changed, 33 insertions(+), 66 deletions(-) delete mode 100644 editors/kdissert/patches/patch-aa delete mode 100644 editors/kdissert/patches/patch-ad (limited to 'editors') diff --git a/editors/kdissert/Makefile b/editors/kdissert/Makefile index a30ff5d06df..502a7c5d481 100644 --- a/editors/kdissert/Makefile +++ b/editors/kdissert/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.15 2008/01/18 05:06:32 tnn Exp $ +# $NetBSD: Makefile,v 1.16 2009/02/27 19:51:13 drochner Exp $ # -DISTNAME= kdissert-1.0.5 -PKGREVISION= 8 +DISTNAME= kdissert-1.0.7 CATEGORIES= editors MASTER_SITES= http://freehackers.org/~tnagy/kdissert/ EXTRACT_SUFX= .tar.bz2 @@ -14,18 +13,23 @@ COMMENT= Mindmapping-like tool to generate text templates USE_PKGLOCALEDIR= yes USE_LANGUAGES= c c++ USE_TOOLS+= msgfmt -NO_CONFIGURE= yes +PYTHON_FOR_BUILD_ONLY= yes -BUILD_DEPENDS+= scons>=0.96.1nb1:../../devel/scons +do-configure: + ${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD} \ + cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ + ${PYTHONBIN} waf configure --prefix=${PTEFIX} do-build: ${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD} \ - cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/scons + cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHONBIN} waf do-install: ${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD} \ - cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/scons install + cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \ + ${PYTHONBIN} waf install +.include "../../lang/python/application.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../x11/kdelibs3/buildlink3.mk" .include "../../x11/qt3-tools/buildlink3.mk" diff --git a/editors/kdissert/PLIST b/editors/kdissert/PLIST index ae25232a3e1..67d710cd9a2 100644 --- a/editors/kdissert/PLIST +++ b/editors/kdissert/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2007/01/26 04:03:19 markd Exp $ +@comment $NetBSD: PLIST,v 1.6 2009/02/27 19:51:13 drochner Exp $ bin/kdissert lib/kde3/libkdissOOOdoc.la lib/kde3/libkdissOOOdoc.so @@ -10,6 +10,8 @@ lib/kde3/libkdissasciidoc.la lib/kde3/libkdissasciidoc.so lib/kde3/libkdissbeamerslides.la lib/kde3/libkdissbeamerslides.so +lib/kde3/libkdissdocbook.la +lib/kde3/libkdissdocbook.so lib/kde3/libkdisshtmldoc.la lib/kde3/libkdisshtmldoc.so lib/kde3/libkdisspdflatexarticle.la @@ -21,13 +23,6 @@ lib/kde3/libkdissprosperslides.so lib/kde3/libkdissstx.la lib/kde3/libkdissstx.so share/applications/kde/kdissert.desktop -share/doc/kde/HTML/en/kdissert/common -share/doc/kde/HTML/en/kdissert/index.cache.bz2 -share/doc/kde/HTML/en/kdissert/index.docbook -share/doc/kde/HTML/en/kdissert/screenshot.jpg -share/doc/kde/HTML/fr/kdissert/common -share/doc/kde/HTML/fr/kdissert/index.cache.bz2 -share/doc/kde/HTML/fr/kdissert/index.docbook share/icons/hicolor/128x128/actions/kdissert_sort.png share/icons/hicolor/128x128/apps/kdissert.png share/icons/hicolor/16x16/actions/kdissert_link.png @@ -52,6 +47,7 @@ share/kde/apps/kdissert/templatedata/kdissOOOimpress.tar.gz share/kde/apps/kdissert/templatedata/kdissapplet.tar.gz share/kde/apps/kdissert/templatedata/kdissasciidoc.tar.gz share/kde/apps/kdissert/templatedata/kdissbeamerslides.tar.gz +share/kde/apps/kdissert/templatedata/kdissdocbook.tar.gz share/kde/apps/kdissert/templatedata/kdisshtmldoc.tar.gz share/kde/apps/kdissert/templatedata/kdisspdflatexarticle.tar.gz share/kde/apps/kdissert/templatedata/kdisspdflatexbook.tar.gz @@ -62,31 +58,27 @@ share/kde/apps/kdissertpart/kdissertpart.rc share/kde/config.kcfg/kdissert.kcfg share/kde/mimelnk/application/x-kdissert.desktop share/kde/services/kdissertpart.desktop +share/locale/bg/LC_MESSAGES/kdissert.mo +share/locale/br/LC_MESSAGES/kdissert.mo +share/locale/cs/LC_MESSAGES/kdissert.mo +share/locale/da/LC_MESSAGES/kdissert.mo share/locale/de/LC_MESSAGES/kdissert.mo +share/locale/el/LC_MESSAGES/kdissert.mo share/locale/es/LC_MESSAGES/kdissert.mo share/locale/fr/LC_MESSAGES/kdissert.mo +share/locale/ga/LC_MESSAGES/kdissert.mo +share/locale/gl/LC_MESSAGES/kdissert.mo share/locale/it/LC_MESSAGES/kdissert.mo +share/locale/ka/LC_MESSAGES/kdissert.mo share/locale/nl/LC_MESSAGES/kdissert.mo share/locale/pl/LC_MESSAGES/kdissert.mo -@comment in kde: @dirrm share/kde/mimelnk/application +share/locale/pt/LC_MESSAGES/kdissert.mo +share/locale/pt_BR/LC_MESSAGES/kdissert.mo +share/locale/ru/LC_MESSAGES/kdissert.mo +share/locale/sk/LC_MESSAGES/kdissert.mo +share/locale/sv/LC_MESSAGES/kdissert.mo +share/locale/tr/LC_MESSAGES/kdissert.mo @dirrm share/kde/apps/kdissertpart @dirrm share/kde/apps/kdissert/templatedata @dirrm share/kde/apps/kdissert/pics @dirrm share/kde/apps/kdissert -@comment in kde: @dirrm share/kde/apps -@comment in kde: @dirrm share/kde/applnk/Utilities -@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/64x64/apps -@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/64x64/actions -@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/32x32/apps -@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/32x32/actions -@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/22x22/apps -@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/22x22/actions -@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16/apps -@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16/actions -@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/128x128/apps -@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/128x128/actions -@dirrm share/doc/kde/HTML/fr/kdissert -@comment in kde: @dirrm share/doc/kde/HTML/fr -@dirrm share/doc/kde/HTML/en/kdissert -@comment in kde: @dirrm share/doc/kde/HTML/en -@comment in kde: @dirrm lib/kde3 diff --git a/editors/kdissert/distinfo b/editors/kdissert/distinfo index 2b0ed8e74ce..0461b43b0ac 100644 --- a/editors/kdissert/distinfo +++ b/editors/kdissert/distinfo @@ -1,9 +1,7 @@ -$NetBSD: distinfo,v 1.4 2006/06/20 14:41:16 joerg Exp $ +$NetBSD: distinfo,v 1.5 2009/02/27 19:51:13 drochner Exp $ -SHA1 (kdissert-1.0.5.tar.bz2) = ab880c60b23d612bdad0eb396db708ad2fd8e09f -RMD160 (kdissert-1.0.5.tar.bz2) = 91a48c7517fa28d94a229cb6fb539c7215b6574f -Size (kdissert-1.0.5.tar.bz2) = 489281 bytes -SHA1 (patch-aa) = 4b35057639ca3bed346d474110388d7e665a4c5a +SHA1 (kdissert-1.0.7.tar.bz2) = 37ecab653b0e5f626036ad847583990c825e5e7e +RMD160 (kdissert-1.0.7.tar.bz2) = 2aa78e9423fa3ec8a46c6c53b3cf7c41396b3347 +Size (kdissert-1.0.7.tar.bz2) = 501108 bytes SHA1 (patch-ab) = f3444118d50e6001443febbe63419051f8ebdfd7 SHA1 (patch-ac) = a961d66f239bbae8251c78c21fdd482a6dc3382c -SHA1 (patch-ad) = 5cdf04357bfae141087b18ac7a2da106aa4ed5fe diff --git a/editors/kdissert/patches/patch-aa b/editors/kdissert/patches/patch-aa deleted file mode 100644 index 6694109840c..00000000000 --- a/editors/kdissert/patches/patch-aa +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-aa,v 1.2 2005/10/21 14:47:13 drochner Exp $ - ---- SConstruct.orig 2005-10-18 22:29:20.000000000 +0200 -+++ SConstruct -@@ -17,7 +17,8 @@ The variables are saved automatically af - ################################################################### - - ## Load the builders in config --env = Environment(tools=['default', 'generic', 'kde', 'parser'], toolpath=['./', './bksys']) -+import os -+env = Environment(tools=['default', 'generic', 'kde', 'parser'], toolpath=['./', './bksys'], ENV={'PATH':os.environ['PATH']}) - env.KDEuse("environ rpath") - - #env['DUMPCONFIG']=1 diff --git a/editors/kdissert/patches/patch-ad b/editors/kdissert/patches/patch-ad deleted file mode 100644 index 7fe9941cc26..00000000000 --- a/editors/kdissert/patches/patch-ad +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ad,v 1.1 2006/06/20 14:41:16 joerg Exp $ - ---- bksys/generic.py.orig 2006-06-20 14:17:30.000000000 +0000 -+++ bksys/generic.py -@@ -438,6 +438,8 @@ def generate(env): - env.AppendUnique( GENCXXFLAGS = ['-D_THREAD_SAFE']) - else: - env.AppendUnique( GENLINKFLAGS = ['-pthread']) -+ elif os.uname()[0] == "DragonFly": -+ env.AppendUnique( GENLINKFLAGS = ['-pthread']) - - # User-specified prefix - if env['ARGS'].has_key('prefix'): -- cgit v1.2.3