Index: head/databases/cyrus-smlacapd/Makefile
===================================================================
--- head/databases/cyrus-smlacapd/Makefile	(revision 147083)
+++ head/databases/cyrus-smlacapd/Makefile	(revision 147084)
@@ -1,65 +1,63 @@
 # New ports collection makefile for:		cyrus-smlacapd
 # Date created:					May 11th 2004
 # Whom:						g.gonter@ieee.org
 #
 # $FreeBSD$
 #
 
 PORTNAME=	cyrus-smlacapd
 PORTVERSION=	0.5
+PORTREVISION=	1
 CATEGORIES=	databases mail
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 		ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/
 
 MAINTAINER=	g.gonter@ieee.org
 COMMENT=	The cyrus ACAP (Application Configuration Access Protocol) server
 
 LIB_DEPENDS=	sasl.8:${PORTSDIR}/security/cyrus-sasl
 BUILD_DEPENDS=	sml:${PORTSDIR}/lang/sml-nj
 
 USE_REINPLACE=	YES
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS=	--with-cyrus-prefix=${PREFIX}/cyrus \
 		--with-sasldir=${LOCALBASE}/lib
 
 SUB_FILES=	pkg-message
-PKGMESSAGE=	${WRKDIR}/pkg-message
+USE_RC_SUBR=	cyrus_smlacapd_backend.sh
 
 ACAPD_DOC=	${PREFIX}/share/doc/acapd
 
 pre-configure:
-	${REINPLACE_CMD} -e "s#sasl.h#sasl1/sasl.h#" ${WRKSRC}/configure
+	${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/configure
 	${REINPLACE_CMD} -e "s#<sasl.h>#<sasl1/sasl.h>#" \
 		${WRKSRC}/actest/actest.c ${WRKSRC}/api/acap.c \
 		${WRKSRC}/api/acap.h ${WRKSRC}/frontend/frontend.c \
 		${WRKSRC}/lib/imclient.c ${WRKSRC}/lib/prot.h
 
 pre-su-install:
 		${MKDIR} -m 0755 -p ${PREFIX}/cyrus
 		${MKDIR} -m 0755 -p ${PREFIX}/include/cyrus
 
 post-install:
 	${INSTALL} ${LOCALBASE}/lib/sml-nj/bin/.run/run.x86-freebsd ${PREFIX}/cyrus/bin
-	${INSTALL_SCRIPT} ${FILESDIR}/cyrus_smlacapd_backend \
-		${PREFIX}/etc/rc.d/cyrus_smlacapd_backend.sample
-
 	${MKDIR} ${ACAPD_DOC}
 	${INSTALL_DATA} ${FILESDIR}/acapd.conf-sample ${ACAPD_DOC}
 .if !defined(NOPORTDOCS)
 	${INSTALL_DATA} ${WRKSRC}/doc/install.html ${ACAPD_DOC}
 	${TR} '\r' '\n' < ${WRKSRC}/doc/draft-ietf-acap-book-03.txt \
 			> ${ACAPD_DOC}/draft-ietf-acap-book-03.txt
 	${TR} '\r' '\n' < ${WRKSRC}/doc/draft-ietf-acap-email-03.txt \
 			> ${ACAPD_DOC}/draft-ietf-acap-email-03.txt
 	${TR} '\r' '\n' < ${WRKSRC}/doc/draft-ietf-acap-pers-03.txt \
 			> ${ACAPD_DOC}/draft-ietf-acap-pers-03.txt
 	${INSTALL_DATA} ${WRKSRC}/doc/rfc2244.txt ${ACAPD_DOC}
 .endif
 
 .if !defined(BATCH)
 	@${ECHO_MSG}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_MSG}
 .endif
 
 .include <bsd.port.mk>

Property changes on: head/databases/cyrus-smlacapd/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property
Index: head/databases/cyrus-smlacapd/files/cyrus_smlacapd_backend
===================================================================
--- head/databases/cyrus-smlacapd/files/cyrus_smlacapd_backend	(revision 147083)
+++ head/databases/cyrus-smlacapd/files/cyrus_smlacapd_backend	(nonexistent)
@@ -1,53 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: /tmp/pcvs/ports/databases/cyrus-smlacapd/files/Attic/cyrus_smlacapd_backend,v 1.1 2005-01-20 15:11:08 pav Exp $
-#
-
-# PROVIDE: cyrus_smlacapd_backend
-# REQUIRE: DAEMON cyrus_pwcheck
-# KEYWORD: FreeBSD shutdown
-
-#
-# Add the following line to /etc/rc.conf to enable cyrus_smlacapd_backend:
-# cyrus_smlacapd_backend_enable="YES"
-#
-. /etc/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="/usr/local/cyrus/bin/run.x86-freebsd"
-[ -z "$cyrus_smlacapd_backend_heap" ]	&& cyrus_smlacapd_backend_heap="/usr/local/cyrus/bin/backend.x86-bsd"
-
-required_dirs="/var/acap /var/spool/acap"
-pidfile=/var/run/cyrus_smlacapd_backend.pid
-procname=$cyrus_smlacapd_backend_runtime
-start_precmd="cyrus_smlacapd_backend_precmd"
-start_postcmd="cyrus_smlacapd_backend_postcmd"
-command=/usr/sbin/daemon
-command_args="-f $cyrus_smlacapd_backend_runtime @SMLload=$cyrus_smlacapd_backend_heap"
-
-cyrus_smlacapd_backend_precmd()
-{
-	SOCKET=/var/acap/socke
-	if [ -e ${SOCKET} ]
-	then
-		rm ${SOCKET}
-        fi
-}
-
-cyrus_smlacapd_backend_postcmd()
-{
-	sleep 1
-	pid=`ps -o pid,command -axww | \
-	     awk '$2 == "'$cyrus_smlacapd_backend_runtime'" && $3 == "@SMLload='$cyrus_smlacapd_backend_heap'" { print $1 }'`
-	if [ -n "$pid" ]
-	then
-		echo "$pid" > $pidfile
-        fi
-}
-
-load_rc_config $name
-
-run_rc_command "$1"

Property changes on: head/databases/cyrus-smlacapd/files/cyrus_smlacapd_backend
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Index: head/databases/cyrus-smlacapd/files/cyrus_smlacapd_backend.sh.in
===================================================================
--- head/databases/cyrus-smlacapd/files/cyrus_smlacapd_backend.sh.in	(nonexistent)
+++ head/databases/cyrus-smlacapd/files/cyrus_smlacapd_backend.sh.in	(revision 147084)
@@ -0,0 +1,55 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: cyrus_smlacapd_backend
+# REQUIRE: DAEMON cyrus_pwcheck
+# KEYWORD: FreeBSD shutdown
+
+#
+# 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
+procname=$cyrus_smlacapd_backend_runtime
+start_precmd="cyrus_smlacapd_backend_precmd"
+start_postcmd="cyrus_smlacapd_backend_postcmd"
+command=/usr/sbin/daemon
+command_args="-f $cyrus_smlacapd_backend_runtime @SMLload=$cyrus_smlacapd_backend_heap"
+
+cyrus_smlacapd_backend_precmd()
+{
+	SOCKET=/var/acap/socke
+	if [ -e ${SOCKET} ]
+	then
+		rm ${SOCKET}
+	fi
+}
+
+cyrus_smlacapd_backend_postcmd()
+{
+	sleep 1
+	pid=`ps -o pid,command -axww | \
+	     awk '$2 == "'$cyrus_smlacapd_backend_runtime'" && $3 == "@SMLload='$cyrus_smlacapd_backend_heap'" { print $1 }'`
+	if [ -n "$pid" ]
+	then
+		echo "$pid" > $pidfile
+	fi
+}
+
+load_rc_config $name
+
+run_rc_command "$1"

Property changes on: head/databases/cyrus-smlacapd/files/cyrus_smlacapd_backend.sh.in
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Index: head/databases/cyrus-smlacapd/files/patch-actest-Makefile.in
===================================================================
--- head/databases/cyrus-smlacapd/files/patch-actest-Makefile.in	(revision 147083)
+++ head/databases/cyrus-smlacapd/files/patch-actest-Makefile.in	(revision 147084)
@@ -1,20 +1,22 @@
 --- actest/Makefile.in.orig	Thu Apr 20 03:32:58 2000
-+++ actest/Makefile.in	Tue May 11 03:54:34 2004
-@@ -37,7 +37,7 @@
++++ 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/usr/local/include -I$(srcdir) -I$(srcdir)/../lib
++CPPFLAGS = -I${PREFIX}/include -I$(srcdir) -I$(srcdir)/../lib
  DEPLIBS = ../lib/libcyrus.a @DEPLIBS@
  LIBS = @LIBS@ $(DEPLIBS) @LIB_SASL@
  
-@@ -46,7 +46,7 @@
+ CFLAGS = @CFLAGS@
+ LDFLAGS = @LDFLAGS@ @CFLAGS@
  
- prefix = /usr/local
+-prefix = /usr/local
++prefix = ${PREFIX}
  exec_prefix = ${prefix}
 -cyrus_prefix = /usr/cyrus
 +cyrus_prefix = ${prefix}/cyrus
  
  SHELL = /bin/sh
  MAKEDEPEND = @MAKEDEPEND@

Property changes on: head/databases/cyrus-smlacapd/files/patch-actest-Makefile.in
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property
Index: head/databases/cyrus-smlacapd/files/patch-backend-Makefile.in
===================================================================
--- head/databases/cyrus-smlacapd/files/patch-backend-Makefile.in	(revision 147083)
+++ head/databases/cyrus-smlacapd/files/patch-backend-Makefile.in	(revision 147084)
@@ -1,12 +1,12 @@
 --- backend/Makefile.in.orig	Wed Mar  8 22:51:42 2000
-+++ backend/Makefile.in	Tue May 11 03:54:34 2004
++++ backend/Makefile.in	Tue Nov  1 01:40:19 2005
 @@ -48,7 +48,8 @@
  INSTALL = @INSTALL@
  
  SML=@SMLNJ@
 -cyrus_prefix = /usr/cyrus
-+prefix = /usr/local
++prefix = ${PREFIX}
 +cyrus_prefix = ${prefix}/cyrus
  
  PROGS = backend
  

Property changes on: head/databases/cyrus-smlacapd/files/patch-backend-Makefile.in
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property
Index: head/databases/cyrus-smlacapd/files/patch-configure
===================================================================
--- head/databases/cyrus-smlacapd/files/patch-configure	(nonexistent)
+++ head/databases/cyrus-smlacapd/files/patch-configure	(revision 147084)
@@ -0,0 +1,40 @@
+--- 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%%LOCALBASE%%/include ${CPPFLAGS}"
+ 
+   # this is CMU ADD LIBPATH
+   if test "$andrew_runpath_switch" = "none" ; then
+-	LDFLAGS="-L"/usr/local/lib" ${LDFLAGS}"
++	LDFLAGS="-L"%%LOCALBASE%%/lib" ${LDFLAGS}"
+   else
+-	LDFLAGS="-L"/usr/local/lib" $andrew_runpath_switch"/usr/local/lib" ${LDFLAGS}"
++	LDFLAGS="-L"%%LOCALBASE%%/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; }

Property changes on: head/databases/cyrus-smlacapd/files/patch-configure
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/databases/cyrus-smlacapd/files/patch-frontend-Makefile.in
===================================================================
--- head/databases/cyrus-smlacapd/files/patch-frontend-Makefile.in	(revision 147083)
+++ head/databases/cyrus-smlacapd/files/patch-frontend-Makefile.in	(revision 147084)
@@ -1,20 +1,22 @@
 --- frontend/Makefile.in.orig	Fri Mar  3 06:05:00 2000
-+++ frontend/Makefile.in	Tue May 11 03:54:34 2004
-@@ -37,7 +37,7 @@
++++ 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/usr/local/include -I$(srcdir) -I$(srcdir)/../lib
++CPPFLAGS = -I${PREFIX}/include -I$(srcdir) -I$(srcdir)/../lib
  DEPLIBS = ../lib/libcyrus.a @DEPLIBS@
  LIBS = @LIBS@ $(DEPLIBS) @LIB_SASL@
  
-@@ -46,7 +46,7 @@
+ CFLAGS = @CFLAGS@
+ LDFLAGS = @LDFLAGS@ @CFLAGS@
  
- prefix = /usr/local
+-prefix = /usr/local
++prefix = ${PREFIX}
  exec_prefix = ${prefix}
 -cyrus_prefix = /usr/cyrus
 +cyrus_prefix = ${prefix}/cyrus
  
  SHELL = /bin/sh
  MAKEDEPEND = @MAKEDEPEND@

Property changes on: head/databases/cyrus-smlacapd/files/patch-frontend-Makefile.in
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property
Index: head/databases/cyrus-smlacapd/pkg-plist
===================================================================
--- head/databases/cyrus-smlacapd/pkg-plist	(revision 147083)
+++ head/databases/cyrus-smlacapd/pkg-plist	(revision 147084)
@@ -1,42 +1,41 @@
-etc/rc.d/cyrus_smlacapd_backend.sample
 cyrus/bin/frontend
 cyrus/bin/backend-acapd
 cyrus/bin/backend.x86-bsd
 cyrus/bin/actest
 cyrus/bin/run.x86-freebsd
 include/cyrus/acl.h
 include/cyrus/assert.h
 include/cyrus/auth.h
 include/cyrus/bsearch.h
 include/cyrus/charset.h
 include/cyrus/glob.h
 include/cyrus/gmtoff.h
 include/cyrus/imclient.h
 include/cyrus/imparse.h
 include/cyrus/lock.h
 include/cyrus/map.h
 include/cyrus/mkgmtime.h
 include/cyrus/nonblock.h
 include/cyrus/parseaddr.h
 include/cyrus/prot.h
 include/cyrus/retry.h
 include/cyrus/sysexits.h
 include/cyrus/lsort.h
 include/cyrus/stristr.h
 include/cyrus/hash.h
 include/cyrus/util.h
 include/cyrus/xmalloc.h
 include/cyrus/imapurl.h
 include/cyrus/acap.h
 lib/libacap.a
 lib/libcyrus.a
 @dirrm cyrus/bin
 @dirrm cyrus
 @dirrm include/cyrus
 %%PORTDOCS%%share/doc/acapd/draft-ietf-acap-book-03.txt
 %%PORTDOCS%%share/doc/acapd/draft-ietf-acap-email-03.txt
 %%PORTDOCS%%share/doc/acapd/draft-ietf-acap-pers-03.txt
 %%PORTDOCS%%share/doc/acapd/install.html
 %%PORTDOCS%%share/doc/acapd/rfc2244.txt
 share/doc/acapd/acapd.conf-sample
 @dirrm share/doc/acapd

Property changes on: head/databases/cyrus-smlacapd/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property