diff options
| -rw-r--r-- | doc/CHANGES | 3 | ||||
| -rw-r--r-- | mail/sqwebmail/DEINSTALL | 3 | ||||
| -rw-r--r-- | mail/sqwebmail/MESSAGE | 22 | ||||
| -rw-r--r-- | mail/sqwebmail/Makefile | 90 | ||||
| -rw-r--r-- | mail/sqwebmail/PLIST | 100 | ||||
| -rw-r--r-- | mail/sqwebmail/distinfo | 14 | ||||
| -rw-r--r-- | mail/sqwebmail/files/pcpd.sh | 39 | ||||
| -rw-r--r-- | mail/sqwebmail/files/sqwebmaild.sh | 39 | ||||
| -rw-r--r-- | mail/sqwebmail/patches/patch-aa | 62 | ||||
| -rw-r--r-- | mail/sqwebmail/patches/patch-ab | 31 | ||||
| -rw-r--r-- | mail/sqwebmail/patches/patch-ac | 12 | ||||
| -rw-r--r-- | mail/sqwebmail/patches/patch-ad | 10 | ||||
| -rw-r--r-- | mail/sqwebmail/patches/patch-ae | 10 |
13 files changed, 253 insertions, 182 deletions
diff --git a/doc/CHANGES b/doc/CHANGES index 8174b940643..a23aae39697 100644 --- a/doc/CHANGES +++ b/doc/CHANGES @@ -1,4 +1,4 @@ -$NetBSD: CHANGES,v 1.4980 2004/02/23 23:28:37 wulf Exp $ +$NetBSD: CHANGES,v 1.4981 2004/02/23 23:41:42 jlam Exp $ Changes to the packages collection and infrastructure in 2004: @@ -1006,3 +1006,4 @@ Changes to the packages collection and infrastructure in 2004: Updated libxml2 to 2.6.7 [xtraeme 2004-02-23] Updated aspell to 0.50.5 [snj 2004-02-23] Added xdx-1.1 [wulf 2004-02-24] + Updated sqwebmail to 3.6.2 [snj 2004-02-24] diff --git a/mail/sqwebmail/DEINSTALL b/mail/sqwebmail/DEINSTALL index 70110035798..b875735d91b 100644 --- a/mail/sqwebmail/DEINSTALL +++ b/mail/sqwebmail/DEINSTALL @@ -1,8 +1,9 @@ -# $NetBSD: DEINSTALL,v 1.1.1.1 2002/01/24 07:23:44 jlam Exp $ +# $NetBSD: DEINSTALL,v 1.2 2004/02/23 23:41:43 jlam Exp $ # Additional files that are may be created for sqwebmail. ALL_FILES="${ALL_FILES} /dev/null @PKG_SYSCONFDIR@/calendarmode" ALL_FILES="${ALL_FILES} /dev/null @PKG_SYSCONFDIR@/defaultdomain" +ALL_FILES="${ALL_FILES} /dev/null @PKG_SYSCONFDIR@/hostname" ALL_FILES="${ALL_FILES} /dev/null @PKG_SYSCONFDIR@/logindomainlist" ALL_FILES="${ALL_FILES} /dev/null @PKG_SYSCONFDIR@/nochangingfrom" ALL_FILES="${ALL_FILES} /dev/null @PKG_SYSCONFDIR@/noimages" diff --git a/mail/sqwebmail/MESSAGE b/mail/sqwebmail/MESSAGE index 939ce9083ea..2c799053249 100644 --- a/mail/sqwebmail/MESSAGE +++ b/mail/sqwebmail/MESSAGE @@ -1,17 +1,20 @@ =========================================================================== -$NetBSD: MESSAGE,v 1.4 2002/09/24 12:30:15 wiz Exp $ +$NetBSD: MESSAGE,v 1.5 2004/02/23 23:41:43 jlam Exp $ -You must create a cron job that runs at regular intervals to clean the -SqWebMail user cache that executes the following script: +You must create a cron job that runs at regular intervals (one hour is +fine) that executes the following Perl script to clean the SqWebMail +user cache: ${PREFIX}/share/courier/sqwebmail/cleancache.pl You will need to make SqWebMail accessible through your HTTP server by -making URLs with path "/images/sqwebmail/" resolve to the images in -${IMAGEDIR}, e.g. for Apache, add the following to httpd.conf: +making URLs with path "${IMAGEURL}/" resolve to the images in +${IMAGEDIR}. + +For Apache, you can add the following to httpd.conf: <IfModule mod_alias.c> - Alias /images/sqwebmail/ "${IMAGEDIR}/" + Alias ${IMAGEURL}/ "${IMAGEDIR}/" </IfModule> Also, certain versions of Microsoft Internet Explorer have a bug in their @@ -26,8 +29,13 @@ Maildir accounts will be accessible through: http://www.domain.com/cgi-bin/sqwebmail -If you're using a non-default mailer, you will need to edit: +If you're using a non-default sendmail program, you will need to edit: ${PKG_SYSCONFDIR}/sendit.sh +To use GPG with SqWebMail, you will need to install the security/gnupg +package and you should read the documentation at: + + ${PREFIX}/share/doc/html/courier/sqwebmail/README.gpg.html + =========================================================================== diff --git a/mail/sqwebmail/Makefile b/mail/sqwebmail/Makefile index c551bc639db..eb5b7ea997e 100644 --- a/mail/sqwebmail/Makefile +++ b/mail/sqwebmail/Makefile @@ -1,13 +1,15 @@ -# $NetBSD: Makefile,v 1.15 2004/01/07 02:21:16 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2004/02/23 23:41:43 jlam Exp $ -DISTNAME= sqwebmail-3.3.1 -CATEGORIES= www -COMMENT= Webmail CGI for access to local Maildir-style mailboxes +DISTNAME= sqwebmail-3.6.2 +CATEGORIES= mail www +COMMENT= webmail CGI for access to local Maildir-style mailboxes HOMEPAGE= http://www.inter7.com/sqwebmail/ -DEPENDS+= courier-auth>=0.37.1nb1:../../mail/courier-auth -DEPENDS+= courier-maildirmake>=0.37.1nb1:../../mail/courier-maildirmake +DEPENDS+= courier-auth>=${BASE_VERS}:../../mail/courier-auth +DEPENDS+= courier-maildirmake>=${BASE_VERS}:../../mail/courier-maildirmake +USE_BUILDLINK3= yes +USE_LANGUAGES= c c++ USE_PERL5= yes REPLACE_PERL= sysconftool @@ -15,33 +17,45 @@ USE_PKGINSTALL= yes DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL -.include "../../mail/courier-auth/Makefile.common" +.include "../courier-auth/Makefile.common" .if defined(_STRIPFLAG_INSTALL) && !empty(_STRIPFLAG_INSTALL:M-s) INSTALL_TARGET= install-strip .endif - -MAIL_GROUP?= mail +INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} sysconfdir=${EGDIR} STATEDIR= /var/sqwebmail CACHEDIR= ${STATEDIR}/cache CALENDARDIR= ${STATEDIR}/calendar -IMAGEDIR= ${DATADIR}/sqwebmail/images -HTMLDIR= ${PREFIX}/share/doc/html/sqwebmail +SQWEBMAIL_HTMLDIR= ${DATADIR}/sqwebmail/html +SQWEBMAIL_IMAGEDIR= ${DATADIR}/sqwebmail/images +SQWEBMAIL_IMAGEURL?= /sqwebmail +BUILD_DEFS+= SQWEBMAIL_IMAGEURL + +SENDMAIL?= /usr/sbin/sendmail + +# This is used by the sqwebmail configure script to set the location of +# the sqwebmaild socket file, lockfile, and pidfile. +# +CONFIGURE_ARGS+= --localstatedir=${STATEDIR} CONFIGURE_ARGS+= --with-cachedir=${CACHEDIR} CONFIGURE_ARGS+= --with-calendardir=${CALENDARDIR} CONFIGURE_ARGS+= --with-cacheowner=${ROOT_USER} -CONFIGURE_ARGS+= --with-mailer=/usr/sbin/sendmail +CONFIGURE_ARGS+= --with-mailer=${SENDMAIL} CONFIGURE_ARGS+= --enable-https=auto CONFIGURE_ARGS+= --enable-cgibindir=${PREFIX}/libexec/cgi-bin -CONFIGURE_ARGS+= --enable-imagedir=${IMAGEDIR} -CONFIGURE_ARGS+= --enable-imageurl=/images/sqwebmail +CONFIGURE_ARGS+= --with-htmldir=${SQWEBMAIL_HTMLDIR} +CONFIGURE_ARGS+= --enable-imagedir=${SQWEBMAIL_IMAGEDIR} +CONFIGURE_ARGS+= --enable-imageurl=${SQWEBMAIL_IMAGEURL} MIME_TYPES= ${PKG_SYSCONFDIR}/mime.types:${PKG_SYSCONFBASEDIR}/httpd/mime.types:${PREFIX}/etc/mime.types:/etc/mime.types CONFIGURE_ARGS+= --enable-mimetypes="${MIME_TYPES}" CONFIGURE_ARGS+= --with-ispell="${LOCALBASE}/bin/ispell" +CONFIGURE_ENV+= GPG="${LOCALBASE}/bin/gpg" +CONFIGURE_ENV+= ldapsearch="${LOCALBASE}/bin/ldapsearch" +MAIL_GROUP?= mail PKG_GROUPS= ${MAIL_GROUP} OWN_DIRS= ${STATEDIR} @@ -53,8 +67,13 @@ OWN_DIRS_PERMS+= ${CALENDARDIR}/localcache ${ROOT_USER} ${MAIL_GROUP} 0700 SYSCONFTOOL= ${PREFIX}/sbin/sqwebmail.sysconftool GEN_FILES= ldapaddressbook +FILES_SUBST+= SYSCONFTOOL=${SYSCONFTOOL:Q} +FILES_SUBST+= GEN_FILES=${GEN_FILES:Q} +MESSAGE_SUBST+= IMAGEDIR=${SQWEBMAIL_IMAGEDIR} +MESSAGE_SUBST+= IMAGEURL=${SQWEBMAIL_IMAGEURL} -CONF_FILES= ${EGDIR}/authmodulelist ${PKG_SYSCONFDIR}/authmodulelist +SUPPORT_FILES= ${EGDIR}/authmodulelist ${PKG_SYSCONFDIR}/authmodulelist +SUPPORT_FILES+= /dev/null ${PKG_SYSCONFDIR}/nodsn .for FILE in ${GEN_FILES} CONF_FILES+= ${EGDIR}/${FILE}.dist ${PKG_SYSCONFDIR}/${FILE} .endfor @@ -64,31 +83,32 @@ CONF_FILES_PERMS+= ${DATADIR}/sqwebmail/${FILE} \ ${PKG_SYSCONFDIR}/${FILE} \ ${ROOT_USER} ${ROOT_GROUP} 0755 .endfor +RCD_SCRIPTS= pcpd sqwebmaild -FILES_SUBST+= SYSCONFTOOL=${SYSCONFTOOL:Q} -FILES_SUBST+= GEN_FILES=${GEN_FILES:Q} -MESSAGE_SUBST+= IMAGEDIR=${IMAGEDIR} +.include "../../devel/gettext-lib/buildlink3.mk" -pre-configure: configure-init - -post-configure: - cd ${WRKSRC}/ldapaddressbook; for file in ldapsearch; do \ - ${SED} -e "s|@SED@|${SED}|g" $${file} > $${file}.new; \ - ${MV} -f $${file}.new $${file}; \ +pre-configure: + for file in ${WRKSRC}/sqwebmail/Makefile.in; do \ + ${MV} -f $$file $$file.bak; \ + ${SED} -e "s|@htmldir@|${SQWEBMAIL_HTMLDIR}|g" \ + -e "s|@scriptdir@|@datadir@/sqwebmail|g" \ + $$file.bak > $$file; \ done post-install: + ${INSTALL_DATA_DIR} ${EGDIR} + ${INSTALL_DATA_DIR} ${HTMLDIR} + ${INSTALL_DATA_DIR} ${HTMLDIR}/pcp + ${INSTALL_DATA_DIR} ${HTMLDIR}/sqwebmail ${INSTALL_SCRIPT} ${WRKSRC}/sysconftool ${SYSCONFTOOL} - for file in ldapaddressbook.dist; do \ - ${INSTALL_DATA} ${PKG_SYSCONFDIR}/$${file} ${EGDIR}; \ - ${RM} -f ${PKG_SYSCONFDIR}/$${file}; \ - done - cd ${WRKSRC}; ${INSTALL_DATA} sqwebmail/webmail.authpam \ - ${EGDIR}/webmail.pam - ${INSTALL_DATA_DIR} ${HTMLDIR} ${HTMLDIR}/sqwebmail ${HTMLDIR}/pcp - cd ${WRKSRC}; ${INSTALL_DATA} COPYING INSTALL.html ${HTMLDIR} - cd ${WRKSRC}/pcp; ${INSTALL_DATA} README.html ${HTMLDIR}/pcp - cd ${WRKSRC}/sqwebmail; ${INSTALL_DATA} BUGS.html SECURITY.html \ - ${HTMLDIR}/sqwebmail + ${INSTALL_DATA} ${WRKSRC}/COPYING ${HTMLDIR}/sqwebmail + ${INSTALL_DATA} ${WRKSRC}/INSTALL.html ${HTMLDIR}/sqwebmail + ${INSTALL_DATA} ${WRKSRC}/gpglib/README.html \ + ${HTMLDIR}/sqwebmail/README.gpg.html + ${INSTALL_DATA} ${WRKSRC}/pcp/README.html \ + ${HTMLDIR}/sqwebmail/README.pcp.html + ${INSTALL_DATA} ${WRKSRC}/sqwebmail/BUGS.html ${HTMLDIR}/sqwebmail + ${INSTALL_DATA} ${WRKSRC}/sqwebmail/SECURITY.html ${HTMLDIR}/sqwebmail + ${INSTALL_DATA} ${WRKSRC}/sqwebmail/webmail.authpam ${EGDIR} .include "../../mk/bsd.pkg.mk" diff --git a/mail/sqwebmail/PLIST b/mail/sqwebmail/PLIST index 1249b21aa99..6165604b93e 100644 --- a/mail/sqwebmail/PLIST +++ b/mail/sqwebmail/PLIST @@ -1,7 +1,9 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2002/01/24 07:23:44 jlam Exp $ +@comment $NetBSD: PLIST,v 1.2 2004/02/23 23:41:43 jlam Exp $ libexec/cgi-bin/sqwebmail -libexec/courier/sqwebmail/mimegpg +libexec/courier/sqwebmail/makemime libexec/courier/sqwebmail/pcpd +libexec/courier/sqwebmail/reformime +libexec/courier/sqwebmail/sqwebmaild sbin/sqwebmail.sysconftool share/courier/sqwebmail/cleancache.pl share/courier/sqwebmail/html/en @@ -50,54 +52,68 @@ share/courier/sqwebmail/html/en-us/printredirect.html share/courier/sqwebmail/html/en-us/quickadd.html share/courier/sqwebmail/html/en-us/readmsg.html share/courier/sqwebmail/html/en-us/redirect.html +share/courier/sqwebmail/html/en-us/smileys.txt share/courier/sqwebmail/html/en-us/spellchk.html -share/courier/sqwebmail/images/bg.gif -share/courier/sqwebmail/images/bluebottomleft.gif -share/courier/sqwebmail/images/bluebottomright.gif -share/courier/sqwebmail/images/bluetopleft.gif -share/courier/sqwebmail/images/bluetopright.gif -share/courier/sqwebmail/images/calendar.gif -share/courier/sqwebmail/images/cancel.gif -share/courier/sqwebmail/images/folder.gif -share/courier/sqwebmail/images/folder2.gif -share/courier/sqwebmail/images/folders.gif -share/courier/sqwebmail/images/forward.gif -share/courier/sqwebmail/images/forwardatt.gif -share/courier/sqwebmail/images/fullheaders.gif -share/courier/sqwebmail/images/graybottomleft.gif -share/courier/sqwebmail/images/graybottomright.gif -share/courier/sqwebmail/images/graytopleft.gif -share/courier/sqwebmail/images/graytopright.gif -share/courier/sqwebmail/images/left.gif -share/courier/sqwebmail/images/left2.gif -share/courier/sqwebmail/images/logo.gif -share/courier/sqwebmail/images/print.gif -share/courier/sqwebmail/images/reply.gif -share/courier/sqwebmail/images/replyall.gif -share/courier/sqwebmail/images/replylist.gif -share/courier/sqwebmail/images/right.gif -share/courier/sqwebmail/images/right2.gif -share/courier/sqwebmail/images/save.gif -share/courier/sqwebmail/images/sep.gif -share/courier/sqwebmail/images/signin.gif +share/courier/sqwebmail/images/bg.png +share/courier/sqwebmail/images/bluebottomleft.png +share/courier/sqwebmail/images/bluebottomright.png +share/courier/sqwebmail/images/bluetopleft.png +share/courier/sqwebmail/images/bluetopright.png +share/courier/sqwebmail/images/calendar.png +share/courier/sqwebmail/images/cancel.png +share/courier/sqwebmail/images/eventadd.png +share/courier/sqwebmail/images/eventedit.png +share/courier/sqwebmail/images/first.png +share/courier/sqwebmail/images/folder.png +share/courier/sqwebmail/images/folder2.png +share/courier/sqwebmail/images/folders.png +share/courier/sqwebmail/images/forward.png +share/courier/sqwebmail/images/forwardatt.png +share/courier/sqwebmail/images/fullheaders.png +share/courier/sqwebmail/images/graybottomleft.png +share/courier/sqwebmail/images/graybottomright.png +share/courier/sqwebmail/images/graytopleft.png +share/courier/sqwebmail/images/graytopright.png +share/courier/sqwebmail/images/last.png +share/courier/sqwebmail/images/left.png +share/courier/sqwebmail/images/left2.png +share/courier/sqwebmail/images/logo.png +share/courier/sqwebmail/images/print.png +share/courier/sqwebmail/images/reply.png +share/courier/sqwebmail/images/replyall.png +share/courier/sqwebmail/images/replylist.png +share/courier/sqwebmail/images/right.png +share/courier/sqwebmail/images/right2.png +share/courier/sqwebmail/images/save.png +share/courier/sqwebmail/images/sep.png +share/courier/sqwebmail/images/signin.png +share/courier/sqwebmail/images/sm-frowney.png +share/courier/sqwebmail/images/sm-frowney2.png +share/courier/sqwebmail/images/sm-notsmiley.png +share/courier/sqwebmail/images/sm-notsmiley2.png +share/courier/sqwebmail/images/sm-ohno.png +share/courier/sqwebmail/images/sm-smiley.png +share/courier/sqwebmail/images/sm-smiley2.png +share/courier/sqwebmail/images/sm-wink.png +share/courier/sqwebmail/images/sm-wink2.png share/courier/sqwebmail/images/sqwebmail.css -share/courier/sqwebmail/images/trash2.gif -share/courier/sqwebmail/images/uncancel.gif +share/courier/sqwebmail/images/trash2.png +share/courier/sqwebmail/images/uncancel.png share/courier/sqwebmail/ldapsearch share/courier/sqwebmail/sendit.sh share/courier/sqwebmail/webgpg -share/doc/html/sqwebmail/COPYING -share/doc/html/sqwebmail/INSTALL.html -share/doc/html/sqwebmail/pcp/README.html -share/doc/html/sqwebmail/sqwebmail/BUGS.html -share/doc/html/sqwebmail/sqwebmail/SECURITY.html +share/doc/html/courier/sqwebmail/BUGS.html +share/doc/html/courier/sqwebmail/COPYING +share/doc/html/courier/sqwebmail/INSTALL.html +share/doc/html/courier/sqwebmail/README.gpg.html +share/doc/html/courier/sqwebmail/README.pcp.html +share/doc/html/courier/sqwebmail/SECURITY.html share/examples/courier/authmodulelist share/examples/courier/ldapaddressbook.dist -share/examples/courier/webmail.pam +share/examples/courier/webmail.authpam @unexec ${RMDIR} -p %D/share/examples/courier 2>/dev/null || ${TRUE} -@dirrm share/doc/html/sqwebmail/sqwebmail -@dirrm share/doc/html/sqwebmail/pcp -@dirrm share/doc/html/sqwebmail +@dirrm share/doc/html/courier/sqwebmail +@unexec ${RMDIR} -p %D/share/doc/html/courier 2>/dev/null || ${TRUE} @dirrm share/courier/sqwebmail/images @dirrm share/courier/sqwebmail/html/en-us @dirrm share/courier/sqwebmail/html diff --git a/mail/sqwebmail/distinfo b/mail/sqwebmail/distinfo index caf69539592..68642cbac39 100644 --- a/mail/sqwebmail/distinfo +++ b/mail/sqwebmail/distinfo @@ -1,9 +1,7 @@ -$NetBSD: distinfo,v 1.2 2002/01/25 00:18:59 jlam Exp $ +$NetBSD: distinfo,v 1.3 2004/02/23 23:41:43 jlam Exp $ -SHA1 (sqwebmail-3.3.1.tar.gz) = ce1650cc37d8f7abbb056d6340f495598ebf3885 -Size (sqwebmail-3.3.1.tar.gz) = 1482655 bytes -SHA1 (patch-aa) = 8c679457a3fa835f4300b78214fd799357cfa6d5 -SHA1 (patch-ab) = 7c91a1a6f138512c66a2820ad30fb8744198125f -SHA1 (patch-ac) = f85ae9f2f56c1885180ae86b156ff508aa2491c4 -SHA1 (patch-ad) = 7fd765a8ed9c178de5f1d0a90bc8abec3e469a57 -SHA1 (patch-ae) = 24028984cdb9879aa3ba9228a9e1ee71612cf589 +SHA1 (sqwebmail-3.6.2.tar.bz2) = 718b4456c9429b37153e4d4e7a0801e4901aaa73 +Size (sqwebmail-3.6.2.tar.bz2) = 1649032 bytes +SHA1 (patch-aa) = c879d95b44a9d7a02c8dd119ca5645add6f96e1e +SHA1 (patch-ab) = a2cba8fbfd020e597a99111efc4a2522d68c2872 +SHA1 (patch-ad) = 47d4ae3b31e6765bf180155b7e7f1472ebf8966b diff --git a/mail/sqwebmail/files/pcpd.sh b/mail/sqwebmail/files/pcpd.sh new file mode 100644 index 00000000000..3e9977a0b34 --- /dev/null +++ b/mail/sqwebmail/files/pcpd.sh @@ -0,0 +1,39 @@ +#!@RCD_SCRIPTS_SHELL@ +# +# $NetBSD: pcpd.sh,v 1.1 2004/02/23 23:41:43 jlam Exp $ +# +# Courier SqWebMail calendaring services daemon +# +# PROVIDE: pcpd +# REQUIRE: authdaemond + +if [ -f /etc/rc.subr ]; then + . /etc/rc.subr +fi + +name="pcpd" +rcvar=${name} +command="@PREFIX@/libexec/courier/sqwebmail/pcpd" +required_files="@PKG_SYSCONFDIR@/calendarmode" + +start_cmd="courier_doit start" +stop_cmd="courier_doit stop" + +courier_doit() +{ + action=$1 + case ${action} in + start) @ECHO@ "Starting ${name}." ;; + stop) @ECHO@ "Stopping ${name}." ;; + esac + + ${command} ${action} +} + +if [ -f /etc/rc.subr ]; then + load_rc_config $name + run_rc_command "$1" +else + @ECHO@ -n " ${name}" + ${start_cmd} +fi diff --git a/mail/sqwebmail/files/sqwebmaild.sh b/mail/sqwebmail/files/sqwebmaild.sh new file mode 100644 index 00000000000..98c33e6522e --- /dev/null +++ b/mail/sqwebmail/files/sqwebmaild.sh @@ -0,0 +1,39 @@ +#!@RCD_SCRIPTS_SHELL@ +# +# $NetBSD: sqwebmaild.sh,v 1.1 2004/02/23 23:41:43 jlam Exp $ +# +# Courier SqWebMail services daemon +# +# PROVIDE: sqwebmail +# REQUIRE: authdaemond + +if [ -f /etc/rc.subr ]; then + . /etc/rc.subr +fi + +name="sqwebmaild" +rcvar=${name} +command="@PREFIX@/libexec/courier/sqwebmail/sqwebmaild" +required_files="@PKG_SYSCONFDIR@/authmodulelist" + +start_cmd="courier_doit start" +stop_cmd="courier_doit stop" + +courier_doit() +{ + action=$1 + case ${action} in + start) @ECHO@ "Starting ${name}." ;; + stop) @ECHO@ "Stopping ${name}." ;; + esac + + ${command} ${action} +} + +if [ -f /etc/rc.subr ]; then + load_rc_config $name + run_rc_command "$1" +else + @ECHO@ -n " ${name}" + ${start_cmd} +fi diff --git a/mail/sqwebmail/patches/patch-aa b/mail/sqwebmail/patches/patch-aa index d20c65eb161..9caf52c9b71 100644 --- a/mail/sqwebmail/patches/patch-aa +++ b/mail/sqwebmail/patches/patch-aa @@ -1,38 +1,33 @@ -$NetBSD: patch-aa,v 1.1.1.1 2002/01/24 07:23:47 jlam Exp $ +$NetBSD: patch-aa,v 1.2 2004/02/23 23:41:43 jlam Exp $ ---- Makefile.in.orig Fri Jan 18 22:54:52 2002 +--- Makefile.in.orig Thu Nov 27 16:46:50 2003 +++ Makefile.in -@@ -28,7 +28,7 @@ - sbindir = @sbindir@ - libexecdir = @libexecdir@ - datadir = @datadir@ --sysconfdir = @sysconfdir@ -+sysconfdir = $(prefix)/share/examples/courier - sharedstatedir = @sharedstatedir@ - localstatedir = @localstatedir@ - libdir = @libdir@ -@@ -98,16 +98,16 @@ - @HAS_USERDB_FALSE@userdb_data = +@@ -156,9 +156,9 @@ sysconf_DATA = authmodulelist + @HAS_USERDB_TRUE@userdb_data = makeuserdb.8 userdb.8 userdbpw.8 scriptbindir = $(sbindir) -scriptbin_SCRIPTS = $(userdb_scripts) -+scriptbin_SCRIPTS = ++scriptbin_SCRIPTS = + +-pkglibPROGRAMS = maildirmake deliverquota reformime makemime pcpd ++pkglibPROGRAMS = reformime makemime pcpd pkglibexecdir = $(libexecdir)/sqwebmail --pkglibexec_PROGRAMS = maildirmake reformime makemime mimegpg pcpd -+pkglibexec_PROGRAMS = mimegpg pcpd + pkglibexec_PROGRAMS = @pkglibPROGRAMS_exec@ +@@ -168,10 +168,10 @@ EXTRA_PROGRAMS = + CLEANFILES = $(userdb_scripts) $(pkgman1_DATA) $(pkgman8_DATA) $(sysconf_DATA) pkgman8dir = @mandir@/man8 -pkgman8_DATA = deliverquota.8 $(userdb_data) -+pkgman8_DATA = ++pkgman8_DATA = pkgman1dir = @mandir@/man1 -pkgman1_DATA = maildirmake.1 -+pkgman1_DATA = - - pcpd_SOURCES = - -@@ -628,50 +628,24 @@ ++pkgman1_DATA = + subdir = . + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +@@ -773,44 +773,21 @@ makemime: rfc2045/makemime # Install SqWebMail setuid to root, if we're running as root # @@ -41,10 +36,9 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/01/24 07:23:47 jlam Exp $ $(mkinstalldirs) $(DESTDIR)$(cgibindir) test -w $(DESTDIR)$(cgibindir) || exit 0; \ $(INSTALL_PROGRAM) sqwebmail/sqwebmail \ - $(DESTDIR)$(cgibindir)/sqwebmail ; \ -- test -w /etc || continue ; \ - chown root $(DESTDIR)$(cgibindir)/sqwebmail ; \ - chmod u+s $(DESTDIR)$(cgibindir)/sqwebmail + $(DESTDIR)$(cgibindir)/sqwebmail + $(mkinstalldirs) $(DESTDIR)$(pkglibexecdir) + $(INSTALL_PROGRAM) sqwebmail/sqwebmaild $(DESTDIR)$(pkglibexecdir)/sqwebmaild - $(mkinstalldirs) $(DESTDIR)$(libexecdir)/authlib - for f in `cat authlib/installlist` dummy ; do \ - test "$$f" = "dummy" && continue ; \ @@ -70,20 +64,14 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/01/24 07:23:47 jlam Exp $ - chmod 700 $(DESTDIR)@authdaemonvar@ + +install-data-local: - -$(mkinstalldirs) $(DESTDIR)@imagedir@ - -for f in `cat sqwebmail/images/filelist` ; do \ + $(mkinstalldirs) $(DESTDIR)@imagedir@ + for f in `cat sqwebmail/images/filelist` ; do \ $(INSTALL_DATA) $(srcdir)/sqwebmail/images/$$f $(DESTDIR)@imagedir@/$$f ;\ done + $(mkinstalldirs) $(DESTDIR)$(sysconfdir) +- cp /dev/null $(DESTDIR)$(sysconfdir)/nodsn @cat sqwebmail/sqwebmail.msg - @cat authlib/authdaemon.msg --uninstall-local: uninstall-userdb-local uninstall-userdb-script -+uninstall-local: + uninstall-local: uninstall-userdb-local uninstall-userdb-script test -w $(DESTDIR)$(cgibindir) || exit 0; \ - rm -f $(DESTDIR)$(cgibindir)/sqwebmail -- . authlib/authpwdprogs ; \ -- for f in `cat authlib/installlist authlib/installlist.sh ; echo $$PWPROGS $$PWSCRIPTS` ; do \ -- rm -f $(DESTDIR)$(libexecdir)/authlib/$$f ; done - for f in `cat sqwebmail/images/filelist` ; do \ - rm -f $(DESTDIR)@imagedir@/$$f ;\ - done diff --git a/mail/sqwebmail/patches/patch-ab b/mail/sqwebmail/patches/patch-ab index 22b1b82cecf..675437f3f45 100644 --- a/mail/sqwebmail/patches/patch-ab +++ b/mail/sqwebmail/patches/patch-ab @@ -1,30 +1,13 @@ -$NetBSD: patch-ab,v 1.1.1.1 2002/01/24 07:23:44 jlam Exp $ +$NetBSD: patch-ab,v 1.2 2004/02/23 23:41:43 jlam Exp $ ---- authlib/Makefile.in.orig Fri Jan 18 22:54:59 2002 +--- authlib/Makefile.in.orig Sat Nov 15 13:33:23 2003 +++ authlib/Makefile.in -@@ -2056,23 +2056,9 @@ +@@ -1279,7 +1279,7 @@ info: info-am - # automake still a bit stupid... + info-am: --install-data-local: install-authldaprc install-authdaemonrc install-authmysqlrc install-authpgsqlrc -- test "$(man_LINKS)" = "" && exit 0; \ -- $(mkinstalldirs) $(DESTDIR)$(man7dir) ; \ -- for f in $(man_MANS) "" ; do \ -- test "$$f" = "" && continue ; \ -- $(INSTALL_DATA) $$f $(DESTDIR)$(man7dir) ; done ; \ -- cd $(DESTDIR)$(man7dir) || exit 1 ; \ -- for f in $(man_LINKS) "" ; do \ -- test "$$f" = "" && continue ; \ -- rm -f $$f; $(LN_S) authlib.7 $$f ; \ -- test -w /etc && chown bin $$f && chgrp bin $$f ; \ -- done ; exit 0 -+install-data-local: +-install-data-am: install-data-local ++install-data-am: --uninstall-local: uninstall-authldaprc uninstall-authdaemonrc uninstall-authmysqlrc uninstall-authpgsqlrc -- cd $(DESTDIR)$(man7dir) 2>/dev/null || exit 0 ; \ -- test "$(man_LINKS)" = "" && exit 0; \ -- rm -f $(man_LINKS) $(man_MANS) -+uninstall-local: + install-exec-am: - authlib.html: authlib.html.in - CONFIG_FILES=authlib.html CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/mail/sqwebmail/patches/patch-ac b/mail/sqwebmail/patches/patch-ac deleted file mode 100644 index c5ca9161970..00000000000 --- a/mail/sqwebmail/patches/patch-ac +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ac,v 1.1.1.1 2002/01/24 07:23:44 jlam Exp $ - ---- authlib/cryptpassword.c.orig Wed Jun 20 21:44:04 2001 -+++ authlib/cryptpassword.c -@@ -6,6 +6,7 @@ - #if HAVE_CONFIG_H - #include "config.h" - #endif -+#include <stdlib.h> - #include <string.h> - #if HAVE_UNISTD_H - #include <unistd.h> diff --git a/mail/sqwebmail/patches/patch-ad b/mail/sqwebmail/patches/patch-ad index d80c380b9ed..e5e32d08717 100644 --- a/mail/sqwebmail/patches/patch-ad +++ b/mail/sqwebmail/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.1.1.1 2002/01/24 07:23:47 jlam Exp $ +$NetBSD: patch-ad,v 1.2 2004/02/23 23:41:43 jlam Exp $ ---- sqwebmail/Makefile.in.orig Tue Jan 22 19:05:17 2002 +--- sqwebmail/Makefile.in.orig Thu Nov 27 16:47:01 2003 +++ sqwebmail/Makefile.in -@@ -677,7 +677,7 @@ +@@ -817,7 +817,7 @@ install-perms-local: install-perms-cache htmllibdir.h: config.status echo '#define HTMLLIBDIR "@htmldir@"' >htmllibdir.h @@ -11,8 +11,8 @@ $NetBSD: patch-ad,v 1.1.1.1 2002/01/24 07:23:47 jlam Exp $ echo '#define NOCHANGINGFROM "$(sysconfdir)/nochangingfrom"' >>htmllibdir.h echo '#define USEXSENDER "$(sysconfdir)/usexsender"' >>htmllibdir.h echo '#define CALENDARMODE "$(sysconfdir)/calendarmode"' >>htmllibdir.h -@@ -695,7 +695,7 @@ - ; echo '#define MIMEGPG "$(pkglibexecdir)/mimegpg"' >>htmllibdir.h \ +@@ -835,7 +835,7 @@ htmllibdir.h: config.status + ; echo '#define MAKEMIME "$(pkglibexecdir)/makemime"' >>htmllibdir.h \ ; fi echo '#define LDAPADDRESSBOOK "$(sysconfdir)/ldapaddressbook"' >>htmllibdir.h - echo '#define LDAPSEARCH "$(scriptdir)/ldapsearch"' >>htmllibdir.h diff --git a/mail/sqwebmail/patches/patch-ae b/mail/sqwebmail/patches/patch-ae deleted file mode 100644 index ed43ad94307..00000000000 --- a/mail/sqwebmail/patches/patch-ae +++ /dev/null @@ -1,10 +0,0 @@ -$NetBSD: patch-ae,v 1.1 2002/01/25 00:19:00 jlam Exp $ - ---- ldapaddressbook/ldapsearch.in.orig Sat Jun 3 01:40:27 2000 -+++ ldapaddressbook/ldapsearch.in -@@ -15,4 +15,4 @@ - # This example sets the search timeout to 60 seconds, and a maximum of 20 - # hits returned. - --exec @ldapsearch@ -l 60 -z 20 "$@" -+exec @ldapsearch@ -l 60 -z 20 "$@" | @SED@ -e "s,^\([^ ]*\): ,\1=," |