From cc95921b754245074d7d6aaede8a5a00bb5274b2 Mon Sep 17 00:00:00 2001 From: markd Date: Thu, 22 Mar 2012 07:06:24 +0000 Subject: Update to 0.4 KDE4 version. --- print/kbibtex/Makefile | 23 ++++++------ print/kbibtex/PLIST | 43 +++++++++++++--------- print/kbibtex/distinfo | 11 ++++-- print/kbibtex/patches/patch-CMakeLists.txt | 15 ++++++++ ...ch-src_gui_preferences_settingsabstractwidget.h | 14 +++++++ .../patches/patch-src_libkbibtexio_iconvlatex.cpp | 13 +++++++ 6 files changed, 86 insertions(+), 33 deletions(-) create mode 100644 print/kbibtex/patches/patch-CMakeLists.txt create mode 100644 print/kbibtex/patches/patch-src_gui_preferences_settingsabstractwidget.h create mode 100644 print/kbibtex/patches/patch-src_libkbibtexio_iconvlatex.cpp (limited to 'print') diff --git a/print/kbibtex/Makefile b/print/kbibtex/Makefile index c2428912a5c..60203418811 100644 --- a/print/kbibtex/Makefile +++ b/print/kbibtex/Makefile @@ -1,23 +1,24 @@ -# $NetBSD: Makefile,v 1.24 2012/03/03 00:13:50 wiz Exp $ +# $NetBSD: Makefile,v 1.25 2012/03/22 07:06:24 markd Exp $ -DISTNAME= kbibtex-0.2.1 -PKGREVISION= 12 +DISTNAME= kbibtex-0.4 CATEGORIES= print kde -MASTER_SITES= http://www.unix-ag.uni-kl.de/~fischer/kbibtex/download/ +MASTER_SITES= http://download.gna.org/kbibtex/0.4/ EXTRACT_SUFX= .tar.bz2 MAINTAINER= markd@NetBSD.org -HOMEPAGE= http://www.unix-ag.uni-kl.de/~fischer/kbibtex/ +HOMEPAGE= http://home.gna.org/kbibtex/ COMMENT= BibTeX editor for KDE +LICENSE= gnu-gpl-v2 PKG_DESTDIR_SUPPORT= user-destdir -USE_TOOLS+= gmake perl msgfmt +BUILD_DEPENDS+= automoc4>=0.9.87:../../devel/automoc4 + +USE_TOOLS+= perl msgfmt USE_LANGUAGES= c c++ -USE_LIBTOOL= yes -GNU_CONFIGURE= yes -SET_LIBDIR= yes -.include "../../meta-pkgs/kde3/kde3.mk" -.include "../../x11/kdelibs3/buildlink3.mk" +.include "../../meta-pkgs/kde4/kde4.mk" +.include "../../print/poppler-qt4/buildlink3.mk" +.include "../../sysutils/desktop-file-utils/desktopdb.mk" +.include "../../x11/kdelibs4/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/kbibtex/PLIST b/print/kbibtex/PLIST index d05c5bfe15e..ca21598859e 100644 --- a/print/kbibtex/PLIST +++ b/print/kbibtex/PLIST @@ -1,20 +1,27 @@ -@comment $NetBSD: PLIST,v 1.4 2009/06/14 18:11:56 joerg Exp $ +@comment $NetBSD: PLIST,v 1.5 2012/03/22 07:06:24 markd Exp $ bin/kbibtex -lib/kde3/libkbibtexpart.la +lib/kde4/kbibtexpart.so +lib/libkbibtexgui.so +lib/libkbibtexio.so +lib/libkbibtexproc.so +lib/libkbibtexws.so man/man1/kbibtex.1 -share/applications/kde/kbibtex.desktop -share/doc/kde/HTML/en/kbibtex/common -share/doc/kde/HTML/en/kbibtex/index.cache.bz2 -share/doc/kde/HTML/en/kbibtex/index.docbook -share/icons/crystalsvg/128x128/apps/kbibtex.png -share/icons/crystalsvg/16x16/apps/kbibtex.png -share/icons/crystalsvg/22x22/apps/kbibtex.png -share/icons/crystalsvg/32x32/apps/kbibtex.png -share/icons/crystalsvg/48x48/apps/kbibtex.png -share/icons/crystalsvg/64x64/apps/kbibtex.png -share/kde/apps/kbibtex/kbibtex_shell.rc -share/kde/apps/kbibtexpart/kbibtex_part.rc -share/kde/apps/kbibtexpart/xslt/html.xsl -share/kde/services/kbibtex_part.desktop -share/locale/de/LC_MESSAGES/kbibtex.mo -share/locale/ru/LC_MESSAGES/kbibtex.mo +share/applications/kde4/kbibtex.desktop +share/icons/hicolor/128x128/apps/kbibtex.png +share/icons/hicolor/16x16/apps/kbibtex.png +share/icons/hicolor/22x22/apps/kbibtex.png +share/icons/hicolor/32x32/apps/kbibtex.png +share/icons/hicolor/48x48/apps/kbibtex.png +share/icons/hicolor/64x64/apps/kbibtex.png +share/kde/apps/kbibtex/abstractonly.xsl +share/kde/apps/kbibtex/arxiv2bibtex.xsl +share/kde/apps/kbibtex/fancy.xsl +share/kde/apps/kbibtex/findduplicatesui.rc +share/kde/apps/kbibtex/kbibtexui.rc +share/kde/apps/kbibtex/lyx.rc +share/kde/apps/kbibtex/pubmed2bibtex.xsl +share/kde/apps/kbibtex/standard.xsl +share/kde/apps/kbibtexpart/kbibtexpartui.rc +share/kde/config/kbibtexrc +share/kde4/services/kbibtexpart.desktop +share/mime/packages/bibliography.xml diff --git a/print/kbibtex/distinfo b/print/kbibtex/distinfo index c44a0a0e3ff..e2da9dede20 100644 --- a/print/kbibtex/distinfo +++ b/print/kbibtex/distinfo @@ -1,5 +1,8 @@ -$NetBSD: distinfo,v 1.4 2008/04/06 20:59:34 wiz Exp $ +$NetBSD: distinfo,v 1.5 2012/03/22 07:06:24 markd Exp $ -SHA1 (kbibtex-0.2.1.tar.bz2) = 2448b8c8358ed1999858e8069dfe523aa1029d70 -RMD160 (kbibtex-0.2.1.tar.bz2) = a9cb38386154204fb24d16a1b686977a96feafbd -Size (kbibtex-0.2.1.tar.bz2) = 722618 bytes +SHA1 (kbibtex-0.4.tar.bz2) = 23eb1380bc737b57f35125d28d2066ebb19ed71b +RMD160 (kbibtex-0.4.tar.bz2) = 42654063d89441bae7ee85796cc06ee2ad5a2c4e +Size (kbibtex-0.4.tar.bz2) = 191138 bytes +SHA1 (patch-CMakeLists.txt) = 41c6e553dfb3ccc7aa60535145ac333ed18f019d +SHA1 (patch-src_gui_preferences_settingsabstractwidget.h) = cbcf24969856687e6448d4f5f66d352edc283231 +SHA1 (patch-src_libkbibtexio_iconvlatex.cpp) = 0a5a05f8babd5baa791062e3d74052937f64d087 diff --git a/print/kbibtex/patches/patch-CMakeLists.txt b/print/kbibtex/patches/patch-CMakeLists.txt new file mode 100644 index 00000000000..85490a11441 --- /dev/null +++ b/print/kbibtex/patches/patch-CMakeLists.txt @@ -0,0 +1,15 @@ +$NetBSD: patch-CMakeLists.txt,v 1.1 2012/03/22 07:06:25 markd Exp $ + +Correct man path for pkgsrc + +--- CMakeLists.txt.orig 2011-06-02 09:38:01.000000000 +0000 ++++ CMakeLists.txt +@@ -2,7 +2,7 @@ project( kbibtex ) + + cmake_minimum_required(VERSION 2.6) + +-set(MANDIR "share/man" CACHE STRING "Where to install manpages") ++set(MANDIR "man" CACHE STRING "Where to install manpages") + + find_package( Qt4 REQUIRED ) + find_package( KDE4 REQUIRED ) diff --git a/print/kbibtex/patches/patch-src_gui_preferences_settingsabstractwidget.h b/print/kbibtex/patches/patch-src_gui_preferences_settingsabstractwidget.h new file mode 100644 index 00000000000..a9a7a5c4a07 --- /dev/null +++ b/print/kbibtex/patches/patch-src_gui_preferences_settingsabstractwidget.h @@ -0,0 +1,14 @@ +$NetBSD: patch-src_gui_preferences_settingsabstractwidget.h,v 1.1 2012/03/22 07:06:25 markd Exp $ + +fix build from 0.4 branch + +--- src/gui/preferences/settingsabstractwidget.h.orig 2011-11-20 20:36:54.000000000 +0000 ++++ src/gui/preferences/settingsabstractwidget.h +@@ -24,6 +24,7 @@ + #include + + #include ++#include + + class KComboBox; + diff --git a/print/kbibtex/patches/patch-src_libkbibtexio_iconvlatex.cpp b/print/kbibtex/patches/patch-src_libkbibtexio_iconvlatex.cpp new file mode 100644 index 00000000000..dcabcf54f9d --- /dev/null +++ b/print/kbibtex/patches/patch-src_libkbibtexio_iconvlatex.cpp @@ -0,0 +1,13 @@ +$NetBSD: patch-src_libkbibtexio_iconvlatex.cpp,v 1.1 2012/03/22 07:06:25 markd Exp $ + +--- src/libkbibtexio/iconvlatex.cpp.orig 2011-11-20 20:36:55.000000000 +0000 ++++ src/libkbibtexio/iconvlatex.cpp +@@ -57,7 +57,7 @@ IConvLaTeX::~IConvLaTeX() + QByteArray IConvLaTeX::encode(const QString &input) + { + QByteArray inputByteArray = input.toUtf8(); +-#ifdef Q_WS_WIN ++#if defined(Q_WS_WIN) || defined(Q_OS_NETBSD) + /// iconv on Windows likes to have it as const char * + const char *inputBuffer = inputByteArray.data(); + #else -- cgit v1.2.3