Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (b92dab9e05450166836565fef6a1f287613713c9)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (b92dab9e05450166836565fef6a1f287613713c9)
  • Date: Wed, 28 Mar 2012 09:20:26 -0500

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

dev/null |binary
utils/sphinx/BUILD | 6 ++++++
utils/sphinx/CONFIGURE | 7 +++++++
utils/sphinx/DEPENDS | 14 +++++++-------
utils/sphinx/DETAILS | 10 +++++-----
utils/sphinx/HISTORY | 9 +++++++++
utils/sphinx/PRE_BUILD | 8 --------
utils/sphinx/firebird.patch.bz2 | 0
8 files changed, 34 insertions(+), 20 deletions(-)

New commits:
commit b92dab9e05450166836565fef6a1f287613713c9
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

sphinx: => 2.0.4

diff --git a/utils/sphinx/BUILD b/utils/sphinx/BUILD
new file mode 100755
index 0000000..0d48e79
--- /dev/null
+++ b/utils/sphinx/BUILD
@@ -0,0 +1,6 @@
+OPTS="--sysconfdir=$INSTALL_ROOT/etc/$SPELL \
+ --localstatedir=$INSTALL_ROOT/var/state/$SPELL \
+ $SPHINX_OPTS \
+ $OPTS" &&
+
+default_build
diff --git a/utils/sphinx/CONFIGURE b/utils/sphinx/CONFIGURE
new file mode 100755
index 0000000..b701caa
--- /dev/null
+++ b/utils/sphinx/CONFIGURE
@@ -0,0 +1,7 @@
+config_query_option SPHINX_OPTS "Use 64-bit document and word IDs?" n \
+ "--enable-id64" \
+ "--disable-id64" &&
+
+config_query_option SPHINX_OPTS "Compile slower debug version?" n \
+ "--with-debug" \
+ "--without-debug"
diff --git a/utils/sphinx/DEPENDS b/utils/sphinx/DEPENDS
index 02541b5..2735d15 100755
--- a/utils/sphinx/DEPENDS
+++ b/utils/sphinx/DEPENDS
@@ -1,11 +1,6 @@
depends -sub CXX gcc &&

-optional_depends expat "" "" "for XML parser usage" &&
-
-optional_depends firebird \
- "--with-firebird --with-firebird-includes=/usr/include
--with-firebird-libs=/usr/lib" \
- "--without-firebird" \
- "for Firebird database support" &&
+optional_depends expat "" "" "for XML parser usage (xmlpipe2)" &&

optional_depends ODBC-MGR \
"--with-unixodbc" \
@@ -20,4 +15,9 @@ optional_depends MYSQL \
optional_depends postgresql \
"--with-pgsql" \
"--without-pgsql" \
- "for PostgreSQL database support"
+ "for PostgreSQL database support" &&
+
+optional_depends SYSTEM-LOGGER \
+ "--with-syslog" \
+ "--without-syslog" \
+ "to use syslog for logging"
diff --git a/utils/sphinx/DETAILS b/utils/sphinx/DETAILS
index 74339b3..d6debc4 100755
--- a/utils/sphinx/DETAILS
+++ b/utils/sphinx/DETAILS
@@ -1,10 +1,10 @@
SPELL=sphinx
- VERSION=0.9.9
-
SOURCE_HASH=sha512:bf1f6b3429beac9336ed975137b9cc582541357df487ae97f407589458fa4cc4f3a797c868fd505c6b4e97a73b30a0f7f9c7ab6b3d8685ba173fde6d1d5383c2
- SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ VERSION=2.0.4
+ SOURCE=$SPELL-$VERSION-release.tar.gz
+
SOURCE_HASH=sha512:34bc6718328f9aad3ad8f081c67bee292af70827cc6d27e9f69198a5a5245fb2d5d76467c1bbea6ff1b4b45b249c302e844c7ce3c2976b103b80fc6a8013f567
WEB_SITE=http://www.sphinxsearch.com/
- SOURCE_URL[0]=$WEB_SITE/downloads/$SOURCE
+ SOURCE_URL[0]=$WEB_SITE/files/$SOURCE
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION-release"
LICENSE[0]=GPL
ENTERED=20081030
KEYWORDS="database search"
diff --git a/utils/sphinx/HISTORY b/utils/sphinx/HISTORY
index fd3c987..e5e38dc 100644
--- a/utils/sphinx/HISTORY
+++ b/utils/sphinx/HISTORY
@@ -1,3 +1,12 @@
+2012-03-28 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.0.4 stable release; renewed source url
and
+ tarball
+ * DEPENDS: added syslog opt dep
+ * CONFIGURE: added, for 2 configure options
+ * BUILD: added, to use SPHINX_OPTS and proper paths
+ * PRE_BUILD: removed
+ * firebird.patch.bz2: removed, dropped unsupported 2008 version
(0.9.8.1)
+
2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: changed dependency on g++ to dependency on gcc with
sub-depends on CXX (scripted)
diff --git a/utils/sphinx/PRE_BUILD b/utils/sphinx/PRE_BUILD
deleted file mode 100755
index 3f7f7a3..0000000
--- a/utils/sphinx/PRE_BUILD
+++ /dev/null
@@ -1,8 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-if is_depends_enabled $SPELL firebird;then
-# add support for firebird
-bzcat $SPELL_DIRECTORY/firebird.patch.bz2 | patch -p1 &&
-# and regenerate the config files
-autoreconf
-fi
diff --git a/utils/sphinx/firebird.patch.bz2 b/utils/sphinx/firebird.patch.bz2
deleted file mode 100644
index afbc953..0000000
Binary files a/utils/sphinx/firebird.patch.bz2 and /dev/null differ



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (b92dab9e05450166836565fef6a1f287613713c9), Vlad Glagolev, 03/28/2012

Archive powered by MHonArc 2.6.24.

Top of Page