[csw-devel] SF.net SVN: gar:[15062] csw/mgar/pkg/xapian-core/trunk

[dmichelsen at users.sourceforge.net]

Revision: 15062
          http://gar.svn.sourceforge.net/gar/?rev=15062&view=rev
Author:   dmichelsen
Date:     2011-07-15 16:04:06 +0000 (Fri, 15 Jul 2011)

Log Message:
-----------
xapian-core: Intermediate commit, update to 1.2.6, redo package split

Modified Paths:
--------------
    csw/mgar/pkg/xapian-core/trunk/Makefile
    csw/mgar/pkg/xapian-core/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/xapian-core/trunk/files/0001-Fix-include-issue-on-Solaris-9.patch

Modified: csw/mgar/pkg/xapian-core/trunk/Makefile
===================================================================
--- csw/mgar/pkg/xapian-core/trunk/Makefile	2011-07-15 12:49:23 UTC (rev 15061)
+++ csw/mgar/pkg/xapian-core/trunk/Makefile	2011-07-15 16:04:06 UTC (rev 15062)
@@ -1,5 +1,5 @@
 NAME = xapian-core
-VERSION = 1.0.11
+VERSION = 1.2.6
 CATEGORIES = lib
 
 DESCRIPTION = An open source search engine library
@@ -13,41 +13,38 @@
 
 DISTFILES  = $(NAME)-$(VERSION).tar.gz
 
-# We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
+PATCHFILES += 0001-Fix-include-issue-on-Solaris-9.patch
 
-PACKAGES = CSWxapian CSWxapianrt CSWxapiandevel
+PACKAGES += CSWxapian
 CATALOGNAME_CSWxapian = xapian
-CATALOGNAME_CSWxapianrt = xapian_rt
-CATALOGNAME_CSWxapiandevel = xapian_devel
-
 SPKG_DESC_CSWxapian = An open source search engine library
+RUNTIME_DEP_PKGS_CSWxapian += CSWxapianrt
+
+PACKAGES += CSWxapianrt
+CATALOGNAME_CSWxapianrt = xapian_rt
 SPKG_DESC_CSWxapianrt = Xapian runtime libraries
-SPKG_DESC_CSWxapiandevel = Xapian development files
-RUNTIME_DEP_PKGS_CSWxapianrt = CSWstlport CSWzlib
-RUNTIME_DEP_PKGS_CSWxapian = CSWxapianrt
-RUNTIME_DEP_PKGS_CSWxapiandevel = CSWxapian
+PKGFILES_CSWxapianrt = $(PKGFILES_RT)
+RUNTIME_DEP_PKGS_CSWxapianrt += CSWstlport
+RUNTIME_DEP_PKGS_CSWxapianrt += CSWzlib
 
+PACKAGES += CSWxapian-dev
+SPKG_DESC_CSWxapian-dev = Xapian development files
+PKGFILES_CSWxapian-dev = $(PKGFILES_DEVEL)
+PKGFILES_CSWxapian-dev += $(docdir)/xapian-core/apidoc/.*
+RUNTIME_DEP_PKGS_CSWxapian-dev += CSWxapian
+
 # If we compile with Sun Studio it is impossible to build the Ruby bindings as
-# Ruby is compiled with GCC.
-# Compiling with GCC4 yields the error "__sync_fetch_and_add_4 not found".
-GARCOMPILER = GCC3
+# TBD: Still true?
 
+# TBD: Is this necessary
 EXTRA_LD_FLAGS = -lm
 
-# GCC3 can not build amd64
-#BUILD64 = 1
-CONFIGURE_ARGS = $(DIRPATHS)
+BUILD64 = 1
 
-#BUILD_ARGS = AM_CXXFLAGS="-library=stlport4 -features=tmplife"
+# Can't we just pass this via EXTRA_CXXFLAGS?
+BUILD_ARGS = AM_CXXFLAGS="-library=stlport4 -features=tmplife"
 
-TEST_TARGET = check
-
 # We need the .la-file, otherwise xapian-config doesn't work
 MERGE_EXCLUDE_LIBTOOL =
 
-PKGFILES_CSWxapianrt = $(PKGFILES_RT)
-PKGFILES_CSWxapiandevel = $(PKGFILES_DEVEL)
-PKGFILES_CSWxapiandevel += $(docdir)/xapian-core/apidoc/.*
-
 include gar/category.mk

Modified: csw/mgar/pkg/xapian-core/trunk/checksums
===================================================================
--- csw/mgar/pkg/xapian-core/trunk/checksums	2011-07-15 12:49:23 UTC (rev 15061)
+++ csw/mgar/pkg/xapian-core/trunk/checksums	2011-07-15 16:04:06 UTC (rev 15062)
@@ -1 +1 @@
-f80a2f51b109e2a065bdcbf1ba03b808  download/xapian-core-1.0.11.tar.gz
+30f5cc976f063694f93cbdf9b83dc2ea  xapian-core-1.2.6.tar.gz

Added: csw/mgar/pkg/xapian-core/trunk/files/0001-Fix-include-issue-on-Solaris-9.patch
===================================================================
--- csw/mgar/pkg/xapian-core/trunk/files/0001-Fix-include-issue-on-Solaris-9.patch	                        (rev 0)
+++ csw/mgar/pkg/xapian-core/trunk/files/0001-Fix-include-issue-on-Solaris-9.patch	2011-07-15 16:04:06 UTC (rev 15062)
@@ -0,0 +1,24 @@
+From 257758591a51f3f361cf38b3e80d14044129c879 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Fri, 15 Jul 2011 17:55:41 +0200
+Subject: [PATCH] Fix include issue on Solaris 9
+
+---
+ tests/soaktest/soaktest.cc |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/tests/soaktest/soaktest.cc b/tests/soaktest/soaktest.cc
+index 2c742c3..37b1aba 100644
+--- a/tests/soaktest/soaktest.cc
++++ b/tests/soaktest/soaktest.cc
+@@ -28,6 +28,7 @@
+ #include "testsuite.h"
+ 
+ #include <cstdlib>
++#include <stdlib.h>
+ 
+ using namespace std;
+ 
+-- 
+1.7.6
+


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