View | Details | Raw Unified | Return to bug 113135
Collapse All | Expand All

(-)sphinxsearch/Makefile (+1 lines)
Lines 9-14 Link Here
9
9
10
PORTNAME=	sphinxsearch
10
PORTNAME=	sphinxsearch
11
PORTVERSION=	0.9.7
11
PORTVERSION=	0.9.7
12
PORTREVISION=	1
12
CATEGORIES=	textproc databases
13
CATEGORIES=	textproc databases
13
MASTER_SITES=	http://www.sphinxsearch.com/downloads/
14
MASTER_SITES=	http://www.sphinxsearch.com/downloads/
14
DISTNAME=	sphinx-${PORTVERSION}
15
DISTNAME=	sphinx-${PORTVERSION}
(-)sphinxsearch/files/patch-src-sphinxsearch.h (-6 / +8 lines)
Lines 1-11 Link Here
1
--- src/sphinxstd.h.orig	Sun Apr 15 20:16:11 2007
1
--- src/sphinxstd.h.orig	Tue May 29 19:50:47 2007
2
+++ src/sphinxstd.h	Sun Apr 15 20:17:25 2007
2
+++ src/sphinxstd.h	Tue May 29 19:52:23 2007
3
@@ -57,7 +57,7 @@
3
@@ -57,9 +57,7 @@
4
 #error "Internal 64-bit integer macros already defined."
4
 #error "Internal 64-bit integer macros already defined."
5
 #endif
5
 #endif
6
 
6
 
7
-#if __STDC_VERSION__>=199901L || __STDC_VERSION>=199901L || defined(_STDINT_H) || defined(_STDINT_H_)
7
-#if __STDC_VERSION__>=199901L || __STDC_VERSION>=199901L || defined(_STDINT_H) || defined(_STDINT_H_)
8
+#if __STDC_VERSION__>=199901L || __STDC_VERSION>=199901L || defined(_STDINT_H) || defined(_STDINT_H_) || defined(_SYS_STDINT_H_)
8
-#include <stdint.h>
9
 #include <stdint.h>
9
-#else // no stdint.h
10
 #else // no stdint.h
10
+#if !HAVE_STDINT_H
11
 
11
 
12
 #if defined(_MSC_VER)
13
 typedef __int64 int64_t;
(-)sphinxsearch/files/sphinxsearch.sh.in (-10 / +18 lines)
Lines 30-50 Link Here
30
name=%%PORTNAME%%
30
name=%%PORTNAME%%
31
rcvar=`set_rcvar`
31
rcvar=`set_rcvar`
32
32
33
%%PORTNAME%%_enable=${%%PORTNAME%%_enable-"NO"}
33
load_rc_config ${name}
34
%%PORTNAME%%_conffile=${%%PORTNAME%%_conffile-"%%CFGFILE%%"}
35
%%PORTNAME%%_pidfile=${%%PORTNAME%%_pidfile-"%%SPHINX_RUN%%/searchd.pid"}
36
%%PORTNAME%%_user=${%%PORTNAME%%_user-"%%SPHINX_USR%%"}
37
%%PORTNAME%%_group=${%%PORTNAME%%_group-"%%SPHINX_GRP%%"}
38
%%PORTNAME%%_logdir=${%%PORTNAME%%_logdir-"%%SPHINX_LOG%%"}
39
34
40
start_precmd="create_dirs"
35
: ${%%PORTNAME%%_enable="NO"}
36
: ${%%PORTNAME%%_conffile="%%CFGFILE%%"}
37
: ${%%PORTNAME%%_pidfile="%%SPHINX_RUN%%/searchd.pid"}
38
: ${%%PORTNAME%%_user="%%SPHINX_USR%%"}
39
: ${%%PORTNAME%%_group="%%SPHINX_GRP%%"}
40
: ${%%PORTNAME%%_logdir="%%SPHINX_LOG%%"}
41
41
42
command=%%PREFIX%%/sbin/searchd
42
command=%%PREFIX%%/sbin/searchd
43
pidfile=${%%PORTNAME%%_pidfile}
43
pidfile=${%%PORTNAME%%_pidfile}
44
required_files=${%%PORTNAME%%_conffile}
44
required_files=${%%PORTNAME%%_conffile}
45
%%PORTNAME%%_flags="--config ${%%PORTNAME%%_conffile}"
46
45
47
create_dirs ()
46
%%PORTNAME%%_precmd ()
48
{
47
{
49
    piddir=$(dirname ${%%PORTNAME%%_pidfile})
48
    piddir=$(dirname ${%%PORTNAME%%_pidfile})
50
    if [ ! -d ${piddir} ]; then
49
    if [ ! -d ${piddir} ]; then
Lines 58-62 Link Here
58
    fi
57
    fi
59
}
58
}
60
59
61
load_rc_config ${name}
60
case "${%%PORTNAME%%_flags}" in
61
    *--config\ *)
62
    echo "Warning \$%%PORTNAME%%_flags includes --config option." \
63
	"Please use \$%%PORTNAME%%_conffile instead."
64
    ;;
65
    *)
66
    %%PORTNAME%%_flags="--config ${%%PORTNAME%%_conffile} ${%%PORTNAME%%_flags}"
67
    ;;
68
esac
69
62
run_rc_command "$1"
70
run_rc_command "$1"

Return to bug 113135