diff options
author | drochner <drochner> | 2006-08-10 14:07:55 +0000 |
---|---|---|
committer | drochner <drochner> | 2006-08-10 14:07:55 +0000 |
commit | 7fa384d01ee9660ca7bf0a424ed5b23a4aa4963f (patch) | |
tree | daba840cab371bcaf23d62f98167d479bdb72864 /devel/devhelp | |
parent | de8c518a096278bc8cb81b288016e7c252cf2b50 (diff) | |
download | pkgsrc-7fa384d01ee9660ca7bf0a424ed5b23a4aa4963f.tar.gz |
update to 0.12
too many changes to list here, see the NEWS file in the distribution
most notably: uses gecko (firefox or mozilla) to render HTML
pkgsrc change: The search path for gtk-doc books has changed. Now
we support the gtk-doc standard share/gtk-doc/html/* (which was patched
out previously), and in addition share/doc/* (which is used by most
pkgsrc installed books). The latter was share/doc/html/* previously
which rendered the whole thing almost useless because only few pkgs
used it. This is in response to PR pkg/34159 by "khorben@syn.localhost".
Diffstat (limited to 'devel/devhelp')
-rw-r--r-- | devel/devhelp/Makefile | 25 | ||||
-rw-r--r-- | devel/devhelp/PLIST | 51 | ||||
-rw-r--r-- | devel/devhelp/distinfo | 13 | ||||
-rw-r--r-- | devel/devhelp/patches/patch-aa | 31 | ||||
-rw-r--r-- | devel/devhelp/patches/patch-ab | 22 | ||||
-rw-r--r-- | devel/devhelp/patches/patch-ac | 13 | ||||
-rw-r--r-- | devel/devhelp/patches/patch-ad | 13 |
7 files changed, 91 insertions, 77 deletions
diff --git a/devel/devhelp/Makefile b/devel/devhelp/Makefile index 82dde457dbe..50c45846990 100644 --- a/devel/devhelp/Makefile +++ b/devel/devhelp/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.35 2006/07/05 05:37:40 jlam Exp $ +# $NetBSD: Makefile,v 1.36 2006/08/10 14:07:55 drochner Exp $ -DISTNAME= devhelp-0.7 -PKGREVISION= 16 +DISTNAME= devhelp-0.12 CATEGORIES= devel x11 -MASTER_SITES= ${MASTER_SITE_GNOME:=sources/devhelp/0.7/} +MASTER_SITES= ${MASTER_SITE_GNOME:=sources/devhelp/0.12/} EXTRACT_SUFX= .tar.bz2 MAINTAINER= pkgsrc-users@NetBSD.org @@ -14,19 +13,25 @@ USE_DIRS+= gnome2-1.5 USE_TOOLS+= gmake intltool msgfmt perl pkg-config USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes +USE_LANGUAGES= c c++ GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-html-widget=gtkhtml2 -BUILDLINK_TRANSFORM+= rm:-DG_DISABLE_DEPRECATED -BUILDLINK_TRANSFORM+= rm:-DGTK_DISABLE_DEPRECATED +PKGCONFIG_OVERRIDE+= libdevhelp-1.0.pc.in +GCONF2_SCHEMAS= devhelp.schemas +PKG_OPTIONS_VAR= PKG_OPTIONS.devhelp +.include "../../www/mozilla/gecko-options.mk" +.include "../../mk/bsd.options.mk" + +.include "../../devel/GConf2/schemas.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" -.include "../../devel/libgnome/buildlink3.mk" -.include "../../devel/libgnomeui/buildlink3.mk" +.include "../../devel/libglade2/buildlink3.mk" +.include "../../devel/libwnck/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" -.include "../../www/libgtkhtml/buildlink3.mk" +.include "../../graphics/hicolor-icon-theme/buildlink3.mk" +.include "../../www/mozilla/gecko-depends.mk" .include "../../x11/gtk2/buildlink3.mk" post-install: diff --git a/devel/devhelp/PLIST b/devel/devhelp/PLIST index e347fc6be7c..90c29593a9a 100644 --- a/devel/devhelp/PLIST +++ b/devel/devhelp/PLIST @@ -1,7 +1,21 @@ -@comment $NetBSD: PLIST,v 1.3 2006/04/17 07:07:16 jlam Exp $ +@comment $NetBSD: PLIST,v 1.4 2006/08/10 14:07:55 drochner Exp $ bin/devhelp -lib/devhelp/libdevhelp.la +include/devhelp-1.0/devhelp/dh-base.h +include/devhelp-1.0/devhelp/dh-book-tree.h +include/devhelp-1.0/devhelp/dh-error.h +include/devhelp-1.0/devhelp/dh-html.h +include/devhelp-1.0/devhelp/dh-keyword-model.h +include/devhelp-1.0/devhelp/dh-link.h +include/devhelp-1.0/devhelp/dh-parser.h +include/devhelp-1.0/devhelp/dh-preferences.h +include/devhelp-1.0/devhelp/dh-search.h +include/devhelp-1.0/devhelp/dh-util.h +include/devhelp-1.0/devhelp/dh-window.h +lib/libdevhelp-1.la +lib/pkgconfig/libdevhelp-1.0.pc share/applications/devhelp.desktop +share/devhelp/default-prefs.js +share/devhelp/devhelp.glade share/devhelp/dtd/devhelp-1.dtd share/devhelp/images/book_closed.png share/devhelp/images/book_open.png @@ -14,45 +28,68 @@ share/doc/devhelp/README share/doc/devhelp/TODO share/examples/devhelp/devhelp.el share/examples/devhelp/devhelp.vim +share/gconf/schemas/devhelp.schemas +share/icons/hicolor/48x48/apps/devhelp.png +share/icons/hicolor/scalable/apps/devhelp.svg share/locale/am/LC_MESSAGES/devhelp.mo share/locale/az/LC_MESSAGES/devhelp.mo share/locale/be/LC_MESSAGES/devhelp.mo +share/locale/bg/LC_MESSAGES/devhelp.mo +share/locale/ca/LC_MESSAGES/devhelp.mo share/locale/cs/LC_MESSAGES/devhelp.mo share/locale/da/LC_MESSAGES/devhelp.mo share/locale/de/LC_MESSAGES/devhelp.mo share/locale/el/LC_MESSAGES/devhelp.mo +share/locale/en_CA/LC_MESSAGES/devhelp.mo +share/locale/en_GB/LC_MESSAGES/devhelp.mo share/locale/es/LC_MESSAGES/devhelp.mo +share/locale/fi/LC_MESSAGES/devhelp.mo share/locale/fr/LC_MESSAGES/devhelp.mo +share/locale/gl/LC_MESSAGES/devhelp.mo +share/locale/gu/LC_MESSAGES/devhelp.mo share/locale/he/LC_MESSAGES/devhelp.mo share/locale/hi/LC_MESSAGES/devhelp.mo +share/locale/hr/LC_MESSAGES/devhelp.mo +share/locale/hu/LC_MESSAGES/devhelp.mo share/locale/is/LC_MESSAGES/devhelp.mo share/locale/it/LC_MESSAGES/devhelp.mo share/locale/ja/LC_MESSAGES/devhelp.mo share/locale/kn/LC_MESSAGES/devhelp.mo share/locale/ko/LC_MESSAGES/devhelp.mo share/locale/lv/LC_MESSAGES/devhelp.mo +share/locale/mk/LC_MESSAGES/devhelp.mo +share/locale/ml/LC_MESSAGES/devhelp.mo share/locale/ms/LC_MESSAGES/devhelp.mo +share/locale/nb/LC_MESSAGES/devhelp.mo +share/locale/ne/LC_MESSAGES/devhelp.mo share/locale/nl/LC_MESSAGES/devhelp.mo -share/locale/no/LC_MESSAGES/devhelp.mo +share/locale/pa/LC_MESSAGES/devhelp.mo share/locale/pl/LC_MESSAGES/devhelp.mo share/locale/pt/LC_MESSAGES/devhelp.mo share/locale/pt_BR/LC_MESSAGES/devhelp.mo share/locale/ru/LC_MESSAGES/devhelp.mo +share/locale/rw/LC_MESSAGES/devhelp.mo share/locale/sk/LC_MESSAGES/devhelp.mo +share/locale/sq/LC_MESSAGES/devhelp.mo share/locale/sr/LC_MESSAGES/devhelp.mo share/locale/sr@Latn/LC_MESSAGES/devhelp.mo share/locale/sv/LC_MESSAGES/devhelp.mo +share/locale/tr/LC_MESSAGES/devhelp.mo share/locale/uk/LC_MESSAGES/devhelp.mo share/locale/vi/LC_MESSAGES/devhelp.mo share/locale/zh_CN/LC_MESSAGES/devhelp.mo +share/locale/zh_HK/LC_MESSAGES/devhelp.mo share/locale/zh_TW/LC_MESSAGES/devhelp.mo -share/mime-info/devhelp.keys -share/mime-info/devhelp.mime -share/pixmaps/devhelp.png +@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/scalable/apps +@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48/apps +@comment in hicolor-icon-theme: @dirrm share/icons/hicolor +@comment in GConf2: @dirrm share/gconf/schemas @dirrm share/examples/devhelp @dirrm share/doc/devhelp @dirrm share/devhelp/ui @dirrm share/devhelp/images @dirrm share/devhelp/dtd @dirrm share/devhelp -@dirrm lib/devhelp +@comment in xdg-dirs: @dirrm share/applications +@dirrm include/devhelp-1.0/devhelp +@dirrm include/devhelp-1.0 diff --git a/devel/devhelp/distinfo b/devel/devhelp/distinfo index 9304337023c..bdfec9b26fa 100644 --- a/devel/devhelp/distinfo +++ b/devel/devhelp/distinfo @@ -1,8 +1,7 @@ -$NetBSD: distinfo,v 1.3 2006/01/30 19:21:41 joerg Exp $ +$NetBSD: distinfo,v 1.4 2006/08/10 14:07:55 drochner Exp $ -SHA1 (devhelp-0.7.tar.bz2) = a5f89a6fc2a255b62b8277af3df491129d1c028e -RMD160 (devhelp-0.7.tar.bz2) = c939e1b2e6173dacae2b85eb6e383b06d7080fbc -Size (devhelp-0.7.tar.bz2) = 371493 bytes -SHA1 (patch-aa) = 84acab25f3263613a7de6a317b8bcbbe55f0f083 -SHA1 (patch-ab) = 48357bb66221377d4f174a1b7e3c2c6a7e61ac68 -SHA1 (patch-ac) = 45172016697a8148bfdf9eaf55cfffb4b6c03c14 +SHA1 (devhelp-0.12.tar.bz2) = 10fae27c4cd60e5dbd84850a971f161b54bd751e +RMD160 (devhelp-0.12.tar.bz2) = 8c189a29bab87be0d6ee23a71311e60c04d0fcfc +Size (devhelp-0.12.tar.bz2) = 440028 bytes +SHA1 (patch-aa) = 65275bf9e1cbb22171d3d3007abfdac88b9c288d +SHA1 (patch-ad) = e19a067ae1ec523f3c82b16c754a5f0f20012392 diff --git a/devel/devhelp/patches/patch-aa b/devel/devhelp/patches/patch-aa index 2252389a103..b3762f3421f 100644 --- a/devel/devhelp/patches/patch-aa +++ b/devel/devhelp/patches/patch-aa @@ -1,20 +1,15 @@ -$NetBSD: patch-aa,v 1.1.1.1 2003/09/25 16:04:07 xtraeme Exp $ +$NetBSD: patch-aa,v 1.2 2006/08/10 14:07:55 drochner Exp $ ---- src/dh-base.c.orig 2003-06-28 23:16:34.000000000 +0200 +--- src/dh-base.c.orig 2006-08-10 14:47:22.000000000 +0200 +++ src/dh-base.c -@@ -221,9 +221,12 @@ base_init_books (DhBase *base) - } - - /* Insert the books from default gtk-doc install path. */ -- base_add_books (base, DATADIR "/gtk-doc/html"); -- base_add_books (base, "/usr/share/gtk-doc/html"); -- base_add_books (base, DATADIR "/devhelp/books"); -+ dir = g_build_filename (DATADIR, "doc", "html", NULL); -+ base_add_books (base, dir); -+ g_free (dir); -+ dir = g_build_filename (g_get_home_dir (), ".devhelp2", "books", NULL); -+ base_add_books (base, dir); -+ g_free (dir); - dir = g_build_filename (g_get_home_dir (), ".devhelp", "books", NULL); - base_add_books (base, dir); - g_free (dir); +@@ -233,6 +233,10 @@ base_add_books_in_data_dir(DhBase *base, + dir = g_build_filename(data_dir, "devhelp", "books", NULL); + base_add_books(base, dir); + g_free(dir); ++ ++ dir = g_build_filename(data_dir, "doc", NULL); ++ base_add_books(base, dir); ++ g_free(dir); + } + + static void diff --git a/devel/devhelp/patches/patch-ab b/devel/devhelp/patches/patch-ab deleted file mode 100644 index 398ecb368c6..00000000000 --- a/devel/devhelp/patches/patch-ab +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ab,v 1.1 2006/01/30 19:21:41 joerg Exp $ - ---- libegg/toolbar/eggtoolbar.c.orig 2006-01-30 19:07:59.000000000 +0000 -+++ libegg/toolbar/eggtoolbar.c -@@ -2570,7 +2570,7 @@ egg_toolbar_insert_widget (EggToolbar *t - - GtkWidget* - egg_toolbar_append_element (EggToolbar *toolbar, -- GtkToolbarChildType type, -+ EggToolbarChildType type, - GtkWidget *widget, - const char *text, - const char *tooltip_text, -@@ -2587,7 +2587,7 @@ egg_toolbar_append_element (EggToolbar - - GtkWidget * - egg_toolbar_prepend_element (EggToolbar *toolbar, -- GtkToolbarChildType type, -+ EggToolbarChildType type, - GtkWidget *widget, - const char *text, - const char *tooltip_text, diff --git a/devel/devhelp/patches/patch-ac b/devel/devhelp/patches/patch-ac deleted file mode 100644 index d3ea335acb4..00000000000 --- a/devel/devhelp/patches/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2006/01/30 19:21:41 joerg Exp $ - ---- src/dh-parser.c.orig 2006-01-30 19:11:10.000000000 +0000 -+++ src/dh-parser.c -@@ -37,8 +37,6 @@ - #define DH_PARSER(o) ((DhParser *) o) - #define BYTES_PER_READ 4096 - --extern int errno; -- - typedef struct { - GMarkupParser *m_parser; - GMarkupParseContext *context; diff --git a/devel/devhelp/patches/patch-ad b/devel/devhelp/patches/patch-ad new file mode 100644 index 00000000000..73de9316889 --- /dev/null +++ b/devel/devhelp/patches/patch-ad @@ -0,0 +1,13 @@ +$NetBSD: patch-ad,v 1.1 2006/08/10 14:07:55 drochner Exp $ + +--- misc/Makefile.in.orig 2006-08-10 14:17:59.000000000 +0200 ++++ misc/Makefile.in +@@ -246,7 +246,7 @@ sbindir = @sbindir@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-SUBDIRS = gedit-plugin ++SUBDIRS = + EXTRA_DIST = devhelp.el devhelp.vim html2funcs.py html2xml.py man2xml.py + all: all-recursive + |