[csw-devel] SF.net SVN: gar:[16445] csw/mgar/pkg/gnome-base/gnomevfs2/trunk

[dmichelsen at users.sourceforge.net]

Revision: 16445
          http://gar.svn.sourceforge.net/gar/?rev=16445&view=rev
Author:   dmichelsen
Date:     2011-12-09 15:56:50 +0000 (Fri, 09 Dec 2011)
Log Message:
-----------
gnome-base/gnomevfs2/trunk: Update to 2.24.4, complete rework

Modified Paths:
--------------
    csw/mgar/pkg/gnome-base/gnomevfs2/trunk/Makefile
    csw/mgar/pkg/gnome-base/gnomevfs2/trunk/checksums

Modified: csw/mgar/pkg/gnome-base/gnomevfs2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gnome-base/gnomevfs2/trunk/Makefile	2011-12-09 15:12:51 UTC (rev 16444)
+++ csw/mgar/pkg/gnome-base/gnomevfs2/trunk/Makefile	2011-12-09 15:56:50 UTC (rev 16445)
@@ -1,6 +1,6 @@
 NAME = gnomevfs2
 GNOME_PROJ = gnome-vfs
-VERSION = 2.24.2
+VERSION = 2.24.4
 CATEGORIES = gnome
 
 DESCRIPTION = GnomeVFS - Filesystem Abstraction library
@@ -11,55 +11,68 @@
 DISTNAME = $(GNOME_PROJ)-$(VERSION)
 DISTFILES = $(DISTNAME).tar.bz2
 
-PACKAGES = CSWgnomevfs2 CSWgnomevfs2devel CSWgnomevfs2doc
-CATALOGNAME_CSWgnomevfs2 = gnomevfs2
-CATALOGNAME_CSWgnomevfs2devel = gnomevfs2_devel
-CATALOGNAME_CSWgnomevfs2doc = gnomevfs2_doc
+# New glib only available on Solaris 10
+PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
 
+VENDOR_URL = http://projects.gnome.org/gnome-vfs/
+
+# Many more missing
+BUILD_DEP_PKGS += CSWlibgamin-dev
+
+PACKAGES += CSWgnomevfs2
 SPKG_DESC_CSWgnomevfs2 += $(DESCRIPTION)
-SPKG_DESC_CSWgnomevfs2devel += $(DESCRIPTION) - developer package
-SPKG_DESC_CSWgnomevfs2doc += $(DESCRIPTION) - documentation
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWgnomevfs2 += CSWlibgthread2-0-0
+RUNTIME_DEP_PKGS_CSWgnomevfs2 += CSWlibbz2-1-0
+RUNTIME_DEP_PKGS_CSWgnomevfs2 += CSWsambalib
+RUNTIME_DEP_PKGS_CSWgnomevfs2 += CSWlibgmodule2-0-0
+RUNTIME_DEP_PKGS_CSWgnomevfs2 += CSWlibz1
+RUNTIME_DEP_PKGS_CSWgnomevfs2 += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWgnomevfs2 += CSWlibfam0
+RUNTIME_DEP_PKGS_CSWgnomevfs2 += CSWlibgssapi-krb5-2
+RUNTIME_DEP_PKGS_CSWgnomevfs2 += CSWlibgconf2-4
+RUNTIME_DEP_PKGS_CSWgnomevfs2 += CSWlibgobject2-0-0
+RUNTIME_DEP_PKGS_CSWgnomevfs2 += CSWlibkrb5-3
+RUNTIME_DEP_PKGS_CSWgnomevfs2 += CSWlibglib2-0-0
+RUNTIME_DEP_PKGS_CSWgnomevfs2 += CSWlibxml2-2
+RUNTIME_DEP_PKGS_CSWgnomevfs2 += CSWlibdbus-glib1-2
+RUNTIME_DEP_PKGS_CSWgnomevfs2 += CSWlibcom-err3
+RUNTIME_DEP_PKGS_CSWgnomevfs2 += CSWosslrt
+RUNTIME_DEP_PKGS_CSWgnomevfs2 += CSWlibk5crypto3
+RUNTIME_DEP_PKGS_CSWgnomevfs2 += CSWlibdbus1-3
 
-RUNTIME_DEP_PKGS_CSWgnomevfs2 += CSWfconfig CSWftype2 CSWggettextrt CSWglib2
-RUNTIME_DEP_PKGS_CSWgnomevfs2 += CSWgtk2 CSWlibatk CSWlibcairo CSWlibx11
-RUNTIME_DEP_PKGS_CSWgnomevfs2 += CSWdbusglib CSWlibdbus CSWlibxext CSWpango
-RUNTIME_DEP_PKGS_CSWgnomevfs2devel += CSWgnomevfs2
-RUNTIME_DEP_PKGS_CSWgnomevfs2doc += CSWgnomevfs2
+# This is an explicit fallback *after* /opt/csw/share, see xdg-reinplacement below
+CHECKPKG_OVERRIDES_CSWgnomevfs2 += file-with-bad-content|/usr/share|root/opt/csw/lib/libgnomevfs-2.so.0.2400.4
+CHECKPKG_OVERRIDES_CSWgnomevfs2 += file-with-bad-content|/usr/share|root/opt/csw/lib/sparcv9/libgnomevfs-2.so.0.2400.4
 
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.bz2
+# No real package split done yet
+CHECKPKG_OVERRIDES_CSWgnomevfs2 += shared-lib-pkgname-mismatch
 
-SPKG_SOURCEURL = http://projects.gnome.org/gnome-vfs/
+PACKAGES += CSWgnomevfs2-dev
+SPKG_DESC_CSWgnomevfs2-dev += Development files for GNOME vfs
+PKGFILES_CSWgnomevfs2-dev += $(PKGFILES_DEVEL)
+PKGFILES_CSWgnomevfs2-dev += $(sharedstatedir)/gtk-doc/.*
+RUNTIME_DEP_PKGS_CSWgnomevfs2-dev += CSWgnomevfs2
+OBSOLETED_BY_CSWgnomevfs2-dev = CSWgnomevfs2devel
+CATALOGNAME_CSWgnomevfs2devel = gnomevfs2_devel_stub
+OBSOLETED_BY_CSWgnomevfs2-dev = CSWgnomevfs2doc
+CATALOGNAME_CSWgnomevfs2doc = gnomevfs2_doc_stub
 
-EXTRA_INC = $(prefix)/X11/include
-EXTRA_LIB = $(prefix)/X11/lib
-EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib
+REINPLACEMENTS += xdg
+REINPLACE_MATCH_xdg = /usr/local/share
+REINPLACE_WITH_xdg = $(sharedstatedir)
+REINPLACE_FILES_xdg = libgnomevfs/xdgmime.c
 
-NOISAEXEC = 1
-#NOISALIST = 1
-# libdbus not 64-bit yet
+NOISALIST = 1
 BUILD64 = 1
 
-PKGFILES_CSWgnomevfs2devel = $(PKGFILES_DEVEL)
-PKGFILES_CSWgnomevfs2doc = $(sharedstatedir)/gtk-doc/.*
+# STRIP_LIBTOOL = 1
 
-ARCHALL_CSWgnomevfs2doc = 1
-
-LIBS = -lsocket -lnsl
-export LIBS
-
-EXTRA_INC = $(prefix)/X11/include
-EXTRA_LIB = $(prefix)/X11/lib
-EXTRA_PKG_CONFIG_DIRS = $(prefix)/X11/lib
-EXTRA_SOS_LD_FLAGS = -L$(abspath $(prefix)/X11/lib/$(MM_LIBDIR))
-
-STRIP_LIBTOOL = 1
-
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --enable-static=no
 CONFIGURE_ARGS += --enable-gtk-doc
-CONFIGURE_ARGS += --x-includes=$(prefix)/X11/include
-CONFIGURE_ARGS += --x-libraries=$(abspath $(prefix)/X11/lib/$(MM_LIBDIR))
 
-TEST_TARGET = check
+include gar/category.mk
 
-include gar/category.mk
+# For GNU gettext
+PATH := /opt/csw/gnu:$(PATH)

Modified: csw/mgar/pkg/gnome-base/gnomevfs2/trunk/checksums
===================================================================
--- csw/mgar/pkg/gnome-base/gnomevfs2/trunk/checksums	2011-12-09 15:12:51 UTC (rev 16444)
+++ csw/mgar/pkg/gnome-base/gnomevfs2/trunk/checksums	2011-12-09 15:56:50 UTC (rev 16445)
@@ -1 +1 @@
-371d13e7306eb82e3fe3748a7584c440  gnome-vfs-2.24.2.tar.bz2
+a05fab03eeef10a47dd156b758982f2e  gnome-vfs-2.24.4.tar.bz2

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.