[csw-devel] SF.net SVN: gar:[19695] csw/mgar/pkg/openjade/trunk

[wahwah at users.sourceforge.net]

Revision: 19695
          http://gar.svn.sourceforge.net/gar/?rev=19695&view=rev
Author:   wahwah
Date:     2012-11-14 12:13:56 +0000 (Wed, 14 Nov 2012)
Log Message:
-----------
openjade/trunk: package split, and no longer built with GCC 3

Modified Paths:
--------------
    csw/mgar/pkg/openjade/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/openjade/trunk/files/0002-adjust-types-in-a-pow-call.patch

Modified: csw/mgar/pkg/openjade/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openjade/trunk/Makefile	2012-11-14 11:27:20 UTC (rev 19694)
+++ csw/mgar/pkg/openjade/trunk/Makefile	2012-11-14 12:13:56 UTC (rev 19695)
@@ -1,3 +1,5 @@
+# $Id$
+
 NAME = openjade
 VERSION = 1.3.2
 GARTYPE = v2
@@ -2,8 +4,4 @@
 
-BUILD_DEP_PKGS = CSWopenspdevel
-RUNTIME_DEP_PKGS = CSWgcc3g++rt
-RUNTIME_DEP_PKGS += CSWggettextrt CSWiconv CSWopensprt CSWsgmlcommon
-RUNTIME_DEP_PKGS += CSWxmlcommon
+BUILD_DEP_PKGS = CSWopensp-dev
 
-PACKAGES = CSWopenjade
 LICENSE = COPYING
@@ -25,12 +23,9 @@
 DISTFILES += CSWopenjade.postinstall CSWopenjade.preremove
 
 PATCHFILES = openjade-1.3.1-nsl.patch
+PATCHFILES += 0002-adjust-types-in-a-pow-call.patch
 
-# Use gcc3 to build this.  a) it matches opensp b) the c++ used has
-# some issues w/sun c++ and c) gcc4 generates object files that get
-# the sun linker upset.  [we could likely force gld or a strip in the
-# middle somewhere, but this works too.]
-GARCOMPILER = GCC3
+GARCOMPILER = GNU
 
 CONFIGURE_ARGS = $(DIRPATHS) --disable-static
 CONFIGURE_ARGS += --datadir=$(datadir)/sgml/$(NAME)
@@ -38,12 +33,44 @@
 CONFIGURE_ARGS += --enable-default-catalog=$(sysconfdir)/sgml/catalog
 CONFIGURE_ARGS += --disable-static
 
-TEST_SCRIPTS = 
+TEST_SCRIPTS =
 
 INSTALL_ARGS = install install-man
 
 sysconfdir = /etc/opt/csw
 
+PACKAGES += CSWlibogrove0
+PKGFILES_CSWlibogrove0 += $(call baseisadirs,$(libdir),libogrove\.so\.0(\.\d+)*)
+SPKG_DESC_CSWlibogrove0 += $(DESCRIPTION), libogrove.so.0
+
+PACKAGES += CSWlibospgrove0
+PKGFILES_CSWlibospgrove0 += $(call baseisadirs,$(libdir),libospgrove\.so\.0(\.\d+)*)
+SPKG_DESC_CSWlibospgrove0 += $(DESCRIPTION), libospgrove.so.0
+
+PACKAGES += CSWlibostyle0
+PKGFILES_CSWlibostyle0 += $(call baseisadirs,$(libdir),libostyle\.so\.0(\.\d+)*)
+SPKG_DESC_CSWlibostyle0 += $(DESCRIPTION), libostyle.so.0
+
+PACKAGES += CSWopenjade-dev
+SPKG_DESC_CSWopenjade-dev += $(DESCRIPTION), development files
+PKGFILES_CSWopenjade-dev += $(PKGFILES_DEVEL)
+RUNTIME_DEP_PKGS_CSWopenjade-dev += CSWlibospgrove0
+RUNTIME_DEP_PKGS_CSWopenjade-dev += CSWlibostyle0
+RUNTIME_DEP_PKGS_CSWopenjade-dev += CSWlibogrove0
+
+PACKAGES += CSWopenjade
+SPKG_DESC_CSWopenjade += $(DESCRIPTION)
+RUNTIME_DEP_PKGS_CSWopenjade += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWopenjade += CSWlibosp5
+RUNTIME_DEP_PKGS_CSWopenjade += CSWlibospgrove0
+RUNTIME_DEP_PKGS_CSWopenjade += CSWlibostyle0
+RUNTIME_DEP_PKGS_CSWopenjade += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWopenjade += CSWsgmlcommon
+RUNTIME_DEP_PKGS_CSWopenjade += CSWxmlcommon
+
+CHECKPKG_OVERRIDES_CSWopenjade += surplus-dependency|CSWxmlcommon
+CHECKPKG_OVERRIDES_CSWopenjade += surplus-dependency|CSWsgmlcommon
+
 include gar/category.mk
 
 sgmldir = $(DESTDIR)/$(datadir)/sgml/$(NAME)

Added: csw/mgar/pkg/openjade/trunk/files/0002-adjust-types-in-a-pow-call.patch
===================================================================
--- csw/mgar/pkg/openjade/trunk/files/0002-adjust-types-in-a-pow-call.patch	                        (rev 0)
+++ csw/mgar/pkg/openjade/trunk/files/0002-adjust-types-in-a-pow-call.patch	2012-11-14 12:13:56 UTC (rev 19695)
@@ -0,0 +1,25 @@
+From 8512e4341c397aa80394d4f87e28bafb39c28174 Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Wed, 14 Nov 2012 12:49:34 +0100
+Subject: [PATCH] adjust types in a pow() call
+
+---
+ style/primitive.cxx | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/style/primitive.cxx b/style/primitive.cxx
+index 30e8334..decb9c4 100644
+--- a/style/primitive.cxx
++++ b/style/primitive.cxx
+@@ -5047,7 +5047,7 @@ DEFPRIMITIVE(XExpt, argc, argv, context, interp, loc)
+     if (!argv[1]->exactIntegerValue(n2))
+       return argError(interp, loc,
+   		      InterpreterMessages::notAnExactInteger, 1, argv[1]);
+-    return new (interp) QuantityObj(pow(d1,n2), dim1*n2);
++    return new (interp) QuantityObj(pow(d1, static_cast <double> (n2)), dim1*n2);
+   }
+   else {
+     if ((q2 == ELObj::noQuantity) || (dim2 != 0))
+-- 
+1.8.0
+

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