On 07/09/12 11:12, Giovanni Bechis wrote:
> On 05/25/12 18:38, Giovanni Bechis wrote:
>> Long overdue update to latest version, many improvements and bug fixes.
>> Comments ? Ok ?
>>
> New diff with fixed regression tests and index files in /var/sphinx instead
> of /var/data (you can change it in /etc/sphinx.conf).
> Maitainer timed out.
> Ok ?
typo in PLIST fixed
Giovanni
Index: Makefile
===================================================================
RCS file: /cvs/ports/textproc/sphinx/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile 16 Nov 2011 15:56:37 -0000 1.9
+++ Makefile 9 Jul 2012 09:19:11 -0000
@@ -2,8 +2,9 @@
COMMENT = free open-source SQL full-text search engine
-DISTNAME = sphinx-0.9.8.1
-REVISION = 4
+VERSION = 2.0.4
+DISTNAME = sphinx-${VERSION}-release
+PKGNAME = sphinx-${VERSION}
CATEGORIES = textproc
HOMEPAGE = http://www.sphinxsearch.com/
@@ -16,17 +17,19 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-MASTER_SITES = ${HOMEPAGE}/downloads/
+MASTER_SITES = ${HOMEPAGE}/files/
MODULES = converters/libiconv lang/php
MODPHP_BUILDDEP=No
MODPHP_RUNDEP=No
-WANTLIB = c expat m stdc++
+LOCALSTATEDIR= ${BASELOCALSTATEDIR}/sphinx
+SUBST_VARS= LOCALSTATEDIR
+WANTLIB = c expat m pthread stdc++
+CONFIGURE_ARGS = --with-unixodbc=no
CONFIGURE_STYLE = gnu
-CONFIGURE_ARGS = --with-mysql
CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
@@ -39,6 +42,7 @@ CONFIGURE_ARGS +=--with-pgsql \
LIB_DEPENDS += databases/postgresql
WANTLIB += pq
.else
+CONFIGURE_ARGS += --with-mysql
LIB_DEPENDS += databases/mysql
WANTLIB += crypto ssl z mysqlclient
.endif
@@ -46,7 +50,9 @@ WANTLIB += crypto ssl z mysqlclient
# Needs php with pdo_mysql setup.
REGRESS_IS_INTERACTIVE= Yes
REGRESS_DEPENDS=lang/php/${MODPHP_VERSION},-mysql \
- lang/php/${MODPHP_VERSION},-pdo_mysql
+ lang/php/${MODPHP_VERSION},-pdo_mysql \
+ databases/mysql,-server
+MAKE_ENV= MODPHP_BIN=${MODPHP_BIN}
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/sphinx
Index: distinfo
===================================================================
RCS file: /cvs/ports/textproc/sphinx/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo 22 Mar 2009 15:53:21 -0000 1.2
+++ distinfo 9 Jul 2012 09:19:11 -0000
@@ -1,5 +1,5 @@
-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
+MD5 (sphinx-2.0.4-release.tar.gz) = faTfPfPeyyTYxvuPR94dPQ==
+RMD160 (sphinx-2.0.4-release.tar.gz) = kOtF9acDkR6pN51DJZwXI+RjZAI=
+SHA1 (sphinx-2.0.4-release.tar.gz) = FoeU3PtGRKwC3M6GPASzUTmbCGM=
+SHA256 (sphinx-2.0.4-release.tar.gz) =
Q8S2KUnY+9K2upPiDLDzXBT0KL5QGvR+daPvcT76KIY=
+SIZE (sphinx-2.0.4-release.tar.gz) = 1938089
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/textproc/sphinx/patches/patch-Makefile_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-Makefile_in
--- patches/patch-Makefile_in 22 Mar 2009 15:53:21 -0000 1.2
+++ patches/patch-Makefile_in 9 Jul 2012 09:19:11 -0000
@@ -1,27 +1,22 @@
$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:
+--- Makefile.in.orig Sat Jun 11 16:19:49 2011
++++ Makefile.in Mon Jul 9 08:34:52 2012
+@@ -288,15 +288,15 @@ sphinx-min.conf.dist: $(top_builddir)/config.status $(
+ cd $(top_builddir) && $(SHELL) ./config.status $@
install-sysconfDATA: $(sysconf_DATA)
@$(NORMAL_INSTALL)
-- test -z "$(sysconfdir)" || $(mkdir_p) "$(DESTDIR)$(sysconfdir)"
-+ test -z "$(datadir)/examples/sphinx" || $(mkdir_p)
"$(DESTDIR)$(datadir)/examples/sphinx"
- @list='$(sysconf_DATA)'; for p in $$list; do \
+- test -z "$(sysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfdir)"
++ test -z "$(datadir)/examples/sphinx" || $(MKDIR_P)
"$(DESTDIR)$(datadir)/examples/sphinx"
+ @list='$(sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \
+ for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
-- echo " $(sysconfDATA_INSTALL) '$$d$$p'
'$(DESTDIR)$(sysconfdir)/$$f'"; \
-- $(sysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconfdir)/$$f"; \
-+ echo " $(sysconfDATA_INSTALL) '$$d$$p'
'$(DESTDIR)$(datadir)/examples/sphinx/$$f'"; \
-+ $(sysconfDATA_INSTALL) "$$d$$p"
"$(DESTDIR)$(datadir)/examples/sphinx/$$f"; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(sysconfdir)'"; \
+- $(INSTALL_DATA) $$files "$(DESTDIR)$(sysconfdir)" || exit $$?; \
++ echo " $(INSTALL_DATA) $$files
'$(DESTDIR)$(datadir)/examples/sphinx/'"; \
++ $(INSTALL_DATA) $$files "$(DESTDIR)$(datadir)/examples/sphinx/" ||
exit $$?; \
done
uninstall-sysconfDATA:
-@@ -619,7 +619,6 @@ uninstall-info: uninstall-info-recursive
-
-
- install-data-hook:
-- mkdir -p $(DESTDIR)$(localstatedir)/data && mkdir -p
$(DESTDIR)$(localstatedir)/log
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/textproc/sphinx/patches/patch-configure,v
retrieving revision 1.2
diff -u -p -r1.2 patch-configure
--- patches/patch-configure 22 Mar 2009 15:53:21 -0000 1.2
+++ patches/patch-configure 9 Jul 2012 09:19:11 -0000
@@ -1,20 +1,20 @@
---- configure.orig Wed Jul 9 16:29:17 2008
-+++ configure Fri Mar 20 12:04:00 2009
-@@ -7229,11 +7229,11 @@ extern "C"
+--- configure.orig Thu Mar 1 10:04:19 2012
++++ configure Mon Jul 9 08:31:19 2012
+@@ -5992,11 +5992,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ #ifdef __cplusplus
+ 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. */
-char iconv ();
+char libiconv ();
int
main ()
{
--iconv ();
-+libiconv ();
+-return iconv ();
++return libiconv ();
;
return 0;
}
-@@ -8219,7 +8219,7 @@ main ()
+@@ -7408,7 +7408,7 @@ main ()
{
const char * inbuf;
iconv_t cd;
Index: patches/patch-src_sphinxstd_cpp
===================================================================
RCS file: patches/patch-src_sphinxstd_cpp
diff -N patches/patch-src_sphinxstd_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_sphinxstd_cpp 9 Jul 2012 09:19:11 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+--- src/sphinxstd.cpp.orig Fri May 25 17:44:37 2012
++++ src/sphinxstd.cpp Fri May 25 17:44:59 2012
+@@ -742,12 +742,6 @@ CSphProcessSharedMutex::CSphProcessSharedMutex ( int i
+ m_sError.SetSprintf ( "pthread_mutexattr_init, errno=%d", iRes
);
+ return;
+ }
+- iRes = pthread_mutexattr_setpshared ( &tAttr, PTHREAD_PROCESS_SHARED );
+- if ( iRes )
+- {
+- m_sError.SetSprintf ( "pthread_mutexattr_setpshared, errno =
%d", iRes );
+- return;
+- }
+
+ CSphString sError, sWarning;
+ if ( !m_pStorage.Alloc ( sizeof(pthread_mutex_t) + iExtraSize, sError,
sWarning ) )
Index: patches/patch-test_Makefile
===================================================================
RCS file: patches/patch-test_Makefile
diff -N patches/patch-test_Makefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-test_Makefile 9 Jul 2012 09:19:11 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- test/Makefile.orig Fri May 25 18:22:09 2012
++++ test/Makefile Fri May 25 18:22:28 2012
+@@ -7,7 +7,7 @@ info:
+ dist:
+
+ check:
+- php ubertest.php t -u test
++ ${MODPHP_BIN} ubertest.php t -u test
+
+ clean:
+ sh clean.sh
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/textproc/sphinx/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 21 Jul 2008 12:42:21 -0000 1.1.1.1
+++ pkg/PLIST 9 Jul 2012 09:19:11 -0000
@@ -1,8 +1,14 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2008/07/21 12:42:21 bernd Exp $
@bin bin/indexer
+@bin bin/indextool
@bin bin/search
@bin bin/searchd
@bin bin/spelldump
+@man man/man1/indexer.1
+@man man/man1/indextool.1
+@man man/man1/search.1
+@man man/man1/searchd.1
+@man man/man1/spelldump.1
share/doc/sphinx/
share/doc/sphinx/sphinx.txt
share/examples/sphinx/
@@ -10,3 +16,6 @@ share/examples/sphinx/example.sql
share/examples/sphinx/sphinx-min.conf.dist
share/examples/sphinx/sphinx.conf.dist
@sample ${SYSCONFDIR}/sphinx.conf
+@sample ${LOCALSTATEDIR}/
+@sample ${LOCALSTATEDIR}/data/
+@sample ${LOCALSTATEDIR}/log/
