- don't use @cwd in pkg-plist

- add a startupscript for authdaemond

PR:		ports/55193
Submitted by:	Alex Dupre <sysadmin@alexdupre.com>

3 files changed, 76 insertions, 55 deletions

diff --git a/mail/sqwebmail/Makefile b/mail/sqwebmail/Makefile
index 7917305881fb..4caf9a39a3db 100644
--- a/mail/sqwebmail/Makefile
+++ b/mail/sqwebmail/Makefile
@@ -7,9 +7,10 @@
 
 PORTNAME=	sqwebmail
 PORTVERSION=	3.5.3
+PORTREVISION=	1
 CATEGORIES=	mail www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= courier
+MASTER_SITE_SUBDIR=	courier
 
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	CGI Webmail client for Maildirs
@@ -26,9 +27,9 @@ COMMENT=	CGI Webmail client for Maildirs
 # set IMAGEURL to where on the web server URL the images are found
 #
 
-CGIBINDIR?=	${PREFIX}/www/cgi-bin.default
+CGIBINDIR?=	www/cgi-bin.default
 CGIBINSUBDIR?=	sqwebmail
-WEBDATADIR?=	${PREFIX}/www/data.default
+WEBDATADIR?=	www/data.default
 WEBDATASUBDIR?=	sqwebmail
 IMAGEURL?=	${WEBDATASUBDIR}
 
@@ -64,16 +65,15 @@ HAS_CONFIGURE=	YES
 USE_BZIP2=	YES
 USE_REINPLACE=	YES
 
-CONFIGURE_ARGS= \
-	--enable-cgibindir=${CGIBINDIR}/${CGIBINSUBDIR} \
-	--enable-imagedir=${WEBDATADIR}/${WEBDATASUBDIR} \
-	--without-authmysql \
+CONFIGURE_ARGS=	\
+	--enable-cgibindir=${PREFIX}/${CGIBINDIR}/${CGIBINSUBDIR} \
+	--enable-imagedir=${PREFIX}/${WEBDATADIR}/${WEBDATASUBDIR} \
 	--libexecdir=${PREFIX}/libexec/sqwebmail \
-	--mandir=${PREFIX}/share/sqwebmail/man \
+	--mandir=${PREFIX}/man \
 	--prefix=${PREFIX}/share/sqwebmail \
-	--enable-imageurl=/${IMAGEURL}/
+	--enable-imageurl=/${IMAGEURL}
 
-PLIST_SUB+=	CGIDIR=${CGIBINDIR} HTDOCSDIR=${WEBDATADIR}
+PLIST_SUB+=	CGIBINDIR=${CGIBINDIR} CGIBINSUBDIR=${CGIBINSUBDIR} WEBDATADIR=${WEBDATADIR} WEBDATASUBDIR=${WEBDATASUBDIR}
 
 .if defined(WITHOUT_CACHEDIR)
 PLIST_SUB+=		CACHE="@comment "
@@ -102,7 +102,7 @@ CONFIGURE_ARGS+=	--without-authldap
 .endif
 
 .if defined(WITH_VCHKPW)
-BUILD_DEPENDS+= ${VCHKPWLOC}/lib/libvpopmail.a:${PORTSDIR}/mail/vpopmail
+BUILD_DEPENDS+=	${VCHKPWLOC}/lib/libvpopmail.a:${PORTSDIR}/mail/vpopmail
 RUN_DEPENDS+=	${VCHKPWLOC}/bin/vchkpw:${PORTSDIR}/mail/vpopmail
 
 CONFIGURE_ARGS+=	--with-authvchkpw
@@ -173,7 +173,6 @@ CONFIGURE_ARGS+=	--with-maxargsize=${WITH_MAXARGSIZE}
 CONFIGURE_ARGS+=	--with-maxformargsize=${WITH_MAXFORMARGSIZE}
 .endif
 
-MANPREFIX=	${PREFIX}/share/sqwebmail
 MAN1=		maildirmake.1
 MAN7=		authlib.7
 MAN8=		deliverquota.8 makeuserdb.8 userdb.8 userdbpw.8
@@ -197,4 +196,9 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|^@INSTALLAUTHMODULES@$$|& @AUTHMODULES@|' \
 		${WRKSRC}/authlib/installlist.in
 
+.if !defined(WITHOUT_AUTHDAEMON)
+post-install:
+	${INSTALL_SCRIPT} ${FILESDIR}/authdaemond.sh ${PREFIX}/etc/rc.d/
+.endif
+
 .include <bsd.port.mk>
diff --git a/mail/sqwebmail/files/sqwebmail-authdaemond.sh b/mail/sqwebmail/files/sqwebmail-authdaemond.sh
new file mode 100644
index 000000000000..cd05b44900b1
--- /dev/null
+++ b/mail/sqwebmail/files/sqwebmail-authdaemond.sh
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
+    echo "$0: Cannot determine the PREFIX" >&2
+    exit 1
+fi
+
+case "$1" in
+start)
+	[ -r ${PREFIX}/share/sqwebmail/authdaemonrc ] && ${PREFIX}/libexec/sqwebmail/authlib/authdaemond start > /dev/null && echo -n ' authdaemond'
+	;;
+stop)
+	${PREFIX}/libexec/sqwebmail/authlib/authdaemond stop > /dev/null && echo -n ' authdaemond'
+	;;
+*)
+	echo "Usage: `basename $0` {start|stop}" >&2
+	;;
+esac
+
+exit 0
+
diff --git a/mail/sqwebmail/pkg-plist b/mail/sqwebmail/pkg-plist
index 741f54fff6b7..b19c3a1aa0e1 100644
--- a/mail/sqwebmail/pkg-plist
+++ b/mail/sqwebmail/pkg-plist
@@ -1,3 +1,4 @@
+%%AUTHDFLAG%%etc/rc.d/authdaemond.sh
 libexec/sqwebmail/authlib/authcram
 libexec/sqwebmail/authlib/authcustom
 %%AUTHDFLAG%%libexec/sqwebmail/authlib/authdaemon
@@ -6,6 +7,7 @@ libexec/sqwebmail/authlib/authcustom
 %%PGSQLFLAG%%libexec/sqwebmail/authlib/authdaemond.pgsql
 %%AUTHDFLAG%%libexec/sqwebmail/authlib/authdaemond.plain
 %%MYSQLFLAG%%libexec/sqwebmail/authlib/authdaemond.mysql
+%%VPOPMAILFLAG%%libexec/sqwebmail/authlib/authvchkpw
 libexec/sqwebmail/authlib/authpam
 libexec/sqwebmail/authlib/authsystem.passwd
 libexec/sqwebmail/authlib/authuserdb
@@ -90,10 +92,6 @@ share/sqwebmail/webgpg
 @dirrm share/sqwebmail/share/locale
 @dirrm share/sqwebmail/share
 @dirrm share/sqwebmail/sbin
-@dirrm share/sqwebmail/man/man8
-@dirrm share/sqwebmail/man/man7
-@dirrm share/sqwebmail/man/man1
-@dirrm share/sqwebmail/man
 @dirrm share/sqwebmail/lib
 @dirrm share/sqwebmail/html/en-us
 @dirrm share/sqwebmail/html
@@ -103,42 +101,40 @@ share/sqwebmail/webgpg
 @dirrm libexec/sqwebmail
 %%CACHE%%@unexec rmdir /var/sqwebmail/cache 2> /dev/null || true
 %%CACHE%%@unexec rmdir /var/sqwebmail 2> /dev/null || true
-@cwd %%CGIDIR%%
-sqwebmail/sqwebmail
-@dirrm sqwebmail
-@unexec cd .. && /bin/rmdir %%CGIDIR%% 2> /dev/null || true
-@cwd %%HTDOCSDIR%%
-sqwebmail/bg.gif
-sqwebmail/bluebottomleft.gif
-sqwebmail/bluebottomright.gif
-sqwebmail/bluetopleft.gif
-sqwebmail/bluetopright.gif
-sqwebmail/calendar.gif
-sqwebmail/cancel.gif
-sqwebmail/folder.gif
-sqwebmail/folder2.gif
-sqwebmail/folders.gif
-sqwebmail/forward.gif
-sqwebmail/forwardatt.gif
-sqwebmail/fullheaders.gif
-sqwebmail/graybottomleft.gif
-sqwebmail/graybottomright.gif
-sqwebmail/graytopleft.gif
-sqwebmail/graytopright.gif
-sqwebmail/left.gif
-sqwebmail/left2.gif
-sqwebmail/logo.gif
-sqwebmail/print.gif
-sqwebmail/reply.gif
-sqwebmail/replyall.gif
-sqwebmail/replylist.gif
-sqwebmail/right.gif
-sqwebmail/right2.gif
-sqwebmail/save.gif
-sqwebmail/sep.gif
-sqwebmail/signin.gif
-sqwebmail/sqwebmail.css
-sqwebmail/trash2.gif
-sqwebmail/uncancel.gif
-@dirrm sqwebmail
-@unexec cd .. && /bin/rmdir %%HTDOCSDIR%% 2> /dev/null || true
+%%CGIBINDIR%%/%%CGIBINSUBDIR%%/sqwebmail
+@unexec /bin/rmdir %D/%%CGIBINDIR%%/%%CGIBINSUBDIR%% 2> /dev/null || true
+@unexec /bin/rmdir %D/%%CGIBINDIR%% 2> /dev/null || true
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/bg.gif
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/bluebottomleft.gif
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/bluebottomright.gif
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/bluetopleft.gif
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/bluetopright.gif
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/calendar.gif
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/cancel.gif
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/folder.gif
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/folder2.gif
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/folders.gif
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/forward.gif
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/forwardatt.gif
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/fullheaders.gif
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/graybottomleft.gif
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/graybottomright.gif
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/graytopleft.gif
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/graytopright.gif
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/left.gif
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/left2.gif
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/logo.gif
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/print.gif
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/reply.gif
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/replyall.gif
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/replylist.gif
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/right.gif
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/right2.gif
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/save.gif
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/sep.gif
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/signin.gif
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/sqwebmail.css
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/trash2.gif
+%%WEBDATADIR%%/%%WEBDATASUBDIR%%/uncancel.gif
+@unexec /bin/rmdir %D/%%WEBDATADIR%%/%%WEBDATASUBDIR%% 2> /dev/null || true
+@unexec /bin/rmdir %D/%%WEBDATADIR%% 2> /dev/null || true