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

[dmichelsen at users.sourceforge.net]

Revision: 22032
          http://gar.svn.sourceforge.net/gar/?rev=22032&view=rev
Author:   dmichelsen
Date:     2013-09-26 14:31:34 +0000 (Thu, 26 Sep 2013)
Log Message:
-----------
xapian-core/trunk: Cleanup, fix dependencies

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

Modified: csw/mgar/pkg/xapian-core/trunk/Makefile
===================================================================
--- csw/mgar/pkg/xapian-core/trunk/Makefile	2013-09-26 13:00:04 UTC (rev 22031)
+++ csw/mgar/pkg/xapian-core/trunk/Makefile	2013-09-26 14:31:34 UTC (rev 22032)
@@ -10,16 +10,10 @@
 endef
 
 MASTER_SITES = http://oligarchy.co.uk/xapian/$(VERSION)/
+DISTFILES += $(NAME)-$(VERSION).tar.gz
 
-DISTFILES  = $(NAME)-$(VERSION).tar.gz
+PATCHFILES += 0002-Do-not-strip-norunpath-on-libtool.patch
 
-# PATCHFILES += 0002-Do-not-strip-norunpath-on-libtool.patch
-
-# Use patch until this is fixed:
-#   http://trac.xapian.org/ticket/626
-#PATCHFILES += 0001-Check-for-explicit-value-or-HAVE_UUID_UNPARSE_LOWER-.patch
-# PATCHFILES += 0001-Do-not-make-uuid_unparse_lower-inline.patch
-
 # This is strange and needs further examination
 PATCHFILES += 0002-Somehow-round-is-missing-in-cmath.patch
 
@@ -29,36 +23,30 @@
 
 PATCHFILES += 0001-Force-float-to-disambiguise-float-double-invocation-.patch
 
-#GARCOMPILER = GNU
-
-
 VENDOR_URL = http://xapian.org/
 
 PACKAGES += CSWxapian
 SPKG_DESC_CSWxapian = Xapian search engine binaries
 # PKGFILES is catchall
-RUNTIME_DEP_PKGS_CSWxapian += CSWlibxapian22
+RUNTIME_DEP_PKGS_CSWxapian += CSWlibxapian1-3-1
 RUNTIME_DEP_PKGS_CSWxapian += CSWlibstlport1
 
-PACKAGES += CSWlibxapian22
-SPKG_DESC_CSWlibxapian22 = An open source search engine library, libxapian.so.22
-PKGFILES_CSWlibxapian22 = $(call pkgfiles_lib,libxapian.so.22)
-RUNTIME_DEP_PKGS_CSWlibxapian22 += CSWlibstlport1
-RUNTIME_DEP_PKGS_CSWlibxapian22 += CSWlibz1
+PACKAGES += CSWlibxapian1-3-1
+SPKG_DESC_CSWlibxapian1-3-1 = An open source search engine library, libxapian-1.3.so.1
+PKGFILES_CSWlibxapian1-3-1 = $(call pkgfiles_lib,libxapian-1.3.so.1)
+RUNTIME_DEP_PKGS_CSWlibxapian1-3-1 += CSWlibstlport1
+RUNTIME_DEP_PKGS_CSWlibxapian1-3-1 += CSWlibz1
+RUNTIME_DEP_PKGS_CSWlibxapian1-3-1 += CSWlibuuid1
 
 PACKAGES += CSWlibxapian-dev
-SPKG_DESC_CSWlibxapian-dev = Xapian development files for libxapian.so.22
+SPKG_DESC_CSWlibxapian-dev = Xapian development files for libxapian-1.3.so.1
 PKGFILES_CSWlibxapian-dev = $(PKGFILES_DEVEL)
 PKGFILES_CSWlibxapian-dev += $(docdir)/xapian-core/apidoc/.*
 PKGFILES_CSWlibxapian-dev += .*\.cmake
-RUNTIME_DEP_PKGS_CSWlibxapian-dev += CSWlibxapian22
+RUNTIME_DEP_PKGS_CSWlibxapian-dev += CSWlibxapian1-3-1
 
-# EXTRA_LD_FLAGS += -norunpath -lCrun
+EXTRA_LD_FLAGS += -norunpath
 
-# We don't need it and if defined the test breaks
-# LD_OPTIONS = $(LINKER_MAPS) $(LINKER_DIRECT) $(LINKER_IGNORE)
-# EXTRA_LINKER_FLAGS = $(RUNPATH_LINKER_FLAGS)
-
 # libuuid.so must be searched in /opt/csw/lib
 EXTRA_CXXFLAGS += -L$(libdir)
 
@@ -69,7 +57,3 @@
 CHECKPKG_OVERRIDES_CSWxapian += file-with-bad-content|/usr/local|root/opt/csw/share/doc/xapian-core/install.html
 
 include gar/category.mk
-
-#post-patch:
-#	cd $(WORKSRC) && autoreconf -fi
-#	@$(MAKECOOKIE)

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