[csw-devel] SF.net SVN: gar:[20921] csw/mgar/pkg/protobuf/branches/protobuf-gcc

[wahwah at users.sourceforge.net]

Revision: 20921
          http://gar.svn.sourceforge.net/gar/?rev=20921&view=rev
Author:   wahwah
Date:     2013-04-30 21:40:58 +0000 (Tue, 30 Apr 2013)
Log Message:
-----------
protobuf/branches/protobuf-gcc: Update to 2.5.0

Modified Paths:
--------------
    csw/mgar/pkg/protobuf/branches/protobuf-gcc/Makefile
    csw/mgar/pkg/protobuf/branches/protobuf-gcc/checksums

Modified: csw/mgar/pkg/protobuf/branches/protobuf-gcc/Makefile
===================================================================
--- csw/mgar/pkg/protobuf/branches/protobuf-gcc/Makefile	2013-04-30 21:30:37 UTC (rev 20920)
+++ csw/mgar/pkg/protobuf/branches/protobuf-gcc/Makefile	2013-04-30 21:40:58 UTC (rev 20921)
@@ -5,8 +5,7 @@
 # http://code.google.com/p/protobuf/issues/detail?id=166
 
 NAME = protobuf
-VERSION = 2.4.1
-CATEGORIES = lib
+VERSION = 2.5.0
 GARTYPE = v2
 define BLURB
 	Protocol Buffers are a way of encoding structured data in an efficient yet
@@ -22,33 +21,32 @@
 CONFIGURE_ARGS = $(DIRPATHS)
 PYCOMPILE = 1
 
-EXTRA_MERGE_EXCLUDE_FILES = .*.pyc
+EXTRA_MERGE_EXCLUDE_FILES = .*\.py[co]
 
-PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
+EXTRA_LINKER_FLAGS = -lrt
+
 GARCOMPILER = GNU
 prefix = $(BUILD_PREFIX)/gxx
 
-PACKAGES += CSWlibprotobuf-lite7-gxx
-PKGFILES_CSWlibprotobuf-lite7-gxx += $(call baseisadirs,$(libdir),libprotobuf-lite\.so\.7(\.\d+)*)
-SPKG_DESC_CSWlibprotobuf-lite7-gxx += $(DESCRIPTION), libprotobuf-lite.so.7
-RUNTIME_DEP_PKGS_CSWlibprotobuf-lite7-gxx += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWlibprotobuf-lite7-gxx += CSWlibstdc++6
-RUNTIME_DEP_PKGS_CSWlibprotobuf-lite7-gxx += CSWlibz1
+PACKAGES += CSWlibprotobuf-lite8-gxx
+PKGFILES_CSWlibprotobuf-lite8-gxx += $(call baseisadirs,$(libdir),libprotobuf-lite\.so\.8(\.\d+)*)
+SPKG_DESC_CSWlibprotobuf-lite8-gxx += $(DESCRIPTION), libprotobuf-lite.so.8
+RUNTIME_DEP_PKGS_CSWlibprotobuf-lite8-gxx += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibprotobuf-lite8-gxx += CSWlibstdc++6
 
-PACKAGES += CSWlibprotoc7-gxx
-PKGFILES_CSWlibprotoc7-gxx += $(call baseisadirs,$(libdir),libprotoc\.so\.7(\.\d+)*)
-SPKG_DESC_CSWlibprotoc7-gxx += $(DESCRIPTION), libprotoc.so.7
-RUNTIME_DEP_PKGS_CSWlibprotoc7-gxx += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWlibprotoc7-gxx += CSWlibprotobuf7-gxx
-RUNTIME_DEP_PKGS_CSWlibprotoc7-gxx += CSWlibstdc++6
-RUNTIME_DEP_PKGS_CSWlibprotoc7-gxx += CSWlibz1
+PACKAGES += CSWlibprotoc8-gxx
+PKGFILES_CSWlibprotoc8-gxx += $(call baseisadirs,$(libdir),libprotoc\.so\.8(\.\d+)*)
+SPKG_DESC_CSWlibprotoc8-gxx += $(DESCRIPTION), libprotoc.so.8
+RUNTIME_DEP_PKGS_CSWlibprotoc8-gxx += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibprotoc8-gxx += CSWlibprotobuf8-gxx
+RUNTIME_DEP_PKGS_CSWlibprotoc8-gxx += CSWlibstdc++6
 
-PACKAGES += CSWlibprotobuf7-gxx
-PKGFILES_CSWlibprotobuf7-gxx += $(call baseisadirs,$(libdir),libprotobuf\.so\.7(\.\d+)*)
-SPKG_DESC_CSWlibprotobuf7-gxx += $(DESCRIPTION), libprotobuf.so.7
-RUNTIME_DEP_PKGS_CSWlibprotobuf7-gxx += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWlibprotobuf7-gxx += CSWlibstdc++6
-RUNTIME_DEP_PKGS_CSWlibprotobuf7-gxx += CSWlibz1
+PACKAGES += CSWlibprotobuf8-gxx
+PKGFILES_CSWlibprotobuf8-gxx += $(call baseisadirs,$(libdir),libprotobuf\.so\.8(\.\d+)*)
+SPKG_DESC_CSWlibprotobuf8-gxx += $(DESCRIPTION), libprotobuf.so.8
+RUNTIME_DEP_PKGS_CSWlibprotobuf8-gxx += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibprotobuf8-gxx += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWlibprotobuf8-gxx += CSWlibz1
 
 # Devel package
 PACKAGES                           += CSWprotobuf-gxx-dev
@@ -56,10 +54,10 @@
 RUNTIME_DEP_PKGS_CSWprotobuf-gxx-dev += CSWpy-protobuf
 RUNTIME_DEP_PKGS_CSWprotobuf-gxx-dev += CSWlibz1
 RUNTIME_DEP_PKGS_CSWprotobuf-gxx-dev += CSWlibstdc++6
-RUNTIME_DEP_PKGS_CSWprotobuf-gxx-dev += CSWlibprotobuf7-gxx
-RUNTIME_DEP_PKGS_CSWprotobuf-gxx-dev += CSWlibprotobuf-lite7-gxx
+RUNTIME_DEP_PKGS_CSWprotobuf-gxx-dev += CSWlibprotobuf8-gxx
+RUNTIME_DEP_PKGS_CSWprotobuf-gxx-dev += CSWlibprotobuf-lite8-gxx
 RUNTIME_DEP_PKGS_CSWprotobuf-gxx-dev += CSWlibgcc-s1
-RUNTIME_DEP_PKGS_CSWprotobuf-gxx-dev += CSWlibprotoc7-gxx
+RUNTIME_DEP_PKGS_CSWprotobuf-gxx-dev += CSWlibprotoc8-gxx
 # Catch-all package
 
 # Python support
@@ -69,6 +67,12 @@
 PKGFILES_CSWpy-protobuf = $(libdir)/python.*
 ARCHALL_CSWpy-protobuf = 1
 
+# The 64-bit binaries check misfires because libdir=/opt/csw/gxx/lib but the
+# check looks into /opt/csw/lib.
+CHECKPKG_OVERRIDES_CSWlibprotobuf8-gxx += 64bits-binaries-missing
+CHECKPKG_OVERRIDES_CSWlibprotobuf-lite8-gxx += 64bits-binaries-missing
+CHECKPKG_OVERRIDES_CSWlibprotoc8-gxx += 64bits-binaries-missing
+
 include gar/category.mk
 
 post-build-modulated:

Modified: csw/mgar/pkg/protobuf/branches/protobuf-gcc/checksums
===================================================================
--- csw/mgar/pkg/protobuf/branches/protobuf-gcc/checksums	2013-04-30 21:30:37 UTC (rev 20920)
+++ csw/mgar/pkg/protobuf/branches/protobuf-gcc/checksums	2013-04-30 21:40:58 UTC (rev 20921)
@@ -1 +1 @@
-dc84e9912ea768baa1976cb7bbcea7b5  protobuf-2.4.1.tar.gz
+b751f772bdeb2812a2a8e7202bf1dae8  protobuf-2.5.0.tar.gz

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