[csw-devel] SF.net SVN: gar:[16580] csw/mgar/pkg/libsigcpp/trunk

[guengel at users.sourceforge.net]

Revision: 16580
          http://gar.svn.sourceforge.net/gar/?rev=16580&view=rev
Author:   guengel
Date:     2011-12-20 12:44:07 +0000 (Tue, 20 Dec 2011)
Log Message:
-----------
libsigcpp/trunk: Reintegrated branch 2.2.10.

Modified Paths:
--------------
    csw/mgar/pkg/libsigcpp/trunk/Makefile
    csw/mgar/pkg/libsigcpp/trunk/checksums

Removed Paths:
-------------
    csw/mgar/pkg/libsigcpp/trunk/files/0001-Comment-out-define-as-we-are-on-Sun-Studio.patch

Property Changed:
----------------
    csw/mgar/pkg/libsigcpp/trunk/
    csw/mgar/pkg/libsigcpp/trunk/Makefile


Property changes on: csw/mgar/pkg/libsigcpp/trunk
___________________________________________________________________
Added: svn:mergeinfo
   + /csw/mgar/pkg/libsigcpp/branches/2.2.10:16575-16579

Modified: csw/mgar/pkg/libsigcpp/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libsigcpp/trunk/Makefile	2011-12-20 10:24:13 UTC (rev 16579)
+++ csw/mgar/pkg/libsigcpp/trunk/Makefile	2011-12-20 12:44:07 UTC (rev 16580)
@@ -1,5 +1,6 @@
+# $Id$
 NAME = libsigc++
-VERSION = 2.2.7
+VERSION = 2.2.10
 CATEGORIES = lib
 
 DESCRIPTION = Typesafe signal and callback system for C++
@@ -8,42 +9,30 @@
 endef
 
 MASTER_SITES = $(GNOME_MIRROR)
-DISTFILES  = $(NAME)-$(VERSION).tar.gz
+DISTFILES += $(DISTNAME).tar.xz
 
-PATCHFILES = 0001-Comment-out-define-as-we-are-on-Sun-Studio.patch
-
-# We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
-
-PACKAGES  = CSWlibsigc++ CSWlibsigc++devel
-
-SPKG_DESC_CSWlibsigc++      = Typesafe signal and callback system for C++
-SPKG_DESC_CSWlibsigc++devel = Header files and docs for libsigc++
-
-CATALOGNAME_CSWlibsigc++      = libsigc++
-CATALOGNAME_CSWlibsigc++devel = libsigc++_devel 
-
+PACKAGES = CSWlibsigc2-0-0
+SPKG_DESC_CSWlibsigc2-0-0 = Typesafe signal and callback system for C++, libsigc-2.0.so.0
+PKGFILES_CSWlibsigc2-0-0 += $(call pkgfiles_lib,libsigc-2.0.so.0)
+OBSOLETED_BY_CSWlibsigc2-0-0 = CSWlibsigc++
 # CSWsigc++ is the previous package name
 INCOMPATIBLE_PKGS_CSWlibsigc++ = CSWsigc++
-RUNTIME_DEP_PKGS_CSWlibsigc++devel = CSWlibsigc++
 
+PACKAGES += CSWlibsigc-dev
+SPKG_DESC_CSWlibsigc-dev = Header files for libsigc-2.0.so.0
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWlibsigc-dev = CSWlibsigc2-0-0
+OBSOLETED_BY_CSWlibsigc-dev = CSWlibsigc++devel
+CATALOGNAME_CSWlibsigc++devel = libsigc++_devel_stub
+
 BUILD64 = 1
+EXTRA_CXXFLAGS += -norunpath
+EXTRA_CONFIGURE_ENV = MAKE=gmake
 CONFIGURE_ARGS = $(DIRPATHS) --disable-static
 
-TEST_TARGET = check
+# Do not strip -norunpath during libtool invocation
+REINPLACE_MATCH = (\|-xarch=)
+REINPLACE_WITH = |-norunpath$$1
+REINPLACE_FILES = build/ltmain.sh
 
-PKGFILES_CSWlibsigc++devel = $(PKGFILES_DEVEL)
-PKGFILES_CSWlibsigc++devel += $(docdir)/.*
-PKGFILES_CSWlibsigc++devel += .*\.h
-PKGFILES_CSWlibsigc++devel += $(sharedstatedir)/.*
-
-CHECKPKG_OVERRIDES_CSWlibsigc++devel += surplus-dependency|CSWlibsigc++
-
 include gar/category.mk
-
-PATH := /opt/csw/gnu:$(PATH)
-
-post-configure-modulated:
-	@# Make sure libtool keeps -norunpath during linking
-	perl -pi -e 's,\|-xarch=,|-norunpath|-xarch=,' $(WORKSRC)/libtool
-	@$(MAKECOOKIE)


Property changes on: csw/mgar/pkg/libsigcpp/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
   + Id

Modified: csw/mgar/pkg/libsigcpp/trunk/checksums
===================================================================
--- csw/mgar/pkg/libsigcpp/trunk/checksums	2011-12-20 10:24:13 UTC (rev 16579)
+++ csw/mgar/pkg/libsigcpp/trunk/checksums	2011-12-20 12:44:07 UTC (rev 16580)
@@ -1,2 +1 @@
-9ed819b9adb3e17c536d4749b85c253f  0001-Comment-out-define-as-we-are-on-Sun-Studio.patch
-48afe53ba0e3958f6ac5f072afed1c53  libsigc++-2.2.7.tar.gz
+73419b477f3bb9ddb9905c88a92f4b4c  libsigc++-2.2.10.tar.xz

Deleted: csw/mgar/pkg/libsigcpp/trunk/files/0001-Comment-out-define-as-we-are-on-Sun-Studio.patch
===================================================================
--- csw/mgar/pkg/libsigcpp/trunk/files/0001-Comment-out-define-as-we-are-on-Sun-Studio.patch	2011-12-20 10:24:13 UTC (rev 16579)
+++ csw/mgar/pkg/libsigcpp/trunk/files/0001-Comment-out-define-as-we-are-on-Sun-Studio.patch	2011-12-20 12:44:07 UTC (rev 16580)
@@ -1,25 +0,0 @@
-From db7e603d9531ce0ade0d71479997579d62242534 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Wed, 26 May 2010 14:10:20 +0200
-Subject: [PATCH] Comment out define as we are on Sun Studio
-
----
- sigc++/signal.h |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/sigc++/signal.h b/sigc++/signal.h
-index 9e81ed0..c273ce0 100644
---- a/sigc++/signal.h
-+++ b/sigc++/signal.h
-@@ -18,7 +18,7 @@
-   //Compilers, such as older versions of SUN Forte C++, that do not allow this also often
-   //do not allow a typedef to have the same name as a class in the typedef's definition.
-   //For Sun Forte CC 5.7 (SUN Workshop 10), comment this out to fix the build.
--  #define SIGC_TYPEDEF_REDEFINE_ALLOWED 1
-+  //define SIGC_TYPEDEF_REDEFINE_ALLOWED 1
- #endif
- 
- namespace sigc {
--- 
-1.7.1
-

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