Attachment #58634 for bug #88313

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

Lines 7-12 Link Here

(-)cyrus-smlacapd/Makefile (-4 / +6 lines)
7		7
8	PORTNAME= cyrus-smlacapd	8	PORTNAME= cyrus-smlacapd
9	PORTVERSION= 0.5	9	PORTVERSION= 0.5
		10	PORTREVISION= 1
10	CATEGORIES= databases mail	11	CATEGORIES= databases mail
11	MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \	12	MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
12	ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/	13	ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/
Lines 24-34 Link Here
24		25
25	SUB_FILES= pkg-message	26	SUB_FILES= pkg-message
26	PKGMESSAGE= ${WRKDIR}/pkg-message	27	PKGMESSAGE= ${WRKDIR}/pkg-message
		28	USE_RC_SUBR= yes
		29	RCSCRIPT= ${PREFIX}/etc/rc.d/cyrus_smlacapd_backend.sample
27		30
28	ACAPD_DOC= ${PREFIX}/share/doc/acapd	31	ACAPD_DOC= ${PREFIX}/share/doc/acapd
29		32
30	pre-configure:	33	pre-configure:
31	${REINPLACE_CMD} -e "s#sasl.h#sasl1/sasl.h#" ${WRKSRC}/configure
32	${REINPLACE_CMD} -e "s#<sasl.h>#<sasl1/sasl.h>#" \	34	${REINPLACE_CMD} -e "s#<sasl.h>#<sasl1/sasl.h>#" \
33	${WRKSRC}/actest/actest.c ${WRKSRC}/api/acap.c \	35	${WRKSRC}/actest/actest.c ${WRKSRC}/api/acap.c \
34	${WRKSRC}/api/acap.h ${WRKSRC}/frontend/frontend.c \	36	${WRKSRC}/api/acap.h ${WRKSRC}/frontend/frontend.c \
Lines 40-48 Link Here
40		42
41	post-install:	43	post-install:
42	${INSTALL} ${LOCALBASE}/lib/sml-nj/bin/.run/run.x86-freebsd ${PREFIX}/cyrus/bin	44	${INSTALL} ${LOCALBASE}/lib/sml-nj/bin/.run/run.x86-freebsd ${PREFIX}/cyrus/bin
43	${INSTALL_SCRIPT} ${FILESDIR}/cyrus_smlacapd_backend \	45	@ ${SED} -e "s\|%%PREFIX%%\|${PREFIX}\|g; s\|%%RC_SUBR%%\|${RC_SUBR}\|g" \
44	${PREFIX}/etc/rc.d/cyrus_smlacapd_backend.sample	46	< ${FILESDIR}/cyrus_smlacapd_backend \
45		47	> ${RCSCRIPT}
46	${MKDIR} ${ACAPD_DOC}	48	${MKDIR} ${ACAPD_DOC}
47	${INSTALL_DATA} ${FILESDIR}/acapd.conf-sample ${ACAPD_DOC}	49	${INSTALL_DATA} ${FILESDIR}/acapd.conf-sample ${ACAPD_DOC}
48	.if !defined(NOPORTDOCS)	50	.if !defined(NOPORTDOCS)




# Add the following line to /etc/rc.conf to enable cyrus_smlacapd_backend:
# cyrus_smlacapd_backend_enable="YES"
#
prefix=%%PREFIX%%
cyrus=${prefix}/cyrus
. %%RC_SUBR$$

name="cyrus_smlacapd_backend"
rcvar=`set_rcvar`

[ -z "$cyrus_smlacapd_backend_enable" ]	&& cyrus_smlacapd_backend_enable="NO"
[ -z "$cyrus_smlacapd_backend_runtime" ]	&& cyrus_smlacapd_backend_runtime="${cyrus}/bin/run.x86-freebsd"
[ -z "$cyrus_smlacapd_backend_heap" ]	&& cyrus_smlacapd_backend_heap="${cyrus}bin/backend.x86-bsd"

required_dirs="/var/acap /var/spool/acap"
pidfile=/var/run/cyrus_smlacapd_backend.pid




--- actest/Makefile.in.orig	Thu Apr 20 03:32:58 2000
+++ actest/Makefile.in	Tue Nov  1 01:38:36 2005
@@ -37,16 +37,16 @@
 RANLIB = @RANLIB@
 
 DEFS = @DEFS@ @LOCALDEFS@
-CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib
+CPPFLAGS = -I${PREFIX}/include -I$(srcdir) -I$(srcdir)/../lib
 DEPLIBS = ../lib/libcyrus.a @DEPLIBS@
 LIBS = @LIBS@ $(DEPLIBS) @LIB_SASL@
 
 CFLAGS = @CFLAGS@
 LDFLAGS = @LDFLAGS@ @CFLAGS@
 
-prefix = /usr/local
+prefix = ${PREFIX}
 exec_prefix = ${prefix}
-cyrus_prefix = /usr/cyrus
+cyrus_prefix = ${prefix}/cyrus

Lines 1-11 Link Here

(-)cyrus-smlacapd/files/patch-backend-Makefile.in (-2 / +2 lines)
1	--- backend/Makefile.in.orig Wed Mar 8 22:51:42 2000	1	--- backend/Makefile.in.orig Wed Mar 8 22:51:42 2000
2	+++ backend/Makefile.in Tue May 11 03:54:34 2004	2	+++ backend/Makefile.in Tue Nov 1 01:40:19 2005
3	@@ -48,7 +48,8 @@	3	@@ -48,7 +48,8 @@
4	INSTALL = @INSTALL@	4	INSTALL = @INSTALL@
5		5
6	SML=@SMLNJ@	6	SML=@SMLNJ@
7	-cyrus_prefix = /usr/cyrus	7	-cyrus_prefix = /usr/cyrus
8	+prefix = /usr/local	8	+prefix = ${PREFIX}
9	+cyrus_prefix = ${prefix}/cyrus	9	+cyrus_prefix = ${prefix}/cyrus
10		10
11	PROGS = backend	11	PROGS = backend




--- configure.orig	Tue Nov  1 08:56:54 2005
+++ configure	Tue Nov  1 09:00:45 2005
@@ -1286,13 +1286,13 @@
 fi
 
 echo "$ac_t""$andrew_runpath_switch" 1>&6
-CPPFLAGS="-I/usr/local/include ${CPPFLAGS}"
+CPPFLAGS="-I${PREFIX}/include ${CPPFLAGS}"
 
   # this is CMU ADD LIBPATH
   if test "$andrew_runpath_switch" = "none" ; then
-	LDFLAGS="-L"/usr/local/lib" ${LDFLAGS}"
+	LDFLAGS="-L"${PREFIX}/lib" ${LDFLAGS}"
   else
-	LDFLAGS="-L"/usr/local/lib" $andrew_runpath_switch"/usr/local/lib" ${LDFLAGS}"
+	LDFLAGS="-L"${PREFIX}/lib" $andrew_runpath_switch"/usr/local/lib" ${LDFLAGS}"
   fi
 
 
@@ -2779,16 +2779,16 @@
 	  LDFLAGS="${cmu_saved_LDFLAGS} -L${ac_cv_sasl_where_lib}"
 	fi
 
-	ac_safe=`echo "sasl.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for sasl.h""... $ac_c" 1>&6
-echo "configure:2785: checking for sasl.h" >&5
+	ac_safe=`echo "sasl1/sasl.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for sasl1/sasl.h""... $ac_c" 1>&6
+echo "configure:2785: checking for sasl1/sasl.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
 #line 2790 "configure"
 #include "confdefs.h"
-#include <sasl.h>
+#include <sasl1/sasl.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 { (eval echo configure:2795: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }




--- frontend/Makefile.in.orig	Fri Mar  3 06:05:00 2000
+++ frontend/Makefile.in	Tue Nov  1 01:41:17 2005
@@ -37,16 +37,16 @@
 RANLIB = @RANLIB@
 
 DEFS = @DEFS@ @LOCALDEFS@
-CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib
+CPPFLAGS = -I${PREFIX}/include -I$(srcdir) -I$(srcdir)/../lib
 DEPLIBS = ../lib/libcyrus.a @DEPLIBS@
 LIBS = @LIBS@ $(DEPLIBS) @LIB_SASL@
 
 CFLAGS = @CFLAGS@
 LDFLAGS = @LDFLAGS@ @CFLAGS@
 
-prefix = /usr/local
+prefix = ${PREFIX}
 exec_prefix = ${prefix}
-cyrus_prefix = /usr/cyrus
+cyrus_prefix = ${prefix}/cyrus

Return to bug 88313

Lines 11-24 Link Here

(-)cyrus-smlacapd/files/cyrus_smlacapd_backend (-3 / +5 lines)
11	# Add the following line to /etc/rc.conf to enable cyrus_smlacapd_backend:	11	# Add the following line to /etc/rc.conf to enable cyrus_smlacapd_backend:
12	# cyrus_smlacapd_backend_enable="YES"	12	# cyrus_smlacapd_backend_enable="YES"
13	#	13	#
14	. /etc/rc.subr	14	prefix=%%PREFIX%%
		15	cyrus=${prefix}/cyrus
		16	. %%RC_SUBR$$
15		17
16	name="cyrus_smlacapd_backend"	18	name="cyrus_smlacapd_backend"
17	rcvar=`set_rcvar`	19	rcvar=`set_rcvar`
18		20
19	[ -z "$cyrus_smlacapd_backend_enable" ] && cyrus_smlacapd_backend_enable="NO"	21	[ -z "$cyrus_smlacapd_backend_enable" ] && cyrus_smlacapd_backend_enable="NO"
20	[ -z "$cyrus_smlacapd_backend_runtime" ] && cyrus_smlacapd_backend_runtime="/usr/local/cyrus/bin/run.x86-freebsd"	22	[ -z "$cyrus_smlacapd_backend_runtime" ] && cyrus_smlacapd_backend_runtime="${cyrus}/bin/run.x86-freebsd"
21	[ -z "$cyrus_smlacapd_backend_heap" ] && cyrus_smlacapd_backend_heap="/usr/local/cyrus/bin/backend.x86-bsd"	23	[ -z "$cyrus_smlacapd_backend_heap" ] && cyrus_smlacapd_backend_heap="${cyrus}bin/backend.x86-bsd"
22		24
23	required_dirs="/var/acap /var/spool/acap"	25	required_dirs="/var/acap /var/spool/acap"
24	pidfile=/var/run/cyrus_smlacapd_backend.pid	26	pidfile=/var/run/cyrus_smlacapd_backend.pid

Lines 1-17 Link Here

(-)cyrus-smlacapd/files/patch-actest-Makefile.in (-5 / +7 lines)
1	--- actest/Makefile.in.orig Thu Apr 20 03:32:58 2000	1	--- actest/Makefile.in.orig Thu Apr 20 03:32:58 2000
2	+++ actest/Makefile.in Tue May 11 03:54:34 2004	2	+++ actest/Makefile.in Tue Nov 1 01:38:36 2005
3	@@ -37,7 +37,7 @@	3	@@ -37,16 +37,16 @@
4	RANLIB = @RANLIB@	4	RANLIB = @RANLIB@
5		5
6	DEFS = @DEFS@ @LOCALDEFS@	6	DEFS = @DEFS@ @LOCALDEFS@
7	-CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib	7	-CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib
8	+CPPFLAGS = -I/usr/local/include -I$(srcdir) -I$(srcdir)/../lib	8	+CPPFLAGS = -I${PREFIX}/include -I$(srcdir) -I$(srcdir)/../lib
9	DEPLIBS = ../lib/libcyrus.a @DEPLIBS@	9	DEPLIBS = ../lib/libcyrus.a @DEPLIBS@
10	LIBS = @LIBS@ $(DEPLIBS) @LIB_SASL@	10	LIBS = @LIBS@ $(DEPLIBS) @LIB_SASL@
11		11
12	@@ -46,7 +46,7 @@	12	CFLAGS = @CFLAGS@
		13	LDFLAGS = @LDFLAGS@ @CFLAGS@
13		14
14	prefix = /usr/local	15	-prefix = /usr/local
		16	+prefix = ${PREFIX}
15	exec_prefix = ${prefix}	17	exec_prefix = ${prefix}
16	-cyrus_prefix = /usr/cyrus	18	-cyrus_prefix = /usr/cyrus
17	+cyrus_prefix = ${prefix}/cyrus	19	+cyrus_prefix = ${prefix}/cyrus

Line 0 Link Here

(-)cyrus-smlacapd/files/patch-configure (+40 lines)
	1	--- configure.orig Tue Nov 1 08:56:54 2005
	2	+++ configure Tue Nov 1 09:00:45 2005
	3	@@ -1286,13 +1286,13 @@
	4	fi
	5
	6	echo "$ac_t""$andrew_runpath_switch" 1>&6
	7	-CPPFLAGS="-I/usr/local/include ${CPPFLAGS}"
	8	+CPPFLAGS="-I${PREFIX}/include ${CPPFLAGS}"
	9
	10	# this is CMU ADD LIBPATH
	11	if test "$andrew_runpath_switch" = "none" ; then
	12	- LDFLAGS="-L"/usr/local/lib" ${LDFLAGS}"
	13	+ LDFLAGS="-L"${PREFIX}/lib" ${LDFLAGS}"
	14	else
	15	- LDFLAGS="-L"/usr/local/lib" $andrew_runpath_switch"/usr/local/lib" ${LDFLAGS}"
	16	+ LDFLAGS="-L"${PREFIX}/lib" $andrew_runpath_switch"/usr/local/lib" ${LDFLAGS}"
	17	fi
	18
	19
	20	@@ -2779,16 +2779,16 @@
	21	LDFLAGS="${cmu_saved_LDFLAGS} -L${ac_cv_sasl_where_lib}"
	22	fi
	23
	24	- ac_safe=`echo "sasl.h" \| sed 'y%./+-%__p_%'`
	25	-echo $ac_n "checking for sasl.h""... $ac_c" 1>&6
	26	-echo "configure:2785: checking for sasl.h" >&5
	27	+ ac_safe=`echo "sasl1/sasl.h" \| sed 'y%./+-%__p_%'`
	28	+echo $ac_n "checking for sasl1/sasl.h""... $ac_c" 1>&6
	29	+echo "configure:2785: checking for sasl1/sasl.h" >&5
	30	if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
	31	echo $ac_n "(cached) $ac_c" 1>&6
	32	else
	33	cat > conftest.$ac_ext <<EOF
	34	#line 2790 "configure"
	35	#include "confdefs.h"
	36	-#include <sasl.h>
	37	+#include <sasl1/sasl.h>
	38	EOF
	39	ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
	40	{ (eval echo configure:2795: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }

Lines 1-17 Link Here

(-)cyrus-smlacapd/files/patch-frontend-Makefile.in (-5 / +7 lines)
1	--- frontend/Makefile.in.orig Fri Mar 3 06:05:00 2000	1	--- frontend/Makefile.in.orig Fri Mar 3 06:05:00 2000
2	+++ frontend/Makefile.in Tue May 11 03:54:34 2004	2	+++ frontend/Makefile.in Tue Nov 1 01:41:17 2005
3	@@ -37,7 +37,7 @@	3	@@ -37,16 +37,16 @@
4	RANLIB = @RANLIB@	4	RANLIB = @RANLIB@
5		5
6	DEFS = @DEFS@ @LOCALDEFS@	6	DEFS = @DEFS@ @LOCALDEFS@
7	-CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib	7	-CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib
8	+CPPFLAGS = -I/usr/local/include -I$(srcdir) -I$(srcdir)/../lib	8	+CPPFLAGS = -I${PREFIX}/include -I$(srcdir) -I$(srcdir)/../lib
9	DEPLIBS = ../lib/libcyrus.a @DEPLIBS@	9	DEPLIBS = ../lib/libcyrus.a @DEPLIBS@
10	LIBS = @LIBS@ $(DEPLIBS) @LIB_SASL@	10	LIBS = @LIBS@ $(DEPLIBS) @LIB_SASL@
11		11
12	@@ -46,7 +46,7 @@	12	CFLAGS = @CFLAGS@
		13	LDFLAGS = @LDFLAGS@ @CFLAGS@
13		14
14	prefix = /usr/local	15	-prefix = /usr/local
		16	+prefix = ${PREFIX}
15	exec_prefix = ${prefix}	17	exec_prefix = ${prefix}
16	-cyrus_prefix = /usr/cyrus	18	-cyrus_prefix = /usr/cyrus
17	+cyrus_prefix = ${prefix}/cyrus	19	+cyrus_prefix = ${prefix}/cyrus