[csw-devel] SF.net SVN: gar:[16575] csw/mgar/pkg/libsigcpp/branches

[guengel at users.sourceforge.net]

Revision: 16575
          http://gar.svn.sourceforge.net/gar/?rev=16575&view=rev
Author:   guengel
Date:     2011-12-19 19:59:05 +0000 (Mon, 19 Dec 2011)
Log Message:
-----------
libsigcpp/branches/2.2.10: Branched for working on version 2.2.10.

Modified Paths:
--------------
    csw/mgar/pkg/libsigcpp/branches/2.2.10/Makefile
    csw/mgar/pkg/libsigcpp/branches/2.2.10/checksums

Added Paths:
-----------
    csw/mgar/pkg/libsigcpp/branches/2.2.10/

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

Property Changed:
----------------
    csw/mgar/pkg/libsigcpp/branches/2.2.10/Makefile

Modified: csw/mgar/pkg/libsigcpp/branches/2.2.10/Makefile
===================================================================
--- csw/mgar/pkg/libsigcpp/trunk/Makefile	2011-12-14 11:26:32 UTC (rev 16503)
+++ csw/mgar/pkg/libsigcpp/branches/2.2.10/Makefile	2011-12-19 19:59:05 UTC (rev 16575)
@@ -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,41 +9,38 @@
 endef
 
 MASTER_SITES = $(GNOME_MIRROR)
-DISTFILES  = $(NAME)-$(VERSION).tar.gz
+DISTFILES  = $(NAME)-$(VERSION).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
+PACKAGES  = CSWlibsigc++ CSWlibsigc++-dev CSWlibsigc++-doc
 
 SPKG_DESC_CSWlibsigc++      = Typesafe signal and callback system for C++
-SPKG_DESC_CSWlibsigc++devel = Header files and docs for libsigc++
+SPKG_DESC_CSWlibsigc++-dev = Header files for libsigc++
+SPKG_DESC_CSWlibsigc++-doc  = Docs for libsigc++
 
-CATALOGNAME_CSWlibsigc++      = libsigc++
-CATALOGNAME_CSWlibsigc++devel = libsigc++_devel 
-
 # CSWsigc++ is the previous package name
 INCOMPATIBLE_PKGS_CSWlibsigc++ = CSWsigc++
-RUNTIME_DEP_PKGS_CSWlibsigc++devel = CSWlibsigc++
+RUNTIME_DEP_PKGS_CSWlibsigc++-dev = CSWlibsigc++
 
 BUILD64 = 1
+EXTRA_CONFIGURE_ENV = MAKE=gmake
 CONFIGURE_ARGS = $(DIRPATHS) --disable-static
 
-TEST_TARGET = check
+PKGFILES_CSWlibsigc++-dev = $(PKGFILES_DEVEL)
+PKGFILES_CSWlibsigc++-dev += .*\.h
+OBSOLETED_BY_CSWlibsigc++-dev = CSWlibsigc++devel
+CATALOGNAME_CSWlibsigc++devel = libsigc++_devel_stub
 
-PKGFILES_CSWlibsigc++devel = $(PKGFILES_DEVEL)
-PKGFILES_CSWlibsigc++devel += $(docdir)/.*
-PKGFILES_CSWlibsigc++devel += .*\.h
-PKGFILES_CSWlibsigc++devel += $(sharedstatedir)/.*
+PKGFILES_CSWlibsigc++-doc  = $(docdir)/.*
+PKGFILES_CSWlibsigc++-doc += $(sharedstatedir)/devhelp/.*
+ARCHALL_CSWlibsigc++-doc = 1
 
-CHECKPKG_OVERRIDES_CSWlibsigc++devel += surplus-dependency|CSWlibsigc++
+CHECKPKG_OVERRIDES_CSWlibsigc++-dev += 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


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

Modified: csw/mgar/pkg/libsigcpp/branches/2.2.10/checksums
===================================================================
--- csw/mgar/pkg/libsigcpp/trunk/checksums	2011-12-14 11:26:32 UTC (rev 16503)
+++ csw/mgar/pkg/libsigcpp/branches/2.2.10/checksums	2011-12-19 19:59:05 UTC (rev 16575)
@@ -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/branches/2.2.10/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-14 11:26:32 UTC (rev 16503)
+++ csw/mgar/pkg/libsigcpp/branches/2.2.10/files/0001-Comment-out-define-as-we-are-on-Sun-Studio.patch	2011-12-19 19:59:05 UTC (rev 16575)
@@ -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.