diff options
| -rw-r--r-- | devel/libgnome/Makefile | 23 | ||||
| -rw-r--r-- | devel/libgnome/PLIST | 42 | ||||
| -rw-r--r-- | devel/libgnome/buildlink2.mk | 9 | ||||
| -rw-r--r-- | devel/libgnome/distinfo | 9 | ||||
| -rw-r--r-- | devel/libgnome/patches/patch-aa | 10 | ||||
| -rw-r--r-- | devel/libgnome/patches/patch-ab | 22 |
6 files changed, 40 insertions, 75 deletions
diff --git a/devel/libgnome/Makefile b/devel/libgnome/Makefile index 16323ebc6b6..733008d131b 100644 --- a/devel/libgnome/Makefile +++ b/devel/libgnome/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.17 2003/12/04 19:48:24 xtraeme Exp $ +# $NetBSD: Makefile,v 1.18 2003/12/14 19:48:04 jmmv Exp $ # -DISTNAME= libgnome-2.2.3 -PKGREVISION= 4 +DISTNAME= libgnome-2.4.0 CATEGORIES= devel gnome -MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgnome/2.2/} +MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libgnome/2.4/} EXTRACT_SUFX= .tar.bz2 MAINTAINER= jmmv@NetBSD.org @@ -24,7 +23,7 @@ USE_PKGLOCALEDIR= YES USE_PKGINSTALL= YES LIBTOOL_OVERRIDE= ${WRKSRC}/libtool -PKGCONFIG_OVERRIDE= ${WRKSRC}/libgnome/libgnome-2.0.pc.in +PKGCONFIG_OVERRIDE= libgnome/libgnome-2.0.pc.in CONFIGURE_ARGS= --enable-gtk-doc=no CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE} @@ -33,19 +32,13 @@ CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/html OWN_DIRS= ${PKG_SYSCONFDIR}/sound/events EGDIR= ${PREFIX}/share/examples/libgnome -.if defined(PKG_SYSCONFDIR.gnome-vfs2) -CONF_FILES= ${EGDIR}/gnome-vfs-2.0/modules/help-methods.conf \ - ${PKG_SYSCONFDIR.gnome-vfs2}/gnome-vfs-2.0/modules/help-modules.conf -.else -CONF_FILES= ${EGDIR}/gnome-vfs-2.0/modules/help-methods.conf \ - ${PKG_SYSCONFDIR}/gnome-vfs-2.0/modules/help-modules.conf -.endif -CONF_FILES+= ${EGDIR}/sound/events/gnome-2.soundlist \ +CONF_FILES= ${EGDIR}/sound/events/gnome-2.soundlist \ ${PKG_SYSCONFDIR}/sound/events/gnome-2.soundlist CONF_FILES+= ${EGDIR}/sound/events/gtk-events-2.soundlist \ ${PKG_SYSCONFDIR}/sound/events/gtk-events-2.soundlist GCONF2_SCHEMAS= desktop_gnome_accessibility_keyboard.schemas +GCONF2_SCHEMAS+= desktop_gnome_accessibility_startup.schemas GCONF2_SCHEMAS+= desktop_gnome_applications_browser.schemas GCONF2_SCHEMAS+= desktop_gnome_applications_help_viewer.schemas GCONF2_SCHEMAS+= desktop_gnome_applications_terminal.schemas @@ -57,14 +50,16 @@ GCONF2_SCHEMAS+= desktop_gnome_peripherals_keyboard.schemas GCONF2_SCHEMAS+= desktop_gnome_peripherals_mouse.schemas GCONF2_SCHEMAS+= desktop_gnome_sound.schemas GCONF2_SCHEMAS+= desktop_gnome_thumbnailers.schemas +GCONF2_SCHEMAS+= desktop_gnome_typing_break.schemas GCONF2_SCHEMAS+= desktop_gnome_url_handlers.schemas -.include "../../archivers/bzip2/buildlink2.mk" .include "../../audio/esound/buildlink2.mk" .include "../../devel/gettext-lib/buildlink2.mk" .include "../../devel/glib2/buildlink2.mk" .include "../../devel/GConf2/schemas.mk" .include "../../devel/libbonobo/buildlink2.mk" +.include "../../devel/pkgconfig/buildlink2.mk" +.include "../../devel/popt/buildlink2.mk" .include "../../devel/zlib/buildlink2.mk" .include "../../sysutils/gnome-vfs2/buildlink2.mk" .include "../../textproc/libxml2/buildlink2.mk" diff --git a/devel/libgnome/PLIST b/devel/libgnome/PLIST index 0a56569b5aa..a74f32c21ba 100644 --- a/devel/libgnome/PLIST +++ b/devel/libgnome/PLIST @@ -1,4 +1,5 @@ -@comment $NetBSD: PLIST,v 1.6 2003/07/11 10:28:27 jmmv Exp $ +@comment $NetBSD: PLIST,v 1.7 2003/12/14 19:48:04 jmmv Exp $ +bin/gnome-open include/libgnome-2.0/libgnome/gnome-config.h include/libgnome-2.0/libgnome/gnome-exec.h include/libgnome-2.0/libgnome/gnome-gconf.h @@ -18,18 +19,16 @@ lib/bonobo/monikers/libmoniker_extra_2.a lib/bonobo/monikers/libmoniker_extra_2.la lib/bonobo/monikers/libmoniker_extra_2.so lib/bonobo/servers/GNOME_Moniker_std.server -lib/gnome-vfs-2.0/modules/libvfs-help.a -lib/gnome-vfs-2.0/modules/libvfs-help.la -lib/gnome-vfs-2.0/modules/libvfs-help.so lib/libgnome-2.a lib/libgnome-2.la lib/libgnome-2.so -lib/libgnome-2.so.200 -lib/libgnome-2.so.200.3 +lib/libgnome-2.so.400 +lib/libgnome-2.so.400.0 lib/pkgconfig/libgnome-2.0.pc -libexec/gnome2-db2html -libexec/gnome2-info2html -libexec/gnome2-man2html +share/doc/html/libgnome/ch01s02.html +share/doc/html/libgnome/ch01s03.html +share/doc/html/libgnome/ch01s04.html +share/doc/html/libgnome/ch01s05.html share/doc/html/libgnome/home.png share/doc/html/libgnome/index.html share/doc/html/libgnome/index.sgml @@ -47,17 +46,14 @@ share/doc/html/libgnome/libgnome-gnome-triggers.html share/doc/html/libgnome/libgnome-gnome-url.html share/doc/html/libgnome/libgnome-gnome-util.html share/doc/html/libgnome/libgnome-libgnometypebuiltins.html +share/doc/html/libgnome/libgnome.devhelp share/doc/html/libgnome/libgnome.html share/doc/html/libgnome/right.png share/doc/html/libgnome/up.png -share/doc/html/libgnome/x1296.html -share/doc/html/libgnome/x2754.html -share/doc/html/libgnome/x3411.html -share/doc/html/libgnome/x4196.html -share/examples/libgnome/gnome-vfs-2.0/modules/help-methods.conf share/examples/libgnome/sound/events/gnome-2.soundlist share/examples/libgnome/sound/events/gtk-events-2.soundlist share/gconf/schemas/desktop_gnome_accessibility_keyboard.schemas +share/gconf/schemas/desktop_gnome_accessibility_startup.schemas share/gconf/schemas/desktop_gnome_applications_browser.schemas share/gconf/schemas/desktop_gnome_applications_help_viewer.schemas share/gconf/schemas/desktop_gnome_applications_terminal.schemas @@ -69,6 +65,7 @@ share/gconf/schemas/desktop_gnome_peripherals_keyboard.schemas share/gconf/schemas/desktop_gnome_peripherals_mouse.schemas share/gconf/schemas/desktop_gnome_sound.schemas share/gconf/schemas/desktop_gnome_thumbnailers.schemas +share/gconf/schemas/desktop_gnome_typing_break.schemas share/gconf/schemas/desktop_gnome_url_handlers.schemas ${PKGLOCALEDIR}/locale/am/LC_MESSAGES/libgnome-2.0.mo ${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/libgnome-2.0.mo @@ -90,11 +87,13 @@ ${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/libgnome-2.0.mo ${PKGLOCALEDIR}/locale/fa/LC_MESSAGES/libgnome-2.0.mo ${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/libgnome-2.0.mo ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/libgnome-2.0.mo +${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/libgnome-2.0.mo ${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/libgnome-2.0.mo ${PKGLOCALEDIR}/locale/he/LC_MESSAGES/libgnome-2.0.mo ${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/libgnome-2.0.mo ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/libgnome-2.0.mo ${PKGLOCALEDIR}/locale/id/LC_MESSAGES/libgnome-2.0.mo +${PKGLOCALEDIR}/locale/is/LC_MESSAGES/libgnome-2.0.mo ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/libgnome-2.0.mo ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/libgnome-2.0.mo ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/libgnome-2.0.mo @@ -114,30 +113,25 @@ ${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/libgnome-2.0.mo ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/libgnome-2.0.mo ${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/libgnome-2.0.mo ${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/libgnome-2.0.mo +${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/libgnome-2.0.mo ${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/libgnome-2.0.mo ${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/libgnome-2.0.mo ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/libgnome-2.0.mo ${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/libgnome-2.0.mo +${PKGLOCALEDIR}/locale/th/LC_MESSAGES/libgnome-2.0.mo ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/libgnome-2.0.mo ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/libgnome-2.0.mo ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/libgnome-2.0.mo ${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/libgnome-2.0.mo +${PKGLOCALEDIR}/locale/yi/LC_MESSAGES/libgnome-2.0.mo ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/libgnome-2.0.mo ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/libgnome-2.0.mo -share/sgml/docbook/gnome-customization-0.1/gnome-custom.xsl -share/sgml/docbook/gnome-customization-0.1/gnome-customization.xsl -share/sgml/docbook/gnome-customization-0.1/l10n.xml -@dirrm share/sgml/docbook/gnome-customization-0.1 -@comment in docbook: @dirrm share/sgml/docbook @comment in GConf2: @dirrm share/gconf/schemas @dirrm share/examples/libgnome/sound/events @dirrm share/examples/libgnome/sound -@dirrm share/examples/libgnome/gnome-vfs-2.0/modules -@dirrm share/examples/libgnome/gnome-vfs-2.0 @dirrm share/examples/libgnome @dirrm share/doc/html/libgnome -@comment in gnome-vfs2: @dirrm lib/gnome-vfs-2.0/modules -@comment in bonobo-activation: @dirrm lib/bonobo/servers -@comment in bonobo-activation: @dirrm lib/bonobo/monikers +@comment in libbonobo: @dirrm lib/bonobo/servers +@comment in libbonobo: @dirrm lib/bonobo/monikers @dirrm include/libgnome-2.0/libgnome @dirrm include/libgnome-2.0 diff --git a/devel/libgnome/buildlink2.mk b/devel/libgnome/buildlink2.mk index a48ca33e97d..b9cd6edd31d 100644 --- a/devel/libgnome/buildlink2.mk +++ b/devel/libgnome/buildlink2.mk @@ -1,24 +1,23 @@ -# $NetBSD: buildlink2.mk,v 1.7 2003/11/12 01:31:48 salo Exp $ +# $NetBSD: buildlink2.mk,v 1.8 2003/12/14 19:48:04 jmmv Exp $ .if !defined(LIBGNOME_BUILDLINK2_MK) LIBGNOME_BUILDLINK2_MK= # defined BUILDLINK_PACKAGES+= libgnome -BUILDLINK_DEPENDS.libgnome?= libgnome>=2.2.3nb3 -BUILDLINK_PKGSRCDIR.libgnome?= ../../devel/libgnome +BUILDLINK_DEPENDS.libgnome?= libgnome>=2.4.0 +BUILDLINK_PKGSRCDIR.libgnome?= ../../gnome-2.4/libgnome EVAL_PREFIX+= BUILDLINK_PREFIX.libgnome=libgnome BUILDLINK_PREFIX.libgnome_DEFAULT= ${LOCALBASE} BUILDLINK_FILES.libgnome= include/libgnome-2.0/libgnome/* BUILDLINK_FILES.libgnome+= lib/libgnome-2.* -BUILDLINK_FILES.libgnome+= lib/pkgconfig/libgnome-2.0.pc -.include "../../archivers/bzip2/buildlink2.mk" .include "../../audio/esound/buildlink2.mk" .include "../../devel/gettext-lib/buildlink2.mk" .include "../../devel/glib2/buildlink2.mk" .include "../../devel/GConf2/buildlink2.mk" .include "../../devel/libbonobo/buildlink2.mk" +.include "../../devel/popt/buildlink2.mk" .include "../../devel/zlib/buildlink2.mk" .include "../../sysutils/gnome-vfs2/buildlink2.mk" .include "../../textproc/libxml2/buildlink2.mk" diff --git a/devel/libgnome/distinfo b/devel/libgnome/distinfo index 91b0cc1e976..30785d91b7d 100644 --- a/devel/libgnome/distinfo +++ b/devel/libgnome/distinfo @@ -1,8 +1,7 @@ -$NetBSD: distinfo,v 1.9 2003/09/25 02:56:01 danw Exp $ +$NetBSD: distinfo,v 1.10 2003/12/14 19:48:04 jmmv Exp $ -SHA1 (libgnome-2.2.3.tar.bz2) = 7f0b6b5205cfc915c606b9907eb61a9590707a68 -Size (libgnome-2.2.3.tar.bz2) = 940005 bytes -SHA1 (patch-aa) = 45cdd3615279a578a6cf1ed806b20c77a6442357 -SHA1 (patch-ab) = 2fc4a9ff9b65fe557443bdcac6d5fc806fe5a35e +SHA1 (libgnome-2.4.0.tar.bz2) = 060f42e140d86fb67d43c6b57798ea1293f813f5 +Size (libgnome-2.4.0.tar.bz2) = 964070 bytes +SHA1 (patch-aa) = 3413cbf561e723710b28b37d6ca696b3d6cddab0 SHA1 (patch-ac) = f5aaa1cd464d85b9ceea42a29edec950658620f8 SHA1 (patch-ae) = 3e9d43e3608cbf9e180c06e690f53c030580fbb2 diff --git a/devel/libgnome/patches/patch-aa b/devel/libgnome/patches/patch-aa index 4e4b84c3df2..95cbc222b13 100644 --- a/devel/libgnome/patches/patch-aa +++ b/devel/libgnome/patches/patch-aa @@ -1,9 +1,9 @@ -$NetBSD: patch-aa,v 1.4 2003/07/11 10:28:28 jmmv Exp $ +$NetBSD: patch-aa,v 1.5 2003/12/14 19:48:04 jmmv Exp $ ---- gnome-data/Makefile.in.orig 2003-07-10 20:42:20.000000000 +0200 -+++ gnome-data/Makefile.in -@@ -142,7 +142,7 @@ YACC = @YACC@ - Z_LIBS = @Z_LIBS@ +--- gnome-data/Makefile.in.orig 2003-10-26 01:53:29.000000000 +0000 ++++ gnome-data/Makefile.in 2003-10-26 01:53:42.000000000 +0000 +@@ -141,7 +141,7 @@ + cxxflags_set = @cxxflags_set@ gnomelocaledir = @gnomelocaledir@ -soundlistdir = $(sysconfdir)/sound/events diff --git a/devel/libgnome/patches/patch-ab b/devel/libgnome/patches/patch-ab deleted file mode 100644 index d315c8b6987..00000000000 --- a/devel/libgnome/patches/patch-ab +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ab,v 1.4 2003/09/25 02:56:01 danw Exp $ - ---- help-converters/gnome-vfs-module/Makefile.in.orig Thu Jul 10 14:42:24 2003 -+++ help-converters/gnome-vfs-module/Makefile.in Sun Aug 31 11:38:14 2003 -@@ -147,7 +147,7 @@ - - modules_LTLIBRARIES = libvfs-help.la - --module_flags = -export_dynamic -avoid-version -+module_flags = -export_dynamic -avoid-version -module - modulesdir = $(libdir)/gnome-vfs-2.0/modules - - libvfs_help_la_SOURCES = help-method.c help-method.h -@@ -156,7 +156,7 @@ - libvfs_help_la_LDFLAGS = $(module_flags) - libvfs_help_la_LIBADD = $(HELP_VFS_MODULE_LIBS) - --modulesconfdir = $(sysconfdir)/gnome-vfs-2.0/modules -+modulesconfdir = $(datadir)/examples/libgnome/gnome-vfs-2.0/modules - modulesconf_DATA = help-methods.conf - - EXTRA_DIST = help-methods.conf.in |