From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Aug 2 15:00:17 2003 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B233037B408 for ; Sat, 2 Aug 2003 15:00:17 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 84DC443FBD for ; Sat, 2 Aug 2003 15:00:16 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h72M0GUp051151 for ; Sat, 2 Aug 2003 15:00:16 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h72M0GNs051150; Sat, 2 Aug 2003 15:00:16 -0700 (PDT) Resent-Date: Sat, 2 Aug 2003 15:00:16 -0700 (PDT) Resent-Message-Id: <200308022200.h72M0GNs051150@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Alex Dupre Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6183E37B401; Sat, 2 Aug 2003 14:50:43 -0700 (PDT) Received: from relay.gufi.org (civetta.gufi.org [212.110.23.10]) by mx1.FreeBSD.org (Postfix) with ESMTP id 37E4143FBF; Sat, 2 Aug 2003 14:50:42 -0700 (PDT) (envelope-from alex@vaio.alexdupre.com) Received: from vaio.alexdupre.com (host245-49.pool8288.interbusiness.it [82.88.49.245]) by relay.gufi.org (Postfix) with ESMTP id 9144420F4E; Sat, 2 Aug 2003 23:50:40 +0200 (CEST) Received: from vaio.alexdupre.com (localhost [127.0.0.1]) by vaio.alexdupre.com (8.12.9/8.12.9) with ESMTP id h72LodeK009118; Sat, 2 Aug 2003 23:50:39 +0200 (CEST) (envelope-from alex@vaio.alexdupre.com) Received: (from alex@localhost) by vaio.alexdupre.com (8.12.9/8.12.9/Submit) id h72LodD7009116; Sat, 2 Aug 2003 23:50:39 +0200 (CEST) Message-Id: <200308022150.h72LodD7009116@vaio.alexdupre.com> Date: Sat, 2 Aug 2003 23:50:39 +0200 (CEST) From: Alex Dupre To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: oliver@FreeBSD.org Subject: ports/55193: [Update] Port: mail/sqwebmail X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Alex Dupre List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Aug 2003 22:00:18 -0000 >Number: 55193 >Category: ports >Synopsis: [Update] Port: mail/sqwebmail >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sat Aug 02 15:00:15 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Alex Dupre >Release: FreeBSD 4.8-ALEXDUPRE i386 >Organization: >Environment: System: FreeBSD 4.8-ALEXDUPRE i386 >Description: Various fixes + startup script. >How-To-Repeat: >Fix: --- sqwebmail.diff begins here --- diff -ruN sqwebmail.orig/Makefile sqwebmail/Makefile --- sqwebmail.orig/Makefile Sat Aug 2 02:08:50 2003 +++ sqwebmail/Makefile Sat Aug 2 10:49:41 2003 @@ -7,6 +7,7 @@ PORTNAME= sqwebmail PORTVERSION= 3.5.3 +PORTREVISION= 1 CATEGORIES= mail www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= courier @@ -26,9 +27,9 @@ # 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} @@ -65,15 +66,14 @@ USE_REINPLACE= YES CONFIGURE_ARGS= \ - --enable-cgibindir=${CGIBINDIR}/${CGIBINSUBDIR} \ - --enable-imagedir=${WEBDATADIR}/${WEBDATASUBDIR} \ - --without-authmysql \ + --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 " @@ -173,7 +173,6 @@ 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 @@ -196,5 +195,10 @@ 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 diff -ruN sqwebmail.orig/files/authdaemond.sh sqwebmail/files/authdaemond.sh --- sqwebmail.orig/files/authdaemond.sh Thu Jan 1 01:00:00 1970 +++ sqwebmail/files/authdaemond.sh Sat Aug 2 10:45:40 2003 @@ -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 -ruN sqwebmail.orig/pkg-plist sqwebmail/pkg-plist --- sqwebmail.orig/pkg-plist Sat Aug 2 02:08:50 2003 +++ sqwebmail/pkg-plist Sat Aug 2 10:46:35 2003 @@ -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 @@ %%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 @@ @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 @@ @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 --- sqwebmail.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: