From 836cd966d27e47a8232f9072a78116c5945d89dd Mon Sep 17 00:00:00 2001 From: jasper Date: Sun, 22 Mar 2009 15:53:21 +0000 Subject: [PATCH] - update sphinx to 0.9.8.1 - tweak regress maintainer timed-out --- textproc/sphinx/Makefile | 12 +++++++++--- textproc/sphinx/distinfo | 10 +++++----- textproc/sphinx/patches/patch-Makefile_in | 10 +++++----- textproc/sphinx/patches/patch-configure | 8 ++++---- 4 files changed, 23 insertions(+), 17 deletions(-) diff --git a/textproc/sphinx/Makefile b/textproc/sphinx/Makefile index 52c0c6f4f3b..85609c04570 100644 --- a/textproc/sphinx/Makefile +++ b/textproc/sphinx/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2008/07/21 12:42:21 bernd Exp $ +# $OpenBSD: Makefile,v 1.2 2009/03/22 15:53:21 jasper Exp $ COMMENT = free open-source SQL full-text search engine -DISTNAME = sphinx-0.9.8 +DISTNAME = sphinx-0.9.8.1 CATEGORIES = textproc HOMEPAGE = http://www.sphinxsearch.com/ @@ -15,7 +15,7 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -MASTER_SITES = http://www.sphinxsearch.com/downloads/ +MASTER_SITES = ${HOMEPAGE}/downloads/ MODULES = converters/libiconv @@ -38,6 +38,12 @@ LIB_DEPENDS += mysqlclient::databases/mysql WANTLIB += crypto ssl z .endif +# Needs php5 with pdo_mysql setup. +REGRESS_IS_INTERACTIVE= Yes +PHP_VERSION= 5 +REGRESS_DEPENDS=:php${PHP_VERSION}-mysql-*:www/php${PHP_VERSION}/extensions,-mysql \ + :php${PHP_VERSION}-pdo_mysql-*:www/php${PHP_VERSION}/extensions,-pdo_mysql + post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/sphinx ${INSTALL_DATA} ${WRKSRC}/doc/sphinx.txt ${PREFIX}/share/doc/sphinx diff --git a/textproc/sphinx/distinfo b/textproc/sphinx/distinfo index dc870c7621e..3e3f66ab544 100644 --- a/textproc/sphinx/distinfo +++ b/textproc/sphinx/distinfo @@ -1,5 +1,5 @@ -MD5 (sphinx-0.9.8.tar.gz) = NH5Ue3m3M3eNdVPt404KrA== -RMD160 (sphinx-0.9.8.tar.gz) = xXKSX3H6gBAKHETrRpVeOkMhUmI= -SHA1 (sphinx-0.9.8.tar.gz) = D4LlapGBs66u72XpuoL79vvmMtY= -SHA256 (sphinx-0.9.8.tar.gz) = ht6GFVD8exGbPL5jo0utMqx3H0TJMNIpd1rBJMg1cdk= -SIZE (sphinx-0.9.8.tar.gz) = 728864 +MD5 (sphinx-0.9.8.1.tar.gz) = QooU30H7Ql5mTZ4tYXjANw== +RMD160 (sphinx-0.9.8.1.tar.gz) = qyv+5MrVUiF+EyRJx91rEHHtW8k= +SHA1 (sphinx-0.9.8.1.tar.gz) = 7tTG9bMU+WXBnMqK69C22EfNNfk= +SHA256 (sphinx-0.9.8.1.tar.gz) = 72mytSOBFz2pK/Lfed/IxSccSz8VbDVrtO+CygNdwBM= +SIZE (sphinx-0.9.8.1.tar.gz) = 949660 diff --git a/textproc/sphinx/patches/patch-Makefile_in b/textproc/sphinx/patches/patch-Makefile_in index 3a000ec6793..2760b0c56d4 100644 --- a/textproc/sphinx/patches/patch-Makefile_in +++ b/textproc/sphinx/patches/patch-Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-Makefile_in,v 1.1.1.1 2008/07/21 12:42:21 bernd Exp $ ---- Makefile.in.orig Fri Dec 28 02:14:35 2007 -+++ Makefile.in Fri Feb 29 13:21:21 2008 -@@ -237,12 +237,12 @@ sphinx.conf.dist: $(top_builddir)/config.status $(srcd +$OpenBSD: patch-Makefile_in,v 1.2 2009/03/22 15:53:21 jasper Exp $ +--- Makefile.in.orig Sun Jun 8 10:57:36 2008 ++++ Makefile.in Fri Mar 20 12:04:00 2009 +@@ -239,12 +239,12 @@ sphinx-min.conf.dist: $(top_builddir)/config.status $( uninstall-info-am: install-sysconfDATA: $(sysconf_DATA) @$(NORMAL_INSTALL) @@ -17,7 +17,7 @@ $OpenBSD: patch-Makefile_in,v 1.1.1.1 2008/07/21 12:42:21 bernd Exp $ done uninstall-sysconfDATA: -@@ -617,7 +617,6 @@ uninstall-info: uninstall-info-recursive +@@ -619,7 +619,6 @@ uninstall-info: uninstall-info-recursive install-data-hook: diff --git a/textproc/sphinx/patches/patch-configure b/textproc/sphinx/patches/patch-configure index a6b5cfc5b93..cafca1b9efc 100644 --- a/textproc/sphinx/patches/patch-configure +++ b/textproc/sphinx/patches/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Mon Jan 28 00:09:03 2008 -+++ configure Fri Feb 29 13:12:06 2008 -@@ -7228,11 +7228,11 @@ extern "C" +--- configure.orig Wed Jul 9 16:29:17 2008 ++++ configure Fri Mar 20 12:04:00 2009 +@@ -7229,11 +7229,11 @@ extern "C" #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ @@ -14,7 +14,7 @@ ; return 0; } -@@ -8205,7 +8205,7 @@ main () +@@ -8219,7 +8219,7 @@ main () { const char * inbuf; iconv_t cd;