diff options
Diffstat (limited to 'mail')
485 files changed, 53 insertions, 35557 deletions
diff --git a/mail/assp/files/510.assp.in b/mail/assp/files/510.assp.in deleted file mode 100644 index 6b76b890ef29..000000000000 --- a/mail/assp/files/510.assp.in +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# -# Update ASSP Spam and ClamAV databases - -cd %%ASSP_HOME%% - -if [ ! -f %%PREFIX%%/lib/assp/rebuildspamdb.pl ] -then - echo "%%PREFIX%%/lib/assp/rebuildspamdb.pl does not exist" - rc_spamdb=2 -else - echo "" - echo "Running ASSP rebuildspamdb.pl:" - %%PERL%% %%PREFIX%%/lib/assp/rebuildspamdb.pl && rc_spamdb=0 || rc_spamdb=3 -fi - -if [ ! -f %%PREFIX%%/lib/assp/freshclam.sh ] -then - # existence of freshclam.sh is optional, dependent - # on the WITH_CLAMAV setting, so not an error if not there - rc_clamav=0 -else - echo "" - echo "Fetching ASSP ClamAV virus database updates:" - export PATH=$PATH:%%LOCALBASE%%/bin - sh %%PREFIX%%/lib/assp/freshclam.sh && rc_clamav=0 || rc_clamav=3 -fi - -exit $(($rc_spamdb|$rc_clamav)) diff --git a/mail/c-sig-emacs21/Makefile b/mail/c-sig-emacs21/Makefile deleted file mode 100644 index 13f8fb116678..000000000000 --- a/mail/c-sig-emacs21/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -# New ports collection makefile for: c-sig -# Date created: 30 May 2004 -# Whom: KIMURA Yasuhiro <yasu@utahime.org> -# -# $FreeBSD$ -# - -PORTNAME= c-sig -PORTVERSION= 3.8 -CATEGORIES= mail elisp -MASTER_SITES= http://www.threeweb.ad.jp/~kshibata/c-sig/programs/ -PKGNAMESUFFIX= -${EMACS_PORT_NAME} -DISTNAME= ${PORTNAME}.${PORTVERSION} - -MAINTAINER= yasu@utahime.org -COMMENT= Signature insertion tool for Emacs - -EMACS_PORT_NAME?= emacs21 - -EMACS_NO_BUILD_DEPENDS= yes - -NO_WRKSUBDIR= yes -NO_BUILD= yes -LISPDIR= ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR} - -do-install: - ${MKDIR} ${LISPDIR} - ${INSTALL_DATA} ${WRKSRC}/c-sig.el ${LISPDIR} -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} -.for file in c-sig-eng.faq c-sig-eng.man c-sig-jp.faq c-sig-jp.man - ${INSTALL_MAN} ${WRKSRC}/${file} ${DOCSDIR} -.endfor -.endif - -.include <bsd.port.mk> diff --git a/mail/c-sig-emacs21/distinfo b/mail/c-sig-emacs21/distinfo deleted file mode 100644 index db8869f8b23d..000000000000 --- a/mail/c-sig-emacs21/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (c-sig.3.8.tar.gz) = d3db4543cf5c9827dbc5bebcedb1f693 -SIZE (c-sig.3.8.tar.gz) = 21827 diff --git a/mail/c-sig-emacs21/pkg-descr b/mail/c-sig-emacs21/pkg-descr deleted file mode 100644 index 07354c258886..000000000000 --- a/mail/c-sig-emacs21/pkg-descr +++ /dev/null @@ -1,10 +0,0 @@ -C-sig is signature insertion tool for Emacs. It provides the following -features: - -- Easy to create signatures. -- Three insertion functions. -- Powerful retrieval and learning function. -- c-sig can convert text automatically when insertion. -- signatures can be modified by emacs lisp. - -WWW: http://www.osk.3web.ne.jp/~kshibata/c-sig/english/ diff --git a/mail/c-sig-emacs21/pkg-plist b/mail/c-sig-emacs21/pkg-plist deleted file mode 100644 index 0b3527f77714..000000000000 --- a/mail/c-sig-emacs21/pkg-plist +++ /dev/null @@ -1,6 +0,0 @@ -%%EMACS_VERSION_SITE_LISPDIR%%/c-sig.el -%%PORTDOCS%%%%DOCSDIR%%/c-sig-eng.faq -%%PORTDOCS%%%%DOCSDIR%%/c-sig-eng.man -%%PORTDOCS%%%%DOCSDIR%%/c-sig-jp.faq -%%PORTDOCS%%%%DOCSDIR%%/c-sig-jp.man -%%PORTDOCS%%@dirrm %%DOCSDIR%% diff --git a/mail/cclient/Makefile b/mail/cclient/Makefile index e46489f1b663..84c3e811d2f6 100644 --- a/mail/cclient/Makefile +++ b/mail/cclient/Makefile @@ -6,7 +6,7 @@ # PORTNAME= cclient -PORTVERSION= 2004d +PORTVERSION= 2004g PORTEPOCH= 1 CATEGORIES= mail devel ipv6 MASTER_SITES= ftp://ftp.cac.washington.edu/imap/%SUBDIR%/ \ diff --git a/mail/cclient/distinfo b/mail/cclient/distinfo index cd5114221fea..8b87c533ef1a 100644 --- a/mail/cclient/distinfo +++ b/mail/cclient/distinfo @@ -1,2 +1,2 @@ -MD5 (imap-2004d.tar.Z) = 9bee45a210138d4a924ab95539f5ef35 -SIZE (imap-2004d.tar.Z) = 2223019 +MD5 (imap-2004g.tar.Z) = 9a80f58d8d6a0979c13714ae69050020 +SIZE (imap-2004g.tar.Z) = 2246713 diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile deleted file mode 100644 index afad6ef3ec17..000000000000 --- a/mail/claws-mail/Makefile +++ /dev/null @@ -1,213 +0,0 @@ -# New ports collection makefile for: sylpheed-claws -# Date created: 3 January 2002 -# Whom: Simon 'corecode' Schubert <corecode@corecode.ath.cx> -# -# $FreeBSD$ -# - -PORTNAME= sylpheed-claws -PORTVERSION= 1.9.13 -CATEGORIES= mail news ipv6 -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= sylpheed-claws -DISTFILES= ${EXTRACT_ONLY} \ - ${THEMEFILE} -EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} - -MAINTAINER= netchild@FreeBSD.org -COMMENT= A lightweight and very featureful GTK+ based e-mail and news client - -LIB_DEPENDS= etpan:${PORTSDIR}/mail/libetpan -RUN_DEPENDS= ${LOCALBASE}/etc/mime.types:${PORTSDIR}/misc/mime-support - -THEMEVERSION= 20040929 -THEMEFILE= sylpheed-iconset-${THEMEVERSION}.tar.gz - -USE_BZIP2= yes -USE_GETTEXT= yes -USE_GMAKE= yes -USE_ICONV= yes -USE_X_PREFIX= yes -USE_GNOME= gnomehack pkgconfig gtk20 -USE_REINPLACE= yes -USE_AUTOTOOLS= autoconf:259 libtool:15 -WANT_GNOME= yes - -MAN1= sylpheed-claws.1 - -CONFIGURE_ARGS= --program-suffix="-claws" --enable-ipv6 \ - --with-libiconv-prefix=${LOCALBASE} - -CONFIGURE_ENV= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \ - CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ - LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib" \ - OPENSSL_CFLAGS="-I${OPENSSLINC}" \ - OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto -lssl" \ - LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" - -OPTIONS= ALL "Enable all options." off \ - ASPELL "Enable spell checking support." on \ - CLAMAV "Enable virus-checking support." off \ - COMPFACE "Enable X-Face support." on \ - GNOMEPRINT "Enable extended print support (GNOME)." off \ - GPGME "Enable PGP/GnuPG support using GPGME." off \ - JPILOT "Enable JPilot support." off \ - LDAP "Enable LDAP support." off \ - SA_PLUG "Enable SpamAssassin support." off \ - SSL "Enable OpenSSL support." on \ - THEMES "Install additional themes." on - - -.if defined(NOPORTDOCS) -EXTRA_PATCHES= ${FILESDIR}/extra-doc:Makefile.in -.endif - -.include <bsd.port.pre.mk> - -.if !defined(WITHOUT_SSL) -# we can't use USE_OPENSSL=yes after including bsd.port.pre.mk -.include "${PORTSDIR}/Mk/bsd.openssl.mk" -CONFIGURE_ARGS+= --enable-openssl --with-openssl-includes=${OPENSSLINC} \ - --with-openssl-libs=${OPENSSLLIB} -.else -CONFIGURE_ARGS+= --disable-openssl -.endif - -.if ${HAVE_GNOME:Mgnomehier} != "" || defined(WITH_GNOMEPRINT) -USE_GNOME+= gnomehier -PLIST_SUB+= GNOME="" -USE_GNOME+= gnomehier -.else -PLIST_SUB+= GNOME="@comment " -.endif - -.if ${HAVE_GNOME:Mgnomeprint} != "" || defined(WITH_GNOMEPRINT) -PLIST_SUB+= GNOMEPRINT="" -USE_GNOME+= libgnomeprint libgnomeprintui -CONFIGURE_ARGS+= --enable-gnomeprint -.else -PLIST_SUB+= GNOMEPRINT="@comment " -CONFIGURE_ARGS+= --disable-gnomeprint -.endif - - -.if exists(${LOCALBASE}/include/clamav.h) -WITH_CLAMAV= yes -.endif - -.if defined(WITH_CLAMAV) || defined(WITH_ALL) -CONFIGURE_ARGS+= --enable-clamav -PLIST_SUB+= CLAM_PLUG="" -BUILD_DEPENDS= ${LOCALBASE}/sbin/clamd:${PORTSDIR}/security/clamav -.else -CONFIGURE_ARGS+= --disable-clamav -PLIST_SUB+= CLAM_PLUG="@comment " -.endif -.if defined(WITH_COMPFACE) || defined(WITH_ALL) -LIB_DEPENDS+= compface.1:${PORTSDIR}/mail/faces -CONFIGURE_ARGS+= --enable-compface -.else -CONFIGURE_ARGS+= --disable-compface -.endif -.if defined(WITH_ASPELL) || defined(WITH_ALL) -LIB_DEPENDS+= pspell.16:${PORTSDIR}/textproc/aspell -CONFIGURE_ARGS+= --enable-aspell -.else -CONFIGURE_ARGS+= --disable-aspell -.endif -.if defined(WITH_JPILOT) || defined(WITH_ALL) -LIB_DEPENDS+= pisock.8:${PORTSDIR}/palm/pilot-link -RUN_DEPENDS+= jpilot:${PORTSDIR}/palm/jpilot -CONFIGURE_ARGS+= --enable-jpilot -.else -CONFIGURE_ARGS+= --disable-jpilot -.endif -.if defined(WITH_LDAP) || defined(WITH_ALL) -USE_OPENLDAP= yes -CONFIGURE_ARGS+= --enable-ldap -.else -CONFIGURE_ARGS+= --enable-ldap -.endif -.if defined(WITH_SA_PLUG) || defined(WITH_ALL) -RUN_DEPENDS+= spamd:${PORTSDIR}/mail/p5-Mail-SpamAssassin -CONFIGURE_ARGS+= --enable-spamassassin-plugin -PLIST_SUB+= SA_PLUG="" -.else -CONFIGURE_ARGS+= --disable-spamassassin-plugin -PLIST_SUB+= SA_PLUG="@comment " -.endif -.if defined(WITH_GPGME) || defined(WITH_ALL) -PLIST_SUB+= GPGME="" -CONFIGURE_ARGS+= --enable-pgpmime-plugin --enable-pgpcore-plugin \ - --enable-pgpinline-plugin -LIB_DEPENDS+= gpgme:${PORTSDIR}/security/gpgme -RUN_DEPENDS+= gpg:${PORTSDIR}/security/gnupg -.else -PLIST_SUB+= GPGME="@comment " -CONFIGURE_ARGS+= --disable-pgpmime-plugin --disable-pgpcore-plugin \ - --disable-pgpinline-plugin -.endif -.if defined(WITHOUT_THEMES) -PLIST_SUB+= THEMES="@comment " -.else -PLIST_SUB+= THEMES="" -.endif - -post-extract: -.if !defined(WITHOUT_THEMES) - @${MKDIR} ${WRKSRC}/themes - @cd ${WRKDIR} && ${GZIP_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${THEMEFILE} ${EXTRACT_AFTER_ARGS} -.endif - -post-patch: - @${REINPLACE_CMD} -e \ - 's|-lresolv||g; s|-lpisock\"|-liconv &|g ;\ - s|gpgme-config|gpgme03-config|' ${WRKSRC}/configure - @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" \ - ${WRKSRC}/tools/README.sylprint ${WRKSRC}/tools/sylprint.pl - @${REINPLACE_CMD} -e "s|po intl src|po src| ; s:@SYLPHEED_GNOME:#@SYLPHEED_GNOME:g" ${WRKSRC}/Makefile.in - @for f in `${FIND} ${WRKSRC}/tools -type f -print`; do \ - ${REINPLACE_CMD} -e "s|/usr/bin/perl|${PERL}|" $$f; done -# @${LN} -s ${WRKSRC}/po/sylpheed.pot ${WRKSRC}/po/${PORTNAME}.pot -.if defined(NOPORTDOCS) - @${REINPLACE_CMD} -e 's|src manual faq tools|src tools|' ${WRKSRC}/Makefile.in -.endif - -post-install: -.if !defined(NOPORTDOCS) -.for i in NEWS README README.claws RELEASE_NOTES.claws TODO tools/README.sylprint - @${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR} -.endfor - @${INSTALL_DATA} ${WRKSRC}/tools/README ${DOCSDIR}/README.tools -.endif - @${MKDIR} ${DATADIR} - @cd ${WRKSRC}/tools && \ - ${INSTALL_SCRIPT} OOo2sylpheed.pl acroread2sylpheed.pl \ - calypso_convert.pl convert_mbox.pl eud2gc.py filter_conv.pl \ - freshmeat_search.pl gif2xface.pl google_msgid.pl \ - google_search.pl gpg-sign-syl kmail2sylpheed.pl \ - kmail2sylpheed_v2.pl maildir2sylpheed.pl multiwebsearch.conf \ - multiwebsearch.pl nautilus2sylpheed.sh outlook2sylpheed.pl \ - tb2sylpheed textviewer.sh update-po uudec vcard2xml.py \ - ${DATADIR} - -.if ${HAVE_GNOME:Mgnomehier} != "" - @${MKDIR} ${PREFIX}/share/gnome/applications - @${INSTALL_DATA} ${WRKSRC}/sylpheed-claws.desktop ${PREFIX}/share/gnome/applications/ -.endif - -.if !defined(WITHOUT_THEMES) - @${MKDIR} ${DATADIR}/themes - @cd ${WRKDIR}/${THEMEFILE:C/.tar.gz//} && ${FIND} . -print | \ - ${GREP} -vE '(xvpics|.directory)' | \ - ${CPIO} -pdu -R ${BINOWN}:${BINGRP} --quiet ${DATADIR}/themes/ - @${CHMOD} -R a+r ${DATADIR}/themes - @${FIND} ${DATADIR}/themes -type d -print0 | ${XARGS} -0 ${CHMOD} a+x -.endif - @${INSTALL_SCRIPT} ${WRKSRC}/tools/sylpheed-switcher ${PREFIX}/bin - @${INSTALL_SCRIPT} ${WRKSRC}/tools/sylprint.pl ${PREFIX}/bin - @${INSTALL_DATA} ${WRKSRC}/tools/sylprint.rc ${PREFIX}/etc/sylprint.rc.example - @${MKDIR} ${PREFIX}/share/pixmaps - @${INSTALL_DATA} ${WRKSRC}/sylpheed-claws*.png ${PREFIX}/share/pixmaps/ - -.include <bsd.port.post.mk> diff --git a/mail/claws-mail/distinfo b/mail/claws-mail/distinfo deleted file mode 100644 index 5bc1b28dfcbb..000000000000 --- a/mail/claws-mail/distinfo +++ /dev/null @@ -1,4 +0,0 @@ -MD5 (sylpheed-claws-1.9.13.tar.bz2) = afd3b82ca210520f0ad241b77c5e673a -SIZE (sylpheed-claws-1.9.13.tar.bz2) = 3432284 -MD5 (sylpheed-iconset-20040929.tar.gz) = d72cf03bf3d13cf9e2785eaca3807707 -SIZE (sylpheed-iconset-20040929.tar.gz) = 1298891 diff --git a/mail/claws-mail/files/extra-doc:Makefile.in b/mail/claws-mail/files/extra-doc:Makefile.in deleted file mode 100644 index 7cb0b03d88ed..000000000000 --- a/mail/claws-mail/files/extra-doc:Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- doc/Makefile.in.orig Mon May 10 10:06:47 2004 -+++ doc/Makefile.in Mon May 10 10:07:06 2004 -@@ -257,7 +257,7 @@ - target_cpu = @target_cpu@ - target_os = @target_os@ - target_vendor = @target_vendor@ --SUBDIRS = faq man manual -+SUBDIRS = man - all: all-recursive - - .SUFFIXES: diff --git a/mail/claws-mail/files/patch-configure.ac b/mail/claws-mail/files/patch-configure.ac deleted file mode 100644 index c5aa15b3d2ba..000000000000 --- a/mail/claws-mail/files/patch-configure.ac +++ /dev/null @@ -1,34 +0,0 @@ ---- configure.ac.orig Sat Jul 30 10:54:42 2005 -+++ configure.ac Sat Jul 30 11:10:47 2005 -@@ -153,9 +153,9 @@ - localedir='${prefix}/${DATADIRNAME}/locale' - AC_SUBST(localedir) - --manualdir='${prefix}/${DATADIRNAME}/${PACKAGE}/manual' -+manualdir='${prefix}/${DATADIRNAME}/doc/${PACKAGE}/manual' - AC_SUBST(manualdir) --faqdir='${prefix}/${DATADIRNAME}/${PACKAGE}/faq' -+faqdir='${prefix}/${DATADIRNAME}/doc/${PACKAGE}/faq' - AC_SUBST(faqdir) - - dnl Set PACKAGE_DATA_DIR in config.h. -@@ -303,7 +303,18 @@ - AC_MSG_CHECKING([whether to use OpenSSL]) - if test x"$ac_cv_enable_openssl" = xyes; then - AC_MSG_RESULT(yes) -- PKG_CHECK_MODULES(OPENSSL, openssl >= 0.9.7, :, ac_cv_enable_openssl=no) -+ case $host_os in -+ *freebsd*) -+ if [ $(openssl version | cut -d ' ' -f 2) \< 0.9.7 ]; then -+ ac_cv_enable_openssl=no -+ else -+ OPENSSL_LIBS=${OPENSSL_LIBS-"-lcrypto -lssl"} -+ fi -+ ;; -+ *) -+ PKG_CHECK_MODULES(OPENSSL, openssl >= 0.9.7, :, ac_cv_enable_openssl=no) -+ ;; -+ esac - if test x$ac_cv_enable_openssl = xyes; then - AC_DEFINE(USE_OPENSSL, 1, Define if you want OpenSSL support) - else diff --git a/mail/claws-mail/files/patch-src_etpan_imap-thread.c b/mail/claws-mail/files/patch-src_etpan_imap-thread.c deleted file mode 100644 index 43316bb10fb2..000000000000 --- a/mail/claws-mail/files/patch-src_etpan_imap-thread.c +++ /dev/null @@ -1,10 +0,0 @@ ---- src/etpan/imap-thread.c.orig Sat Jul 30 11:57:41 2005 -+++ src/etpan/imap-thread.c Sat Jul 30 11:58:06 2005 -@@ -8,6 +8,7 @@ - #include <imap.h> - #include <sys/types.h> - #include <sys/stat.h> -+#include <sys/socket.h> - #include <fcntl.h> - #include <sys/mman.h> - #include <sys/wait.h> diff --git a/mail/claws-mail/files/patch-sylpheed-claws.desktop b/mail/claws-mail/files/patch-sylpheed-claws.desktop deleted file mode 100644 index 1eea74683a46..000000000000 --- a/mail/claws-mail/files/patch-sylpheed-claws.desktop +++ /dev/null @@ -1,11 +0,0 @@ ---- sylpheed-claws.desktop.orig Sat Jul 30 11:17:58 2005 -+++ sylpheed-claws.desktop Sat Jul 30 11:18:16 2005 -@@ -1,7 +1,7 @@ - [Desktop Entry] - Encoding=UTF-8 - Name=Sylpheed-Claws --Exec=sylpheed -+Exec=sylpheed-claws - Icon=sylpheed-claws.png - Info="Sylpheed-Claws" - Categories=Application;Network; diff --git a/mail/claws-mail/files/patch-tools-README.sylprint b/mail/claws-mail/files/patch-tools-README.sylprint deleted file mode 100644 index 22b5e00325d4..000000000000 --- a/mail/claws-mail/files/patch-tools-README.sylprint +++ /dev/null @@ -1,18 +0,0 @@ ---- tools/README.sylprint.orig Sun Jan 6 17:05:30 2002 -+++ tools/README.sylprint Tue Jan 15 00:19:12 2002 -@@ -144,11 +144,12 @@ - sylprint.pl - The script itself. - -- sylprint.rc -+ %%PREFIX%%/etc/sylprint.rc -+ ~/.sylpheed/sylprint.rc - Stores user default preferred configuration for the - script. Settings in this file may be overriden by -- command line options. Must be stored in the same -- directory of the script and/or in the ~/.sylpheed -+ command line options. Must be stored in the local -+ configuration directory and/or in the ~/.sylpheed - one (Sylpheed user's configuration directory). - - /tmp/sylprint.username.number diff --git a/mail/claws-mail/files/patch-tools-sylprint.pl b/mail/claws-mail/files/patch-tools-sylprint.pl deleted file mode 100644 index fce5e4ec5bbe..000000000000 --- a/mail/claws-mail/files/patch-tools-sylprint.pl +++ /dev/null @@ -1,14 +0,0 @@ ---- tools/sylprint.pl.orig Tue Jan 8 20:34:37 2002 -+++ tools/sylprint.pl Tue Jan 15 00:13:15 2002 -@@ -36,10 +36,7 @@ - # get user config - if (defined($ARGV[1]) && $ARGV[1] eq '-r') { $a++; } - else { -- @spp = split('/',$0); -- $spp[$#spp] = ''; -- $spp = join('/',@spp); -- $rcf="$spp$rc"; -+ $rcf="%%PREFIX%%/etc/$rc"; - if (-x $rcf) { do $rcf; } - $rcf="$ENV{'HOME'}/.sylpheed/$rc"; - if (-x $rcf) { do $rcf; } diff --git a/mail/claws-mail/pkg-descr b/mail/claws-mail/pkg-descr deleted file mode 100644 index 67b9da13253f..000000000000 --- a/mail/claws-mail/pkg-descr +++ /dev/null @@ -1,13 +0,0 @@ -Sylpheed is an e-mail client (and news reader) based on GTK+ - -Currently, many features are supported including POP3, IMAP, NNTP, -multiple accounts, threading, filtering, MIME attachments, APOP, SMTP -AUTH, SSL, IPv6, GnuPG, internalization, and more. - -In addition to the above, Sylpheed-claws has a lot of extra features, -e.g. a plugin mechanism, a new filtering/processing mechanism, -extra folder properties and much more... - -WWW: http://sylpheed-claws.sourceforge.net/ - -- Simon 'corecode' Schubert diff --git a/mail/claws-mail/pkg-plist b/mail/claws-mail/pkg-plist deleted file mode 100644 index d9aaeda627a1..000000000000 --- a/mail/claws-mail/pkg-plist +++ /dev/null @@ -1,2184 +0,0 @@ -bin/sylpheed-claws -bin/sylpheed-switcher -bin/sylprint.pl -etc/sylprint.rc.example -include/sylpheed-claws/account.h -include/sylpheed-claws/action.h -include/sylpheed-claws/adbookbase.h -include/sylpheed-claws/addr_compl.h -include/sylpheed-claws/addrbook.h -include/sylpheed-claws/addrcache.h -include/sylpheed-claws/addrclip.h -include/sylpheed-claws/addrdefs.h -include/sylpheed-claws/addressadd.h -include/sylpheed-claws/addressbook.h -include/sylpheed-claws/addressitem.h -include/sylpheed-claws/addrgather.h -include/sylpheed-claws/addrharvest.h -include/sylpheed-claws/addrindex.h -include/sylpheed-claws/addritem.h -include/sylpheed-claws/addrquery.h -include/sylpheed-claws/addrselect.h -include/sylpheed-claws/alertpanel.h -include/sylpheed-claws/browseldap.h -include/sylpheed-claws/codeconv.h -include/sylpheed-claws/common/base64.h -include/sylpheed-claws/common/defs.h -include/sylpheed-claws/common/hooks.h -include/sylpheed-claws/common/log.h -include/sylpheed-claws/common/md5.h -include/sylpheed-claws/common/mgutils.h -include/sylpheed-claws/common/nntp.h -include/sylpheed-claws/common/passcrypt.h -include/sylpheed-claws/common/plugin.h -include/sylpheed-claws/common/prefs.h -include/sylpheed-claws/common/progressindicator.h -include/sylpheed-claws/common/quoted-printable.h -include/sylpheed-claws/common/session.h -include/sylpheed-claws/common/smtp.h -include/sylpheed-claws/common/socket.h -include/sylpheed-claws/common/ssl.h -include/sylpheed-claws/common/ssl_certificate.h -include/sylpheed-claws/common/string_match.h -include/sylpheed-claws/common/stringtable.h -include/sylpheed-claws/common/sylpheed.h -include/sylpheed-claws/common/template.h -include/sylpheed-claws/common/timing.h -include/sylpheed-claws/common/utils.h -include/sylpheed-claws/common/uuencode.h -include/sylpheed-claws/common/version.h -include/sylpheed-claws/common/xml.h -include/sylpheed-claws/common/xmlprops.h -include/sylpheed-claws/compose.h -include/sylpheed-claws/config.h -include/sylpheed-claws/crash.h -include/sylpheed-claws/customheader.h -include/sylpheed-claws/displayheader.h -include/sylpheed-claws/editaddress.h -include/sylpheed-claws/editbook.h -include/sylpheed-claws/editgroup.h -include/sylpheed-claws/editjpilot.h -include/sylpheed-claws/editldap.h -include/sylpheed-claws/editldap_basedn.h -include/sylpheed-claws/editvcard.h -include/sylpheed-claws/enriched.h -include/sylpheed-claws/etpan/etpan-thread-manager-types.h -include/sylpheed-claws/etpan/etpan-thread-manager.h -include/sylpheed-claws/etpan/etpan-errors.h -include/sylpheed-claws/etpan/etpan-log.h -include/sylpheed-claws/etpan/imap-thread.h -include/sylpheed-claws/exphtmldlg.h -include/sylpheed-claws/expldifdlg.h -include/sylpheed-claws/export.h -include/sylpheed-claws/exporthtml.h -include/sylpheed-claws/exportldif.h -include/sylpheed-claws/filtering.h -include/sylpheed-claws/folder.h -include/sylpheed-claws/folder_item_prefs.h -include/sylpheed-claws/foldersel.h -include/sylpheed-claws/folderutils.h -include/sylpheed-claws/folderview.h -include/sylpheed-claws/gedit-print.h -include/sylpheed-claws/grouplistdialog.h -include/sylpheed-claws/gtk/about.h -include/sylpheed-claws/gtk/colorlabel.h -include/sylpheed-claws/gtk/colorsel.h -include/sylpheed-claws/gtk/description_window.h -include/sylpheed-claws/gtk/filesel.h -include/sylpheed-claws/gtk/foldersort.h -include/sylpheed-claws/gtk/gtkaspell.h -include/sylpheed-claws/gtk/gtksctree.h -include/sylpheed-claws/gtk/gtkshruler.h -include/sylpheed-claws/gtk/gtksourceprintjob.h -include/sylpheed-claws/gtk/gtkutils.h -include/sylpheed-claws/gtk/gtkvscrollbutton.h -include/sylpheed-claws/gtk/inputdialog.h -include/sylpheed-claws/gtk/logwindow.h -include/sylpheed-claws/gtk/manage_window.h -include/sylpheed-claws/gtk/menu.h -include/sylpheed-claws/gtk/pluginwindow.h -include/sylpheed-claws/gtk/prefswindow.h -include/sylpheed-claws/gtk/progressdialog.h -include/sylpheed-claws/gtk/quicksearch.h -include/sylpheed-claws/gtk/sslcertwindow.h -include/sylpheed-claws/gtk/sylpheed-marshal.h -include/sylpheed-claws/headerview.h -include/sylpheed-claws/html.h -include/sylpheed-claws/image_viewer.h -include/sylpheed-claws/imap.h -include/sylpheed-claws/imap_gtk.h -include/sylpheed-claws/import.h -include/sylpheed-claws/importldif.h -include/sylpheed-claws/importmutt.h -include/sylpheed-claws/importpine.h -include/sylpheed-claws/inc.h -include/sylpheed-claws/jpilot.h -include/sylpheed-claws/ldapctrl.h -include/sylpheed-claws/ldaplocate.h -include/sylpheed-claws/ldapquery.h -include/sylpheed-claws/ldapserver.h -include/sylpheed-claws/ldaputil.h -include/sylpheed-claws/ldif.h -include/sylpheed-claws/localfolder.h -include/sylpheed-claws/main.h -include/sylpheed-claws/mainwindow.h -include/sylpheed-claws/manual.h -include/sylpheed-claws/matcher.h -include/sylpheed-claws/matcher_parser.h -include/sylpheed-claws/matcher_parser_lex.h -include/sylpheed-claws/matcher_parser_parse.h -include/sylpheed-claws/mbox.h -include/sylpheed-claws/message_search.h -include/sylpheed-claws/messageview.h -include/sylpheed-claws/mh.h -include/sylpheed-claws/mh_gtk.h -include/sylpheed-claws/mimeview.h -include/sylpheed-claws/msgcache.h -include/sylpheed-claws/mutt.h -include/sylpheed-claws/news.h -include/sylpheed-claws/news_gtk.h -include/sylpheed-claws/noticeview.h -include/sylpheed-claws/partial_download.h -include/sylpheed-claws/pine.h -%%GPGME%%include/sylpheed-claws/plugins/pgpcore/passphrase.h -%%GPGME%%include/sylpheed-claws/plugins/pgpcore/prefs_gpg.h -%%GPGME%%include/sylpheed-claws/plugins/pgpcore/select-keys.h -%%GPGME%%include/sylpheed-claws/plugins/pgpcore/sgpgme.h -%%GPGME%%include/sylpheed-claws/plugins/pgpinline/pgpinline.h -%%GPGME%%include/sylpheed-claws/plugins/pgpmime/pgpmime.h -include/sylpheed-claws/pop.h -include/sylpheed-claws/prefs_account.h -include/sylpheed-claws/prefs_actions.h -include/sylpheed-claws/prefs_common.h -include/sylpheed-claws/prefs_compose_writing.h -include/sylpheed-claws/prefs_customheader.h -include/sylpheed-claws/prefs_display_header.h -include/sylpheed-claws/prefs_ext_prog.h -include/sylpheed-claws/prefs_filtering.h -include/sylpheed-claws/prefs_filtering_action.h -include/sylpheed-claws/prefs_folder_item.h -include/sylpheed-claws/prefs_fonts.h -include/sylpheed-claws/prefs_gtk.h -include/sylpheed-claws/prefs_image_viewer.h -include/sylpheed-claws/prefs_matcher.h -include/sylpheed-claws/prefs_message.h -include/sylpheed-claws/prefs_msg_colors.h -include/sylpheed-claws/prefs_other.h -include/sylpheed-claws/prefs_quote.h -include/sylpheed-claws/prefs_receive.h -include/sylpheed-claws/prefs_send.h -include/sylpheed-claws/prefs_spelling.h -include/sylpheed-claws/prefs_summaries.h -include/sylpheed-claws/prefs_summary_column.h -include/sylpheed-claws/prefs_template.h -include/sylpheed-claws/prefs_themes.h -include/sylpheed-claws/prefs_toolbar.h -include/sylpheed-claws/prefs_wrapping.h -include/sylpheed-claws/privacy.h -include/sylpheed-claws/procheader.h -include/sylpheed-claws/procmime.h -include/sylpheed-claws/procmsg.h -include/sylpheed-claws/quote_fmt.h -include/sylpheed-claws/quote_fmt_lex.h -include/sylpheed-claws/quote_fmt_parse.h -include/sylpheed-claws/recv.h -include/sylpheed-claws/remotefolder.h -include/sylpheed-claws/send_message.h -include/sylpheed-claws/setup.h -include/sylpheed-claws/sourcewindow.h -include/sylpheed-claws/ssl_manager.h -include/sylpheed-claws/statusbar.h -include/sylpheed-claws/stock_pixmap.h -include/sylpheed-claws/summary_search.h -include/sylpheed-claws/summaryview.h -include/sylpheed-claws/textview.h -include/sylpheed-claws/toolbar.h -include/sylpheed-claws/undo.h -include/sylpheed-claws/unmime.h -include/sylpheed-claws/vcard.h -include/sylpheed-claws/wizard.h -lib/sylpheed-claws/plugins/dillo_viewer.so -lib/sylpheed-claws/plugins/trayicon.so -libdata/pkgconfig/sylpheed-claws.pc -@dirrm include/sylpheed-claws/common -@dirrm include/sylpheed-claws/etpan -@dirrm include/sylpheed-claws/gtk -%%GPGME%%@dirrm include/sylpheed-claws/plugins/pgpcore -%%GPGME%%@dirrm include/sylpheed-claws/plugins/pgpinline -%%GPGME%%@dirrm include/sylpheed-claws/plugins/pgpmime -@unexec rmdir %D/include/sylpheed-claws/plugins 2>/dev/null >/dev/null || true -@dirrm include/sylpheed-claws -%%CLAM_PLUG%%lib/sylpheed-claws/plugins/clamav_plugin.so -%%CLAM_PLUG%%lib/sylpheed-claws/plugins/clamav_plugin_gtk.so -%%GPGME%%lib/sylpheed-claws/plugins/pgpcore.so -%%GPGME%%lib/sylpheed-claws/plugins/pgpmime.deps -%%GPGME%%lib/sylpheed-claws/plugins/pgpmime.so -%%GPGME%%lib/sylpheed-claws/plugins/pgpinline.deps -%%GPGME%%lib/sylpheed-claws/plugins/pgpinline.so -%%SA_PLUG%%lib/sylpheed-claws/plugins/spamassassin.so -%%SA_PLUG%%lib/sylpheed-claws/plugins/spamassassin_gtk.so -%%PORTDOCS%%%%DOCSDIR%%/NEWS -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/README.claws -%%PORTDOCS%%%%DOCSDIR%%/README.sylprint -%%PORTDOCS%%%%DOCSDIR%%/README.tools -%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES.claws -%%PORTDOCS%%%%DOCSDIR%%/TODO -%%PORTDOCS%%%%DOCSDIR%%/faq/de/sylpheed-faq-1.html -%%PORTDOCS%%%%DOCSDIR%%/faq/de/sylpheed-faq-2.html -%%PORTDOCS%%%%DOCSDIR%%/faq/de/sylpheed-faq-3.html -%%PORTDOCS%%%%DOCSDIR%%/faq/de/sylpheed-faq.html -%%PORTDOCS%%%%DOCSDIR%%/faq/en/sylpheed-faq-1.html -%%PORTDOCS%%%%DOCSDIR%%/faq/en/sylpheed-faq-2.html -%%PORTDOCS%%%%DOCSDIR%%/faq/en/sylpheed-faq-3.html -%%PORTDOCS%%%%DOCSDIR%%/faq/en/sylpheed-faq-4.html -%%PORTDOCS%%%%DOCSDIR%%/faq/en/sylpheed-faq.html -%%PORTDOCS%%%%DOCSDIR%%/faq/es/sylpheed-faq-1.html -%%PORTDOCS%%%%DOCSDIR%%/faq/es/sylpheed-faq-2.html -%%PORTDOCS%%%%DOCSDIR%%/faq/es/sylpheed-faq-3.html -%%PORTDOCS%%%%DOCSDIR%%/faq/es/sylpheed-faq-4.html -%%PORTDOCS%%%%DOCSDIR%%/faq/es/sylpheed-faq.html -%%PORTDOCS%%%%DOCSDIR%%/faq/fr/sylpheed-faq-1.html -%%PORTDOCS%%%%DOCSDIR%%/faq/fr/sylpheed-faq-2.html -%%PORTDOCS%%%%DOCSDIR%%/faq/fr/sylpheed-faq-3.html -%%PORTDOCS%%%%DOCSDIR%%/faq/fr/sylpheed-faq.html -%%PORTDOCS%%%%DOCSDIR%%/faq/it/sylpheed-faq-1.html -%%PORTDOCS%%%%DOCSDIR%%/faq/it/sylpheed-faq-2.html -%%PORTDOCS%%%%DOCSDIR%%/faq/it/sylpheed-faq-3.html -%%PORTDOCS%%%%DOCSDIR%%/faq/it/sylpheed-faq.html -%%PORTDOCS%%%%DOCSDIR%%/manual/de/sylpheed-1.html -%%PORTDOCS%%%%DOCSDIR%%/manual/de/sylpheed-10.html -%%PORTDOCS%%%%DOCSDIR%%/manual/de/sylpheed-11.html -%%PORTDOCS%%%%DOCSDIR%%/manual/de/sylpheed-12.html -%%PORTDOCS%%%%DOCSDIR%%/manual/de/sylpheed-13.html -%%PORTDOCS%%%%DOCSDIR%%/manual/de/sylpheed-14.html -%%PORTDOCS%%%%DOCSDIR%%/manual/de/sylpheed-15.html -%%PORTDOCS%%%%DOCSDIR%%/manual/de/sylpheed-16.html -%%PORTDOCS%%%%DOCSDIR%%/manual/de/sylpheed-17.html -%%PORTDOCS%%%%DOCSDIR%%/manual/de/sylpheed-18.html -%%PORTDOCS%%%%DOCSDIR%%/manual/de/sylpheed-19.html -%%PORTDOCS%%%%DOCSDIR%%/manual/de/sylpheed-2.html -%%PORTDOCS%%%%DOCSDIR%%/manual/de/sylpheed-20.html -%%PORTDOCS%%%%DOCSDIR%%/manual/de/sylpheed-3.html -%%PORTDOCS%%%%DOCSDIR%%/manual/de/sylpheed-4.html -%%PORTDOCS%%%%DOCSDIR%%/manual/de/sylpheed-5.html -%%PORTDOCS%%%%DOCSDIR%%/manual/de/sylpheed-6.html -%%PORTDOCS%%%%DOCSDIR%%/manual/de/sylpheed-7.html -%%PORTDOCS%%%%DOCSDIR%%/manual/de/sylpheed-8.html -%%PORTDOCS%%%%DOCSDIR%%/manual/de/sylpheed-9.html -%%PORTDOCS%%%%DOCSDIR%%/manual/de/sylpheed.html -%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-1.html -%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-10.html -%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-11.html -%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-12.html -%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-13.html -%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-14.html -%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-15.html -%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-16.html -%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-17.html -%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-18.html -%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-19.html -%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-2.html -%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-20.html -%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-21.html -%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-22.html -%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-3.html -%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-4.html -%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-5.html -%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-6.html -%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-7.html -%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-8.html -%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-9.html -%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed.html -%%PORTDOCS%%%%DOCSDIR%%/manual/es/sylpheed-1.html -%%PORTDOCS%%%%DOCSDIR%%/manual/es/sylpheed-10.html -%%PORTDOCS%%%%DOCSDIR%%/manual/es/sylpheed-11.html -%%PORTDOCS%%%%DOCSDIR%%/manual/es/sylpheed-12.html -%%PORTDOCS%%%%DOCSDIR%%/manual/es/sylpheed-13.html -%%PORTDOCS%%%%DOCSDIR%%/manual/es/sylpheed-14.html -%%PORTDOCS%%%%DOCSDIR%%/manual/es/sylpheed-15.html -%%PORTDOCS%%%%DOCSDIR%%/manual/es/sylpheed-16.html -%%PORTDOCS%%%%DOCSDIR%%/manual/es/sylpheed-17.html -%%PORTDOCS%%%%DOCSDIR%%/manual/es/sylpheed-18.html -%%PORTDOCS%%%%DOCSDIR%%/manual/es/sylpheed-19.html -%%PORTDOCS%%%%DOCSDIR%%/manual/es/sylpheed-2.html -%%PORTDOCS%%%%DOCSDIR%%/manual/es/sylpheed-20.html -%%PORTDOCS%%%%DOCSDIR%%/manual/es/sylpheed-3.html -%%PORTDOCS%%%%DOCSDIR%%/manual/es/sylpheed-4.html -%%PORTDOCS%%%%DOCSDIR%%/manual/es/sylpheed-5.html -%%PORTDOCS%%%%DOCSDIR%%/manual/es/sylpheed-6.html -%%PORTDOCS%%%%DOCSDIR%%/manual/es/sylpheed-7.html -%%PORTDOCS%%%%DOCSDIR%%/manual/es/sylpheed-8.html -%%PORTDOCS%%%%DOCSDIR%%/manual/es/sylpheed-9.html -%%PORTDOCS%%%%DOCSDIR%%/manual/es/sylpheed.html -%%PORTDOCS%%%%DOCSDIR%%/manual/fr/sylpheed-1.html -%%PORTDOCS%%%%DOCSDIR%%/manual/fr/sylpheed-10.html -%%PORTDOCS%%%%DOCSDIR%%/manual/fr/sylpheed-11.html -%%PORTDOCS%%%%DOCSDIR%%/manual/fr/sylpheed-12.html -%%PORTDOCS%%%%DOCSDIR%%/manual/fr/sylpheed-13.html -%%PORTDOCS%%%%DOCSDIR%%/manual/fr/sylpheed-14.html -%%PORTDOCS%%%%DOCSDIR%%/manual/fr/sylpheed-15.html -%%PORTDOCS%%%%DOCSDIR%%/manual/fr/sylpheed-16.html -%%PORTDOCS%%%%DOCSDIR%%/manual/fr/sylpheed-17.html -%%PORTDOCS%%%%DOCSDIR%%/manual/fr/sylpheed-18.html -%%PORTDOCS%%%%DOCSDIR%%/manual/fr/sylpheed-19.html -%%PORTDOCS%%%%DOCSDIR%%/manual/fr/sylpheed-2.html -%%PORTDOCS%%%%DOCSDIR%%/manual/fr/sylpheed-20.html -%%PORTDOCS%%%%DOCSDIR%%/manual/fr/sylpheed-3.html -%%PORTDOCS%%%%DOCSDIR%%/manual/fr/sylpheed-4.html -%%PORTDOCS%%%%DOCSDIR%%/manual/fr/sylpheed-5.html -%%PORTDOCS%%%%DOCSDIR%%/manual/fr/sylpheed-6.html -%%PORTDOCS%%%%DOCSDIR%%/manual/fr/sylpheed-7.html -%%PORTDOCS%%%%DOCSDIR%%/manual/fr/sylpheed-8.html -%%PORTDOCS%%%%DOCSDIR%%/manual/fr/sylpheed-9.html -%%PORTDOCS%%%%DOCSDIR%%/manual/fr/sylpheed.html -%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-1.html -%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-10.html -%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-11.html -%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-12.html -%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-13.html -%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-14.html -%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-15.html -%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-16.html -%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-17.html -%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-18.html -%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-19.html -%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-2.html -%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-20.html -%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-3.html -%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-4.html -%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-5.html -%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-6.html -%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-7.html -%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-8.html -%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-9.html -%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed.html -%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed.sgml -share/locale/bg/LC_MESSAGES/sylpheed-claws.mo -share/locale/ca/LC_MESSAGES/sylpheed-claws.mo -share/locale/cs/LC_MESSAGES/sylpheed-claws.mo -share/locale/de/LC_MESSAGES/sylpheed-claws.mo -share/locale/el/LC_MESSAGES/sylpheed-claws.mo -share/locale/en_GB/LC_MESSAGES/sylpheed-claws.mo -share/locale/es/LC_MESSAGES/sylpheed-claws.mo -share/locale/fi/LC_MESSAGES/sylpheed-claws.mo -share/locale/fr/LC_MESSAGES/sylpheed-claws.mo -share/locale/hr/LC_MESSAGES/sylpheed-claws.mo -share/locale/hu/LC_MESSAGES/sylpheed-claws.mo -share/locale/it/LC_MESSAGES/sylpheed-claws.mo -share/locale/ja/LC_MESSAGES/sylpheed-claws.mo -share/locale/ko/LC_MESSAGES/sylpheed-claws.mo -share/locale/nb/LC_MESSAGES/sylpheed-claws.mo -share/locale/nl/LC_MESSAGES/sylpheed-claws.mo -share/locale/pl/LC_MESSAGES/sylpheed-claws.mo -share/locale/pt_BR/LC_MESSAGES/sylpheed-claws.mo -share/locale/ru/LC_MESSAGES/sylpheed-claws.mo -share/locale/sk/LC_MESSAGES/sylpheed-claws.mo -share/locale/sr/LC_MESSAGES/sylpheed-claws.mo -share/locale/sv/LC_MESSAGES/sylpheed-claws.mo -share/locale/zh_CN/LC_MESSAGES/sylpheed-claws.mo -share/locale/zh_TW.Big5/LC_MESSAGES/sylpheed-claws.mo -share/pixmaps/sylpheed-claws-128x128.png -share/pixmaps/sylpheed-claws-64x64.png -share/pixmaps/sylpheed-claws.png -%%GNOME%%share/gnome/applications/sylpheed-claws.desktop -%%DATADIR%%/OOo2sylpheed.pl -%%DATADIR%%/acroread2sylpheed.pl -%%DATADIR%%/calypso_convert.pl -%%DATADIR%%/convert_mbox.pl -%%DATADIR%%/eud2gc.py -%%DATADIR%%/filter_conv.pl -%%DATADIR%%/freshmeat_search.pl -%%DATADIR%%/gif2xface.pl -%%DATADIR%%/google_msgid.pl -%%DATADIR%%/google_search.pl -%%DATADIR%%/gpg-sign-syl -%%DATADIR%%/kmail2sylpheed.pl -%%DATADIR%%/kmail2sylpheed_v2.pl -%%DATADIR%%/maildir2sylpheed.pl -%%DATADIR%%/multiwebsearch.conf -%%DATADIR%%/multiwebsearch.pl -%%DATADIR%%/nautilus2sylpheed.sh -%%DATADIR%%/outlook2sylpheed.pl -%%DATADIR%%/tb2sylpheed -%%DATADIR%%/textviewer.sh -%%DATADIR%%/update-po -%%DATADIR%%/uudec -%%DATADIR%%/vcard2xml.py -%%THEMES%%%%DATADIR%%/themes/Crystal/.sylpheed_themeinfo -%%THEMES%%%%DATADIR%%/themes/Crystal/close.xpm -%%THEMES%%%%DATADIR%%/themes/Crystal/continue.xpm -%%THEMES%%%%DATADIR%%/themes/Crystal/dir-close.xpm -%%THEMES%%%%DATADIR%%/themes/Crystal/dir-open.xpm -%%THEMES%%%%DATADIR%%/themes/Crystal/dir_close.xpm -%%THEMES%%%%DATADIR%%/themes/Crystal/dir_open.xpm -%%THEMES%%%%DATADIR%%/themes/Crystal/down_arrow.xpm -%%THEMES%%%%DATADIR%%/themes/Crystal/error.xpm -%%THEMES%%%%DATADIR%%/themes/Crystal/exec.xpm -%%THEMES%%%%DATADIR%%/themes/Crystal/mail.xpm -%%THEMES%%%%DATADIR%%/themes/Crystal/mail_attach.xpm -%%THEMES%%%%DATADIR%%/themes/Crystal/mail_compose.xpm -%%THEMES%%%%DATADIR%%/themes/Crystal/mail_forward.xpm -%%THEMES%%%%DATADIR%%/themes/Crystal/mail_receive.xpm -%%THEMES%%%%DATADIR%%/themes/Crystal/mail_receive_all.xpm -%%THEMES%%%%DATADIR%%/themes/Crystal/mail_reply.xpm -%%THEMES%%%%DATADIR%%/themes/Crystal/mail_reply_to_all.xpm -%%THEMES%%%%DATADIR%%/themes/Crystal/mail_send.xpm -%%THEMES%%%%DATADIR%%/themes/Crystal/mail_send_queue.xpm -%%THEMES%%%%DATADIR%%/themes/Crystal/paste.xpm -%%THEMES%%%%DATADIR%%/themes/Crystal/preferences.xpm -%%THEMES%%%%DATADIR%%/themes/Crystal/properties.xpm -%%THEMES%%%%DATADIR%%/themes/Crystal/search.xpm -%%THEMES%%%%DATADIR%%/themes/Crystal/up_arrow.xpm -%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/.sylpheed_themeinfo -%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/ReadMe -%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/address_book.xpm -%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/book.xpm -%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/category.xpm -%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/close.xpm -%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/dir_close.xpm -%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/dir_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/dir_open.xpm -%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/dir_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/down_arrow.xpm -%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/draft_close.xpm -%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/draft_open.xpm -%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/draft_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/drafts_close.xpm -%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/drafts_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/drafts_open.xpm -%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/drafts_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/edit_extern.xpm -%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/exec.xpm -%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/group.xpm -%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/inbox_close.xpm -%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/inbox_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/inbox_open.xpm -%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/inbox_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/insert_file.xpm -%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/linewrap.xpm -%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/linewrap_current.xpm -%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/mail.xpm -%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/mail_attach.xpm -%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/mail_compose.xpm -%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/mail_forward.xpm -%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/mail_receive.xpm -%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/mail_receive_all.xpm -%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/mail_reply.xpm -%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/mail_reply_to_all.xpm -%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/mail_reply_to_author.xpm -%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/mail_send.xpm -%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/mail_send_queue.xpm -%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/mail_sign.xpm -%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/mime_application.xpm -%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/mime_message.xpm -%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/mime_text_enriched.xpm -%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/mime_text_html.xpm -%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/mime_text_plain.xpm -%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/mime_unknown.xpm -%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/new.xpm -%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/offline.xpm -%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/online.xpm -%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/outbox_close.xpm -%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/outbox_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/outbox_open.xpm -%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/outbox_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/queue_close.xpm -%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/queue_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/queue_open.xpm -%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/queue_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/quicksearch.xpm -%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/replied.xpm -%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/trash_close.xpm -%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/trash_open.xpm -%%THEMES%%%%DATADIR%%/themes/Everaldo_Kids/unread.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/.sylpheed_themeinfo -%%THEMES%%%%DATADIR%%/themes/Gnomeria/README -%%THEMES%%%%DATADIR%%/themes/Gnomeria/address.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/address_book.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/address_search.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/book.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/category.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/check_spelling.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/checkbox_off.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/checkbox_on.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/clip.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/clipkey.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/close.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/complete.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/continue.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/copy.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/cut.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/deleted.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/dir_close.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/dir_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/dir_open.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/dir_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/down_arrow.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/drafts_close.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/drafts_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/drafts_open.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/drafts_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/edit_extern.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/error.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/exec.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/forwarded.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/gpg_signed.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/group.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/ignorethread.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/inbox_close.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/inbox_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/inbox_open.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/inbox_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/insert_file.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/interface.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/jpilot.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/key.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/ldap.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/linewrap.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/linewrapcurrent.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/locked.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/mail.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/mail_attach.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/mail_compose.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/mail_forward.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/mail_receive.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/mail_receive_all.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/mail_reply.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/mail_reply_to_all.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/mail_reply_to_author.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/mail_send.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/mail_send_queue.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/mail_sign.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/mark.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/mime_application.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/mime_audio.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/mime_image.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/mime_message.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/mime_text_enriched.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/mime_text_html.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/mime_text_plain.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/mime_unknown.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/new.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/news_compose.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/notice_error.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/notice_note.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/notice_warn.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/offline.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/online.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/outbox_close.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/outbox_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/outbox_open.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/outbox_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/paste.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/preferences.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/privacy_emblem_encrypted.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/privacy_emblem_failed.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/privacy_emblem_passed.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/privacy_emblem_signed.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/privacy_emblem_warn.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/privacy_expired.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/privacy_failed.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/privacy_passed.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/privacy_signed.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/privacy_unknown.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/privacy_warn.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/properties.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/queue_close.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/queue_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/queue_open.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/queue_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/quicksearch.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/replied.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/sylpheed_logo.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/trash_close.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/trash_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/trash_open.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/trash_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/unread.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/up_arrow.xpm -%%THEMES%%%%DATADIR%%/themes/Gnomeria/vcard.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/.sylpheed_themeinfo -%%THEMES%%%%DATADIR%%/themes/Gorillaws/ChangeLog -%%THEMES%%%%DATADIR%%/themes/Gorillaws/README -%%THEMES%%%%DATADIR%%/themes/Gorillaws/address.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/address_book.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/address_search.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/book.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/category.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/checkbox_off.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/checkbox_on.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/clip.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/clipkey.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/close.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/complete.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/continue.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/deleted.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/dir_close.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/dir_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/dir_open.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/dir_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/down_arrow.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/drafts_close.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/drafts_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/drafts_open.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/drafts_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/edit_extern.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/error.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/exec.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/exec1.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/exec2.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/folder.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/forwarded.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/gpg_signed.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/group.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/ignore_thread.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/ignorethread.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/inbox_close.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/inbox_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/inbox_open.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/inbox_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/insert_file.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/interface.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/jpilot.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/key.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/ldap.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/linewrap.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/linewrapcurrent.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/locked.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/mail.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/mail1.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/mail_attach.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/mail_compose.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/mail_forward.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/mail_receive.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/mail_receive_all.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/mail_reply.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/mail_reply_to_all.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/mail_reply_to_author.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/mail_reply_to_list.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/mail_send.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/mail_send_queue.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/mail_sign.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/mark.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/messageview_text.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/mime_application.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/mime_application_octet_stream.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/mime_audio.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/mime_gpg_expired.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/mime_gpg_failed.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/mime_gpg_passed.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/mime_gpg_signed.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/mime_gpg_unknown.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/mime_image.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/mime_message.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/mime_text_enriched.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/mime_text_html.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/mime_text_plain.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/mime_unknown.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/new.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/news_compose.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/notice_error.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/notice_note.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/notice_warn.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/offline.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/online.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/outbox_close.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/outbox_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/outbox_open.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/outbox_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/paste.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/preferences.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/print.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/print1.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/privacy_emblem_enabled.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/privacy_emblem_failed.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/privacy_emblem_passed.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/privacy_emblem_signed.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/privacy_emblem_warn.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/privacy_expired.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/privacy_failed.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/privacy_passed.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/privacy_signed.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/privacy_unknown.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/privacy_warn.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/properties.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/queue_close.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/queue_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/queue_open.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/queue_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/quicksearch.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/regular.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/replied.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/search.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/trash_close.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/trash_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/trash_open.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/trash_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/unread.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/up_arrow.xpm -%%THEMES%%%%DATADIR%%/themes/Gorillaws/vcard.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/.sylpheed_themeinfo -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/README -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/address.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/address_book.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/address_search.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/book.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/category.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/checkbox_off.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/checkbox_on.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/clip.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/clipkey.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/close.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/complete.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/continue.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/deleted.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/dir_close.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/dir_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/dir_open.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/dir_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/down_arrow.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/drafts_close.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/drafts_open.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/edit_extern.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/error.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/exec.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/folder.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/forwarded.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/gpg_signed.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/group.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/ignorethread.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/inbox.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/inbox_close.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/inbox_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/inbox_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/inbox_open.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/inbox_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/insert_file.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/interface.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/jpilot.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/key.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/ldap.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/linewrap.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/locked.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/mail.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/mail_attach.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/mail_compose.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/mail_forward.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/mail_receive.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/mail_receive_all.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/mail_reply.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/mail_reply_to_all.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/mail_reply_to_author.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/mail_send.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/mail_send_queue.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/mail_sign.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/mark.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/mime_application.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/mime_audio.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/mime_image.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/mime_message.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/mime_text_enriched.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/mime_text_html.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/mime_text_plain.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/mime_unknown.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/new.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/news_compose.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/notice_error.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/notice_note.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/notice_warn.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/outbox.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/outbox_close.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/outbox_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/outbox_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/outbox_open.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/outbox_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/paste.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/preferences.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/privacy_expired.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/privacy_failed.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/privacy_passed.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/privacy_signed.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/privacy_unknown.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/privacy_warn.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/properties.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/queue_close.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/queue_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/queue_open.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/queue_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/quicksearch.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/regular.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/replied.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/search.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/sylpheed_logo.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/trash.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/trash_close.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/trash_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/trash_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/trash_open.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/trash_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/unread.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/up_arrow.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/vcard.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/work_offline.xpm -%%THEMES%%%%DATADIR%%/themes/Graphitte-0.9.7/work_online.xpm -%%THEMES%%%%DATADIR%%/themes/GurUnix/.sylpheed_themeinfo -%%THEMES%%%%DATADIR%%/themes/GurUnix/ChangeLog -%%THEMES%%%%DATADIR%%/themes/GurUnix/INSTALL -%%THEMES%%%%DATADIR%%/themes/GurUnix/README.txt -%%THEMES%%%%DATADIR%%/themes/GurUnix/address.xpm -%%THEMES%%%%DATADIR%%/themes/GurUnix/address_book.xpm -%%THEMES%%%%DATADIR%%/themes/GurUnix/book.xpm -%%THEMES%%%%DATADIR%%/themes/GurUnix/category.xpm -%%THEMES%%%%DATADIR%%/themes/GurUnix/checkbox_off.xpm -%%THEMES%%%%DATADIR%%/themes/GurUnix/checkbox_on.xpm -%%THEMES%%%%DATADIR%%/themes/GurUnix/clip.xpm -%%THEMES%%%%DATADIR%%/themes/GurUnix/clipkey.xpm -%%THEMES%%%%DATADIR%%/themes/GurUnix/close.xpm -%%THEMES%%%%DATADIR%%/themes/GurUnix/complete.xpm -%%THEMES%%%%DATADIR%%/themes/GurUnix/continue.xpm -%%THEMES%%%%DATADIR%%/themes/GurUnix/deleted.xpm -%%THEMES%%%%DATADIR%%/themes/GurUnix/dir_close.xpm -%%THEMES%%%%DATADIR%%/themes/GurUnix/dir_open.xpm -%%THEMES%%%%DATADIR%%/themes/GurUnix/down_arrow.xpm -%%THEMES%%%%DATADIR%%/themes/GurUnix/drafts_close.xpm -%%THEMES%%%%DATADIR%%/themes/GurUnix/drafts_open.xpm -%%THEMES%%%%DATADIR%%/themes/GurUnix/edit_extern.xpm -%%THEMES%%%%DATADIR%%/themes/GurUnix/error.xpm -%%THEMES%%%%DATADIR%%/themes/GurUnix/exec.xpm -%%THEMES%%%%DATADIR%%/themes/GurUnix/forwarded.xpm -%%THEMES%%%%DATADIR%%/themes/GurUnix/group.xpm -%%THEMES%%%%DATADIR%%/themes/GurUnix/ignore_thread.xpm -%%THEMES%%%%DATADIR%%/themes/GurUnix/ignorethread.xpm -%%THEMES%%%%DATADIR%%/themes/GurUnix/inbox.xpm -%%THEMES%%%%DATADIR%%/themes/GurUnix/inbox_close.xpm -%%THEMES%%%%DATADIR%%/themes/GurUnix/inbox_open.xpm -%%THEMES%%%%DATADIR%%/themes/GurUnix/insert_file.xpm -%%THEMES%%%%DATADIR%%/themes/GurUnix/interface.xpm -%%THEMES%%%%DATADIR%%/themes/GurUnix/jpilot.xpm -%%THEMES%%%%DATADIR%%/themes/GurUnix/key.xpm -%%THEMES%%%%DATADIR%%/themes/GurUnix/ldap.xpm -%%THEMES%%%%DATADIR%%/themes/GurUnix/linewrap.xpm -%%THEMES%%%%DATADIR%%/themes/GurUnix/locked.xpm -%%THEMES%%%%DATADIR%%/themes/GurUnix/mail.xpm -%%THEMES%%%%DATADIR%%/themes/GurUnix/mail_attach.xpm -%%THEMES%%%%DATADIR%%/themes/GurUnix/mail_compose.xpm -%%THEMES%%%%DATADIR%%/themes/GurUnix/mail_forward.xpm -%%THEMES%%%%DATADIR%%/themes/GurUnix/mail_receive.xpm -%%THEMES%%%%DATADIR%%/themes/GurUnix/mail_receive_all.xpm -%%THEMES%%%%DATADIR%%/themes/GurUnix/mail_reply.xpm -%%THEMES%%%%DATADIR%%/themes/GurUnix/mail_reply_to_all.xpm -%%THEMES%%%%DATADIR%%/themes/GurUnix/mail_reply_to_author.xpm -%%THEMES%%%%DATADIR%%/themes/GurUnix/mail_reply_to_list.xpm -%%THEMES%%%%DATADIR%%/themes/GurUnix/mail_send.xpm -%%THEMES%%%%DATADIR%%/themes/GurUnix/mail_send_queue.xpm -%%THEMES%%%%DATADIR%%/themes/GurUnix/mail_sign.xpm -%%THEMES%%%%DATADIR%%/themes/GurUnix/mark.xpm -%%THEMES%%%%DATADIR%%/themes/GurUnix/messageview_text.xpm -%%THEMES%%%%DATADIR%%/themes/GurUnix/new.xpm -%%THEMES%%%%DATADIR%%/themes/GurUnix/news_compose.xpm -%%THEMES%%%%DATADIR%%/themes/GurUnix/notice_error.xpm -%%THEMES%%%%DATADIR%%/themes/GurUnix/notice_note.xpm -%%THEMES%%%%DATADIR%%/themes/GurUnix/notice_warn.xpm -%%THEMES%%%%DATADIR%%/themes/GurUnix/outbox.xpm -%%THEMES%%%%DATADIR%%/themes/GurUnix/outbox_close.xpm -%%THEMES%%%%DATADIR%%/themes/GurUnix/outbox_open.xpm -%%THEMES%%%%DATADIR%%/themes/GurUnix/paste.xpm -%%THEMES%%%%DATADIR%%/themes/GurUnix/pgp_signed.xpm -%%THEMES%%%%DATADIR%%/themes/GurUnix/preferences.xpm -%%THEMES%%%%DATADIR%%/themes/GurUnix/print.xpm -%%THEMES%%%%DATADIR%%/themes/GurUnix/properties.xpm -%%THEMES%%%%DATADIR%%/themes/GurUnix/queue.xpm -%%THEMES%%%%DATADIR%%/themes/GurUnix/queue_close.xpm -%%THEMES%%%%DATADIR%%/themes/GurUnix/queue_open.xpm -%%THEMES%%%%DATADIR%%/themes/GurUnix/quicksearch.xpm -%%THEMES%%%%DATADIR%%/themes/GurUnix/replied.xpm -%%THEMES%%%%DATADIR%%/themes/GurUnix/search.xpm -%%THEMES%%%%DATADIR%%/themes/GurUnix/trash_close.xpm -%%THEMES%%%%DATADIR%%/themes/GurUnix/trash_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/GurUnix/trash_open.xpm -%%THEMES%%%%DATADIR%%/themes/GurUnix/trash_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/GurUnix/unread.xpm -%%THEMES%%%%DATADIR%%/themes/GurUnix/up_arrow.xpm -%%THEMES%%%%DATADIR%%/themes/GurUnix/vcard.xpm -%%THEMES%%%%DATADIR%%/themes/GurUnix/work_offline.xpm -%%THEMES%%%%DATADIR%%/themes/GurUnix/work_online.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/.sylpheed_themeinfo -%%THEMES%%%%DATADIR%%/themes/Korillaws/ChangeLog -%%THEMES%%%%DATADIR%%/themes/Korillaws/README -%%THEMES%%%%DATADIR%%/themes/Korillaws/address.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/address_book.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/address_search.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/book.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/category.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/checkbox_off.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/checkbox_on.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/clip.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/clipkey.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/close.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/complete.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/continue.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/deleted.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/dir_close.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/dir_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/dir_open.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/dir_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/down_arrow.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/drafts_close.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/drafts_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/drafts_open.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/drafts_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/edit_extern.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/error.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/exec.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/exec1.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/exec2.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/folder.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/forwarded.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/gpg_signed.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/group.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/ignore_thread.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/ignorethread.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/inbox_close.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/inbox_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/inbox_open.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/inbox_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/insert_file.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/interface.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/jpilot.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/key.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/ldap.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/linewrap.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/linewrapcurrent.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/locked.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/mail.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/mail1.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/mail_attach.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/mail_compose.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/mail_forward.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/mail_receive.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/mail_receive_all.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/mail_reply.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/mail_reply_to_all.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/mail_reply_to_author.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/mail_reply_to_list.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/mail_send.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/mail_send_queue.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/mail_sign.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/mark.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/messageview_text.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/mime_application.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/mime_application_octet_stream.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/mime_audio.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/mime_gpg_expired.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/mime_gpg_failed.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/mime_gpg_passed.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/mime_gpg_signed.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/mime_gpg_unknown.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/mime_image.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/mime_message.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/mime_text_enriched.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/mime_text_html.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/mime_text_plain.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/mime_unknown.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/new.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/news_compose.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/notice_error.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/notice_note.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/notice_warn.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/offline.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/online.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/outbox_close.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/outbox_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/outbox_open.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/outbox_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/paste.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/preferences.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/print.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/print1.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/privacy_emblem_enabled.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/privacy_emblem_failed.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/privacy_emblem_passed.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/privacy_emblem_signed.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/privacy_emblem_warn.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/privacy_expired.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/privacy_failed.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/privacy_passed.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/privacy_signed.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/privacy_unknown.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/privacy_warn.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/properties.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/queue_close.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/queue_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/queue_open.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/queue_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/quicksearch.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/regular.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/replied.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/search.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/trash_close.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/trash_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/trash_open.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/trash_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/unread.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/up_arrow.xpm -%%THEMES%%%%DATADIR%%/themes/Korillaws/vcard.xpm -%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/.sylpheed_themeinfo -%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/address.xpm -%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/address_book.xpm -%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/close.xpm -%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/dir_close.xpm -%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/dir_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/dir_open.xpm -%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/dir_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/down_arrow.xpm -%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/edit_extern.xpm -%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/exec.xpm -%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/forwarded.xpm -%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/ignorethread.xpm -%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/inbox_close.xpm -%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/inbox_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/inbox_open.xpm -%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/inbox_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/insert_file.xpm -%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/mail.xpm -%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/mail_attach.xpm -%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/mail_compose.xpm -%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/mail_forward.xpm -%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/mail_receive.xpm -%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/mail_receive_all.xpm -%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/mail_reply.xpm -%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/mail_reply_to_all.xpm -%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/mail_reply_to_author.xpm -%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/mail_send.xpm -%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/mail_send_queue.xpm -%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/mail_sign.xpm -%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/new.xpm -%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/news_compose.xpm -%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/outbox_close.xpm -%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/outbox_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/outbox_open.xpm -%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/outbox_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/paste.xpm -%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/queue_close.xpm -%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/queue_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/queue_open.xpm -%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/queue_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/replied.xpm -%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/trash_close.xpm -%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/trash_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/trash_open.xpm -%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/trash_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/unread.xpm -%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/up_arrow.xpm -%%THEMES%%%%DATADIR%%/themes/Kovico-sylpheed/vcard.xpm -%%THEMES%%%%DATADIR%%/themes/New_Session/.sylpheed_themeinfo -%%THEMES%%%%DATADIR%%/themes/New_Session/Readme.txt -%%THEMES%%%%DATADIR%%/themes/New_Session/address.xpm -%%THEMES%%%%DATADIR%%/themes/New_Session/address_book.xpm -%%THEMES%%%%DATADIR%%/themes/New_Session/close.xpm -%%THEMES%%%%DATADIR%%/themes/New_Session/dir_close.xpm -%%THEMES%%%%DATADIR%%/themes/New_Session/dir_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/New_Session/dir_open.xpm -%%THEMES%%%%DATADIR%%/themes/New_Session/dir_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/New_Session/down_arrow.xpm -%%THEMES%%%%DATADIR%%/themes/New_Session/edit_extern.xpm -%%THEMES%%%%DATADIR%%/themes/New_Session/exec.xpm -%%THEMES%%%%DATADIR%%/themes/New_Session/forwarded.xpm -%%THEMES%%%%DATADIR%%/themes/New_Session/ignorethread.xpm -%%THEMES%%%%DATADIR%%/themes/New_Session/inbox_close.xpm -%%THEMES%%%%DATADIR%%/themes/New_Session/inbox_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/New_Session/inbox_open.xpm -%%THEMES%%%%DATADIR%%/themes/New_Session/inbox_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/New_Session/insert_file.xpm -%%THEMES%%%%DATADIR%%/themes/New_Session/mail.xpm -%%THEMES%%%%DATADIR%%/themes/New_Session/mail_attach.xpm -%%THEMES%%%%DATADIR%%/themes/New_Session/mail_compose.xpm -%%THEMES%%%%DATADIR%%/themes/New_Session/mail_forward.xpm -%%THEMES%%%%DATADIR%%/themes/New_Session/mail_receive.xpm -%%THEMES%%%%DATADIR%%/themes/New_Session/mail_receive_all.xpm -%%THEMES%%%%DATADIR%%/themes/New_Session/mail_reply.xpm -%%THEMES%%%%DATADIR%%/themes/New_Session/mail_reply_to_all.xpm -%%THEMES%%%%DATADIR%%/themes/New_Session/mail_reply_to_author.xpm -%%THEMES%%%%DATADIR%%/themes/New_Session/mail_send.xpm -%%THEMES%%%%DATADIR%%/themes/New_Session/mail_send_queue.xpm -%%THEMES%%%%DATADIR%%/themes/New_Session/mail_sign.xpm -%%THEMES%%%%DATADIR%%/themes/New_Session/new.xpm -%%THEMES%%%%DATADIR%%/themes/New_Session/news_compose.xpm -%%THEMES%%%%DATADIR%%/themes/New_Session/outbox_close.xpm -%%THEMES%%%%DATADIR%%/themes/New_Session/outbox_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/New_Session/outbox_open.xpm -%%THEMES%%%%DATADIR%%/themes/New_Session/outbox_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/New_Session/paste.xpm -%%THEMES%%%%DATADIR%%/themes/New_Session/queue_close.xpm -%%THEMES%%%%DATADIR%%/themes/New_Session/queue_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/New_Session/queue_open.xpm -%%THEMES%%%%DATADIR%%/themes/New_Session/queue_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/New_Session/replied.xpm -%%THEMES%%%%DATADIR%%/themes/New_Session/trash_close.xpm -%%THEMES%%%%DATADIR%%/themes/New_Session/trash_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/New_Session/trash_open.xpm -%%THEMES%%%%DATADIR%%/themes/New_Session/trash_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/New_Session/unread.xpm -%%THEMES%%%%DATADIR%%/themes/New_Session/up_arrow.xpm -%%THEMES%%%%DATADIR%%/themes/New_Session/vcard.xpm -%%THEMES%%%%DATADIR%%/themes/Phoenity/.sylpheed_themeinfo -%%THEMES%%%%DATADIR%%/themes/Phoenity/address.xpm -%%THEMES%%%%DATADIR%%/themes/Phoenity/address_book.xpm -%%THEMES%%%%DATADIR%%/themes/Phoenity/book.xpm -%%THEMES%%%%DATADIR%%/themes/Phoenity/category.xpm -%%THEMES%%%%DATADIR%%/themes/Phoenity/checkbox_off.xpm -%%THEMES%%%%DATADIR%%/themes/Phoenity/checkbox_on.xpm -%%THEMES%%%%DATADIR%%/themes/Phoenity/clip.xpm -%%THEMES%%%%DATADIR%%/themes/Phoenity/clipkey.xpm -%%THEMES%%%%DATADIR%%/themes/Phoenity/close.xpm -%%THEMES%%%%DATADIR%%/themes/Phoenity/complete.xpm -%%THEMES%%%%DATADIR%%/themes/Phoenity/continue.xpm -%%THEMES%%%%DATADIR%%/themes/Phoenity/delete.xpm -%%THEMES%%%%DATADIR%%/themes/Phoenity/deleted.xpm -%%THEMES%%%%DATADIR%%/themes/Phoenity/dir_close.xpm -%%THEMES%%%%DATADIR%%/themes/Phoenity/dir_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Phoenity/dir_open.xpm -%%THEMES%%%%DATADIR%%/themes/Phoenity/dir_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Phoenity/down_arrow.xpm -%%THEMES%%%%DATADIR%%/themes/Phoenity/drafts_close.xpm -%%THEMES%%%%DATADIR%%/themes/Phoenity/drafts_open.xpm -%%THEMES%%%%DATADIR%%/themes/Phoenity/edit_extern.xpm -%%THEMES%%%%DATADIR%%/themes/Phoenity/error.xpm -%%THEMES%%%%DATADIR%%/themes/Phoenity/exec.xpm -%%THEMES%%%%DATADIR%%/themes/Phoenity/forwarded.xpm -%%THEMES%%%%DATADIR%%/themes/Phoenity/gpg_signed.xpm -%%THEMES%%%%DATADIR%%/themes/Phoenity/group.xpm -%%THEMES%%%%DATADIR%%/themes/Phoenity/ignorethread.xpm -%%THEMES%%%%DATADIR%%/themes/Phoenity/inbox_close.xpm -%%THEMES%%%%DATADIR%%/themes/Phoenity/inbox_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Phoenity/inbox_open.xpm -%%THEMES%%%%DATADIR%%/themes/Phoenity/inbox_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Phoenity/insert_file.xpm -%%THEMES%%%%DATADIR%%/themes/Phoenity/interface.xpm -%%THEMES%%%%DATADIR%%/themes/Phoenity/jpilot.xpm -%%THEMES%%%%DATADIR%%/themes/Phoenity/key.xpm -%%THEMES%%%%DATADIR%%/themes/Phoenity/ldap.xpm -%%THEMES%%%%DATADIR%%/themes/Phoenity/linewrap.xpm -%%THEMES%%%%DATADIR%%/themes/Phoenity/locked.xpm -%%THEMES%%%%DATADIR%%/themes/Phoenity/mail.xpm -%%THEMES%%%%DATADIR%%/themes/Phoenity/mail_attach.xpm -%%THEMES%%%%DATADIR%%/themes/Phoenity/mail_compose.xpm -%%THEMES%%%%DATADIR%%/themes/Phoenity/mail_forward.xpm -%%THEMES%%%%DATADIR%%/themes/Phoenity/mail_receive.xpm -%%THEMES%%%%DATADIR%%/themes/Phoenity/mail_receive_all.xpm -%%THEMES%%%%DATADIR%%/themes/Phoenity/mail_reply.xpm -%%THEMES%%%%DATADIR%%/themes/Phoenity/mail_reply_to_all.xpm -%%THEMES%%%%DATADIR%%/themes/Phoenity/mail_reply_to_author.xpm -%%THEMES%%%%DATADIR%%/themes/Phoenity/mail_send.xpm -%%THEMES%%%%DATADIR%%/themes/Phoenity/mail_send_queue.xpm -%%THEMES%%%%DATADIR%%/themes/Phoenity/mail_sign.xpm -%%THEMES%%%%DATADIR%%/themes/Phoenity/mark.xpm -%%THEMES%%%%DATADIR%%/themes/Phoenity/new.xpm -%%THEMES%%%%DATADIR%%/themes/Phoenity/news_compose.xpm -%%THEMES%%%%DATADIR%%/themes/Phoenity/notice_error.xpm -%%THEMES%%%%DATADIR%%/themes/Phoenity/notice_note.xpm -%%THEMES%%%%DATADIR%%/themes/Phoenity/notice_warn.xpm -%%THEMES%%%%DATADIR%%/themes/Phoenity/outbox_close.xpm -%%THEMES%%%%DATADIR%%/themes/Phoenity/outbox_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Phoenity/outbox_open.xpm -%%THEMES%%%%DATADIR%%/themes/Phoenity/outbox_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Phoenity/paste.xpm -%%THEMES%%%%DATADIR%%/themes/Phoenity/preferences.xpm -%%THEMES%%%%DATADIR%%/themes/Phoenity/properties.xpm -%%THEMES%%%%DATADIR%%/themes/Phoenity/queue_close.xpm -%%THEMES%%%%DATADIR%%/themes/Phoenity/queue_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Phoenity/queue_open.xpm -%%THEMES%%%%DATADIR%%/themes/Phoenity/queue_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Phoenity/quicksearch.xpm -%%THEMES%%%%DATADIR%%/themes/Phoenity/readme.txt -%%THEMES%%%%DATADIR%%/themes/Phoenity/replied.xpm -%%THEMES%%%%DATADIR%%/themes/Phoenity/search.xpm -%%THEMES%%%%DATADIR%%/themes/Phoenity/trash_close.xpm -%%THEMES%%%%DATADIR%%/themes/Phoenity/trash_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Phoenity/trash_open.xpm -%%THEMES%%%%DATADIR%%/themes/Phoenity/trash_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Phoenity/unread.xpm -%%THEMES%%%%DATADIR%%/themes/Phoenity/up_arrow.xpm -%%THEMES%%%%DATADIR%%/themes/Phoenity/vcard.xpm -%%THEMES%%%%DATADIR%%/themes/Phoenity/work_offline.xpm -%%THEMES%%%%DATADIR%%/themes/Phoenity/work_online.xpm -%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/.sylpheed_themeinfo -%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/address.xpm -%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/address_book.xpm -%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/close.xpm -%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/dir_close.xpm -%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/dir_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/dir_open.xpm -%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/dir_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/down_arrow.xpm -%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/edit_extern.xpm -%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/exec.xpm -%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/forwarded.xpm -%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/ignorethread.xpm -%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/inbox_close.xpm -%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/inbox_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/inbox_open.xpm -%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/inbox_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/insert_file.xpm -%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/mail.xpm -%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/mail_attach.xpm -%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/mail_compose.xpm -%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/mail_forward.xpm -%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/mail_receive.xpm -%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/mail_receive_all.xpm -%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/mail_reply.xpm -%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/mail_reply_to_all.xpm -%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/mail_reply_to_author.xpm -%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/mail_send.xpm -%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/mail_send_queue.xpm -%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/mail_sign.xpm -%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/new.xpm -%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/news_compose.xpm -%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/outbox_close.xpm -%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/outbox_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/outbox_open.xpm -%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/outbox_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/paste.xpm -%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/queue_close.xpm -%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/queue_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/queue_open.xpm -%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/queue_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/replied.xpm -%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/trash_close.xpm -%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/trash_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/trash_open.xpm -%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/trash_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/unread.xpm -%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/up_arrow.xpm -%%THEMES%%%%DATADIR%%/themes/Plain_and_Bluish/vcard.xpm -%%THEMES%%%%DATADIR%%/themes/README -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/.sylpheed_themeinfo -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/README -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/address.xpm -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/address_book.xpm -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/book.xpm -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/checkbox_off.xpm -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/checkbox_on.xpm -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/clip.xpm -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/clipkey.xpm -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/close.xpm -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/complete.xpm -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/continue.xpm -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/deleted.xpm -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/dir_close.xpm -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/dir_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/dir_open.xpm -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/dir_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/down_arrow.xpm -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/drafts_close.xpm -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/drafts_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/drafts_open.xpm -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/drafts_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/edit_extern.xpm -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/error.xpm -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/exec.xpm -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/forwarded.xpm -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/gpg_signed.xpm -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/inbox_close.xpm -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/inbox_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/inbox_open.xpm -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/inbox_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/insert_file.xpm -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/interface.xpm -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/jpilot.xpm -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/key.xpm -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/ldap.xpm -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/linewrap.xpm -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/locked.xpm -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/mail.xpm -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/mail_attach.xpm -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/mail_compose.xpm -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/mail_forward.xpm -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/mail_receive.xpm -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/mail_receive_all.xpm -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/mail_reply.xpm -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/mail_reply_to_all.xpm -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/mail_reply_to_author.xpm -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/mail_send.xpm -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/mail_send_queue.xpm -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/mail_sign.xpm -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/mark.xpm -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/messageview_text.xpm -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/mime_application.xpm -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/mime_audio.xpm -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/mime_gpg_expired.xpm -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/mime_gpg_failed.xpm -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/mime_gpg_passed.xpm -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/mime_gpg_signed.xpm -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/mime_gpg_unknown.xpm -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/mime_image.xpm -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/mime_text_enriched.xpm -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/mime_text_html.xpm -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/mime_text_plain.xpm -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/mime_unknown.xpm -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/new.xpm -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/notice_warn.xpm -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/outbox_close.xpm -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/outbox_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/outbox_open.xpm -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/outbox_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/queue_close.xpm -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/queue_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/queue_open.xpm -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/queue_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/quicksearch.xpm -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/replied.xpm -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/trash_close.xpm -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/trash_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/trash_open.xpm -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/trash_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/unread.xpm -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/work_offline.xpm -%%THEMES%%%%DATADIR%%/themes/Skypilot Clawssic/work_online.xpm -%%THEMES%%%%DATADIR%%/themes/Sylpholution/.sylpheed_themeinfo -%%THEMES%%%%DATADIR%%/themes/Sylpholution/ChangeLog -%%THEMES%%%%DATADIR%%/themes/Sylpholution/ChangeLog.pre-1-4 -%%THEMES%%%%DATADIR%%/themes/Sylpholution/address_book.xpm -%%THEMES%%%%DATADIR%%/themes/Sylpholution/all_contacts.xpm -%%THEMES%%%%DATADIR%%/themes/Sylpholution/clip.xpm -%%THEMES%%%%DATADIR%%/themes/Sylpholution/close.xpm -%%THEMES%%%%DATADIR%%/themes/Sylpholution/continue.xpm -%%THEMES%%%%DATADIR%%/themes/Sylpholution/dayview.xpm -%%THEMES%%%%DATADIR%%/themes/Sylpholution/dir_close.xpm -%%THEMES%%%%DATADIR%%/themes/Sylpholution/dir_open.xpm -%%THEMES%%%%DATADIR%%/themes/Sylpholution/down_arrow.xpm -%%THEMES%%%%DATADIR%%/themes/Sylpholution/drafts_close.xpm -%%THEMES%%%%DATADIR%%/themes/Sylpholution/drafts_open.xpm -%%THEMES%%%%DATADIR%%/themes/Sylpholution/edit_extern.xpm -%%THEMES%%%%DATADIR%%/themes/Sylpholution/flag-for-followup.xpm -%%THEMES%%%%DATADIR%%/themes/Sylpholution/gpg_signed.xpm -%%THEMES%%%%DATADIR%%/themes/Sylpholution/inbox_close.xpm -%%THEMES%%%%DATADIR%%/themes/Sylpholution/inbox_open.xpm -%%THEMES%%%%DATADIR%%/themes/Sylpholution/insert_file.xpm -%%THEMES%%%%DATADIR%%/themes/Sylpholution/linewrap.xpm -%%THEMES%%%%DATADIR%%/themes/Sylpholution/mail-replied.xpm -%%THEMES%%%%DATADIR%%/themes/Sylpholution/mail.xpm -%%THEMES%%%%DATADIR%%/themes/Sylpholution/mail_attach.xpm -%%THEMES%%%%DATADIR%%/themes/Sylpholution/mail_compose.xpm -%%THEMES%%%%DATADIR%%/themes/Sylpholution/mail_forward.xpm -%%THEMES%%%%DATADIR%%/themes/Sylpholution/mail_receive.xpm -%%THEMES%%%%DATADIR%%/themes/Sylpholution/mail_receive_all.xpm -%%THEMES%%%%DATADIR%%/themes/Sylpholution/mail_reply.xpm -%%THEMES%%%%DATADIR%%/themes/Sylpholution/mail_reply_to_all.xpm -%%THEMES%%%%DATADIR%%/themes/Sylpholution/mail_reply_to_author.xpm -%%THEMES%%%%DATADIR%%/themes/Sylpholution/mail_send.xpm -%%THEMES%%%%DATADIR%%/themes/Sylpholution/mail_send_queue.xpm -%%THEMES%%%%DATADIR%%/themes/Sylpholution/mail_sign.xpm -%%THEMES%%%%DATADIR%%/themes/Sylpholution/mark.xpm -%%THEMES%%%%DATADIR%%/themes/Sylpholution/new.xpm -%%THEMES%%%%DATADIR%%/themes/Sylpholution/news_compose.xpm -%%THEMES%%%%DATADIR%%/themes/Sylpholution/offline.xpm -%%THEMES%%%%DATADIR%%/themes/Sylpholution/online.xpm -%%THEMES%%%%DATADIR%%/themes/Sylpholution/outbox_close.xpm -%%THEMES%%%%DATADIR%%/themes/Sylpholution/outbox_open.xpm -%%THEMES%%%%DATADIR%%/themes/Sylpholution/queue_close.xpm -%%THEMES%%%%DATADIR%%/themes/Sylpholution/queue_open.xpm -%%THEMES%%%%DATADIR%%/themes/Sylpholution/replied.xpm -%%THEMES%%%%DATADIR%%/themes/Sylpholution/trash_close.xpm -%%THEMES%%%%DATADIR%%/themes/Sylpholution/trash_open.xpm -%%THEMES%%%%DATADIR%%/themes/Sylpholution/unread.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/.sylpheed_themeinfo -%%THEMES%%%%DATADIR%%/themes/SylZilla/ChangeLog -%%THEMES%%%%DATADIR%%/themes/SylZilla/README -%%THEMES%%%%DATADIR%%/themes/SylZilla/address.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/address_book.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/address_search.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/book.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/category.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/checkbox_off.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/checkbox_on.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/clip.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/clipkey.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/close.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/complete.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/continue.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/deleted.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/dir_close.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/dir_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/dir_open.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/dir_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/down_arrow.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/drafts_close.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/drafts_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/drafts_open.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/drafts_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/edit_extern.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/error.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/exec.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/folder.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/forwarded.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/gpg_signed.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/group.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/ignore_thread.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/ignorethread.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/inbox_close.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/inbox_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/inbox_open.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/inbox_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/insert_file.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/interface.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/jpilot.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/key.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/ldap.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/linewrap.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/locked.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/mail.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/mail_attach.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/mail_compose.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/mail_forward.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/mail_receive.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/mail_receive_all.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/mail_reply.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/mail_reply_to_all.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/mail_reply_to_author.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/mail_reply_to_list.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/mail_send.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/mail_send_queue.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/mail_sign.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/mark.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/messageview_text.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/mime_application.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/mime_application_octet_stream.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/mime_audio.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/mime_gpg_expired.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/mime_gpg_failed.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/mime_gpg_passed.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/mime_gpg_signed.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/mime_gpg_unknown.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/mime_image.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/mime_message.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/mime_text_enriched.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/mime_text_html.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/mime_text_plain.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/mime_unknown.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/new.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/news_compose.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/notice_error.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/notice_note.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/notice_warn.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/outbox_close.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/outbox_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/outbox_open.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/outbox_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/paste.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/preferences.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/print.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/properties.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/queue_close.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/queue_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/queue_open.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/queue_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/quicksearch.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/regular.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/replied.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/search.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/trash_close.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/trash_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/trash_open.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/trash_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/unread.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/up_arrow.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/vcard.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/work_offline.xpm -%%THEMES%%%%DATADIR%%/themes/SylZilla/work_online.xpm -%%THEMES%%%%DATADIR%%/themes/XeNtish/.sylpheed_themeinfo -%%THEMES%%%%DATADIR%%/themes/XeNtish/README -%%THEMES%%%%DATADIR%%/themes/XeNtish/address.xpm -%%THEMES%%%%DATADIR%%/themes/XeNtish/address_book.xpm -%%THEMES%%%%DATADIR%%/themes/XeNtish/close.xpm -%%THEMES%%%%DATADIR%%/themes/XeNtish/dir_close.xpm -%%THEMES%%%%DATADIR%%/themes/XeNtish/dir_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/XeNtish/dir_open.xpm -%%THEMES%%%%DATADIR%%/themes/XeNtish/dir_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/XeNtish/down_arrow.xpm -%%THEMES%%%%DATADIR%%/themes/XeNtish/edit_extern.xpm -%%THEMES%%%%DATADIR%%/themes/XeNtish/exec.xpm -%%THEMES%%%%DATADIR%%/themes/XeNtish/forwarded.xpm -%%THEMES%%%%DATADIR%%/themes/XeNtish/ignorethread.xpm -%%THEMES%%%%DATADIR%%/themes/XeNtish/inbox_close.xpm -%%THEMES%%%%DATADIR%%/themes/XeNtish/inbox_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/XeNtish/inbox_open.xpm -%%THEMES%%%%DATADIR%%/themes/XeNtish/inbox_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/XeNtish/insert_file.xpm -%%THEMES%%%%DATADIR%%/themes/XeNtish/mail.xpm -%%THEMES%%%%DATADIR%%/themes/XeNtish/mail_attach.xpm -%%THEMES%%%%DATADIR%%/themes/XeNtish/mail_compose.xpm -%%THEMES%%%%DATADIR%%/themes/XeNtish/mail_forward.xpm -%%THEMES%%%%DATADIR%%/themes/XeNtish/mail_receive.xpm -%%THEMES%%%%DATADIR%%/themes/XeNtish/mail_receive_all.xpm -%%THEMES%%%%DATADIR%%/themes/XeNtish/mail_reply.xpm -%%THEMES%%%%DATADIR%%/themes/XeNtish/mail_reply_to_all.xpm -%%THEMES%%%%DATADIR%%/themes/XeNtish/mail_reply_to_author.xpm -%%THEMES%%%%DATADIR%%/themes/XeNtish/mail_send.xpm -%%THEMES%%%%DATADIR%%/themes/XeNtish/mail_send_queue.xpm -%%THEMES%%%%DATADIR%%/themes/XeNtish/mail_sign.xpm -%%THEMES%%%%DATADIR%%/themes/XeNtish/new.xpm -%%THEMES%%%%DATADIR%%/themes/XeNtish/news_compose.xpm -%%THEMES%%%%DATADIR%%/themes/XeNtish/outbox_close.xpm -%%THEMES%%%%DATADIR%%/themes/XeNtish/outbox_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/XeNtish/outbox_open.xpm -%%THEMES%%%%DATADIR%%/themes/XeNtish/outbox_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/XeNtish/paste.xpm -%%THEMES%%%%DATADIR%%/themes/XeNtish/queue_close.xpm -%%THEMES%%%%DATADIR%%/themes/XeNtish/queue_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/XeNtish/queue_open.xpm -%%THEMES%%%%DATADIR%%/themes/XeNtish/queue_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/XeNtish/replied.xpm -%%THEMES%%%%DATADIR%%/themes/XeNtish/trash_close.xpm -%%THEMES%%%%DATADIR%%/themes/XeNtish/trash_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/XeNtish/trash_open.xpm -%%THEMES%%%%DATADIR%%/themes/XeNtish/trash_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/XeNtish/unread.xpm -%%THEMES%%%%DATADIR%%/themes/XeNtish/up_arrow.xpm -%%THEMES%%%%DATADIR%%/themes/XeNtish/vcard.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/.sylpheed_themeinfo -%%THEMES%%%%DATADIR%%/themes/achileus-noname/address.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/address_book.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/book.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/checkbox_off.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/checkbox_on.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/clip.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/clipkey.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/close.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/complete.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/continue.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/delete.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/deleted.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/dir_close.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/dir_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/dir_open.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/dir_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/down_arrow.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/drafts_close.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/drafts_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/drafts_open.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/drafts_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/edit_extern.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/error.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/exec.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/forwarded.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/gpg_signed.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/inbox_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/inbox_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/insert_file.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/interface.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/jpilot.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/key.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/linewrap.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/locked.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/mail.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/mail_attach.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/mail_compose.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/mail_extern.xcf -%%THEMES%%%%DATADIR%%/themes/achileus-noname/mail_extern.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/mail_forward.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/mail_receive.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/mail_receive_all.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/mail_reply.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/mail_reply_to_all.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/mail_reply_to_author.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/mail_send.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/mail_send_queue.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/mail_sign.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/mark.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/messageview_text.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/mime_audio.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/mime_gpg_expired.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/mime_gpg_failed.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/mime_gpg_passed.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/mime_gpg_signed.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/mime_gpg_unknown.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/mime_image.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/mime_message.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/mime_text_enriched.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/mime_text_html.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/mime_text_plain.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/mime_unknown.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/new.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/news_compose.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/notice_warn.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/offline.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/online.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/outbox_close.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/outbox_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/outbox_open.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/outbox_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/queue_close.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/queue_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/queue_open.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/queue_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/quicksearch.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/replied.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/trash_close.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/trash_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/trash_open.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/trash_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/unread.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/up_arrow.xpm -%%THEMES%%%%DATADIR%%/themes/achileus-noname/vcard.xpm -%%THEMES%%%%DATADIR%%/themes/black/.sylpheed_themeinfo -%%THEMES%%%%DATADIR%%/themes/black/README -%%THEMES%%%%DATADIR%%/themes/black/address.xpm -%%THEMES%%%%DATADIR%%/themes/black/address_book.xpm -%%THEMES%%%%DATADIR%%/themes/black/book.xpm -%%THEMES%%%%DATADIR%%/themes/black/clip.xpm -%%THEMES%%%%DATADIR%%/themes/black/clipkey.xpm -%%THEMES%%%%DATADIR%%/themes/black/close.xpm -%%THEMES%%%%DATADIR%%/themes/black/continue.xpm -%%THEMES%%%%DATADIR%%/themes/black/deleted.xpm -%%THEMES%%%%DATADIR%%/themes/black/dir_close.xpm -%%THEMES%%%%DATADIR%%/themes/black/dir_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/black/dir_open.xpm -%%THEMES%%%%DATADIR%%/themes/black/dir_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/black/down_arrow.xpm -%%THEMES%%%%DATADIR%%/themes/black/edit_extern.xpm -%%THEMES%%%%DATADIR%%/themes/black/error.xpm -%%THEMES%%%%DATADIR%%/themes/black/exec.xpm -%%THEMES%%%%DATADIR%%/themes/black/forwarded.xpm -%%THEMES%%%%DATADIR%%/themes/black/group.xpm -%%THEMES%%%%DATADIR%%/themes/black/ignorethread.xpm -%%THEMES%%%%DATADIR%%/themes/black/inbox_close.xpm -%%THEMES%%%%DATADIR%%/themes/black/inbox_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/black/inbox_open.xpm -%%THEMES%%%%DATADIR%%/themes/black/inbox_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/black/insert_file.xpm -%%THEMES%%%%DATADIR%%/themes/black/interface.xpm -%%THEMES%%%%DATADIR%%/themes/black/key.xpm -%%THEMES%%%%DATADIR%%/themes/black/linewrap.xpm -%%THEMES%%%%DATADIR%%/themes/black/locked.xpm -%%THEMES%%%%DATADIR%%/themes/black/mail.xpm -%%THEMES%%%%DATADIR%%/themes/black/mail_attach.xpm -%%THEMES%%%%DATADIR%%/themes/black/mail_compose.xpm -%%THEMES%%%%DATADIR%%/themes/black/mail_forward.xpm -%%THEMES%%%%DATADIR%%/themes/black/mail_receive.xpm -%%THEMES%%%%DATADIR%%/themes/black/mail_receive_all.xpm -%%THEMES%%%%DATADIR%%/themes/black/mail_reply.xpm -%%THEMES%%%%DATADIR%%/themes/black/mail_reply_to_all.xpm -%%THEMES%%%%DATADIR%%/themes/black/mail_reply_to_author.xpm -%%THEMES%%%%DATADIR%%/themes/black/mail_send.xpm -%%THEMES%%%%DATADIR%%/themes/black/mail_send_queue.xpm -%%THEMES%%%%DATADIR%%/themes/black/mail_sign.xpm -%%THEMES%%%%DATADIR%%/themes/black/mark.xpm -%%THEMES%%%%DATADIR%%/themes/black/new.xpm -%%THEMES%%%%DATADIR%%/themes/black/news_compose.xpm -%%THEMES%%%%DATADIR%%/themes/black/outbox_close.xpm -%%THEMES%%%%DATADIR%%/themes/black/outbox_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/black/outbox_open.xpm -%%THEMES%%%%DATADIR%%/themes/black/outbox_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/black/paste.xpm -%%THEMES%%%%DATADIR%%/themes/black/queue_close.xpm -%%THEMES%%%%DATADIR%%/themes/black/queue_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/black/queue_open.xpm -%%THEMES%%%%DATADIR%%/themes/black/queue_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/black/replied.xpm -%%THEMES%%%%DATADIR%%/themes/black/trash_close.xpm -%%THEMES%%%%DATADIR%%/themes/black/trash_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/black/trash_open.xpm -%%THEMES%%%%DATADIR%%/themes/black/trash_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/black/unread.xpm -%%THEMES%%%%DATADIR%%/themes/black/up_arrow.xpm -%%THEMES%%%%DATADIR%%/themes/black/vcard.xpm -%%THEMES%%%%DATADIR%%/themes/blue_anarchy/.sylpheed_themeinfo -%%THEMES%%%%DATADIR%%/themes/blue_anarchy/Readme.txt -%%THEMES%%%%DATADIR%%/themes/blue_anarchy/address.xpm -%%THEMES%%%%DATADIR%%/themes/blue_anarchy/address_book.xpm -%%THEMES%%%%DATADIR%%/themes/blue_anarchy/close.xpm -%%THEMES%%%%DATADIR%%/themes/blue_anarchy/dir-close.xpm -%%THEMES%%%%DATADIR%%/themes/blue_anarchy/dir-open.xpm -%%THEMES%%%%DATADIR%%/themes/blue_anarchy/dir_close.xpm -%%THEMES%%%%DATADIR%%/themes/blue_anarchy/dir_open.xpm -%%THEMES%%%%DATADIR%%/themes/blue_anarchy/down_arrow.xpm -%%THEMES%%%%DATADIR%%/themes/blue_anarchy/edit_extern.xpm -%%THEMES%%%%DATADIR%%/themes/blue_anarchy/exec.xpm -%%THEMES%%%%DATADIR%%/themes/blue_anarchy/forwarded.xpm -%%THEMES%%%%DATADIR%%/themes/blue_anarchy/ignorethread.xpm -%%THEMES%%%%DATADIR%%/themes/blue_anarchy/inbox_close.xpm -%%THEMES%%%%DATADIR%%/themes/blue_anarchy/inbox_open.xpm -%%THEMES%%%%DATADIR%%/themes/blue_anarchy/insert_file.xpm -%%THEMES%%%%DATADIR%%/themes/blue_anarchy/mail.xpm -%%THEMES%%%%DATADIR%%/themes/blue_anarchy/mail_attach.xpm -%%THEMES%%%%DATADIR%%/themes/blue_anarchy/mail_compose.xpm -%%THEMES%%%%DATADIR%%/themes/blue_anarchy/mail_forward.xpm -%%THEMES%%%%DATADIR%%/themes/blue_anarchy/mail_receive.xpm -%%THEMES%%%%DATADIR%%/themes/blue_anarchy/mail_receive_all.xpm -%%THEMES%%%%DATADIR%%/themes/blue_anarchy/mail_reply.xpm -%%THEMES%%%%DATADIR%%/themes/blue_anarchy/mail_reply_to_all.xpm -%%THEMES%%%%DATADIR%%/themes/blue_anarchy/mail_reply_to_author.xpm -%%THEMES%%%%DATADIR%%/themes/blue_anarchy/mail_send.xpm -%%THEMES%%%%DATADIR%%/themes/blue_anarchy/mail_send_queue.xpm -%%THEMES%%%%DATADIR%%/themes/blue_anarchy/mail_sign.xpm -%%THEMES%%%%DATADIR%%/themes/blue_anarchy/new.xpm -%%THEMES%%%%DATADIR%%/themes/blue_anarchy/news_compose.xpm -%%THEMES%%%%DATADIR%%/themes/blue_anarchy/outbox_close.xpm -%%THEMES%%%%DATADIR%%/themes/blue_anarchy/outbox_open.xpm -%%THEMES%%%%DATADIR%%/themes/blue_anarchy/paste.xpm -%%THEMES%%%%DATADIR%%/themes/blue_anarchy/queue_close.xpm -%%THEMES%%%%DATADIR%%/themes/blue_anarchy/queue_open.xpm -%%THEMES%%%%DATADIR%%/themes/blue_anarchy/replied.xpm -%%THEMES%%%%DATADIR%%/themes/blue_anarchy/trash_close.xpm -%%THEMES%%%%DATADIR%%/themes/blue_anarchy/trash_open.xpm -%%THEMES%%%%DATADIR%%/themes/blue_anarchy/unread.xpm -%%THEMES%%%%DATADIR%%/themes/blue_anarchy/up_arrow.xpm -%%THEMES%%%%DATADIR%%/themes/blue_anarchy/vcard.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel/.sylpheed_themeinfo -%%THEMES%%%%DATADIR%%/themes/mongrel/address_book.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel/close.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel/dir_close.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel/dir_open.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel/down_arrow.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel/edit_extern.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel/exec.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel/insert_file.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel/linewrap.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel/mail.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel/mail_attach.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel/mail_compose.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel/mail_forward.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel/mail_receive.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel/mail_receive_all.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel/mail_reply.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel/mail_reply_to_all.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel/mail_reply_to_author.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel/mail_send.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel/mail_send_queue.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel/mail_sign.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel/news_compose.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel/work_offline.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel/work_online.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel2/.sylpheed_themeinfo -%%THEMES%%%%DATADIR%%/themes/mongrel2/INSTALL -%%THEMES%%%%DATADIR%%/themes/mongrel2/address.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel2/address_book.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel2/book.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel2/checkbox_off.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel2/checkbox_on.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel2/close.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel2/complete.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel2/continue.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel2/delete.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel2/deleted.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel2/dir_close.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel2/dir_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel2/dir_open.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel2/dir_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel2/down_arrow.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel2/drafts_close.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel2/drafts_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel2/drafts_open.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel2/drafts_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel2/edit_extern.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel2/error.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel2/exec.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel2/forwarded.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel2/gpg_signed.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel2/inbox_close.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel2/inbox_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel2/inbox_open.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel2/inbox_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel2/insert_file.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel2/interface.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel2/jpilot.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel2/key.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel2/linewrap.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel2/locked.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel2/mail.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel2/mail_attach.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel2/mail_compose.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel2/mail_forward.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel2/mail_receive.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel2/mail_receive_all.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel2/mail_reply.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel2/mail_reply_to_all.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel2/mail_reply_to_author.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel2/mail_send.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel2/mail_send_queue.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel2/mail_sign.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel2/mark.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel2/messageview_text.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel2/mime_audio.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel2/mime_gpg_expired.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel2/mime_gpg_failed.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel2/mime_gpg_passed.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel2/mime_gpg_signed.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel2/mime_gpg_unknown.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel2/mime_image.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel2/mime_text_enriched.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel2/mime_text_html.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel2/mime_text_plain.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel2/mime_unknown.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel2/new.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel2/news_compose.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel2/notice_warn.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel2/outbox_close.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel2/outbox_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel2/outbox_open.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel2/outbox_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel2/queue_close.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel2/queue_open.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel2/quicksearch.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel2/replied.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel2/trash_close.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel2/trash_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel2/trash_open.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel2/trash_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel2/unread.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel2/work_offline.xpm -%%THEMES%%%%DATADIR%%/themes/mongrel2/work_online.xpm -%%THEMES%%%%DATADIR%%/themes/mozilla/.sylpheed_themeinfo -%%THEMES%%%%DATADIR%%/themes/mozilla/README -%%THEMES%%%%DATADIR%%/themes/mozilla/address_book.xpm -%%THEMES%%%%DATADIR%%/themes/mozilla/close.xpm -%%THEMES%%%%DATADIR%%/themes/mozilla/dir_close.xpm -%%THEMES%%%%DATADIR%%/themes/mozilla/dir_open.xpm -%%THEMES%%%%DATADIR%%/themes/mozilla/down_arrow.xpm -%%THEMES%%%%DATADIR%%/themes/mozilla/edit_extern.xpm -%%THEMES%%%%DATADIR%%/themes/mozilla/exec.xpm -%%THEMES%%%%DATADIR%%/themes/mozilla/insert_file.xpm -%%THEMES%%%%DATADIR%%/themes/mozilla/linewrap.xpm -%%THEMES%%%%DATADIR%%/themes/mozilla/mail.xpm -%%THEMES%%%%DATADIR%%/themes/mozilla/mail_attach.xpm -%%THEMES%%%%DATADIR%%/themes/mozilla/mail_compose.xpm -%%THEMES%%%%DATADIR%%/themes/mozilla/mail_forward.xpm -%%THEMES%%%%DATADIR%%/themes/mozilla/mail_receive.xpm -%%THEMES%%%%DATADIR%%/themes/mozilla/mail_receive_all.xpm -%%THEMES%%%%DATADIR%%/themes/mozilla/mail_reply.xpm -%%THEMES%%%%DATADIR%%/themes/mozilla/mail_reply_to_all.xpm -%%THEMES%%%%DATADIR%%/themes/mozilla/mail_reply_to_author.xpm -%%THEMES%%%%DATADIR%%/themes/mozilla/mail_send.xpm -%%THEMES%%%%DATADIR%%/themes/mozilla/mail_send_queue.xpm -%%THEMES%%%%DATADIR%%/themes/mozilla/mail_sign.xpm -%%THEMES%%%%DATADIR%%/themes/mozilla/news_compose.xpm -%%THEMES%%%%DATADIR%%/themes/mozilla/work_offline.xpm -%%THEMES%%%%DATADIR%%/themes/mozilla/work_online.xpm -%%THEMES%%%%DATADIR%%/themes/orbit-claws/.sylpheed_themeinfo -%%THEMES%%%%DATADIR%%/themes/orbit-claws/README -%%THEMES%%%%DATADIR%%/themes/orbit-claws/address.xpm -%%THEMES%%%%DATADIR%%/themes/orbit-claws/address_book.xpm -%%THEMES%%%%DATADIR%%/themes/orbit-claws/book.xpm -%%THEMES%%%%DATADIR%%/themes/orbit-claws/checkbox_off.xpm -%%THEMES%%%%DATADIR%%/themes/orbit-claws/checkbox_on.xpm -%%THEMES%%%%DATADIR%%/themes/orbit-claws/clip.xpm -%%THEMES%%%%DATADIR%%/themes/orbit-claws/clipkey.xpm -%%THEMES%%%%DATADIR%%/themes/orbit-claws/close.xpm -%%THEMES%%%%DATADIR%%/themes/orbit-claws/complete.xpm -%%THEMES%%%%DATADIR%%/themes/orbit-claws/continue.xpm -%%THEMES%%%%DATADIR%%/themes/orbit-claws/delete.xpm -%%THEMES%%%%DATADIR%%/themes/orbit-claws/deleted.xpm -%%THEMES%%%%DATADIR%%/themes/orbit-claws/dir_close.xpm -%%THEMES%%%%DATADIR%%/themes/orbit-claws/dir_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/orbit-claws/dir_open.xpm -%%THEMES%%%%DATADIR%%/themes/orbit-claws/dir_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/orbit-claws/down_arrow.xpm -%%THEMES%%%%DATADIR%%/themes/orbit-claws/drafts_close.xpm -%%THEMES%%%%DATADIR%%/themes/orbit-claws/drafts_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/orbit-claws/drafts_open.xpm -%%THEMES%%%%DATADIR%%/themes/orbit-claws/drafts_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/orbit-claws/edit_extern.xpm -%%THEMES%%%%DATADIR%%/themes/orbit-claws/error.xpm -%%THEMES%%%%DATADIR%%/themes/orbit-claws/exec.xpm -%%THEMES%%%%DATADIR%%/themes/orbit-claws/forwarded.xpm -%%THEMES%%%%DATADIR%%/themes/orbit-claws/gpg_signed.xpm -%%THEMES%%%%DATADIR%%/themes/orbit-claws/inbox_close.xpm -%%THEMES%%%%DATADIR%%/themes/orbit-claws/inbox_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/orbit-claws/inbox_open.xpm -%%THEMES%%%%DATADIR%%/themes/orbit-claws/inbox_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/orbit-claws/insert_file.xpm -%%THEMES%%%%DATADIR%%/themes/orbit-claws/interface.xpm -%%THEMES%%%%DATADIR%%/themes/orbit-claws/jpilot.xpm -%%THEMES%%%%DATADIR%%/themes/orbit-claws/key.xpm -%%THEMES%%%%DATADIR%%/themes/orbit-claws/linewrap.xpm -%%THEMES%%%%DATADIR%%/themes/orbit-claws/locked.xpm -%%THEMES%%%%DATADIR%%/themes/orbit-claws/mail.xpm -%%THEMES%%%%DATADIR%%/themes/orbit-claws/mail_attach.xpm -%%THEMES%%%%DATADIR%%/themes/orbit-claws/mail_compose.xpm -%%THEMES%%%%DATADIR%%/themes/orbit-claws/mail_forward.xpm -%%THEMES%%%%DATADIR%%/themes/orbit-claws/mail_receive.xpm -%%THEMES%%%%DATADIR%%/themes/orbit-claws/mail_receive_all.xpm -%%THEMES%%%%DATADIR%%/themes/orbit-claws/mail_reply.xpm -%%THEMES%%%%DATADIR%%/themes/orbit-claws/mail_reply_to_all.xpm -%%THEMES%%%%DATADIR%%/themes/orbit-claws/mail_reply_to_author.xpm -%%THEMES%%%%DATADIR%%/themes/orbit-claws/mail_send.xpm -%%THEMES%%%%DATADIR%%/themes/orbit-claws/mail_send_queue.xpm -%%THEMES%%%%DATADIR%%/themes/orbit-claws/mail_sign.xpm -%%THEMES%%%%DATADIR%%/themes/orbit-claws/mark.xpm -%%THEMES%%%%DATADIR%%/themes/orbit-claws/messageview_text.xpm -%%THEMES%%%%DATADIR%%/themes/orbit-claws/mime_audio.xpm -%%THEMES%%%%DATADIR%%/themes/orbit-claws/mime_gpg_expired.xpm -%%THEMES%%%%DATADIR%%/themes/orbit-claws/mime_gpg_failed.xpm -%%THEMES%%%%DATADIR%%/themes/orbit-claws/mime_gpg_passed.xpm -%%THEMES%%%%DATADIR%%/themes/orbit-claws/mime_gpg_signed.xpm -%%THEMES%%%%DATADIR%%/themes/orbit-claws/mime_gpg_unknown.xpm -%%THEMES%%%%DATADIR%%/themes/orbit-claws/mime_image.xpm -%%THEMES%%%%DATADIR%%/themes/orbit-claws/mime_text_enriched.xpm -%%THEMES%%%%DATADIR%%/themes/orbit-claws/mime_text_html.xpm -%%THEMES%%%%DATADIR%%/themes/orbit-claws/mime_text_plain.xpm -%%THEMES%%%%DATADIR%%/themes/orbit-claws/mime_unknown.xpm -%%THEMES%%%%DATADIR%%/themes/orbit-claws/new.xpm -%%THEMES%%%%DATADIR%%/themes/orbit-claws/notice_warn.xpm -%%THEMES%%%%DATADIR%%/themes/orbit-claws/outbox_close.xpm -%%THEMES%%%%DATADIR%%/themes/orbit-claws/outbox_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/orbit-claws/outbox_open.xpm -%%THEMES%%%%DATADIR%%/themes/orbit-claws/outbox_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/orbit-claws/queue_close.xpm -%%THEMES%%%%DATADIR%%/themes/orbit-claws/queue_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/orbit-claws/queue_open.xpm -%%THEMES%%%%DATADIR%%/themes/orbit-claws/queue_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/orbit-claws/quicksearch.xpm -%%THEMES%%%%DATADIR%%/themes/orbit-claws/replied.xpm -%%THEMES%%%%DATADIR%%/themes/orbit-claws/trash_close.xpm -%%THEMES%%%%DATADIR%%/themes/orbit-claws/trash_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/orbit-claws/trash_open.xpm -%%THEMES%%%%DATADIR%%/themes/orbit-claws/trash_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/orbit-claws/unread.xpm -%%THEMES%%%%DATADIR%%/themes/orbit-claws/work_offline.xpm -%%THEMES%%%%DATADIR%%/themes/orbit-claws/work_online.xpm -%%THEMES%%%%DATADIR%%/themes/stw/.sylpheed_themeinfo -%%THEMES%%%%DATADIR%%/themes/stw/address.xpm -%%THEMES%%%%DATADIR%%/themes/stw/address_book.xpm -%%THEMES%%%%DATADIR%%/themes/stw/book.xpm -%%THEMES%%%%DATADIR%%/themes/stw/clip.xpm -%%THEMES%%%%DATADIR%%/themes/stw/clipkey.xpm -%%THEMES%%%%DATADIR%%/themes/stw/close.xpm -%%THEMES%%%%DATADIR%%/themes/stw/complete.xpm -%%THEMES%%%%DATADIR%%/themes/stw/continue.xpm -%%THEMES%%%%DATADIR%%/themes/stw/deleted.xpm -%%THEMES%%%%DATADIR%%/themes/stw/dir_close.xpm -%%THEMES%%%%DATADIR%%/themes/stw/dir_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/stw/dir_open.xpm -%%THEMES%%%%DATADIR%%/themes/stw/dir_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/stw/down_arrow.xpm -%%THEMES%%%%DATADIR%%/themes/stw/edit_extern.xpm -%%THEMES%%%%DATADIR%%/themes/stw/error.xpm -%%THEMES%%%%DATADIR%%/themes/stw/exec.xpm -%%THEMES%%%%DATADIR%%/themes/stw/folder.xpm -%%THEMES%%%%DATADIR%%/themes/stw/forwarded.xpm -%%THEMES%%%%DATADIR%%/themes/stw/ignorethread.xpm -%%THEMES%%%%DATADIR%%/themes/stw/inbox_close.xpm -%%THEMES%%%%DATADIR%%/themes/stw/inbox_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/stw/inbox_open.xpm -%%THEMES%%%%DATADIR%%/themes/stw/inbox_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/stw/insert_file.xpm -%%THEMES%%%%DATADIR%%/themes/stw/interface.xpm -%%THEMES%%%%DATADIR%%/themes/stw/key.xpm -%%THEMES%%%%DATADIR%%/themes/stw/linewrap.xpm -%%THEMES%%%%DATADIR%%/themes/stw/locked.xpm -%%THEMES%%%%DATADIR%%/themes/stw/mail.xpm -%%THEMES%%%%DATADIR%%/themes/stw/mail_attach.xpm -%%THEMES%%%%DATADIR%%/themes/stw/mail_compose.xpm -%%THEMES%%%%DATADIR%%/themes/stw/mail_forward.xpm -%%THEMES%%%%DATADIR%%/themes/stw/mail_receive.xpm -%%THEMES%%%%DATADIR%%/themes/stw/mail_receive_all.xpm -%%THEMES%%%%DATADIR%%/themes/stw/mail_reply.xpm -%%THEMES%%%%DATADIR%%/themes/stw/mail_reply_to_all.xpm -%%THEMES%%%%DATADIR%%/themes/stw/mail_reply_to_author.xpm -%%THEMES%%%%DATADIR%%/themes/stw/mail_send.xpm -%%THEMES%%%%DATADIR%%/themes/stw/mail_send_queue.xpm -%%THEMES%%%%DATADIR%%/themes/stw/mail_sign.xpm -%%THEMES%%%%DATADIR%%/themes/stw/mark.xpm -%%THEMES%%%%DATADIR%%/themes/stw/new.xpm -%%THEMES%%%%DATADIR%%/themes/stw/news_compose.xpm -%%THEMES%%%%DATADIR%%/themes/stw/outbox_close.xpm -%%THEMES%%%%DATADIR%%/themes/stw/outbox_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/stw/outbox_open.xpm -%%THEMES%%%%DATADIR%%/themes/stw/outbox_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/stw/queue_close.xpm -%%THEMES%%%%DATADIR%%/themes/stw/queue_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/stw/queue_open.xpm -%%THEMES%%%%DATADIR%%/themes/stw/queue_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/stw/replied.xpm -%%THEMES%%%%DATADIR%%/themes/stw/trash_close.xpm -%%THEMES%%%%DATADIR%%/themes/stw/trash_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/stw/trash_open.xpm -%%THEMES%%%%DATADIR%%/themes/stw/trash_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/stw/unread.xpm -%%THEMES%%%%DATADIR%%/themes/stw/up_arrow.xpm -%%THEMES%%%%DATADIR%%/themes/stw/vcard.xpm -%%THEMES%%%%DATADIR%%/themes/tml02c/.sylpheed_themeinfo -%%THEMES%%%%DATADIR%%/themes/tml02c/address.xpm -%%THEMES%%%%DATADIR%%/themes/tml02c/address_book.xpm -%%THEMES%%%%DATADIR%%/themes/tml02c/book.xpm -%%THEMES%%%%DATADIR%%/themes/tml02c/category.xpm -%%THEMES%%%%DATADIR%%/themes/tml02c/clip.xpm -%%THEMES%%%%DATADIR%%/themes/tml02c/clipkey.xpm -%%THEMES%%%%DATADIR%%/themes/tml02c/close.xpm -%%THEMES%%%%DATADIR%%/themes/tml02c/complete.xpm -%%THEMES%%%%DATADIR%%/themes/tml02c/continue.xpm -%%THEMES%%%%DATADIR%%/themes/tml02c/deleted.xpm -%%THEMES%%%%DATADIR%%/themes/tml02c/dir_close.xpm -%%THEMES%%%%DATADIR%%/themes/tml02c/dir_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/tml02c/dir_open.xpm -%%THEMES%%%%DATADIR%%/themes/tml02c/dir_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/tml02c/down_arrow.xpm -%%THEMES%%%%DATADIR%%/themes/tml02c/drafts_close.xpm -%%THEMES%%%%DATADIR%%/themes/tml02c/drafts_open.xpm -%%THEMES%%%%DATADIR%%/themes/tml02c/edit_extern.xpm -%%THEMES%%%%DATADIR%%/themes/tml02c/error.xpm -%%THEMES%%%%DATADIR%%/themes/tml02c/exec.xpm -%%THEMES%%%%DATADIR%%/themes/tml02c/forwarded.xpm -%%THEMES%%%%DATADIR%%/themes/tml02c/ignorethread.xpm -%%THEMES%%%%DATADIR%%/themes/tml02c/inbox_close.xpm -%%THEMES%%%%DATADIR%%/themes/tml02c/inbox_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/tml02c/inbox_open.xpm -%%THEMES%%%%DATADIR%%/themes/tml02c/inbox_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/tml02c/insert_file.xpm -%%THEMES%%%%DATADIR%%/themes/tml02c/interface.xpm -%%THEMES%%%%DATADIR%%/themes/tml02c/jpilot.xpm -%%THEMES%%%%DATADIR%%/themes/tml02c/key.xpm -%%THEMES%%%%DATADIR%%/themes/tml02c/linewrap.xpm -%%THEMES%%%%DATADIR%%/themes/tml02c/locked.xpm -%%THEMES%%%%DATADIR%%/themes/tml02c/mail.xpm -%%THEMES%%%%DATADIR%%/themes/tml02c/mail_attach.xpm -%%THEMES%%%%DATADIR%%/themes/tml02c/mail_compose.xpm -%%THEMES%%%%DATADIR%%/themes/tml02c/mail_forward.xpm -%%THEMES%%%%DATADIR%%/themes/tml02c/mail_receive.xpm -%%THEMES%%%%DATADIR%%/themes/tml02c/mail_receive_all.xpm -%%THEMES%%%%DATADIR%%/themes/tml02c/mail_reply.xpm -%%THEMES%%%%DATADIR%%/themes/tml02c/mail_reply_to_all.xpm -%%THEMES%%%%DATADIR%%/themes/tml02c/mail_reply_to_author.xpm -%%THEMES%%%%DATADIR%%/themes/tml02c/mail_send.xpm -%%THEMES%%%%DATADIR%%/themes/tml02c/mail_send_queue.xpm -%%THEMES%%%%DATADIR%%/themes/tml02c/mail_sign.xpm -%%THEMES%%%%DATADIR%%/themes/tml02c/mark.xpm -%%THEMES%%%%DATADIR%%/themes/tml02c/new.xpm -%%THEMES%%%%DATADIR%%/themes/tml02c/news_compose.xpm -%%THEMES%%%%DATADIR%%/themes/tml02c/outbox_close.xpm -%%THEMES%%%%DATADIR%%/themes/tml02c/outbox_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/tml02c/outbox_open.xpm -%%THEMES%%%%DATADIR%%/themes/tml02c/outbox_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/tml02c/paste.xpm -%%THEMES%%%%DATADIR%%/themes/tml02c/queue_close.xpm -%%THEMES%%%%DATADIR%%/themes/tml02c/queue_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/tml02c/queue_open.xpm -%%THEMES%%%%DATADIR%%/themes/tml02c/queue_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/tml02c/quicksearch.xpm -%%THEMES%%%%DATADIR%%/themes/tml02c/replied.xpm -%%THEMES%%%%DATADIR%%/themes/tml02c/trash_close.xpm -%%THEMES%%%%DATADIR%%/themes/tml02c/trash_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/tml02c/trash_open.xpm -%%THEMES%%%%DATADIR%%/themes/tml02c/trash_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/tml02c/unread.xpm -%%THEMES%%%%DATADIR%%/themes/tml02c/up_arrow.xpm -%%THEMES%%%%DATADIR%%/themes/tml02c/vcard.xpm -%%THEMES%%%%DATADIR%%/themes/tml02c/work_offline.xpm -%%THEMES%%%%DATADIR%%/themes/tml02c/work_online.xpm -%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/.sylpheed_themeinfo -%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/README -%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/address_book.xpm -%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/book.xpm -%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/close.xpm -%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/complete.xpm -%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/dir_close.xpm -%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/dir_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/dir_open.xpm -%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/dir_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/down_arrow.xpm -%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/draft_close.xpm -%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/draft_open.xpm -%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/drafts_close.xpm -%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/drafts_open.xpm -%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/edit_extern.xpm -%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/exec.xpm -%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/forwarded.xpm -%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/gpg_signed.xpm -%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/ignorethread.xpm -%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/inbox_close.xpm -%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/inbox_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/inbox_open.xpm -%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/inbox_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/insert_file.xpm -%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/interface.xpm -%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/linewrap.xpm -%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/mail.xpm -%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/mail_attach.xpm -%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/mail_compose.xpm -%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/mail_forward.xpm -%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/mail_receive.xpm -%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/mail_receive_all.xpm -%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/mail_reply.xpm -%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/mail_reply_to_all.xpm -%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/mail_reply_to_author.xpm -%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/mail_send.xpm -%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/mail_send_queue.xpm -%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/mail_sign.xpm -%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/mark.xpm -%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/mime_application.xpm -%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/mime_attach.xpm -%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/mime_audio.xpm -%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/mime_image.xpm -%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/mime_message.xpm -%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/mime_text_enriched.xpm -%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/mime_text_html.xpm -%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/mime_text_plain.xpm -%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/mime_unknown.xpm -%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/new.xpm -%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/news_compose.xpm -%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/outbox_close.xpm -%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/outbox_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/outbox_open.xpm -%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/outbox_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/paste.xpm -%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/preferences.xpm -%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/queue_close.xpm -%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/queue_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/queue_open.xpm -%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/queue_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/quicksearch.xpm -%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/replied.xpm -%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/trash_close.xpm -%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/trash_close_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/trash_open.xpm -%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/trash_open_hrm.xpm -%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/unread.xpm -%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/up.xpm -%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/up_arrow.xpm -%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/vcard.xpm -%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/work_offline.xpm -%%THEMES%%%%DATADIR%%/themes/tom_2.1.1/work_online.xpm -%%THEMES%%@dirrm %%DATADIR%%/themes/Crystal -%%THEMES%%@dirrm %%DATADIR%%/themes/Everaldo_Kids -%%THEMES%%@dirrm %%DATADIR%%/themes/Gnomeria -%%THEMES%%@dirrm %%DATADIR%%/themes/Gorillaws -%%THEMES%%@dirrm %%DATADIR%%/themes/Graphitte-0.9.7 -%%THEMES%%@dirrm %%DATADIR%%/themes/GurUnix -%%THEMES%%@dirrm %%DATADIR%%/themes/Korillaws -%%THEMES%%@dirrm %%DATADIR%%/themes/Kovico-sylpheed -%%THEMES%%@dirrm %%DATADIR%%/themes/New_Session -%%THEMES%%@dirrm %%DATADIR%%/themes/Phoenity -%%THEMES%%@dirrm %%DATADIR%%/themes/Plain_and_Bluish -%%THEMES%%@dirrm %%DATADIR%%/themes/Skypilot Clawssic -%%THEMES%%@dirrm %%DATADIR%%/themes/SylZilla -%%THEMES%%@dirrm %%DATADIR%%/themes/Sylpholution -%%THEMES%%@dirrm %%DATADIR%%/themes/XeNtish -%%THEMES%%@dirrm %%DATADIR%%/themes/achileus-noname -%%THEMES%%@dirrm %%DATADIR%%/themes/black -%%THEMES%%@dirrm %%DATADIR%%/themes/blue_anarchy -%%THEMES%%@dirrm %%DATADIR%%/themes/mongrel -%%THEMES%%@dirrm %%DATADIR%%/themes/mongrel2 -%%THEMES%%@dirrm %%DATADIR%%/themes/mozilla -%%THEMES%%@dirrm %%DATADIR%%/themes/orbit-claws -%%THEMES%%@dirrm %%DATADIR%%/themes/stw -%%THEMES%%@dirrm %%DATADIR%%/themes/tml02c -%%THEMES%%@dirrm %%DATADIR%%/themes/tom_2.1.1 -%%THEMES%%@dirrm %%DATADIR%%/themes -@dirrm %%DATADIR%% -%%PORTDOCS%%@dirrm %%DOCSDIR%%/manual/ja -%%PORTDOCS%%@dirrm %%DOCSDIR%%/manual/fr -%%PORTDOCS%%@dirrm %%DOCSDIR%%/manual/es -%%PORTDOCS%%@dirrm %%DOCSDIR%%/manual/en -%%PORTDOCS%%@dirrm %%DOCSDIR%%/manual/de -%%PORTDOCS%%@dirrm %%DOCSDIR%%/manual -%%PORTDOCS%%@dirrm %%DOCSDIR%%/faq/it -%%PORTDOCS%%@dirrm %%DOCSDIR%%/faq/fr -%%PORTDOCS%%@dirrm %%DOCSDIR%%/faq/es -%%PORTDOCS%%@dirrm %%DOCSDIR%%/faq/en -%%PORTDOCS%%@dirrm %%DOCSDIR%%/faq/de -%%PORTDOCS%%@dirrm %%DOCSDIR%%/faq -%%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrm lib/sylpheed-claws/plugins -@dirrm lib/sylpheed-claws diff --git a/mail/courier-imap/files/courier-imap-imapd-ssl.in b/mail/courier-imap/files/courier-imap-imapd-ssl.in deleted file mode 100644 index d54c97023180..000000000000 --- a/mail/courier-imap/files/courier-imap-imapd-ssl.in +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/sh -# -# An rc.subr-style startup script for Courier-IMAP's IMAP over SSL service. - -# PROVIDE: courier_imap_imapd_ssl -# REQUIRE: LOGIN courier_authdaemond -# KEYWORD: FreeBSD shutdown - -# Define these courier_imap_imapd_ssl_* variables in one of these files: -# /etc/rc.conf -# /etc/rc.conf.local -# /etc/rc.conf.d/courier_imap_imapd_ssl -# -# DO NOT CHANGE THESE DEFAULT VALUES HERE - -courier_imap_imapd_ssl_enable=${courier_imap_imapd_ssl_enable-"NO"} - -. %%RC_SUBR%% - -name="courier_imap_imapd_ssl" -rcvar=`set_rcvar` -command="%%PREFIX%%/libexec/courier-imap/imapd-ssl.rc" -pidfile="/var/run/imapd-ssl.pid" -procname="%%PREFIX%%/libexec/courier-imap/couriertcpd" - -start_cmd="imapd_ssl_cmd start" -stop_cmd="imapd_ssl_cmd stop" -restart_cmd="imapd_ssl_cmd stop && imapd_ssl_cmd start" - -load_rc_config $name - -imapd_ssl_cmd () { - case $1 in - start) - echo "Starting ${name}." - ${command} start - ;; - stop) - echo "Stopping ${name}." - ${command} stop - ;; - esac -} - -run_rc_command "$1" - diff --git a/mail/courier-imap/files/courier-imap-imapd.in b/mail/courier-imap/files/courier-imap-imapd.in deleted file mode 100644 index 42c776b830ed..000000000000 --- a/mail/courier-imap/files/courier-imap-imapd.in +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/sh -# -# An rc.subr-style startup script for Courier-IMAP's IMAP service. - -# PROVIDE: courier_imap_imapd -# REQUIRE: LOGIN courier_authdaemond -# KEYWORD: FreeBSD shutdown - -# Define these courier_imap_imapd_* variables in one of these files: -# /etc/rc.conf -# /etc/rc.conf.local -# /etc/rc.conf.d/courier_imap_imapd -# -# DO NOT CHANGE THESE DEFAULT VALUES HERE - -courier_imap_imapd_enable=${courier_imap_imapd_enable-"NO"} - -. %%RC_SUBR%% - -name="courier_imap_imapd" -rcvar=`set_rcvar` -command="%%PREFIX%%/libexec/courier-imap/imapd.rc" -pidfile="/var/run/imapd.pid" -procname="%%PREFIX%%/libexec/courier-imap/couriertcpd" - -start_cmd="imapd_cmd start" -stop_cmd="imapd_cmd stop" -restart_cmd="imapd_cmd stop && imapd_cmd start" - -load_rc_config $name - -imapd_cmd () { - case $1 in - start) - echo "Starting ${name}." - ${command} start - ;; - stop) - echo "Stopping ${name}." - ${command} stop - ;; - esac -} - -run_rc_command "$1" - diff --git a/mail/courier-imap/files/courier-imap-pop3d-ssl.in b/mail/courier-imap/files/courier-imap-pop3d-ssl.in deleted file mode 100644 index b594235905f5..000000000000 --- a/mail/courier-imap/files/courier-imap-pop3d-ssl.in +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/sh -# -# An rc.subr-style startup script for Courier-IMAP's POP3 over SSL service. - -# PROVIDE: courier_imap_pop3d_ssl -# REQUIRE: LOGIN courier_authdaemond -# KEYWORD: FreeBSD shutdown - -# Define these courier_imap_pop3d_ssl_* variables in one of these files: -# /etc/rc.conf -# /etc/rc.conf.local -# /etc/rc.conf.d/courier_imap_pop3d_ssl -# -# DO NOT CHANGE THESE DEFAULT VALUES HERE - -courier_imap_pop3d_ssl_enable=${courier_imap_pop3d_ssl_enable-"NO"} - -. %%RC_SUBR%% - -name="courier_imap_pop3d_ssl" -rcvar=`set_rcvar` -command="%%PREFIX%%/libexec/courier-imap/pop3d-ssl.rc" -pidfile="/var/run/pop3d-ssl.pid" -procname="%%PREFIX%%/libexec/courier-imap/couriertcpd" - -start_cmd="pop3d_ssl_cmd start" -stop_cmd="pop3d_ssl_cmd stop" -restart_cmd="pop3d_ssl_cmd stop && pop3d_ssl_cmd start" - -load_rc_config $name - -pop3d_ssl_cmd () { - case $1 in - start) - echo "Starting ${name}." - ${command} start - ;; - stop) - echo "Stopping ${name}." - ${command} stop - ;; - esac -} - -run_rc_command "$1" - diff --git a/mail/courier-imap/files/courier-imap-pop3d.in b/mail/courier-imap/files/courier-imap-pop3d.in deleted file mode 100644 index 886d21eaa3e1..000000000000 --- a/mail/courier-imap/files/courier-imap-pop3d.in +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/sh -# -# An rc.subr-style startup script for Courier-IMAP's POP3 service. - -# PROVIDE: courier_imap_pop3d -# REQUIRE: LOGIN courier_authdaemond -# KEYWORD: FreeBSD shutdown - -# Define these courier_imap_pop3d_* variables in one of these files: -# /etc/rc.conf -# /etc/rc.conf.local -# /etc/rc.conf.d/courier_imap_pop3d -# -# DO NOT CHANGE THESE DEFAULT VALUES HERE - -courier_imap_pop3d_enable=${courier_imap_pop3d_enable-"NO"} - -. %%RC_SUBR%% - -name="courier_imap_pop3d" -rcvar=`set_rcvar` -command="%%PREFIX%%/libexec/courier-imap/pop3d.rc" -pidfile="/var/run/pop3d.pid" -procname="%%PREFIX%%/libexec/courier-imap/couriertcpd" - -start_cmd="pop3d_cmd start" -stop_cmd="pop3d_cmd stop" -restart_cmd="pop3d_cmd stop && pop3d_cmd start" - -load_rc_config $name - -pop3d_cmd () { - case $1 in - start) - echo "Starting ${name}." - ${command} start - ;; - stop) - echo "Stopping ${name}." - ${command} stop - ;; - esac -} - -run_rc_command "$1" - diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile deleted file mode 100644 index d137aefb38fe..000000000000 --- a/mail/cyrus-imapd23/Makefile +++ /dev/null @@ -1,332 +0,0 @@ -# New ports collection makefile for: cyrus-imapd -# Date created: Jan 4th 2001 -# Whom: ume@FreeBSD.org -# -# $FreeBSD$ -# - -PORTNAME= cyrus-imapd -PORTVERSION= 2.2.12 -PORTREVISION= 1 -CATEGORIES= mail ipv6 -MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \ - ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \ - ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/cyrus-mail/&,} - -MAINTAINER= ume@FreeBSD.org -COMMENT= The cyrus mail server, supporting POP3 and IMAP4 protocols - -LIB_DEPENDS= sasl2.2:${PORTSDIR}/security/cyrus-sasl2 -RUN_DEPENDS= ${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-Pod-Parser \ - ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp - -CONFLICTS= cyrus-1.* cyrus-imapd-2.[^2].* - -LATEST_LINK= ${PORTNAME}22 - -USE_RC_SUBR= imapd.sh -USE_OPENSSL= yes -USE_PERL5= yes -USE_REINPLACE= yes -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc \ - --with-cyrus-prefix=${PREFIX}/cyrus \ - --with-cyrus-user=${CYRUS_USER} \ - --with-cyrus-group=${CYRUS_GROUP} \ - --with-sasl=${LOCALBASE} \ - --with-bdb-libdir=${LOCALBASE}/lib \ - --with-com_err \ - --with-openssl=${OPENSSLBASE} \ - --with-perl=${PERL5} - -OPTIONS= AUTH_KRB5 "Use Kerberos5 authorization module" off -.if defined(WITH_BDB_VER) -USE_BDB_VER= ${WITH_BDB_VER} -.else -USE_BDB_VER= 3 -.endif -.if ${USE_BDB_VER} == 3 -OPTIONS+= BDB_3 "Use BerkeleyDB v3" on \ - BDB_4 "Use BerkeleyDB v4" off \ - BDB_41 "Use BerkeleyDB v4.1" off \ - BDB_42 "Use BerkeleyDB v4.2" off \ - BDB_43 "Use BerkeleyDB v4.3" off -.elif ${USE_BDB_VER} == 4 -OPTIONS+= BDB_3 "Use BerkeleyDB v3" off \ - BDB_4 "Use BerkeleyDB v4" on \ - BDB_41 "Use BerkeleyDB v4.1" off \ - BDB_42 "Use BerkeleyDB v4.2" off \ - BDB_43 "Use BerkeleyDB v4.3" off -.elif ${USE_BDB_VER} == 41 -OPTIONS+= BDB_3 "Use BerkeleyDB v3" off \ - BDB_4 "Use BerkeleyDB v4" off \ - BDB_41 "Use BerkeleyDB v4.1" on \ - BDB_42 "Use BerkeleyDB v4.2" off \ - BDB_43 "Use BerkeleyDB v4.3" off -.elif ${USE_BDB_VER} == 42 -OPTIONS+= BDB_3 "Use BerkeleyDB v3" off \ - BDB_4 "Use BerkeleyDB v4" off \ - BDB_41 "Use BerkeleyDB v4.1" off \ - BDB_42 "Use BerkeleyDB v4.2" on \ - BDB_43 "Use BerkeleyDB v4.3" off -.elif ${USE_BDB_VER} == 43 -OPTIONS+= BDB_3 "Use BerkeleyDB v3" off \ - BDB_4 "Use BerkeleyDB v4" off \ - BDB_41 "Use BerkeleyDB v4.1" off \ - BDB_42 "Use BerkeleyDB v4.2" off \ - BDB_43 "Use BerkeleyDB v4.3" on -.else -BROKEN= "WITH_BDB_VER must be 3, 4, 41, 42 or 43" -.endif - -OPTIONS+= DRAC "Enable DRAC support" off -OPTIONS+= IDLE_IDLED "Enable IMAP IDLE method idled" off \ - IDLE_POLL "Enable IMAP IDLE method idle-polling" on -OPTIONS+= LDAP_PTLOADER "Enable LDAP ptloader (experimantal)" off -OPTIONS+= LISTEXT "Enable IMAP List extensions" off -OPTIONS+= MURDER "Enable IMAP Murder support" off -OPTIONS+= NETSCAPEHACK "Enable X-NETSCAPE extensions" off -OPTIONS+= NNTP "Enable NNTP support" off -OPTIONS+= SNMP_4 "Enable SNMP support using net-snmp v4" off \ - SNMP_5 "Enable SNMP support using net-snmp v5" off -OPTIONS+= PASS8BITHACK "Add pass8bit option (not recommended)" off - -BDB_VERS= 3 4 41 42 43 - -.include <bsd.port.pre.mk> - -BDB_W:= -BDB_WO:= -.for v in ${BDB_VERS} -BDB_W:= ${BDB_W} ${WITH_BDB_${v}} -BDB_WO:= ${BDB_WO} ${WITHOUT_BDB_${v}} -.endfor -BDB_NUM_W!= ${ECHO_CMD} ${BDB_W} | wc -w -BDB_NUM_WO!= ${ECHO_CMD} ${BDB_WO} | wc -w -BDB_NUM_VERS!= ${ECHO_CMD} ${BDB_VERS} | wc -w - -.if ${BDB_NUM_W} == 0 -.if ${BDB_NUM_WO} == ${BDB_NUM_VERS} -BROKEN= "You need to select one BDB version. Run 'make config' again!" -.endif -WITH_BDB_${USE_BDB_VER}= true -.elif ${BDB_NUM_W} != 1 -BROKEN= "Multiple BDB versions selected. Run 'make config' again!" -.endif -.if defined(WITH_BDB_3) -BDB_VER= 3 -BDB_MAJOR= 3 -.elif defined(WITH_BDB_4) -BDB_VER= 4 -BDB_MAJOR= 0 -.elif defined(WITH_BDB_41) -BDB_VER= 41 -BDB_MAJOR= 1 -.elif defined(WITH_BDB_42) -BDB_VER= 42 -BDB_SUFFIX= -4.2 -BDB_MAJOR= 2 -.elif defined(WITH_BDB_43) -BDB_VER= 43 -BDB_SUFFIX= -4.3 -BDB_MAJOR= 0 -.endif -BDB_SUFFIX?= ${BDB_VER} -LIB_DEPENDS+= db${BDB_SUFFIX}.${BDB_MAJOR}:${PORTSDIR}/databases/db${BDB_VER} -CONFIGURE_ARGS+=--with-bdb-incdir=${LOCALBASE}/include/db${BDB_VER} \ - --with-bdb=db${BDB_SUFFIX} - -.if defined(WITH_NNTP) -CONFIGURE_ARGS+=--enable-nntp -PLIST_SUB+= NNTP="" -.else -PLIST_SUB+= NNTP="@comment " -.endif - -.if defined(WITH_MURDER) -CONFIGURE_ARGS+=--enable-murder -CFLAGS+= ${PTHREAD_CFLAGS} -MAKE_ENV+= PTHREAD_LIBS=${PTHREAD_LIBS} -PLIST_SUB+= MURDER="" -.else -PLIST_SUB+= MURDER="@comment " -.endif - -.if defined(WITH_IDLE_IDLED) && defined(WITH_IDLE_POLL) -BROKEN= "Multiple IDLE methods selected. Run 'make config' again!" -.endif -.if defined(WITH_IDLE_IDLED) -CONFIGURE_ARGS+=--with-idle=idled -PLIST_SUB+= IDLED="" -.elif defined(WITH_IDLE_POLL) -CONFIGURE_ARGS+=--with-idle=poll -PLIST_SUB+= IDLED="@comment " -.elif defined(WITHOUT_IDLE_IDLED) && defined(WITHOUT_IDLE_POLL) -CONFIGURE_ARGS+=--with-idle=no -PLIST_SUB+= IDLED="@comment " -.else -PLIST_SUB+= IDLED="@comment " -.endif - -.if defined(WITH_LISTEXT) -CONFIGURE_ARGS+=--enable-listext -.endif - -.if defined(WITH_NETSCAPEHACK) -CONFIGURE_ARGS+=--enable-netscapehack -.endif - -.if defined(WITH_DRAC) -EXTRA_PATCHES+= ${WRKSRC}/contrib/drac_auth.patch -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-aclocal.m4 \ - ${FILESDIR}/extra-patch-configure.in -USE_AUTOCONF_VER=259 -USE_AUTOHEADER_VER=259 -CONFIGURE_ARGS+=--with-drac=${LOCALBASE} -BUILD_DEPENDS+= ${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac -.endif - -.if defined(WITH_SNMP_4) && defined(WITH_SNMP_5) -BROKEN= "Multiple net-snmp versions selected. Run 'make config' again!" -.endif -.if defined(WITH_SNMP_4) -LIB_DEPENDS+= snmp.4:${PORTSDIR}/net-mgmt/net-snmp4 -.elif defined(WITH_SNMP_5) -LIB_DEPENDS+= netsnmp.7:${PORTSDIR}/net-mgmt/net-snmp -.endif -.if defined(WITH_SNMP_4) || defined(WITH_SNMP_5) -CONFIGURE_ARGS+=--with-snmp=${LOCALBASE} -.else -CONFIGURE_ARGS+=--with-snmp=no -.endif - -.if defined(WITH_AUTH_KRB5) && defined(WITH_LDAP_PTLOADER) -BROKEN= "AUTH_KRB5 and LDAP_PTLOADER are exclusive. Run 'make config' again!" -.endif -.if defined(WITH_LDAP_PTLOADER) -USE_OPENLDAP= yes -CONFIGURE_ARGS+=--with-auth=pts --with-pts=ldap --with-ldap=${LOCALBASE} -PLIST_SUB+= LDAP_PTLOADER="" -.elif defined(WITH_AUTH_KRB5) -CONFIGURE_ARGS+=--with-auth=krb5 -PLIST_SUB+= LDAP_PTLOADER="@comment " -.else -CONFIGURE_ARGS+=--with-auth=unix -PLIST_SUB+= LDAP_PTLOADER="@comment " -.endif - -.if defined(WITH_PASS8BITHACK) -EXTRA_PATCHES+= ${FILESDIR}/pass8bit.diff -.endif - -CYRUS_USER?= cyrus -CYRUS_GROUP?= cyrus - -MAN1= cyradm.1 imtest.1 installsieve.1 lmtptest.1 mupdatetest.1 \ - nntptest.1 pop3test.1 sieveshell.1 sivtest.1 smtptest.1 -MAN3= imclient.3 -MAN5= cyrus.conf.5 imapd.conf.5 krb.equiv.5 -CYRUS_MAN3= Cyrus::IMAP.3 Cyrus::IMAP::Admin.3 Cyrus::IMAP::IMSP.3 \ - Cyrus::IMAP::Shell.3 Cyrus::SIEVE::managesieve.3 -CYRUS_MAN8= arbitron.8 chk_cyrus.8 nntpd.8 ctl_cyrusdb.8 ctl_deliver.8 \ - cyr_expire.8 ctl_mboxlist.8 cvt_cyrusdb.8 deliver.8 \ - fetchnews.8 fud.8 idled.8 imapd.8 ipurge.8 lmtpd.8 \ - master.8 mbexamine.8 mbpath.8 notifyd.8 pop3d.8 quota.8 \ - reconstruct.8 rmnews.8 smmapd.8 squatter.8 syncnews.8 \ - timsieved.8 tls_prune.8 - -DOCS= altnamespace anoncvs bugs changes faq feedback index \ - install install-admin-mb install-auth install-compile \ - install-configure install-murder install-netnews \ - install-perf install-prereq install-sieve install-snmpmon \ - install-testing install-upgrade install-virtdomains \ - mailing-list man notes os overview questions readme sieve \ - sieve-protocol specs - -CONFS= cmu-frontend.conf prefork.conf cmu-backend.conf normal.conf \ - small.conf - -PKGDEINSTALL= ${WRKDIR}/pkg-deinstall -PKGINSTALL= ${WRKDIR}/pkg-install - -post-patch: - @${SED} -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \ - -e "s|%%PREFIX%%|${PREFIX}|g" \ - -e "s|%%EXAMPLESDIR%%|${EXAMPLESDIR}|g" \ - ${.CURDIR}/pkg-install > ${PKGINSTALL} - @${SED} -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \ - -e "s|%%PREFIX%%|${PREFIX}|g" \ - -e "s|%%EXAMPLESDIR%%|${EXAMPLESDIR}|g" \ - ${.CURDIR}/pkg-deinstall > ${PKGDEINSTALL} - @${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|" \ - -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \ - -e "s|%%CYRUS_GROUP%%|${CYRUS_GROUP}|g" \ - ${WRKSRC}/tools/mkimap - @${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|g" \ - -e "s|/usr/sieve|/var/imap/sieve|g" \ - ${WRKSRC}/tools/masssievec -.if ${PERL_LEVEL} < 500600 - @${REINPLACE_CMD} -e "s|exec perl -x|exec perl -I${SITE_PERL} -x|" \ - ${WRKSRC}/perl/sieve/scripts/sieveshell.pl -.endif -.if defined(WITH_DRAC) - @${RM} -rf ${WRKSRC}/autom4te.cache -.endif - -post-install: -.for f in ${CYRUS_MAN3} - @${GZIP_CMD} ${PREFIX}/lib/perl5/${PERL_VERSION}/man/man3/${f} - @${ECHO_CMD} lib/perl5/${PERL_VERSION}/man/man3/${f}.gz \ - >>${TMPPLIST} -.endfor -.for f in ${CYRUS_MAN8} - @${GZIP_CMD} ${PREFIX}/cyrus/man/man8/${f} - @${ECHO_CMD} cyrus/man/man8/${f}.gz >>${TMPPLIST} -.endfor - @${ECHO_CMD} "@dirrm cyrus/man/man8" >>${TMPPLIST} - @${ECHO_CMD} "@dirrm cyrus/man" >>${TMPPLIST} - @${ECHO_CMD} "@dirrm cyrus" >>${TMPPLIST} -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR}/man - @${MKDIR} ${DOCSDIR}/text -.for f in ${DOCS} - @${INSTALL_DATA} ${WRKSRC}/doc/${f}.html ${DOCSDIR} - @${ECHO_CMD} share/doc/${PORTNAME}/${f}.html >>${TMPPLIST} -.endfor -.for f in ${MAN1} ${MAN3} ${MAN5} ${CYRUS_MAN8} - @if [ -f ${WRKSRC}/doc/man/${f}.html ]; then \ - ${INSTALL_DATA} ${WRKSRC}/doc/man/${f}.html \ - ${DOCSDIR}/man/${f}.html; \ - ${ECHO_CMD} share/doc/${PORTNAME}/man/${f}.html \ - >>${TMPPLIST}; \ - fi -.endfor -.for f in cyrusv2.mc murder.fig murder.png netnews.fig netnews.png - @${INSTALL_DATA} ${WRKSRC}/doc/${f} ${DOCSDIR} - @${ECHO_CMD} share/doc/${PORTNAME}/${f} >>${TMPPLIST} -.endfor -.for f in ${DOCS} - @${INSTALL_DATA} ${WRKSRC}/doc/text/${f} ${DOCSDIR}/text - @${ECHO_CMD} share/doc/${PORTNAME}/text/${f} >>${TMPPLIST} -.endfor - @${ECHO_CMD} "@dirrm share/doc/${PORTNAME}/text" >>${TMPPLIST} - @${ECHO_CMD} "@dirrm share/doc/${PORTNAME}/man" >>${TMPPLIST} - @${ECHO_CMD} "@dirrm share/doc/${PORTNAME}" >>${TMPPLIST} -.endif - @${MKDIR} ${EXAMPLESDIR} - @${INSTALL_DATA} ${FILESDIR}/imapd.conf ${EXAMPLESDIR} -.for f in ${CONFS} - @${INSTALL_DATA} ${WRKSRC}/master/conf/${f} ${EXAMPLESDIR} - @${ECHO_CMD} ${EXAMPLESDIR:S,^${PREFIX}/,,}/${f} >>${TMPPLIST} -.endfor - @${ECHO_CMD} @dirrm ${EXAMPLESDIR:S,^${PREFIX}/,,} \ - >>${TMPPLIST} - @${INSTALL_SCRIPT} ${WRKSRC}/tools/mkimap \ - ${PREFIX}/cyrus/bin/mkimap - @${INSTALL_SCRIPT} ${WRKSRC}/tools/masssievec \ - ${PREFIX}/cyrus/bin/masssievec - @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} \ - POST-INSTALL - @${CAT} ${PKGMESSAGE} - -.include <bsd.port.post.mk> diff --git a/mail/cyrus-imapd23/distinfo b/mail/cyrus-imapd23/distinfo deleted file mode 100644 index ac5f81216c54..000000000000 --- a/mail/cyrus-imapd23/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (cyrus-imapd-2.2.12.tar.gz) = 70b3bba526a8d36d3bb23a87d37e9188 -SIZE (cyrus-imapd-2.2.12.tar.gz) = 1961161 diff --git a/mail/cyrus-imapd23/files/extra-patch-aclocal.m4 b/mail/cyrus-imapd23/files/extra-patch-aclocal.m4 deleted file mode 100644 index 0a8794381188..000000000000 --- a/mail/cyrus-imapd23/files/extra-patch-aclocal.m4 +++ /dev/null @@ -1,51 +0,0 @@ -Index: aclocal.m4 -diff -u aclocal.m4.orig aclocal.m4 ---- aclocal.m4.orig Wed Nov 24 03:55:40 2004 -+++ aclocal.m4 Wed Nov 24 15:39:52 2004 -@@ -506,10 +506,11 @@ - fi - - saved_LIBS=$LIBS -- for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db -+ for dbname in ${with_bdb} db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db - do - LIBS="$saved_LIBS -l$dbname" -- AC_TRY_LINK([#include <db.h>], -+ AC_TRY_LINK([#include <stdio.h> -+#include <db.h>], - [db_create(NULL, NULL, 0);], - BDB_LIBADD="$BDB_LIBADD -l$dbname"; dblib="berkeley"; dbname=db, - dblib="no") -@@ -517,7 +518,8 @@ - done - if test "$dblib" = "no"; then - LIBS="$saved_LIBS -ldb" -- AC_TRY_LINK([#include <db.h>], -+ AC_TRY_LINK([#include <stdio.h> -+#include <db.h>], - [db_open(NULL, 0, 0, 0, NULL, NULL, NULL);], - BDB_LIBADD="$BDB_LIBADD -ldb"; dblib="berkeley"; dbname=db, - dblib="no") -@@ -1820,9 +1822,12 @@ - - if test -n "$SNMP_LIBS" && test -n "$SNMP_PREFIX"; then - CPPFLAGS="$CPPFLAGS -I${SNMP_PREFIX}/include" -- LIB_UCDSNMP=$SNMP_LIBS -+ LIB_UCDSNMP="$SNMP_LIBS -lwrap" -+ PERLLIBDIR=`$PERL -e 'use Config; print "$Config{archlibexp}/CORE";'` -+ LDFLAGS_UCDSNMP="-L${PERLLIBDIR} -R${PERLLIBDIR}" - AC_DEFINE(HAVE_NETSNMP,1,[Do we have Net-SNMP support?]) - AC_SUBST(LIB_UCDSNMP) -+ AC_SUBST(LDFLAGS_UCDSNMP) - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) -@@ -1848,7 +1853,7 @@ - LIB_UCDSNMP="" - if test "$with_snmp" != no; then - AC_DEFINE(HAVE_UCDSNMP,1,[Do we have UCD-SNMP support?]) -- LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp" -+ LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp -lkvm -ldevstat -lwrap" - AC_CHECK_LIB(rpm, rpmdbOpen, - LIB_UCDSNMP="${LIB_UCDSNMP} -lrpm -lpopt",,-lpopt) - fi diff --git a/mail/cyrus-imapd23/files/extra-patch-configure.in b/mail/cyrus-imapd23/files/extra-patch-configure.in deleted file mode 100644 index 1a89d771ee93..000000000000 --- a/mail/cyrus-imapd23/files/extra-patch-configure.in +++ /dev/null @@ -1,13 +0,0 @@ -Index: configure.in -diff -u configure.in.orig configure.in ---- configure.in.orig Sat May 29 04:59:21 2004 -+++ configure.in Sat May 29 05:03:04 2004 -@@ -933,7 +933,7 @@ - dnl add perl cccdlflags when building libraries -- this ensures that the - dnl libraries will be compiled as PIC if perl requires PIC objects - dnl -- this is needed on NetBSD, but seems to cause problems on atleast Solaris -- --dnl eval `${PERL} -V:cccdlflags` -+ eval `${PERL} -V:cccdlflags` - PERL_CCCDLFLAGS="$cccdlflags" - AC_SUBST(PERL_CCCDLFLAGS) - fi diff --git a/mail/cyrus-imapd23/files/imapd.conf b/mail/cyrus-imapd23/files/imapd.conf deleted file mode 100644 index d0f32d1bbe81..000000000000 --- a/mail/cyrus-imapd23/files/imapd.conf +++ /dev/null @@ -1,412 +0,0 @@ -# -# $FreeBSD$ -# -# Sample configurations file for Cyrus IMAPd -# Most lines in this file are commented; in this case the default is used. -# The commented lines (usually) contain the default value - -# The pathname of the IMAP configuration directory -# -configdirectory: /var/imap - -# The partition name used by default for new mailboxes -# -#defaultpartition: default - -# The directory for the different partitions -# -partition-default: /var/spool/imap - -# Use the UNIX separator character '/' for delimiting levels of -# mailbox hierarchy. The default is to use the netnews separator -# character '.'. -#unixhierarchysep: no - -# Use the alternate IMAP namespace, where personal folders reside at -# the same level in the hierarchy as INBOX. -# -#altnamespace: no - -# If using the alternate IMAP namespace, the prefix for the other -# users namespace. The hierarchy delimiter will be automatically -# appended. -# -#userprefix: Other Users - -# If using the alternate IMAP namespace, the prefix for the shared -# namespace. The hierarchy delimiter will be automatically appended. -# -#sharedprefix: Shared Folders - -# The umask value used by various Cyrus IMAP programs -# -#umask: 077 - -# This is the hostname visible in the greeting messages of the POP, -# IMAP and LMTP daemons. If it is unset, then the result returned from -# gethostname(2) is used. -# -#servername: <result returned by gethostname(2)> - -# Whether to allow anonymous logins -# -#allowanonymouslogin: no - -# Allow the use of cleartext passwords on the wire. -# -#allowplaintext: yes - -# The percent of quota utilization over which the server generates -# warnings. -# -#quotawarn: 90 - -# The length of the IMAP server's inactivity autologout timer, in minutes. -# The minimum value is 30, the default. -# -#timeout: 30 - -# The interval (in seconds) for polling the mailbox for changes while -# running the IDLE command. This option is used when idled can not be -# contacted or when polling is used exclusively. The minimum value is -# 1. A value of 0 will disable polling (and disable IDLE if polling -# is the only method available). -# -#imapidlepoll: 60 - -# If enabled, the server responds to an ID command with a parameter -# list containing: version, vendor, support-url, os, os-version, -# command, arguments, environment. Otherwise the server returns NIL. -# -#imapidresponse: yes - -# Set the length of the POP server's inactivity autologout timer, in -# minutes. The minimum value is 10, the default. -# -#poptimeout: 10 - -# Set the minimum amount of time the server forces users to wait between -# successive POP logins, in minutes. The default is 0. -# -#popminpoll: 0 - -# The number of days advertised as being the minimum a message may be -# left on the POP server before it is deleted (via the CAPA command, -# defined in the POP3 Extension Mechanism, which some clients may -# support). "NEVER", the default, may be specified with a negative -# number. The Cyrus POP3 server never deletes mail, no matter what -# the value of this parameter is. However, if a site implements a -# less liberal policy, it needs to change this parameter accordingly. -# -#popexpiretime: 0 - -# The list of userids with administrative rights. Separate each userid -# with a space. We recommend that administrator userids be separate from -# standard userids. Sites using Kerberos authentication may use separate -# "admin" instances. -# -#admins: <none> - -# A list of users and groups that are allowed to proxy for other -# users, seperated by spaces. Any user listed in this will be allowed -# to login for any other user: use with caution. -# -#proxyservers: <none> - -# The Access Control List (ACL) placed on a newly-created (non-user) -# mailbox that does not have a parent mailbox. -# -#defaultacl: anyone lrs - -# The pathname of the news spool directory. Only used if the partition-news -# configuration option is set. -# -#newsspool: <no default> - -# Prefix to be prepended to newsgroup names to make the corresponding IMAP -# mailbox names. -# -#newsprefix: <none> - -# If nonzero, normal users may create their own IMAP accounts by creating -# the mailbox INBOX. The user's quota is set to the value if it is positive, -# otherwise the user has unlimited quota. -# -#autocreatequota: 0 - -# Include notations in the protocol telemetry logs indicating the number -# of seconds since the last command or response. -# -#logtimestamps: no - -# Number of seconds to pause after a successful plaintext login. For systems -# that support strong authentication, this permits users to perceive a cost -# of using plaintext passwords. -# -#plaintextloginpause: 0 - -# The pathname of srvtab file containing the server's private key. -# This option is passed to the SASL library and overrides its default -# setting. -# -#srvtab: /etc/srvtab - -# The list of remote realms whose users may log in using cross-realm -# authentications. Seperate each realm name by a space. This option is -# only used when the server is compiled with Kerberos authentication. -# -#loginrealms: <none> - -# If enabled, any authentication identity which has a rights on a user's -# INBOX may log in as that user. This option is only used when the server -# is compiled with Kerberos authentication. -# -#loginuseacl: no - -# If enabled, lmtpd attempts to only write one copy of a message per -# partition and create hard links, resulting in a potentially large -# disk savings. -# -#singleinstancestore: yes - -# If enabled, lmtpd will suppress delivery of a message to a mailbox -# if a message with the same message-id (or resent-message-id) is -# recorded as having already been delivered to the mailbox. Records -# the mailbox and message-id/resent-message-id of all successful -# deliveries. -# -#duplicatesuppression: yes - -# If enabled, lmtpd rejects messages with 8-bit characters in the -# headers. Otherwise, 8-bit characters are changed to `X'. (A proper -# soultion to non-ASCII characters in headers is offered by RFC 2047 -# and its predecessors.) -# -#reject8bit: no - -# Maximum incoming LMTP message size. If set, lmtpd will reject -# messages larger than maxmessagesize bytes. The default is to allow -# messages of any size. -# -#maxmessagesize: <unlimited> - -# Userid used to deliver messages to shared folders. For example, if -# set to "bb", email sent to "bb+shared.blah" would be delivered to -# the "shared.blah" folder. By default, an email address of -# "+shared.blah" would be used. -#postuser: <none> - -# If enabled at compile time, this specifies a URL to reply when -# Netscape asks the server where the mail administration HTTP server -# is. The default is a site at CMU with a hopefully informative -# message; administrators should set this to a local resource with -# some information of greater use. -# -#netscapeurl: http://andrew2.andrew.cmu.edu/cyrus/imapd/netscapeadmin.html - -# Notifyd(8) method to use for "MAIL" notifications. If not set, -# "MAIL" notifications are disabled. -# -#mailnotifier: <no default> - -# Notifyd(8) method to use for "SIEVE" notifications. If not set, -# "SIEVE" notifications are disabled. -# -# This method is only used when no method is specified in the script. -# -#sievenotifier: <no default> - -# If enabled, lmtpd will look for Sieve scripts in user's home -# directories: ~user/.sieve. -# -sieveusehomedir: false - -# If sieveusehomedir is false, this directory is searched for Sieve scripts. -# The active Sieve script is s called "default", placed in the users sieve -# sieve directory (ie. /var/imap/sieve/u/user). -# -sievedir: /var/imap/sieve - -# The pathname of the sendmail executable. Sieve uses sendmail for -# sending rejections, redirects and vaca- tion responses. -# -#sendmail: /usr/sbin/sendmail - -# Username that is used as the 'From' address in rejection MDNs -# produced by sieve. -# -#postmaster: postmaster - -# If enabled, the partitions will also be hashed, in addition to the hashing -# done on configuration directories. This is recommended if one partition has -# a very bushy mailbox tree. -# -#hashimapspool: false - -# Maximum size (in kilobytes) any sieve script can be, enforced at -# submission by timsieved(8). -# -#sieve_maxscriptsize: 32 - -# Maximum number of sieve scripts any user may have, enforced at -# submission by timsieved(8). -# -#sieve_maxscripts: 5 - -# The cyrusdb backend to use for mailbox annotations. -# Allowed values: berkeley, skiplist -# -#annotation_db: skiplist - -# The cyrusdb backend to use for the duplicate delivery suppression -# and sieve. -# Allowed values: berkeley, berkeley-nosync, skiplist -# -#duplicate_db: berkeley-nosync - -# The cyrusdb backend to use for the mailbox list. -# Allowed values: flat, berkeley, skiplist -# -#mboxlist_db: skiplist - -# The cyrusdb backend to use for the pts cache. -# Allowed values: berkeley, skiplist -# -#ptscache_db: berkeley - -# The cyrusdb backend to use for the seen state. -# Allowed values: flat, berkeley, skiplist -# -#seenstate_db: skiplist - -# The cyrusdb backend to use for the subscriptions list. -# Allowed values: flat, berkeley, skiplist -# -#subscription_db: flat - -# The cyrusdb backend to use for the TLS cache. -# Allowed values: berkeley, berkeley-nosync, skiplist -# -#tlscache_db: berkeley-nosync - -# Maximum SSF (security strength factor) that the server will allow a -# client to negotiate. -# -#sasl_maximum_layer: 256 - -# The minimum SSF that the server will allow a client to negotiate. A -# value of 1 requires integrity protection; any higher value requires -# some amount of encryption. -# -#sasl_minimum_layer: 0 - -# The mechanism used by the server to verify plaintext passwords. Possible -# values include "auxprop" or "saslauthd" -# -sasl_pwcheck_method: auxprop - -# If enabled, the SASL library will automatically create authentication -# secrets when given a plaintext password. See the SASL documentation. -# -#sasl_auto_transition: no - -# Whitespace separated list of mechanisms to allow (e.g. 'plain otp'). -# Used to restrict the mechanisms to a subset of the installed -# plugins. The default is all available. -# -#sasl_mech_list: cram-md5 digest-md5 - -# Location of the opiekeys file -# -#sasl_opiekeys: /etc/opiekeys - -# File containing the global certificate used for ALL services (imap, -# pop3, lmtp). -# -#tls_cert_file: <none> - -# File containing the private key belonging to the global server -# certificate. -# -#tls_key_file: <none> - -# File containing the certificate used for imap ONLY. If not -# specified, the global certificate is used. A value of "disabled" -# will disable SSL/TLS for imap. -# -#imap_tls_cert_file: <none> - -# File containing the private key belonging to the imap-specific -# server certificate. If not specified, the global private key is -# used. A value of "disabled" will disable SSL/TLS for imap. -# -#imap_tls_key_file: <none> - -# File containing the certificate used for pop3 ONLY. If not -# specified, the global certificate is used. A value of "disabled" -# will disable SSL/TLS for pop3. -# -#pop3_tls_cert_file: <none> - -# File containing the private key belonging to the pop3-specific -# server certificate. If not specified, the global private key is -# used. A value of "disabled" will disable SSL/TLS for pop3. -# -#pop3_tls_key_file: <none> - -# File containing the certificate used for lmtp ONLY. If not -# specified, the global certificate is used. A value of "disabled" -# will disable TLS for lmtp. -# -#lmtp_tls_cert_file: <none> - -# File containing the private key belonging to the lmtp-specific -# server certificate. If not specified, the global private key is -# used. A value of "disabled" will disable TLS for lmtp. -# -#lmtp_tls_key_file: <none> - -# File containing the certificate used for sieve ONLY. If not -# specified, the global certificate is used. A value of "disabled" -# will disable TLS for sieve. -# -#sieve_tls_cert_file: <none> - -# File containing the private key belonging to the sieve-specific -# server certificate. If not specified, the global private key is -# used. A value of "disabled" will disable TLS for sieve. -# -#sieve_tls_key_file: <none> - -# File containing one or more Certificate Authority (CA) certificates. -# -#tls_ca_file: <none> - -# Path to directory with certificates of CAs. -# -#tls_ca_path: <none> - -# The length of time (in minutes) that a TLS session will be cached -# for later reuse. The maximum value is 1440 (24 hours), the default. -# A value of 0 will disable session caching. -# -#tls_session_timeout: 1440 - -# The right that a user needs to delete a mailbox. -# -#deleteright: c - -# Unix domain socket that lmtpd listens on, used by deliver(8). -# -#lmtpsocket: /var/imap/socket/lmtp - -# Unix domain socket that idled listens on. -# -#idlesocket: /var/imap/socket/idle - -# Unix domain socket that the new mail notification daemon listens on. -# -#notifysocket: /var/imap/socket/notify - -# -# EOF diff --git a/mail/cyrus-imapd23/files/imapd.sh.in b/mail/cyrus-imapd23/files/imapd.sh.in deleted file mode 100644 index 5fcc612bb31c..000000000000 --- a/mail/cyrus-imapd23/files/imapd.sh.in +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh - -# Start or stop cyrus-imapd -# $FreeBSD$ - -# PROVIDE: cyrus_imapd -# REQUIRE: DAEMON -# BEFORE: mail -# KEYWORD: FreeBSD shutdown -# -# NOTE for FreeBSD 5.0+: -# If you want this script to start with the base rc scripts -# move imapd.sh to /etc/rc.d/cyrus_imapd - -prefix=%%PREFIX%% - -# Define these cyrus_imapd_* variables in one of these files: -# /etc/rc.conf -# /etc/rc.conf.local -# /etc/rc.conf.d/cyrus_imapd -# -# DO NOT CHANGE THESE DEFAULT VALUES HERE -# -[ -z "$cyrus_imapd_enable" ] && cyrus_imapd_enable="NO" # Enable imapd -#cyrus_imapd_program="${prefix}/cyrus/bin/master" # Location of imapd -[ -z "$cyrus_imapd_flags" ] && cyrus_imapd_flags="-d" # Flags to imapd program - -. %%RC_SUBR%% - -name="cyrus_imapd" -rcvar=`set_rcvar` -command="${prefix}/cyrus/bin/master" -pidfile="/var/run/cyrus-master.pid" -required_files="${prefix}/etc/cyrus.conf ${prefix}/etc/imapd.conf" -stop_postcmd="cyrus_imapd_poststop" - -cyrus_imapd_poststop() { - /bin/rm -f ${pidfile} -} - -load_rc_config $name -run_rc_command "$1" diff --git a/mail/cyrus-imapd23/files/pass8bit.diff b/mail/cyrus-imapd23/files/pass8bit.diff deleted file mode 100644 index 74389a491c30..000000000000 --- a/mail/cyrus-imapd23/files/pass8bit.diff +++ /dev/null @@ -1,59 +0,0 @@ -Index: imap/message.c -diff -u -p imap/message.c.orig imap/message.c ---- imap/message.c.orig Sat Feb 28 02:44:55 2004 -+++ imap/message.c Thu Oct 7 20:21:04 2004 -@@ -227,6 +227,7 @@ unsigned size; - int n; - int sawcr = 0, sawnl; - int reject8bit = config_getswitch(IMAPOPT_REJECT8BIT); -+ int pass8bit = config_getswitch(IMAPOPT_PASS8BIT); - int inheader = 1, blankline = 1; - - while (size) { -@@ -262,7 +263,7 @@ unsigned size; - /* We have been configured to reject all mail of this - form. */ - if (!r) r = IMAP_MESSAGE_CONTAINS8BIT; -- } else { -+ } else if (!pass8bit) { - /* We have been configured to munge all mail of this - form. */ - *p = 'X'; -Index: imap/spool.c -diff -u -p imap/spool.c.orig imap/spool.c ---- imap/spool.c.orig Fri Mar 5 01:09:34 2004 -+++ imap/spool.c Thu Oct 7 20:20:57 2004 -@@ -140,6 +140,7 @@ static int parseheader(struct protstream - state s = NAME_START; - int r = 0; - int reject8bit = config_getswitch(IMAPOPT_REJECT8BIT); -+ int pass8bit = config_getswitch(IMAPOPT_PASS8BIT); - const char **skip = NULL; - - if (namelen == 0) { -@@ -266,7 +267,7 @@ static int parseheader(struct protstream - form. */ - r = IMAP_MESSAGE_CONTAINS8BIT; - goto ph_error; -- } else { -+ } else if (!pass8bit) { - /* We have been configured to munge all mail of this - form. */ - c = 'X'; -Index: lib/imapoptions -diff -u lib/imapoptions.orig lib/imapoptions ---- lib/imapoptions.orig Thu Jul 22 04:07:45 2004 -+++ lib/imapoptions Thu Oct 7 20:00:04 2004 -@@ -95,6 +95,12 @@ - { "afspts_mycell", NULL, STRING } - /* Cell to use for AFS PTS lookups. Defaults to the local cell. */ - -+{ "pass8bit", 0, SWITCH } -+/* If enabled, lmtpd accepts messages with 8-bit characters in the -+ headers without changing to `X'. This option is strongly not -+ recommended. (A proper soultion to non-ASCII characters in headers -+ is offered by RFC 2047 and its predecessors.) */ -+ - { "allowallsubscribe", 0, SWITCH } - /* Allow subscription to nonexistent mailboxes. This option is - typically used on backend servers in a Murder so that users can diff --git a/mail/cyrus-imapd23/files/patch-Makefile.in b/mail/cyrus-imapd23/files/patch-Makefile.in deleted file mode 100644 index 71800e59efb8..000000000000 --- a/mail/cyrus-imapd23/files/patch-Makefile.in +++ /dev/null @@ -1,25 +0,0 @@ -Index: Makefile.in -diff -u Makefile.in.orig Makefile.in ---- Makefile.in.orig Sat May 15 05:59:10 2004 -+++ Makefile.in Wed May 19 00:23:11 2004 -@@ -97,13 +97,13 @@ - touch distcvs - - install:: -- $(srcdir)/install-sh -d ${DESTDIR}$(exec_prefix)/bin -- $(srcdir)/install-sh -d ${DESTDIR}$(exec_prefix)/lib -- $(srcdir)/install-sh -d ${DESTDIR}$(prefix)/include/cyrus -- $(srcdir)/install-sh -d ${DESTDIR}$(mandir)/man1 -- $(srcdir)/install-sh -d ${DESTDIR}$(mandir)/man3 -- $(srcdir)/install-sh -d ${DESTDIR}$(mandir)/man5 -- $(srcdir)/install-sh -d ${DESTDIR}$(mandir)/man8 -+ $(INSTALL) -d ${DESTDIR}$(exec_prefix)/bin -+ $(INSTALL) -d ${DESTDIR}$(exec_prefix)/lib -+ $(INSTALL) -d ${DESTDIR}$(prefix)/include/cyrus -+ $(INSTALL) -d ${DESTDIR}$(mandir)/man1 -+ $(INSTALL) -d ${DESTDIR}$(mandir)/man3 -+ $(INSTALL) -d ${DESTDIR}$(mandir)/man5 -+ $(INSTALL) -d ${DESTDIR}$(cyrus_prefix)/man/man8 - @for d in $(SUBDIRS); \ - do \ - (cd $$d; echo "### Making" install "in" `pwd`; \ diff --git a/mail/cyrus-imapd23/files/patch-aa b/mail/cyrus-imapd23/files/patch-aa deleted file mode 100644 index 1438b30aa60f..000000000000 --- a/mail/cyrus-imapd23/files/patch-aa +++ /dev/null @@ -1,21 +0,0 @@ -Index: man/Makefile.in -diff -u man/Makefile.in.orig man/Makefile.in ---- man/Makefile.in.orig Wed Mar 31 00:18:41 2004 -+++ man/Makefile.in Wed May 19 01:52:50 2004 -@@ -50,6 +50,7 @@ - SHELL = /bin/sh - - prefix = @prefix@ -+cyrus_prefix = @cyrus_prefix@ - - mandir = @mandir@ - -@@ -93,7 +94,7 @@ - done - for file in $(MAN8); \ - do \ -- $(INSTALL) -m 644 $$file $(DESTDIR)$(mandir)/man8 || exit 1; \ -+ $(INSTALL) -m 644 $$file $(DESTDIR)$(cyrus_prefix)/man/man8 || exit 1; \ - done - - clean: diff --git a/mail/cyrus-imapd23/files/patch-ac b/mail/cyrus-imapd23/files/patch-ac deleted file mode 100644 index 146e56766703..000000000000 --- a/mail/cyrus-imapd23/files/patch-ac +++ /dev/null @@ -1,65 +0,0 @@ -Index: configure -diff -u configure.orig configure ---- configure.orig Tue Feb 15 02:59:46 2005 -+++ configure Thu Feb 24 04:45:06 2005 -@@ -309,6 +309,7 @@ - #endif" - - ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os MAKEDEPEND cyrus_prefix service_path cyrus_user cyrus_group CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT RANLIB ac_ct_RANLIB SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CPP EGREP AWK LIBOBJS LIB_SOCKET IPV6_OBJS PRE_SUBDIRS EXTRA_SUBDIRS DEPLIBS LOCALDEFS WITH_AUTH BDB_INC BDB_LIB CYRUSDB_OBJS SIEVE_OBJS SIEVE_LIBS SIEVE_CPPFLAGS YACC LEX LEXLIB LEX_OUTPUT_ROOT SIEVE_SUBDIRS WITH_NONBLOCK WITH_GMTOFF WITH_MAP WITH_LOCK cyrus_sigveclib WITH_PTS AFS_LIBS AFS_LDFLAGS LDAP_CPPFLAGS LDAP_LDFLAGS LDAP_LIBS SERVER_SUBDIRS OPENSSL_INC OPENSSL_LIB ZEPHYR_LIBS ZEPHYR_CPPFLAGS WITH_IDLE IMAP_PROGS COMPILE_ET COM_ERR_LIBS COM_ERR_LDFLAGS COM_ERR_CPPFLAGS LIB_CRYPT GSSAPI_LIBS GSSAPIBASE_LIBS LIB_DYN_SASL DYNSASLFLAGS LIB_SASL SASLFLAGS PERL PERL_CCCDLFLAGS MD5OBJ SNMP_SUBDIRS LIB_WRAP SNMP_CONFIG LIB_UCDSNMP LIB_RT IMAP_COM_ERR_LIBS IMAP_LIBS PERL_SUBDIRS PERL_DEPSUBDIRS LTLIBOBJS' -+ac_subst_vars="${ac_subst_vars} LDFLAGS_UCDSNMP" - ac_subst_files='' - - # Initialize some variables set by options. -@@ -6612,7 +6613,7 @@ - fi - - saved_LIBS=$LIBS -- for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db -+ for dbname in ${with_bdb} db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db - do - LIBS="$saved_LIBS -l$dbname" - cat >conftest.$ac_ext <<_ACEOF -@@ -6622,6 +6623,7 @@ - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ -+#include <stdio.h> - #include <db.h> - int - main () -@@ -13549,6 +13551,7 @@ - EXTRA_SUBDIRS="${EXTRA_SUBDIRS} perl" - PERL_SUBDIRS="imap" - PERL="${with_perl}" -+ eval `${PERL} -V:cccdlflags` - PERL_CCCDLFLAGS="$cccdlflags" - - fi -@@ -14067,7 +14070,9 @@ - - if test -n "$SNMP_LIBS" && test -n "$SNMP_PREFIX"; then - CPPFLAGS="$CPPFLAGS -I${SNMP_PREFIX}/include" -- LIB_UCDSNMP=$SNMP_LIBS -+ LIB_UCDSNMP="$SNMP_LIBS -lwrap" -+ PERLLIBDIR=`$PERL -e 'use Config; print "$Config{archlibexp}/CORE";'` -+ LDFLAGS_UCDSNMP="-L${PERLLIBDIR} -R${PERLLIBDIR}" - - cat >>confdefs.h <<\_ACEOF - #define HAVE_NETSNMP 1 -@@ -14298,7 +14303,7 @@ - #define HAVE_UCDSNMP 1 - _ACEOF - -- LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp" -+ LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp -lkvm -ldevstat -lwrap" - echo "$as_me:$LINENO: checking for rpmdbOpen in -lrpm" >&5 - echo $ECHO_N "checking for rpmdbOpen in -lrpm... $ECHO_C" >&6 - if test "${ac_cv_lib_rpm_rpmdbOpen+set}" = set; then -@@ -15114,6 +15119,7 @@ - s,@LIB_WRAP@,$LIB_WRAP,;t t - s,@SNMP_CONFIG@,$SNMP_CONFIG,;t t - s,@LIB_UCDSNMP@,$LIB_UCDSNMP,;t t -+s,@LDFLAGS_UCDSNMP@,$LDFLAGS_UCDSNMP,;t t - s,@LIB_RT@,$LIB_RT,;t t - s,@IMAP_COM_ERR_LIBS@,$IMAP_COM_ERR_LIBS,;t t - s,@IMAP_LIBS@,$IMAP_LIBS,;t t diff --git a/mail/cyrus-imapd23/files/patch-bc b/mail/cyrus-imapd23/files/patch-bc deleted file mode 100644 index df4b302b3098..000000000000 --- a/mail/cyrus-imapd23/files/patch-bc +++ /dev/null @@ -1,33 +0,0 @@ -Index: imap/Makefile.in -diff -u imap/Makefile.in.orig imap/Makefile.in ---- imap/Makefile.in.orig Wed Nov 12 13:02:01 2003 -+++ imap/Makefile.in Thu Mar 11 01:16:00 2004 -@@ -132,10 +132,10 @@ - - - install: -- $(srcdir)/../install-sh -d ${DESTDIR}$(service_path) -+ $(INSTALL) -d ${DESTDIR}$(service_path) - for file in $(PROGS); \ - do \ -- $(INSTALL) -m 755 $$file $(DESTDIR)$(service_path) || exit 1; \ -+ $(INSTALL) -s -m 755 $$file $(DESTDIR)$(service_path) || exit 1; \ - done - ln -f $(DESTDIR)$(service_path)/pop3d $(DESTDIR)$(service_path)/pop3proxyd - -@@ -242,13 +242,13 @@ - $(CC) $(LDFLAGS) -o mupdate \ - $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \ - mutex_pthread.o tls.o libimap.a \ -- $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread -+ $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(PTHREAD_LIBS) - - mupdate.pure: mupdate.o mupdate-slave.o mupdate-client.o mutex_pthread.o \ - libimap.a $(DEPLIBS) - $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o mupdate.pure \ - $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \ -- mutex_pthread.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread -+ mutex_pthread.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(PTHREAD_LIBS) - - pop3d: pop3d.o backend.o tls.o mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE) - $(CC) $(LDFLAGS) -o pop3d pop3d.o backend.o tls.o $(SERVICE) \ diff --git a/mail/cyrus-imapd23/files/patch-df b/mail/cyrus-imapd23/files/patch-df deleted file mode 100644 index 69a0841343ee..000000000000 --- a/mail/cyrus-imapd23/files/patch-df +++ /dev/null @@ -1,14 +0,0 @@ -Index: master/service.c -diff -u master/service.c.orig master/service.c ---- master/service.c.orig Wed Jan 22 22:52:36 2003 -+++ master/service.c Wed Jan 22 22:57:20 2003 -@@ -102,6 +102,9 @@ - struct sockaddr_storage sin; - socklen_t len = sizeof(sin); - -+ /* XXX: old FreeBSD didn't fill sockaddr correctly against AF_UNIX */ -+ sin.ss_family = AF_UNIX; -+ - /* is this a connection from the local host? */ - if (getpeername(fd, (struct sockaddr *) &sin, &len) == 0) { - if (((struct sockaddr *)&sin)->sa_family == AF_UNIX) { diff --git a/mail/cyrus-imapd23/files/patch-dg b/mail/cyrus-imapd23/files/patch-dg deleted file mode 100644 index 80dc928b96d0..000000000000 --- a/mail/cyrus-imapd23/files/patch-dg +++ /dev/null @@ -1,37 +0,0 @@ -Index: tools/mkimap -diff -u tools/mkimap.orig tools/mkimap ---- tools/mkimap.orig Wed Jun 30 03:16:54 2004 -+++ tools/mkimap Tue Jul 27 04:47:43 2004 -@@ -61,6 +61,9 @@ - - $imapdconf = shift || "/etc/imapd.conf"; - -+$cyrus_user = $ENV{CYRUS_USER} || "%%CYRUS_USER%%"; -+$cyrus_group = $ENV{CYRUS_GROUP} || "%%CYRUS_GROUP%%"; -+ - open CONF, $imapdconf or die "can't open $imapdconf"; - print "reading configure file...\n"; - while (<CONF>) { -@@ -86,6 +89,7 @@ - - print "configuring $d...\n"; - -+mkdir $d, 0755; - chdir $d or die "couldn't change to $d"; - - mkdir "proc", 0755 || warn "can't create $d/proc: $!"; -@@ -95,11 +99,14 @@ - mkdir "msg", 0755 || warn "can't create $d/msg: $!"; - mkdir "ptclient", 0755 || warn "can't create $d/ptclient: $!"; - -+system "/usr/sbin/chown -R $cyrus_user:$cyrus_group ."; -+ - while ($part = shift @parts) { - print "creating $part...\n"; - mkdir $part, 0755 || warn "can't create $part: $!"; - chdir $part or die "couldn't change to partition $part"; - mkdir "stage.", 0755 || warn "can't create $part/stage.: $!"; -+ system "/usr/sbin/chown -R $cyrus_user:$cyrus_group $part"; - } - - print "done\n"; diff --git a/mail/cyrus-imapd23/files/patch-imtest::imtest.c b/mail/cyrus-imapd23/files/patch-imtest::imtest.c deleted file mode 100644 index e1fd1efa8c06..000000000000 --- a/mail/cyrus-imapd23/files/patch-imtest::imtest.c +++ /dev/null @@ -1,23 +0,0 @@ -Index: imtest/imtest.c -diff -u imtest/imtest.c.orig imtest/imtest.c ---- imtest/imtest.c.orig Sun Jul 13 05:10:56 2003 -+++ imtest/imtest.c Fri Jul 18 00:52:29 2003 -@@ -51,6 +51,7 @@ - #include <sys/stat.h> - #include <fcntl.h> - -+#include <limits.h> - #include <stdlib.h> - #include <stdio.h> - #include <string.h> -@@ -419,8 +420,8 @@ - } - - --char *var_tls_CAfile=""; --char *var_tls_CApath=""; -+static char *var_tls_CAfile=""; -+static char *var_tls_CApath=""; - /* - * This is the setup routine for the SSL client. - * diff --git a/mail/cyrus-imapd23/files/patch-lib::Makefile.in b/mail/cyrus-imapd23/files/patch-lib::Makefile.in deleted file mode 100644 index 543ece89f131..000000000000 --- a/mail/cyrus-imapd23/files/patch-lib::Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ -Index: lib/Makefile.in -diff -u lib/Makefile.in.orig lib/Makefile.in ---- lib/Makefile.in.orig Thu Mar 11 06:25:39 2004 -+++ lib/Makefile.in Wed May 19 00:34:19 2004 -@@ -102,7 +102,7 @@ - all: $(BUILTSOURCES) libcyrus_min.a libcyrus.a - - install: -- $(srcdir)/../install-sh -d $(DESTDIR)$(libdir) -+ $(INSTALL) -d $(DESTDIR)$(libdir) - $(INSTALL) -m 644 libcyrus.a $(DESTDIR)$(libdir) - $(INSTALL) -m 644 libcyrus_min.a $(DESTDIR)$(libdir) - $(RANLIB) $(DESTDIR)$(libdir)/libcyrus.a diff --git a/mail/cyrus-imapd23/files/patch-lib::imapoptions b/mail/cyrus-imapd23/files/patch-lib::imapoptions deleted file mode 100644 index c46c80a342a0..000000000000 --- a/mail/cyrus-imapd23/files/patch-lib::imapoptions +++ /dev/null @@ -1,22 +0,0 @@ -Index: lib/imapoptions -diff -u lib/imapoptions.orig lib/imapoptions ---- lib/imapoptions.orig Thu Mar 20 04:00:39 2003 -+++ lib/imapoptions Fri Mar 21 15:27:44 2003 -@@ -454,7 +454,7 @@ - /* The mechanism used by the server to verify plaintext passwords. - Possible values include "auxprop", "saslauthd", and "pwcheck". */ - --{ "sendmail", "/usr/lib/sendmail", STRING } -+{ "sendmail", "/usr/sbin/sendmail", STRING } - /* The pathname of the sendmail executable. Sieve invokes sendmail - for sending rejections, redirects and vacation responses. */ - -@@ -475,7 +475,7 @@ - /* Maximum number of sieve scripts any user may have, enforced at - submission by timsieved(8). */ - --{ "sievedir", "/usr/sieve", STRING } -+{ "sievedir", "/var/imap/sieve", STRING } - /* If sieveusehomedir is false, this directory is searched for Sieve - scripts. */ - diff --git a/mail/cyrus-imapd23/files/patch-lib::libcyr_cfg.c b/mail/cyrus-imapd23/files/patch-lib::libcyr_cfg.c deleted file mode 100644 index 5cbb64001209..000000000000 --- a/mail/cyrus-imapd23/files/patch-lib::libcyr_cfg.c +++ /dev/null @@ -1,13 +0,0 @@ -Index: lib/libcyr_cfg.c -diff -u -p lib/libcyr_cfg.c.orig lib/libcyr_cfg.c ---- lib/libcyr_cfg.c.orig Wed Mar 10 00:05:58 2004 -+++ lib/libcyr_cfg.c Fri Feb 25 00:06:44 2005 -@@ -52,7 +52,7 @@ - #include "libcyr_cfg.h" - #include "cyrusdb.h" - --#if defined(__GNUC__) && __GNUC__ > 1 -+#if defined(__GNUC__) && __GNUC__ > 1 && !defined(__INTEL_COMPILER) - /* We can use the GCC union constructor extension */ - #define CFGVAL(t,v) (union cyrus_config_value)((t)(v)) - #else diff --git a/mail/cyrus-imapd23/files/patch-master::Makefile.in b/mail/cyrus-imapd23/files/patch-master::Makefile.in deleted file mode 100644 index c828109f247e..000000000000 --- a/mail/cyrus-imapd23/files/patch-master::Makefile.in +++ /dev/null @@ -1,26 +0,0 @@ -Index: master/Makefile.in -diff -u master/Makefile.in.orig master/Makefile.in ---- master/Makefile.in.orig Sat May 29 03:03:05 2004 -+++ master/Makefile.in Wed Jul 21 04:13:16 2004 -@@ -58,7 +58,7 @@ - DEPLIBS = @DEPLIBS@ - - CFLAGS = @CFLAGS@ --LDFLAGS = @LDFLAGS@ @COM_ERR_LDFLAGS@ -+LDFLAGS = @LDFLAGS_UCDSNMP@ @LDFLAGS@ @COM_ERR_LDFLAGS@ - LIBS = ../lib/libcyrus_min.a @LIB_UCDSNMP@ @LIBS@ @COM_ERR_LIBS@ - - SHELL = /bin/sh -@@ -76,10 +76,10 @@ - all: $(PROGS) $(LOBJS) - - install: -- $(srcdir)/../install-sh -d ${DESTDIR}$(service_path) -+ $(INSTALL) -d ${DESTDIR}$(service_path) - for file in $(PROGS); \ - do \ -- $(INSTALL) -m 755 $$file $(DESTDIR)$(service_path) || exit 1; \ -+ $(INSTALL) -s -m 755 $$file $(DESTDIR)$(service_path) || exit 1; \ - done - - .c.o: diff --git a/mail/cyrus-imapd23/files/patch-master::service-thread.c b/mail/cyrus-imapd23/files/patch-master::service-thread.c deleted file mode 100644 index 9a2016c3c64a..000000000000 --- a/mail/cyrus-imapd23/files/patch-master::service-thread.c +++ /dev/null @@ -1,14 +0,0 @@ -Index: master/service-thread.c -diff -u master/service-thread.c.orig master/service-thread.c ---- master/service-thread.c.orig Wed Jan 22 22:52:36 2003 -+++ master/service-thread.c Wed Jan 22 23:09:52 2003 -@@ -99,6 +99,9 @@ - struct sockaddr_storage sin; - socklen_t len = sizeof(sin); - -+ /* XXX: old FreeBSD didn't fill sockaddr correctly against AF_UNIX */ -+ sin.ss_family = AF_UNIX; -+ - /* is this a connection from the local host? */ - if (getpeername(fd, (struct sockaddr *) &sin, &len) == 0) { - if (((struct sockaddr *)&sin)->sa_family == AF_UNIX) { diff --git a/mail/cyrus-imapd23/files/patch-notifyd::Makefile.in b/mail/cyrus-imapd23/files/patch-notifyd::Makefile.in deleted file mode 100644 index d49703fa25b4..000000000000 --- a/mail/cyrus-imapd23/files/patch-notifyd::Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ -Index: notifyd/Makefile.in -diff -u notifyd/Makefile.in.orig notifyd/Makefile.in ---- notifyd/Makefile.in.orig Wed Nov 12 13:02:10 2003 -+++ notifyd/Makefile.in Fri Feb 13 18:41:07 2004 -@@ -79,7 +79,7 @@ - all: notifyd - - install: -- $(INSTALL) -m 755 notifyd $(DESTDIR)$(service_path) -+ $(INSTALL) -s -m 755 notifyd $(DESTDIR)$(service_path) - - OBJS= notifyd.o notify_null.o notify_log.o notify_mailto.o notify_zephyr.o - diff --git a/mail/cyrus-imapd23/files/patch-perl::imap::Makefile.PL b/mail/cyrus-imapd23/files/patch-perl::imap::Makefile.PL deleted file mode 100644 index 66140bf53219..000000000000 --- a/mail/cyrus-imapd23/files/patch-perl::imap::Makefile.PL +++ /dev/null @@ -1,15 +0,0 @@ -Index: perl/imap/Makefile.PL -diff -u perl/imap/Makefile.PL.orig perl/imap/Makefile.PL ---- perl/imap/Makefile.PL.orig Thu Oct 23 03:50:18 2003 -+++ perl/imap/Makefile.PL Sun Dec 12 04:20:10 2004 -@@ -70,3 +70,10 @@ - 'INC' => "-I../../lib $SASL_INC $OPENSSL_INC", - 'EXE_FILES' => [cyradm], - ); -+ -+package MY; -+sub install { -+ my $inherited = shift->SUPER::install(@_); -+ $inherited =~ s/(install :: all pure_install) doc_install/$1/; -+ $inherited; -+} diff --git a/mail/cyrus-imapd23/files/patch-perl::sieve::managesieve::Makefile.PL b/mail/cyrus-imapd23/files/patch-perl::sieve::managesieve::Makefile.PL deleted file mode 100644 index bde3d77b763e..000000000000 --- a/mail/cyrus-imapd23/files/patch-perl::sieve::managesieve::Makefile.PL +++ /dev/null @@ -1,15 +0,0 @@ -Index: perl/sieve/managesieve/Makefile.PL -diff -u perl/sieve/managesieve/Makefile.PL.orig perl/sieve/managesieve/Makefile.PL ---- perl/sieve/managesieve/Makefile.PL.orig Thu Oct 23 03:50:27 2003 -+++ perl/sieve/managesieve/Makefile.PL Sun Dec 12 04:21:55 2004 -@@ -64,3 +64,10 @@ - 'DEFINE' => '-DPERL_POLLUTE', # e.g., '-DHAVE_SOMETHING' - 'INC' => "-I../lib/ -I../../../lib/ $SASL_INC $OPENSSL_INC", - ); -+ -+package MY; -+sub install { -+ my $inherited = shift->SUPER::install(@_); -+ $inherited =~ s/(install :: all pure_install) doc_install/$1/; -+ $inherited; -+} diff --git a/mail/cyrus-imapd23/files/patch-sieve::Makefile.in b/mail/cyrus-imapd23/files/patch-sieve::Makefile.in deleted file mode 100644 index 99d494cf81d4..000000000000 --- a/mail/cyrus-imapd23/files/patch-sieve::Makefile.in +++ /dev/null @@ -1,23 +0,0 @@ -Index: sieve/Makefile.in -diff -u sieve/Makefile.in.orig sieve/Makefile.in ---- sieve/Makefile.in.orig Sat May 29 03:03:09 2004 -+++ sieve/Makefile.in Sat May 29 04:53:11 2004 -@@ -34,6 +34,7 @@ - YACC = @YACC@ - YFLAGS = -d - LEX = @LEX@ -+INSTALL = @INSTALL@ - RANLIB = @RANLIB@ - COMPILE_ET = @COMPILE_ET@ - -@@ -60,8 +61,8 @@ - dist: $(BUILT_SOURCES) - - install: sievec -- $(srcdir)/../install-sh -d ${DESTDIR}$(service_path) -- $(srcdir)/../install-sh -c -m 755 sievec $(DESTDIR)$(service_path) || exit -+ $(INSTALL) -d ${DESTDIR}$(service_path) -+ $(INSTALL) -s -c -m 755 sievec $(DESTDIR)$(service_path) || exit - - test: $(DEPLIBS) libsieve.a test.o - $(CC) $(LDFLAGS) -o test test.o libsieve.a $(DEPLIBS) $(LIBS) diff --git a/mail/cyrus-imapd23/files/patch-timsieved::Makefile.in b/mail/cyrus-imapd23/files/patch-timsieved::Makefile.in deleted file mode 100644 index 4e0bc2841c2c..000000000000 --- a/mail/cyrus-imapd23/files/patch-timsieved::Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ -Index: timsieved/Makefile.in -diff -u timsieved/Makefile.in.orig timsieved/Makefile.in ---- timsieved/Makefile.in.orig Wed Nov 12 13:02:14 2003 -+++ timsieved/Makefile.in Fri Feb 13 18:51:17 2004 -@@ -79,7 +79,7 @@ - all: timsieved - - install: -- $(INSTALL) -m 755 timsieved $(DESTDIR)$(service_path) -+ $(INSTALL) -s -m 755 timsieved $(DESTDIR)$(service_path) - - OBJS= actions.o lex.o mystring.o scripttest.o timsieved.o parser.o \ - ../imap/tls.o diff --git a/mail/cyrus-imapd23/pkg-deinstall b/mail/cyrus-imapd23/pkg-deinstall deleted file mode 100644 index e0dd1b8bb7fc..000000000000 --- a/mail/cyrus-imapd23/pkg-deinstall +++ /dev/null @@ -1,60 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# -# Created by: hetzels@westbend.net - -#set -vx - -PKG_BATCH=${BATCH:=NO} -PKG_PREFIX=${PKG_PREFIX:=%%PREFIX%%} -EXAMPLESDIR=${EXAMPLESDIR:=%%EXAMPLESDIR%%} -CYRUS_USER=${CYRUS_USER:=%%CYRUS_USER%%} - -checkfile() { - diff -bBqw $1 $2 >/dev/null 2>&1 - case $? in - 0) # config file exists, but is the same - rm $1 - ;; - 1) # config file exists and differs - ;; - *) # no config file exists - ;; - esac -} - -# -# Modify the 'cyrus' user created from the cyrus-sasl port -# - -modify_cyrus_user() { - USER=${CYRUS_USER} - PW=/usr/sbin/pw - if [ -x /usr/sbin/nologin ]; then - shell=/usr/sbin/nologin - elif [ -x /sbin/nologin ]; then - shell=/sbin/nologin - else - shell=/nonexistent - fi - uhome=/nonexistent - - if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}"; then - echo "*** Failed to update user \`${USER}'." - else - echo "*** Updated user \`${USER}'." - fi -} - -case $2 in - DEINSTALL) - cd ${PKG_PREFIX} - checkfile ${PKG_PREFIX}/etc/imapd.conf ${EXAMPLESDIR}/imapd.conf - checkfile ${PKG_PREFIX}/etc/cyrus.conf ${EXAMPLESDIR}/normal.conf - ;; - POST-DEINSTALL) - modify_cyrus_user - ;; - -esac diff --git a/mail/cyrus-imapd23/pkg-descr b/mail/cyrus-imapd23/pkg-descr deleted file mode 100644 index 79d06da9dd9b..000000000000 --- a/mail/cyrus-imapd23/pkg-descr +++ /dev/null @@ -1,21 +0,0 @@ -The Cyrus IMAP (Internet Message Access Protocol) server provides access to -personal mail and system-wide bulletin boards through the IMAP protocol. -The Cyrus IMAP server is a scaleable enterprise mail system designed for use -from small to large enterprise environments using standards-based -technologies. - -A full Cyrus IMAP implementation allows a seamless mail and bulletin board -environment to be set up across multiple servers. It differs from other -IMAP server implementations in that it is run on "sealed" servers, where -users are not normally permitted to log in. The mailbox database is stored -in parts of the filesystem that are private to the Cyrus IMAP system. All -user access to mail is through software using the IMAP, POP3, or KPOP -protocols. - -The private mailbox database design gives the server large advantages in -efficiency, scalability, and administratability. Multiple concurrent -read/write connections to the same mailbox are permitted. The server -supports access control lists on mailboxes and storage quotas on mailbox -hierarchies. - -WWW: http://asg.web.cmu.edu/cyrus/ diff --git a/mail/cyrus-imapd23/pkg-install b/mail/cyrus-imapd23/pkg-install deleted file mode 100644 index d2ba72f75349..000000000000 --- a/mail/cyrus-imapd23/pkg-install +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/sh - -#set -vx - -PKG_BATCH=${BATCH:=NO} -PKG_PREFIX=${PKG_PREFIX:=%%PREFIX%%} -EXAMPLESDIR=${EXAMPLESDIR:=%%EXAMPLESDIR%%} -CYRUS_USER=${CYRUS_USER:=%%CYRUS_USER%%} - -# -# Modify the 'cyrus' user created from the cyrus-sasl port -# - -modify_cyrus_user() { - USER=${CYRUS_USER} - PW=/usr/sbin/pw - shell=/bin/csh - uhome=${PKG_PREFIX}/cyrus - - if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}"; then - echo "*** Failed to update user \`${USER}'." - else - echo "*** Updated user \`${USER}'." - fi -} - - -checkfile() { - diff -bBqw $1 $2 >/dev/null 2>&1 - case $? in - 0) # config file exists, but is the same - ;; - 1) # config file exists and differs - echo "** Make sure $1 is in sync with this version"; - echo " of the port. See $1.dist for details."; - ;; - *) # no config file exists, copy it - install -c -m 644 $2 $1 - ;; - esac -} - -case $2 in - PRE-INSTALL) - ;; - - POST-INSTALL) - modify_cyrus_user - cd ${PKG_PREFIX} - checkfile ${PKG_PREFIX}/etc/imapd.conf ${EXAMPLESDIR}/imapd.conf - checkfile ${PKG_PREFIX}/etc/cyrus.conf ${EXAMPLESDIR}/normal.conf - if grep 'sieve' /etc/services; then - echo - else - echo - echo "** Please add an entry for the sieve protocol (2000/tcp)" - echo " to /etc/services" - echo - fi - ;; -esac diff --git a/mail/cyrus-imapd23/pkg-message b/mail/cyrus-imapd23/pkg-message deleted file mode 100644 index ff816e46e925..000000000000 --- a/mail/cyrus-imapd23/pkg-message +++ /dev/null @@ -1,8 +0,0 @@ -**************************************************************************** - -To setup mail spool, modify /usr/local/etc/imapd.conf appropriately, -then run /usr/local/cyrus/bin/mkimap. -To run Cyrus IMAPd from startup, add cyrus_imapd_enable="YES" in your -/etc/rc.conf. - -**************************************************************************** diff --git a/mail/cyrus-imapd23/pkg-plist b/mail/cyrus-imapd23/pkg-plist deleted file mode 100644 index f62a19ad16e6..000000000000 --- a/mail/cyrus-imapd23/pkg-plist +++ /dev/null @@ -1,102 +0,0 @@ -bin/cyradm -bin/imtest -bin/installsieve -bin/lmtptest -bin/mupdatetest -bin/nntptest -bin/pop3test -bin/sieveshell -bin/sivtest -bin/smtptest -cyrus/bin/arbitron -cyrus/bin/chk_cyrus -cyrus/bin/ctl_cyrusdb -cyrus/bin/ctl_deliver -cyrus/bin/ctl_mboxlist -cyrus/bin/cvt_cyrusdb -cyrus/bin/cyr_expire -cyrus/bin/cyrdump -cyrus/bin/deliver -%%NNTP%%cyrus/bin/fetchnews -cyrus/bin/fud -%%IDLED%%cyrus/bin/idled -cyrus/bin/imapd -cyrus/bin/ipurge -cyrus/bin/lmtpd -%%MURDER%%cyrus/bin/lmtpproxyd -cyrus/bin/masssievec -cyrus/bin/master -cyrus/bin/mbexamine -cyrus/bin/mbpath -cyrus/bin/mkimap -%%MURDER%%cyrus/bin/mupdate -%%NNTP%%cyrus/bin/nntpd -cyrus/bin/notifyd -cyrus/bin/pop3d -cyrus/bin/pop3proxyd -%%MURDER%%cyrus/bin/proxyd -%%LDAP_PTLOADER%%cyrus/bin/ptdump -%%LDAP_PTLOADER%%cyrus/bin/ptexpire -%%LDAP_PTLOADER%%cyrus/bin/ptloader -cyrus/bin/quota -cyrus/bin/reconstruct -cyrus/bin/sievec -cyrus/bin/smmapd -cyrus/bin/squatter -cyrus/bin/timsieved -cyrus/bin/tls_prune -include/cyrus/acl.h -include/cyrus/assert.h -include/cyrus/auth.h -include/cyrus/bsearch.h -include/cyrus/charset.h -include/cyrus/cyrusdb.h -include/cyrus/glob.h -include/cyrus/gmtoff.h -include/cyrus/hash.h -include/cyrus/imapopts.h -include/cyrus/imapurl.h -include/cyrus/imclient.h -include/cyrus/imparse.h -include/cyrus/iptostring.h -include/cyrus/libconfig.h -include/cyrus/libcyr_cfg.h -include/cyrus/lock.h -include/cyrus/lsort.h -include/cyrus/map.h -include/cyrus/mkgmtime.h -include/cyrus/mpool.h -include/cyrus/nonblock.h -include/cyrus/parseaddr.h -include/cyrus/prot.h -include/cyrus/retry.h -include/cyrus/rfc822date.h -include/cyrus/strhash.h -include/cyrus/strhash.o -include/cyrus/stristr.h -include/cyrus/sysexits.h -include/cyrus/util.h -include/cyrus/xmalloc.h -lib/libcyrus_min.a -lib/libcyrus.a -%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/Admin.pm -%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/IMSP.pm -%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/Shell.pm -%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP.pm -%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/SIEVE/managesieve.pm -%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/.packlist -%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/IMAP.bs -%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/IMAP.so -%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/.packlist -%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.bs -%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.so -%%EXAMPLESDIR%%/imapd.conf -@dirrm cyrus/bin -@dirrm include/cyrus -@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP -@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/SIEVE -@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus -@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/IMAP -@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve -@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE -@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile deleted file mode 100644 index d137aefb38fe..000000000000 --- a/mail/cyrus-imapd24/Makefile +++ /dev/null @@ -1,332 +0,0 @@ -# New ports collection makefile for: cyrus-imapd -# Date created: Jan 4th 2001 -# Whom: ume@FreeBSD.org -# -# $FreeBSD$ -# - -PORTNAME= cyrus-imapd -PORTVERSION= 2.2.12 -PORTREVISION= 1 -CATEGORIES= mail ipv6 -MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \ - ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \ - ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/cyrus-mail/&,} - -MAINTAINER= ume@FreeBSD.org -COMMENT= The cyrus mail server, supporting POP3 and IMAP4 protocols - -LIB_DEPENDS= sasl2.2:${PORTSDIR}/security/cyrus-sasl2 -RUN_DEPENDS= ${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-Pod-Parser \ - ${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp - -CONFLICTS= cyrus-1.* cyrus-imapd-2.[^2].* - -LATEST_LINK= ${PORTNAME}22 - -USE_RC_SUBR= imapd.sh -USE_OPENSSL= yes -USE_PERL5= yes -USE_REINPLACE= yes -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc \ - --with-cyrus-prefix=${PREFIX}/cyrus \ - --with-cyrus-user=${CYRUS_USER} \ - --with-cyrus-group=${CYRUS_GROUP} \ - --with-sasl=${LOCALBASE} \ - --with-bdb-libdir=${LOCALBASE}/lib \ - --with-com_err \ - --with-openssl=${OPENSSLBASE} \ - --with-perl=${PERL5} - -OPTIONS= AUTH_KRB5 "Use Kerberos5 authorization module" off -.if defined(WITH_BDB_VER) -USE_BDB_VER= ${WITH_BDB_VER} -.else -USE_BDB_VER= 3 -.endif -.if ${USE_BDB_VER} == 3 -OPTIONS+= BDB_3 "Use BerkeleyDB v3" on \ - BDB_4 "Use BerkeleyDB v4" off \ - BDB_41 "Use BerkeleyDB v4.1" off \ - BDB_42 "Use BerkeleyDB v4.2" off \ - BDB_43 "Use BerkeleyDB v4.3" off -.elif ${USE_BDB_VER} == 4 -OPTIONS+= BDB_3 "Use BerkeleyDB v3" off \ - BDB_4 "Use BerkeleyDB v4" on \ - BDB_41 "Use BerkeleyDB v4.1" off \ - BDB_42 "Use BerkeleyDB v4.2" off \ - BDB_43 "Use BerkeleyDB v4.3" off -.elif ${USE_BDB_VER} == 41 -OPTIONS+= BDB_3 "Use BerkeleyDB v3" off \ - BDB_4 "Use BerkeleyDB v4" off \ - BDB_41 "Use BerkeleyDB v4.1" on \ - BDB_42 "Use BerkeleyDB v4.2" off \ - BDB_43 "Use BerkeleyDB v4.3" off -.elif ${USE_BDB_VER} == 42 -OPTIONS+= BDB_3 "Use BerkeleyDB v3" off \ - BDB_4 "Use BerkeleyDB v4" off \ - BDB_41 "Use BerkeleyDB v4.1" off \ - BDB_42 "Use BerkeleyDB v4.2" on \ - BDB_43 "Use BerkeleyDB v4.3" off -.elif ${USE_BDB_VER} == 43 -OPTIONS+= BDB_3 "Use BerkeleyDB v3" off \ - BDB_4 "Use BerkeleyDB v4" off \ - BDB_41 "Use BerkeleyDB v4.1" off \ - BDB_42 "Use BerkeleyDB v4.2" off \ - BDB_43 "Use BerkeleyDB v4.3" on -.else -BROKEN= "WITH_BDB_VER must be 3, 4, 41, 42 or 43" -.endif - -OPTIONS+= DRAC "Enable DRAC support" off -OPTIONS+= IDLE_IDLED "Enable IMAP IDLE method idled" off \ - IDLE_POLL "Enable IMAP IDLE method idle-polling" on -OPTIONS+= LDAP_PTLOADER "Enable LDAP ptloader (experimantal)" off -OPTIONS+= LISTEXT "Enable IMAP List extensions" off -OPTIONS+= MURDER "Enable IMAP Murder support" off -OPTIONS+= NETSCAPEHACK "Enable X-NETSCAPE extensions" off -OPTIONS+= NNTP "Enable NNTP support" off -OPTIONS+= SNMP_4 "Enable SNMP support using net-snmp v4" off \ - SNMP_5 "Enable SNMP support using net-snmp v5" off -OPTIONS+= PASS8BITHACK "Add pass8bit option (not recommended)" off - -BDB_VERS= 3 4 41 42 43 - -.include <bsd.port.pre.mk> - -BDB_W:= -BDB_WO:= -.for v in ${BDB_VERS} -BDB_W:= ${BDB_W} ${WITH_BDB_${v}} -BDB_WO:= ${BDB_WO} ${WITHOUT_BDB_${v}} -.endfor -BDB_NUM_W!= ${ECHO_CMD} ${BDB_W} | wc -w -BDB_NUM_WO!= ${ECHO_CMD} ${BDB_WO} | wc -w -BDB_NUM_VERS!= ${ECHO_CMD} ${BDB_VERS} | wc -w - -.if ${BDB_NUM_W} == 0 -.if ${BDB_NUM_WO} == ${BDB_NUM_VERS} -BROKEN= "You need to select one BDB version. Run 'make config' again!" -.endif -WITH_BDB_${USE_BDB_VER}= true -.elif ${BDB_NUM_W} != 1 -BROKEN= "Multiple BDB versions selected. Run 'make config' again!" -.endif -.if defined(WITH_BDB_3) -BDB_VER= 3 -BDB_MAJOR= 3 -.elif defined(WITH_BDB_4) -BDB_VER= 4 -BDB_MAJOR= 0 -.elif defined(WITH_BDB_41) -BDB_VER= 41 -BDB_MAJOR= 1 -.elif defined(WITH_BDB_42) -BDB_VER= 42 -BDB_SUFFIX= -4.2 -BDB_MAJOR= 2 -.elif defined(WITH_BDB_43) -BDB_VER= 43 -BDB_SUFFIX= -4.3 -BDB_MAJOR= 0 -.endif -BDB_SUFFIX?= ${BDB_VER} -LIB_DEPENDS+= db${BDB_SUFFIX}.${BDB_MAJOR}:${PORTSDIR}/databases/db${BDB_VER} -CONFIGURE_ARGS+=--with-bdb-incdir=${LOCALBASE}/include/db${BDB_VER} \ - --with-bdb=db${BDB_SUFFIX} - -.if defined(WITH_NNTP) -CONFIGURE_ARGS+=--enable-nntp -PLIST_SUB+= NNTP="" -.else -PLIST_SUB+= NNTP="@comment " -.endif - -.if defined(WITH_MURDER) -CONFIGURE_ARGS+=--enable-murder -CFLAGS+= ${PTHREAD_CFLAGS} -MAKE_ENV+= PTHREAD_LIBS=${PTHREAD_LIBS} -PLIST_SUB+= MURDER="" -.else -PLIST_SUB+= MURDER="@comment " -.endif - -.if defined(WITH_IDLE_IDLED) && defined(WITH_IDLE_POLL) -BROKEN= "Multiple IDLE methods selected. Run 'make config' again!" -.endif -.if defined(WITH_IDLE_IDLED) -CONFIGURE_ARGS+=--with-idle=idled -PLIST_SUB+= IDLED="" -.elif defined(WITH_IDLE_POLL) -CONFIGURE_ARGS+=--with-idle=poll -PLIST_SUB+= IDLED="@comment " -.elif defined(WITHOUT_IDLE_IDLED) && defined(WITHOUT_IDLE_POLL) -CONFIGURE_ARGS+=--with-idle=no -PLIST_SUB+= IDLED="@comment " -.else -PLIST_SUB+= IDLED="@comment " -.endif - -.if defined(WITH_LISTEXT) -CONFIGURE_ARGS+=--enable-listext -.endif - -.if defined(WITH_NETSCAPEHACK) -CONFIGURE_ARGS+=--enable-netscapehack -.endif - -.if defined(WITH_DRAC) -EXTRA_PATCHES+= ${WRKSRC}/contrib/drac_auth.patch -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-aclocal.m4 \ - ${FILESDIR}/extra-patch-configure.in -USE_AUTOCONF_VER=259 -USE_AUTOHEADER_VER=259 -CONFIGURE_ARGS+=--with-drac=${LOCALBASE} -BUILD_DEPENDS+= ${LOCALBASE}/lib/libdrac.a:${PORTSDIR}/mail/drac -.endif - -.if defined(WITH_SNMP_4) && defined(WITH_SNMP_5) -BROKEN= "Multiple net-snmp versions selected. Run 'make config' again!" -.endif -.if defined(WITH_SNMP_4) -LIB_DEPENDS+= snmp.4:${PORTSDIR}/net-mgmt/net-snmp4 -.elif defined(WITH_SNMP_5) -LIB_DEPENDS+= netsnmp.7:${PORTSDIR}/net-mgmt/net-snmp -.endif -.if defined(WITH_SNMP_4) || defined(WITH_SNMP_5) -CONFIGURE_ARGS+=--with-snmp=${LOCALBASE} -.else -CONFIGURE_ARGS+=--with-snmp=no -.endif - -.if defined(WITH_AUTH_KRB5) && defined(WITH_LDAP_PTLOADER) -BROKEN= "AUTH_KRB5 and LDAP_PTLOADER are exclusive. Run 'make config' again!" -.endif -.if defined(WITH_LDAP_PTLOADER) -USE_OPENLDAP= yes -CONFIGURE_ARGS+=--with-auth=pts --with-pts=ldap --with-ldap=${LOCALBASE} -PLIST_SUB+= LDAP_PTLOADER="" -.elif defined(WITH_AUTH_KRB5) -CONFIGURE_ARGS+=--with-auth=krb5 -PLIST_SUB+= LDAP_PTLOADER="@comment " -.else -CONFIGURE_ARGS+=--with-auth=unix -PLIST_SUB+= LDAP_PTLOADER="@comment " -.endif - -.if defined(WITH_PASS8BITHACK) -EXTRA_PATCHES+= ${FILESDIR}/pass8bit.diff -.endif - -CYRUS_USER?= cyrus -CYRUS_GROUP?= cyrus - -MAN1= cyradm.1 imtest.1 installsieve.1 lmtptest.1 mupdatetest.1 \ - nntptest.1 pop3test.1 sieveshell.1 sivtest.1 smtptest.1 -MAN3= imclient.3 -MAN5= cyrus.conf.5 imapd.conf.5 krb.equiv.5 -CYRUS_MAN3= Cyrus::IMAP.3 Cyrus::IMAP::Admin.3 Cyrus::IMAP::IMSP.3 \ - Cyrus::IMAP::Shell.3 Cyrus::SIEVE::managesieve.3 -CYRUS_MAN8= arbitron.8 chk_cyrus.8 nntpd.8 ctl_cyrusdb.8 ctl_deliver.8 \ - cyr_expire.8 ctl_mboxlist.8 cvt_cyrusdb.8 deliver.8 \ - fetchnews.8 fud.8 idled.8 imapd.8 ipurge.8 lmtpd.8 \ - master.8 mbexamine.8 mbpath.8 notifyd.8 pop3d.8 quota.8 \ - reconstruct.8 rmnews.8 smmapd.8 squatter.8 syncnews.8 \ - timsieved.8 tls_prune.8 - -DOCS= altnamespace anoncvs bugs changes faq feedback index \ - install install-admin-mb install-auth install-compile \ - install-configure install-murder install-netnews \ - install-perf install-prereq install-sieve install-snmpmon \ - install-testing install-upgrade install-virtdomains \ - mailing-list man notes os overview questions readme sieve \ - sieve-protocol specs - -CONFS= cmu-frontend.conf prefork.conf cmu-backend.conf normal.conf \ - small.conf - -PKGDEINSTALL= ${WRKDIR}/pkg-deinstall -PKGINSTALL= ${WRKDIR}/pkg-install - -post-patch: - @${SED} -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \ - -e "s|%%PREFIX%%|${PREFIX}|g" \ - -e "s|%%EXAMPLESDIR%%|${EXAMPLESDIR}|g" \ - ${.CURDIR}/pkg-install > ${PKGINSTALL} - @${SED} -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \ - -e "s|%%PREFIX%%|${PREFIX}|g" \ - -e "s|%%EXAMPLESDIR%%|${EXAMPLESDIR}|g" \ - ${.CURDIR}/pkg-deinstall > ${PKGDEINSTALL} - @${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|" \ - -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \ - -e "s|%%CYRUS_GROUP%%|${CYRUS_GROUP}|g" \ - ${WRKSRC}/tools/mkimap - @${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|g" \ - -e "s|/usr/sieve|/var/imap/sieve|g" \ - ${WRKSRC}/tools/masssievec -.if ${PERL_LEVEL} < 500600 - @${REINPLACE_CMD} -e "s|exec perl -x|exec perl -I${SITE_PERL} -x|" \ - ${WRKSRC}/perl/sieve/scripts/sieveshell.pl -.endif -.if defined(WITH_DRAC) - @${RM} -rf ${WRKSRC}/autom4te.cache -.endif - -post-install: -.for f in ${CYRUS_MAN3} - @${GZIP_CMD} ${PREFIX}/lib/perl5/${PERL_VERSION}/man/man3/${f} - @${ECHO_CMD} lib/perl5/${PERL_VERSION}/man/man3/${f}.gz \ - >>${TMPPLIST} -.endfor -.for f in ${CYRUS_MAN8} - @${GZIP_CMD} ${PREFIX}/cyrus/man/man8/${f} - @${ECHO_CMD} cyrus/man/man8/${f}.gz >>${TMPPLIST} -.endfor - @${ECHO_CMD} "@dirrm cyrus/man/man8" >>${TMPPLIST} - @${ECHO_CMD} "@dirrm cyrus/man" >>${TMPPLIST} - @${ECHO_CMD} "@dirrm cyrus" >>${TMPPLIST} -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR}/man - @${MKDIR} ${DOCSDIR}/text -.for f in ${DOCS} - @${INSTALL_DATA} ${WRKSRC}/doc/${f}.html ${DOCSDIR} - @${ECHO_CMD} share/doc/${PORTNAME}/${f}.html >>${TMPPLIST} -.endfor -.for f in ${MAN1} ${MAN3} ${MAN5} ${CYRUS_MAN8} - @if [ -f ${WRKSRC}/doc/man/${f}.html ]; then \ - ${INSTALL_DATA} ${WRKSRC}/doc/man/${f}.html \ - ${DOCSDIR}/man/${f}.html; \ - ${ECHO_CMD} share/doc/${PORTNAME}/man/${f}.html \ - >>${TMPPLIST}; \ - fi -.endfor -.for f in cyrusv2.mc murder.fig murder.png netnews.fig netnews.png - @${INSTALL_DATA} ${WRKSRC}/doc/${f} ${DOCSDIR} - @${ECHO_CMD} share/doc/${PORTNAME}/${f} >>${TMPPLIST} -.endfor -.for f in ${DOCS} - @${INSTALL_DATA} ${WRKSRC}/doc/text/${f} ${DOCSDIR}/text - @${ECHO_CMD} share/doc/${PORTNAME}/text/${f} >>${TMPPLIST} -.endfor - @${ECHO_CMD} "@dirrm share/doc/${PORTNAME}/text" >>${TMPPLIST} - @${ECHO_CMD} "@dirrm share/doc/${PORTNAME}/man" >>${TMPPLIST} - @${ECHO_CMD} "@dirrm share/doc/${PORTNAME}" >>${TMPPLIST} -.endif - @${MKDIR} ${EXAMPLESDIR} - @${INSTALL_DATA} ${FILESDIR}/imapd.conf ${EXAMPLESDIR} -.for f in ${CONFS} - @${INSTALL_DATA} ${WRKSRC}/master/conf/${f} ${EXAMPLESDIR} - @${ECHO_CMD} ${EXAMPLESDIR:S,^${PREFIX}/,,}/${f} >>${TMPPLIST} -.endfor - @${ECHO_CMD} @dirrm ${EXAMPLESDIR:S,^${PREFIX}/,,} \ - >>${TMPPLIST} - @${INSTALL_SCRIPT} ${WRKSRC}/tools/mkimap \ - ${PREFIX}/cyrus/bin/mkimap - @${INSTALL_SCRIPT} ${WRKSRC}/tools/masssievec \ - ${PREFIX}/cyrus/bin/masssievec - @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} \ - POST-INSTALL - @${CAT} ${PKGMESSAGE} - -.include <bsd.port.post.mk> diff --git a/mail/cyrus-imapd24/distinfo b/mail/cyrus-imapd24/distinfo deleted file mode 100644 index ac5f81216c54..000000000000 --- a/mail/cyrus-imapd24/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (cyrus-imapd-2.2.12.tar.gz) = 70b3bba526a8d36d3bb23a87d37e9188 -SIZE (cyrus-imapd-2.2.12.tar.gz) = 1961161 diff --git a/mail/cyrus-imapd24/files/extra-patch-aclocal.m4 b/mail/cyrus-imapd24/files/extra-patch-aclocal.m4 deleted file mode 100644 index 0a8794381188..000000000000 --- a/mail/cyrus-imapd24/files/extra-patch-aclocal.m4 +++ /dev/null @@ -1,51 +0,0 @@ -Index: aclocal.m4 -diff -u aclocal.m4.orig aclocal.m4 ---- aclocal.m4.orig Wed Nov 24 03:55:40 2004 -+++ aclocal.m4 Wed Nov 24 15:39:52 2004 -@@ -506,10 +506,11 @@ - fi - - saved_LIBS=$LIBS -- for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db -+ for dbname in ${with_bdb} db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db - do - LIBS="$saved_LIBS -l$dbname" -- AC_TRY_LINK([#include <db.h>], -+ AC_TRY_LINK([#include <stdio.h> -+#include <db.h>], - [db_create(NULL, NULL, 0);], - BDB_LIBADD="$BDB_LIBADD -l$dbname"; dblib="berkeley"; dbname=db, - dblib="no") -@@ -517,7 +518,8 @@ - done - if test "$dblib" = "no"; then - LIBS="$saved_LIBS -ldb" -- AC_TRY_LINK([#include <db.h>], -+ AC_TRY_LINK([#include <stdio.h> -+#include <db.h>], - [db_open(NULL, 0, 0, 0, NULL, NULL, NULL);], - BDB_LIBADD="$BDB_LIBADD -ldb"; dblib="berkeley"; dbname=db, - dblib="no") -@@ -1820,9 +1822,12 @@ - - if test -n "$SNMP_LIBS" && test -n "$SNMP_PREFIX"; then - CPPFLAGS="$CPPFLAGS -I${SNMP_PREFIX}/include" -- LIB_UCDSNMP=$SNMP_LIBS -+ LIB_UCDSNMP="$SNMP_LIBS -lwrap" -+ PERLLIBDIR=`$PERL -e 'use Config; print "$Config{archlibexp}/CORE";'` -+ LDFLAGS_UCDSNMP="-L${PERLLIBDIR} -R${PERLLIBDIR}" - AC_DEFINE(HAVE_NETSNMP,1,[Do we have Net-SNMP support?]) - AC_SUBST(LIB_UCDSNMP) -+ AC_SUBST(LDFLAGS_UCDSNMP) - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) -@@ -1848,7 +1853,7 @@ - LIB_UCDSNMP="" - if test "$with_snmp" != no; then - AC_DEFINE(HAVE_UCDSNMP,1,[Do we have UCD-SNMP support?]) -- LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp" -+ LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp -lkvm -ldevstat -lwrap" - AC_CHECK_LIB(rpm, rpmdbOpen, - LIB_UCDSNMP="${LIB_UCDSNMP} -lrpm -lpopt",,-lpopt) - fi diff --git a/mail/cyrus-imapd24/files/extra-patch-configure.in b/mail/cyrus-imapd24/files/extra-patch-configure.in deleted file mode 100644 index 1a89d771ee93..000000000000 --- a/mail/cyrus-imapd24/files/extra-patch-configure.in +++ /dev/null @@ -1,13 +0,0 @@ -Index: configure.in -diff -u configure.in.orig configure.in ---- configure.in.orig Sat May 29 04:59:21 2004 -+++ configure.in Sat May 29 05:03:04 2004 -@@ -933,7 +933,7 @@ - dnl add perl cccdlflags when building libraries -- this ensures that the - dnl libraries will be compiled as PIC if perl requires PIC objects - dnl -- this is needed on NetBSD, but seems to cause problems on atleast Solaris -- --dnl eval `${PERL} -V:cccdlflags` -+ eval `${PERL} -V:cccdlflags` - PERL_CCCDLFLAGS="$cccdlflags" - AC_SUBST(PERL_CCCDLFLAGS) - fi diff --git a/mail/cyrus-imapd24/files/imapd.conf b/mail/cyrus-imapd24/files/imapd.conf deleted file mode 100644 index d0f32d1bbe81..000000000000 --- a/mail/cyrus-imapd24/files/imapd.conf +++ /dev/null @@ -1,412 +0,0 @@ -# -# $FreeBSD$ -# -# Sample configurations file for Cyrus IMAPd -# Most lines in this file are commented; in this case the default is used. -# The commented lines (usually) contain the default value - -# The pathname of the IMAP configuration directory -# -configdirectory: /var/imap - -# The partition name used by default for new mailboxes -# -#defaultpartition: default - -# The directory for the different partitions -# -partition-default: /var/spool/imap - -# Use the UNIX separator character '/' for delimiting levels of -# mailbox hierarchy. The default is to use the netnews separator -# character '.'. -#unixhierarchysep: no - -# Use the alternate IMAP namespace, where personal folders reside at -# the same level in the hierarchy as INBOX. -# -#altnamespace: no - -# If using the alternate IMAP namespace, the prefix for the other -# users namespace. The hierarchy delimiter will be automatically -# appended. -# -#userprefix: Other Users - -# If using the alternate IMAP namespace, the prefix for the shared -# namespace. The hierarchy delimiter will be automatically appended. -# -#sharedprefix: Shared Folders - -# The umask value used by various Cyrus IMAP programs -# -#umask: 077 - -# This is the hostname visible in the greeting messages of the POP, -# IMAP and LMTP daemons. If it is unset, then the result returned from -# gethostname(2) is used. -# -#servername: <result returned by gethostname(2)> - -# Whether to allow anonymous logins -# -#allowanonymouslogin: no - -# Allow the use of cleartext passwords on the wire. -# -#allowplaintext: yes - -# The percent of quota utilization over which the server generates -# warnings. -# -#quotawarn: 90 - -# The length of the IMAP server's inactivity autologout timer, in minutes. -# The minimum value is 30, the default. -# -#timeout: 30 - -# The interval (in seconds) for polling the mailbox for changes while -# running the IDLE command. This option is used when idled can not be -# contacted or when polling is used exclusively. The minimum value is -# 1. A value of 0 will disable polling (and disable IDLE if polling -# is the only method available). -# -#imapidlepoll: 60 - -# If enabled, the server responds to an ID command with a parameter -# list containing: version, vendor, support-url, os, os-version, -# command, arguments, environment. Otherwise the server returns NIL. -# -#imapidresponse: yes - -# Set the length of the POP server's inactivity autologout timer, in -# minutes. The minimum value is 10, the default. -# -#poptimeout: 10 - -# Set the minimum amount of time the server forces users to wait between -# successive POP logins, in minutes. The default is 0. -# -#popminpoll: 0 - -# The number of days advertised as being the minimum a message may be -# left on the POP server before it is deleted (via the CAPA command, -# defined in the POP3 Extension Mechanism, which some clients may -# support). "NEVER", the default, may be specified with a negative -# number. The Cyrus POP3 server never deletes mail, no matter what -# the value of this parameter is. However, if a site implements a -# less liberal policy, it needs to change this parameter accordingly. -# -#popexpiretime: 0 - -# The list of userids with administrative rights. Separate each userid -# with a space. We recommend that administrator userids be separate from -# standard userids. Sites using Kerberos authentication may use separate -# "admin" instances. -# -#admins: <none> - -# A list of users and groups that are allowed to proxy for other -# users, seperated by spaces. Any user listed in this will be allowed -# to login for any other user: use with caution. -# -#proxyservers: <none> - -# The Access Control List (ACL) placed on a newly-created (non-user) -# mailbox that does not have a parent mailbox. -# -#defaultacl: anyone lrs - -# The pathname of the news spool directory. Only used if the partition-news -# configuration option is set. -# -#newsspool: <no default> - -# Prefix to be prepended to newsgroup names to make the corresponding IMAP -# mailbox names. -# -#newsprefix: <none> - -# If nonzero, normal users may create their own IMAP accounts by creating -# the mailbox INBOX. The user's quota is set to the value if it is positive, -# otherwise the user has unlimited quota. -# -#autocreatequota: 0 - -# Include notations in the protocol telemetry logs indicating the number -# of seconds since the last command or response. -# -#logtimestamps: no - -# Number of seconds to pause after a successful plaintext login. For systems -# that support strong authentication, this permits users to perceive a cost -# of using plaintext passwords. -# -#plaintextloginpause: 0 - -# The pathname of srvtab file containing the server's private key. -# This option is passed to the SASL library and overrides its default -# setting. -# -#srvtab: /etc/srvtab - -# The list of remote realms whose users may log in using cross-realm -# authentications. Seperate each realm name by a space. This option is -# only used when the server is compiled with Kerberos authentication. -# -#loginrealms: <none> - -# If enabled, any authentication identity which has a rights on a user's -# INBOX may log in as that user. This option is only used when the server -# is compiled with Kerberos authentication. -# -#loginuseacl: no - -# If enabled, lmtpd attempts to only write one copy of a message per -# partition and create hard links, resulting in a potentially large -# disk savings. -# -#singleinstancestore: yes - -# If enabled, lmtpd will suppress delivery of a message to a mailbox -# if a message with the same message-id (or resent-message-id) is -# recorded as having already been delivered to the mailbox. Records -# the mailbox and message-id/resent-message-id of all successful -# deliveries. -# -#duplicatesuppression: yes - -# If enabled, lmtpd rejects messages with 8-bit characters in the -# headers. Otherwise, 8-bit characters are changed to `X'. (A proper -# soultion to non-ASCII characters in headers is offered by RFC 2047 -# and its predecessors.) -# -#reject8bit: no - -# Maximum incoming LMTP message size. If set, lmtpd will reject -# messages larger than maxmessagesize bytes. The default is to allow -# messages of any size. -# -#maxmessagesize: <unlimited> - -# Userid used to deliver messages to shared folders. For example, if -# set to "bb", email sent to "bb+shared.blah" would be delivered to -# the "shared.blah" folder. By default, an email address of -# "+shared.blah" would be used. -#postuser: <none> - -# If enabled at compile time, this specifies a URL to reply when -# Netscape asks the server where the mail administration HTTP server -# is. The default is a site at CMU with a hopefully informative -# message; administrators should set this to a local resource with -# some information of greater use. -# -#netscapeurl: http://andrew2.andrew.cmu.edu/cyrus/imapd/netscapeadmin.html - -# Notifyd(8) method to use for "MAIL" notifications. If not set, -# "MAIL" notifications are disabled. -# -#mailnotifier: <no default> - -# Notifyd(8) method to use for "SIEVE" notifications. If not set, -# "SIEVE" notifications are disabled. -# -# This method is only used when no method is specified in the script. -# -#sievenotifier: <no default> - -# If enabled, lmtpd will look for Sieve scripts in user's home -# directories: ~user/.sieve. -# -sieveusehomedir: false - -# If sieveusehomedir is false, this directory is searched for Sieve scripts. -# The active Sieve script is s called "default", placed in the users sieve -# sieve directory (ie. /var/imap/sieve/u/user). -# -sievedir: /var/imap/sieve - -# The pathname of the sendmail executable. Sieve uses sendmail for -# sending rejections, redirects and vaca- tion responses. -# -#sendmail: /usr/sbin/sendmail - -# Username that is used as the 'From' address in rejection MDNs -# produced by sieve. -# -#postmaster: postmaster - -# If enabled, the partitions will also be hashed, in addition to the hashing -# done on configuration directories. This is recommended if one partition has -# a very bushy mailbox tree. -# -#hashimapspool: false - -# Maximum size (in kilobytes) any sieve script can be, enforced at -# submission by timsieved(8). -# -#sieve_maxscriptsize: 32 - -# Maximum number of sieve scripts any user may have, enforced at -# submission by timsieved(8). -# -#sieve_maxscripts: 5 - -# The cyrusdb backend to use for mailbox annotations. -# Allowed values: berkeley, skiplist -# -#annotation_db: skiplist - -# The cyrusdb backend to use for the duplicate delivery suppression -# and sieve. -# Allowed values: berkeley, berkeley-nosync, skiplist -# -#duplicate_db: berkeley-nosync - -# The cyrusdb backend to use for the mailbox list. -# Allowed values: flat, berkeley, skiplist -# -#mboxlist_db: skiplist - -# The cyrusdb backend to use for the pts cache. -# Allowed values: berkeley, skiplist -# -#ptscache_db: berkeley - -# The cyrusdb backend to use for the seen state. -# Allowed values: flat, berkeley, skiplist -# -#seenstate_db: skiplist - -# The cyrusdb backend to use for the subscriptions list. -# Allowed values: flat, berkeley, skiplist -# -#subscription_db: flat - -# The cyrusdb backend to use for the TLS cache. -# Allowed values: berkeley, berkeley-nosync, skiplist -# -#tlscache_db: berkeley-nosync - -# Maximum SSF (security strength factor) that the server will allow a -# client to negotiate. -# -#sasl_maximum_layer: 256 - -# The minimum SSF that the server will allow a client to negotiate. A -# value of 1 requires integrity protection; any higher value requires -# some amount of encryption. -# -#sasl_minimum_layer: 0 - -# The mechanism used by the server to verify plaintext passwords. Possible -# values include "auxprop" or "saslauthd" -# -sasl_pwcheck_method: auxprop - -# If enabled, the SASL library will automatically create authentication -# secrets when given a plaintext password. See the SASL documentation. -# -#sasl_auto_transition: no - -# Whitespace separated list of mechanisms to allow (e.g. 'plain otp'). -# Used to restrict the mechanisms to a subset of the installed -# plugins. The default is all available. -# -#sasl_mech_list: cram-md5 digest-md5 - -# Location of the opiekeys file -# -#sasl_opiekeys: /etc/opiekeys - -# File containing the global certificate used for ALL services (imap, -# pop3, lmtp). -# -#tls_cert_file: <none> - -# File containing the private key belonging to the global server -# certificate. -# -#tls_key_file: <none> - -# File containing the certificate used for imap ONLY. If not -# specified, the global certificate is used. A value of "disabled" -# will disable SSL/TLS for imap. -# -#imap_tls_cert_file: <none> - -# File containing the private key belonging to the imap-specific -# server certificate. If not specified, the global private key is -# used. A value of "disabled" will disable SSL/TLS for imap. -# -#imap_tls_key_file: <none> - -# File containing the certificate used for pop3 ONLY. If not -# specified, the global certificate is used. A value of "disabled" -# will disable SSL/TLS for pop3. -# -#pop3_tls_cert_file: <none> - -# File containing the private key belonging to the pop3-specific -# server certificate. If not specified, the global private key is -# used. A value of "disabled" will disable SSL/TLS for pop3. -# -#pop3_tls_key_file: <none> - -# File containing the certificate used for lmtp ONLY. If not -# specified, the global certificate is used. A value of "disabled" -# will disable TLS for lmtp. -# -#lmtp_tls_cert_file: <none> - -# File containing the private key belonging to the lmtp-specific -# server certificate. If not specified, the global private key is -# used. A value of "disabled" will disable TLS for lmtp. -# -#lmtp_tls_key_file: <none> - -# File containing the certificate used for sieve ONLY. If not -# specified, the global certificate is used. A value of "disabled" -# will disable TLS for sieve. -# -#sieve_tls_cert_file: <none> - -# File containing the private key belonging to the sieve-specific -# server certificate. If not specified, the global private key is -# used. A value of "disabled" will disable TLS for sieve. -# -#sieve_tls_key_file: <none> - -# File containing one or more Certificate Authority (CA) certificates. -# -#tls_ca_file: <none> - -# Path to directory with certificates of CAs. -# -#tls_ca_path: <none> - -# The length of time (in minutes) that a TLS session will be cached -# for later reuse. The maximum value is 1440 (24 hours), the default. -# A value of 0 will disable session caching. -# -#tls_session_timeout: 1440 - -# The right that a user needs to delete a mailbox. -# -#deleteright: c - -# Unix domain socket that lmtpd listens on, used by deliver(8). -# -#lmtpsocket: /var/imap/socket/lmtp - -# Unix domain socket that idled listens on. -# -#idlesocket: /var/imap/socket/idle - -# Unix domain socket that the new mail notification daemon listens on. -# -#notifysocket: /var/imap/socket/notify - -# -# EOF diff --git a/mail/cyrus-imapd24/files/imapd.sh.in b/mail/cyrus-imapd24/files/imapd.sh.in deleted file mode 100644 index 5fcc612bb31c..000000000000 --- a/mail/cyrus-imapd24/files/imapd.sh.in +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh - -# Start or stop cyrus-imapd -# $FreeBSD$ - -# PROVIDE: cyrus_imapd -# REQUIRE: DAEMON -# BEFORE: mail -# KEYWORD: FreeBSD shutdown -# -# NOTE for FreeBSD 5.0+: -# If you want this script to start with the base rc scripts -# move imapd.sh to /etc/rc.d/cyrus_imapd - -prefix=%%PREFIX%% - -# Define these cyrus_imapd_* variables in one of these files: -# /etc/rc.conf -# /etc/rc.conf.local -# /etc/rc.conf.d/cyrus_imapd -# -# DO NOT CHANGE THESE DEFAULT VALUES HERE -# -[ -z "$cyrus_imapd_enable" ] && cyrus_imapd_enable="NO" # Enable imapd -#cyrus_imapd_program="${prefix}/cyrus/bin/master" # Location of imapd -[ -z "$cyrus_imapd_flags" ] && cyrus_imapd_flags="-d" # Flags to imapd program - -. %%RC_SUBR%% - -name="cyrus_imapd" -rcvar=`set_rcvar` -command="${prefix}/cyrus/bin/master" -pidfile="/var/run/cyrus-master.pid" -required_files="${prefix}/etc/cyrus.conf ${prefix}/etc/imapd.conf" -stop_postcmd="cyrus_imapd_poststop" - -cyrus_imapd_poststop() { - /bin/rm -f ${pidfile} -} - -load_rc_config $name -run_rc_command "$1" diff --git a/mail/cyrus-imapd24/files/pass8bit.diff b/mail/cyrus-imapd24/files/pass8bit.diff deleted file mode 100644 index 74389a491c30..000000000000 --- a/mail/cyrus-imapd24/files/pass8bit.diff +++ /dev/null @@ -1,59 +0,0 @@ -Index: imap/message.c -diff -u -p imap/message.c.orig imap/message.c ---- imap/message.c.orig Sat Feb 28 02:44:55 2004 -+++ imap/message.c Thu Oct 7 20:21:04 2004 -@@ -227,6 +227,7 @@ unsigned size; - int n; - int sawcr = 0, sawnl; - int reject8bit = config_getswitch(IMAPOPT_REJECT8BIT); -+ int pass8bit = config_getswitch(IMAPOPT_PASS8BIT); - int inheader = 1, blankline = 1; - - while (size) { -@@ -262,7 +263,7 @@ unsigned size; - /* We have been configured to reject all mail of this - form. */ - if (!r) r = IMAP_MESSAGE_CONTAINS8BIT; -- } else { -+ } else if (!pass8bit) { - /* We have been configured to munge all mail of this - form. */ - *p = 'X'; -Index: imap/spool.c -diff -u -p imap/spool.c.orig imap/spool.c ---- imap/spool.c.orig Fri Mar 5 01:09:34 2004 -+++ imap/spool.c Thu Oct 7 20:20:57 2004 -@@ -140,6 +140,7 @@ static int parseheader(struct protstream - state s = NAME_START; - int r = 0; - int reject8bit = config_getswitch(IMAPOPT_REJECT8BIT); -+ int pass8bit = config_getswitch(IMAPOPT_PASS8BIT); - const char **skip = NULL; - - if (namelen == 0) { -@@ -266,7 +267,7 @@ static int parseheader(struct protstream - form. */ - r = IMAP_MESSAGE_CONTAINS8BIT; - goto ph_error; -- } else { -+ } else if (!pass8bit) { - /* We have been configured to munge all mail of this - form. */ - c = 'X'; -Index: lib/imapoptions -diff -u lib/imapoptions.orig lib/imapoptions ---- lib/imapoptions.orig Thu Jul 22 04:07:45 2004 -+++ lib/imapoptions Thu Oct 7 20:00:04 2004 -@@ -95,6 +95,12 @@ - { "afspts_mycell", NULL, STRING } - /* Cell to use for AFS PTS lookups. Defaults to the local cell. */ - -+{ "pass8bit", 0, SWITCH } -+/* If enabled, lmtpd accepts messages with 8-bit characters in the -+ headers without changing to `X'. This option is strongly not -+ recommended. (A proper soultion to non-ASCII characters in headers -+ is offered by RFC 2047 and its predecessors.) */ -+ - { "allowallsubscribe", 0, SWITCH } - /* Allow subscription to nonexistent mailboxes. This option is - typically used on backend servers in a Murder so that users can diff --git a/mail/cyrus-imapd24/files/patch-Makefile.in b/mail/cyrus-imapd24/files/patch-Makefile.in deleted file mode 100644 index 71800e59efb8..000000000000 --- a/mail/cyrus-imapd24/files/patch-Makefile.in +++ /dev/null @@ -1,25 +0,0 @@ -Index: Makefile.in -diff -u Makefile.in.orig Makefile.in ---- Makefile.in.orig Sat May 15 05:59:10 2004 -+++ Makefile.in Wed May 19 00:23:11 2004 -@@ -97,13 +97,13 @@ - touch distcvs - - install:: -- $(srcdir)/install-sh -d ${DESTDIR}$(exec_prefix)/bin -- $(srcdir)/install-sh -d ${DESTDIR}$(exec_prefix)/lib -- $(srcdir)/install-sh -d ${DESTDIR}$(prefix)/include/cyrus -- $(srcdir)/install-sh -d ${DESTDIR}$(mandir)/man1 -- $(srcdir)/install-sh -d ${DESTDIR}$(mandir)/man3 -- $(srcdir)/install-sh -d ${DESTDIR}$(mandir)/man5 -- $(srcdir)/install-sh -d ${DESTDIR}$(mandir)/man8 -+ $(INSTALL) -d ${DESTDIR}$(exec_prefix)/bin -+ $(INSTALL) -d ${DESTDIR}$(exec_prefix)/lib -+ $(INSTALL) -d ${DESTDIR}$(prefix)/include/cyrus -+ $(INSTALL) -d ${DESTDIR}$(mandir)/man1 -+ $(INSTALL) -d ${DESTDIR}$(mandir)/man3 -+ $(INSTALL) -d ${DESTDIR}$(mandir)/man5 -+ $(INSTALL) -d ${DESTDIR}$(cyrus_prefix)/man/man8 - @for d in $(SUBDIRS); \ - do \ - (cd $$d; echo "### Making" install "in" `pwd`; \ diff --git a/mail/cyrus-imapd24/files/patch-aa b/mail/cyrus-imapd24/files/patch-aa deleted file mode 100644 index 1438b30aa60f..000000000000 --- a/mail/cyrus-imapd24/files/patch-aa +++ /dev/null @@ -1,21 +0,0 @@ -Index: man/Makefile.in -diff -u man/Makefile.in.orig man/Makefile.in ---- man/Makefile.in.orig Wed Mar 31 00:18:41 2004 -+++ man/Makefile.in Wed May 19 01:52:50 2004 -@@ -50,6 +50,7 @@ - SHELL = /bin/sh - - prefix = @prefix@ -+cyrus_prefix = @cyrus_prefix@ - - mandir = @mandir@ - -@@ -93,7 +94,7 @@ - done - for file in $(MAN8); \ - do \ -- $(INSTALL) -m 644 $$file $(DESTDIR)$(mandir)/man8 || exit 1; \ -+ $(INSTALL) -m 644 $$file $(DESTDIR)$(cyrus_prefix)/man/man8 || exit 1; \ - done - - clean: diff --git a/mail/cyrus-imapd24/files/patch-ac b/mail/cyrus-imapd24/files/patch-ac deleted file mode 100644 index 146e56766703..000000000000 --- a/mail/cyrus-imapd24/files/patch-ac +++ /dev/null @@ -1,65 +0,0 @@ -Index: configure -diff -u configure.orig configure ---- configure.orig Tue Feb 15 02:59:46 2005 -+++ configure Thu Feb 24 04:45:06 2005 -@@ -309,6 +309,7 @@ - #endif" - - ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os MAKEDEPEND cyrus_prefix service_path cyrus_user cyrus_group CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT RANLIB ac_ct_RANLIB SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CPP EGREP AWK LIBOBJS LIB_SOCKET IPV6_OBJS PRE_SUBDIRS EXTRA_SUBDIRS DEPLIBS LOCALDEFS WITH_AUTH BDB_INC BDB_LIB CYRUSDB_OBJS SIEVE_OBJS SIEVE_LIBS SIEVE_CPPFLAGS YACC LEX LEXLIB LEX_OUTPUT_ROOT SIEVE_SUBDIRS WITH_NONBLOCK WITH_GMTOFF WITH_MAP WITH_LOCK cyrus_sigveclib WITH_PTS AFS_LIBS AFS_LDFLAGS LDAP_CPPFLAGS LDAP_LDFLAGS LDAP_LIBS SERVER_SUBDIRS OPENSSL_INC OPENSSL_LIB ZEPHYR_LIBS ZEPHYR_CPPFLAGS WITH_IDLE IMAP_PROGS COMPILE_ET COM_ERR_LIBS COM_ERR_LDFLAGS COM_ERR_CPPFLAGS LIB_CRYPT GSSAPI_LIBS GSSAPIBASE_LIBS LIB_DYN_SASL DYNSASLFLAGS LIB_SASL SASLFLAGS PERL PERL_CCCDLFLAGS MD5OBJ SNMP_SUBDIRS LIB_WRAP SNMP_CONFIG LIB_UCDSNMP LIB_RT IMAP_COM_ERR_LIBS IMAP_LIBS PERL_SUBDIRS PERL_DEPSUBDIRS LTLIBOBJS' -+ac_subst_vars="${ac_subst_vars} LDFLAGS_UCDSNMP" - ac_subst_files='' - - # Initialize some variables set by options. -@@ -6612,7 +6613,7 @@ - fi - - saved_LIBS=$LIBS -- for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db -+ for dbname in ${with_bdb} db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db - do - LIBS="$saved_LIBS -l$dbname" - cat >conftest.$ac_ext <<_ACEOF -@@ -6622,6 +6623,7 @@ - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ -+#include <stdio.h> - #include <db.h> - int - main () -@@ -13549,6 +13551,7 @@ - EXTRA_SUBDIRS="${EXTRA_SUBDIRS} perl" - PERL_SUBDIRS="imap" - PERL="${with_perl}" -+ eval `${PERL} -V:cccdlflags` - PERL_CCCDLFLAGS="$cccdlflags" - - fi -@@ -14067,7 +14070,9 @@ - - if test -n "$SNMP_LIBS" && test -n "$SNMP_PREFIX"; then - CPPFLAGS="$CPPFLAGS -I${SNMP_PREFIX}/include" -- LIB_UCDSNMP=$SNMP_LIBS -+ LIB_UCDSNMP="$SNMP_LIBS -lwrap" -+ PERLLIBDIR=`$PERL -e 'use Config; print "$Config{archlibexp}/CORE";'` -+ LDFLAGS_UCDSNMP="-L${PERLLIBDIR} -R${PERLLIBDIR}" - - cat >>confdefs.h <<\_ACEOF - #define HAVE_NETSNMP 1 -@@ -14298,7 +14303,7 @@ - #define HAVE_UCDSNMP 1 - _ACEOF - -- LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp" -+ LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp -lkvm -ldevstat -lwrap" - echo "$as_me:$LINENO: checking for rpmdbOpen in -lrpm" >&5 - echo $ECHO_N "checking for rpmdbOpen in -lrpm... $ECHO_C" >&6 - if test "${ac_cv_lib_rpm_rpmdbOpen+set}" = set; then -@@ -15114,6 +15119,7 @@ - s,@LIB_WRAP@,$LIB_WRAP,;t t - s,@SNMP_CONFIG@,$SNMP_CONFIG,;t t - s,@LIB_UCDSNMP@,$LIB_UCDSNMP,;t t -+s,@LDFLAGS_UCDSNMP@,$LDFLAGS_UCDSNMP,;t t - s,@LIB_RT@,$LIB_RT,;t t - s,@IMAP_COM_ERR_LIBS@,$IMAP_COM_ERR_LIBS,;t t - s,@IMAP_LIBS@,$IMAP_LIBS,;t t diff --git a/mail/cyrus-imapd24/files/patch-bc b/mail/cyrus-imapd24/files/patch-bc deleted file mode 100644 index df4b302b3098..000000000000 --- a/mail/cyrus-imapd24/files/patch-bc +++ /dev/null @@ -1,33 +0,0 @@ -Index: imap/Makefile.in -diff -u imap/Makefile.in.orig imap/Makefile.in ---- imap/Makefile.in.orig Wed Nov 12 13:02:01 2003 -+++ imap/Makefile.in Thu Mar 11 01:16:00 2004 -@@ -132,10 +132,10 @@ - - - install: -- $(srcdir)/../install-sh -d ${DESTDIR}$(service_path) -+ $(INSTALL) -d ${DESTDIR}$(service_path) - for file in $(PROGS); \ - do \ -- $(INSTALL) -m 755 $$file $(DESTDIR)$(service_path) || exit 1; \ -+ $(INSTALL) -s -m 755 $$file $(DESTDIR)$(service_path) || exit 1; \ - done - ln -f $(DESTDIR)$(service_path)/pop3d $(DESTDIR)$(service_path)/pop3proxyd - -@@ -242,13 +242,13 @@ - $(CC) $(LDFLAGS) -o mupdate \ - $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \ - mutex_pthread.o tls.o libimap.a \ -- $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread -+ $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(PTHREAD_LIBS) - - mupdate.pure: mupdate.o mupdate-slave.o mupdate-client.o mutex_pthread.o \ - libimap.a $(DEPLIBS) - $(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o mupdate.pure \ - $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \ -- mutex_pthread.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread -+ mutex_pthread.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(PTHREAD_LIBS) - - pop3d: pop3d.o backend.o tls.o mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE) - $(CC) $(LDFLAGS) -o pop3d pop3d.o backend.o tls.o $(SERVICE) \ diff --git a/mail/cyrus-imapd24/files/patch-df b/mail/cyrus-imapd24/files/patch-df deleted file mode 100644 index 69a0841343ee..000000000000 --- a/mail/cyrus-imapd24/files/patch-df +++ /dev/null @@ -1,14 +0,0 @@ -Index: master/service.c -diff -u master/service.c.orig master/service.c ---- master/service.c.orig Wed Jan 22 22:52:36 2003 -+++ master/service.c Wed Jan 22 22:57:20 2003 -@@ -102,6 +102,9 @@ - struct sockaddr_storage sin; - socklen_t len = sizeof(sin); - -+ /* XXX: old FreeBSD didn't fill sockaddr correctly against AF_UNIX */ -+ sin.ss_family = AF_UNIX; -+ - /* is this a connection from the local host? */ - if (getpeername(fd, (struct sockaddr *) &sin, &len) == 0) { - if (((struct sockaddr *)&sin)->sa_family == AF_UNIX) { diff --git a/mail/cyrus-imapd24/files/patch-dg b/mail/cyrus-imapd24/files/patch-dg deleted file mode 100644 index 80dc928b96d0..000000000000 --- a/mail/cyrus-imapd24/files/patch-dg +++ /dev/null @@ -1,37 +0,0 @@ -Index: tools/mkimap -diff -u tools/mkimap.orig tools/mkimap ---- tools/mkimap.orig Wed Jun 30 03:16:54 2004 -+++ tools/mkimap Tue Jul 27 04:47:43 2004 -@@ -61,6 +61,9 @@ - - $imapdconf = shift || "/etc/imapd.conf"; - -+$cyrus_user = $ENV{CYRUS_USER} || "%%CYRUS_USER%%"; -+$cyrus_group = $ENV{CYRUS_GROUP} || "%%CYRUS_GROUP%%"; -+ - open CONF, $imapdconf or die "can't open $imapdconf"; - print "reading configure file...\n"; - while (<CONF>) { -@@ -86,6 +89,7 @@ - - print "configuring $d...\n"; - -+mkdir $d, 0755; - chdir $d or die "couldn't change to $d"; - - mkdir "proc", 0755 || warn "can't create $d/proc: $!"; -@@ -95,11 +99,14 @@ - mkdir "msg", 0755 || warn "can't create $d/msg: $!"; - mkdir "ptclient", 0755 || warn "can't create $d/ptclient: $!"; - -+system "/usr/sbin/chown -R $cyrus_user:$cyrus_group ."; -+ - while ($part = shift @parts) { - print "creating $part...\n"; - mkdir $part, 0755 || warn "can't create $part: $!"; - chdir $part or die "couldn't change to partition $part"; - mkdir "stage.", 0755 || warn "can't create $part/stage.: $!"; -+ system "/usr/sbin/chown -R $cyrus_user:$cyrus_group $part"; - } - - print "done\n"; diff --git a/mail/cyrus-imapd24/files/patch-imtest::imtest.c b/mail/cyrus-imapd24/files/patch-imtest::imtest.c deleted file mode 100644 index e1fd1efa8c06..000000000000 --- a/mail/cyrus-imapd24/files/patch-imtest::imtest.c +++ /dev/null @@ -1,23 +0,0 @@ -Index: imtest/imtest.c -diff -u imtest/imtest.c.orig imtest/imtest.c ---- imtest/imtest.c.orig Sun Jul 13 05:10:56 2003 -+++ imtest/imtest.c Fri Jul 18 00:52:29 2003 -@@ -51,6 +51,7 @@ - #include <sys/stat.h> - #include <fcntl.h> - -+#include <limits.h> - #include <stdlib.h> - #include <stdio.h> - #include <string.h> -@@ -419,8 +420,8 @@ - } - - --char *var_tls_CAfile=""; --char *var_tls_CApath=""; -+static char *var_tls_CAfile=""; -+static char *var_tls_CApath=""; - /* - * This is the setup routine for the SSL client. - * diff --git a/mail/cyrus-imapd24/files/patch-lib::Makefile.in b/mail/cyrus-imapd24/files/patch-lib::Makefile.in deleted file mode 100644 index 543ece89f131..000000000000 --- a/mail/cyrus-imapd24/files/patch-lib::Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ -Index: lib/Makefile.in -diff -u lib/Makefile.in.orig lib/Makefile.in ---- lib/Makefile.in.orig Thu Mar 11 06:25:39 2004 -+++ lib/Makefile.in Wed May 19 00:34:19 2004 -@@ -102,7 +102,7 @@ - all: $(BUILTSOURCES) libcyrus_min.a libcyrus.a - - install: -- $(srcdir)/../install-sh -d $(DESTDIR)$(libdir) -+ $(INSTALL) -d $(DESTDIR)$(libdir) - $(INSTALL) -m 644 libcyrus.a $(DESTDIR)$(libdir) - $(INSTALL) -m 644 libcyrus_min.a $(DESTDIR)$(libdir) - $(RANLIB) $(DESTDIR)$(libdir)/libcyrus.a diff --git a/mail/cyrus-imapd24/files/patch-lib::imapoptions b/mail/cyrus-imapd24/files/patch-lib::imapoptions deleted file mode 100644 index c46c80a342a0..000000000000 --- a/mail/cyrus-imapd24/files/patch-lib::imapoptions +++ /dev/null @@ -1,22 +0,0 @@ -Index: lib/imapoptions -diff -u lib/imapoptions.orig lib/imapoptions ---- lib/imapoptions.orig Thu Mar 20 04:00:39 2003 -+++ lib/imapoptions Fri Mar 21 15:27:44 2003 -@@ -454,7 +454,7 @@ - /* The mechanism used by the server to verify plaintext passwords. - Possible values include "auxprop", "saslauthd", and "pwcheck". */ - --{ "sendmail", "/usr/lib/sendmail", STRING } -+{ "sendmail", "/usr/sbin/sendmail", STRING } - /* The pathname of the sendmail executable. Sieve invokes sendmail - for sending rejections, redirects and vacation responses. */ - -@@ -475,7 +475,7 @@ - /* Maximum number of sieve scripts any user may have, enforced at - submission by timsieved(8). */ - --{ "sievedir", "/usr/sieve", STRING } -+{ "sievedir", "/var/imap/sieve", STRING } - /* If sieveusehomedir is false, this directory is searched for Sieve - scripts. */ - diff --git a/mail/cyrus-imapd24/files/patch-lib::libcyr_cfg.c b/mail/cyrus-imapd24/files/patch-lib::libcyr_cfg.c deleted file mode 100644 index 5cbb64001209..000000000000 --- a/mail/cyrus-imapd24/files/patch-lib::libcyr_cfg.c +++ /dev/null @@ -1,13 +0,0 @@ -Index: lib/libcyr_cfg.c -diff -u -p lib/libcyr_cfg.c.orig lib/libcyr_cfg.c ---- lib/libcyr_cfg.c.orig Wed Mar 10 00:05:58 2004 -+++ lib/libcyr_cfg.c Fri Feb 25 00:06:44 2005 -@@ -52,7 +52,7 @@ - #include "libcyr_cfg.h" - #include "cyrusdb.h" - --#if defined(__GNUC__) && __GNUC__ > 1 -+#if defined(__GNUC__) && __GNUC__ > 1 && !defined(__INTEL_COMPILER) - /* We can use the GCC union constructor extension */ - #define CFGVAL(t,v) (union cyrus_config_value)((t)(v)) - #else diff --git a/mail/cyrus-imapd24/files/patch-master::Makefile.in b/mail/cyrus-imapd24/files/patch-master::Makefile.in deleted file mode 100644 index c828109f247e..000000000000 --- a/mail/cyrus-imapd24/files/patch-master::Makefile.in +++ /dev/null @@ -1,26 +0,0 @@ -Index: master/Makefile.in -diff -u master/Makefile.in.orig master/Makefile.in ---- master/Makefile.in.orig Sat May 29 03:03:05 2004 -+++ master/Makefile.in Wed Jul 21 04:13:16 2004 -@@ -58,7 +58,7 @@ - DEPLIBS = @DEPLIBS@ - - CFLAGS = @CFLAGS@ --LDFLAGS = @LDFLAGS@ @COM_ERR_LDFLAGS@ -+LDFLAGS = @LDFLAGS_UCDSNMP@ @LDFLAGS@ @COM_ERR_LDFLAGS@ - LIBS = ../lib/libcyrus_min.a @LIB_UCDSNMP@ @LIBS@ @COM_ERR_LIBS@ - - SHELL = /bin/sh -@@ -76,10 +76,10 @@ - all: $(PROGS) $(LOBJS) - - install: -- $(srcdir)/../install-sh -d ${DESTDIR}$(service_path) -+ $(INSTALL) -d ${DESTDIR}$(service_path) - for file in $(PROGS); \ - do \ -- $(INSTALL) -m 755 $$file $(DESTDIR)$(service_path) || exit 1; \ -+ $(INSTALL) -s -m 755 $$file $(DESTDIR)$(service_path) || exit 1; \ - done - - .c.o: diff --git a/mail/cyrus-imapd24/files/patch-master::service-thread.c b/mail/cyrus-imapd24/files/patch-master::service-thread.c deleted file mode 100644 index 9a2016c3c64a..000000000000 --- a/mail/cyrus-imapd24/files/patch-master::service-thread.c +++ /dev/null @@ -1,14 +0,0 @@ -Index: master/service-thread.c -diff -u master/service-thread.c.orig master/service-thread.c ---- master/service-thread.c.orig Wed Jan 22 22:52:36 2003 -+++ master/service-thread.c Wed Jan 22 23:09:52 2003 -@@ -99,6 +99,9 @@ - struct sockaddr_storage sin; - socklen_t len = sizeof(sin); - -+ /* XXX: old FreeBSD didn't fill sockaddr correctly against AF_UNIX */ -+ sin.ss_family = AF_UNIX; -+ - /* is this a connection from the local host? */ - if (getpeername(fd, (struct sockaddr *) &sin, &len) == 0) { - if (((struct sockaddr *)&sin)->sa_family == AF_UNIX) { diff --git a/mail/cyrus-imapd24/files/patch-notifyd::Makefile.in b/mail/cyrus-imapd24/files/patch-notifyd::Makefile.in deleted file mode 100644 index d49703fa25b4..000000000000 --- a/mail/cyrus-imapd24/files/patch-notifyd::Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ -Index: notifyd/Makefile.in -diff -u notifyd/Makefile.in.orig notifyd/Makefile.in ---- notifyd/Makefile.in.orig Wed Nov 12 13:02:10 2003 -+++ notifyd/Makefile.in Fri Feb 13 18:41:07 2004 -@@ -79,7 +79,7 @@ - all: notifyd - - install: -- $(INSTALL) -m 755 notifyd $(DESTDIR)$(service_path) -+ $(INSTALL) -s -m 755 notifyd $(DESTDIR)$(service_path) - - OBJS= notifyd.o notify_null.o notify_log.o notify_mailto.o notify_zephyr.o - diff --git a/mail/cyrus-imapd24/files/patch-perl::imap::Makefile.PL b/mail/cyrus-imapd24/files/patch-perl::imap::Makefile.PL deleted file mode 100644 index 66140bf53219..000000000000 --- a/mail/cyrus-imapd24/files/patch-perl::imap::Makefile.PL +++ /dev/null @@ -1,15 +0,0 @@ -Index: perl/imap/Makefile.PL -diff -u perl/imap/Makefile.PL.orig perl/imap/Makefile.PL ---- perl/imap/Makefile.PL.orig Thu Oct 23 03:50:18 2003 -+++ perl/imap/Makefile.PL Sun Dec 12 04:20:10 2004 -@@ -70,3 +70,10 @@ - 'INC' => "-I../../lib $SASL_INC $OPENSSL_INC", - 'EXE_FILES' => [cyradm], - ); -+ -+package MY; -+sub install { -+ my $inherited = shift->SUPER::install(@_); -+ $inherited =~ s/(install :: all pure_install) doc_install/$1/; -+ $inherited; -+} diff --git a/mail/cyrus-imapd24/files/patch-perl::sieve::managesieve::Makefile.PL b/mail/cyrus-imapd24/files/patch-perl::sieve::managesieve::Makefile.PL deleted file mode 100644 index bde3d77b763e..000000000000 --- a/mail/cyrus-imapd24/files/patch-perl::sieve::managesieve::Makefile.PL +++ /dev/null @@ -1,15 +0,0 @@ -Index: perl/sieve/managesieve/Makefile.PL -diff -u perl/sieve/managesieve/Makefile.PL.orig perl/sieve/managesieve/Makefile.PL ---- perl/sieve/managesieve/Makefile.PL.orig Thu Oct 23 03:50:27 2003 -+++ perl/sieve/managesieve/Makefile.PL Sun Dec 12 04:21:55 2004 -@@ -64,3 +64,10 @@ - 'DEFINE' => '-DPERL_POLLUTE', # e.g., '-DHAVE_SOMETHING' - 'INC' => "-I../lib/ -I../../../lib/ $SASL_INC $OPENSSL_INC", - ); -+ -+package MY; -+sub install { -+ my $inherited = shift->SUPER::install(@_); -+ $inherited =~ s/(install :: all pure_install) doc_install/$1/; -+ $inherited; -+} diff --git a/mail/cyrus-imapd24/files/patch-sieve::Makefile.in b/mail/cyrus-imapd24/files/patch-sieve::Makefile.in deleted file mode 100644 index 99d494cf81d4..000000000000 --- a/mail/cyrus-imapd24/files/patch-sieve::Makefile.in +++ /dev/null @@ -1,23 +0,0 @@ -Index: sieve/Makefile.in -diff -u sieve/Makefile.in.orig sieve/Makefile.in ---- sieve/Makefile.in.orig Sat May 29 03:03:09 2004 -+++ sieve/Makefile.in Sat May 29 04:53:11 2004 -@@ -34,6 +34,7 @@ - YACC = @YACC@ - YFLAGS = -d - LEX = @LEX@ -+INSTALL = @INSTALL@ - RANLIB = @RANLIB@ - COMPILE_ET = @COMPILE_ET@ - -@@ -60,8 +61,8 @@ - dist: $(BUILT_SOURCES) - - install: sievec -- $(srcdir)/../install-sh -d ${DESTDIR}$(service_path) -- $(srcdir)/../install-sh -c -m 755 sievec $(DESTDIR)$(service_path) || exit -+ $(INSTALL) -d ${DESTDIR}$(service_path) -+ $(INSTALL) -s -c -m 755 sievec $(DESTDIR)$(service_path) || exit - - test: $(DEPLIBS) libsieve.a test.o - $(CC) $(LDFLAGS) -o test test.o libsieve.a $(DEPLIBS) $(LIBS) diff --git a/mail/cyrus-imapd24/files/patch-timsieved::Makefile.in b/mail/cyrus-imapd24/files/patch-timsieved::Makefile.in deleted file mode 100644 index 4e0bc2841c2c..000000000000 --- a/mail/cyrus-imapd24/files/patch-timsieved::Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ -Index: timsieved/Makefile.in -diff -u timsieved/Makefile.in.orig timsieved/Makefile.in ---- timsieved/Makefile.in.orig Wed Nov 12 13:02:14 2003 -+++ timsieved/Makefile.in Fri Feb 13 18:51:17 2004 -@@ -79,7 +79,7 @@ - all: timsieved - - install: -- $(INSTALL) -m 755 timsieved $(DESTDIR)$(service_path) -+ $(INSTALL) -s -m 755 timsieved $(DESTDIR)$(service_path) - - OBJS= actions.o lex.o mystring.o scripttest.o timsieved.o parser.o \ - ../imap/tls.o diff --git a/mail/cyrus-imapd24/pkg-deinstall b/mail/cyrus-imapd24/pkg-deinstall deleted file mode 100644 index e0dd1b8bb7fc..000000000000 --- a/mail/cyrus-imapd24/pkg-deinstall +++ /dev/null @@ -1,60 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# -# Created by: hetzels@westbend.net - -#set -vx - -PKG_BATCH=${BATCH:=NO} -PKG_PREFIX=${PKG_PREFIX:=%%PREFIX%%} -EXAMPLESDIR=${EXAMPLESDIR:=%%EXAMPLESDIR%%} -CYRUS_USER=${CYRUS_USER:=%%CYRUS_USER%%} - -checkfile() { - diff -bBqw $1 $2 >/dev/null 2>&1 - case $? in - 0) # config file exists, but is the same - rm $1 - ;; - 1) # config file exists and differs - ;; - *) # no config file exists - ;; - esac -} - -# -# Modify the 'cyrus' user created from the cyrus-sasl port -# - -modify_cyrus_user() { - USER=${CYRUS_USER} - PW=/usr/sbin/pw - if [ -x /usr/sbin/nologin ]; then - shell=/usr/sbin/nologin - elif [ -x /sbin/nologin ]; then - shell=/sbin/nologin - else - shell=/nonexistent - fi - uhome=/nonexistent - - if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}"; then - echo "*** Failed to update user \`${USER}'." - else - echo "*** Updated user \`${USER}'." - fi -} - -case $2 in - DEINSTALL) - cd ${PKG_PREFIX} - checkfile ${PKG_PREFIX}/etc/imapd.conf ${EXAMPLESDIR}/imapd.conf - checkfile ${PKG_PREFIX}/etc/cyrus.conf ${EXAMPLESDIR}/normal.conf - ;; - POST-DEINSTALL) - modify_cyrus_user - ;; - -esac diff --git a/mail/cyrus-imapd24/pkg-descr b/mail/cyrus-imapd24/pkg-descr deleted file mode 100644 index 79d06da9dd9b..000000000000 --- a/mail/cyrus-imapd24/pkg-descr +++ /dev/null @@ -1,21 +0,0 @@ -The Cyrus IMAP (Internet Message Access Protocol) server provides access to -personal mail and system-wide bulletin boards through the IMAP protocol. -The Cyrus IMAP server is a scaleable enterprise mail system designed for use -from small to large enterprise environments using standards-based -technologies. - -A full Cyrus IMAP implementation allows a seamless mail and bulletin board -environment to be set up across multiple servers. It differs from other -IMAP server implementations in that it is run on "sealed" servers, where -users are not normally permitted to log in. The mailbox database is stored -in parts of the filesystem that are private to the Cyrus IMAP system. All -user access to mail is through software using the IMAP, POP3, or KPOP -protocols. - -The private mailbox database design gives the server large advantages in -efficiency, scalability, and administratability. Multiple concurrent -read/write connections to the same mailbox are permitted. The server -supports access control lists on mailboxes and storage quotas on mailbox -hierarchies. - -WWW: http://asg.web.cmu.edu/cyrus/ diff --git a/mail/cyrus-imapd24/pkg-install b/mail/cyrus-imapd24/pkg-install deleted file mode 100644 index d2ba72f75349..000000000000 --- a/mail/cyrus-imapd24/pkg-install +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/sh - -#set -vx - -PKG_BATCH=${BATCH:=NO} -PKG_PREFIX=${PKG_PREFIX:=%%PREFIX%%} -EXAMPLESDIR=${EXAMPLESDIR:=%%EXAMPLESDIR%%} -CYRUS_USER=${CYRUS_USER:=%%CYRUS_USER%%} - -# -# Modify the 'cyrus' user created from the cyrus-sasl port -# - -modify_cyrus_user() { - USER=${CYRUS_USER} - PW=/usr/sbin/pw - shell=/bin/csh - uhome=${PKG_PREFIX}/cyrus - - if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}"; then - echo "*** Failed to update user \`${USER}'." - else - echo "*** Updated user \`${USER}'." - fi -} - - -checkfile() { - diff -bBqw $1 $2 >/dev/null 2>&1 - case $? in - 0) # config file exists, but is the same - ;; - 1) # config file exists and differs - echo "** Make sure $1 is in sync with this version"; - echo " of the port. See $1.dist for details."; - ;; - *) # no config file exists, copy it - install -c -m 644 $2 $1 - ;; - esac -} - -case $2 in - PRE-INSTALL) - ;; - - POST-INSTALL) - modify_cyrus_user - cd ${PKG_PREFIX} - checkfile ${PKG_PREFIX}/etc/imapd.conf ${EXAMPLESDIR}/imapd.conf - checkfile ${PKG_PREFIX}/etc/cyrus.conf ${EXAMPLESDIR}/normal.conf - if grep 'sieve' /etc/services; then - echo - else - echo - echo "** Please add an entry for the sieve protocol (2000/tcp)" - echo " to /etc/services" - echo - fi - ;; -esac diff --git a/mail/cyrus-imapd24/pkg-message b/mail/cyrus-imapd24/pkg-message deleted file mode 100644 index ff816e46e925..000000000000 --- a/mail/cyrus-imapd24/pkg-message +++ /dev/null @@ -1,8 +0,0 @@ -**************************************************************************** - -To setup mail spool, modify /usr/local/etc/imapd.conf appropriately, -then run /usr/local/cyrus/bin/mkimap. -To run Cyrus IMAPd from startup, add cyrus_imapd_enable="YES" in your -/etc/rc.conf. - -**************************************************************************** diff --git a/mail/cyrus-imapd24/pkg-plist b/mail/cyrus-imapd24/pkg-plist deleted file mode 100644 index f62a19ad16e6..000000000000 --- a/mail/cyrus-imapd24/pkg-plist +++ /dev/null @@ -1,102 +0,0 @@ -bin/cyradm -bin/imtest -bin/installsieve -bin/lmtptest -bin/mupdatetest -bin/nntptest -bin/pop3test -bin/sieveshell -bin/sivtest -bin/smtptest -cyrus/bin/arbitron -cyrus/bin/chk_cyrus -cyrus/bin/ctl_cyrusdb -cyrus/bin/ctl_deliver -cyrus/bin/ctl_mboxlist -cyrus/bin/cvt_cyrusdb -cyrus/bin/cyr_expire -cyrus/bin/cyrdump -cyrus/bin/deliver -%%NNTP%%cyrus/bin/fetchnews -cyrus/bin/fud -%%IDLED%%cyrus/bin/idled -cyrus/bin/imapd -cyrus/bin/ipurge -cyrus/bin/lmtpd -%%MURDER%%cyrus/bin/lmtpproxyd -cyrus/bin/masssievec -cyrus/bin/master -cyrus/bin/mbexamine -cyrus/bin/mbpath -cyrus/bin/mkimap -%%MURDER%%cyrus/bin/mupdate -%%NNTP%%cyrus/bin/nntpd -cyrus/bin/notifyd -cyrus/bin/pop3d -cyrus/bin/pop3proxyd -%%MURDER%%cyrus/bin/proxyd -%%LDAP_PTLOADER%%cyrus/bin/ptdump -%%LDAP_PTLOADER%%cyrus/bin/ptexpire -%%LDAP_PTLOADER%%cyrus/bin/ptloader -cyrus/bin/quota -cyrus/bin/reconstruct -cyrus/bin/sievec -cyrus/bin/smmapd -cyrus/bin/squatter -cyrus/bin/timsieved -cyrus/bin/tls_prune -include/cyrus/acl.h -include/cyrus/assert.h -include/cyrus/auth.h -include/cyrus/bsearch.h -include/cyrus/charset.h -include/cyrus/cyrusdb.h -include/cyrus/glob.h -include/cyrus/gmtoff.h -include/cyrus/hash.h -include/cyrus/imapopts.h -include/cyrus/imapurl.h -include/cyrus/imclient.h -include/cyrus/imparse.h -include/cyrus/iptostring.h -include/cyrus/libconfig.h -include/cyrus/libcyr_cfg.h -include/cyrus/lock.h -include/cyrus/lsort.h -include/cyrus/map.h -include/cyrus/mkgmtime.h -include/cyrus/mpool.h -include/cyrus/nonblock.h -include/cyrus/parseaddr.h -include/cyrus/prot.h -include/cyrus/retry.h -include/cyrus/rfc822date.h -include/cyrus/strhash.h -include/cyrus/strhash.o -include/cyrus/stristr.h -include/cyrus/sysexits.h -include/cyrus/util.h -include/cyrus/xmalloc.h -lib/libcyrus_min.a -lib/libcyrus.a -%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/Admin.pm -%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/IMSP.pm -%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/Shell.pm -%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP.pm -%%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/SIEVE/managesieve.pm -%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/.packlist -%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/IMAP.bs -%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/IMAP.so -%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/.packlist -%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.bs -%%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.so -%%EXAMPLESDIR%%/imapd.conf -@dirrm cyrus/bin -@dirrm include/cyrus -@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP -@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/SIEVE -@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus -@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/IMAP -@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve -@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE -@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus diff --git a/mail/dbmail-devel/Makefile b/mail/dbmail-devel/Makefile deleted file mode 100644 index d138d51531d7..000000000000 --- a/mail/dbmail-devel/Makefile +++ /dev/null @@ -1,90 +0,0 @@ -# New ports collection makefile for: dbmail -# Date created: 07/26/2003 -# Whom: Clement Laforet <sheepkiller@cultdeadsheep.org> -# -# $FreeBSD$ -# - -PORTNAME= dbmail -PORTVERSION= 2.0.4 -PORTREVISION= 1 -CATEGORIES= mail -MASTER_SITES= http://www.dbmail.org/download/ -PKGNAMESUFFIX= -${DATABASE} -EXTRACT_SUFX= .tgz - -MAINTAINER= seanc@FreeBSD.org -COMMENT= An SQL database-based mail system (POP3 and IMAP) - -USE_REINPLACE= YES -GNU_CONFIGURE= YES -CONFIGURE_ARGS= --prefix=${PREFIX} -USE_GMAKE= YES -USE_OPENSSL= YES -USE_RC_SUBR= dbmail-pop3d.sh dbmail-lmtpd.sh dbmail-imapd.sh - -CFLAGS += -fPIC - -.if defined(WITH_POSTGRESQL) -CONFIGURE_ARGS+= --with-pgsql -USE_PGSQL= yes -DATABASE= postgresql -PLIST_SUB+= PGSQL="" -PLIST_SUB+= MYSQL="@comment " -LDFLAGS+= -L${LOCALBASE}/lib/ -.else -USE_MYSQL= YES -CONFIGURE_ARGS+= --with-mysql -DATABASE= mysql -PLIST_SUB+= MYSQL="" -PLIST_SUB+= PGSQL="@comment " -CFLAGS+= -I${LOCALBASE}/include/mysql -LDFLAGS+= -L${LOCALBASE}/lib/mysql -.endif - -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" LOCALBASE=${LOCALBASE} -PORTDOCS= INSTALL README EXTRAS - -MAN1= dbmail-smtp.1 -MAN8= dbmail-imapd.8 dbmail-lmtpd.8 dbmail-pop3d.8 \ - dbmail-users.8 dbmail-util.8 -MANCOMPRESSED= no - -pre-everything:: - @${ECHO} "" - @${ECHO} "You may use the following build options:" - @${ECHO} " By default dbmail uses MySQL backend database." - @${ECHO} " To build dbmail with PostgreSQL as backend database," - @${ECHO} " define WITH_POSTGRESQL" - @${ECHO} "" - -post-patch: - @${FIND} ${WRKSRC} -name CVS -type d | ${XARGS} ${RM} -fr - -post-configure: - @${REINPLACE_CMD} -i.orig 's!/etc/dbmail.conf!${PREFIX}/etc/dbmail.conf!g' \ - ${WRKSRC}/dbmail.h - -post-install: - @${INSTALL_DATA} ${WRKSRC}/dbmail.conf ${PREFIX}/etc/dbmail.conf-dist - @${MKDIR} ${DATADIR}/sql - @${INSTALL_DATA} ${WRKSRC}/sql/${DATABASE}/* ${DATADIR}/sql - @cd ${WRKSRC}/man && ${INSTALL_MAN} ${MAN1} ${MAN1PREFIX}/man/man1 -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - @cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} -.endif - @${ECHO} "" - @${ECHO} "IMPORTANT NOTE FOR ADMINS UPGRADING FROM 1.X->2.X!!!" - @${ECHO} "" - @${ECHO} " *) Don't forget to update the database using a script from" - @${ECHO} " ${DATADIR}/sql/" - @${ECHO} " *) Many programs have been renamed and their arguments changed." - @${ECHO} " *) Read the upgrading notes." - @${ECHO} " *) Don't be careless with this upgrade or mail will be lost!" - @${ECHO} " *) dbmail can be controled by setting dbmail_imapd_enable," - @${ECHO} " dbmail_lmtpd_enable, and/or dbmail_pop3d_enable in" - @${ECHO} " /etc/rc.conf." - @${ECHO} "" - -.include <bsd.port.mk> diff --git a/mail/dbmail-devel/distinfo b/mail/dbmail-devel/distinfo deleted file mode 100644 index 776ad1c05d7a..000000000000 --- a/mail/dbmail-devel/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (dbmail-2.0.4.tgz) = fc80ac11a24286aa78ee71dd78c965a1 -SIZE (dbmail-2.0.4.tgz) = 589603 diff --git a/mail/dbmail-devel/files/dbmail-imapd.sh.in b/mail/dbmail-devel/files/dbmail-imapd.sh.in deleted file mode 100644 index 82505e96d9b0..000000000000 --- a/mail/dbmail-devel/files/dbmail-imapd.sh.in +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# PROVIDE: dbmail-imapd -# REQUIRE: DAEMON -# KEYWORD: shutdown - -# -# Add the following lines to /etc/rc.conf to enable dbmail-imapd: -# -#dbmail_imapd_enable="YES" -# -# See dbmail-imapd(8) for flags -# - -. %%RC_SUBR%% - -name=dbmail_imapd -rcvar=`set_rcvar` - -command=%%PREFIX%%/sbin/dbmail-imapd -pidfile=/var/run/dbmail-imapd.pid -required_files=%%PREFIX%%/etc/dbmail.conf - -# read settings, set default values -load_rc_config "$name" -: ${dbmail_imapd_enable="NO"} -: ${dbmail_imapd_flags=""} - -run_rc_command "$1" diff --git a/mail/dbmail-devel/files/dbmail-lmtpd.sh.in b/mail/dbmail-devel/files/dbmail-lmtpd.sh.in deleted file mode 100644 index f1133f43a70e..000000000000 --- a/mail/dbmail-devel/files/dbmail-lmtpd.sh.in +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# PROVIDE: dbmail-lmtpd -# REQUIRE: DAEMON -# KEYWORD: shutdown - -# -# Add the following lines to /etc/rc.conf to enable dbmail-lmtpd: -# -#dbmail_lmtpd_enable="YES" -# -# See dbmail-lmtpd(8) for flags -# - -. %%RC_SUBR%% - -name=dbmail_lmtpd -rcvar=`set_rcvar` - -command=%%PREFIX%%/sbin/dbmail-lmtpd -pidfile=/var/run/dbmail-lmtpd.pid -required_files=%%PREFIX%%/etc/dbmail.conf - -# read settings, set default values -load_rc_config "$name" -: ${dbmail_lmtpd_enable="NO"} -: ${dbmail_lmtpd_flags=""} - -run_rc_command "$1" diff --git a/mail/dbmail-devel/files/dbmail-pop3d.sh.in b/mail/dbmail-devel/files/dbmail-pop3d.sh.in deleted file mode 100644 index d787f6a668e7..000000000000 --- a/mail/dbmail-devel/files/dbmail-pop3d.sh.in +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# PROVIDE: dbmail-pop3d -# REQUIRE: DAEMON -# KEYWORD: shutdown - -# -# Add the following lines to /etc/rc.conf to enable dbmail-pop3d: -# -#dbmail_pop3d_enable="YES" -# -# See dbmail-pop3d(8) for flags -# - -. %%RC_SUBR%% - -name=dbmail_pop3d -rcvar=`set_rcvar` - -command=%%PREFIX%%/sbin/dbmail-pop3d -pidfile=/var/run/dbmail-pop3d.pid -required_files=%%PREFIX%%/etc/dbmail.conf - -# read settings, set default values -load_rc_config "$name" -: ${dbmail_pop3d_enable="NO"} -: ${dbmail_pop3d_flags=""} - -run_rc_command "$1" diff --git a/mail/dbmail-devel/files/patch-2.0.4_bug145_lmtp.c b/mail/dbmail-devel/files/patch-2.0.4_bug145_lmtp.c deleted file mode 100644 index 8e355487776c..000000000000 --- a/mail/dbmail-devel/files/patch-2.0.4_bug145_lmtp.c +++ /dev/null @@ -1,66 +0,0 @@ -Index: lmtp.c -=================================================================== ---- lmtp.c (revision 1559) -+++ lmtp.c (revision 1700) -@@ -77,8 +77,9 @@ - * - -1 on error - * - 1 on success - */ --static int read_whole_message_network(FILE *instream, char **whole_message, -- u64_t *whole_message_size); -+static int read_whole_message_network(FILE *instream, -+ char **whole_message, u64_t *whole_message_size, -+ const char *prepend_format, ...) PRINTF_ARGS(4, 5); - - /** - * \function lmtp_error -@@ -624,7 +625,9 @@ - if (read_whole_message_network( - (FILE *) instream, - &whole_message, -- &whole_message_size) < 0) { -+ &whole_message_size, -+ "Return-Path: %s\r\n", -+ (char *)(list_getstart(&from)->data)) < 0) { - trace(TRACE_ERROR, - "%s,%s: read_whole_message_network() failed", - __FILE__, __func__); -@@ -755,8 +758,9 @@ - return 1; - } - --int read_whole_message_network(FILE *instream, char **whole_message, -- u64_t *whole_message_size) -+int read_whole_message_network(FILE *instream, -+ char **whole_message, u64_t *whole_message_size, -+ const char *prepend_format, ...) - { - char *tmpmessage = NULL; - char tmpline[MESSAGE_MAX_LINE_SIZE + 1]; -@@ -765,9 +769,17 @@ - size_t total_size = 0; - size_t current_pos = 0; - int error = 0; -+ va_list argp; - - memset(tmpline, '\0', MESSAGE_MAX_LINE_SIZE + 1); -- while (fgets(tmpline, MESSAGE_MAX_LINE_SIZE, instream) != NULL) { -+ -+ /* This adds the Return-Path header and any other -+ * important headers we might need; see RFC 2076. */ -+ va_start(argp, prepend_format); -+ line_size = vsnprintf(tmpline, MESSAGE_MAX_LINE_SIZE, prepend_format, argp); -+ va_end(argp); -+ -+ do { - line_size = strlen(tmpline); - - /* It sometimes happens that we read a line of size 0, -@@ -798,6 +810,7 @@ - - memset(tmpline, '\0', MESSAGE_MAX_LINE_SIZE + 1); - } -+ while (fgets(tmpline, MESSAGE_MAX_LINE_SIZE, instream) != NULL); - - if (ferror(instream)) { - trace(TRACE_ERROR, "%s,%s: error reading instream", diff --git a/mail/dbmail-devel/files/patch-2.0.4_bug177 b/mail/dbmail-devel/files/patch-2.0.4_bug177 deleted file mode 100644 index 6c0630d72ae4..000000000000 --- a/mail/dbmail-devel/files/patch-2.0.4_bug177 +++ /dev/null @@ -1,575 +0,0 @@ -Index: user.c -=================================================================== ---- user.c (revision 1711) -+++ user.c (revision 1712) -@@ -202,8 +202,8 @@ - memset(&change_flags, 0, sizeof(change_flags)); - - /* get options */ -- opterr = 0; /* suppress error message from getopt() */ -- while ((opt = getopt(argc, argv, -+ dm_opterr = 0; /* suppress error message from getopt() */ -+ while ((opt = dm_getopt(argc, argv, - "-a:d:c:e:l::x:" /* Major modes */ - "W::w:P::p:u:g:m:t:s:S:T:" /* Minor options */ - "i" "f:qnyvVh" /* Common options */ )) != -1) { -@@ -223,16 +223,16 @@ - if (mode) - mode_toomany = 1; - mode = opt; -- if (optarg && strlen(optarg)) -- user = dm_strdup(optarg); -+ if (dm_optarg && strlen(dm_optarg)) -+ user = dm_strdup(dm_optarg); - break; - - case 'x': - if (mode) - mode_toomany = 1; - mode = opt; -- if (optarg && strlen(optarg)) -- alias = dm_strdup(optarg); -+ if (dm_optarg && strlen(dm_optarg)) -+ alias = dm_strdup(dm_optarg); - break; - - case 'l': -@@ -241,8 +241,8 @@ - if (mode != 0 && mode != 'l') - mode_toomany = 1; - mode = opt; -- if (optarg && strlen(optarg)) -- userspec = dm_strdup(optarg); -+ if (dm_optarg && strlen(dm_optarg)) -+ userspec = dm_strdup(dm_optarg); - break; - - case 'i': -@@ -253,13 +253,13 @@ - /* Minor options */ - case 'w': - change_flags.newpasswd = 1; -- passwd = dm_strdup(optarg); -+ passwd = dm_strdup(dm_optarg); - break; - - case 'W': - change_flags.newpasswd = 1; -- if (optarg && strlen(optarg)) { -- passwdfile = dm_strdup(optarg); -+ if (dm_optarg && strlen(dm_optarg)) { -+ passwdfile = dm_strdup(dm_optarg); - change_flags.newpasswdfile = 1; - } else { - change_flags.newpasswdstdin = 1; -@@ -268,20 +268,20 @@ - - case 'u': - change_flags.newuser = 1; -- newuser = dm_strdup(optarg); -+ newuser = dm_strdup(dm_optarg); - break; - - case 'p': - if (!passwdtype) -- passwdtype = dm_strdup(optarg); -+ passwdtype = dm_strdup(dm_optarg); - // else - // Complain about only one type allowed. - break; - - case 'P': - change_flags.newpasswdshadow = 1; -- if (optarg && strlen(optarg)) -- passwdfile = dm_strdup(optarg); -+ if (dm_optarg && strlen(dm_optarg)) -+ passwdfile = dm_strdup(dm_optarg); - else - passwdfile = SHADOWFILE; - passwdtype = "shadow"; -@@ -289,42 +289,42 @@ - - case 'g': - change_flags.newclientid = 1; -- clientid = strtoull(optarg, NULL, 10); -+ clientid = strtoull(dm_optarg, NULL, 10); - break; - - case 'm': - change_flags.newmaxmail = 1; -- maxmail = strtomaxmail(optarg); -+ maxmail = strtomaxmail(dm_optarg); - break; - - case 's': - // Add this item to the user's aliases. -- if (optarg && (len = strlen(optarg))) -- list_nodeadd(&alias_add, optarg, len+1); -+ if (dm_optarg && (len = strlen(dm_optarg))) -+ list_nodeadd(&alias_add, dm_optarg, len+1); - break; - - case 'S': - // Delete this item from the user's aliases. -- if (optarg && (len = strlen(optarg))) -- list_nodeadd(&alias_del, optarg, len+1); -+ if (dm_optarg && (len = strlen(dm_optarg))) -+ list_nodeadd(&alias_del, dm_optarg, len+1); - break; - - case 't': - // Add this item to the alias's forwards. -- if (optarg && (len = strlen(optarg))) -- list_nodeadd(&fwds_add, optarg, len+1); -+ if (dm_optarg && (len = strlen(dm_optarg))) -+ list_nodeadd(&fwds_add, dm_optarg, len+1); - break; - - case 'T': - // Delete this item from the alias's forwards. -- if (optarg && (len = strlen(optarg))) -- list_nodeadd(&fwds_del, optarg, len+1); -+ if (dm_optarg && (len = strlen(dm_optarg))) -+ list_nodeadd(&fwds_del, dm_optarg, len+1); - break; - - /* Common options */ - case 'f': -- if (optarg && strlen(optarg) > 0) -- configFile = optarg; -+ if (dm_optarg && strlen(dm_optarg) > 0) -+ configFile = dm_optarg; - else { - qerrorf("dbmail-users: -f requires a filename\n\n"); - result = 1; -Index: lmtpd.c -=================================================================== ---- lmtpd.c (revision 1711) -+++ lmtpd.c (revision 1712) -@@ -100,8 +100,8 @@ - openlog(PNAME, LOG_PID, LOG_MAIL); - - /* get command-line options */ -- opterr = 0; /* suppress error message from getopt() */ -- while ((opt = getopt(argc, argv, "vVhqnf:p:")) != -1) { -+ dm_opterr = 0; /* suppress error message from getopt() */ -+ while ((opt = dm_getopt(argc, argv, "vVhqnf:p:")) != -1) { - switch (opt) { - case 'v': - /* TODO: Perhaps verbose should log to the console with -n? */ -@@ -121,8 +121,8 @@ - do_showhelp(); - return 0; - case 'p': -- if (optarg && strlen(optarg) > 0) -- pidFile = optarg; -+ if (dm_optarg && strlen(dm_optarg) > 0) -+ pidFile = dm_optarg; - else { - fprintf(stderr, - "dbmail-lmtpd: -p requires a filename " -@@ -131,8 +131,8 @@ - } - break; - case 'f': -- if (optarg && strlen(optarg) > 0) -- configFile = optarg; -+ if (dm_optarg && strlen(dm_optarg) > 0) -+ configFile = dm_optarg; - else { - fprintf(stderr, - "dbmail-lmtpd: -f requires a filename " -Index: dm_getopt.c -=================================================================== ---- dm_getopt.c (revision 1711) -+++ dm_getopt.c (revision 1712) -@@ -135,7 +135,7 @@ - */ - - int _dm_getopt_internal(int argc, char * argv[], const char *shortopts, -- const struct option *longopts, int *longind, -+ const struct dm_option *longopts, int *longind, - int long_only) - { - char mode, colon_mode = *shortopts; -@@ -261,13 +261,13 @@ - } - - int dm_getopt_long(int argc, char * argv[], const char *shortopts, -- const struct option *longopts, int *longind) -+ const struct dm_option *longopts, int *longind) - { - return _dm_getopt_internal(argc, argv, shortopts, longopts, longind, 0); - } - - int dm_getopt_long_only(int argc, char * argv[], const char *shortopts, -- const struct option *longopts, int *longind) -+ const struct dm_option *longopts, int *longind) - { - return _dm_getopt_internal(argc, argv, shortopts, longopts, longind, 1); - } -Index: maintenance.c -=================================================================== ---- maintenance.c (revision 1711) -+++ maintenance.c (revision 1712) -@@ -121,8 +121,8 @@ - setvbuf(stdout, 0, _IONBF, 0); - - /* get options */ -- opterr = 0; /* suppress error message from getopt() */ -- while ((opt = getopt(argc, argv, -+ dm_opterr = 0; /* suppress error message from getopt() */ -+ while ((opt = dm_getopt(argc, argv, - "-acrtl:pudb" /* Main options */ - "i" /* Maybe later options */ - "f:qnyvVh")) != -1) { /* Common options */ -@@ -173,8 +173,8 @@ - case 'l': - check_iplog = 1; - do_nothing = 0; -- if (optarg) -- strncpy(timespec, optarg, LEN); -+ if (dm_optarg) -+ strncpy(timespec, dm_optarg, LEN); - else - timespec[0] = 0; - -@@ -209,8 +209,8 @@ - break; - - case 'f': -- if (optarg && strlen(optarg) > 0) -- configFile = optarg; -+ if (dm_optarg && strlen(dm_optarg) > 0) -+ configFile = dm_optarg; - else { - qerrorf("dbmail-util: -f requires a filename\n\n" ); - return 1; -Index: dm_getopt.h -=================================================================== ---- dm_getopt.h (revision 1711) -+++ dm_getopt.h (revision 1712) -@@ -26,38 +26,23 @@ - */ - - #include "config.h" -+#ifndef DM_GETOPT_H -+#define DM_GETOPT_H - --#ifndef USE_DM_GETOPT --# include <getopt.h> --#endif -+# ifndef USE_DM_GETOPT -+# include <getopt.h> -+# define dm_getopt getopt -+# define dm_getopt_long getopt_long -+# define dm_getopt_long_only getopt_long_only -+# define _dm_getopt_internal _getopt_internal -+# define dm_opterr opterr -+# define dm_optind optind -+# define dm_optopt optopt -+# define dm_optarg optarg -+# endif - --#ifdef USE_DM_GETOPT -+# ifdef USE_DM_GETOPT - --# ifndef DM_GETOPT_H -- /* Our include guard first. */ --# define DM_GETOPT_H -- /* Try to kill the system getopt.h */ --# define _GETOPT_DECLARED --# define _GETOPT_H --# define GETOPT_H -- --# undef getopt --# define getopt dm_getopt --# undef getopt_long --# define getopt_long dm_getopt_long --# undef getopt_long_only --# define getopt_long_only dm_getopt_long_only --# undef _getopt_internal --# define _getopt_internal _dm_getopt_internal --# undef opterr --# define opterr dm_opterr --# undef optind --# define optind dm_optind --# undef optopt --# define optopt dm_optopt --# undef optarg --# define optarg dm_optarg -- - # ifdef __cplusplus - extern "C" { - # endif -@@ -68,7 +53,7 @@ - extern int dm_optind, dm_opterr, dm_optopt; - extern char *dm_optarg; - --struct option { -+struct dm_option { - const char *name; - int has_arg; - int *flag; -@@ -76,28 +61,25 @@ - }; - - /* human-readable values for has_arg */ --# undef no_argument --# define no_argument 0 --# undef required_argument --# define required_argument 1 --# undef optional_argument --# define optional_argument 2 -+# define dm_getopt_no_argument 0 -+# define dm_getopt_required_argument 1 -+# define dm_getopt_optional_argument 2 - - /* GNU-style long-argument parsers */ - extern int dm_getopt_long(int argc, char * argv[], const char *shortopts, -- const struct option *longopts, int *longind); -+ const struct dm_option *longopts, int *longind); - - extern int dm_getopt_long_only(int argc, char * argv[], const char *shortopts, -- const struct option *longopts, int *longind); -+ const struct dm_option *longopts, int *longind); - - extern int _dm_getopt_internal(int argc, char * argv[], const char *shortopts, -- const struct option *longopts, int *longind, -+ const struct dm_option *longopts, int *longind, - int long_only); - - # ifdef __cplusplus - } - # endif - --# endif /* DM_GETOPT_H */ -+# endif /* USE_DM_GETOPT */ - --#endif /* USE_DM_GETOPT */ -+#endif /* DM_GETOPT_H */ -Index: timsieved.c -=================================================================== ---- timsieved.c (revision 1711) -+++ timsieved.c (revision 1712) -@@ -99,8 +99,8 @@ - openlog(PNAME, LOG_PID, LOG_MAIL); - - /* get command-line options */ -- opterr = 0; /* suppress error message from getopt() */ -- while ((opt = getopt(argc, argv, "vVhqnf:p:")) != -1) { -+ dm_opterr = 0; /* suppress error message from getopt() */ -+ while ((opt = dm_getopt(argc, argv, "vVhqnf:p:")) != -1) { - switch (opt) { - case 'v': - /* TODO: Perhaps verbose should log to the console with -n? */ -@@ -120,8 +120,8 @@ - do_showhelp(); - return 0; - case 'p': -- if (optarg && strlen(optarg) > 0) -- pidFile = optarg; -+ if (dm_optarg && strlen(dm_optarg) > 0) -+ pidFile = dm_optarg; - else { - fprintf(stderr, - "dbmail-timsieved: -p requires a filename " -@@ -130,8 +130,8 @@ - } - break; - case 'f': -- if (optarg && strlen(optarg) > 0) -- configFile = optarg; -+ if (dm_optarg && strlen(dm_optarg) > 0) -+ configFile = dm_optarg; - else { - fprintf(stderr, - "dbmail-timsieved: -f requires a filename " -Index: pop3d.c -=================================================================== ---- pop3d.c (revision 1711) -+++ pop3d.c (revision 1712) -@@ -103,8 +103,8 @@ - openlog(PNAME, LOG_PID, LOG_MAIL); - - /* get command-line options */ -- opterr = 0; /* suppress error message from getopt() */ -- while ((opt = getopt(argc, argv, "vVhqnf:p:")) != -1) { -+ dm_opterr = 0; /* suppress error message from getopt() */ -+ while ((opt = dm_getopt(argc, argv, "vVhqnf:p:")) != -1) { - switch (opt) { - case 'v': - /* TODO: Perhaps verbose should log to the console with -n? */ -@@ -124,8 +124,8 @@ - do_showhelp(); - return 0; - case 'p': -- if (optarg && strlen(optarg) > 0) -- pidFile = optarg; -+ if (dm_optarg && strlen(dm_optarg) > 0) -+ pidFile = dm_optarg; - else { - fprintf(stderr, - "dbmail-pop3d: -p requires a filename " -@@ -134,8 +134,8 @@ - } - break; - case 'f': -- if (optarg && strlen(optarg) > 0) -- configFile = optarg; -+ if (dm_optarg && strlen(dm_optarg) > 0) -+ configFile = dm_optarg; - else { - fprintf(stderr, - "dbmail-pop3d: -f requires a filename " -Index: imapd.c -=================================================================== ---- imapd.c (revision 1711) -+++ imapd.c (revision 1712) -@@ -97,8 +97,8 @@ - openlog(PNAME, LOG_PID, LOG_MAIL); - - /* get command-line options */ -- opterr = 0; /* suppress error message from getopt() */ -- while ((opt = getopt(argc, argv, "vVhqnf:p:")) != -1) { -+ dm_opterr = 0; /* suppress error message from getopt() */ -+ while ((opt = dm_getopt(argc, argv, "vVhqnf:p:")) != -1) { - switch (opt) { - case 'v': - /* TODO: Perhaps verbose should log to the console with -n? */ -@@ -118,8 +118,8 @@ - do_showhelp(); - return 0; - case 'p': -- if (optarg && strlen(optarg) > 0) -- pidFile = optarg; -+ if (dm_optarg && strlen(dm_optarg) > 0) -+ pidFile = dm_optarg; - else { - fprintf(stderr, - "dbmail-imapd: -p requires a filename " -@@ -128,8 +128,8 @@ - } - break; - case 'f': -- if (optarg && strlen(optarg) > 0) -- configFile = optarg; -+ if (dm_optarg && strlen(dm_optarg) > 0) -+ configFile = dm_optarg; - else { - fprintf(stderr, - "dbmail-imapd: -f requires a filename " -Index: sievecmd.c -=================================================================== ---- sievecmd.c (revision 1711) -+++ sievecmd.c (revision 1712) -@@ -57,7 +57,7 @@ - char *user_name = NULL; - char *name = NULL; - FILE *source = NULL; -- extern char *optarg; -+ extern char *dm_optarg; - - openlog(PNAME, LOG_PID, LOG_MAIL); - -@@ -70,7 +70,7 @@ - configure_debug(TRACE_ERROR, 1, 0); - - while (opt != -1 && act != 'h') { -- opt = getopt(argc, argv, "a:d:i:r:u:l"); -+ opt = dm_getopt(argc, argv, "a:d:i:r:u:l"); - - switch (opt) { - case -1: -@@ -84,11 +84,11 @@ - act = 'h'; - else - act = opt; -- name = optarg; -+ name = dm_optarg; - source = stdin; // FIXME to take files as input, too - break; - case 'u': -- user_name = dm_strdup(optarg); -+ user_name = dm_strdup(dm_optarg); - break; - case 'l': - if (act != 0) -Index: main.c -=================================================================== ---- main.c (revision 1711) -+++ main.c (revision 1712) -@@ -189,7 +189,7 @@ - * with an immediately preceding option are return with option - * value '1'. We will use this to allow for multiple values to - * follow after each of the supported options. */ -- while ((c = getopt(argc, argv, "-t::m:u:d:r: f:qnyvVh")) != EOF) { -+ while ((c = dm_getopt(argc, argv, "-t::m:u:d:r: f:qnyvVh")) != EOF) { - /* Received an n-th value following the last option, - * so recall the last known option to be used in the switch. */ - if (c == 1) -@@ -200,13 +200,13 @@ - case 't': - trace(TRACE_INFO, "main(): using NORMAL_DELIVERY"); - -- if (optarg) { -+ if (dm_optarg) { - if (deliver_to_header) { - printf - ("Only one header field may be specified.\n"); - usage_error = 1; - } else -- deliver_to_header = optarg; -+ deliver_to_header = dm_optarg; - } else - deliver_to_header = "deliver-to"; - -@@ -221,7 +221,7 @@ - ("Only one header field may be specified.\n"); - usage_error = 1; - } else -- deliver_to_mailbox = optarg; -+ deliver_to_mailbox = dm_optarg; - - break; - -@@ -231,8 +231,8 @@ - - /* Add argument onto the returnpath list. */ - if (list_nodeadd -- (&returnpath, optarg, -- strlen(optarg) + 1) == 0) { -+ (&returnpath, dm_optarg, -+ strlen(dm_optarg) + 1) == 0) { - trace(TRACE_ERROR, - "main(): list_nodeadd reports out of memory" - " while adding to returnpath"); -@@ -247,7 +247,7 @@ - "main(): using SPECIAL_DELIVERY to usernames"); - - dsnuser_init(&dsnuser); -- dsnuser.address = dm_strdup(optarg); -+ dsnuser.address = dm_strdup(dm_optarg); - - /* Add argument onto the users list. */ - if (list_nodeadd -@@ -267,7 +267,7 @@ - "main(): using SPECIAL_DELIVERY to email addresses"); - - dsnuser_init(&dsnuser); -- dsnuser.address = dm_strdup(optarg); -+ dsnuser.address = dm_strdup(dm_optarg); - - /* Add argument onto the users list. */ - if (list_nodeadd -@@ -284,8 +284,8 @@ - - /* Common command line options. */ - case 'f': -- if (optarg && strlen(optarg) > 0) -- configFile = optarg; -+ if (dm_optarg && strlen(dm_optarg) > 0) -+ configFile = dm_optarg; - else { - fprintf(stderr, - "dbmail-smtp: -f requires a filename\n\n" ); diff --git a/mail/dbmail-devel/files/patch-2.0.4_bug184 b/mail/dbmail-devel/files/patch-2.0.4_bug184 deleted file mode 100644 index 37d6689d66b2..000000000000 --- a/mail/dbmail-devel/files/patch-2.0.4_bug184 +++ /dev/null @@ -1,66 +0,0 @@ -Index: configure.in -=================================================================== ---- configure.in (revision 1751) -+++ configure.in (revision 1761) -@@ -42,6 +42,7 @@ - DBMAIL_CHECK_SIEVE_LIBS - DBMAIL_CHECK_GC - DBMAIL_CHECK_GETOPT -+DBMAIL_CHECK_SOCKLEN_T - - AC_PROG_CC - AC_COMPILE_WARNINGS -Index: acinclude.m4 -=================================================================== ---- acinclude.m4 (revision 1751) -+++ acinclude.m4 (revision 1761) -@@ -513,3 +513,49 @@ - - # Prerequisites of lib/getopt*. - AC_DEFUN([CHECK_PREREQ_GETOPT], [:]) -+ -+# -+# socklen_t -+# from curl -+ -+dnl Check for socklen_t: historically on BSD it is an int, and in -+dnl POSIX 1g it is a type of its own, but some platforms use different -+dnl types for the argument to getsockopt, getpeername, etc. So we -+dnl have to test to find something that will work. -+AC_DEFUN([DBMAIL_CHECK_SOCKLEN_T], -+[ -+ AC_CHECK_TYPE([socklen_t], ,[ -+ AC_MSG_CHECKING([for socklen_t equivalent]) -+ AC_CACHE_VAL([socklen_t_equiv], -+ [ -+ # Systems have either "struct sockaddr *" or -+ # "void *" as the second argument to getpeername -+ socklen_t_equiv= -+ for arg2 in "struct sockaddr" void; do -+ for t in int size_t unsigned long "unsigned long"; do -+ AC_TRY_COMPILE([ -+ #include <sys/types.h> -+ #include <sys/socket.h> -+ -+ int getpeername (int, $arg2 *, $t *); -+ ],[ -+ $t len; -+ getpeername(0,0,&len); -+ ],[ -+ socklen_t_equiv="$t" -+ break -+ ]) -+ done -+ done -+ -+ if test "x$socklen_t_equiv" = x; then -+ AC_MSG_ERROR([Cannot find a type to use in place of socklen_t]) -+ fi -+ ]) -+ AC_MSG_RESULT($socklen_t_equiv) -+ AC_DEFINE_UNQUOTED(socklen_t, $socklen_t_equiv, -+ [type to use in place of socklen_t if not defined])], -+ [#include <sys/types.h> -+#include <sys/socket.h>]) -+]) -+ diff --git a/mail/dbmail-devel/files/patch-2.0.4_bug190_pool.c b/mail/dbmail-devel/files/patch-2.0.4_bug190_pool.c deleted file mode 100644 index 562c0cb23688..000000000000 --- a/mail/dbmail-devel/files/patch-2.0.4_bug190_pool.c +++ /dev/null @@ -1,126 +0,0 @@ -Index: pool.c -=================================================================== ---- pool.c (revision 1600) -+++ pool.c (revision 1758) -@@ -73,8 +73,10 @@ - void scoreboard_new(serverConfig_t * conf) - { - int serr; -- if ((shmid = shmget(IPC_PRIVATE, P_SIZE, 0644 | IPC_CREAT)) == -1) -- trace(TRACE_FATAL, "%s,%s: shmget failed",__FILE__,__func__); -+ if ((shmid = shmget(IPC_PRIVATE, P_SIZE, 0644 | IPC_CREAT)) == -1) { -+ serr = errno; -+ trace(TRACE_FATAL, "%s,%s: shmget failed [%s]",__FILE__,__func__, strerror(serr)); -+ } - scoreboard = shmat(shmid, (void *) 0, 0); - serr=errno; - if (scoreboard == (Scoreboard_t *) (-1)) { -@@ -222,7 +236,7 @@ - } - scoreboard_unlck(); - trace(TRACE_FATAL, -- "%s,%s: pid NOT found on scoreboard [%d]", __FILE__, __FUNCTION__, pid); -+ "%s,%s: pid NOT found on scoreboard [%d]", __FILE__, __func__, pid); - return -1; - } - -@@ -238,25 +252,25 @@ - { - int i; - trace(TRACE_MESSAGE, "%s,%s: register child [%d]", -- __FILE__, __FUNCTION__, getpid()); -+ __FILE__, __func__, getpid()); - - scoreboard_wrlck(); - for (i = 0; i < scoreboard->conf->maxChildren; i++) { - if (scoreboard->child[i].pid == -1) - break; - if (scoreboard->child[i].pid == getpid()) { -- trace(TRACE_ERROR, -+ scoreboard_unlck(); -+ trace(TRACE_FATAL, - "%s,%s: child already registered.", -- __FILE__, __FUNCTION__); -- scoreboard_unlck(); -+ __FILE__, __func__); - return -1; - } - } - if (i == scoreboard->conf->maxChildren) { -+ scoreboard_unlck(); - trace(TRACE_WARNING, - "%s,%s: no empty slot found", -- __FILE__, __FUNCTION__); -- scoreboard_unlck(); -+ __FILE__, __func__); - return -1; - } - -@@ -264,8 +278,8 @@ - scoreboard->child[i].status = STATE_IDLE; - scoreboard_unlck(); - -- trace(TRACE_INFO, "%s,%s: initializing child_state [%d] using slot [%d]", -- __FILE__, __FUNCTION__, getpid(), i); -+ trace(TRACE_MESSAGE, "%s,%s: initializing child_state [%d] using slot [%d]", -+ __FILE__, __func__, getpid(), i); - return 0; - } - -@@ -281,7 +295,7 @@ - scoreboard->child[key].status = STATE_CONNECTED; - scoreboard_unlck(); - -- trace(TRACE_DEBUG, "%s,%s: [%d]", __FILE__, __FUNCTION__, -+ trace(TRACE_DEBUG, "%s,%s: [%d]", __FILE__, __func__, - getpid()); - } - -@@ -297,7 +311,7 @@ - scoreboard->child[key].status = STATE_IDLE; - scoreboard_unlck(); - -- trace(TRACE_DEBUG, "%s,%s: [%d]", __FILE__, __FUNCTION__, -+ trace(TRACE_DEBUG, "%s,%s: [%d]", __FILE__, __func__, - getpid()); - } - -@@ -320,7 +334,7 @@ - scoreboard_unlck(); - - trace(TRACE_MESSAGE, -- "%s,%s: child [%d] unregistered", __FILE__, __FUNCTION__, -+ "%s,%s: child [%d] unregistered", __FILE__, __func__, - getpid()); - } - -@@ -346,7 +360,7 @@ - manage_stop_children(); - trace(TRACE_FATAL, - "%s,%s: could not create children. Fatal.", -- __FILE__, __FUNCTION__); -+ __FILE__, __func__); - exit(0); - } - } -@@ -360,10 +374,17 @@ - if (chpid == -1) - continue; - if (waitpid(chpid, NULL, WNOHANG|WUNTRACED) == chpid) { -+ scoreboard_release(chpid); - trace(TRACE_MESSAGE,"%s,%s: child [%d] exited. Restarting...", -- __FILE__, __FUNCTION__, chpid); -- scoreboard_release(chpid); -- CreateChild(&childinfo); -+ __FILE__, __func__, chpid); -+ if (CreateChild(&childinfo)== -1) { -+ trace(TRACE_ERROR,"%s,%s: createchild failed. Bailout...", -+ __FILE__, __func__); -+ GeneralStopRequested=1; -+ manage_stop_children(); -+ -+ exit(1); -+ } - } - } - sleep(1); diff --git a/mail/dbmail-devel/files/patch-2.0.4_bug190_server.c b/mail/dbmail-devel/files/patch-2.0.4_bug190_server.c deleted file mode 100644 index 23129a5c8b52..000000000000 --- a/mail/dbmail-devel/files/patch-2.0.4_bug190_server.c +++ /dev/null @@ -1,41 +0,0 @@ -Index: server.c -=================================================================== ---- server.c (revision 1600) -+++ server.c (revision 1758) -@@ -119,9 +119,15 @@ - alarm(10); - - trace(TRACE_DEBUG, "StartServer(): children created, starting main service loop"); -- while (!GeneralStopRequested) -- manage_restart_children(); -- -+ while (!GeneralStopRequested) { -+ if (db_connect() != 0) { -+ GeneralStopRequested=1; -+ } else { -+ db_disconnect(); -+ manage_restart_children(); -+ } -+ } -+ - manage_stop_children(); - scoreboard_delete(); - -@@ -131,6 +137,8 @@ - - void ParentSigHandler(int sig, siginfo_t * info, void *data) - { -+ int saved_errno = errno; -+ - if (ParentPID != getpid()) { - trace(TRACE_INFO, - "ParentSigHandler(): i'm no longer father"); -@@ -162,6 +170,8 @@ - default: - GeneralStopRequested = 1; - } -+ -+ errno = saved_errno; - } - - diff --git a/mail/dbmail-devel/files/patch-2.0.4_bug190_serverchild.c b/mail/dbmail-devel/files/patch-2.0.4_bug190_serverchild.c deleted file mode 100644 index bf6da33dcfbd..000000000000 --- a/mail/dbmail-devel/files/patch-2.0.4_bug190_serverchild.c +++ /dev/null @@ -1,267 +0,0 @@ -Index: serverchild.c -=================================================================== ---- serverchild.c (revision 1600) -+++ serverchild.c (revision 1758) -@@ -66,13 +66,13 @@ - void client_close(void) - { - if (client.tx) { -- trace(TRACE_DEBUG,"%s,%s: closing write stream", __FILE__,__FUNCTION__); -+ trace(TRACE_DEBUG,"%s,%s: closing write stream", __FILE__,__func__); - fflush(client.tx); - fclose(client.tx); /* closes clientSocket as well */ - client.tx = NULL; - } - if (client.rx) { -- trace(TRACE_DEBUG,"%s,%s: closing read stream", __FILE__,__FUNCTION__); -+ trace(TRACE_DEBUG,"%s,%s: closing read stream", __FILE__,__func__); - shutdown(fileno(client.rx), SHUT_RDWR); - fclose(client.rx); - client.rx = NULL; -@@ -86,7 +86,7 @@ - - trace(TRACE_DEBUG, - "%s,%s: database connection still open, closing", -- __FILE__,__FUNCTION__); -+ __FILE__,__func__); - db_disconnect(); - auth_disconnect(); - connected = 0; /* FIXME a signal between this line and the previous one -@@ -99,18 +99,22 @@ - - void noop_child_sig_handler(int sig, siginfo_t *info UNUSED, void *data UNUSED) - { -- trace(TRACE_DEBUG, "%s,%s: ignoring signal [%d]", __FILE__, __FUNCTION__, sig); -+ int saved_errno = errno; -+ trace(TRACE_DEBUG, "%s,%s: ignoring signal [%d]", __FILE__, __func__, sig); -+ errno = saved_errno; - } - - void active_child_sig_handler(int sig, siginfo_t * info UNUSED, void *data UNUSED) - { -+ int saved_errno = errno; -+ - static int triedDisconnect = 0; - - #ifdef _USE_STR_SIGNAL -- trace(TRACE_ERROR, "%s,%s: got signal [%s]", __FILE__, __FUNCTION__, -+ trace(TRACE_ERROR, "%s,%s: got signal [%s]", __FILE__, __func__, - strsignal(sig)); - #else -- trace(TRACE_ERROR, "%s,%s: got signal [%d]", __FILE__, __FUNCTION__, sig); -+ trace(TRACE_ERROR, "%s,%s: got signal [%d]", __FILE__, __func__, sig); - #endif - - /* perform reinit at SIGHUP otherwise exit, but do nothing on -@@ -118,10 +122,10 @@ - switch (sig) { - case SIGCHLD: - trace(TRACE_DEBUG, "%s,%s: SIGCHLD received... ignoring", -- __FILE__, __FUNCTION__); -+ __FILE__, __func__); - break; - case SIGALRM: -- trace(TRACE_DEBUG, "%s,%s: timeout received", __FILE__, __FUNCTION__); -+ trace(TRACE_DEBUG, "%s,%s: timeout received", __FILE__, __func__); - client_close(); - break; - -@@ -132,23 +136,23 @@ - if (ChildStopRequested) { - trace(TRACE_DEBUG, - "%s,%s: already caught a stop request. Closing right now", -- __FILE__,__FUNCTION__); -+ __FILE__,__func__); - - /* already caught this signal, exit the hard way now */ - client_close(); - disconnect_all(); - child_unregister(); -- trace(TRACE_DEBUG, "%s,%s: exit",__FILE__,__FUNCTION__); -+ trace(TRACE_DEBUG, "%s,%s: exit",__FILE__,__func__); - exit(1); - } -- trace(TRACE_DEBUG, "%s,%s: setting stop request",__FILE__,__FUNCTION__); -+ trace(TRACE_DEBUG, "%s,%s: setting stop request",__FILE__,__func__); - DelChildSigHandler(); - ChildStopRequested = 1; - break; - default: - /* bad shtuff, exit */ - trace(TRACE_DEBUG, -- "%s,%s: cannot ignore this. Terminating",__FILE__,__FUNCTION__); -+ "%s,%s: cannot ignore this. Terminating",__FILE__,__func__); - - /* - * For some reason i have not yet determined the process starts eating up -@@ -164,10 +168,12 @@ - disconnect_all(); - } - -- trace(TRACE_DEBUG, "%s,%s: exit", __FILE__, __FUNCTION__); -+ trace(TRACE_DEBUG, "%s,%s: exit", __FILE__, __func__); - child_unregister(); - exit(1); - } -+ -+ errno = saved_errno; - } - - -@@ -239,16 +245,19 @@ - if (! pid) { - if (child_register() == -1) { - trace(TRACE_FATAL, "%s,%s: child_register failed", -- __FILE__, __FUNCTION__); -+ __FILE__, __func__); - exit(0); - - } - - ChildStopRequested = 0; - SetChildSigHandler(); -- trace(TRACE_INFO, "%s,%s: signal handler placed, going to perform task now", -- __FILE__, __FUNCTION__); -- PerformChildTask(info); -+ -+ trace(TRACE_INFO, "%s,%s: signal handler placed, going to perform task now", -+ __FILE__, __func__); -+ -+ if (PerformChildTask(info)== -1) -+ return -1; - child_unregister(); - exit(0); - } else { -@@ -269,22 +278,22 @@ - struct hostent *clientHost; - - if (!info) { -- trace(TRACE_ERROR, -- "PerformChildTask(): NULL info supplied"); -+ trace(TRACE_ERROR, "%s,%s: NULL info supplied", -+ __FILE__, __func__); - return -1; - } - - if (db_connect() != 0) { -- trace(TRACE_ERROR, -- "PerformChildTask(): could not connect to database"); -+ trace(TRACE_ERROR, "%s,%s: could not connect to database", -+ __FILE__, __func__); - return -1; - } - if (db_check_version() != 0) - return -1; - - if (auth_connect() != 0) { -- trace(TRACE_ERROR, -- "PerformChildTask(): could not connect to authentication"); -+ trace(TRACE_ERROR, "%s,%s: could not connect to authentication", -+ __FILE__, __func__); - return -1; - } - -@@ -294,12 +303,13 @@ - for (i = 0; i < info->maxConnect && !ChildStopRequested; i++) { - - if (db_check_connection()) { -- trace(TRACE_ERROR, "%s,%s: database has gone away", __FILE__, __func__); -+ trace(TRACE_ERROR, "%s,%s: database has gone away", -+ __FILE__, __func__); - return -1; - } - -- trace(TRACE_INFO, -- "PerformChildTask(): waiting for connection"); -+ trace(TRACE_INFO, "%s,%s: waiting for connection", -+ __FILE__, __func__); - - child_reg_disconnected(); - -@@ -312,8 +322,8 @@ - - if (clientSocket == -1) { - i--; /* don't count this as a connect */ -- trace(TRACE_INFO, -- "PerformChildTask(): accept failed"); -+ trace(TRACE_INFO, "%s,%s: accept failed", -+ __FILE__, __func__); - continue; /* accept failed, refuse connection & continue */ - } - -@@ -337,30 +347,29 @@ - strncpy(client.clientname, - clientHost->h_name, FIELDSIZE); - -- trace(TRACE_MESSAGE, -- "PerformChildTask(): incoming connection from [%s (%s)]", -+ trace(TRACE_MESSAGE, "%s,%s: incoming connection from [%s (%s)]", -+ __FILE__, __func__, - client.ip, - client.clientname[0] ? client. - clientname : "Lookup failed"); - } else { -- trace(TRACE_MESSAGE, -- "PerformChildTask(): incoming connection from [%s]", -- client.ip); -+ trace(TRACE_MESSAGE, "%s,%s: incoming connection from [%s]", -+ __FILE__, __func__, client.ip); - } - - /* make streams */ - if (!(client.rx = fdopen(dup(clientSocket), "r"))) { - /* read-FILE opening failure */ -- trace(TRACE_ERROR, -- "PerformChildTask(): error opening read file stream"); -+ trace(TRACE_ERROR, "%s,%s: error opening read file stream", -+ __FILE__, __func__); - close(clientSocket); - continue; - } - - if (!(client.tx = fdopen(clientSocket, "w"))) { - /* write-FILE opening failure */ -- trace(TRACE_ERROR, -- "PerformChildTask(): error opening write file stream"); -+ trace(TRACE_ERROR, "%s,%s: error opening write file stream", -+ __FILE__, __func__); - fclose(client.rx); - close(clientSocket); - memset(&client, 0, sizeof(client)); -@@ -370,8 +379,8 @@ - setvbuf(client.tx, (char *) NULL, _IOLBF, 0); - setvbuf(client.rx, (char *) NULL, _IOLBF, 0); - -- trace(TRACE_DEBUG, -- "PerformChildTask(): client info init complete, calling client handler"); -+ trace(TRACE_DEBUG, "%s,%s: client info init complete, calling client handler", -+ __FILE__, __func__); - - /* streams are ready, perform handling */ - info->ClientHandler(&client); -@@ -379,17 +388,19 @@ - set_proc_title("%s", "Idle"); - #endif - -- trace(TRACE_DEBUG, -- "PerformChildTask(): client handling complete, closing streams"); -+ trace(TRACE_DEBUG, "%s,%s: client handling complete, closing streams", -+ __FILE__, __func__); - client_close(); -- trace(TRACE_INFO, "PerformChildTask(): connection closed"); -+ trace(TRACE_INFO, "%s,%s: connection closed", -+ __FILE__, __func__); - } - - if (!ChildStopRequested) -- trace(TRACE_ERROR, -- "PerformChildTask(): maximum number of connections reached, stopping now"); -+ trace(TRACE_ERROR, "%s,%s: maximum number of connections reached, stopping now", -+ __FILE__, __func__); - else -- trace(TRACE_ERROR, "PerformChildTask(): stop requested"); -+ trace(TRACE_ERROR, "%s,%s: stop requested", -+ __FILE__, __func__); - - child_reg_disconnected(); - disconnect_all(); diff --git a/mail/dbmail-devel/files/patch-2.0.4_bug198_pool.c b/mail/dbmail-devel/files/patch-2.0.4_bug198_pool.c deleted file mode 100644 index c21e745d9dda..000000000000 --- a/mail/dbmail-devel/files/patch-2.0.4_bug198_pool.c +++ /dev/null @@ -1,13 +0,0 @@ -Index: pool.c -=================================================================== ---- pool.c (revision 1763) -+++ pool.c (revision 1787) -@@ -433,7 +433,7 @@ - - for (i = 0; i < scoreboard->conf->maxChildren; i++) { - chpid = scoreboard->child[i].pid; -- if (chpid != 0) -+ if (chpid > 0) - kill(chpid, SIGKILL);; - scoreboard_release(chpid); - } diff --git a/mail/dbmail-devel/files/patch-2.0.4_bug199_server.c b/mail/dbmail-devel/files/patch-2.0.4_bug199_server.c deleted file mode 100644 index 6786e6c8fc60..000000000000 --- a/mail/dbmail-devel/files/patch-2.0.4_bug199_server.c +++ /dev/null @@ -1,35 +0,0 @@ -Index: server.c -=================================================================== ---- server.c (revision 1763) -+++ server.c (revision 1787) -@@ -69,7 +69,7 @@ - - act.sa_sigaction = ParentSigHandler; - sigemptyset(&act.sa_mask); -- act.sa_flags = SA_SIGINFO; -+ act.sa_flags = SA_SIGINFO | SA_NOCLDSTOP; - - sigaction(SIGCHLD, &act, 0); - sigaction(SIGINT, &act, 0); -@@ -152,6 +152,7 @@ - - void ParentSigHandler(int sig, siginfo_t * info, void *data) - { -+ pid_t chpid; - int saved_errno = errno; - - if (ParentPID != getpid()) { -@@ -175,7 +176,12 @@ - break; - - case SIGCHLD: -- break; /* ignore, wait for child in main loop */ -+ /* ignore, wait for child in main loop */ -+ /* but we need to catch zombie */ -+ if ((chpid = waitpid(-1,&sig,WNOHANG)) > 0) -+ scoreboard_release(chpid); -+ -+ break; - - case SIGHUP: - trace(TRACE_DEBUG, diff --git a/mail/dbmail-devel/files/patch-2.0.4_bug214_main.c b/mail/dbmail-devel/files/patch-2.0.4_bug214_main.c deleted file mode 100644 index 18dfefa77e80..000000000000 --- a/mail/dbmail-devel/files/patch-2.0.4_bug214_main.c +++ /dev/null @@ -1,20 +0,0 @@ -Index: main.c -=================================================================== ---- main.c (revision 1793) -+++ main.c (revision 1796) -@@ -133,6 +133,7 @@ - trace(TRACE_ERROR, "%s,%s: error reading message", - __FILE__, __func__); - dm_free(tmpmessage); -+ tmpmessage=NULL; - return -1; - } - -@@ -371,6 +372,7 @@ - trace(TRACE_ERROR, "%s,%s splitmessage failed", - __FILE__, __func__); - dm_free(whole_message); -+ whole_message=NULL; - exitcode = EX_TEMPFAIL; - goto freeall; - } diff --git a/mail/dbmail-devel/files/patch-2.0.4_bug216_header.c b/mail/dbmail-devel/files/patch-2.0.4_bug216_header.c deleted file mode 100644 index d9610a5cd609..000000000000 --- a/mail/dbmail-devel/files/patch-2.0.4_bug216_header.c +++ /dev/null @@ -1,37 +0,0 @@ -Index: header.c -=================================================================== ---- header.c (revision 1796) -+++ header.c (revision 1813) -@@ -176,15 +176,17 @@ - if (message_content[line_content_size] == '\n') { - tmp_line_size = line_content_size + 1; - tmp_line_rfcsize = tmp_line_size + 1; -- } else { -- if (message_content[line_content_size] == '\r' && -- message_content[line_content_size + 1] == '\n') { -+ } else if (message_content[line_content_size] == '\r') { -+ if (message_content[line_content_size + 1] == '\n') { -+ /* This is the right behaviour */ - tmp_line_size = line_content_size + 2; - tmp_line_rfcsize = tmp_line_size; - } else { -- trace(TRACE_ERROR, "%s,%s: error reading header line", -- __FILE__, __func__); -- return -1; -+ /* This is broken behaviour, but it's better -+ * than not handling it at all. -+ */ -+ tmp_line_size = line_content_size + 1; -+ tmp_line_rfcsize = tmp_line_size + 1; - } - } - } -@@ -197,7 +199,6 @@ - __FILE__, __func__); - return 0; - } -- else -- return 1; -+ return 1; - - } diff --git a/mail/dbmail-devel/files/patch-2.0.4_bug79_imaputil.c b/mail/dbmail-devel/files/patch-2.0.4_bug79_imaputil.c deleted file mode 100644 index dbeb799017be..000000000000 --- a/mail/dbmail-devel/files/patch-2.0.4_bug79_imaputil.c +++ /dev/null @@ -1,80 +0,0 @@ -Index: imaputil.c -=================================================================== ---- imaputil.c (revision 1726) -+++ imaputil.c (revision 1793) -@@ -65,7 +65,7 @@ - "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; - - /* returned by date_sql2imap() */ --#define IMAP_STANDARD_DATE "03-Nov-1979 00:00:00 +0000" -+#define IMAP_STANDARD_DATE "Sat, 03-Nov-1979 00:00:00 +0000" - char _imapdate[IMAP_INTERNALDATE_LEN] = IMAP_STANDARD_DATE; - - /* returned by date_imap2sql() */ -@@ -1776,50 +1776,35 @@ - - /* - * convert a mySQL date (yyyy-mm-dd hh:mm:ss) to a valid IMAP internal date: -- * 0123456789012345678 -- * dd-mon-yyyy hh:mm:ss with mon characters (i.e. 'Apr' for april) -- * 01234567890123456789 -+ * [Mon, 30 May 2005 10:01:55 +0100] with mon characters (i.e. 'Apr' for april) - * return value is valid until next function call. - * NOTE: if date is not valid, IMAP_STANDARD_DATE is returned - */ - char *date_sql2imap(const char *sqldate) - { -- char *last_char; -- struct tm tm_localtime, tm_sqldate; -- time_t td; -+ struct tm tm_sql_date; -+ struct tm *tm_imap_date; -+ -+ time_t ltime; -+ char *last; - -- /* we need to get the localtime to get the current timezone */ -- if (time(&td) == -1) { -- trace(TRACE_ERROR, "%s,%s: error getting time()", -- __FILE__, __func__); -- return IMAP_STANDARD_DATE; -- } -- tm_localtime = *localtime(&td); -+ last = strptime(sqldate,"%Y-%m-%d %T", &tm_sql_date); -+ if ( (last == NULL) || (*last != '\0') ) { -+ strcpy(_imapdate, IMAP_STANDARD_DATE); -+ return _imapdate; -+ } - -- /* parse sqldate */ -- last_char = strptime(sqldate, "%Y-%m-%d %T", &tm_sqldate); -- if (last_char == NULL || *last_char != '\0') { -- trace(TRACE_DEBUG, "%s,%s, error parsing date [%s]", -- __FILE__, __func__, sqldate); -- strcpy(_imapdate, IMAP_STANDARD_DATE); -- return _imapdate; -- } -- /* copy DST information from localtime */ -- tm_sqldate.tm_gmtoff = tm_localtime.tm_gmtoff; -- tm_sqldate.tm_isdst = tm_localtime.tm_isdst; -+ /* FIXME: this works fine on linux, but may cause dst offsets in netbsd. */ -+ ltime = mktime (&tm_sql_date); -+ tm_imap_date = localtime(<ime); - -- (void) strftime(_imapdate, IMAP_INTERNALDATE_LEN, -- "%d-%b-%Y %T %z", &tm_sqldate); -- -- return _imapdate; -+ strftime(_imapdate, sizeof(_imapdate), "%a, %d %b %Y %H:%M:%S %z", tm_imap_date); -+ return _imapdate; - } - -- - /* - * convert TO a mySQL date (yyyy-mm-dd) FROM a valid IMAP internal date: -- * 0123456789 - * dd-mon-yyyy with mon characters (i.e. 'Apr' for april) -- * 01234567890 - * OR - * d-mon-yyyy - * return value is valid until next function call. diff --git a/mail/dbmail-devel/files/patch-sort.c b/mail/dbmail-devel/files/patch-sort.c deleted file mode 100644 index a267163eca11..000000000000 --- a/mail/dbmail-devel/files/patch-sort.c +++ /dev/null @@ -1,11 +0,0 @@ ---- sort/sort.c.orig Tue Mar 15 00:54:00 2005 -+++ sort/sort.c Mon Apr 11 13:46:46 2005 -@@ -58,7 +58,7 @@ - * - * Then do it! - * */ --dsn_class_t sort_and_deliver(u64_t msgidnr, -+sort_result_t sort_and_deliver(u64_t msgidnr, - const char *header UNUSED, - u64_t headersize UNUSED, - u64_t totalmsgsize, diff --git a/mail/dbmail-devel/pkg-descr b/mail/dbmail-devel/pkg-descr deleted file mode 100644 index 2c03d30b6ea9..000000000000 --- a/mail/dbmail-devel/pkg-descr +++ /dev/null @@ -1,22 +0,0 @@ -Dbmail is the name of a group of programs that enable the possiblilty of storing -and retrieving mail messages from a database (currently MySQL or PostgreSQL). - -What are the advantages? - - * Scalability. - Dbmail is as scalable as the database that is used for the mail storage. - * Manageability. - Dbmail is based upon a database. Dbmail can be managed by changing - settings in the database (f.e. using PHP/Perl/SQL). - * Speed. - Dbmail uses very efficient, database specific queries for retrieving mail - information. This is much faster then parsing a filesystem. - * Security. - Dbmail has got nothing to do with the filesystem or interaction with other - programs in the Unix environment which need special permissions. Dbmail - is as secure as the database it's based upon. - * Flexibility. - Changes on a Dbmail system (adding of users, changing passwords etc.) are - effective immediately. - -WWW: http://www.dbmail.org/ diff --git a/mail/dbmail-devel/pkg-plist b/mail/dbmail-devel/pkg-plist deleted file mode 100644 index 66d3c8a85d05..000000000000 --- a/mail/dbmail-devel/pkg-plist +++ /dev/null @@ -1,36 +0,0 @@ -etc/dbmail.conf-dist -lib/dbmail/libauthdbmail.0 -lib/dbmail/libauthdbmail.a -lib/dbmail/libauthdbmail.la -lib/dbmail/libauthdbmail -lib/dbmail/libsortdbmail.0 -lib/dbmail/libsortdbmail.a -lib/dbmail/libsortdbmail.la -lib/dbmail/libsortdbmail -lib/libdbmail -lib/libdbmail.0 -lib/libdbmail.a -lib/libdbmail.la -sbin/dbmail-imapd -sbin/dbmail-lmtpd -sbin/dbmail-pop3d -sbin/dbmail-smtp -sbin/dbmail-users -sbin/dbmail-util -%%MYSQL%%%%DATADIR%%/sql/create_tables.mysql -%%MYSQL%%%%DATADIR%%/sql/create_tables_innoDB.mysql -%%MYSQL%%%%DATADIR%%/sql/migrate_from_1.x_to_2.0.mysql -%%MYSQL%%%%DATADIR%%/sql/migrate_from_1.x_to_2.0_innodb.mysql -%%MYSQL%%lib/dbmail/libmysqldbmail.0 -%%MYSQL%%lib/dbmail/libmysqldbmail.a -%%MYSQL%%lib/dbmail/libmysqldbmail.la -%%MYSQL%%lib/dbmail/libmysqldbmail -%%PGSQL%%%%DATADIR%%/sql/create_tables.pgsql -%%PGSQL%%%%DATADIR%%/sql/migrate_from_1.x_to_2.0.pgsql -%%PGSQL%%/lib/dbmail/libpgsqldbmail.0 -%%PGSQL%%/lib/dbmail/libpgsqldbmail.a -%%PGSQL%%/lib/dbmail/libpgsqldbmail.la -%%PGSQL%%/lib/dbmail/libpgsqldbmail -@dirrm lib/dbmail -@dirrm %%DATADIR%%/sql -@dirrm %%DATADIR%% diff --git a/mail/dbmail20/Makefile b/mail/dbmail20/Makefile deleted file mode 100644 index d138d51531d7..000000000000 --- a/mail/dbmail20/Makefile +++ /dev/null @@ -1,90 +0,0 @@ -# New ports collection makefile for: dbmail -# Date created: 07/26/2003 -# Whom: Clement Laforet <sheepkiller@cultdeadsheep.org> -# -# $FreeBSD$ -# - -PORTNAME= dbmail -PORTVERSION= 2.0.4 -PORTREVISION= 1 -CATEGORIES= mail -MASTER_SITES= http://www.dbmail.org/download/ -PKGNAMESUFFIX= -${DATABASE} -EXTRACT_SUFX= .tgz - -MAINTAINER= seanc@FreeBSD.org -COMMENT= An SQL database-based mail system (POP3 and IMAP) - -USE_REINPLACE= YES -GNU_CONFIGURE= YES -CONFIGURE_ARGS= --prefix=${PREFIX} -USE_GMAKE= YES -USE_OPENSSL= YES -USE_RC_SUBR= dbmail-pop3d.sh dbmail-lmtpd.sh dbmail-imapd.sh - -CFLAGS += -fPIC - -.if defined(WITH_POSTGRESQL) -CONFIGURE_ARGS+= --with-pgsql -USE_PGSQL= yes -DATABASE= postgresql -PLIST_SUB+= PGSQL="" -PLIST_SUB+= MYSQL="@comment " -LDFLAGS+= -L${LOCALBASE}/lib/ -.else -USE_MYSQL= YES -CONFIGURE_ARGS+= --with-mysql -DATABASE= mysql -PLIST_SUB+= MYSQL="" -PLIST_SUB+= PGSQL="@comment " -CFLAGS+= -I${LOCALBASE}/include/mysql -LDFLAGS+= -L${LOCALBASE}/lib/mysql -.endif - -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" LOCALBASE=${LOCALBASE} -PORTDOCS= INSTALL README EXTRAS - -MAN1= dbmail-smtp.1 -MAN8= dbmail-imapd.8 dbmail-lmtpd.8 dbmail-pop3d.8 \ - dbmail-users.8 dbmail-util.8 -MANCOMPRESSED= no - -pre-everything:: - @${ECHO} "" - @${ECHO} "You may use the following build options:" - @${ECHO} " By default dbmail uses MySQL backend database." - @${ECHO} " To build dbmail with PostgreSQL as backend database," - @${ECHO} " define WITH_POSTGRESQL" - @${ECHO} "" - -post-patch: - @${FIND} ${WRKSRC} -name CVS -type d | ${XARGS} ${RM} -fr - -post-configure: - @${REINPLACE_CMD} -i.orig 's!/etc/dbmail.conf!${PREFIX}/etc/dbmail.conf!g' \ - ${WRKSRC}/dbmail.h - -post-install: - @${INSTALL_DATA} ${WRKSRC}/dbmail.conf ${PREFIX}/etc/dbmail.conf-dist - @${MKDIR} ${DATADIR}/sql - @${INSTALL_DATA} ${WRKSRC}/sql/${DATABASE}/* ${DATADIR}/sql - @cd ${WRKSRC}/man && ${INSTALL_MAN} ${MAN1} ${MAN1PREFIX}/man/man1 -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - @cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} -.endif - @${ECHO} "" - @${ECHO} "IMPORTANT NOTE FOR ADMINS UPGRADING FROM 1.X->2.X!!!" - @${ECHO} "" - @${ECHO} " *) Don't forget to update the database using a script from" - @${ECHO} " ${DATADIR}/sql/" - @${ECHO} " *) Many programs have been renamed and their arguments changed." - @${ECHO} " *) Read the upgrading notes." - @${ECHO} " *) Don't be careless with this upgrade or mail will be lost!" - @${ECHO} " *) dbmail can be controled by setting dbmail_imapd_enable," - @${ECHO} " dbmail_lmtpd_enable, and/or dbmail_pop3d_enable in" - @${ECHO} " /etc/rc.conf." - @${ECHO} "" - -.include <bsd.port.mk> diff --git a/mail/dbmail20/distinfo b/mail/dbmail20/distinfo deleted file mode 100644 index 776ad1c05d7a..000000000000 --- a/mail/dbmail20/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (dbmail-2.0.4.tgz) = fc80ac11a24286aa78ee71dd78c965a1 -SIZE (dbmail-2.0.4.tgz) = 589603 diff --git a/mail/dbmail20/files/dbmail-imapd.sh.in b/mail/dbmail20/files/dbmail-imapd.sh.in deleted file mode 100644 index 82505e96d9b0..000000000000 --- a/mail/dbmail20/files/dbmail-imapd.sh.in +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# PROVIDE: dbmail-imapd -# REQUIRE: DAEMON -# KEYWORD: shutdown - -# -# Add the following lines to /etc/rc.conf to enable dbmail-imapd: -# -#dbmail_imapd_enable="YES" -# -# See dbmail-imapd(8) for flags -# - -. %%RC_SUBR%% - -name=dbmail_imapd -rcvar=`set_rcvar` - -command=%%PREFIX%%/sbin/dbmail-imapd -pidfile=/var/run/dbmail-imapd.pid -required_files=%%PREFIX%%/etc/dbmail.conf - -# read settings, set default values -load_rc_config "$name" -: ${dbmail_imapd_enable="NO"} -: ${dbmail_imapd_flags=""} - -run_rc_command "$1" diff --git a/mail/dbmail20/files/dbmail-lmtpd.sh.in b/mail/dbmail20/files/dbmail-lmtpd.sh.in deleted file mode 100644 index f1133f43a70e..000000000000 --- a/mail/dbmail20/files/dbmail-lmtpd.sh.in +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# PROVIDE: dbmail-lmtpd -# REQUIRE: DAEMON -# KEYWORD: shutdown - -# -# Add the following lines to /etc/rc.conf to enable dbmail-lmtpd: -# -#dbmail_lmtpd_enable="YES" -# -# See dbmail-lmtpd(8) for flags -# - -. %%RC_SUBR%% - -name=dbmail_lmtpd -rcvar=`set_rcvar` - -command=%%PREFIX%%/sbin/dbmail-lmtpd -pidfile=/var/run/dbmail-lmtpd.pid -required_files=%%PREFIX%%/etc/dbmail.conf - -# read settings, set default values -load_rc_config "$name" -: ${dbmail_lmtpd_enable="NO"} -: ${dbmail_lmtpd_flags=""} - -run_rc_command "$1" diff --git a/mail/dbmail20/files/dbmail-pop3d.sh.in b/mail/dbmail20/files/dbmail-pop3d.sh.in deleted file mode 100644 index d787f6a668e7..000000000000 --- a/mail/dbmail20/files/dbmail-pop3d.sh.in +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# PROVIDE: dbmail-pop3d -# REQUIRE: DAEMON -# KEYWORD: shutdown - -# -# Add the following lines to /etc/rc.conf to enable dbmail-pop3d: -# -#dbmail_pop3d_enable="YES" -# -# See dbmail-pop3d(8) for flags -# - -. %%RC_SUBR%% - -name=dbmail_pop3d -rcvar=`set_rcvar` - -command=%%PREFIX%%/sbin/dbmail-pop3d -pidfile=/var/run/dbmail-pop3d.pid -required_files=%%PREFIX%%/etc/dbmail.conf - -# read settings, set default values -load_rc_config "$name" -: ${dbmail_pop3d_enable="NO"} -: ${dbmail_pop3d_flags=""} - -run_rc_command "$1" diff --git a/mail/dbmail20/files/patch-2.0.4_bug145_lmtp.c b/mail/dbmail20/files/patch-2.0.4_bug145_lmtp.c deleted file mode 100644 index 8e355487776c..000000000000 --- a/mail/dbmail20/files/patch-2.0.4_bug145_lmtp.c +++ /dev/null @@ -1,66 +0,0 @@ -Index: lmtp.c -=================================================================== ---- lmtp.c (revision 1559) -+++ lmtp.c (revision 1700) -@@ -77,8 +77,9 @@ - * - -1 on error - * - 1 on success - */ --static int read_whole_message_network(FILE *instream, char **whole_message, -- u64_t *whole_message_size); -+static int read_whole_message_network(FILE *instream, -+ char **whole_message, u64_t *whole_message_size, -+ const char *prepend_format, ...) PRINTF_ARGS(4, 5); - - /** - * \function lmtp_error -@@ -624,7 +625,9 @@ - if (read_whole_message_network( - (FILE *) instream, - &whole_message, -- &whole_message_size) < 0) { -+ &whole_message_size, -+ "Return-Path: %s\r\n", -+ (char *)(list_getstart(&from)->data)) < 0) { - trace(TRACE_ERROR, - "%s,%s: read_whole_message_network() failed", - __FILE__, __func__); -@@ -755,8 +758,9 @@ - return 1; - } - --int read_whole_message_network(FILE *instream, char **whole_message, -- u64_t *whole_message_size) -+int read_whole_message_network(FILE *instream, -+ char **whole_message, u64_t *whole_message_size, -+ const char *prepend_format, ...) - { - char *tmpmessage = NULL; - char tmpline[MESSAGE_MAX_LINE_SIZE + 1]; -@@ -765,9 +769,17 @@ - size_t total_size = 0; - size_t current_pos = 0; - int error = 0; -+ va_list argp; - - memset(tmpline, '\0', MESSAGE_MAX_LINE_SIZE + 1); -- while (fgets(tmpline, MESSAGE_MAX_LINE_SIZE, instream) != NULL) { -+ -+ /* This adds the Return-Path header and any other -+ * important headers we might need; see RFC 2076. */ -+ va_start(argp, prepend_format); -+ line_size = vsnprintf(tmpline, MESSAGE_MAX_LINE_SIZE, prepend_format, argp); -+ va_end(argp); -+ -+ do { - line_size = strlen(tmpline); - - /* It sometimes happens that we read a line of size 0, -@@ -798,6 +810,7 @@ - - memset(tmpline, '\0', MESSAGE_MAX_LINE_SIZE + 1); - } -+ while (fgets(tmpline, MESSAGE_MAX_LINE_SIZE, instream) != NULL); - - if (ferror(instream)) { - trace(TRACE_ERROR, "%s,%s: error reading instream", diff --git a/mail/dbmail20/files/patch-2.0.4_bug177 b/mail/dbmail20/files/patch-2.0.4_bug177 deleted file mode 100644 index 6c0630d72ae4..000000000000 --- a/mail/dbmail20/files/patch-2.0.4_bug177 +++ /dev/null @@ -1,575 +0,0 @@ -Index: user.c -=================================================================== ---- user.c (revision 1711) -+++ user.c (revision 1712) -@@ -202,8 +202,8 @@ - memset(&change_flags, 0, sizeof(change_flags)); - - /* get options */ -- opterr = 0; /* suppress error message from getopt() */ -- while ((opt = getopt(argc, argv, -+ dm_opterr = 0; /* suppress error message from getopt() */ -+ while ((opt = dm_getopt(argc, argv, - "-a:d:c:e:l::x:" /* Major modes */ - "W::w:P::p:u:g:m:t:s:S:T:" /* Minor options */ - "i" "f:qnyvVh" /* Common options */ )) != -1) { -@@ -223,16 +223,16 @@ - if (mode) - mode_toomany = 1; - mode = opt; -- if (optarg && strlen(optarg)) -- user = dm_strdup(optarg); -+ if (dm_optarg && strlen(dm_optarg)) -+ user = dm_strdup(dm_optarg); - break; - - case 'x': - if (mode) - mode_toomany = 1; - mode = opt; -- if (optarg && strlen(optarg)) -- alias = dm_strdup(optarg); -+ if (dm_optarg && strlen(dm_optarg)) -+ alias = dm_strdup(dm_optarg); - break; - - case 'l': -@@ -241,8 +241,8 @@ - if (mode != 0 && mode != 'l') - mode_toomany = 1; - mode = opt; -- if (optarg && strlen(optarg)) -- userspec = dm_strdup(optarg); -+ if (dm_optarg && strlen(dm_optarg)) -+ userspec = dm_strdup(dm_optarg); - break; - - case 'i': -@@ -253,13 +253,13 @@ - /* Minor options */ - case 'w': - change_flags.newpasswd = 1; -- passwd = dm_strdup(optarg); -+ passwd = dm_strdup(dm_optarg); - break; - - case 'W': - change_flags.newpasswd = 1; -- if (optarg && strlen(optarg)) { -- passwdfile = dm_strdup(optarg); -+ if (dm_optarg && strlen(dm_optarg)) { -+ passwdfile = dm_strdup(dm_optarg); - change_flags.newpasswdfile = 1; - } else { - change_flags.newpasswdstdin = 1; -@@ -268,20 +268,20 @@ - - case 'u': - change_flags.newuser = 1; -- newuser = dm_strdup(optarg); -+ newuser = dm_strdup(dm_optarg); - break; - - case 'p': - if (!passwdtype) -- passwdtype = dm_strdup(optarg); -+ passwdtype = dm_strdup(dm_optarg); - // else - // Complain about only one type allowed. - break; - - case 'P': - change_flags.newpasswdshadow = 1; -- if (optarg && strlen(optarg)) -- passwdfile = dm_strdup(optarg); -+ if (dm_optarg && strlen(dm_optarg)) -+ passwdfile = dm_strdup(dm_optarg); - else - passwdfile = SHADOWFILE; - passwdtype = "shadow"; -@@ -289,42 +289,42 @@ - - case 'g': - change_flags.newclientid = 1; -- clientid = strtoull(optarg, NULL, 10); -+ clientid = strtoull(dm_optarg, NULL, 10); - break; - - case 'm': - change_flags.newmaxmail = 1; -- maxmail = strtomaxmail(optarg); -+ maxmail = strtomaxmail(dm_optarg); - break; - - case 's': - // Add this item to the user's aliases. -- if (optarg && (len = strlen(optarg))) -- list_nodeadd(&alias_add, optarg, len+1); -+ if (dm_optarg && (len = strlen(dm_optarg))) -+ list_nodeadd(&alias_add, dm_optarg, len+1); - break; - - case 'S': - // Delete this item from the user's aliases. -- if (optarg && (len = strlen(optarg))) -- list_nodeadd(&alias_del, optarg, len+1); -+ if (dm_optarg && (len = strlen(dm_optarg))) -+ list_nodeadd(&alias_del, dm_optarg, len+1); - break; - - case 't': - // Add this item to the alias's forwards. -- if (optarg && (len = strlen(optarg))) -- list_nodeadd(&fwds_add, optarg, len+1); -+ if (dm_optarg && (len = strlen(dm_optarg))) -+ list_nodeadd(&fwds_add, dm_optarg, len+1); - break; - - case 'T': - // Delete this item from the alias's forwards. -- if (optarg && (len = strlen(optarg))) -- list_nodeadd(&fwds_del, optarg, len+1); -+ if (dm_optarg && (len = strlen(dm_optarg))) -+ list_nodeadd(&fwds_del, dm_optarg, len+1); - break; - - /* Common options */ - case 'f': -- if (optarg && strlen(optarg) > 0) -- configFile = optarg; -+ if (dm_optarg && strlen(dm_optarg) > 0) -+ configFile = dm_optarg; - else { - qerrorf("dbmail-users: -f requires a filename\n\n"); - result = 1; -Index: lmtpd.c -=================================================================== ---- lmtpd.c (revision 1711) -+++ lmtpd.c (revision 1712) -@@ -100,8 +100,8 @@ - openlog(PNAME, LOG_PID, LOG_MAIL); - - /* get command-line options */ -- opterr = 0; /* suppress error message from getopt() */ -- while ((opt = getopt(argc, argv, "vVhqnf:p:")) != -1) { -+ dm_opterr = 0; /* suppress error message from getopt() */ -+ while ((opt = dm_getopt(argc, argv, "vVhqnf:p:")) != -1) { - switch (opt) { - case 'v': - /* TODO: Perhaps verbose should log to the console with -n? */ -@@ -121,8 +121,8 @@ - do_showhelp(); - return 0; - case 'p': -- if (optarg && strlen(optarg) > 0) -- pidFile = optarg; -+ if (dm_optarg && strlen(dm_optarg) > 0) -+ pidFile = dm_optarg; - else { - fprintf(stderr, - "dbmail-lmtpd: -p requires a filename " -@@ -131,8 +131,8 @@ - } - break; - case 'f': -- if (optarg && strlen(optarg) > 0) -- configFile = optarg; -+ if (dm_optarg && strlen(dm_optarg) > 0) -+ configFile = dm_optarg; - else { - fprintf(stderr, - "dbmail-lmtpd: -f requires a filename " -Index: dm_getopt.c -=================================================================== ---- dm_getopt.c (revision 1711) -+++ dm_getopt.c (revision 1712) -@@ -135,7 +135,7 @@ - */ - - int _dm_getopt_internal(int argc, char * argv[], const char *shortopts, -- const struct option *longopts, int *longind, -+ const struct dm_option *longopts, int *longind, - int long_only) - { - char mode, colon_mode = *shortopts; -@@ -261,13 +261,13 @@ - } - - int dm_getopt_long(int argc, char * argv[], const char *shortopts, -- const struct option *longopts, int *longind) -+ const struct dm_option *longopts, int *longind) - { - return _dm_getopt_internal(argc, argv, shortopts, longopts, longind, 0); - } - - int dm_getopt_long_only(int argc, char * argv[], const char *shortopts, -- const struct option *longopts, int *longind) -+ const struct dm_option *longopts, int *longind) - { - return _dm_getopt_internal(argc, argv, shortopts, longopts, longind, 1); - } -Index: maintenance.c -=================================================================== ---- maintenance.c (revision 1711) -+++ maintenance.c (revision 1712) -@@ -121,8 +121,8 @@ - setvbuf(stdout, 0, _IONBF, 0); - - /* get options */ -- opterr = 0; /* suppress error message from getopt() */ -- while ((opt = getopt(argc, argv, -+ dm_opterr = 0; /* suppress error message from getopt() */ -+ while ((opt = dm_getopt(argc, argv, - "-acrtl:pudb" /* Main options */ - "i" /* Maybe later options */ - "f:qnyvVh")) != -1) { /* Common options */ -@@ -173,8 +173,8 @@ - case 'l': - check_iplog = 1; - do_nothing = 0; -- if (optarg) -- strncpy(timespec, optarg, LEN); -+ if (dm_optarg) -+ strncpy(timespec, dm_optarg, LEN); - else - timespec[0] = 0; - -@@ -209,8 +209,8 @@ - break; - - case 'f': -- if (optarg && strlen(optarg) > 0) -- configFile = optarg; -+ if (dm_optarg && strlen(dm_optarg) > 0) -+ configFile = dm_optarg; - else { - qerrorf("dbmail-util: -f requires a filename\n\n" ); - return 1; -Index: dm_getopt.h -=================================================================== ---- dm_getopt.h (revision 1711) -+++ dm_getopt.h (revision 1712) -@@ -26,38 +26,23 @@ - */ - - #include "config.h" -+#ifndef DM_GETOPT_H -+#define DM_GETOPT_H - --#ifndef USE_DM_GETOPT --# include <getopt.h> --#endif -+# ifndef USE_DM_GETOPT -+# include <getopt.h> -+# define dm_getopt getopt -+# define dm_getopt_long getopt_long -+# define dm_getopt_long_only getopt_long_only -+# define _dm_getopt_internal _getopt_internal -+# define dm_opterr opterr -+# define dm_optind optind -+# define dm_optopt optopt -+# define dm_optarg optarg -+# endif - --#ifdef USE_DM_GETOPT -+# ifdef USE_DM_GETOPT - --# ifndef DM_GETOPT_H -- /* Our include guard first. */ --# define DM_GETOPT_H -- /* Try to kill the system getopt.h */ --# define _GETOPT_DECLARED --# define _GETOPT_H --# define GETOPT_H -- --# undef getopt --# define getopt dm_getopt --# undef getopt_long --# define getopt_long dm_getopt_long --# undef getopt_long_only --# define getopt_long_only dm_getopt_long_only --# undef _getopt_internal --# define _getopt_internal _dm_getopt_internal --# undef opterr --# define opterr dm_opterr --# undef optind --# define optind dm_optind --# undef optopt --# define optopt dm_optopt --# undef optarg --# define optarg dm_optarg -- - # ifdef __cplusplus - extern "C" { - # endif -@@ -68,7 +53,7 @@ - extern int dm_optind, dm_opterr, dm_optopt; - extern char *dm_optarg; - --struct option { -+struct dm_option { - const char *name; - int has_arg; - int *flag; -@@ -76,28 +61,25 @@ - }; - - /* human-readable values for has_arg */ --# undef no_argument --# define no_argument 0 --# undef required_argument --# define required_argument 1 --# undef optional_argument --# define optional_argument 2 -+# define dm_getopt_no_argument 0 -+# define dm_getopt_required_argument 1 -+# define dm_getopt_optional_argument 2 - - /* GNU-style long-argument parsers */ - extern int dm_getopt_long(int argc, char * argv[], const char *shortopts, -- const struct option *longopts, int *longind); -+ const struct dm_option *longopts, int *longind); - - extern int dm_getopt_long_only(int argc, char * argv[], const char *shortopts, -- const struct option *longopts, int *longind); -+ const struct dm_option *longopts, int *longind); - - extern int _dm_getopt_internal(int argc, char * argv[], const char *shortopts, -- const struct option *longopts, int *longind, -+ const struct dm_option *longopts, int *longind, - int long_only); - - # ifdef __cplusplus - } - # endif - --# endif /* DM_GETOPT_H */ -+# endif /* USE_DM_GETOPT */ - --#endif /* USE_DM_GETOPT */ -+#endif /* DM_GETOPT_H */ -Index: timsieved.c -=================================================================== ---- timsieved.c (revision 1711) -+++ timsieved.c (revision 1712) -@@ -99,8 +99,8 @@ - openlog(PNAME, LOG_PID, LOG_MAIL); - - /* get command-line options */ -- opterr = 0; /* suppress error message from getopt() */ -- while ((opt = getopt(argc, argv, "vVhqnf:p:")) != -1) { -+ dm_opterr = 0; /* suppress error message from getopt() */ -+ while ((opt = dm_getopt(argc, argv, "vVhqnf:p:")) != -1) { - switch (opt) { - case 'v': - /* TODO: Perhaps verbose should log to the console with -n? */ -@@ -120,8 +120,8 @@ - do_showhelp(); - return 0; - case 'p': -- if (optarg && strlen(optarg) > 0) -- pidFile = optarg; -+ if (dm_optarg && strlen(dm_optarg) > 0) -+ pidFile = dm_optarg; - else { - fprintf(stderr, - "dbmail-timsieved: -p requires a filename " -@@ -130,8 +130,8 @@ - } - break; - case 'f': -- if (optarg && strlen(optarg) > 0) -- configFile = optarg; -+ if (dm_optarg && strlen(dm_optarg) > 0) -+ configFile = dm_optarg; - else { - fprintf(stderr, - "dbmail-timsieved: -f requires a filename " -Index: pop3d.c -=================================================================== ---- pop3d.c (revision 1711) -+++ pop3d.c (revision 1712) -@@ -103,8 +103,8 @@ - openlog(PNAME, LOG_PID, LOG_MAIL); - - /* get command-line options */ -- opterr = 0; /* suppress error message from getopt() */ -- while ((opt = getopt(argc, argv, "vVhqnf:p:")) != -1) { -+ dm_opterr = 0; /* suppress error message from getopt() */ -+ while ((opt = dm_getopt(argc, argv, "vVhqnf:p:")) != -1) { - switch (opt) { - case 'v': - /* TODO: Perhaps verbose should log to the console with -n? */ -@@ -124,8 +124,8 @@ - do_showhelp(); - return 0; - case 'p': -- if (optarg && strlen(optarg) > 0) -- pidFile = optarg; -+ if (dm_optarg && strlen(dm_optarg) > 0) -+ pidFile = dm_optarg; - else { - fprintf(stderr, - "dbmail-pop3d: -p requires a filename " -@@ -134,8 +134,8 @@ - } - break; - case 'f': -- if (optarg && strlen(optarg) > 0) -- configFile = optarg; -+ if (dm_optarg && strlen(dm_optarg) > 0) -+ configFile = dm_optarg; - else { - fprintf(stderr, - "dbmail-pop3d: -f requires a filename " -Index: imapd.c -=================================================================== ---- imapd.c (revision 1711) -+++ imapd.c (revision 1712) -@@ -97,8 +97,8 @@ - openlog(PNAME, LOG_PID, LOG_MAIL); - - /* get command-line options */ -- opterr = 0; /* suppress error message from getopt() */ -- while ((opt = getopt(argc, argv, "vVhqnf:p:")) != -1) { -+ dm_opterr = 0; /* suppress error message from getopt() */ -+ while ((opt = dm_getopt(argc, argv, "vVhqnf:p:")) != -1) { - switch (opt) { - case 'v': - /* TODO: Perhaps verbose should log to the console with -n? */ -@@ -118,8 +118,8 @@ - do_showhelp(); - return 0; - case 'p': -- if (optarg && strlen(optarg) > 0) -- pidFile = optarg; -+ if (dm_optarg && strlen(dm_optarg) > 0) -+ pidFile = dm_optarg; - else { - fprintf(stderr, - "dbmail-imapd: -p requires a filename " -@@ -128,8 +128,8 @@ - } - break; - case 'f': -- if (optarg && strlen(optarg) > 0) -- configFile = optarg; -+ if (dm_optarg && strlen(dm_optarg) > 0) -+ configFile = dm_optarg; - else { - fprintf(stderr, - "dbmail-imapd: -f requires a filename " -Index: sievecmd.c -=================================================================== ---- sievecmd.c (revision 1711) -+++ sievecmd.c (revision 1712) -@@ -57,7 +57,7 @@ - char *user_name = NULL; - char *name = NULL; - FILE *source = NULL; -- extern char *optarg; -+ extern char *dm_optarg; - - openlog(PNAME, LOG_PID, LOG_MAIL); - -@@ -70,7 +70,7 @@ - configure_debug(TRACE_ERROR, 1, 0); - - while (opt != -1 && act != 'h') { -- opt = getopt(argc, argv, "a:d:i:r:u:l"); -+ opt = dm_getopt(argc, argv, "a:d:i:r:u:l"); - - switch (opt) { - case -1: -@@ -84,11 +84,11 @@ - act = 'h'; - else - act = opt; -- name = optarg; -+ name = dm_optarg; - source = stdin; // FIXME to take files as input, too - break; - case 'u': -- user_name = dm_strdup(optarg); -+ user_name = dm_strdup(dm_optarg); - break; - case 'l': - if (act != 0) -Index: main.c -=================================================================== ---- main.c (revision 1711) -+++ main.c (revision 1712) -@@ -189,7 +189,7 @@ - * with an immediately preceding option are return with option - * value '1'. We will use this to allow for multiple values to - * follow after each of the supported options. */ -- while ((c = getopt(argc, argv, "-t::m:u:d:r: f:qnyvVh")) != EOF) { -+ while ((c = dm_getopt(argc, argv, "-t::m:u:d:r: f:qnyvVh")) != EOF) { - /* Received an n-th value following the last option, - * so recall the last known option to be used in the switch. */ - if (c == 1) -@@ -200,13 +200,13 @@ - case 't': - trace(TRACE_INFO, "main(): using NORMAL_DELIVERY"); - -- if (optarg) { -+ if (dm_optarg) { - if (deliver_to_header) { - printf - ("Only one header field may be specified.\n"); - usage_error = 1; - } else -- deliver_to_header = optarg; -+ deliver_to_header = dm_optarg; - } else - deliver_to_header = "deliver-to"; - -@@ -221,7 +221,7 @@ - ("Only one header field may be specified.\n"); - usage_error = 1; - } else -- deliver_to_mailbox = optarg; -+ deliver_to_mailbox = dm_optarg; - - break; - -@@ -231,8 +231,8 @@ - - /* Add argument onto the returnpath list. */ - if (list_nodeadd -- (&returnpath, optarg, -- strlen(optarg) + 1) == 0) { -+ (&returnpath, dm_optarg, -+ strlen(dm_optarg) + 1) == 0) { - trace(TRACE_ERROR, - "main(): list_nodeadd reports out of memory" - " while adding to returnpath"); -@@ -247,7 +247,7 @@ - "main(): using SPECIAL_DELIVERY to usernames"); - - dsnuser_init(&dsnuser); -- dsnuser.address = dm_strdup(optarg); -+ dsnuser.address = dm_strdup(dm_optarg); - - /* Add argument onto the users list. */ - if (list_nodeadd -@@ -267,7 +267,7 @@ - "main(): using SPECIAL_DELIVERY to email addresses"); - - dsnuser_init(&dsnuser); -- dsnuser.address = dm_strdup(optarg); -+ dsnuser.address = dm_strdup(dm_optarg); - - /* Add argument onto the users list. */ - if (list_nodeadd -@@ -284,8 +284,8 @@ - - /* Common command line options. */ - case 'f': -- if (optarg && strlen(optarg) > 0) -- configFile = optarg; -+ if (dm_optarg && strlen(dm_optarg) > 0) -+ configFile = dm_optarg; - else { - fprintf(stderr, - "dbmail-smtp: -f requires a filename\n\n" ); diff --git a/mail/dbmail20/files/patch-2.0.4_bug184 b/mail/dbmail20/files/patch-2.0.4_bug184 deleted file mode 100644 index 37d6689d66b2..000000000000 --- a/mail/dbmail20/files/patch-2.0.4_bug184 +++ /dev/null @@ -1,66 +0,0 @@ -Index: configure.in -=================================================================== ---- configure.in (revision 1751) -+++ configure.in (revision 1761) -@@ -42,6 +42,7 @@ - DBMAIL_CHECK_SIEVE_LIBS - DBMAIL_CHECK_GC - DBMAIL_CHECK_GETOPT -+DBMAIL_CHECK_SOCKLEN_T - - AC_PROG_CC - AC_COMPILE_WARNINGS -Index: acinclude.m4 -=================================================================== ---- acinclude.m4 (revision 1751) -+++ acinclude.m4 (revision 1761) -@@ -513,3 +513,49 @@ - - # Prerequisites of lib/getopt*. - AC_DEFUN([CHECK_PREREQ_GETOPT], [:]) -+ -+# -+# socklen_t -+# from curl -+ -+dnl Check for socklen_t: historically on BSD it is an int, and in -+dnl POSIX 1g it is a type of its own, but some platforms use different -+dnl types for the argument to getsockopt, getpeername, etc. So we -+dnl have to test to find something that will work. -+AC_DEFUN([DBMAIL_CHECK_SOCKLEN_T], -+[ -+ AC_CHECK_TYPE([socklen_t], ,[ -+ AC_MSG_CHECKING([for socklen_t equivalent]) -+ AC_CACHE_VAL([socklen_t_equiv], -+ [ -+ # Systems have either "struct sockaddr *" or -+ # "void *" as the second argument to getpeername -+ socklen_t_equiv= -+ for arg2 in "struct sockaddr" void; do -+ for t in int size_t unsigned long "unsigned long"; do -+ AC_TRY_COMPILE([ -+ #include <sys/types.h> -+ #include <sys/socket.h> -+ -+ int getpeername (int, $arg2 *, $t *); -+ ],[ -+ $t len; -+ getpeername(0,0,&len); -+ ],[ -+ socklen_t_equiv="$t" -+ break -+ ]) -+ done -+ done -+ -+ if test "x$socklen_t_equiv" = x; then -+ AC_MSG_ERROR([Cannot find a type to use in place of socklen_t]) -+ fi -+ ]) -+ AC_MSG_RESULT($socklen_t_equiv) -+ AC_DEFINE_UNQUOTED(socklen_t, $socklen_t_equiv, -+ [type to use in place of socklen_t if not defined])], -+ [#include <sys/types.h> -+#include <sys/socket.h>]) -+]) -+ diff --git a/mail/dbmail20/files/patch-2.0.4_bug190_pool.c b/mail/dbmail20/files/patch-2.0.4_bug190_pool.c deleted file mode 100644 index 562c0cb23688..000000000000 --- a/mail/dbmail20/files/patch-2.0.4_bug190_pool.c +++ /dev/null @@ -1,126 +0,0 @@ -Index: pool.c -=================================================================== ---- pool.c (revision 1600) -+++ pool.c (revision 1758) -@@ -73,8 +73,10 @@ - void scoreboard_new(serverConfig_t * conf) - { - int serr; -- if ((shmid = shmget(IPC_PRIVATE, P_SIZE, 0644 | IPC_CREAT)) == -1) -- trace(TRACE_FATAL, "%s,%s: shmget failed",__FILE__,__func__); -+ if ((shmid = shmget(IPC_PRIVATE, P_SIZE, 0644 | IPC_CREAT)) == -1) { -+ serr = errno; -+ trace(TRACE_FATAL, "%s,%s: shmget failed [%s]",__FILE__,__func__, strerror(serr)); -+ } - scoreboard = shmat(shmid, (void *) 0, 0); - serr=errno; - if (scoreboard == (Scoreboard_t *) (-1)) { -@@ -222,7 +236,7 @@ - } - scoreboard_unlck(); - trace(TRACE_FATAL, -- "%s,%s: pid NOT found on scoreboard [%d]", __FILE__, __FUNCTION__, pid); -+ "%s,%s: pid NOT found on scoreboard [%d]", __FILE__, __func__, pid); - return -1; - } - -@@ -238,25 +252,25 @@ - { - int i; - trace(TRACE_MESSAGE, "%s,%s: register child [%d]", -- __FILE__, __FUNCTION__, getpid()); -+ __FILE__, __func__, getpid()); - - scoreboard_wrlck(); - for (i = 0; i < scoreboard->conf->maxChildren; i++) { - if (scoreboard->child[i].pid == -1) - break; - if (scoreboard->child[i].pid == getpid()) { -- trace(TRACE_ERROR, -+ scoreboard_unlck(); -+ trace(TRACE_FATAL, - "%s,%s: child already registered.", -- __FILE__, __FUNCTION__); -- scoreboard_unlck(); -+ __FILE__, __func__); - return -1; - } - } - if (i == scoreboard->conf->maxChildren) { -+ scoreboard_unlck(); - trace(TRACE_WARNING, - "%s,%s: no empty slot found", -- __FILE__, __FUNCTION__); -- scoreboard_unlck(); -+ __FILE__, __func__); - return -1; - } - -@@ -264,8 +278,8 @@ - scoreboard->child[i].status = STATE_IDLE; - scoreboard_unlck(); - -- trace(TRACE_INFO, "%s,%s: initializing child_state [%d] using slot [%d]", -- __FILE__, __FUNCTION__, getpid(), i); -+ trace(TRACE_MESSAGE, "%s,%s: initializing child_state [%d] using slot [%d]", -+ __FILE__, __func__, getpid(), i); - return 0; - } - -@@ -281,7 +295,7 @@ - scoreboard->child[key].status = STATE_CONNECTED; - scoreboard_unlck(); - -- trace(TRACE_DEBUG, "%s,%s: [%d]", __FILE__, __FUNCTION__, -+ trace(TRACE_DEBUG, "%s,%s: [%d]", __FILE__, __func__, - getpid()); - } - -@@ -297,7 +311,7 @@ - scoreboard->child[key].status = STATE_IDLE; - scoreboard_unlck(); - -- trace(TRACE_DEBUG, "%s,%s: [%d]", __FILE__, __FUNCTION__, -+ trace(TRACE_DEBUG, "%s,%s: [%d]", __FILE__, __func__, - getpid()); - } - -@@ -320,7 +334,7 @@ - scoreboard_unlck(); - - trace(TRACE_MESSAGE, -- "%s,%s: child [%d] unregistered", __FILE__, __FUNCTION__, -+ "%s,%s: child [%d] unregistered", __FILE__, __func__, - getpid()); - } - -@@ -346,7 +360,7 @@ - manage_stop_children(); - trace(TRACE_FATAL, - "%s,%s: could not create children. Fatal.", -- __FILE__, __FUNCTION__); -+ __FILE__, __func__); - exit(0); - } - } -@@ -360,10 +374,17 @@ - if (chpid == -1) - continue; - if (waitpid(chpid, NULL, WNOHANG|WUNTRACED) == chpid) { -+ scoreboard_release(chpid); - trace(TRACE_MESSAGE,"%s,%s: child [%d] exited. Restarting...", -- __FILE__, __FUNCTION__, chpid); -- scoreboard_release(chpid); -- CreateChild(&childinfo); -+ __FILE__, __func__, chpid); -+ if (CreateChild(&childinfo)== -1) { -+ trace(TRACE_ERROR,"%s,%s: createchild failed. Bailout...", -+ __FILE__, __func__); -+ GeneralStopRequested=1; -+ manage_stop_children(); -+ -+ exit(1); -+ } - } - } - sleep(1); diff --git a/mail/dbmail20/files/patch-2.0.4_bug190_server.c b/mail/dbmail20/files/patch-2.0.4_bug190_server.c deleted file mode 100644 index 23129a5c8b52..000000000000 --- a/mail/dbmail20/files/patch-2.0.4_bug190_server.c +++ /dev/null @@ -1,41 +0,0 @@ -Index: server.c -=================================================================== ---- server.c (revision 1600) -+++ server.c (revision 1758) -@@ -119,9 +119,15 @@ - alarm(10); - - trace(TRACE_DEBUG, "StartServer(): children created, starting main service loop"); -- while (!GeneralStopRequested) -- manage_restart_children(); -- -+ while (!GeneralStopRequested) { -+ if (db_connect() != 0) { -+ GeneralStopRequested=1; -+ } else { -+ db_disconnect(); -+ manage_restart_children(); -+ } -+ } -+ - manage_stop_children(); - scoreboard_delete(); - -@@ -131,6 +137,8 @@ - - void ParentSigHandler(int sig, siginfo_t * info, void *data) - { -+ int saved_errno = errno; -+ - if (ParentPID != getpid()) { - trace(TRACE_INFO, - "ParentSigHandler(): i'm no longer father"); -@@ -162,6 +170,8 @@ - default: - GeneralStopRequested = 1; - } -+ -+ errno = saved_errno; - } - - diff --git a/mail/dbmail20/files/patch-2.0.4_bug190_serverchild.c b/mail/dbmail20/files/patch-2.0.4_bug190_serverchild.c deleted file mode 100644 index bf6da33dcfbd..000000000000 --- a/mail/dbmail20/files/patch-2.0.4_bug190_serverchild.c +++ /dev/null @@ -1,267 +0,0 @@ -Index: serverchild.c -=================================================================== ---- serverchild.c (revision 1600) -+++ serverchild.c (revision 1758) -@@ -66,13 +66,13 @@ - void client_close(void) - { - if (client.tx) { -- trace(TRACE_DEBUG,"%s,%s: closing write stream", __FILE__,__FUNCTION__); -+ trace(TRACE_DEBUG,"%s,%s: closing write stream", __FILE__,__func__); - fflush(client.tx); - fclose(client.tx); /* closes clientSocket as well */ - client.tx = NULL; - } - if (client.rx) { -- trace(TRACE_DEBUG,"%s,%s: closing read stream", __FILE__,__FUNCTION__); -+ trace(TRACE_DEBUG,"%s,%s: closing read stream", __FILE__,__func__); - shutdown(fileno(client.rx), SHUT_RDWR); - fclose(client.rx); - client.rx = NULL; -@@ -86,7 +86,7 @@ - - trace(TRACE_DEBUG, - "%s,%s: database connection still open, closing", -- __FILE__,__FUNCTION__); -+ __FILE__,__func__); - db_disconnect(); - auth_disconnect(); - connected = 0; /* FIXME a signal between this line and the previous one -@@ -99,18 +99,22 @@ - - void noop_child_sig_handler(int sig, siginfo_t *info UNUSED, void *data UNUSED) - { -- trace(TRACE_DEBUG, "%s,%s: ignoring signal [%d]", __FILE__, __FUNCTION__, sig); -+ int saved_errno = errno; -+ trace(TRACE_DEBUG, "%s,%s: ignoring signal [%d]", __FILE__, __func__, sig); -+ errno = saved_errno; - } - - void active_child_sig_handler(int sig, siginfo_t * info UNUSED, void *data UNUSED) - { -+ int saved_errno = errno; -+ - static int triedDisconnect = 0; - - #ifdef _USE_STR_SIGNAL -- trace(TRACE_ERROR, "%s,%s: got signal [%s]", __FILE__, __FUNCTION__, -+ trace(TRACE_ERROR, "%s,%s: got signal [%s]", __FILE__, __func__, - strsignal(sig)); - #else -- trace(TRACE_ERROR, "%s,%s: got signal [%d]", __FILE__, __FUNCTION__, sig); -+ trace(TRACE_ERROR, "%s,%s: got signal [%d]", __FILE__, __func__, sig); - #endif - - /* perform reinit at SIGHUP otherwise exit, but do nothing on -@@ -118,10 +122,10 @@ - switch (sig) { - case SIGCHLD: - trace(TRACE_DEBUG, "%s,%s: SIGCHLD received... ignoring", -- __FILE__, __FUNCTION__); -+ __FILE__, __func__); - break; - case SIGALRM: -- trace(TRACE_DEBUG, "%s,%s: timeout received", __FILE__, __FUNCTION__); -+ trace(TRACE_DEBUG, "%s,%s: timeout received", __FILE__, __func__); - client_close(); - break; - -@@ -132,23 +136,23 @@ - if (ChildStopRequested) { - trace(TRACE_DEBUG, - "%s,%s: already caught a stop request. Closing right now", -- __FILE__,__FUNCTION__); -+ __FILE__,__func__); - - /* already caught this signal, exit the hard way now */ - client_close(); - disconnect_all(); - child_unregister(); -- trace(TRACE_DEBUG, "%s,%s: exit",__FILE__,__FUNCTION__); -+ trace(TRACE_DEBUG, "%s,%s: exit",__FILE__,__func__); - exit(1); - } -- trace(TRACE_DEBUG, "%s,%s: setting stop request",__FILE__,__FUNCTION__); -+ trace(TRACE_DEBUG, "%s,%s: setting stop request",__FILE__,__func__); - DelChildSigHandler(); - ChildStopRequested = 1; - break; - default: - /* bad shtuff, exit */ - trace(TRACE_DEBUG, -- "%s,%s: cannot ignore this. Terminating",__FILE__,__FUNCTION__); -+ "%s,%s: cannot ignore this. Terminating",__FILE__,__func__); - - /* - * For some reason i have not yet determined the process starts eating up -@@ -164,10 +168,12 @@ - disconnect_all(); - } - -- trace(TRACE_DEBUG, "%s,%s: exit", __FILE__, __FUNCTION__); -+ trace(TRACE_DEBUG, "%s,%s: exit", __FILE__, __func__); - child_unregister(); - exit(1); - } -+ -+ errno = saved_errno; - } - - -@@ -239,16 +245,19 @@ - if (! pid) { - if (child_register() == -1) { - trace(TRACE_FATAL, "%s,%s: child_register failed", -- __FILE__, __FUNCTION__); -+ __FILE__, __func__); - exit(0); - - } - - ChildStopRequested = 0; - SetChildSigHandler(); -- trace(TRACE_INFO, "%s,%s: signal handler placed, going to perform task now", -- __FILE__, __FUNCTION__); -- PerformChildTask(info); -+ -+ trace(TRACE_INFO, "%s,%s: signal handler placed, going to perform task now", -+ __FILE__, __func__); -+ -+ if (PerformChildTask(info)== -1) -+ return -1; - child_unregister(); - exit(0); - } else { -@@ -269,22 +278,22 @@ - struct hostent *clientHost; - - if (!info) { -- trace(TRACE_ERROR, -- "PerformChildTask(): NULL info supplied"); -+ trace(TRACE_ERROR, "%s,%s: NULL info supplied", -+ __FILE__, __func__); - return -1; - } - - if (db_connect() != 0) { -- trace(TRACE_ERROR, -- "PerformChildTask(): could not connect to database"); -+ trace(TRACE_ERROR, "%s,%s: could not connect to database", -+ __FILE__, __func__); - return -1; - } - if (db_check_version() != 0) - return -1; - - if (auth_connect() != 0) { -- trace(TRACE_ERROR, -- "PerformChildTask(): could not connect to authentication"); -+ trace(TRACE_ERROR, "%s,%s: could not connect to authentication", -+ __FILE__, __func__); - return -1; - } - -@@ -294,12 +303,13 @@ - for (i = 0; i < info->maxConnect && !ChildStopRequested; i++) { - - if (db_check_connection()) { -- trace(TRACE_ERROR, "%s,%s: database has gone away", __FILE__, __func__); -+ trace(TRACE_ERROR, "%s,%s: database has gone away", -+ __FILE__, __func__); - return -1; - } - -- trace(TRACE_INFO, -- "PerformChildTask(): waiting for connection"); -+ trace(TRACE_INFO, "%s,%s: waiting for connection", -+ __FILE__, __func__); - - child_reg_disconnected(); - -@@ -312,8 +322,8 @@ - - if (clientSocket == -1) { - i--; /* don't count this as a connect */ -- trace(TRACE_INFO, -- "PerformChildTask(): accept failed"); -+ trace(TRACE_INFO, "%s,%s: accept failed", -+ __FILE__, __func__); - continue; /* accept failed, refuse connection & continue */ - } - -@@ -337,30 +347,29 @@ - strncpy(client.clientname, - clientHost->h_name, FIELDSIZE); - -- trace(TRACE_MESSAGE, -- "PerformChildTask(): incoming connection from [%s (%s)]", -+ trace(TRACE_MESSAGE, "%s,%s: incoming connection from [%s (%s)]", -+ __FILE__, __func__, - client.ip, - client.clientname[0] ? client. - clientname : "Lookup failed"); - } else { -- trace(TRACE_MESSAGE, -- "PerformChildTask(): incoming connection from [%s]", -- client.ip); -+ trace(TRACE_MESSAGE, "%s,%s: incoming connection from [%s]", -+ __FILE__, __func__, client.ip); - } - - /* make streams */ - if (!(client.rx = fdopen(dup(clientSocket), "r"))) { - /* read-FILE opening failure */ -- trace(TRACE_ERROR, -- "PerformChildTask(): error opening read file stream"); -+ trace(TRACE_ERROR, "%s,%s: error opening read file stream", -+ __FILE__, __func__); - close(clientSocket); - continue; - } - - if (!(client.tx = fdopen(clientSocket, "w"))) { - /* write-FILE opening failure */ -- trace(TRACE_ERROR, -- "PerformChildTask(): error opening write file stream"); -+ trace(TRACE_ERROR, "%s,%s: error opening write file stream", -+ __FILE__, __func__); - fclose(client.rx); - close(clientSocket); - memset(&client, 0, sizeof(client)); -@@ -370,8 +379,8 @@ - setvbuf(client.tx, (char *) NULL, _IOLBF, 0); - setvbuf(client.rx, (char *) NULL, _IOLBF, 0); - -- trace(TRACE_DEBUG, -- "PerformChildTask(): client info init complete, calling client handler"); -+ trace(TRACE_DEBUG, "%s,%s: client info init complete, calling client handler", -+ __FILE__, __func__); - - /* streams are ready, perform handling */ - info->ClientHandler(&client); -@@ -379,17 +388,19 @@ - set_proc_title("%s", "Idle"); - #endif - -- trace(TRACE_DEBUG, -- "PerformChildTask(): client handling complete, closing streams"); -+ trace(TRACE_DEBUG, "%s,%s: client handling complete, closing streams", -+ __FILE__, __func__); - client_close(); -- trace(TRACE_INFO, "PerformChildTask(): connection closed"); -+ trace(TRACE_INFO, "%s,%s: connection closed", -+ __FILE__, __func__); - } - - if (!ChildStopRequested) -- trace(TRACE_ERROR, -- "PerformChildTask(): maximum number of connections reached, stopping now"); -+ trace(TRACE_ERROR, "%s,%s: maximum number of connections reached, stopping now", -+ __FILE__, __func__); - else -- trace(TRACE_ERROR, "PerformChildTask(): stop requested"); -+ trace(TRACE_ERROR, "%s,%s: stop requested", -+ __FILE__, __func__); - - child_reg_disconnected(); - disconnect_all(); diff --git a/mail/dbmail20/files/patch-2.0.4_bug198_pool.c b/mail/dbmail20/files/patch-2.0.4_bug198_pool.c deleted file mode 100644 index c21e745d9dda..000000000000 --- a/mail/dbmail20/files/patch-2.0.4_bug198_pool.c +++ /dev/null @@ -1,13 +0,0 @@ -Index: pool.c -=================================================================== ---- pool.c (revision 1763) -+++ pool.c (revision 1787) -@@ -433,7 +433,7 @@ - - for (i = 0; i < scoreboard->conf->maxChildren; i++) { - chpid = scoreboard->child[i].pid; -- if (chpid != 0) -+ if (chpid > 0) - kill(chpid, SIGKILL);; - scoreboard_release(chpid); - } diff --git a/mail/dbmail20/files/patch-2.0.4_bug199_server.c b/mail/dbmail20/files/patch-2.0.4_bug199_server.c deleted file mode 100644 index 6786e6c8fc60..000000000000 --- a/mail/dbmail20/files/patch-2.0.4_bug199_server.c +++ /dev/null @@ -1,35 +0,0 @@ -Index: server.c -=================================================================== ---- server.c (revision 1763) -+++ server.c (revision 1787) -@@ -69,7 +69,7 @@ - - act.sa_sigaction = ParentSigHandler; - sigemptyset(&act.sa_mask); -- act.sa_flags = SA_SIGINFO; -+ act.sa_flags = SA_SIGINFO | SA_NOCLDSTOP; - - sigaction(SIGCHLD, &act, 0); - sigaction(SIGINT, &act, 0); -@@ -152,6 +152,7 @@ - - void ParentSigHandler(int sig, siginfo_t * info, void *data) - { -+ pid_t chpid; - int saved_errno = errno; - - if (ParentPID != getpid()) { -@@ -175,7 +176,12 @@ - break; - - case SIGCHLD: -- break; /* ignore, wait for child in main loop */ -+ /* ignore, wait for child in main loop */ -+ /* but we need to catch zombie */ -+ if ((chpid = waitpid(-1,&sig,WNOHANG)) > 0) -+ scoreboard_release(chpid); -+ -+ break; - - case SIGHUP: - trace(TRACE_DEBUG, diff --git a/mail/dbmail20/files/patch-2.0.4_bug214_main.c b/mail/dbmail20/files/patch-2.0.4_bug214_main.c deleted file mode 100644 index 18dfefa77e80..000000000000 --- a/mail/dbmail20/files/patch-2.0.4_bug214_main.c +++ /dev/null @@ -1,20 +0,0 @@ -Index: main.c -=================================================================== ---- main.c (revision 1793) -+++ main.c (revision 1796) -@@ -133,6 +133,7 @@ - trace(TRACE_ERROR, "%s,%s: error reading message", - __FILE__, __func__); - dm_free(tmpmessage); -+ tmpmessage=NULL; - return -1; - } - -@@ -371,6 +372,7 @@ - trace(TRACE_ERROR, "%s,%s splitmessage failed", - __FILE__, __func__); - dm_free(whole_message); -+ whole_message=NULL; - exitcode = EX_TEMPFAIL; - goto freeall; - } diff --git a/mail/dbmail20/files/patch-2.0.4_bug216_header.c b/mail/dbmail20/files/patch-2.0.4_bug216_header.c deleted file mode 100644 index d9610a5cd609..000000000000 --- a/mail/dbmail20/files/patch-2.0.4_bug216_header.c +++ /dev/null @@ -1,37 +0,0 @@ -Index: header.c -=================================================================== ---- header.c (revision 1796) -+++ header.c (revision 1813) -@@ -176,15 +176,17 @@ - if (message_content[line_content_size] == '\n') { - tmp_line_size = line_content_size + 1; - tmp_line_rfcsize = tmp_line_size + 1; -- } else { -- if (message_content[line_content_size] == '\r' && -- message_content[line_content_size + 1] == '\n') { -+ } else if (message_content[line_content_size] == '\r') { -+ if (message_content[line_content_size + 1] == '\n') { -+ /* This is the right behaviour */ - tmp_line_size = line_content_size + 2; - tmp_line_rfcsize = tmp_line_size; - } else { -- trace(TRACE_ERROR, "%s,%s: error reading header line", -- __FILE__, __func__); -- return -1; -+ /* This is broken behaviour, but it's better -+ * than not handling it at all. -+ */ -+ tmp_line_size = line_content_size + 1; -+ tmp_line_rfcsize = tmp_line_size + 1; - } - } - } -@@ -197,7 +199,6 @@ - __FILE__, __func__); - return 0; - } -- else -- return 1; -+ return 1; - - } diff --git a/mail/dbmail20/files/patch-2.0.4_bug79_imaputil.c b/mail/dbmail20/files/patch-2.0.4_bug79_imaputil.c deleted file mode 100644 index dbeb799017be..000000000000 --- a/mail/dbmail20/files/patch-2.0.4_bug79_imaputil.c +++ /dev/null @@ -1,80 +0,0 @@ -Index: imaputil.c -=================================================================== ---- imaputil.c (revision 1726) -+++ imaputil.c (revision 1793) -@@ -65,7 +65,7 @@ - "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; - - /* returned by date_sql2imap() */ --#define IMAP_STANDARD_DATE "03-Nov-1979 00:00:00 +0000" -+#define IMAP_STANDARD_DATE "Sat, 03-Nov-1979 00:00:00 +0000" - char _imapdate[IMAP_INTERNALDATE_LEN] = IMAP_STANDARD_DATE; - - /* returned by date_imap2sql() */ -@@ -1776,50 +1776,35 @@ - - /* - * convert a mySQL date (yyyy-mm-dd hh:mm:ss) to a valid IMAP internal date: -- * 0123456789012345678 -- * dd-mon-yyyy hh:mm:ss with mon characters (i.e. 'Apr' for april) -- * 01234567890123456789 -+ * [Mon, 30 May 2005 10:01:55 +0100] with mon characters (i.e. 'Apr' for april) - * return value is valid until next function call. - * NOTE: if date is not valid, IMAP_STANDARD_DATE is returned - */ - char *date_sql2imap(const char *sqldate) - { -- char *last_char; -- struct tm tm_localtime, tm_sqldate; -- time_t td; -+ struct tm tm_sql_date; -+ struct tm *tm_imap_date; -+ -+ time_t ltime; -+ char *last; - -- /* we need to get the localtime to get the current timezone */ -- if (time(&td) == -1) { -- trace(TRACE_ERROR, "%s,%s: error getting time()", -- __FILE__, __func__); -- return IMAP_STANDARD_DATE; -- } -- tm_localtime = *localtime(&td); -+ last = strptime(sqldate,"%Y-%m-%d %T", &tm_sql_date); -+ if ( (last == NULL) || (*last != '\0') ) { -+ strcpy(_imapdate, IMAP_STANDARD_DATE); -+ return _imapdate; -+ } - -- /* parse sqldate */ -- last_char = strptime(sqldate, "%Y-%m-%d %T", &tm_sqldate); -- if (last_char == NULL || *last_char != '\0') { -- trace(TRACE_DEBUG, "%s,%s, error parsing date [%s]", -- __FILE__, __func__, sqldate); -- strcpy(_imapdate, IMAP_STANDARD_DATE); -- return _imapdate; -- } -- /* copy DST information from localtime */ -- tm_sqldate.tm_gmtoff = tm_localtime.tm_gmtoff; -- tm_sqldate.tm_isdst = tm_localtime.tm_isdst; -+ /* FIXME: this works fine on linux, but may cause dst offsets in netbsd. */ -+ ltime = mktime (&tm_sql_date); -+ tm_imap_date = localtime(<ime); - -- (void) strftime(_imapdate, IMAP_INTERNALDATE_LEN, -- "%d-%b-%Y %T %z", &tm_sqldate); -- -- return _imapdate; -+ strftime(_imapdate, sizeof(_imapdate), "%a, %d %b %Y %H:%M:%S %z", tm_imap_date); -+ return _imapdate; - } - -- - /* - * convert TO a mySQL date (yyyy-mm-dd) FROM a valid IMAP internal date: -- * 0123456789 - * dd-mon-yyyy with mon characters (i.e. 'Apr' for april) -- * 01234567890 - * OR - * d-mon-yyyy - * return value is valid until next function call. diff --git a/mail/dbmail20/files/patch-sort.c b/mail/dbmail20/files/patch-sort.c deleted file mode 100644 index a267163eca11..000000000000 --- a/mail/dbmail20/files/patch-sort.c +++ /dev/null @@ -1,11 +0,0 @@ ---- sort/sort.c.orig Tue Mar 15 00:54:00 2005 -+++ sort/sort.c Mon Apr 11 13:46:46 2005 -@@ -58,7 +58,7 @@ - * - * Then do it! - * */ --dsn_class_t sort_and_deliver(u64_t msgidnr, -+sort_result_t sort_and_deliver(u64_t msgidnr, - const char *header UNUSED, - u64_t headersize UNUSED, - u64_t totalmsgsize, diff --git a/mail/dbmail20/pkg-descr b/mail/dbmail20/pkg-descr deleted file mode 100644 index 2c03d30b6ea9..000000000000 --- a/mail/dbmail20/pkg-descr +++ /dev/null @@ -1,22 +0,0 @@ -Dbmail is the name of a group of programs that enable the possiblilty of storing -and retrieving mail messages from a database (currently MySQL or PostgreSQL). - -What are the advantages? - - * Scalability. - Dbmail is as scalable as the database that is used for the mail storage. - * Manageability. - Dbmail is based upon a database. Dbmail can be managed by changing - settings in the database (f.e. using PHP/Perl/SQL). - * Speed. - Dbmail uses very efficient, database specific queries for retrieving mail - information. This is much faster then parsing a filesystem. - * Security. - Dbmail has got nothing to do with the filesystem or interaction with other - programs in the Unix environment which need special permissions. Dbmail - is as secure as the database it's based upon. - * Flexibility. - Changes on a Dbmail system (adding of users, changing passwords etc.) are - effective immediately. - -WWW: http://www.dbmail.org/ diff --git a/mail/dbmail20/pkg-plist b/mail/dbmail20/pkg-plist deleted file mode 100644 index 66d3c8a85d05..000000000000 --- a/mail/dbmail20/pkg-plist +++ /dev/null @@ -1,36 +0,0 @@ -etc/dbmail.conf-dist -lib/dbmail/libauthdbmail.0 -lib/dbmail/libauthdbmail.a -lib/dbmail/libauthdbmail.la -lib/dbmail/libauthdbmail -lib/dbmail/libsortdbmail.0 -lib/dbmail/libsortdbmail.a -lib/dbmail/libsortdbmail.la -lib/dbmail/libsortdbmail -lib/libdbmail -lib/libdbmail.0 -lib/libdbmail.a -lib/libdbmail.la -sbin/dbmail-imapd -sbin/dbmail-lmtpd -sbin/dbmail-pop3d -sbin/dbmail-smtp -sbin/dbmail-users -sbin/dbmail-util -%%MYSQL%%%%DATADIR%%/sql/create_tables.mysql -%%MYSQL%%%%DATADIR%%/sql/create_tables_innoDB.mysql -%%MYSQL%%%%DATADIR%%/sql/migrate_from_1.x_to_2.0.mysql -%%MYSQL%%%%DATADIR%%/sql/migrate_from_1.x_to_2.0_innodb.mysql -%%MYSQL%%lib/dbmail/libmysqldbmail.0 -%%MYSQL%%lib/dbmail/libmysqldbmail.a -%%MYSQL%%lib/dbmail/libmysqldbmail.la -%%MYSQL%%lib/dbmail/libmysqldbmail -%%PGSQL%%%%DATADIR%%/sql/create_tables.pgsql -%%PGSQL%%%%DATADIR%%/sql/migrate_from_1.x_to_2.0.pgsql -%%PGSQL%%/lib/dbmail/libpgsqldbmail.0 -%%PGSQL%%/lib/dbmail/libpgsqldbmail.a -%%PGSQL%%/lib/dbmail/libpgsqldbmail.la -%%PGSQL%%/lib/dbmail/libpgsqldbmail -@dirrm lib/dbmail -@dirrm %%DATADIR%%/sql -@dirrm %%DATADIR%% diff --git a/mail/dbmail21/Makefile b/mail/dbmail21/Makefile deleted file mode 100644 index d138d51531d7..000000000000 --- a/mail/dbmail21/Makefile +++ /dev/null @@ -1,90 +0,0 @@ -# New ports collection makefile for: dbmail -# Date created: 07/26/2003 -# Whom: Clement Laforet <sheepkiller@cultdeadsheep.org> -# -# $FreeBSD$ -# - -PORTNAME= dbmail -PORTVERSION= 2.0.4 -PORTREVISION= 1 -CATEGORIES= mail -MASTER_SITES= http://www.dbmail.org/download/ -PKGNAMESUFFIX= -${DATABASE} -EXTRACT_SUFX= .tgz - -MAINTAINER= seanc@FreeBSD.org -COMMENT= An SQL database-based mail system (POP3 and IMAP) - -USE_REINPLACE= YES -GNU_CONFIGURE= YES -CONFIGURE_ARGS= --prefix=${PREFIX} -USE_GMAKE= YES -USE_OPENSSL= YES -USE_RC_SUBR= dbmail-pop3d.sh dbmail-lmtpd.sh dbmail-imapd.sh - -CFLAGS += -fPIC - -.if defined(WITH_POSTGRESQL) -CONFIGURE_ARGS+= --with-pgsql -USE_PGSQL= yes -DATABASE= postgresql -PLIST_SUB+= PGSQL="" -PLIST_SUB+= MYSQL="@comment " -LDFLAGS+= -L${LOCALBASE}/lib/ -.else -USE_MYSQL= YES -CONFIGURE_ARGS+= --with-mysql -DATABASE= mysql -PLIST_SUB+= MYSQL="" -PLIST_SUB+= PGSQL="@comment " -CFLAGS+= -I${LOCALBASE}/include/mysql -LDFLAGS+= -L${LOCALBASE}/lib/mysql -.endif - -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" LOCALBASE=${LOCALBASE} -PORTDOCS= INSTALL README EXTRAS - -MAN1= dbmail-smtp.1 -MAN8= dbmail-imapd.8 dbmail-lmtpd.8 dbmail-pop3d.8 \ - dbmail-users.8 dbmail-util.8 -MANCOMPRESSED= no - -pre-everything:: - @${ECHO} "" - @${ECHO} "You may use the following build options:" - @${ECHO} " By default dbmail uses MySQL backend database." - @${ECHO} " To build dbmail with PostgreSQL as backend database," - @${ECHO} " define WITH_POSTGRESQL" - @${ECHO} "" - -post-patch: - @${FIND} ${WRKSRC} -name CVS -type d | ${XARGS} ${RM} -fr - -post-configure: - @${REINPLACE_CMD} -i.orig 's!/etc/dbmail.conf!${PREFIX}/etc/dbmail.conf!g' \ - ${WRKSRC}/dbmail.h - -post-install: - @${INSTALL_DATA} ${WRKSRC}/dbmail.conf ${PREFIX}/etc/dbmail.conf-dist - @${MKDIR} ${DATADIR}/sql - @${INSTALL_DATA} ${WRKSRC}/sql/${DATABASE}/* ${DATADIR}/sql - @cd ${WRKSRC}/man && ${INSTALL_MAN} ${MAN1} ${MAN1PREFIX}/man/man1 -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - @cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} -.endif - @${ECHO} "" - @${ECHO} "IMPORTANT NOTE FOR ADMINS UPGRADING FROM 1.X->2.X!!!" - @${ECHO} "" - @${ECHO} " *) Don't forget to update the database using a script from" - @${ECHO} " ${DATADIR}/sql/" - @${ECHO} " *) Many programs have been renamed and their arguments changed." - @${ECHO} " *) Read the upgrading notes." - @${ECHO} " *) Don't be careless with this upgrade or mail will be lost!" - @${ECHO} " *) dbmail can be controled by setting dbmail_imapd_enable," - @${ECHO} " dbmail_lmtpd_enable, and/or dbmail_pop3d_enable in" - @${ECHO} " /etc/rc.conf." - @${ECHO} "" - -.include <bsd.port.mk> diff --git a/mail/dbmail21/distinfo b/mail/dbmail21/distinfo deleted file mode 100644 index 776ad1c05d7a..000000000000 --- a/mail/dbmail21/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (dbmail-2.0.4.tgz) = fc80ac11a24286aa78ee71dd78c965a1 -SIZE (dbmail-2.0.4.tgz) = 589603 diff --git a/mail/dbmail21/files/dbmail-imapd.sh.in b/mail/dbmail21/files/dbmail-imapd.sh.in deleted file mode 100644 index 82505e96d9b0..000000000000 --- a/mail/dbmail21/files/dbmail-imapd.sh.in +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# PROVIDE: dbmail-imapd -# REQUIRE: DAEMON -# KEYWORD: shutdown - -# -# Add the following lines to /etc/rc.conf to enable dbmail-imapd: -# -#dbmail_imapd_enable="YES" -# -# See dbmail-imapd(8) for flags -# - -. %%RC_SUBR%% - -name=dbmail_imapd -rcvar=`set_rcvar` - -command=%%PREFIX%%/sbin/dbmail-imapd -pidfile=/var/run/dbmail-imapd.pid -required_files=%%PREFIX%%/etc/dbmail.conf - -# read settings, set default values -load_rc_config "$name" -: ${dbmail_imapd_enable="NO"} -: ${dbmail_imapd_flags=""} - -run_rc_command "$1" diff --git a/mail/dbmail21/files/dbmail-lmtpd.sh.in b/mail/dbmail21/files/dbmail-lmtpd.sh.in deleted file mode 100644 index f1133f43a70e..000000000000 --- a/mail/dbmail21/files/dbmail-lmtpd.sh.in +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# PROVIDE: dbmail-lmtpd -# REQUIRE: DAEMON -# KEYWORD: shutdown - -# -# Add the following lines to /etc/rc.conf to enable dbmail-lmtpd: -# -#dbmail_lmtpd_enable="YES" -# -# See dbmail-lmtpd(8) for flags -# - -. %%RC_SUBR%% - -name=dbmail_lmtpd -rcvar=`set_rcvar` - -command=%%PREFIX%%/sbin/dbmail-lmtpd -pidfile=/var/run/dbmail-lmtpd.pid -required_files=%%PREFIX%%/etc/dbmail.conf - -# read settings, set default values -load_rc_config "$name" -: ${dbmail_lmtpd_enable="NO"} -: ${dbmail_lmtpd_flags=""} - -run_rc_command "$1" diff --git a/mail/dbmail21/files/dbmail-pop3d.sh.in b/mail/dbmail21/files/dbmail-pop3d.sh.in deleted file mode 100644 index d787f6a668e7..000000000000 --- a/mail/dbmail21/files/dbmail-pop3d.sh.in +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# PROVIDE: dbmail-pop3d -# REQUIRE: DAEMON -# KEYWORD: shutdown - -# -# Add the following lines to /etc/rc.conf to enable dbmail-pop3d: -# -#dbmail_pop3d_enable="YES" -# -# See dbmail-pop3d(8) for flags -# - -. %%RC_SUBR%% - -name=dbmail_pop3d -rcvar=`set_rcvar` - -command=%%PREFIX%%/sbin/dbmail-pop3d -pidfile=/var/run/dbmail-pop3d.pid -required_files=%%PREFIX%%/etc/dbmail.conf - -# read settings, set default values -load_rc_config "$name" -: ${dbmail_pop3d_enable="NO"} -: ${dbmail_pop3d_flags=""} - -run_rc_command "$1" diff --git a/mail/dbmail21/files/patch-2.0.4_bug145_lmtp.c b/mail/dbmail21/files/patch-2.0.4_bug145_lmtp.c deleted file mode 100644 index 8e355487776c..000000000000 --- a/mail/dbmail21/files/patch-2.0.4_bug145_lmtp.c +++ /dev/null @@ -1,66 +0,0 @@ -Index: lmtp.c -=================================================================== ---- lmtp.c (revision 1559) -+++ lmtp.c (revision 1700) -@@ -77,8 +77,9 @@ - * - -1 on error - * - 1 on success - */ --static int read_whole_message_network(FILE *instream, char **whole_message, -- u64_t *whole_message_size); -+static int read_whole_message_network(FILE *instream, -+ char **whole_message, u64_t *whole_message_size, -+ const char *prepend_format, ...) PRINTF_ARGS(4, 5); - - /** - * \function lmtp_error -@@ -624,7 +625,9 @@ - if (read_whole_message_network( - (FILE *) instream, - &whole_message, -- &whole_message_size) < 0) { -+ &whole_message_size, -+ "Return-Path: %s\r\n", -+ (char *)(list_getstart(&from)->data)) < 0) { - trace(TRACE_ERROR, - "%s,%s: read_whole_message_network() failed", - __FILE__, __func__); -@@ -755,8 +758,9 @@ - return 1; - } - --int read_whole_message_network(FILE *instream, char **whole_message, -- u64_t *whole_message_size) -+int read_whole_message_network(FILE *instream, -+ char **whole_message, u64_t *whole_message_size, -+ const char *prepend_format, ...) - { - char *tmpmessage = NULL; - char tmpline[MESSAGE_MAX_LINE_SIZE + 1]; -@@ -765,9 +769,17 @@ - size_t total_size = 0; - size_t current_pos = 0; - int error = 0; -+ va_list argp; - - memset(tmpline, '\0', MESSAGE_MAX_LINE_SIZE + 1); -- while (fgets(tmpline, MESSAGE_MAX_LINE_SIZE, instream) != NULL) { -+ -+ /* This adds the Return-Path header and any other -+ * important headers we might need; see RFC 2076. */ -+ va_start(argp, prepend_format); -+ line_size = vsnprintf(tmpline, MESSAGE_MAX_LINE_SIZE, prepend_format, argp); -+ va_end(argp); -+ -+ do { - line_size = strlen(tmpline); - - /* It sometimes happens that we read a line of size 0, -@@ -798,6 +810,7 @@ - - memset(tmpline, '\0', MESSAGE_MAX_LINE_SIZE + 1); - } -+ while (fgets(tmpline, MESSAGE_MAX_LINE_SIZE, instream) != NULL); - - if (ferror(instream)) { - trace(TRACE_ERROR, "%s,%s: error reading instream", diff --git a/mail/dbmail21/files/patch-2.0.4_bug177 b/mail/dbmail21/files/patch-2.0.4_bug177 deleted file mode 100644 index 6c0630d72ae4..000000000000 --- a/mail/dbmail21/files/patch-2.0.4_bug177 +++ /dev/null @@ -1,575 +0,0 @@ -Index: user.c -=================================================================== ---- user.c (revision 1711) -+++ user.c (revision 1712) -@@ -202,8 +202,8 @@ - memset(&change_flags, 0, sizeof(change_flags)); - - /* get options */ -- opterr = 0; /* suppress error message from getopt() */ -- while ((opt = getopt(argc, argv, -+ dm_opterr = 0; /* suppress error message from getopt() */ -+ while ((opt = dm_getopt(argc, argv, - "-a:d:c:e:l::x:" /* Major modes */ - "W::w:P::p:u:g:m:t:s:S:T:" /* Minor options */ - "i" "f:qnyvVh" /* Common options */ )) != -1) { -@@ -223,16 +223,16 @@ - if (mode) - mode_toomany = 1; - mode = opt; -- if (optarg && strlen(optarg)) -- user = dm_strdup(optarg); -+ if (dm_optarg && strlen(dm_optarg)) -+ user = dm_strdup(dm_optarg); - break; - - case 'x': - if (mode) - mode_toomany = 1; - mode = opt; -- if (optarg && strlen(optarg)) -- alias = dm_strdup(optarg); -+ if (dm_optarg && strlen(dm_optarg)) -+ alias = dm_strdup(dm_optarg); - break; - - case 'l': -@@ -241,8 +241,8 @@ - if (mode != 0 && mode != 'l') - mode_toomany = 1; - mode = opt; -- if (optarg && strlen(optarg)) -- userspec = dm_strdup(optarg); -+ if (dm_optarg && strlen(dm_optarg)) -+ userspec = dm_strdup(dm_optarg); - break; - - case 'i': -@@ -253,13 +253,13 @@ - /* Minor options */ - case 'w': - change_flags.newpasswd = 1; -- passwd = dm_strdup(optarg); -+ passwd = dm_strdup(dm_optarg); - break; - - case 'W': - change_flags.newpasswd = 1; -- if (optarg && strlen(optarg)) { -- passwdfile = dm_strdup(optarg); -+ if (dm_optarg && strlen(dm_optarg)) { -+ passwdfile = dm_strdup(dm_optarg); - change_flags.newpasswdfile = 1; - } else { - change_flags.newpasswdstdin = 1; -@@ -268,20 +268,20 @@ - - case 'u': - change_flags.newuser = 1; -- newuser = dm_strdup(optarg); -+ newuser = dm_strdup(dm_optarg); - break; - - case 'p': - if (!passwdtype) -- passwdtype = dm_strdup(optarg); -+ passwdtype = dm_strdup(dm_optarg); - // else - // Complain about only one type allowed. - break; - - case 'P': - change_flags.newpasswdshadow = 1; -- if (optarg && strlen(optarg)) -- passwdfile = dm_strdup(optarg); -+ if (dm_optarg && strlen(dm_optarg)) -+ passwdfile = dm_strdup(dm_optarg); - else - passwdfile = SHADOWFILE; - passwdtype = "shadow"; -@@ -289,42 +289,42 @@ - - case 'g': - change_flags.newclientid = 1; -- clientid = strtoull(optarg, NULL, 10); -+ clientid = strtoull(dm_optarg, NULL, 10); - break; - - case 'm': - change_flags.newmaxmail = 1; -- maxmail = strtomaxmail(optarg); -+ maxmail = strtomaxmail(dm_optarg); - break; - - case 's': - // Add this item to the user's aliases. -- if (optarg && (len = strlen(optarg))) -- list_nodeadd(&alias_add, optarg, len+1); -+ if (dm_optarg && (len = strlen(dm_optarg))) -+ list_nodeadd(&alias_add, dm_optarg, len+1); - break; - - case 'S': - // Delete this item from the user's aliases. -- if (optarg && (len = strlen(optarg))) -- list_nodeadd(&alias_del, optarg, len+1); -+ if (dm_optarg && (len = strlen(dm_optarg))) -+ list_nodeadd(&alias_del, dm_optarg, len+1); - break; - - case 't': - // Add this item to the alias's forwards. -- if (optarg && (len = strlen(optarg))) -- list_nodeadd(&fwds_add, optarg, len+1); -+ if (dm_optarg && (len = strlen(dm_optarg))) -+ list_nodeadd(&fwds_add, dm_optarg, len+1); - break; - - case 'T': - // Delete this item from the alias's forwards. -- if (optarg && (len = strlen(optarg))) -- list_nodeadd(&fwds_del, optarg, len+1); -+ if (dm_optarg && (len = strlen(dm_optarg))) -+ list_nodeadd(&fwds_del, dm_optarg, len+1); - break; - - /* Common options */ - case 'f': -- if (optarg && strlen(optarg) > 0) -- configFile = optarg; -+ if (dm_optarg && strlen(dm_optarg) > 0) -+ configFile = dm_optarg; - else { - qerrorf("dbmail-users: -f requires a filename\n\n"); - result = 1; -Index: lmtpd.c -=================================================================== ---- lmtpd.c (revision 1711) -+++ lmtpd.c (revision 1712) -@@ -100,8 +100,8 @@ - openlog(PNAME, LOG_PID, LOG_MAIL); - - /* get command-line options */ -- opterr = 0; /* suppress error message from getopt() */ -- while ((opt = getopt(argc, argv, "vVhqnf:p:")) != -1) { -+ dm_opterr = 0; /* suppress error message from getopt() */ -+ while ((opt = dm_getopt(argc, argv, "vVhqnf:p:")) != -1) { - switch (opt) { - case 'v': - /* TODO: Perhaps verbose should log to the console with -n? */ -@@ -121,8 +121,8 @@ - do_showhelp(); - return 0; - case 'p': -- if (optarg && strlen(optarg) > 0) -- pidFile = optarg; -+ if (dm_optarg && strlen(dm_optarg) > 0) -+ pidFile = dm_optarg; - else { - fprintf(stderr, - "dbmail-lmtpd: -p requires a filename " -@@ -131,8 +131,8 @@ - } - break; - case 'f': -- if (optarg && strlen(optarg) > 0) -- configFile = optarg; -+ if (dm_optarg && strlen(dm_optarg) > 0) -+ configFile = dm_optarg; - else { - fprintf(stderr, - "dbmail-lmtpd: -f requires a filename " -Index: dm_getopt.c -=================================================================== ---- dm_getopt.c (revision 1711) -+++ dm_getopt.c (revision 1712) -@@ -135,7 +135,7 @@ - */ - - int _dm_getopt_internal(int argc, char * argv[], const char *shortopts, -- const struct option *longopts, int *longind, -+ const struct dm_option *longopts, int *longind, - int long_only) - { - char mode, colon_mode = *shortopts; -@@ -261,13 +261,13 @@ - } - - int dm_getopt_long(int argc, char * argv[], const char *shortopts, -- const struct option *longopts, int *longind) -+ const struct dm_option *longopts, int *longind) - { - return _dm_getopt_internal(argc, argv, shortopts, longopts, longind, 0); - } - - int dm_getopt_long_only(int argc, char * argv[], const char *shortopts, -- const struct option *longopts, int *longind) -+ const struct dm_option *longopts, int *longind) - { - return _dm_getopt_internal(argc, argv, shortopts, longopts, longind, 1); - } -Index: maintenance.c -=================================================================== ---- maintenance.c (revision 1711) -+++ maintenance.c (revision 1712) -@@ -121,8 +121,8 @@ - setvbuf(stdout, 0, _IONBF, 0); - - /* get options */ -- opterr = 0; /* suppress error message from getopt() */ -- while ((opt = getopt(argc, argv, -+ dm_opterr = 0; /* suppress error message from getopt() */ -+ while ((opt = dm_getopt(argc, argv, - "-acrtl:pudb" /* Main options */ - "i" /* Maybe later options */ - "f:qnyvVh")) != -1) { /* Common options */ -@@ -173,8 +173,8 @@ - case 'l': - check_iplog = 1; - do_nothing = 0; -- if (optarg) -- strncpy(timespec, optarg, LEN); -+ if (dm_optarg) -+ strncpy(timespec, dm_optarg, LEN); - else - timespec[0] = 0; - -@@ -209,8 +209,8 @@ - break; - - case 'f': -- if (optarg && strlen(optarg) > 0) -- configFile = optarg; -+ if (dm_optarg && strlen(dm_optarg) > 0) -+ configFile = dm_optarg; - else { - qerrorf("dbmail-util: -f requires a filename\n\n" ); - return 1; -Index: dm_getopt.h -=================================================================== ---- dm_getopt.h (revision 1711) -+++ dm_getopt.h (revision 1712) -@@ -26,38 +26,23 @@ - */ - - #include "config.h" -+#ifndef DM_GETOPT_H -+#define DM_GETOPT_H - --#ifndef USE_DM_GETOPT --# include <getopt.h> --#endif -+# ifndef USE_DM_GETOPT -+# include <getopt.h> -+# define dm_getopt getopt -+# define dm_getopt_long getopt_long -+# define dm_getopt_long_only getopt_long_only -+# define _dm_getopt_internal _getopt_internal -+# define dm_opterr opterr -+# define dm_optind optind -+# define dm_optopt optopt -+# define dm_optarg optarg -+# endif - --#ifdef USE_DM_GETOPT -+# ifdef USE_DM_GETOPT - --# ifndef DM_GETOPT_H -- /* Our include guard first. */ --# define DM_GETOPT_H -- /* Try to kill the system getopt.h */ --# define _GETOPT_DECLARED --# define _GETOPT_H --# define GETOPT_H -- --# undef getopt --# define getopt dm_getopt --# undef getopt_long --# define getopt_long dm_getopt_long --# undef getopt_long_only --# define getopt_long_only dm_getopt_long_only --# undef _getopt_internal --# define _getopt_internal _dm_getopt_internal --# undef opterr --# define opterr dm_opterr --# undef optind --# define optind dm_optind --# undef optopt --# define optopt dm_optopt --# undef optarg --# define optarg dm_optarg -- - # ifdef __cplusplus - extern "C" { - # endif -@@ -68,7 +53,7 @@ - extern int dm_optind, dm_opterr, dm_optopt; - extern char *dm_optarg; - --struct option { -+struct dm_option { - const char *name; - int has_arg; - int *flag; -@@ -76,28 +61,25 @@ - }; - - /* human-readable values for has_arg */ --# undef no_argument --# define no_argument 0 --# undef required_argument --# define required_argument 1 --# undef optional_argument --# define optional_argument 2 -+# define dm_getopt_no_argument 0 -+# define dm_getopt_required_argument 1 -+# define dm_getopt_optional_argument 2 - - /* GNU-style long-argument parsers */ - extern int dm_getopt_long(int argc, char * argv[], const char *shortopts, -- const struct option *longopts, int *longind); -+ const struct dm_option *longopts, int *longind); - - extern int dm_getopt_long_only(int argc, char * argv[], const char *shortopts, -- const struct option *longopts, int *longind); -+ const struct dm_option *longopts, int *longind); - - extern int _dm_getopt_internal(int argc, char * argv[], const char *shortopts, -- const struct option *longopts, int *longind, -+ const struct dm_option *longopts, int *longind, - int long_only); - - # ifdef __cplusplus - } - # endif - --# endif /* DM_GETOPT_H */ -+# endif /* USE_DM_GETOPT */ - --#endif /* USE_DM_GETOPT */ -+#endif /* DM_GETOPT_H */ -Index: timsieved.c -=================================================================== ---- timsieved.c (revision 1711) -+++ timsieved.c (revision 1712) -@@ -99,8 +99,8 @@ - openlog(PNAME, LOG_PID, LOG_MAIL); - - /* get command-line options */ -- opterr = 0; /* suppress error message from getopt() */ -- while ((opt = getopt(argc, argv, "vVhqnf:p:")) != -1) { -+ dm_opterr = 0; /* suppress error message from getopt() */ -+ while ((opt = dm_getopt(argc, argv, "vVhqnf:p:")) != -1) { - switch (opt) { - case 'v': - /* TODO: Perhaps verbose should log to the console with -n? */ -@@ -120,8 +120,8 @@ - do_showhelp(); - return 0; - case 'p': -- if (optarg && strlen(optarg) > 0) -- pidFile = optarg; -+ if (dm_optarg && strlen(dm_optarg) > 0) -+ pidFile = dm_optarg; - else { - fprintf(stderr, - "dbmail-timsieved: -p requires a filename " -@@ -130,8 +130,8 @@ - } - break; - case 'f': -- if (optarg && strlen(optarg) > 0) -- configFile = optarg; -+ if (dm_optarg && strlen(dm_optarg) > 0) -+ configFile = dm_optarg; - else { - fprintf(stderr, - "dbmail-timsieved: -f requires a filename " -Index: pop3d.c -=================================================================== ---- pop3d.c (revision 1711) -+++ pop3d.c (revision 1712) -@@ -103,8 +103,8 @@ - openlog(PNAME, LOG_PID, LOG_MAIL); - - /* get command-line options */ -- opterr = 0; /* suppress error message from getopt() */ -- while ((opt = getopt(argc, argv, "vVhqnf:p:")) != -1) { -+ dm_opterr = 0; /* suppress error message from getopt() */ -+ while ((opt = dm_getopt(argc, argv, "vVhqnf:p:")) != -1) { - switch (opt) { - case 'v': - /* TODO: Perhaps verbose should log to the console with -n? */ -@@ -124,8 +124,8 @@ - do_showhelp(); - return 0; - case 'p': -- if (optarg && strlen(optarg) > 0) -- pidFile = optarg; -+ if (dm_optarg && strlen(dm_optarg) > 0) -+ pidFile = dm_optarg; - else { - fprintf(stderr, - "dbmail-pop3d: -p requires a filename " -@@ -134,8 +134,8 @@ - } - break; - case 'f': -- if (optarg && strlen(optarg) > 0) -- configFile = optarg; -+ if (dm_optarg && strlen(dm_optarg) > 0) -+ configFile = dm_optarg; - else { - fprintf(stderr, - "dbmail-pop3d: -f requires a filename " -Index: imapd.c -=================================================================== ---- imapd.c (revision 1711) -+++ imapd.c (revision 1712) -@@ -97,8 +97,8 @@ - openlog(PNAME, LOG_PID, LOG_MAIL); - - /* get command-line options */ -- opterr = 0; /* suppress error message from getopt() */ -- while ((opt = getopt(argc, argv, "vVhqnf:p:")) != -1) { -+ dm_opterr = 0; /* suppress error message from getopt() */ -+ while ((opt = dm_getopt(argc, argv, "vVhqnf:p:")) != -1) { - switch (opt) { - case 'v': - /* TODO: Perhaps verbose should log to the console with -n? */ -@@ -118,8 +118,8 @@ - do_showhelp(); - return 0; - case 'p': -- if (optarg && strlen(optarg) > 0) -- pidFile = optarg; -+ if (dm_optarg && strlen(dm_optarg) > 0) -+ pidFile = dm_optarg; - else { - fprintf(stderr, - "dbmail-imapd: -p requires a filename " -@@ -128,8 +128,8 @@ - } - break; - case 'f': -- if (optarg && strlen(optarg) > 0) -- configFile = optarg; -+ if (dm_optarg && strlen(dm_optarg) > 0) -+ configFile = dm_optarg; - else { - fprintf(stderr, - "dbmail-imapd: -f requires a filename " -Index: sievecmd.c -=================================================================== ---- sievecmd.c (revision 1711) -+++ sievecmd.c (revision 1712) -@@ -57,7 +57,7 @@ - char *user_name = NULL; - char *name = NULL; - FILE *source = NULL; -- extern char *optarg; -+ extern char *dm_optarg; - - openlog(PNAME, LOG_PID, LOG_MAIL); - -@@ -70,7 +70,7 @@ - configure_debug(TRACE_ERROR, 1, 0); - - while (opt != -1 && act != 'h') { -- opt = getopt(argc, argv, "a:d:i:r:u:l"); -+ opt = dm_getopt(argc, argv, "a:d:i:r:u:l"); - - switch (opt) { - case -1: -@@ -84,11 +84,11 @@ - act = 'h'; - else - act = opt; -- name = optarg; -+ name = dm_optarg; - source = stdin; // FIXME to take files as input, too - break; - case 'u': -- user_name = dm_strdup(optarg); -+ user_name = dm_strdup(dm_optarg); - break; - case 'l': - if (act != 0) -Index: main.c -=================================================================== ---- main.c (revision 1711) -+++ main.c (revision 1712) -@@ -189,7 +189,7 @@ - * with an immediately preceding option are return with option - * value '1'. We will use this to allow for multiple values to - * follow after each of the supported options. */ -- while ((c = getopt(argc, argv, "-t::m:u:d:r: f:qnyvVh")) != EOF) { -+ while ((c = dm_getopt(argc, argv, "-t::m:u:d:r: f:qnyvVh")) != EOF) { - /* Received an n-th value following the last option, - * so recall the last known option to be used in the switch. */ - if (c == 1) -@@ -200,13 +200,13 @@ - case 't': - trace(TRACE_INFO, "main(): using NORMAL_DELIVERY"); - -- if (optarg) { -+ if (dm_optarg) { - if (deliver_to_header) { - printf - ("Only one header field may be specified.\n"); - usage_error = 1; - } else -- deliver_to_header = optarg; -+ deliver_to_header = dm_optarg; - } else - deliver_to_header = "deliver-to"; - -@@ -221,7 +221,7 @@ - ("Only one header field may be specified.\n"); - usage_error = 1; - } else -- deliver_to_mailbox = optarg; -+ deliver_to_mailbox = dm_optarg; - - break; - -@@ -231,8 +231,8 @@ - - /* Add argument onto the returnpath list. */ - if (list_nodeadd -- (&returnpath, optarg, -- strlen(optarg) + 1) == 0) { -+ (&returnpath, dm_optarg, -+ strlen(dm_optarg) + 1) == 0) { - trace(TRACE_ERROR, - "main(): list_nodeadd reports out of memory" - " while adding to returnpath"); -@@ -247,7 +247,7 @@ - "main(): using SPECIAL_DELIVERY to usernames"); - - dsnuser_init(&dsnuser); -- dsnuser.address = dm_strdup(optarg); -+ dsnuser.address = dm_strdup(dm_optarg); - - /* Add argument onto the users list. */ - if (list_nodeadd -@@ -267,7 +267,7 @@ - "main(): using SPECIAL_DELIVERY to email addresses"); - - dsnuser_init(&dsnuser); -- dsnuser.address = dm_strdup(optarg); -+ dsnuser.address = dm_strdup(dm_optarg); - - /* Add argument onto the users list. */ - if (list_nodeadd -@@ -284,8 +284,8 @@ - - /* Common command line options. */ - case 'f': -- if (optarg && strlen(optarg) > 0) -- configFile = optarg; -+ if (dm_optarg && strlen(dm_optarg) > 0) -+ configFile = dm_optarg; - else { - fprintf(stderr, - "dbmail-smtp: -f requires a filename\n\n" ); diff --git a/mail/dbmail21/files/patch-2.0.4_bug184 b/mail/dbmail21/files/patch-2.0.4_bug184 deleted file mode 100644 index 37d6689d66b2..000000000000 --- a/mail/dbmail21/files/patch-2.0.4_bug184 +++ /dev/null @@ -1,66 +0,0 @@ -Index: configure.in -=================================================================== ---- configure.in (revision 1751) -+++ configure.in (revision 1761) -@@ -42,6 +42,7 @@ - DBMAIL_CHECK_SIEVE_LIBS - DBMAIL_CHECK_GC - DBMAIL_CHECK_GETOPT -+DBMAIL_CHECK_SOCKLEN_T - - AC_PROG_CC - AC_COMPILE_WARNINGS -Index: acinclude.m4 -=================================================================== ---- acinclude.m4 (revision 1751) -+++ acinclude.m4 (revision 1761) -@@ -513,3 +513,49 @@ - - # Prerequisites of lib/getopt*. - AC_DEFUN([CHECK_PREREQ_GETOPT], [:]) -+ -+# -+# socklen_t -+# from curl -+ -+dnl Check for socklen_t: historically on BSD it is an int, and in -+dnl POSIX 1g it is a type of its own, but some platforms use different -+dnl types for the argument to getsockopt, getpeername, etc. So we -+dnl have to test to find something that will work. -+AC_DEFUN([DBMAIL_CHECK_SOCKLEN_T], -+[ -+ AC_CHECK_TYPE([socklen_t], ,[ -+ AC_MSG_CHECKING([for socklen_t equivalent]) -+ AC_CACHE_VAL([socklen_t_equiv], -+ [ -+ # Systems have either "struct sockaddr *" or -+ # "void *" as the second argument to getpeername -+ socklen_t_equiv= -+ for arg2 in "struct sockaddr" void; do -+ for t in int size_t unsigned long "unsigned long"; do -+ AC_TRY_COMPILE([ -+ #include <sys/types.h> -+ #include <sys/socket.h> -+ -+ int getpeername (int, $arg2 *, $t *); -+ ],[ -+ $t len; -+ getpeername(0,0,&len); -+ ],[ -+ socklen_t_equiv="$t" -+ break -+ ]) -+ done -+ done -+ -+ if test "x$socklen_t_equiv" = x; then -+ AC_MSG_ERROR([Cannot find a type to use in place of socklen_t]) -+ fi -+ ]) -+ AC_MSG_RESULT($socklen_t_equiv) -+ AC_DEFINE_UNQUOTED(socklen_t, $socklen_t_equiv, -+ [type to use in place of socklen_t if not defined])], -+ [#include <sys/types.h> -+#include <sys/socket.h>]) -+]) -+ diff --git a/mail/dbmail21/files/patch-2.0.4_bug190_pool.c b/mail/dbmail21/files/patch-2.0.4_bug190_pool.c deleted file mode 100644 index 562c0cb23688..000000000000 --- a/mail/dbmail21/files/patch-2.0.4_bug190_pool.c +++ /dev/null @@ -1,126 +0,0 @@ -Index: pool.c -=================================================================== ---- pool.c (revision 1600) -+++ pool.c (revision 1758) -@@ -73,8 +73,10 @@ - void scoreboard_new(serverConfig_t * conf) - { - int serr; -- if ((shmid = shmget(IPC_PRIVATE, P_SIZE, 0644 | IPC_CREAT)) == -1) -- trace(TRACE_FATAL, "%s,%s: shmget failed",__FILE__,__func__); -+ if ((shmid = shmget(IPC_PRIVATE, P_SIZE, 0644 | IPC_CREAT)) == -1) { -+ serr = errno; -+ trace(TRACE_FATAL, "%s,%s: shmget failed [%s]",__FILE__,__func__, strerror(serr)); -+ } - scoreboard = shmat(shmid, (void *) 0, 0); - serr=errno; - if (scoreboard == (Scoreboard_t *) (-1)) { -@@ -222,7 +236,7 @@ - } - scoreboard_unlck(); - trace(TRACE_FATAL, -- "%s,%s: pid NOT found on scoreboard [%d]", __FILE__, __FUNCTION__, pid); -+ "%s,%s: pid NOT found on scoreboard [%d]", __FILE__, __func__, pid); - return -1; - } - -@@ -238,25 +252,25 @@ - { - int i; - trace(TRACE_MESSAGE, "%s,%s: register child [%d]", -- __FILE__, __FUNCTION__, getpid()); -+ __FILE__, __func__, getpid()); - - scoreboard_wrlck(); - for (i = 0; i < scoreboard->conf->maxChildren; i++) { - if (scoreboard->child[i].pid == -1) - break; - if (scoreboard->child[i].pid == getpid()) { -- trace(TRACE_ERROR, -+ scoreboard_unlck(); -+ trace(TRACE_FATAL, - "%s,%s: child already registered.", -- __FILE__, __FUNCTION__); -- scoreboard_unlck(); -+ __FILE__, __func__); - return -1; - } - } - if (i == scoreboard->conf->maxChildren) { -+ scoreboard_unlck(); - trace(TRACE_WARNING, - "%s,%s: no empty slot found", -- __FILE__, __FUNCTION__); -- scoreboard_unlck(); -+ __FILE__, __func__); - return -1; - } - -@@ -264,8 +278,8 @@ - scoreboard->child[i].status = STATE_IDLE; - scoreboard_unlck(); - -- trace(TRACE_INFO, "%s,%s: initializing child_state [%d] using slot [%d]", -- __FILE__, __FUNCTION__, getpid(), i); -+ trace(TRACE_MESSAGE, "%s,%s: initializing child_state [%d] using slot [%d]", -+ __FILE__, __func__, getpid(), i); - return 0; - } - -@@ -281,7 +295,7 @@ - scoreboard->child[key].status = STATE_CONNECTED; - scoreboard_unlck(); - -- trace(TRACE_DEBUG, "%s,%s: [%d]", __FILE__, __FUNCTION__, -+ trace(TRACE_DEBUG, "%s,%s: [%d]", __FILE__, __func__, - getpid()); - } - -@@ -297,7 +311,7 @@ - scoreboard->child[key].status = STATE_IDLE; - scoreboard_unlck(); - -- trace(TRACE_DEBUG, "%s,%s: [%d]", __FILE__, __FUNCTION__, -+ trace(TRACE_DEBUG, "%s,%s: [%d]", __FILE__, __func__, - getpid()); - } - -@@ -320,7 +334,7 @@ - scoreboard_unlck(); - - trace(TRACE_MESSAGE, -- "%s,%s: child [%d] unregistered", __FILE__, __FUNCTION__, -+ "%s,%s: child [%d] unregistered", __FILE__, __func__, - getpid()); - } - -@@ -346,7 +360,7 @@ - manage_stop_children(); - trace(TRACE_FATAL, - "%s,%s: could not create children. Fatal.", -- __FILE__, __FUNCTION__); -+ __FILE__, __func__); - exit(0); - } - } -@@ -360,10 +374,17 @@ - if (chpid == -1) - continue; - if (waitpid(chpid, NULL, WNOHANG|WUNTRACED) == chpid) { -+ scoreboard_release(chpid); - trace(TRACE_MESSAGE,"%s,%s: child [%d] exited. Restarting...", -- __FILE__, __FUNCTION__, chpid); -- scoreboard_release(chpid); -- CreateChild(&childinfo); -+ __FILE__, __func__, chpid); -+ if (CreateChild(&childinfo)== -1) { -+ trace(TRACE_ERROR,"%s,%s: createchild failed. Bailout...", -+ __FILE__, __func__); -+ GeneralStopRequested=1; -+ manage_stop_children(); -+ -+ exit(1); -+ } - } - } - sleep(1); diff --git a/mail/dbmail21/files/patch-2.0.4_bug190_server.c b/mail/dbmail21/files/patch-2.0.4_bug190_server.c deleted file mode 100644 index 23129a5c8b52..000000000000 --- a/mail/dbmail21/files/patch-2.0.4_bug190_server.c +++ /dev/null @@ -1,41 +0,0 @@ -Index: server.c -=================================================================== ---- server.c (revision 1600) -+++ server.c (revision 1758) -@@ -119,9 +119,15 @@ - alarm(10); - - trace(TRACE_DEBUG, "StartServer(): children created, starting main service loop"); -- while (!GeneralStopRequested) -- manage_restart_children(); -- -+ while (!GeneralStopRequested) { -+ if (db_connect() != 0) { -+ GeneralStopRequested=1; -+ } else { -+ db_disconnect(); -+ manage_restart_children(); -+ } -+ } -+ - manage_stop_children(); - scoreboard_delete(); - -@@ -131,6 +137,8 @@ - - void ParentSigHandler(int sig, siginfo_t * info, void *data) - { -+ int saved_errno = errno; -+ - if (ParentPID != getpid()) { - trace(TRACE_INFO, - "ParentSigHandler(): i'm no longer father"); -@@ -162,6 +170,8 @@ - default: - GeneralStopRequested = 1; - } -+ -+ errno = saved_errno; - } - - diff --git a/mail/dbmail21/files/patch-2.0.4_bug190_serverchild.c b/mail/dbmail21/files/patch-2.0.4_bug190_serverchild.c deleted file mode 100644 index bf6da33dcfbd..000000000000 --- a/mail/dbmail21/files/patch-2.0.4_bug190_serverchild.c +++ /dev/null @@ -1,267 +0,0 @@ -Index: serverchild.c -=================================================================== ---- serverchild.c (revision 1600) -+++ serverchild.c (revision 1758) -@@ -66,13 +66,13 @@ - void client_close(void) - { - if (client.tx) { -- trace(TRACE_DEBUG,"%s,%s: closing write stream", __FILE__,__FUNCTION__); -+ trace(TRACE_DEBUG,"%s,%s: closing write stream", __FILE__,__func__); - fflush(client.tx); - fclose(client.tx); /* closes clientSocket as well */ - client.tx = NULL; - } - if (client.rx) { -- trace(TRACE_DEBUG,"%s,%s: closing read stream", __FILE__,__FUNCTION__); -+ trace(TRACE_DEBUG,"%s,%s: closing read stream", __FILE__,__func__); - shutdown(fileno(client.rx), SHUT_RDWR); - fclose(client.rx); - client.rx = NULL; -@@ -86,7 +86,7 @@ - - trace(TRACE_DEBUG, - "%s,%s: database connection still open, closing", -- __FILE__,__FUNCTION__); -+ __FILE__,__func__); - db_disconnect(); - auth_disconnect(); - connected = 0; /* FIXME a signal between this line and the previous one -@@ -99,18 +99,22 @@ - - void noop_child_sig_handler(int sig, siginfo_t *info UNUSED, void *data UNUSED) - { -- trace(TRACE_DEBUG, "%s,%s: ignoring signal [%d]", __FILE__, __FUNCTION__, sig); -+ int saved_errno = errno; -+ trace(TRACE_DEBUG, "%s,%s: ignoring signal [%d]", __FILE__, __func__, sig); -+ errno = saved_errno; - } - - void active_child_sig_handler(int sig, siginfo_t * info UNUSED, void *data UNUSED) - { -+ int saved_errno = errno; -+ - static int triedDisconnect = 0; - - #ifdef _USE_STR_SIGNAL -- trace(TRACE_ERROR, "%s,%s: got signal [%s]", __FILE__, __FUNCTION__, -+ trace(TRACE_ERROR, "%s,%s: got signal [%s]", __FILE__, __func__, - strsignal(sig)); - #else -- trace(TRACE_ERROR, "%s,%s: got signal [%d]", __FILE__, __FUNCTION__, sig); -+ trace(TRACE_ERROR, "%s,%s: got signal [%d]", __FILE__, __func__, sig); - #endif - - /* perform reinit at SIGHUP otherwise exit, but do nothing on -@@ -118,10 +122,10 @@ - switch (sig) { - case SIGCHLD: - trace(TRACE_DEBUG, "%s,%s: SIGCHLD received... ignoring", -- __FILE__, __FUNCTION__); -+ __FILE__, __func__); - break; - case SIGALRM: -- trace(TRACE_DEBUG, "%s,%s: timeout received", __FILE__, __FUNCTION__); -+ trace(TRACE_DEBUG, "%s,%s: timeout received", __FILE__, __func__); - client_close(); - break; - -@@ -132,23 +136,23 @@ - if (ChildStopRequested) { - trace(TRACE_DEBUG, - "%s,%s: already caught a stop request. Closing right now", -- __FILE__,__FUNCTION__); -+ __FILE__,__func__); - - /* already caught this signal, exit the hard way now */ - client_close(); - disconnect_all(); - child_unregister(); -- trace(TRACE_DEBUG, "%s,%s: exit",__FILE__,__FUNCTION__); -+ trace(TRACE_DEBUG, "%s,%s: exit",__FILE__,__func__); - exit(1); - } -- trace(TRACE_DEBUG, "%s,%s: setting stop request",__FILE__,__FUNCTION__); -+ trace(TRACE_DEBUG, "%s,%s: setting stop request",__FILE__,__func__); - DelChildSigHandler(); - ChildStopRequested = 1; - break; - default: - /* bad shtuff, exit */ - trace(TRACE_DEBUG, -- "%s,%s: cannot ignore this. Terminating",__FILE__,__FUNCTION__); -+ "%s,%s: cannot ignore this. Terminating",__FILE__,__func__); - - /* - * For some reason i have not yet determined the process starts eating up -@@ -164,10 +168,12 @@ - disconnect_all(); - } - -- trace(TRACE_DEBUG, "%s,%s: exit", __FILE__, __FUNCTION__); -+ trace(TRACE_DEBUG, "%s,%s: exit", __FILE__, __func__); - child_unregister(); - exit(1); - } -+ -+ errno = saved_errno; - } - - -@@ -239,16 +245,19 @@ - if (! pid) { - if (child_register() == -1) { - trace(TRACE_FATAL, "%s,%s: child_register failed", -- __FILE__, __FUNCTION__); -+ __FILE__, __func__); - exit(0); - - } - - ChildStopRequested = 0; - SetChildSigHandler(); -- trace(TRACE_INFO, "%s,%s: signal handler placed, going to perform task now", -- __FILE__, __FUNCTION__); -- PerformChildTask(info); -+ -+ trace(TRACE_INFO, "%s,%s: signal handler placed, going to perform task now", -+ __FILE__, __func__); -+ -+ if (PerformChildTask(info)== -1) -+ return -1; - child_unregister(); - exit(0); - } else { -@@ -269,22 +278,22 @@ - struct hostent *clientHost; - - if (!info) { -- trace(TRACE_ERROR, -- "PerformChildTask(): NULL info supplied"); -+ trace(TRACE_ERROR, "%s,%s: NULL info supplied", -+ __FILE__, __func__); - return -1; - } - - if (db_connect() != 0) { -- trace(TRACE_ERROR, -- "PerformChildTask(): could not connect to database"); -+ trace(TRACE_ERROR, "%s,%s: could not connect to database", -+ __FILE__, __func__); - return -1; - } - if (db_check_version() != 0) - return -1; - - if (auth_connect() != 0) { -- trace(TRACE_ERROR, -- "PerformChildTask(): could not connect to authentication"); -+ trace(TRACE_ERROR, "%s,%s: could not connect to authentication", -+ __FILE__, __func__); - return -1; - } - -@@ -294,12 +303,13 @@ - for (i = 0; i < info->maxConnect && !ChildStopRequested; i++) { - - if (db_check_connection()) { -- trace(TRACE_ERROR, "%s,%s: database has gone away", __FILE__, __func__); -+ trace(TRACE_ERROR, "%s,%s: database has gone away", -+ __FILE__, __func__); - return -1; - } - -- trace(TRACE_INFO, -- "PerformChildTask(): waiting for connection"); -+ trace(TRACE_INFO, "%s,%s: waiting for connection", -+ __FILE__, __func__); - - child_reg_disconnected(); - -@@ -312,8 +322,8 @@ - - if (clientSocket == -1) { - i--; /* don't count this as a connect */ -- trace(TRACE_INFO, -- "PerformChildTask(): accept failed"); -+ trace(TRACE_INFO, "%s,%s: accept failed", -+ __FILE__, __func__); - continue; /* accept failed, refuse connection & continue */ - } - -@@ -337,30 +347,29 @@ - strncpy(client.clientname, - clientHost->h_name, FIELDSIZE); - -- trace(TRACE_MESSAGE, -- "PerformChildTask(): incoming connection from [%s (%s)]", -+ trace(TRACE_MESSAGE, "%s,%s: incoming connection from [%s (%s)]", -+ __FILE__, __func__, - client.ip, - client.clientname[0] ? client. - clientname : "Lookup failed"); - } else { -- trace(TRACE_MESSAGE, -- "PerformChildTask(): incoming connection from [%s]", -- client.ip); -+ trace(TRACE_MESSAGE, "%s,%s: incoming connection from [%s]", -+ __FILE__, __func__, client.ip); - } - - /* make streams */ - if (!(client.rx = fdopen(dup(clientSocket), "r"))) { - /* read-FILE opening failure */ -- trace(TRACE_ERROR, -- "PerformChildTask(): error opening read file stream"); -+ trace(TRACE_ERROR, "%s,%s: error opening read file stream", -+ __FILE__, __func__); - close(clientSocket); - continue; - } - - if (!(client.tx = fdopen(clientSocket, "w"))) { - /* write-FILE opening failure */ -- trace(TRACE_ERROR, -- "PerformChildTask(): error opening write file stream"); -+ trace(TRACE_ERROR, "%s,%s: error opening write file stream", -+ __FILE__, __func__); - fclose(client.rx); - close(clientSocket); - memset(&client, 0, sizeof(client)); -@@ -370,8 +379,8 @@ - setvbuf(client.tx, (char *) NULL, _IOLBF, 0); - setvbuf(client.rx, (char *) NULL, _IOLBF, 0); - -- trace(TRACE_DEBUG, -- "PerformChildTask(): client info init complete, calling client handler"); -+ trace(TRACE_DEBUG, "%s,%s: client info init complete, calling client handler", -+ __FILE__, __func__); - - /* streams are ready, perform handling */ - info->ClientHandler(&client); -@@ -379,17 +388,19 @@ - set_proc_title("%s", "Idle"); - #endif - -- trace(TRACE_DEBUG, -- "PerformChildTask(): client handling complete, closing streams"); -+ trace(TRACE_DEBUG, "%s,%s: client handling complete, closing streams", -+ __FILE__, __func__); - client_close(); -- trace(TRACE_INFO, "PerformChildTask(): connection closed"); -+ trace(TRACE_INFO, "%s,%s: connection closed", -+ __FILE__, __func__); - } - - if (!ChildStopRequested) -- trace(TRACE_ERROR, -- "PerformChildTask(): maximum number of connections reached, stopping now"); -+ trace(TRACE_ERROR, "%s,%s: maximum number of connections reached, stopping now", -+ __FILE__, __func__); - else -- trace(TRACE_ERROR, "PerformChildTask(): stop requested"); -+ trace(TRACE_ERROR, "%s,%s: stop requested", -+ __FILE__, __func__); - - child_reg_disconnected(); - disconnect_all(); diff --git a/mail/dbmail21/files/patch-2.0.4_bug198_pool.c b/mail/dbmail21/files/patch-2.0.4_bug198_pool.c deleted file mode 100644 index c21e745d9dda..000000000000 --- a/mail/dbmail21/files/patch-2.0.4_bug198_pool.c +++ /dev/null @@ -1,13 +0,0 @@ -Index: pool.c -=================================================================== ---- pool.c (revision 1763) -+++ pool.c (revision 1787) -@@ -433,7 +433,7 @@ - - for (i = 0; i < scoreboard->conf->maxChildren; i++) { - chpid = scoreboard->child[i].pid; -- if (chpid != 0) -+ if (chpid > 0) - kill(chpid, SIGKILL);; - scoreboard_release(chpid); - } diff --git a/mail/dbmail21/files/patch-2.0.4_bug199_server.c b/mail/dbmail21/files/patch-2.0.4_bug199_server.c deleted file mode 100644 index 6786e6c8fc60..000000000000 --- a/mail/dbmail21/files/patch-2.0.4_bug199_server.c +++ /dev/null @@ -1,35 +0,0 @@ -Index: server.c -=================================================================== ---- server.c (revision 1763) -+++ server.c (revision 1787) -@@ -69,7 +69,7 @@ - - act.sa_sigaction = ParentSigHandler; - sigemptyset(&act.sa_mask); -- act.sa_flags = SA_SIGINFO; -+ act.sa_flags = SA_SIGINFO | SA_NOCLDSTOP; - - sigaction(SIGCHLD, &act, 0); - sigaction(SIGINT, &act, 0); -@@ -152,6 +152,7 @@ - - void ParentSigHandler(int sig, siginfo_t * info, void *data) - { -+ pid_t chpid; - int saved_errno = errno; - - if (ParentPID != getpid()) { -@@ -175,7 +176,12 @@ - break; - - case SIGCHLD: -- break; /* ignore, wait for child in main loop */ -+ /* ignore, wait for child in main loop */ -+ /* but we need to catch zombie */ -+ if ((chpid = waitpid(-1,&sig,WNOHANG)) > 0) -+ scoreboard_release(chpid); -+ -+ break; - - case SIGHUP: - trace(TRACE_DEBUG, diff --git a/mail/dbmail21/files/patch-2.0.4_bug214_main.c b/mail/dbmail21/files/patch-2.0.4_bug214_main.c deleted file mode 100644 index 18dfefa77e80..000000000000 --- a/mail/dbmail21/files/patch-2.0.4_bug214_main.c +++ /dev/null @@ -1,20 +0,0 @@ -Index: main.c -=================================================================== ---- main.c (revision 1793) -+++ main.c (revision 1796) -@@ -133,6 +133,7 @@ - trace(TRACE_ERROR, "%s,%s: error reading message", - __FILE__, __func__); - dm_free(tmpmessage); -+ tmpmessage=NULL; - return -1; - } - -@@ -371,6 +372,7 @@ - trace(TRACE_ERROR, "%s,%s splitmessage failed", - __FILE__, __func__); - dm_free(whole_message); -+ whole_message=NULL; - exitcode = EX_TEMPFAIL; - goto freeall; - } diff --git a/mail/dbmail21/files/patch-2.0.4_bug216_header.c b/mail/dbmail21/files/patch-2.0.4_bug216_header.c deleted file mode 100644 index d9610a5cd609..000000000000 --- a/mail/dbmail21/files/patch-2.0.4_bug216_header.c +++ /dev/null @@ -1,37 +0,0 @@ -Index: header.c -=================================================================== ---- header.c (revision 1796) -+++ header.c (revision 1813) -@@ -176,15 +176,17 @@ - if (message_content[line_content_size] == '\n') { - tmp_line_size = line_content_size + 1; - tmp_line_rfcsize = tmp_line_size + 1; -- } else { -- if (message_content[line_content_size] == '\r' && -- message_content[line_content_size + 1] == '\n') { -+ } else if (message_content[line_content_size] == '\r') { -+ if (message_content[line_content_size + 1] == '\n') { -+ /* This is the right behaviour */ - tmp_line_size = line_content_size + 2; - tmp_line_rfcsize = tmp_line_size; - } else { -- trace(TRACE_ERROR, "%s,%s: error reading header line", -- __FILE__, __func__); -- return -1; -+ /* This is broken behaviour, but it's better -+ * than not handling it at all. -+ */ -+ tmp_line_size = line_content_size + 1; -+ tmp_line_rfcsize = tmp_line_size + 1; - } - } - } -@@ -197,7 +199,6 @@ - __FILE__, __func__); - return 0; - } -- else -- return 1; -+ return 1; - - } diff --git a/mail/dbmail21/files/patch-2.0.4_bug79_imaputil.c b/mail/dbmail21/files/patch-2.0.4_bug79_imaputil.c deleted file mode 100644 index dbeb799017be..000000000000 --- a/mail/dbmail21/files/patch-2.0.4_bug79_imaputil.c +++ /dev/null @@ -1,80 +0,0 @@ -Index: imaputil.c -=================================================================== ---- imaputil.c (revision 1726) -+++ imaputil.c (revision 1793) -@@ -65,7 +65,7 @@ - "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; - - /* returned by date_sql2imap() */ --#define IMAP_STANDARD_DATE "03-Nov-1979 00:00:00 +0000" -+#define IMAP_STANDARD_DATE "Sat, 03-Nov-1979 00:00:00 +0000" - char _imapdate[IMAP_INTERNALDATE_LEN] = IMAP_STANDARD_DATE; - - /* returned by date_imap2sql() */ -@@ -1776,50 +1776,35 @@ - - /* - * convert a mySQL date (yyyy-mm-dd hh:mm:ss) to a valid IMAP internal date: -- * 0123456789012345678 -- * dd-mon-yyyy hh:mm:ss with mon characters (i.e. 'Apr' for april) -- * 01234567890123456789 -+ * [Mon, 30 May 2005 10:01:55 +0100] with mon characters (i.e. 'Apr' for april) - * return value is valid until next function call. - * NOTE: if date is not valid, IMAP_STANDARD_DATE is returned - */ - char *date_sql2imap(const char *sqldate) - { -- char *last_char; -- struct tm tm_localtime, tm_sqldate; -- time_t td; -+ struct tm tm_sql_date; -+ struct tm *tm_imap_date; -+ -+ time_t ltime; -+ char *last; - -- /* we need to get the localtime to get the current timezone */ -- if (time(&td) == -1) { -- trace(TRACE_ERROR, "%s,%s: error getting time()", -- __FILE__, __func__); -- return IMAP_STANDARD_DATE; -- } -- tm_localtime = *localtime(&td); -+ last = strptime(sqldate,"%Y-%m-%d %T", &tm_sql_date); -+ if ( (last == NULL) || (*last != '\0') ) { -+ strcpy(_imapdate, IMAP_STANDARD_DATE); -+ return _imapdate; -+ } - -- /* parse sqldate */ -- last_char = strptime(sqldate, "%Y-%m-%d %T", &tm_sqldate); -- if (last_char == NULL || *last_char != '\0') { -- trace(TRACE_DEBUG, "%s,%s, error parsing date [%s]", -- __FILE__, __func__, sqldate); -- strcpy(_imapdate, IMAP_STANDARD_DATE); -- return _imapdate; -- } -- /* copy DST information from localtime */ -- tm_sqldate.tm_gmtoff = tm_localtime.tm_gmtoff; -- tm_sqldate.tm_isdst = tm_localtime.tm_isdst; -+ /* FIXME: this works fine on linux, but may cause dst offsets in netbsd. */ -+ ltime = mktime (&tm_sql_date); -+ tm_imap_date = localtime(<ime); - -- (void) strftime(_imapdate, IMAP_INTERNALDATE_LEN, -- "%d-%b-%Y %T %z", &tm_sqldate); -- -- return _imapdate; -+ strftime(_imapdate, sizeof(_imapdate), "%a, %d %b %Y %H:%M:%S %z", tm_imap_date); -+ return _imapdate; - } - -- - /* - * convert TO a mySQL date (yyyy-mm-dd) FROM a valid IMAP internal date: -- * 0123456789 - * dd-mon-yyyy with mon characters (i.e. 'Apr' for april) -- * 01234567890 - * OR - * d-mon-yyyy - * return value is valid until next function call. diff --git a/mail/dbmail21/files/patch-sort.c b/mail/dbmail21/files/patch-sort.c deleted file mode 100644 index a267163eca11..000000000000 --- a/mail/dbmail21/files/patch-sort.c +++ /dev/null @@ -1,11 +0,0 @@ ---- sort/sort.c.orig Tue Mar 15 00:54:00 2005 -+++ sort/sort.c Mon Apr 11 13:46:46 2005 -@@ -58,7 +58,7 @@ - * - * Then do it! - * */ --dsn_class_t sort_and_deliver(u64_t msgidnr, -+sort_result_t sort_and_deliver(u64_t msgidnr, - const char *header UNUSED, - u64_t headersize UNUSED, - u64_t totalmsgsize, diff --git a/mail/dbmail21/pkg-descr b/mail/dbmail21/pkg-descr deleted file mode 100644 index 2c03d30b6ea9..000000000000 --- a/mail/dbmail21/pkg-descr +++ /dev/null @@ -1,22 +0,0 @@ -Dbmail is the name of a group of programs that enable the possiblilty of storing -and retrieving mail messages from a database (currently MySQL or PostgreSQL). - -What are the advantages? - - * Scalability. - Dbmail is as scalable as the database that is used for the mail storage. - * Manageability. - Dbmail is based upon a database. Dbmail can be managed by changing - settings in the database (f.e. using PHP/Perl/SQL). - * Speed. - Dbmail uses very efficient, database specific queries for retrieving mail - information. This is much faster then parsing a filesystem. - * Security. - Dbmail has got nothing to do with the filesystem or interaction with other - programs in the Unix environment which need special permissions. Dbmail - is as secure as the database it's based upon. - * Flexibility. - Changes on a Dbmail system (adding of users, changing passwords etc.) are - effective immediately. - -WWW: http://www.dbmail.org/ diff --git a/mail/dbmail21/pkg-plist b/mail/dbmail21/pkg-plist deleted file mode 100644 index 66d3c8a85d05..000000000000 --- a/mail/dbmail21/pkg-plist +++ /dev/null @@ -1,36 +0,0 @@ -etc/dbmail.conf-dist -lib/dbmail/libauthdbmail.0 -lib/dbmail/libauthdbmail.a -lib/dbmail/libauthdbmail.la -lib/dbmail/libauthdbmail -lib/dbmail/libsortdbmail.0 -lib/dbmail/libsortdbmail.a -lib/dbmail/libsortdbmail.la -lib/dbmail/libsortdbmail -lib/libdbmail -lib/libdbmail.0 -lib/libdbmail.a -lib/libdbmail.la -sbin/dbmail-imapd -sbin/dbmail-lmtpd -sbin/dbmail-pop3d -sbin/dbmail-smtp -sbin/dbmail-users -sbin/dbmail-util -%%MYSQL%%%%DATADIR%%/sql/create_tables.mysql -%%MYSQL%%%%DATADIR%%/sql/create_tables_innoDB.mysql -%%MYSQL%%%%DATADIR%%/sql/migrate_from_1.x_to_2.0.mysql -%%MYSQL%%%%DATADIR%%/sql/migrate_from_1.x_to_2.0_innodb.mysql -%%MYSQL%%lib/dbmail/libmysqldbmail.0 -%%MYSQL%%lib/dbmail/libmysqldbmail.a -%%MYSQL%%lib/dbmail/libmysqldbmail.la -%%MYSQL%%lib/dbmail/libmysqldbmail -%%PGSQL%%%%DATADIR%%/sql/create_tables.pgsql -%%PGSQL%%%%DATADIR%%/sql/migrate_from_1.x_to_2.0.pgsql -%%PGSQL%%/lib/dbmail/libpgsqldbmail.0 -%%PGSQL%%/lib/dbmail/libpgsqldbmail.a -%%PGSQL%%/lib/dbmail/libpgsqldbmail.la -%%PGSQL%%/lib/dbmail/libpgsqldbmail -@dirrm lib/dbmail -@dirrm %%DATADIR%%/sql -@dirrm %%DATADIR%% diff --git a/mail/dbmail22/Makefile b/mail/dbmail22/Makefile deleted file mode 100644 index d138d51531d7..000000000000 --- a/mail/dbmail22/Makefile +++ /dev/null @@ -1,90 +0,0 @@ -# New ports collection makefile for: dbmail -# Date created: 07/26/2003 -# Whom: Clement Laforet <sheepkiller@cultdeadsheep.org> -# -# $FreeBSD$ -# - -PORTNAME= dbmail -PORTVERSION= 2.0.4 -PORTREVISION= 1 -CATEGORIES= mail -MASTER_SITES= http://www.dbmail.org/download/ -PKGNAMESUFFIX= -${DATABASE} -EXTRACT_SUFX= .tgz - -MAINTAINER= seanc@FreeBSD.org -COMMENT= An SQL database-based mail system (POP3 and IMAP) - -USE_REINPLACE= YES -GNU_CONFIGURE= YES -CONFIGURE_ARGS= --prefix=${PREFIX} -USE_GMAKE= YES -USE_OPENSSL= YES -USE_RC_SUBR= dbmail-pop3d.sh dbmail-lmtpd.sh dbmail-imapd.sh - -CFLAGS += -fPIC - -.if defined(WITH_POSTGRESQL) -CONFIGURE_ARGS+= --with-pgsql -USE_PGSQL= yes -DATABASE= postgresql -PLIST_SUB+= PGSQL="" -PLIST_SUB+= MYSQL="@comment " -LDFLAGS+= -L${LOCALBASE}/lib/ -.else -USE_MYSQL= YES -CONFIGURE_ARGS+= --with-mysql -DATABASE= mysql -PLIST_SUB+= MYSQL="" -PLIST_SUB+= PGSQL="@comment " -CFLAGS+= -I${LOCALBASE}/include/mysql -LDFLAGS+= -L${LOCALBASE}/lib/mysql -.endif - -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" LOCALBASE=${LOCALBASE} -PORTDOCS= INSTALL README EXTRAS - -MAN1= dbmail-smtp.1 -MAN8= dbmail-imapd.8 dbmail-lmtpd.8 dbmail-pop3d.8 \ - dbmail-users.8 dbmail-util.8 -MANCOMPRESSED= no - -pre-everything:: - @${ECHO} "" - @${ECHO} "You may use the following build options:" - @${ECHO} " By default dbmail uses MySQL backend database." - @${ECHO} " To build dbmail with PostgreSQL as backend database," - @${ECHO} " define WITH_POSTGRESQL" - @${ECHO} "" - -post-patch: - @${FIND} ${WRKSRC} -name CVS -type d | ${XARGS} ${RM} -fr - -post-configure: - @${REINPLACE_CMD} -i.orig 's!/etc/dbmail.conf!${PREFIX}/etc/dbmail.conf!g' \ - ${WRKSRC}/dbmail.h - -post-install: - @${INSTALL_DATA} ${WRKSRC}/dbmail.conf ${PREFIX}/etc/dbmail.conf-dist - @${MKDIR} ${DATADIR}/sql - @${INSTALL_DATA} ${WRKSRC}/sql/${DATABASE}/* ${DATADIR}/sql - @cd ${WRKSRC}/man && ${INSTALL_MAN} ${MAN1} ${MAN1PREFIX}/man/man1 -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - @cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} -.endif - @${ECHO} "" - @${ECHO} "IMPORTANT NOTE FOR ADMINS UPGRADING FROM 1.X->2.X!!!" - @${ECHO} "" - @${ECHO} " *) Don't forget to update the database using a script from" - @${ECHO} " ${DATADIR}/sql/" - @${ECHO} " *) Many programs have been renamed and their arguments changed." - @${ECHO} " *) Read the upgrading notes." - @${ECHO} " *) Don't be careless with this upgrade or mail will be lost!" - @${ECHO} " *) dbmail can be controled by setting dbmail_imapd_enable," - @${ECHO} " dbmail_lmtpd_enable, and/or dbmail_pop3d_enable in" - @${ECHO} " /etc/rc.conf." - @${ECHO} "" - -.include <bsd.port.mk> diff --git a/mail/dbmail22/distinfo b/mail/dbmail22/distinfo deleted file mode 100644 index 776ad1c05d7a..000000000000 --- a/mail/dbmail22/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (dbmail-2.0.4.tgz) = fc80ac11a24286aa78ee71dd78c965a1 -SIZE (dbmail-2.0.4.tgz) = 589603 diff --git a/mail/dbmail22/files/dbmail-imapd.sh.in b/mail/dbmail22/files/dbmail-imapd.sh.in deleted file mode 100644 index 82505e96d9b0..000000000000 --- a/mail/dbmail22/files/dbmail-imapd.sh.in +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# PROVIDE: dbmail-imapd -# REQUIRE: DAEMON -# KEYWORD: shutdown - -# -# Add the following lines to /etc/rc.conf to enable dbmail-imapd: -# -#dbmail_imapd_enable="YES" -# -# See dbmail-imapd(8) for flags -# - -. %%RC_SUBR%% - -name=dbmail_imapd -rcvar=`set_rcvar` - -command=%%PREFIX%%/sbin/dbmail-imapd -pidfile=/var/run/dbmail-imapd.pid -required_files=%%PREFIX%%/etc/dbmail.conf - -# read settings, set default values -load_rc_config "$name" -: ${dbmail_imapd_enable="NO"} -: ${dbmail_imapd_flags=""} - -run_rc_command "$1" diff --git a/mail/dbmail22/files/dbmail-lmtpd.sh.in b/mail/dbmail22/files/dbmail-lmtpd.sh.in deleted file mode 100644 index f1133f43a70e..000000000000 --- a/mail/dbmail22/files/dbmail-lmtpd.sh.in +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# PROVIDE: dbmail-lmtpd -# REQUIRE: DAEMON -# KEYWORD: shutdown - -# -# Add the following lines to /etc/rc.conf to enable dbmail-lmtpd: -# -#dbmail_lmtpd_enable="YES" -# -# See dbmail-lmtpd(8) for flags -# - -. %%RC_SUBR%% - -name=dbmail_lmtpd -rcvar=`set_rcvar` - -command=%%PREFIX%%/sbin/dbmail-lmtpd -pidfile=/var/run/dbmail-lmtpd.pid -required_files=%%PREFIX%%/etc/dbmail.conf - -# read settings, set default values -load_rc_config "$name" -: ${dbmail_lmtpd_enable="NO"} -: ${dbmail_lmtpd_flags=""} - -run_rc_command "$1" diff --git a/mail/dbmail22/files/dbmail-pop3d.sh.in b/mail/dbmail22/files/dbmail-pop3d.sh.in deleted file mode 100644 index d787f6a668e7..000000000000 --- a/mail/dbmail22/files/dbmail-pop3d.sh.in +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# PROVIDE: dbmail-pop3d -# REQUIRE: DAEMON -# KEYWORD: shutdown - -# -# Add the following lines to /etc/rc.conf to enable dbmail-pop3d: -# -#dbmail_pop3d_enable="YES" -# -# See dbmail-pop3d(8) for flags -# - -. %%RC_SUBR%% - -name=dbmail_pop3d -rcvar=`set_rcvar` - -command=%%PREFIX%%/sbin/dbmail-pop3d -pidfile=/var/run/dbmail-pop3d.pid -required_files=%%PREFIX%%/etc/dbmail.conf - -# read settings, set default values -load_rc_config "$name" -: ${dbmail_pop3d_enable="NO"} -: ${dbmail_pop3d_flags=""} - -run_rc_command "$1" diff --git a/mail/dbmail22/files/patch-2.0.4_bug145_lmtp.c b/mail/dbmail22/files/patch-2.0.4_bug145_lmtp.c deleted file mode 100644 index 8e355487776c..000000000000 --- a/mail/dbmail22/files/patch-2.0.4_bug145_lmtp.c +++ /dev/null @@ -1,66 +0,0 @@ -Index: lmtp.c -=================================================================== ---- lmtp.c (revision 1559) -+++ lmtp.c (revision 1700) -@@ -77,8 +77,9 @@ - * - -1 on error - * - 1 on success - */ --static int read_whole_message_network(FILE *instream, char **whole_message, -- u64_t *whole_message_size); -+static int read_whole_message_network(FILE *instream, -+ char **whole_message, u64_t *whole_message_size, -+ const char *prepend_format, ...) PRINTF_ARGS(4, 5); - - /** - * \function lmtp_error -@@ -624,7 +625,9 @@ - if (read_whole_message_network( - (FILE *) instream, - &whole_message, -- &whole_message_size) < 0) { -+ &whole_message_size, -+ "Return-Path: %s\r\n", -+ (char *)(list_getstart(&from)->data)) < 0) { - trace(TRACE_ERROR, - "%s,%s: read_whole_message_network() failed", - __FILE__, __func__); -@@ -755,8 +758,9 @@ - return 1; - } - --int read_whole_message_network(FILE *instream, char **whole_message, -- u64_t *whole_message_size) -+int read_whole_message_network(FILE *instream, -+ char **whole_message, u64_t *whole_message_size, -+ const char *prepend_format, ...) - { - char *tmpmessage = NULL; - char tmpline[MESSAGE_MAX_LINE_SIZE + 1]; -@@ -765,9 +769,17 @@ - size_t total_size = 0; - size_t current_pos = 0; - int error = 0; -+ va_list argp; - - memset(tmpline, '\0', MESSAGE_MAX_LINE_SIZE + 1); -- while (fgets(tmpline, MESSAGE_MAX_LINE_SIZE, instream) != NULL) { -+ -+ /* This adds the Return-Path header and any other -+ * important headers we might need; see RFC 2076. */ -+ va_start(argp, prepend_format); -+ line_size = vsnprintf(tmpline, MESSAGE_MAX_LINE_SIZE, prepend_format, argp); -+ va_end(argp); -+ -+ do { - line_size = strlen(tmpline); - - /* It sometimes happens that we read a line of size 0, -@@ -798,6 +810,7 @@ - - memset(tmpline, '\0', MESSAGE_MAX_LINE_SIZE + 1); - } -+ while (fgets(tmpline, MESSAGE_MAX_LINE_SIZE, instream) != NULL); - - if (ferror(instream)) { - trace(TRACE_ERROR, "%s,%s: error reading instream", diff --git a/mail/dbmail22/files/patch-2.0.4_bug177 b/mail/dbmail22/files/patch-2.0.4_bug177 deleted file mode 100644 index 6c0630d72ae4..000000000000 --- a/mail/dbmail22/files/patch-2.0.4_bug177 +++ /dev/null @@ -1,575 +0,0 @@ -Index: user.c -=================================================================== ---- user.c (revision 1711) -+++ user.c (revision 1712) -@@ -202,8 +202,8 @@ - memset(&change_flags, 0, sizeof(change_flags)); - - /* get options */ -- opterr = 0; /* suppress error message from getopt() */ -- while ((opt = getopt(argc, argv, -+ dm_opterr = 0; /* suppress error message from getopt() */ -+ while ((opt = dm_getopt(argc, argv, - "-a:d:c:e:l::x:" /* Major modes */ - "W::w:P::p:u:g:m:t:s:S:T:" /* Minor options */ - "i" "f:qnyvVh" /* Common options */ )) != -1) { -@@ -223,16 +223,16 @@ - if (mode) - mode_toomany = 1; - mode = opt; -- if (optarg && strlen(optarg)) -- user = dm_strdup(optarg); -+ if (dm_optarg && strlen(dm_optarg)) -+ user = dm_strdup(dm_optarg); - break; - - case 'x': - if (mode) - mode_toomany = 1; - mode = opt; -- if (optarg && strlen(optarg)) -- alias = dm_strdup(optarg); -+ if (dm_optarg && strlen(dm_optarg)) -+ alias = dm_strdup(dm_optarg); - break; - - case 'l': -@@ -241,8 +241,8 @@ - if (mode != 0 && mode != 'l') - mode_toomany = 1; - mode = opt; -- if (optarg && strlen(optarg)) -- userspec = dm_strdup(optarg); -+ if (dm_optarg && strlen(dm_optarg)) -+ userspec = dm_strdup(dm_optarg); - break; - - case 'i': -@@ -253,13 +253,13 @@ - /* Minor options */ - case 'w': - change_flags.newpasswd = 1; -- passwd = dm_strdup(optarg); -+ passwd = dm_strdup(dm_optarg); - break; - - case 'W': - change_flags.newpasswd = 1; -- if (optarg && strlen(optarg)) { -- passwdfile = dm_strdup(optarg); -+ if (dm_optarg && strlen(dm_optarg)) { -+ passwdfile = dm_strdup(dm_optarg); - change_flags.newpasswdfile = 1; - } else { - change_flags.newpasswdstdin = 1; -@@ -268,20 +268,20 @@ - - case 'u': - change_flags.newuser = 1; -- newuser = dm_strdup(optarg); -+ newuser = dm_strdup(dm_optarg); - break; - - case 'p': - if (!passwdtype) -- passwdtype = dm_strdup(optarg); -+ passwdtype = dm_strdup(dm_optarg); - // else - // Complain about only one type allowed. - break; - - case 'P': - change_flags.newpasswdshadow = 1; -- if (optarg && strlen(optarg)) -- passwdfile = dm_strdup(optarg); -+ if (dm_optarg && strlen(dm_optarg)) -+ passwdfile = dm_strdup(dm_optarg); - else - passwdfile = SHADOWFILE; - passwdtype = "shadow"; -@@ -289,42 +289,42 @@ - - case 'g': - change_flags.newclientid = 1; -- clientid = strtoull(optarg, NULL, 10); -+ clientid = strtoull(dm_optarg, NULL, 10); - break; - - case 'm': - change_flags.newmaxmail = 1; -- maxmail = strtomaxmail(optarg); -+ maxmail = strtomaxmail(dm_optarg); - break; - - case 's': - // Add this item to the user's aliases. -- if (optarg && (len = strlen(optarg))) -- list_nodeadd(&alias_add, optarg, len+1); -+ if (dm_optarg && (len = strlen(dm_optarg))) -+ list_nodeadd(&alias_add, dm_optarg, len+1); - break; - - case 'S': - // Delete this item from the user's aliases. -- if (optarg && (len = strlen(optarg))) -- list_nodeadd(&alias_del, optarg, len+1); -+ if (dm_optarg && (len = strlen(dm_optarg))) -+ list_nodeadd(&alias_del, dm_optarg, len+1); - break; - - case 't': - // Add this item to the alias's forwards. -- if (optarg && (len = strlen(optarg))) -- list_nodeadd(&fwds_add, optarg, len+1); -+ if (dm_optarg && (len = strlen(dm_optarg))) -+ list_nodeadd(&fwds_add, dm_optarg, len+1); - break; - - case 'T': - // Delete this item from the alias's forwards. -- if (optarg && (len = strlen(optarg))) -- list_nodeadd(&fwds_del, optarg, len+1); -+ if (dm_optarg && (len = strlen(dm_optarg))) -+ list_nodeadd(&fwds_del, dm_optarg, len+1); - break; - - /* Common options */ - case 'f': -- if (optarg && strlen(optarg) > 0) -- configFile = optarg; -+ if (dm_optarg && strlen(dm_optarg) > 0) -+ configFile = dm_optarg; - else { - qerrorf("dbmail-users: -f requires a filename\n\n"); - result = 1; -Index: lmtpd.c -=================================================================== ---- lmtpd.c (revision 1711) -+++ lmtpd.c (revision 1712) -@@ -100,8 +100,8 @@ - openlog(PNAME, LOG_PID, LOG_MAIL); - - /* get command-line options */ -- opterr = 0; /* suppress error message from getopt() */ -- while ((opt = getopt(argc, argv, "vVhqnf:p:")) != -1) { -+ dm_opterr = 0; /* suppress error message from getopt() */ -+ while ((opt = dm_getopt(argc, argv, "vVhqnf:p:")) != -1) { - switch (opt) { - case 'v': - /* TODO: Perhaps verbose should log to the console with -n? */ -@@ -121,8 +121,8 @@ - do_showhelp(); - return 0; - case 'p': -- if (optarg && strlen(optarg) > 0) -- pidFile = optarg; -+ if (dm_optarg && strlen(dm_optarg) > 0) -+ pidFile = dm_optarg; - else { - fprintf(stderr, - "dbmail-lmtpd: -p requires a filename " -@@ -131,8 +131,8 @@ - } - break; - case 'f': -- if (optarg && strlen(optarg) > 0) -- configFile = optarg; -+ if (dm_optarg && strlen(dm_optarg) > 0) -+ configFile = dm_optarg; - else { - fprintf(stderr, - "dbmail-lmtpd: -f requires a filename " -Index: dm_getopt.c -=================================================================== ---- dm_getopt.c (revision 1711) -+++ dm_getopt.c (revision 1712) -@@ -135,7 +135,7 @@ - */ - - int _dm_getopt_internal(int argc, char * argv[], const char *shortopts, -- const struct option *longopts, int *longind, -+ const struct dm_option *longopts, int *longind, - int long_only) - { - char mode, colon_mode = *shortopts; -@@ -261,13 +261,13 @@ - } - - int dm_getopt_long(int argc, char * argv[], const char *shortopts, -- const struct option *longopts, int *longind) -+ const struct dm_option *longopts, int *longind) - { - return _dm_getopt_internal(argc, argv, shortopts, longopts, longind, 0); - } - - int dm_getopt_long_only(int argc, char * argv[], const char *shortopts, -- const struct option *longopts, int *longind) -+ const struct dm_option *longopts, int *longind) - { - return _dm_getopt_internal(argc, argv, shortopts, longopts, longind, 1); - } -Index: maintenance.c -=================================================================== ---- maintenance.c (revision 1711) -+++ maintenance.c (revision 1712) -@@ -121,8 +121,8 @@ - setvbuf(stdout, 0, _IONBF, 0); - - /* get options */ -- opterr = 0; /* suppress error message from getopt() */ -- while ((opt = getopt(argc, argv, -+ dm_opterr = 0; /* suppress error message from getopt() */ -+ while ((opt = dm_getopt(argc, argv, - "-acrtl:pudb" /* Main options */ - "i" /* Maybe later options */ - "f:qnyvVh")) != -1) { /* Common options */ -@@ -173,8 +173,8 @@ - case 'l': - check_iplog = 1; - do_nothing = 0; -- if (optarg) -- strncpy(timespec, optarg, LEN); -+ if (dm_optarg) -+ strncpy(timespec, dm_optarg, LEN); - else - timespec[0] = 0; - -@@ -209,8 +209,8 @@ - break; - - case 'f': -- if (optarg && strlen(optarg) > 0) -- configFile = optarg; -+ if (dm_optarg && strlen(dm_optarg) > 0) -+ configFile = dm_optarg; - else { - qerrorf("dbmail-util: -f requires a filename\n\n" ); - return 1; -Index: dm_getopt.h -=================================================================== ---- dm_getopt.h (revision 1711) -+++ dm_getopt.h (revision 1712) -@@ -26,38 +26,23 @@ - */ - - #include "config.h" -+#ifndef DM_GETOPT_H -+#define DM_GETOPT_H - --#ifndef USE_DM_GETOPT --# include <getopt.h> --#endif -+# ifndef USE_DM_GETOPT -+# include <getopt.h> -+# define dm_getopt getopt -+# define dm_getopt_long getopt_long -+# define dm_getopt_long_only getopt_long_only -+# define _dm_getopt_internal _getopt_internal -+# define dm_opterr opterr -+# define dm_optind optind -+# define dm_optopt optopt -+# define dm_optarg optarg -+# endif - --#ifdef USE_DM_GETOPT -+# ifdef USE_DM_GETOPT - --# ifndef DM_GETOPT_H -- /* Our include guard first. */ --# define DM_GETOPT_H -- /* Try to kill the system getopt.h */ --# define _GETOPT_DECLARED --# define _GETOPT_H --# define GETOPT_H -- --# undef getopt --# define getopt dm_getopt --# undef getopt_long --# define getopt_long dm_getopt_long --# undef getopt_long_only --# define getopt_long_only dm_getopt_long_only --# undef _getopt_internal --# define _getopt_internal _dm_getopt_internal --# undef opterr --# define opterr dm_opterr --# undef optind --# define optind dm_optind --# undef optopt --# define optopt dm_optopt --# undef optarg --# define optarg dm_optarg -- - # ifdef __cplusplus - extern "C" { - # endif -@@ -68,7 +53,7 @@ - extern int dm_optind, dm_opterr, dm_optopt; - extern char *dm_optarg; - --struct option { -+struct dm_option { - const char *name; - int has_arg; - int *flag; -@@ -76,28 +61,25 @@ - }; - - /* human-readable values for has_arg */ --# undef no_argument --# define no_argument 0 --# undef required_argument --# define required_argument 1 --# undef optional_argument --# define optional_argument 2 -+# define dm_getopt_no_argument 0 -+# define dm_getopt_required_argument 1 -+# define dm_getopt_optional_argument 2 - - /* GNU-style long-argument parsers */ - extern int dm_getopt_long(int argc, char * argv[], const char *shortopts, -- const struct option *longopts, int *longind); -+ const struct dm_option *longopts, int *longind); - - extern int dm_getopt_long_only(int argc, char * argv[], const char *shortopts, -- const struct option *longopts, int *longind); -+ const struct dm_option *longopts, int *longind); - - extern int _dm_getopt_internal(int argc, char * argv[], const char *shortopts, -- const struct option *longopts, int *longind, -+ const struct dm_option *longopts, int *longind, - int long_only); - - # ifdef __cplusplus - } - # endif - --# endif /* DM_GETOPT_H */ -+# endif /* USE_DM_GETOPT */ - --#endif /* USE_DM_GETOPT */ -+#endif /* DM_GETOPT_H */ -Index: timsieved.c -=================================================================== ---- timsieved.c (revision 1711) -+++ timsieved.c (revision 1712) -@@ -99,8 +99,8 @@ - openlog(PNAME, LOG_PID, LOG_MAIL); - - /* get command-line options */ -- opterr = 0; /* suppress error message from getopt() */ -- while ((opt = getopt(argc, argv, "vVhqnf:p:")) != -1) { -+ dm_opterr = 0; /* suppress error message from getopt() */ -+ while ((opt = dm_getopt(argc, argv, "vVhqnf:p:")) != -1) { - switch (opt) { - case 'v': - /* TODO: Perhaps verbose should log to the console with -n? */ -@@ -120,8 +120,8 @@ - do_showhelp(); - return 0; - case 'p': -- if (optarg && strlen(optarg) > 0) -- pidFile = optarg; -+ if (dm_optarg && strlen(dm_optarg) > 0) -+ pidFile = dm_optarg; - else { - fprintf(stderr, - "dbmail-timsieved: -p requires a filename " -@@ -130,8 +130,8 @@ - } - break; - case 'f': -- if (optarg && strlen(optarg) > 0) -- configFile = optarg; -+ if (dm_optarg && strlen(dm_optarg) > 0) -+ configFile = dm_optarg; - else { - fprintf(stderr, - "dbmail-timsieved: -f requires a filename " -Index: pop3d.c -=================================================================== ---- pop3d.c (revision 1711) -+++ pop3d.c (revision 1712) -@@ -103,8 +103,8 @@ - openlog(PNAME, LOG_PID, LOG_MAIL); - - /* get command-line options */ -- opterr = 0; /* suppress error message from getopt() */ -- while ((opt = getopt(argc, argv, "vVhqnf:p:")) != -1) { -+ dm_opterr = 0; /* suppress error message from getopt() */ -+ while ((opt = dm_getopt(argc, argv, "vVhqnf:p:")) != -1) { - switch (opt) { - case 'v': - /* TODO: Perhaps verbose should log to the console with -n? */ -@@ -124,8 +124,8 @@ - do_showhelp(); - return 0; - case 'p': -- if (optarg && strlen(optarg) > 0) -- pidFile = optarg; -+ if (dm_optarg && strlen(dm_optarg) > 0) -+ pidFile = dm_optarg; - else { - fprintf(stderr, - "dbmail-pop3d: -p requires a filename " -@@ -134,8 +134,8 @@ - } - break; - case 'f': -- if (optarg && strlen(optarg) > 0) -- configFile = optarg; -+ if (dm_optarg && strlen(dm_optarg) > 0) -+ configFile = dm_optarg; - else { - fprintf(stderr, - "dbmail-pop3d: -f requires a filename " -Index: imapd.c -=================================================================== ---- imapd.c (revision 1711) -+++ imapd.c (revision 1712) -@@ -97,8 +97,8 @@ - openlog(PNAME, LOG_PID, LOG_MAIL); - - /* get command-line options */ -- opterr = 0; /* suppress error message from getopt() */ -- while ((opt = getopt(argc, argv, "vVhqnf:p:")) != -1) { -+ dm_opterr = 0; /* suppress error message from getopt() */ -+ while ((opt = dm_getopt(argc, argv, "vVhqnf:p:")) != -1) { - switch (opt) { - case 'v': - /* TODO: Perhaps verbose should log to the console with -n? */ -@@ -118,8 +118,8 @@ - do_showhelp(); - return 0; - case 'p': -- if (optarg && strlen(optarg) > 0) -- pidFile = optarg; -+ if (dm_optarg && strlen(dm_optarg) > 0) -+ pidFile = dm_optarg; - else { - fprintf(stderr, - "dbmail-imapd: -p requires a filename " -@@ -128,8 +128,8 @@ - } - break; - case 'f': -- if (optarg && strlen(optarg) > 0) -- configFile = optarg; -+ if (dm_optarg && strlen(dm_optarg) > 0) -+ configFile = dm_optarg; - else { - fprintf(stderr, - "dbmail-imapd: -f requires a filename " -Index: sievecmd.c -=================================================================== ---- sievecmd.c (revision 1711) -+++ sievecmd.c (revision 1712) -@@ -57,7 +57,7 @@ - char *user_name = NULL; - char *name = NULL; - FILE *source = NULL; -- extern char *optarg; -+ extern char *dm_optarg; - - openlog(PNAME, LOG_PID, LOG_MAIL); - -@@ -70,7 +70,7 @@ - configure_debug(TRACE_ERROR, 1, 0); - - while (opt != -1 && act != 'h') { -- opt = getopt(argc, argv, "a:d:i:r:u:l"); -+ opt = dm_getopt(argc, argv, "a:d:i:r:u:l"); - - switch (opt) { - case -1: -@@ -84,11 +84,11 @@ - act = 'h'; - else - act = opt; -- name = optarg; -+ name = dm_optarg; - source = stdin; // FIXME to take files as input, too - break; - case 'u': -- user_name = dm_strdup(optarg); -+ user_name = dm_strdup(dm_optarg); - break; - case 'l': - if (act != 0) -Index: main.c -=================================================================== ---- main.c (revision 1711) -+++ main.c (revision 1712) -@@ -189,7 +189,7 @@ - * with an immediately preceding option are return with option - * value '1'. We will use this to allow for multiple values to - * follow after each of the supported options. */ -- while ((c = getopt(argc, argv, "-t::m:u:d:r: f:qnyvVh")) != EOF) { -+ while ((c = dm_getopt(argc, argv, "-t::m:u:d:r: f:qnyvVh")) != EOF) { - /* Received an n-th value following the last option, - * so recall the last known option to be used in the switch. */ - if (c == 1) -@@ -200,13 +200,13 @@ - case 't': - trace(TRACE_INFO, "main(): using NORMAL_DELIVERY"); - -- if (optarg) { -+ if (dm_optarg) { - if (deliver_to_header) { - printf - ("Only one header field may be specified.\n"); - usage_error = 1; - } else -- deliver_to_header = optarg; -+ deliver_to_header = dm_optarg; - } else - deliver_to_header = "deliver-to"; - -@@ -221,7 +221,7 @@ - ("Only one header field may be specified.\n"); - usage_error = 1; - } else -- deliver_to_mailbox = optarg; -+ deliver_to_mailbox = dm_optarg; - - break; - -@@ -231,8 +231,8 @@ - - /* Add argument onto the returnpath list. */ - if (list_nodeadd -- (&returnpath, optarg, -- strlen(optarg) + 1) == 0) { -+ (&returnpath, dm_optarg, -+ strlen(dm_optarg) + 1) == 0) { - trace(TRACE_ERROR, - "main(): list_nodeadd reports out of memory" - " while adding to returnpath"); -@@ -247,7 +247,7 @@ - "main(): using SPECIAL_DELIVERY to usernames"); - - dsnuser_init(&dsnuser); -- dsnuser.address = dm_strdup(optarg); -+ dsnuser.address = dm_strdup(dm_optarg); - - /* Add argument onto the users list. */ - if (list_nodeadd -@@ -267,7 +267,7 @@ - "main(): using SPECIAL_DELIVERY to email addresses"); - - dsnuser_init(&dsnuser); -- dsnuser.address = dm_strdup(optarg); -+ dsnuser.address = dm_strdup(dm_optarg); - - /* Add argument onto the users list. */ - if (list_nodeadd -@@ -284,8 +284,8 @@ - - /* Common command line options. */ - case 'f': -- if (optarg && strlen(optarg) > 0) -- configFile = optarg; -+ if (dm_optarg && strlen(dm_optarg) > 0) -+ configFile = dm_optarg; - else { - fprintf(stderr, - "dbmail-smtp: -f requires a filename\n\n" ); diff --git a/mail/dbmail22/files/patch-2.0.4_bug184 b/mail/dbmail22/files/patch-2.0.4_bug184 deleted file mode 100644 index 37d6689d66b2..000000000000 --- a/mail/dbmail22/files/patch-2.0.4_bug184 +++ /dev/null @@ -1,66 +0,0 @@ -Index: configure.in -=================================================================== ---- configure.in (revision 1751) -+++ configure.in (revision 1761) -@@ -42,6 +42,7 @@ - DBMAIL_CHECK_SIEVE_LIBS - DBMAIL_CHECK_GC - DBMAIL_CHECK_GETOPT -+DBMAIL_CHECK_SOCKLEN_T - - AC_PROG_CC - AC_COMPILE_WARNINGS -Index: acinclude.m4 -=================================================================== ---- acinclude.m4 (revision 1751) -+++ acinclude.m4 (revision 1761) -@@ -513,3 +513,49 @@ - - # Prerequisites of lib/getopt*. - AC_DEFUN([CHECK_PREREQ_GETOPT], [:]) -+ -+# -+# socklen_t -+# from curl -+ -+dnl Check for socklen_t: historically on BSD it is an int, and in -+dnl POSIX 1g it is a type of its own, but some platforms use different -+dnl types for the argument to getsockopt, getpeername, etc. So we -+dnl have to test to find something that will work. -+AC_DEFUN([DBMAIL_CHECK_SOCKLEN_T], -+[ -+ AC_CHECK_TYPE([socklen_t], ,[ -+ AC_MSG_CHECKING([for socklen_t equivalent]) -+ AC_CACHE_VAL([socklen_t_equiv], -+ [ -+ # Systems have either "struct sockaddr *" or -+ # "void *" as the second argument to getpeername -+ socklen_t_equiv= -+ for arg2 in "struct sockaddr" void; do -+ for t in int size_t unsigned long "unsigned long"; do -+ AC_TRY_COMPILE([ -+ #include <sys/types.h> -+ #include <sys/socket.h> -+ -+ int getpeername (int, $arg2 *, $t *); -+ ],[ -+ $t len; -+ getpeername(0,0,&len); -+ ],[ -+ socklen_t_equiv="$t" -+ break -+ ]) -+ done -+ done -+ -+ if test "x$socklen_t_equiv" = x; then -+ AC_MSG_ERROR([Cannot find a type to use in place of socklen_t]) -+ fi -+ ]) -+ AC_MSG_RESULT($socklen_t_equiv) -+ AC_DEFINE_UNQUOTED(socklen_t, $socklen_t_equiv, -+ [type to use in place of socklen_t if not defined])], -+ [#include <sys/types.h> -+#include <sys/socket.h>]) -+]) -+ diff --git a/mail/dbmail22/files/patch-2.0.4_bug190_pool.c b/mail/dbmail22/files/patch-2.0.4_bug190_pool.c deleted file mode 100644 index 562c0cb23688..000000000000 --- a/mail/dbmail22/files/patch-2.0.4_bug190_pool.c +++ /dev/null @@ -1,126 +0,0 @@ -Index: pool.c -=================================================================== ---- pool.c (revision 1600) -+++ pool.c (revision 1758) -@@ -73,8 +73,10 @@ - void scoreboard_new(serverConfig_t * conf) - { - int serr; -- if ((shmid = shmget(IPC_PRIVATE, P_SIZE, 0644 | IPC_CREAT)) == -1) -- trace(TRACE_FATAL, "%s,%s: shmget failed",__FILE__,__func__); -+ if ((shmid = shmget(IPC_PRIVATE, P_SIZE, 0644 | IPC_CREAT)) == -1) { -+ serr = errno; -+ trace(TRACE_FATAL, "%s,%s: shmget failed [%s]",__FILE__,__func__, strerror(serr)); -+ } - scoreboard = shmat(shmid, (void *) 0, 0); - serr=errno; - if (scoreboard == (Scoreboard_t *) (-1)) { -@@ -222,7 +236,7 @@ - } - scoreboard_unlck(); - trace(TRACE_FATAL, -- "%s,%s: pid NOT found on scoreboard [%d]", __FILE__, __FUNCTION__, pid); -+ "%s,%s: pid NOT found on scoreboard [%d]", __FILE__, __func__, pid); - return -1; - } - -@@ -238,25 +252,25 @@ - { - int i; - trace(TRACE_MESSAGE, "%s,%s: register child [%d]", -- __FILE__, __FUNCTION__, getpid()); -+ __FILE__, __func__, getpid()); - - scoreboard_wrlck(); - for (i = 0; i < scoreboard->conf->maxChildren; i++) { - if (scoreboard->child[i].pid == -1) - break; - if (scoreboard->child[i].pid == getpid()) { -- trace(TRACE_ERROR, -+ scoreboard_unlck(); -+ trace(TRACE_FATAL, - "%s,%s: child already registered.", -- __FILE__, __FUNCTION__); -- scoreboard_unlck(); -+ __FILE__, __func__); - return -1; - } - } - if (i == scoreboard->conf->maxChildren) { -+ scoreboard_unlck(); - trace(TRACE_WARNING, - "%s,%s: no empty slot found", -- __FILE__, __FUNCTION__); -- scoreboard_unlck(); -+ __FILE__, __func__); - return -1; - } - -@@ -264,8 +278,8 @@ - scoreboard->child[i].status = STATE_IDLE; - scoreboard_unlck(); - -- trace(TRACE_INFO, "%s,%s: initializing child_state [%d] using slot [%d]", -- __FILE__, __FUNCTION__, getpid(), i); -+ trace(TRACE_MESSAGE, "%s,%s: initializing child_state [%d] using slot [%d]", -+ __FILE__, __func__, getpid(), i); - return 0; - } - -@@ -281,7 +295,7 @@ - scoreboard->child[key].status = STATE_CONNECTED; - scoreboard_unlck(); - -- trace(TRACE_DEBUG, "%s,%s: [%d]", __FILE__, __FUNCTION__, -+ trace(TRACE_DEBUG, "%s,%s: [%d]", __FILE__, __func__, - getpid()); - } - -@@ -297,7 +311,7 @@ - scoreboard->child[key].status = STATE_IDLE; - scoreboard_unlck(); - -- trace(TRACE_DEBUG, "%s,%s: [%d]", __FILE__, __FUNCTION__, -+ trace(TRACE_DEBUG, "%s,%s: [%d]", __FILE__, __func__, - getpid()); - } - -@@ -320,7 +334,7 @@ - scoreboard_unlck(); - - trace(TRACE_MESSAGE, -- "%s,%s: child [%d] unregistered", __FILE__, __FUNCTION__, -+ "%s,%s: child [%d] unregistered", __FILE__, __func__, - getpid()); - } - -@@ -346,7 +360,7 @@ - manage_stop_children(); - trace(TRACE_FATAL, - "%s,%s: could not create children. Fatal.", -- __FILE__, __FUNCTION__); -+ __FILE__, __func__); - exit(0); - } - } -@@ -360,10 +374,17 @@ - if (chpid == -1) - continue; - if (waitpid(chpid, NULL, WNOHANG|WUNTRACED) == chpid) { -+ scoreboard_release(chpid); - trace(TRACE_MESSAGE,"%s,%s: child [%d] exited. Restarting...", -- __FILE__, __FUNCTION__, chpid); -- scoreboard_release(chpid); -- CreateChild(&childinfo); -+ __FILE__, __func__, chpid); -+ if (CreateChild(&childinfo)== -1) { -+ trace(TRACE_ERROR,"%s,%s: createchild failed. Bailout...", -+ __FILE__, __func__); -+ GeneralStopRequested=1; -+ manage_stop_children(); -+ -+ exit(1); -+ } - } - } - sleep(1); diff --git a/mail/dbmail22/files/patch-2.0.4_bug190_server.c b/mail/dbmail22/files/patch-2.0.4_bug190_server.c deleted file mode 100644 index 23129a5c8b52..000000000000 --- a/mail/dbmail22/files/patch-2.0.4_bug190_server.c +++ /dev/null @@ -1,41 +0,0 @@ -Index: server.c -=================================================================== ---- server.c (revision 1600) -+++ server.c (revision 1758) -@@ -119,9 +119,15 @@ - alarm(10); - - trace(TRACE_DEBUG, "StartServer(): children created, starting main service loop"); -- while (!GeneralStopRequested) -- manage_restart_children(); -- -+ while (!GeneralStopRequested) { -+ if (db_connect() != 0) { -+ GeneralStopRequested=1; -+ } else { -+ db_disconnect(); -+ manage_restart_children(); -+ } -+ } -+ - manage_stop_children(); - scoreboard_delete(); - -@@ -131,6 +137,8 @@ - - void ParentSigHandler(int sig, siginfo_t * info, void *data) - { -+ int saved_errno = errno; -+ - if (ParentPID != getpid()) { - trace(TRACE_INFO, - "ParentSigHandler(): i'm no longer father"); -@@ -162,6 +170,8 @@ - default: - GeneralStopRequested = 1; - } -+ -+ errno = saved_errno; - } - - diff --git a/mail/dbmail22/files/patch-2.0.4_bug190_serverchild.c b/mail/dbmail22/files/patch-2.0.4_bug190_serverchild.c deleted file mode 100644 index bf6da33dcfbd..000000000000 --- a/mail/dbmail22/files/patch-2.0.4_bug190_serverchild.c +++ /dev/null @@ -1,267 +0,0 @@ -Index: serverchild.c -=================================================================== ---- serverchild.c (revision 1600) -+++ serverchild.c (revision 1758) -@@ -66,13 +66,13 @@ - void client_close(void) - { - if (client.tx) { -- trace(TRACE_DEBUG,"%s,%s: closing write stream", __FILE__,__FUNCTION__); -+ trace(TRACE_DEBUG,"%s,%s: closing write stream", __FILE__,__func__); - fflush(client.tx); - fclose(client.tx); /* closes clientSocket as well */ - client.tx = NULL; - } - if (client.rx) { -- trace(TRACE_DEBUG,"%s,%s: closing read stream", __FILE__,__FUNCTION__); -+ trace(TRACE_DEBUG,"%s,%s: closing read stream", __FILE__,__func__); - shutdown(fileno(client.rx), SHUT_RDWR); - fclose(client.rx); - client.rx = NULL; -@@ -86,7 +86,7 @@ - - trace(TRACE_DEBUG, - "%s,%s: database connection still open, closing", -- __FILE__,__FUNCTION__); -+ __FILE__,__func__); - db_disconnect(); - auth_disconnect(); - connected = 0; /* FIXME a signal between this line and the previous one -@@ -99,18 +99,22 @@ - - void noop_child_sig_handler(int sig, siginfo_t *info UNUSED, void *data UNUSED) - { -- trace(TRACE_DEBUG, "%s,%s: ignoring signal [%d]", __FILE__, __FUNCTION__, sig); -+ int saved_errno = errno; -+ trace(TRACE_DEBUG, "%s,%s: ignoring signal [%d]", __FILE__, __func__, sig); -+ errno = saved_errno; - } - - void active_child_sig_handler(int sig, siginfo_t * info UNUSED, void *data UNUSED) - { -+ int saved_errno = errno; -+ - static int triedDisconnect = 0; - - #ifdef _USE_STR_SIGNAL -- trace(TRACE_ERROR, "%s,%s: got signal [%s]", __FILE__, __FUNCTION__, -+ trace(TRACE_ERROR, "%s,%s: got signal [%s]", __FILE__, __func__, - strsignal(sig)); - #else -- trace(TRACE_ERROR, "%s,%s: got signal [%d]", __FILE__, __FUNCTION__, sig); -+ trace(TRACE_ERROR, "%s,%s: got signal [%d]", __FILE__, __func__, sig); - #endif - - /* perform reinit at SIGHUP otherwise exit, but do nothing on -@@ -118,10 +122,10 @@ - switch (sig) { - case SIGCHLD: - trace(TRACE_DEBUG, "%s,%s: SIGCHLD received... ignoring", -- __FILE__, __FUNCTION__); -+ __FILE__, __func__); - break; - case SIGALRM: -- trace(TRACE_DEBUG, "%s,%s: timeout received", __FILE__, __FUNCTION__); -+ trace(TRACE_DEBUG, "%s,%s: timeout received", __FILE__, __func__); - client_close(); - break; - -@@ -132,23 +136,23 @@ - if (ChildStopRequested) { - trace(TRACE_DEBUG, - "%s,%s: already caught a stop request. Closing right now", -- __FILE__,__FUNCTION__); -+ __FILE__,__func__); - - /* already caught this signal, exit the hard way now */ - client_close(); - disconnect_all(); - child_unregister(); -- trace(TRACE_DEBUG, "%s,%s: exit",__FILE__,__FUNCTION__); -+ trace(TRACE_DEBUG, "%s,%s: exit",__FILE__,__func__); - exit(1); - } -- trace(TRACE_DEBUG, "%s,%s: setting stop request",__FILE__,__FUNCTION__); -+ trace(TRACE_DEBUG, "%s,%s: setting stop request",__FILE__,__func__); - DelChildSigHandler(); - ChildStopRequested = 1; - break; - default: - /* bad shtuff, exit */ - trace(TRACE_DEBUG, -- "%s,%s: cannot ignore this. Terminating",__FILE__,__FUNCTION__); -+ "%s,%s: cannot ignore this. Terminating",__FILE__,__func__); - - /* - * For some reason i have not yet determined the process starts eating up -@@ -164,10 +168,12 @@ - disconnect_all(); - } - -- trace(TRACE_DEBUG, "%s,%s: exit", __FILE__, __FUNCTION__); -+ trace(TRACE_DEBUG, "%s,%s: exit", __FILE__, __func__); - child_unregister(); - exit(1); - } -+ -+ errno = saved_errno; - } - - -@@ -239,16 +245,19 @@ - if (! pid) { - if (child_register() == -1) { - trace(TRACE_FATAL, "%s,%s: child_register failed", -- __FILE__, __FUNCTION__); -+ __FILE__, __func__); - exit(0); - - } - - ChildStopRequested = 0; - SetChildSigHandler(); -- trace(TRACE_INFO, "%s,%s: signal handler placed, going to perform task now", -- __FILE__, __FUNCTION__); -- PerformChildTask(info); -+ -+ trace(TRACE_INFO, "%s,%s: signal handler placed, going to perform task now", -+ __FILE__, __func__); -+ -+ if (PerformChildTask(info)== -1) -+ return -1; - child_unregister(); - exit(0); - } else { -@@ -269,22 +278,22 @@ - struct hostent *clientHost; - - if (!info) { -- trace(TRACE_ERROR, -- "PerformChildTask(): NULL info supplied"); -+ trace(TRACE_ERROR, "%s,%s: NULL info supplied", -+ __FILE__, __func__); - return -1; - } - - if (db_connect() != 0) { -- trace(TRACE_ERROR, -- "PerformChildTask(): could not connect to database"); -+ trace(TRACE_ERROR, "%s,%s: could not connect to database", -+ __FILE__, __func__); - return -1; - } - if (db_check_version() != 0) - return -1; - - if (auth_connect() != 0) { -- trace(TRACE_ERROR, -- "PerformChildTask(): could not connect to authentication"); -+ trace(TRACE_ERROR, "%s,%s: could not connect to authentication", -+ __FILE__, __func__); - return -1; - } - -@@ -294,12 +303,13 @@ - for (i = 0; i < info->maxConnect && !ChildStopRequested; i++) { - - if (db_check_connection()) { -- trace(TRACE_ERROR, "%s,%s: database has gone away", __FILE__, __func__); -+ trace(TRACE_ERROR, "%s,%s: database has gone away", -+ __FILE__, __func__); - return -1; - } - -- trace(TRACE_INFO, -- "PerformChildTask(): waiting for connection"); -+ trace(TRACE_INFO, "%s,%s: waiting for connection", -+ __FILE__, __func__); - - child_reg_disconnected(); - -@@ -312,8 +322,8 @@ - - if (clientSocket == -1) { - i--; /* don't count this as a connect */ -- trace(TRACE_INFO, -- "PerformChildTask(): accept failed"); -+ trace(TRACE_INFO, "%s,%s: accept failed", -+ __FILE__, __func__); - continue; /* accept failed, refuse connection & continue */ - } - -@@ -337,30 +347,29 @@ - strncpy(client.clientname, - clientHost->h_name, FIELDSIZE); - -- trace(TRACE_MESSAGE, -- "PerformChildTask(): incoming connection from [%s (%s)]", -+ trace(TRACE_MESSAGE, "%s,%s: incoming connection from [%s (%s)]", -+ __FILE__, __func__, - client.ip, - client.clientname[0] ? client. - clientname : "Lookup failed"); - } else { -- trace(TRACE_MESSAGE, -- "PerformChildTask(): incoming connection from [%s]", -- client.ip); -+ trace(TRACE_MESSAGE, "%s,%s: incoming connection from [%s]", -+ __FILE__, __func__, client.ip); - } - - /* make streams */ - if (!(client.rx = fdopen(dup(clientSocket), "r"))) { - /* read-FILE opening failure */ -- trace(TRACE_ERROR, -- "PerformChildTask(): error opening read file stream"); -+ trace(TRACE_ERROR, "%s,%s: error opening read file stream", -+ __FILE__, __func__); - close(clientSocket); - continue; - } - - if (!(client.tx = fdopen(clientSocket, "w"))) { - /* write-FILE opening failure */ -- trace(TRACE_ERROR, -- "PerformChildTask(): error opening write file stream"); -+ trace(TRACE_ERROR, "%s,%s: error opening write file stream", -+ __FILE__, __func__); - fclose(client.rx); - close(clientSocket); - memset(&client, 0, sizeof(client)); -@@ -370,8 +379,8 @@ - setvbuf(client.tx, (char *) NULL, _IOLBF, 0); - setvbuf(client.rx, (char *) NULL, _IOLBF, 0); - -- trace(TRACE_DEBUG, -- "PerformChildTask(): client info init complete, calling client handler"); -+ trace(TRACE_DEBUG, "%s,%s: client info init complete, calling client handler", -+ __FILE__, __func__); - - /* streams are ready, perform handling */ - info->ClientHandler(&client); -@@ -379,17 +388,19 @@ - set_proc_title("%s", "Idle"); - #endif - -- trace(TRACE_DEBUG, -- "PerformChildTask(): client handling complete, closing streams"); -+ trace(TRACE_DEBUG, "%s,%s: client handling complete, closing streams", -+ __FILE__, __func__); - client_close(); -- trace(TRACE_INFO, "PerformChildTask(): connection closed"); -+ trace(TRACE_INFO, "%s,%s: connection closed", -+ __FILE__, __func__); - } - - if (!ChildStopRequested) -- trace(TRACE_ERROR, -- "PerformChildTask(): maximum number of connections reached, stopping now"); -+ trace(TRACE_ERROR, "%s,%s: maximum number of connections reached, stopping now", -+ __FILE__, __func__); - else -- trace(TRACE_ERROR, "PerformChildTask(): stop requested"); -+ trace(TRACE_ERROR, "%s,%s: stop requested", -+ __FILE__, __func__); - - child_reg_disconnected(); - disconnect_all(); diff --git a/mail/dbmail22/files/patch-2.0.4_bug198_pool.c b/mail/dbmail22/files/patch-2.0.4_bug198_pool.c deleted file mode 100644 index c21e745d9dda..000000000000 --- a/mail/dbmail22/files/patch-2.0.4_bug198_pool.c +++ /dev/null @@ -1,13 +0,0 @@ -Index: pool.c -=================================================================== ---- pool.c (revision 1763) -+++ pool.c (revision 1787) -@@ -433,7 +433,7 @@ - - for (i = 0; i < scoreboard->conf->maxChildren; i++) { - chpid = scoreboard->child[i].pid; -- if (chpid != 0) -+ if (chpid > 0) - kill(chpid, SIGKILL);; - scoreboard_release(chpid); - } diff --git a/mail/dbmail22/files/patch-2.0.4_bug199_server.c b/mail/dbmail22/files/patch-2.0.4_bug199_server.c deleted file mode 100644 index 6786e6c8fc60..000000000000 --- a/mail/dbmail22/files/patch-2.0.4_bug199_server.c +++ /dev/null @@ -1,35 +0,0 @@ -Index: server.c -=================================================================== ---- server.c (revision 1763) -+++ server.c (revision 1787) -@@ -69,7 +69,7 @@ - - act.sa_sigaction = ParentSigHandler; - sigemptyset(&act.sa_mask); -- act.sa_flags = SA_SIGINFO; -+ act.sa_flags = SA_SIGINFO | SA_NOCLDSTOP; - - sigaction(SIGCHLD, &act, 0); - sigaction(SIGINT, &act, 0); -@@ -152,6 +152,7 @@ - - void ParentSigHandler(int sig, siginfo_t * info, void *data) - { -+ pid_t chpid; - int saved_errno = errno; - - if (ParentPID != getpid()) { -@@ -175,7 +176,12 @@ - break; - - case SIGCHLD: -- break; /* ignore, wait for child in main loop */ -+ /* ignore, wait for child in main loop */ -+ /* but we need to catch zombie */ -+ if ((chpid = waitpid(-1,&sig,WNOHANG)) > 0) -+ scoreboard_release(chpid); -+ -+ break; - - case SIGHUP: - trace(TRACE_DEBUG, diff --git a/mail/dbmail22/files/patch-2.0.4_bug214_main.c b/mail/dbmail22/files/patch-2.0.4_bug214_main.c deleted file mode 100644 index 18dfefa77e80..000000000000 --- a/mail/dbmail22/files/patch-2.0.4_bug214_main.c +++ /dev/null @@ -1,20 +0,0 @@ -Index: main.c -=================================================================== ---- main.c (revision 1793) -+++ main.c (revision 1796) -@@ -133,6 +133,7 @@ - trace(TRACE_ERROR, "%s,%s: error reading message", - __FILE__, __func__); - dm_free(tmpmessage); -+ tmpmessage=NULL; - return -1; - } - -@@ -371,6 +372,7 @@ - trace(TRACE_ERROR, "%s,%s splitmessage failed", - __FILE__, __func__); - dm_free(whole_message); -+ whole_message=NULL; - exitcode = EX_TEMPFAIL; - goto freeall; - } diff --git a/mail/dbmail22/files/patch-2.0.4_bug216_header.c b/mail/dbmail22/files/patch-2.0.4_bug216_header.c deleted file mode 100644 index d9610a5cd609..000000000000 --- a/mail/dbmail22/files/patch-2.0.4_bug216_header.c +++ /dev/null @@ -1,37 +0,0 @@ -Index: header.c -=================================================================== ---- header.c (revision 1796) -+++ header.c (revision 1813) -@@ -176,15 +176,17 @@ - if (message_content[line_content_size] == '\n') { - tmp_line_size = line_content_size + 1; - tmp_line_rfcsize = tmp_line_size + 1; -- } else { -- if (message_content[line_content_size] == '\r' && -- message_content[line_content_size + 1] == '\n') { -+ } else if (message_content[line_content_size] == '\r') { -+ if (message_content[line_content_size + 1] == '\n') { -+ /* This is the right behaviour */ - tmp_line_size = line_content_size + 2; - tmp_line_rfcsize = tmp_line_size; - } else { -- trace(TRACE_ERROR, "%s,%s: error reading header line", -- __FILE__, __func__); -- return -1; -+ /* This is broken behaviour, but it's better -+ * than not handling it at all. -+ */ -+ tmp_line_size = line_content_size + 1; -+ tmp_line_rfcsize = tmp_line_size + 1; - } - } - } -@@ -197,7 +199,6 @@ - __FILE__, __func__); - return 0; - } -- else -- return 1; -+ return 1; - - } diff --git a/mail/dbmail22/files/patch-2.0.4_bug79_imaputil.c b/mail/dbmail22/files/patch-2.0.4_bug79_imaputil.c deleted file mode 100644 index dbeb799017be..000000000000 --- a/mail/dbmail22/files/patch-2.0.4_bug79_imaputil.c +++ /dev/null @@ -1,80 +0,0 @@ -Index: imaputil.c -=================================================================== ---- imaputil.c (revision 1726) -+++ imaputil.c (revision 1793) -@@ -65,7 +65,7 @@ - "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; - - /* returned by date_sql2imap() */ --#define IMAP_STANDARD_DATE "03-Nov-1979 00:00:00 +0000" -+#define IMAP_STANDARD_DATE "Sat, 03-Nov-1979 00:00:00 +0000" - char _imapdate[IMAP_INTERNALDATE_LEN] = IMAP_STANDARD_DATE; - - /* returned by date_imap2sql() */ -@@ -1776,50 +1776,35 @@ - - /* - * convert a mySQL date (yyyy-mm-dd hh:mm:ss) to a valid IMAP internal date: -- * 0123456789012345678 -- * dd-mon-yyyy hh:mm:ss with mon characters (i.e. 'Apr' for april) -- * 01234567890123456789 -+ * [Mon, 30 May 2005 10:01:55 +0100] with mon characters (i.e. 'Apr' for april) - * return value is valid until next function call. - * NOTE: if date is not valid, IMAP_STANDARD_DATE is returned - */ - char *date_sql2imap(const char *sqldate) - { -- char *last_char; -- struct tm tm_localtime, tm_sqldate; -- time_t td; -+ struct tm tm_sql_date; -+ struct tm *tm_imap_date; -+ -+ time_t ltime; -+ char *last; - -- /* we need to get the localtime to get the current timezone */ -- if (time(&td) == -1) { -- trace(TRACE_ERROR, "%s,%s: error getting time()", -- __FILE__, __func__); -- return IMAP_STANDARD_DATE; -- } -- tm_localtime = *localtime(&td); -+ last = strptime(sqldate,"%Y-%m-%d %T", &tm_sql_date); -+ if ( (last == NULL) || (*last != '\0') ) { -+ strcpy(_imapdate, IMAP_STANDARD_DATE); -+ return _imapdate; -+ } - -- /* parse sqldate */ -- last_char = strptime(sqldate, "%Y-%m-%d %T", &tm_sqldate); -- if (last_char == NULL || *last_char != '\0') { -- trace(TRACE_DEBUG, "%s,%s, error parsing date [%s]", -- __FILE__, __func__, sqldate); -- strcpy(_imapdate, IMAP_STANDARD_DATE); -- return _imapdate; -- } -- /* copy DST information from localtime */ -- tm_sqldate.tm_gmtoff = tm_localtime.tm_gmtoff; -- tm_sqldate.tm_isdst = tm_localtime.tm_isdst; -+ /* FIXME: this works fine on linux, but may cause dst offsets in netbsd. */ -+ ltime = mktime (&tm_sql_date); -+ tm_imap_date = localtime(<ime); - -- (void) strftime(_imapdate, IMAP_INTERNALDATE_LEN, -- "%d-%b-%Y %T %z", &tm_sqldate); -- -- return _imapdate; -+ strftime(_imapdate, sizeof(_imapdate), "%a, %d %b %Y %H:%M:%S %z", tm_imap_date); -+ return _imapdate; - } - -- - /* - * convert TO a mySQL date (yyyy-mm-dd) FROM a valid IMAP internal date: -- * 0123456789 - * dd-mon-yyyy with mon characters (i.e. 'Apr' for april) -- * 01234567890 - * OR - * d-mon-yyyy - * return value is valid until next function call. diff --git a/mail/dbmail22/files/patch-sort.c b/mail/dbmail22/files/patch-sort.c deleted file mode 100644 index a267163eca11..000000000000 --- a/mail/dbmail22/files/patch-sort.c +++ /dev/null @@ -1,11 +0,0 @@ ---- sort/sort.c.orig Tue Mar 15 00:54:00 2005 -+++ sort/sort.c Mon Apr 11 13:46:46 2005 -@@ -58,7 +58,7 @@ - * - * Then do it! - * */ --dsn_class_t sort_and_deliver(u64_t msgidnr, -+sort_result_t sort_and_deliver(u64_t msgidnr, - const char *header UNUSED, - u64_t headersize UNUSED, - u64_t totalmsgsize, diff --git a/mail/dbmail22/pkg-descr b/mail/dbmail22/pkg-descr deleted file mode 100644 index 2c03d30b6ea9..000000000000 --- a/mail/dbmail22/pkg-descr +++ /dev/null @@ -1,22 +0,0 @@ -Dbmail is the name of a group of programs that enable the possiblilty of storing -and retrieving mail messages from a database (currently MySQL or PostgreSQL). - -What are the advantages? - - * Scalability. - Dbmail is as scalable as the database that is used for the mail storage. - * Manageability. - Dbmail is based upon a database. Dbmail can be managed by changing - settings in the database (f.e. using PHP/Perl/SQL). - * Speed. - Dbmail uses very efficient, database specific queries for retrieving mail - information. This is much faster then parsing a filesystem. - * Security. - Dbmail has got nothing to do with the filesystem or interaction with other - programs in the Unix environment which need special permissions. Dbmail - is as secure as the database it's based upon. - * Flexibility. - Changes on a Dbmail system (adding of users, changing passwords etc.) are - effective immediately. - -WWW: http://www.dbmail.org/ diff --git a/mail/dbmail22/pkg-plist b/mail/dbmail22/pkg-plist deleted file mode 100644 index 66d3c8a85d05..000000000000 --- a/mail/dbmail22/pkg-plist +++ /dev/null @@ -1,36 +0,0 @@ -etc/dbmail.conf-dist -lib/dbmail/libauthdbmail.0 -lib/dbmail/libauthdbmail.a -lib/dbmail/libauthdbmail.la -lib/dbmail/libauthdbmail -lib/dbmail/libsortdbmail.0 -lib/dbmail/libsortdbmail.a -lib/dbmail/libsortdbmail.la -lib/dbmail/libsortdbmail -lib/libdbmail -lib/libdbmail.0 -lib/libdbmail.a -lib/libdbmail.la -sbin/dbmail-imapd -sbin/dbmail-lmtpd -sbin/dbmail-pop3d -sbin/dbmail-smtp -sbin/dbmail-users -sbin/dbmail-util -%%MYSQL%%%%DATADIR%%/sql/create_tables.mysql -%%MYSQL%%%%DATADIR%%/sql/create_tables_innoDB.mysql -%%MYSQL%%%%DATADIR%%/sql/migrate_from_1.x_to_2.0.mysql -%%MYSQL%%%%DATADIR%%/sql/migrate_from_1.x_to_2.0_innodb.mysql -%%MYSQL%%lib/dbmail/libmysqldbmail.0 -%%MYSQL%%lib/dbmail/libmysqldbmail.a -%%MYSQL%%lib/dbmail/libmysqldbmail.la -%%MYSQL%%lib/dbmail/libmysqldbmail -%%PGSQL%%%%DATADIR%%/sql/create_tables.pgsql -%%PGSQL%%%%DATADIR%%/sql/migrate_from_1.x_to_2.0.pgsql -%%PGSQL%%/lib/dbmail/libpgsqldbmail.0 -%%PGSQL%%/lib/dbmail/libpgsqldbmail.a -%%PGSQL%%/lib/dbmail/libpgsqldbmail.la -%%PGSQL%%/lib/dbmail/libpgsqldbmail -@dirrm lib/dbmail -@dirrm %%DATADIR%%/sql -@dirrm %%DATADIR%% diff --git a/mail/dovecot-devel/Makefile b/mail/dovecot-devel/Makefile deleted file mode 100644 index 359f2da2017f..000000000000 --- a/mail/dovecot-devel/Makefile +++ /dev/null @@ -1,147 +0,0 @@ -# ex:ts=8 -# New ports collection makefile for: dovecot -# Date created: 12/08/2002 -# Whom: Dominic Marks <dominic.marks@btinternet.com> -# -# $FreeBSD$ -# - -PORTNAME= dovecot -DISTVERSION= 0.99.14 -CATEGORIES= mail ipv6 -MASTER_SITES= http://www.dovecot.org/releases/ - -MAINTAINER= robin@isometry.net -COMMENT= Secure and compact IMAP and POP3 servers - -CONFLICTS= dovecot-1.* - -USE_ICONV= yes -USE_RC_SUBR= yes - -GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS= --without-shadow --with-pam --localstatedir=/var -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" - -PKGMESSAGE= ${WRKDIR}/pkg-message - -DOCS= auth.txt configuration.txt design.txt \ - index.txt mail-storages.txt mkcert.sh multiaccess.txt \ - nfs.txt securecoding.txt \ - dovecot-ldap.conf dovecot-pgsql.conf \ - dovecot-mysql.conf dovecot-openssl.cnf - -OPTIONS= GNUTLS "GNUTLS support" off \ - SASL2 "SASL2 support" off \ - VPOPMAIL "VPopMail support" off \ - LDAP "OpenLDAP support" off \ - PGSQL "PostgreSQL support" off \ - MYSQL "MySQL support" off - -.include <bsd.port.pre.mk> - -## GNUTLS support -# -# Use the GNU Transport Layer Security -# rather than OpenSSL. -.if defined(WITH_GNUTLS) -IGNORE= Currently incompatible with security/gnutls -LIB_DEPENDS+= gnutls:${PORTSDIR}/security/gnutls -CONFIGURE_ARGS+= --with-ssl=gnutls -.else -CONFIGURE_ARGS+= --with-ssl=openssl -.endif - -## SASL2 support -# -# SASL provides authentication support to -# session-based protocols. This is can be -# used by dovecot for authentication sources. -# -.if defined(WITH_SASL2) -LIB_DEPENDS+= sasl2.2:${PORTSDIR}/security/cyrus-sasl2 -CONFIGURE_ARGS+= --with-cyrus-sasl2 -.endif - -## VPopMail Support -# -# vpopmail provides easy authentication and -# multi-domain features. It was originally -# created for use with Qmail. -# -.if defined(WITH_VPOPMAIL) -VPOPMAIL= ${LOCALBASE}/vpopmail/bin/vchkpw -BUILD_DEPENDS+= ${VPOPMAIL}:${PORTSDIR}/mail/vpopmail -CONFIGURE_ARGS+= --with-vpopmail -.else -CONFIGURE_ARGS+= --without-vpopmail -.endif - -## OpenLDAP Support -# -# LDAP is the light-weight directory access -# protocol and can be used by Dovecot for its -# user database. -# -.if defined(WITH_LDAP) -USE_OPENLDAP= yes -CONFIGURE_ARGS+= --with-ldap -.endif - -## PostgreSQL Support -# -# PostgreSQL is a powerful SQL database that -# can be used to store user tables. -# -.if defined(WITH_PGSQL) -USE_PGSQL= yes -CONFIGURE_ARGS+= --with-pgsql -.endif - -## MySQL Support -# -# MySQL is another SQL database that can be -# used to store user tables. -# -.if defined(WITH_MYSQL) -USE_MYSQL= yes -CONFIGURE_ARGS+= --with-mysql -.endif - -post-build: - @${SED} -e 's,%%PREFIX%%,${PREFIX},' \ - ${WRKSRC}/dovecot-example.conf >${WRKDIR}/dovecot.conf.sample - @${SED} -e 's,%%PREFIX%%,${PREFIX},g' \ - -e 's,%%RC_SUBR%%,${RC_SUBR},g' \ - ${FILESDIR}/dovecot.sh >${WRKDIR}/dovecot.sh - -pre-install: - @${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL - -do-install: - @${MKDIR} ${PREFIX}/libexec/dovecot - ${INSTALL_PROGRAM} \ - ${WRKSRC}/src/imap/imap \ - ${WRKSRC}/src/pop3/pop3 \ - ${WRKSRC}/src/auth/dovecot-auth \ - ${WRKSRC}/src/imap-login/imap-login \ - ${WRKSRC}/src/pop3-login/pop3-login \ - ${PREFIX}/libexec/dovecot/ - ${INSTALL_PROGRAM} ${WRKSRC}/src/master/dovecot ${PREFIX}/sbin/ - ${INSTALL_DATA} ${WRKDIR}/dovecot.conf.sample ${PREFIX}/etc/ - ${INSTALL_SCRIPT} ${WRKDIR}/dovecot.sh ${PREFIX}/etc/rc.d/ -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - cd ${WRKSRC}/doc && ${INSTALL_DATA} ${DOCS} ${DOCSDIR} -.endif - -post-install: - @${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL - @${SED} -e 's,%%PREFIX%%,${PREFIX},g' \ - -e 's,%%DOCSDIR%%,${DOCSDIR},g' \ - ${.CURDIR}/pkg-message >${PKGMESSAGE} - @${CAT} ${PKGMESSAGE} - -.include <bsd.port.post.mk> diff --git a/mail/dovecot-devel/distinfo b/mail/dovecot-devel/distinfo deleted file mode 100644 index a4f0e25b6383..000000000000 --- a/mail/dovecot-devel/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (dovecot-0.99.14.tar.gz) = a12e26fd378a46c31ec3a81ab7b55b5b -SIZE (dovecot-0.99.14.tar.gz) = 871285 diff --git a/mail/dovecot-devel/files/dovecot.sh b/mail/dovecot-devel/files/dovecot.sh deleted file mode 100644 index f646cbce8ba3..000000000000 --- a/mail/dovecot-devel/files/dovecot.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# PROVIDE: dovecot -# REQUIRE: LOGIN -# KEYWORD: FreeBSD shutdown - -# -# Add the following lines to /etc/rc.conf to enable dovecot: -# -#dovecot_enable="YES" -# -dovecot_enable=${dovecot_enable-"NO"} - -. %%RC_SUBR%% - -name=dovecot -rcvar=`set_rcvar` - -command=%%PREFIX%%/sbin/${name} -required_files=%%PREFIX%%/etc/${name}.conf - -load_rc_config ${name} -run_rc_command "$1" diff --git a/mail/dovecot-devel/files/patch-dovecot-example.conf b/mail/dovecot-devel/files/patch-dovecot-example.conf deleted file mode 100644 index ceb2dfe706af..000000000000 --- a/mail/dovecot-devel/files/patch-dovecot-example.conf +++ /dev/null @@ -1,174 +0,0 @@ ---- dovecot-example.conf.orig Tue Jan 11 00:49:06 2005 -+++ dovecot-example.conf Tue Jan 11 00:53:50 2005 -@@ -3,7 +3,7 @@ - # Default values are shown after each value, it's not required to uncomment - # any of the lines. Exception to this are paths, they're just examples - # with real defaults being based on configure options. The paths listed here --# are for configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var -+# are for configure --prefix=%%PREFIX%% --sysconfdir=/etc --localstatedir=/var - # --with-ssldir=/etc/ssl - - # Base directory where to store runtime data. -@@ -11,7 +11,7 @@ - - # Protocols we want to be serving: - # imap imaps pop3 pop3s --#protocols = imap imaps -+protocols = imap pop3 - - # IP or host address where to listen in for connections. It's not currently - # possible to specify multiple addresses. "*" listens in all IPv4 interfaces. -@@ -27,14 +27,14 @@ - #pop3s_listen = - - # Disable SSL/TLS support. --#ssl_disable = no -+ssl_disable = yes - - # PEM encoded X.509 SSL/TLS certificate and private key. They're opened before - # dropping root privileges, so keep the key file unreadable by anyone but - # root. Included doc/mkcert.sh can be used to easily generate self-signed - # certificate, just make sure to update the domains in dovecot-openssl.cnf --#ssl_cert_file = /etc/ssl/certs/dovecot.pem --#ssl_key_file = /etc/ssl/private/dovecot.pem -+#ssl_cert_file = /etc/ssl/certs/imapd.pem -+#ssl_key_file = /etc/ssl/private/imapd.pem - - # SSL parameter file. Master process generates this file for login processes. - # It contains Diffie Hellman and RSA parameters. -@@ -85,14 +85,14 @@ - login = imap - - # Executable location. --#login_executable = /usr/libexec/dovecot/imap-login -+#login_executable = %%PREFIX%%/libexec/dovecot/imap-login - - # User to use for the login process. Create a completely new user for this, - # and don't use it anywhere else. The user must also belong to a group where - # only it has access, it's used to control access for authentication process. - # Note that this user is NOT used to access mails. - # http://wiki.dovecot.org/UserIds --#login_user = dovecot -+login_user = dovecot - - # Set max. process size in megabytes. If you don't use - # login_process_per_connection you might need to grow this. -@@ -132,7 +132,7 @@ - login = pop3 - - # Exception to above rule being the executable location. --#login_executable = /usr/libexec/dovecot/pop3-login -+#login_executable = %%PREFIX%%/libexec/dovecot/pop3-login - - ## - ## Mail processes -@@ -145,7 +145,7 @@ - # Show more verbose process titles (in ps). Currently shows user name and - # IP address. Useful for seeing who are actually using the IMAP processes - # (eg. shared mailboxes or if same uid is used for multiple accounts). --#verbose_proctitle = no -+verbose_proctitle = yes - - # Show protocol level SSL errors. - #verbose_ssl = no -@@ -161,7 +161,7 @@ - # non-valid GID as primary group ID aren't allowed to log in. If user - # belongs to supplementary groups with non-valid GIDs, those groups are - # not set. --#first_valid_gid = 1 -+first_valid_gid = 0 - #last_valid_gid = 0 - - # Grant access to these extra groups for mail processes. Typical use would be -@@ -174,7 +174,7 @@ - # WARNING: Never add directories here which local users can modify, that - # may lead to root exploit. Usually this should be done only if you don't - # allow shell access for users. See doc/configuration.txt for more information. --#valid_chroot_dirs = -+valid_chroot_dirs = /var/mail - - # Default chroot directory for mail processes. This can be overridden by - # giving /./ in user's home directory (eg. /home/./user chroots into /home). -@@ -197,7 +197,7 @@ - # default_mail_env = mbox:~/mail/:INBOX=/var/mail/%u - # default_mail_env = mbox:/var/mail/%d/%n/:INDEX=/var/indexes/%d/%n - # --#default_mail_env = -+default_mail_env = mbox:/var/mail/%u - - # Space-separated list of fields to cache for all mails. Currently these - # fields are allowed followed by a list of commands they speed up: -@@ -245,7 +245,7 @@ - # outlook-pop3-no-nuls: - # Outlook and Outlook Express hang if mails contain NUL characters. - # This setting replaces them with 0x80 character. --#client_workarounds = -+client_workarounds = oe6-fetch-no-newmail outlook-idle outlook-pop3-no-nuls - - # Dovecot can notify client of new mail in selected mailbox soon after it's - # received. This setting specifies the minimum interval in seconds between -@@ -289,7 +289,7 @@ - # know any MUA which would modify mail files directly. IMAP protocol also - # requires that the mails don't change, so it would be problematic in any case. - # If you care about performance, enable it. --#maildir_copy_with_hardlinks = no -+maildir_copy_with_hardlinks = yes - - # Check if mails' content has been changed by external programs. This slows - # down things as extra stat() needs to be called for each file. If changes are -@@ -338,7 +338,7 @@ - ## - - # Executable location --#imap_executable = /usr/libexec/dovecot/imap -+#imap_executable = %%PREFIX%%/libexec/dovecot/imap - - # Set max. process size in megabytes. Most of the memory goes to mmap()ing - # files, so it shouldn't harm much even if this limit is set pretty high. -@@ -346,14 +346,14 @@ - - # Support for dynamically loadable modules. - #imap_use_modules = no --#imap_modules = /usr/lib/dovecot/imap -+#imap_modules = %%PREFIX%%/lib/dovecot/imap - - ## - ## POP3 process - ## - - # Executable location --#pop3_executable = /usr/libexec/dovecot/pop3 -+#pop3_executable = %%PREFIX%%/libexec/dovecot/pop3 - - # Set max. process size in megabytes. Most of the memory goes to mmap()ing - # files, so it shouldn't harm much even if this limit is set pretty high. -@@ -361,7 +361,7 @@ - - # Support for dynamically loadable modules. - #pop3_use_modules = no --#pop3_modules = /usr/lib/dovecot/pop3 -+#pop3_modules = %%PREFIX%%/lib/dovecot/pop3 - - ## - ## Authentication processes -@@ -438,9 +438,9 @@ - # vpopmail: vpopmail authentication - # ldap <config path>: LDAP, see doc/dovecot-ldap.conf - # pgsql <config path>: a PostgreSQL database, see doc/dovecot-pgsql.conf --auth_passdb = pam -+auth_passdb = passwd - --#auth_executable = /usr/libexec/dovecot/dovecot-auth -+#auth_executable = %%PREFIX%%/libexec/dovecot/dovecot-auth - - # Set max. process size in megabytes. - #auth_process_size = 256 -@@ -472,7 +472,7 @@ - - # More verbose logging. Useful for figuring out why authentication isn't - # working. --#auth_verbose = no -+auth_verbose = yes - - # Even more verbose logging for debugging purposes. Shows for example SQL - # queries. diff --git a/mail/dovecot-devel/pkg-deinstall b/mail/dovecot-devel/pkg-deinstall deleted file mode 100644 index 21c58498bdbe..000000000000 --- a/mail/dovecot-devel/pkg-deinstall +++ /dev/null @@ -1,63 +0,0 @@ -#! /bin/sh -# -# ex:ts=4 - -ask() { - local question default answer - - question=$1 - default=$2 - if [ -z "${PACKAGE_BUILDING}" -a -z "${BATCH}" ]; then - read -p "${question} [${default}]? " answer - fi - echo ${answer:-${default}} -} - -yesno() { - local question default answer - - question=$1 - default=$2 - while :; do - answer=$(ask "${question}" "${default}") - case "${answer}" in - [Yy]*) return 0;; - [Nn]*) return 1;; - esac - echo "Please answer yes or no." - done -} - -delete_account() { - local u - - u=$1 - if yesno "Do you want me to remove user \"${u}\"" n; then - pw userdel -n ${u} - echo "Done." - fi -} - -case $2 in - -DEINSTALL) - if ps -axc | grep -qw dovecot; then - if yesno "Dovecot is still running. Shall I stop it?" y; then - killall dovecot - sleep 2 - else - echo "OK ... I hope you know what you are doing." - fi - fi - - delete_account dovecot - - base=/var/run/dovecot - DIRLIST="${base}/login ${base}" - echo "Cleaning up \"${base}\"." - for directory in ${DIRLIST}; do - rmdir ${directory} 2>/dev/null || : - done - ;; - -esac diff --git a/mail/dovecot-devel/pkg-descr b/mail/dovecot-devel/pkg-descr deleted file mode 100644 index d5a19d0d489c..000000000000 --- a/mail/dovecot-devel/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -Dovecot is a secure and compact IMAP server which is in the early stages -of developement. It supports Maildirs and mbox formats and much of the -IMAP v4 protocol including SSL/TLS. IPv6 support is also included. -Dovecot supports authentication with OpenLDAP, PostgreSQL, MySQL, vpopmail -and PAM. - -WWW: http://www.dovecot.org/ diff --git a/mail/dovecot-devel/pkg-install b/mail/dovecot-devel/pkg-install deleted file mode 100644 index 05686ba48d5f..000000000000 --- a/mail/dovecot-devel/pkg-install +++ /dev/null @@ -1,91 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# -# ex:ts=4 - -ask() { - local question default answer - - question=$1 - default=$2 - if [ -z "${PACKAGE_BUILDING}" -a -z "${BATCH}" ]; then - read -p "${question} [${default}]? " answer - fi - echo ${answer:-${default}} -} - -yesno() { - local question default answer - - question=$1 - default=$2 - while :; do - answer=$(ask "${question}" "${default}") - case "${answer}" in - [Yy]*) return 0;; - [Nn]*) return 1;; - esac - echo "Please answer yes or no." - done -} - -make_account() { - local u g gcos - - u=$1 - g=$2 - gcos=$3 - - if pw group show "${g}" >/dev/null 2>&1; then - echo "You already have a group \"${g}\", so I will use it." - else - echo "You need a group \"${g}\"." - if which -s pw && yesno "Would you like me to create it" y - then - pw groupadd ${g} || exit - echo "Done." - else - echo "Please create it, and try again." - exit 1 - fi - fi - - if pw user show "${u}" >/dev/null 2>&1; then - echo "You already have a user \"${u}\", so I will use it." - else - echo "You need a user \"${u}\"." - if which -s pw && yesno "Would you like me to create it" y - then - pw useradd ${u} -g ${g} -h - -s /sbin/nologin -c "${gcos}" || exit - echo "Done." - else - echo "Please create it, and try again." - exit 1 - fi - fi -} - -case $2 in - -PRE-INSTALL) - make_account dovecot dovecot "Dovecot" - ;; - -POST-INSTALL) - base=/var/run/dovecot - DIRLIST="${base} ${base}/login" - echo "Fixing ownerships and modes in \"${base}\"." - for directory in ${DIRLIST}; do - if [ ! -d "${directory}" ]; then - mkdir -p ${directory} - echo "Created directory: ${directory}" - fi - done - chown -R root:wheel ${base} - chmod -R 0700 ${base} - chown -R root:dovecot ${base}/login - chmod -R 0750 ${base}/login - ;; - -esac diff --git a/mail/dovecot-devel/pkg-message b/mail/dovecot-devel/pkg-message deleted file mode 100644 index c0011013d5ee..000000000000 --- a/mail/dovecot-devel/pkg-message +++ /dev/null @@ -1,18 +0,0 @@ ---------------------------------------------------------------------- - - You can get default configured IMAP and POP3 services running by - copying the sample configuration file to the given location and then - enabling dovecot in /etc/rc.conf. - In this simple configuration Dovecot will authenticate users against - the systems passwd file and use the default /var/mail/$USER mbox - files. - - cd %%PREFIX%%/etc; cp dovecot.conf.sample dovecot.conf - - echo dovecot_enable="YES" >> /etc/rc.conf - - Further information on configuration can be found in: - - %%DOCSDIR%% - ---------------------------------------------------------------------- diff --git a/mail/dovecot-devel/pkg-plist b/mail/dovecot-devel/pkg-plist deleted file mode 100644 index e616165c95e3..000000000000 --- a/mail/dovecot-devel/pkg-plist +++ /dev/null @@ -1,24 +0,0 @@ -@comment $FreeBSD$ -etc/dovecot.conf.sample -etc/rc.d/dovecot.sh -libexec/dovecot/dovecot-auth -libexec/dovecot/imap -libexec/dovecot/imap-login -libexec/dovecot/pop3 -libexec/dovecot/pop3-login -@dirrm libexec/dovecot -sbin/dovecot -%%PORTDOCS%%%%DOCSDIR%%/auth.txt -%%PORTDOCS%%%%DOCSDIR%%/configuration.txt -%%PORTDOCS%%%%DOCSDIR%%/design.txt -%%PORTDOCS%%%%DOCSDIR%%/index.txt -%%PORTDOCS%%%%DOCSDIR%%/mail-storages.txt -%%PORTDOCS%%%%DOCSDIR%%/mkcert.sh -%%PORTDOCS%%%%DOCSDIR%%/multiaccess.txt -%%PORTDOCS%%%%DOCSDIR%%/nfs.txt -%%PORTDOCS%%%%DOCSDIR%%/securecoding.txt -%%PORTDOCS%%%%DOCSDIR%%/dovecot-ldap.conf -%%PORTDOCS%%%%DOCSDIR%%/dovecot-openssl.cnf -%%PORTDOCS%%%%DOCSDIR%%/dovecot-pgsql.conf -%%PORTDOCS%%%%DOCSDIR%%/dovecot-mysql.conf -%%PORTDOCS%%@dirrm %%DOCSDIR%% diff --git a/mail/evolution-exchange/Makefile b/mail/evolution-exchange/Makefile deleted file mode 100644 index 2cafa1673c05..000000000000 --- a/mail/evolution-exchange/Makefile +++ /dev/null @@ -1,55 +0,0 @@ -# New ports collection makefile for: ximian-connector -# Date created: 30 May 2004 -# Whom: kiesel -# -# $FreeBSD$ -# - -PORTNAME= ximian -PORTVERSION= 2.2.2 -CATEGORIES= mail gnome -MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}${PKGNAMESUFFIX}/2.2 -PKGNAMESUFFIX= -connector -DISTNAME= ${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION} - -MAINTAINER= kiesel@schlund.de -COMMENT= Evolution plugin to connect to Microsoft Exchange servers - -BUILD_DEPENDS= evolution-${EVO_VERSION}:${PORTSDIR}/mail/evolution -RUN_DEPENDS= evolution-${EVO_VERSION}:${PORTSDIR}/mail/evolution - -USE_BZIP2= yes -USE_X_PREFIX= yes -USE_LIBTOOL_VER=15 -USE_GMAKE= yes -USE_OPENLDAP= yes -USE_GNOME= gnomeprefix intlhack gnomehack gnometarget -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" -CONFIGURE_ARGS= --with-openldap=${LOCALBASE} \ - --with-static-ldap=no - -DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} -EVO_VERSION= 2.2 -PLIST_SUB= VERSION="2.2" EVO_VERSION=${EVO_VERSION} EDS_VERSION="1.2" - -.include <bsd.port.pre.mk> - -.if ${OSVERSION} >= 500000 && !defined(NO_KERBEROS) && \ - exists(/usr/lib/libkrb5.so) -CONFIGURE_ARGS+= --with-krb5=/usr -.else -LIB_DEPENDS+= krb5:${PORTSDIR}/security/heimdal -.if defined(HEIMDAL_HOME) -CONFIGURE_ARGS+= --with-krb5=${HEIMDAL_HOME} --with-krb5-includes=${HEIMDAL_HOME}/include -.else -CONFIGURE_ARGS+= --with-krb5=${LOCALBASE} -.endif -.endif - -.if ${ARCH} == "amd64" -CONFIGURE_ENV+= CFLAGS="${CFLAGS} -fPIC" -.endif - -.include <bsd.port.post.mk> diff --git a/mail/evolution-exchange/distinfo b/mail/evolution-exchange/distinfo deleted file mode 100644 index e80523bf6ad3..000000000000 --- a/mail/evolution-exchange/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (ximian-connector-2.2.2.tar.bz2) = 2cee47bdf6030d30a5ac82e5028b58ed -SIZE (ximian-connector-2.2.2.tar.bz2) = 1367526 diff --git a/mail/evolution-exchange/files/patch-calendar_e-cal-backend-exchange.c b/mail/evolution-exchange/files/patch-calendar_e-cal-backend-exchange.c deleted file mode 100644 index 466d30410c31..000000000000 --- a/mail/evolution-exchange/files/patch-calendar_e-cal-backend-exchange.c +++ /dev/null @@ -1,19 +0,0 @@ ---- calendar/e-cal-backend-exchange.c.orig Sat Mar 19 14:24:33 2005 -+++ calendar/e-cal-backend-exchange.c Sat Mar 19 14:25:06 2005 -@@ -1432,6 +1432,7 @@ - e_cal_component_get_uid (comp, &uid); - e_cal_component_get_attachment_list (comp, &attach_list); - for (l = attach_list; l ; l = l->next){ -+ char *mime_type; - if (!strncmp ((char *)l->data, "file://", 7)) { - fname = (char *)(l->data) + strlen ("file://"); - filename = g_strrstr (fname, "/") + 1; -@@ -1461,7 +1462,7 @@ - camel_data_wrapper_construct_from_stream (wrapper, stream); - camel_object_unref (stream); - -- char *mime_type = gnome_vfs_get_mime_type (dest_url + strlen ("file://")); -+ mime_type = gnome_vfs_get_mime_type (dest_url + strlen ("file://")); - type = camel_content_type_decode (mime_type); - camel_data_wrapper_set_mime_type_field (wrapper, type); - camel_content_type_unref (type); diff --git a/mail/evolution-exchange/files/patch-configure b/mail/evolution-exchange/files/patch-configure deleted file mode 100644 index 43668716a0d1..000000000000 --- a/mail/evolution-exchange/files/patch-configure +++ /dev/null @@ -1,22 +0,0 @@ ---- configure.orig Fri Aug 20 15:26:49 2004 -+++ configure Fri Aug 20 15:27:21 2004 -@@ -23754,8 +23754,8 @@ - # libldap might depend on OpenSSL... We need to pull - # in the dependency libs explicitly here since we're - # not using libtool for the configure test. -- if test -f $with_openldap/lib/libldap.la; then -- LDAP_LIBS="`. $with_openldap/lib/libldap.la; echo $dependency_libs` $LDAP_LIBS" -+ if test -f $with_openldap/lib/libldap.so; then -+ LDAP_LIBS="`. $with_openldap/lib/libldap.so; echo $dependency_libs` $LDAP_LIBS" - fi - else - LDAP_LIBS="-llber $LDAP_LIBS" -@@ -24006,7 +24006,7 @@ - - - mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5" --heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi" -+heimlibs="-lkrb5 -lcrypt -lcrypto -lasn1 -lcom_err -lroken -lgssapi" - echo "$as_me:$LINENO: checking for Kerberos 5" >&5 - echo $ECHO_N "checking for Kerberos 5... $ECHO_C" >&6 - if test "${ac_cv_lib_kerberos5+set}" = set; then diff --git a/mail/evolution-exchange/files/patch-lib::e2k-autoconfig.c b/mail/evolution-exchange/files/patch-lib::e2k-autoconfig.c deleted file mode 100644 index 7576f7123449..000000000000 --- a/mail/evolution-exchange/files/patch-lib::e2k-autoconfig.c +++ /dev/null @@ -1,13 +0,0 @@ ---- lib/e2k-autoconfig.c.orig Tue May 11 11:15:58 2004 -+++ lib/e2k-autoconfig.c Thu Jun 17 14:02:58 2004 -@@ -31,6 +31,10 @@ - #include <sys/stat.h> - #include <unistd.h> - -+#include <sys/types.h> -+#include <sys/socket.h> -+#include <netinet/in.h> -+#include <arpa/inet.h> - #include <netinet/in.h> - #include <arpa/nameser.h> - #include <resolv.h> diff --git a/mail/evolution-exchange/files/patch-storage_e-folder-exchange.c b/mail/evolution-exchange/files/patch-storage_e-folder-exchange.c deleted file mode 100644 index 7436ca9fe8f6..000000000000 --- a/mail/evolution-exchange/files/patch-storage_e-folder-exchange.c +++ /dev/null @@ -1,16 +0,0 @@ ---- storage/e-folder-exchange.c.orig Tue Jan 25 21:31:32 2005 -+++ storage/e-folder-exchange.c Tue Jan 25 21:31:52 2005 -@@ -689,11 +689,12 @@ - void - e_folder_exchange_unsubscribe (EFolder *folder) - { -+ E2kContext *ctx; - g_return_if_fail (E_IS_FOLDER_EXCHANGE (folder)); - - /* FIXME : This is a hack as of now. The free_folder in mail-stub - gets called when we are in offline and the context is NULL then. */ -- E2kContext *ctx = E_FOLDER_EXCHANGE_CONTEXT (folder); -+ ctx = E_FOLDER_EXCHANGE_CONTEXT (folder); - if (ctx) { - e2k_context_unsubscribe (E_FOLDER_EXCHANGE_CONTEXT (folder), - E_FOLDER_EXCHANGE_URI (folder)); diff --git a/mail/evolution-exchange/pkg-descr b/mail/evolution-exchange/pkg-descr deleted file mode 100644 index c89d7aba86dd..000000000000 --- a/mail/evolution-exchange/pkg-descr +++ /dev/null @@ -1,13 +0,0 @@ -Ximian Connector is a plugin for Evolution that adds Exchange client -capabilities to Evolution. - -With the Evolution Connector installed, Evolution functions as an -Exchange client, enabling users to become full participants in company-wide -group scheduling and other collaborative tasks. Linux, Solaris and FreeBSD -users can access public folders, Global Address Lists, email, calendar, -task lists, and group scheduling information. - -WWW: http://www.novell.com/products/connector/ - -- Alex Kiesel -kiesel@schlund.de diff --git a/mail/evolution-exchange/pkg-plist b/mail/evolution-exchange/pkg-plist deleted file mode 100644 index a5872eab961a..000000000000 --- a/mail/evolution-exchange/pkg-plist +++ /dev/null @@ -1,127 +0,0 @@ -bin/ximian-connector-setup-%%VERSION%% -lib/evolution-data-server-%%EDS_VERSION%%/camel-providers/libcamelexchange.so -lib/evolution-data-server-%%EDS_VERSION%%/camel-providers/libcamelexchange.urls -lib/evolution/%%EVO_VERSION%%/libexchange.a -lib/evolution/%%EVO_VERSION%%/libexchange.so -lib/evolution/%%EVO_VERSION%%/libexchange.so.0 -libdata/bonobo/servers/GNOME_Evolution_Exchange_Storage_%%VERSION%%.server -libexec/evolution/%%EVO_VERSION%%/evolution-exchange-storage -%%DOCSDIR%%/E2kContext.html -%%DOCSDIR%%/E2kGlobalCatalog.html -%%DOCSDIR%%/E2kSecurityDescriptor.html -%%DOCSDIR%%/E2kSid.html -%%DOCSDIR%%/E2kUserDialog.html -%%DOCSDIR%%/ch01.html -%%DOCSDIR%%/ch02.html -%%DOCSDIR%%/ch03.html -%%DOCSDIR%%/ch04.html -%%DOCSDIR%%/ch05.html -%%DOCSDIR%%/ch06.html -%%DOCSDIR%%/home.png -%%DOCSDIR%%/index.html -%%DOCSDIR%%/index.sgml -%%DOCSDIR%%/left.png -%%DOCSDIR%%/right.png -%%DOCSDIR%%/style.css -%%DOCSDIR%%/up.png -%%DOCSDIR%%/ximian-connector-E2kAutoconfig.html -%%DOCSDIR%%/ximian-connector-E2kContext-(private).html -%%DOCSDIR%%/ximian-connector-E2kOperation-(private).html -%%DOCSDIR%%/ximian-connector-E2kOperation.html -%%DOCSDIR%%/ximian-connector-E2kProperties.html -%%DOCSDIR%%/ximian-connector-E2kRestriction-(vaporware).html -%%DOCSDIR%%/ximian-connector-E2kResult-(private).html -%%DOCSDIR%%/ximian-connector-MAPI.html -%%DOCSDIR%%/ximian-connector-autoconfig.html -%%DOCSDIR%%/ximian-connector-bug-private.html -%%DOCSDIR%%/ximian-connector-bug-xml.html -%%DOCSDIR%%/ximian-connector-calendar.html -%%DOCSDIR%%/ximian-connector-delegation.html -%%DOCSDIR%%/ximian-connector-e2k-action.html -%%DOCSDIR%%/ximian-connector-e2k-encoding-utils.html -%%DOCSDIR%%/ximian-connector-e2k-freebusy.html -%%DOCSDIR%%/ximian-connector-e2k-http-utils.html -%%DOCSDIR%%/ximian-connector-e2k-kerberos.html -%%DOCSDIR%%/ximian-connector-e2k-restriction.html -%%DOCSDIR%%/ximian-connector-e2k-result.html -%%DOCSDIR%%/ximian-connector-e2k-rule.html -%%DOCSDIR%%/ximian-connector-e2k-uri.html -%%DOCSDIR%%/ximian-connector-e2k-utils.html -%%DOCSDIR%%/ximian-connector-e2k-xml-utils.html -%%DOCSDIR%%/ximian-connector-favorites.html -%%DOCSDIR%%/ximian-connector-fba.html -%%DOCSDIR%%/ximian-connector-freebusy.html -%%DOCSDIR%%/ximian-connector-mail-threading.html -%%DOCSDIR%%/ximian-connector-mail.html -%%DOCSDIR%%/ximian-connector-ntlm.html -%%DOCSDIR%%/ximian-connector-oof.html -%%DOCSDIR%%/ximian-connector-other-users.html -%%DOCSDIR%%/ximian-connector-permissions.html -%%DOCSDIR%%/ximian-connector-test-utils.html -%%DOCSDIR%%/ximian-connector-xntlm-des.html -%%DOCSDIR%%/ximian-connector-xntlm-md4.html -%%DOCSDIR%%/ximian-connector-xntlm.html -%%DOCSDIR%%/ximian-connector.devhelp -%%DOCSDIR%%/ximian-connnector-booking.html -share/gnome/ximian-connector/%%VERSION%%/etspec/e-storage-set-view.etspec -share/gnome/ximian-connector/%%VERSION%%/glade/e-folder-creation-dialog.glade -share/gnome/ximian-connector/%%VERSION%%/glade/e-foreign-folder-dialog.glade -share/gnome/ximian-connector/%%VERSION%%/glade/exchange-autoconfig-wizard.glade -share/gnome/ximian-connector/%%VERSION%%/glade/exchange-change-password.glade -share/gnome/ximian-connector/%%VERSION%%/glade/exchange-delegates.glade -share/gnome/ximian-connector/%%VERSION%%/glade/exchange-folder-tree.glade -share/gnome/ximian-connector/%%VERSION%%/glade/exchange-oof.glade -share/gnome/ximian-connector/%%VERSION%%/glade/exchange-passwd-expiry.glade -share/gnome/ximian-connector/%%VERSION%%/glade/exchange-permissions-dialog.glade -share/gnome/ximian-connector/%%VERSION%%/images/connector-mini.png -share/gnome/ximian-connector/%%VERSION%%/images/connector.png -share/gnome/ximian-connector/%%VERSION%%/images/exchange-delegates-48.png -share/gnome/ximian-connector/%%VERSION%%/images/exchange-oof-48.png -share/gnome/ximian-connector/%%VERSION%%/ui/ximian-connector.xml -share/locale/ar/LC_MESSAGES/ximian-connector-%%VERSION%%.mo -share/locale/az/LC_MESSAGES/ximian-connector-%%VERSION%%.mo -share/locale/bg/LC_MESSAGES/ximian-connector-%%VERSION%%.mo -share/locale/bn/LC_MESSAGES/ximian-connector-%%VERSION%%.mo -share/locale/cs/LC_MESSAGES/ximian-connector-%%VERSION%%.mo -share/locale/de/LC_MESSAGES/ximian-connector-%%VERSION%%.mo -share/locale/el/LC_MESSAGES/ximian-connector-%%VERSION%%.mo -share/locale/en_CA/LC_MESSAGES/ximian-connector-%%VERSION%%.mo -share/locale/en_GB/LC_MESSAGES/ximian-connector-%%VERSION%%.mo -share/locale/es/LC_MESSAGES/ximian-connector-%%VERSION%%.mo -share/locale/fi/LC_MESSAGES/ximian-connector-%%VERSION%%.mo -share/locale/fr/LC_MESSAGES/ximian-connector-%%VERSION%%.mo -share/locale/gu/LC_MESSAGES/ximian-connector-%%VERSION%%.mo -share/locale/hi/LC_MESSAGES/ximian-connector-%%VERSION%%.mo -share/locale/hu/LC_MESSAGES/ximian-connector-%%VERSION%%.mo -share/locale/id/LC_MESSAGES/ximian-connector-%%VERSION%%.mo -share/locale/it/LC_MESSAGES/ximian-connector-%%VERSION%%.mo -share/locale/ja/LC_MESSAGES/ximian-connector-%%VERSION%%.mo -share/locale/ko/LC_MESSAGES/ximian-connector-%%VERSION%%.mo -share/locale/lt/LC_MESSAGES/ximian-connector-%%VERSION%%.mo -share/locale/ms/LC_MESSAGES/ximian-connector-%%VERSION%%.mo -share/locale/nb/LC_MESSAGES/ximian-connector-%%VERSION%%.mo -share/locale/nl/LC_MESSAGES/ximian-connector-%%VERSION%%.mo -share/locale/nn/LC_MESSAGES/ximian-connector-%%VERSION%%.mo -share/locale/no/LC_MESSAGES/ximian-connector-%%VERSION%%.mo -share/locale/pa/LC_MESSAGES/ximian-connector-%%VERSION%%.mo -share/locale/pl/LC_MESSAGES/ximian-connector-%%VERSION%%.mo -share/locale/pt/LC_MESSAGES/ximian-connector-%%VERSION%%.mo -share/locale/pt_BR/LC_MESSAGES/ximian-connector-%%VERSION%%.mo -share/locale/rw/LC_MESSAGES/ximian-connector-%%VERSION%%.mo -share/locale/sq/LC_MESSAGES/ximian-connector-%%VERSION%%.mo -share/locale/sr/LC_MESSAGES/ximian-connector-%%VERSION%%.mo -share/locale/sr@Latn/LC_MESSAGES/ximian-connector-%%VERSION%%.mo -share/locale/sv/LC_MESSAGES/ximian-connector-%%VERSION%%.mo -share/locale/ta/LC_MESSAGES/ximian-connector-%%VERSION%%.mo -share/locale/tr/LC_MESSAGES/ximian-connector-%%VERSION%%.mo -share/locale/uk/LC_MESSAGES/ximian-connector-%%VERSION%%.mo -share/locale/xh/LC_MESSAGES/ximian-connector-%%VERSION%%.mo -share/locale/zh_CN/LC_MESSAGES/ximian-connector-%%VERSION%%.mo -share/locale/zh_TW/LC_MESSAGES/ximian-connector-%%VERSION%%.mo -@dirrm share/gnome/ximian-connector/%%VERSION%%/ui -@dirrm share/gnome/ximian-connector/%%VERSION%%/images -@dirrm share/gnome/ximian-connector/%%VERSION%%/glade -@dirrm share/gnome/ximian-connector/%%VERSION%%/etspec -@dirrm share/gnome/ximian-connector/%%VERSION%% -@dirrm share/gnome/ximian-connector -@dirrm %%DOCSDIR%% diff --git a/mail/heirloom-mailx/Makefile b/mail/heirloom-mailx/Makefile deleted file mode 100644 index 306bc7945586..000000000000 --- a/mail/heirloom-mailx/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -# New ports collection makefile for: nail -# Date created: 20 October 2000 -# Whom: Kris Kennaway <kris@FreeBSD.org> -# -# $FreeBSD$ -# - -PORTNAME= nail -PORTVERSION= 11.24 -CATEGORIES= mail -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} - -MAINTAINER= ports@FreeBSD.org -COMMENT= BSD mail utility with MIME extensions - -USE_BZIP2= yes -USE_ICONV= yes -USE_OPENSSL= yes -MAKE_ARGS= PREFIX="${PREFIX}" \ - SYSCONFDIR="${PREFIX}/etc" \ - SENDMAIL="/usr/sbin/sendmail" \ - CPPFLAGS="${CPPFLAGS}" \ - LDFLAGS="${LDFLAGS}" \ - IPv6="-DHAVE_IPv6_FUNCS" - -MAN1= nail.1 -PLIST_FILES= bin/nail etc/nail.rc - -CPPFLAGS= -I${LOCALBASE}/include -LDFLAGS= -L${LOCALBASE}/lib - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/nail ${PREFIX}/bin - ${INSTALL_DATA} ${WRKSRC}/nail.rc ${PREFIX}/etc - ${INSTALL_MAN} ${WRKSRC}/nail.1 ${MANPREFIX}/man/man1 - -.include <bsd.port.mk> diff --git a/mail/heirloom-mailx/distinfo b/mail/heirloom-mailx/distinfo deleted file mode 100644 index bcc263058dd1..000000000000 --- a/mail/heirloom-mailx/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (nail-11.24.tar.bz2) = e127cdbba1220a45f6f1f463ac4b4fd1 -SIZE (nail-11.24.tar.bz2) = 266691 diff --git a/mail/heirloom-mailx/pkg-descr b/mail/heirloom-mailx/pkg-descr deleted file mode 100644 index 0b4272e2f2f4..000000000000 --- a/mail/heirloom-mailx/pkg-descr +++ /dev/null @@ -1,3 +0,0 @@ -BSD mail utility with MIME extensions - -WWW: http://nail.sourceforge.net/ diff --git a/mail/horde-imp/Makefile b/mail/horde-imp/Makefile deleted file mode 100644 index 62de9a6325a7..000000000000 --- a/mail/horde-imp/Makefile +++ /dev/null @@ -1,246 +0,0 @@ -# Ports collection makefile for: imp3 -# Date created: Mon Oct 08, 2001 -# Whom: Thierry Thomas (<thierry@thomas.as>) -# -# $FreeBSD$ -# - -PORTNAME= imp -PORTVERSION= 4.0.3 -CATEGORIES= mail www -MASTER_SITES= ftp://ftp.horde.org/pub/imp/ \ - ftp://ftp.planetmirror.com/pub/horde/imp/ \ - ftp://ftp.au.horde.org/pub/horde/imp/ \ - ftp://ftp.be.horde.org/imp/ \ - ftp://ftp.es.horde.org/pub/imp/ \ - http://ftp.horde.org/pub/imp/ -DISTNAME= ${PORTNAME}-h3-${PORTVERSION} - -MAINTAINER= thierry@FreeBSD.org -COMMENT= A webmail system which accesses mail over IMAP - -#----------------------------------------------------------------------- -# You may define these options: -# -# - WITHOUT_LDAP : if you do not need OpenLDAP; -# -# - WITHOUT_SMIME : disable S/MIME; -# -# - WITHOUT_SUPPORTED_DB: if you run a database not in the ports tree; -# -# - WITHOUT_ASPELL : for spelling bees... -# -# - WITH_ISPELL : if you prefer ispell; -# -# - NOCRYPT : if crypto is restricted in your country; -# -# - WITHOUT_SSL : if you have not installed c-client WITH_SSL; -# -# - WITH_VALID_CERT : if you own a valid SSL certificate; -# -# - WITHOUT_INGO : if you don't need filters management; -# -# - WITHOUT_NAG : if you don't want tasks management; -# -# - WITHOUT_TURBA : if you do not want adressbooks; -# -# - WITH_HTML : enable HTML composition mode; -# -# - WITHOUT_IMAPSERVER : if your IMAP server runs on another machine; -# -# or you can select to work with one of these servers: -# -# - WITH_CYRUS-IMAPD : IMP will work with cyrus-imapd; -# -# - WITH_IMAP-UW : IMP will work with imap-uw; -# -# - WITH_DOVECOT : IMP will work with dovecot; -# -# - WITH_COURIER-IMAP : IMP will work with courier-imap. -# -# These choices are mutually exclusive, and imap-uw is the default. -# -#----------------------------------------------------------------------- - -RUN_DEPENDS+= ${PEARDIR}/Auth/SASL.php:${PORTSDIR}/security/pear-Auth_SASL - -CONFLICTS= imp-3.* - -USE_PHP= imap -.if defined(WITHOUT_TURBA) -. if !defined(WITHOUT_LDAP) -USE_PHP+= ldap -. endif -RUN_DEPENDS+= ${LOCALBASE}/${LHORDEDIR}/rpc.php:${PORTSDIR}/www/horde -.else -RUN_DEPENDS+= ${LOCALBASE}/${LHORDEDIR}/turba/minisearch.php:${PORTSDIR}/mail/turba -.endif - -.if !defined(WITHOUT_INGO) -RUN_DEPENDS+= ${LOCALBASE}/${LHORDEDIR}/ingo/filters.php:${PORTSDIR}/mail/ingo -.endif - -.if !defined(WITHOUT_NAG) -RUN_DEPENDS+= ${LOCALBASE}/${LHORDEDIR}/nag/data.php:${PORTSDIR}/deskutils/nag -.endif - -.if !defined(WITHOUT_SMIME) -USE_PHP+= openssl -.endif - -.if !defined(NOCRYPT) -RUN_DEPENDS+= ${LOCALBASE}/bin/gpg:${PORTSDIR}/security/gnupg -.endif - -.if !defined(WITHOUT_ASPELL) -RUN_DEPENDS+= ${LOCALBASE}/bin/aspell:${PORTSDIR}/textproc/aspell -.elif defined(WITH_ISPELL) -RUN_DEPENDS+= ${LOCALBASE}/bin/ispell:${PORTSDIR}/textproc/ispell -.endif - -.if defined(WITH_HTML) -RUN_DEPENDS+= ${PEARDIR}/HTTP/Request.php:${PORTSDIR}/www/pear-HTTP_Request -.endif - -NO_BUILD= yes -USE_REINPLACE= yes -REINPLACE_ARGS= -i.beforeIMP - -DOCS= COPYING README docs/CHANGES docs/CREDITS docs/INSTALL \ - docs/RELEASE_NOTES docs/TODO docs/UPGRADING -CONFFILE= filter.txt header.txt menu.php mime_drivers.php motd.php \ - prefs.php servers.php trailer.txt -SUB_DIRS= config lib locale po scripts templates themes - -LHORDEDIR?= www/horde -LIMPDIR= ${LHORDEDIR}/imp -PEARDIR?= ${LOCALBASE}/share/pear - -PLIST_SUB= IMPDIR=${LIMPDIR} -SUB_LIST= IMPDIR=${IMPDIR} PORTSDIR=${PORTSDIR} CONFDIR=${CONFDIR} - -PKGMESSAGE= ${WRKDIR}/pkg-message -SUB_FILES= pkg-message - -IMPDIR= ${PREFIX}/${LIMPDIR} -CONFDIR= ${IMPDIR}/config - -HORDE_INC= ${LOCALBASE}/etc/horde - -HOSTNAME?= `/bin/hostname` -SERVOS?= ${OPSYS}-${OSREL} - -PORTREV_H?= ${LOCALBASE}/include/c-client/portrevision.h - -PATCH2RM= prefs.php.dist.orig servers.php.dist.orig conf.xml.orig \ - conf.xml.beforeIMP servers.php.dist.beforeIMP - -.include <bsd.port.pre.mk> - -# I have no report about the support of dkimap4 by IMP, -# but I shall be happy to add it if someone report success with it. -# If an IMAP server is already installed, we just record the dependence, -# else we shall install imap-uw. -# IMAP servers are ordered according to my tastes, if several are -# installed, we just record the first one. -.if !defined(WITHOUT_IMAPSERVER) -. if defined(WITH_IMAP-UW) || exists(${LOCALBASE}/libexec/imapd) -RUN_DEPENDS+= ${LOCALBASE}/libexec/imapd:${PORTSDIR}/mail/imap-uw -. elif defined(WITH_CYRUS-IMAPD) || exists(${LOCALBASE}/lib/libacap.a) -RUN_DEPENDS+= ${LOCALBASE}/lib/libacap.a:${PORTSDIR}/mail/cyrus-imapd2 -. elif defined(WITH_COURIER-IMAP) || exists(${LOCALBASE}/bin/deliverquota) -RUN_DEPENDS+= ${LOCALBASE}/bin/deliverquota:${PORTSDIR}/mail/courier-imap -. elif defined(WITH_DOVECOT) || exists(${LOCALBASE}/libexec/dovecot/imap) -RUN_DEPENDS+= ${LOCALBASE}/libexec/dovecot/imap:${PORTSDIR}/mail/dovecot -. else -RUN_DEPENDS+= ${LOCALBASE}/libexec/imapd:${PORTSDIR}/mail/imap-uw -. endif -.endif - -pre-everything:: -.if !defined(WITHOUT_IMAPSERVER) - @${ECHO_MSG} "" - @${ECHO_MSG} "Press CTRL-C and define WITHOUT_IMAPSERVER" - @${ECHO_MSG} "if you intend to run an IMAP server on an other machine." - @${ECHO_MSG} "" -.endif - -pre-configure: - @${REINPLACE_CMD} -e "s:/usr/local:${LOCALBASE}:" ${WRKSRC}/config/conf.xml -.if !defined(WITHOUT_ASPELL) - @${REINPLACE_CMD} -e "s:%%ASPELL%%:${LOCALBASE}/bin/aspell:" \ - ${WRKSRC}/config/conf.xml -.elif defined(WITH_ISPELL) - @${REINPLACE_CMD} -e "s:%%ASPELL%%:${LOCALBASE}/bin/ispell:" \ - ${WRKSRC}/config/conf.xml -.else - @${REINPLACE_CMD} -e "s:%%ASPELL%%::" ${WRKSRC}/config/conf.xml -.endif -.if !defined(NOCRYPT) - @${REINPLACE_CMD} -e "s:%%GPG%%:${LOCALBASE}/bin/gpg:" \ - ${WRKSRC}/config/conf.xml -.else - @${REINPLACE_CMD} -e "s:%%GPG%%::" ${WRKSRC}/config/conf.xml -.endif - @${REINPLACE_CMD} -e "s:IMP_VERSION:IMP_VERSION . ' / ${SERVOS}':" \ - ${WRKSRC}/lib/MIME/Headers.php - @${REINPLACE_CMD} -e "s:example.com:${HOSTNAME}:g" \ - ${WRKSRC}/config/servers.php.dist -.if defined(WITHOUT_SSL) - @${REINPLACE_CMD} -e "s:%%PROTOCOL%%:imap/notls:;s:%%IMAPPORT%%:143:" \ - ${WRKSRC}/config/servers.php.dist -.else - @${REINPLACE_CMD} -e "s:%%IMAPPORT%%:993:" ${WRKSRC}/config/servers.php.dist -. if defined(WITH_VALID_CERT) - @${REINPLACE_CMD} -e "s:%%PROTOCOL%%:imap/ssl:" ${WRKSRC}/config/servers.php.dist -. else - @${REINPLACE_CMD} -e "s:%%PROTOCOL%%:imap/ssl/novalidate-cert:" \ - ${WRKSRC}/config/servers.php.dist -. endif -.endif - @${SED} -e "s:/home/httpd/html/horde/imp:${IMPDIR}:" \ - ${FILESDIR}/httpd.conf.imp > ${WRKDIR}/httpd.conf.imp -.for fc in ${PATCH2RM} - @${RM} ${WRKSRC}/config/${fc} -.endfor - @${RM} ${WRKSRC}/lib/MIME/Headers.php.beforeIMP - -pre-install: -.if !defined(BATCH) && !defined(WITHOUT_SSL) - @if ! ${GREP} -q -e 'CCLIENT_SSLENABLED "yes"' ${PORTREV_H}; then \ - ${ECHO_MSG} "" ; \ - ${ECHO_MSG} "Please configure c-client with SSL support." ; \ - ${ECHO_MSG} "" ; \ - ${FALSE} ; \ - fi -.endif - -do-install: - @${MKDIR} ${IMPDIR} -.for REP in ${SUB_DIRS} - @${CP} -Rp ${WRKSRC}/${REP} ${IMPDIR} -.endfor - @${CP} -p ${WRKSRC}/*.php ${IMPDIR} -.for FILE in ${CONFFILE} - @if [ ! -f ${CONFDIR}/${FILE} ]; then \ - ${CP} ${CONFDIR}/${FILE}.dist ${CONFDIR}/${FILE} ; \ - fi -.endfor - @${INSTALL_DATA} ${WRKSRC}/config/conf.xml ${CONFDIR} - @${INSTALL_DATA} ${WRKDIR}/httpd.conf.imp ${HORDE_INC} - @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${IMPDIR} - @${CHMOD} -R o-rwx ${CONFDIR} -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} -.for FILE in ${DOCS} - @${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR} -.endfor - @${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}." -.endif - -post-install: - @${ECHO_MSG} - @${CAT} ${PKGMESSAGE} - @${ECHO_MSG} - -.include <bsd.port.post.mk> diff --git a/mail/horde-imp/distinfo b/mail/horde-imp/distinfo deleted file mode 100644 index f02a82afb2d8..000000000000 --- a/mail/horde-imp/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (imp-h3-4.0.3.tar.gz) = 42e7232663f65c2edf5e5bb8c85e84f9 -SIZE (imp-h3-4.0.3.tar.gz) = 3060914 diff --git a/mail/horde-imp/files/httpd.conf.imp b/mail/horde-imp/files/httpd.conf.imp deleted file mode 100644 index edd7b1df357e..000000000000 --- a/mail/horde-imp/files/httpd.conf.imp +++ /dev/null @@ -1,31 +0,0 @@ -# This is included in Apache's httpd.conf for IMP -# -# For security, don't serve pages from the IMP configuration and -# library directories. -# -<Directory "/home/httpd/html/horde/imp/config"> - order deny,allow - deny from all -</Directory> -<Directory "/home/httpd/html/horde/imp/lib"> - order deny,allow - deny from all -</Directory> -<Directory "/home/httpd/html/horde/imp/locale"> - order deny,allow - deny from all -</Directory> -<Directory "/home/httpd/html/horde/imp/po"> - order deny,allow - deny from all -</Directory> -<Directory "/home/httpd/html/horde/imp/scripts"> - order deny,allow - deny from all -</Directory> -<Directory "/home/httpd/html/horde/imp/templates"> - order deny,allow - deny from all -</Directory> -# End of IMP configuration ================ - diff --git a/mail/horde-imp/files/patch-ab b/mail/horde-imp/files/patch-ab deleted file mode 100644 index 0ef811fa652d..000000000000 --- a/mail/horde-imp/files/patch-ab +++ /dev/null @@ -1,33 +0,0 @@ ---- config/servers.php.dist.orig Sun Dec 12 07:36:51 2004 -+++ config/servers.php.dist Fri Dec 24 00:27:59 2004 -@@ -47,7 +47,7 @@ - * - * folders: The folder path for the IMAP server. - * Common values: -- * UW-IMAP 'mail/' (note the trailing slash) -+ * UW-IMAP 'Mail/' (note the trailing slash) - * Cyrus, Courier-IMAP 'INBOX.' (note the trailing dot) - * dovecot '' - * -@@ -174,14 +174,16 @@ - - $servers['imap'] = array( - 'name' => 'IMAP Server', -- 'server' => 'imap.example.com', -+// 'server' => 'imap.example.com', -+ 'server' => 'localhost', - 'hordeauth' => false, -- 'protocol' => 'imap/notls', -- 'port' => 143, -- 'folders' => 'mail/', -+ 'protocol' => '%%PROTOCOL%%', -+ 'port' => %%IMAPPORT%%, -+ 'folders' => 'Mail/', - 'namespace' => '', - 'maildomain' => 'example.com', -- 'smtphost' => 'smtp.example.com', -+// 'smtphost' => 'smtp.example.com', -+ 'smtphost' => 'localhost', - 'smtpport' => 25, - 'realm' => '', - 'preferred' => '', diff --git a/mail/horde-imp/files/patch-ac b/mail/horde-imp/files/patch-ac deleted file mode 100644 index 68730ef6fde4..000000000000 --- a/mail/horde-imp/files/patch-ac +++ /dev/null @@ -1,11 +0,0 @@ ---- config/prefs.php.dist.orig Fri Oct 29 19:04:12 2004 -+++ config/prefs.php.dist Thu Nov 11 21:49:05 2004 -@@ -1071,7 +1071,7 @@ - // 'value' => "source_one\tsource_two" - // refer to turba/config/sources.php for possible source values - $_prefs['search_sources'] = array( -- 'value' => "", -+ 'value' => 'localsql', - 'locked' => false, - 'shared' => false, - 'type' => 'implicit'); diff --git a/mail/horde-imp/files/patch-config::conf.xml b/mail/horde-imp/files/patch-config::conf.xml deleted file mode 100644 index 225acb1a99c1..000000000000 --- a/mail/horde-imp/files/patch-config::conf.xml +++ /dev/null @@ -1,25 +0,0 @@ ---- config/conf.xml.orig Mon Nov 22 09:40:29 2004 -+++ config/conf.xml Mon Nov 29 11:51:54 2004 -@@ -6,11 +6,11 @@ - <configheader>External Utilities</configheader> - <configstring name="spellchecker" required="false" desc="Enter the location - of the binary to either aspell or ispell to enable the spell checker. If -- this is empty, then spell checking will be disabled."></configstring> -+ this is empty, then spell checking will be disabled.">%%ASPELL%%</configstring> - <configstring name="gnupg" required="false" desc="If you want users to have - the option of using the GNU Privacy Guard program to decrypt/encrypt PGP - files, enter the location of the 'gpg' binary here. If this is empty this -- feature will be disabled."></configstring> -+ feature will be disabled.">%%GPG%%</configstring> - <configmultienum name="gnupg_keyserver" required="false" desc="The address of - the public PGP keyserver(s) to use.">wwwkeys.pgp.net - <values> -@@ -23,7 +23,7 @@ - connecting to the PGP keyserver. Timeouts are not supported on all - systems.">10</configstring> - <configstring name="openssl_cafile" required="false" desc="The location of -- the root certificates bundle.">/somewhere/ca-bundle.crt</configstring> -+ the root certificates bundle.">/usr/local/etc/ssl.crt/ca-bundle.crt</configstring> - <configstring name="openssl_binary" required="false" desc="The location of - the OpenSSL binary on your system. This program is REQUIRED to import - personal S/MIME certificate information, as there is no native PHP function diff --git a/mail/horde-imp/files/pkg-message.in b/mail/horde-imp/files/pkg-message.in deleted file mode 100644 index 78a666232a4a..000000000000 --- a/mail/horde-imp/files/pkg-message.in +++ /dev/null @@ -1,25 +0,0 @@ -************************************************************************ -IMP has been installed in %%IMPDIR%% with your blank -configuration files. - -Horde must be configured and the tables created; if not, see -`pkg_info -D -x horde'. - -Then, you might have to tune the configuration files located in -%%CONFDIR%%/, specially the file servers.php. - -Then, you must login to Horde as a Horde Administrator to finish the -configuration. Please read %%DOCSDIR%%/INSTALL. - -Warning: the filter system of IMP 3.x has been replaced by a separate -******** application => check the port mail/ingo. Ingo provides a script - to migrate the existing filter rules from IMP 3.x, see Ingo's - documentation. - -To protect your configuration files, you have to restart Apache. - -To secure your installation, it is at least recommended that you change -the default database password used by horde and imp. -Then, you might change the 'session.save_path' setting in php.ini to a -directory only readable and writeable by your webserver. -************************************************************************ diff --git a/mail/horde-imp/pkg-deinstall b/mail/horde-imp/pkg-deinstall deleted file mode 100644 index cd0aa1e6c6c5..000000000000 --- a/mail/horde-imp/pkg-deinstall +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# -# Backup IMP config files, if needed. - -if [ x$2 != xDEINSTALL ]; then - exit -fi - -if [ -z "${PACKAGE_BUILDING}" ]; then - for cf in `ls ${PKG_PREFIX}/www/horde/imp/config/*php ${PKG_PREFIX}/www/horde/imp/config/*txt`; do - diff -bBqw $cf $cf.dist >/dev/null 2>&1 - case $? in - 0) # original config file, will be deleted by pkg-plist - ;; - 1) # config file has been updated, must be backuped - cp -p $cf $cf.previous - echo "===> Backing-up..." - echo "---> $cf has been saved ***" - echo "---> as $cf.previous ***" - ;; - *) # not found? - ;; - esac - done -fi diff --git a/mail/horde-imp/pkg-descr b/mail/horde-imp/pkg-descr deleted file mode 100644 index b085871c38de..000000000000 --- a/mail/horde-imp/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -IMP is the Internet Messaging Program. It is written in PHP and provides -webmail access to IMAP and POP3 accounts. - -WWW: http://www.horde.org/imp/ diff --git a/mail/horde-imp/pkg-plist b/mail/horde-imp/pkg-plist deleted file mode 100644 index 9e5b4de17419..000000000000 --- a/mail/horde-imp/pkg-plist +++ /dev/null @@ -1,487 +0,0 @@ -%%PORTDOCS%%%%DOCSDIR%%/CHANGES -%%PORTDOCS%%%%DOCSDIR%%/COPYING -%%PORTDOCS%%%%DOCSDIR%%/CREDITS -%%PORTDOCS%%%%DOCSDIR%%/INSTALL -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES -%%PORTDOCS%%%%DOCSDIR%%/TODO -%%PORTDOCS%%%%DOCSDIR%%/UPGRADING -%%IMPDIR%%/acl.php -%%IMPDIR%%/attachment.php -%%IMPDIR%%/compose.php -%%IMPDIR%%/config/.htaccess -%%IMPDIR%%/config/conf.xml -%%IMPDIR%%/config/filter.txt -%%IMPDIR%%/config/filter.txt.dist -%%IMPDIR%%/config/header.txt -%%IMPDIR%%/config/header.txt.dist -%%IMPDIR%%/config/menu.php -%%IMPDIR%%/config/menu.php.dist -%%IMPDIR%%/config/mime_drivers.php -%%IMPDIR%%/config/mime_drivers.php.dist -%%IMPDIR%%/config/motd.php -%%IMPDIR%%/config/motd.php.dist -%%IMPDIR%%/config/prefs.php -%%IMPDIR%%/config/prefs.php.dist -%%IMPDIR%%/config/servers.php -%%IMPDIR%%/config/servers.php.dist -%%IMPDIR%%/config/trailer.txt -%%IMPDIR%%/config/trailer.txt.dist -%%IMPDIR%%/contacts.php -%%IMPDIR%%/expand.php -%%IMPDIR%%/fetchmail.php -%%IMPDIR%%/fetchmailprefs.php -%%IMPDIR%%/filterprefs.php -%%IMPDIR%%/folders.php -%%IMPDIR%%/index.php -%%IMPDIR%%/lib/.htaccess -%%IMPDIR%%/lib/Auth/imp.php -%%IMPDIR%%/lib/Block/summary.php -%%IMPDIR%%/lib/Block/tree_folders.php -%%IMPDIR%%/lib/Compose.php -%%IMPDIR%%/lib/Crypt/PGP.php -%%IMPDIR%%/lib/Crypt/SMIME.php -%%IMPDIR%%/lib/Fetchmail.php -%%IMPDIR%%/lib/Fetchmail/imap.php -%%IMPDIR%%/lib/Filter.php -%%IMPDIR%%/lib/Folder.php -%%IMPDIR%%/lib/IMAP.php -%%IMPDIR%%/lib/IMAP/Tree.php -%%IMPDIR%%/lib/IMP.php -%%IMPDIR%%/lib/Identity/imp.php -%%IMPDIR%%/lib/MIME/Contents.php -%%IMPDIR%%/lib/MIME/Headers.php -%%IMPDIR%%/lib/MIME/Viewer/alternative.php -%%IMPDIR%%/lib/MIME/Viewer/appledouble.php -%%IMPDIR%%/lib/MIME/Viewer/enriched.php -%%IMPDIR%%/lib/MIME/Viewer/html.php -%%IMPDIR%%/lib/MIME/Viewer/images.php -%%IMPDIR%%/lib/MIME/Viewer/itip.php -%%IMPDIR%%/lib/MIME/Viewer/multipart.php -%%IMPDIR%%/lib/MIME/Viewer/notification.php -%%IMPDIR%%/lib/MIME/Viewer/partial.php -%%IMPDIR%%/lib/MIME/Viewer/pgp.php -%%IMPDIR%%/lib/MIME/Viewer/pkcs7.php -%%IMPDIR%%/lib/MIME/Viewer/plain.php -%%IMPDIR%%/lib/MIME/Viewer/related.php -%%IMPDIR%%/lib/MIME/Viewer/rfc822.php -%%IMPDIR%%/lib/MIME/Viewer/status.php -%%IMPDIR%%/lib/MIME/Viewer/tnef.php -%%IMPDIR%%/lib/MIME/Viewer/zip.php -%%IMPDIR%%/lib/Mailbox.php -%%IMPDIR%%/lib/Maillog.php -%%IMPDIR%%/lib/Maintenance/Task/delete_attachments_monthly.php -%%IMPDIR%%/lib/Maintenance/Task/delete_sentmail_monthly.php -%%IMPDIR%%/lib/Maintenance/Task/fetchmail_login.php -%%IMPDIR%%/lib/Maintenance/Task/purge_trash.php -%%IMPDIR%%/lib/Maintenance/Task/rename_sentmail_monthly.php -%%IMPDIR%%/lib/Maintenance/Task/tos_agreement.php -%%IMPDIR%%/lib/Maintenance/imp.php -%%IMPDIR%%/lib/Message.php -%%IMPDIR%%/lib/Notification/Listener/status.php -%%IMPDIR%%/lib/Quota.php -%%IMPDIR%%/lib/Quota/command.php -%%IMPDIR%%/lib/Quota/courier.php -%%IMPDIR%%/lib/Quota/cyrus.php -%%IMPDIR%%/lib/Quota/logfile.php -%%IMPDIR%%/lib/Quota/mdaemon.php -%%IMPDIR%%/lib/Quota/mercury32.php -%%IMPDIR%%/lib/Search.php -%%IMPDIR%%/lib/Session.php -%%IMPDIR%%/lib/Spam.php -%%IMPDIR%%/lib/VFolder.php -%%IMPDIR%%/lib/api.php -%%IMPDIR%%/lib/base.php -%%IMPDIR%%/lib/prefs.php -%%IMPDIR%%/lib/version.php -%%IMPDIR%%/locale/.htaccess -%%IMPDIR%%/locale/ar_OM/LC_MESSAGES/imp.mo -%%IMPDIR%%/locale/ar_SY/LC_MESSAGES/imp.mo -%%IMPDIR%%/locale/bg_BG/LC_MESSAGES/imp.mo -%%IMPDIR%%/locale/ca_ES/LC_MESSAGES/imp.mo -%%IMPDIR%%/locale/ca_ES/help.xml -%%IMPDIR%%/locale/cs_CZ/LC_MESSAGES/imp.mo -%%IMPDIR%%/locale/cs_CZ/help.xml -%%IMPDIR%%/locale/da_DK/LC_MESSAGES/imp.mo -%%IMPDIR%%/locale/da_DK/help.xml -%%IMPDIR%%/locale/de_DE/LC_MESSAGES/imp.mo -%%IMPDIR%%/locale/de_DE/help.xml -%%IMPDIR%%/locale/el_GR/LC_MESSAGES/imp.mo -%%IMPDIR%%/locale/el_GR/help.xml -%%IMPDIR%%/locale/en_US/help.xml -%%IMPDIR%%/locale/es_ES/LC_MESSAGES/imp.mo -%%IMPDIR%%/locale/es_ES/help.xml -%%IMPDIR%%/locale/et_EE/LC_MESSAGES/imp.mo -%%IMPDIR%%/locale/et_EE/help.xml -%%IMPDIR%%/locale/fa_IR/LC_MESSAGES/imp.mo -%%IMPDIR%%/locale/fi_FI/LC_MESSAGES/imp.mo -%%IMPDIR%%/locale/fi_FI/help.xml -%%IMPDIR%%/locale/fr_FR/LC_MESSAGES/imp.mo -%%IMPDIR%%/locale/fr_FR/help.xml -%%IMPDIR%%/locale/gl_ES/LC_MESSAGES/imp.mo -%%IMPDIR%%/locale/hu_HU/LC_MESSAGES/imp.mo -%%IMPDIR%%/locale/hu_HU/help.xml -%%IMPDIR%%/locale/id_ID/LC_MESSAGES/imp.mo -%%IMPDIR%%/locale/is_IS/LC_MESSAGES/imp.mo -%%IMPDIR%%/locale/it_IT/LC_MESSAGES/imp.mo -%%IMPDIR%%/locale/it_IT/help.xml -%%IMPDIR%%/locale/ja_JP/LC_MESSAGES/imp.mo -%%IMPDIR%%/locale/ko_KR/LC_MESSAGES/imp.mo -%%IMPDIR%%/locale/ko_KR/help.xml -%%IMPDIR%%/locale/lt_LT/LC_MESSAGES/imp.mo -%%IMPDIR%%/locale/lv_LV/LC_MESSAGES/imp.mo -%%IMPDIR%%/locale/mk_MK/LC_MESSAGES/imp.mo -%%IMPDIR%%/locale/nb_NO/LC_MESSAGES/imp.mo -%%IMPDIR%%/locale/nb_NO/help.xml -%%IMPDIR%%/locale/nl_NL/LC_MESSAGES/imp.mo -%%IMPDIR%%/locale/nl_NL/help.xml -%%IMPDIR%%/locale/nn_NO/LC_MESSAGES/imp.mo -%%IMPDIR%%/locale/pl_PL/LC_MESSAGES/imp.mo -%%IMPDIR%%/locale/pl_PL/help.xml -%%IMPDIR%%/locale/pt_BR/LC_MESSAGES/imp.mo -%%IMPDIR%%/locale/pt_BR/help.xml -%%IMPDIR%%/locale/pt_PT/LC_MESSAGES/imp.mo -%%IMPDIR%%/locale/pt_PT/help.xml -%%IMPDIR%%/locale/ro_RO/LC_MESSAGES/imp.mo -%%IMPDIR%%/locale/ru_RU/LC_MESSAGES/imp.mo -%%IMPDIR%%/locale/ru_RU/help.xml -%%IMPDIR%%/locale/sk_SK/LC_MESSAGES/imp.mo -%%IMPDIR%%/locale/sk_SK/help.xml -%%IMPDIR%%/locale/sl_SI/LC_MESSAGES/imp.mo -%%IMPDIR%%/locale/sv_SE/LC_MESSAGES/imp.mo -%%IMPDIR%%/locale/sv_SE/help.xml -%%IMPDIR%%/locale/th_TH/LC_MESSAGES/imp.mo -%%IMPDIR%%/locale/tr_TR/LC_MESSAGES/imp.mo -%%IMPDIR%%/locale/uk_UA/LC_MESSAGES/imp.mo -%%IMPDIR%%/locale/uk_UA/help.xml -%%IMPDIR%%/locale/zh_CN/LC_MESSAGES/imp.mo -%%IMPDIR%%/locale/zh_CN/help.xml -%%IMPDIR%%/locale/zh_TW/LC_MESSAGES/imp.mo -%%IMPDIR%%/locale/zh_TW/help.xml -%%IMPDIR%%/login.php -%%IMPDIR%%/mailbox.php -%%IMPDIR%%/message.php -%%IMPDIR%%/pgp.php -%%IMPDIR%%/po/.htaccess -%%IMPDIR%%/po/README -%%IMPDIR%%/po/ar_OM.po -%%IMPDIR%%/po/ar_SY.po -%%IMPDIR%%/po/bg_BG.po -%%IMPDIR%%/po/ca_ES.po -%%IMPDIR%%/po/cs_CZ.po -%%IMPDIR%%/po/da_DK.po -%%IMPDIR%%/po/de_DE.po -%%IMPDIR%%/po/el_GR.po -%%IMPDIR%%/po/es_ES.po -%%IMPDIR%%/po/et_EE.po -%%IMPDIR%%/po/fa_IR.po -%%IMPDIR%%/po/fi_FI.po -%%IMPDIR%%/po/fr_FR.po -%%IMPDIR%%/po/gl_ES.po -%%IMPDIR%%/po/hu_HU.po -%%IMPDIR%%/po/id_ID.po -%%IMPDIR%%/po/imp.pot -%%IMPDIR%%/po/is_IS.po -%%IMPDIR%%/po/it_IT.po -%%IMPDIR%%/po/ja_JP.po -%%IMPDIR%%/po/ko_KR.po -%%IMPDIR%%/po/lt_LT.po -%%IMPDIR%%/po/lv_LV.po -%%IMPDIR%%/po/mk_MK.po -%%IMPDIR%%/po/nb_NO.po -%%IMPDIR%%/po/nl_NL.po -%%IMPDIR%%/po/nn_NO.po -%%IMPDIR%%/po/pl_PL.po -%%IMPDIR%%/po/pt_BR.po -%%IMPDIR%%/po/pt_PT.po -%%IMPDIR%%/po/ro_RO.po -%%IMPDIR%%/po/ru_RU.po -%%IMPDIR%%/po/sk_SK.po -%%IMPDIR%%/po/sl_SI.po -%%IMPDIR%%/po/sv_SE.po -%%IMPDIR%%/po/th_TH.po -%%IMPDIR%%/po/tr_TR.po -%%IMPDIR%%/po/uk_UA.po -%%IMPDIR%%/po/zh_CN.po -%%IMPDIR%%/po/zh_TW.po -%%IMPDIR%%/recompose.php -%%IMPDIR%%/redirect.php -%%IMPDIR%%/scripts/.htaccess -%%IMPDIR%%/scripts/Imp.reg -%%IMPDIR%%/scripts/custom_login.php -%%IMPDIR%%/scripts/singlescript.php -%%IMPDIR%%/search.php -%%IMPDIR%%/smime.php -%%IMPDIR%%/spelling.php -%%IMPDIR%%/templates/.htaccess -%%IMPDIR%%/templates/acl/acl.inc -%%IMPDIR%%/templates/common-header.inc -%%IMPDIR%%/templates/compose/attachments.inc -%%IMPDIR%%/templates/compose/attachments.js -%%IMPDIR%%/templates/compose/compose.inc -%%IMPDIR%%/templates/compose/compose.js -%%IMPDIR%%/templates/compose/compose_expand.js -%%IMPDIR%%/templates/compose/encrypt_list.inc -%%IMPDIR%%/templates/compose/expand.inc -%%IMPDIR%%/templates/compose/recompose.inc -%%IMPDIR%%/templates/compose/redirect.inc -%%IMPDIR%%/templates/compose/spelling.inc -%%IMPDIR%%/templates/compose/spelling.js -%%IMPDIR%%/templates/compose/success.inc -%%IMPDIR%%/templates/contacts/contacts.inc -%%IMPDIR%%/templates/fetchmail/account_select.inc -%%IMPDIR%%/templates/fetchmail/driver_select.inc -%%IMPDIR%%/templates/fetchmail/fetchmail.inc -%%IMPDIR%%/templates/fetchmail/manage.inc -%%IMPDIR%%/templates/fetchmail/top.inc -%%IMPDIR%%/templates/filters/notactive.inc -%%IMPDIR%%/templates/filters/prefs.inc -%%IMPDIR%%/templates/folders/actions.inc -%%IMPDIR%%/templates/folders/folders.html -%%IMPDIR%%/templates/folders/foot.inc -%%IMPDIR%%/templates/folders/head.inc -%%IMPDIR%%/templates/folders/import.inc -%%IMPDIR%%/templates/folders/javascript.inc -%%IMPDIR%%/templates/javascript/open_compose_win.js -%%IMPDIR%%/templates/javascript/open_print_win.js -%%IMPDIR%%/templates/login/login.inc -%%IMPDIR%%/templates/mailbox/actions.inc -%%IMPDIR%%/templates/mailbox/actions_deleted.inc -%%IMPDIR%%/templates/mailbox/alert.inc -%%IMPDIR%%/templates/mailbox/empty_mailbox.inc -%%IMPDIR%%/templates/mailbox/footer.inc -%%IMPDIR%%/templates/mailbox/header.inc -%%IMPDIR%%/templates/mailbox/javascript.inc -%%IMPDIR%%/templates/mailbox/legend.inc -%%IMPDIR%%/templates/mailbox/mailbox.html -%%IMPDIR%%/templates/mailbox/message_footers.inc -%%IMPDIR%%/templates/mailbox/message_headers.inc -%%IMPDIR%%/templates/mailbox/navbar.inc -%%IMPDIR%%/templates/mailbox/searchfolder.inc -%%IMPDIR%%/templates/menu.inc -%%IMPDIR%%/templates/message/headers.inc -%%IMPDIR%%/templates/message/javascript.inc -%%IMPDIR%%/templates/message/message.inc -%%IMPDIR%%/templates/message/navbar_actions.inc -%%IMPDIR%%/templates/message/navbar_navigate.inc -%%IMPDIR%%/templates/message/navbar_top.inc -%%IMPDIR%%/templates/message/print.inc -%%IMPDIR%%/templates/pgp/import_key.inc -%%IMPDIR%%/templates/pgp/notactive.inc -%%IMPDIR%%/templates/pgp/open_pgp_import.js -%%IMPDIR%%/templates/pgp/open_pgp_win.js -%%IMPDIR%%/templates/pgp/passphrase.inc -%%IMPDIR%%/templates/pgp/pgp.inc -%%IMPDIR%%/templates/prefs/encryptselect.inc -%%IMPDIR%%/templates/prefs/folderselect.inc -%%IMPDIR%%/templates/prefs/initialpageselect.inc -%%IMPDIR%%/templates/prefs/sentmailselect.inc -%%IMPDIR%%/templates/prefs/sourceselect.inc -%%IMPDIR%%/templates/prefs/spamselect.inc -%%IMPDIR%%/templates/prefs/trashselect.inc -%%IMPDIR%%/templates/quota/quota.inc -%%IMPDIR%%/templates/search/fields.inc -%%IMPDIR%%/templates/search/header.inc -%%IMPDIR%%/templates/search/javascript.inc -%%IMPDIR%%/templates/search/main.inc -%%IMPDIR%%/templates/smime/import_key.inc -%%IMPDIR%%/templates/smime/notactive.inc -%%IMPDIR%%/templates/smime/open_smime_import.js -%%IMPDIR%%/templates/smime/open_smime_win.js -%%IMPDIR%%/templates/smime/passphrase.inc -%%IMPDIR%%/templates/smime/smime.inc -%%IMPDIR%%/templates/thread/bottom.inc -%%IMPDIR%%/templates/thread/thread.html -%%IMPDIR%%/templates/thread/top.inc -%%IMPDIR%%/test.php -%%IMPDIR%%/themes/azur/screen.css -%%IMPDIR%%/themes/bluemoon/screen.css -%%IMPDIR%%/themes/bluewhite/screen.css -%%IMPDIR%%/themes/brown/screen.css -%%IMPDIR%%/themes/burntorange/screen.css -%%IMPDIR%%/themes/cherry/screen.css -%%IMPDIR%%/themes/gennevilliers/screen.css -%%IMPDIR%%/themes/green/screen.css -%%IMPDIR%%/themes/grey/screen.css -%%IMPDIR%%/themes/graphics/addressbook-blue.png -%%IMPDIR%%/themes/graphics/addressbook-red.png -%%IMPDIR%%/themes/graphics/apple.png -%%IMPDIR%%/themes/graphics/attachment.png -%%IMPDIR%%/themes/graphics/compose.png -%%IMPDIR%%/themes/graphics/empty_trash.png -%%IMPDIR%%/themes/graphics/expand.png -%%IMPDIR%%/themes/graphics/favicon.ico -%%IMPDIR%%/themes/graphics/fetchmail.png -%%IMPDIR%%/themes/graphics/filters.png -%%IMPDIR%%/themes/graphics/folders/drafts.png -%%IMPDIR%%/themes/graphics/folders/folder.png -%%IMPDIR%%/themes/graphics/folders/folder_open.png -%%IMPDIR%%/themes/graphics/folders/inbox.png -%%IMPDIR%%/themes/graphics/folders/sent.png -%%IMPDIR%%/themes/graphics/folders/templates.png -%%IMPDIR%%/themes/graphics/folders/trash.png -%%IMPDIR%%/themes/graphics/forward.png -%%IMPDIR%%/themes/graphics/imp.png -%%IMPDIR%%/themes/graphics/mail_answered.png -%%IMPDIR%%/themes/graphics/mail_deleted.png -%%IMPDIR%%/themes/graphics/mail_draft.png -%%IMPDIR%%/themes/graphics/mail_flagged.png -%%IMPDIR%%/themes/graphics/mail_personal.png -%%IMPDIR%%/themes/graphics/mail_priority_high.png -%%IMPDIR%%/themes/graphics/mail_priority_low.png -%%IMPDIR%%/themes/graphics/mail_unseen.png -%%IMPDIR%%/themes/graphics/manage_attachments.png -%%IMPDIR%%/themes/graphics/mime/compressed.png -%%IMPDIR%%/themes/graphics/mime/encryption.png -%%IMPDIR%%/themes/graphics/mime/html.png -%%IMPDIR%%/themes/graphics/mime/image.png -%%IMPDIR%%/themes/graphics/mime/itip.png -%%IMPDIR%%/themes/graphics/mime/mail.png -%%IMPDIR%%/themes/graphics/mime/text.png -%%IMPDIR%%/themes/graphics/newmail.png -%%IMPDIR%%/themes/graphics/reply.png -%%IMPDIR%%/themes/graphics/shared.png -%%IMPDIR%%/themes/graphics/signed.png -%%IMPDIR%%/themes/graphics/spacer_red.png -%%IMPDIR%%/themes/graphics/spellcheck.png -%%IMPDIR%%/themes/screen.css -%%IMPDIR%%/themes/lavander/screen.css -%%IMPDIR%%/themes/postnuke/screen.css -%%IMPDIR%%/themes/simplex/screen.css -%%IMPDIR%%/themes/sun/screen.css -%%IMPDIR%%/thread.php -%%IMPDIR%%/view.php -%%PORTDOCS%%@dirrm %%DOCSDIR%% -etc/horde/httpd.conf.imp -@dirrm %%IMPDIR%%/themes/sun -@dirrm %%IMPDIR%%/themes/simplex -@dirrm %%IMPDIR%%/themes/postnuke -@dirrm %%IMPDIR%%/themes/lavander -@dirrm %%IMPDIR%%/themes/graphics/mime -@dirrm %%IMPDIR%%/themes/graphics/folders -@dirrm %%IMPDIR%%/themes/graphics -@dirrm %%IMPDIR%%/themes/grey -@dirrm %%IMPDIR%%/themes/green -@dirrm %%IMPDIR%%/themes/gennevilliers -@dirrm %%IMPDIR%%/themes/cherry -@dirrm %%IMPDIR%%/themes/burntorange -@dirrm %%IMPDIR%%/themes/brown -@dirrm %%IMPDIR%%/themes/bluewhite -@dirrm %%IMPDIR%%/themes/bluemoon -@dirrm %%IMPDIR%%/themes/azur -@dirrm %%IMPDIR%%/themes -@dirrm %%IMPDIR%%/templates/thread -@dirrm %%IMPDIR%%/templates/smime -@dirrm %%IMPDIR%%/templates/search -@dirrm %%IMPDIR%%/templates/quota -@dirrm %%IMPDIR%%/templates/prefs -@dirrm %%IMPDIR%%/templates/pgp -@dirrm %%IMPDIR%%/templates/message -@dirrm %%IMPDIR%%/templates/mailbox -@dirrm %%IMPDIR%%/templates/login -@dirrm %%IMPDIR%%/templates/javascript -@dirrm %%IMPDIR%%/templates/folders -@dirrm %%IMPDIR%%/templates/filters -@dirrm %%IMPDIR%%/templates/fetchmail -@dirrm %%IMPDIR%%/templates/contacts -@dirrm %%IMPDIR%%/templates/compose -@dirrm %%IMPDIR%%/templates/acl -@dirrm %%IMPDIR%%/templates -@dirrm %%IMPDIR%%/scripts -@dirrm %%IMPDIR%%/po -@dirrm %%IMPDIR%%/locale/zh_TW/LC_MESSAGES -@dirrm %%IMPDIR%%/locale/zh_TW -@dirrm %%IMPDIR%%/locale/zh_CN/LC_MESSAGES -@dirrm %%IMPDIR%%/locale/zh_CN -@dirrm %%IMPDIR%%/locale/uk_UA/LC_MESSAGES -@dirrm %%IMPDIR%%/locale/uk_UA -@dirrm %%IMPDIR%%/locale/tr_TR/LC_MESSAGES -@dirrm %%IMPDIR%%/locale/tr_TR -@dirrm %%IMPDIR%%/locale/th_TH/LC_MESSAGES -@dirrm %%IMPDIR%%/locale/th_TH -@dirrm %%IMPDIR%%/locale/sv_SE/LC_MESSAGES -@dirrm %%IMPDIR%%/locale/sv_SE -@dirrm %%IMPDIR%%/locale/sl_SI/LC_MESSAGES -@dirrm %%IMPDIR%%/locale/sl_SI -@dirrm %%IMPDIR%%/locale/sk_SK/LC_MESSAGES -@dirrm %%IMPDIR%%/locale/sk_SK -@dirrm %%IMPDIR%%/locale/ru_RU/LC_MESSAGES -@dirrm %%IMPDIR%%/locale/ru_RU -@dirrm %%IMPDIR%%/locale/ro_RO/LC_MESSAGES -@dirrm %%IMPDIR%%/locale/ro_RO -@dirrm %%IMPDIR%%/locale/pt_PT/LC_MESSAGES -@dirrm %%IMPDIR%%/locale/pt_PT -@dirrm %%IMPDIR%%/locale/pt_BR/LC_MESSAGES -@dirrm %%IMPDIR%%/locale/pt_BR -@dirrm %%IMPDIR%%/locale/pl_PL/LC_MESSAGES -@dirrm %%IMPDIR%%/locale/pl_PL -@dirrm %%IMPDIR%%/locale/nn_NO/LC_MESSAGES -@dirrm %%IMPDIR%%/locale/nn_NO -@dirrm %%IMPDIR%%/locale/nl_NL/LC_MESSAGES -@dirrm %%IMPDIR%%/locale/nl_NL -@dirrm %%IMPDIR%%/locale/nb_NO/LC_MESSAGES -@dirrm %%IMPDIR%%/locale/nb_NO -@dirrm %%IMPDIR%%/locale/mk_MK/LC_MESSAGES -@dirrm %%IMPDIR%%/locale/mk_MK -@dirrm %%IMPDIR%%/locale/lv_LV/LC_MESSAGES -@dirrm %%IMPDIR%%/locale/lv_LV -@dirrm %%IMPDIR%%/locale/lt_LT/LC_MESSAGES -@dirrm %%IMPDIR%%/locale/lt_LT -@dirrm %%IMPDIR%%/locale/ko_KR/LC_MESSAGES -@dirrm %%IMPDIR%%/locale/ko_KR -@dirrm %%IMPDIR%%/locale/ja_JP/LC_MESSAGES -@dirrm %%IMPDIR%%/locale/ja_JP -@dirrm %%IMPDIR%%/locale/it_IT/LC_MESSAGES -@dirrm %%IMPDIR%%/locale/it_IT -@dirrm %%IMPDIR%%/locale/is_IS/LC_MESSAGES -@dirrm %%IMPDIR%%/locale/is_IS -@dirrm %%IMPDIR%%/locale/id_ID/LC_MESSAGES -@dirrm %%IMPDIR%%/locale/id_ID -@dirrm %%IMPDIR%%/locale/hu_HU/LC_MESSAGES -@dirrm %%IMPDIR%%/locale/hu_HU -@dirrm %%IMPDIR%%/locale/gl_ES/LC_MESSAGES -@dirrm %%IMPDIR%%/locale/gl_ES -@dirrm %%IMPDIR%%/locale/fr_FR/LC_MESSAGES -@dirrm %%IMPDIR%%/locale/fr_FR -@dirrm %%IMPDIR%%/locale/fi_FI/LC_MESSAGES -@dirrm %%IMPDIR%%/locale/fi_FI -@dirrm %%IMPDIR%%/locale/fa_IR/LC_MESSAGES -@dirrm %%IMPDIR%%/locale/fa_IR -@dirrm %%IMPDIR%%/locale/et_EE/LC_MESSAGES -@dirrm %%IMPDIR%%/locale/et_EE -@dirrm %%IMPDIR%%/locale/es_ES/LC_MESSAGES -@dirrm %%IMPDIR%%/locale/es_ES -@dirrm %%IMPDIR%%/locale/en_US -@dirrm %%IMPDIR%%/locale/el_GR/LC_MESSAGES -@dirrm %%IMPDIR%%/locale/el_GR -@dirrm %%IMPDIR%%/locale/de_DE/LC_MESSAGES -@dirrm %%IMPDIR%%/locale/de_DE -@dirrm %%IMPDIR%%/locale/da_DK/LC_MESSAGES -@dirrm %%IMPDIR%%/locale/da_DK -@dirrm %%IMPDIR%%/locale/cs_CZ/LC_MESSAGES -@dirrm %%IMPDIR%%/locale/cs_CZ -@dirrm %%IMPDIR%%/locale/ca_ES/LC_MESSAGES -@dirrm %%IMPDIR%%/locale/ca_ES -@dirrm %%IMPDIR%%/locale/bg_BG/LC_MESSAGES -@dirrm %%IMPDIR%%/locale/bg_BG -@dirrm %%IMPDIR%%/locale/ar_SY/LC_MESSAGES -@dirrm %%IMPDIR%%/locale/ar_SY -@dirrm %%IMPDIR%%/locale/ar_OM/LC_MESSAGES -@dirrm %%IMPDIR%%/locale/ar_OM -@dirrm %%IMPDIR%%/locale -@dirrm %%IMPDIR%%/lib/Quota -@dirrm %%IMPDIR%%/lib/Notification/Listener -@dirrm %%IMPDIR%%/lib/Notification -@dirrm %%IMPDIR%%/lib/Maintenance/Task -@dirrm %%IMPDIR%%/lib/Maintenance -@dirrm %%IMPDIR%%/lib/MIME/Viewer -@dirrm %%IMPDIR%%/lib/MIME -@dirrm %%IMPDIR%%/lib/Identity -@dirrm %%IMPDIR%%/lib/IMAP -@dirrm %%IMPDIR%%/lib/Fetchmail -@dirrm %%IMPDIR%%/lib/Crypt -@dirrm %%IMPDIR%%/lib/Block -@dirrm %%IMPDIR%%/lib/Auth -@dirrm %%IMPDIR%%/lib -@unexec rmdir %D/%%IMPDIR%%/config 2>/dev/null || true -@unexec rmdir %D/%%IMPDIR%% 2>/dev/null || true diff --git a/mail/horde-ingo/Makefile b/mail/horde-ingo/Makefile deleted file mode 100644 index 875ac6ffa817..000000000000 --- a/mail/horde-ingo/Makefile +++ /dev/null @@ -1,94 +0,0 @@ -# Ports collection makefile for: Ingo -# Date created: Dec 3, 2004 -# Whom: Thierry Thomas (<thierry@pompo.net>) -# -# $FreeBSD$ -# - -PORTNAME= ingo -PORTVERSION= 1.0.1 -CATEGORIES= mail www -MASTER_SITES= ftp://ftp.horde.org/pub/ingo/ \ - ftp://ftp.planetmirror.com/pub/horde/ingo/ \ - ftp://ftp.au.horde.org/pub/horde/ingo/ \ - ftp://ftp.be.horde.org/ingo/ \ - ftp://ftp.es.horde.org/pub/ingo/ \ - ftp://ftp.it.horde.org/pub/mirror/horde.org/ingo/ \ - ftp://ftp.nl.horde.org/mirror/horde-ftp/pub/ingo/ \ - ftp://ftp.uk.horde.org/mirrors/ftp.horde.org/pub/ingo/ \ - http://ftp.horde.org/pub/ingo/ -DISTNAME= ${PORTNAME}-h3-${PORTVERSION} - -MAINTAINER= thierry@FreeBSD.org -COMMENT= Horde's email-filter management application - -#----------------------------------------------------------------------- -# You may define this option: -# -# - WITH_SIEVE : if you run timsieved (with Cyrus). -# -#----------------------------------------------------------------------- - -RUN_DEPENDS+= ${LOCALBASE}/${LHORDEDIR}/rpc.php:${PORTSDIR}/www/horde - -NO_BUILD= yes -USE_PHP= imap -USE_REINPLACE= yes - -PLIST_SUB= INGODIR=${LINGODIR} -PKGMESSAGE= ${WRKDIR}/pkg-message - -DOCS= LICENSE README docs/CHANGES docs/CREDITS docs/INSTALL \ - docs/RELEASE_NOTES docs/TODO -CONFFILE= backends.php fields.php prefs.php -SUB_DIRS= config lib locale po scripts templates themes - -LHORDEDIR?= www/horde -LINGODIR= ${LHORDEDIR}/ingo -PEARDIR?= ${LOCALBASE}/share/pear - -INGODIR= ${PREFIX}/${LINGODIR} -CONFDIR= ${INGODIR}/config - -HORDE_INC= ${LOCALBASE}/etc/horde - -.include <bsd.port.pre.mk> - -.if defined(WITH_SIEVE) || exists(${LOCALBASE}/cyrus/bin/timsieved) -RUN_DEPENDS+= ${PEARDIR}/Net/Sieve.php:${PORTSDIR}/net/pear-Net_Sieve -.endif - -pre-configure: - @${SED} -e "s:/home/httpd/html/horde/ingo:${INGODIR}:g" \ - ${FILESDIR}/httpd.conf.ingo >${WRKDIR}/httpd.conf.ingo - -do-install: - @${MKDIR} ${INGODIR} -.for REP in ${SUB_DIRS} - @${CP} -Rp ${WRKSRC}/${REP} ${INGODIR} -.endfor - @${CP} -p ${WRKSRC}/*.php ${INGODIR} -.for FILE in ${CONFFILE} - @if [ ! -f ${CONFDIR}/${FILE} ]; then \ - ${CP} ${CONFDIR}/${FILE}.dist ${CONFDIR}/${FILE} ; \ - fi -.endfor - @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${INGODIR} - @${CHMOD} -R o-rwx ${CONFDIR} - @${INSTALL_DATA} ${WRKDIR}/httpd.conf.ingo ${HORDE_INC} -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} -.for FILE in ${DOCS} - @${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR} -.endfor - @${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}." -.endif - -post-install: - @${SED} -e "s:%%INGODIR%%:${INGODIR}:g;s:%%DOCSDIR%%:${DOCSDIR}:g" \ - < ${FILESDIR}/pkg-message.in > ${PKGMESSAGE} - @${ECHO_MSG} - @${CAT} ${PKGMESSAGE} - @${ECHO_MSG} - -.include <bsd.port.post.mk> diff --git a/mail/horde-ingo/distinfo b/mail/horde-ingo/distinfo deleted file mode 100644 index 5ab26ac7cb66..000000000000 --- a/mail/horde-ingo/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (ingo-h3-1.0.1.tar.gz) = 7fce229d752e5b981621e215e4fc56e8 -SIZE (ingo-h3-1.0.1.tar.gz) = 733425 diff --git a/mail/horde-ingo/files/httpd.conf.ingo b/mail/horde-ingo/files/httpd.conf.ingo deleted file mode 100644 index d07046cdd18c..000000000000 --- a/mail/horde-ingo/files/httpd.conf.ingo +++ /dev/null @@ -1,31 +0,0 @@ -# This is included in Apache's httpd.conf for Ingo -# -# For security, don't serve pages from the Ingo configuration and -# library directories. -# -<Directory "/home/httpd/html/horde/ingo/config"> - order deny,allow - deny from all -</Directory> -<Directory "/home/httpd/html/horde/ingo/lib"> - order deny,allow - deny from all -</Directory> -<Directory "/home/httpd/html/horde/ingo/locale"> - order deny,allow - deny from all -</Directory> -<Directory "/home/httpd/html/horde/ingo/po"> - order deny,allow - deny from all -</Directory> -<Directory "/home/httpd/html/horde/ingo/scripts"> - order deny,allow - deny from all -</Directory> -<Directory "/home/httpd/html/horde/ingo/templates"> - order deny,allow - deny from all -</Directory> -# End of Ingo configuration ================ - diff --git a/mail/horde-ingo/files/pkg-message.in b/mail/horde-ingo/files/pkg-message.in deleted file mode 100644 index fba684f58b9d..000000000000 --- a/mail/horde-ingo/files/pkg-message.in +++ /dev/null @@ -1,11 +0,0 @@ -************************************************************************ -Ingo has been installed in %%INGODIR%% with your blank -configuration files. - -Horde must be configured; if not, see `pkg_info -D -x horde'. - -Finally, you must login to Horde as a Horde Administrator to finish the -configuration. - -To protect your configuration files, you have to restart Apache. -************************************************************************ diff --git a/mail/horde-ingo/pkg-deinstall b/mail/horde-ingo/pkg-deinstall deleted file mode 100644 index a3a597d448a6..000000000000 --- a/mail/horde-ingo/pkg-deinstall +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# -# Backup Ingo config files, if needed. - -if [ x$2 != xDEINSTALL ]; then - exit -fi - -if [ -z "${PACKAGE_BUILDING}" ]; then - for cf in `ls ${PKG_PREFIX}/www/horde/ingo/config/*php`; do - diff -bBqw $cf $cf.dist >/dev/null 2>&1 - case $? in - 0) # original config file, will be deleted by pkg-plist - ;; - 1) # config file has been updated, must be backuped - cp -p $cf $cf.previous - echo "===> Backing-up..." - echo "---> $cf has been saved ***" - echo "---> as $cf.previous ***" - ;; - *) # not found? - ;; - esac - done -fi diff --git a/mail/horde-ingo/pkg-descr b/mail/horde-ingo/pkg-descr deleted file mode 100644 index 382bea7a8f2d..000000000000 --- a/mail/horde-ingo/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -Ingo is an email-filter management application. - -It is fully internationalized, integrated with Horde and the IMP Webmail -client, and supports both server-side (Sieve, procmail) and client-side -(IMAP) rule creation. - -WWW: http://horde.org/ingo/ diff --git a/mail/horde-ingo/pkg-plist b/mail/horde-ingo/pkg-plist deleted file mode 100644 index 6b72cc37cf5e..000000000000 --- a/mail/horde-ingo/pkg-plist +++ /dev/null @@ -1,156 +0,0 @@ -etc/horde/httpd.conf.ingo -%%PORTDOCS%%%%DOCSDIR%%/CHANGES -%%PORTDOCS%%%%DOCSDIR%%/LICENSE -%%PORTDOCS%%%%DOCSDIR%%/CREDITS -%%PORTDOCS%%%%DOCSDIR%%/INSTALL -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES -%%PORTDOCS%%%%DOCSDIR%%/TODO -%%INGODIR%%/blacklist.php -%%INGODIR%%/config/.htaccess -%%INGODIR%%/config/backends.php -%%INGODIR%%/config/backends.php.dist -%%INGODIR%%/config/conf.xml -%%INGODIR%%/config/fields.php -%%INGODIR%%/config/fields.php.dist -%%INGODIR%%/config/prefs.php -%%INGODIR%%/config/prefs.php.dist -%%INGODIR%%/filters.php -%%INGODIR%%/forward.php -%%INGODIR%%/index.php -%%INGODIR%%/lib/Driver.php -%%INGODIR%%/lib/Driver/null.php -%%INGODIR%%/lib/Driver/timsieved.php -%%INGODIR%%/lib/Driver/vfs.php -%%INGODIR%%/lib/Ingo.php -%%INGODIR%%/lib/Script.php -%%INGODIR%%/lib/Script/imap.php -%%INGODIR%%/lib/Script/procmail.php -%%INGODIR%%/lib/Script/sieve.php -%%INGODIR%%/lib/Session.php -%%INGODIR%%/lib/Storage.php -%%INGODIR%%/lib/Storage/prefs.php -%%INGODIR%%/lib/api.php -%%INGODIR%%/lib/base.php -%%INGODIR%%/lib/version.php -%%INGODIR%%/locale/cs_CZ/LC_MESSAGES/ingo.mo -%%INGODIR%%/locale/de_DE/LC_MESSAGES/ingo.mo -%%INGODIR%%/locale/de_DE/help.xml -%%INGODIR%%/locale/en_US/help.xml -%%INGODIR%%/locale/es_ES/LC_MESSAGES/ingo.mo -%%INGODIR%%/locale/es_ES/help.xml -%%INGODIR%%/locale/fi_FI/LC_MESSAGES/ingo.mo -%%INGODIR%%/locale/fr_FR/LC_MESSAGES/ingo.mo -%%INGODIR%%/locale/hu_HU/LC_MESSAGES/ingo.mo -%%INGODIR%%/locale/it_IT/LC_MESSAGES/ingo.mo -%%INGODIR%%/locale/lt_LT/LC_MESSAGES/ingo.mo -%%INGODIR%%/locale/lv_LV/help.xml -%%INGODIR%%/locale/nl_NL/LC_MESSAGES/ingo.mo -%%INGODIR%%/locale/pl_PL/LC_MESSAGES/ingo.mo -%%INGODIR%%/locale/pt_BR/LC_MESSAGES/ingo.mo -%%INGODIR%%/locale/ro_RO/LC_MESSAGES/ingo.mo -%%INGODIR%%/locale/sv_SE/LC_MESSAGES/ingo.mo -%%INGODIR%%/locale/zh_TW/LC_MESSAGES/ingo.mo -%%INGODIR%%/po/README -%%INGODIR%%/po/cs_CZ.po -%%INGODIR%%/po/de_DE.po -%%INGODIR%%/po/es_ES.po -%%INGODIR%%/po/fi_FI.po -%%INGODIR%%/po/fr_FR.po -%%INGODIR%%/po/hu_HU.po -%%INGODIR%%/po/ingo.pot -%%INGODIR%%/po/it_IT.po -%%INGODIR%%/po/lt_LT.po -%%INGODIR%%/po/nl_NL.po -%%INGODIR%%/po/pl_PL.po -%%INGODIR%%/po/pt_BR.po -%%INGODIR%%/po/ro_RO.po -%%INGODIR%%/po/sv_SE.po -%%INGODIR%%/po/zh_TW.po -%%INGODIR%%/rule.php -%%INGODIR%%/script.php -%%INGODIR%%/scripts/.htaccess -%%INGODIR%%/scripts/convert_imp_filters.php -%%INGODIR%%/templates/blacklist/blacklist.inc -%%INGODIR%%/templates/common-header.inc -%%INGODIR%%/templates/filters/filter-none.inc -%%INGODIR%%/templates/filters/filter.html -%%INGODIR%%/templates/filters/footer.inc -%%INGODIR%%/templates/filters/header.inc -%%INGODIR%%/templates/filters/settings.inc -%%INGODIR%%/templates/forward/forward.inc -%%INGODIR%%/templates/javascript/new_folder.js -%%INGODIR%%/templates/menu.inc -%%INGODIR%%/templates/rule/filter.inc -%%INGODIR%%/templates/rule/footer.inc -%%INGODIR%%/templates/rule/header.inc -%%INGODIR%%/templates/script/activate.inc -%%INGODIR%%/templates/script/footer.inc -%%INGODIR%%/templates/script/header.inc -%%INGODIR%%/templates/script/script.inc -%%INGODIR%%/templates/vacation/vacation.inc -%%INGODIR%%/templates/whitelist/whitelist.inc -%%INGODIR%%/test.php -%%INGODIR%%/themes/graphics/blacklist.png -%%INGODIR%%/themes/graphics/copy.png -%%INGODIR%%/themes/graphics/disable.png -%%INGODIR%%/themes/graphics/enable.png -%%INGODIR%%/themes/graphics/favicon.ico -%%INGODIR%%/themes/graphics/forward.png -%%INGODIR%%/themes/graphics/ingo.png -%%INGODIR%%/themes/graphics/script.png -%%INGODIR%%/themes/graphics/vacation.png -%%INGODIR%%/themes/graphics/whitelist.png -%%INGODIR%%/vacation.php -%%INGODIR%%/whitelist.php -%%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrm %%INGODIR%%/themes/graphics -@dirrm %%INGODIR%%/themes -@dirrm %%INGODIR%%/templates/whitelist -@dirrm %%INGODIR%%/templates/vacation -@dirrm %%INGODIR%%/templates/script -@dirrm %%INGODIR%%/templates/rule -@dirrm %%INGODIR%%/templates/javascript -@dirrm %%INGODIR%%/templates/forward -@dirrm %%INGODIR%%/templates/filters -@dirrm %%INGODIR%%/templates/blacklist -@dirrm %%INGODIR%%/templates -@dirrm %%INGODIR%%/scripts -@dirrm %%INGODIR%%/po -@dirrm %%INGODIR%%/locale/zh_TW/LC_MESSAGES -@dirrm %%INGODIR%%/locale/zh_TW -@dirrm %%INGODIR%%/locale/sv_SE/LC_MESSAGES -@dirrm %%INGODIR%%/locale/sv_SE -@dirrm %%INGODIR%%/locale/ro_RO/LC_MESSAGES -@dirrm %%INGODIR%%/locale/ro_RO -@dirrm %%INGODIR%%/locale/pt_BR/LC_MESSAGES -@dirrm %%INGODIR%%/locale/pt_BR -@dirrm %%INGODIR%%/locale/pl_PL/LC_MESSAGES -@dirrm %%INGODIR%%/locale/pl_PL -@dirrm %%INGODIR%%/locale/nl_NL/LC_MESSAGES -@dirrm %%INGODIR%%/locale/nl_NL -@dirrm %%INGODIR%%/locale/lv_LV -@dirrm %%INGODIR%%/locale/lt_LT/LC_MESSAGES -@dirrm %%INGODIR%%/locale/lt_LT -@dirrm %%INGODIR%%/locale/it_IT/LC_MESSAGES -@dirrm %%INGODIR%%/locale/it_IT -@dirrm %%INGODIR%%/locale/hu_HU/LC_MESSAGES -@dirrm %%INGODIR%%/locale/hu_HU -@dirrm %%INGODIR%%/locale/fr_FR/LC_MESSAGES -@dirrm %%INGODIR%%/locale/fr_FR -@dirrm %%INGODIR%%/locale/fi_FI/LC_MESSAGES -@dirrm %%INGODIR%%/locale/fi_FI -@dirrm %%INGODIR%%/locale/es_ES/LC_MESSAGES -@dirrm %%INGODIR%%/locale/es_ES -@dirrm %%INGODIR%%/locale/en_US -@dirrm %%INGODIR%%/locale/de_DE/LC_MESSAGES -@dirrm %%INGODIR%%/locale/de_DE -@dirrm %%INGODIR%%/locale/cs_CZ/LC_MESSAGES -@dirrm %%INGODIR%%/locale/cs_CZ -@dirrm %%INGODIR%%/locale -@dirrm %%INGODIR%%/lib/Storage -@dirrm %%INGODIR%%/lib/Script -@dirrm %%INGODIR%%/lib/Driver -@dirrm %%INGODIR%%/lib -@unexec rmdir %D/%%INGODIR%%/config 2>/dev/null || true -@unexec rmdir %D/%%INGODIR%% 2>/dev/null || true diff --git a/mail/horde-turba/Makefile b/mail/horde-turba/Makefile deleted file mode 100644 index 2621ef05451f..000000000000 --- a/mail/horde-turba/Makefile +++ /dev/null @@ -1,106 +0,0 @@ -# Ports collection makefile for: turba -# Date created: Sat Nov 16, 2001 -# Whom: Thierry Thomas (<thierry@thomas.as>) -# -# $FreeBSD$ -# - -PORTNAME= turba -PORTVERSION= 2.0.2 -CATEGORIES= mail www -MASTER_SITES= ftp://ftp.horde.org/pub/turba/ \ - ftp://ftp.planetmirror.com/pub/horde/turba/ \ - ftp://ftp.au.horde.org/pub/horde/turba/ \ - ftp://ftp.be.horde.org/turba/ \ - ftp://ftp.es.horde.org/pub/turba/ \ - ftp://ftp.it.horde.org/pub/mirror/horde.org/turba/ \ - ftp://ftp.nl.horde.org/mirror/horde-ftp/pub/turba/ \ - ftp://ftp.uk.horde.org/mirrors/ftp.horde.org/pub/turba/ \ - http://ftp.horde.org/pub/turba/ -DISTNAME= ${PORTNAME}-h3-${PORTVERSION} - -MAINTAINER= thierry@FreeBSD.org -COMMENT= The Horde contact management application - -#----------------------------------------------------------------------- -# You may define this option: -# -# - WITHOUT_LDAP : if you do not need OpenLDAP; -# -# - WITH_IMSP : run IMSP cyrus-imspd. -# -#----------------------------------------------------------------------- - -RUN_DEPENDS+= ${LOCALBASE}/${LHORDEDIR}/rpc.php:${PORTSDIR}/www/horde - -.if !defined(WITHOUT_LDAP) -USE_PHP= ldap -.endif - -NO_BUILD= yes -USE_REINPLACE= yes - -REINPLACE_ARGS= -i "" -DOCS= COPYING README docs/CHANGES docs/CREDITS docs/INSTALL \ - docs/LDAP docs/RELEASE_NOTES docs/TODO docs/UPGRADING -CONFFILE= attributes.php menu.php prefs.php sources.php -SUB_DIRS= config lib locale po scripts templates themes - -LHORDEDIR?= www/horde -LTURBADIR?= ${LHORDEDIR}/turba - -PLIST_SUB= TURBADIR=${LTURBADIR} -PKGMESSAGE= ${WRKDIR}/pkg-message - -TURBADIR= ${PREFIX}/${LTURBADIR} -CONFDIR= ${TURBADIR}/config - -HORDE_INC= ${LOCALBASE}/etc/horde - -.if exists(${LOCALBASE}/sbin/imspd) -WITH_IMSP= yes -.endif -.if defined(WITH_IMSP) -RUN_DEPENDS+= imspd:${PORTSDIR}/databases/cyrus-imspd -.endif - -pre-configure: - @${RM} ${WRKSRC}/config/sources.php.dist.orig - @${SED} -e "s:/home/httpd/html/horde/turba:${TURBADIR}:g" \ - ${FILESDIR}/httpd.conf.turba > ${WRKDIR}/httpd.conf.turba - @${REINPLACE_CMD} -e "s:/usr/bin/ldapadd:${LOCALBASE}/bin/ldapadd:" \ - ${WRKSRC}/scripts/ldap/addou.pl -.if defined(WITH_IMSP) - @${REINPLACE_CMD} -e "s://UNCOMMENTIFIMSP ::" ${WRKSRC}/config/sources.php.dist -.endif - -do-install: - @${MKDIR} ${TURBADIR} -.for REP in ${SUB_DIRS} - @${CP} -Rp ${WRKSRC}/${REP} ${TURBADIR} -.endfor - @${CP} -p ${WRKSRC}/*.php ${TURBADIR} -.for FILE in ${CONFFILE} - @if [ ! -f ${CONFDIR}/${FILE} ]; then \ - ${CP} ${CONFDIR}/${FILE}.dist ${CONFDIR}/${FILE} ; \ - fi -.endfor - @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${TURBADIR} - @${CHMOD} -R o-rwx ${CONFDIR} - @${INSTALL_DATA} ${WRKDIR}/httpd.conf.turba ${HORDE_INC} -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} -.for FILE in ${DOCS} - @${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR} -.endfor - @${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}." -.endif - -post-install: - @${SED} -e "s:%%TURBADIR%%:${TURBADIR}:;s:%%CONFDIR%%:${CONFDIR}:" \ - < ${FILESDIR}/pkg-message.in > ${PKGMESSAGE} - @${ECHO_MSG} - @${CAT} ${PKGMESSAGE} - @${ECHO_MSG} - -.include <bsd.port.mk> diff --git a/mail/horde-turba/distinfo b/mail/horde-turba/distinfo deleted file mode 100644 index 9bc78221e313..000000000000 --- a/mail/horde-turba/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (turba-h3-2.0.2.tar.gz) = e3b04476d9d18f4c9774f5da76a03f22 -SIZE (turba-h3-2.0.2.tar.gz) = 1227556 diff --git a/mail/horde-turba/files/httpd.conf.turba b/mail/horde-turba/files/httpd.conf.turba deleted file mode 100644 index f6674cbb9700..000000000000 --- a/mail/horde-turba/files/httpd.conf.turba +++ /dev/null @@ -1,31 +0,0 @@ -# This is included in Apache's httpd.conf for Turba -# -# For security, don't serve pages from the Turba configuration and -# library directories. -# -<Directory "/home/httpd/html/horde/turba/config"> - order deny,allow - deny from all -</Directory> -<Directory "/home/httpd/html/horde/turba/lib"> - order deny,allow - deny from all -</Directory> -<Directory "/home/httpd/html/horde/turba/locale"> - order deny,allow - deny from all -</Directory> -<Directory "/home/httpd/html/horde/turba/po"> - order deny,allow - deny from all -</Directory> -<Directory "/home/httpd/html/horde/turba/scripts"> - order deny,allow - deny from all -</Directory> -<Directory "/home/httpd/html/horde/turba/templates"> - order deny,allow - deny from all -</Directory> -# End of Turba configuration ================ - diff --git a/mail/horde-turba/files/patch-config::sources.php.dist b/mail/horde-turba/files/patch-config::sources.php.dist deleted file mode 100644 index b3d2dca409fe..000000000000 --- a/mail/horde-turba/files/patch-config::sources.php.dist +++ /dev/null @@ -1,137 +0,0 @@ ---- config/sources.php.dist.orig Tue Feb 8 21:43:47 2005 -+++ config/sources.php.dist Sun Feb 13 15:54:12 2005 -@@ -454,72 +454,72 @@ - * automatically populated with the current username. - */ - // First, get the user name --$uid = $GLOBALS['prefs']->getValue('imsp_auth_user'); --$pass = $GLOBALS['prefs']->getValue('imsp_auth_pass'); --if (!strlen($uid)) { -- $uid = Auth::getAuth(); -- if (preg_match('/(^.*)@/', $uid, $matches)) { -- $uid = $matches[1]; -- } -- $pass = Auth::getCredential('password'); --} -- --$cfgSources['imsp'] = array( -- 'title' => _("IMSP"), -- 'type' => 'imsp', -- 'params' => array( -- 'server' => 'localhost', -- 'port' => '406', -- 'username' => $uid, -- 'password' => $pass, -- 'name' => $uid, -- 'auth_method' => 'cram_md5', -- 'group_id_field' => 'group', -- 'group_id_value' => 'group', -- 'contact_ownership' => false -- ), -- 'map' => array( -- '__key' => 'name', -- '__type' => '__type', -- '__members' => '__members', -- '__owner' => '__owner', -- '__uid' => '__uid', -- 'name' => 'fullname', -- 'email' => 'email', -- 'alias' => 'alias', -- 'company' => 'company', -- 'notes' => 'notes', -- 'workPhone' => 'phone-work', -- 'fax' => 'fax', -- 'homePhone' => 'phone-home', -- 'cellPhone' => 'cellphone', -- 'freebusyUrl' => 'freebusyUrl' -- ), -- 'search' => array( -- 'name', -- 'email', -- 'alias', -- 'company', -- 'homePhone' -- ), -- 'strict' => array(), -- 'public' => false, -- 'readonly' => false, -- 'export' => true -- ); -+//UNCOMMENTIFIMSP $uid = $GLOBALS['prefs']->getValue('imsp_auth_user'); -+//UNCOMMENTIFIMSP $pass = $GLOBALS['prefs']->getValue('imsp_auth_pass'); -+//UNCOMMENTIFIMSP if (!strlen($uid)) { -+//UNCOMMENTIFIMSP $uid = Auth::getAuth(); -+//UNCOMMENTIFIMSP if (preg_match('/(^.*)@/', $uid, $matches)) { -+//UNCOMMENTIFIMSP $uid = $matches[1]; -+//UNCOMMENTIFIMSP } -+//UNCOMMENTIFIMSP $pass = Auth::getCredential('password'); -+//UNCOMMENTIFIMSP } -+//UNCOMMENTIFIMSP -+//UNCOMMENTIFIMSP $cfgSources['imsp'] = array( -+//UNCOMMENTIFIMSP 'title' => _("IMSP"), -+//UNCOMMENTIFIMSP 'type' => 'imsp', -+//UNCOMMENTIFIMSP 'params' => array( -+//UNCOMMENTIFIMSP 'server' => 'localhost', -+//UNCOMMENTIFIMSP 'port' => '406', -+//UNCOMMENTIFIMSP 'username' => $uid, -+//UNCOMMENTIFIMSP 'password' => $pass, -+//UNCOMMENTIFIMSP 'name' => $uid, -+//UNCOMMENTIFIMSP 'auth_method' => 'cram_md5', -+//UNCOMMENTIFIMSP 'group_id_field' => 'group', -+//UNCOMMENTIFIMSP 'group_id_value' => 'group', -+//UNCOMMENTIFIMSP 'contact_ownership' => false -+//UNCOMMENTIFIMSP ), -+//UNCOMMENTIFIMSP 'map' => array( -+//UNCOMMENTIFIMSP '__key' => 'name', -+//UNCOMMENTIFIMSP '__type' => '__type', -+//UNCOMMENTIFIMSP '__members' => '__members', -+//UNCOMMENTIFIMSP '__owner' => '__owner', -+//UNCOMMENTIFIMSP '__uid' => '__uid', -+//UNCOMMENTIFIMSP 'name' => 'fullname', -+//UNCOMMENTIFIMSP 'email' => 'email', -+//UNCOMMENTIFIMSP 'alias' => 'alias', -+//UNCOMMENTIFIMSP 'company' => 'company', -+//UNCOMMENTIFIMSP 'notes' => 'notes', -+//UNCOMMENTIFIMSP 'workPhone' => 'phone-work', -+//UNCOMMENTIFIMSP 'fax' => 'fax', -+//UNCOMMENTIFIMSP 'homePhone' => 'phone-home', -+//UNCOMMENTIFIMSP 'cellPhone' => 'cellphone', -+//UNCOMMENTIFIMSP 'freebusyUrl' => 'freebusyUrl' -+//UNCOMMENTIFIMSP ), -+//UNCOMMENTIFIMSP 'search' => array( -+//UNCOMMENTIFIMSP 'name', -+//UNCOMMENTIFIMSP 'email', -+//UNCOMMENTIFIMSP 'alias', -+//UNCOMMENTIFIMSP 'company', -+//UNCOMMENTIFIMSP 'homePhone' -+//UNCOMMENTIFIMSP ), -+//UNCOMMENTIFIMSP 'strict' => array(), -+//UNCOMMENTIFIMSP 'public' => false, -+//UNCOMMENTIFIMSP 'readonly' => false, -+//UNCOMMENTIFIMSP 'export' => true -+//UNCOMMENTIFIMSP ); - - /** - * Get any other addressbooks this user might be privy to. - */ --require_once 'Net/IMSP/Utils.php'; --$result = Net_IMSP_Utils::getAllBooks($cfgSources['imsp']); --if (!is_a($result, 'PEAR_Error')) { -- for ($i = 0; $i < count($result); $i++) { -- $cfgSources[sprintf('imsp%d', $i + 1)] = $result[$i]; -- } --} else { -- $notification->push($result); --} -+//UNCOMMENTIFIMSP require_once 'Net/IMSP/Utils.php'; -+//UNCOMMENTIFIMSP $result = Net_IMSP_Utils::getAllBooks($cfgSources['imsp']); -+//UNCOMMENTIFIMSP if (!is_a($result, 'PEAR_Error')) { -+//UNCOMMENTIFIMSP for ($i = 0; $i < count($result); $i++) { -+//UNCOMMENTIFIMSP $cfgSources[sprintf('imsp%d', $i + 1)] = $result[$i]; -+//UNCOMMENTIFIMSP } -+//UNCOMMENTIFIMSP } else { -+//UNCOMMENTIFIMSP $notification->push($result); -+//UNCOMMENTIFIMSP } - - /* Begin Kolab sources. */ - if (!empty($GLOBALS['conf']['kolab']['enabled'])) { diff --git a/mail/horde-turba/files/pkg-message.in b/mail/horde-turba/files/pkg-message.in deleted file mode 100644 index f7347f3f3413..000000000000 --- a/mail/horde-turba/files/pkg-message.in +++ /dev/null @@ -1,21 +0,0 @@ -************************************************************************ -Turba has been installed in %%TURBADIR%% with your blank -configuration files. - -Horde must be configured; if not, see `pkg_info -D -x horde'. - -Then, you might have to tune the configuration files located in -%%CONFDIR%%/, specially the file sources.php. - -Then, you must login to Horde as a Horde Administrator to finish the -configuration. - -You have to create a table in your database; please see -%%TURBADIR%%/scripts/. -You might create a LDAP schema: please see the doc LDAP. - -WARNING! if you are upgrading from Turba v. 1.2.x, you have to alter your -******** schemas. Please read the doc UPGRADING. - -To protect your configuration files, you have to restart Apache. -************************************************************************ diff --git a/mail/horde-turba/pkg-deinstall b/mail/horde-turba/pkg-deinstall deleted file mode 100644 index b0a141eef091..000000000000 --- a/mail/horde-turba/pkg-deinstall +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# -# Backup Turba config files, if needed. - -if [ x$2 != xDEINSTALL ]; then - exit -fi - -if [ -z "${PACKAGE_BUILDING}" ]; then - for cf in `ls ${PKG_PREFIX}/www/horde/turba/config/*php`; do - diff -bBqw $cf $cf.dist >/dev/null 2>&1 - case $? in - 0) # original config file, will be deleted by pkg-plist - ;; - 1) # config file has been updated, must be backuped - cp -p $cf $cf.previous - echo "===> Backing-up..." - echo "---> $cf has been saved ***" - echo "---> as $cf.previous ***" - ;; - *) # not found? - ;; - esac - done -fi diff --git a/mail/horde-turba/pkg-descr b/mail/horde-turba/pkg-descr deleted file mode 100644 index 7ad5e825db08..000000000000 --- a/mail/horde-turba/pkg-descr +++ /dev/null @@ -1,10 +0,0 @@ -Turba is the Horde contact management application. It makes heavy use -of the Horde framework to provide integration with other applications. - -Turba is a fairly complete basic contact management application. -SQL and LDAP backends are available. -You can define the fields in your addressbooks in a very flexible way, -just by changing the config files. -And there are Horde API functions to add and search for contacts. - -WWW: http://horde.org/turba/ diff --git a/mail/horde-turba/pkg-plist b/mail/horde-turba/pkg-plist deleted file mode 100644 index cbcd497949cb..000000000000 --- a/mail/horde-turba/pkg-plist +++ /dev/null @@ -1,266 +0,0 @@ -%%PORTDOCS%%%%DOCSDIR%%/CHANGES -%%PORTDOCS%%%%DOCSDIR%%/COPYING -%%PORTDOCS%%%%DOCSDIR%%/CREDITS -%%PORTDOCS%%%%DOCSDIR%%/INSTALL -%%PORTDOCS%%%%DOCSDIR%%/LDAP -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES -%%PORTDOCS%%%%DOCSDIR%%/TODO -%%PORTDOCS%%%%DOCSDIR%%/UPGRADING -%%TURBADIR%%/add.php -%%TURBADIR%%/browse.php -%%TURBADIR%%/config/.htaccess -%%TURBADIR%%/config/attributes.php -%%TURBADIR%%/config/attributes.php.dist -%%TURBADIR%%/config/conf.xml -%%TURBADIR%%/config/menu.php -%%TURBADIR%%/config/menu.php.dist -%%TURBADIR%%/config/prefs.php -%%TURBADIR%%/config/prefs.php.dist -%%TURBADIR%%/config/sources.php -%%TURBADIR%%/config/sources.php.dist -%%TURBADIR%%/data.php -%%TURBADIR%%/delete.php -%%TURBADIR%%/display.php -%%TURBADIR%%/edit.php -%%TURBADIR%%/index.php -%%TURBADIR%%/lib/.htaccess -%%TURBADIR%%/lib/AbstractObject.php -%%TURBADIR%%/lib/Block/minisearch.php -%%TURBADIR%%/lib/Driver.php -%%TURBADIR%%/lib/Driver/imsp.php -%%TURBADIR%%/lib/Driver/kolab.php -%%TURBADIR%%/lib/Driver/ldap.php -%%TURBADIR%%/lib/Driver/prefs.php -%%TURBADIR%%/lib/Driver/sql.php -%%TURBADIR%%/lib/Group.php -%%TURBADIR%%/lib/List.php -%%TURBADIR%%/lib/List/Plain.php -%%TURBADIR%%/lib/List/Tree.php -%%TURBADIR%%/lib/ListView.php -%%TURBADIR%%/lib/ListView/Rolodex.php -%%TURBADIR%%/lib/ListView/Tree.php -%%TURBADIR%%/lib/Object.php -%%TURBADIR%%/lib/ObjectView.php -%%TURBADIR%%/lib/ObjectView/List.php -%%TURBADIR%%/lib/ObjectView/PhotoID.php -%%TURBADIR%%/lib/Renderer.php -%%TURBADIR%%/lib/Turba.php -%%TURBADIR%%/lib/api.php -%%TURBADIR%%/lib/base.php -%%TURBADIR%%/lib/prefs.php -%%TURBADIR%%/lib/version.php -%%TURBADIR%%/locale/.htaccess -%%TURBADIR%%/locale/ar_SY/LC_MESSAGES/turba.mo -%%TURBADIR%%/locale/bg_BG/LC_MESSAGES/turba.mo -%%TURBADIR%%/locale/ca_ES/LC_MESSAGES/turba.mo -%%TURBADIR%%/locale/cs_CZ/LC_MESSAGES/turba.mo -%%TURBADIR%%/locale/da_DK/LC_MESSAGES/turba.mo -%%TURBADIR%%/locale/de_DE/LC_MESSAGES/turba.mo -%%TURBADIR%%/locale/de_DE/help.xml -%%TURBADIR%%/locale/el_GR/LC_MESSAGES/turba.mo -%%TURBADIR%%/locale/en_US/help.xml -%%TURBADIR%%/locale/es_ES/LC_MESSAGES/turba.mo -%%TURBADIR%%/locale/es_ES/help.xml -%%TURBADIR%%/locale/et_EE/LC_MESSAGES/turba.mo -%%TURBADIR%%/locale/fa_IR/LC_MESSAGES/turba.mo -%%TURBADIR%%/locale/fi_FI/LC_MESSAGES/turba.mo -%%TURBADIR%%/locale/fi_FI/help.xml -%%TURBADIR%%/locale/fr_FR/LC_MESSAGES/turba.mo -%%TURBADIR%%/locale/gl_ES/LC_MESSAGES/turba.mo -%%TURBADIR%%/locale/hu_HU/LC_MESSAGES/turba.mo -%%TURBADIR%%/locale/it_IT/LC_MESSAGES/turba.mo -%%TURBADIR%%/locale/ja_JP/LC_MESSAGES/turba.mo -%%TURBADIR%%/locale/ko_KR/LC_MESSAGES/turba.mo -%%TURBADIR%%/locale/lt_LT/LC_MESSAGES/turba.mo -%%TURBADIR%%/locale/lv_LV/LC_MESSAGES/turba.mo -%%TURBADIR%%/locale/mk_MK/LC_MESSAGES/turba.mo -%%TURBADIR%%/locale/nb_NO/LC_MESSAGES/turba.mo -%%TURBADIR%%/locale/nl_NL/LC_MESSAGES/turba.mo -%%TURBADIR%%/locale/nn_NO/LC_MESSAGES/turba.mo -%%TURBADIR%%/locale/pl_PL/LC_MESSAGES/turba.mo -%%TURBADIR%%/locale/pt_BR/LC_MESSAGES/turba.mo -%%TURBADIR%%/locale/pt_BR/help.xml -%%TURBADIR%%/locale/pt_PT/LC_MESSAGES/turba.mo -%%TURBADIR%%/locale/pt_PT/help.xml -%%TURBADIR%%/locale/ro_RO/LC_MESSAGES/turba.mo -%%TURBADIR%%/locale/ru_RU/LC_MESSAGES/turba.mo -%%TURBADIR%%/locale/sk_SK/LC_MESSAGES/turba.mo -%%TURBADIR%%/locale/sk_SK/help.xml -%%TURBADIR%%/locale/sl_SI/LC_MESSAGES/turba.mo -%%TURBADIR%%/locale/sv_SE/LC_MESSAGES/turba.mo -%%TURBADIR%%/locale/uk_UA/LC_MESSAGES/turba.mo -%%TURBADIR%%/locale/zh_CN/LC_MESSAGES/turba.mo -%%TURBADIR%%/locale/zh_TW/LC_MESSAGES/turba.mo -%%TURBADIR%%/minisearch.php -%%TURBADIR%%/po/.htaccess -%%TURBADIR%%/po/README -%%TURBADIR%%/po/ar_SY.po -%%TURBADIR%%/po/bg_BG.po -%%TURBADIR%%/po/ca_ES.po -%%TURBADIR%%/po/cs_CZ.po -%%TURBADIR%%/po/da_DK.po -%%TURBADIR%%/po/de_DE.po -%%TURBADIR%%/po/el_GR.po -%%TURBADIR%%/po/es_ES.po -%%TURBADIR%%/po/et_EE.po -%%TURBADIR%%/po/fa_IR.po -%%TURBADIR%%/po/fi_FI.po -%%TURBADIR%%/po/fr_FR.po -%%TURBADIR%%/po/gl_ES.po -%%TURBADIR%%/po/hu_HU.po -%%TURBADIR%%/po/it_IT.po -%%TURBADIR%%/po/ja_JP.po -%%TURBADIR%%/po/ko_KR.po -%%TURBADIR%%/po/lt_LT.po -%%TURBADIR%%/po/lv_LV.po -%%TURBADIR%%/po/mk_MK.po -%%TURBADIR%%/po/nb_NO.po -%%TURBADIR%%/po/nl_NL.po -%%TURBADIR%%/po/nn_NO.po -%%TURBADIR%%/po/pl_PL.po -%%TURBADIR%%/po/pt_BR.po -%%TURBADIR%%/po/pt_PT.po -%%TURBADIR%%/po/ro_RO.po -%%TURBADIR%%/po/ru_RU.po -%%TURBADIR%%/po/sk_SK.po -%%TURBADIR%%/po/sl_SI.po -%%TURBADIR%%/po/sv_SE.po -%%TURBADIR%%/po/turba.pot -%%TURBADIR%%/po/uk_UA.po -%%TURBADIR%%/po/zh_CN.po -%%TURBADIR%%/po/zh_TW.po -%%TURBADIR%%/scripts/.htaccess -%%TURBADIR%%/scripts/Turba.reg -%%TURBADIR%%/scripts/ldap/addou -%%TURBADIR%%/scripts/ldap/addou.pl -%%TURBADIR%%/scripts/ldap/core.schema.patch -%%TURBADIR%%/scripts/ldap/rfc2739.schema -%%TURBADIR%%/scripts/sql/turba_objects.mysql.sql -%%TURBADIR%%/scripts/sql/turba_objects.oci8.sql -%%TURBADIR%%/scripts/sql/turba_objects.pgsql.sql -%%TURBADIR%%/scripts/sql/turba_objects.sql -%%TURBADIR%%/scripts/sql/turba_weddingguests.sql -%%TURBADIR%%/scripts/upgrades/1.2_to_2.0.mysql.sql -%%TURBADIR%%/scripts/upgrades/2004-10-26_create_default_histories.php -%%TURBADIR%%/search.php -%%TURBADIR%%/templates/.htaccess -%%TURBADIR%%/templates/block/minisearch.inc -%%TURBADIR%%/templates/browse/actions.inc -%%TURBADIR%%/templates/browse/column_footers.inc -%%TURBADIR%%/templates/browse/column_headers.inc -%%TURBADIR%%/templates/browse/contactrow.inc -%%TURBADIR%%/templates/browse/footer.inc -%%TURBADIR%%/templates/browse/footerAlpha.inc -%%TURBADIR%%/templates/browse/header.inc -%%TURBADIR%%/templates/browse/javascript.inc -%%TURBADIR%%/templates/browse/search.inc -%%TURBADIR%%/templates/browse/search_criteria.inc -%%TURBADIR%%/templates/browse/select.inc -%%TURBADIR%%/templates/common-header.inc -%%TURBADIR%%/templates/data/export.inc -%%TURBADIR%%/templates/data/import.inc -%%TURBADIR%%/templates/menu.inc -%%TURBADIR%%/templates/prefs/columnselect.inc -%%TURBADIR%%/test.php -%%TURBADIR%%/themes/graphics/contact.png -%%TURBADIR%%/themes/graphics/group.png -%%TURBADIR%%/themes/graphics/menu/browse.png -%%TURBADIR%%/themes/graphics/menu/new.png -%%TURBADIR%%/themes/graphics/new.png -%%TURBADIR%%/themes/graphics/turba.png -%%TURBADIR%%/themes/screen.css -%%TURBADIR%%/vcard.php -etc/horde/httpd.conf.turba -%%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrm %%TURBADIR%%/lib/Block -@dirrm %%TURBADIR%%/lib/Driver -@dirrm %%TURBADIR%%/lib/List -@dirrm %%TURBADIR%%/lib/ListView -@dirrm %%TURBADIR%%/lib/ObjectView -@dirrm %%TURBADIR%%/lib -@dirrm %%TURBADIR%%/locale/ar_SY/LC_MESSAGES -@dirrm %%TURBADIR%%/locale/ar_SY -@dirrm %%TURBADIR%%/locale/bg_BG/LC_MESSAGES -@dirrm %%TURBADIR%%/locale/bg_BG -@dirrm %%TURBADIR%%/locale/ca_ES/LC_MESSAGES -@dirrm %%TURBADIR%%/locale/ca_ES -@dirrm %%TURBADIR%%/locale/cs_CZ/LC_MESSAGES -@dirrm %%TURBADIR%%/locale/cs_CZ -@dirrm %%TURBADIR%%/locale/da_DK/LC_MESSAGES -@dirrm %%TURBADIR%%/locale/da_DK -@dirrm %%TURBADIR%%/locale/de_DE/LC_MESSAGES -@dirrm %%TURBADIR%%/locale/de_DE -@dirrm %%TURBADIR%%/locale/el_GR/LC_MESSAGES -@dirrm %%TURBADIR%%/locale/el_GR -@dirrm %%TURBADIR%%/locale/en_US -@dirrm %%TURBADIR%%/locale/es_ES/LC_MESSAGES -@dirrm %%TURBADIR%%/locale/es_ES -@dirrm %%TURBADIR%%/locale/et_EE/LC_MESSAGES -@dirrm %%TURBADIR%%/locale/et_EE -@dirrm %%TURBADIR%%/locale/fa_IR/LC_MESSAGES -@dirrm %%TURBADIR%%/locale/fa_IR -@dirrm %%TURBADIR%%/locale/fi_FI/LC_MESSAGES -@dirrm %%TURBADIR%%/locale/fi_FI -@dirrm %%TURBADIR%%/locale/fr_FR/LC_MESSAGES -@dirrm %%TURBADIR%%/locale/fr_FR -@dirrm %%TURBADIR%%/locale/gl_ES/LC_MESSAGES -@dirrm %%TURBADIR%%/locale/gl_ES -@dirrm %%TURBADIR%%/locale/hu_HU/LC_MESSAGES -@dirrm %%TURBADIR%%/locale/hu_HU -@dirrm %%TURBADIR%%/locale/it_IT/LC_MESSAGES -@dirrm %%TURBADIR%%/locale/it_IT -@dirrm %%TURBADIR%%/locale/ja_JP/LC_MESSAGES -@dirrm %%TURBADIR%%/locale/ja_JP -@dirrm %%TURBADIR%%/locale/ko_KR/LC_MESSAGES -@dirrm %%TURBADIR%%/locale/ko_KR -@dirrm %%TURBADIR%%/locale/lt_LT/LC_MESSAGES -@dirrm %%TURBADIR%%/locale/lt_LT -@dirrm %%TURBADIR%%/locale/lv_LV/LC_MESSAGES -@dirrm %%TURBADIR%%/locale/lv_LV -@dirrm %%TURBADIR%%/locale/mk_MK/LC_MESSAGES -@dirrm %%TURBADIR%%/locale/mk_MK -@dirrm %%TURBADIR%%/locale/nb_NO/LC_MESSAGES -@dirrm %%TURBADIR%%/locale/nb_NO -@dirrm %%TURBADIR%%/locale/nl_NL/LC_MESSAGES -@dirrm %%TURBADIR%%/locale/nl_NL -@dirrm %%TURBADIR%%/locale/nn_NO/LC_MESSAGES -@dirrm %%TURBADIR%%/locale/nn_NO -@dirrm %%TURBADIR%%/locale/pl_PL/LC_MESSAGES -@dirrm %%TURBADIR%%/locale/pl_PL -@dirrm %%TURBADIR%%/locale/pt_BR/LC_MESSAGES -@dirrm %%TURBADIR%%/locale/pt_BR -@dirrm %%TURBADIR%%/locale/pt_PT/LC_MESSAGES -@dirrm %%TURBADIR%%/locale/pt_PT -@dirrm %%TURBADIR%%/locale/ro_RO/LC_MESSAGES -@dirrm %%TURBADIR%%/locale/ro_RO -@dirrm %%TURBADIR%%/locale/ru_RU/LC_MESSAGES -@dirrm %%TURBADIR%%/locale/ru_RU -@dirrm %%TURBADIR%%/locale/sk_SK/LC_MESSAGES -@dirrm %%TURBADIR%%/locale/sk_SK -@dirrm %%TURBADIR%%/locale/sl_SI/LC_MESSAGES -@dirrm %%TURBADIR%%/locale/sl_SI -@dirrm %%TURBADIR%%/locale/sv_SE/LC_MESSAGES -@dirrm %%TURBADIR%%/locale/sv_SE -@dirrm %%TURBADIR%%/locale/uk_UA/LC_MESSAGES -@dirrm %%TURBADIR%%/locale/uk_UA -@dirrm %%TURBADIR%%/locale/zh_CN/LC_MESSAGES -@dirrm %%TURBADIR%%/locale/zh_CN -@dirrm %%TURBADIR%%/locale/zh_TW/LC_MESSAGES -@dirrm %%TURBADIR%%/locale/zh_TW -@dirrm %%TURBADIR%%/locale -@dirrm %%TURBADIR%%/po -@dirrm %%TURBADIR%%/scripts/ldap -@dirrm %%TURBADIR%%/scripts/sql -@dirrm %%TURBADIR%%/scripts/upgrades -@dirrm %%TURBADIR%%/scripts -@dirrm %%TURBADIR%%/templates/block -@dirrm %%TURBADIR%%/templates/browse -@dirrm %%TURBADIR%%/templates/data -@dirrm %%TURBADIR%%/templates/prefs -@dirrm %%TURBADIR%%/templates -@dirrm %%TURBADIR%%/themes/graphics/menu -@dirrm %%TURBADIR%%/themes/graphics -@dirrm %%TURBADIR%%/themes -@unexec rmdir %D/%%TURBADIR%%/config 2>/dev/null || true -@unexec rmdir %D/%%TURBADIR%% 2>/dev/null || true diff --git a/mail/horde4-imp/Makefile b/mail/horde4-imp/Makefile deleted file mode 100644 index 62de9a6325a7..000000000000 --- a/mail/horde4-imp/Makefile +++ /dev/null @@ -1,246 +0,0 @@ -# Ports collection makefile for: imp3 -# Date created: Mon Oct 08, 2001 -# Whom: Thierry Thomas (<thierry@thomas.as>) -# -# $FreeBSD$ -# - -PORTNAME= imp -PORTVERSION= 4.0.3 -CATEGORIES= mail www -MASTER_SITES= ftp://ftp.horde.org/pub/imp/ \ - ftp://ftp.planetmirror.com/pub/horde/imp/ \ - ftp://ftp.au.horde.org/pub/horde/imp/ \ - ftp://ftp.be.horde.org/imp/ \ - ftp://ftp.es.horde.org/pub/imp/ \ - http://ftp.horde.org/pub/imp/ -DISTNAME= ${PORTNAME}-h3-${PORTVERSION} - -MAINTAINER= thierry@FreeBSD.org -COMMENT= A webmail system which accesses mail over IMAP - -#----------------------------------------------------------------------- -# You may define these options: -# -# - WITHOUT_LDAP : if you do not need OpenLDAP; -# -# - WITHOUT_SMIME : disable S/MIME; -# -# - WITHOUT_SUPPORTED_DB: if you run a database not in the ports tree; -# -# - WITHOUT_ASPELL : for spelling bees... -# -# - WITH_ISPELL : if you prefer ispell; -# -# - NOCRYPT : if crypto is restricted in your country; -# -# - WITHOUT_SSL : if you have not installed c-client WITH_SSL; -# -# - WITH_VALID_CERT : if you own a valid SSL certificate; -# -# - WITHOUT_INGO : if you don't need filters management; -# -# - WITHOUT_NAG : if you don't want tasks management; -# -# - WITHOUT_TURBA : if you do not want adressbooks; -# -# - WITH_HTML : enable HTML composition mode; -# -# - WITHOUT_IMAPSERVER : if your IMAP server runs on another machine; -# -# or you can select to work with one of these servers: -# -# - WITH_CYRUS-IMAPD : IMP will work with cyrus-imapd; -# -# - WITH_IMAP-UW : IMP will work with imap-uw; -# -# - WITH_DOVECOT : IMP will work with dovecot; -# -# - WITH_COURIER-IMAP : IMP will work with courier-imap. -# -# These choices are mutually exclusive, and imap-uw is the default. -# -#----------------------------------------------------------------------- - -RUN_DEPENDS+= ${PEARDIR}/Auth/SASL.php:${PORTSDIR}/security/pear-Auth_SASL - -CONFLICTS= imp-3.* - -USE_PHP= imap -.if defined(WITHOUT_TURBA) -. if !defined(WITHOUT_LDAP) -USE_PHP+= ldap -. endif -RUN_DEPENDS+= ${LOCALBASE}/${LHORDEDIR}/rpc.php:${PORTSDIR}/www/horde -.else -RUN_DEPENDS+= ${LOCALBASE}/${LHORDEDIR}/turba/minisearch.php:${PORTSDIR}/mail/turba -.endif - -.if !defined(WITHOUT_INGO) -RUN_DEPENDS+= ${LOCALBASE}/${LHORDEDIR}/ingo/filters.php:${PORTSDIR}/mail/ingo -.endif - -.if !defined(WITHOUT_NAG) -RUN_DEPENDS+= ${LOCALBASE}/${LHORDEDIR}/nag/data.php:${PORTSDIR}/deskutils/nag -.endif - -.if !defined(WITHOUT_SMIME) -USE_PHP+= openssl -.endif - -.if !defined(NOCRYPT) -RUN_DEPENDS+= ${LOCALBASE}/bin/gpg:${PORTSDIR}/security/gnupg -.endif - -.if !defined(WITHOUT_ASPELL) -RUN_DEPENDS+= ${LOCALBASE}/bin/aspell:${PORTSDIR}/textproc/aspell -.elif defined(WITH_ISPELL) -RUN_DEPENDS+= ${LOCALBASE}/bin/ispell:${PORTSDIR}/textproc/ispell -.endif - -.if defined(WITH_HTML) -RUN_DEPENDS+= ${PEARDIR}/HTTP/Request.php:${PORTSDIR}/www/pear-HTTP_Request -.endif - -NO_BUILD= yes -USE_REINPLACE= yes -REINPLACE_ARGS= -i.beforeIMP - -DOCS= COPYING README docs/CHANGES docs/CREDITS docs/INSTALL \ - docs/RELEASE_NOTES docs/TODO docs/UPGRADING -CONFFILE= filter.txt header.txt menu.php mime_drivers.php motd.php \ - prefs.php servers.php trailer.txt -SUB_DIRS= config lib locale po scripts templates themes - -LHORDEDIR?= www/horde -LIMPDIR= ${LHORDEDIR}/imp -PEARDIR?= ${LOCALBASE}/share/pear - -PLIST_SUB= IMPDIR=${LIMPDIR} -SUB_LIST= IMPDIR=${IMPDIR} PORTSDIR=${PORTSDIR} CONFDIR=${CONFDIR} - -PKGMESSAGE= ${WRKDIR}/pkg-message -SUB_FILES= pkg-message - -IMPDIR= ${PREFIX}/${LIMPDIR} -CONFDIR= ${IMPDIR}/config - -HORDE_INC= ${LOCALBASE}/etc/horde - -HOSTNAME?= `/bin/hostname` -SERVOS?= ${OPSYS}-${OSREL} - -PORTREV_H?= ${LOCALBASE}/include/c-client/portrevision.h - -PATCH2RM= prefs.php.dist.orig servers.php.dist.orig conf.xml.orig \ - conf.xml.beforeIMP servers.php.dist.beforeIMP - -.include <bsd.port.pre.mk> - -# I have no report about the support of dkimap4 by IMP, -# but I shall be happy to add it if someone report success with it. -# If an IMAP server is already installed, we just record the dependence, -# else we shall install imap-uw. -# IMAP servers are ordered according to my tastes, if several are -# installed, we just record the first one. -.if !defined(WITHOUT_IMAPSERVER) -. if defined(WITH_IMAP-UW) || exists(${LOCALBASE}/libexec/imapd) -RUN_DEPENDS+= ${LOCALBASE}/libexec/imapd:${PORTSDIR}/mail/imap-uw -. elif defined(WITH_CYRUS-IMAPD) || exists(${LOCALBASE}/lib/libacap.a) -RUN_DEPENDS+= ${LOCALBASE}/lib/libacap.a:${PORTSDIR}/mail/cyrus-imapd2 -. elif defined(WITH_COURIER-IMAP) || exists(${LOCALBASE}/bin/deliverquota) -RUN_DEPENDS+= ${LOCALBASE}/bin/deliverquota:${PORTSDIR}/mail/courier-imap -. elif defined(WITH_DOVECOT) || exists(${LOCALBASE}/libexec/dovecot/imap) -RUN_DEPENDS+= ${LOCALBASE}/libexec/dovecot/imap:${PORTSDIR}/mail/dovecot -. else -RUN_DEPENDS+= ${LOCALBASE}/libexec/imapd:${PORTSDIR}/mail/imap-uw -. endif -.endif - -pre-everything:: -.if !defined(WITHOUT_IMAPSERVER) - @${ECHO_MSG} "" - @${ECHO_MSG} "Press CTRL-C and define WITHOUT_IMAPSERVER" - @${ECHO_MSG} "if you intend to run an IMAP server on an other machine." - @${ECHO_MSG} "" -.endif - -pre-configure: - @${REINPLACE_CMD} -e "s:/usr/local:${LOCALBASE}:" ${WRKSRC}/config/conf.xml -.if !defined(WITHOUT_ASPELL) - @${REINPLACE_CMD} -e "s:%%ASPELL%%:${LOCALBASE}/bin/aspell:" \ - ${WRKSRC}/config/conf.xml -.elif defined(WITH_ISPELL) - @${REINPLACE_CMD} -e "s:%%ASPELL%%:${LOCALBASE}/bin/ispell:" \ - ${WRKSRC}/config/conf.xml -.else - @${REINPLACE_CMD} -e "s:%%ASPELL%%::" ${WRKSRC}/config/conf.xml -.endif -.if !defined(NOCRYPT) - @${REINPLACE_CMD} -e "s:%%GPG%%:${LOCALBASE}/bin/gpg:" \ - ${WRKSRC}/config/conf.xml -.else - @${REINPLACE_CMD} -e "s:%%GPG%%::" ${WRKSRC}/config/conf.xml -.endif - @${REINPLACE_CMD} -e "s:IMP_VERSION:IMP_VERSION . ' / ${SERVOS}':" \ - ${WRKSRC}/lib/MIME/Headers.php - @${REINPLACE_CMD} -e "s:example.com:${HOSTNAME}:g" \ - ${WRKSRC}/config/servers.php.dist -.if defined(WITHOUT_SSL) - @${REINPLACE_CMD} -e "s:%%PROTOCOL%%:imap/notls:;s:%%IMAPPORT%%:143:" \ - ${WRKSRC}/config/servers.php.dist -.else - @${REINPLACE_CMD} -e "s:%%IMAPPORT%%:993:" ${WRKSRC}/config/servers.php.dist -. if defined(WITH_VALID_CERT) - @${REINPLACE_CMD} -e "s:%%PROTOCOL%%:imap/ssl:" ${WRKSRC}/config/servers.php.dist -. else - @${REINPLACE_CMD} -e "s:%%PROTOCOL%%:imap/ssl/novalidate-cert:" \ - ${WRKSRC}/config/servers.php.dist -. endif -.endif - @${SED} -e "s:/home/httpd/html/horde/imp:${IMPDIR}:" \ - ${FILESDIR}/httpd.conf.imp > ${WRKDIR}/httpd.conf.imp -.for fc in ${PATCH2RM} - @${RM} ${WRKSRC}/config/${fc} -.endfor - @${RM} ${WRKSRC}/lib/MIME/Headers.php.beforeIMP - -pre-install: -.if !defined(BATCH) && !defined(WITHOUT_SSL) - @if ! ${GREP} -q -e 'CCLIENT_SSLENABLED "yes"' ${PORTREV_H}; then \ - ${ECHO_MSG} "" ; \ - ${ECHO_MSG} "Please configure c-client with SSL support." ; \ - ${ECHO_MSG} "" ; \ - ${FALSE} ; \ - fi -.endif - -do-install: - @${MKDIR} ${IMPDIR} -.for REP in ${SUB_DIRS} - @${CP} -Rp ${WRKSRC}/${REP} ${IMPDIR} -.endfor - @${CP} -p ${WRKSRC}/*.php ${IMPDIR} -.for FILE in ${CONFFILE} - @if [ ! -f ${CONFDIR}/${FILE} ]; then \ - ${CP} ${CONFDIR}/${FILE}.dist ${CONFDIR}/${FILE} ; \ - fi -.endfor - @${INSTALL_DATA} ${WRKSRC}/config/conf.xml ${CONFDIR} - @${INSTALL_DATA} ${WRKDIR}/httpd.conf.imp ${HORDE_INC} - @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${IMPDIR} - @${CHMOD} -R o-rwx ${CONFDIR} -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} -.for FILE in ${DOCS} - @${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR} -.endfor - @${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}." -.endif - -post-install: - @${ECHO_MSG} - @${CAT} ${PKGMESSAGE} - @${ECHO_MSG} - -.include <bsd.port.post.mk> diff --git a/mail/horde4-imp/distinfo b/mail/horde4-imp/distinfo deleted file mode 100644 index f02a82afb2d8..000000000000 --- a/mail/horde4-imp/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (imp-h3-4.0.3.tar.gz) = 42e7232663f65c2edf5e5bb8c85e84f9 -SIZE (imp-h3-4.0.3.tar.gz) = 3060914 diff --git a/mail/horde4-imp/files/httpd.conf.imp b/mail/horde4-imp/files/httpd.conf.imp deleted file mode 100644 index edd7b1df357e..000000000000 --- a/mail/horde4-imp/files/httpd.conf.imp +++ /dev/null @@ -1,31 +0,0 @@ -# This is included in Apache's httpd.conf for IMP -# -# For security, don't serve pages from the IMP configuration and -# library directories. -# -<Directory "/home/httpd/html/horde/imp/config"> - order deny,allow - deny from all -</Directory> -<Directory "/home/httpd/html/horde/imp/lib"> - order deny,allow - deny from all -</Directory> -<Directory "/home/httpd/html/horde/imp/locale"> - order deny,allow - deny from all -</Directory> -<Directory "/home/httpd/html/horde/imp/po"> - order deny,allow - deny from all -</Directory> -<Directory "/home/httpd/html/horde/imp/scripts"> - order deny,allow - deny from all -</Directory> -<Directory "/home/httpd/html/horde/imp/templates"> - order deny,allow - deny from all -</Directory> -# End of IMP configuration ================ - diff --git a/mail/horde4-imp/files/patch-ab b/mail/horde4-imp/files/patch-ab deleted file mode 100644 index 0ef811fa652d..000000000000 --- a/mail/horde4-imp/files/patch-ab +++ /dev/null @@ -1,33 +0,0 @@ ---- config/servers.php.dist.orig Sun Dec 12 07:36:51 2004 -+++ config/servers.php.dist Fri Dec 24 00:27:59 2004 -@@ -47,7 +47,7 @@ - * - * folders: The folder path for the IMAP server. - * Common values: -- * UW-IMAP 'mail/' (note the trailing slash) -+ * UW-IMAP 'Mail/' (note the trailing slash) - * Cyrus, Courier-IMAP 'INBOX.' (note the trailing dot) - * dovecot '' - * -@@ -174,14 +174,16 @@ - - $servers['imap'] = array( - 'name' => 'IMAP Server', -- 'server' => 'imap.example.com', -+// 'server' => 'imap.example.com', -+ 'server' => 'localhost', - 'hordeauth' => false, -- 'protocol' => 'imap/notls', -- 'port' => 143, -- 'folders' => 'mail/', -+ 'protocol' => '%%PROTOCOL%%', -+ 'port' => %%IMAPPORT%%, -+ 'folders' => 'Mail/', - 'namespace' => '', - 'maildomain' => 'example.com', -- 'smtphost' => 'smtp.example.com', -+// 'smtphost' => 'smtp.example.com', -+ 'smtphost' => 'localhost', - 'smtpport' => 25, - 'realm' => '', - 'preferred' => '', diff --git a/mail/horde4-imp/files/patch-ac b/mail/horde4-imp/files/patch-ac deleted file mode 100644 index 68730ef6fde4..000000000000 --- a/mail/horde4-imp/files/patch-ac +++ /dev/null @@ -1,11 +0,0 @@ ---- config/prefs.php.dist.orig Fri Oct 29 19:04:12 2004 -+++ config/prefs.php.dist Thu Nov 11 21:49:05 2004 -@@ -1071,7 +1071,7 @@ - // 'value' => "source_one\tsource_two" - // refer to turba/config/sources.php for possible source values - $_prefs['search_sources'] = array( -- 'value' => "", -+ 'value' => 'localsql', - 'locked' => false, - 'shared' => false, - 'type' => 'implicit'); diff --git a/mail/horde4-imp/files/patch-config::conf.xml b/mail/horde4-imp/files/patch-config::conf.xml deleted file mode 100644 index 225acb1a99c1..000000000000 --- a/mail/horde4-imp/files/patch-config::conf.xml +++ /dev/null @@ -1,25 +0,0 @@ ---- config/conf.xml.orig Mon Nov 22 09:40:29 2004 -+++ config/conf.xml Mon Nov 29 11:51:54 2004 -@@ -6,11 +6,11 @@ - <configheader>External Utilities</configheader> - <configstring name="spellchecker" required="false" desc="Enter the location - of the binary to either aspell or ispell to enable the spell checker. If -- this is empty, then spell checking will be disabled."></configstring> -+ this is empty, then spell checking will be disabled.">%%ASPELL%%</configstring> - <configstring name="gnupg" required="false" desc="If you want users to have - the option of using the GNU Privacy Guard program to decrypt/encrypt PGP - files, enter the location of the 'gpg' binary here. If this is empty this -- feature will be disabled."></configstring> -+ feature will be disabled.">%%GPG%%</configstring> - <configmultienum name="gnupg_keyserver" required="false" desc="The address of - the public PGP keyserver(s) to use.">wwwkeys.pgp.net - <values> -@@ -23,7 +23,7 @@ - connecting to the PGP keyserver. Timeouts are not supported on all - systems.">10</configstring> - <configstring name="openssl_cafile" required="false" desc="The location of -- the root certificates bundle.">/somewhere/ca-bundle.crt</configstring> -+ the root certificates bundle.">/usr/local/etc/ssl.crt/ca-bundle.crt</configstring> - <configstring name="openssl_binary" required="false" desc="The location of - the OpenSSL binary on your system. This program is REQUIRED to import - personal S/MIME certificate information, as there is no native PHP function diff --git a/mail/horde4-imp/files/pkg-message.in b/mail/horde4-imp/files/pkg-message.in deleted file mode 100644 index 78a666232a4a..000000000000 --- a/mail/horde4-imp/files/pkg-message.in +++ /dev/null @@ -1,25 +0,0 @@ -************************************************************************ -IMP has been installed in %%IMPDIR%% with your blank -configuration files. - -Horde must be configured and the tables created; if not, see -`pkg_info -D -x horde'. - -Then, you might have to tune the configuration files located in -%%CONFDIR%%/, specially the file servers.php. - -Then, you must login to Horde as a Horde Administrator to finish the -configuration. Please read %%DOCSDIR%%/INSTALL. - -Warning: the filter system of IMP 3.x has been replaced by a separate -******** application => check the port mail/ingo. Ingo provides a script - to migrate the existing filter rules from IMP 3.x, see Ingo's - documentation. - -To protect your configuration files, you have to restart Apache. - -To secure your installation, it is at least recommended that you change -the default database password used by horde and imp. -Then, you might change the 'session.save_path' setting in php.ini to a -directory only readable and writeable by your webserver. -************************************************************************ diff --git a/mail/horde4-imp/pkg-deinstall b/mail/horde4-imp/pkg-deinstall deleted file mode 100644 index cd0aa1e6c6c5..000000000000 --- a/mail/horde4-imp/pkg-deinstall +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# -# Backup IMP config files, if needed. - -if [ x$2 != xDEINSTALL ]; then - exit -fi - -if [ -z "${PACKAGE_BUILDING}" ]; then - for cf in `ls ${PKG_PREFIX}/www/horde/imp/config/*php ${PKG_PREFIX}/www/horde/imp/config/*txt`; do - diff -bBqw $cf $cf.dist >/dev/null 2>&1 - case $? in - 0) # original config file, will be deleted by pkg-plist - ;; - 1) # config file has been updated, must be backuped - cp -p $cf $cf.previous - echo "===> Backing-up..." - echo "---> $cf has been saved ***" - echo "---> as $cf.previous ***" - ;; - *) # not found? - ;; - esac - done -fi diff --git a/mail/horde4-imp/pkg-descr b/mail/horde4-imp/pkg-descr deleted file mode 100644 index b085871c38de..000000000000 --- a/mail/horde4-imp/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -IMP is the Internet Messaging Program. It is written in PHP and provides -webmail access to IMAP and POP3 accounts. - -WWW: http://www.horde.org/imp/ diff --git a/mail/horde4-imp/pkg-plist b/mail/horde4-imp/pkg-plist deleted file mode 100644 index 9e5b4de17419..000000000000 --- a/mail/horde4-imp/pkg-plist +++ /dev/null @@ -1,487 +0,0 @@ -%%PORTDOCS%%%%DOCSDIR%%/CHANGES -%%PORTDOCS%%%%DOCSDIR%%/COPYING -%%PORTDOCS%%%%DOCSDIR%%/CREDITS -%%PORTDOCS%%%%DOCSDIR%%/INSTALL -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES -%%PORTDOCS%%%%DOCSDIR%%/TODO -%%PORTDOCS%%%%DOCSDIR%%/UPGRADING -%%IMPDIR%%/acl.php -%%IMPDIR%%/attachment.php -%%IMPDIR%%/compose.php -%%IMPDIR%%/config/.htaccess -%%IMPDIR%%/config/conf.xml -%%IMPDIR%%/config/filter.txt -%%IMPDIR%%/config/filter.txt.dist -%%IMPDIR%%/config/header.txt -%%IMPDIR%%/config/header.txt.dist -%%IMPDIR%%/config/menu.php -%%IMPDIR%%/config/menu.php.dist -%%IMPDIR%%/config/mime_drivers.php -%%IMPDIR%%/config/mime_drivers.php.dist -%%IMPDIR%%/config/motd.php -%%IMPDIR%%/config/motd.php.dist -%%IMPDIR%%/config/prefs.php -%%IMPDIR%%/config/prefs.php.dist -%%IMPDIR%%/config/servers.php -%%IMPDIR%%/config/servers.php.dist -%%IMPDIR%%/config/trailer.txt -%%IMPDIR%%/config/trailer.txt.dist -%%IMPDIR%%/contacts.php -%%IMPDIR%%/expand.php -%%IMPDIR%%/fetchmail.php -%%IMPDIR%%/fetchmailprefs.php -%%IMPDIR%%/filterprefs.php -%%IMPDIR%%/folders.php -%%IMPDIR%%/index.php -%%IMPDIR%%/lib/.htaccess -%%IMPDIR%%/lib/Auth/imp.php -%%IMPDIR%%/lib/Block/summary.php -%%IMPDIR%%/lib/Block/tree_folders.php -%%IMPDIR%%/lib/Compose.php -%%IMPDIR%%/lib/Crypt/PGP.php -%%IMPDIR%%/lib/Crypt/SMIME.php -%%IMPDIR%%/lib/Fetchmail.php -%%IMPDIR%%/lib/Fetchmail/imap.php -%%IMPDIR%%/lib/Filter.php -%%IMPDIR%%/lib/Folder.php -%%IMPDIR%%/lib/IMAP.php -%%IMPDIR%%/lib/IMAP/Tree.php -%%IMPDIR%%/lib/IMP.php -%%IMPDIR%%/lib/Identity/imp.php -%%IMPDIR%%/lib/MIME/Contents.php -%%IMPDIR%%/lib/MIME/Headers.php -%%IMPDIR%%/lib/MIME/Viewer/alternative.php -%%IMPDIR%%/lib/MIME/Viewer/appledouble.php -%%IMPDIR%%/lib/MIME/Viewer/enriched.php -%%IMPDIR%%/lib/MIME/Viewer/html.php -%%IMPDIR%%/lib/MIME/Viewer/images.php -%%IMPDIR%%/lib/MIME/Viewer/itip.php -%%IMPDIR%%/lib/MIME/Viewer/multipart.php -%%IMPDIR%%/lib/MIME/Viewer/notification.php -%%IMPDIR%%/lib/MIME/Viewer/partial.php -%%IMPDIR%%/lib/MIME/Viewer/pgp.php -%%IMPDIR%%/lib/MIME/Viewer/pkcs7.php -%%IMPDIR%%/lib/MIME/Viewer/plain.php -%%IMPDIR%%/lib/MIME/Viewer/related.php -%%IMPDIR%%/lib/MIME/Viewer/rfc822.php -%%IMPDIR%%/lib/MIME/Viewer/status.php -%%IMPDIR%%/lib/MIME/Viewer/tnef.php -%%IMPDIR%%/lib/MIME/Viewer/zip.php -%%IMPDIR%%/lib/Mailbox.php -%%IMPDIR%%/lib/Maillog.php -%%IMPDIR%%/lib/Maintenance/Task/delete_attachments_monthly.php -%%IMPDIR%%/lib/Maintenance/Task/delete_sentmail_monthly.php -%%IMPDIR%%/lib/Maintenance/Task/fetchmail_login.php -%%IMPDIR%%/lib/Maintenance/Task/purge_trash.php -%%IMPDIR%%/lib/Maintenance/Task/rename_sentmail_monthly.php -%%IMPDIR%%/lib/Maintenance/Task/tos_agreement.php -%%IMPDIR%%/lib/Maintenance/imp.php -%%IMPDIR%%/lib/Message.php -%%IMPDIR%%/lib/Notification/Listener/status.php -%%IMPDIR%%/lib/Quota.php -%%IMPDIR%%/lib/Quota/command.php -%%IMPDIR%%/lib/Quota/courier.php -%%IMPDIR%%/lib/Quota/cyrus.php -%%IMPDIR%%/lib/Quota/logfile.php -%%IMPDIR%%/lib/Quota/mdaemon.php -%%IMPDIR%%/lib/Quota/mercury32.php -%%IMPDIR%%/lib/Search.php -%%IMPDIR%%/lib/Session.php -%%IMPDIR%%/lib/Spam.php -%%IMPDIR%%/lib/VFolder.php -%%IMPDIR%%/lib/api.php -%%IMPDIR%%/lib/base.php -%%IMPDIR%%/lib/prefs.php -%%IMPDIR%%/lib/version.php -%%IMPDIR%%/locale/.htaccess -%%IMPDIR%%/locale/ar_OM/LC_MESSAGES/imp.mo -%%IMPDIR%%/locale/ar_SY/LC_MESSAGES/imp.mo -%%IMPDIR%%/locale/bg_BG/LC_MESSAGES/imp.mo -%%IMPDIR%%/locale/ca_ES/LC_MESSAGES/imp.mo -%%IMPDIR%%/locale/ca_ES/help.xml -%%IMPDIR%%/locale/cs_CZ/LC_MESSAGES/imp.mo -%%IMPDIR%%/locale/cs_CZ/help.xml -%%IMPDIR%%/locale/da_DK/LC_MESSAGES/imp.mo -%%IMPDIR%%/locale/da_DK/help.xml -%%IMPDIR%%/locale/de_DE/LC_MESSAGES/imp.mo -%%IMPDIR%%/locale/de_DE/help.xml -%%IMPDIR%%/locale/el_GR/LC_MESSAGES/imp.mo -%%IMPDIR%%/locale/el_GR/help.xml -%%IMPDIR%%/locale/en_US/help.xml -%%IMPDIR%%/locale/es_ES/LC_MESSAGES/imp.mo -%%IMPDIR%%/locale/es_ES/help.xml -%%IMPDIR%%/locale/et_EE/LC_MESSAGES/imp.mo -%%IMPDIR%%/locale/et_EE/help.xml -%%IMPDIR%%/locale/fa_IR/LC_MESSAGES/imp.mo -%%IMPDIR%%/locale/fi_FI/LC_MESSAGES/imp.mo -%%IMPDIR%%/locale/fi_FI/help.xml -%%IMPDIR%%/locale/fr_FR/LC_MESSAGES/imp.mo -%%IMPDIR%%/locale/fr_FR/help.xml -%%IMPDIR%%/locale/gl_ES/LC_MESSAGES/imp.mo -%%IMPDIR%%/locale/hu_HU/LC_MESSAGES/imp.mo -%%IMPDIR%%/locale/hu_HU/help.xml -%%IMPDIR%%/locale/id_ID/LC_MESSAGES/imp.mo -%%IMPDIR%%/locale/is_IS/LC_MESSAGES/imp.mo -%%IMPDIR%%/locale/it_IT/LC_MESSAGES/imp.mo -%%IMPDIR%%/locale/it_IT/help.xml -%%IMPDIR%%/locale/ja_JP/LC_MESSAGES/imp.mo -%%IMPDIR%%/locale/ko_KR/LC_MESSAGES/imp.mo -%%IMPDIR%%/locale/ko_KR/help.xml -%%IMPDIR%%/locale/lt_LT/LC_MESSAGES/imp.mo -%%IMPDIR%%/locale/lv_LV/LC_MESSAGES/imp.mo -%%IMPDIR%%/locale/mk_MK/LC_MESSAGES/imp.mo -%%IMPDIR%%/locale/nb_NO/LC_MESSAGES/imp.mo -%%IMPDIR%%/locale/nb_NO/help.xml -%%IMPDIR%%/locale/nl_NL/LC_MESSAGES/imp.mo -%%IMPDIR%%/locale/nl_NL/help.xml -%%IMPDIR%%/locale/nn_NO/LC_MESSAGES/imp.mo -%%IMPDIR%%/locale/pl_PL/LC_MESSAGES/imp.mo -%%IMPDIR%%/locale/pl_PL/help.xml -%%IMPDIR%%/locale/pt_BR/LC_MESSAGES/imp.mo -%%IMPDIR%%/locale/pt_BR/help.xml -%%IMPDIR%%/locale/pt_PT/LC_MESSAGES/imp.mo -%%IMPDIR%%/locale/pt_PT/help.xml -%%IMPDIR%%/locale/ro_RO/LC_MESSAGES/imp.mo -%%IMPDIR%%/locale/ru_RU/LC_MESSAGES/imp.mo -%%IMPDIR%%/locale/ru_RU/help.xml -%%IMPDIR%%/locale/sk_SK/LC_MESSAGES/imp.mo -%%IMPDIR%%/locale/sk_SK/help.xml -%%IMPDIR%%/locale/sl_SI/LC_MESSAGES/imp.mo -%%IMPDIR%%/locale/sv_SE/LC_MESSAGES/imp.mo -%%IMPDIR%%/locale/sv_SE/help.xml -%%IMPDIR%%/locale/th_TH/LC_MESSAGES/imp.mo -%%IMPDIR%%/locale/tr_TR/LC_MESSAGES/imp.mo -%%IMPDIR%%/locale/uk_UA/LC_MESSAGES/imp.mo -%%IMPDIR%%/locale/uk_UA/help.xml -%%IMPDIR%%/locale/zh_CN/LC_MESSAGES/imp.mo -%%IMPDIR%%/locale/zh_CN/help.xml -%%IMPDIR%%/locale/zh_TW/LC_MESSAGES/imp.mo -%%IMPDIR%%/locale/zh_TW/help.xml -%%IMPDIR%%/login.php -%%IMPDIR%%/mailbox.php -%%IMPDIR%%/message.php -%%IMPDIR%%/pgp.php -%%IMPDIR%%/po/.htaccess -%%IMPDIR%%/po/README -%%IMPDIR%%/po/ar_OM.po -%%IMPDIR%%/po/ar_SY.po -%%IMPDIR%%/po/bg_BG.po -%%IMPDIR%%/po/ca_ES.po -%%IMPDIR%%/po/cs_CZ.po -%%IMPDIR%%/po/da_DK.po -%%IMPDIR%%/po/de_DE.po -%%IMPDIR%%/po/el_GR.po -%%IMPDIR%%/po/es_ES.po -%%IMPDIR%%/po/et_EE.po -%%IMPDIR%%/po/fa_IR.po -%%IMPDIR%%/po/fi_FI.po -%%IMPDIR%%/po/fr_FR.po -%%IMPDIR%%/po/gl_ES.po -%%IMPDIR%%/po/hu_HU.po -%%IMPDIR%%/po/id_ID.po -%%IMPDIR%%/po/imp.pot -%%IMPDIR%%/po/is_IS.po -%%IMPDIR%%/po/it_IT.po -%%IMPDIR%%/po/ja_JP.po -%%IMPDIR%%/po/ko_KR.po -%%IMPDIR%%/po/lt_LT.po -%%IMPDIR%%/po/lv_LV.po -%%IMPDIR%%/po/mk_MK.po -%%IMPDIR%%/po/nb_NO.po -%%IMPDIR%%/po/nl_NL.po -%%IMPDIR%%/po/nn_NO.po -%%IMPDIR%%/po/pl_PL.po -%%IMPDIR%%/po/pt_BR.po -%%IMPDIR%%/po/pt_PT.po -%%IMPDIR%%/po/ro_RO.po -%%IMPDIR%%/po/ru_RU.po -%%IMPDIR%%/po/sk_SK.po -%%IMPDIR%%/po/sl_SI.po -%%IMPDIR%%/po/sv_SE.po -%%IMPDIR%%/po/th_TH.po -%%IMPDIR%%/po/tr_TR.po -%%IMPDIR%%/po/uk_UA.po -%%IMPDIR%%/po/zh_CN.po -%%IMPDIR%%/po/zh_TW.po -%%IMPDIR%%/recompose.php -%%IMPDIR%%/redirect.php -%%IMPDIR%%/scripts/.htaccess -%%IMPDIR%%/scripts/Imp.reg -%%IMPDIR%%/scripts/custom_login.php -%%IMPDIR%%/scripts/singlescript.php -%%IMPDIR%%/search.php -%%IMPDIR%%/smime.php -%%IMPDIR%%/spelling.php -%%IMPDIR%%/templates/.htaccess -%%IMPDIR%%/templates/acl/acl.inc -%%IMPDIR%%/templates/common-header.inc -%%IMPDIR%%/templates/compose/attachments.inc -%%IMPDIR%%/templates/compose/attachments.js -%%IMPDIR%%/templates/compose/compose.inc -%%IMPDIR%%/templates/compose/compose.js -%%IMPDIR%%/templates/compose/compose_expand.js -%%IMPDIR%%/templates/compose/encrypt_list.inc -%%IMPDIR%%/templates/compose/expand.inc -%%IMPDIR%%/templates/compose/recompose.inc -%%IMPDIR%%/templates/compose/redirect.inc -%%IMPDIR%%/templates/compose/spelling.inc -%%IMPDIR%%/templates/compose/spelling.js -%%IMPDIR%%/templates/compose/success.inc -%%IMPDIR%%/templates/contacts/contacts.inc -%%IMPDIR%%/templates/fetchmail/account_select.inc -%%IMPDIR%%/templates/fetchmail/driver_select.inc -%%IMPDIR%%/templates/fetchmail/fetchmail.inc -%%IMPDIR%%/templates/fetchmail/manage.inc -%%IMPDIR%%/templates/fetchmail/top.inc -%%IMPDIR%%/templates/filters/notactive.inc -%%IMPDIR%%/templates/filters/prefs.inc -%%IMPDIR%%/templates/folders/actions.inc -%%IMPDIR%%/templates/folders/folders.html -%%IMPDIR%%/templates/folders/foot.inc -%%IMPDIR%%/templates/folders/head.inc -%%IMPDIR%%/templates/folders/import.inc -%%IMPDIR%%/templates/folders/javascript.inc -%%IMPDIR%%/templates/javascript/open_compose_win.js -%%IMPDIR%%/templates/javascript/open_print_win.js -%%IMPDIR%%/templates/login/login.inc -%%IMPDIR%%/templates/mailbox/actions.inc -%%IMPDIR%%/templates/mailbox/actions_deleted.inc -%%IMPDIR%%/templates/mailbox/alert.inc -%%IMPDIR%%/templates/mailbox/empty_mailbox.inc -%%IMPDIR%%/templates/mailbox/footer.inc -%%IMPDIR%%/templates/mailbox/header.inc -%%IMPDIR%%/templates/mailbox/javascript.inc -%%IMPDIR%%/templates/mailbox/legend.inc -%%IMPDIR%%/templates/mailbox/mailbox.html -%%IMPDIR%%/templates/mailbox/message_footers.inc -%%IMPDIR%%/templates/mailbox/message_headers.inc -%%IMPDIR%%/templates/mailbox/navbar.inc -%%IMPDIR%%/templates/mailbox/searchfolder.inc -%%IMPDIR%%/templates/menu.inc -%%IMPDIR%%/templates/message/headers.inc -%%IMPDIR%%/templates/message/javascript.inc -%%IMPDIR%%/templates/message/message.inc -%%IMPDIR%%/templates/message/navbar_actions.inc -%%IMPDIR%%/templates/message/navbar_navigate.inc -%%IMPDIR%%/templates/message/navbar_top.inc -%%IMPDIR%%/templates/message/print.inc -%%IMPDIR%%/templates/pgp/import_key.inc -%%IMPDIR%%/templates/pgp/notactive.inc -%%IMPDIR%%/templates/pgp/open_pgp_import.js -%%IMPDIR%%/templates/pgp/open_pgp_win.js -%%IMPDIR%%/templates/pgp/passphrase.inc -%%IMPDIR%%/templates/pgp/pgp.inc -%%IMPDIR%%/templates/prefs/encryptselect.inc -%%IMPDIR%%/templates/prefs/folderselect.inc -%%IMPDIR%%/templates/prefs/initialpageselect.inc -%%IMPDIR%%/templates/prefs/sentmailselect.inc -%%IMPDIR%%/templates/prefs/sourceselect.inc -%%IMPDIR%%/templates/prefs/spamselect.inc -%%IMPDIR%%/templates/prefs/trashselect.inc -%%IMPDIR%%/templates/quota/quota.inc -%%IMPDIR%%/templates/search/fields.inc -%%IMPDIR%%/templates/search/header.inc -%%IMPDIR%%/templates/search/javascript.inc -%%IMPDIR%%/templates/search/main.inc -%%IMPDIR%%/templates/smime/import_key.inc -%%IMPDIR%%/templates/smime/notactive.inc -%%IMPDIR%%/templates/smime/open_smime_import.js -%%IMPDIR%%/templates/smime/open_smime_win.js -%%IMPDIR%%/templates/smime/passphrase.inc -%%IMPDIR%%/templates/smime/smime.inc -%%IMPDIR%%/templates/thread/bottom.inc -%%IMPDIR%%/templates/thread/thread.html -%%IMPDIR%%/templates/thread/top.inc -%%IMPDIR%%/test.php -%%IMPDIR%%/themes/azur/screen.css -%%IMPDIR%%/themes/bluemoon/screen.css -%%IMPDIR%%/themes/bluewhite/screen.css -%%IMPDIR%%/themes/brown/screen.css -%%IMPDIR%%/themes/burntorange/screen.css -%%IMPDIR%%/themes/cherry/screen.css -%%IMPDIR%%/themes/gennevilliers/screen.css -%%IMPDIR%%/themes/green/screen.css -%%IMPDIR%%/themes/grey/screen.css -%%IMPDIR%%/themes/graphics/addressbook-blue.png -%%IMPDIR%%/themes/graphics/addressbook-red.png -%%IMPDIR%%/themes/graphics/apple.png -%%IMPDIR%%/themes/graphics/attachment.png -%%IMPDIR%%/themes/graphics/compose.png -%%IMPDIR%%/themes/graphics/empty_trash.png -%%IMPDIR%%/themes/graphics/expand.png -%%IMPDIR%%/themes/graphics/favicon.ico -%%IMPDIR%%/themes/graphics/fetchmail.png -%%IMPDIR%%/themes/graphics/filters.png -%%IMPDIR%%/themes/graphics/folders/drafts.png -%%IMPDIR%%/themes/graphics/folders/folder.png -%%IMPDIR%%/themes/graphics/folders/folder_open.png -%%IMPDIR%%/themes/graphics/folders/inbox.png -%%IMPDIR%%/themes/graphics/folders/sent.png -%%IMPDIR%%/themes/graphics/folders/templates.png -%%IMPDIR%%/themes/graphics/folders/trash.png -%%IMPDIR%%/themes/graphics/forward.png -%%IMPDIR%%/themes/graphics/imp.png -%%IMPDIR%%/themes/graphics/mail_answered.png -%%IMPDIR%%/themes/graphics/mail_deleted.png -%%IMPDIR%%/themes/graphics/mail_draft.png -%%IMPDIR%%/themes/graphics/mail_flagged.png -%%IMPDIR%%/themes/graphics/mail_personal.png -%%IMPDIR%%/themes/graphics/mail_priority_high.png -%%IMPDIR%%/themes/graphics/mail_priority_low.png -%%IMPDIR%%/themes/graphics/mail_unseen.png -%%IMPDIR%%/themes/graphics/manage_attachments.png -%%IMPDIR%%/themes/graphics/mime/compressed.png -%%IMPDIR%%/themes/graphics/mime/encryption.png -%%IMPDIR%%/themes/graphics/mime/html.png -%%IMPDIR%%/themes/graphics/mime/image.png -%%IMPDIR%%/themes/graphics/mime/itip.png -%%IMPDIR%%/themes/graphics/mime/mail.png -%%IMPDIR%%/themes/graphics/mime/text.png -%%IMPDIR%%/themes/graphics/newmail.png -%%IMPDIR%%/themes/graphics/reply.png -%%IMPDIR%%/themes/graphics/shared.png -%%IMPDIR%%/themes/graphics/signed.png -%%IMPDIR%%/themes/graphics/spacer_red.png -%%IMPDIR%%/themes/graphics/spellcheck.png -%%IMPDIR%%/themes/screen.css -%%IMPDIR%%/themes/lavander/screen.css -%%IMPDIR%%/themes/postnuke/screen.css -%%IMPDIR%%/themes/simplex/screen.css -%%IMPDIR%%/themes/sun/screen.css -%%IMPDIR%%/thread.php -%%IMPDIR%%/view.php -%%PORTDOCS%%@dirrm %%DOCSDIR%% -etc/horde/httpd.conf.imp -@dirrm %%IMPDIR%%/themes/sun -@dirrm %%IMPDIR%%/themes/simplex -@dirrm %%IMPDIR%%/themes/postnuke -@dirrm %%IMPDIR%%/themes/lavander -@dirrm %%IMPDIR%%/themes/graphics/mime -@dirrm %%IMPDIR%%/themes/graphics/folders -@dirrm %%IMPDIR%%/themes/graphics -@dirrm %%IMPDIR%%/themes/grey -@dirrm %%IMPDIR%%/themes/green -@dirrm %%IMPDIR%%/themes/gennevilliers -@dirrm %%IMPDIR%%/themes/cherry -@dirrm %%IMPDIR%%/themes/burntorange -@dirrm %%IMPDIR%%/themes/brown -@dirrm %%IMPDIR%%/themes/bluewhite -@dirrm %%IMPDIR%%/themes/bluemoon -@dirrm %%IMPDIR%%/themes/azur -@dirrm %%IMPDIR%%/themes -@dirrm %%IMPDIR%%/templates/thread -@dirrm %%IMPDIR%%/templates/smime -@dirrm %%IMPDIR%%/templates/search -@dirrm %%IMPDIR%%/templates/quota -@dirrm %%IMPDIR%%/templates/prefs -@dirrm %%IMPDIR%%/templates/pgp -@dirrm %%IMPDIR%%/templates/message -@dirrm %%IMPDIR%%/templates/mailbox -@dirrm %%IMPDIR%%/templates/login -@dirrm %%IMPDIR%%/templates/javascript -@dirrm %%IMPDIR%%/templates/folders -@dirrm %%IMPDIR%%/templates/filters -@dirrm %%IMPDIR%%/templates/fetchmail -@dirrm %%IMPDIR%%/templates/contacts -@dirrm %%IMPDIR%%/templates/compose -@dirrm %%IMPDIR%%/templates/acl -@dirrm %%IMPDIR%%/templates -@dirrm %%IMPDIR%%/scripts -@dirrm %%IMPDIR%%/po -@dirrm %%IMPDIR%%/locale/zh_TW/LC_MESSAGES -@dirrm %%IMPDIR%%/locale/zh_TW -@dirrm %%IMPDIR%%/locale/zh_CN/LC_MESSAGES -@dirrm %%IMPDIR%%/locale/zh_CN -@dirrm %%IMPDIR%%/locale/uk_UA/LC_MESSAGES -@dirrm %%IMPDIR%%/locale/uk_UA -@dirrm %%IMPDIR%%/locale/tr_TR/LC_MESSAGES -@dirrm %%IMPDIR%%/locale/tr_TR -@dirrm %%IMPDIR%%/locale/th_TH/LC_MESSAGES -@dirrm %%IMPDIR%%/locale/th_TH -@dirrm %%IMPDIR%%/locale/sv_SE/LC_MESSAGES -@dirrm %%IMPDIR%%/locale/sv_SE -@dirrm %%IMPDIR%%/locale/sl_SI/LC_MESSAGES -@dirrm %%IMPDIR%%/locale/sl_SI -@dirrm %%IMPDIR%%/locale/sk_SK/LC_MESSAGES -@dirrm %%IMPDIR%%/locale/sk_SK -@dirrm %%IMPDIR%%/locale/ru_RU/LC_MESSAGES -@dirrm %%IMPDIR%%/locale/ru_RU -@dirrm %%IMPDIR%%/locale/ro_RO/LC_MESSAGES -@dirrm %%IMPDIR%%/locale/ro_RO -@dirrm %%IMPDIR%%/locale/pt_PT/LC_MESSAGES -@dirrm %%IMPDIR%%/locale/pt_PT -@dirrm %%IMPDIR%%/locale/pt_BR/LC_MESSAGES -@dirrm %%IMPDIR%%/locale/pt_BR -@dirrm %%IMPDIR%%/locale/pl_PL/LC_MESSAGES -@dirrm %%IMPDIR%%/locale/pl_PL -@dirrm %%IMPDIR%%/locale/nn_NO/LC_MESSAGES -@dirrm %%IMPDIR%%/locale/nn_NO -@dirrm %%IMPDIR%%/locale/nl_NL/LC_MESSAGES -@dirrm %%IMPDIR%%/locale/nl_NL -@dirrm %%IMPDIR%%/locale/nb_NO/LC_MESSAGES -@dirrm %%IMPDIR%%/locale/nb_NO -@dirrm %%IMPDIR%%/locale/mk_MK/LC_MESSAGES -@dirrm %%IMPDIR%%/locale/mk_MK -@dirrm %%IMPDIR%%/locale/lv_LV/LC_MESSAGES -@dirrm %%IMPDIR%%/locale/lv_LV -@dirrm %%IMPDIR%%/locale/lt_LT/LC_MESSAGES -@dirrm %%IMPDIR%%/locale/lt_LT -@dirrm %%IMPDIR%%/locale/ko_KR/LC_MESSAGES -@dirrm %%IMPDIR%%/locale/ko_KR -@dirrm %%IMPDIR%%/locale/ja_JP/LC_MESSAGES -@dirrm %%IMPDIR%%/locale/ja_JP -@dirrm %%IMPDIR%%/locale/it_IT/LC_MESSAGES -@dirrm %%IMPDIR%%/locale/it_IT -@dirrm %%IMPDIR%%/locale/is_IS/LC_MESSAGES -@dirrm %%IMPDIR%%/locale/is_IS -@dirrm %%IMPDIR%%/locale/id_ID/LC_MESSAGES -@dirrm %%IMPDIR%%/locale/id_ID -@dirrm %%IMPDIR%%/locale/hu_HU/LC_MESSAGES -@dirrm %%IMPDIR%%/locale/hu_HU -@dirrm %%IMPDIR%%/locale/gl_ES/LC_MESSAGES -@dirrm %%IMPDIR%%/locale/gl_ES -@dirrm %%IMPDIR%%/locale/fr_FR/LC_MESSAGES -@dirrm %%IMPDIR%%/locale/fr_FR -@dirrm %%IMPDIR%%/locale/fi_FI/LC_MESSAGES -@dirrm %%IMPDIR%%/locale/fi_FI -@dirrm %%IMPDIR%%/locale/fa_IR/LC_MESSAGES -@dirrm %%IMPDIR%%/locale/fa_IR -@dirrm %%IMPDIR%%/locale/et_EE/LC_MESSAGES -@dirrm %%IMPDIR%%/locale/et_EE -@dirrm %%IMPDIR%%/locale/es_ES/LC_MESSAGES -@dirrm %%IMPDIR%%/locale/es_ES -@dirrm %%IMPDIR%%/locale/en_US -@dirrm %%IMPDIR%%/locale/el_GR/LC_MESSAGES -@dirrm %%IMPDIR%%/locale/el_GR -@dirrm %%IMPDIR%%/locale/de_DE/LC_MESSAGES -@dirrm %%IMPDIR%%/locale/de_DE -@dirrm %%IMPDIR%%/locale/da_DK/LC_MESSAGES -@dirrm %%IMPDIR%%/locale/da_DK -@dirrm %%IMPDIR%%/locale/cs_CZ/LC_MESSAGES -@dirrm %%IMPDIR%%/locale/cs_CZ -@dirrm %%IMPDIR%%/locale/ca_ES/LC_MESSAGES -@dirrm %%IMPDIR%%/locale/ca_ES -@dirrm %%IMPDIR%%/locale/bg_BG/LC_MESSAGES -@dirrm %%IMPDIR%%/locale/bg_BG -@dirrm %%IMPDIR%%/locale/ar_SY/LC_MESSAGES -@dirrm %%IMPDIR%%/locale/ar_SY -@dirrm %%IMPDIR%%/locale/ar_OM/LC_MESSAGES -@dirrm %%IMPDIR%%/locale/ar_OM -@dirrm %%IMPDIR%%/locale -@dirrm %%IMPDIR%%/lib/Quota -@dirrm %%IMPDIR%%/lib/Notification/Listener -@dirrm %%IMPDIR%%/lib/Notification -@dirrm %%IMPDIR%%/lib/Maintenance/Task -@dirrm %%IMPDIR%%/lib/Maintenance -@dirrm %%IMPDIR%%/lib/MIME/Viewer -@dirrm %%IMPDIR%%/lib/MIME -@dirrm %%IMPDIR%%/lib/Identity -@dirrm %%IMPDIR%%/lib/IMAP -@dirrm %%IMPDIR%%/lib/Fetchmail -@dirrm %%IMPDIR%%/lib/Crypt -@dirrm %%IMPDIR%%/lib/Block -@dirrm %%IMPDIR%%/lib/Auth -@dirrm %%IMPDIR%%/lib -@unexec rmdir %D/%%IMPDIR%%/config 2>/dev/null || true -@unexec rmdir %D/%%IMPDIR%% 2>/dev/null || true diff --git a/mail/horde4-ingo/Makefile b/mail/horde4-ingo/Makefile deleted file mode 100644 index 875ac6ffa817..000000000000 --- a/mail/horde4-ingo/Makefile +++ /dev/null @@ -1,94 +0,0 @@ -# Ports collection makefile for: Ingo -# Date created: Dec 3, 2004 -# Whom: Thierry Thomas (<thierry@pompo.net>) -# -# $FreeBSD$ -# - -PORTNAME= ingo -PORTVERSION= 1.0.1 -CATEGORIES= mail www -MASTER_SITES= ftp://ftp.horde.org/pub/ingo/ \ - ftp://ftp.planetmirror.com/pub/horde/ingo/ \ - ftp://ftp.au.horde.org/pub/horde/ingo/ \ - ftp://ftp.be.horde.org/ingo/ \ - ftp://ftp.es.horde.org/pub/ingo/ \ - ftp://ftp.it.horde.org/pub/mirror/horde.org/ingo/ \ - ftp://ftp.nl.horde.org/mirror/horde-ftp/pub/ingo/ \ - ftp://ftp.uk.horde.org/mirrors/ftp.horde.org/pub/ingo/ \ - http://ftp.horde.org/pub/ingo/ -DISTNAME= ${PORTNAME}-h3-${PORTVERSION} - -MAINTAINER= thierry@FreeBSD.org -COMMENT= Horde's email-filter management application - -#----------------------------------------------------------------------- -# You may define this option: -# -# - WITH_SIEVE : if you run timsieved (with Cyrus). -# -#----------------------------------------------------------------------- - -RUN_DEPENDS+= ${LOCALBASE}/${LHORDEDIR}/rpc.php:${PORTSDIR}/www/horde - -NO_BUILD= yes -USE_PHP= imap -USE_REINPLACE= yes - -PLIST_SUB= INGODIR=${LINGODIR} -PKGMESSAGE= ${WRKDIR}/pkg-message - -DOCS= LICENSE README docs/CHANGES docs/CREDITS docs/INSTALL \ - docs/RELEASE_NOTES docs/TODO -CONFFILE= backends.php fields.php prefs.php -SUB_DIRS= config lib locale po scripts templates themes - -LHORDEDIR?= www/horde -LINGODIR= ${LHORDEDIR}/ingo -PEARDIR?= ${LOCALBASE}/share/pear - -INGODIR= ${PREFIX}/${LINGODIR} -CONFDIR= ${INGODIR}/config - -HORDE_INC= ${LOCALBASE}/etc/horde - -.include <bsd.port.pre.mk> - -.if defined(WITH_SIEVE) || exists(${LOCALBASE}/cyrus/bin/timsieved) -RUN_DEPENDS+= ${PEARDIR}/Net/Sieve.php:${PORTSDIR}/net/pear-Net_Sieve -.endif - -pre-configure: - @${SED} -e "s:/home/httpd/html/horde/ingo:${INGODIR}:g" \ - ${FILESDIR}/httpd.conf.ingo >${WRKDIR}/httpd.conf.ingo - -do-install: - @${MKDIR} ${INGODIR} -.for REP in ${SUB_DIRS} - @${CP} -Rp ${WRKSRC}/${REP} ${INGODIR} -.endfor - @${CP} -p ${WRKSRC}/*.php ${INGODIR} -.for FILE in ${CONFFILE} - @if [ ! -f ${CONFDIR}/${FILE} ]; then \ - ${CP} ${CONFDIR}/${FILE}.dist ${CONFDIR}/${FILE} ; \ - fi -.endfor - @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${INGODIR} - @${CHMOD} -R o-rwx ${CONFDIR} - @${INSTALL_DATA} ${WRKDIR}/httpd.conf.ingo ${HORDE_INC} -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} -.for FILE in ${DOCS} - @${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR} -.endfor - @${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}." -.endif - -post-install: - @${SED} -e "s:%%INGODIR%%:${INGODIR}:g;s:%%DOCSDIR%%:${DOCSDIR}:g" \ - < ${FILESDIR}/pkg-message.in > ${PKGMESSAGE} - @${ECHO_MSG} - @${CAT} ${PKGMESSAGE} - @${ECHO_MSG} - -.include <bsd.port.post.mk> diff --git a/mail/horde4-ingo/distinfo b/mail/horde4-ingo/distinfo deleted file mode 100644 index 5ab26ac7cb66..000000000000 --- a/mail/horde4-ingo/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (ingo-h3-1.0.1.tar.gz) = 7fce229d752e5b981621e215e4fc56e8 -SIZE (ingo-h3-1.0.1.tar.gz) = 733425 diff --git a/mail/horde4-ingo/files/httpd.conf.ingo b/mail/horde4-ingo/files/httpd.conf.ingo deleted file mode 100644 index d07046cdd18c..000000000000 --- a/mail/horde4-ingo/files/httpd.conf.ingo +++ /dev/null @@ -1,31 +0,0 @@ -# This is included in Apache's httpd.conf for Ingo -# -# For security, don't serve pages from the Ingo configuration and -# library directories. -# -<Directory "/home/httpd/html/horde/ingo/config"> - order deny,allow - deny from all -</Directory> -<Directory "/home/httpd/html/horde/ingo/lib"> - order deny,allow - deny from all -</Directory> -<Directory "/home/httpd/html/horde/ingo/locale"> - order deny,allow - deny from all -</Directory> -<Directory "/home/httpd/html/horde/ingo/po"> - order deny,allow - deny from all -</Directory> -<Directory "/home/httpd/html/horde/ingo/scripts"> - order deny,allow - deny from all -</Directory> -<Directory "/home/httpd/html/horde/ingo/templates"> - order deny,allow - deny from all -</Directory> -# End of Ingo configuration ================ - diff --git a/mail/horde4-ingo/files/pkg-message.in b/mail/horde4-ingo/files/pkg-message.in deleted file mode 100644 index fba684f58b9d..000000000000 --- a/mail/horde4-ingo/files/pkg-message.in +++ /dev/null @@ -1,11 +0,0 @@ -************************************************************************ -Ingo has been installed in %%INGODIR%% with your blank -configuration files. - -Horde must be configured; if not, see `pkg_info -D -x horde'. - -Finally, you must login to Horde as a Horde Administrator to finish the -configuration. - -To protect your configuration files, you have to restart Apache. -************************************************************************ diff --git a/mail/horde4-ingo/pkg-deinstall b/mail/horde4-ingo/pkg-deinstall deleted file mode 100644 index a3a597d448a6..000000000000 --- a/mail/horde4-ingo/pkg-deinstall +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# -# Backup Ingo config files, if needed. - -if [ x$2 != xDEINSTALL ]; then - exit -fi - -if [ -z "${PACKAGE_BUILDING}" ]; then - for cf in `ls ${PKG_PREFIX}/www/horde/ingo/config/*php`; do - diff -bBqw $cf $cf.dist >/dev/null 2>&1 - case $? in - 0) # original config file, will be deleted by pkg-plist - ;; - 1) # config file has been updated, must be backuped - cp -p $cf $cf.previous - echo "===> Backing-up..." - echo "---> $cf has been saved ***" - echo "---> as $cf.previous ***" - ;; - *) # not found? - ;; - esac - done -fi diff --git a/mail/horde4-ingo/pkg-descr b/mail/horde4-ingo/pkg-descr deleted file mode 100644 index 382bea7a8f2d..000000000000 --- a/mail/horde4-ingo/pkg-descr +++ /dev/null @@ -1,7 +0,0 @@ -Ingo is an email-filter management application. - -It is fully internationalized, integrated with Horde and the IMP Webmail -client, and supports both server-side (Sieve, procmail) and client-side -(IMAP) rule creation. - -WWW: http://horde.org/ingo/ diff --git a/mail/horde4-ingo/pkg-plist b/mail/horde4-ingo/pkg-plist deleted file mode 100644 index 6b72cc37cf5e..000000000000 --- a/mail/horde4-ingo/pkg-plist +++ /dev/null @@ -1,156 +0,0 @@ -etc/horde/httpd.conf.ingo -%%PORTDOCS%%%%DOCSDIR%%/CHANGES -%%PORTDOCS%%%%DOCSDIR%%/LICENSE -%%PORTDOCS%%%%DOCSDIR%%/CREDITS -%%PORTDOCS%%%%DOCSDIR%%/INSTALL -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES -%%PORTDOCS%%%%DOCSDIR%%/TODO -%%INGODIR%%/blacklist.php -%%INGODIR%%/config/.htaccess -%%INGODIR%%/config/backends.php -%%INGODIR%%/config/backends.php.dist -%%INGODIR%%/config/conf.xml -%%INGODIR%%/config/fields.php -%%INGODIR%%/config/fields.php.dist -%%INGODIR%%/config/prefs.php -%%INGODIR%%/config/prefs.php.dist -%%INGODIR%%/filters.php -%%INGODIR%%/forward.php -%%INGODIR%%/index.php -%%INGODIR%%/lib/Driver.php -%%INGODIR%%/lib/Driver/null.php -%%INGODIR%%/lib/Driver/timsieved.php -%%INGODIR%%/lib/Driver/vfs.php -%%INGODIR%%/lib/Ingo.php -%%INGODIR%%/lib/Script.php -%%INGODIR%%/lib/Script/imap.php -%%INGODIR%%/lib/Script/procmail.php -%%INGODIR%%/lib/Script/sieve.php -%%INGODIR%%/lib/Session.php -%%INGODIR%%/lib/Storage.php -%%INGODIR%%/lib/Storage/prefs.php -%%INGODIR%%/lib/api.php -%%INGODIR%%/lib/base.php -%%INGODIR%%/lib/version.php -%%INGODIR%%/locale/cs_CZ/LC_MESSAGES/ingo.mo -%%INGODIR%%/locale/de_DE/LC_MESSAGES/ingo.mo -%%INGODIR%%/locale/de_DE/help.xml -%%INGODIR%%/locale/en_US/help.xml -%%INGODIR%%/locale/es_ES/LC_MESSAGES/ingo.mo -%%INGODIR%%/locale/es_ES/help.xml -%%INGODIR%%/locale/fi_FI/LC_MESSAGES/ingo.mo -%%INGODIR%%/locale/fr_FR/LC_MESSAGES/ingo.mo -%%INGODIR%%/locale/hu_HU/LC_MESSAGES/ingo.mo -%%INGODIR%%/locale/it_IT/LC_MESSAGES/ingo.mo -%%INGODIR%%/locale/lt_LT/LC_MESSAGES/ingo.mo -%%INGODIR%%/locale/lv_LV/help.xml -%%INGODIR%%/locale/nl_NL/LC_MESSAGES/ingo.mo -%%INGODIR%%/locale/pl_PL/LC_MESSAGES/ingo.mo -%%INGODIR%%/locale/pt_BR/LC_MESSAGES/ingo.mo -%%INGODIR%%/locale/ro_RO/LC_MESSAGES/ingo.mo -%%INGODIR%%/locale/sv_SE/LC_MESSAGES/ingo.mo -%%INGODIR%%/locale/zh_TW/LC_MESSAGES/ingo.mo -%%INGODIR%%/po/README -%%INGODIR%%/po/cs_CZ.po -%%INGODIR%%/po/de_DE.po -%%INGODIR%%/po/es_ES.po -%%INGODIR%%/po/fi_FI.po -%%INGODIR%%/po/fr_FR.po -%%INGODIR%%/po/hu_HU.po -%%INGODIR%%/po/ingo.pot -%%INGODIR%%/po/it_IT.po -%%INGODIR%%/po/lt_LT.po -%%INGODIR%%/po/nl_NL.po -%%INGODIR%%/po/pl_PL.po -%%INGODIR%%/po/pt_BR.po -%%INGODIR%%/po/ro_RO.po -%%INGODIR%%/po/sv_SE.po -%%INGODIR%%/po/zh_TW.po -%%INGODIR%%/rule.php -%%INGODIR%%/script.php -%%INGODIR%%/scripts/.htaccess -%%INGODIR%%/scripts/convert_imp_filters.php -%%INGODIR%%/templates/blacklist/blacklist.inc -%%INGODIR%%/templates/common-header.inc -%%INGODIR%%/templates/filters/filter-none.inc -%%INGODIR%%/templates/filters/filter.html -%%INGODIR%%/templates/filters/footer.inc -%%INGODIR%%/templates/filters/header.inc -%%INGODIR%%/templates/filters/settings.inc -%%INGODIR%%/templates/forward/forward.inc -%%INGODIR%%/templates/javascript/new_folder.js -%%INGODIR%%/templates/menu.inc -%%INGODIR%%/templates/rule/filter.inc -%%INGODIR%%/templates/rule/footer.inc -%%INGODIR%%/templates/rule/header.inc -%%INGODIR%%/templates/script/activate.inc -%%INGODIR%%/templates/script/footer.inc -%%INGODIR%%/templates/script/header.inc -%%INGODIR%%/templates/script/script.inc -%%INGODIR%%/templates/vacation/vacation.inc -%%INGODIR%%/templates/whitelist/whitelist.inc -%%INGODIR%%/test.php -%%INGODIR%%/themes/graphics/blacklist.png -%%INGODIR%%/themes/graphics/copy.png -%%INGODIR%%/themes/graphics/disable.png -%%INGODIR%%/themes/graphics/enable.png -%%INGODIR%%/themes/graphics/favicon.ico -%%INGODIR%%/themes/graphics/forward.png -%%INGODIR%%/themes/graphics/ingo.png -%%INGODIR%%/themes/graphics/script.png -%%INGODIR%%/themes/graphics/vacation.png -%%INGODIR%%/themes/graphics/whitelist.png -%%INGODIR%%/vacation.php -%%INGODIR%%/whitelist.php -%%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrm %%INGODIR%%/themes/graphics -@dirrm %%INGODIR%%/themes -@dirrm %%INGODIR%%/templates/whitelist -@dirrm %%INGODIR%%/templates/vacation -@dirrm %%INGODIR%%/templates/script -@dirrm %%INGODIR%%/templates/rule -@dirrm %%INGODIR%%/templates/javascript -@dirrm %%INGODIR%%/templates/forward -@dirrm %%INGODIR%%/templates/filters -@dirrm %%INGODIR%%/templates/blacklist -@dirrm %%INGODIR%%/templates -@dirrm %%INGODIR%%/scripts -@dirrm %%INGODIR%%/po -@dirrm %%INGODIR%%/locale/zh_TW/LC_MESSAGES -@dirrm %%INGODIR%%/locale/zh_TW -@dirrm %%INGODIR%%/locale/sv_SE/LC_MESSAGES -@dirrm %%INGODIR%%/locale/sv_SE -@dirrm %%INGODIR%%/locale/ro_RO/LC_MESSAGES -@dirrm %%INGODIR%%/locale/ro_RO -@dirrm %%INGODIR%%/locale/pt_BR/LC_MESSAGES -@dirrm %%INGODIR%%/locale/pt_BR -@dirrm %%INGODIR%%/locale/pl_PL/LC_MESSAGES -@dirrm %%INGODIR%%/locale/pl_PL -@dirrm %%INGODIR%%/locale/nl_NL/LC_MESSAGES -@dirrm %%INGODIR%%/locale/nl_NL -@dirrm %%INGODIR%%/locale/lv_LV -@dirrm %%INGODIR%%/locale/lt_LT/LC_MESSAGES -@dirrm %%INGODIR%%/locale/lt_LT -@dirrm %%INGODIR%%/locale/it_IT/LC_MESSAGES -@dirrm %%INGODIR%%/locale/it_IT -@dirrm %%INGODIR%%/locale/hu_HU/LC_MESSAGES -@dirrm %%INGODIR%%/locale/hu_HU -@dirrm %%INGODIR%%/locale/fr_FR/LC_MESSAGES -@dirrm %%INGODIR%%/locale/fr_FR -@dirrm %%INGODIR%%/locale/fi_FI/LC_MESSAGES -@dirrm %%INGODIR%%/locale/fi_FI -@dirrm %%INGODIR%%/locale/es_ES/LC_MESSAGES -@dirrm %%INGODIR%%/locale/es_ES -@dirrm %%INGODIR%%/locale/en_US -@dirrm %%INGODIR%%/locale/de_DE/LC_MESSAGES -@dirrm %%INGODIR%%/locale/de_DE -@dirrm %%INGODIR%%/locale/cs_CZ/LC_MESSAGES -@dirrm %%INGODIR%%/locale/cs_CZ -@dirrm %%INGODIR%%/locale -@dirrm %%INGODIR%%/lib/Storage -@dirrm %%INGODIR%%/lib/Script -@dirrm %%INGODIR%%/lib/Driver -@dirrm %%INGODIR%%/lib -@unexec rmdir %D/%%INGODIR%%/config 2>/dev/null || true -@unexec rmdir %D/%%INGODIR%% 2>/dev/null || true diff --git a/mail/horde4-turba/Makefile b/mail/horde4-turba/Makefile deleted file mode 100644 index 2621ef05451f..000000000000 --- a/mail/horde4-turba/Makefile +++ /dev/null @@ -1,106 +0,0 @@ -# Ports collection makefile for: turba -# Date created: Sat Nov 16, 2001 -# Whom: Thierry Thomas (<thierry@thomas.as>) -# -# $FreeBSD$ -# - -PORTNAME= turba -PORTVERSION= 2.0.2 -CATEGORIES= mail www -MASTER_SITES= ftp://ftp.horde.org/pub/turba/ \ - ftp://ftp.planetmirror.com/pub/horde/turba/ \ - ftp://ftp.au.horde.org/pub/horde/turba/ \ - ftp://ftp.be.horde.org/turba/ \ - ftp://ftp.es.horde.org/pub/turba/ \ - ftp://ftp.it.horde.org/pub/mirror/horde.org/turba/ \ - ftp://ftp.nl.horde.org/mirror/horde-ftp/pub/turba/ \ - ftp://ftp.uk.horde.org/mirrors/ftp.horde.org/pub/turba/ \ - http://ftp.horde.org/pub/turba/ -DISTNAME= ${PORTNAME}-h3-${PORTVERSION} - -MAINTAINER= thierry@FreeBSD.org -COMMENT= The Horde contact management application - -#----------------------------------------------------------------------- -# You may define this option: -# -# - WITHOUT_LDAP : if you do not need OpenLDAP; -# -# - WITH_IMSP : run IMSP cyrus-imspd. -# -#----------------------------------------------------------------------- - -RUN_DEPENDS+= ${LOCALBASE}/${LHORDEDIR}/rpc.php:${PORTSDIR}/www/horde - -.if !defined(WITHOUT_LDAP) -USE_PHP= ldap -.endif - -NO_BUILD= yes -USE_REINPLACE= yes - -REINPLACE_ARGS= -i "" -DOCS= COPYING README docs/CHANGES docs/CREDITS docs/INSTALL \ - docs/LDAP docs/RELEASE_NOTES docs/TODO docs/UPGRADING -CONFFILE= attributes.php menu.php prefs.php sources.php -SUB_DIRS= config lib locale po scripts templates themes - -LHORDEDIR?= www/horde -LTURBADIR?= ${LHORDEDIR}/turba - -PLIST_SUB= TURBADIR=${LTURBADIR} -PKGMESSAGE= ${WRKDIR}/pkg-message - -TURBADIR= ${PREFIX}/${LTURBADIR} -CONFDIR= ${TURBADIR}/config - -HORDE_INC= ${LOCALBASE}/etc/horde - -.if exists(${LOCALBASE}/sbin/imspd) -WITH_IMSP= yes -.endif -.if defined(WITH_IMSP) -RUN_DEPENDS+= imspd:${PORTSDIR}/databases/cyrus-imspd -.endif - -pre-configure: - @${RM} ${WRKSRC}/config/sources.php.dist.orig - @${SED} -e "s:/home/httpd/html/horde/turba:${TURBADIR}:g" \ - ${FILESDIR}/httpd.conf.turba > ${WRKDIR}/httpd.conf.turba - @${REINPLACE_CMD} -e "s:/usr/bin/ldapadd:${LOCALBASE}/bin/ldapadd:" \ - ${WRKSRC}/scripts/ldap/addou.pl -.if defined(WITH_IMSP) - @${REINPLACE_CMD} -e "s://UNCOMMENTIFIMSP ::" ${WRKSRC}/config/sources.php.dist -.endif - -do-install: - @${MKDIR} ${TURBADIR} -.for REP in ${SUB_DIRS} - @${CP} -Rp ${WRKSRC}/${REP} ${TURBADIR} -.endfor - @${CP} -p ${WRKSRC}/*.php ${TURBADIR} -.for FILE in ${CONFFILE} - @if [ ! -f ${CONFDIR}/${FILE} ]; then \ - ${CP} ${CONFDIR}/${FILE}.dist ${CONFDIR}/${FILE} ; \ - fi -.endfor - @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${TURBADIR} - @${CHMOD} -R o-rwx ${CONFDIR} - @${INSTALL_DATA} ${WRKDIR}/httpd.conf.turba ${HORDE_INC} -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} -.for FILE in ${DOCS} - @${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR} -.endfor - @${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}." -.endif - -post-install: - @${SED} -e "s:%%TURBADIR%%:${TURBADIR}:;s:%%CONFDIR%%:${CONFDIR}:" \ - < ${FILESDIR}/pkg-message.in > ${PKGMESSAGE} - @${ECHO_MSG} - @${CAT} ${PKGMESSAGE} - @${ECHO_MSG} - -.include <bsd.port.mk> diff --git a/mail/horde4-turba/distinfo b/mail/horde4-turba/distinfo deleted file mode 100644 index 9bc78221e313..000000000000 --- a/mail/horde4-turba/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (turba-h3-2.0.2.tar.gz) = e3b04476d9d18f4c9774f5da76a03f22 -SIZE (turba-h3-2.0.2.tar.gz) = 1227556 diff --git a/mail/horde4-turba/files/httpd.conf.turba b/mail/horde4-turba/files/httpd.conf.turba deleted file mode 100644 index f6674cbb9700..000000000000 --- a/mail/horde4-turba/files/httpd.conf.turba +++ /dev/null @@ -1,31 +0,0 @@ -# This is included in Apache's httpd.conf for Turba -# -# For security, don't serve pages from the Turba configuration and -# library directories. -# -<Directory "/home/httpd/html/horde/turba/config"> - order deny,allow - deny from all -</Directory> -<Directory "/home/httpd/html/horde/turba/lib"> - order deny,allow - deny from all -</Directory> -<Directory "/home/httpd/html/horde/turba/locale"> - order deny,allow - deny from all -</Directory> -<Directory "/home/httpd/html/horde/turba/po"> - order deny,allow - deny from all -</Directory> -<Directory "/home/httpd/html/horde/turba/scripts"> - order deny,allow - deny from all -</Directory> -<Directory "/home/httpd/html/horde/turba/templates"> - order deny,allow - deny from all -</Directory> -# End of Turba configuration ================ - diff --git a/mail/horde4-turba/files/patch-config::sources.php.dist b/mail/horde4-turba/files/patch-config::sources.php.dist deleted file mode 100644 index b3d2dca409fe..000000000000 --- a/mail/horde4-turba/files/patch-config::sources.php.dist +++ /dev/null @@ -1,137 +0,0 @@ ---- config/sources.php.dist.orig Tue Feb 8 21:43:47 2005 -+++ config/sources.php.dist Sun Feb 13 15:54:12 2005 -@@ -454,72 +454,72 @@ - * automatically populated with the current username. - */ - // First, get the user name --$uid = $GLOBALS['prefs']->getValue('imsp_auth_user'); --$pass = $GLOBALS['prefs']->getValue('imsp_auth_pass'); --if (!strlen($uid)) { -- $uid = Auth::getAuth(); -- if (preg_match('/(^.*)@/', $uid, $matches)) { -- $uid = $matches[1]; -- } -- $pass = Auth::getCredential('password'); --} -- --$cfgSources['imsp'] = array( -- 'title' => _("IMSP"), -- 'type' => 'imsp', -- 'params' => array( -- 'server' => 'localhost', -- 'port' => '406', -- 'username' => $uid, -- 'password' => $pass, -- 'name' => $uid, -- 'auth_method' => 'cram_md5', -- 'group_id_field' => 'group', -- 'group_id_value' => 'group', -- 'contact_ownership' => false -- ), -- 'map' => array( -- '__key' => 'name', -- '__type' => '__type', -- '__members' => '__members', -- '__owner' => '__owner', -- '__uid' => '__uid', -- 'name' => 'fullname', -- 'email' => 'email', -- 'alias' => 'alias', -- 'company' => 'company', -- 'notes' => 'notes', -- 'workPhone' => 'phone-work', -- 'fax' => 'fax', -- 'homePhone' => 'phone-home', -- 'cellPhone' => 'cellphone', -- 'freebusyUrl' => 'freebusyUrl' -- ), -- 'search' => array( -- 'name', -- 'email', -- 'alias', -- 'company', -- 'homePhone' -- ), -- 'strict' => array(), -- 'public' => false, -- 'readonly' => false, -- 'export' => true -- ); -+//UNCOMMENTIFIMSP $uid = $GLOBALS['prefs']->getValue('imsp_auth_user'); -+//UNCOMMENTIFIMSP $pass = $GLOBALS['prefs']->getValue('imsp_auth_pass'); -+//UNCOMMENTIFIMSP if (!strlen($uid)) { -+//UNCOMMENTIFIMSP $uid = Auth::getAuth(); -+//UNCOMMENTIFIMSP if (preg_match('/(^.*)@/', $uid, $matches)) { -+//UNCOMMENTIFIMSP $uid = $matches[1]; -+//UNCOMMENTIFIMSP } -+//UNCOMMENTIFIMSP $pass = Auth::getCredential('password'); -+//UNCOMMENTIFIMSP } -+//UNCOMMENTIFIMSP -+//UNCOMMENTIFIMSP $cfgSources['imsp'] = array( -+//UNCOMMENTIFIMSP 'title' => _("IMSP"), -+//UNCOMMENTIFIMSP 'type' => 'imsp', -+//UNCOMMENTIFIMSP 'params' => array( -+//UNCOMMENTIFIMSP 'server' => 'localhost', -+//UNCOMMENTIFIMSP 'port' => '406', -+//UNCOMMENTIFIMSP 'username' => $uid, -+//UNCOMMENTIFIMSP 'password' => $pass, -+//UNCOMMENTIFIMSP 'name' => $uid, -+//UNCOMMENTIFIMSP 'auth_method' => 'cram_md5', -+//UNCOMMENTIFIMSP 'group_id_field' => 'group', -+//UNCOMMENTIFIMSP 'group_id_value' => 'group', -+//UNCOMMENTIFIMSP 'contact_ownership' => false -+//UNCOMMENTIFIMSP ), -+//UNCOMMENTIFIMSP 'map' => array( -+//UNCOMMENTIFIMSP '__key' => 'name', -+//UNCOMMENTIFIMSP '__type' => '__type', -+//UNCOMMENTIFIMSP '__members' => '__members', -+//UNCOMMENTIFIMSP '__owner' => '__owner', -+//UNCOMMENTIFIMSP '__uid' => '__uid', -+//UNCOMMENTIFIMSP 'name' => 'fullname', -+//UNCOMMENTIFIMSP 'email' => 'email', -+//UNCOMMENTIFIMSP 'alias' => 'alias', -+//UNCOMMENTIFIMSP 'company' => 'company', -+//UNCOMMENTIFIMSP 'notes' => 'notes', -+//UNCOMMENTIFIMSP 'workPhone' => 'phone-work', -+//UNCOMMENTIFIMSP 'fax' => 'fax', -+//UNCOMMENTIFIMSP 'homePhone' => 'phone-home', -+//UNCOMMENTIFIMSP 'cellPhone' => 'cellphone', -+//UNCOMMENTIFIMSP 'freebusyUrl' => 'freebusyUrl' -+//UNCOMMENTIFIMSP ), -+//UNCOMMENTIFIMSP 'search' => array( -+//UNCOMMENTIFIMSP 'name', -+//UNCOMMENTIFIMSP 'email', -+//UNCOMMENTIFIMSP 'alias', -+//UNCOMMENTIFIMSP 'company', -+//UNCOMMENTIFIMSP 'homePhone' -+//UNCOMMENTIFIMSP ), -+//UNCOMMENTIFIMSP 'strict' => array(), -+//UNCOMMENTIFIMSP 'public' => false, -+//UNCOMMENTIFIMSP 'readonly' => false, -+//UNCOMMENTIFIMSP 'export' => true -+//UNCOMMENTIFIMSP ); - - /** - * Get any other addressbooks this user might be privy to. - */ --require_once 'Net/IMSP/Utils.php'; --$result = Net_IMSP_Utils::getAllBooks($cfgSources['imsp']); --if (!is_a($result, 'PEAR_Error')) { -- for ($i = 0; $i < count($result); $i++) { -- $cfgSources[sprintf('imsp%d', $i + 1)] = $result[$i]; -- } --} else { -- $notification->push($result); --} -+//UNCOMMENTIFIMSP require_once 'Net/IMSP/Utils.php'; -+//UNCOMMENTIFIMSP $result = Net_IMSP_Utils::getAllBooks($cfgSources['imsp']); -+//UNCOMMENTIFIMSP if (!is_a($result, 'PEAR_Error')) { -+//UNCOMMENTIFIMSP for ($i = 0; $i < count($result); $i++) { -+//UNCOMMENTIFIMSP $cfgSources[sprintf('imsp%d', $i + 1)] = $result[$i]; -+//UNCOMMENTIFIMSP } -+//UNCOMMENTIFIMSP } else { -+//UNCOMMENTIFIMSP $notification->push($result); -+//UNCOMMENTIFIMSP } - - /* Begin Kolab sources. */ - if (!empty($GLOBALS['conf']['kolab']['enabled'])) { diff --git a/mail/horde4-turba/files/pkg-message.in b/mail/horde4-turba/files/pkg-message.in deleted file mode 100644 index f7347f3f3413..000000000000 --- a/mail/horde4-turba/files/pkg-message.in +++ /dev/null @@ -1,21 +0,0 @@ -************************************************************************ -Turba has been installed in %%TURBADIR%% with your blank -configuration files. - -Horde must be configured; if not, see `pkg_info -D -x horde'. - -Then, you might have to tune the configuration files located in -%%CONFDIR%%/, specially the file sources.php. - -Then, you must login to Horde as a Horde Administrator to finish the -configuration. - -You have to create a table in your database; please see -%%TURBADIR%%/scripts/. -You might create a LDAP schema: please see the doc LDAP. - -WARNING! if you are upgrading from Turba v. 1.2.x, you have to alter your -******** schemas. Please read the doc UPGRADING. - -To protect your configuration files, you have to restart Apache. -************************************************************************ diff --git a/mail/horde4-turba/pkg-deinstall b/mail/horde4-turba/pkg-deinstall deleted file mode 100644 index b0a141eef091..000000000000 --- a/mail/horde4-turba/pkg-deinstall +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# -# Backup Turba config files, if needed. - -if [ x$2 != xDEINSTALL ]; then - exit -fi - -if [ -z "${PACKAGE_BUILDING}" ]; then - for cf in `ls ${PKG_PREFIX}/www/horde/turba/config/*php`; do - diff -bBqw $cf $cf.dist >/dev/null 2>&1 - case $? in - 0) # original config file, will be deleted by pkg-plist - ;; - 1) # config file has been updated, must be backuped - cp -p $cf $cf.previous - echo "===> Backing-up..." - echo "---> $cf has been saved ***" - echo "---> as $cf.previous ***" - ;; - *) # not found? - ;; - esac - done -fi diff --git a/mail/horde4-turba/pkg-descr b/mail/horde4-turba/pkg-descr deleted file mode 100644 index 7ad5e825db08..000000000000 --- a/mail/horde4-turba/pkg-descr +++ /dev/null @@ -1,10 +0,0 @@ -Turba is the Horde contact management application. It makes heavy use -of the Horde framework to provide integration with other applications. - -Turba is a fairly complete basic contact management application. -SQL and LDAP backends are available. -You can define the fields in your addressbooks in a very flexible way, -just by changing the config files. -And there are Horde API functions to add and search for contacts. - -WWW: http://horde.org/turba/ diff --git a/mail/horde4-turba/pkg-plist b/mail/horde4-turba/pkg-plist deleted file mode 100644 index cbcd497949cb..000000000000 --- a/mail/horde4-turba/pkg-plist +++ /dev/null @@ -1,266 +0,0 @@ -%%PORTDOCS%%%%DOCSDIR%%/CHANGES -%%PORTDOCS%%%%DOCSDIR%%/COPYING -%%PORTDOCS%%%%DOCSDIR%%/CREDITS -%%PORTDOCS%%%%DOCSDIR%%/INSTALL -%%PORTDOCS%%%%DOCSDIR%%/LDAP -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES -%%PORTDOCS%%%%DOCSDIR%%/TODO -%%PORTDOCS%%%%DOCSDIR%%/UPGRADING -%%TURBADIR%%/add.php -%%TURBADIR%%/browse.php -%%TURBADIR%%/config/.htaccess -%%TURBADIR%%/config/attributes.php -%%TURBADIR%%/config/attributes.php.dist -%%TURBADIR%%/config/conf.xml -%%TURBADIR%%/config/menu.php -%%TURBADIR%%/config/menu.php.dist -%%TURBADIR%%/config/prefs.php -%%TURBADIR%%/config/prefs.php.dist -%%TURBADIR%%/config/sources.php -%%TURBADIR%%/config/sources.php.dist -%%TURBADIR%%/data.php -%%TURBADIR%%/delete.php -%%TURBADIR%%/display.php -%%TURBADIR%%/edit.php -%%TURBADIR%%/index.php -%%TURBADIR%%/lib/.htaccess -%%TURBADIR%%/lib/AbstractObject.php -%%TURBADIR%%/lib/Block/minisearch.php -%%TURBADIR%%/lib/Driver.php -%%TURBADIR%%/lib/Driver/imsp.php -%%TURBADIR%%/lib/Driver/kolab.php -%%TURBADIR%%/lib/Driver/ldap.php -%%TURBADIR%%/lib/Driver/prefs.php -%%TURBADIR%%/lib/Driver/sql.php -%%TURBADIR%%/lib/Group.php -%%TURBADIR%%/lib/List.php -%%TURBADIR%%/lib/List/Plain.php -%%TURBADIR%%/lib/List/Tree.php -%%TURBADIR%%/lib/ListView.php -%%TURBADIR%%/lib/ListView/Rolodex.php -%%TURBADIR%%/lib/ListView/Tree.php -%%TURBADIR%%/lib/Object.php -%%TURBADIR%%/lib/ObjectView.php -%%TURBADIR%%/lib/ObjectView/List.php -%%TURBADIR%%/lib/ObjectView/PhotoID.php -%%TURBADIR%%/lib/Renderer.php -%%TURBADIR%%/lib/Turba.php -%%TURBADIR%%/lib/api.php -%%TURBADIR%%/lib/base.php -%%TURBADIR%%/lib/prefs.php -%%TURBADIR%%/lib/version.php -%%TURBADIR%%/locale/.htaccess -%%TURBADIR%%/locale/ar_SY/LC_MESSAGES/turba.mo -%%TURBADIR%%/locale/bg_BG/LC_MESSAGES/turba.mo -%%TURBADIR%%/locale/ca_ES/LC_MESSAGES/turba.mo -%%TURBADIR%%/locale/cs_CZ/LC_MESSAGES/turba.mo -%%TURBADIR%%/locale/da_DK/LC_MESSAGES/turba.mo -%%TURBADIR%%/locale/de_DE/LC_MESSAGES/turba.mo -%%TURBADIR%%/locale/de_DE/help.xml -%%TURBADIR%%/locale/el_GR/LC_MESSAGES/turba.mo -%%TURBADIR%%/locale/en_US/help.xml -%%TURBADIR%%/locale/es_ES/LC_MESSAGES/turba.mo -%%TURBADIR%%/locale/es_ES/help.xml -%%TURBADIR%%/locale/et_EE/LC_MESSAGES/turba.mo -%%TURBADIR%%/locale/fa_IR/LC_MESSAGES/turba.mo -%%TURBADIR%%/locale/fi_FI/LC_MESSAGES/turba.mo -%%TURBADIR%%/locale/fi_FI/help.xml -%%TURBADIR%%/locale/fr_FR/LC_MESSAGES/turba.mo -%%TURBADIR%%/locale/gl_ES/LC_MESSAGES/turba.mo -%%TURBADIR%%/locale/hu_HU/LC_MESSAGES/turba.mo -%%TURBADIR%%/locale/it_IT/LC_MESSAGES/turba.mo -%%TURBADIR%%/locale/ja_JP/LC_MESSAGES/turba.mo -%%TURBADIR%%/locale/ko_KR/LC_MESSAGES/turba.mo -%%TURBADIR%%/locale/lt_LT/LC_MESSAGES/turba.mo -%%TURBADIR%%/locale/lv_LV/LC_MESSAGES/turba.mo -%%TURBADIR%%/locale/mk_MK/LC_MESSAGES/turba.mo -%%TURBADIR%%/locale/nb_NO/LC_MESSAGES/turba.mo -%%TURBADIR%%/locale/nl_NL/LC_MESSAGES/turba.mo -%%TURBADIR%%/locale/nn_NO/LC_MESSAGES/turba.mo -%%TURBADIR%%/locale/pl_PL/LC_MESSAGES/turba.mo -%%TURBADIR%%/locale/pt_BR/LC_MESSAGES/turba.mo -%%TURBADIR%%/locale/pt_BR/help.xml -%%TURBADIR%%/locale/pt_PT/LC_MESSAGES/turba.mo -%%TURBADIR%%/locale/pt_PT/help.xml -%%TURBADIR%%/locale/ro_RO/LC_MESSAGES/turba.mo -%%TURBADIR%%/locale/ru_RU/LC_MESSAGES/turba.mo -%%TURBADIR%%/locale/sk_SK/LC_MESSAGES/turba.mo -%%TURBADIR%%/locale/sk_SK/help.xml -%%TURBADIR%%/locale/sl_SI/LC_MESSAGES/turba.mo -%%TURBADIR%%/locale/sv_SE/LC_MESSAGES/turba.mo -%%TURBADIR%%/locale/uk_UA/LC_MESSAGES/turba.mo -%%TURBADIR%%/locale/zh_CN/LC_MESSAGES/turba.mo -%%TURBADIR%%/locale/zh_TW/LC_MESSAGES/turba.mo -%%TURBADIR%%/minisearch.php -%%TURBADIR%%/po/.htaccess -%%TURBADIR%%/po/README -%%TURBADIR%%/po/ar_SY.po -%%TURBADIR%%/po/bg_BG.po -%%TURBADIR%%/po/ca_ES.po -%%TURBADIR%%/po/cs_CZ.po -%%TURBADIR%%/po/da_DK.po -%%TURBADIR%%/po/de_DE.po -%%TURBADIR%%/po/el_GR.po -%%TURBADIR%%/po/es_ES.po -%%TURBADIR%%/po/et_EE.po -%%TURBADIR%%/po/fa_IR.po -%%TURBADIR%%/po/fi_FI.po -%%TURBADIR%%/po/fr_FR.po -%%TURBADIR%%/po/gl_ES.po -%%TURBADIR%%/po/hu_HU.po -%%TURBADIR%%/po/it_IT.po -%%TURBADIR%%/po/ja_JP.po -%%TURBADIR%%/po/ko_KR.po -%%TURBADIR%%/po/lt_LT.po -%%TURBADIR%%/po/lv_LV.po -%%TURBADIR%%/po/mk_MK.po -%%TURBADIR%%/po/nb_NO.po -%%TURBADIR%%/po/nl_NL.po -%%TURBADIR%%/po/nn_NO.po -%%TURBADIR%%/po/pl_PL.po -%%TURBADIR%%/po/pt_BR.po -%%TURBADIR%%/po/pt_PT.po -%%TURBADIR%%/po/ro_RO.po -%%TURBADIR%%/po/ru_RU.po -%%TURBADIR%%/po/sk_SK.po -%%TURBADIR%%/po/sl_SI.po -%%TURBADIR%%/po/sv_SE.po -%%TURBADIR%%/po/turba.pot -%%TURBADIR%%/po/uk_UA.po -%%TURBADIR%%/po/zh_CN.po -%%TURBADIR%%/po/zh_TW.po -%%TURBADIR%%/scripts/.htaccess -%%TURBADIR%%/scripts/Turba.reg -%%TURBADIR%%/scripts/ldap/addou -%%TURBADIR%%/scripts/ldap/addou.pl -%%TURBADIR%%/scripts/ldap/core.schema.patch -%%TURBADIR%%/scripts/ldap/rfc2739.schema -%%TURBADIR%%/scripts/sql/turba_objects.mysql.sql -%%TURBADIR%%/scripts/sql/turba_objects.oci8.sql -%%TURBADIR%%/scripts/sql/turba_objects.pgsql.sql -%%TURBADIR%%/scripts/sql/turba_objects.sql -%%TURBADIR%%/scripts/sql/turba_weddingguests.sql -%%TURBADIR%%/scripts/upgrades/1.2_to_2.0.mysql.sql -%%TURBADIR%%/scripts/upgrades/2004-10-26_create_default_histories.php -%%TURBADIR%%/search.php -%%TURBADIR%%/templates/.htaccess -%%TURBADIR%%/templates/block/minisearch.inc -%%TURBADIR%%/templates/browse/actions.inc -%%TURBADIR%%/templates/browse/column_footers.inc -%%TURBADIR%%/templates/browse/column_headers.inc -%%TURBADIR%%/templates/browse/contactrow.inc -%%TURBADIR%%/templates/browse/footer.inc -%%TURBADIR%%/templates/browse/footerAlpha.inc -%%TURBADIR%%/templates/browse/header.inc -%%TURBADIR%%/templates/browse/javascript.inc -%%TURBADIR%%/templates/browse/search.inc -%%TURBADIR%%/templates/browse/search_criteria.inc -%%TURBADIR%%/templates/browse/select.inc -%%TURBADIR%%/templates/common-header.inc -%%TURBADIR%%/templates/data/export.inc -%%TURBADIR%%/templates/data/import.inc -%%TURBADIR%%/templates/menu.inc -%%TURBADIR%%/templates/prefs/columnselect.inc -%%TURBADIR%%/test.php -%%TURBADIR%%/themes/graphics/contact.png -%%TURBADIR%%/themes/graphics/group.png -%%TURBADIR%%/themes/graphics/menu/browse.png -%%TURBADIR%%/themes/graphics/menu/new.png -%%TURBADIR%%/themes/graphics/new.png -%%TURBADIR%%/themes/graphics/turba.png -%%TURBADIR%%/themes/screen.css -%%TURBADIR%%/vcard.php -etc/horde/httpd.conf.turba -%%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrm %%TURBADIR%%/lib/Block -@dirrm %%TURBADIR%%/lib/Driver -@dirrm %%TURBADIR%%/lib/List -@dirrm %%TURBADIR%%/lib/ListView -@dirrm %%TURBADIR%%/lib/ObjectView -@dirrm %%TURBADIR%%/lib -@dirrm %%TURBADIR%%/locale/ar_SY/LC_MESSAGES -@dirrm %%TURBADIR%%/locale/ar_SY -@dirrm %%TURBADIR%%/locale/bg_BG/LC_MESSAGES -@dirrm %%TURBADIR%%/locale/bg_BG -@dirrm %%TURBADIR%%/locale/ca_ES/LC_MESSAGES -@dirrm %%TURBADIR%%/locale/ca_ES -@dirrm %%TURBADIR%%/locale/cs_CZ/LC_MESSAGES -@dirrm %%TURBADIR%%/locale/cs_CZ -@dirrm %%TURBADIR%%/locale/da_DK/LC_MESSAGES -@dirrm %%TURBADIR%%/locale/da_DK -@dirrm %%TURBADIR%%/locale/de_DE/LC_MESSAGES -@dirrm %%TURBADIR%%/locale/de_DE -@dirrm %%TURBADIR%%/locale/el_GR/LC_MESSAGES -@dirrm %%TURBADIR%%/locale/el_GR -@dirrm %%TURBADIR%%/locale/en_US -@dirrm %%TURBADIR%%/locale/es_ES/LC_MESSAGES -@dirrm %%TURBADIR%%/locale/es_ES -@dirrm %%TURBADIR%%/locale/et_EE/LC_MESSAGES -@dirrm %%TURBADIR%%/locale/et_EE -@dirrm %%TURBADIR%%/locale/fa_IR/LC_MESSAGES -@dirrm %%TURBADIR%%/locale/fa_IR -@dirrm %%TURBADIR%%/locale/fi_FI/LC_MESSAGES -@dirrm %%TURBADIR%%/locale/fi_FI -@dirrm %%TURBADIR%%/locale/fr_FR/LC_MESSAGES -@dirrm %%TURBADIR%%/locale/fr_FR -@dirrm %%TURBADIR%%/locale/gl_ES/LC_MESSAGES -@dirrm %%TURBADIR%%/locale/gl_ES -@dirrm %%TURBADIR%%/locale/hu_HU/LC_MESSAGES -@dirrm %%TURBADIR%%/locale/hu_HU -@dirrm %%TURBADIR%%/locale/it_IT/LC_MESSAGES -@dirrm %%TURBADIR%%/locale/it_IT -@dirrm %%TURBADIR%%/locale/ja_JP/LC_MESSAGES -@dirrm %%TURBADIR%%/locale/ja_JP -@dirrm %%TURBADIR%%/locale/ko_KR/LC_MESSAGES -@dirrm %%TURBADIR%%/locale/ko_KR -@dirrm %%TURBADIR%%/locale/lt_LT/LC_MESSAGES -@dirrm %%TURBADIR%%/locale/lt_LT -@dirrm %%TURBADIR%%/locale/lv_LV/LC_MESSAGES -@dirrm %%TURBADIR%%/locale/lv_LV -@dirrm %%TURBADIR%%/locale/mk_MK/LC_MESSAGES -@dirrm %%TURBADIR%%/locale/mk_MK -@dirrm %%TURBADIR%%/locale/nb_NO/LC_MESSAGES -@dirrm %%TURBADIR%%/locale/nb_NO -@dirrm %%TURBADIR%%/locale/nl_NL/LC_MESSAGES -@dirrm %%TURBADIR%%/locale/nl_NL -@dirrm %%TURBADIR%%/locale/nn_NO/LC_MESSAGES -@dirrm %%TURBADIR%%/locale/nn_NO -@dirrm %%TURBADIR%%/locale/pl_PL/LC_MESSAGES -@dirrm %%TURBADIR%%/locale/pl_PL -@dirrm %%TURBADIR%%/locale/pt_BR/LC_MESSAGES -@dirrm %%TURBADIR%%/locale/pt_BR -@dirrm %%TURBADIR%%/locale/pt_PT/LC_MESSAGES -@dirrm %%TURBADIR%%/locale/pt_PT -@dirrm %%TURBADIR%%/locale/ro_RO/LC_MESSAGES -@dirrm %%TURBADIR%%/locale/ro_RO -@dirrm %%TURBADIR%%/locale/ru_RU/LC_MESSAGES -@dirrm %%TURBADIR%%/locale/ru_RU -@dirrm %%TURBADIR%%/locale/sk_SK/LC_MESSAGES -@dirrm %%TURBADIR%%/locale/sk_SK -@dirrm %%TURBADIR%%/locale/sl_SI/LC_MESSAGES -@dirrm %%TURBADIR%%/locale/sl_SI -@dirrm %%TURBADIR%%/locale/sv_SE/LC_MESSAGES -@dirrm %%TURBADIR%%/locale/sv_SE -@dirrm %%TURBADIR%%/locale/uk_UA/LC_MESSAGES -@dirrm %%TURBADIR%%/locale/uk_UA -@dirrm %%TURBADIR%%/locale/zh_CN/LC_MESSAGES -@dirrm %%TURBADIR%%/locale/zh_CN -@dirrm %%TURBADIR%%/locale/zh_TW/LC_MESSAGES -@dirrm %%TURBADIR%%/locale/zh_TW -@dirrm %%TURBADIR%%/locale -@dirrm %%TURBADIR%%/po -@dirrm %%TURBADIR%%/scripts/ldap -@dirrm %%TURBADIR%%/scripts/sql -@dirrm %%TURBADIR%%/scripts/upgrades -@dirrm %%TURBADIR%%/scripts -@dirrm %%TURBADIR%%/templates/block -@dirrm %%TURBADIR%%/templates/browse -@dirrm %%TURBADIR%%/templates/data -@dirrm %%TURBADIR%%/templates/prefs -@dirrm %%TURBADIR%%/templates -@dirrm %%TURBADIR%%/themes/graphics/menu -@dirrm %%TURBADIR%%/themes/graphics -@dirrm %%TURBADIR%%/themes -@unexec rmdir %D/%%TURBADIR%%/config 2>/dev/null || true -@unexec rmdir %D/%%TURBADIR%% 2>/dev/null || true diff --git a/mail/ilohamail-devel/Makefile b/mail/ilohamail-devel/Makefile deleted file mode 100644 index 42e3ab4394ba..000000000000 --- a/mail/ilohamail-devel/Makefile +++ /dev/null @@ -1,65 +0,0 @@ -# New ports collection makefile for: ilohamail -# Date created: 2004-01-20 -# Whom: TAKATSU Tomonari <tota@rtfm.jp> -# -# $FreeBSD$ -# - -PORTNAME= ilohamail -PORTVERSION= 0.8.13 -PORTREVISION= 1 -CATEGORIES= mail www -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ilohamail -DISTNAME= IlohaMail-${PORTVERSION} - -MAINTAINER= tota@rtfm.jp -COMMENT= IlohaMail is a lightweight multilingual webmail program - -NO_BUILD= yes -USE_PHP= pcre -WANT_PHP_WEB= yes - -.if !defined(WITHOUT_MYSQL) -USE_PHP+= mysql -PLIST_SUB+= MYSQL="" -.else -PLIST_SUB+= MYSQL="@comment " -.endif - -.if !defined(WITHOUT_WWWDIR) -ILOHADIR= ${PREFIX}/www/ilohamail -.else -ILOHADIR= ${PREFIX}/ilohamail -.endif - -PLIST_SUB+= ILOHADIR="${ILOHADIR:S,^${PREFIX}/,,}" -PKGMESSAGE= ${WRKDIR}/pkg-message - -pre-everything:: - @${ECHO_MSG} "" - @${ECHO_MSG} " define WITHOUT_MYSQL: not to use MySQL back-end" - @${ECHO_MSG} "" - -do-install: - @${MKDIR} ${ILOHADIR} - ${CP} -Rp ${WRKSRC}/IlohaMail/ ${ILOHADIR} - ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${ILOHADIR}/data -.if !defined(WITHOUT_MYSQL) - @${MKDIR} ${DATADIR} - ${CP} -Rp ${WRKSRC}/MySQL ${DATADIR} -.endif -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - cd ${WRKSRC}; ${CP} -Rp INSTALL README RELEASE_NOTES \ - THEMES TODO UPGRADING Manual ${DOCSDIR} -.endif - -post-install: - @${SED} -e 's|%%ILOHADIR%%|${ILOHADIR}|g' \ - -e 's|%%DATADIR%%|${DATADIR}|g' \ - -e 's|%%DOCSDIR%%|${DOCSDIR}|g' \ - < ${MASTERDIR}/pkg-message > ${PKGMESSAGE} - @${CAT} ${PKGMESSAGE} - -.include <bsd.port.mk> diff --git a/mail/ilohamail-devel/distinfo b/mail/ilohamail-devel/distinfo deleted file mode 100644 index fbb94ebb3a4a..000000000000 --- a/mail/ilohamail-devel/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (IlohaMail-0.8.13.tar.gz) = 491f1a7e9ab3a5e34c006c9693ef6406 -SIZE (IlohaMail-0.8.13.tar.gz) = 364963 diff --git a/mail/ilohamail-devel/pkg-descr b/mail/ilohamail-devel/pkg-descr deleted file mode 100644 index e0d6ae38c9cc..000000000000 --- a/mail/ilohamail-devel/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -IlohaMail (pronounced: e-lo-ha-mail) is a lightweight, yet full featured, -multilingual webmail program that is easy to use and install. It runs on a -stock, default build of PHP, and does not require databases (although -database support is available). IlohaMail supports IMAP and POP3. - -WWW: http://ilohamail.org/ diff --git a/mail/ilohamail-devel/pkg-message b/mail/ilohamail-devel/pkg-message deleted file mode 100644 index 64409c974ac2..000000000000 --- a/mail/ilohamail-devel/pkg-message +++ /dev/null @@ -1,41 +0,0 @@ -========================================================================== -IlohaMail has now been installed. - -Create a redirect one of the following methods: - - add an alias to apache's httpd.conf pointing to %%ILOHADIR%%/source - - create a VirtualHost with DocumentRoot set to %%ILOHADIR%%/source - - make a symbolic link to %%ILOHADIR%%/source - -Check your PHP.ini file. You need: - - short_open_tag = On - - file_uploads = On - -Edit %%ILOHADIR%%/conf/conf.inc and -%%ILOHADIR%%/conf/login.inc files as necessary. - -Using the MySQL back-end is also recommended. - - 1. Create database user who has rights on webmail database manipulation - by following "sample" mysql commands: - - $ mysql -u root -p - mysql> use mysql; - mysql> grant select,insert,update,delete,index, - -> alter,create,drop,references, lock tables, - -> create temporary tables on webmail.* to webmail@localhost - -> identified by 'password'; - mysql> flush privileges; - - 2. Create a MySQL database. - $ mysqladmin create webmail - - 3. Create tables. - $ mysql webmail < %%DATADIR%%/MySQL/sql - - 4. Configure %%ILOHADIR%%/conf/db_conf.php. - - 5. Set value of $backend in %%ILOHADIR%%/conf/conf.inc from "FS" to "DB". - -For more complete database setup, post-installation instructions -please read IlohaMail Guide in %%DOCSDIR%%/Manual. -========================================================================== diff --git a/mail/ilohamail-devel/pkg-plist b/mail/ilohamail-devel/pkg-plist deleted file mode 100644 index f01b22d2aa0e..000000000000 --- a/mail/ilohamail-devel/pkg-plist +++ /dev/null @@ -1,833 +0,0 @@ -%%PORTDOCS%%%%DOCSDIR%%/INSTALL -%%PORTDOCS%%%%DOCSDIR%%/Manual/configure.MySQL.html -%%PORTDOCS%%%%DOCSDIR%%/Manual/configure.html -%%PORTDOCS%%%%DOCSDIR%%/Manual/configure.php.html -%%PORTDOCS%%%%DOCSDIR%%/Manual/custom.smtp.html -%%PORTDOCS%%%%DOCSDIR%%/Manual/install.html -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES -%%PORTDOCS%%%%DOCSDIR%%/THEMES -%%PORTDOCS%%%%DOCSDIR%%/TODO -%%PORTDOCS%%%%DOCSDIR%%/UPGRADING -%%MYSQL%%%%DATADIR%%/MySQL/0.7.3.sql -%%MYSQL%%%%DATADIR%%/MySQL/0.7.5.sql -%%MYSQL%%%%DATADIR%%/MySQL/0.7.6.sql -%%MYSQL%%%%DATADIR%%/MySQL/0.7.9.sql -%%MYSQL%%%%DATADIR%%/MySQL/0.8.0.sql -%%MYSQL%%%%DATADIR%%/MySQL/0.8.10.sql -%%MYSQL%%%%DATADIR%%/MySQL/0.8.5.sql -%%MYSQL%%%%DATADIR%%/MySQL/sql -%%ILOHADIR%%/conf/conf.inc -%%ILOHADIR%%/conf/custom_auth.inc -%%ILOHADIR%%/conf/db_conf.php -%%ILOHADIR%%/conf/defaults.generic.inc -%%ILOHADIR%%/conf/defaults.inc -%%ILOHADIR%%/conf/login.inc -%%ILOHADIR%%/conf/login_blurb.inc -%%ILOHADIR%%/conf/login_title.inc -%%ILOHADIR%%/conf/mysqlrc.inc -%%ILOHADIR%%/conf/new_user.inc -%%ILOHADIR%%/data/cache/index.html -%%ILOHADIR%%/data/gpg/index.html -%%ILOHADIR%%/data/index.html -%%ILOHADIR%%/data/sessions/index.html -%%ILOHADIR%%/data/uploads/index.html -%%ILOHADIR%%/data/users/index.html -%%ILOHADIR%%/include/antispam.inc -%%ILOHADIR%%/include/array2php.inc -%%ILOHADIR%%/include/array2sql.inc -%%ILOHADIR%%/include/as_update.DB.inc -%%ILOHADIR%%/include/as_update.inc -%%ILOHADIR%%/include/cache.DB.inc -%%ILOHADIR%%/include/cache.FS.inc -%%ILOHADIR%%/include/cache.inc -%%ILOHADIR%%/include/calendar.inc -%%ILOHADIR%%/include/contacts_commons.inc -%%ILOHADIR%%/include/css.inc -%%ILOHADIR%%/include/data_manager.FS.inc -%%ILOHADIR%%/include/data_manager.MySQL.inc -%%ILOHADIR%%/include/data_manager.inc -%%ILOHADIR%%/include/display_monthly_calendar.inc -%%ILOHADIR%%/include/edit_calendar.inc -%%ILOHADIR%%/include/encryption.inc -%%ILOHADIR%%/include/gpg.inc -%%ILOHADIR%%/include/header_main.inc -%%ILOHADIR%%/include/icl.inc -%%ILOHADIR%%/include/idba.MySQL.inc -%%ILOHADIR%%/include/identities.inc -%%ILOHADIR%%/include/imap.inc -%%ILOHADIR%%/include/init.inc -%%ILOHADIR%%/include/javascript.inc -%%ILOHADIR%%/include/langs.inc -%%ILOHADIR%%/include/log.DB.inc -%%ILOHADIR%%/include/log.FS.inc -%%ILOHADIR%%/include/log.inc -%%ILOHADIR%%/include/log.syslog.inc -%%ILOHADIR%%/include/main.inc -%%ILOHADIR%%/include/main_tools.inc -%%ILOHADIR%%/include/mime.inc -%%ILOHADIR%%/include/mod_base64.inc -%%ILOHADIR%%/include/nocache.inc -%%ILOHADIR%%/include/pop3.inc -%%ILOHADIR%%/include/pref_header.inc -%%ILOHADIR%%/include/qp_enc.inc -%%ILOHADIR%%/include/read_message_handler.inc -%%ILOHADIR%%/include/read_message_print.inc -%%ILOHADIR%%/include/read_message_tools.inc -%%ILOHADIR%%/include/read_tnef_print.inc -%%ILOHADIR%%/include/ryosdates.inc -%%ILOHADIR%%/include/ryosimap.inc -%%ILOHADIR%%/include/save_colors.DB.inc -%%ILOHADIR%%/include/save_colors.FS.inc -%%ILOHADIR%%/include/save_colors.inc -%%ILOHADIR%%/include/save_prefs.DB.inc -%%ILOHADIR%%/include/save_prefs.FS.inc -%%ILOHADIR%%/include/save_prefs.inc -%%ILOHADIR%%/include/session_auth.DB.inc -%%ILOHADIR%%/include/session_auth.FS.inc -%%ILOHADIR%%/include/session_auth.inc -%%ILOHADIR%%/include/session_close.DB.inc -%%ILOHADIR%%/include/session_close.FS.inc -%%ILOHADIR%%/include/session_close.inc -%%ILOHADIR%%/include/smtp.inc -%%ILOHADIR%%/include/sort2darray.inc -%%ILOHADIR%%/include/spellcheck.inc -%%ILOHADIR%%/include/stack.inc -%%ILOHADIR%%/include/stopwatch.inc -%%ILOHADIR%%/include/super2global.inc -%%ILOHADIR%%/include/tnef_decoder.inc -%%ILOHADIR%%/include/utf7.inc -%%ILOHADIR%%/include/utf8.inc -%%ILOHADIR%%/include/version.inc -%%ILOHADIR%%/include/write_sinc.DB.inc -%%ILOHADIR%%/include/write_sinc.FS.inc -%%ILOHADIR%%/include/write_sinc.inc -%%ILOHADIR%%/index.html -%%ILOHADIR%%/lang/BIG5.inc -%%ILOHADIR%%/lang/EUC-JP.inc -%%ILOHADIR%%/lang/EUC-KR.inc -%%ILOHADIR%%/lang/GB2312.inc -%%ILOHADIR%%/lang/ISO-8859-1.inc -%%ILOHADIR%%/lang/ISO-8859-2.inc -%%ILOHADIR%%/lang/ISO-8859-9.inc -%%ILOHADIR%%/lang/US-ASCII.inc -%%ILOHADIR%%/lang/UTF-8.inc -%%ILOHADIR%%/lang/Windows-1251.inc -%%ILOHADIR%%/lang/Windows-1255.inc -%%ILOHADIR%%/lang/Windows-1256.inc -%%ILOHADIR%%/lang/X-EUC-JP.inc -%%ILOHADIR%%/lang/ar/bookmarks.inc -%%ILOHADIR%%/lang/ar/calendar.inc -%%ILOHADIR%%/lang/ar/compose.inc -%%ILOHADIR%%/lang/ar/contacts.inc -%%ILOHADIR%%/lang/ar/cp.inc -%%ILOHADIR%%/lang/ar/dates.inc -%%ILOHADIR%%/lang/ar/defaultFolders.inc -%%ILOHADIR%%/lang/ar/edit_contact.inc -%%ILOHADIR%%/lang/ar/edit_folders.inc -%%ILOHADIR%%/lang/ar/folders.inc -%%ILOHADIR%%/lang/ar/init.inc -%%ILOHADIR%%/lang/ar/login.inc -%%ILOHADIR%%/lang/ar/main.inc -%%ILOHADIR%%/lang/ar/pref_colors.inc -%%ILOHADIR%%/lang/ar/pref_identities.inc -%%ILOHADIR%%/lang/ar/prefs.inc -%%ILOHADIR%%/lang/ar/quota.inc -%%ILOHADIR%%/lang/ar/read_message.inc -%%ILOHADIR%%/lang/ar/search.inc -%%ILOHADIR%%/lang/ar/search_errors.inc -%%ILOHADIR%%/lang/ar/tool.inc -%%ILOHADIR%%/lang/bg/bookmarks.inc -%%ILOHADIR%%/lang/bg/calendar.inc -%%ILOHADIR%%/lang/bg/compose.inc -%%ILOHADIR%%/lang/bg/contacts.inc -%%ILOHADIR%%/lang/bg/cp.inc -%%ILOHADIR%%/lang/bg/dates.inc -%%ILOHADIR%%/lang/bg/defaultFolders.inc -%%ILOHADIR%%/lang/bg/edit_contact.inc -%%ILOHADIR%%/lang/bg/edit_folders.inc -%%ILOHADIR%%/lang/bg/folders.inc -%%ILOHADIR%%/lang/bg/init.inc -%%ILOHADIR%%/lang/bg/login.inc -%%ILOHADIR%%/lang/bg/main.inc -%%ILOHADIR%%/lang/bg/pref_colors.inc -%%ILOHADIR%%/lang/bg/pref_identities.inc -%%ILOHADIR%%/lang/bg/prefs.inc -%%ILOHADIR%%/lang/bg/quota.inc -%%ILOHADIR%%/lang/bg/read_message.inc -%%ILOHADIR%%/lang/bg/search.inc -%%ILOHADIR%%/lang/bg/search_errors.inc -%%ILOHADIR%%/lang/bg/tool.inc -%%ILOHADIR%%/lang/br/bookmarks.inc -%%ILOHADIR%%/lang/br/calendar.inc -%%ILOHADIR%%/lang/br/compose.inc -%%ILOHADIR%%/lang/br/contacts.inc -%%ILOHADIR%%/lang/br/cp.inc -%%ILOHADIR%%/lang/br/dates.inc -%%ILOHADIR%%/lang/br/defaultFolders.inc -%%ILOHADIR%%/lang/br/edit_contact.inc -%%ILOHADIR%%/lang/br/edit_folders.inc -%%ILOHADIR%%/lang/br/folders.inc -%%ILOHADIR%%/lang/br/init.inc -%%ILOHADIR%%/lang/br/login.inc -%%ILOHADIR%%/lang/br/main.inc -%%ILOHADIR%%/lang/br/pref_colors.inc -%%ILOHADIR%%/lang/br/pref_identities.inc -%%ILOHADIR%%/lang/br/prefs.inc -%%ILOHADIR%%/lang/br/quota.inc -%%ILOHADIR%%/lang/br/read_message.inc -%%ILOHADIR%%/lang/br/search.inc -%%ILOHADIR%%/lang/br/search_errors.inc -%%ILOHADIR%%/lang/br/tool.inc -%%ILOHADIR%%/lang/cat/bookmarks.inc -%%ILOHADIR%%/lang/cat/calendar.inc -%%ILOHADIR%%/lang/cat/compose.inc -%%ILOHADIR%%/lang/cat/contacts.inc -%%ILOHADIR%%/lang/cat/cp.inc -%%ILOHADIR%%/lang/cat/dates.inc -%%ILOHADIR%%/lang/cat/defaultFolders.inc -%%ILOHADIR%%/lang/cat/edit_contact.inc -%%ILOHADIR%%/lang/cat/edit_folders.inc -%%ILOHADIR%%/lang/cat/folders.inc -%%ILOHADIR%%/lang/cat/init.inc -%%ILOHADIR%%/lang/cat/login.inc -%%ILOHADIR%%/lang/cat/main.inc -%%ILOHADIR%%/lang/cat/pref_colors.inc -%%ILOHADIR%%/lang/cat/pref_identities.inc -%%ILOHADIR%%/lang/cat/prefs.inc -%%ILOHADIR%%/lang/cat/quota.inc -%%ILOHADIR%%/lang/cat/read_message.inc -%%ILOHADIR%%/lang/cat/search.inc -%%ILOHADIR%%/lang/cat/search_errors.inc -%%ILOHADIR%%/lang/cat/tool.inc -%%ILOHADIR%%/lang/cn/bookmarks.inc -%%ILOHADIR%%/lang/cn/calendar.inc -%%ILOHADIR%%/lang/cn/compose.inc -%%ILOHADIR%%/lang/cn/contacts.inc -%%ILOHADIR%%/lang/cn/cp.inc -%%ILOHADIR%%/lang/cn/dates.inc -%%ILOHADIR%%/lang/cn/defaultFolders.inc -%%ILOHADIR%%/lang/cn/edit_contact.inc -%%ILOHADIR%%/lang/cn/edit_folders.inc -%%ILOHADIR%%/lang/cn/folders.inc -%%ILOHADIR%%/lang/cn/init.inc -%%ILOHADIR%%/lang/cn/login.inc -%%ILOHADIR%%/lang/cn/main.inc -%%ILOHADIR%%/lang/cn/pref_colors.inc -%%ILOHADIR%%/lang/cn/pref_identities.inc -%%ILOHADIR%%/lang/cn/prefs.inc -%%ILOHADIR%%/lang/cn/quota.inc -%%ILOHADIR%%/lang/cn/read_message.inc -%%ILOHADIR%%/lang/cn/search.inc -%%ILOHADIR%%/lang/cn/search_errors.inc -%%ILOHADIR%%/lang/cn/tool.inc -%%ILOHADIR%%/lang/common.inc -%%ILOHADIR%%/lang/cz/bookmarks.inc -%%ILOHADIR%%/lang/cz/calendar.inc -%%ILOHADIR%%/lang/cz/compose.inc -%%ILOHADIR%%/lang/cz/contacts.inc -%%ILOHADIR%%/lang/cz/cp.inc -%%ILOHADIR%%/lang/cz/dates.inc -%%ILOHADIR%%/lang/cz/defaultFolders.inc -%%ILOHADIR%%/lang/cz/edit_contact.inc -%%ILOHADIR%%/lang/cz/edit_folders.inc -%%ILOHADIR%%/lang/cz/folders.inc -%%ILOHADIR%%/lang/cz/init.inc -%%ILOHADIR%%/lang/cz/login.inc -%%ILOHADIR%%/lang/cz/main.inc -%%ILOHADIR%%/lang/cz/pref_colors.inc -%%ILOHADIR%%/lang/cz/pref_identities.inc -%%ILOHADIR%%/lang/cz/prefs.inc -%%ILOHADIR%%/lang/cz/quota.inc -%%ILOHADIR%%/lang/cz/read_message.inc -%%ILOHADIR%%/lang/cz/search.inc -%%ILOHADIR%%/lang/cz/search_errors.inc -%%ILOHADIR%%/lang/cz/tool.inc -%%ILOHADIR%%/lang/de/bookmarks.inc -%%ILOHADIR%%/lang/de/calendar.inc -%%ILOHADIR%%/lang/de/compose.inc -%%ILOHADIR%%/lang/de/contacts.inc -%%ILOHADIR%%/lang/de/cp.inc -%%ILOHADIR%%/lang/de/dates.inc -%%ILOHADIR%%/lang/de/defaultFolders.inc -%%ILOHADIR%%/lang/de/edit_contact.inc -%%ILOHADIR%%/lang/de/edit_folders.inc -%%ILOHADIR%%/lang/de/folders.inc -%%ILOHADIR%%/lang/de/init.inc -%%ILOHADIR%%/lang/de/login.inc -%%ILOHADIR%%/lang/de/main.inc -%%ILOHADIR%%/lang/de/pref_colors.inc -%%ILOHADIR%%/lang/de/pref_identities.inc -%%ILOHADIR%%/lang/de/prefs.inc -%%ILOHADIR%%/lang/de/quota.inc -%%ILOHADIR%%/lang/de/read_message.inc -%%ILOHADIR%%/lang/de/search.inc -%%ILOHADIR%%/lang/de/search_errors.inc -%%ILOHADIR%%/lang/de/tool.inc -%%ILOHADIR%%/lang/dk/bookmarks.inc -%%ILOHADIR%%/lang/dk/calendar.inc -%%ILOHADIR%%/lang/dk/compose.inc -%%ILOHADIR%%/lang/dk/contacts.inc -%%ILOHADIR%%/lang/dk/cp.inc -%%ILOHADIR%%/lang/dk/dates.inc -%%ILOHADIR%%/lang/dk/defaultFolders.inc -%%ILOHADIR%%/lang/dk/edit_contact.inc -%%ILOHADIR%%/lang/dk/edit_folders.inc -%%ILOHADIR%%/lang/dk/folders.inc -%%ILOHADIR%%/lang/dk/init.inc -%%ILOHADIR%%/lang/dk/login.inc -%%ILOHADIR%%/lang/dk/main.inc -%%ILOHADIR%%/lang/dk/pref_colors.inc -%%ILOHADIR%%/lang/dk/pref_identities.inc -%%ILOHADIR%%/lang/dk/prefs.inc -%%ILOHADIR%%/lang/dk/quota.inc -%%ILOHADIR%%/lang/dk/read_message.inc -%%ILOHADIR%%/lang/dk/search.inc -%%ILOHADIR%%/lang/dk/search_errors.inc -%%ILOHADIR%%/lang/dk/tool.inc -%%ILOHADIR%%/lang/eng/bookmarks.inc -%%ILOHADIR%%/lang/eng/calendar.inc -%%ILOHADIR%%/lang/eng/compose.inc -%%ILOHADIR%%/lang/eng/contacts.inc -%%ILOHADIR%%/lang/eng/cp.inc -%%ILOHADIR%%/lang/eng/dates.inc -%%ILOHADIR%%/lang/eng/defaultFolders.inc -%%ILOHADIR%%/lang/eng/edit_contact.inc -%%ILOHADIR%%/lang/eng/edit_folders.inc -%%ILOHADIR%%/lang/eng/folders.inc -%%ILOHADIR%%/lang/eng/init.inc -%%ILOHADIR%%/lang/eng/login.inc -%%ILOHADIR%%/lang/eng/main.inc -%%ILOHADIR%%/lang/eng/pref_colors.inc -%%ILOHADIR%%/lang/eng/pref_identities.inc -%%ILOHADIR%%/lang/eng/prefs.inc -%%ILOHADIR%%/lang/eng/quota.inc -%%ILOHADIR%%/lang/eng/read_message.inc -%%ILOHADIR%%/lang/eng/search.inc -%%ILOHADIR%%/lang/eng/search_errors.inc -%%ILOHADIR%%/lang/eng/tool.inc -%%ILOHADIR%%/lang/eng_GB/bookmarks.inc -%%ILOHADIR%%/lang/eng_GB/calendar.inc -%%ILOHADIR%%/lang/eng_GB/compose.inc -%%ILOHADIR%%/lang/eng_GB/contacts.inc -%%ILOHADIR%%/lang/eng_GB/cp.inc -%%ILOHADIR%%/lang/eng_GB/dates.inc -%%ILOHADIR%%/lang/eng_GB/defaultFolders.inc -%%ILOHADIR%%/lang/eng_GB/edit_contact.inc -%%ILOHADIR%%/lang/eng_GB/edit_folders.inc -%%ILOHADIR%%/lang/eng_GB/folders.inc -%%ILOHADIR%%/lang/eng_GB/init.inc -%%ILOHADIR%%/lang/eng_GB/login.inc -%%ILOHADIR%%/lang/eng_GB/main.inc -%%ILOHADIR%%/lang/eng_GB/pref_colors.inc -%%ILOHADIR%%/lang/eng_GB/pref_identities.inc -%%ILOHADIR%%/lang/eng_GB/prefs.inc -%%ILOHADIR%%/lang/eng_GB/quota.inc -%%ILOHADIR%%/lang/eng_GB/read_message.inc -%%ILOHADIR%%/lang/eng_GB/search.inc -%%ILOHADIR%%/lang/eng_GB/search_errors.inc -%%ILOHADIR%%/lang/eng_GB/tool.inc -%%ILOHADIR%%/lang/es/bookmarks.inc -%%ILOHADIR%%/lang/es/calendar.inc -%%ILOHADIR%%/lang/es/compose.inc -%%ILOHADIR%%/lang/es/contacts.inc -%%ILOHADIR%%/lang/es/cp.inc -%%ILOHADIR%%/lang/es/dates.inc -%%ILOHADIR%%/lang/es/defaultFolders.inc -%%ILOHADIR%%/lang/es/edit_contact.inc -%%ILOHADIR%%/lang/es/edit_folders.inc -%%ILOHADIR%%/lang/es/folders.inc -%%ILOHADIR%%/lang/es/init.inc -%%ILOHADIR%%/lang/es/login.inc -%%ILOHADIR%%/lang/es/main.inc -%%ILOHADIR%%/lang/es/pref_colors.inc -%%ILOHADIR%%/lang/es/pref_identities.inc -%%ILOHADIR%%/lang/es/prefs.inc -%%ILOHADIR%%/lang/es/quota.inc -%%ILOHADIR%%/lang/es/read_message.inc -%%ILOHADIR%%/lang/es/search.inc -%%ILOHADIR%%/lang/es/search_errors.inc -%%ILOHADIR%%/lang/es/tool.inc -%%ILOHADIR%%/lang/fr/bookmarks.inc -%%ILOHADIR%%/lang/fr/calendar.inc -%%ILOHADIR%%/lang/fr/compose.inc -%%ILOHADIR%%/lang/fr/contacts.inc -%%ILOHADIR%%/lang/fr/cp.inc -%%ILOHADIR%%/lang/fr/dates.inc -%%ILOHADIR%%/lang/fr/defaultFolders.inc -%%ILOHADIR%%/lang/fr/edit_contact.inc -%%ILOHADIR%%/lang/fr/edit_folders.inc -%%ILOHADIR%%/lang/fr/folders.inc -%%ILOHADIR%%/lang/fr/init.inc -%%ILOHADIR%%/lang/fr/login.inc -%%ILOHADIR%%/lang/fr/main.inc -%%ILOHADIR%%/lang/fr/pref_colors.inc -%%ILOHADIR%%/lang/fr/pref_identities.inc -%%ILOHADIR%%/lang/fr/prefs.inc -%%ILOHADIR%%/lang/fr/quota.inc -%%ILOHADIR%%/lang/fr/read_message.inc -%%ILOHADIR%%/lang/fr/search.inc -%%ILOHADIR%%/lang/fr/search_errors.inc -%%ILOHADIR%%/lang/fr/tool.inc -%%ILOHADIR%%/lang/ga/bookmarks.inc -%%ILOHADIR%%/lang/ga/calendar.inc -%%ILOHADIR%%/lang/ga/compose.inc -%%ILOHADIR%%/lang/ga/contacts.inc -%%ILOHADIR%%/lang/ga/cp.inc -%%ILOHADIR%%/lang/ga/dates.inc -%%ILOHADIR%%/lang/ga/defaultFolders.inc -%%ILOHADIR%%/lang/ga/edit_contact.inc -%%ILOHADIR%%/lang/ga/edit_folders.inc -%%ILOHADIR%%/lang/ga/folders.inc -%%ILOHADIR%%/lang/ga/init.inc -%%ILOHADIR%%/lang/ga/login.inc -%%ILOHADIR%%/lang/ga/main.inc -%%ILOHADIR%%/lang/ga/pref_colors.inc -%%ILOHADIR%%/lang/ga/pref_identities.inc -%%ILOHADIR%%/lang/ga/prefs.inc -%%ILOHADIR%%/lang/ga/quota.inc -%%ILOHADIR%%/lang/ga/read_message.inc -%%ILOHADIR%%/lang/ga/search.inc -%%ILOHADIR%%/lang/ga/search_errors.inc -%%ILOHADIR%%/lang/ga/tool.inc -%%ILOHADIR%%/lang/hu/bookmarks.inc -%%ILOHADIR%%/lang/hu/calendar.inc -%%ILOHADIR%%/lang/hu/compose.inc -%%ILOHADIR%%/lang/hu/contacts.inc -%%ILOHADIR%%/lang/hu/cp.inc -%%ILOHADIR%%/lang/hu/dates.inc -%%ILOHADIR%%/lang/hu/defaultFolders.inc -%%ILOHADIR%%/lang/hu/edit_contact.inc -%%ILOHADIR%%/lang/hu/edit_folders.inc -%%ILOHADIR%%/lang/hu/folders.inc -%%ILOHADIR%%/lang/hu/init.inc -%%ILOHADIR%%/lang/hu/login.inc -%%ILOHADIR%%/lang/hu/main.inc -%%ILOHADIR%%/lang/hu/pref_colors.inc -%%ILOHADIR%%/lang/hu/pref_identities.inc -%%ILOHADIR%%/lang/hu/prefs.inc -%%ILOHADIR%%/lang/hu/quota.inc -%%ILOHADIR%%/lang/hu/read_message.inc -%%ILOHADIR%%/lang/hu/search.inc -%%ILOHADIR%%/lang/hu/search_errors.inc -%%ILOHADIR%%/lang/hu/tool.inc -%%ILOHADIR%%/lang/it/bookmarks.inc -%%ILOHADIR%%/lang/it/calendar.inc -%%ILOHADIR%%/lang/it/compose.inc -%%ILOHADIR%%/lang/it/contacts.inc -%%ILOHADIR%%/lang/it/cp.inc -%%ILOHADIR%%/lang/it/dates.inc -%%ILOHADIR%%/lang/it/defaultFolders.inc -%%ILOHADIR%%/lang/it/edit_contact.inc -%%ILOHADIR%%/lang/it/edit_folders.inc -%%ILOHADIR%%/lang/it/folders.inc -%%ILOHADIR%%/lang/it/init.inc -%%ILOHADIR%%/lang/it/login.inc -%%ILOHADIR%%/lang/it/main.inc -%%ILOHADIR%%/lang/it/pref_colors.inc -%%ILOHADIR%%/lang/it/pref_identities.inc -%%ILOHADIR%%/lang/it/prefs.inc -%%ILOHADIR%%/lang/it/quota.inc -%%ILOHADIR%%/lang/it/read_message.inc -%%ILOHADIR%%/lang/it/search.inc -%%ILOHADIR%%/lang/it/search_errors.inc -%%ILOHADIR%%/lang/it/tool.inc -%%ILOHADIR%%/lang/jp/bookmarks.inc -%%ILOHADIR%%/lang/jp/calendar.inc -%%ILOHADIR%%/lang/jp/compose.inc -%%ILOHADIR%%/lang/jp/contacts.inc -%%ILOHADIR%%/lang/jp/cp.inc -%%ILOHADIR%%/lang/jp/dates.inc -%%ILOHADIR%%/lang/jp/defaultFolders.inc -%%ILOHADIR%%/lang/jp/edit_contact.inc -%%ILOHADIR%%/lang/jp/edit_folders.inc -%%ILOHADIR%%/lang/jp/folders.inc -%%ILOHADIR%%/lang/jp/init.inc -%%ILOHADIR%%/lang/jp/jcode.inc -%%ILOHADIR%%/lang/jp/login.inc -%%ILOHADIR%%/lang/jp/main.inc -%%ILOHADIR%%/lang/jp/pref_colors.inc -%%ILOHADIR%%/lang/jp/pref_identities.inc -%%ILOHADIR%%/lang/jp/prefs.inc -%%ILOHADIR%%/lang/jp/quota.inc -%%ILOHADIR%%/lang/jp/read_message.inc -%%ILOHADIR%%/lang/jp/search.inc -%%ILOHADIR%%/lang/jp/search_errors.inc -%%ILOHADIR%%/lang/jp/tool.inc -%%ILOHADIR%%/lang/kr/bookmarks.inc -%%ILOHADIR%%/lang/kr/calendar.inc -%%ILOHADIR%%/lang/kr/compose.inc -%%ILOHADIR%%/lang/kr/contacts.inc -%%ILOHADIR%%/lang/kr/cp.inc -%%ILOHADIR%%/lang/kr/dates.inc -%%ILOHADIR%%/lang/kr/defaultFolders.inc -%%ILOHADIR%%/lang/kr/edit_contact.inc -%%ILOHADIR%%/lang/kr/edit_folders.inc -%%ILOHADIR%%/lang/kr/folders.inc -%%ILOHADIR%%/lang/kr/init.inc -%%ILOHADIR%%/lang/kr/login.inc -%%ILOHADIR%%/lang/kr/main.inc -%%ILOHADIR%%/lang/kr/pref_colors.inc -%%ILOHADIR%%/lang/kr/pref_identities.inc -%%ILOHADIR%%/lang/kr/prefs.inc -%%ILOHADIR%%/lang/kr/quota.inc -%%ILOHADIR%%/lang/kr/read_message.inc -%%ILOHADIR%%/lang/kr/search.inc -%%ILOHADIR%%/lang/kr/search_errors.inc -%%ILOHADIR%%/lang/kr/tool.inc -%%ILOHADIR%%/lang/nl/bookmarks.inc -%%ILOHADIR%%/lang/nl/calendar.inc -%%ILOHADIR%%/lang/nl/compose.inc -%%ILOHADIR%%/lang/nl/contacts.inc -%%ILOHADIR%%/lang/nl/cp.inc -%%ILOHADIR%%/lang/nl/dates.inc -%%ILOHADIR%%/lang/nl/defaultFolders.inc -%%ILOHADIR%%/lang/nl/edit_contact.inc -%%ILOHADIR%%/lang/nl/edit_folders.inc -%%ILOHADIR%%/lang/nl/folders.inc -%%ILOHADIR%%/lang/nl/init.inc -%%ILOHADIR%%/lang/nl/login.inc -%%ILOHADIR%%/lang/nl/main.inc -%%ILOHADIR%%/lang/nl/pref_colors.inc -%%ILOHADIR%%/lang/nl/pref_identities.inc -%%ILOHADIR%%/lang/nl/prefs.inc -%%ILOHADIR%%/lang/nl/quota.inc -%%ILOHADIR%%/lang/nl/read_message.inc -%%ILOHADIR%%/lang/nl/search.inc -%%ILOHADIR%%/lang/nl/search_errors.inc -%%ILOHADIR%%/lang/nl/tool.inc -%%ILOHADIR%%/lang/nn_NO/bookmarks.inc -%%ILOHADIR%%/lang/nn_NO/calendar.inc -%%ILOHADIR%%/lang/nn_NO/compose.inc -%%ILOHADIR%%/lang/nn_NO/contacts.inc -%%ILOHADIR%%/lang/nn_NO/cp.inc -%%ILOHADIR%%/lang/nn_NO/dates.inc -%%ILOHADIR%%/lang/nn_NO/defaultFolders.inc -%%ILOHADIR%%/lang/nn_NO/edit_contact.inc -%%ILOHADIR%%/lang/nn_NO/edit_folders.inc -%%ILOHADIR%%/lang/nn_NO/folders.inc -%%ILOHADIR%%/lang/nn_NO/init.inc -%%ILOHADIR%%/lang/nn_NO/login.inc -%%ILOHADIR%%/lang/nn_NO/main.inc -%%ILOHADIR%%/lang/nn_NO/pref_colors.inc -%%ILOHADIR%%/lang/nn_NO/pref_identities.inc -%%ILOHADIR%%/lang/nn_NO/prefs.inc -%%ILOHADIR%%/lang/nn_NO/quota.inc -%%ILOHADIR%%/lang/nn_NO/read_message.inc -%%ILOHADIR%%/lang/nn_NO/search.inc -%%ILOHADIR%%/lang/nn_NO/search_errors.inc -%%ILOHADIR%%/lang/nn_NO/tool.inc -%%ILOHADIR%%/lang/no/bookmarks.inc -%%ILOHADIR%%/lang/no/calendar.inc -%%ILOHADIR%%/lang/no/compose.inc -%%ILOHADIR%%/lang/no/contacts.inc -%%ILOHADIR%%/lang/no/cp.inc -%%ILOHADIR%%/lang/no/dates.inc -%%ILOHADIR%%/lang/no/defaultFolders.inc -%%ILOHADIR%%/lang/no/edit_contact.inc -%%ILOHADIR%%/lang/no/edit_folders.inc -%%ILOHADIR%%/lang/no/folders.inc -%%ILOHADIR%%/lang/no/init.inc -%%ILOHADIR%%/lang/no/login.inc -%%ILOHADIR%%/lang/no/main.inc -%%ILOHADIR%%/lang/no/pref_colors.inc -%%ILOHADIR%%/lang/no/pref_identities.inc -%%ILOHADIR%%/lang/no/prefs.inc -%%ILOHADIR%%/lang/no/quota.inc -%%ILOHADIR%%/lang/no/read_message.inc -%%ILOHADIR%%/lang/no/search.inc -%%ILOHADIR%%/lang/no/search_errors.inc -%%ILOHADIR%%/lang/no/tool.inc -%%ILOHADIR%%/lang/notes.txt -%%ILOHADIR%%/lang/pl/bookmarks.inc -%%ILOHADIR%%/lang/pl/calendar.inc -%%ILOHADIR%%/lang/pl/compose.inc -%%ILOHADIR%%/lang/pl/contacts.inc -%%ILOHADIR%%/lang/pl/cp.inc -%%ILOHADIR%%/lang/pl/dates.inc -%%ILOHADIR%%/lang/pl/defaultFolders.inc -%%ILOHADIR%%/lang/pl/edit_contact.inc -%%ILOHADIR%%/lang/pl/edit_folders.inc -%%ILOHADIR%%/lang/pl/folders.inc -%%ILOHADIR%%/lang/pl/init.inc -%%ILOHADIR%%/lang/pl/login.inc -%%ILOHADIR%%/lang/pl/main.inc -%%ILOHADIR%%/lang/pl/pref_colors.inc -%%ILOHADIR%%/lang/pl/pref_identities.inc -%%ILOHADIR%%/lang/pl/prefs.inc -%%ILOHADIR%%/lang/pl/quota.inc -%%ILOHADIR%%/lang/pl/read_message.inc -%%ILOHADIR%%/lang/pl/search.inc -%%ILOHADIR%%/lang/pl/search_errors.inc -%%ILOHADIR%%/lang/pl/tool.inc -%%ILOHADIR%%/lang/pt/bookmarks.inc -%%ILOHADIR%%/lang/pt/calendar.inc -%%ILOHADIR%%/lang/pt/compose.inc -%%ILOHADIR%%/lang/pt/contacts.inc -%%ILOHADIR%%/lang/pt/cp.inc -%%ILOHADIR%%/lang/pt/dates.inc -%%ILOHADIR%%/lang/pt/defaultFolders.inc -%%ILOHADIR%%/lang/pt/edit_contact.inc -%%ILOHADIR%%/lang/pt/edit_folders.inc -%%ILOHADIR%%/lang/pt/folders.inc -%%ILOHADIR%%/lang/pt/init.inc -%%ILOHADIR%%/lang/pt/login.inc -%%ILOHADIR%%/lang/pt/main.inc -%%ILOHADIR%%/lang/pt/pref_colors.inc -%%ILOHADIR%%/lang/pt/pref_identities.inc -%%ILOHADIR%%/lang/pt/prefs.inc -%%ILOHADIR%%/lang/pt/quota.inc -%%ILOHADIR%%/lang/pt/read_message.inc -%%ILOHADIR%%/lang/pt/search.inc -%%ILOHADIR%%/lang/pt/search_errors.inc -%%ILOHADIR%%/lang/pt/tool.inc -%%ILOHADIR%%/lang/ro/bookmarks.inc -%%ILOHADIR%%/lang/ro/calendar.inc -%%ILOHADIR%%/lang/ro/compose.inc -%%ILOHADIR%%/lang/ro/contacts.inc -%%ILOHADIR%%/lang/ro/cp.inc -%%ILOHADIR%%/lang/ro/dates.inc -%%ILOHADIR%%/lang/ro/defaultFolders.inc -%%ILOHADIR%%/lang/ro/edit_contact.inc -%%ILOHADIR%%/lang/ro/edit_folders.inc -%%ILOHADIR%%/lang/ro/folders.inc -%%ILOHADIR%%/lang/ro/init.inc -%%ILOHADIR%%/lang/ro/login.inc -%%ILOHADIR%%/lang/ro/main.inc -%%ILOHADIR%%/lang/ro/pref_colors.inc -%%ILOHADIR%%/lang/ro/pref_identities.inc -%%ILOHADIR%%/lang/ro/prefs.inc -%%ILOHADIR%%/lang/ro/quota.inc -%%ILOHADIR%%/lang/ro/read_message.inc -%%ILOHADIR%%/lang/ro/search.inc -%%ILOHADIR%%/lang/ro/search_errors.inc -%%ILOHADIR%%/lang/ro/tool.inc -%%ILOHADIR%%/lang/ru/bookmarks.inc -%%ILOHADIR%%/lang/ru/calendar.inc -%%ILOHADIR%%/lang/ru/compose.inc -%%ILOHADIR%%/lang/ru/contacts.inc -%%ILOHADIR%%/lang/ru/cp.inc -%%ILOHADIR%%/lang/ru/dates.inc -%%ILOHADIR%%/lang/ru/defaultFolders.inc -%%ILOHADIR%%/lang/ru/edit_contact.inc -%%ILOHADIR%%/lang/ru/edit_folders.inc -%%ILOHADIR%%/lang/ru/folders.inc -%%ILOHADIR%%/lang/ru/init.inc -%%ILOHADIR%%/lang/ru/login.inc -%%ILOHADIR%%/lang/ru/main.inc -%%ILOHADIR%%/lang/ru/pref_colors.inc -%%ILOHADIR%%/lang/ru/pref_identities.inc -%%ILOHADIR%%/lang/ru/prefs.inc -%%ILOHADIR%%/lang/ru/quota.inc -%%ILOHADIR%%/lang/ru/read_message.inc -%%ILOHADIR%%/lang/ru/search.inc -%%ILOHADIR%%/lang/ru/search_errors.inc -%%ILOHADIR%%/lang/ru/tool.inc -%%ILOHADIR%%/lang/se/bookmarks.inc -%%ILOHADIR%%/lang/se/calendar.inc -%%ILOHADIR%%/lang/se/compose.inc -%%ILOHADIR%%/lang/se/contacts.inc -%%ILOHADIR%%/lang/se/cp.inc -%%ILOHADIR%%/lang/se/dates.inc -%%ILOHADIR%%/lang/se/defaultFolders.inc -%%ILOHADIR%%/lang/se/edit_contact.inc -%%ILOHADIR%%/lang/se/edit_folders.inc -%%ILOHADIR%%/lang/se/folders.inc -%%ILOHADIR%%/lang/se/init.inc -%%ILOHADIR%%/lang/se/login.inc -%%ILOHADIR%%/lang/se/main.inc -%%ILOHADIR%%/lang/se/pref_colors.inc -%%ILOHADIR%%/lang/se/pref_identities.inc -%%ILOHADIR%%/lang/se/prefs.inc -%%ILOHADIR%%/lang/se/quota.inc -%%ILOHADIR%%/lang/se/read_message.inc -%%ILOHADIR%%/lang/se/search.inc -%%ILOHADIR%%/lang/se/search_errors.inc -%%ILOHADIR%%/lang/se/tool.inc -%%ILOHADIR%%/lang/si/bookmarks.inc -%%ILOHADIR%%/lang/si/calendar.inc -%%ILOHADIR%%/lang/si/compose.inc -%%ILOHADIR%%/lang/si/contacts.inc -%%ILOHADIR%%/lang/si/cp.inc -%%ILOHADIR%%/lang/si/dates.inc -%%ILOHADIR%%/lang/si/defaultFolders.inc -%%ILOHADIR%%/lang/si/edit_contact.inc -%%ILOHADIR%%/lang/si/edit_folders.inc -%%ILOHADIR%%/lang/si/folders.inc -%%ILOHADIR%%/lang/si/init.inc -%%ILOHADIR%%/lang/si/login.inc -%%ILOHADIR%%/lang/si/main.inc -%%ILOHADIR%%/lang/si/pref_colors.inc -%%ILOHADIR%%/lang/si/pref_identities.inc -%%ILOHADIR%%/lang/si/prefs.inc -%%ILOHADIR%%/lang/si/quota.inc -%%ILOHADIR%%/lang/si/read_message.inc -%%ILOHADIR%%/lang/si/search.inc -%%ILOHADIR%%/lang/si/search_errors.inc -%%ILOHADIR%%/lang/si/tool.inc -%%ILOHADIR%%/lang/tr/bookmarks.inc -%%ILOHADIR%%/lang/tr/calendar.inc -%%ILOHADIR%%/lang/tr/compose.inc -%%ILOHADIR%%/lang/tr/contacts.inc -%%ILOHADIR%%/lang/tr/cp.inc -%%ILOHADIR%%/lang/tr/dates.inc -%%ILOHADIR%%/lang/tr/defaultFolders.inc -%%ILOHADIR%%/lang/tr/edit_contact.inc -%%ILOHADIR%%/lang/tr/edit_folders.inc -%%ILOHADIR%%/lang/tr/folders.inc -%%ILOHADIR%%/lang/tr/init.inc -%%ILOHADIR%%/lang/tr/login.inc -%%ILOHADIR%%/lang/tr/main.inc -%%ILOHADIR%%/lang/tr/pref_colors.inc -%%ILOHADIR%%/lang/tr/pref_identities.inc -%%ILOHADIR%%/lang/tr/prefs.inc -%%ILOHADIR%%/lang/tr/quota.inc -%%ILOHADIR%%/lang/tr/read_message.inc -%%ILOHADIR%%/lang/tr/search.inc -%%ILOHADIR%%/lang/tr/search_errors.inc -%%ILOHADIR%%/lang/tr/tool.inc -%%ILOHADIR%%/lang/tw/bookmarks.inc -%%ILOHADIR%%/lang/tw/calendar.inc -%%ILOHADIR%%/lang/tw/compose.inc -%%ILOHADIR%%/lang/tw/contacts.inc -%%ILOHADIR%%/lang/tw/cp.inc -%%ILOHADIR%%/lang/tw/dates.inc -%%ILOHADIR%%/lang/tw/defaultFolders.inc -%%ILOHADIR%%/lang/tw/edit_contact.inc -%%ILOHADIR%%/lang/tw/edit_folders.inc -%%ILOHADIR%%/lang/tw/folders.inc -%%ILOHADIR%%/lang/tw/init.inc -%%ILOHADIR%%/lang/tw/login.inc -%%ILOHADIR%%/lang/tw/main.inc -%%ILOHADIR%%/lang/tw/pref_colors.inc -%%ILOHADIR%%/lang/tw/pref_identities.inc -%%ILOHADIR%%/lang/tw/prefs.inc -%%ILOHADIR%%/lang/tw/quota.inc -%%ILOHADIR%%/lang/tw/read_message.inc -%%ILOHADIR%%/lang/tw/search.inc -%%ILOHADIR%%/lang/tw/search_errors.inc -%%ILOHADIR%%/lang/tw/tool.inc -%%ILOHADIR%%/lang/vn/bookmarks.inc -%%ILOHADIR%%/lang/vn/calendar.inc -%%ILOHADIR%%/lang/vn/compose.inc -%%ILOHADIR%%/lang/vn/contacts.inc -%%ILOHADIR%%/lang/vn/cp.inc -%%ILOHADIR%%/lang/vn/dates.inc -%%ILOHADIR%%/lang/vn/defaultFolders.inc -%%ILOHADIR%%/lang/vn/edit_contact.inc -%%ILOHADIR%%/lang/vn/edit_folders.inc -%%ILOHADIR%%/lang/vn/folders.inc -%%ILOHADIR%%/lang/vn/init.inc -%%ILOHADIR%%/lang/vn/login.inc -%%ILOHADIR%%/lang/vn/main.inc -%%ILOHADIR%%/lang/vn/pref_colors.inc -%%ILOHADIR%%/lang/vn/pref_identities.inc -%%ILOHADIR%%/lang/vn/prefs.inc -%%ILOHADIR%%/lang/vn/quota.inc -%%ILOHADIR%%/lang/vn/read_message.inc -%%ILOHADIR%%/lang/vn/search.inc -%%ILOHADIR%%/lang/vn/search_errors.inc -%%ILOHADIR%%/lang/vn/tool.inc -%%ILOHADIR%%/source/blank.html -%%ILOHADIR%%/source/bookmarks.php -%%ILOHADIR%%/source/calendar.php -%%ILOHADIR%%/source/compose.php -%%ILOHADIR%%/source/compose2.php -%%ILOHADIR%%/source/contacts.php -%%ILOHADIR%%/source/contacts_popup.php -%%ILOHADIR%%/source/cp.php -%%ILOHADIR%%/source/css.php -%%ILOHADIR%%/source/edit_calendar.php -%%ILOHADIR%%/source/edit_contact.php -%%ILOHADIR%%/source/edit_folders.php -%%ILOHADIR%%/source/folders.php -%%ILOHADIR%%/source/images/inbox.GIF -%%ILOHADIR%%/source/index.php -%%ILOHADIR%%/source/login.php -%%ILOHADIR%%/source/main.php -%%ILOHADIR%%/source/pref_colors.php -%%ILOHADIR%%/source/pref_columns.php -%%ILOHADIR%%/source/pref_gpg.php -%%ILOHADIR%%/source/pref_identities.php -%%ILOHADIR%%/source/prefs.php -%%ILOHADIR%%/source/radar.php -%%ILOHADIR%%/source/read_message.php -%%ILOHADIR%%/source/search_form.php -%%ILOHADIR%%/source/synch.php -%%ILOHADIR%%/source/themes/default/images/addc.gif -%%ILOHADIR%%/source/themes/default/images/allr.gif -%%ILOHADIR%%/source/themes/default/images/application.gif -%%ILOHADIR%%/source/themes/default/images/att.gif -%%ILOHADIR%%/source/themes/default/images/attach.gif -%%ILOHADIR%%/source/themes/default/images/cube.gif -%%ILOHADIR%%/source/themes/default/images/del.gif -%%ILOHADIR%%/source/themes/default/images/folder.gif -%%ILOHADIR%%/source/themes/default/images/forward.gif -%%ILOHADIR%%/source/themes/default/images/heads.gif -%%ILOHADIR%%/source/themes/default/images/image.gif -%%ILOHADIR%%/source/themes/default/images/inbox.GIF -%%ILOHADIR%%/source/themes/default/images/minus.gif -%%ILOHADIR%%/source/themes/default/images/movie.gif -%%ILOHADIR%%/source/themes/default/images/multi.gif -%%ILOHADIR%%/source/themes/default/images/multipart.gif -%%ILOHADIR%%/source/themes/default/images/music.gif -%%ILOHADIR%%/source/themes/default/images/plus.gif -%%ILOHADIR%%/source/themes/default/images/read.gif -%%ILOHADIR%%/source/themes/default/images/reply.gif -%%ILOHADIR%%/source/themes/default/images/showc.gif -%%ILOHADIR%%/source/themes/default/images/src.gif -%%ILOHADIR%%/source/themes/default/images/text.gif -%%ILOHADIR%%/source/themes/default/images/unknown.gif -%%ILOHADIR%%/source/themes/default/images/unread.gif -%%ILOHADIR%%/source/themes/default/info.inc -%%ILOHADIR%%/source/themes/default/override.inc -%%ILOHADIR%%/source/tool.php -%%ILOHADIR%%/source/view.php -@dirrm %%ILOHADIR%%/source/themes/default/images -@dirrm %%ILOHADIR%%/source/themes/default -@dirrm %%ILOHADIR%%/source/themes -@dirrm %%ILOHADIR%%/source/images -@dirrm %%ILOHADIR%%/source -@dirrm %%ILOHADIR%%/lang/vn -@dirrm %%ILOHADIR%%/lang/tw -@dirrm %%ILOHADIR%%/lang/tr -@dirrm %%ILOHADIR%%/lang/si -@dirrm %%ILOHADIR%%/lang/se -@dirrm %%ILOHADIR%%/lang/ru -@dirrm %%ILOHADIR%%/lang/ro -@dirrm %%ILOHADIR%%/lang/pt -@dirrm %%ILOHADIR%%/lang/pl -@dirrm %%ILOHADIR%%/lang/no -@dirrm %%ILOHADIR%%/lang/nn_NO -@dirrm %%ILOHADIR%%/lang/nl -@dirrm %%ILOHADIR%%/lang/kr -@dirrm %%ILOHADIR%%/lang/jp -@dirrm %%ILOHADIR%%/lang/it -@dirrm %%ILOHADIR%%/lang/hu -@dirrm %%ILOHADIR%%/lang/ga -@dirrm %%ILOHADIR%%/lang/fr -@dirrm %%ILOHADIR%%/lang/es -@dirrm %%ILOHADIR%%/lang/eng_GB -@dirrm %%ILOHADIR%%/lang/eng -@dirrm %%ILOHADIR%%/lang/dk -@dirrm %%ILOHADIR%%/lang/de -@dirrm %%ILOHADIR%%/lang/cz -@dirrm %%ILOHADIR%%/lang/cn -@dirrm %%ILOHADIR%%/lang/cat -@dirrm %%ILOHADIR%%/lang/br -@dirrm %%ILOHADIR%%/lang/bg -@dirrm %%ILOHADIR%%/lang/ar -@dirrm %%ILOHADIR%%/lang -@dirrm %%ILOHADIR%%/include -@dirrm %%ILOHADIR%%/data/users -@dirrm %%ILOHADIR%%/data/uploads -@dirrm %%ILOHADIR%%/data/sessions -@dirrm %%ILOHADIR%%/data/gpg -@dirrm %%ILOHADIR%%/data/cache -@dirrm %%ILOHADIR%%/data -@dirrm %%ILOHADIR%%/conf -@dirrm %%ILOHADIR%% -%%MYSQL%%@dirrm %%DATADIR%%/MySQL -%%MYSQL%%@dirrm %%DATADIR%% -%%PORTDOCS%%@dirrm %%DOCSDIR%%/Manual -%%PORTDOCS%%@dirrm %%DOCSDIR%% diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile index 0a0c4b640b38..1e63ddb8a440 100644 --- a/mail/imap-uw/Makefile +++ b/mail/imap-uw/Makefile @@ -6,7 +6,7 @@ # PORTNAME= imap -PORTVERSION= 2004d +PORTVERSION= 2004g PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.cac.washington.edu/imap/%SUBDIR%/ \ diff --git a/mail/imap-uw/distinfo b/mail/imap-uw/distinfo index cd5114221fea..8b87c533ef1a 100644 --- a/mail/imap-uw/distinfo +++ b/mail/imap-uw/distinfo @@ -1,2 +1,2 @@ -MD5 (imap-2004d.tar.Z) = 9bee45a210138d4a924ab95539f5ef35 -SIZE (imap-2004d.tar.Z) = 2223019 +MD5 (imap-2004g.tar.Z) = 9a80f58d8d6a0979c13714ae69050020 +SIZE (imap-2004g.tar.Z) = 2246713 diff --git a/mail/libspf2-10/Makefile b/mail/libspf2-10/Makefile deleted file mode 100644 index 81419234af42..000000000000 --- a/mail/libspf2-10/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# New ports collection makefile for: libspf2 -# Date created: 07 July 2004 -# Whom: snowchyld -# -# $FreeBSD$ -# - -PORTNAME= libspf2 -PORTVERSION= 1.0.4 -CATEGORIES= mail -MASTER_SITES= http://www.libspf2.org/%SUBDIR%/ -MASTER_SITE_SUBDIR= spf - -MAINTAINER= mail-libspf2-freebsd-ports@snowchyld.org -COMMENT= Sender Rewriting Scheme 2 C Implementation - -INSTALLS_SHLIB= yes -GNU_CONFIGURE= yes -USE_LIBTOOL_VER= 15 - -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} - -.include <bsd.port.mk> diff --git a/mail/libspf2-10/distinfo b/mail/libspf2-10/distinfo deleted file mode 100644 index f7fc71c61b4c..000000000000 --- a/mail/libspf2-10/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (libspf2-1.0.4.tar.gz) = 5fe69ba13bf35d505b733247032a8a64 -SIZE (libspf2-1.0.4.tar.gz) = 427613 diff --git a/mail/libspf2-10/pkg-descr b/mail/libspf2-10/pkg-descr deleted file mode 100644 index 8643c9176d99..000000000000 --- a/mail/libspf2-10/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -libsrs2 is the next generation SRS library from the original designer of SRS. -It implements the Sender Rewriting Scheme, a part of the SPF/SRS protocol pair. - -WWW: http://www.libsrs2.org/ -- snowchyld - <mail-libsrs2-freebsd-ports@snowchyld.org> diff --git a/mail/libspf2-10/pkg-plist b/mail/libspf2-10/pkg-plist deleted file mode 100644 index 73bf7996ee84..000000000000 --- a/mail/libspf2-10/pkg-plist +++ /dev/null @@ -1,22 +0,0 @@ -bin/spf_example -bin/spf_example_2mx -bin/spf_example_2mx_static -bin/spf_example_static -bin/spfd -bin/spfd_static -bin/spfquery -bin/spfquery_static -bin/spftest -bin/spftest_static -include/spf2/spf.h -include/spf2/spf_dns.h -include/spf2/spf_dns_cache.h -include/spf2/spf_dns_null.h -include/spf2/spf_dns_resolv.h -include/spf2/spf_dns_test.h -include/spf2/spf_dns_zone.h -include/spf2/spf_lib_version.h -@dirrm include/spf2 -lib/libspf2.a -lib/libspf2.so -lib/libspf2.so.1 diff --git a/mail/milter-greylist/files/milter-greylist.in b/mail/milter-greylist/files/milter-greylist.in deleted file mode 100644 index 15524546d05d..000000000000 --- a/mail/milter-greylist/files/milter-greylist.in +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -# PROVIDE: miltergreylist -# REQUIRE: LOGIN -# BEFORE: sendmail -# KEYWORD: milter-greylist - -# Define these miltergreylist_* variables in one of these files: -# /etc/rc.conf -# /etc/rc.conf.local -# /etc/rc.conf.d/miltergreylist -# -# DO NOT CHANGE THESE DEFAULT VALUES HERE -# - -. %%RC_SUBR%% - -name="miltergreylist" -rcvar=`set_rcvar` - -load_rc_config $name - -miltergreylist_enable=${miltergreylist_enable-"NO"} -miltergreylist_runas=${miltergreylist_runas-"smmsp"} -miltergreylist_pidfile=${miltergreylist_pidfile-"/var/run/milter-greylist.pid"} -miltergreylist_sockfile=${miltergreylist_sockfile-"/var/milter-greylist/milter-greylist.sock"} -miltergreylist_cfgfile=${miltergreylist_cfgfile-"%%PREFIX%%/etc/mail/greylist.conf"} -miltergreylist_flags=${miltergreylist_flags-"-P $miltergreylist_pidfile \ --f $miltergreylist_cfgfile -p $miltergreylist_sockfile -u $miltergreylist_runas"} - -command="%%PREFIX%%/bin/milter-greylist" - -run_rc_command "$1" diff --git a/mail/milter-greylist/files/pkg-message.in b/mail/milter-greylist/files/pkg-message.in deleted file mode 100644 index 398094ce4230..000000000000 --- a/mail/milter-greylist/files/pkg-message.in +++ /dev/null @@ -1,10 +0,0 @@ -===> IMPORTANT NOTE - - A sample configuration file has been installed in ${PREFIX}/etc/mail - directory. Copy and edit it to suit your needs before launching - milter-greylist. - - To run milter-greylist from startup, add miltergreylist_enable="YES" - in your /etc/rc.conf or your /etc/rc.conf.local - - See ${DOCSDIR}/README for operation details. diff --git a/mail/mutt-ng/Makefile b/mail/mutt-ng/Makefile index 1db0c5e59dde..36ff609c4532 100644 --- a/mail/mutt-ng/Makefile +++ b/mail/mutt-ng/Makefile @@ -6,7 +6,7 @@ # PORTNAME= mutt-ng -PORTVERSION= 20050726 +PORTVERSION= 20050927 CATEGORIES= mail MASTER_SITES= http://nion.modprobe.de/mutt-ng/snapshots/ DISTNAME= muttng-${PORTVERSION} @@ -44,44 +44,67 @@ CONFIGURE_ARGS+= --disable-iconv OPTIONS= POP "Enable pop3 support" on \ IMAP "Enable imap support" on \ NNTP "Enable nntp support" off \ - COMPRESSED "Enable compressed folder support" off \ - FLOCK "Enable flock to lock files" off \ - HCACHE "Enable headers caching" on \ + COMPRESSED "Enable compressed folder support" on \ + FLOCK "Enable flock to lock files" on \ + HCACHE_DB4 "Enable headers caching via DB4" on \ + HCACHE_GDBM "Enable headers caching via gdbm" off \ + HCACHE_QDBM "Enable headers caching via qdbm" off \ ESMTP "Enable libesmtp support for sending mail" off \ SLANG "Compile with SLANG frontend" off \ - NCURSES_PORT "Compile with ncurses frontend" off \ - SASL2 "Compile with sasl2 support for authentication" off + NCURSES_PORT "Compile with ncurses frontend via port" off \ + SASL2 "Compile with sasl2 support for authentication" off \ + GNUTLS "Compile with SSL support via GNUTLS" off \ + LIBIDN "Enable international domain names" off \ + DEBUG "Compile a debug version" on .include <bsd.port.pre.mk> +.if defined(WITH_MUTT_MAILDIR_HEADER_CACHE) +WITH_MUTT_IMAP_HEADER_CACHE= yes +.endif + .if defined (WITH_POP) CONFIGURE_ARGS+= --enable-pop .endif -.if defined (WITH_IMAP) +.if defined (WITH_IMAP) || defined(WITH_MUTT_IMAP_HEADER_CACHE) CONFIGURE_ARGS+= --enable-imap .endif -.if defined(WITH_POP) || defined(WITH_IMAP) +.if defined(WITH_POP) || defined(WITH_IMAP) || defined(WITH_NNTP) || defined(WITH_SSL) +.if !defined(WITH_GNUTLS) CONFIGURE_ARGS+= --with-ssl=${OPENSSLBASE} +.else +CONFIGURE_ARGS+= --with-gnutls=${LOCALBASE} +LIB_DEPENDS+= gnutls.12:${PORTSDIR}/security/gnutls +.endif .endif -.if defined (WITH_NNTP) +.if defined (WITH_NNTP) || defined(WITH_MUTT_NNTP) CONFIGURE_ARGS+= --enable-nntp .endif -.if defined (WITH_COMPRESSED) +.if defined (WITH_COMPRESSED) || defined(WITH_MUTT_COMPRESSED_FOLDERS) CONFIGURE_ARGS+= --enable-compressed .endif -.if defined (WITH_HCACHE) +.if defined (WITH_HCACHE_DB4) || defined(WITH_MUTT_IMAP_HEADER_CACHE) CONFIGURE_ARGS+= --enable-hcache --without-qdbm --without-gdbm --with-bdb=${LOCALBASE} LIB_DEPENDS+= db41.1:${PORTSDIR}/databases/db41 +.elif defined (WITH_HCACHE_GDBM) +CONFIGURE_ARGS+= --enable-hcache --without-qdbm +LIB_DEPENDS+= gdbm.3:${PORTSDIR}/databases/gdbm +.elif defined (WITH_HCACHE_QDBM) +CONFIGURE_ARGS+= --enable-hcache +LIB_DEPENDS+= qdbm.11:${PORTSDIR}/databases/qdbm .endif .if defined (WITH_FLOCK) CONFIGURE_ARGS+= --enable-flock CONFIGURE_ARGS+= --disable-fcntl +.elif defined(WITHOUT_MUTT_FLOCK) +CONFIGURE_ARGS+= --disable-flock +CONFIGURE_ARGS+= --enable-fcntl .endif .if defined(WITH_SLANG) && !defined(WITH_NCURSES_PORT) @@ -89,12 +112,12 @@ LIB_DEPENDS+= slang.1:${PORTSDIR}/devel/libslang CONFIGURE_ARGS+= --with-slang=${LOCALBASE} .elif defined(WITH_NCURSES_PORT) && !defined(WITH_SLANG) LIB_DEPENDS+= ncurses.5:${PORTSDIR}/devel/ncurses -CONFIGURE_ARGS+= --with-ncurses=${LOCALBASE} +CONFIGURE_ARGS+= --with-curses=${LOCALBASE} .elif defined(WITH_SLANG) && defined(WITH_NCURSES_PORT) BROKEN= "You may not specify both WITH_SLANG and WITH_NCURSES options" .endif -.if defined(WITH_SASL2) +.if defined(WITH_SASL2) || defined(WITH_MUTT_CYRUS_SASL2) .if !defined(WITH_POP) && !defined(WITH_IMAP) BROKEN= "SASL2 only is useful for imap or pop" .endif @@ -107,6 +130,15 @@ LIB_DEPENDS+= esmtp.6:${PORTSDIR}/mail/libesmtp CONFIGURE_ARGS+= --with-libesmtp=${LOCALBASE} .endif +.if defined(WITH_LIBIDN) +LIB_DEPENDS+= idn.16:${PORTSDIR}/devel/libidn +CONFIGURE_ARGS+= --with-idn=${LOCALBASE} +.endif + +.if defined (WITH_DEBUG) +CONFIGURE_ARGS+= --enable-debug +.endif + .if !defined (NOPORTDOCS) BUILD_DEPENDS+= sgmlfmt:${PORTSDIR}/textproc/sgmlformat .else diff --git a/mail/mutt-ng/distinfo b/mail/mutt-ng/distinfo index 7fad2b710265..1c135adaf975 100644 --- a/mail/mutt-ng/distinfo +++ b/mail/mutt-ng/distinfo @@ -1,2 +1,2 @@ -MD5 (muttng-20050726.tar.gz) = cc3d39cdaa985c28357d0d671e732597 -SIZE (muttng-20050726.tar.gz) = 2272249 +MD5 (muttng-20050927.tar.gz) = f866cf04803285f514d6bda6a91a3395 +SIZE (muttng-20050927.tar.gz) = 2597566 diff --git a/mail/mutt-ng/files/patch-intl_Makefile.in b/mail/mutt-ng/files/patch-intl_Makefile.in deleted file mode 100644 index 7ced86681c2f..000000000000 --- a/mail/mutt-ng/files/patch-intl_Makefile.in +++ /dev/null @@ -1,85 +0,0 @@ ---- intl/Makefile.in.orig Mon Aug 1 13:21:23 2005 -+++ intl/Makefile.in Mon Aug 1 13:24:12 2005 -@@ -142,44 +142,44 @@ - # package, you have to use `configure --with-included-gettext'. - install: install-exec install-data - install-exec: all -- if test "$(PACKAGE)" = "gettext" \ -- && test '@INTLOBJS@' = '$(GETTOBJS)'; then \ -- $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \ -- $(INSTALL_DATA) libintl.h $(DESTDIR)$(includedir)/libintl.h; \ -- $(LIBTOOL) --mode=install \ -- $(INSTALL_DATA) libintl.$la $(DESTDIR)$(libdir)/libintl.$la; \ -- else \ -- : ; \ -- fi -- if test '@USE_INCLUDED_LIBINTL@' = yes; then \ -- $(mkinstalldirs) $(DESTDIR)$(libdir); \ -- temp=$(DESTDIR)$(libdir)/t-charset.alias; \ -- dest=$(DESTDIR)$(libdir)/charset.alias; \ -- if test -f $(DESTDIR)$(libdir)/charset.alias; then \ -- orig=$(DESTDIR)$(libdir)/charset.alias; \ -- sed -f ref-add.sed $$orig > $$temp; \ -- $(INSTALL_DATA) $$temp $$dest; \ -- rm -f $$temp; \ -- else \ -- if test @GLIBC21@ = no; then \ -- orig=charset.alias; \ -- sed -f ref-add.sed $$orig > $$temp; \ -- $(INSTALL_DATA) $$temp $$dest; \ -- rm -f $$temp; \ -- fi; \ -- fi; \ -- $(mkinstalldirs) $(DESTDIR)$(localedir); \ -- test -f $(DESTDIR)$(localedir)/locale.alias \ -- && orig=$(DESTDIR)$(localedir)/locale.alias \ -- || orig=$(srcdir)/locale.alias; \ -- temp=$(DESTDIR)$(localedir)/t-locale.alias; \ -- dest=$(DESTDIR)$(localedir)/locale.alias; \ -- sed -f ref-add.sed $$orig > $$temp; \ -- $(INSTALL_DATA) $$temp $$dest; \ -- rm -f $$temp; \ -- else \ -- : ; \ -- fi -+# if test "$(PACKAGE)" = "gettext" \ -+# && test '@INTLOBJS@' = '$(GETTOBJS)'; then \ -+# $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \ -+# $(INSTALL_DATA) libintl.h $(DESTDIR)$(includedir)/libintl.h; \ -+# $(LIBTOOL) --mode=install \ -+# $(INSTALL_DATA) libintl.$la $(DESTDIR)$(libdir)/libintl.$la; \ -+# else \ -+# : ; \ -+# fi -+# if test '@USE_INCLUDED_LIBINTL@' = yes; then \ -+# $(mkinstalldirs) $(DESTDIR)$(libdir); \ -+# temp=$(DESTDIR)$(libdir)/t-charset.alias; \ -+# dest=$(DESTDIR)$(libdir)/charset.alias; \ -+# if test -f $(DESTDIR)$(libdir)/charset.alias; then \ -+# orig=$(DESTDIR)$(libdir)/charset.alias; \ -+# sed -f ref-add.sed $$orig > $$temp; \ -+# $(INSTALL_DATA) $$temp $$dest; \ -+# rm -f $$temp; \ -+# else \ -+# if test @GLIBC21@ = no; then \ -+# orig=charset.alias; \ -+# sed -f ref-add.sed $$orig > $$temp; \ -+# $(INSTALL_DATA) $$temp $$dest; \ -+# rm -f $$temp; \ -+# fi; \ -+# fi; \ -+# $(mkinstalldirs) $(DESTDIR)$(localedir); \ -+# test -f $(DESTDIR)$(localedir)/locale.alias \ -+# && orig=$(DESTDIR)$(localedir)/locale.alias \ -+# || orig=$(srcdir)/locale.alias; \ -+# temp=$(DESTDIR)$(localedir)/t-locale.alias; \ -+# dest=$(DESTDIR)$(localedir)/locale.alias; \ -+# sed -f ref-add.sed $$orig > $$temp; \ -+# $(INSTALL_DATA) $$temp $$dest; \ -+# rm -f $$temp; \ -+# else \ -+# : ; \ -+# fi - install-data: all - if test "$(PACKAGE)" = "gettext"; then \ - $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \ diff --git a/mail/mutt-ng/files/patch-intl_dcigettext.c b/mail/mutt-ng/files/patch-intl_dcigettext.c deleted file mode 100644 index 840167e151f8..000000000000 --- a/mail/mutt-ng/files/patch-intl_dcigettext.c +++ /dev/null @@ -1,14 +0,0 @@ ---- intl/dcigettext.c.orig Sat Jun 18 01:40:35 2005 -+++ intl/dcigettext.c Sat Jun 18 01:40:57 2005 -@@ -58,11 +58,6 @@ - #include <stdlib.h> - - #include <string.h> --#if !HAVE_STRCHR && !defined _LIBC --# ifndef strchr --# define strchr index --# endif --#endif - - #if defined HAVE_UNISTD_H || defined _LIBC - # include <unistd.h> diff --git a/mail/mutt14/Makefile b/mail/mutt14/Makefile deleted file mode 100644 index 0cc696500f68..000000000000 --- a/mail/mutt14/Makefile +++ /dev/null @@ -1,201 +0,0 @@ -# ex:ts=8 -# Ports collection makefile for: mutt w/pgp hooks -# Date created: Thur July 25, 1996 -# Whom: David O'Brien (obrien@NUXI.com) -# -# $FreeBSD$ -# - -PORTNAME= mutt -PORTVERSION= 1.4.2.1 -PORTREVISION= 2 -CATEGORIES+= mail ipv6 -MASTER_SITES= ftp://ftp.mutt.org/mutt/ \ - ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/ \ - ftp://ftp.demon.co.uk/pub/mirrors/mutt/ \ - ftp://ftp.parodius.com/pub/mutt/ -DISTFILES= ${DISTNAME}i${EXTRACT_SUFX} - -PATCH_SITES= http://www.mutt.org.ua/download/mutt-${PORTVERSION}/:vvv \ - http://www2.mutt.org.ua/download/mutt-${PORTVERSION}/:vvv \ - http://www3.mutt.org.ua/download/mutt-${PORTVERSION}/:vvv \ - ftp://ftp.mutt.org.ua/pub/mutt/mutt-${PORTVERSION}/:vvv \ - ftp://ftp3.mutt.org.ua/pub/mutt/mutt-${PORTVERSION}/:vvv -PATCHFILES= patch-${PORTVERSION}.rr.compressed.gz:vvv \ - patch-${PORTVERSION}.vvv.initials.gz:vvv -PATCH_DIST_STRIP= -p1 - -MAINTAINER?= udo.schweigert@siemens.com -COMMENT?= The Mongrel of Mail User Agents (part Elm, Pine, Mush, mh, etc.) - -CONFLICTS= mutt-devel-* - -RUN_DEPENDS= ${LOCALBASE}/etc/mime.types:${PORTSDIR}/misc/mime-support -.if defined(PACKAGE_BUILDING) && !defined (MUTT_LITE) -WITH_SLANG= yes -BUILD_DEPENDS= ispell:${PORTSDIR}/textproc/ispell -RUN_DEPENDS+= ispell:${PORTSDIR}/textproc/ispell \ - urlview:${PORTSDIR}/textproc/urlview -.endif -.if defined (MUTT_LITE) -PKGNAMESUFFIX= -lite -WITH_SGML_DOCS:=no -.elif ${MACHINE_ARCH} != "alpha" -# coredump in sgmls -WITH_SGML_DOCS?=yes -.endif - -.if !defined(WITHOUT_NLS) -USE_GETTEXT= yes -USE_ICONV= yes -.if defined(WITHOUT_MUTT_ICONV) -.error the WITHOUT_MUTT_ICONV knob of the mutt port only works if \ - WITHOUT_NLS is also given -.endif -.elif !defined(WITHOUT_MUTT_ICONV) -USE_ICONV= yes -.endif - -.if defined(WITH_SLANG) -LIB_DEPENDS+= slang.1:${PORTSDIR}/devel/libslang -.elif defined(WITH_NCURSES_PORT) -LIB_DEPENDS+= ncurses.5:${PORTSDIR}/devel/ncurses -.endif -.if !defined (MUTT_LITE) -.if defined(WITH_MUTT_CYRUS_SASL) -LIB_DEPENDS+= sasl.8:${PORTSDIR}/security/cyrus-sasl -.endif -.if defined(WITH_SGML_DOCS) && ${WITH_SGML_DOCS} != "no" -BUILD_DEPENDS+= sgmlfmt:${PORTSDIR}/textproc/sgmlformat -.endif -.if defined(WITH_MUTT_XFACE) -PATCH_DEPENDS+= ${NONEXISTENT}:${PORTSDIR}/news/slrnface:extract -RUN_DEPENDS+= slrnface:${PORTSDIR}/news/slrnface -.endif -.endif - -DIST_SUBDIR= mutt -WRKSRC= ${WRKDIR}/${DISTNAME:S/i$//} -USE_OPENSSL= yes -GNU_CONFIGURE= yes -USE_AUTOMAKE_VER= 19 # configure.in is patched by <PATCHFILES> -USE_AUTOCONF_VER= 259 -USE_REINPLACE= yes -CONFIGURE_TARGET=${ARCH}-portbld-freebsd${OSREL} -LDFLAGS+= -L${LOCALBASE}/lib -CONFIGURE_ENV= CC="${CC} -I${LOCALBASE}/include" LDFLAGS="${LDFLAGS}" -CONFIGURE_ARGS= --enable-pop --enable-imap --disable-fcntl \ - --with-ssl=${OPENSSLBASE} --sysconfdir=${PREFIX}/etc \ - --with-sharedir=${PREFIX}/share/mutt \ - --with-docdir=${DOCSDIR} --with-charmaps \ - --enable-compressed -.if defined(MUTT_CONFIGURE_ARGS) -CONFIGURE_ARGS+= ${MUTT_CONFIGURE_ARGS} -.endif -.if defined(WITHOUT_MUTT_FLOCK) -CONFIGURE_ARGS+= --disable-flock -.else -CONFIGURE_ARGS+= --enable-flock -.endif -.if defined(WITH_LOCALES_FIX) -CONFIGURE_ARGS+= --enable-locales-fix -.endif -.if defined(WITHOUT_NLS) -CONFIGURE_ARGS+= --disable-nls -PLIST_SUB+= NLS="@comment " -.else -PLIST_SUB+= NLS="" -.endif -.if defined(WITHOUT_MUTT_ICONV) && defined(WITHOUT_NLS) -CONFIGURE_ARGS+= --disable-iconv -.else -CONFIGURE_ARGS+= --with-libiconv-prefix=${PREFIX} -.endif -.if defined(WITH_SLANG) -CONFIGURE_ARGS+= --with-slang=${PREFIX} -.elif defined(WITH_NCURSES_PORT) -CONFIGURE_ARGS+= --with-curses=${PREFIX} -CFLAGS+= -I${PREFIX}/include/ncurses -I${PREFIX}/include -.endif -.if defined(WITH_MUTT_CYRUS_SASL) -CONFIGURE_ARGS+= --with-sasl=${LOCALBASE} -.endif -MAN1= mutt.1 mutt_dotlock.1 -MAN5= mbox.5 muttrc.5 - -post-patch:: - @${REINPLACE_CMD} -e 's,/usr/bin/gpg,${LOCALBASE}/bin/gpg,g' \ - ${WRKSRC}/contrib/gpg.rc - @${REINPLACE_CMD} -e 's,pgp6,pgp,g' \ - ${WRKSRC}/contrib/pgp6.rc - @${REINPLACE_CMD} -E -e 's|@samplesdir@|${EXAMPLESDIR}|g' \ - ${WRKSRC}/contrib/Makefile.in - -.if defined(WITH_MUTT_XFACE) -post-patch:: - @${ECHO} "===> Applying XFACE patch" - slrnface_dir=`${FIND} ${PORTSDIR}/news/slrnface/work -type d \ - -name slrnface-\*`; \ - cd ${BUILD_WRKSRC}; ${PATCH} ${PATCH_ARGS} < $$slrnface_dir/mutt.patch -.endif - -pre-configure:: - @(cd ${WRKSRC}; ${SETENV} ${AUTOMAKE_ENV} ${ACLOCAL} -I m4) - -# XXX -# this should be done automagically by aclocal but .... -# for now, this will have to do -pre-build: - @${REINPLACE_CMD} -E -e "s|^(ACLOCAL = ).+|\1${ACLOCAL}|" \ - -e "s|^(AUTOCONF = ).+|\1${AUTOCONF}|" \ - -e "s|^(AUTOMAKE = ).+|\1${AUTOMAKE}|" \ - -e "s|^(AUTOHEADER = ).+|\1${AUTOHEADER}|" \ - ${BUILD_WRKSRC}/Makefile - -.if !defined(NOPORTDOCS) -post-build: - @${TOUCH} ${WRKSRC}/doc/mutt.man ${WRKSRC}/doc/manual.sgml - @${PATCH} ${PATCH_ARGS} < ${PATCHDIR}/extra-patch-doc-ref - @${REINPLACE_CMD} -E -e 's|\$$\{PREFIX\}|${PREFIX}|g' \ - -e 's|\$$\{DOCSDIR\}|${DOCSDIR}|g' \ - -e 's|\$$\{EXAMPLESDIR\}|${EXAMPLESDIR}|g' \ - ${WRKSRC}/doc/mutt.man - @${REINPLACE_CMD} -E -e 's|\$$\{PREFIX\}|${PREFIX}|g' \ - -e 's|\$$\{DOCSDIR\}|${DOCSDIR}|g' \ - -e 's|\$$\{EXAMPLESDIR\}|${EXAMPLESDIR}|g' \ - ${WRKSRC}/doc/muttrc.man -.if defined(WITH_SGML_DOCS) && ${WITH_SGML_DOCS} != "no" -PLIST:= ${WRKDIR}/PLIST -pre-install: - @${CAT} ${PKGDIR}/pkg-plist.htmlfiles > ${PLIST} - @${CAT} ${PKGDIR}/pkg-plist >> ${PLIST} -.endif -.endif - -post-install: - ${INSTALL_DATA} ${WRKSRC}/Muttrc ${PREFIX}/etc/Muttrc.dist -.if !defined(NOPORTDOCS) - @${ECHO} "===> Installing Mutt documentation" - @${MKDIR} ${DOCSDIR} && ${CHMOD} a+rx ${DOCSDIR} - @cd ${WRKSRC}/doc ; ${INSTALL_MAN} manual.txt PGP-Notes.txt \ - ${DOCSDIR} -.if defined(WITH_SGML_DOCS) && ${WITH_SGML_DOCS} != "no" - ${INSTALL} ${COPY} -o ${MANOWN} -g ${MANGRP} -m 0755 \ - -d ${DOCSDIR}/html - ${INSTALL_MAN} ${WRKSRC}/doc/*.html ${DOCSDIR}/html - ${INSTALL_MAN} ${WRKSRC}/doc/*.latin1 ${DOCSDIR} -.endif -.endif - -.if defined(WITH_MUTT_XFACE) - @${ECHO} "" - @${ECHO} "************************************************************" - @${ECHO} " To enable the XFACE support in mutt you also have to add" - @${ECHO} " set xface=yes" - @${ECHO} " to your ~/.muttrc" - @${ECHO} " Additional information is provided by news/slrnface" - @${ECHO} "************************************************************" - @${ECHO} "" -.endif - -.include <bsd.port.mk> diff --git a/mail/mutt14/distinfo b/mail/mutt14/distinfo deleted file mode 100644 index e4d415068f7c..000000000000 --- a/mail/mutt14/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -MD5 (mutt/mutt-1.4.2.1i.tar.gz) = 710bd56d3c4c4bcd1403bc4e053f7476 -SIZE (mutt/mutt-1.4.2.1i.tar.gz) = 2611253 -MD5 (mutt/patch-1.4.2.1.rr.compressed.gz) = d73694d88089c32e051b0682ab3bca15 -SIZE (mutt/patch-1.4.2.1.rr.compressed.gz) = 10125 -MD5 (mutt/patch-1.4.2.1.vvv.initials.gz) = fd5cca0c29b4e0fb4cf56cec023a5ab6 -SIZE (mutt/patch-1.4.2.1.vvv.initials.gz) = 686 diff --git a/mail/mutt14/files/extra-patch-doc-ref b/mail/mutt14/files/extra-patch-doc-ref deleted file mode 100644 index 99222e0bceb0..000000000000 --- a/mail/mutt14/files/extra-patch-doc-ref +++ /dev/null @@ -1,12 +0,0 @@ ---- doc/mutt.man.orig Mon Jul 13 12:50:38 1998 -+++ doc/mutt.man Thu Oct 1 22:15:40 1998 -@@ -20,7 +20,8 @@ - .SH DESCRIPTION - Mutt is a small but very powerful text based program for reading electronic - mail under unix operating systems, including support color terminals, MIME, --and a threaded sorting mode. -+and a threaded sorting mode. Details of how to use all of this is -+available in \fI${DOCSDIR}\fP. - .SH OPTIONS - .IP "-a \fIfile\fP" - Attach a file to your message using MIME. diff --git a/mail/mutt14/files/patch-02 b/mail/mutt14/files/patch-02 deleted file mode 100644 index 3717189e334f..000000000000 --- a/mail/mutt14/files/patch-02 +++ /dev/null @@ -1,63 +0,0 @@ ---- doc/Makefile.in.orig Tue Nov 6 11:12:31 2001 -+++ doc/Makefile.in Fri Jun 21 12:00:28 2002 -@@ -60,13 +60,19 @@ - topsrcdir_DOCFILES = COPYRIGHT GPL INSTALL ChangeLog \ - README NEWS TODO README.SECURITY README.SSL - --all: muttrc.man try-html try-txt -+all: muttrc.man try-html try-txt try-latin1 - - try-html: ../makedoc -- test -f manual.html || $(MAKE) manual.html || cp $(srcdir)/manual*.html ./ -+ rm -f *.html && $(MAKE) manual.html || cp $(srcdir)/manual*.html ./ -+ touch $@ - - try-txt: ../makedoc -- test -f manual.txt || $(MAKE) manual.txt || cp $(srcdir)/manual.txt ./ -+ $(MAKE) manual.txt || cp $(srcdir)/manual.txt ./ -+ touch $@ -+ -+try-latin1: -+ $(MAKE) manual.latin1 || cp $(srcdir)/manual.latin1 ./ -+ touch $@ - - install: all instdoc - $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1 -@@ -86,10 +92,10 @@ - $(INSTALL) -m 644 $(top_srcdir)/$$f $(DESTDIR)$(docdir) ; \ - done - $(INSTALL) -m 644 manual.txt $(DESTDIR)$(docdir) || true -- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)/html -- for file in manual*.html ; do \ -- $(INSTALL) -m 644 $$file $(DESTDIR)$(docdir)/html/ || true ;\ -- done -+ # $(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)/html -+ # for file in manual*.html ; do \ -+ # $(INSTALL) -m 644 $$file $(DESTDIR)$(docdir)/html/ || true ;\ -+ # done - - uninstall: - -rm -f $(DESTDIR)$(mandir)/man1/mutt.1 -@@ -99,14 +105,18 @@ - - check: - manual.txt: manual.sgml -- if sgml2txt -c latin manual ; then \ -- uniq < manual.txt | expand > _manual.txt ; \ -- rm manual.txt ; \ -+ if sgmlfmt -f ascii manual; then \ -+ uniq < manual.ascii | expand > _manual.txt ; \ -+ rm -f manual.txt manual.ascii; \ - mv _manual.txt manual.txt ;\ - fi - - manual.html: manual.sgml -- sgml2html manual || true -+ @# sgml2html manual || true -+ sgmlfmt -f html manual || true -+ -+manual.latin1: manual.sgml -+ sgmlfmt -f latin1 manual || true - - manual.ps: manual.sgml - sgml2latex --output=ps manual || true diff --git a/mail/mutt14/files/patch-03 b/mail/mutt14/files/patch-03 deleted file mode 100644 index b870f7f7aaec..000000000000 --- a/mail/mutt14/files/patch-03 +++ /dev/null @@ -1,13 +0,0 @@ ---- doc/manual.sgml.orig Tue May 9 17:15:26 2000 -+++ doc/manual.sgml Fri May 12 11:05:40 2000 -@@ -1,5 +1,8 @@ --<!doctype linuxdoc system> -- -+<!DOCTYPE linuxdoc PUBLIC "-//FreeBSD//DTD linuxdoc//EN" [ -+<!ENTITY dquot """> -+]> -+<linuxdoc> -+ - <article> - - <title>The Mutt E-Mail Client diff --git a/mail/mutt14/files/patch-05 b/mail/mutt14/files/patch-05 deleted file mode 100644 index 13a52d9daa40..000000000000 --- a/mail/mutt14/files/patch-05 +++ /dev/null @@ -1,87 +0,0 @@ ---- curs_lib.c.old Wed Sep 1 19:39:20 1999 -+++ curs_lib.c Sun Sep 26 23:47:03 1999 -@@ -156,6 +156,16 @@ - def = 0; - break; - } -+ else if (tolower(ch.ch) == 'y') -+ { -+ def = 1; -+ break; -+ } -+ else if (tolower(ch.ch) == 'n') -+ { -+ def = 0; -+ break; -+ } - else - { - BEEP(); -@@ -413,8 +423,9 @@ - { - event_t ch; - int choice; -- char *p; -+ char *p, *nletters; - -+ nletters = _(letters); - mvaddstr (LINES - 1, 0, prompt); - clrtoeol (); - FOREVER -@@ -428,6 +439,12 @@ - } - else - { -+ p = strchr (nletters, ch.ch); -+ if (p) -+ { -+ choice = p - nletters + 1; -+ break; -+ } - p = strchr (letters, ch.ch); - if (p) - { ---- browser.c.orig Fri Sep 24 01:08:08 1999 -+++ browser.c Sun Sep 26 23:46:25 1999 -@@ -750,7 +750,7 @@ - switch (mutt_multi_choice ((reverse) ? - _("Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? ") : - _("Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "), -- _("dazn"))) -+ N_("dazn"))) - { - case -1: /* abort */ - resort = 0; ---- commands.c.orig Wed Jul 7 02:56:24 1999 -+++ commands.c Sun Sep 26 23:46:25 1999 -@@ -337,7 +337,7 @@ - switch (mutt_multi_choice (reverse ? - _("Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore?: ") : - _("Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore?: "), -- _("dfrsotuzc"))) -+ N_("dfrsotuzc"))) - { - case -1: /* abort - don't resort */ - return -1; ---- compose.c.orig Mon Feb 12 18:02:38 2001 -+++ compose.c Fri Mar 30 17:04:09 2001 -@@ -130,7 +130,7 @@ - char input_signas[SHORT_STRING]; - - switch (mutt_multi_choice (_("(e)ncrypt, (s)ign, sign (a)s, (b)oth, or (f)orget it? "), -- _("esabf"))) -+ N_("esabf"))) - { - case 1: /* (e)ncrypt */ - bits |= PGPENCRYPT; ---- muttlib.c.orig Sun Apr 9 14:39:02 2000 -+++ muttlib.c Fri May 12 11:26:58 2000 -@@ -671,7 +671,7 @@ - if (*append == 0 && access (fname, F_OK) == 0) - { - switch (mutt_multi_choice -- (_("File exists, (o)verwrite, (a)ppend, or (c)ancel?"), _("oac"))) -+ (_("File exists, (o)verwrite, (a)ppend, or (c)ancel?"), N_("oac"))) - { - case -1: /* abort */ - case 3: /* cancel */ diff --git a/mail/mutt14/files/patch-08 b/mail/mutt14/files/patch-08 deleted file mode 100644 index 3e50cbd13779..000000000000 --- a/mail/mutt14/files/patch-08 +++ /dev/null @@ -1,10 +0,0 @@ ---- Muttrc.orig Sat May 13 08:30:44 2000 -+++ Muttrc Sat May 13 08:32:05 2000 -@@ -629,6 +629,7 @@ - # Type: boolean - # Default: yes - # -+set followup_to=no - # - # Controls whether or not the Mail-Followup-To header field is - # generated when sending mail. When set, Mutt will generate this diff --git a/mail/mutt14/files/patch-aclocal.m4 b/mail/mutt14/files/patch-aclocal.m4 deleted file mode 100644 index 6635a1a90fa6..000000000000 --- a/mail/mutt14/files/patch-aclocal.m4 +++ /dev/null @@ -1,11 +0,0 @@ ---- aclocal.m4.orig Fri Jul 28 11:50:25 2000 -+++ aclocal.m4 Wed Dec 5 12:10:16 2001 -@@ -62,4 +62,4 @@ --AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir) --AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir) --AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir) --AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir) -+AM_MISSING_PROG(ACLOCAL, aclocal14, $missing_dir) -+AM_MISSING_PROG(AUTOCONF, autoconf213, $missing_dir) -+AM_MISSING_PROG(AUTOMAKE, automake14, $missing_dir) -+AM_MISSING_PROG(AUTOHEADER, autoheader213, $missing_dir) diff --git a/mail/mutt14/files/patch-configure.in b/mail/mutt14/files/patch-configure.in deleted file mode 100644 index 0b37933c1c62..000000000000 --- a/mail/mutt14/files/patch-configure.in +++ /dev/null @@ -1,29 +0,0 @@ ---- configure.in.orig Mon Nov 11 14:11:26 2002 -+++ configure.in Mon Nov 11 14:12:09 2002 -@@ -515,7 +515,7 @@ - AC_MSG_ERROR([SSL support is only useful with POP or IMAP support]) - fi - -- if test "$with_ssl" != "yes" -+ if test "$with_ssl" != "yes" && x$withval != x/usr - then - LDFLAGS="$LDFLAGS -L$withval/lib" - CPPFLAGS="$CPPFLAGS -I$withval/include" -@@ -572,7 +572,7 @@ - then - if test "$with_sasl" != "yes" - then -- CPPFLAGS="$CPPFLAGS -I$with_sasl/include" -+ CPPFLAGS="$CPPFLAGS -I$with_sasl/include/sasl1" - LDFLAGS="$LDFLAGS -L$with_sasl/lib" - fi - -@@ -625,7 +625,7 @@ - fi]) - - if test x$GCC = xyes -a $mutt_cv_warnings = yes; then -- CFLAGS="-Wall -pedantic $CFLAGS" -+ CFLAGS="-Wall $CFLAGS" - fi - - AC_ARG_ENABLE(nfs-fix, [ --enable-nfs-fix Work around an NFS with broken attributes caching ], diff --git a/mail/mutt14/files/patch-contrib-Makefile.in b/mail/mutt14/files/patch-contrib-Makefile.in deleted file mode 100644 index 71e216bd607c..000000000000 --- a/mail/mutt14/files/patch-contrib-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- contrib/Makefile.in.orig Mon Jun 4 19:14:31 2001 -+++ contrib/Makefile.in Mon Mar 21 08:12:59 2005 -@@ -20,7 +20,7 @@ - - subdir = contrib - --SAMPLES = Mush.rc Pine.rc gpg.rc pgp2.rc pgp5.rc pgp6.rc Tin.rc \ -+SAMPLES = Mush.rc Pine.rc gpg.rc pgp2.rc pgp6.rc Tin.rc \ - sample.muttrc sample.mailcap sample.muttrc-tlr - - DISTFILES = Makefile.in language.txt language50.txt \ diff --git a/mail/mutt14/files/patch-doc-mutt.man b/mail/mutt14/files/patch-doc-mutt.man deleted file mode 100644 index 46e086721a76..000000000000 --- a/mail/mutt14/files/patch-doc-mutt.man +++ /dev/null @@ -1,34 +0,0 @@ ---- doc/mutt.man.orig Wed Jul 24 10:41:31 2002 -+++ doc/mutt.man Sun Oct 26 11:06:36 2003 -@@ -136,9 +136,9 @@ - User's personal mapping between MIME types and file extensions. - .IP "/etc/mime.types" - System mapping between MIME types and file extensions. --.IP "/usr/local/bin/mutt_dotlock" -+.IP "${PREFIX}/bin/mutt_dotlock" - The privileged dotlocking program. --.IP "/usr/local/doc/mutt/manual.txt" -+.IP "${DOCSDIR}/manual.txt" - The Mutt manual. - .SH BUGS - .PP ---- doc/muttrc.man Sun Oct 26 11:09:09 2003 -+++ doc/muttrc.man Sun Oct 26 11:08:48 2003 -@@ -990,7 +972,7 @@ - .B dotlock_program - .nf - Type: path --Default: \(lq/usr/local/bin/mutt_dotlock\(rq -+Default: \(lq${PREFIX}/bin/mutt_dotlock\(rq - .fi - .IP - Contains the path of the mutt_dotlock (8) binary to be used by -@@ -3970,7 +3952,7 @@ - instead of a raw socket. You may be able to use this to set up - preauthenticated connections to your IMAP/POP3 server. Example: - .IP --tunnel=\(rqssh -q mailhost.net /usr/local/libexec/imapd\(rq -+tunnel=\(rqssh -q mailhost.net ${PREFIX}/libexec/imapd\(rq - .IP - NOTE: For this example to work you must be able to log in to the remote - machine without having to enter a password. diff --git a/mail/mutt14/files/patch-examples b/mail/mutt14/files/patch-examples deleted file mode 100644 index 2d24771033f7..000000000000 --- a/mail/mutt14/files/patch-examples +++ /dev/null @@ -1,50 +0,0 @@ ---- contrib/Makefile.in.orig Mon Jun 4 19:14:31 2001 -+++ contrib/Makefile.in Wed Mar 26 11:45:15 2003 -@@ -12,6 +12,7 @@ - mandir = @mandir@ - srcdir = @srcdir@ - docdir = @docdir@ -+samplesdir = @samplesdir@ - top_srcdir = @top_srcdir@ - top_builddir = .. - INSTALL = @INSTALL@ -@@ -37,12 +38,12 @@ - check: - - install: -- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(docdir)/samples $(DESTDIR)$(docdir)/samples/iconv -+ $(top_srcdir)/mkinstalldirs $(DESTDIR)$(samplesdir) $(DESTDIR)$(samplesdir)/iconv - for f in $(SAMPLES) ; do \ -- $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(docdir)/samples ; \ -+ $(INSTALL) -m 644 $(srcdir)/$$f $(DESTDIR)$(samplesdir); \ - done - for f in $(srcdir)/iconv/*.rc ; do \ -- $(INSTALL) -m 644 $$f $(DESTDIR)$(docdir)/samples/iconv ; \ -+ $(INSTALL) -m 644 $$f $(DESTDIR)$(samplesdir)/iconv ; \ - done - - # Nothing needs to be done - uninstall in doc removes samples as well. ---- init.h.orig Wed Mar 26 11:50:36 2003 -+++ init.h Wed Mar 26 12:54:37 2003 -@@ -1347,8 +1347,8 @@ - ** .pp - ** For examples on how to configure these formats for the various versions - ** of PGP which are floating around, see the pgp*.rc and gpg.rc files in -- ** the samples/ subdirectory which has been installed on your system -- ** alongside the documentation. -+ ** the share/examples/mutt subdirectory which has been installed on your -+ ** system. - */ - { "pgp_getkeys_command", DT_STR, R_NONE, UL &PgpGetkeysCommand, 0}, - /* ---- Makefile.am.orig Wed Mar 26 13:13:10 2003 -+++ Makefile.am Wed Mar 26 13:25:40 2003 -@@ -13,7 +13,7 @@ - - bin_SCRIPTS = muttbug flea - --BUILT_SOURCES = keymap_defs.h patchlist.c -+BUILT_SOURCES = keymap_defs.h patchlist.c Muttrc - - bin_PROGRAMS = mutt @DOTLOCK_TARGET@ @PGPAUX_TARGET@ - mutt_SOURCES = $(BUILT_SOURCES) \ diff --git a/mail/mutt14/files/patch-init.c b/mail/mutt14/files/patch-init.c deleted file mode 100644 index 389b682cfa11..000000000000 --- a/mail/mutt14/files/patch-init.c +++ /dev/null @@ -1,39 +0,0 @@ ---- init.c.orig Wed Jul 24 10:41:29 2002 -+++ init.c Sat May 3 08:46:29 2003 -@@ -1707,7 +1707,11 @@ - void mutt_init (int skip_sys_rc, LIST *commands) - { - struct passwd *pw; -+#if __FreeBSD_version < 500000 -+ char nodename[STRING]; -+#else - struct utsname utsname; -+#endif - char *p, buffer[STRING], error[STRING]; - int i, default_rc = 0, need_pause = 0; - BUFFER err; -@@ -1765,16 +1769,21 @@ - #endif - - /* And about the host... */ -+#if __FreeBSD_version < 500000 -+ gethostname(nodename, sizeof (nodename)); -+#else - uname (&utsname); -+ strfcpy (nodename, utsname.nodename, sizeof (nodename)); -+#endif - /* some systems report the FQDN instead of just the hostname */ -- if ((p = strchr (utsname.nodename, '.'))) -+ if ((p = strchr (nodename, '.'))) - { -- Hostname = mutt_substrdup (utsname.nodename, p); -+ Hostname = mutt_substrdup (nodename, p); - p++; - strfcpy (buffer, p, sizeof (buffer)); /* save the domain for below */ - } - else -- Hostname = safe_strdup (utsname.nodename); -+ Hostname = safe_strdup (nodename); - - #ifndef DOMAIN - #define DOMAIN buffer diff --git a/mail/mutt14/files/patch-mktemp b/mail/mutt14/files/patch-mktemp deleted file mode 100644 index 8fc82de528d7..000000000000 --- a/mail/mutt14/files/patch-mktemp +++ /dev/null @@ -1,15 +0,0 @@ ---- muttlib.c.orig Fri May 7 17:30:35 2004 -+++ muttlib.c Fri May 7 17:32:13 2004 -@@ -656,7 +656,11 @@ - - void mutt_mktemp (char *s) - { -- snprintf (s, _POSIX_PATH_MAX, "%s/mutt-%s-%d-%d", NONULL (Tempdir), NONULL(Hostname), (int) getpid (), Counter++); -+ char t[7]; -+ snprintf (t, 7, "-%05d", Counter++); -+ snprintf (s, _POSIX_PATH_MAX-6, "%s/mutt-%s-XXXXXXXX", NONULL(Tempdir), NONULL(Hostname)); -+ mktemp (s); -+ strncat(s, t, 6); - unlink (s); - } - diff --git a/mail/mutt14/files/patch-threadcomplete b/mail/mutt14/files/patch-threadcomplete deleted file mode 100644 index e4f56f261382..000000000000 --- a/mail/mutt14/files/patch-threadcomplete +++ /dev/null @@ -1,73 +0,0 @@ -written by Nicolas Rachinsky <nr@rachinsky.de> -http://www.rachinsky.de - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published -by the Free Software Foundation; version 2 of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -General Public License for more details. - ---- mutt-1.3.28.ori/mutt.h Thu Mar 14 19:22:25 2002 -+++ mutt.h Fri Mar 15 00:22:41 2002 -@@ -198,6 +198,7 @@ - M_LIMIT, - M_EXPIRED, - M_SUPERSEDED, -+ M_THREADCOMPLETE, - - /* actions for mutt_pattern_comp/mutt_pattern_exec */ - M_AND, ---- mutt-1.3.28.ori/pattern.c Thu Mar 14 19:22:26 2002 -+++ pattern.c Fri Mar 15 00:23:52 2002 -@@ -50,6 +50,7 @@ - } - Flags[] = - { -+ { 'a', M_THREADCOMPLETE, 0, NULL }, - { 'A', M_ALL, 0, NULL }, - { 'b', M_BODY, M_FULL_MSG, eat_regexp }, - { 'B', M_WHOLE_MSG, M_FULL_MSG, eat_regexp }, -@@ -957,6 +958,27 @@ - return alladdr; - } - -+static int match_threadcomplete(int flag,THREAD *t,int left,int up,int right,int down) -+{ -+ int a=0; -+ HEADER *h=NULL; -+ -+ if(! t)return 0; -+ h=t->message; -+ if(! flag && h && h->tagged)return 1; -+ if(flag && h && ! h->tagged) return 1; -+ -+ if(up)a=match_threadcomplete(flag,t->parent,1,1,1,0); -+ if(a)return a; -+ if(right && t->parent)a=match_threadcomplete(flag,t->next,0,0,1,1); -+ if(a)return a; -+ if(left && t->parent)a=match_threadcomplete(flag,t->prev,1,0,0,1); -+ if(a)return a; -+ if(down)a=match_threadcomplete(flag,t->child,1,0,1,1); -+ if(a)return a; -+ return 0; -+} -+ - /* flags - M_MATCH_FULL_ADDRESS match both personal and machine address */ - int -@@ -1053,6 +1075,8 @@ - return (pat->not ^ (h->env->x_label && regexec (pat->rx, h->env->x_label, 0, NULL, 0) == 0)); - case M_DUPLICATED: - return (pat->not ^ (h->thread && h->thread->duplicate_thread)); -+ case M_THREADCOMPLETE: -+ return ((h->thread && match_threadcomplete(pat->not,h->thread,1,1,1,1))); - } - mutt_error (_("error: unknown op %d (report this error)."), pat->op); - return (-1); ---- PATCHES~ Tue Nov 6 19:59:33 2001 -+++ PATCHES Tue Nov 6 19:59:42 2001 -@@ -1,0 +1 @@ -+1.3.28.nr.threadcomplete diff --git a/mail/mutt14/files/patch-z b/mail/mutt14/files/patch-z deleted file mode 100644 index 08a7dfbebe7b..000000000000 --- a/mail/mutt14/files/patch-z +++ /dev/null @@ -1,22 +0,0 @@ ---- Makefile.am.orig2 Thu Jan 6 15:45:58 2005 -+++ Makefile.am Thu Jan 6 15:47:48 2005 -@@ -11,7 +11,7 @@ - - SUBDIRS = m4 po intl doc contrib $(IMAP_SUBDIR) - --bin_SCRIPTS = muttbug flea -+bin_SCRIPTS = - - BUILT_SOURCES = keymap_defs.h patchlist.c Muttrc - ---- doc/Makefile.in.orig2 Thu Jan 6 15:45:57 2005 -+++ doc/Makefile.in Thu Jan 6 15:53:52 2005 -@@ -78,8 +78,6 @@ - $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1 - $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man5 - ./instdoc $(srcdir)/mutt.man $(DESTDIR)$(mandir)/man1/mutt.1 -- ./instdoc $(srcdir)/muttbug.man $(DESTDIR)$(mandir)/man1/flea.1 -- echo ".so $(mandir)/man1/flea.1" > $(DESTDIR)$(mandir)/man1/muttbug.1 - ./instdoc $(srcdir)/dotlock.man \ - $(DESTDIR)$(mandir)/man1/mutt_dotlock.1 - ./instdoc muttrc.man $(DESTDIR)$(mandir)/man5/muttrc.5 diff --git a/mail/mutt14/pkg-descr b/mail/mutt14/pkg-descr deleted file mode 100644 index 68d853aebed8..000000000000 --- a/mail/mutt14/pkg-descr +++ /dev/null @@ -1,12 +0,0 @@ -Mutt -- "The Mongrel of Mail User Agents" (part Elm, part Pine, part mh, -part slrn, part everything else) is an interactive screen-oriented mailer -program that supersedes Elm, Pine, mail and mailx. - -Features include color support, message threading, MIME support (including -RFC1522 support for encoded headers), customizable key bindings, POP3, -Delivery Status Notification (DSN) support, and PGP/MIME. - -WWW: http://www.mutt.org/ -Mutt User Information: http://www.math.fu-berlin.de/~guckes/mutt/ - - -- David (obrien@cs.ucdavis.edu) diff --git a/mail/mutt14/pkg-plist b/mail/mutt14/pkg-plist deleted file mode 100644 index 28f0c9f55b73..000000000000 --- a/mail/mutt14/pkg-plist +++ /dev/null @@ -1,79 +0,0 @@ -@comment $FreeBSD$ -bin/mutt -bin/mutt_dotlock -bin/pgpewrap -bin/pgpring -@unexec if cmp -s %D/etc/Muttrc.dist %D/etc/Muttrc; then rm -f %D/etc/Muttrc; fi -etc/Muttrc.dist -@exec if [ ! -f %D/etc/Muttrc ]; then cp %D/etc/Muttrc.dist %D/etc/Muttrc; fi -%%DOCSDIR%%/COPYRIGHT -%%DOCSDIR%%/ChangeLog -%%DOCSDIR%%/GPL -%%DOCSDIR%%/INSTALL -%%DOCSDIR%%/NEWS -%%DOCSDIR%%/PGP-Notes.txt -%%DOCSDIR%%/README -%%DOCSDIR%%/README.SECURITY -%%DOCSDIR%%/README.SSL -%%DOCSDIR%%/TODO -%%DOCSDIR%%/applying-patches.txt -%%DOCSDIR%%/devel-notes.txt -%%DOCSDIR%%/manual.txt -%%DOCSDIR%%/patch-notes.txt -%%EXAMPLESDIR%%/Mush.rc -%%EXAMPLESDIR%%/Pine.rc -%%EXAMPLESDIR%%/Tin.rc -%%EXAMPLESDIR%%/gpg.rc -%%EXAMPLESDIR%%/iconv/iconv.aix-3.2.5.rc -%%EXAMPLESDIR%%/iconv/iconv.aix-4.1.5.rc -%%EXAMPLESDIR%%/iconv/iconv.aix-4.2.0.rc -%%EXAMPLESDIR%%/iconv/iconv.aix-4.3.2.rc -%%EXAMPLESDIR%%/iconv/iconv.freebsd-3.3.rc -%%EXAMPLESDIR%%/iconv/iconv.glibc-2.1.3.rc -%%EXAMPLESDIR%%/iconv/iconv.glibc-2.1.90.rc -%%EXAMPLESDIR%%/iconv/iconv.hpux-10.01.rc -%%EXAMPLESDIR%%/iconv/iconv.hpux-10.20.rc -%%EXAMPLESDIR%%/iconv/iconv.hpux-11.00.rc -%%EXAMPLESDIR%%/iconv/iconv.irix-6.5.rc -%%EXAMPLESDIR%%/iconv/iconv.osf1-4.0a.rc -%%EXAMPLESDIR%%/iconv/iconv.osf1-4.0d.rc -%%EXAMPLESDIR%%/iconv/iconv.solaris-2.4.rc -%%EXAMPLESDIR%%/iconv/iconv.solaris-2.5.1.rc -%%EXAMPLESDIR%%/iconv/iconv.solaris-2.6-cjk.rc -%%EXAMPLESDIR%%/iconv/iconv.solaris-2.6.rc -%%EXAMPLESDIR%%/iconv/iconv.solaris-2.7.rc -%%EXAMPLESDIR%%/pgp2.rc -%%EXAMPLESDIR%%/pgp6.rc -%%EXAMPLESDIR%%/sample.mailcap -%%EXAMPLESDIR%%/sample.muttrc -%%EXAMPLESDIR%%/sample.muttrc-tlr -%%NLS%%share/locale/bg/LC_MESSAGES/mutt.mo -%%NLS%%share/locale/ca/LC_MESSAGES/mutt.mo -%%NLS%%share/locale/cs/LC_MESSAGES/mutt.mo -%%NLS%%share/locale/da/LC_MESSAGES/mutt.mo -%%NLS%%share/locale/de/LC_MESSAGES/mutt.mo -%%NLS%%share/locale/el/LC_MESSAGES/mutt.mo -%%NLS%%share/locale/eo/LC_MESSAGES/mutt.mo -%%NLS%%share/locale/es/LC_MESSAGES/mutt.mo -%%NLS%%share/locale/et/LC_MESSAGES/mutt.mo -%%NLS%%share/locale/fr/LC_MESSAGES/mutt.mo -%%NLS%%share/locale/gl/LC_MESSAGES/mutt.mo -%%NLS%%share/locale/hu/LC_MESSAGES/mutt.mo -%%NLS%%share/locale/id/LC_MESSAGES/mutt.mo -%%NLS%%share/locale/it/LC_MESSAGES/mutt.mo -%%NLS%%share/locale/ja/LC_MESSAGES/mutt.mo -%%NLS%%share/locale/ko/LC_MESSAGES/mutt.mo -%%NLS%%share/locale/lt/LC_MESSAGES/mutt.mo -%%NLS%%share/locale/nl/LC_MESSAGES/mutt.mo -%%NLS%%share/locale/pl/LC_MESSAGES/mutt.mo -%%NLS%%share/locale/pt_BR/LC_MESSAGES/mutt.mo -%%NLS%%share/locale/ru/LC_MESSAGES/mutt.mo -%%NLS%%share/locale/sk/LC_MESSAGES/mutt.mo -%%NLS%%share/locale/sv/LC_MESSAGES/mutt.mo -%%NLS%%share/locale/tr/LC_MESSAGES/mutt.mo -%%NLS%%share/locale/uk/LC_MESSAGES/mutt.mo -%%NLS%%share/locale/zh_CN/LC_MESSAGES/mutt.mo -%%NLS%%share/locale/zh_TW/LC_MESSAGES/mutt.mo -@dirrm %%EXAMPLESDIR%%/iconv -@dirrm %%EXAMPLESDIR%% -@dirrm %%DOCSDIR%% diff --git a/mail/mutt14/pkg-plist.htmlfiles b/mail/mutt14/pkg-plist.htmlfiles deleted file mode 100644 index 60d2e6956e83..000000000000 --- a/mail/mutt14/pkg-plist.htmlfiles +++ /dev/null @@ -1,346 +0,0 @@ -%%DOCSDIR%%/html/manual.html -%%DOCSDIR%%/html/manual1.html -%%DOCSDIR%%/html/manual10.html -%%DOCSDIR%%/html/manual100.html -%%DOCSDIR%%/html/manual101.html -%%DOCSDIR%%/html/manual102.html -%%DOCSDIR%%/html/manual103.html -%%DOCSDIR%%/html/manual104.html -%%DOCSDIR%%/html/manual105.html -%%DOCSDIR%%/html/manual106.html -%%DOCSDIR%%/html/manual107.html -%%DOCSDIR%%/html/manual108.html -%%DOCSDIR%%/html/manual109.html -%%DOCSDIR%%/html/manual11.html -%%DOCSDIR%%/html/manual110.html -%%DOCSDIR%%/html/manual111.html -%%DOCSDIR%%/html/manual112.html -%%DOCSDIR%%/html/manual113.html -%%DOCSDIR%%/html/manual114.html -%%DOCSDIR%%/html/manual115.html -%%DOCSDIR%%/html/manual116.html -%%DOCSDIR%%/html/manual117.html -%%DOCSDIR%%/html/manual118.html -%%DOCSDIR%%/html/manual119.html -%%DOCSDIR%%/html/manual12.html -%%DOCSDIR%%/html/manual120.html -%%DOCSDIR%%/html/manual121.html -%%DOCSDIR%%/html/manual122.html -%%DOCSDIR%%/html/manual123.html -%%DOCSDIR%%/html/manual124.html -%%DOCSDIR%%/html/manual125.html -%%DOCSDIR%%/html/manual126.html -%%DOCSDIR%%/html/manual127.html -%%DOCSDIR%%/html/manual128.html -%%DOCSDIR%%/html/manual129.html -%%DOCSDIR%%/html/manual13.html -%%DOCSDIR%%/html/manual130.html -%%DOCSDIR%%/html/manual131.html -%%DOCSDIR%%/html/manual132.html -%%DOCSDIR%%/html/manual133.html -%%DOCSDIR%%/html/manual134.html -%%DOCSDIR%%/html/manual135.html -%%DOCSDIR%%/html/manual136.html -%%DOCSDIR%%/html/manual137.html -%%DOCSDIR%%/html/manual138.html -%%DOCSDIR%%/html/manual139.html -%%DOCSDIR%%/html/manual14.html -%%DOCSDIR%%/html/manual140.html -%%DOCSDIR%%/html/manual141.html -%%DOCSDIR%%/html/manual142.html -%%DOCSDIR%%/html/manual143.html -%%DOCSDIR%%/html/manual144.html -%%DOCSDIR%%/html/manual145.html -%%DOCSDIR%%/html/manual146.html -%%DOCSDIR%%/html/manual147.html -%%DOCSDIR%%/html/manual148.html -%%DOCSDIR%%/html/manual149.html -%%DOCSDIR%%/html/manual15.html -%%DOCSDIR%%/html/manual150.html -%%DOCSDIR%%/html/manual151.html -%%DOCSDIR%%/html/manual152.html -%%DOCSDIR%%/html/manual153.html -%%DOCSDIR%%/html/manual154.html -%%DOCSDIR%%/html/manual155.html -%%DOCSDIR%%/html/manual156.html -%%DOCSDIR%%/html/manual157.html -%%DOCSDIR%%/html/manual158.html -%%DOCSDIR%%/html/manual159.html -%%DOCSDIR%%/html/manual16.html -%%DOCSDIR%%/html/manual160.html -%%DOCSDIR%%/html/manual161.html -%%DOCSDIR%%/html/manual162.html -%%DOCSDIR%%/html/manual163.html -%%DOCSDIR%%/html/manual164.html -%%DOCSDIR%%/html/manual165.html -%%DOCSDIR%%/html/manual166.html -%%DOCSDIR%%/html/manual167.html -%%DOCSDIR%%/html/manual168.html -%%DOCSDIR%%/html/manual169.html -%%DOCSDIR%%/html/manual17.html -%%DOCSDIR%%/html/manual170.html -%%DOCSDIR%%/html/manual171.html -%%DOCSDIR%%/html/manual172.html -%%DOCSDIR%%/html/manual173.html -%%DOCSDIR%%/html/manual174.html -%%DOCSDIR%%/html/manual175.html -%%DOCSDIR%%/html/manual176.html -%%DOCSDIR%%/html/manual177.html -%%DOCSDIR%%/html/manual178.html -%%DOCSDIR%%/html/manual179.html -%%DOCSDIR%%/html/manual18.html -%%DOCSDIR%%/html/manual180.html -%%DOCSDIR%%/html/manual181.html -%%DOCSDIR%%/html/manual182.html -%%DOCSDIR%%/html/manual183.html -%%DOCSDIR%%/html/manual184.html -%%DOCSDIR%%/html/manual185.html -%%DOCSDIR%%/html/manual186.html -%%DOCSDIR%%/html/manual187.html -%%DOCSDIR%%/html/manual188.html -%%DOCSDIR%%/html/manual189.html -%%DOCSDIR%%/html/manual19.html -%%DOCSDIR%%/html/manual190.html -%%DOCSDIR%%/html/manual191.html -%%DOCSDIR%%/html/manual192.html -%%DOCSDIR%%/html/manual193.html -%%DOCSDIR%%/html/manual194.html -%%DOCSDIR%%/html/manual195.html -%%DOCSDIR%%/html/manual196.html -%%DOCSDIR%%/html/manual197.html -%%DOCSDIR%%/html/manual198.html -%%DOCSDIR%%/html/manual199.html -%%DOCSDIR%%/html/manual2.html -%%DOCSDIR%%/html/manual20.html -%%DOCSDIR%%/html/manual200.html -%%DOCSDIR%%/html/manual201.html -%%DOCSDIR%%/html/manual202.html -%%DOCSDIR%%/html/manual203.html -%%DOCSDIR%%/html/manual204.html -%%DOCSDIR%%/html/manual205.html -%%DOCSDIR%%/html/manual206.html -%%DOCSDIR%%/html/manual207.html -%%DOCSDIR%%/html/manual208.html -%%DOCSDIR%%/html/manual209.html -%%DOCSDIR%%/html/manual21.html -%%DOCSDIR%%/html/manual210.html -%%DOCSDIR%%/html/manual211.html -%%DOCSDIR%%/html/manual212.html -%%DOCSDIR%%/html/manual213.html -%%DOCSDIR%%/html/manual214.html -%%DOCSDIR%%/html/manual215.html -%%DOCSDIR%%/html/manual216.html -%%DOCSDIR%%/html/manual217.html -%%DOCSDIR%%/html/manual218.html -%%DOCSDIR%%/html/manual219.html -%%DOCSDIR%%/html/manual22.html -%%DOCSDIR%%/html/manual220.html -%%DOCSDIR%%/html/manual221.html -%%DOCSDIR%%/html/manual222.html -%%DOCSDIR%%/html/manual223.html -%%DOCSDIR%%/html/manual224.html -%%DOCSDIR%%/html/manual225.html -%%DOCSDIR%%/html/manual226.html -%%DOCSDIR%%/html/manual227.html -%%DOCSDIR%%/html/manual228.html -%%DOCSDIR%%/html/manual229.html -%%DOCSDIR%%/html/manual23.html -%%DOCSDIR%%/html/manual230.html -%%DOCSDIR%%/html/manual231.html -%%DOCSDIR%%/html/manual232.html -%%DOCSDIR%%/html/manual233.html -%%DOCSDIR%%/html/manual234.html -%%DOCSDIR%%/html/manual235.html -%%DOCSDIR%%/html/manual236.html -%%DOCSDIR%%/html/manual237.html -%%DOCSDIR%%/html/manual238.html -%%DOCSDIR%%/html/manual239.html -%%DOCSDIR%%/html/manual24.html -%%DOCSDIR%%/html/manual240.html -%%DOCSDIR%%/html/manual241.html -%%DOCSDIR%%/html/manual242.html -%%DOCSDIR%%/html/manual243.html -%%DOCSDIR%%/html/manual244.html -%%DOCSDIR%%/html/manual245.html -%%DOCSDIR%%/html/manual246.html -%%DOCSDIR%%/html/manual247.html -%%DOCSDIR%%/html/manual248.html -%%DOCSDIR%%/html/manual249.html -%%DOCSDIR%%/html/manual25.html -%%DOCSDIR%%/html/manual250.html -%%DOCSDIR%%/html/manual251.html -%%DOCSDIR%%/html/manual252.html -%%DOCSDIR%%/html/manual253.html -%%DOCSDIR%%/html/manual254.html -%%DOCSDIR%%/html/manual255.html -%%DOCSDIR%%/html/manual256.html -%%DOCSDIR%%/html/manual257.html -%%DOCSDIR%%/html/manual258.html -%%DOCSDIR%%/html/manual259.html -%%DOCSDIR%%/html/manual26.html -%%DOCSDIR%%/html/manual260.html -%%DOCSDIR%%/html/manual261.html -%%DOCSDIR%%/html/manual262.html -%%DOCSDIR%%/html/manual263.html -%%DOCSDIR%%/html/manual264.html -%%DOCSDIR%%/html/manual265.html -%%DOCSDIR%%/html/manual266.html -%%DOCSDIR%%/html/manual267.html -%%DOCSDIR%%/html/manual268.html -%%DOCSDIR%%/html/manual269.html -%%DOCSDIR%%/html/manual27.html -%%DOCSDIR%%/html/manual270.html -%%DOCSDIR%%/html/manual271.html -%%DOCSDIR%%/html/manual272.html -%%DOCSDIR%%/html/manual273.html -%%DOCSDIR%%/html/manual274.html -%%DOCSDIR%%/html/manual275.html -%%DOCSDIR%%/html/manual276.html -%%DOCSDIR%%/html/manual277.html -%%DOCSDIR%%/html/manual278.html -%%DOCSDIR%%/html/manual279.html -%%DOCSDIR%%/html/manual28.html -%%DOCSDIR%%/html/manual280.html -%%DOCSDIR%%/html/manual281.html -%%DOCSDIR%%/html/manual282.html -%%DOCSDIR%%/html/manual283.html -%%DOCSDIR%%/html/manual284.html -%%DOCSDIR%%/html/manual285.html -%%DOCSDIR%%/html/manual286.html -%%DOCSDIR%%/html/manual287.html -%%DOCSDIR%%/html/manual288.html -%%DOCSDIR%%/html/manual289.html -%%DOCSDIR%%/html/manual29.html -%%DOCSDIR%%/html/manual290.html -%%DOCSDIR%%/html/manual291.html -%%DOCSDIR%%/html/manual292.html -%%DOCSDIR%%/html/manual293.html -%%DOCSDIR%%/html/manual294.html -%%DOCSDIR%%/html/manual295.html -%%DOCSDIR%%/html/manual296.html -%%DOCSDIR%%/html/manual297.html -%%DOCSDIR%%/html/manual298.html -%%DOCSDIR%%/html/manual299.html -%%DOCSDIR%%/html/manual3.html -%%DOCSDIR%%/html/manual30.html -%%DOCSDIR%%/html/manual300.html -%%DOCSDIR%%/html/manual301.html -%%DOCSDIR%%/html/manual302.html -%%DOCSDIR%%/html/manual303.html -%%DOCSDIR%%/html/manual304.html -%%DOCSDIR%%/html/manual305.html -%%DOCSDIR%%/html/manual306.html -%%DOCSDIR%%/html/manual307.html -%%DOCSDIR%%/html/manual308.html -%%DOCSDIR%%/html/manual309.html -%%DOCSDIR%%/html/manual31.html -%%DOCSDIR%%/html/manual310.html -%%DOCSDIR%%/html/manual311.html -%%DOCSDIR%%/html/manual312.html -%%DOCSDIR%%/html/manual313.html -%%DOCSDIR%%/html/manual314.html -%%DOCSDIR%%/html/manual315.html -%%DOCSDIR%%/html/manual316.html -%%DOCSDIR%%/html/manual317.html -%%DOCSDIR%%/html/manual318.html -%%DOCSDIR%%/html/manual319.html -%%DOCSDIR%%/html/manual32.html -%%DOCSDIR%%/html/manual320.html -%%DOCSDIR%%/html/manual321.html -%%DOCSDIR%%/html/manual322.html -%%DOCSDIR%%/html/manual323.html -%%DOCSDIR%%/html/manual324.html -%%DOCSDIR%%/html/manual325.html -%%DOCSDIR%%/html/manual326.html -%%DOCSDIR%%/html/manual327.html -%%DOCSDIR%%/html/manual328.html -%%DOCSDIR%%/html/manual329.html -%%DOCSDIR%%/html/manual33.html -%%DOCSDIR%%/html/manual330.html -%%DOCSDIR%%/html/manual331.html -%%DOCSDIR%%/html/manual332.html -%%DOCSDIR%%/html/manual333.html -%%DOCSDIR%%/html/manual334.html -%%DOCSDIR%%/html/manual335.html -%%DOCSDIR%%/html/manual336.html -%%DOCSDIR%%/html/manual337.html -%%DOCSDIR%%/html/manual338.html -%%DOCSDIR%%/html/manual339.html -%%DOCSDIR%%/html/manual34.html -%%DOCSDIR%%/html/manual340.html -%%DOCSDIR%%/html/manual341.html -%%DOCSDIR%%/html/manual342.html -%%DOCSDIR%%/html/manual35.html -%%DOCSDIR%%/html/manual36.html -%%DOCSDIR%%/html/manual37.html -%%DOCSDIR%%/html/manual38.html -%%DOCSDIR%%/html/manual39.html -%%DOCSDIR%%/html/manual4.html -%%DOCSDIR%%/html/manual40.html -%%DOCSDIR%%/html/manual41.html -%%DOCSDIR%%/html/manual42.html -%%DOCSDIR%%/html/manual43.html -%%DOCSDIR%%/html/manual44.html -%%DOCSDIR%%/html/manual45.html -%%DOCSDIR%%/html/manual46.html -%%DOCSDIR%%/html/manual47.html -%%DOCSDIR%%/html/manual48.html -%%DOCSDIR%%/html/manual49.html -%%DOCSDIR%%/html/manual5.html -%%DOCSDIR%%/html/manual50.html -%%DOCSDIR%%/html/manual51.html -%%DOCSDIR%%/html/manual52.html -%%DOCSDIR%%/html/manual53.html -%%DOCSDIR%%/html/manual54.html -%%DOCSDIR%%/html/manual55.html -%%DOCSDIR%%/html/manual56.html -%%DOCSDIR%%/html/manual57.html -%%DOCSDIR%%/html/manual58.html -%%DOCSDIR%%/html/manual59.html -%%DOCSDIR%%/html/manual6.html -%%DOCSDIR%%/html/manual60.html -%%DOCSDIR%%/html/manual61.html -%%DOCSDIR%%/html/manual62.html -%%DOCSDIR%%/html/manual63.html -%%DOCSDIR%%/html/manual64.html -%%DOCSDIR%%/html/manual65.html -%%DOCSDIR%%/html/manual66.html -%%DOCSDIR%%/html/manual67.html -%%DOCSDIR%%/html/manual68.html -%%DOCSDIR%%/html/manual69.html -%%DOCSDIR%%/html/manual7.html -%%DOCSDIR%%/html/manual70.html -%%DOCSDIR%%/html/manual71.html -%%DOCSDIR%%/html/manual72.html -%%DOCSDIR%%/html/manual73.html -%%DOCSDIR%%/html/manual74.html -%%DOCSDIR%%/html/manual75.html -%%DOCSDIR%%/html/manual76.html -%%DOCSDIR%%/html/manual77.html -%%DOCSDIR%%/html/manual78.html -%%DOCSDIR%%/html/manual79.html -%%DOCSDIR%%/html/manual8.html -%%DOCSDIR%%/html/manual80.html -%%DOCSDIR%%/html/manual81.html -%%DOCSDIR%%/html/manual82.html -%%DOCSDIR%%/html/manual83.html -%%DOCSDIR%%/html/manual84.html -%%DOCSDIR%%/html/manual85.html -%%DOCSDIR%%/html/manual86.html -%%DOCSDIR%%/html/manual87.html -%%DOCSDIR%%/html/manual88.html -%%DOCSDIR%%/html/manual89.html -%%DOCSDIR%%/html/manual9.html -%%DOCSDIR%%/html/manual90.html -%%DOCSDIR%%/html/manual91.html -%%DOCSDIR%%/html/manual92.html -%%DOCSDIR%%/html/manual93.html -%%DOCSDIR%%/html/manual94.html -%%DOCSDIR%%/html/manual95.html -%%DOCSDIR%%/html/manual96.html -%%DOCSDIR%%/html/manual97.html -%%DOCSDIR%%/html/manual98.html -%%DOCSDIR%%/html/manual99.html -%%DOCSDIR%%/html/manual_toc.html -%%DOCSDIR%%/manual.latin1 -@dirrm %%DOCSDIR%%/html diff --git a/mail/postfix22/Makefile b/mail/postfix22/Makefile deleted file mode 100644 index 8947c1225319..000000000000 --- a/mail/postfix22/Makefile +++ /dev/null @@ -1,161 +0,0 @@ -# New ports collection makefile for: postfix -# Date created: 18 Mar 1999 -# Whom: torstenb -# -# $FreeBSD$ -# - -# To pre-select options in batch mode, run make like this: -# -# make -DBATCH POSTFIX_OPTIONS="DB3 TLS" -# -# the options are the same names as in the scripts/configure.postfix file. -# POSTFIX_OPTIONS can be set in /etc/make.conf also. - -# NOTE: PCRE is enabled by default unless you specifically disable it. - -PORTNAME= postfix -PORTVERSION= 2.2.5 -PORTEPOCH= 1 -CATEGORIES= mail ipv6 -MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ - ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/%SUBDIR%/ \ - ftp://ftp.tux.org/pub/net/postfix/official/ \ - ftp://ftp.utoronto.ca/mirror/packages/postfix/official/ \ - ftp://ftp.samurai.com/pub/postfix/official/ \ - ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/postfix/official/&,} -MASTER_SITE_SUBDIR= . old related/postfix -DISTNAME= postfix-${PORTVERSION} -DIST_SUBDIR= ${PORTNAME} - -# blanket approval for version updates: marcus@corp.grupos.com.br -MAINTAINER= vivek@khera.org -COMMENT= A secure alternative to widely-used Sendmail - -CONFLICTS= courier-0.* postfix-1.* postfix-2.0.* postfix-2.1.* postfix-2.3.* \ - sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.* -USE_SUBMAKE= yes -USE_REINPLACE= yes - -MAN1= postalias.1 postcat.1 postconf.1 postdrop.1 postfix.1 postkick.1 \ - postlock.1 postlog.1 postmap.1 postqueue.1 postsuper.1 sendmail.1 - -MAN5= access.5 aliases.5 canonical.5 cidr_table.5 generic.5 header_checks.5 \ - ldap_table.5 master.5 mysql_table.5 nisplus_table.5 pcre_table.5 \ - pgsql_table.5 postconf.5 regexp_table.5 relocated.5 transport.5 \ - virtual.5 - -MAN8= anvil.8 bounce.8 cleanup.8 discard.8 error.8 flush.8 lmtp.8 local.8 \ - master.8 oqmgr.8 pickup.8 pipe.8 proxymap.8 qmgr.8 qmqpd.8 scache.8 \ - showq.8 smtp.8 smtpd.8 spawn.8 tlsmgr.8 trivial-rewrite.8 verify.8 \ - virtual.8 - -MLINKS= sendmail.1 mailq.1 \ - sendmail.1 newaliases.1 \ - header_checks.5 body_checks.5 \ - bounce.8 defer.8 \ - bounce.8 trace.8 - -CONF1= access aliases canonical generic header_checks main.cf master.cf \ - relocated transport virtual - -.if !defined(DEBUG) -MAKEFILEFLAGS+= DEBUG= -.endif - -MAKEFILEFLAGS+= CC="${CC}" OPT="${CFLAGS}" - -SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ - TOUCH="${TOUCH}" \ - MKDIR="${MKDIR}" \ - POSTFIX_OPTIONS="${POSTFIX_OPTIONS}" - -pre-fetch: - @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postfix - -.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc) -.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc" -.endif - -.if defined(WITHOUT_PCRE) -POSTFIX_CCARGS+= -DNO_PCRE -.else -LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre -POSTFIX_CCARGS+= -DHAS_PCRE -I${LOCALBASE}/include -POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -lpcre -.endif - -post-patch: - (cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \ - CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \ - ${ECHO} "all: default" >> Makefile) - -pre-patch: - @${ECHO} "<body>See <A HREF="header_checks.5.html">header_checks.5.html</A></BODY>" > ${WRKSRC}/html/body_checks.5.html - @for f in `${FIND} -P ${WRKSRC}/man -type f`; do \ - ${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" $${f}; \ - done - @for f in `${FIND} -P ${WRKSRC}/README_FILES -type f`; do \ - ${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" $${f}; \ - done - @for f in `${FIND} -P ${WRKSRC}/conf -type f`; do \ - ${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" $${f}; \ - done - -pre-install: - @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL - -.if defined(NOPORTDOCS) -READMEDIR=no -.else -READMEDIR=${PREFIX}/share/doc/postfix -.endif - -do-install: - cd ${WRKSRC}; ${SH} postfix-install -non-interactive install_root=/ tempdir=/tmp \ - config_directory=${PREFIX}/etc/postfix \ - daemon_directory=${PREFIX}/libexec/postfix \ - command_directory=${PREFIX}/sbin \ - queue_directory=/var/spool/postfix \ - sendmail_path=${PREFIX}/sbin/sendmail \ - newaliases_path=${PREFIX}/bin/newaliases \ - mailq_path=${PREFIX}/bin/mailq \ - mail_owner=postfix \ - setgid_group=maildrop \ - manpage_directory=${PREFIX}/man \ - sample_directory=${PREFIX}/etc/postfix \ - readme_directory=${READMEDIR} - - @${MKDIR} ${PREFIX}/etc/postfix/dist -.for f in ${CONF1} - ${INSTALL_DATA} ${WRKSRC}/conf/${f} ${PREFIX}/etc/postfix/dist -.endfor - - @${INSTALL_SCRIPT} \ - ${WRKSRC}/auxiliary/rmail/rmail \ - ${PREFIX}/bin/rmail - -# optional TEST binaries -.for file in ${BIN1} - @${INSTALL_PROGRAM} ${WRKSRC}/bin/${file} ${PREFIX}/sbin -.endfor - -.if !defined(NOPORTDOCS) - @${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${DOCSDIR} - @cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.jpg *.png ${DOCSDIR} && \ - ${ECHO_MSG} "Installed HTML documentation in ${DOCSDIR}" -.endif - -post-install: - @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL -# need to fixup ${PREFIX}/etc/postfix/postfix-files to indicate compressed -# man pages, since the ports software compresses them after this step, and -# if we run etc/postfix/post-install again during package installation, -# it will complain about missing files. - @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/fix-files-list - @${CAT} ${PKGMESSAGE} - -post-clean: - @${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc - -.include <bsd.port.mk> diff --git a/mail/postfix22/distinfo b/mail/postfix22/distinfo deleted file mode 100644 index 59ac523435fa..000000000000 --- a/mail/postfix22/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -MD5 (postfix/postfix-2.2.5.tar.gz) = 9c13d58494c64012bfd8ab0d6967305c -SIZE (postfix/postfix-2.2.5.tar.gz) = 2428594 -MD5 (postfix/postfix-libspf2-2.2.0-5.patch) = 80be36e0f14e1a1f39a3b30b9b2d4115 -SIZE (postfix/postfix-libspf2-2.2.0-5.patch) = 26077 -MD5 (postfix/postfix-2.2.4-vda.patch.gz) = 7049364c6476edf80d6ff861ca37936f -SIZE (postfix/postfix-2.2.4-vda.patch.gz) = 7712 diff --git a/mail/postfix22/files/patch-conf::main.cf b/mail/postfix22/files/patch-conf::main.cf deleted file mode 100644 index 67e356de21dd..000000000000 --- a/mail/postfix22/files/patch-conf::main.cf +++ /dev/null @@ -1,64 +0,0 @@ ---- conf/main.cf.orig Sat Mar 5 11:53:42 2005 -+++ conf/main.cf Sat Mar 5 11:53:42 2005 -@@ -32,13 +32,13 @@ - # The command_directory parameter specifies the location of all - # postXXX commands. - # --command_directory = /usr/sbin -+command_directory = !!PREFIX!!/sbin - - # The daemon_directory parameter specifies the location of all Postfix - # daemon programs (i.e. programs listed in the master.cf file). This - # directory must be owned by root. - # --daemon_directory = /usr/libexec/postfix -+daemon_directory = !!PREFIX!!/libexec/postfix - - # QUEUE AND PROCESS OWNERSHIP - # -@@ -608,37 +608,37 @@ - # sendmail_path: The full pathname of the Postfix sendmail command. - # This is the Sendmail-compatible mail posting interface. - # --sendmail_path = -+sendmail_path = !!PREFIX!!/sbin/sendmail - - # newaliases_path: The full pathname of the Postfix newaliases command. - # This is the Sendmail-compatible command to build alias databases. - # --newaliases_path = -+newaliases_path = !!PREFIX!!/bin/newaliases - - # mailq_path: The full pathname of the Postfix mailq command. This - # is the Sendmail-compatible mail queue listing command. - # --mailq_path = -+mailq_path = !!PREFIX!!/bin/mailq - - # setgid_group: The group for mail submission and queue management - # commands. This must be a group name with a numerical group ID that - # is not shared with other accounts, not even with the Postfix account. - # --setgid_group = -+setgid_group = maildrop - - # html_directory: The location of the Postfix HTML documentation. - # --html_directory = -+html_directory = no - - # manpage_directory: The location of the Postfix on-line manual pages. - # --manpage_directory = -+manpage_directory = !!PREFIX!!/man - - # sample_directory: The location of the Postfix sample configuration files. - # This parameter is obsolete as of Postfix 2.1. - # --sample_directory = -+sample_directory = !!PREFIX!!/etc/postfix - - # readme_directory: The location of the Postfix README files. - # --readme_directory = -+readme_directory = no diff --git a/mail/postfix22/files/patch-conf::post-install b/mail/postfix22/files/patch-conf::post-install deleted file mode 100644 index 78401de5bdf3..000000000000 --- a/mail/postfix22/files/patch-conf::post-install +++ /dev/null @@ -1,11 +0,0 @@ ---- conf/post-install.orig Thu Feb 24 08:06:08 2005 -+++ conf/post-install Sat Mar 5 11:53:42 2005 -@@ -185,7 +185,7 @@ - - umask 022 - --PATH=/bin:/usr/bin:/usr/sbin:/usr/etc:/sbin:/etc:/usr/contrib/bin:/usr/gnu/bin:/usr/ucb:/usr/bsd -+PATH=/bin:/usr/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/local/sbin - SHELL=/bin/sh - IFS=" - " diff --git a/mail/postfix22/files/patch-makedefs b/mail/postfix22/files/patch-makedefs deleted file mode 100644 index ed2f08d06ae4..000000000000 --- a/mail/postfix22/files/patch-makedefs +++ /dev/null @@ -1,13 +0,0 @@ ---- makedefs.orig Tue Feb 22 09:35:52 2005 -+++ makedefs Wed Jul 13 17:42:53 2005 -@@ -116,6 +116,10 @@ - ;; - FreeBSD.5*) SYSTYPE=FREEBSD5 - ;; -+ FreeBSD.6*) SYSTYPE=FREEBSD5 -+ ;; -+ FreeBSD.7*) SYSTYPE=FREEBSD5 -+ ;; - OpenBSD.2*) SYSTYPE=OPENBSD2 - ;; - OpenBSD.3*) SYSTYPE=OPENBSD3 diff --git a/mail/postfix22/files/patch-src::global::mail_params.h b/mail/postfix22/files/patch-src::global::mail_params.h deleted file mode 100644 index 52ea5e9e5c35..000000000000 --- a/mail/postfix22/files/patch-src::global::mail_params.h +++ /dev/null @@ -1,29 +0,0 @@ ---- src/global/mail_params.h.orig Fri Feb 11 21:53:21 2005 -+++ src/global/mail_params.h Sat Mar 5 11:53:42 2005 -@@ -64,7 +64,7 @@ - extern gid_t var_owner_gid; - - #define VAR_SGID_GROUP "setgid_group" --#define DEF_SGID_GROUP "postdrop" -+#define DEF_SGID_GROUP "maildrop" - extern char *var_sgid_group; - extern gid_t var_sgid_gid; - -@@ -221,7 +221,7 @@ - */ - #define VAR_DAEMON_DIR "daemon_directory" - #ifndef DEF_DAEMON_DIR --#define DEF_DAEMON_DIR "/usr/libexec/postfix" -+#define DEF_DAEMON_DIR "!!PREFIX!!/libexec/postfix" - #endif - extern char *var_daemon_dir; - -@@ -250,7 +250,7 @@ - */ - #define VAR_CONFIG_DIR "config_directory" - #ifndef DEF_CONFIG_DIR --#define DEF_CONFIG_DIR "/etc/postfix" -+#define DEF_CONFIG_DIR "!!PREFIX!!/etc/postfix" - #endif - extern char *var_config_dir; - diff --git a/mail/postfix22/pkg-descr b/mail/postfix22/pkg-descr deleted file mode 100644 index 1f335ce6820c..000000000000 --- a/mail/postfix22/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -Postfix attempts to be fast, easy to administer, and secure, while at -the same time being sendmail-compatible enough to not upset existing -users. It also offers QMQP and VERP support to let Postfix act as delivery -daemon for ezmlm-idx. - -WWW: http://www.postfix.org/ diff --git a/mail/postfix22/pkg-install b/mail/postfix22/pkg-install deleted file mode 100644 index e912b1a051e2..000000000000 --- a/mail/postfix22/pkg-install +++ /dev/null @@ -1,181 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# If the POSTFIX_DEFAULT_MTA environment variable is set to YES, it -# will make the port/package use defaults which make postfix replace -# sendmail as much as possible. - -PKG_PREFIX=${PKG_PREFIX:=/usr/local} -BATCH=${BATCH:=no} -POSTFIX_DEFAULT_MTA=${POSTFIX_DEFAULT_MTA:=no} - -if [ x${POSTFIX_DEFAULT_MTA} = xno ]; then - DEFAULT_REPLACE_MAILERCONF=n -else - DEFAULT_REPLACE_MAILERCONF=y -fi - -if [ -x /usr/sbin/nologin ]; then - NOLOGIN=/usr/sbin/nologin -else - NOLOGIN=/sbin/nologin -fi - -ask() { - local question default answer - - question=$1 - default=$2 - if [ -z "${PACKAGE_BUILDING}" -a x${BATCH} = xno ]; then - read -p "${question} [${default}]? " answer - fi - if [ x${answer} = x ]; then - answer=${default} - fi - /bin/echo ${answer} -} - -yesno() { - local question default answer - - question=$1 - default=$2 - while :; do - answer=$(ask "${question}" "${default}") - case "${answer}" in - [Yy]*) return 0;; - [Nn]*) return 1;; - esac - /bin/echo "Please answer yes or no." - done -} - -if [ x"$2" = xPRE-INSTALL ]; then - USER=postfix - UID=125 - GROUP=postfix - GID=125 - GROUP2=maildrop - GID2=126 - - if /usr/sbin/pw groupshow "${GROUP}" 2>/dev/null; then - /bin/echo "You already have a group \"${GROUP}\", so I will use it." - else - if /usr/sbin/pw groupadd ${GROUP} -g ${GID} - then - /bin/echo "Added group \"${GROUP}\"." - else - /bin/echo "Adding group \"${GROUP}\" failed..." - /bin/echo "Please create it, and try again." - exit 1 - fi - fi - - if /usr/sbin/pw groupshow "${GROUP2}" 2>/dev/null; then - /bin/echo "You already have a group \"${GROUP2}\", so I will use it." - else - if /usr/sbin/pw groupadd ${GROUP2} -g ${GID2}; then - /bin/echo "Added group \"${GROUP2}\"." - else - /bin/echo "Adding group \"${GROUP2}\" failed..." - /bin/echo "Please create it, and try again." - exit 1 - fi - fi - - if /usr/sbin/pw user show "${USER}" 2>/dev/null; then - /bin/echo "You already have a user \"${USER}\", so I will use it." - else - if /usr/sbin/pw useradd ${USER} -u ${UID} -g ${GROUP} -h - -d /var/spool/postfix -s ${NOLOGIN} -c "Postfix Mail System"; then - /bin/echo "Added user \"${USER}\"." - else - /bin/echo "Adding user \"${USER}\" failed..." - /bin/echo "Please create it, and try again." - exit 1 - fi - fi - - if /usr/sbin/pw show group mail | grep -q "${USER}" 2>/dev/null; then - /bin/echo "You already have user \"${USER}\" in group \"mail\", so I will use it." - else - /bin/echo "You need user \"${USER}\" added to group \"mail\"." - if yesno "Would you like me to add it" y; then - /usr/sbin/pw groupmod mail -m ${USER} || exit - /bin/echo "Done." - else - /bin/echo "Please create it, and try again." - exit 1 - fi - fi -fi - -if [ x"$2" = xPOST-INSTALL ]; then - if [ -d ${PKG_PREFIX}/etc/postfix/dist ]; then - for file in ${PKG_PREFIX}/etc/postfix/dist/*; do - if [ ! -f ${PKG_PREFIX}/etc/postfix/${file#${PKG_PREFIX}/etc/postfix/dist} ]; then - cp $file ${PKG_PREFIX}/etc/postfix/ - fi - done - fi - - /bin/sh ${PKG_PREFIX}/etc/postfix/post-install tempdir=/tmp \ - config_directory=${PKG_PREFIX}/etc/postfix \ - daemon_directory=${PKG_PREFIX}/libexec/postfix \ - command_directory=${PKG_PREFIX}/sbin \ - queue_directory=/var/spool/postfix \ - sendmail_path=${PKG_PREFIX}/sbin/sendmail \ - newaliases_path=${PKG_PREFIX}/bin/newaliases \ - mailq_path=${PKG_PREFIX}/bin/mailq \ - mail_owner=postfix \ - setgid_group=maildrop \ - manpage_directory=${PKG_PREFIX}/man \ - sample_directory=${PKG_PREFIX}/etc/postfix \ - readme_directory=no \ - upgrade-package -fi -# readme_directory is "no" above since the package will have correct perms -# already, and we don't know if they had PORTDOCS. - -replace() { - local orig repl - - orig=$1 - repl=$2 - if [ -e ${orig} ]; then - /bin/mv -f ${orig} ${orig}.OFF - /bin/chmod 0 ${orig}.OFF - fi - if [ -e ${repl} ]; then - /bin/ln -s ${repl} ${orig} - fi -} - -if [ x"$2" = xPOST-INSTALL -a -z "${PACKAGE_BUILDING}" ]; then - if [ -x /sbin/sysctl ]; then - OSVERSION=`/sbin/sysctl -n kern.osreldate` - else - OSVERSION=`/usr/sbin/sysctl -n kern.osreldate` - fi - if [ ${OSVERSION} -ge 400014 ]; then - if yesno "Would you like to activate Postfix in /etc/mail/mailer.conf" ${DEFAULT_REPLACE_MAILERCONF}; then - mv -f /etc/mail/mailer.conf /etc/mail/mailer.conf.old - /bin/echo "#" > /etc/mail/mailer.conf - /bin/echo -n "# Execute the Postfix sendmail program" >> /etc/mail/mailer.conf - /bin/echo ", named ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - /bin/echo "#" >> /etc/mail/mailer.conf - /bin/echo "sendmail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - /bin/echo "send-mail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - /bin/echo "mailq ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - /bin/echo "newaliases ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - fi - else - if yesno "Would you like to replace {sendmail,mailq,newaliases} with Postfix versions" n; then - replace /usr/sbin/sendmail ${PKG_PREFIX}/sbin/sendmail - replace /usr/bin/mailq ${PKG_PREFIX}/sbin/sendmail - replace /usr/bin/newaliases ${PKG_PREFIX}/sbin/sendmail - /bin/echo "Done." - fi - fi -fi diff --git a/mail/postfix22/pkg-message b/mail/postfix22/pkg-message deleted file mode 100644 index d9e910d86ceb..000000000000 --- a/mail/postfix22/pkg-message +++ /dev/null @@ -1,47 +0,0 @@ -If you have postfix configured in your /etc/mail/mailer.conf (answered yes to -the previous question) and would like to enable postfix to start at boot time, -please set these variables in your /etc/rc.conf file: - -sendmail_enable="YES" -sendmail_flags="-bd" -sendmail_pidfile="/var/spool/postfix/pid/master.pid" -sendmail_procname="/usr/local/libexec/postfix/master" -sendmail_outbound_enable="NO" -sendmail_submit_enable="NO" -sendmail_msp_queue_enable="NO" - -This will disable Sendmail completely, and allow you to use /etc/rc.d/sendmail -to start and stop postfix (FreeBSD 5.x and up). For FreeBSD 4.x, it will just -cause the system boot scripts to start sendmail for you. - -Alternatively to the above settings, you can enable postfix to start with -the other local services, for example, after your database server starts if -you need it to be running for postfix. To do this, set in your rc.conf file: - -sendmail_enable="NO" -sendmail_submit_enable="NO" -sendmail_outbound_enable="NO" -sendmail_msp_queue_enable="NO" - -Then make the following symbolic link: - -cd /usr/local/etc/rc.d -ln -s /usr/local/sbin/postfix postfix.sh - - -With either startup configuration, you will want to disable some -Sendmail-specific daily maintenance routines in your /etc/periodic.conf file: - -daily_clean_hoststat_enable="NO" -daily_status_mail_rejects_enable="NO" -daily_status_include_submit_mailq="NO" -daily_submit_queuerun="NO" - - -If you are using SASL, you need to make sure that postfix has access to read -the sasldb file. This is accomplished by adding postfix to group mail and -making the /usr/local/etc/sasldb* file(s) readable by group mail (this should -be the default for new installs). - -If you are upgrading from postfix version prior to 2.0, please see the README -files for recommended changes to your configuration. diff --git a/mail/postfix22/pkg-plist b/mail/postfix22/pkg-plist deleted file mode 100644 index 6c1ab4114c53..000000000000 --- a/mail/postfix22/pkg-plist +++ /dev/null @@ -1,233 +0,0 @@ -@unexec if cmp -s %D/etc/postfix/main.cf %D/etc/postfix/dist/main.cf; then rm -f %D/etc/postfix/main.cf; fi -@unexec if cmp -s %D/etc/postfix/master.cf %D/etc/postfix/dist/master.cf; then rm -f %D/etc/postfix/master.cf; fi -@unexec if cmp -s %D/etc/postfix/access %D/etc/postfix/dist/access; then rm -f %D/etc/postfix/access; fi -@unexec if cmp -s %D/etc/postfix/aliases %D/etc/postfix/dist/aliases; then rm -f %D/etc/postfix/aliases; fi -@unexec if cmp -s %D/etc/postfix/canonical %D/etc/postfix/dist/canonical; then rm -f %D/etc/postfix/canonical; fi -@unexec if cmp -s %D/etc/postfix/header_checks %D/etc/postfix/dist/header_checks; then rm -f %D/etc/postfix/header_checks; fi -@unexec if cmp -s %D/etc/postfix/relocated %D/etc/postfix/dist/relocated; then rm -f %D/etc/postfix/relocated; fi -@unexec if cmp -s %D/etc/postfix/transport %D/etc/postfix/dist/transport; then rm -f %D/etc/postfix/transport; fi -@unexec if cmp -s %D/etc/postfix/virtual %D/etc/postfix/dist/virtual; then rm -f %D/etc/postfix/virtual; fi -@unexec if cmp -s %D/etc/postfix/generic %D/etc/postfix/dist/generic; then rm -f %D/etc/postfix/generic; fi -etc/postfix/LICENSE -etc/postfix/TLS_LICENSE -etc/postfix/main.cf.default -etc/postfix/makedefs.out -etc/postfix/post-install -etc/postfix/postfix-files -etc/postfix/postfix-script -etc/postfix/dist/main.cf -etc/postfix/dist/master.cf -etc/postfix/dist/access -etc/postfix/dist/aliases -etc/postfix/dist/canonical -etc/postfix/dist/header_checks -etc/postfix/dist/relocated -etc/postfix/dist/transport -etc/postfix/dist/virtual -etc/postfix/dist/generic -libexec/postfix/anvil -libexec/postfix/bounce -libexec/postfix/cleanup -libexec/postfix/discard -libexec/postfix/error -libexec/postfix/flush -libexec/postfix/lmtp -libexec/postfix/local -libexec/postfix/master -libexec/postfix/nqmgr -libexec/postfix/oqmgr -libexec/postfix/pickup -libexec/postfix/pipe -libexec/postfix/proxymap -libexec/postfix/qmgr -libexec/postfix/qmqpd -libexec/postfix/scache -libexec/postfix/showq -libexec/postfix/smtp -libexec/postfix/smtpd -libexec/postfix/spawn -libexec/postfix/trivial-rewrite -libexec/postfix/verify -libexec/postfix/virtual -libexec/postfix/tlsmgr -sbin/postalias -sbin/postcat -sbin/postconf -sbin/postdrop -sbin/postfix -sbin/postkick -sbin/postlock -sbin/postlog -sbin/postmap -sbin/postqueue -sbin/postsuper -sbin/sendmail -%%SUB_TEST%%sbin/qmqp-source -%%SUB_TEST%%sbin/smtp-sink -%%SUB_TEST%%sbin/smtp-source -bin/rmail -bin/newaliases -bin/mailq -%%PORTDOCS%%%%DOCSDIR%%/AAAREADME -%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_CLASS_README -%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_CLASS_README.html -%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_REWRITING_README -%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_REWRITING_README.html -%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_VERIFICATION_README -%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_VERIFICATION_README.html -%%PORTDOCS%%%%DOCSDIR%%/BACKSCATTER_README -%%PORTDOCS%%%%DOCSDIR%%/BACKSCATTER_README.html -%%PORTDOCS%%%%DOCSDIR%%/BASIC_CONFIGURATION_README -%%PORTDOCS%%%%DOCSDIR%%/BASIC_CONFIGURATION_README.html -%%PORTDOCS%%%%DOCSDIR%%/BUILTIN_FILTER_README -%%PORTDOCS%%%%DOCSDIR%%/BUILTIN_FILTER_README.html -%%PORTDOCS%%%%DOCSDIR%%/CDB_README -%%PORTDOCS%%%%DOCSDIR%%/CONNECTION_CACHE_README -%%PORTDOCS%%%%DOCSDIR%%/CONNECTION_CACHE_README.html -%%PORTDOCS%%%%DOCSDIR%%/CONTENT_INSPECTION_README -%%PORTDOCS%%%%DOCSDIR%%/CONTENT_INSPECTION_README.html -%%PORTDOCS%%%%DOCSDIR%%/CYRUS_README.html -%%PORTDOCS%%%%DOCSDIR%%/DATABASE_README -%%PORTDOCS%%%%DOCSDIR%%/DATABASE_README.html -%%PORTDOCS%%%%DOCSDIR%%/DB_README -%%PORTDOCS%%%%DOCSDIR%%/DB_README.html -%%PORTDOCS%%%%DOCSDIR%%/DEBUG_README -%%PORTDOCS%%%%DOCSDIR%%/DEBUG_README.html -%%PORTDOCS%%%%DOCSDIR%%/ETRN_README -%%PORTDOCS%%%%DOCSDIR%%/ETRN_README.html -%%PORTDOCS%%%%DOCSDIR%%/FILTER_README -%%PORTDOCS%%%%DOCSDIR%%/FILTER_README.html -%%PORTDOCS%%%%DOCSDIR%%/INSTALL -%%PORTDOCS%%%%DOCSDIR%%/INSTALL.html -%%PORTDOCS%%%%DOCSDIR%%/IPV6_README -%%PORTDOCS%%%%DOCSDIR%%/IPV6_README.html -%%PORTDOCS%%%%DOCSDIR%%/CDB_README.html -%%PORTDOCS%%%%DOCSDIR%%/TLS_README -%%PORTDOCS%%%%DOCSDIR%%/TLS_README.html -%%PORTDOCS%%%%DOCSDIR%%/LDAP_README -%%PORTDOCS%%%%DOCSDIR%%/LDAP_README.html -%%PORTDOCS%%%%DOCSDIR%%/LINUX_README -%%PORTDOCS%%%%DOCSDIR%%/LINUX_README.html -%%PORTDOCS%%%%DOCSDIR%%/LMTP_README -%%PORTDOCS%%%%DOCSDIR%%/LMTP_README.html -%%PORTDOCS%%%%DOCSDIR%%/LOCAL_RECIPIENT_README -%%PORTDOCS%%%%DOCSDIR%%/LOCAL_RECIPIENT_README.html -%%PORTDOCS%%%%DOCSDIR%%/MAILDROP_README -%%PORTDOCS%%%%DOCSDIR%%/MAILDROP_README.html -%%PORTDOCS%%%%DOCSDIR%%/MYSQL_README -%%PORTDOCS%%%%DOCSDIR%%/MYSQL_README.html -%%PORTDOCS%%%%DOCSDIR%%/NFS_README -%%PORTDOCS%%%%DOCSDIR%%/NFS_README.html -%%PORTDOCS%%%%DOCSDIR%%/OVERVIEW -%%PORTDOCS%%%%DOCSDIR%%/OVERVIEW.html -%%PORTDOCS%%%%DOCSDIR%%/PACKAGE_README -%%PORTDOCS%%%%DOCSDIR%%/PACKAGE_README.html -%%PORTDOCS%%%%DOCSDIR%%/PCRE_README -%%PORTDOCS%%%%DOCSDIR%%/PCRE_README.html -%%PORTDOCS%%%%DOCSDIR%%/PGSQL_README -%%PORTDOCS%%%%DOCSDIR%%/PGSQL_README.html -%%PORTDOCS%%%%DOCSDIR%%/QMQP_README -%%PORTDOCS%%%%DOCSDIR%%/QMQP_README.html -%%PORTDOCS%%%%DOCSDIR%%/QSHAPE_README -%%PORTDOCS%%%%DOCSDIR%%/QSHAPE_README.html -%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES -%%PORTDOCS%%%%DOCSDIR%%/RESTRICTION_CLASS_README -%%PORTDOCS%%%%DOCSDIR%%/RESTRICTION_CLASS_README.html -%%PORTDOCS%%%%DOCSDIR%%/SASL_README -%%PORTDOCS%%%%DOCSDIR%%/SASL_README.html -%%PORTDOCS%%%%DOCSDIR%%/SCHEDULER_README -%%PORTDOCS%%%%DOCSDIR%%/SCHEDULER_README.html -%%PORTDOCS%%%%DOCSDIR%%/SMTPD_ACCESS_README -%%PORTDOCS%%%%DOCSDIR%%/SMTPD_ACCESS_README.html -%%PORTDOCS%%%%DOCSDIR%%/SMTPD_POLICY_README -%%PORTDOCS%%%%DOCSDIR%%/SMTPD_POLICY_README.html -%%PORTDOCS%%%%DOCSDIR%%/SMTPD_PROXY_README -%%PORTDOCS%%%%DOCSDIR%%/SMTPD_PROXY_README.html -%%PORTDOCS%%%%SUB_SPF%%%%DOCSDIR%%/SPF_README -%%PORTDOCS%%%%DOCSDIR%%/STANDARD_CONFIGURATION_README -%%PORTDOCS%%%%DOCSDIR%%/STANDARD_CONFIGURATION_README.html -%%PORTDOCS%%%%DOCSDIR%%/TUNING_README -%%PORTDOCS%%%%DOCSDIR%%/TUNING_README.html -%%PORTDOCS%%%%DOCSDIR%%/ULTRIX_README -%%PORTDOCS%%%%DOCSDIR%%/ULTRIX_README.html -%%PORTDOCS%%%%DOCSDIR%%/UUCP_README -%%PORTDOCS%%%%DOCSDIR%%/UUCP_README.html -%%PORTDOCS%%%%DOCSDIR%%/VERP_README -%%PORTDOCS%%%%DOCSDIR%%/VERP_README.html -%%PORTDOCS%%%%DOCSDIR%%/VIRTUAL_README -%%PORTDOCS%%%%DOCSDIR%%/VIRTUAL_README.html -%%PORTDOCS%%%%DOCSDIR%%/XCLIENT_README -%%PORTDOCS%%%%DOCSDIR%%/XCLIENT_README.html -%%PORTDOCS%%%%DOCSDIR%%/XFORWARD_README -%%PORTDOCS%%%%DOCSDIR%%/XFORWARD_README.html -%%PORTDOCS%%%%DOCSDIR%%/access.5.html -%%PORTDOCS%%%%DOCSDIR%%/aliases.5.html -%%PORTDOCS%%%%DOCSDIR%%/anvil.8.html -%%PORTDOCS%%%%DOCSDIR%%/body_checks.5.html -%%PORTDOCS%%%%DOCSDIR%%/bounce.8.html -%%PORTDOCS%%%%DOCSDIR%%/canonical.5.html -%%PORTDOCS%%%%DOCSDIR%%/cidr_table.5.html -%%PORTDOCS%%%%DOCSDIR%%/cleanup.8.html -%%PORTDOCS%%%%DOCSDIR%%/defer.8.html -%%PORTDOCS%%%%DOCSDIR%%/discard.8.html -%%PORTDOCS%%%%DOCSDIR%%/error.8.html -%%PORTDOCS%%%%DOCSDIR%%/flush.8.html -%%PORTDOCS%%%%DOCSDIR%%/header_checks.5.html -%%PORTDOCS%%%%DOCSDIR%%/index.html -%%PORTDOCS%%%%DOCSDIR%%/ldap_table.5.html -%%PORTDOCS%%%%DOCSDIR%%/lmtp.8.html -%%PORTDOCS%%%%DOCSDIR%%/local.8.html -%%PORTDOCS%%%%DOCSDIR%%/mailq.1.html -%%PORTDOCS%%%%DOCSDIR%%/master.5.html -%%PORTDOCS%%%%DOCSDIR%%/master.8.html -%%PORTDOCS%%%%DOCSDIR%%/mysql_table.5.html -%%PORTDOCS%%%%DOCSDIR%%/nisplus_table.5.html -%%PORTDOCS%%%%DOCSDIR%%/newaliases.1.html -%%PORTDOCS%%%%DOCSDIR%%/oqmgr.8.html -%%PORTDOCS%%%%DOCSDIR%%/pcre_table.5.html -%%PORTDOCS%%%%DOCSDIR%%/pgsql_table.5.html -%%PORTDOCS%%%%DOCSDIR%%/pickup.8.html -%%PORTDOCS%%%%DOCSDIR%%/pipe.8.html -%%PORTDOCS%%%%DOCSDIR%%/postalias.1.html -%%PORTDOCS%%%%DOCSDIR%%/postcat.1.html -%%PORTDOCS%%%%DOCSDIR%%/postconf.1.html -%%PORTDOCS%%%%DOCSDIR%%/postconf.5.html -%%PORTDOCS%%%%DOCSDIR%%/postdrop.1.html -%%PORTDOCS%%%%DOCSDIR%%/postfix-logo.jpg -%%PORTDOCS%%%%DOCSDIR%%/postfix-manuals.html -%%PORTDOCS%%%%DOCSDIR%%/postfix-power.png -%%PORTDOCS%%%%DOCSDIR%%/postfix.1.html -%%PORTDOCS%%%%DOCSDIR%%/postkick.1.html -%%PORTDOCS%%%%DOCSDIR%%/postlock.1.html -%%PORTDOCS%%%%DOCSDIR%%/postlog.1.html -%%PORTDOCS%%%%DOCSDIR%%/postmap.1.html -%%PORTDOCS%%%%DOCSDIR%%/postqueue.1.html -%%PORTDOCS%%%%DOCSDIR%%/postsuper.1.html -%%PORTDOCS%%%%DOCSDIR%%/proxymap.8.html -%%PORTDOCS%%%%DOCSDIR%%/qmgr.8.html -%%PORTDOCS%%%%DOCSDIR%%/qmqp-sink.1.html -%%PORTDOCS%%%%DOCSDIR%%/qmqp-source.1.html -%%PORTDOCS%%%%DOCSDIR%%/qmqpd.8.html -%%PORTDOCS%%%%DOCSDIR%%/qshape.1.html -%%PORTDOCS%%%%DOCSDIR%%/regexp_table.5.html -%%PORTDOCS%%%%DOCSDIR%%/relocated.5.html -%%PORTDOCS%%%%DOCSDIR%%/sendmail.1.html -%%PORTDOCS%%%%DOCSDIR%%/scache.8.html -%%PORTDOCS%%%%DOCSDIR%%/showq.8.html -%%PORTDOCS%%%%DOCSDIR%%/smtp-sink.1.html -%%PORTDOCS%%%%DOCSDIR%%/smtp-source.1.html -%%PORTDOCS%%%%DOCSDIR%%/smtp.8.html -%%PORTDOCS%%%%DOCSDIR%%/smtpd.8.html -%%PORTDOCS%%%%DOCSDIR%%/spawn.8.html -%%PORTDOCS%%%%DOCSDIR%%/trace.8.html -%%PORTDOCS%%%%DOCSDIR%%/transport.5.html -%%PORTDOCS%%%%DOCSDIR%%/trivial-rewrite.8.html -%%PORTDOCS%%%%DOCSDIR%%/verify.8.html -%%PORTDOCS%%%%DOCSDIR%%/virtual.5.html -%%PORTDOCS%%%%DOCSDIR%%/virtual.8.html -%%PORTDOCS%%%%DOCSDIR%%/tlsmgr.8.html -%%PORTDOCS%%%%DOCSDIR%%/generic.5.html -%%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrm libexec/postfix -@dirrm etc/postfix/dist -@unexec rmdir %D/etc/postfix 2>/dev/null || true diff --git a/mail/postfix22/scripts/configure b/mail/postfix22/scripts/configure deleted file mode 100644 index 93c5b95ec561..000000000000 --- a/mail/postfix22/scripts/configure +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ - -for f in `find ${WRKSRC} -type f | xargs grep -l '\!\!PREFIX\!\!' ` ; do \ - mv $f $f.orig && sed s+!!PREFIX!!+$PREFIX+g < $f.orig > $f && \ - rm $f.orig -done diff --git a/mail/postfix22/scripts/configure.postfix b/mail/postfix22/scripts/configure.postfix deleted file mode 100644 index 8fe06f2de9ae..000000000000 --- a/mail/postfix22/scripts/configure.postfix +++ /dev/null @@ -1,256 +0,0 @@ -#!/bin/sh -# $FreeBSD: /tmp/pcvs/ports/mail/postfix22/scripts/Attic/configure.postfix,v 1.63 2005-07-06 16:37:35 jylefort Exp $ - -if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then - exit -fi - -tempfile=`/usr/bin/mktemp -t checklist` - -if [ "${POSTFIX_OPTIONS}" ]; then - set ${POSTFIX_OPTIONS} -fi - -for i; do - eval status_$i=ON -done - -if [ -z "${BATCH}" ]; then - /usr/bin/dialog --title "Postfix configuration options" --clear \ - --checklist "\n\ -Please select desired options:" -1 -1 16 \ -NOPCRE "DISABLE Perl Compatible Regular Expressions" "$status_NOPCRE" \ -SASL "Cyrus SASLv1 (Simple Authentication and Security Layer)" "$status_SASL" \ -SASL2 "Cyrus SASLv2 (Simple Authentication and Security Layer)" "$status_SASL2" \ -SASLKRB "If your SASL requires Kerberos select this option" "$status_SASLKRB" \ -SASLKRB5 "If your SASL requires Kerberos5 select this option" "$status_SASLKRB5" \ -SPF "SPF support" "$status_SPF" \ -TLS "SSL and TLS" "$status_TLS" \ -DB3 "Berkeley DB3 (required if SASL also built with DB3)" "$status_DB3" \ -DB40 "Berkeley DB4.0 (required if SASL also built with DB4.0)" "$status_DB40" \ -DB41 "Berkeley DB4.1 (required if SASL also built with DB4.1)" "$status_DB41" \ -DB42 "Berkeley DB4.2 (required if SASL also built with DB4.2)" "$status_DB42" \ -DB43 "Berkeley DB4.3 (required if SASL also built with DB4.3)" "$status_DB43" \ -MySQL "MySQL map lookups (choose version with WITH_MYSQL_VER)" "$status_MySQL" \ -PgSQL "PostgreSQL map lookups (choose with DEFAULT_PGSQL_VER)" "$status_PgSQL" \ -OpenLDAP "OpenLDAP map lookups (choose ver. with WITH_OPENLDAP_VER)" "$status_OpenLDAP" \ -NIS "NIS map lookups" "$status_NIS" \ -VDA "VDA (Virtual Delivery Agent)" "$status_VDA" \ -Test "SMTP/LMTP test server and generator" "$status_Test" \ -2> $tempfile - - retval=$? - - if [ -s $tempfile ]; then - set `sed 's/"//g' $tempfile` - fi - rm -f $tempfile - - case $retval in - 0) if [ -z "$*" ]; then - /bin/echo "Nothing selected" - fi - ;; - 1) /bin/echo "Cancel pressed." - exit 1 - ;; - esac -fi - -${MKDIR} ${WRKDIRPREFIX}${CURDIR} -exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - -/bin/echo "PREFIX= ${PREFIX}" - -SUB_TEST="@comment " -SUB_SPF="@comment " - -while [ "$1" ]; do - case $1 in - NOPCRE) - /bin/echo "WITHOUT_PCRE= yes" - /bin/echo "NOPCRE_SUFFIX= +nopcre" - SUB_NOPCRE="" - ;; - SASL) - /bin/echo "LIB_DEPENDS+= sasl.8:\${PORTSDIR}/security/cyrus-sasl" - /bin/echo "POSTFIX_CCARGS+= -DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl1" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lsasl -lpam -lcrypt" - /bin/echo "SASL_SUFFIX= +sasl" - if [ -f ${LOCALBASE}/lib/libsasl.a ]; then - if /usr/bin/nm ${LOCALBASE}/lib/libsasl.a | grep -wq "mysql_init"; then - SASL_USE_MYSQL="YES" - fi - fi - ;; - SASL2) - /bin/echo "LIB_DEPENDS+= sasl2.2:\${PORTSDIR}/security/cyrus-sasl2" - /bin/echo "POSTFIX_CCARGS+= -DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lsasl2 -lpam -lcrypt" - /bin/echo "SASL_SUFFIX= +sasl2" - if [ -f ${LOCALBASE}/lib/libsasl2.a ]; then - if /usr/bin/nm ${LOCALBASE}/lib/libsasl2.a | grep -wq "mysql_init"; then - SASL_USE_MYSQL="YES" - fi - fi - ;; - SASLKRB) - /bin/echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err" - ;; - SASLKRB5) - /bin/echo "POSTFIX_AUXLIBS+= -lkrb5 -lcrypto -lcrypt -lcom_err -lasn1 -lroken" - ;; - SPF) - # see http://www.ipnet6.org/postfix/spf/ - /bin/echo "LIB_DEPENDS+= spf2.1:\${PORTSDIR}/mail/libspf2" - /bin/echo "PATCH_SITES+= http://www.ipnet6.org/postfix/download/" - /bin/echo "PATCHFILES+= postfix-libspf2-2.2.0-5.patch" - /bin/echo "PATCH_DIST_STRIP= -p1" - /bin/echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lspf2" - /bin/echo "SPF_SUFFIX= +spf" -# /bin/echo "README+= SPF_README" - /bin/echo "" - SUB_SPF="" - ;; - TLS) - /bin/echo "USE_OPENSSL= yes" - /bin/echo "POSTFIX_CCARGS+= -DUSE_TLS -I\${OPENSSLINC}" - /bin/echo "POSTFIX_AUXLIBS+= -L\${OPENSSLLIB} -lssl -lcrypto" - /bin/echo "TLS_SUFFIX= +tls" - ;; - DB3) - if [ "X$BDB_SELECTED" != "X" ]; then - /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr - rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - exit 1 - fi - /bin/echo "LIB_DEPENDS+= db3.3:\${PORTSDIR}/databases/db3" - /bin/echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db3" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb3" - /bin/echo "DB_SUFFIX= +db3" - BDB_SELECTED="3" - ;; - DB40) - if [ "X$BDB_SELECTED" != "X" ]; then - /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr - rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - exit 1 - fi - /bin/echo "LIB_DEPENDS+= db4.0:\${PORTSDIR}/databases/db4" - /bin/echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db4" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb4" - /bin/echo "DB_SUFFIX= +db40" - BDB_SELECTED="40" - ;; - DB41) - if [ "X$BDB_SELECTED" != "X" ]; then - /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr - rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - exit 1 - fi - /bin/echo "LIB_DEPENDS+= db41.1:\${PORTSDIR}/databases/db41" - /bin/echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db41" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb41" - /bin/echo "DB_SUFFIX= +db41" - BDB_SELECTED="41" - ;; - DB42) - if [ "X$BDB_SELECTED" != "X" ]; then - /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr - rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - exit 1 - fi - /bin/echo "LIB_DEPENDS+= db-4.2.2:\${PORTSDIR}/databases/db42" - /bin/echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db42" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib/db42/ -ldb" - /bin/echo "DB_SUFFIX= +db42" - BDB_SELECTED="42" - ;; - DB43) - if [ "X$BDB_SELECTED" != "X" ]; then - /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr - rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - exit 1 - fi - /bin/echo "LIB_DEPENDS+= db-4.3.0:\${PORTSDIR}/databases/db43" - /bin/echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db43" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib/db43/ -ldb" - /bin/echo "DB_SUFFIX= +db43" - BDB_SELECTED="43" - ;; - MySQL) - /bin/echo "USE_MYSQL=YES" - /bin/echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql" - /bin/echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz -lcrypt" - if [ -f ${LOCALBASE}/lib/mysql/libmysqlclient.a ]; then - if /usr/bin/nm ${LOCALBASE}/lib/mysql/libmysqlclient.a | grep -wq "SSL_new"; then - /bin/echo "USE_OPENSSL= yes" - /bin/echo "POSTFIX_CCARGS+= -I\${OPENSSLLIB}" - /bin/echo "POSTFIX_AUXLIBS+= -L\${OPENSSLLIB} -lssl -lcrypto" - fi - fi - /bin/echo "MYSQL_SUFFIX= +mysql" - MYSQL_SELECTED="YES" - ;; - PgSQL) - /bin/echo "USE_PGSQL=YES" - /bin/echo "POSTFIX_CCARGS+= -DHAS_PGSQL -I\${LOCALBASE}/include -I\${LOCALBASE}/pgsql/include" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt" - /bin/echo "PGSQL_SUFFIX= +pgsql" - ;; - OpenLDAP) - /bin/echo "USE_OPENLDAP=YES" - /bin/echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lldap -llber" - /bin/echo "OPENLDAP_SUFFIX= +openldap" - ;; - NIS) - /bin/echo "POSTFIX_CCARGS+= -DHAS_NIS" - /bin/echo "NIS_SUFFIX= +nis" - ;; - VDA) - /bin/echo "PATCH_SITES+= http://web.onda.com.br/nadal/postfix/VDA/" - /bin/echo "PATCHFILES+= postfix-2.2.4-vda.patch.gz" - /bin/echo "PATCH_DIST_STRIP= -p1" - ;; - Test) - /bin/echo "BIN1= smtp-sink smtp-source qmqp-source" -# /bin/echo "MAN1+= smtp-sink.1 smtp-source.1 qmqp-sink.1 qmqp-source.1" - SUB_TEST="" - ;; - *) - /bin/echo "Unknown option(s): $*" > /dev/stderr - rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - exit 1 - ;; - esac - shift -done - -if [ -z "${BATCH}" ]; then - if [ "X$SASL_USE_MYSQL" != "X" ] && [ "$MYSQL_SELECTED" != "YES" ]; then - /usr/bin/dialog --yesno "Your lib SASL it is compiled with MySQL. It desires to use the MySQL?" 5 80 > /dev/stderr - if [ $? = 0 ]; then - /bin/echo "USE_MYSQL=YES" - /bin/echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql" - /bin/echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz -lcrypt" - if [ -f ${LOCALBASE}/lib/mysql/libmysqlclient.a ]; then - if /usr/bin/nm ${LOCALBASE}/lib/mysql/libmysqlclient.a | grep -wq "SSL_new"; then - /bin/echo "USE_OPENSSL= yes" - /bin/echo "POSTFIX_CCARGS+= -I\${OPENSSLLIB}" - /bin/echo "POSTFIX_AUXLIBS+= -L\${OPENSSLLIB} -lssl -lcrypto" - fi - fi - fi - fi -fi - -/bin/echo "PLIST_SUB+= SUB_TEST=\"${SUB_TEST}\"" -/bin/echo "PLIST_SUB+= SUB_SPF=\"${SUB_SPF}\"" - -# for some reason, if we alter the pkg name this way, the first build (where -# we ask the configure questions) doesn't pick up the extensions, but -# any subsequent build will. so "make; make install" will build twice. -# don't do this for now. -#/bin/echo "PKGNAMESUFFIX= \${NOPCRE_SUFFIX}\${SASL_SUFFIX}\${DB_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${NIS_SUFFIX}\${SPF_SUFFIX}" diff --git a/mail/postfix22/scripts/fix-files-list b/mail/postfix22/scripts/fix-files-list deleted file mode 100644 index cc4a1083a814..000000000000 --- a/mail/postfix22/scripts/fix-files-list +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -# need to fixup ${PREFIX}/etc/postfix/postfix-files to indicate compressed -# man pages, since the ports software compresses them later, and if we -# run post-install it will complain about missing files -# (script from Simon J. Mudd) - -ed ${PREFIX}/etc/postfix/postfix-files <<EOF || exit 1 -%s/\(\/man[158]\/.*\.[158]\):/\1.gz:/ -w -q -EOF diff --git a/mail/postfix23/Makefile b/mail/postfix23/Makefile deleted file mode 100644 index 8947c1225319..000000000000 --- a/mail/postfix23/Makefile +++ /dev/null @@ -1,161 +0,0 @@ -# New ports collection makefile for: postfix -# Date created: 18 Mar 1999 -# Whom: torstenb -# -# $FreeBSD$ -# - -# To pre-select options in batch mode, run make like this: -# -# make -DBATCH POSTFIX_OPTIONS="DB3 TLS" -# -# the options are the same names as in the scripts/configure.postfix file. -# POSTFIX_OPTIONS can be set in /etc/make.conf also. - -# NOTE: PCRE is enabled by default unless you specifically disable it. - -PORTNAME= postfix -PORTVERSION= 2.2.5 -PORTEPOCH= 1 -CATEGORIES= mail ipv6 -MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ - ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/%SUBDIR%/ \ - ftp://ftp.tux.org/pub/net/postfix/official/ \ - ftp://ftp.utoronto.ca/mirror/packages/postfix/official/ \ - ftp://ftp.samurai.com/pub/postfix/official/ \ - ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/postfix/official/&,} -MASTER_SITE_SUBDIR= . old related/postfix -DISTNAME= postfix-${PORTVERSION} -DIST_SUBDIR= ${PORTNAME} - -# blanket approval for version updates: marcus@corp.grupos.com.br -MAINTAINER= vivek@khera.org -COMMENT= A secure alternative to widely-used Sendmail - -CONFLICTS= courier-0.* postfix-1.* postfix-2.0.* postfix-2.1.* postfix-2.3.* \ - sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.* -USE_SUBMAKE= yes -USE_REINPLACE= yes - -MAN1= postalias.1 postcat.1 postconf.1 postdrop.1 postfix.1 postkick.1 \ - postlock.1 postlog.1 postmap.1 postqueue.1 postsuper.1 sendmail.1 - -MAN5= access.5 aliases.5 canonical.5 cidr_table.5 generic.5 header_checks.5 \ - ldap_table.5 master.5 mysql_table.5 nisplus_table.5 pcre_table.5 \ - pgsql_table.5 postconf.5 regexp_table.5 relocated.5 transport.5 \ - virtual.5 - -MAN8= anvil.8 bounce.8 cleanup.8 discard.8 error.8 flush.8 lmtp.8 local.8 \ - master.8 oqmgr.8 pickup.8 pipe.8 proxymap.8 qmgr.8 qmqpd.8 scache.8 \ - showq.8 smtp.8 smtpd.8 spawn.8 tlsmgr.8 trivial-rewrite.8 verify.8 \ - virtual.8 - -MLINKS= sendmail.1 mailq.1 \ - sendmail.1 newaliases.1 \ - header_checks.5 body_checks.5 \ - bounce.8 defer.8 \ - bounce.8 trace.8 - -CONF1= access aliases canonical generic header_checks main.cf master.cf \ - relocated transport virtual - -.if !defined(DEBUG) -MAKEFILEFLAGS+= DEBUG= -.endif - -MAKEFILEFLAGS+= CC="${CC}" OPT="${CFLAGS}" - -SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ - TOUCH="${TOUCH}" \ - MKDIR="${MKDIR}" \ - POSTFIX_OPTIONS="${POSTFIX_OPTIONS}" - -pre-fetch: - @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postfix - -.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc) -.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc" -.endif - -.if defined(WITHOUT_PCRE) -POSTFIX_CCARGS+= -DNO_PCRE -.else -LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre -POSTFIX_CCARGS+= -DHAS_PCRE -I${LOCALBASE}/include -POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -lpcre -.endif - -post-patch: - (cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \ - CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \ - ${ECHO} "all: default" >> Makefile) - -pre-patch: - @${ECHO} "<body>See <A HREF="header_checks.5.html">header_checks.5.html</A></BODY>" > ${WRKSRC}/html/body_checks.5.html - @for f in `${FIND} -P ${WRKSRC}/man -type f`; do \ - ${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" $${f}; \ - done - @for f in `${FIND} -P ${WRKSRC}/README_FILES -type f`; do \ - ${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" $${f}; \ - done - @for f in `${FIND} -P ${WRKSRC}/conf -type f`; do \ - ${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" $${f}; \ - done - -pre-install: - @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL - -.if defined(NOPORTDOCS) -READMEDIR=no -.else -READMEDIR=${PREFIX}/share/doc/postfix -.endif - -do-install: - cd ${WRKSRC}; ${SH} postfix-install -non-interactive install_root=/ tempdir=/tmp \ - config_directory=${PREFIX}/etc/postfix \ - daemon_directory=${PREFIX}/libexec/postfix \ - command_directory=${PREFIX}/sbin \ - queue_directory=/var/spool/postfix \ - sendmail_path=${PREFIX}/sbin/sendmail \ - newaliases_path=${PREFIX}/bin/newaliases \ - mailq_path=${PREFIX}/bin/mailq \ - mail_owner=postfix \ - setgid_group=maildrop \ - manpage_directory=${PREFIX}/man \ - sample_directory=${PREFIX}/etc/postfix \ - readme_directory=${READMEDIR} - - @${MKDIR} ${PREFIX}/etc/postfix/dist -.for f in ${CONF1} - ${INSTALL_DATA} ${WRKSRC}/conf/${f} ${PREFIX}/etc/postfix/dist -.endfor - - @${INSTALL_SCRIPT} \ - ${WRKSRC}/auxiliary/rmail/rmail \ - ${PREFIX}/bin/rmail - -# optional TEST binaries -.for file in ${BIN1} - @${INSTALL_PROGRAM} ${WRKSRC}/bin/${file} ${PREFIX}/sbin -.endfor - -.if !defined(NOPORTDOCS) - @${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${DOCSDIR} - @cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.jpg *.png ${DOCSDIR} && \ - ${ECHO_MSG} "Installed HTML documentation in ${DOCSDIR}" -.endif - -post-install: - @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL -# need to fixup ${PREFIX}/etc/postfix/postfix-files to indicate compressed -# man pages, since the ports software compresses them after this step, and -# if we run etc/postfix/post-install again during package installation, -# it will complain about missing files. - @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/fix-files-list - @${CAT} ${PKGMESSAGE} - -post-clean: - @${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc - -.include <bsd.port.mk> diff --git a/mail/postfix23/distinfo b/mail/postfix23/distinfo deleted file mode 100644 index 59ac523435fa..000000000000 --- a/mail/postfix23/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -MD5 (postfix/postfix-2.2.5.tar.gz) = 9c13d58494c64012bfd8ab0d6967305c -SIZE (postfix/postfix-2.2.5.tar.gz) = 2428594 -MD5 (postfix/postfix-libspf2-2.2.0-5.patch) = 80be36e0f14e1a1f39a3b30b9b2d4115 -SIZE (postfix/postfix-libspf2-2.2.0-5.patch) = 26077 -MD5 (postfix/postfix-2.2.4-vda.patch.gz) = 7049364c6476edf80d6ff861ca37936f -SIZE (postfix/postfix-2.2.4-vda.patch.gz) = 7712 diff --git a/mail/postfix23/files/patch-conf::main.cf b/mail/postfix23/files/patch-conf::main.cf deleted file mode 100644 index 67e356de21dd..000000000000 --- a/mail/postfix23/files/patch-conf::main.cf +++ /dev/null @@ -1,64 +0,0 @@ ---- conf/main.cf.orig Sat Mar 5 11:53:42 2005 -+++ conf/main.cf Sat Mar 5 11:53:42 2005 -@@ -32,13 +32,13 @@ - # The command_directory parameter specifies the location of all - # postXXX commands. - # --command_directory = /usr/sbin -+command_directory = !!PREFIX!!/sbin - - # The daemon_directory parameter specifies the location of all Postfix - # daemon programs (i.e. programs listed in the master.cf file). This - # directory must be owned by root. - # --daemon_directory = /usr/libexec/postfix -+daemon_directory = !!PREFIX!!/libexec/postfix - - # QUEUE AND PROCESS OWNERSHIP - # -@@ -608,37 +608,37 @@ - # sendmail_path: The full pathname of the Postfix sendmail command. - # This is the Sendmail-compatible mail posting interface. - # --sendmail_path = -+sendmail_path = !!PREFIX!!/sbin/sendmail - - # newaliases_path: The full pathname of the Postfix newaliases command. - # This is the Sendmail-compatible command to build alias databases. - # --newaliases_path = -+newaliases_path = !!PREFIX!!/bin/newaliases - - # mailq_path: The full pathname of the Postfix mailq command. This - # is the Sendmail-compatible mail queue listing command. - # --mailq_path = -+mailq_path = !!PREFIX!!/bin/mailq - - # setgid_group: The group for mail submission and queue management - # commands. This must be a group name with a numerical group ID that - # is not shared with other accounts, not even with the Postfix account. - # --setgid_group = -+setgid_group = maildrop - - # html_directory: The location of the Postfix HTML documentation. - # --html_directory = -+html_directory = no - - # manpage_directory: The location of the Postfix on-line manual pages. - # --manpage_directory = -+manpage_directory = !!PREFIX!!/man - - # sample_directory: The location of the Postfix sample configuration files. - # This parameter is obsolete as of Postfix 2.1. - # --sample_directory = -+sample_directory = !!PREFIX!!/etc/postfix - - # readme_directory: The location of the Postfix README files. - # --readme_directory = -+readme_directory = no diff --git a/mail/postfix23/files/patch-conf::post-install b/mail/postfix23/files/patch-conf::post-install deleted file mode 100644 index 78401de5bdf3..000000000000 --- a/mail/postfix23/files/patch-conf::post-install +++ /dev/null @@ -1,11 +0,0 @@ ---- conf/post-install.orig Thu Feb 24 08:06:08 2005 -+++ conf/post-install Sat Mar 5 11:53:42 2005 -@@ -185,7 +185,7 @@ - - umask 022 - --PATH=/bin:/usr/bin:/usr/sbin:/usr/etc:/sbin:/etc:/usr/contrib/bin:/usr/gnu/bin:/usr/ucb:/usr/bsd -+PATH=/bin:/usr/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/local/sbin - SHELL=/bin/sh - IFS=" - " diff --git a/mail/postfix23/files/patch-makedefs b/mail/postfix23/files/patch-makedefs deleted file mode 100644 index ed2f08d06ae4..000000000000 --- a/mail/postfix23/files/patch-makedefs +++ /dev/null @@ -1,13 +0,0 @@ ---- makedefs.orig Tue Feb 22 09:35:52 2005 -+++ makedefs Wed Jul 13 17:42:53 2005 -@@ -116,6 +116,10 @@ - ;; - FreeBSD.5*) SYSTYPE=FREEBSD5 - ;; -+ FreeBSD.6*) SYSTYPE=FREEBSD5 -+ ;; -+ FreeBSD.7*) SYSTYPE=FREEBSD5 -+ ;; - OpenBSD.2*) SYSTYPE=OPENBSD2 - ;; - OpenBSD.3*) SYSTYPE=OPENBSD3 diff --git a/mail/postfix23/files/patch-src::global::mail_params.h b/mail/postfix23/files/patch-src::global::mail_params.h deleted file mode 100644 index 52ea5e9e5c35..000000000000 --- a/mail/postfix23/files/patch-src::global::mail_params.h +++ /dev/null @@ -1,29 +0,0 @@ ---- src/global/mail_params.h.orig Fri Feb 11 21:53:21 2005 -+++ src/global/mail_params.h Sat Mar 5 11:53:42 2005 -@@ -64,7 +64,7 @@ - extern gid_t var_owner_gid; - - #define VAR_SGID_GROUP "setgid_group" --#define DEF_SGID_GROUP "postdrop" -+#define DEF_SGID_GROUP "maildrop" - extern char *var_sgid_group; - extern gid_t var_sgid_gid; - -@@ -221,7 +221,7 @@ - */ - #define VAR_DAEMON_DIR "daemon_directory" - #ifndef DEF_DAEMON_DIR --#define DEF_DAEMON_DIR "/usr/libexec/postfix" -+#define DEF_DAEMON_DIR "!!PREFIX!!/libexec/postfix" - #endif - extern char *var_daemon_dir; - -@@ -250,7 +250,7 @@ - */ - #define VAR_CONFIG_DIR "config_directory" - #ifndef DEF_CONFIG_DIR --#define DEF_CONFIG_DIR "/etc/postfix" -+#define DEF_CONFIG_DIR "!!PREFIX!!/etc/postfix" - #endif - extern char *var_config_dir; - diff --git a/mail/postfix23/pkg-descr b/mail/postfix23/pkg-descr deleted file mode 100644 index 1f335ce6820c..000000000000 --- a/mail/postfix23/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -Postfix attempts to be fast, easy to administer, and secure, while at -the same time being sendmail-compatible enough to not upset existing -users. It also offers QMQP and VERP support to let Postfix act as delivery -daemon for ezmlm-idx. - -WWW: http://www.postfix.org/ diff --git a/mail/postfix23/pkg-install b/mail/postfix23/pkg-install deleted file mode 100644 index e912b1a051e2..000000000000 --- a/mail/postfix23/pkg-install +++ /dev/null @@ -1,181 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# If the POSTFIX_DEFAULT_MTA environment variable is set to YES, it -# will make the port/package use defaults which make postfix replace -# sendmail as much as possible. - -PKG_PREFIX=${PKG_PREFIX:=/usr/local} -BATCH=${BATCH:=no} -POSTFIX_DEFAULT_MTA=${POSTFIX_DEFAULT_MTA:=no} - -if [ x${POSTFIX_DEFAULT_MTA} = xno ]; then - DEFAULT_REPLACE_MAILERCONF=n -else - DEFAULT_REPLACE_MAILERCONF=y -fi - -if [ -x /usr/sbin/nologin ]; then - NOLOGIN=/usr/sbin/nologin -else - NOLOGIN=/sbin/nologin -fi - -ask() { - local question default answer - - question=$1 - default=$2 - if [ -z "${PACKAGE_BUILDING}" -a x${BATCH} = xno ]; then - read -p "${question} [${default}]? " answer - fi - if [ x${answer} = x ]; then - answer=${default} - fi - /bin/echo ${answer} -} - -yesno() { - local question default answer - - question=$1 - default=$2 - while :; do - answer=$(ask "${question}" "${default}") - case "${answer}" in - [Yy]*) return 0;; - [Nn]*) return 1;; - esac - /bin/echo "Please answer yes or no." - done -} - -if [ x"$2" = xPRE-INSTALL ]; then - USER=postfix - UID=125 - GROUP=postfix - GID=125 - GROUP2=maildrop - GID2=126 - - if /usr/sbin/pw groupshow "${GROUP}" 2>/dev/null; then - /bin/echo "You already have a group \"${GROUP}\", so I will use it." - else - if /usr/sbin/pw groupadd ${GROUP} -g ${GID} - then - /bin/echo "Added group \"${GROUP}\"." - else - /bin/echo "Adding group \"${GROUP}\" failed..." - /bin/echo "Please create it, and try again." - exit 1 - fi - fi - - if /usr/sbin/pw groupshow "${GROUP2}" 2>/dev/null; then - /bin/echo "You already have a group \"${GROUP2}\", so I will use it." - else - if /usr/sbin/pw groupadd ${GROUP2} -g ${GID2}; then - /bin/echo "Added group \"${GROUP2}\"." - else - /bin/echo "Adding group \"${GROUP2}\" failed..." - /bin/echo "Please create it, and try again." - exit 1 - fi - fi - - if /usr/sbin/pw user show "${USER}" 2>/dev/null; then - /bin/echo "You already have a user \"${USER}\", so I will use it." - else - if /usr/sbin/pw useradd ${USER} -u ${UID} -g ${GROUP} -h - -d /var/spool/postfix -s ${NOLOGIN} -c "Postfix Mail System"; then - /bin/echo "Added user \"${USER}\"." - else - /bin/echo "Adding user \"${USER}\" failed..." - /bin/echo "Please create it, and try again." - exit 1 - fi - fi - - if /usr/sbin/pw show group mail | grep -q "${USER}" 2>/dev/null; then - /bin/echo "You already have user \"${USER}\" in group \"mail\", so I will use it." - else - /bin/echo "You need user \"${USER}\" added to group \"mail\"." - if yesno "Would you like me to add it" y; then - /usr/sbin/pw groupmod mail -m ${USER} || exit - /bin/echo "Done." - else - /bin/echo "Please create it, and try again." - exit 1 - fi - fi -fi - -if [ x"$2" = xPOST-INSTALL ]; then - if [ -d ${PKG_PREFIX}/etc/postfix/dist ]; then - for file in ${PKG_PREFIX}/etc/postfix/dist/*; do - if [ ! -f ${PKG_PREFIX}/etc/postfix/${file#${PKG_PREFIX}/etc/postfix/dist} ]; then - cp $file ${PKG_PREFIX}/etc/postfix/ - fi - done - fi - - /bin/sh ${PKG_PREFIX}/etc/postfix/post-install tempdir=/tmp \ - config_directory=${PKG_PREFIX}/etc/postfix \ - daemon_directory=${PKG_PREFIX}/libexec/postfix \ - command_directory=${PKG_PREFIX}/sbin \ - queue_directory=/var/spool/postfix \ - sendmail_path=${PKG_PREFIX}/sbin/sendmail \ - newaliases_path=${PKG_PREFIX}/bin/newaliases \ - mailq_path=${PKG_PREFIX}/bin/mailq \ - mail_owner=postfix \ - setgid_group=maildrop \ - manpage_directory=${PKG_PREFIX}/man \ - sample_directory=${PKG_PREFIX}/etc/postfix \ - readme_directory=no \ - upgrade-package -fi -# readme_directory is "no" above since the package will have correct perms -# already, and we don't know if they had PORTDOCS. - -replace() { - local orig repl - - orig=$1 - repl=$2 - if [ -e ${orig} ]; then - /bin/mv -f ${orig} ${orig}.OFF - /bin/chmod 0 ${orig}.OFF - fi - if [ -e ${repl} ]; then - /bin/ln -s ${repl} ${orig} - fi -} - -if [ x"$2" = xPOST-INSTALL -a -z "${PACKAGE_BUILDING}" ]; then - if [ -x /sbin/sysctl ]; then - OSVERSION=`/sbin/sysctl -n kern.osreldate` - else - OSVERSION=`/usr/sbin/sysctl -n kern.osreldate` - fi - if [ ${OSVERSION} -ge 400014 ]; then - if yesno "Would you like to activate Postfix in /etc/mail/mailer.conf" ${DEFAULT_REPLACE_MAILERCONF}; then - mv -f /etc/mail/mailer.conf /etc/mail/mailer.conf.old - /bin/echo "#" > /etc/mail/mailer.conf - /bin/echo -n "# Execute the Postfix sendmail program" >> /etc/mail/mailer.conf - /bin/echo ", named ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - /bin/echo "#" >> /etc/mail/mailer.conf - /bin/echo "sendmail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - /bin/echo "send-mail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - /bin/echo "mailq ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - /bin/echo "newaliases ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - fi - else - if yesno "Would you like to replace {sendmail,mailq,newaliases} with Postfix versions" n; then - replace /usr/sbin/sendmail ${PKG_PREFIX}/sbin/sendmail - replace /usr/bin/mailq ${PKG_PREFIX}/sbin/sendmail - replace /usr/bin/newaliases ${PKG_PREFIX}/sbin/sendmail - /bin/echo "Done." - fi - fi -fi diff --git a/mail/postfix23/pkg-message b/mail/postfix23/pkg-message deleted file mode 100644 index d9e910d86ceb..000000000000 --- a/mail/postfix23/pkg-message +++ /dev/null @@ -1,47 +0,0 @@ -If you have postfix configured in your /etc/mail/mailer.conf (answered yes to -the previous question) and would like to enable postfix to start at boot time, -please set these variables in your /etc/rc.conf file: - -sendmail_enable="YES" -sendmail_flags="-bd" -sendmail_pidfile="/var/spool/postfix/pid/master.pid" -sendmail_procname="/usr/local/libexec/postfix/master" -sendmail_outbound_enable="NO" -sendmail_submit_enable="NO" -sendmail_msp_queue_enable="NO" - -This will disable Sendmail completely, and allow you to use /etc/rc.d/sendmail -to start and stop postfix (FreeBSD 5.x and up). For FreeBSD 4.x, it will just -cause the system boot scripts to start sendmail for you. - -Alternatively to the above settings, you can enable postfix to start with -the other local services, for example, after your database server starts if -you need it to be running for postfix. To do this, set in your rc.conf file: - -sendmail_enable="NO" -sendmail_submit_enable="NO" -sendmail_outbound_enable="NO" -sendmail_msp_queue_enable="NO" - -Then make the following symbolic link: - -cd /usr/local/etc/rc.d -ln -s /usr/local/sbin/postfix postfix.sh - - -With either startup configuration, you will want to disable some -Sendmail-specific daily maintenance routines in your /etc/periodic.conf file: - -daily_clean_hoststat_enable="NO" -daily_status_mail_rejects_enable="NO" -daily_status_include_submit_mailq="NO" -daily_submit_queuerun="NO" - - -If you are using SASL, you need to make sure that postfix has access to read -the sasldb file. This is accomplished by adding postfix to group mail and -making the /usr/local/etc/sasldb* file(s) readable by group mail (this should -be the default for new installs). - -If you are upgrading from postfix version prior to 2.0, please see the README -files for recommended changes to your configuration. diff --git a/mail/postfix23/pkg-plist b/mail/postfix23/pkg-plist deleted file mode 100644 index 6c1ab4114c53..000000000000 --- a/mail/postfix23/pkg-plist +++ /dev/null @@ -1,233 +0,0 @@ -@unexec if cmp -s %D/etc/postfix/main.cf %D/etc/postfix/dist/main.cf; then rm -f %D/etc/postfix/main.cf; fi -@unexec if cmp -s %D/etc/postfix/master.cf %D/etc/postfix/dist/master.cf; then rm -f %D/etc/postfix/master.cf; fi -@unexec if cmp -s %D/etc/postfix/access %D/etc/postfix/dist/access; then rm -f %D/etc/postfix/access; fi -@unexec if cmp -s %D/etc/postfix/aliases %D/etc/postfix/dist/aliases; then rm -f %D/etc/postfix/aliases; fi -@unexec if cmp -s %D/etc/postfix/canonical %D/etc/postfix/dist/canonical; then rm -f %D/etc/postfix/canonical; fi -@unexec if cmp -s %D/etc/postfix/header_checks %D/etc/postfix/dist/header_checks; then rm -f %D/etc/postfix/header_checks; fi -@unexec if cmp -s %D/etc/postfix/relocated %D/etc/postfix/dist/relocated; then rm -f %D/etc/postfix/relocated; fi -@unexec if cmp -s %D/etc/postfix/transport %D/etc/postfix/dist/transport; then rm -f %D/etc/postfix/transport; fi -@unexec if cmp -s %D/etc/postfix/virtual %D/etc/postfix/dist/virtual; then rm -f %D/etc/postfix/virtual; fi -@unexec if cmp -s %D/etc/postfix/generic %D/etc/postfix/dist/generic; then rm -f %D/etc/postfix/generic; fi -etc/postfix/LICENSE -etc/postfix/TLS_LICENSE -etc/postfix/main.cf.default -etc/postfix/makedefs.out -etc/postfix/post-install -etc/postfix/postfix-files -etc/postfix/postfix-script -etc/postfix/dist/main.cf -etc/postfix/dist/master.cf -etc/postfix/dist/access -etc/postfix/dist/aliases -etc/postfix/dist/canonical -etc/postfix/dist/header_checks -etc/postfix/dist/relocated -etc/postfix/dist/transport -etc/postfix/dist/virtual -etc/postfix/dist/generic -libexec/postfix/anvil -libexec/postfix/bounce -libexec/postfix/cleanup -libexec/postfix/discard -libexec/postfix/error -libexec/postfix/flush -libexec/postfix/lmtp -libexec/postfix/local -libexec/postfix/master -libexec/postfix/nqmgr -libexec/postfix/oqmgr -libexec/postfix/pickup -libexec/postfix/pipe -libexec/postfix/proxymap -libexec/postfix/qmgr -libexec/postfix/qmqpd -libexec/postfix/scache -libexec/postfix/showq -libexec/postfix/smtp -libexec/postfix/smtpd -libexec/postfix/spawn -libexec/postfix/trivial-rewrite -libexec/postfix/verify -libexec/postfix/virtual -libexec/postfix/tlsmgr -sbin/postalias -sbin/postcat -sbin/postconf -sbin/postdrop -sbin/postfix -sbin/postkick -sbin/postlock -sbin/postlog -sbin/postmap -sbin/postqueue -sbin/postsuper -sbin/sendmail -%%SUB_TEST%%sbin/qmqp-source -%%SUB_TEST%%sbin/smtp-sink -%%SUB_TEST%%sbin/smtp-source -bin/rmail -bin/newaliases -bin/mailq -%%PORTDOCS%%%%DOCSDIR%%/AAAREADME -%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_CLASS_README -%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_CLASS_README.html -%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_REWRITING_README -%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_REWRITING_README.html -%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_VERIFICATION_README -%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_VERIFICATION_README.html -%%PORTDOCS%%%%DOCSDIR%%/BACKSCATTER_README -%%PORTDOCS%%%%DOCSDIR%%/BACKSCATTER_README.html -%%PORTDOCS%%%%DOCSDIR%%/BASIC_CONFIGURATION_README -%%PORTDOCS%%%%DOCSDIR%%/BASIC_CONFIGURATION_README.html -%%PORTDOCS%%%%DOCSDIR%%/BUILTIN_FILTER_README -%%PORTDOCS%%%%DOCSDIR%%/BUILTIN_FILTER_README.html -%%PORTDOCS%%%%DOCSDIR%%/CDB_README -%%PORTDOCS%%%%DOCSDIR%%/CONNECTION_CACHE_README -%%PORTDOCS%%%%DOCSDIR%%/CONNECTION_CACHE_README.html -%%PORTDOCS%%%%DOCSDIR%%/CONTENT_INSPECTION_README -%%PORTDOCS%%%%DOCSDIR%%/CONTENT_INSPECTION_README.html -%%PORTDOCS%%%%DOCSDIR%%/CYRUS_README.html -%%PORTDOCS%%%%DOCSDIR%%/DATABASE_README -%%PORTDOCS%%%%DOCSDIR%%/DATABASE_README.html -%%PORTDOCS%%%%DOCSDIR%%/DB_README -%%PORTDOCS%%%%DOCSDIR%%/DB_README.html -%%PORTDOCS%%%%DOCSDIR%%/DEBUG_README -%%PORTDOCS%%%%DOCSDIR%%/DEBUG_README.html -%%PORTDOCS%%%%DOCSDIR%%/ETRN_README -%%PORTDOCS%%%%DOCSDIR%%/ETRN_README.html -%%PORTDOCS%%%%DOCSDIR%%/FILTER_README -%%PORTDOCS%%%%DOCSDIR%%/FILTER_README.html -%%PORTDOCS%%%%DOCSDIR%%/INSTALL -%%PORTDOCS%%%%DOCSDIR%%/INSTALL.html -%%PORTDOCS%%%%DOCSDIR%%/IPV6_README -%%PORTDOCS%%%%DOCSDIR%%/IPV6_README.html -%%PORTDOCS%%%%DOCSDIR%%/CDB_README.html -%%PORTDOCS%%%%DOCSDIR%%/TLS_README -%%PORTDOCS%%%%DOCSDIR%%/TLS_README.html -%%PORTDOCS%%%%DOCSDIR%%/LDAP_README -%%PORTDOCS%%%%DOCSDIR%%/LDAP_README.html -%%PORTDOCS%%%%DOCSDIR%%/LINUX_README -%%PORTDOCS%%%%DOCSDIR%%/LINUX_README.html -%%PORTDOCS%%%%DOCSDIR%%/LMTP_README -%%PORTDOCS%%%%DOCSDIR%%/LMTP_README.html -%%PORTDOCS%%%%DOCSDIR%%/LOCAL_RECIPIENT_README -%%PORTDOCS%%%%DOCSDIR%%/LOCAL_RECIPIENT_README.html -%%PORTDOCS%%%%DOCSDIR%%/MAILDROP_README -%%PORTDOCS%%%%DOCSDIR%%/MAILDROP_README.html -%%PORTDOCS%%%%DOCSDIR%%/MYSQL_README -%%PORTDOCS%%%%DOCSDIR%%/MYSQL_README.html -%%PORTDOCS%%%%DOCSDIR%%/NFS_README -%%PORTDOCS%%%%DOCSDIR%%/NFS_README.html -%%PORTDOCS%%%%DOCSDIR%%/OVERVIEW -%%PORTDOCS%%%%DOCSDIR%%/OVERVIEW.html -%%PORTDOCS%%%%DOCSDIR%%/PACKAGE_README -%%PORTDOCS%%%%DOCSDIR%%/PACKAGE_README.html -%%PORTDOCS%%%%DOCSDIR%%/PCRE_README -%%PORTDOCS%%%%DOCSDIR%%/PCRE_README.html -%%PORTDOCS%%%%DOCSDIR%%/PGSQL_README -%%PORTDOCS%%%%DOCSDIR%%/PGSQL_README.html -%%PORTDOCS%%%%DOCSDIR%%/QMQP_README -%%PORTDOCS%%%%DOCSDIR%%/QMQP_README.html -%%PORTDOCS%%%%DOCSDIR%%/QSHAPE_README -%%PORTDOCS%%%%DOCSDIR%%/QSHAPE_README.html -%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES -%%PORTDOCS%%%%DOCSDIR%%/RESTRICTION_CLASS_README -%%PORTDOCS%%%%DOCSDIR%%/RESTRICTION_CLASS_README.html -%%PORTDOCS%%%%DOCSDIR%%/SASL_README -%%PORTDOCS%%%%DOCSDIR%%/SASL_README.html -%%PORTDOCS%%%%DOCSDIR%%/SCHEDULER_README -%%PORTDOCS%%%%DOCSDIR%%/SCHEDULER_README.html -%%PORTDOCS%%%%DOCSDIR%%/SMTPD_ACCESS_README -%%PORTDOCS%%%%DOCSDIR%%/SMTPD_ACCESS_README.html -%%PORTDOCS%%%%DOCSDIR%%/SMTPD_POLICY_README -%%PORTDOCS%%%%DOCSDIR%%/SMTPD_POLICY_README.html -%%PORTDOCS%%%%DOCSDIR%%/SMTPD_PROXY_README -%%PORTDOCS%%%%DOCSDIR%%/SMTPD_PROXY_README.html -%%PORTDOCS%%%%SUB_SPF%%%%DOCSDIR%%/SPF_README -%%PORTDOCS%%%%DOCSDIR%%/STANDARD_CONFIGURATION_README -%%PORTDOCS%%%%DOCSDIR%%/STANDARD_CONFIGURATION_README.html -%%PORTDOCS%%%%DOCSDIR%%/TUNING_README -%%PORTDOCS%%%%DOCSDIR%%/TUNING_README.html -%%PORTDOCS%%%%DOCSDIR%%/ULTRIX_README -%%PORTDOCS%%%%DOCSDIR%%/ULTRIX_README.html -%%PORTDOCS%%%%DOCSDIR%%/UUCP_README -%%PORTDOCS%%%%DOCSDIR%%/UUCP_README.html -%%PORTDOCS%%%%DOCSDIR%%/VERP_README -%%PORTDOCS%%%%DOCSDIR%%/VERP_README.html -%%PORTDOCS%%%%DOCSDIR%%/VIRTUAL_README -%%PORTDOCS%%%%DOCSDIR%%/VIRTUAL_README.html -%%PORTDOCS%%%%DOCSDIR%%/XCLIENT_README -%%PORTDOCS%%%%DOCSDIR%%/XCLIENT_README.html -%%PORTDOCS%%%%DOCSDIR%%/XFORWARD_README -%%PORTDOCS%%%%DOCSDIR%%/XFORWARD_README.html -%%PORTDOCS%%%%DOCSDIR%%/access.5.html -%%PORTDOCS%%%%DOCSDIR%%/aliases.5.html -%%PORTDOCS%%%%DOCSDIR%%/anvil.8.html -%%PORTDOCS%%%%DOCSDIR%%/body_checks.5.html -%%PORTDOCS%%%%DOCSDIR%%/bounce.8.html -%%PORTDOCS%%%%DOCSDIR%%/canonical.5.html -%%PORTDOCS%%%%DOCSDIR%%/cidr_table.5.html -%%PORTDOCS%%%%DOCSDIR%%/cleanup.8.html -%%PORTDOCS%%%%DOCSDIR%%/defer.8.html -%%PORTDOCS%%%%DOCSDIR%%/discard.8.html -%%PORTDOCS%%%%DOCSDIR%%/error.8.html -%%PORTDOCS%%%%DOCSDIR%%/flush.8.html -%%PORTDOCS%%%%DOCSDIR%%/header_checks.5.html -%%PORTDOCS%%%%DOCSDIR%%/index.html -%%PORTDOCS%%%%DOCSDIR%%/ldap_table.5.html -%%PORTDOCS%%%%DOCSDIR%%/lmtp.8.html -%%PORTDOCS%%%%DOCSDIR%%/local.8.html -%%PORTDOCS%%%%DOCSDIR%%/mailq.1.html -%%PORTDOCS%%%%DOCSDIR%%/master.5.html -%%PORTDOCS%%%%DOCSDIR%%/master.8.html -%%PORTDOCS%%%%DOCSDIR%%/mysql_table.5.html -%%PORTDOCS%%%%DOCSDIR%%/nisplus_table.5.html -%%PORTDOCS%%%%DOCSDIR%%/newaliases.1.html -%%PORTDOCS%%%%DOCSDIR%%/oqmgr.8.html -%%PORTDOCS%%%%DOCSDIR%%/pcre_table.5.html -%%PORTDOCS%%%%DOCSDIR%%/pgsql_table.5.html -%%PORTDOCS%%%%DOCSDIR%%/pickup.8.html -%%PORTDOCS%%%%DOCSDIR%%/pipe.8.html -%%PORTDOCS%%%%DOCSDIR%%/postalias.1.html -%%PORTDOCS%%%%DOCSDIR%%/postcat.1.html -%%PORTDOCS%%%%DOCSDIR%%/postconf.1.html -%%PORTDOCS%%%%DOCSDIR%%/postconf.5.html -%%PORTDOCS%%%%DOCSDIR%%/postdrop.1.html -%%PORTDOCS%%%%DOCSDIR%%/postfix-logo.jpg -%%PORTDOCS%%%%DOCSDIR%%/postfix-manuals.html -%%PORTDOCS%%%%DOCSDIR%%/postfix-power.png -%%PORTDOCS%%%%DOCSDIR%%/postfix.1.html -%%PORTDOCS%%%%DOCSDIR%%/postkick.1.html -%%PORTDOCS%%%%DOCSDIR%%/postlock.1.html -%%PORTDOCS%%%%DOCSDIR%%/postlog.1.html -%%PORTDOCS%%%%DOCSDIR%%/postmap.1.html -%%PORTDOCS%%%%DOCSDIR%%/postqueue.1.html -%%PORTDOCS%%%%DOCSDIR%%/postsuper.1.html -%%PORTDOCS%%%%DOCSDIR%%/proxymap.8.html -%%PORTDOCS%%%%DOCSDIR%%/qmgr.8.html -%%PORTDOCS%%%%DOCSDIR%%/qmqp-sink.1.html -%%PORTDOCS%%%%DOCSDIR%%/qmqp-source.1.html -%%PORTDOCS%%%%DOCSDIR%%/qmqpd.8.html -%%PORTDOCS%%%%DOCSDIR%%/qshape.1.html -%%PORTDOCS%%%%DOCSDIR%%/regexp_table.5.html -%%PORTDOCS%%%%DOCSDIR%%/relocated.5.html -%%PORTDOCS%%%%DOCSDIR%%/sendmail.1.html -%%PORTDOCS%%%%DOCSDIR%%/scache.8.html -%%PORTDOCS%%%%DOCSDIR%%/showq.8.html -%%PORTDOCS%%%%DOCSDIR%%/smtp-sink.1.html -%%PORTDOCS%%%%DOCSDIR%%/smtp-source.1.html -%%PORTDOCS%%%%DOCSDIR%%/smtp.8.html -%%PORTDOCS%%%%DOCSDIR%%/smtpd.8.html -%%PORTDOCS%%%%DOCSDIR%%/spawn.8.html -%%PORTDOCS%%%%DOCSDIR%%/trace.8.html -%%PORTDOCS%%%%DOCSDIR%%/transport.5.html -%%PORTDOCS%%%%DOCSDIR%%/trivial-rewrite.8.html -%%PORTDOCS%%%%DOCSDIR%%/verify.8.html -%%PORTDOCS%%%%DOCSDIR%%/virtual.5.html -%%PORTDOCS%%%%DOCSDIR%%/virtual.8.html -%%PORTDOCS%%%%DOCSDIR%%/tlsmgr.8.html -%%PORTDOCS%%%%DOCSDIR%%/generic.5.html -%%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrm libexec/postfix -@dirrm etc/postfix/dist -@unexec rmdir %D/etc/postfix 2>/dev/null || true diff --git a/mail/postfix23/scripts/configure b/mail/postfix23/scripts/configure deleted file mode 100644 index 93c5b95ec561..000000000000 --- a/mail/postfix23/scripts/configure +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ - -for f in `find ${WRKSRC} -type f | xargs grep -l '\!\!PREFIX\!\!' ` ; do \ - mv $f $f.orig && sed s+!!PREFIX!!+$PREFIX+g < $f.orig > $f && \ - rm $f.orig -done diff --git a/mail/postfix23/scripts/configure.postfix b/mail/postfix23/scripts/configure.postfix deleted file mode 100644 index e1d1d1c52d83..000000000000 --- a/mail/postfix23/scripts/configure.postfix +++ /dev/null @@ -1,256 +0,0 @@ -#!/bin/sh -# $FreeBSD: /tmp/pcvs/ports/mail/postfix23/scripts/Attic/configure.postfix,v 1.63 2005-07-06 16:37:35 jylefort Exp $ - -if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then - exit -fi - -tempfile=`/usr/bin/mktemp -t checklist` - -if [ "${POSTFIX_OPTIONS}" ]; then - set ${POSTFIX_OPTIONS} -fi - -for i; do - eval status_$i=ON -done - -if [ -z "${BATCH}" ]; then - /usr/bin/dialog --title "Postfix configuration options" --clear \ - --checklist "\n\ -Please select desired options:" -1 -1 16 \ -NOPCRE "DISABLE Perl Compatible Regular Expressions" "$status_NOPCRE" \ -SASL "Cyrus SASLv1 (Simple Authentication and Security Layer)" "$status_SASL" \ -SASL2 "Cyrus SASLv2 (Simple Authentication and Security Layer)" "$status_SASL2" \ -SASLKRB "If your SASL requires Kerberos select this option" "$status_SASLKRB" \ -SASLKRB5 "If your SASL requires Kerberos5 select this option" "$status_SASLKRB5" \ -SPF "SPF support" "$status_SPF" \ -TLS "SSL and TLS" "$status_TLS" \ -DB3 "Berkeley DB3 (required if SASL also built with DB3)" "$status_DB3" \ -DB40 "Berkeley DB4.0 (required if SASL also built with DB4.0)" "$status_DB40" \ -DB41 "Berkeley DB4.1 (required if SASL also built with DB4.1)" "$status_DB41" \ -DB42 "Berkeley DB4.2 (required if SASL also built with DB4.2)" "$status_DB42" \ -DB43 "Berkeley DB4.3 (required if SASL also built with DB4.3)" "$status_DB43" \ -MySQL "MySQL map lookups (choose version with WITH_MYSQL_VER)" "$status_MySQL" \ -PgSQL "PostgreSQL map lookups (choose with DEFAULT_PGSQL_VER)" "$status_PgSQL" \ -OpenLDAP "OpenLDAP map lookups (choose ver. with WITH_OPENLDAP_VER)" "$status_OpenLDAP" \ -NIS "NIS map lookups" "$status_NIS" \ -VDA "VDA (Virtual Delivery Agent)" "$status_VDA" \ -Test "SMTP/LMTP test server and generator" "$status_Test" \ -2> $tempfile - - retval=$? - - if [ -s $tempfile ]; then - set `sed 's/"//g' $tempfile` - fi - rm -f $tempfile - - case $retval in - 0) if [ -z "$*" ]; then - /bin/echo "Nothing selected" - fi - ;; - 1) /bin/echo "Cancel pressed." - exit 1 - ;; - esac -fi - -${MKDIR} ${WRKDIRPREFIX}${CURDIR} -exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - -/bin/echo "PREFIX= ${PREFIX}" - -SUB_TEST="@comment " -SUB_SPF="@comment " - -while [ "$1" ]; do - case $1 in - NOPCRE) - /bin/echo "WITHOUT_PCRE= yes" - /bin/echo "NOPCRE_SUFFIX= +nopcre" - SUB_NOPCRE="" - ;; - SASL) - /bin/echo "LIB_DEPENDS+= sasl.8:\${PORTSDIR}/security/cyrus-sasl" - /bin/echo "POSTFIX_CCARGS+= -DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl1" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lsasl -lpam -lcrypt" - /bin/echo "SASL_SUFFIX= +sasl" - if [ -f ${LOCALBASE}/lib/libsasl.a ]; then - if /usr/bin/nm ${LOCALBASE}/lib/libsasl.a | grep -wq "mysql_init"; then - SASL_USE_MYSQL="YES" - fi - fi - ;; - SASL2) - /bin/echo "LIB_DEPENDS+= sasl2.2:\${PORTSDIR}/security/cyrus-sasl2" - /bin/echo "POSTFIX_CCARGS+= -DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lsasl2 -lpam -lcrypt" - /bin/echo "SASL_SUFFIX= +sasl2" - if [ -f ${LOCALBASE}/lib/libsasl2.a ]; then - if /usr/bin/nm ${LOCALBASE}/lib/libsasl2.a | grep -wq "mysql_init"; then - SASL_USE_MYSQL="YES" - fi - fi - ;; - SASLKRB) - /bin/echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err" - ;; - SASLKRB5) - /bin/echo "POSTFIX_AUXLIBS+= -lkrb5 -lcrypto -lcrypt -lcom_err -lasn1 -lroken" - ;; - SPF) - # see http://www.ipnet6.org/postfix/spf/ - /bin/echo "LIB_DEPENDS+= spf2.1:\${PORTSDIR}/mail/libspf2" - /bin/echo "PATCH_SITES+= http://www.ipnet6.org/postfix/download/" - /bin/echo "PATCHFILES+= postfix-libspf2-2.2.0-5.patch" - /bin/echo "PATCH_DIST_STRIP= -p1" - /bin/echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lspf2" - /bin/echo "SPF_SUFFIX= +spf" -# /bin/echo "README+= SPF_README" - /bin/echo "" - SUB_SPF="" - ;; - TLS) - /bin/echo "USE_OPENSSL= yes" - /bin/echo "POSTFIX_CCARGS+= -DUSE_TLS -I\${OPENSSLINC}" - /bin/echo "POSTFIX_AUXLIBS+= -L\${OPENSSLLIB} -lssl -lcrypto" - /bin/echo "TLS_SUFFIX= +tls" - ;; - DB3) - if [ "X$BDB_SELECTED" != "X" ]; then - /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr - rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - exit 1 - fi - /bin/echo "LIB_DEPENDS+= db3.3:\${PORTSDIR}/databases/db3" - /bin/echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db3" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb3" - /bin/echo "DB_SUFFIX= +db3" - BDB_SELECTED="3" - ;; - DB40) - if [ "X$BDB_SELECTED" != "X" ]; then - /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr - rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - exit 1 - fi - /bin/echo "LIB_DEPENDS+= db4.0:\${PORTSDIR}/databases/db4" - /bin/echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db4" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb4" - /bin/echo "DB_SUFFIX= +db40" - BDB_SELECTED="40" - ;; - DB41) - if [ "X$BDB_SELECTED" != "X" ]; then - /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr - rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - exit 1 - fi - /bin/echo "LIB_DEPENDS+= db41.1:\${PORTSDIR}/databases/db41" - /bin/echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db41" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb41" - /bin/echo "DB_SUFFIX= +db41" - BDB_SELECTED="41" - ;; - DB42) - if [ "X$BDB_SELECTED" != "X" ]; then - /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr - rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - exit 1 - fi - /bin/echo "LIB_DEPENDS+= db-4.2.2:\${PORTSDIR}/databases/db42" - /bin/echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db42" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib/db42/ -ldb" - /bin/echo "DB_SUFFIX= +db42" - BDB_SELECTED="42" - ;; - DB43) - if [ "X$BDB_SELECTED" != "X" ]; then - /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr - rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - exit 1 - fi - /bin/echo "LIB_DEPENDS+= db-4.3.0:\${PORTSDIR}/databases/db43" - /bin/echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db43" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib/db43/ -ldb" - /bin/echo "DB_SUFFIX= +db43" - BDB_SELECTED="43" - ;; - MySQL) - /bin/echo "USE_MYSQL=YES" - /bin/echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql" - /bin/echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz -lcrypt" - if [ -f ${LOCALBASE}/lib/mysql/libmysqlclient.a ]; then - if /usr/bin/nm ${LOCALBASE}/lib/mysql/libmysqlclient.a | grep -wq "SSL_new"; then - /bin/echo "USE_OPENSSL= yes" - /bin/echo "POSTFIX_CCARGS+= -I\${OPENSSLLIB}" - /bin/echo "POSTFIX_AUXLIBS+= -L\${OPENSSLLIB} -lssl -lcrypto" - fi - fi - /bin/echo "MYSQL_SUFFIX= +mysql" - MYSQL_SELECTED="YES" - ;; - PgSQL) - /bin/echo "USE_PGSQL=YES" - /bin/echo "POSTFIX_CCARGS+= -DHAS_PGSQL -I\${LOCALBASE}/include -I\${LOCALBASE}/pgsql/include" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt" - /bin/echo "PGSQL_SUFFIX= +pgsql" - ;; - OpenLDAP) - /bin/echo "USE_OPENLDAP=YES" - /bin/echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lldap -llber" - /bin/echo "OPENLDAP_SUFFIX= +openldap" - ;; - NIS) - /bin/echo "POSTFIX_CCARGS+= -DHAS_NIS" - /bin/echo "NIS_SUFFIX= +nis" - ;; - VDA) - /bin/echo "PATCH_SITES+= http://web.onda.com.br/nadal/postfix/VDA/" - /bin/echo "PATCHFILES+= postfix-2.2.4-vda.patch.gz" - /bin/echo "PATCH_DIST_STRIP= -p1" - ;; - Test) - /bin/echo "BIN1= smtp-sink smtp-source qmqp-source" -# /bin/echo "MAN1+= smtp-sink.1 smtp-source.1 qmqp-sink.1 qmqp-source.1" - SUB_TEST="" - ;; - *) - /bin/echo "Unknown option(s): $*" > /dev/stderr - rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - exit 1 - ;; - esac - shift -done - -if [ -z "${BATCH}" ]; then - if [ "X$SASL_USE_MYSQL" != "X" ] && [ "$MYSQL_SELECTED" != "YES" ]; then - /usr/bin/dialog --yesno "Your lib SASL it is compiled with MySQL. It desires to use the MySQL?" 5 80 > /dev/stderr - if [ $? = 0 ]; then - /bin/echo "USE_MYSQL=YES" - /bin/echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql" - /bin/echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz -lcrypt" - if [ -f ${LOCALBASE}/lib/mysql/libmysqlclient.a ]; then - if /usr/bin/nm ${LOCALBASE}/lib/mysql/libmysqlclient.a | grep -wq "SSL_new"; then - /bin/echo "USE_OPENSSL= yes" - /bin/echo "POSTFIX_CCARGS+= -I\${OPENSSLLIB}" - /bin/echo "POSTFIX_AUXLIBS+= -L\${OPENSSLLIB} -lssl -lcrypto" - fi - fi - fi - fi -fi - -/bin/echo "PLIST_SUB+= SUB_TEST=\"${SUB_TEST}\"" -/bin/echo "PLIST_SUB+= SUB_SPF=\"${SUB_SPF}\"" - -# for some reason, if we alter the pkg name this way, the first build (where -# we ask the configure questions) doesn't pick up the extensions, but -# any subsequent build will. so "make; make install" will build twice. -# don't do this for now. -#/bin/echo "PKGNAMESUFFIX= \${NOPCRE_SUFFIX}\${SASL_SUFFIX}\${DB_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${NIS_SUFFIX}\${SPF_SUFFIX}" diff --git a/mail/postfix23/scripts/fix-files-list b/mail/postfix23/scripts/fix-files-list deleted file mode 100644 index cc4a1083a814..000000000000 --- a/mail/postfix23/scripts/fix-files-list +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -# need to fixup ${PREFIX}/etc/postfix/postfix-files to indicate compressed -# man pages, since the ports software compresses them later, and if we -# run post-install it will complain about missing files -# (script from Simon J. Mudd) - -ed ${PREFIX}/etc/postfix/postfix-files <<EOF || exit 1 -%s/\(\/man[158]\/.*\.[158]\):/\1.gz:/ -w -q -EOF diff --git a/mail/postfix24/Makefile b/mail/postfix24/Makefile deleted file mode 100644 index 8947c1225319..000000000000 --- a/mail/postfix24/Makefile +++ /dev/null @@ -1,161 +0,0 @@ -# New ports collection makefile for: postfix -# Date created: 18 Mar 1999 -# Whom: torstenb -# -# $FreeBSD$ -# - -# To pre-select options in batch mode, run make like this: -# -# make -DBATCH POSTFIX_OPTIONS="DB3 TLS" -# -# the options are the same names as in the scripts/configure.postfix file. -# POSTFIX_OPTIONS can be set in /etc/make.conf also. - -# NOTE: PCRE is enabled by default unless you specifically disable it. - -PORTNAME= postfix -PORTVERSION= 2.2.5 -PORTEPOCH= 1 -CATEGORIES= mail ipv6 -MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ - ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/%SUBDIR%/ \ - ftp://ftp.tux.org/pub/net/postfix/official/ \ - ftp://ftp.utoronto.ca/mirror/packages/postfix/official/ \ - ftp://ftp.samurai.com/pub/postfix/official/ \ - ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/postfix/official/&,} -MASTER_SITE_SUBDIR= . old related/postfix -DISTNAME= postfix-${PORTVERSION} -DIST_SUBDIR= ${PORTNAME} - -# blanket approval for version updates: marcus@corp.grupos.com.br -MAINTAINER= vivek@khera.org -COMMENT= A secure alternative to widely-used Sendmail - -CONFLICTS= courier-0.* postfix-1.* postfix-2.0.* postfix-2.1.* postfix-2.3.* \ - sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.* -USE_SUBMAKE= yes -USE_REINPLACE= yes - -MAN1= postalias.1 postcat.1 postconf.1 postdrop.1 postfix.1 postkick.1 \ - postlock.1 postlog.1 postmap.1 postqueue.1 postsuper.1 sendmail.1 - -MAN5= access.5 aliases.5 canonical.5 cidr_table.5 generic.5 header_checks.5 \ - ldap_table.5 master.5 mysql_table.5 nisplus_table.5 pcre_table.5 \ - pgsql_table.5 postconf.5 regexp_table.5 relocated.5 transport.5 \ - virtual.5 - -MAN8= anvil.8 bounce.8 cleanup.8 discard.8 error.8 flush.8 lmtp.8 local.8 \ - master.8 oqmgr.8 pickup.8 pipe.8 proxymap.8 qmgr.8 qmqpd.8 scache.8 \ - showq.8 smtp.8 smtpd.8 spawn.8 tlsmgr.8 trivial-rewrite.8 verify.8 \ - virtual.8 - -MLINKS= sendmail.1 mailq.1 \ - sendmail.1 newaliases.1 \ - header_checks.5 body_checks.5 \ - bounce.8 defer.8 \ - bounce.8 trace.8 - -CONF1= access aliases canonical generic header_checks main.cf master.cf \ - relocated transport virtual - -.if !defined(DEBUG) -MAKEFILEFLAGS+= DEBUG= -.endif - -MAKEFILEFLAGS+= CC="${CC}" OPT="${CFLAGS}" - -SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ - TOUCH="${TOUCH}" \ - MKDIR="${MKDIR}" \ - POSTFIX_OPTIONS="${POSTFIX_OPTIONS}" - -pre-fetch: - @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postfix - -.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc) -.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc" -.endif - -.if defined(WITHOUT_PCRE) -POSTFIX_CCARGS+= -DNO_PCRE -.else -LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre -POSTFIX_CCARGS+= -DHAS_PCRE -I${LOCALBASE}/include -POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -lpcre -.endif - -post-patch: - (cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \ - CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \ - ${ECHO} "all: default" >> Makefile) - -pre-patch: - @${ECHO} "<body>See <A HREF="header_checks.5.html">header_checks.5.html</A></BODY>" > ${WRKSRC}/html/body_checks.5.html - @for f in `${FIND} -P ${WRKSRC}/man -type f`; do \ - ${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" $${f}; \ - done - @for f in `${FIND} -P ${WRKSRC}/README_FILES -type f`; do \ - ${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" $${f}; \ - done - @for f in `${FIND} -P ${WRKSRC}/conf -type f`; do \ - ${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" $${f}; \ - done - -pre-install: - @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL - -.if defined(NOPORTDOCS) -READMEDIR=no -.else -READMEDIR=${PREFIX}/share/doc/postfix -.endif - -do-install: - cd ${WRKSRC}; ${SH} postfix-install -non-interactive install_root=/ tempdir=/tmp \ - config_directory=${PREFIX}/etc/postfix \ - daemon_directory=${PREFIX}/libexec/postfix \ - command_directory=${PREFIX}/sbin \ - queue_directory=/var/spool/postfix \ - sendmail_path=${PREFIX}/sbin/sendmail \ - newaliases_path=${PREFIX}/bin/newaliases \ - mailq_path=${PREFIX}/bin/mailq \ - mail_owner=postfix \ - setgid_group=maildrop \ - manpage_directory=${PREFIX}/man \ - sample_directory=${PREFIX}/etc/postfix \ - readme_directory=${READMEDIR} - - @${MKDIR} ${PREFIX}/etc/postfix/dist -.for f in ${CONF1} - ${INSTALL_DATA} ${WRKSRC}/conf/${f} ${PREFIX}/etc/postfix/dist -.endfor - - @${INSTALL_SCRIPT} \ - ${WRKSRC}/auxiliary/rmail/rmail \ - ${PREFIX}/bin/rmail - -# optional TEST binaries -.for file in ${BIN1} - @${INSTALL_PROGRAM} ${WRKSRC}/bin/${file} ${PREFIX}/sbin -.endfor - -.if !defined(NOPORTDOCS) - @${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${DOCSDIR} - @cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.jpg *.png ${DOCSDIR} && \ - ${ECHO_MSG} "Installed HTML documentation in ${DOCSDIR}" -.endif - -post-install: - @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL -# need to fixup ${PREFIX}/etc/postfix/postfix-files to indicate compressed -# man pages, since the ports software compresses them after this step, and -# if we run etc/postfix/post-install again during package installation, -# it will complain about missing files. - @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/fix-files-list - @${CAT} ${PKGMESSAGE} - -post-clean: - @${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc - -.include <bsd.port.mk> diff --git a/mail/postfix24/distinfo b/mail/postfix24/distinfo deleted file mode 100644 index 59ac523435fa..000000000000 --- a/mail/postfix24/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -MD5 (postfix/postfix-2.2.5.tar.gz) = 9c13d58494c64012bfd8ab0d6967305c -SIZE (postfix/postfix-2.2.5.tar.gz) = 2428594 -MD5 (postfix/postfix-libspf2-2.2.0-5.patch) = 80be36e0f14e1a1f39a3b30b9b2d4115 -SIZE (postfix/postfix-libspf2-2.2.0-5.patch) = 26077 -MD5 (postfix/postfix-2.2.4-vda.patch.gz) = 7049364c6476edf80d6ff861ca37936f -SIZE (postfix/postfix-2.2.4-vda.patch.gz) = 7712 diff --git a/mail/postfix24/files/patch-conf::main.cf b/mail/postfix24/files/patch-conf::main.cf deleted file mode 100644 index 67e356de21dd..000000000000 --- a/mail/postfix24/files/patch-conf::main.cf +++ /dev/null @@ -1,64 +0,0 @@ ---- conf/main.cf.orig Sat Mar 5 11:53:42 2005 -+++ conf/main.cf Sat Mar 5 11:53:42 2005 -@@ -32,13 +32,13 @@ - # The command_directory parameter specifies the location of all - # postXXX commands. - # --command_directory = /usr/sbin -+command_directory = !!PREFIX!!/sbin - - # The daemon_directory parameter specifies the location of all Postfix - # daemon programs (i.e. programs listed in the master.cf file). This - # directory must be owned by root. - # --daemon_directory = /usr/libexec/postfix -+daemon_directory = !!PREFIX!!/libexec/postfix - - # QUEUE AND PROCESS OWNERSHIP - # -@@ -608,37 +608,37 @@ - # sendmail_path: The full pathname of the Postfix sendmail command. - # This is the Sendmail-compatible mail posting interface. - # --sendmail_path = -+sendmail_path = !!PREFIX!!/sbin/sendmail - - # newaliases_path: The full pathname of the Postfix newaliases command. - # This is the Sendmail-compatible command to build alias databases. - # --newaliases_path = -+newaliases_path = !!PREFIX!!/bin/newaliases - - # mailq_path: The full pathname of the Postfix mailq command. This - # is the Sendmail-compatible mail queue listing command. - # --mailq_path = -+mailq_path = !!PREFIX!!/bin/mailq - - # setgid_group: The group for mail submission and queue management - # commands. This must be a group name with a numerical group ID that - # is not shared with other accounts, not even with the Postfix account. - # --setgid_group = -+setgid_group = maildrop - - # html_directory: The location of the Postfix HTML documentation. - # --html_directory = -+html_directory = no - - # manpage_directory: The location of the Postfix on-line manual pages. - # --manpage_directory = -+manpage_directory = !!PREFIX!!/man - - # sample_directory: The location of the Postfix sample configuration files. - # This parameter is obsolete as of Postfix 2.1. - # --sample_directory = -+sample_directory = !!PREFIX!!/etc/postfix - - # readme_directory: The location of the Postfix README files. - # --readme_directory = -+readme_directory = no diff --git a/mail/postfix24/files/patch-conf::post-install b/mail/postfix24/files/patch-conf::post-install deleted file mode 100644 index 78401de5bdf3..000000000000 --- a/mail/postfix24/files/patch-conf::post-install +++ /dev/null @@ -1,11 +0,0 @@ ---- conf/post-install.orig Thu Feb 24 08:06:08 2005 -+++ conf/post-install Sat Mar 5 11:53:42 2005 -@@ -185,7 +185,7 @@ - - umask 022 - --PATH=/bin:/usr/bin:/usr/sbin:/usr/etc:/sbin:/etc:/usr/contrib/bin:/usr/gnu/bin:/usr/ucb:/usr/bsd -+PATH=/bin:/usr/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/local/sbin - SHELL=/bin/sh - IFS=" - " diff --git a/mail/postfix24/files/patch-makedefs b/mail/postfix24/files/patch-makedefs deleted file mode 100644 index ed2f08d06ae4..000000000000 --- a/mail/postfix24/files/patch-makedefs +++ /dev/null @@ -1,13 +0,0 @@ ---- makedefs.orig Tue Feb 22 09:35:52 2005 -+++ makedefs Wed Jul 13 17:42:53 2005 -@@ -116,6 +116,10 @@ - ;; - FreeBSD.5*) SYSTYPE=FREEBSD5 - ;; -+ FreeBSD.6*) SYSTYPE=FREEBSD5 -+ ;; -+ FreeBSD.7*) SYSTYPE=FREEBSD5 -+ ;; - OpenBSD.2*) SYSTYPE=OPENBSD2 - ;; - OpenBSD.3*) SYSTYPE=OPENBSD3 diff --git a/mail/postfix24/files/patch-src::global::mail_params.h b/mail/postfix24/files/patch-src::global::mail_params.h deleted file mode 100644 index 52ea5e9e5c35..000000000000 --- a/mail/postfix24/files/patch-src::global::mail_params.h +++ /dev/null @@ -1,29 +0,0 @@ ---- src/global/mail_params.h.orig Fri Feb 11 21:53:21 2005 -+++ src/global/mail_params.h Sat Mar 5 11:53:42 2005 -@@ -64,7 +64,7 @@ - extern gid_t var_owner_gid; - - #define VAR_SGID_GROUP "setgid_group" --#define DEF_SGID_GROUP "postdrop" -+#define DEF_SGID_GROUP "maildrop" - extern char *var_sgid_group; - extern gid_t var_sgid_gid; - -@@ -221,7 +221,7 @@ - */ - #define VAR_DAEMON_DIR "daemon_directory" - #ifndef DEF_DAEMON_DIR --#define DEF_DAEMON_DIR "/usr/libexec/postfix" -+#define DEF_DAEMON_DIR "!!PREFIX!!/libexec/postfix" - #endif - extern char *var_daemon_dir; - -@@ -250,7 +250,7 @@ - */ - #define VAR_CONFIG_DIR "config_directory" - #ifndef DEF_CONFIG_DIR --#define DEF_CONFIG_DIR "/etc/postfix" -+#define DEF_CONFIG_DIR "!!PREFIX!!/etc/postfix" - #endif - extern char *var_config_dir; - diff --git a/mail/postfix24/pkg-descr b/mail/postfix24/pkg-descr deleted file mode 100644 index 1f335ce6820c..000000000000 --- a/mail/postfix24/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -Postfix attempts to be fast, easy to administer, and secure, while at -the same time being sendmail-compatible enough to not upset existing -users. It also offers QMQP and VERP support to let Postfix act as delivery -daemon for ezmlm-idx. - -WWW: http://www.postfix.org/ diff --git a/mail/postfix24/pkg-install b/mail/postfix24/pkg-install deleted file mode 100644 index e912b1a051e2..000000000000 --- a/mail/postfix24/pkg-install +++ /dev/null @@ -1,181 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# If the POSTFIX_DEFAULT_MTA environment variable is set to YES, it -# will make the port/package use defaults which make postfix replace -# sendmail as much as possible. - -PKG_PREFIX=${PKG_PREFIX:=/usr/local} -BATCH=${BATCH:=no} -POSTFIX_DEFAULT_MTA=${POSTFIX_DEFAULT_MTA:=no} - -if [ x${POSTFIX_DEFAULT_MTA} = xno ]; then - DEFAULT_REPLACE_MAILERCONF=n -else - DEFAULT_REPLACE_MAILERCONF=y -fi - -if [ -x /usr/sbin/nologin ]; then - NOLOGIN=/usr/sbin/nologin -else - NOLOGIN=/sbin/nologin -fi - -ask() { - local question default answer - - question=$1 - default=$2 - if [ -z "${PACKAGE_BUILDING}" -a x${BATCH} = xno ]; then - read -p "${question} [${default}]? " answer - fi - if [ x${answer} = x ]; then - answer=${default} - fi - /bin/echo ${answer} -} - -yesno() { - local question default answer - - question=$1 - default=$2 - while :; do - answer=$(ask "${question}" "${default}") - case "${answer}" in - [Yy]*) return 0;; - [Nn]*) return 1;; - esac - /bin/echo "Please answer yes or no." - done -} - -if [ x"$2" = xPRE-INSTALL ]; then - USER=postfix - UID=125 - GROUP=postfix - GID=125 - GROUP2=maildrop - GID2=126 - - if /usr/sbin/pw groupshow "${GROUP}" 2>/dev/null; then - /bin/echo "You already have a group \"${GROUP}\", so I will use it." - else - if /usr/sbin/pw groupadd ${GROUP} -g ${GID} - then - /bin/echo "Added group \"${GROUP}\"." - else - /bin/echo "Adding group \"${GROUP}\" failed..." - /bin/echo "Please create it, and try again." - exit 1 - fi - fi - - if /usr/sbin/pw groupshow "${GROUP2}" 2>/dev/null; then - /bin/echo "You already have a group \"${GROUP2}\", so I will use it." - else - if /usr/sbin/pw groupadd ${GROUP2} -g ${GID2}; then - /bin/echo "Added group \"${GROUP2}\"." - else - /bin/echo "Adding group \"${GROUP2}\" failed..." - /bin/echo "Please create it, and try again." - exit 1 - fi - fi - - if /usr/sbin/pw user show "${USER}" 2>/dev/null; then - /bin/echo "You already have a user \"${USER}\", so I will use it." - else - if /usr/sbin/pw useradd ${USER} -u ${UID} -g ${GROUP} -h - -d /var/spool/postfix -s ${NOLOGIN} -c "Postfix Mail System"; then - /bin/echo "Added user \"${USER}\"." - else - /bin/echo "Adding user \"${USER}\" failed..." - /bin/echo "Please create it, and try again." - exit 1 - fi - fi - - if /usr/sbin/pw show group mail | grep -q "${USER}" 2>/dev/null; then - /bin/echo "You already have user \"${USER}\" in group \"mail\", so I will use it." - else - /bin/echo "You need user \"${USER}\" added to group \"mail\"." - if yesno "Would you like me to add it" y; then - /usr/sbin/pw groupmod mail -m ${USER} || exit - /bin/echo "Done." - else - /bin/echo "Please create it, and try again." - exit 1 - fi - fi -fi - -if [ x"$2" = xPOST-INSTALL ]; then - if [ -d ${PKG_PREFIX}/etc/postfix/dist ]; then - for file in ${PKG_PREFIX}/etc/postfix/dist/*; do - if [ ! -f ${PKG_PREFIX}/etc/postfix/${file#${PKG_PREFIX}/etc/postfix/dist} ]; then - cp $file ${PKG_PREFIX}/etc/postfix/ - fi - done - fi - - /bin/sh ${PKG_PREFIX}/etc/postfix/post-install tempdir=/tmp \ - config_directory=${PKG_PREFIX}/etc/postfix \ - daemon_directory=${PKG_PREFIX}/libexec/postfix \ - command_directory=${PKG_PREFIX}/sbin \ - queue_directory=/var/spool/postfix \ - sendmail_path=${PKG_PREFIX}/sbin/sendmail \ - newaliases_path=${PKG_PREFIX}/bin/newaliases \ - mailq_path=${PKG_PREFIX}/bin/mailq \ - mail_owner=postfix \ - setgid_group=maildrop \ - manpage_directory=${PKG_PREFIX}/man \ - sample_directory=${PKG_PREFIX}/etc/postfix \ - readme_directory=no \ - upgrade-package -fi -# readme_directory is "no" above since the package will have correct perms -# already, and we don't know if they had PORTDOCS. - -replace() { - local orig repl - - orig=$1 - repl=$2 - if [ -e ${orig} ]; then - /bin/mv -f ${orig} ${orig}.OFF - /bin/chmod 0 ${orig}.OFF - fi - if [ -e ${repl} ]; then - /bin/ln -s ${repl} ${orig} - fi -} - -if [ x"$2" = xPOST-INSTALL -a -z "${PACKAGE_BUILDING}" ]; then - if [ -x /sbin/sysctl ]; then - OSVERSION=`/sbin/sysctl -n kern.osreldate` - else - OSVERSION=`/usr/sbin/sysctl -n kern.osreldate` - fi - if [ ${OSVERSION} -ge 400014 ]; then - if yesno "Would you like to activate Postfix in /etc/mail/mailer.conf" ${DEFAULT_REPLACE_MAILERCONF}; then - mv -f /etc/mail/mailer.conf /etc/mail/mailer.conf.old - /bin/echo "#" > /etc/mail/mailer.conf - /bin/echo -n "# Execute the Postfix sendmail program" >> /etc/mail/mailer.conf - /bin/echo ", named ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - /bin/echo "#" >> /etc/mail/mailer.conf - /bin/echo "sendmail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - /bin/echo "send-mail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - /bin/echo "mailq ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - /bin/echo "newaliases ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - fi - else - if yesno "Would you like to replace {sendmail,mailq,newaliases} with Postfix versions" n; then - replace /usr/sbin/sendmail ${PKG_PREFIX}/sbin/sendmail - replace /usr/bin/mailq ${PKG_PREFIX}/sbin/sendmail - replace /usr/bin/newaliases ${PKG_PREFIX}/sbin/sendmail - /bin/echo "Done." - fi - fi -fi diff --git a/mail/postfix24/pkg-message b/mail/postfix24/pkg-message deleted file mode 100644 index d9e910d86ceb..000000000000 --- a/mail/postfix24/pkg-message +++ /dev/null @@ -1,47 +0,0 @@ -If you have postfix configured in your /etc/mail/mailer.conf (answered yes to -the previous question) and would like to enable postfix to start at boot time, -please set these variables in your /etc/rc.conf file: - -sendmail_enable="YES" -sendmail_flags="-bd" -sendmail_pidfile="/var/spool/postfix/pid/master.pid" -sendmail_procname="/usr/local/libexec/postfix/master" -sendmail_outbound_enable="NO" -sendmail_submit_enable="NO" -sendmail_msp_queue_enable="NO" - -This will disable Sendmail completely, and allow you to use /etc/rc.d/sendmail -to start and stop postfix (FreeBSD 5.x and up). For FreeBSD 4.x, it will just -cause the system boot scripts to start sendmail for you. - -Alternatively to the above settings, you can enable postfix to start with -the other local services, for example, after your database server starts if -you need it to be running for postfix. To do this, set in your rc.conf file: - -sendmail_enable="NO" -sendmail_submit_enable="NO" -sendmail_outbound_enable="NO" -sendmail_msp_queue_enable="NO" - -Then make the following symbolic link: - -cd /usr/local/etc/rc.d -ln -s /usr/local/sbin/postfix postfix.sh - - -With either startup configuration, you will want to disable some -Sendmail-specific daily maintenance routines in your /etc/periodic.conf file: - -daily_clean_hoststat_enable="NO" -daily_status_mail_rejects_enable="NO" -daily_status_include_submit_mailq="NO" -daily_submit_queuerun="NO" - - -If you are using SASL, you need to make sure that postfix has access to read -the sasldb file. This is accomplished by adding postfix to group mail and -making the /usr/local/etc/sasldb* file(s) readable by group mail (this should -be the default for new installs). - -If you are upgrading from postfix version prior to 2.0, please see the README -files for recommended changes to your configuration. diff --git a/mail/postfix24/pkg-plist b/mail/postfix24/pkg-plist deleted file mode 100644 index 6c1ab4114c53..000000000000 --- a/mail/postfix24/pkg-plist +++ /dev/null @@ -1,233 +0,0 @@ -@unexec if cmp -s %D/etc/postfix/main.cf %D/etc/postfix/dist/main.cf; then rm -f %D/etc/postfix/main.cf; fi -@unexec if cmp -s %D/etc/postfix/master.cf %D/etc/postfix/dist/master.cf; then rm -f %D/etc/postfix/master.cf; fi -@unexec if cmp -s %D/etc/postfix/access %D/etc/postfix/dist/access; then rm -f %D/etc/postfix/access; fi -@unexec if cmp -s %D/etc/postfix/aliases %D/etc/postfix/dist/aliases; then rm -f %D/etc/postfix/aliases; fi -@unexec if cmp -s %D/etc/postfix/canonical %D/etc/postfix/dist/canonical; then rm -f %D/etc/postfix/canonical; fi -@unexec if cmp -s %D/etc/postfix/header_checks %D/etc/postfix/dist/header_checks; then rm -f %D/etc/postfix/header_checks; fi -@unexec if cmp -s %D/etc/postfix/relocated %D/etc/postfix/dist/relocated; then rm -f %D/etc/postfix/relocated; fi -@unexec if cmp -s %D/etc/postfix/transport %D/etc/postfix/dist/transport; then rm -f %D/etc/postfix/transport; fi -@unexec if cmp -s %D/etc/postfix/virtual %D/etc/postfix/dist/virtual; then rm -f %D/etc/postfix/virtual; fi -@unexec if cmp -s %D/etc/postfix/generic %D/etc/postfix/dist/generic; then rm -f %D/etc/postfix/generic; fi -etc/postfix/LICENSE -etc/postfix/TLS_LICENSE -etc/postfix/main.cf.default -etc/postfix/makedefs.out -etc/postfix/post-install -etc/postfix/postfix-files -etc/postfix/postfix-script -etc/postfix/dist/main.cf -etc/postfix/dist/master.cf -etc/postfix/dist/access -etc/postfix/dist/aliases -etc/postfix/dist/canonical -etc/postfix/dist/header_checks -etc/postfix/dist/relocated -etc/postfix/dist/transport -etc/postfix/dist/virtual -etc/postfix/dist/generic -libexec/postfix/anvil -libexec/postfix/bounce -libexec/postfix/cleanup -libexec/postfix/discard -libexec/postfix/error -libexec/postfix/flush -libexec/postfix/lmtp -libexec/postfix/local -libexec/postfix/master -libexec/postfix/nqmgr -libexec/postfix/oqmgr -libexec/postfix/pickup -libexec/postfix/pipe -libexec/postfix/proxymap -libexec/postfix/qmgr -libexec/postfix/qmqpd -libexec/postfix/scache -libexec/postfix/showq -libexec/postfix/smtp -libexec/postfix/smtpd -libexec/postfix/spawn -libexec/postfix/trivial-rewrite -libexec/postfix/verify -libexec/postfix/virtual -libexec/postfix/tlsmgr -sbin/postalias -sbin/postcat -sbin/postconf -sbin/postdrop -sbin/postfix -sbin/postkick -sbin/postlock -sbin/postlog -sbin/postmap -sbin/postqueue -sbin/postsuper -sbin/sendmail -%%SUB_TEST%%sbin/qmqp-source -%%SUB_TEST%%sbin/smtp-sink -%%SUB_TEST%%sbin/smtp-source -bin/rmail -bin/newaliases -bin/mailq -%%PORTDOCS%%%%DOCSDIR%%/AAAREADME -%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_CLASS_README -%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_CLASS_README.html -%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_REWRITING_README -%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_REWRITING_README.html -%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_VERIFICATION_README -%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_VERIFICATION_README.html -%%PORTDOCS%%%%DOCSDIR%%/BACKSCATTER_README -%%PORTDOCS%%%%DOCSDIR%%/BACKSCATTER_README.html -%%PORTDOCS%%%%DOCSDIR%%/BASIC_CONFIGURATION_README -%%PORTDOCS%%%%DOCSDIR%%/BASIC_CONFIGURATION_README.html -%%PORTDOCS%%%%DOCSDIR%%/BUILTIN_FILTER_README -%%PORTDOCS%%%%DOCSDIR%%/BUILTIN_FILTER_README.html -%%PORTDOCS%%%%DOCSDIR%%/CDB_README -%%PORTDOCS%%%%DOCSDIR%%/CONNECTION_CACHE_README -%%PORTDOCS%%%%DOCSDIR%%/CONNECTION_CACHE_README.html -%%PORTDOCS%%%%DOCSDIR%%/CONTENT_INSPECTION_README -%%PORTDOCS%%%%DOCSDIR%%/CONTENT_INSPECTION_README.html -%%PORTDOCS%%%%DOCSDIR%%/CYRUS_README.html -%%PORTDOCS%%%%DOCSDIR%%/DATABASE_README -%%PORTDOCS%%%%DOCSDIR%%/DATABASE_README.html -%%PORTDOCS%%%%DOCSDIR%%/DB_README -%%PORTDOCS%%%%DOCSDIR%%/DB_README.html -%%PORTDOCS%%%%DOCSDIR%%/DEBUG_README -%%PORTDOCS%%%%DOCSDIR%%/DEBUG_README.html -%%PORTDOCS%%%%DOCSDIR%%/ETRN_README -%%PORTDOCS%%%%DOCSDIR%%/ETRN_README.html -%%PORTDOCS%%%%DOCSDIR%%/FILTER_README -%%PORTDOCS%%%%DOCSDIR%%/FILTER_README.html -%%PORTDOCS%%%%DOCSDIR%%/INSTALL -%%PORTDOCS%%%%DOCSDIR%%/INSTALL.html -%%PORTDOCS%%%%DOCSDIR%%/IPV6_README -%%PORTDOCS%%%%DOCSDIR%%/IPV6_README.html -%%PORTDOCS%%%%DOCSDIR%%/CDB_README.html -%%PORTDOCS%%%%DOCSDIR%%/TLS_README -%%PORTDOCS%%%%DOCSDIR%%/TLS_README.html -%%PORTDOCS%%%%DOCSDIR%%/LDAP_README -%%PORTDOCS%%%%DOCSDIR%%/LDAP_README.html -%%PORTDOCS%%%%DOCSDIR%%/LINUX_README -%%PORTDOCS%%%%DOCSDIR%%/LINUX_README.html -%%PORTDOCS%%%%DOCSDIR%%/LMTP_README -%%PORTDOCS%%%%DOCSDIR%%/LMTP_README.html -%%PORTDOCS%%%%DOCSDIR%%/LOCAL_RECIPIENT_README -%%PORTDOCS%%%%DOCSDIR%%/LOCAL_RECIPIENT_README.html -%%PORTDOCS%%%%DOCSDIR%%/MAILDROP_README -%%PORTDOCS%%%%DOCSDIR%%/MAILDROP_README.html -%%PORTDOCS%%%%DOCSDIR%%/MYSQL_README -%%PORTDOCS%%%%DOCSDIR%%/MYSQL_README.html -%%PORTDOCS%%%%DOCSDIR%%/NFS_README -%%PORTDOCS%%%%DOCSDIR%%/NFS_README.html -%%PORTDOCS%%%%DOCSDIR%%/OVERVIEW -%%PORTDOCS%%%%DOCSDIR%%/OVERVIEW.html -%%PORTDOCS%%%%DOCSDIR%%/PACKAGE_README -%%PORTDOCS%%%%DOCSDIR%%/PACKAGE_README.html -%%PORTDOCS%%%%DOCSDIR%%/PCRE_README -%%PORTDOCS%%%%DOCSDIR%%/PCRE_README.html -%%PORTDOCS%%%%DOCSDIR%%/PGSQL_README -%%PORTDOCS%%%%DOCSDIR%%/PGSQL_README.html -%%PORTDOCS%%%%DOCSDIR%%/QMQP_README -%%PORTDOCS%%%%DOCSDIR%%/QMQP_README.html -%%PORTDOCS%%%%DOCSDIR%%/QSHAPE_README -%%PORTDOCS%%%%DOCSDIR%%/QSHAPE_README.html -%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES -%%PORTDOCS%%%%DOCSDIR%%/RESTRICTION_CLASS_README -%%PORTDOCS%%%%DOCSDIR%%/RESTRICTION_CLASS_README.html -%%PORTDOCS%%%%DOCSDIR%%/SASL_README -%%PORTDOCS%%%%DOCSDIR%%/SASL_README.html -%%PORTDOCS%%%%DOCSDIR%%/SCHEDULER_README -%%PORTDOCS%%%%DOCSDIR%%/SCHEDULER_README.html -%%PORTDOCS%%%%DOCSDIR%%/SMTPD_ACCESS_README -%%PORTDOCS%%%%DOCSDIR%%/SMTPD_ACCESS_README.html -%%PORTDOCS%%%%DOCSDIR%%/SMTPD_POLICY_README -%%PORTDOCS%%%%DOCSDIR%%/SMTPD_POLICY_README.html -%%PORTDOCS%%%%DOCSDIR%%/SMTPD_PROXY_README -%%PORTDOCS%%%%DOCSDIR%%/SMTPD_PROXY_README.html -%%PORTDOCS%%%%SUB_SPF%%%%DOCSDIR%%/SPF_README -%%PORTDOCS%%%%DOCSDIR%%/STANDARD_CONFIGURATION_README -%%PORTDOCS%%%%DOCSDIR%%/STANDARD_CONFIGURATION_README.html -%%PORTDOCS%%%%DOCSDIR%%/TUNING_README -%%PORTDOCS%%%%DOCSDIR%%/TUNING_README.html -%%PORTDOCS%%%%DOCSDIR%%/ULTRIX_README -%%PORTDOCS%%%%DOCSDIR%%/ULTRIX_README.html -%%PORTDOCS%%%%DOCSDIR%%/UUCP_README -%%PORTDOCS%%%%DOCSDIR%%/UUCP_README.html -%%PORTDOCS%%%%DOCSDIR%%/VERP_README -%%PORTDOCS%%%%DOCSDIR%%/VERP_README.html -%%PORTDOCS%%%%DOCSDIR%%/VIRTUAL_README -%%PORTDOCS%%%%DOCSDIR%%/VIRTUAL_README.html -%%PORTDOCS%%%%DOCSDIR%%/XCLIENT_README -%%PORTDOCS%%%%DOCSDIR%%/XCLIENT_README.html -%%PORTDOCS%%%%DOCSDIR%%/XFORWARD_README -%%PORTDOCS%%%%DOCSDIR%%/XFORWARD_README.html -%%PORTDOCS%%%%DOCSDIR%%/access.5.html -%%PORTDOCS%%%%DOCSDIR%%/aliases.5.html -%%PORTDOCS%%%%DOCSDIR%%/anvil.8.html -%%PORTDOCS%%%%DOCSDIR%%/body_checks.5.html -%%PORTDOCS%%%%DOCSDIR%%/bounce.8.html -%%PORTDOCS%%%%DOCSDIR%%/canonical.5.html -%%PORTDOCS%%%%DOCSDIR%%/cidr_table.5.html -%%PORTDOCS%%%%DOCSDIR%%/cleanup.8.html -%%PORTDOCS%%%%DOCSDIR%%/defer.8.html -%%PORTDOCS%%%%DOCSDIR%%/discard.8.html -%%PORTDOCS%%%%DOCSDIR%%/error.8.html -%%PORTDOCS%%%%DOCSDIR%%/flush.8.html -%%PORTDOCS%%%%DOCSDIR%%/header_checks.5.html -%%PORTDOCS%%%%DOCSDIR%%/index.html -%%PORTDOCS%%%%DOCSDIR%%/ldap_table.5.html -%%PORTDOCS%%%%DOCSDIR%%/lmtp.8.html -%%PORTDOCS%%%%DOCSDIR%%/local.8.html -%%PORTDOCS%%%%DOCSDIR%%/mailq.1.html -%%PORTDOCS%%%%DOCSDIR%%/master.5.html -%%PORTDOCS%%%%DOCSDIR%%/master.8.html -%%PORTDOCS%%%%DOCSDIR%%/mysql_table.5.html -%%PORTDOCS%%%%DOCSDIR%%/nisplus_table.5.html -%%PORTDOCS%%%%DOCSDIR%%/newaliases.1.html -%%PORTDOCS%%%%DOCSDIR%%/oqmgr.8.html -%%PORTDOCS%%%%DOCSDIR%%/pcre_table.5.html -%%PORTDOCS%%%%DOCSDIR%%/pgsql_table.5.html -%%PORTDOCS%%%%DOCSDIR%%/pickup.8.html -%%PORTDOCS%%%%DOCSDIR%%/pipe.8.html -%%PORTDOCS%%%%DOCSDIR%%/postalias.1.html -%%PORTDOCS%%%%DOCSDIR%%/postcat.1.html -%%PORTDOCS%%%%DOCSDIR%%/postconf.1.html -%%PORTDOCS%%%%DOCSDIR%%/postconf.5.html -%%PORTDOCS%%%%DOCSDIR%%/postdrop.1.html -%%PORTDOCS%%%%DOCSDIR%%/postfix-logo.jpg -%%PORTDOCS%%%%DOCSDIR%%/postfix-manuals.html -%%PORTDOCS%%%%DOCSDIR%%/postfix-power.png -%%PORTDOCS%%%%DOCSDIR%%/postfix.1.html -%%PORTDOCS%%%%DOCSDIR%%/postkick.1.html -%%PORTDOCS%%%%DOCSDIR%%/postlock.1.html -%%PORTDOCS%%%%DOCSDIR%%/postlog.1.html -%%PORTDOCS%%%%DOCSDIR%%/postmap.1.html -%%PORTDOCS%%%%DOCSDIR%%/postqueue.1.html -%%PORTDOCS%%%%DOCSDIR%%/postsuper.1.html -%%PORTDOCS%%%%DOCSDIR%%/proxymap.8.html -%%PORTDOCS%%%%DOCSDIR%%/qmgr.8.html -%%PORTDOCS%%%%DOCSDIR%%/qmqp-sink.1.html -%%PORTDOCS%%%%DOCSDIR%%/qmqp-source.1.html -%%PORTDOCS%%%%DOCSDIR%%/qmqpd.8.html -%%PORTDOCS%%%%DOCSDIR%%/qshape.1.html -%%PORTDOCS%%%%DOCSDIR%%/regexp_table.5.html -%%PORTDOCS%%%%DOCSDIR%%/relocated.5.html -%%PORTDOCS%%%%DOCSDIR%%/sendmail.1.html -%%PORTDOCS%%%%DOCSDIR%%/scache.8.html -%%PORTDOCS%%%%DOCSDIR%%/showq.8.html -%%PORTDOCS%%%%DOCSDIR%%/smtp-sink.1.html -%%PORTDOCS%%%%DOCSDIR%%/smtp-source.1.html -%%PORTDOCS%%%%DOCSDIR%%/smtp.8.html -%%PORTDOCS%%%%DOCSDIR%%/smtpd.8.html -%%PORTDOCS%%%%DOCSDIR%%/spawn.8.html -%%PORTDOCS%%%%DOCSDIR%%/trace.8.html -%%PORTDOCS%%%%DOCSDIR%%/transport.5.html -%%PORTDOCS%%%%DOCSDIR%%/trivial-rewrite.8.html -%%PORTDOCS%%%%DOCSDIR%%/verify.8.html -%%PORTDOCS%%%%DOCSDIR%%/virtual.5.html -%%PORTDOCS%%%%DOCSDIR%%/virtual.8.html -%%PORTDOCS%%%%DOCSDIR%%/tlsmgr.8.html -%%PORTDOCS%%%%DOCSDIR%%/generic.5.html -%%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrm libexec/postfix -@dirrm etc/postfix/dist -@unexec rmdir %D/etc/postfix 2>/dev/null || true diff --git a/mail/postfix24/scripts/configure b/mail/postfix24/scripts/configure deleted file mode 100644 index 93c5b95ec561..000000000000 --- a/mail/postfix24/scripts/configure +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ - -for f in `find ${WRKSRC} -type f | xargs grep -l '\!\!PREFIX\!\!' ` ; do \ - mv $f $f.orig && sed s+!!PREFIX!!+$PREFIX+g < $f.orig > $f && \ - rm $f.orig -done diff --git a/mail/postfix24/scripts/configure.postfix b/mail/postfix24/scripts/configure.postfix deleted file mode 100644 index 71991cf9b8e6..000000000000 --- a/mail/postfix24/scripts/configure.postfix +++ /dev/null @@ -1,256 +0,0 @@ -#!/bin/sh -# $FreeBSD: /tmp/pcvs/ports/mail/postfix24/scripts/Attic/configure.postfix,v 1.63 2005-07-06 16:37:35 jylefort Exp $ - -if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then - exit -fi - -tempfile=`/usr/bin/mktemp -t checklist` - -if [ "${POSTFIX_OPTIONS}" ]; then - set ${POSTFIX_OPTIONS} -fi - -for i; do - eval status_$i=ON -done - -if [ -z "${BATCH}" ]; then - /usr/bin/dialog --title "Postfix configuration options" --clear \ - --checklist "\n\ -Please select desired options:" -1 -1 16 \ -NOPCRE "DISABLE Perl Compatible Regular Expressions" "$status_NOPCRE" \ -SASL "Cyrus SASLv1 (Simple Authentication and Security Layer)" "$status_SASL" \ -SASL2 "Cyrus SASLv2 (Simple Authentication and Security Layer)" "$status_SASL2" \ -SASLKRB "If your SASL requires Kerberos select this option" "$status_SASLKRB" \ -SASLKRB5 "If your SASL requires Kerberos5 select this option" "$status_SASLKRB5" \ -SPF "SPF support" "$status_SPF" \ -TLS "SSL and TLS" "$status_TLS" \ -DB3 "Berkeley DB3 (required if SASL also built with DB3)" "$status_DB3" \ -DB40 "Berkeley DB4.0 (required if SASL also built with DB4.0)" "$status_DB40" \ -DB41 "Berkeley DB4.1 (required if SASL also built with DB4.1)" "$status_DB41" \ -DB42 "Berkeley DB4.2 (required if SASL also built with DB4.2)" "$status_DB42" \ -DB43 "Berkeley DB4.3 (required if SASL also built with DB4.3)" "$status_DB43" \ -MySQL "MySQL map lookups (choose version with WITH_MYSQL_VER)" "$status_MySQL" \ -PgSQL "PostgreSQL map lookups (choose with DEFAULT_PGSQL_VER)" "$status_PgSQL" \ -OpenLDAP "OpenLDAP map lookups (choose ver. with WITH_OPENLDAP_VER)" "$status_OpenLDAP" \ -NIS "NIS map lookups" "$status_NIS" \ -VDA "VDA (Virtual Delivery Agent)" "$status_VDA" \ -Test "SMTP/LMTP test server and generator" "$status_Test" \ -2> $tempfile - - retval=$? - - if [ -s $tempfile ]; then - set `sed 's/"//g' $tempfile` - fi - rm -f $tempfile - - case $retval in - 0) if [ -z "$*" ]; then - /bin/echo "Nothing selected" - fi - ;; - 1) /bin/echo "Cancel pressed." - exit 1 - ;; - esac -fi - -${MKDIR} ${WRKDIRPREFIX}${CURDIR} -exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - -/bin/echo "PREFIX= ${PREFIX}" - -SUB_TEST="@comment " -SUB_SPF="@comment " - -while [ "$1" ]; do - case $1 in - NOPCRE) - /bin/echo "WITHOUT_PCRE= yes" - /bin/echo "NOPCRE_SUFFIX= +nopcre" - SUB_NOPCRE="" - ;; - SASL) - /bin/echo "LIB_DEPENDS+= sasl.8:\${PORTSDIR}/security/cyrus-sasl" - /bin/echo "POSTFIX_CCARGS+= -DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl1" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lsasl -lpam -lcrypt" - /bin/echo "SASL_SUFFIX= +sasl" - if [ -f ${LOCALBASE}/lib/libsasl.a ]; then - if /usr/bin/nm ${LOCALBASE}/lib/libsasl.a | grep -wq "mysql_init"; then - SASL_USE_MYSQL="YES" - fi - fi - ;; - SASL2) - /bin/echo "LIB_DEPENDS+= sasl2.2:\${PORTSDIR}/security/cyrus-sasl2" - /bin/echo "POSTFIX_CCARGS+= -DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lsasl2 -lpam -lcrypt" - /bin/echo "SASL_SUFFIX= +sasl2" - if [ -f ${LOCALBASE}/lib/libsasl2.a ]; then - if /usr/bin/nm ${LOCALBASE}/lib/libsasl2.a | grep -wq "mysql_init"; then - SASL_USE_MYSQL="YES" - fi - fi - ;; - SASLKRB) - /bin/echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err" - ;; - SASLKRB5) - /bin/echo "POSTFIX_AUXLIBS+= -lkrb5 -lcrypto -lcrypt -lcom_err -lasn1 -lroken" - ;; - SPF) - # see http://www.ipnet6.org/postfix/spf/ - /bin/echo "LIB_DEPENDS+= spf2.1:\${PORTSDIR}/mail/libspf2" - /bin/echo "PATCH_SITES+= http://www.ipnet6.org/postfix/download/" - /bin/echo "PATCHFILES+= postfix-libspf2-2.2.0-5.patch" - /bin/echo "PATCH_DIST_STRIP= -p1" - /bin/echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lspf2" - /bin/echo "SPF_SUFFIX= +spf" -# /bin/echo "README+= SPF_README" - /bin/echo "" - SUB_SPF="" - ;; - TLS) - /bin/echo "USE_OPENSSL= yes" - /bin/echo "POSTFIX_CCARGS+= -DUSE_TLS -I\${OPENSSLINC}" - /bin/echo "POSTFIX_AUXLIBS+= -L\${OPENSSLLIB} -lssl -lcrypto" - /bin/echo "TLS_SUFFIX= +tls" - ;; - DB3) - if [ "X$BDB_SELECTED" != "X" ]; then - /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr - rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - exit 1 - fi - /bin/echo "LIB_DEPENDS+= db3.3:\${PORTSDIR}/databases/db3" - /bin/echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db3" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb3" - /bin/echo "DB_SUFFIX= +db3" - BDB_SELECTED="3" - ;; - DB40) - if [ "X$BDB_SELECTED" != "X" ]; then - /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr - rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - exit 1 - fi - /bin/echo "LIB_DEPENDS+= db4.0:\${PORTSDIR}/databases/db4" - /bin/echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db4" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb4" - /bin/echo "DB_SUFFIX= +db40" - BDB_SELECTED="40" - ;; - DB41) - if [ "X$BDB_SELECTED" != "X" ]; then - /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr - rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - exit 1 - fi - /bin/echo "LIB_DEPENDS+= db41.1:\${PORTSDIR}/databases/db41" - /bin/echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db41" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb41" - /bin/echo "DB_SUFFIX= +db41" - BDB_SELECTED="41" - ;; - DB42) - if [ "X$BDB_SELECTED" != "X" ]; then - /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr - rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - exit 1 - fi - /bin/echo "LIB_DEPENDS+= db-4.2.2:\${PORTSDIR}/databases/db42" - /bin/echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db42" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib/db42/ -ldb" - /bin/echo "DB_SUFFIX= +db42" - BDB_SELECTED="42" - ;; - DB43) - if [ "X$BDB_SELECTED" != "X" ]; then - /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr - rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - exit 1 - fi - /bin/echo "LIB_DEPENDS+= db-4.3.0:\${PORTSDIR}/databases/db43" - /bin/echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db43" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib/db43/ -ldb" - /bin/echo "DB_SUFFIX= +db43" - BDB_SELECTED="43" - ;; - MySQL) - /bin/echo "USE_MYSQL=YES" - /bin/echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql" - /bin/echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz -lcrypt" - if [ -f ${LOCALBASE}/lib/mysql/libmysqlclient.a ]; then - if /usr/bin/nm ${LOCALBASE}/lib/mysql/libmysqlclient.a | grep -wq "SSL_new"; then - /bin/echo "USE_OPENSSL= yes" - /bin/echo "POSTFIX_CCARGS+= -I\${OPENSSLLIB}" - /bin/echo "POSTFIX_AUXLIBS+= -L\${OPENSSLLIB} -lssl -lcrypto" - fi - fi - /bin/echo "MYSQL_SUFFIX= +mysql" - MYSQL_SELECTED="YES" - ;; - PgSQL) - /bin/echo "USE_PGSQL=YES" - /bin/echo "POSTFIX_CCARGS+= -DHAS_PGSQL -I\${LOCALBASE}/include -I\${LOCALBASE}/pgsql/include" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt" - /bin/echo "PGSQL_SUFFIX= +pgsql" - ;; - OpenLDAP) - /bin/echo "USE_OPENLDAP=YES" - /bin/echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lldap -llber" - /bin/echo "OPENLDAP_SUFFIX= +openldap" - ;; - NIS) - /bin/echo "POSTFIX_CCARGS+= -DHAS_NIS" - /bin/echo "NIS_SUFFIX= +nis" - ;; - VDA) - /bin/echo "PATCH_SITES+= http://web.onda.com.br/nadal/postfix/VDA/" - /bin/echo "PATCHFILES+= postfix-2.2.4-vda.patch.gz" - /bin/echo "PATCH_DIST_STRIP= -p1" - ;; - Test) - /bin/echo "BIN1= smtp-sink smtp-source qmqp-source" -# /bin/echo "MAN1+= smtp-sink.1 smtp-source.1 qmqp-sink.1 qmqp-source.1" - SUB_TEST="" - ;; - *) - /bin/echo "Unknown option(s): $*" > /dev/stderr - rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - exit 1 - ;; - esac - shift -done - -if [ -z "${BATCH}" ]; then - if [ "X$SASL_USE_MYSQL" != "X" ] && [ "$MYSQL_SELECTED" != "YES" ]; then - /usr/bin/dialog --yesno "Your lib SASL it is compiled with MySQL. It desires to use the MySQL?" 5 80 > /dev/stderr - if [ $? = 0 ]; then - /bin/echo "USE_MYSQL=YES" - /bin/echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql" - /bin/echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz -lcrypt" - if [ -f ${LOCALBASE}/lib/mysql/libmysqlclient.a ]; then - if /usr/bin/nm ${LOCALBASE}/lib/mysql/libmysqlclient.a | grep -wq "SSL_new"; then - /bin/echo "USE_OPENSSL= yes" - /bin/echo "POSTFIX_CCARGS+= -I\${OPENSSLLIB}" - /bin/echo "POSTFIX_AUXLIBS+= -L\${OPENSSLLIB} -lssl -lcrypto" - fi - fi - fi - fi -fi - -/bin/echo "PLIST_SUB+= SUB_TEST=\"${SUB_TEST}\"" -/bin/echo "PLIST_SUB+= SUB_SPF=\"${SUB_SPF}\"" - -# for some reason, if we alter the pkg name this way, the first build (where -# we ask the configure questions) doesn't pick up the extensions, but -# any subsequent build will. so "make; make install" will build twice. -# don't do this for now. -#/bin/echo "PKGNAMESUFFIX= \${NOPCRE_SUFFIX}\${SASL_SUFFIX}\${DB_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${NIS_SUFFIX}\${SPF_SUFFIX}" diff --git a/mail/postfix24/scripts/fix-files-list b/mail/postfix24/scripts/fix-files-list deleted file mode 100644 index cc4a1083a814..000000000000 --- a/mail/postfix24/scripts/fix-files-list +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -# need to fixup ${PREFIX}/etc/postfix/postfix-files to indicate compressed -# man pages, since the ports software compresses them later, and if we -# run post-install it will complain about missing files -# (script from Simon J. Mudd) - -ed ${PREFIX}/etc/postfix/postfix-files <<EOF || exit 1 -%s/\(\/man[158]\/.*\.[158]\):/\1.gz:/ -w -q -EOF diff --git a/mail/postfix25/Makefile b/mail/postfix25/Makefile deleted file mode 100644 index 8947c1225319..000000000000 --- a/mail/postfix25/Makefile +++ /dev/null @@ -1,161 +0,0 @@ -# New ports collection makefile for: postfix -# Date created: 18 Mar 1999 -# Whom: torstenb -# -# $FreeBSD$ -# - -# To pre-select options in batch mode, run make like this: -# -# make -DBATCH POSTFIX_OPTIONS="DB3 TLS" -# -# the options are the same names as in the scripts/configure.postfix file. -# POSTFIX_OPTIONS can be set in /etc/make.conf also. - -# NOTE: PCRE is enabled by default unless you specifically disable it. - -PORTNAME= postfix -PORTVERSION= 2.2.5 -PORTEPOCH= 1 -CATEGORIES= mail ipv6 -MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ - ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/%SUBDIR%/ \ - ftp://ftp.tux.org/pub/net/postfix/official/ \ - ftp://ftp.utoronto.ca/mirror/packages/postfix/official/ \ - ftp://ftp.samurai.com/pub/postfix/official/ \ - ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/postfix/official/&,} -MASTER_SITE_SUBDIR= . old related/postfix -DISTNAME= postfix-${PORTVERSION} -DIST_SUBDIR= ${PORTNAME} - -# blanket approval for version updates: marcus@corp.grupos.com.br -MAINTAINER= vivek@khera.org -COMMENT= A secure alternative to widely-used Sendmail - -CONFLICTS= courier-0.* postfix-1.* postfix-2.0.* postfix-2.1.* postfix-2.3.* \ - sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.* -USE_SUBMAKE= yes -USE_REINPLACE= yes - -MAN1= postalias.1 postcat.1 postconf.1 postdrop.1 postfix.1 postkick.1 \ - postlock.1 postlog.1 postmap.1 postqueue.1 postsuper.1 sendmail.1 - -MAN5= access.5 aliases.5 canonical.5 cidr_table.5 generic.5 header_checks.5 \ - ldap_table.5 master.5 mysql_table.5 nisplus_table.5 pcre_table.5 \ - pgsql_table.5 postconf.5 regexp_table.5 relocated.5 transport.5 \ - virtual.5 - -MAN8= anvil.8 bounce.8 cleanup.8 discard.8 error.8 flush.8 lmtp.8 local.8 \ - master.8 oqmgr.8 pickup.8 pipe.8 proxymap.8 qmgr.8 qmqpd.8 scache.8 \ - showq.8 smtp.8 smtpd.8 spawn.8 tlsmgr.8 trivial-rewrite.8 verify.8 \ - virtual.8 - -MLINKS= sendmail.1 mailq.1 \ - sendmail.1 newaliases.1 \ - header_checks.5 body_checks.5 \ - bounce.8 defer.8 \ - bounce.8 trace.8 - -CONF1= access aliases canonical generic header_checks main.cf master.cf \ - relocated transport virtual - -.if !defined(DEBUG) -MAKEFILEFLAGS+= DEBUG= -.endif - -MAKEFILEFLAGS+= CC="${CC}" OPT="${CFLAGS}" - -SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ - TOUCH="${TOUCH}" \ - MKDIR="${MKDIR}" \ - POSTFIX_OPTIONS="${POSTFIX_OPTIONS}" - -pre-fetch: - @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postfix - -.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc) -.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc" -.endif - -.if defined(WITHOUT_PCRE) -POSTFIX_CCARGS+= -DNO_PCRE -.else -LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre -POSTFIX_CCARGS+= -DHAS_PCRE -I${LOCALBASE}/include -POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -lpcre -.endif - -post-patch: - (cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \ - CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \ - ${ECHO} "all: default" >> Makefile) - -pre-patch: - @${ECHO} "<body>See <A HREF="header_checks.5.html">header_checks.5.html</A></BODY>" > ${WRKSRC}/html/body_checks.5.html - @for f in `${FIND} -P ${WRKSRC}/man -type f`; do \ - ${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" $${f}; \ - done - @for f in `${FIND} -P ${WRKSRC}/README_FILES -type f`; do \ - ${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" $${f}; \ - done - @for f in `${FIND} -P ${WRKSRC}/conf -type f`; do \ - ${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" $${f}; \ - done - -pre-install: - @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL - -.if defined(NOPORTDOCS) -READMEDIR=no -.else -READMEDIR=${PREFIX}/share/doc/postfix -.endif - -do-install: - cd ${WRKSRC}; ${SH} postfix-install -non-interactive install_root=/ tempdir=/tmp \ - config_directory=${PREFIX}/etc/postfix \ - daemon_directory=${PREFIX}/libexec/postfix \ - command_directory=${PREFIX}/sbin \ - queue_directory=/var/spool/postfix \ - sendmail_path=${PREFIX}/sbin/sendmail \ - newaliases_path=${PREFIX}/bin/newaliases \ - mailq_path=${PREFIX}/bin/mailq \ - mail_owner=postfix \ - setgid_group=maildrop \ - manpage_directory=${PREFIX}/man \ - sample_directory=${PREFIX}/etc/postfix \ - readme_directory=${READMEDIR} - - @${MKDIR} ${PREFIX}/etc/postfix/dist -.for f in ${CONF1} - ${INSTALL_DATA} ${WRKSRC}/conf/${f} ${PREFIX}/etc/postfix/dist -.endfor - - @${INSTALL_SCRIPT} \ - ${WRKSRC}/auxiliary/rmail/rmail \ - ${PREFIX}/bin/rmail - -# optional TEST binaries -.for file in ${BIN1} - @${INSTALL_PROGRAM} ${WRKSRC}/bin/${file} ${PREFIX}/sbin -.endfor - -.if !defined(NOPORTDOCS) - @${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${DOCSDIR} - @cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.jpg *.png ${DOCSDIR} && \ - ${ECHO_MSG} "Installed HTML documentation in ${DOCSDIR}" -.endif - -post-install: - @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL -# need to fixup ${PREFIX}/etc/postfix/postfix-files to indicate compressed -# man pages, since the ports software compresses them after this step, and -# if we run etc/postfix/post-install again during package installation, -# it will complain about missing files. - @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/fix-files-list - @${CAT} ${PKGMESSAGE} - -post-clean: - @${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc - -.include <bsd.port.mk> diff --git a/mail/postfix25/distinfo b/mail/postfix25/distinfo deleted file mode 100644 index 59ac523435fa..000000000000 --- a/mail/postfix25/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -MD5 (postfix/postfix-2.2.5.tar.gz) = 9c13d58494c64012bfd8ab0d6967305c -SIZE (postfix/postfix-2.2.5.tar.gz) = 2428594 -MD5 (postfix/postfix-libspf2-2.2.0-5.patch) = 80be36e0f14e1a1f39a3b30b9b2d4115 -SIZE (postfix/postfix-libspf2-2.2.0-5.patch) = 26077 -MD5 (postfix/postfix-2.2.4-vda.patch.gz) = 7049364c6476edf80d6ff861ca37936f -SIZE (postfix/postfix-2.2.4-vda.patch.gz) = 7712 diff --git a/mail/postfix25/files/patch-conf::main.cf b/mail/postfix25/files/patch-conf::main.cf deleted file mode 100644 index 67e356de21dd..000000000000 --- a/mail/postfix25/files/patch-conf::main.cf +++ /dev/null @@ -1,64 +0,0 @@ ---- conf/main.cf.orig Sat Mar 5 11:53:42 2005 -+++ conf/main.cf Sat Mar 5 11:53:42 2005 -@@ -32,13 +32,13 @@ - # The command_directory parameter specifies the location of all - # postXXX commands. - # --command_directory = /usr/sbin -+command_directory = !!PREFIX!!/sbin - - # The daemon_directory parameter specifies the location of all Postfix - # daemon programs (i.e. programs listed in the master.cf file). This - # directory must be owned by root. - # --daemon_directory = /usr/libexec/postfix -+daemon_directory = !!PREFIX!!/libexec/postfix - - # QUEUE AND PROCESS OWNERSHIP - # -@@ -608,37 +608,37 @@ - # sendmail_path: The full pathname of the Postfix sendmail command. - # This is the Sendmail-compatible mail posting interface. - # --sendmail_path = -+sendmail_path = !!PREFIX!!/sbin/sendmail - - # newaliases_path: The full pathname of the Postfix newaliases command. - # This is the Sendmail-compatible command to build alias databases. - # --newaliases_path = -+newaliases_path = !!PREFIX!!/bin/newaliases - - # mailq_path: The full pathname of the Postfix mailq command. This - # is the Sendmail-compatible mail queue listing command. - # --mailq_path = -+mailq_path = !!PREFIX!!/bin/mailq - - # setgid_group: The group for mail submission and queue management - # commands. This must be a group name with a numerical group ID that - # is not shared with other accounts, not even with the Postfix account. - # --setgid_group = -+setgid_group = maildrop - - # html_directory: The location of the Postfix HTML documentation. - # --html_directory = -+html_directory = no - - # manpage_directory: The location of the Postfix on-line manual pages. - # --manpage_directory = -+manpage_directory = !!PREFIX!!/man - - # sample_directory: The location of the Postfix sample configuration files. - # This parameter is obsolete as of Postfix 2.1. - # --sample_directory = -+sample_directory = !!PREFIX!!/etc/postfix - - # readme_directory: The location of the Postfix README files. - # --readme_directory = -+readme_directory = no diff --git a/mail/postfix25/files/patch-conf::post-install b/mail/postfix25/files/patch-conf::post-install deleted file mode 100644 index 78401de5bdf3..000000000000 --- a/mail/postfix25/files/patch-conf::post-install +++ /dev/null @@ -1,11 +0,0 @@ ---- conf/post-install.orig Thu Feb 24 08:06:08 2005 -+++ conf/post-install Sat Mar 5 11:53:42 2005 -@@ -185,7 +185,7 @@ - - umask 022 - --PATH=/bin:/usr/bin:/usr/sbin:/usr/etc:/sbin:/etc:/usr/contrib/bin:/usr/gnu/bin:/usr/ucb:/usr/bsd -+PATH=/bin:/usr/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/local/sbin - SHELL=/bin/sh - IFS=" - " diff --git a/mail/postfix25/files/patch-makedefs b/mail/postfix25/files/patch-makedefs deleted file mode 100644 index ed2f08d06ae4..000000000000 --- a/mail/postfix25/files/patch-makedefs +++ /dev/null @@ -1,13 +0,0 @@ ---- makedefs.orig Tue Feb 22 09:35:52 2005 -+++ makedefs Wed Jul 13 17:42:53 2005 -@@ -116,6 +116,10 @@ - ;; - FreeBSD.5*) SYSTYPE=FREEBSD5 - ;; -+ FreeBSD.6*) SYSTYPE=FREEBSD5 -+ ;; -+ FreeBSD.7*) SYSTYPE=FREEBSD5 -+ ;; - OpenBSD.2*) SYSTYPE=OPENBSD2 - ;; - OpenBSD.3*) SYSTYPE=OPENBSD3 diff --git a/mail/postfix25/files/patch-src::global::mail_params.h b/mail/postfix25/files/patch-src::global::mail_params.h deleted file mode 100644 index 52ea5e9e5c35..000000000000 --- a/mail/postfix25/files/patch-src::global::mail_params.h +++ /dev/null @@ -1,29 +0,0 @@ ---- src/global/mail_params.h.orig Fri Feb 11 21:53:21 2005 -+++ src/global/mail_params.h Sat Mar 5 11:53:42 2005 -@@ -64,7 +64,7 @@ - extern gid_t var_owner_gid; - - #define VAR_SGID_GROUP "setgid_group" --#define DEF_SGID_GROUP "postdrop" -+#define DEF_SGID_GROUP "maildrop" - extern char *var_sgid_group; - extern gid_t var_sgid_gid; - -@@ -221,7 +221,7 @@ - */ - #define VAR_DAEMON_DIR "daemon_directory" - #ifndef DEF_DAEMON_DIR --#define DEF_DAEMON_DIR "/usr/libexec/postfix" -+#define DEF_DAEMON_DIR "!!PREFIX!!/libexec/postfix" - #endif - extern char *var_daemon_dir; - -@@ -250,7 +250,7 @@ - */ - #define VAR_CONFIG_DIR "config_directory" - #ifndef DEF_CONFIG_DIR --#define DEF_CONFIG_DIR "/etc/postfix" -+#define DEF_CONFIG_DIR "!!PREFIX!!/etc/postfix" - #endif - extern char *var_config_dir; - diff --git a/mail/postfix25/pkg-descr b/mail/postfix25/pkg-descr deleted file mode 100644 index 1f335ce6820c..000000000000 --- a/mail/postfix25/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -Postfix attempts to be fast, easy to administer, and secure, while at -the same time being sendmail-compatible enough to not upset existing -users. It also offers QMQP and VERP support to let Postfix act as delivery -daemon for ezmlm-idx. - -WWW: http://www.postfix.org/ diff --git a/mail/postfix25/pkg-install b/mail/postfix25/pkg-install deleted file mode 100644 index e912b1a051e2..000000000000 --- a/mail/postfix25/pkg-install +++ /dev/null @@ -1,181 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# If the POSTFIX_DEFAULT_MTA environment variable is set to YES, it -# will make the port/package use defaults which make postfix replace -# sendmail as much as possible. - -PKG_PREFIX=${PKG_PREFIX:=/usr/local} -BATCH=${BATCH:=no} -POSTFIX_DEFAULT_MTA=${POSTFIX_DEFAULT_MTA:=no} - -if [ x${POSTFIX_DEFAULT_MTA} = xno ]; then - DEFAULT_REPLACE_MAILERCONF=n -else - DEFAULT_REPLACE_MAILERCONF=y -fi - -if [ -x /usr/sbin/nologin ]; then - NOLOGIN=/usr/sbin/nologin -else - NOLOGIN=/sbin/nologin -fi - -ask() { - local question default answer - - question=$1 - default=$2 - if [ -z "${PACKAGE_BUILDING}" -a x${BATCH} = xno ]; then - read -p "${question} [${default}]? " answer - fi - if [ x${answer} = x ]; then - answer=${default} - fi - /bin/echo ${answer} -} - -yesno() { - local question default answer - - question=$1 - default=$2 - while :; do - answer=$(ask "${question}" "${default}") - case "${answer}" in - [Yy]*) return 0;; - [Nn]*) return 1;; - esac - /bin/echo "Please answer yes or no." - done -} - -if [ x"$2" = xPRE-INSTALL ]; then - USER=postfix - UID=125 - GROUP=postfix - GID=125 - GROUP2=maildrop - GID2=126 - - if /usr/sbin/pw groupshow "${GROUP}" 2>/dev/null; then - /bin/echo "You already have a group \"${GROUP}\", so I will use it." - else - if /usr/sbin/pw groupadd ${GROUP} -g ${GID} - then - /bin/echo "Added group \"${GROUP}\"." - else - /bin/echo "Adding group \"${GROUP}\" failed..." - /bin/echo "Please create it, and try again." - exit 1 - fi - fi - - if /usr/sbin/pw groupshow "${GROUP2}" 2>/dev/null; then - /bin/echo "You already have a group \"${GROUP2}\", so I will use it." - else - if /usr/sbin/pw groupadd ${GROUP2} -g ${GID2}; then - /bin/echo "Added group \"${GROUP2}\"." - else - /bin/echo "Adding group \"${GROUP2}\" failed..." - /bin/echo "Please create it, and try again." - exit 1 - fi - fi - - if /usr/sbin/pw user show "${USER}" 2>/dev/null; then - /bin/echo "You already have a user \"${USER}\", so I will use it." - else - if /usr/sbin/pw useradd ${USER} -u ${UID} -g ${GROUP} -h - -d /var/spool/postfix -s ${NOLOGIN} -c "Postfix Mail System"; then - /bin/echo "Added user \"${USER}\"." - else - /bin/echo "Adding user \"${USER}\" failed..." - /bin/echo "Please create it, and try again." - exit 1 - fi - fi - - if /usr/sbin/pw show group mail | grep -q "${USER}" 2>/dev/null; then - /bin/echo "You already have user \"${USER}\" in group \"mail\", so I will use it." - else - /bin/echo "You need user \"${USER}\" added to group \"mail\"." - if yesno "Would you like me to add it" y; then - /usr/sbin/pw groupmod mail -m ${USER} || exit - /bin/echo "Done." - else - /bin/echo "Please create it, and try again." - exit 1 - fi - fi -fi - -if [ x"$2" = xPOST-INSTALL ]; then - if [ -d ${PKG_PREFIX}/etc/postfix/dist ]; then - for file in ${PKG_PREFIX}/etc/postfix/dist/*; do - if [ ! -f ${PKG_PREFIX}/etc/postfix/${file#${PKG_PREFIX}/etc/postfix/dist} ]; then - cp $file ${PKG_PREFIX}/etc/postfix/ - fi - done - fi - - /bin/sh ${PKG_PREFIX}/etc/postfix/post-install tempdir=/tmp \ - config_directory=${PKG_PREFIX}/etc/postfix \ - daemon_directory=${PKG_PREFIX}/libexec/postfix \ - command_directory=${PKG_PREFIX}/sbin \ - queue_directory=/var/spool/postfix \ - sendmail_path=${PKG_PREFIX}/sbin/sendmail \ - newaliases_path=${PKG_PREFIX}/bin/newaliases \ - mailq_path=${PKG_PREFIX}/bin/mailq \ - mail_owner=postfix \ - setgid_group=maildrop \ - manpage_directory=${PKG_PREFIX}/man \ - sample_directory=${PKG_PREFIX}/etc/postfix \ - readme_directory=no \ - upgrade-package -fi -# readme_directory is "no" above since the package will have correct perms -# already, and we don't know if they had PORTDOCS. - -replace() { - local orig repl - - orig=$1 - repl=$2 - if [ -e ${orig} ]; then - /bin/mv -f ${orig} ${orig}.OFF - /bin/chmod 0 ${orig}.OFF - fi - if [ -e ${repl} ]; then - /bin/ln -s ${repl} ${orig} - fi -} - -if [ x"$2" = xPOST-INSTALL -a -z "${PACKAGE_BUILDING}" ]; then - if [ -x /sbin/sysctl ]; then - OSVERSION=`/sbin/sysctl -n kern.osreldate` - else - OSVERSION=`/usr/sbin/sysctl -n kern.osreldate` - fi - if [ ${OSVERSION} -ge 400014 ]; then - if yesno "Would you like to activate Postfix in /etc/mail/mailer.conf" ${DEFAULT_REPLACE_MAILERCONF}; then - mv -f /etc/mail/mailer.conf /etc/mail/mailer.conf.old - /bin/echo "#" > /etc/mail/mailer.conf - /bin/echo -n "# Execute the Postfix sendmail program" >> /etc/mail/mailer.conf - /bin/echo ", named ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - /bin/echo "#" >> /etc/mail/mailer.conf - /bin/echo "sendmail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - /bin/echo "send-mail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - /bin/echo "mailq ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - /bin/echo "newaliases ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - fi - else - if yesno "Would you like to replace {sendmail,mailq,newaliases} with Postfix versions" n; then - replace /usr/sbin/sendmail ${PKG_PREFIX}/sbin/sendmail - replace /usr/bin/mailq ${PKG_PREFIX}/sbin/sendmail - replace /usr/bin/newaliases ${PKG_PREFIX}/sbin/sendmail - /bin/echo "Done." - fi - fi -fi diff --git a/mail/postfix25/pkg-message b/mail/postfix25/pkg-message deleted file mode 100644 index d9e910d86ceb..000000000000 --- a/mail/postfix25/pkg-message +++ /dev/null @@ -1,47 +0,0 @@ -If you have postfix configured in your /etc/mail/mailer.conf (answered yes to -the previous question) and would like to enable postfix to start at boot time, -please set these variables in your /etc/rc.conf file: - -sendmail_enable="YES" -sendmail_flags="-bd" -sendmail_pidfile="/var/spool/postfix/pid/master.pid" -sendmail_procname="/usr/local/libexec/postfix/master" -sendmail_outbound_enable="NO" -sendmail_submit_enable="NO" -sendmail_msp_queue_enable="NO" - -This will disable Sendmail completely, and allow you to use /etc/rc.d/sendmail -to start and stop postfix (FreeBSD 5.x and up). For FreeBSD 4.x, it will just -cause the system boot scripts to start sendmail for you. - -Alternatively to the above settings, you can enable postfix to start with -the other local services, for example, after your database server starts if -you need it to be running for postfix. To do this, set in your rc.conf file: - -sendmail_enable="NO" -sendmail_submit_enable="NO" -sendmail_outbound_enable="NO" -sendmail_msp_queue_enable="NO" - -Then make the following symbolic link: - -cd /usr/local/etc/rc.d -ln -s /usr/local/sbin/postfix postfix.sh - - -With either startup configuration, you will want to disable some -Sendmail-specific daily maintenance routines in your /etc/periodic.conf file: - -daily_clean_hoststat_enable="NO" -daily_status_mail_rejects_enable="NO" -daily_status_include_submit_mailq="NO" -daily_submit_queuerun="NO" - - -If you are using SASL, you need to make sure that postfix has access to read -the sasldb file. This is accomplished by adding postfix to group mail and -making the /usr/local/etc/sasldb* file(s) readable by group mail (this should -be the default for new installs). - -If you are upgrading from postfix version prior to 2.0, please see the README -files for recommended changes to your configuration. diff --git a/mail/postfix25/pkg-plist b/mail/postfix25/pkg-plist deleted file mode 100644 index 6c1ab4114c53..000000000000 --- a/mail/postfix25/pkg-plist +++ /dev/null @@ -1,233 +0,0 @@ -@unexec if cmp -s %D/etc/postfix/main.cf %D/etc/postfix/dist/main.cf; then rm -f %D/etc/postfix/main.cf; fi -@unexec if cmp -s %D/etc/postfix/master.cf %D/etc/postfix/dist/master.cf; then rm -f %D/etc/postfix/master.cf; fi -@unexec if cmp -s %D/etc/postfix/access %D/etc/postfix/dist/access; then rm -f %D/etc/postfix/access; fi -@unexec if cmp -s %D/etc/postfix/aliases %D/etc/postfix/dist/aliases; then rm -f %D/etc/postfix/aliases; fi -@unexec if cmp -s %D/etc/postfix/canonical %D/etc/postfix/dist/canonical; then rm -f %D/etc/postfix/canonical; fi -@unexec if cmp -s %D/etc/postfix/header_checks %D/etc/postfix/dist/header_checks; then rm -f %D/etc/postfix/header_checks; fi -@unexec if cmp -s %D/etc/postfix/relocated %D/etc/postfix/dist/relocated; then rm -f %D/etc/postfix/relocated; fi -@unexec if cmp -s %D/etc/postfix/transport %D/etc/postfix/dist/transport; then rm -f %D/etc/postfix/transport; fi -@unexec if cmp -s %D/etc/postfix/virtual %D/etc/postfix/dist/virtual; then rm -f %D/etc/postfix/virtual; fi -@unexec if cmp -s %D/etc/postfix/generic %D/etc/postfix/dist/generic; then rm -f %D/etc/postfix/generic; fi -etc/postfix/LICENSE -etc/postfix/TLS_LICENSE -etc/postfix/main.cf.default -etc/postfix/makedefs.out -etc/postfix/post-install -etc/postfix/postfix-files -etc/postfix/postfix-script -etc/postfix/dist/main.cf -etc/postfix/dist/master.cf -etc/postfix/dist/access -etc/postfix/dist/aliases -etc/postfix/dist/canonical -etc/postfix/dist/header_checks -etc/postfix/dist/relocated -etc/postfix/dist/transport -etc/postfix/dist/virtual -etc/postfix/dist/generic -libexec/postfix/anvil -libexec/postfix/bounce -libexec/postfix/cleanup -libexec/postfix/discard -libexec/postfix/error -libexec/postfix/flush -libexec/postfix/lmtp -libexec/postfix/local -libexec/postfix/master -libexec/postfix/nqmgr -libexec/postfix/oqmgr -libexec/postfix/pickup -libexec/postfix/pipe -libexec/postfix/proxymap -libexec/postfix/qmgr -libexec/postfix/qmqpd -libexec/postfix/scache -libexec/postfix/showq -libexec/postfix/smtp -libexec/postfix/smtpd -libexec/postfix/spawn -libexec/postfix/trivial-rewrite -libexec/postfix/verify -libexec/postfix/virtual -libexec/postfix/tlsmgr -sbin/postalias -sbin/postcat -sbin/postconf -sbin/postdrop -sbin/postfix -sbin/postkick -sbin/postlock -sbin/postlog -sbin/postmap -sbin/postqueue -sbin/postsuper -sbin/sendmail -%%SUB_TEST%%sbin/qmqp-source -%%SUB_TEST%%sbin/smtp-sink -%%SUB_TEST%%sbin/smtp-source -bin/rmail -bin/newaliases -bin/mailq -%%PORTDOCS%%%%DOCSDIR%%/AAAREADME -%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_CLASS_README -%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_CLASS_README.html -%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_REWRITING_README -%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_REWRITING_README.html -%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_VERIFICATION_README -%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_VERIFICATION_README.html -%%PORTDOCS%%%%DOCSDIR%%/BACKSCATTER_README -%%PORTDOCS%%%%DOCSDIR%%/BACKSCATTER_README.html -%%PORTDOCS%%%%DOCSDIR%%/BASIC_CONFIGURATION_README -%%PORTDOCS%%%%DOCSDIR%%/BASIC_CONFIGURATION_README.html -%%PORTDOCS%%%%DOCSDIR%%/BUILTIN_FILTER_README -%%PORTDOCS%%%%DOCSDIR%%/BUILTIN_FILTER_README.html -%%PORTDOCS%%%%DOCSDIR%%/CDB_README -%%PORTDOCS%%%%DOCSDIR%%/CONNECTION_CACHE_README -%%PORTDOCS%%%%DOCSDIR%%/CONNECTION_CACHE_README.html -%%PORTDOCS%%%%DOCSDIR%%/CONTENT_INSPECTION_README -%%PORTDOCS%%%%DOCSDIR%%/CONTENT_INSPECTION_README.html -%%PORTDOCS%%%%DOCSDIR%%/CYRUS_README.html -%%PORTDOCS%%%%DOCSDIR%%/DATABASE_README -%%PORTDOCS%%%%DOCSDIR%%/DATABASE_README.html -%%PORTDOCS%%%%DOCSDIR%%/DB_README -%%PORTDOCS%%%%DOCSDIR%%/DB_README.html -%%PORTDOCS%%%%DOCSDIR%%/DEBUG_README -%%PORTDOCS%%%%DOCSDIR%%/DEBUG_README.html -%%PORTDOCS%%%%DOCSDIR%%/ETRN_README -%%PORTDOCS%%%%DOCSDIR%%/ETRN_README.html -%%PORTDOCS%%%%DOCSDIR%%/FILTER_README -%%PORTDOCS%%%%DOCSDIR%%/FILTER_README.html -%%PORTDOCS%%%%DOCSDIR%%/INSTALL -%%PORTDOCS%%%%DOCSDIR%%/INSTALL.html -%%PORTDOCS%%%%DOCSDIR%%/IPV6_README -%%PORTDOCS%%%%DOCSDIR%%/IPV6_README.html -%%PORTDOCS%%%%DOCSDIR%%/CDB_README.html -%%PORTDOCS%%%%DOCSDIR%%/TLS_README -%%PORTDOCS%%%%DOCSDIR%%/TLS_README.html -%%PORTDOCS%%%%DOCSDIR%%/LDAP_README -%%PORTDOCS%%%%DOCSDIR%%/LDAP_README.html -%%PORTDOCS%%%%DOCSDIR%%/LINUX_README -%%PORTDOCS%%%%DOCSDIR%%/LINUX_README.html -%%PORTDOCS%%%%DOCSDIR%%/LMTP_README -%%PORTDOCS%%%%DOCSDIR%%/LMTP_README.html -%%PORTDOCS%%%%DOCSDIR%%/LOCAL_RECIPIENT_README -%%PORTDOCS%%%%DOCSDIR%%/LOCAL_RECIPIENT_README.html -%%PORTDOCS%%%%DOCSDIR%%/MAILDROP_README -%%PORTDOCS%%%%DOCSDIR%%/MAILDROP_README.html -%%PORTDOCS%%%%DOCSDIR%%/MYSQL_README -%%PORTDOCS%%%%DOCSDIR%%/MYSQL_README.html -%%PORTDOCS%%%%DOCSDIR%%/NFS_README -%%PORTDOCS%%%%DOCSDIR%%/NFS_README.html -%%PORTDOCS%%%%DOCSDIR%%/OVERVIEW -%%PORTDOCS%%%%DOCSDIR%%/OVERVIEW.html -%%PORTDOCS%%%%DOCSDIR%%/PACKAGE_README -%%PORTDOCS%%%%DOCSDIR%%/PACKAGE_README.html -%%PORTDOCS%%%%DOCSDIR%%/PCRE_README -%%PORTDOCS%%%%DOCSDIR%%/PCRE_README.html -%%PORTDOCS%%%%DOCSDIR%%/PGSQL_README -%%PORTDOCS%%%%DOCSDIR%%/PGSQL_README.html -%%PORTDOCS%%%%DOCSDIR%%/QMQP_README -%%PORTDOCS%%%%DOCSDIR%%/QMQP_README.html -%%PORTDOCS%%%%DOCSDIR%%/QSHAPE_README -%%PORTDOCS%%%%DOCSDIR%%/QSHAPE_README.html -%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES -%%PORTDOCS%%%%DOCSDIR%%/RESTRICTION_CLASS_README -%%PORTDOCS%%%%DOCSDIR%%/RESTRICTION_CLASS_README.html -%%PORTDOCS%%%%DOCSDIR%%/SASL_README -%%PORTDOCS%%%%DOCSDIR%%/SASL_README.html -%%PORTDOCS%%%%DOCSDIR%%/SCHEDULER_README -%%PORTDOCS%%%%DOCSDIR%%/SCHEDULER_README.html -%%PORTDOCS%%%%DOCSDIR%%/SMTPD_ACCESS_README -%%PORTDOCS%%%%DOCSDIR%%/SMTPD_ACCESS_README.html -%%PORTDOCS%%%%DOCSDIR%%/SMTPD_POLICY_README -%%PORTDOCS%%%%DOCSDIR%%/SMTPD_POLICY_README.html -%%PORTDOCS%%%%DOCSDIR%%/SMTPD_PROXY_README -%%PORTDOCS%%%%DOCSDIR%%/SMTPD_PROXY_README.html -%%PORTDOCS%%%%SUB_SPF%%%%DOCSDIR%%/SPF_README -%%PORTDOCS%%%%DOCSDIR%%/STANDARD_CONFIGURATION_README -%%PORTDOCS%%%%DOCSDIR%%/STANDARD_CONFIGURATION_README.html -%%PORTDOCS%%%%DOCSDIR%%/TUNING_README -%%PORTDOCS%%%%DOCSDIR%%/TUNING_README.html -%%PORTDOCS%%%%DOCSDIR%%/ULTRIX_README -%%PORTDOCS%%%%DOCSDIR%%/ULTRIX_README.html -%%PORTDOCS%%%%DOCSDIR%%/UUCP_README -%%PORTDOCS%%%%DOCSDIR%%/UUCP_README.html -%%PORTDOCS%%%%DOCSDIR%%/VERP_README -%%PORTDOCS%%%%DOCSDIR%%/VERP_README.html -%%PORTDOCS%%%%DOCSDIR%%/VIRTUAL_README -%%PORTDOCS%%%%DOCSDIR%%/VIRTUAL_README.html -%%PORTDOCS%%%%DOCSDIR%%/XCLIENT_README -%%PORTDOCS%%%%DOCSDIR%%/XCLIENT_README.html -%%PORTDOCS%%%%DOCSDIR%%/XFORWARD_README -%%PORTDOCS%%%%DOCSDIR%%/XFORWARD_README.html -%%PORTDOCS%%%%DOCSDIR%%/access.5.html -%%PORTDOCS%%%%DOCSDIR%%/aliases.5.html -%%PORTDOCS%%%%DOCSDIR%%/anvil.8.html -%%PORTDOCS%%%%DOCSDIR%%/body_checks.5.html -%%PORTDOCS%%%%DOCSDIR%%/bounce.8.html -%%PORTDOCS%%%%DOCSDIR%%/canonical.5.html -%%PORTDOCS%%%%DOCSDIR%%/cidr_table.5.html -%%PORTDOCS%%%%DOCSDIR%%/cleanup.8.html -%%PORTDOCS%%%%DOCSDIR%%/defer.8.html -%%PORTDOCS%%%%DOCSDIR%%/discard.8.html -%%PORTDOCS%%%%DOCSDIR%%/error.8.html -%%PORTDOCS%%%%DOCSDIR%%/flush.8.html -%%PORTDOCS%%%%DOCSDIR%%/header_checks.5.html -%%PORTDOCS%%%%DOCSDIR%%/index.html -%%PORTDOCS%%%%DOCSDIR%%/ldap_table.5.html -%%PORTDOCS%%%%DOCSDIR%%/lmtp.8.html -%%PORTDOCS%%%%DOCSDIR%%/local.8.html -%%PORTDOCS%%%%DOCSDIR%%/mailq.1.html -%%PORTDOCS%%%%DOCSDIR%%/master.5.html -%%PORTDOCS%%%%DOCSDIR%%/master.8.html -%%PORTDOCS%%%%DOCSDIR%%/mysql_table.5.html -%%PORTDOCS%%%%DOCSDIR%%/nisplus_table.5.html -%%PORTDOCS%%%%DOCSDIR%%/newaliases.1.html -%%PORTDOCS%%%%DOCSDIR%%/oqmgr.8.html -%%PORTDOCS%%%%DOCSDIR%%/pcre_table.5.html -%%PORTDOCS%%%%DOCSDIR%%/pgsql_table.5.html -%%PORTDOCS%%%%DOCSDIR%%/pickup.8.html -%%PORTDOCS%%%%DOCSDIR%%/pipe.8.html -%%PORTDOCS%%%%DOCSDIR%%/postalias.1.html -%%PORTDOCS%%%%DOCSDIR%%/postcat.1.html -%%PORTDOCS%%%%DOCSDIR%%/postconf.1.html -%%PORTDOCS%%%%DOCSDIR%%/postconf.5.html -%%PORTDOCS%%%%DOCSDIR%%/postdrop.1.html -%%PORTDOCS%%%%DOCSDIR%%/postfix-logo.jpg -%%PORTDOCS%%%%DOCSDIR%%/postfix-manuals.html -%%PORTDOCS%%%%DOCSDIR%%/postfix-power.png -%%PORTDOCS%%%%DOCSDIR%%/postfix.1.html -%%PORTDOCS%%%%DOCSDIR%%/postkick.1.html -%%PORTDOCS%%%%DOCSDIR%%/postlock.1.html -%%PORTDOCS%%%%DOCSDIR%%/postlog.1.html -%%PORTDOCS%%%%DOCSDIR%%/postmap.1.html -%%PORTDOCS%%%%DOCSDIR%%/postqueue.1.html -%%PORTDOCS%%%%DOCSDIR%%/postsuper.1.html -%%PORTDOCS%%%%DOCSDIR%%/proxymap.8.html -%%PORTDOCS%%%%DOCSDIR%%/qmgr.8.html -%%PORTDOCS%%%%DOCSDIR%%/qmqp-sink.1.html -%%PORTDOCS%%%%DOCSDIR%%/qmqp-source.1.html -%%PORTDOCS%%%%DOCSDIR%%/qmqpd.8.html -%%PORTDOCS%%%%DOCSDIR%%/qshape.1.html -%%PORTDOCS%%%%DOCSDIR%%/regexp_table.5.html -%%PORTDOCS%%%%DOCSDIR%%/relocated.5.html -%%PORTDOCS%%%%DOCSDIR%%/sendmail.1.html -%%PORTDOCS%%%%DOCSDIR%%/scache.8.html -%%PORTDOCS%%%%DOCSDIR%%/showq.8.html -%%PORTDOCS%%%%DOCSDIR%%/smtp-sink.1.html -%%PORTDOCS%%%%DOCSDIR%%/smtp-source.1.html -%%PORTDOCS%%%%DOCSDIR%%/smtp.8.html -%%PORTDOCS%%%%DOCSDIR%%/smtpd.8.html -%%PORTDOCS%%%%DOCSDIR%%/spawn.8.html -%%PORTDOCS%%%%DOCSDIR%%/trace.8.html -%%PORTDOCS%%%%DOCSDIR%%/transport.5.html -%%PORTDOCS%%%%DOCSDIR%%/trivial-rewrite.8.html -%%PORTDOCS%%%%DOCSDIR%%/verify.8.html -%%PORTDOCS%%%%DOCSDIR%%/virtual.5.html -%%PORTDOCS%%%%DOCSDIR%%/virtual.8.html -%%PORTDOCS%%%%DOCSDIR%%/tlsmgr.8.html -%%PORTDOCS%%%%DOCSDIR%%/generic.5.html -%%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrm libexec/postfix -@dirrm etc/postfix/dist -@unexec rmdir %D/etc/postfix 2>/dev/null || true diff --git a/mail/postfix25/scripts/configure b/mail/postfix25/scripts/configure deleted file mode 100644 index 93c5b95ec561..000000000000 --- a/mail/postfix25/scripts/configure +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ - -for f in `find ${WRKSRC} -type f | xargs grep -l '\!\!PREFIX\!\!' ` ; do \ - mv $f $f.orig && sed s+!!PREFIX!!+$PREFIX+g < $f.orig > $f && \ - rm $f.orig -done diff --git a/mail/postfix25/scripts/configure.postfix b/mail/postfix25/scripts/configure.postfix deleted file mode 100644 index b24ecf11af85..000000000000 --- a/mail/postfix25/scripts/configure.postfix +++ /dev/null @@ -1,256 +0,0 @@ -#!/bin/sh -# $FreeBSD: /tmp/pcvs/ports/mail/postfix25/scripts/Attic/configure.postfix,v 1.63 2005-07-06 16:37:35 jylefort Exp $ - -if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then - exit -fi - -tempfile=`/usr/bin/mktemp -t checklist` - -if [ "${POSTFIX_OPTIONS}" ]; then - set ${POSTFIX_OPTIONS} -fi - -for i; do - eval status_$i=ON -done - -if [ -z "${BATCH}" ]; then - /usr/bin/dialog --title "Postfix configuration options" --clear \ - --checklist "\n\ -Please select desired options:" -1 -1 16 \ -NOPCRE "DISABLE Perl Compatible Regular Expressions" "$status_NOPCRE" \ -SASL "Cyrus SASLv1 (Simple Authentication and Security Layer)" "$status_SASL" \ -SASL2 "Cyrus SASLv2 (Simple Authentication and Security Layer)" "$status_SASL2" \ -SASLKRB "If your SASL requires Kerberos select this option" "$status_SASLKRB" \ -SASLKRB5 "If your SASL requires Kerberos5 select this option" "$status_SASLKRB5" \ -SPF "SPF support" "$status_SPF" \ -TLS "SSL and TLS" "$status_TLS" \ -DB3 "Berkeley DB3 (required if SASL also built with DB3)" "$status_DB3" \ -DB40 "Berkeley DB4.0 (required if SASL also built with DB4.0)" "$status_DB40" \ -DB41 "Berkeley DB4.1 (required if SASL also built with DB4.1)" "$status_DB41" \ -DB42 "Berkeley DB4.2 (required if SASL also built with DB4.2)" "$status_DB42" \ -DB43 "Berkeley DB4.3 (required if SASL also built with DB4.3)" "$status_DB43" \ -MySQL "MySQL map lookups (choose version with WITH_MYSQL_VER)" "$status_MySQL" \ -PgSQL "PostgreSQL map lookups (choose with DEFAULT_PGSQL_VER)" "$status_PgSQL" \ -OpenLDAP "OpenLDAP map lookups (choose ver. with WITH_OPENLDAP_VER)" "$status_OpenLDAP" \ -NIS "NIS map lookups" "$status_NIS" \ -VDA "VDA (Virtual Delivery Agent)" "$status_VDA" \ -Test "SMTP/LMTP test server and generator" "$status_Test" \ -2> $tempfile - - retval=$? - - if [ -s $tempfile ]; then - set `sed 's/"//g' $tempfile` - fi - rm -f $tempfile - - case $retval in - 0) if [ -z "$*" ]; then - /bin/echo "Nothing selected" - fi - ;; - 1) /bin/echo "Cancel pressed." - exit 1 - ;; - esac -fi - -${MKDIR} ${WRKDIRPREFIX}${CURDIR} -exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - -/bin/echo "PREFIX= ${PREFIX}" - -SUB_TEST="@comment " -SUB_SPF="@comment " - -while [ "$1" ]; do - case $1 in - NOPCRE) - /bin/echo "WITHOUT_PCRE= yes" - /bin/echo "NOPCRE_SUFFIX= +nopcre" - SUB_NOPCRE="" - ;; - SASL) - /bin/echo "LIB_DEPENDS+= sasl.8:\${PORTSDIR}/security/cyrus-sasl" - /bin/echo "POSTFIX_CCARGS+= -DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl1" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lsasl -lpam -lcrypt" - /bin/echo "SASL_SUFFIX= +sasl" - if [ -f ${LOCALBASE}/lib/libsasl.a ]; then - if /usr/bin/nm ${LOCALBASE}/lib/libsasl.a | grep -wq "mysql_init"; then - SASL_USE_MYSQL="YES" - fi - fi - ;; - SASL2) - /bin/echo "LIB_DEPENDS+= sasl2.2:\${PORTSDIR}/security/cyrus-sasl2" - /bin/echo "POSTFIX_CCARGS+= -DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lsasl2 -lpam -lcrypt" - /bin/echo "SASL_SUFFIX= +sasl2" - if [ -f ${LOCALBASE}/lib/libsasl2.a ]; then - if /usr/bin/nm ${LOCALBASE}/lib/libsasl2.a | grep -wq "mysql_init"; then - SASL_USE_MYSQL="YES" - fi - fi - ;; - SASLKRB) - /bin/echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err" - ;; - SASLKRB5) - /bin/echo "POSTFIX_AUXLIBS+= -lkrb5 -lcrypto -lcrypt -lcom_err -lasn1 -lroken" - ;; - SPF) - # see http://www.ipnet6.org/postfix/spf/ - /bin/echo "LIB_DEPENDS+= spf2.1:\${PORTSDIR}/mail/libspf2" - /bin/echo "PATCH_SITES+= http://www.ipnet6.org/postfix/download/" - /bin/echo "PATCHFILES+= postfix-libspf2-2.2.0-5.patch" - /bin/echo "PATCH_DIST_STRIP= -p1" - /bin/echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lspf2" - /bin/echo "SPF_SUFFIX= +spf" -# /bin/echo "README+= SPF_README" - /bin/echo "" - SUB_SPF="" - ;; - TLS) - /bin/echo "USE_OPENSSL= yes" - /bin/echo "POSTFIX_CCARGS+= -DUSE_TLS -I\${OPENSSLINC}" - /bin/echo "POSTFIX_AUXLIBS+= -L\${OPENSSLLIB} -lssl -lcrypto" - /bin/echo "TLS_SUFFIX= +tls" - ;; - DB3) - if [ "X$BDB_SELECTED" != "X" ]; then - /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr - rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - exit 1 - fi - /bin/echo "LIB_DEPENDS+= db3.3:\${PORTSDIR}/databases/db3" - /bin/echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db3" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb3" - /bin/echo "DB_SUFFIX= +db3" - BDB_SELECTED="3" - ;; - DB40) - if [ "X$BDB_SELECTED" != "X" ]; then - /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr - rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - exit 1 - fi - /bin/echo "LIB_DEPENDS+= db4.0:\${PORTSDIR}/databases/db4" - /bin/echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db4" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb4" - /bin/echo "DB_SUFFIX= +db40" - BDB_SELECTED="40" - ;; - DB41) - if [ "X$BDB_SELECTED" != "X" ]; then - /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr - rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - exit 1 - fi - /bin/echo "LIB_DEPENDS+= db41.1:\${PORTSDIR}/databases/db41" - /bin/echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db41" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb41" - /bin/echo "DB_SUFFIX= +db41" - BDB_SELECTED="41" - ;; - DB42) - if [ "X$BDB_SELECTED" != "X" ]; then - /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr - rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - exit 1 - fi - /bin/echo "LIB_DEPENDS+= db-4.2.2:\${PORTSDIR}/databases/db42" - /bin/echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db42" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib/db42/ -ldb" - /bin/echo "DB_SUFFIX= +db42" - BDB_SELECTED="42" - ;; - DB43) - if [ "X$BDB_SELECTED" != "X" ]; then - /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr - rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - exit 1 - fi - /bin/echo "LIB_DEPENDS+= db-4.3.0:\${PORTSDIR}/databases/db43" - /bin/echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db43" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib/db43/ -ldb" - /bin/echo "DB_SUFFIX= +db43" - BDB_SELECTED="43" - ;; - MySQL) - /bin/echo "USE_MYSQL=YES" - /bin/echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql" - /bin/echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz -lcrypt" - if [ -f ${LOCALBASE}/lib/mysql/libmysqlclient.a ]; then - if /usr/bin/nm ${LOCALBASE}/lib/mysql/libmysqlclient.a | grep -wq "SSL_new"; then - /bin/echo "USE_OPENSSL= yes" - /bin/echo "POSTFIX_CCARGS+= -I\${OPENSSLLIB}" - /bin/echo "POSTFIX_AUXLIBS+= -L\${OPENSSLLIB} -lssl -lcrypto" - fi - fi - /bin/echo "MYSQL_SUFFIX= +mysql" - MYSQL_SELECTED="YES" - ;; - PgSQL) - /bin/echo "USE_PGSQL=YES" - /bin/echo "POSTFIX_CCARGS+= -DHAS_PGSQL -I\${LOCALBASE}/include -I\${LOCALBASE}/pgsql/include" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt" - /bin/echo "PGSQL_SUFFIX= +pgsql" - ;; - OpenLDAP) - /bin/echo "USE_OPENLDAP=YES" - /bin/echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lldap -llber" - /bin/echo "OPENLDAP_SUFFIX= +openldap" - ;; - NIS) - /bin/echo "POSTFIX_CCARGS+= -DHAS_NIS" - /bin/echo "NIS_SUFFIX= +nis" - ;; - VDA) - /bin/echo "PATCH_SITES+= http://web.onda.com.br/nadal/postfix/VDA/" - /bin/echo "PATCHFILES+= postfix-2.2.4-vda.patch.gz" - /bin/echo "PATCH_DIST_STRIP= -p1" - ;; - Test) - /bin/echo "BIN1= smtp-sink smtp-source qmqp-source" -# /bin/echo "MAN1+= smtp-sink.1 smtp-source.1 qmqp-sink.1 qmqp-source.1" - SUB_TEST="" - ;; - *) - /bin/echo "Unknown option(s): $*" > /dev/stderr - rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - exit 1 - ;; - esac - shift -done - -if [ -z "${BATCH}" ]; then - if [ "X$SASL_USE_MYSQL" != "X" ] && [ "$MYSQL_SELECTED" != "YES" ]; then - /usr/bin/dialog --yesno "Your lib SASL it is compiled with MySQL. It desires to use the MySQL?" 5 80 > /dev/stderr - if [ $? = 0 ]; then - /bin/echo "USE_MYSQL=YES" - /bin/echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql" - /bin/echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz -lcrypt" - if [ -f ${LOCALBASE}/lib/mysql/libmysqlclient.a ]; then - if /usr/bin/nm ${LOCALBASE}/lib/mysql/libmysqlclient.a | grep -wq "SSL_new"; then - /bin/echo "USE_OPENSSL= yes" - /bin/echo "POSTFIX_CCARGS+= -I\${OPENSSLLIB}" - /bin/echo "POSTFIX_AUXLIBS+= -L\${OPENSSLLIB} -lssl -lcrypto" - fi - fi - fi - fi -fi - -/bin/echo "PLIST_SUB+= SUB_TEST=\"${SUB_TEST}\"" -/bin/echo "PLIST_SUB+= SUB_SPF=\"${SUB_SPF}\"" - -# for some reason, if we alter the pkg name this way, the first build (where -# we ask the configure questions) doesn't pick up the extensions, but -# any subsequent build will. so "make; make install" will build twice. -# don't do this for now. -#/bin/echo "PKGNAMESUFFIX= \${NOPCRE_SUFFIX}\${SASL_SUFFIX}\${DB_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${NIS_SUFFIX}\${SPF_SUFFIX}" diff --git a/mail/postfix25/scripts/fix-files-list b/mail/postfix25/scripts/fix-files-list deleted file mode 100644 index cc4a1083a814..000000000000 --- a/mail/postfix25/scripts/fix-files-list +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -# need to fixup ${PREFIX}/etc/postfix/postfix-files to indicate compressed -# man pages, since the ports software compresses them later, and if we -# run post-install it will complain about missing files -# (script from Simon J. Mudd) - -ed ${PREFIX}/etc/postfix/postfix-files <<EOF || exit 1 -%s/\(\/man[158]\/.*\.[158]\):/\1.gz:/ -w -q -EOF diff --git a/mail/postfix26/Makefile b/mail/postfix26/Makefile deleted file mode 100644 index 8947c1225319..000000000000 --- a/mail/postfix26/Makefile +++ /dev/null @@ -1,161 +0,0 @@ -# New ports collection makefile for: postfix -# Date created: 18 Mar 1999 -# Whom: torstenb -# -# $FreeBSD$ -# - -# To pre-select options in batch mode, run make like this: -# -# make -DBATCH POSTFIX_OPTIONS="DB3 TLS" -# -# the options are the same names as in the scripts/configure.postfix file. -# POSTFIX_OPTIONS can be set in /etc/make.conf also. - -# NOTE: PCRE is enabled by default unless you specifically disable it. - -PORTNAME= postfix -PORTVERSION= 2.2.5 -PORTEPOCH= 1 -CATEGORIES= mail ipv6 -MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ - ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/%SUBDIR%/ \ - ftp://ftp.tux.org/pub/net/postfix/official/ \ - ftp://ftp.utoronto.ca/mirror/packages/postfix/official/ \ - ftp://ftp.samurai.com/pub/postfix/official/ \ - ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/postfix/official/&,} -MASTER_SITE_SUBDIR= . old related/postfix -DISTNAME= postfix-${PORTVERSION} -DIST_SUBDIR= ${PORTNAME} - -# blanket approval for version updates: marcus@corp.grupos.com.br -MAINTAINER= vivek@khera.org -COMMENT= A secure alternative to widely-used Sendmail - -CONFLICTS= courier-0.* postfix-1.* postfix-2.0.* postfix-2.1.* postfix-2.3.* \ - sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.* -USE_SUBMAKE= yes -USE_REINPLACE= yes - -MAN1= postalias.1 postcat.1 postconf.1 postdrop.1 postfix.1 postkick.1 \ - postlock.1 postlog.1 postmap.1 postqueue.1 postsuper.1 sendmail.1 - -MAN5= access.5 aliases.5 canonical.5 cidr_table.5 generic.5 header_checks.5 \ - ldap_table.5 master.5 mysql_table.5 nisplus_table.5 pcre_table.5 \ - pgsql_table.5 postconf.5 regexp_table.5 relocated.5 transport.5 \ - virtual.5 - -MAN8= anvil.8 bounce.8 cleanup.8 discard.8 error.8 flush.8 lmtp.8 local.8 \ - master.8 oqmgr.8 pickup.8 pipe.8 proxymap.8 qmgr.8 qmqpd.8 scache.8 \ - showq.8 smtp.8 smtpd.8 spawn.8 tlsmgr.8 trivial-rewrite.8 verify.8 \ - virtual.8 - -MLINKS= sendmail.1 mailq.1 \ - sendmail.1 newaliases.1 \ - header_checks.5 body_checks.5 \ - bounce.8 defer.8 \ - bounce.8 trace.8 - -CONF1= access aliases canonical generic header_checks main.cf master.cf \ - relocated transport virtual - -.if !defined(DEBUG) -MAKEFILEFLAGS+= DEBUG= -.endif - -MAKEFILEFLAGS+= CC="${CC}" OPT="${CFLAGS}" - -SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ - TOUCH="${TOUCH}" \ - MKDIR="${MKDIR}" \ - POSTFIX_OPTIONS="${POSTFIX_OPTIONS}" - -pre-fetch: - @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postfix - -.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc) -.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc" -.endif - -.if defined(WITHOUT_PCRE) -POSTFIX_CCARGS+= -DNO_PCRE -.else -LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre -POSTFIX_CCARGS+= -DHAS_PCRE -I${LOCALBASE}/include -POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -lpcre -.endif - -post-patch: - (cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \ - CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \ - ${ECHO} "all: default" >> Makefile) - -pre-patch: - @${ECHO} "<body>See <A HREF="header_checks.5.html">header_checks.5.html</A></BODY>" > ${WRKSRC}/html/body_checks.5.html - @for f in `${FIND} -P ${WRKSRC}/man -type f`; do \ - ${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" $${f}; \ - done - @for f in `${FIND} -P ${WRKSRC}/README_FILES -type f`; do \ - ${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" $${f}; \ - done - @for f in `${FIND} -P ${WRKSRC}/conf -type f`; do \ - ${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" $${f}; \ - done - -pre-install: - @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL - -.if defined(NOPORTDOCS) -READMEDIR=no -.else -READMEDIR=${PREFIX}/share/doc/postfix -.endif - -do-install: - cd ${WRKSRC}; ${SH} postfix-install -non-interactive install_root=/ tempdir=/tmp \ - config_directory=${PREFIX}/etc/postfix \ - daemon_directory=${PREFIX}/libexec/postfix \ - command_directory=${PREFIX}/sbin \ - queue_directory=/var/spool/postfix \ - sendmail_path=${PREFIX}/sbin/sendmail \ - newaliases_path=${PREFIX}/bin/newaliases \ - mailq_path=${PREFIX}/bin/mailq \ - mail_owner=postfix \ - setgid_group=maildrop \ - manpage_directory=${PREFIX}/man \ - sample_directory=${PREFIX}/etc/postfix \ - readme_directory=${READMEDIR} - - @${MKDIR} ${PREFIX}/etc/postfix/dist -.for f in ${CONF1} - ${INSTALL_DATA} ${WRKSRC}/conf/${f} ${PREFIX}/etc/postfix/dist -.endfor - - @${INSTALL_SCRIPT} \ - ${WRKSRC}/auxiliary/rmail/rmail \ - ${PREFIX}/bin/rmail - -# optional TEST binaries -.for file in ${BIN1} - @${INSTALL_PROGRAM} ${WRKSRC}/bin/${file} ${PREFIX}/sbin -.endfor - -.if !defined(NOPORTDOCS) - @${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${DOCSDIR} - @cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.jpg *.png ${DOCSDIR} && \ - ${ECHO_MSG} "Installed HTML documentation in ${DOCSDIR}" -.endif - -post-install: - @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL -# need to fixup ${PREFIX}/etc/postfix/postfix-files to indicate compressed -# man pages, since the ports software compresses them after this step, and -# if we run etc/postfix/post-install again during package installation, -# it will complain about missing files. - @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/fix-files-list - @${CAT} ${PKGMESSAGE} - -post-clean: - @${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc - -.include <bsd.port.mk> diff --git a/mail/postfix26/distinfo b/mail/postfix26/distinfo deleted file mode 100644 index 59ac523435fa..000000000000 --- a/mail/postfix26/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -MD5 (postfix/postfix-2.2.5.tar.gz) = 9c13d58494c64012bfd8ab0d6967305c -SIZE (postfix/postfix-2.2.5.tar.gz) = 2428594 -MD5 (postfix/postfix-libspf2-2.2.0-5.patch) = 80be36e0f14e1a1f39a3b30b9b2d4115 -SIZE (postfix/postfix-libspf2-2.2.0-5.patch) = 26077 -MD5 (postfix/postfix-2.2.4-vda.patch.gz) = 7049364c6476edf80d6ff861ca37936f -SIZE (postfix/postfix-2.2.4-vda.patch.gz) = 7712 diff --git a/mail/postfix26/files/patch-conf::main.cf b/mail/postfix26/files/patch-conf::main.cf deleted file mode 100644 index 67e356de21dd..000000000000 --- a/mail/postfix26/files/patch-conf::main.cf +++ /dev/null @@ -1,64 +0,0 @@ ---- conf/main.cf.orig Sat Mar 5 11:53:42 2005 -+++ conf/main.cf Sat Mar 5 11:53:42 2005 -@@ -32,13 +32,13 @@ - # The command_directory parameter specifies the location of all - # postXXX commands. - # --command_directory = /usr/sbin -+command_directory = !!PREFIX!!/sbin - - # The daemon_directory parameter specifies the location of all Postfix - # daemon programs (i.e. programs listed in the master.cf file). This - # directory must be owned by root. - # --daemon_directory = /usr/libexec/postfix -+daemon_directory = !!PREFIX!!/libexec/postfix - - # QUEUE AND PROCESS OWNERSHIP - # -@@ -608,37 +608,37 @@ - # sendmail_path: The full pathname of the Postfix sendmail command. - # This is the Sendmail-compatible mail posting interface. - # --sendmail_path = -+sendmail_path = !!PREFIX!!/sbin/sendmail - - # newaliases_path: The full pathname of the Postfix newaliases command. - # This is the Sendmail-compatible command to build alias databases. - # --newaliases_path = -+newaliases_path = !!PREFIX!!/bin/newaliases - - # mailq_path: The full pathname of the Postfix mailq command. This - # is the Sendmail-compatible mail queue listing command. - # --mailq_path = -+mailq_path = !!PREFIX!!/bin/mailq - - # setgid_group: The group for mail submission and queue management - # commands. This must be a group name with a numerical group ID that - # is not shared with other accounts, not even with the Postfix account. - # --setgid_group = -+setgid_group = maildrop - - # html_directory: The location of the Postfix HTML documentation. - # --html_directory = -+html_directory = no - - # manpage_directory: The location of the Postfix on-line manual pages. - # --manpage_directory = -+manpage_directory = !!PREFIX!!/man - - # sample_directory: The location of the Postfix sample configuration files. - # This parameter is obsolete as of Postfix 2.1. - # --sample_directory = -+sample_directory = !!PREFIX!!/etc/postfix - - # readme_directory: The location of the Postfix README files. - # --readme_directory = -+readme_directory = no diff --git a/mail/postfix26/files/patch-conf::post-install b/mail/postfix26/files/patch-conf::post-install deleted file mode 100644 index 78401de5bdf3..000000000000 --- a/mail/postfix26/files/patch-conf::post-install +++ /dev/null @@ -1,11 +0,0 @@ ---- conf/post-install.orig Thu Feb 24 08:06:08 2005 -+++ conf/post-install Sat Mar 5 11:53:42 2005 -@@ -185,7 +185,7 @@ - - umask 022 - --PATH=/bin:/usr/bin:/usr/sbin:/usr/etc:/sbin:/etc:/usr/contrib/bin:/usr/gnu/bin:/usr/ucb:/usr/bsd -+PATH=/bin:/usr/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/local/sbin - SHELL=/bin/sh - IFS=" - " diff --git a/mail/postfix26/files/patch-makedefs b/mail/postfix26/files/patch-makedefs deleted file mode 100644 index ed2f08d06ae4..000000000000 --- a/mail/postfix26/files/patch-makedefs +++ /dev/null @@ -1,13 +0,0 @@ ---- makedefs.orig Tue Feb 22 09:35:52 2005 -+++ makedefs Wed Jul 13 17:42:53 2005 -@@ -116,6 +116,10 @@ - ;; - FreeBSD.5*) SYSTYPE=FREEBSD5 - ;; -+ FreeBSD.6*) SYSTYPE=FREEBSD5 -+ ;; -+ FreeBSD.7*) SYSTYPE=FREEBSD5 -+ ;; - OpenBSD.2*) SYSTYPE=OPENBSD2 - ;; - OpenBSD.3*) SYSTYPE=OPENBSD3 diff --git a/mail/postfix26/files/patch-src::global::mail_params.h b/mail/postfix26/files/patch-src::global::mail_params.h deleted file mode 100644 index 52ea5e9e5c35..000000000000 --- a/mail/postfix26/files/patch-src::global::mail_params.h +++ /dev/null @@ -1,29 +0,0 @@ ---- src/global/mail_params.h.orig Fri Feb 11 21:53:21 2005 -+++ src/global/mail_params.h Sat Mar 5 11:53:42 2005 -@@ -64,7 +64,7 @@ - extern gid_t var_owner_gid; - - #define VAR_SGID_GROUP "setgid_group" --#define DEF_SGID_GROUP "postdrop" -+#define DEF_SGID_GROUP "maildrop" - extern char *var_sgid_group; - extern gid_t var_sgid_gid; - -@@ -221,7 +221,7 @@ - */ - #define VAR_DAEMON_DIR "daemon_directory" - #ifndef DEF_DAEMON_DIR --#define DEF_DAEMON_DIR "/usr/libexec/postfix" -+#define DEF_DAEMON_DIR "!!PREFIX!!/libexec/postfix" - #endif - extern char *var_daemon_dir; - -@@ -250,7 +250,7 @@ - */ - #define VAR_CONFIG_DIR "config_directory" - #ifndef DEF_CONFIG_DIR --#define DEF_CONFIG_DIR "/etc/postfix" -+#define DEF_CONFIG_DIR "!!PREFIX!!/etc/postfix" - #endif - extern char *var_config_dir; - diff --git a/mail/postfix26/pkg-descr b/mail/postfix26/pkg-descr deleted file mode 100644 index 1f335ce6820c..000000000000 --- a/mail/postfix26/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -Postfix attempts to be fast, easy to administer, and secure, while at -the same time being sendmail-compatible enough to not upset existing -users. It also offers QMQP and VERP support to let Postfix act as delivery -daemon for ezmlm-idx. - -WWW: http://www.postfix.org/ diff --git a/mail/postfix26/pkg-install b/mail/postfix26/pkg-install deleted file mode 100644 index e912b1a051e2..000000000000 --- a/mail/postfix26/pkg-install +++ /dev/null @@ -1,181 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# If the POSTFIX_DEFAULT_MTA environment variable is set to YES, it -# will make the port/package use defaults which make postfix replace -# sendmail as much as possible. - -PKG_PREFIX=${PKG_PREFIX:=/usr/local} -BATCH=${BATCH:=no} -POSTFIX_DEFAULT_MTA=${POSTFIX_DEFAULT_MTA:=no} - -if [ x${POSTFIX_DEFAULT_MTA} = xno ]; then - DEFAULT_REPLACE_MAILERCONF=n -else - DEFAULT_REPLACE_MAILERCONF=y -fi - -if [ -x /usr/sbin/nologin ]; then - NOLOGIN=/usr/sbin/nologin -else - NOLOGIN=/sbin/nologin -fi - -ask() { - local question default answer - - question=$1 - default=$2 - if [ -z "${PACKAGE_BUILDING}" -a x${BATCH} = xno ]; then - read -p "${question} [${default}]? " answer - fi - if [ x${answer} = x ]; then - answer=${default} - fi - /bin/echo ${answer} -} - -yesno() { - local question default answer - - question=$1 - default=$2 - while :; do - answer=$(ask "${question}" "${default}") - case "${answer}" in - [Yy]*) return 0;; - [Nn]*) return 1;; - esac - /bin/echo "Please answer yes or no." - done -} - -if [ x"$2" = xPRE-INSTALL ]; then - USER=postfix - UID=125 - GROUP=postfix - GID=125 - GROUP2=maildrop - GID2=126 - - if /usr/sbin/pw groupshow "${GROUP}" 2>/dev/null; then - /bin/echo "You already have a group \"${GROUP}\", so I will use it." - else - if /usr/sbin/pw groupadd ${GROUP} -g ${GID} - then - /bin/echo "Added group \"${GROUP}\"." - else - /bin/echo "Adding group \"${GROUP}\" failed..." - /bin/echo "Please create it, and try again." - exit 1 - fi - fi - - if /usr/sbin/pw groupshow "${GROUP2}" 2>/dev/null; then - /bin/echo "You already have a group \"${GROUP2}\", so I will use it." - else - if /usr/sbin/pw groupadd ${GROUP2} -g ${GID2}; then - /bin/echo "Added group \"${GROUP2}\"." - else - /bin/echo "Adding group \"${GROUP2}\" failed..." - /bin/echo "Please create it, and try again." - exit 1 - fi - fi - - if /usr/sbin/pw user show "${USER}" 2>/dev/null; then - /bin/echo "You already have a user \"${USER}\", so I will use it." - else - if /usr/sbin/pw useradd ${USER} -u ${UID} -g ${GROUP} -h - -d /var/spool/postfix -s ${NOLOGIN} -c "Postfix Mail System"; then - /bin/echo "Added user \"${USER}\"." - else - /bin/echo "Adding user \"${USER}\" failed..." - /bin/echo "Please create it, and try again." - exit 1 - fi - fi - - if /usr/sbin/pw show group mail | grep -q "${USER}" 2>/dev/null; then - /bin/echo "You already have user \"${USER}\" in group \"mail\", so I will use it." - else - /bin/echo "You need user \"${USER}\" added to group \"mail\"." - if yesno "Would you like me to add it" y; then - /usr/sbin/pw groupmod mail -m ${USER} || exit - /bin/echo "Done." - else - /bin/echo "Please create it, and try again." - exit 1 - fi - fi -fi - -if [ x"$2" = xPOST-INSTALL ]; then - if [ -d ${PKG_PREFIX}/etc/postfix/dist ]; then - for file in ${PKG_PREFIX}/etc/postfix/dist/*; do - if [ ! -f ${PKG_PREFIX}/etc/postfix/${file#${PKG_PREFIX}/etc/postfix/dist} ]; then - cp $file ${PKG_PREFIX}/etc/postfix/ - fi - done - fi - - /bin/sh ${PKG_PREFIX}/etc/postfix/post-install tempdir=/tmp \ - config_directory=${PKG_PREFIX}/etc/postfix \ - daemon_directory=${PKG_PREFIX}/libexec/postfix \ - command_directory=${PKG_PREFIX}/sbin \ - queue_directory=/var/spool/postfix \ - sendmail_path=${PKG_PREFIX}/sbin/sendmail \ - newaliases_path=${PKG_PREFIX}/bin/newaliases \ - mailq_path=${PKG_PREFIX}/bin/mailq \ - mail_owner=postfix \ - setgid_group=maildrop \ - manpage_directory=${PKG_PREFIX}/man \ - sample_directory=${PKG_PREFIX}/etc/postfix \ - readme_directory=no \ - upgrade-package -fi -# readme_directory is "no" above since the package will have correct perms -# already, and we don't know if they had PORTDOCS. - -replace() { - local orig repl - - orig=$1 - repl=$2 - if [ -e ${orig} ]; then - /bin/mv -f ${orig} ${orig}.OFF - /bin/chmod 0 ${orig}.OFF - fi - if [ -e ${repl} ]; then - /bin/ln -s ${repl} ${orig} - fi -} - -if [ x"$2" = xPOST-INSTALL -a -z "${PACKAGE_BUILDING}" ]; then - if [ -x /sbin/sysctl ]; then - OSVERSION=`/sbin/sysctl -n kern.osreldate` - else - OSVERSION=`/usr/sbin/sysctl -n kern.osreldate` - fi - if [ ${OSVERSION} -ge 400014 ]; then - if yesno "Would you like to activate Postfix in /etc/mail/mailer.conf" ${DEFAULT_REPLACE_MAILERCONF}; then - mv -f /etc/mail/mailer.conf /etc/mail/mailer.conf.old - /bin/echo "#" > /etc/mail/mailer.conf - /bin/echo -n "# Execute the Postfix sendmail program" >> /etc/mail/mailer.conf - /bin/echo ", named ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - /bin/echo "#" >> /etc/mail/mailer.conf - /bin/echo "sendmail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - /bin/echo "send-mail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - /bin/echo "mailq ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - /bin/echo "newaliases ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - fi - else - if yesno "Would you like to replace {sendmail,mailq,newaliases} with Postfix versions" n; then - replace /usr/sbin/sendmail ${PKG_PREFIX}/sbin/sendmail - replace /usr/bin/mailq ${PKG_PREFIX}/sbin/sendmail - replace /usr/bin/newaliases ${PKG_PREFIX}/sbin/sendmail - /bin/echo "Done." - fi - fi -fi diff --git a/mail/postfix26/pkg-message b/mail/postfix26/pkg-message deleted file mode 100644 index d9e910d86ceb..000000000000 --- a/mail/postfix26/pkg-message +++ /dev/null @@ -1,47 +0,0 @@ -If you have postfix configured in your /etc/mail/mailer.conf (answered yes to -the previous question) and would like to enable postfix to start at boot time, -please set these variables in your /etc/rc.conf file: - -sendmail_enable="YES" -sendmail_flags="-bd" -sendmail_pidfile="/var/spool/postfix/pid/master.pid" -sendmail_procname="/usr/local/libexec/postfix/master" -sendmail_outbound_enable="NO" -sendmail_submit_enable="NO" -sendmail_msp_queue_enable="NO" - -This will disable Sendmail completely, and allow you to use /etc/rc.d/sendmail -to start and stop postfix (FreeBSD 5.x and up). For FreeBSD 4.x, it will just -cause the system boot scripts to start sendmail for you. - -Alternatively to the above settings, you can enable postfix to start with -the other local services, for example, after your database server starts if -you need it to be running for postfix. To do this, set in your rc.conf file: - -sendmail_enable="NO" -sendmail_submit_enable="NO" -sendmail_outbound_enable="NO" -sendmail_msp_queue_enable="NO" - -Then make the following symbolic link: - -cd /usr/local/etc/rc.d -ln -s /usr/local/sbin/postfix postfix.sh - - -With either startup configuration, you will want to disable some -Sendmail-specific daily maintenance routines in your /etc/periodic.conf file: - -daily_clean_hoststat_enable="NO" -daily_status_mail_rejects_enable="NO" -daily_status_include_submit_mailq="NO" -daily_submit_queuerun="NO" - - -If you are using SASL, you need to make sure that postfix has access to read -the sasldb file. This is accomplished by adding postfix to group mail and -making the /usr/local/etc/sasldb* file(s) readable by group mail (this should -be the default for new installs). - -If you are upgrading from postfix version prior to 2.0, please see the README -files for recommended changes to your configuration. diff --git a/mail/postfix26/pkg-plist b/mail/postfix26/pkg-plist deleted file mode 100644 index 6c1ab4114c53..000000000000 --- a/mail/postfix26/pkg-plist +++ /dev/null @@ -1,233 +0,0 @@ -@unexec if cmp -s %D/etc/postfix/main.cf %D/etc/postfix/dist/main.cf; then rm -f %D/etc/postfix/main.cf; fi -@unexec if cmp -s %D/etc/postfix/master.cf %D/etc/postfix/dist/master.cf; then rm -f %D/etc/postfix/master.cf; fi -@unexec if cmp -s %D/etc/postfix/access %D/etc/postfix/dist/access; then rm -f %D/etc/postfix/access; fi -@unexec if cmp -s %D/etc/postfix/aliases %D/etc/postfix/dist/aliases; then rm -f %D/etc/postfix/aliases; fi -@unexec if cmp -s %D/etc/postfix/canonical %D/etc/postfix/dist/canonical; then rm -f %D/etc/postfix/canonical; fi -@unexec if cmp -s %D/etc/postfix/header_checks %D/etc/postfix/dist/header_checks; then rm -f %D/etc/postfix/header_checks; fi -@unexec if cmp -s %D/etc/postfix/relocated %D/etc/postfix/dist/relocated; then rm -f %D/etc/postfix/relocated; fi -@unexec if cmp -s %D/etc/postfix/transport %D/etc/postfix/dist/transport; then rm -f %D/etc/postfix/transport; fi -@unexec if cmp -s %D/etc/postfix/virtual %D/etc/postfix/dist/virtual; then rm -f %D/etc/postfix/virtual; fi -@unexec if cmp -s %D/etc/postfix/generic %D/etc/postfix/dist/generic; then rm -f %D/etc/postfix/generic; fi -etc/postfix/LICENSE -etc/postfix/TLS_LICENSE -etc/postfix/main.cf.default -etc/postfix/makedefs.out -etc/postfix/post-install -etc/postfix/postfix-files -etc/postfix/postfix-script -etc/postfix/dist/main.cf -etc/postfix/dist/master.cf -etc/postfix/dist/access -etc/postfix/dist/aliases -etc/postfix/dist/canonical -etc/postfix/dist/header_checks -etc/postfix/dist/relocated -etc/postfix/dist/transport -etc/postfix/dist/virtual -etc/postfix/dist/generic -libexec/postfix/anvil -libexec/postfix/bounce -libexec/postfix/cleanup -libexec/postfix/discard -libexec/postfix/error -libexec/postfix/flush -libexec/postfix/lmtp -libexec/postfix/local -libexec/postfix/master -libexec/postfix/nqmgr -libexec/postfix/oqmgr -libexec/postfix/pickup -libexec/postfix/pipe -libexec/postfix/proxymap -libexec/postfix/qmgr -libexec/postfix/qmqpd -libexec/postfix/scache -libexec/postfix/showq -libexec/postfix/smtp -libexec/postfix/smtpd -libexec/postfix/spawn -libexec/postfix/trivial-rewrite -libexec/postfix/verify -libexec/postfix/virtual -libexec/postfix/tlsmgr -sbin/postalias -sbin/postcat -sbin/postconf -sbin/postdrop -sbin/postfix -sbin/postkick -sbin/postlock -sbin/postlog -sbin/postmap -sbin/postqueue -sbin/postsuper -sbin/sendmail -%%SUB_TEST%%sbin/qmqp-source -%%SUB_TEST%%sbin/smtp-sink -%%SUB_TEST%%sbin/smtp-source -bin/rmail -bin/newaliases -bin/mailq -%%PORTDOCS%%%%DOCSDIR%%/AAAREADME -%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_CLASS_README -%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_CLASS_README.html -%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_REWRITING_README -%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_REWRITING_README.html -%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_VERIFICATION_README -%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_VERIFICATION_README.html -%%PORTDOCS%%%%DOCSDIR%%/BACKSCATTER_README -%%PORTDOCS%%%%DOCSDIR%%/BACKSCATTER_README.html -%%PORTDOCS%%%%DOCSDIR%%/BASIC_CONFIGURATION_README -%%PORTDOCS%%%%DOCSDIR%%/BASIC_CONFIGURATION_README.html -%%PORTDOCS%%%%DOCSDIR%%/BUILTIN_FILTER_README -%%PORTDOCS%%%%DOCSDIR%%/BUILTIN_FILTER_README.html -%%PORTDOCS%%%%DOCSDIR%%/CDB_README -%%PORTDOCS%%%%DOCSDIR%%/CONNECTION_CACHE_README -%%PORTDOCS%%%%DOCSDIR%%/CONNECTION_CACHE_README.html -%%PORTDOCS%%%%DOCSDIR%%/CONTENT_INSPECTION_README -%%PORTDOCS%%%%DOCSDIR%%/CONTENT_INSPECTION_README.html -%%PORTDOCS%%%%DOCSDIR%%/CYRUS_README.html -%%PORTDOCS%%%%DOCSDIR%%/DATABASE_README -%%PORTDOCS%%%%DOCSDIR%%/DATABASE_README.html -%%PORTDOCS%%%%DOCSDIR%%/DB_README -%%PORTDOCS%%%%DOCSDIR%%/DB_README.html -%%PORTDOCS%%%%DOCSDIR%%/DEBUG_README -%%PORTDOCS%%%%DOCSDIR%%/DEBUG_README.html -%%PORTDOCS%%%%DOCSDIR%%/ETRN_README -%%PORTDOCS%%%%DOCSDIR%%/ETRN_README.html -%%PORTDOCS%%%%DOCSDIR%%/FILTER_README -%%PORTDOCS%%%%DOCSDIR%%/FILTER_README.html -%%PORTDOCS%%%%DOCSDIR%%/INSTALL -%%PORTDOCS%%%%DOCSDIR%%/INSTALL.html -%%PORTDOCS%%%%DOCSDIR%%/IPV6_README -%%PORTDOCS%%%%DOCSDIR%%/IPV6_README.html -%%PORTDOCS%%%%DOCSDIR%%/CDB_README.html -%%PORTDOCS%%%%DOCSDIR%%/TLS_README -%%PORTDOCS%%%%DOCSDIR%%/TLS_README.html -%%PORTDOCS%%%%DOCSDIR%%/LDAP_README -%%PORTDOCS%%%%DOCSDIR%%/LDAP_README.html -%%PORTDOCS%%%%DOCSDIR%%/LINUX_README -%%PORTDOCS%%%%DOCSDIR%%/LINUX_README.html -%%PORTDOCS%%%%DOCSDIR%%/LMTP_README -%%PORTDOCS%%%%DOCSDIR%%/LMTP_README.html -%%PORTDOCS%%%%DOCSDIR%%/LOCAL_RECIPIENT_README -%%PORTDOCS%%%%DOCSDIR%%/LOCAL_RECIPIENT_README.html -%%PORTDOCS%%%%DOCSDIR%%/MAILDROP_README -%%PORTDOCS%%%%DOCSDIR%%/MAILDROP_README.html -%%PORTDOCS%%%%DOCSDIR%%/MYSQL_README -%%PORTDOCS%%%%DOCSDIR%%/MYSQL_README.html -%%PORTDOCS%%%%DOCSDIR%%/NFS_README -%%PORTDOCS%%%%DOCSDIR%%/NFS_README.html -%%PORTDOCS%%%%DOCSDIR%%/OVERVIEW -%%PORTDOCS%%%%DOCSDIR%%/OVERVIEW.html -%%PORTDOCS%%%%DOCSDIR%%/PACKAGE_README -%%PORTDOCS%%%%DOCSDIR%%/PACKAGE_README.html -%%PORTDOCS%%%%DOCSDIR%%/PCRE_README -%%PORTDOCS%%%%DOCSDIR%%/PCRE_README.html -%%PORTDOCS%%%%DOCSDIR%%/PGSQL_README -%%PORTDOCS%%%%DOCSDIR%%/PGSQL_README.html -%%PORTDOCS%%%%DOCSDIR%%/QMQP_README -%%PORTDOCS%%%%DOCSDIR%%/QMQP_README.html -%%PORTDOCS%%%%DOCSDIR%%/QSHAPE_README -%%PORTDOCS%%%%DOCSDIR%%/QSHAPE_README.html -%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES -%%PORTDOCS%%%%DOCSDIR%%/RESTRICTION_CLASS_README -%%PORTDOCS%%%%DOCSDIR%%/RESTRICTION_CLASS_README.html -%%PORTDOCS%%%%DOCSDIR%%/SASL_README -%%PORTDOCS%%%%DOCSDIR%%/SASL_README.html -%%PORTDOCS%%%%DOCSDIR%%/SCHEDULER_README -%%PORTDOCS%%%%DOCSDIR%%/SCHEDULER_README.html -%%PORTDOCS%%%%DOCSDIR%%/SMTPD_ACCESS_README -%%PORTDOCS%%%%DOCSDIR%%/SMTPD_ACCESS_README.html -%%PORTDOCS%%%%DOCSDIR%%/SMTPD_POLICY_README -%%PORTDOCS%%%%DOCSDIR%%/SMTPD_POLICY_README.html -%%PORTDOCS%%%%DOCSDIR%%/SMTPD_PROXY_README -%%PORTDOCS%%%%DOCSDIR%%/SMTPD_PROXY_README.html -%%PORTDOCS%%%%SUB_SPF%%%%DOCSDIR%%/SPF_README -%%PORTDOCS%%%%DOCSDIR%%/STANDARD_CONFIGURATION_README -%%PORTDOCS%%%%DOCSDIR%%/STANDARD_CONFIGURATION_README.html -%%PORTDOCS%%%%DOCSDIR%%/TUNING_README -%%PORTDOCS%%%%DOCSDIR%%/TUNING_README.html -%%PORTDOCS%%%%DOCSDIR%%/ULTRIX_README -%%PORTDOCS%%%%DOCSDIR%%/ULTRIX_README.html -%%PORTDOCS%%%%DOCSDIR%%/UUCP_README -%%PORTDOCS%%%%DOCSDIR%%/UUCP_README.html -%%PORTDOCS%%%%DOCSDIR%%/VERP_README -%%PORTDOCS%%%%DOCSDIR%%/VERP_README.html -%%PORTDOCS%%%%DOCSDIR%%/VIRTUAL_README -%%PORTDOCS%%%%DOCSDIR%%/VIRTUAL_README.html -%%PORTDOCS%%%%DOCSDIR%%/XCLIENT_README -%%PORTDOCS%%%%DOCSDIR%%/XCLIENT_README.html -%%PORTDOCS%%%%DOCSDIR%%/XFORWARD_README -%%PORTDOCS%%%%DOCSDIR%%/XFORWARD_README.html -%%PORTDOCS%%%%DOCSDIR%%/access.5.html -%%PORTDOCS%%%%DOCSDIR%%/aliases.5.html -%%PORTDOCS%%%%DOCSDIR%%/anvil.8.html -%%PORTDOCS%%%%DOCSDIR%%/body_checks.5.html -%%PORTDOCS%%%%DOCSDIR%%/bounce.8.html -%%PORTDOCS%%%%DOCSDIR%%/canonical.5.html -%%PORTDOCS%%%%DOCSDIR%%/cidr_table.5.html -%%PORTDOCS%%%%DOCSDIR%%/cleanup.8.html -%%PORTDOCS%%%%DOCSDIR%%/defer.8.html -%%PORTDOCS%%%%DOCSDIR%%/discard.8.html -%%PORTDOCS%%%%DOCSDIR%%/error.8.html -%%PORTDOCS%%%%DOCSDIR%%/flush.8.html -%%PORTDOCS%%%%DOCSDIR%%/header_checks.5.html -%%PORTDOCS%%%%DOCSDIR%%/index.html -%%PORTDOCS%%%%DOCSDIR%%/ldap_table.5.html -%%PORTDOCS%%%%DOCSDIR%%/lmtp.8.html -%%PORTDOCS%%%%DOCSDIR%%/local.8.html -%%PORTDOCS%%%%DOCSDIR%%/mailq.1.html -%%PORTDOCS%%%%DOCSDIR%%/master.5.html -%%PORTDOCS%%%%DOCSDIR%%/master.8.html -%%PORTDOCS%%%%DOCSDIR%%/mysql_table.5.html -%%PORTDOCS%%%%DOCSDIR%%/nisplus_table.5.html -%%PORTDOCS%%%%DOCSDIR%%/newaliases.1.html -%%PORTDOCS%%%%DOCSDIR%%/oqmgr.8.html -%%PORTDOCS%%%%DOCSDIR%%/pcre_table.5.html -%%PORTDOCS%%%%DOCSDIR%%/pgsql_table.5.html -%%PORTDOCS%%%%DOCSDIR%%/pickup.8.html -%%PORTDOCS%%%%DOCSDIR%%/pipe.8.html -%%PORTDOCS%%%%DOCSDIR%%/postalias.1.html -%%PORTDOCS%%%%DOCSDIR%%/postcat.1.html -%%PORTDOCS%%%%DOCSDIR%%/postconf.1.html -%%PORTDOCS%%%%DOCSDIR%%/postconf.5.html -%%PORTDOCS%%%%DOCSDIR%%/postdrop.1.html -%%PORTDOCS%%%%DOCSDIR%%/postfix-logo.jpg -%%PORTDOCS%%%%DOCSDIR%%/postfix-manuals.html -%%PORTDOCS%%%%DOCSDIR%%/postfix-power.png -%%PORTDOCS%%%%DOCSDIR%%/postfix.1.html -%%PORTDOCS%%%%DOCSDIR%%/postkick.1.html -%%PORTDOCS%%%%DOCSDIR%%/postlock.1.html -%%PORTDOCS%%%%DOCSDIR%%/postlog.1.html -%%PORTDOCS%%%%DOCSDIR%%/postmap.1.html -%%PORTDOCS%%%%DOCSDIR%%/postqueue.1.html -%%PORTDOCS%%%%DOCSDIR%%/postsuper.1.html -%%PORTDOCS%%%%DOCSDIR%%/proxymap.8.html -%%PORTDOCS%%%%DOCSDIR%%/qmgr.8.html -%%PORTDOCS%%%%DOCSDIR%%/qmqp-sink.1.html -%%PORTDOCS%%%%DOCSDIR%%/qmqp-source.1.html -%%PORTDOCS%%%%DOCSDIR%%/qmqpd.8.html -%%PORTDOCS%%%%DOCSDIR%%/qshape.1.html -%%PORTDOCS%%%%DOCSDIR%%/regexp_table.5.html -%%PORTDOCS%%%%DOCSDIR%%/relocated.5.html -%%PORTDOCS%%%%DOCSDIR%%/sendmail.1.html -%%PORTDOCS%%%%DOCSDIR%%/scache.8.html -%%PORTDOCS%%%%DOCSDIR%%/showq.8.html -%%PORTDOCS%%%%DOCSDIR%%/smtp-sink.1.html -%%PORTDOCS%%%%DOCSDIR%%/smtp-source.1.html -%%PORTDOCS%%%%DOCSDIR%%/smtp.8.html -%%PORTDOCS%%%%DOCSDIR%%/smtpd.8.html -%%PORTDOCS%%%%DOCSDIR%%/spawn.8.html -%%PORTDOCS%%%%DOCSDIR%%/trace.8.html -%%PORTDOCS%%%%DOCSDIR%%/transport.5.html -%%PORTDOCS%%%%DOCSDIR%%/trivial-rewrite.8.html -%%PORTDOCS%%%%DOCSDIR%%/verify.8.html -%%PORTDOCS%%%%DOCSDIR%%/virtual.5.html -%%PORTDOCS%%%%DOCSDIR%%/virtual.8.html -%%PORTDOCS%%%%DOCSDIR%%/tlsmgr.8.html -%%PORTDOCS%%%%DOCSDIR%%/generic.5.html -%%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrm libexec/postfix -@dirrm etc/postfix/dist -@unexec rmdir %D/etc/postfix 2>/dev/null || true diff --git a/mail/postfix26/scripts/configure b/mail/postfix26/scripts/configure deleted file mode 100644 index 93c5b95ec561..000000000000 --- a/mail/postfix26/scripts/configure +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ - -for f in `find ${WRKSRC} -type f | xargs grep -l '\!\!PREFIX\!\!' ` ; do \ - mv $f $f.orig && sed s+!!PREFIX!!+$PREFIX+g < $f.orig > $f && \ - rm $f.orig -done diff --git a/mail/postfix26/scripts/configure.postfix b/mail/postfix26/scripts/configure.postfix deleted file mode 100644 index e34694ca7318..000000000000 --- a/mail/postfix26/scripts/configure.postfix +++ /dev/null @@ -1,256 +0,0 @@ -#!/bin/sh -# $FreeBSD: /tmp/pcvs/ports/mail/postfix26/scripts/Attic/configure.postfix,v 1.63 2005-07-06 16:37:35 jylefort Exp $ - -if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then - exit -fi - -tempfile=`/usr/bin/mktemp -t checklist` - -if [ "${POSTFIX_OPTIONS}" ]; then - set ${POSTFIX_OPTIONS} -fi - -for i; do - eval status_$i=ON -done - -if [ -z "${BATCH}" ]; then - /usr/bin/dialog --title "Postfix configuration options" --clear \ - --checklist "\n\ -Please select desired options:" -1 -1 16 \ -NOPCRE "DISABLE Perl Compatible Regular Expressions" "$status_NOPCRE" \ -SASL "Cyrus SASLv1 (Simple Authentication and Security Layer)" "$status_SASL" \ -SASL2 "Cyrus SASLv2 (Simple Authentication and Security Layer)" "$status_SASL2" \ -SASLKRB "If your SASL requires Kerberos select this option" "$status_SASLKRB" \ -SASLKRB5 "If your SASL requires Kerberos5 select this option" "$status_SASLKRB5" \ -SPF "SPF support" "$status_SPF" \ -TLS "SSL and TLS" "$status_TLS" \ -DB3 "Berkeley DB3 (required if SASL also built with DB3)" "$status_DB3" \ -DB40 "Berkeley DB4.0 (required if SASL also built with DB4.0)" "$status_DB40" \ -DB41 "Berkeley DB4.1 (required if SASL also built with DB4.1)" "$status_DB41" \ -DB42 "Berkeley DB4.2 (required if SASL also built with DB4.2)" "$status_DB42" \ -DB43 "Berkeley DB4.3 (required if SASL also built with DB4.3)" "$status_DB43" \ -MySQL "MySQL map lookups (choose version with WITH_MYSQL_VER)" "$status_MySQL" \ -PgSQL "PostgreSQL map lookups (choose with DEFAULT_PGSQL_VER)" "$status_PgSQL" \ -OpenLDAP "OpenLDAP map lookups (choose ver. with WITH_OPENLDAP_VER)" "$status_OpenLDAP" \ -NIS "NIS map lookups" "$status_NIS" \ -VDA "VDA (Virtual Delivery Agent)" "$status_VDA" \ -Test "SMTP/LMTP test server and generator" "$status_Test" \ -2> $tempfile - - retval=$? - - if [ -s $tempfile ]; then - set `sed 's/"//g' $tempfile` - fi - rm -f $tempfile - - case $retval in - 0) if [ -z "$*" ]; then - /bin/echo "Nothing selected" - fi - ;; - 1) /bin/echo "Cancel pressed." - exit 1 - ;; - esac -fi - -${MKDIR} ${WRKDIRPREFIX}${CURDIR} -exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - -/bin/echo "PREFIX= ${PREFIX}" - -SUB_TEST="@comment " -SUB_SPF="@comment " - -while [ "$1" ]; do - case $1 in - NOPCRE) - /bin/echo "WITHOUT_PCRE= yes" - /bin/echo "NOPCRE_SUFFIX= +nopcre" - SUB_NOPCRE="" - ;; - SASL) - /bin/echo "LIB_DEPENDS+= sasl.8:\${PORTSDIR}/security/cyrus-sasl" - /bin/echo "POSTFIX_CCARGS+= -DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl1" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lsasl -lpam -lcrypt" - /bin/echo "SASL_SUFFIX= +sasl" - if [ -f ${LOCALBASE}/lib/libsasl.a ]; then - if /usr/bin/nm ${LOCALBASE}/lib/libsasl.a | grep -wq "mysql_init"; then - SASL_USE_MYSQL="YES" - fi - fi - ;; - SASL2) - /bin/echo "LIB_DEPENDS+= sasl2.2:\${PORTSDIR}/security/cyrus-sasl2" - /bin/echo "POSTFIX_CCARGS+= -DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lsasl2 -lpam -lcrypt" - /bin/echo "SASL_SUFFIX= +sasl2" - if [ -f ${LOCALBASE}/lib/libsasl2.a ]; then - if /usr/bin/nm ${LOCALBASE}/lib/libsasl2.a | grep -wq "mysql_init"; then - SASL_USE_MYSQL="YES" - fi - fi - ;; - SASLKRB) - /bin/echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err" - ;; - SASLKRB5) - /bin/echo "POSTFIX_AUXLIBS+= -lkrb5 -lcrypto -lcrypt -lcom_err -lasn1 -lroken" - ;; - SPF) - # see http://www.ipnet6.org/postfix/spf/ - /bin/echo "LIB_DEPENDS+= spf2.1:\${PORTSDIR}/mail/libspf2" - /bin/echo "PATCH_SITES+= http://www.ipnet6.org/postfix/download/" - /bin/echo "PATCHFILES+= postfix-libspf2-2.2.0-5.patch" - /bin/echo "PATCH_DIST_STRIP= -p1" - /bin/echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lspf2" - /bin/echo "SPF_SUFFIX= +spf" -# /bin/echo "README+= SPF_README" - /bin/echo "" - SUB_SPF="" - ;; - TLS) - /bin/echo "USE_OPENSSL= yes" - /bin/echo "POSTFIX_CCARGS+= -DUSE_TLS -I\${OPENSSLINC}" - /bin/echo "POSTFIX_AUXLIBS+= -L\${OPENSSLLIB} -lssl -lcrypto" - /bin/echo "TLS_SUFFIX= +tls" - ;; - DB3) - if [ "X$BDB_SELECTED" != "X" ]; then - /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr - rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - exit 1 - fi - /bin/echo "LIB_DEPENDS+= db3.3:\${PORTSDIR}/databases/db3" - /bin/echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db3" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb3" - /bin/echo "DB_SUFFIX= +db3" - BDB_SELECTED="3" - ;; - DB40) - if [ "X$BDB_SELECTED" != "X" ]; then - /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr - rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - exit 1 - fi - /bin/echo "LIB_DEPENDS+= db4.0:\${PORTSDIR}/databases/db4" - /bin/echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db4" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb4" - /bin/echo "DB_SUFFIX= +db40" - BDB_SELECTED="40" - ;; - DB41) - if [ "X$BDB_SELECTED" != "X" ]; then - /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr - rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - exit 1 - fi - /bin/echo "LIB_DEPENDS+= db41.1:\${PORTSDIR}/databases/db41" - /bin/echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db41" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb41" - /bin/echo "DB_SUFFIX= +db41" - BDB_SELECTED="41" - ;; - DB42) - if [ "X$BDB_SELECTED" != "X" ]; then - /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr - rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - exit 1 - fi - /bin/echo "LIB_DEPENDS+= db-4.2.2:\${PORTSDIR}/databases/db42" - /bin/echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db42" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib/db42/ -ldb" - /bin/echo "DB_SUFFIX= +db42" - BDB_SELECTED="42" - ;; - DB43) - if [ "X$BDB_SELECTED" != "X" ]; then - /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr - rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - exit 1 - fi - /bin/echo "LIB_DEPENDS+= db-4.3.0:\${PORTSDIR}/databases/db43" - /bin/echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db43" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib/db43/ -ldb" - /bin/echo "DB_SUFFIX= +db43" - BDB_SELECTED="43" - ;; - MySQL) - /bin/echo "USE_MYSQL=YES" - /bin/echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql" - /bin/echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz -lcrypt" - if [ -f ${LOCALBASE}/lib/mysql/libmysqlclient.a ]; then - if /usr/bin/nm ${LOCALBASE}/lib/mysql/libmysqlclient.a | grep -wq "SSL_new"; then - /bin/echo "USE_OPENSSL= yes" - /bin/echo "POSTFIX_CCARGS+= -I\${OPENSSLLIB}" - /bin/echo "POSTFIX_AUXLIBS+= -L\${OPENSSLLIB} -lssl -lcrypto" - fi - fi - /bin/echo "MYSQL_SUFFIX= +mysql" - MYSQL_SELECTED="YES" - ;; - PgSQL) - /bin/echo "USE_PGSQL=YES" - /bin/echo "POSTFIX_CCARGS+= -DHAS_PGSQL -I\${LOCALBASE}/include -I\${LOCALBASE}/pgsql/include" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt" - /bin/echo "PGSQL_SUFFIX= +pgsql" - ;; - OpenLDAP) - /bin/echo "USE_OPENLDAP=YES" - /bin/echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lldap -llber" - /bin/echo "OPENLDAP_SUFFIX= +openldap" - ;; - NIS) - /bin/echo "POSTFIX_CCARGS+= -DHAS_NIS" - /bin/echo "NIS_SUFFIX= +nis" - ;; - VDA) - /bin/echo "PATCH_SITES+= http://web.onda.com.br/nadal/postfix/VDA/" - /bin/echo "PATCHFILES+= postfix-2.2.4-vda.patch.gz" - /bin/echo "PATCH_DIST_STRIP= -p1" - ;; - Test) - /bin/echo "BIN1= smtp-sink smtp-source qmqp-source" -# /bin/echo "MAN1+= smtp-sink.1 smtp-source.1 qmqp-sink.1 qmqp-source.1" - SUB_TEST="" - ;; - *) - /bin/echo "Unknown option(s): $*" > /dev/stderr - rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - exit 1 - ;; - esac - shift -done - -if [ -z "${BATCH}" ]; then - if [ "X$SASL_USE_MYSQL" != "X" ] && [ "$MYSQL_SELECTED" != "YES" ]; then - /usr/bin/dialog --yesno "Your lib SASL it is compiled with MySQL. It desires to use the MySQL?" 5 80 > /dev/stderr - if [ $? = 0 ]; then - /bin/echo "USE_MYSQL=YES" - /bin/echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql" - /bin/echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz -lcrypt" - if [ -f ${LOCALBASE}/lib/mysql/libmysqlclient.a ]; then - if /usr/bin/nm ${LOCALBASE}/lib/mysql/libmysqlclient.a | grep -wq "SSL_new"; then - /bin/echo "USE_OPENSSL= yes" - /bin/echo "POSTFIX_CCARGS+= -I\${OPENSSLLIB}" - /bin/echo "POSTFIX_AUXLIBS+= -L\${OPENSSLLIB} -lssl -lcrypto" - fi - fi - fi - fi -fi - -/bin/echo "PLIST_SUB+= SUB_TEST=\"${SUB_TEST}\"" -/bin/echo "PLIST_SUB+= SUB_SPF=\"${SUB_SPF}\"" - -# for some reason, if we alter the pkg name this way, the first build (where -# we ask the configure questions) doesn't pick up the extensions, but -# any subsequent build will. so "make; make install" will build twice. -# don't do this for now. -#/bin/echo "PKGNAMESUFFIX= \${NOPCRE_SUFFIX}\${SASL_SUFFIX}\${DB_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${NIS_SUFFIX}\${SPF_SUFFIX}" diff --git a/mail/postfix26/scripts/fix-files-list b/mail/postfix26/scripts/fix-files-list deleted file mode 100644 index cc4a1083a814..000000000000 --- a/mail/postfix26/scripts/fix-files-list +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -# need to fixup ${PREFIX}/etc/postfix/postfix-files to indicate compressed -# man pages, since the ports software compresses them later, and if we -# run post-install it will complain about missing files -# (script from Simon J. Mudd) - -ed ${PREFIX}/etc/postfix/postfix-files <<EOF || exit 1 -%s/\(\/man[158]\/.*\.[158]\):/\1.gz:/ -w -q -EOF diff --git a/mail/postfix27/Makefile b/mail/postfix27/Makefile deleted file mode 100644 index 8947c1225319..000000000000 --- a/mail/postfix27/Makefile +++ /dev/null @@ -1,161 +0,0 @@ -# New ports collection makefile for: postfix -# Date created: 18 Mar 1999 -# Whom: torstenb -# -# $FreeBSD$ -# - -# To pre-select options in batch mode, run make like this: -# -# make -DBATCH POSTFIX_OPTIONS="DB3 TLS" -# -# the options are the same names as in the scripts/configure.postfix file. -# POSTFIX_OPTIONS can be set in /etc/make.conf also. - -# NOTE: PCRE is enabled by default unless you specifically disable it. - -PORTNAME= postfix -PORTVERSION= 2.2.5 -PORTEPOCH= 1 -CATEGORIES= mail ipv6 -MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ - ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/%SUBDIR%/ \ - ftp://ftp.tux.org/pub/net/postfix/official/ \ - ftp://ftp.utoronto.ca/mirror/packages/postfix/official/ \ - ftp://ftp.samurai.com/pub/postfix/official/ \ - ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/postfix/official/&,} -MASTER_SITE_SUBDIR= . old related/postfix -DISTNAME= postfix-${PORTVERSION} -DIST_SUBDIR= ${PORTNAME} - -# blanket approval for version updates: marcus@corp.grupos.com.br -MAINTAINER= vivek@khera.org -COMMENT= A secure alternative to widely-used Sendmail - -CONFLICTS= courier-0.* postfix-1.* postfix-2.0.* postfix-2.1.* postfix-2.3.* \ - sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.* -USE_SUBMAKE= yes -USE_REINPLACE= yes - -MAN1= postalias.1 postcat.1 postconf.1 postdrop.1 postfix.1 postkick.1 \ - postlock.1 postlog.1 postmap.1 postqueue.1 postsuper.1 sendmail.1 - -MAN5= access.5 aliases.5 canonical.5 cidr_table.5 generic.5 header_checks.5 \ - ldap_table.5 master.5 mysql_table.5 nisplus_table.5 pcre_table.5 \ - pgsql_table.5 postconf.5 regexp_table.5 relocated.5 transport.5 \ - virtual.5 - -MAN8= anvil.8 bounce.8 cleanup.8 discard.8 error.8 flush.8 lmtp.8 local.8 \ - master.8 oqmgr.8 pickup.8 pipe.8 proxymap.8 qmgr.8 qmqpd.8 scache.8 \ - showq.8 smtp.8 smtpd.8 spawn.8 tlsmgr.8 trivial-rewrite.8 verify.8 \ - virtual.8 - -MLINKS= sendmail.1 mailq.1 \ - sendmail.1 newaliases.1 \ - header_checks.5 body_checks.5 \ - bounce.8 defer.8 \ - bounce.8 trace.8 - -CONF1= access aliases canonical generic header_checks main.cf master.cf \ - relocated transport virtual - -.if !defined(DEBUG) -MAKEFILEFLAGS+= DEBUG= -.endif - -MAKEFILEFLAGS+= CC="${CC}" OPT="${CFLAGS}" - -SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ - TOUCH="${TOUCH}" \ - MKDIR="${MKDIR}" \ - POSTFIX_OPTIONS="${POSTFIX_OPTIONS}" - -pre-fetch: - @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postfix - -.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc) -.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc" -.endif - -.if defined(WITHOUT_PCRE) -POSTFIX_CCARGS+= -DNO_PCRE -.else -LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre -POSTFIX_CCARGS+= -DHAS_PCRE -I${LOCALBASE}/include -POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -lpcre -.endif - -post-patch: - (cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \ - CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \ - ${ECHO} "all: default" >> Makefile) - -pre-patch: - @${ECHO} "<body>See <A HREF="header_checks.5.html">header_checks.5.html</A></BODY>" > ${WRKSRC}/html/body_checks.5.html - @for f in `${FIND} -P ${WRKSRC}/man -type f`; do \ - ${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" $${f}; \ - done - @for f in `${FIND} -P ${WRKSRC}/README_FILES -type f`; do \ - ${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" $${f}; \ - done - @for f in `${FIND} -P ${WRKSRC}/conf -type f`; do \ - ${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" $${f}; \ - done - -pre-install: - @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL - -.if defined(NOPORTDOCS) -READMEDIR=no -.else -READMEDIR=${PREFIX}/share/doc/postfix -.endif - -do-install: - cd ${WRKSRC}; ${SH} postfix-install -non-interactive install_root=/ tempdir=/tmp \ - config_directory=${PREFIX}/etc/postfix \ - daemon_directory=${PREFIX}/libexec/postfix \ - command_directory=${PREFIX}/sbin \ - queue_directory=/var/spool/postfix \ - sendmail_path=${PREFIX}/sbin/sendmail \ - newaliases_path=${PREFIX}/bin/newaliases \ - mailq_path=${PREFIX}/bin/mailq \ - mail_owner=postfix \ - setgid_group=maildrop \ - manpage_directory=${PREFIX}/man \ - sample_directory=${PREFIX}/etc/postfix \ - readme_directory=${READMEDIR} - - @${MKDIR} ${PREFIX}/etc/postfix/dist -.for f in ${CONF1} - ${INSTALL_DATA} ${WRKSRC}/conf/${f} ${PREFIX}/etc/postfix/dist -.endfor - - @${INSTALL_SCRIPT} \ - ${WRKSRC}/auxiliary/rmail/rmail \ - ${PREFIX}/bin/rmail - -# optional TEST binaries -.for file in ${BIN1} - @${INSTALL_PROGRAM} ${WRKSRC}/bin/${file} ${PREFIX}/sbin -.endfor - -.if !defined(NOPORTDOCS) - @${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${DOCSDIR} - @cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.jpg *.png ${DOCSDIR} && \ - ${ECHO_MSG} "Installed HTML documentation in ${DOCSDIR}" -.endif - -post-install: - @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL -# need to fixup ${PREFIX}/etc/postfix/postfix-files to indicate compressed -# man pages, since the ports software compresses them after this step, and -# if we run etc/postfix/post-install again during package installation, -# it will complain about missing files. - @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/fix-files-list - @${CAT} ${PKGMESSAGE} - -post-clean: - @${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc - -.include <bsd.port.mk> diff --git a/mail/postfix27/distinfo b/mail/postfix27/distinfo deleted file mode 100644 index 59ac523435fa..000000000000 --- a/mail/postfix27/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -MD5 (postfix/postfix-2.2.5.tar.gz) = 9c13d58494c64012bfd8ab0d6967305c -SIZE (postfix/postfix-2.2.5.tar.gz) = 2428594 -MD5 (postfix/postfix-libspf2-2.2.0-5.patch) = 80be36e0f14e1a1f39a3b30b9b2d4115 -SIZE (postfix/postfix-libspf2-2.2.0-5.patch) = 26077 -MD5 (postfix/postfix-2.2.4-vda.patch.gz) = 7049364c6476edf80d6ff861ca37936f -SIZE (postfix/postfix-2.2.4-vda.patch.gz) = 7712 diff --git a/mail/postfix27/files/patch-conf::main.cf b/mail/postfix27/files/patch-conf::main.cf deleted file mode 100644 index 67e356de21dd..000000000000 --- a/mail/postfix27/files/patch-conf::main.cf +++ /dev/null @@ -1,64 +0,0 @@ ---- conf/main.cf.orig Sat Mar 5 11:53:42 2005 -+++ conf/main.cf Sat Mar 5 11:53:42 2005 -@@ -32,13 +32,13 @@ - # The command_directory parameter specifies the location of all - # postXXX commands. - # --command_directory = /usr/sbin -+command_directory = !!PREFIX!!/sbin - - # The daemon_directory parameter specifies the location of all Postfix - # daemon programs (i.e. programs listed in the master.cf file). This - # directory must be owned by root. - # --daemon_directory = /usr/libexec/postfix -+daemon_directory = !!PREFIX!!/libexec/postfix - - # QUEUE AND PROCESS OWNERSHIP - # -@@ -608,37 +608,37 @@ - # sendmail_path: The full pathname of the Postfix sendmail command. - # This is the Sendmail-compatible mail posting interface. - # --sendmail_path = -+sendmail_path = !!PREFIX!!/sbin/sendmail - - # newaliases_path: The full pathname of the Postfix newaliases command. - # This is the Sendmail-compatible command to build alias databases. - # --newaliases_path = -+newaliases_path = !!PREFIX!!/bin/newaliases - - # mailq_path: The full pathname of the Postfix mailq command. This - # is the Sendmail-compatible mail queue listing command. - # --mailq_path = -+mailq_path = !!PREFIX!!/bin/mailq - - # setgid_group: The group for mail submission and queue management - # commands. This must be a group name with a numerical group ID that - # is not shared with other accounts, not even with the Postfix account. - # --setgid_group = -+setgid_group = maildrop - - # html_directory: The location of the Postfix HTML documentation. - # --html_directory = -+html_directory = no - - # manpage_directory: The location of the Postfix on-line manual pages. - # --manpage_directory = -+manpage_directory = !!PREFIX!!/man - - # sample_directory: The location of the Postfix sample configuration files. - # This parameter is obsolete as of Postfix 2.1. - # --sample_directory = -+sample_directory = !!PREFIX!!/etc/postfix - - # readme_directory: The location of the Postfix README files. - # --readme_directory = -+readme_directory = no diff --git a/mail/postfix27/files/patch-conf::post-install b/mail/postfix27/files/patch-conf::post-install deleted file mode 100644 index 78401de5bdf3..000000000000 --- a/mail/postfix27/files/patch-conf::post-install +++ /dev/null @@ -1,11 +0,0 @@ ---- conf/post-install.orig Thu Feb 24 08:06:08 2005 -+++ conf/post-install Sat Mar 5 11:53:42 2005 -@@ -185,7 +185,7 @@ - - umask 022 - --PATH=/bin:/usr/bin:/usr/sbin:/usr/etc:/sbin:/etc:/usr/contrib/bin:/usr/gnu/bin:/usr/ucb:/usr/bsd -+PATH=/bin:/usr/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/local/sbin - SHELL=/bin/sh - IFS=" - " diff --git a/mail/postfix27/files/patch-makedefs b/mail/postfix27/files/patch-makedefs deleted file mode 100644 index ed2f08d06ae4..000000000000 --- a/mail/postfix27/files/patch-makedefs +++ /dev/null @@ -1,13 +0,0 @@ ---- makedefs.orig Tue Feb 22 09:35:52 2005 -+++ makedefs Wed Jul 13 17:42:53 2005 -@@ -116,6 +116,10 @@ - ;; - FreeBSD.5*) SYSTYPE=FREEBSD5 - ;; -+ FreeBSD.6*) SYSTYPE=FREEBSD5 -+ ;; -+ FreeBSD.7*) SYSTYPE=FREEBSD5 -+ ;; - OpenBSD.2*) SYSTYPE=OPENBSD2 - ;; - OpenBSD.3*) SYSTYPE=OPENBSD3 diff --git a/mail/postfix27/files/patch-src::global::mail_params.h b/mail/postfix27/files/patch-src::global::mail_params.h deleted file mode 100644 index 52ea5e9e5c35..000000000000 --- a/mail/postfix27/files/patch-src::global::mail_params.h +++ /dev/null @@ -1,29 +0,0 @@ ---- src/global/mail_params.h.orig Fri Feb 11 21:53:21 2005 -+++ src/global/mail_params.h Sat Mar 5 11:53:42 2005 -@@ -64,7 +64,7 @@ - extern gid_t var_owner_gid; - - #define VAR_SGID_GROUP "setgid_group" --#define DEF_SGID_GROUP "postdrop" -+#define DEF_SGID_GROUP "maildrop" - extern char *var_sgid_group; - extern gid_t var_sgid_gid; - -@@ -221,7 +221,7 @@ - */ - #define VAR_DAEMON_DIR "daemon_directory" - #ifndef DEF_DAEMON_DIR --#define DEF_DAEMON_DIR "/usr/libexec/postfix" -+#define DEF_DAEMON_DIR "!!PREFIX!!/libexec/postfix" - #endif - extern char *var_daemon_dir; - -@@ -250,7 +250,7 @@ - */ - #define VAR_CONFIG_DIR "config_directory" - #ifndef DEF_CONFIG_DIR --#define DEF_CONFIG_DIR "/etc/postfix" -+#define DEF_CONFIG_DIR "!!PREFIX!!/etc/postfix" - #endif - extern char *var_config_dir; - diff --git a/mail/postfix27/pkg-descr b/mail/postfix27/pkg-descr deleted file mode 100644 index 1f335ce6820c..000000000000 --- a/mail/postfix27/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -Postfix attempts to be fast, easy to administer, and secure, while at -the same time being sendmail-compatible enough to not upset existing -users. It also offers QMQP and VERP support to let Postfix act as delivery -daemon for ezmlm-idx. - -WWW: http://www.postfix.org/ diff --git a/mail/postfix27/pkg-install b/mail/postfix27/pkg-install deleted file mode 100644 index e912b1a051e2..000000000000 --- a/mail/postfix27/pkg-install +++ /dev/null @@ -1,181 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# If the POSTFIX_DEFAULT_MTA environment variable is set to YES, it -# will make the port/package use defaults which make postfix replace -# sendmail as much as possible. - -PKG_PREFIX=${PKG_PREFIX:=/usr/local} -BATCH=${BATCH:=no} -POSTFIX_DEFAULT_MTA=${POSTFIX_DEFAULT_MTA:=no} - -if [ x${POSTFIX_DEFAULT_MTA} = xno ]; then - DEFAULT_REPLACE_MAILERCONF=n -else - DEFAULT_REPLACE_MAILERCONF=y -fi - -if [ -x /usr/sbin/nologin ]; then - NOLOGIN=/usr/sbin/nologin -else - NOLOGIN=/sbin/nologin -fi - -ask() { - local question default answer - - question=$1 - default=$2 - if [ -z "${PACKAGE_BUILDING}" -a x${BATCH} = xno ]; then - read -p "${question} [${default}]? " answer - fi - if [ x${answer} = x ]; then - answer=${default} - fi - /bin/echo ${answer} -} - -yesno() { - local question default answer - - question=$1 - default=$2 - while :; do - answer=$(ask "${question}" "${default}") - case "${answer}" in - [Yy]*) return 0;; - [Nn]*) return 1;; - esac - /bin/echo "Please answer yes or no." - done -} - -if [ x"$2" = xPRE-INSTALL ]; then - USER=postfix - UID=125 - GROUP=postfix - GID=125 - GROUP2=maildrop - GID2=126 - - if /usr/sbin/pw groupshow "${GROUP}" 2>/dev/null; then - /bin/echo "You already have a group \"${GROUP}\", so I will use it." - else - if /usr/sbin/pw groupadd ${GROUP} -g ${GID} - then - /bin/echo "Added group \"${GROUP}\"." - else - /bin/echo "Adding group \"${GROUP}\" failed..." - /bin/echo "Please create it, and try again." - exit 1 - fi - fi - - if /usr/sbin/pw groupshow "${GROUP2}" 2>/dev/null; then - /bin/echo "You already have a group \"${GROUP2}\", so I will use it." - else - if /usr/sbin/pw groupadd ${GROUP2} -g ${GID2}; then - /bin/echo "Added group \"${GROUP2}\"." - else - /bin/echo "Adding group \"${GROUP2}\" failed..." - /bin/echo "Please create it, and try again." - exit 1 - fi - fi - - if /usr/sbin/pw user show "${USER}" 2>/dev/null; then - /bin/echo "You already have a user \"${USER}\", so I will use it." - else - if /usr/sbin/pw useradd ${USER} -u ${UID} -g ${GROUP} -h - -d /var/spool/postfix -s ${NOLOGIN} -c "Postfix Mail System"; then - /bin/echo "Added user \"${USER}\"." - else - /bin/echo "Adding user \"${USER}\" failed..." - /bin/echo "Please create it, and try again." - exit 1 - fi - fi - - if /usr/sbin/pw show group mail | grep -q "${USER}" 2>/dev/null; then - /bin/echo "You already have user \"${USER}\" in group \"mail\", so I will use it." - else - /bin/echo "You need user \"${USER}\" added to group \"mail\"." - if yesno "Would you like me to add it" y; then - /usr/sbin/pw groupmod mail -m ${USER} || exit - /bin/echo "Done." - else - /bin/echo "Please create it, and try again." - exit 1 - fi - fi -fi - -if [ x"$2" = xPOST-INSTALL ]; then - if [ -d ${PKG_PREFIX}/etc/postfix/dist ]; then - for file in ${PKG_PREFIX}/etc/postfix/dist/*; do - if [ ! -f ${PKG_PREFIX}/etc/postfix/${file#${PKG_PREFIX}/etc/postfix/dist} ]; then - cp $file ${PKG_PREFIX}/etc/postfix/ - fi - done - fi - - /bin/sh ${PKG_PREFIX}/etc/postfix/post-install tempdir=/tmp \ - config_directory=${PKG_PREFIX}/etc/postfix \ - daemon_directory=${PKG_PREFIX}/libexec/postfix \ - command_directory=${PKG_PREFIX}/sbin \ - queue_directory=/var/spool/postfix \ - sendmail_path=${PKG_PREFIX}/sbin/sendmail \ - newaliases_path=${PKG_PREFIX}/bin/newaliases \ - mailq_path=${PKG_PREFIX}/bin/mailq \ - mail_owner=postfix \ - setgid_group=maildrop \ - manpage_directory=${PKG_PREFIX}/man \ - sample_directory=${PKG_PREFIX}/etc/postfix \ - readme_directory=no \ - upgrade-package -fi -# readme_directory is "no" above since the package will have correct perms -# already, and we don't know if they had PORTDOCS. - -replace() { - local orig repl - - orig=$1 - repl=$2 - if [ -e ${orig} ]; then - /bin/mv -f ${orig} ${orig}.OFF - /bin/chmod 0 ${orig}.OFF - fi - if [ -e ${repl} ]; then - /bin/ln -s ${repl} ${orig} - fi -} - -if [ x"$2" = xPOST-INSTALL -a -z "${PACKAGE_BUILDING}" ]; then - if [ -x /sbin/sysctl ]; then - OSVERSION=`/sbin/sysctl -n kern.osreldate` - else - OSVERSION=`/usr/sbin/sysctl -n kern.osreldate` - fi - if [ ${OSVERSION} -ge 400014 ]; then - if yesno "Would you like to activate Postfix in /etc/mail/mailer.conf" ${DEFAULT_REPLACE_MAILERCONF}; then - mv -f /etc/mail/mailer.conf /etc/mail/mailer.conf.old - /bin/echo "#" > /etc/mail/mailer.conf - /bin/echo -n "# Execute the Postfix sendmail program" >> /etc/mail/mailer.conf - /bin/echo ", named ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - /bin/echo "#" >> /etc/mail/mailer.conf - /bin/echo "sendmail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - /bin/echo "send-mail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - /bin/echo "mailq ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - /bin/echo "newaliases ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - fi - else - if yesno "Would you like to replace {sendmail,mailq,newaliases} with Postfix versions" n; then - replace /usr/sbin/sendmail ${PKG_PREFIX}/sbin/sendmail - replace /usr/bin/mailq ${PKG_PREFIX}/sbin/sendmail - replace /usr/bin/newaliases ${PKG_PREFIX}/sbin/sendmail - /bin/echo "Done." - fi - fi -fi diff --git a/mail/postfix27/pkg-message b/mail/postfix27/pkg-message deleted file mode 100644 index d9e910d86ceb..000000000000 --- a/mail/postfix27/pkg-message +++ /dev/null @@ -1,47 +0,0 @@ -If you have postfix configured in your /etc/mail/mailer.conf (answered yes to -the previous question) and would like to enable postfix to start at boot time, -please set these variables in your /etc/rc.conf file: - -sendmail_enable="YES" -sendmail_flags="-bd" -sendmail_pidfile="/var/spool/postfix/pid/master.pid" -sendmail_procname="/usr/local/libexec/postfix/master" -sendmail_outbound_enable="NO" -sendmail_submit_enable="NO" -sendmail_msp_queue_enable="NO" - -This will disable Sendmail completely, and allow you to use /etc/rc.d/sendmail -to start and stop postfix (FreeBSD 5.x and up). For FreeBSD 4.x, it will just -cause the system boot scripts to start sendmail for you. - -Alternatively to the above settings, you can enable postfix to start with -the other local services, for example, after your database server starts if -you need it to be running for postfix. To do this, set in your rc.conf file: - -sendmail_enable="NO" -sendmail_submit_enable="NO" -sendmail_outbound_enable="NO" -sendmail_msp_queue_enable="NO" - -Then make the following symbolic link: - -cd /usr/local/etc/rc.d -ln -s /usr/local/sbin/postfix postfix.sh - - -With either startup configuration, you will want to disable some -Sendmail-specific daily maintenance routines in your /etc/periodic.conf file: - -daily_clean_hoststat_enable="NO" -daily_status_mail_rejects_enable="NO" -daily_status_include_submit_mailq="NO" -daily_submit_queuerun="NO" - - -If you are using SASL, you need to make sure that postfix has access to read -the sasldb file. This is accomplished by adding postfix to group mail and -making the /usr/local/etc/sasldb* file(s) readable by group mail (this should -be the default for new installs). - -If you are upgrading from postfix version prior to 2.0, please see the README -files for recommended changes to your configuration. diff --git a/mail/postfix27/pkg-plist b/mail/postfix27/pkg-plist deleted file mode 100644 index 6c1ab4114c53..000000000000 --- a/mail/postfix27/pkg-plist +++ /dev/null @@ -1,233 +0,0 @@ -@unexec if cmp -s %D/etc/postfix/main.cf %D/etc/postfix/dist/main.cf; then rm -f %D/etc/postfix/main.cf; fi -@unexec if cmp -s %D/etc/postfix/master.cf %D/etc/postfix/dist/master.cf; then rm -f %D/etc/postfix/master.cf; fi -@unexec if cmp -s %D/etc/postfix/access %D/etc/postfix/dist/access; then rm -f %D/etc/postfix/access; fi -@unexec if cmp -s %D/etc/postfix/aliases %D/etc/postfix/dist/aliases; then rm -f %D/etc/postfix/aliases; fi -@unexec if cmp -s %D/etc/postfix/canonical %D/etc/postfix/dist/canonical; then rm -f %D/etc/postfix/canonical; fi -@unexec if cmp -s %D/etc/postfix/header_checks %D/etc/postfix/dist/header_checks; then rm -f %D/etc/postfix/header_checks; fi -@unexec if cmp -s %D/etc/postfix/relocated %D/etc/postfix/dist/relocated; then rm -f %D/etc/postfix/relocated; fi -@unexec if cmp -s %D/etc/postfix/transport %D/etc/postfix/dist/transport; then rm -f %D/etc/postfix/transport; fi -@unexec if cmp -s %D/etc/postfix/virtual %D/etc/postfix/dist/virtual; then rm -f %D/etc/postfix/virtual; fi -@unexec if cmp -s %D/etc/postfix/generic %D/etc/postfix/dist/generic; then rm -f %D/etc/postfix/generic; fi -etc/postfix/LICENSE -etc/postfix/TLS_LICENSE -etc/postfix/main.cf.default -etc/postfix/makedefs.out -etc/postfix/post-install -etc/postfix/postfix-files -etc/postfix/postfix-script -etc/postfix/dist/main.cf -etc/postfix/dist/master.cf -etc/postfix/dist/access -etc/postfix/dist/aliases -etc/postfix/dist/canonical -etc/postfix/dist/header_checks -etc/postfix/dist/relocated -etc/postfix/dist/transport -etc/postfix/dist/virtual -etc/postfix/dist/generic -libexec/postfix/anvil -libexec/postfix/bounce -libexec/postfix/cleanup -libexec/postfix/discard -libexec/postfix/error -libexec/postfix/flush -libexec/postfix/lmtp -libexec/postfix/local -libexec/postfix/master -libexec/postfix/nqmgr -libexec/postfix/oqmgr -libexec/postfix/pickup -libexec/postfix/pipe -libexec/postfix/proxymap -libexec/postfix/qmgr -libexec/postfix/qmqpd -libexec/postfix/scache -libexec/postfix/showq -libexec/postfix/smtp -libexec/postfix/smtpd -libexec/postfix/spawn -libexec/postfix/trivial-rewrite -libexec/postfix/verify -libexec/postfix/virtual -libexec/postfix/tlsmgr -sbin/postalias -sbin/postcat -sbin/postconf -sbin/postdrop -sbin/postfix -sbin/postkick -sbin/postlock -sbin/postlog -sbin/postmap -sbin/postqueue -sbin/postsuper -sbin/sendmail -%%SUB_TEST%%sbin/qmqp-source -%%SUB_TEST%%sbin/smtp-sink -%%SUB_TEST%%sbin/smtp-source -bin/rmail -bin/newaliases -bin/mailq -%%PORTDOCS%%%%DOCSDIR%%/AAAREADME -%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_CLASS_README -%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_CLASS_README.html -%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_REWRITING_README -%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_REWRITING_README.html -%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_VERIFICATION_README -%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_VERIFICATION_README.html -%%PORTDOCS%%%%DOCSDIR%%/BACKSCATTER_README -%%PORTDOCS%%%%DOCSDIR%%/BACKSCATTER_README.html -%%PORTDOCS%%%%DOCSDIR%%/BASIC_CONFIGURATION_README -%%PORTDOCS%%%%DOCSDIR%%/BASIC_CONFIGURATION_README.html -%%PORTDOCS%%%%DOCSDIR%%/BUILTIN_FILTER_README -%%PORTDOCS%%%%DOCSDIR%%/BUILTIN_FILTER_README.html -%%PORTDOCS%%%%DOCSDIR%%/CDB_README -%%PORTDOCS%%%%DOCSDIR%%/CONNECTION_CACHE_README -%%PORTDOCS%%%%DOCSDIR%%/CONNECTION_CACHE_README.html -%%PORTDOCS%%%%DOCSDIR%%/CONTENT_INSPECTION_README -%%PORTDOCS%%%%DOCSDIR%%/CONTENT_INSPECTION_README.html -%%PORTDOCS%%%%DOCSDIR%%/CYRUS_README.html -%%PORTDOCS%%%%DOCSDIR%%/DATABASE_README -%%PORTDOCS%%%%DOCSDIR%%/DATABASE_README.html -%%PORTDOCS%%%%DOCSDIR%%/DB_README -%%PORTDOCS%%%%DOCSDIR%%/DB_README.html -%%PORTDOCS%%%%DOCSDIR%%/DEBUG_README -%%PORTDOCS%%%%DOCSDIR%%/DEBUG_README.html -%%PORTDOCS%%%%DOCSDIR%%/ETRN_README -%%PORTDOCS%%%%DOCSDIR%%/ETRN_README.html -%%PORTDOCS%%%%DOCSDIR%%/FILTER_README -%%PORTDOCS%%%%DOCSDIR%%/FILTER_README.html -%%PORTDOCS%%%%DOCSDIR%%/INSTALL -%%PORTDOCS%%%%DOCSDIR%%/INSTALL.html -%%PORTDOCS%%%%DOCSDIR%%/IPV6_README -%%PORTDOCS%%%%DOCSDIR%%/IPV6_README.html -%%PORTDOCS%%%%DOCSDIR%%/CDB_README.html -%%PORTDOCS%%%%DOCSDIR%%/TLS_README -%%PORTDOCS%%%%DOCSDIR%%/TLS_README.html -%%PORTDOCS%%%%DOCSDIR%%/LDAP_README -%%PORTDOCS%%%%DOCSDIR%%/LDAP_README.html -%%PORTDOCS%%%%DOCSDIR%%/LINUX_README -%%PORTDOCS%%%%DOCSDIR%%/LINUX_README.html -%%PORTDOCS%%%%DOCSDIR%%/LMTP_README -%%PORTDOCS%%%%DOCSDIR%%/LMTP_README.html -%%PORTDOCS%%%%DOCSDIR%%/LOCAL_RECIPIENT_README -%%PORTDOCS%%%%DOCSDIR%%/LOCAL_RECIPIENT_README.html -%%PORTDOCS%%%%DOCSDIR%%/MAILDROP_README -%%PORTDOCS%%%%DOCSDIR%%/MAILDROP_README.html -%%PORTDOCS%%%%DOCSDIR%%/MYSQL_README -%%PORTDOCS%%%%DOCSDIR%%/MYSQL_README.html -%%PORTDOCS%%%%DOCSDIR%%/NFS_README -%%PORTDOCS%%%%DOCSDIR%%/NFS_README.html -%%PORTDOCS%%%%DOCSDIR%%/OVERVIEW -%%PORTDOCS%%%%DOCSDIR%%/OVERVIEW.html -%%PORTDOCS%%%%DOCSDIR%%/PACKAGE_README -%%PORTDOCS%%%%DOCSDIR%%/PACKAGE_README.html -%%PORTDOCS%%%%DOCSDIR%%/PCRE_README -%%PORTDOCS%%%%DOCSDIR%%/PCRE_README.html -%%PORTDOCS%%%%DOCSDIR%%/PGSQL_README -%%PORTDOCS%%%%DOCSDIR%%/PGSQL_README.html -%%PORTDOCS%%%%DOCSDIR%%/QMQP_README -%%PORTDOCS%%%%DOCSDIR%%/QMQP_README.html -%%PORTDOCS%%%%DOCSDIR%%/QSHAPE_README -%%PORTDOCS%%%%DOCSDIR%%/QSHAPE_README.html -%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES -%%PORTDOCS%%%%DOCSDIR%%/RESTRICTION_CLASS_README -%%PORTDOCS%%%%DOCSDIR%%/RESTRICTION_CLASS_README.html -%%PORTDOCS%%%%DOCSDIR%%/SASL_README -%%PORTDOCS%%%%DOCSDIR%%/SASL_README.html -%%PORTDOCS%%%%DOCSDIR%%/SCHEDULER_README -%%PORTDOCS%%%%DOCSDIR%%/SCHEDULER_README.html -%%PORTDOCS%%%%DOCSDIR%%/SMTPD_ACCESS_README -%%PORTDOCS%%%%DOCSDIR%%/SMTPD_ACCESS_README.html -%%PORTDOCS%%%%DOCSDIR%%/SMTPD_POLICY_README -%%PORTDOCS%%%%DOCSDIR%%/SMTPD_POLICY_README.html -%%PORTDOCS%%%%DOCSDIR%%/SMTPD_PROXY_README -%%PORTDOCS%%%%DOCSDIR%%/SMTPD_PROXY_README.html -%%PORTDOCS%%%%SUB_SPF%%%%DOCSDIR%%/SPF_README -%%PORTDOCS%%%%DOCSDIR%%/STANDARD_CONFIGURATION_README -%%PORTDOCS%%%%DOCSDIR%%/STANDARD_CONFIGURATION_README.html -%%PORTDOCS%%%%DOCSDIR%%/TUNING_README -%%PORTDOCS%%%%DOCSDIR%%/TUNING_README.html -%%PORTDOCS%%%%DOCSDIR%%/ULTRIX_README -%%PORTDOCS%%%%DOCSDIR%%/ULTRIX_README.html -%%PORTDOCS%%%%DOCSDIR%%/UUCP_README -%%PORTDOCS%%%%DOCSDIR%%/UUCP_README.html -%%PORTDOCS%%%%DOCSDIR%%/VERP_README -%%PORTDOCS%%%%DOCSDIR%%/VERP_README.html -%%PORTDOCS%%%%DOCSDIR%%/VIRTUAL_README -%%PORTDOCS%%%%DOCSDIR%%/VIRTUAL_README.html -%%PORTDOCS%%%%DOCSDIR%%/XCLIENT_README -%%PORTDOCS%%%%DOCSDIR%%/XCLIENT_README.html -%%PORTDOCS%%%%DOCSDIR%%/XFORWARD_README -%%PORTDOCS%%%%DOCSDIR%%/XFORWARD_README.html -%%PORTDOCS%%%%DOCSDIR%%/access.5.html -%%PORTDOCS%%%%DOCSDIR%%/aliases.5.html -%%PORTDOCS%%%%DOCSDIR%%/anvil.8.html -%%PORTDOCS%%%%DOCSDIR%%/body_checks.5.html -%%PORTDOCS%%%%DOCSDIR%%/bounce.8.html -%%PORTDOCS%%%%DOCSDIR%%/canonical.5.html -%%PORTDOCS%%%%DOCSDIR%%/cidr_table.5.html -%%PORTDOCS%%%%DOCSDIR%%/cleanup.8.html -%%PORTDOCS%%%%DOCSDIR%%/defer.8.html -%%PORTDOCS%%%%DOCSDIR%%/discard.8.html -%%PORTDOCS%%%%DOCSDIR%%/error.8.html -%%PORTDOCS%%%%DOCSDIR%%/flush.8.html -%%PORTDOCS%%%%DOCSDIR%%/header_checks.5.html -%%PORTDOCS%%%%DOCSDIR%%/index.html -%%PORTDOCS%%%%DOCSDIR%%/ldap_table.5.html -%%PORTDOCS%%%%DOCSDIR%%/lmtp.8.html -%%PORTDOCS%%%%DOCSDIR%%/local.8.html -%%PORTDOCS%%%%DOCSDIR%%/mailq.1.html -%%PORTDOCS%%%%DOCSDIR%%/master.5.html -%%PORTDOCS%%%%DOCSDIR%%/master.8.html -%%PORTDOCS%%%%DOCSDIR%%/mysql_table.5.html -%%PORTDOCS%%%%DOCSDIR%%/nisplus_table.5.html -%%PORTDOCS%%%%DOCSDIR%%/newaliases.1.html -%%PORTDOCS%%%%DOCSDIR%%/oqmgr.8.html -%%PORTDOCS%%%%DOCSDIR%%/pcre_table.5.html -%%PORTDOCS%%%%DOCSDIR%%/pgsql_table.5.html -%%PORTDOCS%%%%DOCSDIR%%/pickup.8.html -%%PORTDOCS%%%%DOCSDIR%%/pipe.8.html -%%PORTDOCS%%%%DOCSDIR%%/postalias.1.html -%%PORTDOCS%%%%DOCSDIR%%/postcat.1.html -%%PORTDOCS%%%%DOCSDIR%%/postconf.1.html -%%PORTDOCS%%%%DOCSDIR%%/postconf.5.html -%%PORTDOCS%%%%DOCSDIR%%/postdrop.1.html -%%PORTDOCS%%%%DOCSDIR%%/postfix-logo.jpg -%%PORTDOCS%%%%DOCSDIR%%/postfix-manuals.html -%%PORTDOCS%%%%DOCSDIR%%/postfix-power.png -%%PORTDOCS%%%%DOCSDIR%%/postfix.1.html -%%PORTDOCS%%%%DOCSDIR%%/postkick.1.html -%%PORTDOCS%%%%DOCSDIR%%/postlock.1.html -%%PORTDOCS%%%%DOCSDIR%%/postlog.1.html -%%PORTDOCS%%%%DOCSDIR%%/postmap.1.html -%%PORTDOCS%%%%DOCSDIR%%/postqueue.1.html -%%PORTDOCS%%%%DOCSDIR%%/postsuper.1.html -%%PORTDOCS%%%%DOCSDIR%%/proxymap.8.html -%%PORTDOCS%%%%DOCSDIR%%/qmgr.8.html -%%PORTDOCS%%%%DOCSDIR%%/qmqp-sink.1.html -%%PORTDOCS%%%%DOCSDIR%%/qmqp-source.1.html -%%PORTDOCS%%%%DOCSDIR%%/qmqpd.8.html -%%PORTDOCS%%%%DOCSDIR%%/qshape.1.html -%%PORTDOCS%%%%DOCSDIR%%/regexp_table.5.html -%%PORTDOCS%%%%DOCSDIR%%/relocated.5.html -%%PORTDOCS%%%%DOCSDIR%%/sendmail.1.html -%%PORTDOCS%%%%DOCSDIR%%/scache.8.html -%%PORTDOCS%%%%DOCSDIR%%/showq.8.html -%%PORTDOCS%%%%DOCSDIR%%/smtp-sink.1.html -%%PORTDOCS%%%%DOCSDIR%%/smtp-source.1.html -%%PORTDOCS%%%%DOCSDIR%%/smtp.8.html -%%PORTDOCS%%%%DOCSDIR%%/smtpd.8.html -%%PORTDOCS%%%%DOCSDIR%%/spawn.8.html -%%PORTDOCS%%%%DOCSDIR%%/trace.8.html -%%PORTDOCS%%%%DOCSDIR%%/transport.5.html -%%PORTDOCS%%%%DOCSDIR%%/trivial-rewrite.8.html -%%PORTDOCS%%%%DOCSDIR%%/verify.8.html -%%PORTDOCS%%%%DOCSDIR%%/virtual.5.html -%%PORTDOCS%%%%DOCSDIR%%/virtual.8.html -%%PORTDOCS%%%%DOCSDIR%%/tlsmgr.8.html -%%PORTDOCS%%%%DOCSDIR%%/generic.5.html -%%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrm libexec/postfix -@dirrm etc/postfix/dist -@unexec rmdir %D/etc/postfix 2>/dev/null || true diff --git a/mail/postfix27/scripts/configure b/mail/postfix27/scripts/configure deleted file mode 100644 index 93c5b95ec561..000000000000 --- a/mail/postfix27/scripts/configure +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ - -for f in `find ${WRKSRC} -type f | xargs grep -l '\!\!PREFIX\!\!' ` ; do \ - mv $f $f.orig && sed s+!!PREFIX!!+$PREFIX+g < $f.orig > $f && \ - rm $f.orig -done diff --git a/mail/postfix27/scripts/configure.postfix b/mail/postfix27/scripts/configure.postfix deleted file mode 100644 index c746de5f9f6e..000000000000 --- a/mail/postfix27/scripts/configure.postfix +++ /dev/null @@ -1,256 +0,0 @@ -#!/bin/sh -# $FreeBSD: /tmp/pcvs/ports/mail/postfix27/scripts/Attic/configure.postfix,v 1.63 2005-07-06 16:37:35 jylefort Exp $ - -if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then - exit -fi - -tempfile=`/usr/bin/mktemp -t checklist` - -if [ "${POSTFIX_OPTIONS}" ]; then - set ${POSTFIX_OPTIONS} -fi - -for i; do - eval status_$i=ON -done - -if [ -z "${BATCH}" ]; then - /usr/bin/dialog --title "Postfix configuration options" --clear \ - --checklist "\n\ -Please select desired options:" -1 -1 16 \ -NOPCRE "DISABLE Perl Compatible Regular Expressions" "$status_NOPCRE" \ -SASL "Cyrus SASLv1 (Simple Authentication and Security Layer)" "$status_SASL" \ -SASL2 "Cyrus SASLv2 (Simple Authentication and Security Layer)" "$status_SASL2" \ -SASLKRB "If your SASL requires Kerberos select this option" "$status_SASLKRB" \ -SASLKRB5 "If your SASL requires Kerberos5 select this option" "$status_SASLKRB5" \ -SPF "SPF support" "$status_SPF" \ -TLS "SSL and TLS" "$status_TLS" \ -DB3 "Berkeley DB3 (required if SASL also built with DB3)" "$status_DB3" \ -DB40 "Berkeley DB4.0 (required if SASL also built with DB4.0)" "$status_DB40" \ -DB41 "Berkeley DB4.1 (required if SASL also built with DB4.1)" "$status_DB41" \ -DB42 "Berkeley DB4.2 (required if SASL also built with DB4.2)" "$status_DB42" \ -DB43 "Berkeley DB4.3 (required if SASL also built with DB4.3)" "$status_DB43" \ -MySQL "MySQL map lookups (choose version with WITH_MYSQL_VER)" "$status_MySQL" \ -PgSQL "PostgreSQL map lookups (choose with DEFAULT_PGSQL_VER)" "$status_PgSQL" \ -OpenLDAP "OpenLDAP map lookups (choose ver. with WITH_OPENLDAP_VER)" "$status_OpenLDAP" \ -NIS "NIS map lookups" "$status_NIS" \ -VDA "VDA (Virtual Delivery Agent)" "$status_VDA" \ -Test "SMTP/LMTP test server and generator" "$status_Test" \ -2> $tempfile - - retval=$? - - if [ -s $tempfile ]; then - set `sed 's/"//g' $tempfile` - fi - rm -f $tempfile - - case $retval in - 0) if [ -z "$*" ]; then - /bin/echo "Nothing selected" - fi - ;; - 1) /bin/echo "Cancel pressed." - exit 1 - ;; - esac -fi - -${MKDIR} ${WRKDIRPREFIX}${CURDIR} -exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - -/bin/echo "PREFIX= ${PREFIX}" - -SUB_TEST="@comment " -SUB_SPF="@comment " - -while [ "$1" ]; do - case $1 in - NOPCRE) - /bin/echo "WITHOUT_PCRE= yes" - /bin/echo "NOPCRE_SUFFIX= +nopcre" - SUB_NOPCRE="" - ;; - SASL) - /bin/echo "LIB_DEPENDS+= sasl.8:\${PORTSDIR}/security/cyrus-sasl" - /bin/echo "POSTFIX_CCARGS+= -DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl1" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lsasl -lpam -lcrypt" - /bin/echo "SASL_SUFFIX= +sasl" - if [ -f ${LOCALBASE}/lib/libsasl.a ]; then - if /usr/bin/nm ${LOCALBASE}/lib/libsasl.a | grep -wq "mysql_init"; then - SASL_USE_MYSQL="YES" - fi - fi - ;; - SASL2) - /bin/echo "LIB_DEPENDS+= sasl2.2:\${PORTSDIR}/security/cyrus-sasl2" - /bin/echo "POSTFIX_CCARGS+= -DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lsasl2 -lpam -lcrypt" - /bin/echo "SASL_SUFFIX= +sasl2" - if [ -f ${LOCALBASE}/lib/libsasl2.a ]; then - if /usr/bin/nm ${LOCALBASE}/lib/libsasl2.a | grep -wq "mysql_init"; then - SASL_USE_MYSQL="YES" - fi - fi - ;; - SASLKRB) - /bin/echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err" - ;; - SASLKRB5) - /bin/echo "POSTFIX_AUXLIBS+= -lkrb5 -lcrypto -lcrypt -lcom_err -lasn1 -lroken" - ;; - SPF) - # see http://www.ipnet6.org/postfix/spf/ - /bin/echo "LIB_DEPENDS+= spf2.1:\${PORTSDIR}/mail/libspf2" - /bin/echo "PATCH_SITES+= http://www.ipnet6.org/postfix/download/" - /bin/echo "PATCHFILES+= postfix-libspf2-2.2.0-5.patch" - /bin/echo "PATCH_DIST_STRIP= -p1" - /bin/echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lspf2" - /bin/echo "SPF_SUFFIX= +spf" -# /bin/echo "README+= SPF_README" - /bin/echo "" - SUB_SPF="" - ;; - TLS) - /bin/echo "USE_OPENSSL= yes" - /bin/echo "POSTFIX_CCARGS+= -DUSE_TLS -I\${OPENSSLINC}" - /bin/echo "POSTFIX_AUXLIBS+= -L\${OPENSSLLIB} -lssl -lcrypto" - /bin/echo "TLS_SUFFIX= +tls" - ;; - DB3) - if [ "X$BDB_SELECTED" != "X" ]; then - /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr - rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - exit 1 - fi - /bin/echo "LIB_DEPENDS+= db3.3:\${PORTSDIR}/databases/db3" - /bin/echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db3" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb3" - /bin/echo "DB_SUFFIX= +db3" - BDB_SELECTED="3" - ;; - DB40) - if [ "X$BDB_SELECTED" != "X" ]; then - /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr - rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - exit 1 - fi - /bin/echo "LIB_DEPENDS+= db4.0:\${PORTSDIR}/databases/db4" - /bin/echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db4" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb4" - /bin/echo "DB_SUFFIX= +db40" - BDB_SELECTED="40" - ;; - DB41) - if [ "X$BDB_SELECTED" != "X" ]; then - /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr - rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - exit 1 - fi - /bin/echo "LIB_DEPENDS+= db41.1:\${PORTSDIR}/databases/db41" - /bin/echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db41" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb41" - /bin/echo "DB_SUFFIX= +db41" - BDB_SELECTED="41" - ;; - DB42) - if [ "X$BDB_SELECTED" != "X" ]; then - /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr - rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - exit 1 - fi - /bin/echo "LIB_DEPENDS+= db-4.2.2:\${PORTSDIR}/databases/db42" - /bin/echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db42" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib/db42/ -ldb" - /bin/echo "DB_SUFFIX= +db42" - BDB_SELECTED="42" - ;; - DB43) - if [ "X$BDB_SELECTED" != "X" ]; then - /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr - rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - exit 1 - fi - /bin/echo "LIB_DEPENDS+= db-4.3.0:\${PORTSDIR}/databases/db43" - /bin/echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db43" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib/db43/ -ldb" - /bin/echo "DB_SUFFIX= +db43" - BDB_SELECTED="43" - ;; - MySQL) - /bin/echo "USE_MYSQL=YES" - /bin/echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql" - /bin/echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz -lcrypt" - if [ -f ${LOCALBASE}/lib/mysql/libmysqlclient.a ]; then - if /usr/bin/nm ${LOCALBASE}/lib/mysql/libmysqlclient.a | grep -wq "SSL_new"; then - /bin/echo "USE_OPENSSL= yes" - /bin/echo "POSTFIX_CCARGS+= -I\${OPENSSLLIB}" - /bin/echo "POSTFIX_AUXLIBS+= -L\${OPENSSLLIB} -lssl -lcrypto" - fi - fi - /bin/echo "MYSQL_SUFFIX= +mysql" - MYSQL_SELECTED="YES" - ;; - PgSQL) - /bin/echo "USE_PGSQL=YES" - /bin/echo "POSTFIX_CCARGS+= -DHAS_PGSQL -I\${LOCALBASE}/include -I\${LOCALBASE}/pgsql/include" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt" - /bin/echo "PGSQL_SUFFIX= +pgsql" - ;; - OpenLDAP) - /bin/echo "USE_OPENLDAP=YES" - /bin/echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lldap -llber" - /bin/echo "OPENLDAP_SUFFIX= +openldap" - ;; - NIS) - /bin/echo "POSTFIX_CCARGS+= -DHAS_NIS" - /bin/echo "NIS_SUFFIX= +nis" - ;; - VDA) - /bin/echo "PATCH_SITES+= http://web.onda.com.br/nadal/postfix/VDA/" - /bin/echo "PATCHFILES+= postfix-2.2.4-vda.patch.gz" - /bin/echo "PATCH_DIST_STRIP= -p1" - ;; - Test) - /bin/echo "BIN1= smtp-sink smtp-source qmqp-source" -# /bin/echo "MAN1+= smtp-sink.1 smtp-source.1 qmqp-sink.1 qmqp-source.1" - SUB_TEST="" - ;; - *) - /bin/echo "Unknown option(s): $*" > /dev/stderr - rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - exit 1 - ;; - esac - shift -done - -if [ -z "${BATCH}" ]; then - if [ "X$SASL_USE_MYSQL" != "X" ] && [ "$MYSQL_SELECTED" != "YES" ]; then - /usr/bin/dialog --yesno "Your lib SASL it is compiled with MySQL. It desires to use the MySQL?" 5 80 > /dev/stderr - if [ $? = 0 ]; then - /bin/echo "USE_MYSQL=YES" - /bin/echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql" - /bin/echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz -lcrypt" - if [ -f ${LOCALBASE}/lib/mysql/libmysqlclient.a ]; then - if /usr/bin/nm ${LOCALBASE}/lib/mysql/libmysqlclient.a | grep -wq "SSL_new"; then - /bin/echo "USE_OPENSSL= yes" - /bin/echo "POSTFIX_CCARGS+= -I\${OPENSSLLIB}" - /bin/echo "POSTFIX_AUXLIBS+= -L\${OPENSSLLIB} -lssl -lcrypto" - fi - fi - fi - fi -fi - -/bin/echo "PLIST_SUB+= SUB_TEST=\"${SUB_TEST}\"" -/bin/echo "PLIST_SUB+= SUB_SPF=\"${SUB_SPF}\"" - -# for some reason, if we alter the pkg name this way, the first build (where -# we ask the configure questions) doesn't pick up the extensions, but -# any subsequent build will. so "make; make install" will build twice. -# don't do this for now. -#/bin/echo "PKGNAMESUFFIX= \${NOPCRE_SUFFIX}\${SASL_SUFFIX}\${DB_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${NIS_SUFFIX}\${SPF_SUFFIX}" diff --git a/mail/postfix27/scripts/fix-files-list b/mail/postfix27/scripts/fix-files-list deleted file mode 100644 index cc4a1083a814..000000000000 --- a/mail/postfix27/scripts/fix-files-list +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -# need to fixup ${PREFIX}/etc/postfix/postfix-files to indicate compressed -# man pages, since the ports software compresses them later, and if we -# run post-install it will complain about missing files -# (script from Simon J. Mudd) - -ed ${PREFIX}/etc/postfix/postfix-files <<EOF || exit 1 -%s/\(\/man[158]\/.*\.[158]\):/\1.gz:/ -w -q -EOF diff --git a/mail/postfix28/Makefile b/mail/postfix28/Makefile deleted file mode 100644 index 8947c1225319..000000000000 --- a/mail/postfix28/Makefile +++ /dev/null @@ -1,161 +0,0 @@ -# New ports collection makefile for: postfix -# Date created: 18 Mar 1999 -# Whom: torstenb -# -# $FreeBSD$ -# - -# To pre-select options in batch mode, run make like this: -# -# make -DBATCH POSTFIX_OPTIONS="DB3 TLS" -# -# the options are the same names as in the scripts/configure.postfix file. -# POSTFIX_OPTIONS can be set in /etc/make.conf also. - -# NOTE: PCRE is enabled by default unless you specifically disable it. - -PORTNAME= postfix -PORTVERSION= 2.2.5 -PORTEPOCH= 1 -CATEGORIES= mail ipv6 -MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ - ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/%SUBDIR%/ \ - ftp://ftp.tux.org/pub/net/postfix/official/ \ - ftp://ftp.utoronto.ca/mirror/packages/postfix/official/ \ - ftp://ftp.samurai.com/pub/postfix/official/ \ - ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/postfix/official/&,} -MASTER_SITE_SUBDIR= . old related/postfix -DISTNAME= postfix-${PORTVERSION} -DIST_SUBDIR= ${PORTNAME} - -# blanket approval for version updates: marcus@corp.grupos.com.br -MAINTAINER= vivek@khera.org -COMMENT= A secure alternative to widely-used Sendmail - -CONFLICTS= courier-0.* postfix-1.* postfix-2.0.* postfix-2.1.* postfix-2.3.* \ - sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.* -USE_SUBMAKE= yes -USE_REINPLACE= yes - -MAN1= postalias.1 postcat.1 postconf.1 postdrop.1 postfix.1 postkick.1 \ - postlock.1 postlog.1 postmap.1 postqueue.1 postsuper.1 sendmail.1 - -MAN5= access.5 aliases.5 canonical.5 cidr_table.5 generic.5 header_checks.5 \ - ldap_table.5 master.5 mysql_table.5 nisplus_table.5 pcre_table.5 \ - pgsql_table.5 postconf.5 regexp_table.5 relocated.5 transport.5 \ - virtual.5 - -MAN8= anvil.8 bounce.8 cleanup.8 discard.8 error.8 flush.8 lmtp.8 local.8 \ - master.8 oqmgr.8 pickup.8 pipe.8 proxymap.8 qmgr.8 qmqpd.8 scache.8 \ - showq.8 smtp.8 smtpd.8 spawn.8 tlsmgr.8 trivial-rewrite.8 verify.8 \ - virtual.8 - -MLINKS= sendmail.1 mailq.1 \ - sendmail.1 newaliases.1 \ - header_checks.5 body_checks.5 \ - bounce.8 defer.8 \ - bounce.8 trace.8 - -CONF1= access aliases canonical generic header_checks main.cf master.cf \ - relocated transport virtual - -.if !defined(DEBUG) -MAKEFILEFLAGS+= DEBUG= -.endif - -MAKEFILEFLAGS+= CC="${CC}" OPT="${CFLAGS}" - -SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ - TOUCH="${TOUCH}" \ - MKDIR="${MKDIR}" \ - POSTFIX_OPTIONS="${POSTFIX_OPTIONS}" - -pre-fetch: - @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postfix - -.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc) -.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc" -.endif - -.if defined(WITHOUT_PCRE) -POSTFIX_CCARGS+= -DNO_PCRE -.else -LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre -POSTFIX_CCARGS+= -DHAS_PCRE -I${LOCALBASE}/include -POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -lpcre -.endif - -post-patch: - (cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \ - CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \ - ${ECHO} "all: default" >> Makefile) - -pre-patch: - @${ECHO} "<body>See <A HREF="header_checks.5.html">header_checks.5.html</A></BODY>" > ${WRKSRC}/html/body_checks.5.html - @for f in `${FIND} -P ${WRKSRC}/man -type f`; do \ - ${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" $${f}; \ - done - @for f in `${FIND} -P ${WRKSRC}/README_FILES -type f`; do \ - ${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" $${f}; \ - done - @for f in `${FIND} -P ${WRKSRC}/conf -type f`; do \ - ${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" $${f}; \ - done - -pre-install: - @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL - -.if defined(NOPORTDOCS) -READMEDIR=no -.else -READMEDIR=${PREFIX}/share/doc/postfix -.endif - -do-install: - cd ${WRKSRC}; ${SH} postfix-install -non-interactive install_root=/ tempdir=/tmp \ - config_directory=${PREFIX}/etc/postfix \ - daemon_directory=${PREFIX}/libexec/postfix \ - command_directory=${PREFIX}/sbin \ - queue_directory=/var/spool/postfix \ - sendmail_path=${PREFIX}/sbin/sendmail \ - newaliases_path=${PREFIX}/bin/newaliases \ - mailq_path=${PREFIX}/bin/mailq \ - mail_owner=postfix \ - setgid_group=maildrop \ - manpage_directory=${PREFIX}/man \ - sample_directory=${PREFIX}/etc/postfix \ - readme_directory=${READMEDIR} - - @${MKDIR} ${PREFIX}/etc/postfix/dist -.for f in ${CONF1} - ${INSTALL_DATA} ${WRKSRC}/conf/${f} ${PREFIX}/etc/postfix/dist -.endfor - - @${INSTALL_SCRIPT} \ - ${WRKSRC}/auxiliary/rmail/rmail \ - ${PREFIX}/bin/rmail - -# optional TEST binaries -.for file in ${BIN1} - @${INSTALL_PROGRAM} ${WRKSRC}/bin/${file} ${PREFIX}/sbin -.endfor - -.if !defined(NOPORTDOCS) - @${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${DOCSDIR} - @cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.jpg *.png ${DOCSDIR} && \ - ${ECHO_MSG} "Installed HTML documentation in ${DOCSDIR}" -.endif - -post-install: - @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL -# need to fixup ${PREFIX}/etc/postfix/postfix-files to indicate compressed -# man pages, since the ports software compresses them after this step, and -# if we run etc/postfix/post-install again during package installation, -# it will complain about missing files. - @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/fix-files-list - @${CAT} ${PKGMESSAGE} - -post-clean: - @${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc - -.include <bsd.port.mk> diff --git a/mail/postfix28/distinfo b/mail/postfix28/distinfo deleted file mode 100644 index 59ac523435fa..000000000000 --- a/mail/postfix28/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -MD5 (postfix/postfix-2.2.5.tar.gz) = 9c13d58494c64012bfd8ab0d6967305c -SIZE (postfix/postfix-2.2.5.tar.gz) = 2428594 -MD5 (postfix/postfix-libspf2-2.2.0-5.patch) = 80be36e0f14e1a1f39a3b30b9b2d4115 -SIZE (postfix/postfix-libspf2-2.2.0-5.patch) = 26077 -MD5 (postfix/postfix-2.2.4-vda.patch.gz) = 7049364c6476edf80d6ff861ca37936f -SIZE (postfix/postfix-2.2.4-vda.patch.gz) = 7712 diff --git a/mail/postfix28/files/patch-conf::main.cf b/mail/postfix28/files/patch-conf::main.cf deleted file mode 100644 index 67e356de21dd..000000000000 --- a/mail/postfix28/files/patch-conf::main.cf +++ /dev/null @@ -1,64 +0,0 @@ ---- conf/main.cf.orig Sat Mar 5 11:53:42 2005 -+++ conf/main.cf Sat Mar 5 11:53:42 2005 -@@ -32,13 +32,13 @@ - # The command_directory parameter specifies the location of all - # postXXX commands. - # --command_directory = /usr/sbin -+command_directory = !!PREFIX!!/sbin - - # The daemon_directory parameter specifies the location of all Postfix - # daemon programs (i.e. programs listed in the master.cf file). This - # directory must be owned by root. - # --daemon_directory = /usr/libexec/postfix -+daemon_directory = !!PREFIX!!/libexec/postfix - - # QUEUE AND PROCESS OWNERSHIP - # -@@ -608,37 +608,37 @@ - # sendmail_path: The full pathname of the Postfix sendmail command. - # This is the Sendmail-compatible mail posting interface. - # --sendmail_path = -+sendmail_path = !!PREFIX!!/sbin/sendmail - - # newaliases_path: The full pathname of the Postfix newaliases command. - # This is the Sendmail-compatible command to build alias databases. - # --newaliases_path = -+newaliases_path = !!PREFIX!!/bin/newaliases - - # mailq_path: The full pathname of the Postfix mailq command. This - # is the Sendmail-compatible mail queue listing command. - # --mailq_path = -+mailq_path = !!PREFIX!!/bin/mailq - - # setgid_group: The group for mail submission and queue management - # commands. This must be a group name with a numerical group ID that - # is not shared with other accounts, not even with the Postfix account. - # --setgid_group = -+setgid_group = maildrop - - # html_directory: The location of the Postfix HTML documentation. - # --html_directory = -+html_directory = no - - # manpage_directory: The location of the Postfix on-line manual pages. - # --manpage_directory = -+manpage_directory = !!PREFIX!!/man - - # sample_directory: The location of the Postfix sample configuration files. - # This parameter is obsolete as of Postfix 2.1. - # --sample_directory = -+sample_directory = !!PREFIX!!/etc/postfix - - # readme_directory: The location of the Postfix README files. - # --readme_directory = -+readme_directory = no diff --git a/mail/postfix28/files/patch-conf::post-install b/mail/postfix28/files/patch-conf::post-install deleted file mode 100644 index 78401de5bdf3..000000000000 --- a/mail/postfix28/files/patch-conf::post-install +++ /dev/null @@ -1,11 +0,0 @@ ---- conf/post-install.orig Thu Feb 24 08:06:08 2005 -+++ conf/post-install Sat Mar 5 11:53:42 2005 -@@ -185,7 +185,7 @@ - - umask 022 - --PATH=/bin:/usr/bin:/usr/sbin:/usr/etc:/sbin:/etc:/usr/contrib/bin:/usr/gnu/bin:/usr/ucb:/usr/bsd -+PATH=/bin:/usr/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/local/sbin - SHELL=/bin/sh - IFS=" - " diff --git a/mail/postfix28/files/patch-makedefs b/mail/postfix28/files/patch-makedefs deleted file mode 100644 index ed2f08d06ae4..000000000000 --- a/mail/postfix28/files/patch-makedefs +++ /dev/null @@ -1,13 +0,0 @@ ---- makedefs.orig Tue Feb 22 09:35:52 2005 -+++ makedefs Wed Jul 13 17:42:53 2005 -@@ -116,6 +116,10 @@ - ;; - FreeBSD.5*) SYSTYPE=FREEBSD5 - ;; -+ FreeBSD.6*) SYSTYPE=FREEBSD5 -+ ;; -+ FreeBSD.7*) SYSTYPE=FREEBSD5 -+ ;; - OpenBSD.2*) SYSTYPE=OPENBSD2 - ;; - OpenBSD.3*) SYSTYPE=OPENBSD3 diff --git a/mail/postfix28/files/patch-src::global::mail_params.h b/mail/postfix28/files/patch-src::global::mail_params.h deleted file mode 100644 index 52ea5e9e5c35..000000000000 --- a/mail/postfix28/files/patch-src::global::mail_params.h +++ /dev/null @@ -1,29 +0,0 @@ ---- src/global/mail_params.h.orig Fri Feb 11 21:53:21 2005 -+++ src/global/mail_params.h Sat Mar 5 11:53:42 2005 -@@ -64,7 +64,7 @@ - extern gid_t var_owner_gid; - - #define VAR_SGID_GROUP "setgid_group" --#define DEF_SGID_GROUP "postdrop" -+#define DEF_SGID_GROUP "maildrop" - extern char *var_sgid_group; - extern gid_t var_sgid_gid; - -@@ -221,7 +221,7 @@ - */ - #define VAR_DAEMON_DIR "daemon_directory" - #ifndef DEF_DAEMON_DIR --#define DEF_DAEMON_DIR "/usr/libexec/postfix" -+#define DEF_DAEMON_DIR "!!PREFIX!!/libexec/postfix" - #endif - extern char *var_daemon_dir; - -@@ -250,7 +250,7 @@ - */ - #define VAR_CONFIG_DIR "config_directory" - #ifndef DEF_CONFIG_DIR --#define DEF_CONFIG_DIR "/etc/postfix" -+#define DEF_CONFIG_DIR "!!PREFIX!!/etc/postfix" - #endif - extern char *var_config_dir; - diff --git a/mail/postfix28/pkg-descr b/mail/postfix28/pkg-descr deleted file mode 100644 index 1f335ce6820c..000000000000 --- a/mail/postfix28/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -Postfix attempts to be fast, easy to administer, and secure, while at -the same time being sendmail-compatible enough to not upset existing -users. It also offers QMQP and VERP support to let Postfix act as delivery -daemon for ezmlm-idx. - -WWW: http://www.postfix.org/ diff --git a/mail/postfix28/pkg-install b/mail/postfix28/pkg-install deleted file mode 100644 index e912b1a051e2..000000000000 --- a/mail/postfix28/pkg-install +++ /dev/null @@ -1,181 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# If the POSTFIX_DEFAULT_MTA environment variable is set to YES, it -# will make the port/package use defaults which make postfix replace -# sendmail as much as possible. - -PKG_PREFIX=${PKG_PREFIX:=/usr/local} -BATCH=${BATCH:=no} -POSTFIX_DEFAULT_MTA=${POSTFIX_DEFAULT_MTA:=no} - -if [ x${POSTFIX_DEFAULT_MTA} = xno ]; then - DEFAULT_REPLACE_MAILERCONF=n -else - DEFAULT_REPLACE_MAILERCONF=y -fi - -if [ -x /usr/sbin/nologin ]; then - NOLOGIN=/usr/sbin/nologin -else - NOLOGIN=/sbin/nologin -fi - -ask() { - local question default answer - - question=$1 - default=$2 - if [ -z "${PACKAGE_BUILDING}" -a x${BATCH} = xno ]; then - read -p "${question} [${default}]? " answer - fi - if [ x${answer} = x ]; then - answer=${default} - fi - /bin/echo ${answer} -} - -yesno() { - local question default answer - - question=$1 - default=$2 - while :; do - answer=$(ask "${question}" "${default}") - case "${answer}" in - [Yy]*) return 0;; - [Nn]*) return 1;; - esac - /bin/echo "Please answer yes or no." - done -} - -if [ x"$2" = xPRE-INSTALL ]; then - USER=postfix - UID=125 - GROUP=postfix - GID=125 - GROUP2=maildrop - GID2=126 - - if /usr/sbin/pw groupshow "${GROUP}" 2>/dev/null; then - /bin/echo "You already have a group \"${GROUP}\", so I will use it." - else - if /usr/sbin/pw groupadd ${GROUP} -g ${GID} - then - /bin/echo "Added group \"${GROUP}\"." - else - /bin/echo "Adding group \"${GROUP}\" failed..." - /bin/echo "Please create it, and try again." - exit 1 - fi - fi - - if /usr/sbin/pw groupshow "${GROUP2}" 2>/dev/null; then - /bin/echo "You already have a group \"${GROUP2}\", so I will use it." - else - if /usr/sbin/pw groupadd ${GROUP2} -g ${GID2}; then - /bin/echo "Added group \"${GROUP2}\"." - else - /bin/echo "Adding group \"${GROUP2}\" failed..." - /bin/echo "Please create it, and try again." - exit 1 - fi - fi - - if /usr/sbin/pw user show "${USER}" 2>/dev/null; then - /bin/echo "You already have a user \"${USER}\", so I will use it." - else - if /usr/sbin/pw useradd ${USER} -u ${UID} -g ${GROUP} -h - -d /var/spool/postfix -s ${NOLOGIN} -c "Postfix Mail System"; then - /bin/echo "Added user \"${USER}\"." - else - /bin/echo "Adding user \"${USER}\" failed..." - /bin/echo "Please create it, and try again." - exit 1 - fi - fi - - if /usr/sbin/pw show group mail | grep -q "${USER}" 2>/dev/null; then - /bin/echo "You already have user \"${USER}\" in group \"mail\", so I will use it." - else - /bin/echo "You need user \"${USER}\" added to group \"mail\"." - if yesno "Would you like me to add it" y; then - /usr/sbin/pw groupmod mail -m ${USER} || exit - /bin/echo "Done." - else - /bin/echo "Please create it, and try again." - exit 1 - fi - fi -fi - -if [ x"$2" = xPOST-INSTALL ]; then - if [ -d ${PKG_PREFIX}/etc/postfix/dist ]; then - for file in ${PKG_PREFIX}/etc/postfix/dist/*; do - if [ ! -f ${PKG_PREFIX}/etc/postfix/${file#${PKG_PREFIX}/etc/postfix/dist} ]; then - cp $file ${PKG_PREFIX}/etc/postfix/ - fi - done - fi - - /bin/sh ${PKG_PREFIX}/etc/postfix/post-install tempdir=/tmp \ - config_directory=${PKG_PREFIX}/etc/postfix \ - daemon_directory=${PKG_PREFIX}/libexec/postfix \ - command_directory=${PKG_PREFIX}/sbin \ - queue_directory=/var/spool/postfix \ - sendmail_path=${PKG_PREFIX}/sbin/sendmail \ - newaliases_path=${PKG_PREFIX}/bin/newaliases \ - mailq_path=${PKG_PREFIX}/bin/mailq \ - mail_owner=postfix \ - setgid_group=maildrop \ - manpage_directory=${PKG_PREFIX}/man \ - sample_directory=${PKG_PREFIX}/etc/postfix \ - readme_directory=no \ - upgrade-package -fi -# readme_directory is "no" above since the package will have correct perms -# already, and we don't know if they had PORTDOCS. - -replace() { - local orig repl - - orig=$1 - repl=$2 - if [ -e ${orig} ]; then - /bin/mv -f ${orig} ${orig}.OFF - /bin/chmod 0 ${orig}.OFF - fi - if [ -e ${repl} ]; then - /bin/ln -s ${repl} ${orig} - fi -} - -if [ x"$2" = xPOST-INSTALL -a -z "${PACKAGE_BUILDING}" ]; then - if [ -x /sbin/sysctl ]; then - OSVERSION=`/sbin/sysctl -n kern.osreldate` - else - OSVERSION=`/usr/sbin/sysctl -n kern.osreldate` - fi - if [ ${OSVERSION} -ge 400014 ]; then - if yesno "Would you like to activate Postfix in /etc/mail/mailer.conf" ${DEFAULT_REPLACE_MAILERCONF}; then - mv -f /etc/mail/mailer.conf /etc/mail/mailer.conf.old - /bin/echo "#" > /etc/mail/mailer.conf - /bin/echo -n "# Execute the Postfix sendmail program" >> /etc/mail/mailer.conf - /bin/echo ", named ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - /bin/echo "#" >> /etc/mail/mailer.conf - /bin/echo "sendmail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - /bin/echo "send-mail ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - /bin/echo "mailq ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - /bin/echo "newaliases ${PKG_PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - fi - else - if yesno "Would you like to replace {sendmail,mailq,newaliases} with Postfix versions" n; then - replace /usr/sbin/sendmail ${PKG_PREFIX}/sbin/sendmail - replace /usr/bin/mailq ${PKG_PREFIX}/sbin/sendmail - replace /usr/bin/newaliases ${PKG_PREFIX}/sbin/sendmail - /bin/echo "Done." - fi - fi -fi diff --git a/mail/postfix28/pkg-message b/mail/postfix28/pkg-message deleted file mode 100644 index d9e910d86ceb..000000000000 --- a/mail/postfix28/pkg-message +++ /dev/null @@ -1,47 +0,0 @@ -If you have postfix configured in your /etc/mail/mailer.conf (answered yes to -the previous question) and would like to enable postfix to start at boot time, -please set these variables in your /etc/rc.conf file: - -sendmail_enable="YES" -sendmail_flags="-bd" -sendmail_pidfile="/var/spool/postfix/pid/master.pid" -sendmail_procname="/usr/local/libexec/postfix/master" -sendmail_outbound_enable="NO" -sendmail_submit_enable="NO" -sendmail_msp_queue_enable="NO" - -This will disable Sendmail completely, and allow you to use /etc/rc.d/sendmail -to start and stop postfix (FreeBSD 5.x and up). For FreeBSD 4.x, it will just -cause the system boot scripts to start sendmail for you. - -Alternatively to the above settings, you can enable postfix to start with -the other local services, for example, after your database server starts if -you need it to be running for postfix. To do this, set in your rc.conf file: - -sendmail_enable="NO" -sendmail_submit_enable="NO" -sendmail_outbound_enable="NO" -sendmail_msp_queue_enable="NO" - -Then make the following symbolic link: - -cd /usr/local/etc/rc.d -ln -s /usr/local/sbin/postfix postfix.sh - - -With either startup configuration, you will want to disable some -Sendmail-specific daily maintenance routines in your /etc/periodic.conf file: - -daily_clean_hoststat_enable="NO" -daily_status_mail_rejects_enable="NO" -daily_status_include_submit_mailq="NO" -daily_submit_queuerun="NO" - - -If you are using SASL, you need to make sure that postfix has access to read -the sasldb file. This is accomplished by adding postfix to group mail and -making the /usr/local/etc/sasldb* file(s) readable by group mail (this should -be the default for new installs). - -If you are upgrading from postfix version prior to 2.0, please see the README -files for recommended changes to your configuration. diff --git a/mail/postfix28/pkg-plist b/mail/postfix28/pkg-plist deleted file mode 100644 index 6c1ab4114c53..000000000000 --- a/mail/postfix28/pkg-plist +++ /dev/null @@ -1,233 +0,0 @@ -@unexec if cmp -s %D/etc/postfix/main.cf %D/etc/postfix/dist/main.cf; then rm -f %D/etc/postfix/main.cf; fi -@unexec if cmp -s %D/etc/postfix/master.cf %D/etc/postfix/dist/master.cf; then rm -f %D/etc/postfix/master.cf; fi -@unexec if cmp -s %D/etc/postfix/access %D/etc/postfix/dist/access; then rm -f %D/etc/postfix/access; fi -@unexec if cmp -s %D/etc/postfix/aliases %D/etc/postfix/dist/aliases; then rm -f %D/etc/postfix/aliases; fi -@unexec if cmp -s %D/etc/postfix/canonical %D/etc/postfix/dist/canonical; then rm -f %D/etc/postfix/canonical; fi -@unexec if cmp -s %D/etc/postfix/header_checks %D/etc/postfix/dist/header_checks; then rm -f %D/etc/postfix/header_checks; fi -@unexec if cmp -s %D/etc/postfix/relocated %D/etc/postfix/dist/relocated; then rm -f %D/etc/postfix/relocated; fi -@unexec if cmp -s %D/etc/postfix/transport %D/etc/postfix/dist/transport; then rm -f %D/etc/postfix/transport; fi -@unexec if cmp -s %D/etc/postfix/virtual %D/etc/postfix/dist/virtual; then rm -f %D/etc/postfix/virtual; fi -@unexec if cmp -s %D/etc/postfix/generic %D/etc/postfix/dist/generic; then rm -f %D/etc/postfix/generic; fi -etc/postfix/LICENSE -etc/postfix/TLS_LICENSE -etc/postfix/main.cf.default -etc/postfix/makedefs.out -etc/postfix/post-install -etc/postfix/postfix-files -etc/postfix/postfix-script -etc/postfix/dist/main.cf -etc/postfix/dist/master.cf -etc/postfix/dist/access -etc/postfix/dist/aliases -etc/postfix/dist/canonical -etc/postfix/dist/header_checks -etc/postfix/dist/relocated -etc/postfix/dist/transport -etc/postfix/dist/virtual -etc/postfix/dist/generic -libexec/postfix/anvil -libexec/postfix/bounce -libexec/postfix/cleanup -libexec/postfix/discard -libexec/postfix/error -libexec/postfix/flush -libexec/postfix/lmtp -libexec/postfix/local -libexec/postfix/master -libexec/postfix/nqmgr -libexec/postfix/oqmgr -libexec/postfix/pickup -libexec/postfix/pipe -libexec/postfix/proxymap -libexec/postfix/qmgr -libexec/postfix/qmqpd -libexec/postfix/scache -libexec/postfix/showq -libexec/postfix/smtp -libexec/postfix/smtpd -libexec/postfix/spawn -libexec/postfix/trivial-rewrite -libexec/postfix/verify -libexec/postfix/virtual -libexec/postfix/tlsmgr -sbin/postalias -sbin/postcat -sbin/postconf -sbin/postdrop -sbin/postfix -sbin/postkick -sbin/postlock -sbin/postlog -sbin/postmap -sbin/postqueue -sbin/postsuper -sbin/sendmail -%%SUB_TEST%%sbin/qmqp-source -%%SUB_TEST%%sbin/smtp-sink -%%SUB_TEST%%sbin/smtp-source -bin/rmail -bin/newaliases -bin/mailq -%%PORTDOCS%%%%DOCSDIR%%/AAAREADME -%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_CLASS_README -%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_CLASS_README.html -%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_REWRITING_README -%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_REWRITING_README.html -%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_VERIFICATION_README -%%PORTDOCS%%%%DOCSDIR%%/ADDRESS_VERIFICATION_README.html -%%PORTDOCS%%%%DOCSDIR%%/BACKSCATTER_README -%%PORTDOCS%%%%DOCSDIR%%/BACKSCATTER_README.html -%%PORTDOCS%%%%DOCSDIR%%/BASIC_CONFIGURATION_README -%%PORTDOCS%%%%DOCSDIR%%/BASIC_CONFIGURATION_README.html -%%PORTDOCS%%%%DOCSDIR%%/BUILTIN_FILTER_README -%%PORTDOCS%%%%DOCSDIR%%/BUILTIN_FILTER_README.html -%%PORTDOCS%%%%DOCSDIR%%/CDB_README -%%PORTDOCS%%%%DOCSDIR%%/CONNECTION_CACHE_README -%%PORTDOCS%%%%DOCSDIR%%/CONNECTION_CACHE_README.html -%%PORTDOCS%%%%DOCSDIR%%/CONTENT_INSPECTION_README -%%PORTDOCS%%%%DOCSDIR%%/CONTENT_INSPECTION_README.html -%%PORTDOCS%%%%DOCSDIR%%/CYRUS_README.html -%%PORTDOCS%%%%DOCSDIR%%/DATABASE_README -%%PORTDOCS%%%%DOCSDIR%%/DATABASE_README.html -%%PORTDOCS%%%%DOCSDIR%%/DB_README -%%PORTDOCS%%%%DOCSDIR%%/DB_README.html -%%PORTDOCS%%%%DOCSDIR%%/DEBUG_README -%%PORTDOCS%%%%DOCSDIR%%/DEBUG_README.html -%%PORTDOCS%%%%DOCSDIR%%/ETRN_README -%%PORTDOCS%%%%DOCSDIR%%/ETRN_README.html -%%PORTDOCS%%%%DOCSDIR%%/FILTER_README -%%PORTDOCS%%%%DOCSDIR%%/FILTER_README.html -%%PORTDOCS%%%%DOCSDIR%%/INSTALL -%%PORTDOCS%%%%DOCSDIR%%/INSTALL.html -%%PORTDOCS%%%%DOCSDIR%%/IPV6_README -%%PORTDOCS%%%%DOCSDIR%%/IPV6_README.html -%%PORTDOCS%%%%DOCSDIR%%/CDB_README.html -%%PORTDOCS%%%%DOCSDIR%%/TLS_README -%%PORTDOCS%%%%DOCSDIR%%/TLS_README.html -%%PORTDOCS%%%%DOCSDIR%%/LDAP_README -%%PORTDOCS%%%%DOCSDIR%%/LDAP_README.html -%%PORTDOCS%%%%DOCSDIR%%/LINUX_README -%%PORTDOCS%%%%DOCSDIR%%/LINUX_README.html -%%PORTDOCS%%%%DOCSDIR%%/LMTP_README -%%PORTDOCS%%%%DOCSDIR%%/LMTP_README.html -%%PORTDOCS%%%%DOCSDIR%%/LOCAL_RECIPIENT_README -%%PORTDOCS%%%%DOCSDIR%%/LOCAL_RECIPIENT_README.html -%%PORTDOCS%%%%DOCSDIR%%/MAILDROP_README -%%PORTDOCS%%%%DOCSDIR%%/MAILDROP_README.html -%%PORTDOCS%%%%DOCSDIR%%/MYSQL_README -%%PORTDOCS%%%%DOCSDIR%%/MYSQL_README.html -%%PORTDOCS%%%%DOCSDIR%%/NFS_README -%%PORTDOCS%%%%DOCSDIR%%/NFS_README.html -%%PORTDOCS%%%%DOCSDIR%%/OVERVIEW -%%PORTDOCS%%%%DOCSDIR%%/OVERVIEW.html -%%PORTDOCS%%%%DOCSDIR%%/PACKAGE_README -%%PORTDOCS%%%%DOCSDIR%%/PACKAGE_README.html -%%PORTDOCS%%%%DOCSDIR%%/PCRE_README -%%PORTDOCS%%%%DOCSDIR%%/PCRE_README.html -%%PORTDOCS%%%%DOCSDIR%%/PGSQL_README -%%PORTDOCS%%%%DOCSDIR%%/PGSQL_README.html -%%PORTDOCS%%%%DOCSDIR%%/QMQP_README -%%PORTDOCS%%%%DOCSDIR%%/QMQP_README.html -%%PORTDOCS%%%%DOCSDIR%%/QSHAPE_README -%%PORTDOCS%%%%DOCSDIR%%/QSHAPE_README.html -%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES -%%PORTDOCS%%%%DOCSDIR%%/RESTRICTION_CLASS_README -%%PORTDOCS%%%%DOCSDIR%%/RESTRICTION_CLASS_README.html -%%PORTDOCS%%%%DOCSDIR%%/SASL_README -%%PORTDOCS%%%%DOCSDIR%%/SASL_README.html -%%PORTDOCS%%%%DOCSDIR%%/SCHEDULER_README -%%PORTDOCS%%%%DOCSDIR%%/SCHEDULER_README.html -%%PORTDOCS%%%%DOCSDIR%%/SMTPD_ACCESS_README -%%PORTDOCS%%%%DOCSDIR%%/SMTPD_ACCESS_README.html -%%PORTDOCS%%%%DOCSDIR%%/SMTPD_POLICY_README -%%PORTDOCS%%%%DOCSDIR%%/SMTPD_POLICY_README.html -%%PORTDOCS%%%%DOCSDIR%%/SMTPD_PROXY_README -%%PORTDOCS%%%%DOCSDIR%%/SMTPD_PROXY_README.html -%%PORTDOCS%%%%SUB_SPF%%%%DOCSDIR%%/SPF_README -%%PORTDOCS%%%%DOCSDIR%%/STANDARD_CONFIGURATION_README -%%PORTDOCS%%%%DOCSDIR%%/STANDARD_CONFIGURATION_README.html -%%PORTDOCS%%%%DOCSDIR%%/TUNING_README -%%PORTDOCS%%%%DOCSDIR%%/TUNING_README.html -%%PORTDOCS%%%%DOCSDIR%%/ULTRIX_README -%%PORTDOCS%%%%DOCSDIR%%/ULTRIX_README.html -%%PORTDOCS%%%%DOCSDIR%%/UUCP_README -%%PORTDOCS%%%%DOCSDIR%%/UUCP_README.html -%%PORTDOCS%%%%DOCSDIR%%/VERP_README -%%PORTDOCS%%%%DOCSDIR%%/VERP_README.html -%%PORTDOCS%%%%DOCSDIR%%/VIRTUAL_README -%%PORTDOCS%%%%DOCSDIR%%/VIRTUAL_README.html -%%PORTDOCS%%%%DOCSDIR%%/XCLIENT_README -%%PORTDOCS%%%%DOCSDIR%%/XCLIENT_README.html -%%PORTDOCS%%%%DOCSDIR%%/XFORWARD_README -%%PORTDOCS%%%%DOCSDIR%%/XFORWARD_README.html -%%PORTDOCS%%%%DOCSDIR%%/access.5.html -%%PORTDOCS%%%%DOCSDIR%%/aliases.5.html -%%PORTDOCS%%%%DOCSDIR%%/anvil.8.html -%%PORTDOCS%%%%DOCSDIR%%/body_checks.5.html -%%PORTDOCS%%%%DOCSDIR%%/bounce.8.html -%%PORTDOCS%%%%DOCSDIR%%/canonical.5.html -%%PORTDOCS%%%%DOCSDIR%%/cidr_table.5.html -%%PORTDOCS%%%%DOCSDIR%%/cleanup.8.html -%%PORTDOCS%%%%DOCSDIR%%/defer.8.html -%%PORTDOCS%%%%DOCSDIR%%/discard.8.html -%%PORTDOCS%%%%DOCSDIR%%/error.8.html -%%PORTDOCS%%%%DOCSDIR%%/flush.8.html -%%PORTDOCS%%%%DOCSDIR%%/header_checks.5.html -%%PORTDOCS%%%%DOCSDIR%%/index.html -%%PORTDOCS%%%%DOCSDIR%%/ldap_table.5.html -%%PORTDOCS%%%%DOCSDIR%%/lmtp.8.html -%%PORTDOCS%%%%DOCSDIR%%/local.8.html -%%PORTDOCS%%%%DOCSDIR%%/mailq.1.html -%%PORTDOCS%%%%DOCSDIR%%/master.5.html -%%PORTDOCS%%%%DOCSDIR%%/master.8.html -%%PORTDOCS%%%%DOCSDIR%%/mysql_table.5.html -%%PORTDOCS%%%%DOCSDIR%%/nisplus_table.5.html -%%PORTDOCS%%%%DOCSDIR%%/newaliases.1.html -%%PORTDOCS%%%%DOCSDIR%%/oqmgr.8.html -%%PORTDOCS%%%%DOCSDIR%%/pcre_table.5.html -%%PORTDOCS%%%%DOCSDIR%%/pgsql_table.5.html -%%PORTDOCS%%%%DOCSDIR%%/pickup.8.html -%%PORTDOCS%%%%DOCSDIR%%/pipe.8.html -%%PORTDOCS%%%%DOCSDIR%%/postalias.1.html -%%PORTDOCS%%%%DOCSDIR%%/postcat.1.html -%%PORTDOCS%%%%DOCSDIR%%/postconf.1.html -%%PORTDOCS%%%%DOCSDIR%%/postconf.5.html -%%PORTDOCS%%%%DOCSDIR%%/postdrop.1.html -%%PORTDOCS%%%%DOCSDIR%%/postfix-logo.jpg -%%PORTDOCS%%%%DOCSDIR%%/postfix-manuals.html -%%PORTDOCS%%%%DOCSDIR%%/postfix-power.png -%%PORTDOCS%%%%DOCSDIR%%/postfix.1.html -%%PORTDOCS%%%%DOCSDIR%%/postkick.1.html -%%PORTDOCS%%%%DOCSDIR%%/postlock.1.html -%%PORTDOCS%%%%DOCSDIR%%/postlog.1.html -%%PORTDOCS%%%%DOCSDIR%%/postmap.1.html -%%PORTDOCS%%%%DOCSDIR%%/postqueue.1.html -%%PORTDOCS%%%%DOCSDIR%%/postsuper.1.html -%%PORTDOCS%%%%DOCSDIR%%/proxymap.8.html -%%PORTDOCS%%%%DOCSDIR%%/qmgr.8.html -%%PORTDOCS%%%%DOCSDIR%%/qmqp-sink.1.html -%%PORTDOCS%%%%DOCSDIR%%/qmqp-source.1.html -%%PORTDOCS%%%%DOCSDIR%%/qmqpd.8.html -%%PORTDOCS%%%%DOCSDIR%%/qshape.1.html -%%PORTDOCS%%%%DOCSDIR%%/regexp_table.5.html -%%PORTDOCS%%%%DOCSDIR%%/relocated.5.html -%%PORTDOCS%%%%DOCSDIR%%/sendmail.1.html -%%PORTDOCS%%%%DOCSDIR%%/scache.8.html -%%PORTDOCS%%%%DOCSDIR%%/showq.8.html -%%PORTDOCS%%%%DOCSDIR%%/smtp-sink.1.html -%%PORTDOCS%%%%DOCSDIR%%/smtp-source.1.html -%%PORTDOCS%%%%DOCSDIR%%/smtp.8.html -%%PORTDOCS%%%%DOCSDIR%%/smtpd.8.html -%%PORTDOCS%%%%DOCSDIR%%/spawn.8.html -%%PORTDOCS%%%%DOCSDIR%%/trace.8.html -%%PORTDOCS%%%%DOCSDIR%%/transport.5.html -%%PORTDOCS%%%%DOCSDIR%%/trivial-rewrite.8.html -%%PORTDOCS%%%%DOCSDIR%%/verify.8.html -%%PORTDOCS%%%%DOCSDIR%%/virtual.5.html -%%PORTDOCS%%%%DOCSDIR%%/virtual.8.html -%%PORTDOCS%%%%DOCSDIR%%/tlsmgr.8.html -%%PORTDOCS%%%%DOCSDIR%%/generic.5.html -%%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrm libexec/postfix -@dirrm etc/postfix/dist -@unexec rmdir %D/etc/postfix 2>/dev/null || true diff --git a/mail/postfix28/scripts/configure b/mail/postfix28/scripts/configure deleted file mode 100644 index 93c5b95ec561..000000000000 --- a/mail/postfix28/scripts/configure +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ - -for f in `find ${WRKSRC} -type f | xargs grep -l '\!\!PREFIX\!\!' ` ; do \ - mv $f $f.orig && sed s+!!PREFIX!!+$PREFIX+g < $f.orig > $f && \ - rm $f.orig -done diff --git a/mail/postfix28/scripts/configure.postfix b/mail/postfix28/scripts/configure.postfix deleted file mode 100644 index e8b2cc11549a..000000000000 --- a/mail/postfix28/scripts/configure.postfix +++ /dev/null @@ -1,256 +0,0 @@ -#!/bin/sh -# $FreeBSD: /tmp/pcvs/ports/mail/postfix28/scripts/Attic/configure.postfix,v 1.63 2005-07-06 16:37:35 jylefort Exp $ - -if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then - exit -fi - -tempfile=`/usr/bin/mktemp -t checklist` - -if [ "${POSTFIX_OPTIONS}" ]; then - set ${POSTFIX_OPTIONS} -fi - -for i; do - eval status_$i=ON -done - -if [ -z "${BATCH}" ]; then - /usr/bin/dialog --title "Postfix configuration options" --clear \ - --checklist "\n\ -Please select desired options:" -1 -1 16 \ -NOPCRE "DISABLE Perl Compatible Regular Expressions" "$status_NOPCRE" \ -SASL "Cyrus SASLv1 (Simple Authentication and Security Layer)" "$status_SASL" \ -SASL2 "Cyrus SASLv2 (Simple Authentication and Security Layer)" "$status_SASL2" \ -SASLKRB "If your SASL requires Kerberos select this option" "$status_SASLKRB" \ -SASLKRB5 "If your SASL requires Kerberos5 select this option" "$status_SASLKRB5" \ -SPF "SPF support" "$status_SPF" \ -TLS "SSL and TLS" "$status_TLS" \ -DB3 "Berkeley DB3 (required if SASL also built with DB3)" "$status_DB3" \ -DB40 "Berkeley DB4.0 (required if SASL also built with DB4.0)" "$status_DB40" \ -DB41 "Berkeley DB4.1 (required if SASL also built with DB4.1)" "$status_DB41" \ -DB42 "Berkeley DB4.2 (required if SASL also built with DB4.2)" "$status_DB42" \ -DB43 "Berkeley DB4.3 (required if SASL also built with DB4.3)" "$status_DB43" \ -MySQL "MySQL map lookups (choose version with WITH_MYSQL_VER)" "$status_MySQL" \ -PgSQL "PostgreSQL map lookups (choose with DEFAULT_PGSQL_VER)" "$status_PgSQL" \ -OpenLDAP "OpenLDAP map lookups (choose ver. with WITH_OPENLDAP_VER)" "$status_OpenLDAP" \ -NIS "NIS map lookups" "$status_NIS" \ -VDA "VDA (Virtual Delivery Agent)" "$status_VDA" \ -Test "SMTP/LMTP test server and generator" "$status_Test" \ -2> $tempfile - - retval=$? - - if [ -s $tempfile ]; then - set `sed 's/"//g' $tempfile` - fi - rm -f $tempfile - - case $retval in - 0) if [ -z "$*" ]; then - /bin/echo "Nothing selected" - fi - ;; - 1) /bin/echo "Cancel pressed." - exit 1 - ;; - esac -fi - -${MKDIR} ${WRKDIRPREFIX}${CURDIR} -exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - -/bin/echo "PREFIX= ${PREFIX}" - -SUB_TEST="@comment " -SUB_SPF="@comment " - -while [ "$1" ]; do - case $1 in - NOPCRE) - /bin/echo "WITHOUT_PCRE= yes" - /bin/echo "NOPCRE_SUFFIX= +nopcre" - SUB_NOPCRE="" - ;; - SASL) - /bin/echo "LIB_DEPENDS+= sasl.8:\${PORTSDIR}/security/cyrus-sasl" - /bin/echo "POSTFIX_CCARGS+= -DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl1" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lsasl -lpam -lcrypt" - /bin/echo "SASL_SUFFIX= +sasl" - if [ -f ${LOCALBASE}/lib/libsasl.a ]; then - if /usr/bin/nm ${LOCALBASE}/lib/libsasl.a | grep -wq "mysql_init"; then - SASL_USE_MYSQL="YES" - fi - fi - ;; - SASL2) - /bin/echo "LIB_DEPENDS+= sasl2.2:\${PORTSDIR}/security/cyrus-sasl2" - /bin/echo "POSTFIX_CCARGS+= -DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lsasl2 -lpam -lcrypt" - /bin/echo "SASL_SUFFIX= +sasl2" - if [ -f ${LOCALBASE}/lib/libsasl2.a ]; then - if /usr/bin/nm ${LOCALBASE}/lib/libsasl2.a | grep -wq "mysql_init"; then - SASL_USE_MYSQL="YES" - fi - fi - ;; - SASLKRB) - /bin/echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err" - ;; - SASLKRB5) - /bin/echo "POSTFIX_AUXLIBS+= -lkrb5 -lcrypto -lcrypt -lcom_err -lasn1 -lroken" - ;; - SPF) - # see http://www.ipnet6.org/postfix/spf/ - /bin/echo "LIB_DEPENDS+= spf2.1:\${PORTSDIR}/mail/libspf2" - /bin/echo "PATCH_SITES+= http://www.ipnet6.org/postfix/download/" - /bin/echo "PATCHFILES+= postfix-libspf2-2.2.0-5.patch" - /bin/echo "PATCH_DIST_STRIP= -p1" - /bin/echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lspf2" - /bin/echo "SPF_SUFFIX= +spf" -# /bin/echo "README+= SPF_README" - /bin/echo "" - SUB_SPF="" - ;; - TLS) - /bin/echo "USE_OPENSSL= yes" - /bin/echo "POSTFIX_CCARGS+= -DUSE_TLS -I\${OPENSSLINC}" - /bin/echo "POSTFIX_AUXLIBS+= -L\${OPENSSLLIB} -lssl -lcrypto" - /bin/echo "TLS_SUFFIX= +tls" - ;; - DB3) - if [ "X$BDB_SELECTED" != "X" ]; then - /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr - rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - exit 1 - fi - /bin/echo "LIB_DEPENDS+= db3.3:\${PORTSDIR}/databases/db3" - /bin/echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db3" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb3" - /bin/echo "DB_SUFFIX= +db3" - BDB_SELECTED="3" - ;; - DB40) - if [ "X$BDB_SELECTED" != "X" ]; then - /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr - rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - exit 1 - fi - /bin/echo "LIB_DEPENDS+= db4.0:\${PORTSDIR}/databases/db4" - /bin/echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db4" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb4" - /bin/echo "DB_SUFFIX= +db40" - BDB_SELECTED="40" - ;; - DB41) - if [ "X$BDB_SELECTED" != "X" ]; then - /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr - rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - exit 1 - fi - /bin/echo "LIB_DEPENDS+= db41.1:\${PORTSDIR}/databases/db41" - /bin/echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db41" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb41" - /bin/echo "DB_SUFFIX= +db41" - BDB_SELECTED="41" - ;; - DB42) - if [ "X$BDB_SELECTED" != "X" ]; then - /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr - rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - exit 1 - fi - /bin/echo "LIB_DEPENDS+= db-4.2.2:\${PORTSDIR}/databases/db42" - /bin/echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db42" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib/db42/ -ldb" - /bin/echo "DB_SUFFIX= +db42" - BDB_SELECTED="42" - ;; - DB43) - if [ "X$BDB_SELECTED" != "X" ]; then - /usr/bin/dialog --msgbox "Select exactly one of the DB3, DB40, DB41, DB42 and DB43 options." 5 60 > /dev/stderr - rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - exit 1 - fi - /bin/echo "LIB_DEPENDS+= db-4.3.0:\${PORTSDIR}/databases/db43" - /bin/echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db43" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib/db43/ -ldb" - /bin/echo "DB_SUFFIX= +db43" - BDB_SELECTED="43" - ;; - MySQL) - /bin/echo "USE_MYSQL=YES" - /bin/echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql" - /bin/echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz -lcrypt" - if [ -f ${LOCALBASE}/lib/mysql/libmysqlclient.a ]; then - if /usr/bin/nm ${LOCALBASE}/lib/mysql/libmysqlclient.a | grep -wq "SSL_new"; then - /bin/echo "USE_OPENSSL= yes" - /bin/echo "POSTFIX_CCARGS+= -I\${OPENSSLLIB}" - /bin/echo "POSTFIX_AUXLIBS+= -L\${OPENSSLLIB} -lssl -lcrypto" - fi - fi - /bin/echo "MYSQL_SUFFIX= +mysql" - MYSQL_SELECTED="YES" - ;; - PgSQL) - /bin/echo "USE_PGSQL=YES" - /bin/echo "POSTFIX_CCARGS+= -DHAS_PGSQL -I\${LOCALBASE}/include -I\${LOCALBASE}/pgsql/include" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt" - /bin/echo "PGSQL_SUFFIX= +pgsql" - ;; - OpenLDAP) - /bin/echo "USE_OPENLDAP=YES" - /bin/echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include" - /bin/echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lldap -llber" - /bin/echo "OPENLDAP_SUFFIX= +openldap" - ;; - NIS) - /bin/echo "POSTFIX_CCARGS+= -DHAS_NIS" - /bin/echo "NIS_SUFFIX= +nis" - ;; - VDA) - /bin/echo "PATCH_SITES+= http://web.onda.com.br/nadal/postfix/VDA/" - /bin/echo "PATCHFILES+= postfix-2.2.4-vda.patch.gz" - /bin/echo "PATCH_DIST_STRIP= -p1" - ;; - Test) - /bin/echo "BIN1= smtp-sink smtp-source qmqp-source" -# /bin/echo "MAN1+= smtp-sink.1 smtp-source.1 qmqp-sink.1 qmqp-source.1" - SUB_TEST="" - ;; - *) - /bin/echo "Unknown option(s): $*" > /dev/stderr - rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc - exit 1 - ;; - esac - shift -done - -if [ -z "${BATCH}" ]; then - if [ "X$SASL_USE_MYSQL" != "X" ] && [ "$MYSQL_SELECTED" != "YES" ]; then - /usr/bin/dialog --yesno "Your lib SASL it is compiled with MySQL. It desires to use the MySQL?" 5 80 > /dev/stderr - if [ $? = 0 ]; then - /bin/echo "USE_MYSQL=YES" - /bin/echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql" - /bin/echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz -lcrypt" - if [ -f ${LOCALBASE}/lib/mysql/libmysqlclient.a ]; then - if /usr/bin/nm ${LOCALBASE}/lib/mysql/libmysqlclient.a | grep -wq "SSL_new"; then - /bin/echo "USE_OPENSSL= yes" - /bin/echo "POSTFIX_CCARGS+= -I\${OPENSSLLIB}" - /bin/echo "POSTFIX_AUXLIBS+= -L\${OPENSSLLIB} -lssl -lcrypto" - fi - fi - fi - fi -fi - -/bin/echo "PLIST_SUB+= SUB_TEST=\"${SUB_TEST}\"" -/bin/echo "PLIST_SUB+= SUB_SPF=\"${SUB_SPF}\"" - -# for some reason, if we alter the pkg name this way, the first build (where -# we ask the configure questions) doesn't pick up the extensions, but -# any subsequent build will. so "make; make install" will build twice. -# don't do this for now. -#/bin/echo "PKGNAMESUFFIX= \${NOPCRE_SUFFIX}\${SASL_SUFFIX}\${DB_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${NIS_SUFFIX}\${SPF_SUFFIX}" diff --git a/mail/postfix28/scripts/fix-files-list b/mail/postfix28/scripts/fix-files-list deleted file mode 100644 index cc4a1083a814..000000000000 --- a/mail/postfix28/scripts/fix-files-list +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -# need to fixup ${PREFIX}/etc/postfix/postfix-files to indicate compressed -# man pages, since the ports software compresses them later, and if we -# run post-install it will complain about missing files -# (script from Simon J. Mudd) - -ed ${PREFIX}/etc/postfix/postfix-files <<EOF || exit 1 -%s/\(\/man[158]\/.*\.[158]\):/\1.gz:/ -w -q -EOF diff --git a/mail/py-email/Makefile b/mail/py-email/Makefile deleted file mode 100644 index 5c713f11e2b7..000000000000 --- a/mail/py-email/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# New ports collection makefile for: py-mimelib -# Date created: 31 July 2003 -# Whom: Gerhard Schmidt <estartu@augusta.de> -# -# $FreeBSD$ -# - -PORTNAME= mimelib -PORTVERSION= 2.5 -CATEGORIES= mail python -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= mimelib -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -DISTNAME= email-${PORTVERSION} - -MAINTAINER= estartu@augusta.de -COMMENT= Email package for Python - -DIST_SUBDIR= python -USE_PYTHON= yes -USE_PYDISTUTILS=yes - -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} >= 220 -IGNORE= is part of the Python base distribution since python 2.2 -.endif - -.include <bsd.port.post.mk> diff --git a/mail/py-email/distinfo b/mail/py-email/distinfo deleted file mode 100644 index e77f13f23eaf..000000000000 --- a/mail/py-email/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (python/email-2.5.tar.gz) = a2a396f97e9628cfb91471a1d3d156d8 -SIZE (python/email-2.5.tar.gz) = 1194582 diff --git a/mail/py-email/pkg-descr b/mail/py-email/pkg-descr deleted file mode 100644 index c7d5c1b1b64e..000000000000 --- a/mail/py-email/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -This library is intended to replace the standard Python libraries rfc822, -mimetools, multifile, MIMEWriter, etc. It intends to be the be-all end-all -package for parsing, manipulating, and generating MIME and rfc822 style -messages in Python. - -WWW: http://sourceforge.net/projects/mimelib/ diff --git a/mail/py-email/pkg-plist b/mail/py-email/pkg-plist deleted file mode 100644 index ed872eb8fae7..000000000000 --- a/mail/py-email/pkg-plist +++ /dev/null @@ -1,67 +0,0 @@ -lib/%%PYTHON_VERSION%%/site-packages/email/_compat22.pyc -lib/%%PYTHON_VERSION%%/site-packages/email/_compat22.pyo -lib/%%PYTHON_VERSION%%/site-packages/email/Charset.py -lib/%%PYTHON_VERSION%%/site-packages/email/Charset.pyc -lib/%%PYTHON_VERSION%%/site-packages/email/Charset.pyo -lib/%%PYTHON_VERSION%%/site-packages/email/Encoders.py -lib/%%PYTHON_VERSION%%/site-packages/email/Encoders.pyc -lib/%%PYTHON_VERSION%%/site-packages/email/Encoders.pyo -lib/%%PYTHON_VERSION%%/site-packages/email/Errors.py -lib/%%PYTHON_VERSION%%/site-packages/email/Errors.pyc -lib/%%PYTHON_VERSION%%/site-packages/email/Errors.pyo -lib/%%PYTHON_VERSION%%/site-packages/email/Generator.py -lib/%%PYTHON_VERSION%%/site-packages/email/Generator.pyc -lib/%%PYTHON_VERSION%%/site-packages/email/Generator.pyo -lib/%%PYTHON_VERSION%%/site-packages/email/Header.py -lib/%%PYTHON_VERSION%%/site-packages/email/Header.pyc -lib/%%PYTHON_VERSION%%/site-packages/email/Header.pyo -lib/%%PYTHON_VERSION%%/site-packages/email/Iterators.py -lib/%%PYTHON_VERSION%%/site-packages/email/Iterators.pyc -lib/%%PYTHON_VERSION%%/site-packages/email/Iterators.pyo -lib/%%PYTHON_VERSION%%/site-packages/email/MIMEAudio.py -lib/%%PYTHON_VERSION%%/site-packages/email/MIMEAudio.pyc -lib/%%PYTHON_VERSION%%/site-packages/email/MIMEAudio.pyo -lib/%%PYTHON_VERSION%%/site-packages/email/MIMEBase.py -lib/%%PYTHON_VERSION%%/site-packages/email/MIMEBase.pyc -lib/%%PYTHON_VERSION%%/site-packages/email/MIMEBase.pyo -lib/%%PYTHON_VERSION%%/site-packages/email/MIMEImage.py -lib/%%PYTHON_VERSION%%/site-packages/email/MIMEImage.pyc -lib/%%PYTHON_VERSION%%/site-packages/email/MIMEImage.pyo -lib/%%PYTHON_VERSION%%/site-packages/email/MIMEMessage.py -lib/%%PYTHON_VERSION%%/site-packages/email/MIMEMessage.pyc -lib/%%PYTHON_VERSION%%/site-packages/email/MIMEMessage.pyo -lib/%%PYTHON_VERSION%%/site-packages/email/MIMEMultipart.py -lib/%%PYTHON_VERSION%%/site-packages/email/MIMEMultipart.pyc -lib/%%PYTHON_VERSION%%/site-packages/email/MIMEMultipart.pyo -lib/%%PYTHON_VERSION%%/site-packages/email/MIMENonMultipart.py -lib/%%PYTHON_VERSION%%/site-packages/email/MIMENonMultipart.pyc -lib/%%PYTHON_VERSION%%/site-packages/email/MIMENonMultipart.pyo -lib/%%PYTHON_VERSION%%/site-packages/email/MIMEText.py -lib/%%PYTHON_VERSION%%/site-packages/email/MIMEText.pyc -lib/%%PYTHON_VERSION%%/site-packages/email/MIMEText.pyo -lib/%%PYTHON_VERSION%%/site-packages/email/Message.py -lib/%%PYTHON_VERSION%%/site-packages/email/Message.pyc -lib/%%PYTHON_VERSION%%/site-packages/email/Message.pyo -lib/%%PYTHON_VERSION%%/site-packages/email/Parser.py -lib/%%PYTHON_VERSION%%/site-packages/email/Parser.pyc -lib/%%PYTHON_VERSION%%/site-packages/email/Parser.pyo -lib/%%PYTHON_VERSION%%/site-packages/email/Utils.py -lib/%%PYTHON_VERSION%%/site-packages/email/Utils.pyc -lib/%%PYTHON_VERSION%%/site-packages/email/Utils.pyo -lib/%%PYTHON_VERSION%%/site-packages/email/__init__.py -lib/%%PYTHON_VERSION%%/site-packages/email/__init__.pyc -lib/%%PYTHON_VERSION%%/site-packages/email/__init__.pyo -lib/%%PYTHON_VERSION%%/site-packages/email/_compat21.py -lib/%%PYTHON_VERSION%%/site-packages/email/_compat21.pyc -lib/%%PYTHON_VERSION%%/site-packages/email/_compat21.pyo -lib/%%PYTHON_VERSION%%/site-packages/email/_compat22.py -lib/%%PYTHON_VERSION%%/site-packages/email/_parseaddr.py -lib/%%PYTHON_VERSION%%/site-packages/email/_parseaddr.pyc -lib/%%PYTHON_VERSION%%/site-packages/email/_parseaddr.pyo -lib/%%PYTHON_VERSION%%/site-packages/email/base64MIME.py -lib/%%PYTHON_VERSION%%/site-packages/email/base64MIME.pyc -lib/%%PYTHON_VERSION%%/site-packages/email/base64MIME.pyo -lib/%%PYTHON_VERSION%%/site-packages/email/quopriMIME.py -lib/%%PYTHON_VERSION%%/site-packages/email/quopriMIME.pyc -lib/%%PYTHON_VERSION%%/site-packages/email/quopriMIME.pyo -@dirrm lib/%%PYTHON_VERSION%%/site-packages/email diff --git a/mail/py-email2/Makefile b/mail/py-email2/Makefile deleted file mode 100644 index 5c713f11e2b7..000000000000 --- a/mail/py-email2/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# New ports collection makefile for: py-mimelib -# Date created: 31 July 2003 -# Whom: Gerhard Schmidt <estartu@augusta.de> -# -# $FreeBSD$ -# - -PORTNAME= mimelib -PORTVERSION= 2.5 -CATEGORIES= mail python -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= mimelib -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -DISTNAME= email-${PORTVERSION} - -MAINTAINER= estartu@augusta.de -COMMENT= Email package for Python - -DIST_SUBDIR= python -USE_PYTHON= yes -USE_PYDISTUTILS=yes - -.include <bsd.port.pre.mk> - -.if ${PYTHON_REL} >= 220 -IGNORE= is part of the Python base distribution since python 2.2 -.endif - -.include <bsd.port.post.mk> diff --git a/mail/py-email2/distinfo b/mail/py-email2/distinfo deleted file mode 100644 index e77f13f23eaf..000000000000 --- a/mail/py-email2/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (python/email-2.5.tar.gz) = a2a396f97e9628cfb91471a1d3d156d8 -SIZE (python/email-2.5.tar.gz) = 1194582 diff --git a/mail/py-email2/pkg-descr b/mail/py-email2/pkg-descr deleted file mode 100644 index c7d5c1b1b64e..000000000000 --- a/mail/py-email2/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -This library is intended to replace the standard Python libraries rfc822, -mimetools, multifile, MIMEWriter, etc. It intends to be the be-all end-all -package for parsing, manipulating, and generating MIME and rfc822 style -messages in Python. - -WWW: http://sourceforge.net/projects/mimelib/ diff --git a/mail/py-email2/pkg-plist b/mail/py-email2/pkg-plist deleted file mode 100644 index ed872eb8fae7..000000000000 --- a/mail/py-email2/pkg-plist +++ /dev/null @@ -1,67 +0,0 @@ -lib/%%PYTHON_VERSION%%/site-packages/email/_compat22.pyc -lib/%%PYTHON_VERSION%%/site-packages/email/_compat22.pyo -lib/%%PYTHON_VERSION%%/site-packages/email/Charset.py -lib/%%PYTHON_VERSION%%/site-packages/email/Charset.pyc -lib/%%PYTHON_VERSION%%/site-packages/email/Charset.pyo -lib/%%PYTHON_VERSION%%/site-packages/email/Encoders.py -lib/%%PYTHON_VERSION%%/site-packages/email/Encoders.pyc -lib/%%PYTHON_VERSION%%/site-packages/email/Encoders.pyo -lib/%%PYTHON_VERSION%%/site-packages/email/Errors.py -lib/%%PYTHON_VERSION%%/site-packages/email/Errors.pyc -lib/%%PYTHON_VERSION%%/site-packages/email/Errors.pyo -lib/%%PYTHON_VERSION%%/site-packages/email/Generator.py -lib/%%PYTHON_VERSION%%/site-packages/email/Generator.pyc -lib/%%PYTHON_VERSION%%/site-packages/email/Generator.pyo -lib/%%PYTHON_VERSION%%/site-packages/email/Header.py -lib/%%PYTHON_VERSION%%/site-packages/email/Header.pyc -lib/%%PYTHON_VERSION%%/site-packages/email/Header.pyo -lib/%%PYTHON_VERSION%%/site-packages/email/Iterators.py -lib/%%PYTHON_VERSION%%/site-packages/email/Iterators.pyc -lib/%%PYTHON_VERSION%%/site-packages/email/Iterators.pyo -lib/%%PYTHON_VERSION%%/site-packages/email/MIMEAudio.py -lib/%%PYTHON_VERSION%%/site-packages/email/MIMEAudio.pyc -lib/%%PYTHON_VERSION%%/site-packages/email/MIMEAudio.pyo -lib/%%PYTHON_VERSION%%/site-packages/email/MIMEBase.py -lib/%%PYTHON_VERSION%%/site-packages/email/MIMEBase.pyc -lib/%%PYTHON_VERSION%%/site-packages/email/MIMEBase.pyo -lib/%%PYTHON_VERSION%%/site-packages/email/MIMEImage.py -lib/%%PYTHON_VERSION%%/site-packages/email/MIMEImage.pyc -lib/%%PYTHON_VERSION%%/site-packages/email/MIMEImage.pyo -lib/%%PYTHON_VERSION%%/site-packages/email/MIMEMessage.py -lib/%%PYTHON_VERSION%%/site-packages/email/MIMEMessage.pyc -lib/%%PYTHON_VERSION%%/site-packages/email/MIMEMessage.pyo -lib/%%PYTHON_VERSION%%/site-packages/email/MIMEMultipart.py -lib/%%PYTHON_VERSION%%/site-packages/email/MIMEMultipart.pyc -lib/%%PYTHON_VERSION%%/site-packages/email/MIMEMultipart.pyo -lib/%%PYTHON_VERSION%%/site-packages/email/MIMENonMultipart.py -lib/%%PYTHON_VERSION%%/site-packages/email/MIMENonMultipart.pyc -lib/%%PYTHON_VERSION%%/site-packages/email/MIMENonMultipart.pyo -lib/%%PYTHON_VERSION%%/site-packages/email/MIMEText.py -lib/%%PYTHON_VERSION%%/site-packages/email/MIMEText.pyc -lib/%%PYTHON_VERSION%%/site-packages/email/MIMEText.pyo -lib/%%PYTHON_VERSION%%/site-packages/email/Message.py -lib/%%PYTHON_VERSION%%/site-packages/email/Message.pyc -lib/%%PYTHON_VERSION%%/site-packages/email/Message.pyo -lib/%%PYTHON_VERSION%%/site-packages/email/Parser.py -lib/%%PYTHON_VERSION%%/site-packages/email/Parser.pyc -lib/%%PYTHON_VERSION%%/site-packages/email/Parser.pyo -lib/%%PYTHON_VERSION%%/site-packages/email/Utils.py -lib/%%PYTHON_VERSION%%/site-packages/email/Utils.pyc -lib/%%PYTHON_VERSION%%/site-packages/email/Utils.pyo -lib/%%PYTHON_VERSION%%/site-packages/email/__init__.py -lib/%%PYTHON_VERSION%%/site-packages/email/__init__.pyc -lib/%%PYTHON_VERSION%%/site-packages/email/__init__.pyo -lib/%%PYTHON_VERSION%%/site-packages/email/_compat21.py -lib/%%PYTHON_VERSION%%/site-packages/email/_compat21.pyc -lib/%%PYTHON_VERSION%%/site-packages/email/_compat21.pyo -lib/%%PYTHON_VERSION%%/site-packages/email/_compat22.py -lib/%%PYTHON_VERSION%%/site-packages/email/_parseaddr.py -lib/%%PYTHON_VERSION%%/site-packages/email/_parseaddr.pyc -lib/%%PYTHON_VERSION%%/site-packages/email/_parseaddr.pyo -lib/%%PYTHON_VERSION%%/site-packages/email/base64MIME.py -lib/%%PYTHON_VERSION%%/site-packages/email/base64MIME.pyc -lib/%%PYTHON_VERSION%%/site-packages/email/base64MIME.pyo -lib/%%PYTHON_VERSION%%/site-packages/email/quopriMIME.py -lib/%%PYTHON_VERSION%%/site-packages/email/quopriMIME.pyc -lib/%%PYTHON_VERSION%%/site-packages/email/quopriMIME.pyo -@dirrm lib/%%PYTHON_VERSION%%/site-packages/email diff --git a/mail/qmail-scanner1/Makefile b/mail/qmail-scanner1/Makefile deleted file mode 100644 index 3ce416e540a2..000000000000 --- a/mail/qmail-scanner1/Makefile +++ /dev/null @@ -1,170 +0,0 @@ -# New ports collection makefile for: qmail-scanner -# Date created: 2003-08-24 -# Whom: moeti -# -# $FreeBSD$ -# - -PORTNAME= qmail-scanner -PORTVERSION= 1.25 -PORTREVISION= 1 -CATEGORIES= mail security -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} -DISTNAME= ${PORTNAME}-${PORTVERSION:S/.r/rc/} -EXTRACT_SUFX= .tgz - -MAINTAINER= freebsd@simplerezo.com -COMMENT= Content/Anti-virus Scanner for qmail - -BUILD_DEPENDS= ${QMAIL_QUEUE}:${PORTSDIR}/mail/qmail \ - reformime:${PORTSDIR}/mail/maildrop \ - ${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes - -# A normal qmail installation puts everything into /var/qmail/. -# Must match your qmail installation -QMAIL_DIR?= /var/qmail -QMAIL_QUEUE= ${QMAIL_DIR}/bin/qmail-queue - -USE_PERL5= yes -NO_BUILD= yes - -# Barely optionnal -.if !defined(WITHOUT_TNEF) -BUILD_DEPENDS+= ${LOCALBASE}/bin/tnef:${PORTSDIR}/converters/tnef -.endif - -# Options -QMAILSCAN_ADMIN?= root -.if defined(QMAILSCAN_ADMINREALNAME) -CONFIGURE_ARGS+= --admin-realname "${QMAILSCAN_ADMINREALNAME}" -.endif -.if defined(QMAILSCAN_ARCHIVE) -CONFIGURE_ARGS+= --archive yes -.endif -QMAILSCAN_NOTIFY?= psender,precips -.if defined(QMAILSCAN_LANG) -CONFIGURE_ARGS+= --lang "${QMAILSCAN_LANG}" -.endif -.if defined(QMAILSCAN_LOCALDOMAINS) && !empty(QMAILSCAN_LOCALDOMAINS) -CONFIGURE_ARGS+= --local-domains "${QMAILSCAN_LOCALDOMAINS}" -.endif -.if defined(QMAILSCAN_LOGCRYPTO) -CONFIGURE_ARGS+= --log-crypto yes -.endif -.if defined(QMAILSCAN_NOTUNZIP) -CONFIGURE_ARGS+= --unzip no -.else -CONFIGURE_ARGS+= --unzip yes -.if defined(QMAILSCAN_MAXZIPSIZE) -CONFIGURE_ARGS+= --max-zip-size "${QMAILSCAN_MAXZIPSIZE}" -.endif -.if !defined(QMAILSCAN_NOTBLKZIPPW) -BUILD_DEPENDS+= unzip:${PORTSDIR}/archivers/unzip -CONFIGURE_ARGS+= --block-password-protected yes -.endif -.endif -.if defined(QMAILSCAN_SCANNERS) -CONFIGURE_ARGS+= --scanners "${QMAILSCAN_SCANNERS}" -.else -CONFIGURE_ARGS+= --scanners auto -.endif -QMAILSCAN_SILENTVIRUSES?= auto -.if defined(QMAILSCAN_SPAMSREDIRECT) -CONFIGURE_ARGS+= --spams-redirect "${QMAILSCAN_SPAMSREDIRECT}" -.endif -.if defined(QMAILSCAN_SPAMSTOSUFFIX) -CONFIGURE_ARGS+= --spams-tosuffix "${QMAILSCAN_SPAMSTOSUFFIX}" -.endif - -RUN_DEPENDS= ${BUILD_DEPENDS} - -SPOOLDIR= ${PREFIX}/qmailscan -PLIST_SUB= SPOOLDIR="${SPOOLDIR:S,${PREFIX}/,,}" - -HAS_CONFIGURE= yes -CONFIGURE_ARGS+= \ - --qmaildir "${QMAIL_DIR}" --spooldir "${SPOOLDIR}" \ - --bindir "${PREFIX}/bin" --qmail-queue-binary "${QMAIL_QUEUE}" \ - --admin "${QMAILSCAN_ADMIN}" --notify "${QMAILSCAN_NOTIFY}" \ - --silent-viruses "${QMAILSCAN_SILENTVIRUSES}" \ - --redundant yes \ - --add-dscr-hdrs yes \ - --log-details syslog --debug no \ - --batch - -pre-configure: - @${ECHO_MSG} "" - @${ECHO_MSG} "----------------------------------------" - @${ECHO_MSG} "You may use the following build options:" - @${ECHO_MSG} "" - @${ECHO_MSG} "QMAILSCAN_ADMIN email adress of qmail-scanner admin for alerts" - @${ECHO_MSG} "QMAILSCAN_ADMINREALNAME* name to use when sending alerts" - @${ECHO_MSG} "QMAILSCAN_LANG specify languages for QS mails (notify, etc..)" - @${ECHO_MSG} " supported languages are: af_ZA, cs_CZ, da_DK, de_DE," - @${ECHO_MSG} " en_GB, en_PL, enlt_LT, enlt_LT_short, es_ES, fr_FR," - @${ECHO_MSG} " it_IT, ja_JP.EUC, nl_NL, no_NO, pl_PL, pt_BR, pt_PT," - @${ECHO_MSG} " sk_SK, sv_SE, tr_TR, tr_TR_ascii and tw_BIG5" - @${ECHO_MSG} " default depends on your LANG variable" - @${ECHO_MSG} " (en_GB if LANG is not set)" - @${ECHO_MSG} "QMAILSCAN_LOCALDOMAINS domains classified as local domains preventing alerts" - @${ECHO_MSG} " of externals users (and mailing-lists...)" - @${ECHO_MSG} "QMAILSCAN_LOGCRYPTO simply notes in the log record if the message" - @${ECHO_MSG} " contained any form of digital signing or encryption" - @${ECHO_MSG} " (S/MIME, PGP and password protected files)" - @${ECHO_MSG} " default is disabled" - @${ECHO_MSG} "QMAILSCAN_MAXZIPSIZE zip that would have unpacked into more diskspace" - @${ECHO_MSG} " than this value will be blocked (prevent DoS)" - @${ECHO_MSG} " default is 1000000000" - @${ECHO_MSG} "QMAILSCAN_NOTBLKZIPPW zip password protected are blocked by default" - @${ECHO_MSG} " setting this variable to disable this function" - @${ECHO_MSG} "QMAILSCAN_NOTIFY who has to be notify of viruses/spams" - @${ECHO_MSG} " defaults to 'psender,precips'" - @${ECHO_MSG} "QMAILSCAN_SCANNERS list of installed content scanner" - @${ECHO_MSG} " default is automatic, so you do not need to set this" - @${ECHO_MSG} "QMAILSCAN_SILENTVIRUSES viruses that qs shoud not notify about" - @${ECHO_MSG} "QMAILSCAN_SPAMSREDIRECT* set this if you want to redirect all spams to a" - @${ECHO_MSG} " specific email address" - @${ECHO_MSG} "QMAILSCAN_SPAMSTOSUFFIX* suffix to alter spams recipients with" - @${ECHO_MSG} "" - @${ECHO_MSG} "When you set the last option to 'spam', a detected spam will be delivered to" - @${ECHO_MSG} "'user-spam@domain' instead of 'user@domain'." - @${ECHO_MSG} "" - @${ECHO_MSG} "* Please note these options are only available with FreeBSD ports " - @${ECHO_MSG} "So please, do not report relatives bugs to qmail-scanner team, but maintainer." - @${ECHO_MSG} "----------------------------------------" - @${ECHO_MSG} "" - @PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/pkg-install ${PKGNAME} PRE-INSTALL - @if ! ${TEST} -f ${QMAIL_QUEUE}; then \ - ${ECHO_MSG} "Unable to found qmail-queue binary trying '${QMAIL_QUEUE}'."; \ - ${ECHO_MSG} "Please set QMAIL_DIR to your qmail installation directory !"; \ - exit 1; \ - fi - -post-configure: - ${TEST} -f ${WRKSRC}/qmail-scanner-queue.pl - -do-install: - -${TEST} -f ${PREFIX}/bin/qmail-scanner-queue.pl && \ - ${MV} ${PREFIX}/bin/qmail-scanner-queue.pl \ - ${PREFIX}/bin/qmail-scanner-queue.pl.old - ${INSTALL_SCRIPT} ${WRKSRC}/qmail-scanner-queue.pl ${PREFIX}/bin - ${INSTALL_SCRIPT} ${WRKSRC}/contrib/qs2mrtg.pl ${PREFIX}/bin - ${INSTALL_DATA} ${WRKSRC}/quarantine-attachments.txt \ - ${SPOOLDIR}/quarantine-attachments.sample - ${TEST} -f ${SPOOLDIR}/quarantine-attachments.txt || \ - ${INSTALL_DATA} ${WRKSRC}/quarantine-attachments.txt ${SPOOLDIR} - ${INSTALL_DATA} ${WRKSRC}/contrib/mrtg-qmail-scanner.cfg \ - ${PREFIX}/share/examples/qs2mrtg - @PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/pkg-install ${PKGNAME} POST-INSTALL - @${CAT} ${PKGMESSAGE} - -post-deinstall: - @${ECHO_MSG} - @${ECHO_MSG} "If you're not updating this port, you can delete directory '${SPOOLDIR}'." - @${ECHO_MSG} "" - -test: - @${WRKSRC}/contrib/test_installation.sh -doit - -.include <bsd.port.mk> diff --git a/mail/qmail-scanner1/distinfo b/mail/qmail-scanner1/distinfo deleted file mode 100644 index 72f4e0525ade..000000000000 --- a/mail/qmail-scanner1/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (qmail-scanner-1.25.tgz) = 0117c425efb75208682fabcba4e1dd24 -SIZE (qmail-scanner-1.25.tgz) = 221156 diff --git a/mail/qmail-scanner1/files/patch-configure b/mail/qmail-scanner1/files/patch-configure deleted file mode 100644 index 6c2bfd5adfac..000000000000 --- a/mail/qmail-scanner1/files/patch-configure +++ /dev/null @@ -1,145 +0,0 @@ ---- ./configure.orig Mon Oct 18 21:26:55 2004 -+++ ./configure Mon Jan 31 09:07:22 2005 -@@ -1,13 +1,6 @@ - #!/bin/sh - # - --#Pipe into bash if it's present -- --if [ "`bash --version 2>&1|grep 'GNU bash'`" != "" -a "$BASH_VERSION" = "" ]; then -- exec bash $0 $* -- exit --fi -- - umask 007 - - OLD_LANG="$LANG" -@@ -51,6 +44,12 @@ - #reset all English to en_GB - QSLANG="en_GB" - fi -+ -+QSLANG=`echo $QSLANG|sed 's/\..*//'` -+if [ "$QSLANG" = "ja_JP" ]; then -+ #reset all Japanese to ja_JP.EUC -+ QSLANG="ja_JP.EUC" -+fi - - if [ ! -d "./locale/$QSLANG" ]; then - echo " -@@ -87,7 +86,8 @@ - QUARANTINE_PASSWORD_PROTECTED="0" - DESCRIPTIVE_HEADERS="0" - NOTIFY_ADDRESSES="psender,nmlvadm" --USERNAME="$USER" -+ADMIN_MAIL="$USER" -+ADMIN_REALNAME="System Anti-Virus Administrator" - MANUAL_INSTALL="0" - INSTALLIT="0" - DONOTCONFIRM="0" -@@ -100,13 +100,17 @@ - - while [ -n "$1" ] - do -+ -+ - case $1 in - --qs-user) if [ "$2" != "" ] ; then shift ; fi ; QS_USER="$1" ;; - --spooldir) if [ "$2" != "" ] ; then shift ; fi ; AS_QQ="$1" ;; - --qmaildir) if [ "$2" != "" ]; then shift ; fi ; QMAILDIR="$1" ;; - --bindir) if [ "$2" != "" ] ; then shift ; fi ; BINDIR="$1" ;; -- --user|--admin) if [ "$2" != "" ] ; then shift ; fi ; USERNAME="$1" ;; -- --domain) if [ "$2" != "" ] ; then shift ; fi ; MAILDOMAIN="$1" ;; -+ --admin|--user) if [ "$2" != "" ] ; then shift ; fi ; ADMIN_MAIL=`echo $1 | sed 's/@/\\\\@/'` ;; -+ --admin-realname) if [ "$2" != "" ] ; then shift ; fi ; ADMIN_REALNAME="$1" ;; -+ --spams-redirect) if [ "$2" != "" ] ; then shift ; fi ; SPAMS_REDIRECT=`echo $1 | sed 's/@/\\\\@/'` ;; -+ --spams-tosuffix) if [ "$2" != "" ] ; then shift ; fi ; SPAMS_TOSUFFIX="$1" ;; - --notify) if [ "$2" != "" ]; then shift ; fi ; NOTIFY_ADDRESSES="$1" ;; - --batch) DONOTCONFIRM="1" ; if [ "$2" != "" -a "`echo $2|grep '\-'`" = "" ] ; then shift ; fi ;; - --silent-viruses) if [ "$2" != "" ]; then shift ; fi ; FIND_SILENT_VIRUSES="$1" ;; -@@ -138,9 +142,17 @@ - --spooldir <spooldir> defaults to $AS_QQ/ - --bindir <installdir> where to install qmail-scanner-queue.pl - Defaults to /var/qmail/bin/ -- --admin <username> user to Email alerts to (default: $USERNAME) -- --domain <domain name> "user"@"domain" makes up Email address -- to Email alerts to. -+ --admin <email> email to send alerts to (default: $ADMIN_MAIL) -+ --admin-realname <...> realname for sending alerts -+ Defaults to "$ADMIN_REALNAME" -+ nb: use '_' instead of ' ' (sorry for inconvenience) -+ --spams-redirect <email> email to redirect detected spams to -+ Defaults to empty (no redirection) -+ --spams-tosuffix <suffix> suffix to alter recipient with -+ i.e. recipient user@domain -+ will be transform into user-suffix@domain -+ Defaults to empty (do not alter recipients) -+ nb: 'spams-admin' option has precedence on this - --scanners <list of installed content scanners> - Defaults to "auto" - will use - whatever scanners are found on system. -@@ -910,7 +922,7 @@ - #Test to see if spamc is calling Unix sockets instead of TCP - SPAMD_SOCKET=`ps -ef 2>/dev/null|egrep 'spamd.*socket'|grep -v grep|sed -e 's/^.*socketpath=//'|awk '{print $1}'` - if [ "$SPAMD_SOCKET" = "" ]; then -- SPAMD_SOCKET=`ps aux 2>/dev/null|egrep 'spamd.*socket'|grep -v grep|sed -e 's/^.*socketpath=//'|awk '{print $1}'` -+ SPAMD_SOCKET=`ps auxwww 2>/dev/null|egrep 'spamd.*socket'|grep -v grep|sed -e 's/^.*socketpath[\ |=]//'|awk '{print $1}'` - fi - if [ "$SPAMD_SOCKET" != "" -a -S "$SPAMD_SOCKET" ]; then - SPAMC_BINARY="$SPAMC_BINARY -U $SPAMD_SOCKET" -@@ -1005,9 +1017,14 @@ - - MAILDOMAIN=${MAILDOMAIN:-$FQDN} - LOCAL_DOMAINS_ARRAY=${LOCAL_DOMAINS_ARRAY:-$MAILDOMAIN} --CMDLINE="$0 --spooldir $AS_QQ --qmaildir $QMAILDIR --bindir $BINDIR --qmail-queue-binary $QMAILQUEUE_BIN --admin $USERNAME --domain $MAILDOMAIN --notify $NOTIFY_ADDRESSES --local-domains $LOCAL_DOMAINS_ARRAY --silent-viruses $SILENT_VIRUSES --lang $QSLANG --debug $DEBUG_LEVEL --unzip $FORCE_UNZIP --block-password-protected $QUARANTINE_PASSWORD_PROTECTED --add-dscr-hdrs $DESCRIPTIVE_HEADERS --archive $ARCHIVEIT --redundant $REDUNDANT --log-details $LOG_DETAILS --log-crypto $LOG_CRYPTO --fix-mime $FIX_MIME --ignore-eol-check $DISABLE_EOL_CHECK --scanners \"$SCANNERS\"" -- -+CMDLINE="$0 --spooldir $AS_QQ --qmaildir $QMAILDIR --bindir $BINDIR --qmail-queue-binary $QMAILQUEUE_BIN --admin $ADMIN_MAIL --admin-realname \"$ADMIN_REALNAME\" --domain $MAILDOMAIN --notify $NOTIFY_ADDRESSES --local-domains $LOCAL_DOMAINS_ARRAY --silent-viruses $SILENT_VIRUSES --lang $QSLANG --debug $DEBUG_LEVEL --unzip $FORCE_UNZIP --block-password-protected $QUARANTINE_PASSWORD_PROTECTED --add-dscr-hdrs $DESCRIPTIVE_HEADERS --archive $ARCHIVEIT --redundant $REDUNDANT --log-details $LOG_DETAILS --log-crypto $LOG_CRYPTO --fix-mime $FIX_MIME --ignore-eol-check $DISABLE_EOL_CHECK --scanners \"$SCANNERS\"" - -+if [ -n "$SPAMS_REDIRECT" ]; then -+ CMDLINE="$CMDLINE --spams-redirect $SPAMS_REDIRECT" -+fi -+if [ -n "$SPAMS_TOSUFFIX" ]; then -+ CMDLINE="$CMDLINE --spams-tosuffix $SPAMS_TOSUFFIX" -+fi - if [ "$MANUAL_INSTALL" = "1" ]; then - CMDLINE="$CMDLINE --no-QQ-check $MANUAL_INSTALL" - fi -@@ -1381,7 +1398,7 @@ - fi - fi - --USERNAME=${USERNAME:-$LOGNAME} -+ADMIN_MAIL=${ADMIN_MAIL:-$LOGNAME} - - SCANNER_ARRAY=`echo $SCANNER_ARRAY|sed 's/^,//g'` - -@@ -1461,7 +1478,13 @@ - fi - echo "archiving $ASTRING into $AS_QQ/$ARCHIVEDIR/" - fi --echo "virus-admin=$USERNAME@$MAILDOMAIN" -+echo "admin=$ADMIN_MAIL" -+if [ -n "$SPAMS_REDIRECT" ]; then -+ echo "spams-admin=$SPAMS_REDIRECT" -+fi -+if [ -n "$SPAMS_TOSUFFIX" ]; then -+ echo "spams-suffix=$SPAMS_TOSUFFIX" -+fi - echo "local-domains=$LOCAL_DOMAINS_ARRAY" - echo "silent-viruses=$FIND_SILENT_VIRUSES_ARRAY" - echo "scanners=$SCANNER_ARRAY" -@@ -1623,10 +1646,12 @@ - s?SPAMC_BINARY?$SPAMC_BINARY?g; - s?SPAMC_OPTIONS?$SPAMC_OPTIONS?g; - s?SPAMC_SUBJECT?$SPAMC_SUBJECT?g; --s?USERNAME?$USERNAME?g; -+s?ADMIN_MAIL?$ADMIN_MAIL?g; -+s?ADMIN_REALNAME?$ADMIN_REALNAME?g; -+s?SPAMS_REDIRECT?$SPAMS_REDIRECT?g; -+s?SPAMS_TOSUFFIX?$SPAMS_TOSUFFIX?g; - s?SKIP_TEXT_MSGS?$SKIP_TEXT_MSGS?g; - s?FQDN?$FQDN?g; --s?MAILDOMAIN?$MAILDOMAIN?g; - s?LOCAL_DOMAINS_ARRAY?$LOCAL_DOMAINS_ARRAY?g; - s?NOTIFY_ADDRESSES?$NOTIFY_ADDRESSES?g; - s?FIND?$FIND?g; diff --git a/mail/qmail-scanner1/files/patch-qmail-scanner-queue.template b/mail/qmail-scanner1/files/patch-qmail-scanner-queue.template deleted file mode 100644 index ad2728979032..000000000000 --- a/mail/qmail-scanner1/files/patch-qmail-scanner-queue.template +++ /dev/null @@ -1,51 +0,0 @@ ---- qmail-scanner-queue.template.orig Wed Mar 10 21:02:05 2004 -+++ qmail-scanner-queue.template Mon Mar 15 01:26:52 2004 -@@ -85,11 +85,17 @@ - - - #From: line information used when making reports --my $V_FROM='USERNAME@MAILDOMAIN'; --my $V_FROMNAME='System Anti-Virus Administrator'; -+my $V_FROM='ADMIN_MAIL'; -+my $V_FROMNAME='ADMIN_REALNAME'; - - # Address carbon-copied on any virus reports --my $QUARANTINE_CC='USERNAME@MAILDOMAIN'; -+my $QUARANTINE_CC='ADMIN_MAIL'; -+ -+# Address to where spams are redirected -+my $SPAMSADMIN='SPAMS_REDIRECT'; -+ -+# Suffix to alter recipients with (when spam detected) -+my $SPAMSSUFFIX='SPAMS_TOSUFFIX'; - - #Array of local domains that are checked against for - #deciding whether or not to send recipient alerts to -@@ -302,6 +308,7 @@ - } - - my ($quarantine_event,$quarantine_event_tmp,$quarantine_DOS)=0; -+my $spam_event=0; - - my $file_id = &uniq_id(); - -@@ -424,7 +431,18 @@ - &email_quarantine_report; - } else { - &qmail_parent_check; -- &qmail_requeue($env_returnpath,$env_recips,"$scandir/$wmaildir/new/$file_id"); -+ if ($spam_event) { -+ if ($SPAMSADMIN) { -+ &qmail_requeue($env_returnpath,"T$SPAMSADMIN\0\0","$scandir/$wmaildir/new/$file_id"); -+ } elsif ($SPAMSSUFFIX) { -+ $env_recips =~ s/\@/\-$SPAMSSUFFIX\@/g; -+ &qmail_requeue($env_returnpath,$env_recips,"$scandir/$wmaildir/new/$file_id"); -+ } else { -+ &qmail_requeue($env_returnpath,$env_recips,"$scandir/$wmaildir/new/$file_id"); -+ } -+ } else { -+ &qmail_requeue($env_returnpath,$env_recips,"$scandir/$wmaildir/new/$file_id"); -+ } - } - alarm 0; - }; diff --git a/mail/qmail-scanner1/files/patch-sub-spamassassin.pl b/mail/qmail-scanner1/files/patch-sub-spamassassin.pl deleted file mode 100644 index 8daf87ded5c2..000000000000 --- a/mail/qmail-scanner1/files/patch-sub-spamassassin.pl +++ /dev/null @@ -1,10 +0,0 @@ ---- sub-spamassassin.pl.orig Thu Dec 4 22:17:55 2003 -+++ sub-spamassassin.pl Mon Mar 15 01:27:28 2004 -@@ -61,6 +61,7 @@ - $tag_score .= "SA:1($sa_score/$sa_max):"; - $sa_comment = "Yes, hits=$sa_score required=$sa_max" if ($sa_fast); - &debug("SA: yup, this smells like SPAM"); -+ $spam_event = 1; - } - if ($sa_score > 0) { - $sa_score=int($sa_score); diff --git a/mail/qmail-scanner1/pkg-descr b/mail/qmail-scanner1/pkg-descr deleted file mode 100644 index e1a3e30d6f0e..000000000000 --- a/mail/qmail-scanner1/pkg-descr +++ /dev/null @@ -1,11 +0,0 @@ -Qmail-Scanner is e-mail content scanner that enables a qmail server to -scan all messages it receives for certain characteristics (normally viruses), -and react accordingly. - -If you have a commercial virus scanner (eg, Sophos sweep, McAfee -uvscan, etc) installed when you build qmail-scanner, qmail-scanner -will configure itself to use that. Otherwise, it will only use its -internal content filter which only allows you to block mail based -on text in the subject/body, general types of attachments, etc. - -WWW: http://qmail-scanner.sourceforge.net/ diff --git a/mail/qmail-scanner1/pkg-install b/mail/qmail-scanner1/pkg-install deleted file mode 100644 index e42be90badcb..000000000000 --- a/mail/qmail-scanner1/pkg-install +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/sh - -CHMOD=/bin/chmod -CHOWN=/usr/sbin/chown -MKDIR=/bin/mkdir -PW=/usr/sbin/pw - -GU_ID=98 -GU_NAME=qscand - -PREFIX=${PKG_PREFIX} -SPOOLDIR=${PREFIX}/qmailscan - -case "$2" in -PRE-INSTALL) - # User and group - ${PW} groupshow -n ${GU_NAME} >/dev/null 2>&1 \ - || ${PW} groupadd -n ${GU_NAME} -g ${GU_ID} - ${PW} usershow -n ${GU_NAME} >/dev/null 2>&1 \ - || ${PW} useradd ${GU_NAME} -g ${GU_NAME} -u ${GU_ID} -s /sbin/nologin - ${MKDIR} -p ${SPOOLDIR} - ${MKDIR} -p ${PREFIX}/share/examples/qs2mrtg - ;; -POST-INSTALL) - # Directories - for i in quarantine working archives; do - for j in tmp cur new; do - ${MKDIR} -p ${SPOOLDIR}/$i/$j - done - done - ${MKDIR} -p ${SPOOLDIR}/tmp - - # Mod and owner - ${CHOWN} -R ${GU_NAME}:${GU_NAME} ${SPOOLDIR} - ${CHOWN} ${GU_NAME}:${GU_NAME} ${PREFIX}/bin/qmail-scanner-queue.pl - ${CHMOD} 4755 ${PREFIX}/bin/qmail-scanner-queue.pl - - # Initialize - ${PREFIX}/bin/qmail-scanner-queue.pl -z - ${PREFIX}/bin/qmail-scanner-queue.pl -g - - # Mod and owner (final) - ${CHOWN} -R ${GU_NAME}:${GU_NAME} ${SPOOLDIR} - ;; -esac diff --git a/mail/qmail-scanner1/pkg-message b/mail/qmail-scanner1/pkg-message deleted file mode 100644 index e61b55935bea..000000000000 --- a/mail/qmail-scanner1/pkg-message +++ /dev/null @@ -1,12 +0,0 @@ -**************************************************** -NOTES: - - You have to configure your anti-virus and anti-spams products! - - You HAVE to reinstall this port each time you add or remove one! - -Now, you have to modify your qmail startup files to call qmail-scanner. -In most case, you just need to add: - export QMAILQUEUE="${PREFIX}/bin/qmail-scanner-queue.pl" -to your tcpserver startup file. - -You can test installation by running 'make test' in port dir. -**************************************************** diff --git a/mail/qmail-scanner1/pkg-plist b/mail/qmail-scanner1/pkg-plist deleted file mode 100644 index 4eaf88befb04..000000000000 --- a/mail/qmail-scanner1/pkg-plist +++ /dev/null @@ -1,17 +0,0 @@ -@comment $FreeBSD$ -bin/qmail-scanner-queue.pl -bin/qs2mrtg.pl -share/examples/qs2mrtg/mrtg-qmail-scanner.cfg -%%SPOOLDIR%%/quarantine-attachments.sample -@unexec if cmp -s %%SPOOLDIR%%/quarantine-attachments.txt %%SPOOLDIR%%/quarantine-attachments.sample; then rm -f %%SPOOLDIR%%/quarantine-attachments.txt; fi -@unexec rmdir share/examples/qs2mrtg 2>/dev/null || true -@unexec rmdir %%SPOOLDIR%%/archives/cur 2>/dev/null || true -@unexec rmdir %%SPOOLDIR%%/archives/new 2>/dev/null || true -@unexec rmdir %%SPOOLDIR%%/archives/tmp 2>/dev/null || true -@unexec rmdir %%SPOOLDIR%%/archives 2>/dev/null || true -@unexec rmdir %%SPOOLDIR%%/quarantine/cur 2>/dev/null || true -@unexec rmdir %%SPOOLDIR%%/quarantine/new 2>/dev/null || true -@unexec rmdir %%SPOOLDIR%%/quarantine/tmp 2>/dev/null || true -@unexec rmdir %%SPOOLDIR%%/quarantine 2>/dev/null || true -@unexec rmdir %%SPOOLDIR%%/tmp 2>/dev/null || true -@unexec rmdir %%SPOOLDIR%% 2>/dev/null || true diff --git a/mail/qmhandle/Makefile b/mail/qmhandle/Makefile deleted file mode 100644 index d2bfb860ac20..000000000000 --- a/mail/qmhandle/Makefile +++ /dev/null @@ -1,50 +0,0 @@ -# New ports collection makefile for: qmHandle -# Date created: 17 August 2001 -# Whom: petef -# -# $FreeBSD$ -# - -PORTNAME= qmHandle -PORTVERSION= 1.2.0 -PORTREVISION= 1 -CATEGORIES= mail -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= qmhandle -DISTNAME= qmhandle-${PORTVERSION} - -MAINTAINER= petef@FreeBSD.org -COMMENT= Tool to view and manage a qmail queue - -RUN_DEPENDS= ${QMAIL_DIR}/bin/qmail-qstat:${PORTSDIR}/mail/qmail - -NO_WRKSUBDIR= yes -NO_BUILD= yes -USE_PERL5= yes - -.if exists(${LOCALBASE}/qmail/bin/qmail-qstat) -QMAIL_DIR?= ${LOCALBASE}/qmail -.else -QMAIL_DIR?= /var/qmail -.endif - -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500601 -IGNORE= Port requires perl 5.6.1 or later. Install lang/perl5 then try again -.endif - -post-patch: - @${PERL} -pi -e 's,^#!/usr/bin/perl,#!${PERL},; \ - s,%%LOCALBASE%%,${LOCALBASE},g' ${WRKSRC}/qmHandle - -do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/qmHandle ${PREFIX}/bin -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} -.for file in HISTORY README - ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} -.endfor -.endif - -.include <bsd.port.post.mk> diff --git a/mail/qmhandle/distinfo b/mail/qmhandle/distinfo deleted file mode 100644 index d26efe160d31..000000000000 --- a/mail/qmhandle/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (qmhandle-1.2.0.tar.gz) = 0d2b5f1756d7641a8a8054e29e1b9747 -SIZE (qmhandle-1.2.0.tar.gz) = 13134 diff --git a/mail/qmhandle/files/patch-qmHandle b/mail/qmhandle/files/patch-qmHandle deleted file mode 100644 index e0b05bfe1b91..000000000000 --- a/mail/qmhandle/files/patch-qmHandle +++ /dev/null @@ -1,34 +0,0 @@ -$FreeBSD$ - ---- qmHandle.orig Thu Jan 16 10:05:21 2003 -+++ qmHandle Thu Jan 16 10:31:33 2003 -@@ -26,8 +26,12 @@ - #my ($startqmail) = '/usr/local/bin/svc -u /service/qmail-send'; - - # While this is if you have a Debian GNU/Linux with its qmail package --my ($stopqmail) = '/etc/init.d/qmail stop'; --my ($startqmail) = '/etc/init.d/qmail start'; -+#my ($stopqmail) = '/etc/init.d/qmail stop'; -+#my ($startqmail) = '/etc/init.d/qmail start'; -+ -+# This is if you have FreeBSD with its qmail package -+my ($stopqmail) = '%%LOCALBASE%%/etc/rc.d/qmail.sh stop'; -+my ($startqmail) = '%%LOCALBASE%%/etc/rc.d/qmail.sh start'; - - # If you don't have scripts, leave $stopqmail blank (the process will - # be hunted and killed by qmHandle): -@@ -43,7 +47,10 @@ - ##### - # Enter here the system command which returns qmail PID. The following - # should work on most Unixes: --my ($pidcmd) = 'pidof qmail-send'; -+#my ($pidcmd) = 'pidof qmail-send'; -+# This is for FreeBSD with a standard qmail installation: -+my ($pidcmd) = 'ps -U qmails | grep qmail-send | cut -s -d " " -f 1'; -+ - - #################### USER CONFIGURATION END #################### - - - - diff --git a/mail/qmhandle/pkg-descr b/mail/qmhandle/pkg-descr deleted file mode 100644 index 9802349bd5de..000000000000 --- a/mail/qmhandle/pkg-descr +++ /dev/null @@ -1,15 +0,0 @@ -qmHandle is a simple program which allows you to view and manage a qmail -message queue. - -The key features of qmHandle are: - * You can read the qmail queue, like you do with the qmail-qread program. - However, the output of this program is improved over qmail-qread, with - the output of the message subjects and color capabilities; - * You can print queue statistics, like qmail-qstat, with color capabilities; - * You can view a message in the queue; - * You can remove a message from the queue. - -WWW: http://qmhandle.sourceforge.net/ - -- Pete -petef@FreeBSD.org diff --git a/mail/qmhandle/pkg-plist b/mail/qmhandle/pkg-plist deleted file mode 100644 index 2bb092b008dd..000000000000 --- a/mail/qmhandle/pkg-plist +++ /dev/null @@ -1,4 +0,0 @@ -bin/qmHandle -%%PORTDOCS%%share/doc/qmHandle/HISTORY -%%PORTDOCS%%share/doc/qmHandle/README -%%PORTDOCS%%@dirrm share/doc/qmHandle diff --git a/mail/rubygem-tmail/Makefile b/mail/rubygem-tmail/Makefile deleted file mode 100644 index df16ca7f2266..000000000000 --- a/mail/rubygem-tmail/Makefile +++ /dev/null @@ -1,40 +0,0 @@ -# New ports collection makefile for: Ruby-TMail -# Date created: 22 Aug 2000 -# Whom: Akinori MUSHA aka knu <knu@idaemons.org> -# -# $FreeBSD$ -# - -PORTNAME= tmail -PORTVERSION= 0.10.8 -CATEGORIES= mail ruby -MASTER_SITES= http://www.loveruby.net/archive/%SUBDIR%/ -MASTER_SITE_SUBDIR= ${PORTNAME} -PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX} -DIST_SUBDIR= ruby - -MAINTAINER= knu@FreeBSD.org -COMMENT= A RFC2822/MIME compliant mail manipulating library for Ruby - -USE_RUBY= yes -USE_RUBY_SETUP= yes -USE_RUBY_FEATURES= racc-runtime - -DOCS_EN= Incompatibilities README.en doc.en/* \ - *ChangeLog BUGS TODO -DOCS_JA= Incompatibilities.ja README.ja doc.ja/* - -do-install: -.if !defined(NOPORTDOCS) - ${MKDIR} ${RUBY_MODEXAMPLESDIR} - ${CP} -R ${WRKSRC}/sample/ ${RUBY_MODEXAMPLESDIR}/ - ${MKDIR} ${RUBY_MODDOCDIR}/ja -.for f in ${DOCS_EN} - ${CP} -R ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/ -.endfor -.for f in ${DOCS_JA} - ${CP} -R ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/ja/ -.endfor -.endif - -.include <bsd.port.mk> diff --git a/mail/rubygem-tmail/distinfo b/mail/rubygem-tmail/distinfo deleted file mode 100644 index b771c4833645..000000000000 --- a/mail/rubygem-tmail/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (ruby/tmail-0.10.8.tar.gz) = abd5916459691aec669f1bbf78e201d3 -SIZE (ruby/tmail-0.10.8.tar.gz) = 125752 diff --git a/mail/rubygem-tmail/pkg-descr b/mail/rubygem-tmail/pkg-descr deleted file mode 100644 index 659655c1c621..000000000000 --- a/mail/rubygem-tmail/pkg-descr +++ /dev/null @@ -1,5 +0,0 @@ -TMail is a mail manipulating library for Ruby, with RFC822 and MIME -multipart support. - -Author: Minero Aoki <aamine@loveruby.net> -WWW: http://www.loveruby.net/en/tmail.html diff --git a/mail/rubygem-tmail/pkg-plist b/mail/rubygem-tmail/pkg-plist deleted file mode 100644 index 2349b7f9d884..000000000000 --- a/mail/rubygem-tmail/pkg-plist +++ /dev/null @@ -1,69 +0,0 @@ -%%RUBY_SITEARCHLIBDIR%%/tmail/base64.so -%%RUBY_SITEARCHLIBDIR%%/tmail/scanner_c.so -%%RUBY_SITELIBDIR%%/tmail.rb -@dirrm %%RUBY_SITEARCHLIBDIR%%/tmail -%%RUBY_SITELIBDIR%%/tmail/address.rb -%%RUBY_SITELIBDIR%%/tmail/base64.rb -%%RUBY_SITELIBDIR%%/tmail/compat.rb -%%RUBY_SITELIBDIR%%/tmail/config.rb -%%RUBY_SITELIBDIR%%/tmail/encode.rb -%%RUBY_SITELIBDIR%%/tmail/header.rb -%%RUBY_SITELIBDIR%%/tmail/info.rb -%%RUBY_SITELIBDIR%%/tmail/loader.rb -%%RUBY_SITELIBDIR%%/tmail/mail.rb -%%RUBY_SITELIBDIR%%/tmail/mailbox.rb -%%RUBY_SITELIBDIR%%/tmail/mbox.rb -%%RUBY_SITELIBDIR%%/tmail/net.rb -%%RUBY_SITELIBDIR%%/tmail/obsolete.rb -%%RUBY_SITELIBDIR%%/tmail/parser.rb -%%RUBY_SITELIBDIR%%/tmail/port.rb -%%RUBY_SITELIBDIR%%/tmail/scanner.rb -%%RUBY_SITELIBDIR%%/tmail/scanner_r.rb -%%RUBY_SITELIBDIR%%/tmail/stringio.rb -%%RUBY_SITELIBDIR%%/tmail/textutils.rb -%%RUBY_SITELIBDIR%%/tmail/tmail.rb -%%RUBY_SITELIBDIR%%/tmail/utils.rb -@dirrm %%RUBY_SITELIBDIR%%/tmail -%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/extract-attachements.rb -%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/from-check.rb -%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/multipart.rb -%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/parse-bench.rb -%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/parse-test.rb -%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/sendmail.rb -%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/data/multipart -%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/data/normal -%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/data/sendtest -%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/data/simple -%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/data/test -%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/data -%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%% -%%PORTDOCS%%%%RUBY_MODDOCDIR%%/0ChangeLog -%%PORTDOCS%%%%RUBY_MODDOCDIR%%/BUGS -%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog -%%PORTDOCS%%%%RUBY_MODDOCDIR%%/Incompatibilities -%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README.en -%%PORTDOCS%%%%RUBY_MODDOCDIR%%/TODO -%%PORTDOCS%%%%RUBY_MODDOCDIR%%/address.html -%%PORTDOCS%%%%RUBY_MODDOCDIR%%/basics.html -%%PORTDOCS%%%%RUBY_MODDOCDIR%%/config.html -%%PORTDOCS%%%%RUBY_MODDOCDIR%%/details.html -%%PORTDOCS%%%%RUBY_MODDOCDIR%%/index.html -%%PORTDOCS%%%%RUBY_MODDOCDIR%%/mail.html -%%PORTDOCS%%%%RUBY_MODDOCDIR%%/mailbox.html -%%PORTDOCS%%%%RUBY_MODDOCDIR%%/port.html -%%PORTDOCS%%%%RUBY_MODDOCDIR%%/tmail.html -%%PORTDOCS%%%%RUBY_MODDOCDIR%%/usage.html -%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/Incompatibilities.ja -%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/README.ja -%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/address.html -%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/basics.html -%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/config.html -%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/details.html -%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/index.html -%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/mail.html -%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/mailbox.html -%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/port.html -%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/tmail.html -%%PORTDOCS%%%%RUBY_MODDOCDIR%%/ja/usage.html -%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%/ja -%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%% diff --git a/mail/squirrelmail-compatibility-plugin1/Makefile b/mail/squirrelmail-compatibility-plugin1/Makefile deleted file mode 100644 index df4e4482cf9b..000000000000 --- a/mail/squirrelmail-compatibility-plugin1/Makefile +++ /dev/null @@ -1,69 +0,0 @@ -# New ports collection makefile for: squirrelmail-compatibility-plugin -# Date created: 3 Jul 2005 -# Whom: Alexander Wittig <alexander@wittig.name> -# -# $FreeBSD$ - -PORTNAME= squirrelmail-${SQUIRREL_PLUGIN_NAME}-plugin -PORTVERSION= 2.0 -CATEGORIES= mail www -MASTER_SITES= http://www.squirrelmail.org/plugins/ -DISTNAME= ${SQUIRREL_PLUGIN_NAME}-${PORTVERSION} -DIST_SUBDIR= squirrelmail - -MAINTAINER= alexander@wittig.name -COMMENT= Required by many plugins for compatibility with SquirrelMail - -RUN_DEPENDS= ${SQUIRRELDIR}/index.php:${PORTSDIR}/mail/squirrelmail - -SQUIRREL_PLUGIN_NAME= compatibility - -.ifdef SQUIRRELDIR -PLIST_SUB+= SQUIRRELDIR=${SQUIRRELDIR} -.else -. ifndef WITHOUT_WWWDIR -SQUIRRELDIR= ${PREFIX}/www/squirrelmail -PLIST_SUB+= SQUIRRELDIR=www/squirrelmail -. else -SQUIRRELDIR= ${PREFIX}/squirrelmail -PLIST_SUB+= SQUIRRELDIR=squirrelmail -. endif -.endif - -NO_BUILD= yes -NO_WRKSUBDIR= yes -USE_PERL5_BUILD= yes -WANT_PHP_WEB= yes - -pre-everything:: - @${ECHO} "" -.ifndef WITHOUT_ACTIVATE - @${ECHO} "Activating plug-in in SquirrelMail after installation." - @${ECHO} "If you don't want to automatically activate the plug-in set" - @${ECHO} "WITHOUT_ACTIVATE=yes" -.else - @${ECHO} "NOT Activating plug-in in SquirrelMail after installation." - @${ECHO} "If you want to automatically activate the plug-in unset" - @${ECHO} "WITHOUT_ACTIVATE" -.endif - @${ECHO} "" - -do-install: - ${CP} -rp ${WRKSRC}/${SQUIRREL_PLUGIN_NAME} ${SQUIRRELDIR}/plugins - ${CHOWN} -R ${WWWOWN}:${WWWGRP} ${SQUIRRELDIR}/plugins/${SQUIRREL_PLUGIN_NAME} - -post-install: - @${ECHO} "Patching SquirrelMail for compatibility plugin" - @${ECHO} "" - ${PATCH} -sN -p0 -d ${SQUIRRELDIR}/plugins < ${SQUIRRELDIR}/plugins/compatibility/patches/compatibility_patch-1.4.4.diff - @${ECHO} "" - -.ifndef WITHOUT_ACTIVATE - @${ECHO} "Activating plug-in in SquirrelMail" - ${SQUIRRELDIR}/config/conf.pl --install-plugin ${SQUIRREL_PLUGIN_NAME} -.else - @${ECHO} "To activate the plug-in in SquirrelMail use" - @${ECHO} "${SQUIRRELDIR}/config/conf.pl --install-plugin ${SQUIRREL_PLUGIN_NAME}" -.endif - -.include <bsd.port.mk> diff --git a/mail/squirrelmail-compatibility-plugin1/distinfo b/mail/squirrelmail-compatibility-plugin1/distinfo deleted file mode 100644 index 92169787266b..000000000000 --- a/mail/squirrelmail-compatibility-plugin1/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (squirrelmail/compatibility-2.0.tar.gz) = 8e3c8fc99a6669a1d9de911c2194dc31 -SIZE (squirrelmail/compatibility-2.0.tar.gz) = 15306 diff --git a/mail/squirrelmail-compatibility-plugin1/pkg-descr b/mail/squirrelmail-compatibility-plugin1/pkg-descr deleted file mode 100644 index a37b1c7a2078..000000000000 --- a/mail/squirrelmail-compatibility-plugin1/pkg-descr +++ /dev/null @@ -1,10 +0,0 @@ -SquirrelMail Plug-in that provdies a standard API for plugin authors who need -certain functionalities that may not be available in older versions of -SquirrelMail. SquirrelMail administrators only need to download this plugin if -any of the plugins they have require it. -This plugin has no functionality in and of itself. - -WWW: http://www.squirrelmail.org - -- Alexander Wittig -alexander@wittig.name diff --git a/mail/squirrelmail-compatibility-plugin1/pkg-plist b/mail/squirrelmail-compatibility-plugin1/pkg-plist deleted file mode 100644 index a0c2c6b6e25a..000000000000 --- a/mail/squirrelmail-compatibility-plugin1/pkg-plist +++ /dev/null @@ -1,45 +0,0 @@ -@unexec %D/%%SQUIRRELDIR%%/config/conf.pl --remove-plugin compatibility -@unexec mv -f %D/%%SQUIRRELDIR%%/include/validate.php.orig %D/%%SQUIRRELDIR%%/include/validate.php -@exec mkdir -p %D/%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.1 -@exec mkdir -p %D/%%SQUIRRELDIR%%/plugins/compatibility/includes/1.5.1 -@exec mkdir -p %D/%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.5 -@exec mkdir -p %D/%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.4 -@exec mkdir -p %D/%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.3 -@exec mkdir -p %D/%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.2 -@exec mkdir -p %D/%%SQUIRRELDIR%%/plugins/compatibility/includes/1.5.2 -@exec mkdir -p %D/%%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.0 -%%SQUIRRELDIR%%/plugins/compatibility/includes/1.2.11/global.php -%%SQUIRRELDIR%%/plugins/compatibility/includes/1.2.10/global.php -%%SQUIRRELDIR%%/plugins/compatibility/includes/1.2.9/global.php -%%SQUIRRELDIR%%/plugins/compatibility/includes/1.2.8/global.php -%%SQUIRRELDIR%%/plugins/compatibility/includes/1.2.7/global.php -%%SQUIRRELDIR%%/plugins/compatibility/patches/compatibility_patch-1.4.4.diff -%%SQUIRRELDIR%%/plugins/compatibility/patches/compatibility_patch-1.2.11.diff -%%SQUIRRELDIR%%/plugins/compatibility/README -%%SQUIRRELDIR%%/plugins/compatibility/index.php -%%SQUIRRELDIR%%/plugins/compatibility/version -%%SQUIRRELDIR%%/plugins/compatibility/setup.php -%%SQUIRRELDIR%%/plugins/compatibility/COPYING -%%SQUIRRELDIR%%/plugins/compatibility/make_release.sh -%%SQUIRRELDIR%%/plugins/compatibility/getpot -%%SQUIRRELDIR%%/plugins/compatibility/INSTALL -%%SQUIRRELDIR%%/plugins/compatibility/compatibility.pot -%%SQUIRRELDIR%%/plugins/compatibility/functions.php -@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.1 -@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.5.1 -@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.5 -@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.4 -@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.3 -@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.2 -@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.5.2 -@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.4.0 -@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.2.11 -@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.2.10 -@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.2.9 -@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.2.8 -@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes/1.2.7 -@dirrm %%SQUIRRELDIR%%/plugins/compatibility/includes -@dirrm %%SQUIRRELDIR%%/plugins/compatibility/patches -@dirrm %%SQUIRRELDIR%%/plugins/compatibility -@exec patch -sN -p0 -d %D/%%SQUIRRELDIR%%/plugins < %D/%%SQUIRRELDIR%%/plugins/compatibility/patches/compatibility_patch-1.4.4.diff -@exec %D/%%SQUIRRELDIR%%/config/conf.pl --install-plugin compatibility diff --git a/mail/sylpheed2-devel/Makefile b/mail/sylpheed2-devel/Makefile deleted file mode 100644 index d7397dca1a41..000000000000 --- a/mail/sylpheed2-devel/Makefile +++ /dev/null @@ -1,116 +0,0 @@ -# New ports collection makefile for: sylpheed -# Date created: 15 June 2000 -# Whom: shigeri <shigeri@m10.alpha-net.ne.jp> -# -# $FreeBSD$ -# - -PORTNAME= sylpheed -PORTVERSION= 2.0.0 -PORTREVISION= 0 -CATEGORIES= mail ipv6 -MASTER_SITES= http://sylpheed.good-day.net/sylpheed/v2.0/ \ - ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= sylpheed-claws/ - -MAINTAINER= oliver@FreeBSD.org -COMMENT= A lightweight, featureful, and fast GTK+ based e-mail client - -RUN_DEPENDS= ${LOCALBASE}/etc/mime.types:${PORTSDIR}/misc/mime-support - -USE_BZIP2= yes -USE_GETTEXT= yes -USE_GMAKE= yes -USE_ICONV= yes -USE_X_PREFIX= yes -USE_GNOME= gtk20 -USE_LIBTOOL_VER=15 -USE_REINPLACE= yes - -CONFIGURE_ENV= CPPFLAGS="-I${PREFIX}/include -I${LOCALBASE}/include -I${X11BASE}/include" \ - LIBS="-L${PREFIX}/lib -L${LOCALBASE}/lib -L${X11BASE}/lib" -CONFIGURE_ARGS= --enable-ipv6 \ - --prefix=${PREFIX} \ - --with-libintl-prefix=${LOCALBASE} \ - --program-transform-name='' - -CONFLICTS= sylpheed-1.[0-8]* sylpheed-gtk2-[0-9]* - -OPTIONS= GPGME "Enable GnuPG support using GPGME." off \ - COMPFACE "Enable X-Face support." off \ - JPILOT "Enable JPilot support." off \ - LDAP "Enable LDAP support." off \ - SSL "Enable OpenSSL support." on - -.include <bsd.port.pre.mk> - -.if !defined(WITHOUT_SSL) -# we can't use USE_OPENSSL=yes after including bsd.port.pre.mk -.include "${PORTSDIR}/Mk/bsd.openssl.mk" -CONFIGURE_ARGS+=--enable-ssl -.endif - -.if defined(WITH_GPGME) -LIB_DEPENDS+= gpgme.14:${PORTSDIR}/security/gpgme -RUN_DEPENDS+= gpg:${PORTSDIR}/security/gnupg -CONFIGURE_ARGS+=--enable-gpgme -.else -CONFIGURE_ARGS+=--disable-gpgme -.endif -.if defined(WITH_COMPFACE) -LIB_DEPENDS+= compface.1:${PORTSDIR}/mail/faces -CONFIGURE_ARGS+=--enable-compface -.else -CONFIGURE_ARGS+=--disable-compface -.endif -.if defined(WITH_JPILOT) -LIB_DEPENDS+= pisock.8:${PORTSDIR}/palm/pilot-link -RUN_DEPENDS+= jpilot:${PORTSDIR}/palm/jpilot -CONFIGURE_ARGS+=--enable-jpilot -.else -CONFIGURE_ARGS+=--disable-jpilot -.endif -.if defined(WITH_LDAP) -USE_OPENLDAP= yes -CONFIGURE_ARGS+=--enable-ldap -.else -CONFIGURE_ARGS+=--disable-ldap -.endif -.if !defined(WITHOUT_SSL) -CONFIGURE_ARGS+=--enable-ssl -.else -CONFIGURE_ARGS+=--disable-ssl -.endif - -MAKEFILES= Makefile.in ac/Makefile.in faq/Makefile.in faq/de/Makefile.in \ - faq/en/Makefile.in faq/es/Makefile.in faq/fr/Makefile.in \ - faq/it/Makefile.in manual/Makefile.in manual/en/Makefile.in \ - manual/ja/Makefile.in src/Makefile.in - -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS:S/"//g}|g; \ - s|-lresolv||g; s|-lpisock\"|-liconv &|g; ' ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|/etc|${LOCALBASE}&|g' \ - ${WRKSRC}/src/procmime.c - -.if defined(NOPORTDOCS) - @${REINPLACE_CMD} -e 's|^SUBDIRS = ac po intl src manual faq$$|SUBDIRS = ac po intl src|g' \ - ${WRKSRC}/Makefile.in -.else -.for i in ${MAKEFILES} - @${REINPLACE_CMD} -e 's|^faqdir = @faqdir@$$|faqdir = ${DOCSDIR}/faq|g; \ - s|^manualdir = @manualdir@$$|manualdir = ${DOCSDIR}/manual|g' \ - ${WRKSRC}/${i} -.endfor -.endif - -post-install: -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} -.for i in ChangeLog INSTALL README TODO - @${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/${i}.ja ${DOCSDIR} -.endfor -.endif - -.include <bsd.port.post.mk> diff --git a/mail/sylpheed2-devel/distinfo b/mail/sylpheed2-devel/distinfo deleted file mode 100644 index 27587a919247..000000000000 --- a/mail/sylpheed2-devel/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (sylpheed-2.0.0.tar.bz2) = a7754f8820814089229b1ab5f0e4d855 -SIZE (sylpheed-2.0.0.tar.bz2) = 2331583 diff --git a/mail/sylpheed2-devel/files/patch-ac b/mail/sylpheed2-devel/files/patch-ac deleted file mode 100644 index 86cde54e6a53..000000000000 --- a/mail/sylpheed2-devel/files/patch-ac +++ /dev/null @@ -1,22 +0,0 @@ ---- src/defs.h.orig Mon Sep 3 01:07:32 2001 -+++ src/defs.h Mon Sep 3 04:50:35 2001 -@@ -58,8 +58,8 @@ - #define MARK_VERSION 2 - - #define DEFAULT_SIGNATURE ".signature" --#define DEFAULT_INC_PATH "/usr/bin/mh/inc" --#define DEFAULT_INC_PROGRAM "inc" -+#define DEFAULT_INC_PATH "" -+#define DEFAULT_INC_PROGRAM "" - /* #define DEFAULT_INC_PATH "/usr/bin/imget" */ - /* #define DEFAULT_INC_PROGRAM "imget" */ - #define DEFAULT_SENDMAIL_CMD "/usr/sbin/sendmail -t" -@@ -67,7 +67,7 @@ - #ifdef _PATH_MAILDIR - # define DEFAULT_SPOOL_PATH _PATH_MAILDIR - #else --# define DEFAULT_SPOOL_PATH "/var/spool/mail" -+# define DEFAULT_SPOOL_PATH "/var/mail" - #endif - - #define BUFFSIZE 8192 diff --git a/mail/sylpheed2-devel/pkg-descr b/mail/sylpheed2-devel/pkg-descr deleted file mode 100644 index 3107ae5ca582..000000000000 --- a/mail/sylpheed2-devel/pkg-descr +++ /dev/null @@ -1,12 +0,0 @@ -Sylpheed is an e-mail client (and news reader) based on GTK+ 2, running on -X Window System, and aiming for: - * Quick response - * Graceful, and sophisticated interface - * Easy configuration, intuitive operation - * Abundant features - -Currently, many features are supported including POP3, IMAP, NNTP, -multiple accounts, threading, filtering, MIME attachments, APOP, SMTP -AUTH, SSL, IPv6, GnuPG, internalization, and more. - -WWW: http://sylpheed.good-day.net/ diff --git a/mail/sylpheed2-devel/pkg-plist b/mail/sylpheed2-devel/pkg-plist deleted file mode 100644 index e26db6784e9e..000000000000 --- a/mail/sylpheed2-devel/pkg-plist +++ /dev/null @@ -1,112 +0,0 @@ -bin/sylpheed -%%PORTDOCS%%%%DOCSDIR%%/ChangeLog -%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.ja -%%PORTDOCS%%%%DOCSDIR%%/INSTALL -%%PORTDOCS%%%%DOCSDIR%%/INSTALL.ja -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/README.ja -%%PORTDOCS%%%%DOCSDIR%%/TODO -%%PORTDOCS%%%%DOCSDIR%%/TODO.ja -share/locale/cs/LC_MESSAGES/sylpheed.mo -share/locale/bg/LC_MESSAGES/sylpheed.mo -share/locale/da/LC_MESSAGES/sylpheed.mo -share/locale/de/LC_MESSAGES/sylpheed.mo -share/locale/el/LC_MESSAGES/sylpheed.mo -share/locale/es/LC_MESSAGES/sylpheed.mo -share/locale/et/LC_MESSAGES/sylpheed.mo -share/locale/fr/LC_MESSAGES/sylpheed.mo -share/locale/gl/LC_MESSAGES/sylpheed.mo -share/locale/hr/LC_MESSAGES/sylpheed.mo -share/locale/hu/LC_MESSAGES/sylpheed.mo -share/locale/it/LC_MESSAGES/sylpheed.mo -share/locale/ja/LC_MESSAGES/sylpheed.mo -share/locale/ko/LC_MESSAGES/sylpheed.mo -share/locale/lt/LC_MESSAGES/sylpheed.mo -share/locale/nl/LC_MESSAGES/sylpheed.mo -share/locale/pl/LC_MESSAGES/sylpheed.mo -share/locale/pt_BR/LC_MESSAGES/sylpheed.mo -share/locale/ro/LC_MESSAGES/sylpheed.mo -share/locale/ru/LC_MESSAGES/sylpheed.mo -share/locale/sk/LC_MESSAGES/sylpheed.mo -share/locale/sl/LC_MESSAGES/sylpheed.mo -share/locale/sr/LC_MESSAGES/sylpheed.mo -share/locale/sv/LC_MESSAGES/sylpheed.mo -share/locale/tr/LC_MESSAGES/sylpheed.mo -share/locale/uk/LC_MESSAGES/sylpheed.mo -share/locale/zh_CN/LC_MESSAGES/sylpheed.mo -share/locale/zh_TW.Big5/LC_MESSAGES/sylpheed.mo -%%PORTDOCS%%%%DOCSDIR%%/faq/de/sylpheed-faq-1.html -%%PORTDOCS%%%%DOCSDIR%%/faq/de/sylpheed-faq-2.html -%%PORTDOCS%%%%DOCSDIR%%/faq/de/sylpheed-faq-3.html -%%PORTDOCS%%%%DOCSDIR%%/faq/de/sylpheed-faq.html -%%PORTDOCS%%%%DOCSDIR%%/faq/en/sylpheed-faq-1.html -%%PORTDOCS%%%%DOCSDIR%%/faq/en/sylpheed-faq-2.html -%%PORTDOCS%%%%DOCSDIR%%/faq/en/sylpheed-faq-3.html -%%PORTDOCS%%%%DOCSDIR%%/faq/en/sylpheed-faq.html -%%PORTDOCS%%%%DOCSDIR%%/faq/es/sylpheed-faq-1.html -%%PORTDOCS%%%%DOCSDIR%%/faq/es/sylpheed-faq-2.html -%%PORTDOCS%%%%DOCSDIR%%/faq/es/sylpheed-faq-3.html -%%PORTDOCS%%%%DOCSDIR%%/faq/es/sylpheed-faq.html -%%PORTDOCS%%%%DOCSDIR%%/faq/fr/sylpheed-faq-1.html -%%PORTDOCS%%%%DOCSDIR%%/faq/fr/sylpheed-faq-2.html -%%PORTDOCS%%%%DOCSDIR%%/faq/fr/sylpheed-faq-3.html -%%PORTDOCS%%%%DOCSDIR%%/faq/fr/sylpheed-faq.html -%%PORTDOCS%%%%DOCSDIR%%/faq/it/sylpheed-faq-1.html -%%PORTDOCS%%%%DOCSDIR%%/faq/it/sylpheed-faq-2.html -%%PORTDOCS%%%%DOCSDIR%%/faq/it/sylpheed-faq-3.html -%%PORTDOCS%%%%DOCSDIR%%/faq/it/sylpheed-faq.html -%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-1.html -%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-10.html -%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-11.html -%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-12.html -%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-13.html -%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-14.html -%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-15.html -%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-16.html -%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-17.html -%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-18.html -%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-19.html -%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-2.html -%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-20.html -%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-3.html -%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-4.html -%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-5.html -%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-6.html -%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-7.html -%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-8.html -%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-9.html -%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed.html -%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-1.html -%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-10.html -%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-11.html -%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-12.html -%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-13.html -%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-14.html -%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-15.html -%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-16.html -%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-17.html -%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-18.html -%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-19.html -%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-2.html -%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-20.html -%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-3.html -%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-4.html -%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-5.html -%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-6.html -%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-7.html -%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-8.html -%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-9.html -%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed.html -%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed.sgml -%%PORTDOCS%%@dirrm %%DOCSDIR%%/manual/ja -%%PORTDOCS%%@dirrm %%DOCSDIR%%/manual/en -%%PORTDOCS%%@dirrm %%DOCSDIR%%/manual -%%PORTDOCS%%@dirrm %%DOCSDIR%%/faq/it -%%PORTDOCS%%@dirrm %%DOCSDIR%%/faq/fr -%%PORTDOCS%%@dirrm %%DOCSDIR%%/faq/es -%%PORTDOCS%%@dirrm %%DOCSDIR%%/faq/en -%%PORTDOCS%%@dirrm %%DOCSDIR%%/faq/de -%%PORTDOCS%%@dirrm %%DOCSDIR%%/faq -%%PORTDOCS%%@dirrm %%DOCSDIR%% -@unexec rmdir %D/share/locale/lt/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/lt 2>/dev/null || true diff --git a/mail/sylpheed3/Makefile b/mail/sylpheed3/Makefile deleted file mode 100644 index d7397dca1a41..000000000000 --- a/mail/sylpheed3/Makefile +++ /dev/null @@ -1,116 +0,0 @@ -# New ports collection makefile for: sylpheed -# Date created: 15 June 2000 -# Whom: shigeri <shigeri@m10.alpha-net.ne.jp> -# -# $FreeBSD$ -# - -PORTNAME= sylpheed -PORTVERSION= 2.0.0 -PORTREVISION= 0 -CATEGORIES= mail ipv6 -MASTER_SITES= http://sylpheed.good-day.net/sylpheed/v2.0/ \ - ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= sylpheed-claws/ - -MAINTAINER= oliver@FreeBSD.org -COMMENT= A lightweight, featureful, and fast GTK+ based e-mail client - -RUN_DEPENDS= ${LOCALBASE}/etc/mime.types:${PORTSDIR}/misc/mime-support - -USE_BZIP2= yes -USE_GETTEXT= yes -USE_GMAKE= yes -USE_ICONV= yes -USE_X_PREFIX= yes -USE_GNOME= gtk20 -USE_LIBTOOL_VER=15 -USE_REINPLACE= yes - -CONFIGURE_ENV= CPPFLAGS="-I${PREFIX}/include -I${LOCALBASE}/include -I${X11BASE}/include" \ - LIBS="-L${PREFIX}/lib -L${LOCALBASE}/lib -L${X11BASE}/lib" -CONFIGURE_ARGS= --enable-ipv6 \ - --prefix=${PREFIX} \ - --with-libintl-prefix=${LOCALBASE} \ - --program-transform-name='' - -CONFLICTS= sylpheed-1.[0-8]* sylpheed-gtk2-[0-9]* - -OPTIONS= GPGME "Enable GnuPG support using GPGME." off \ - COMPFACE "Enable X-Face support." off \ - JPILOT "Enable JPilot support." off \ - LDAP "Enable LDAP support." off \ - SSL "Enable OpenSSL support." on - -.include <bsd.port.pre.mk> - -.if !defined(WITHOUT_SSL) -# we can't use USE_OPENSSL=yes after including bsd.port.pre.mk -.include "${PORTSDIR}/Mk/bsd.openssl.mk" -CONFIGURE_ARGS+=--enable-ssl -.endif - -.if defined(WITH_GPGME) -LIB_DEPENDS+= gpgme.14:${PORTSDIR}/security/gpgme -RUN_DEPENDS+= gpg:${PORTSDIR}/security/gnupg -CONFIGURE_ARGS+=--enable-gpgme -.else -CONFIGURE_ARGS+=--disable-gpgme -.endif -.if defined(WITH_COMPFACE) -LIB_DEPENDS+= compface.1:${PORTSDIR}/mail/faces -CONFIGURE_ARGS+=--enable-compface -.else -CONFIGURE_ARGS+=--disable-compface -.endif -.if defined(WITH_JPILOT) -LIB_DEPENDS+= pisock.8:${PORTSDIR}/palm/pilot-link -RUN_DEPENDS+= jpilot:${PORTSDIR}/palm/jpilot -CONFIGURE_ARGS+=--enable-jpilot -.else -CONFIGURE_ARGS+=--disable-jpilot -.endif -.if defined(WITH_LDAP) -USE_OPENLDAP= yes -CONFIGURE_ARGS+=--enable-ldap -.else -CONFIGURE_ARGS+=--disable-ldap -.endif -.if !defined(WITHOUT_SSL) -CONFIGURE_ARGS+=--enable-ssl -.else -CONFIGURE_ARGS+=--disable-ssl -.endif - -MAKEFILES= Makefile.in ac/Makefile.in faq/Makefile.in faq/de/Makefile.in \ - faq/en/Makefile.in faq/es/Makefile.in faq/fr/Makefile.in \ - faq/it/Makefile.in manual/Makefile.in manual/en/Makefile.in \ - manual/ja/Makefile.in src/Makefile.in - -post-patch: - @${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS:S/"//g}|g; \ - s|-lresolv||g; s|-lpisock\"|-liconv &|g; ' ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|/etc|${LOCALBASE}&|g' \ - ${WRKSRC}/src/procmime.c - -.if defined(NOPORTDOCS) - @${REINPLACE_CMD} -e 's|^SUBDIRS = ac po intl src manual faq$$|SUBDIRS = ac po intl src|g' \ - ${WRKSRC}/Makefile.in -.else -.for i in ${MAKEFILES} - @${REINPLACE_CMD} -e 's|^faqdir = @faqdir@$$|faqdir = ${DOCSDIR}/faq|g; \ - s|^manualdir = @manualdir@$$|manualdir = ${DOCSDIR}/manual|g' \ - ${WRKSRC}/${i} -.endfor -.endif - -post-install: -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} -.for i in ChangeLog INSTALL README TODO - @${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/${i}.ja ${DOCSDIR} -.endfor -.endif - -.include <bsd.port.post.mk> diff --git a/mail/sylpheed3/distinfo b/mail/sylpheed3/distinfo deleted file mode 100644 index 27587a919247..000000000000 --- a/mail/sylpheed3/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (sylpheed-2.0.0.tar.bz2) = a7754f8820814089229b1ab5f0e4d855 -SIZE (sylpheed-2.0.0.tar.bz2) = 2331583 diff --git a/mail/sylpheed3/files/patch-ac b/mail/sylpheed3/files/patch-ac deleted file mode 100644 index 86cde54e6a53..000000000000 --- a/mail/sylpheed3/files/patch-ac +++ /dev/null @@ -1,22 +0,0 @@ ---- src/defs.h.orig Mon Sep 3 01:07:32 2001 -+++ src/defs.h Mon Sep 3 04:50:35 2001 -@@ -58,8 +58,8 @@ - #define MARK_VERSION 2 - - #define DEFAULT_SIGNATURE ".signature" --#define DEFAULT_INC_PATH "/usr/bin/mh/inc" --#define DEFAULT_INC_PROGRAM "inc" -+#define DEFAULT_INC_PATH "" -+#define DEFAULT_INC_PROGRAM "" - /* #define DEFAULT_INC_PATH "/usr/bin/imget" */ - /* #define DEFAULT_INC_PROGRAM "imget" */ - #define DEFAULT_SENDMAIL_CMD "/usr/sbin/sendmail -t" -@@ -67,7 +67,7 @@ - #ifdef _PATH_MAILDIR - # define DEFAULT_SPOOL_PATH _PATH_MAILDIR - #else --# define DEFAULT_SPOOL_PATH "/var/spool/mail" -+# define DEFAULT_SPOOL_PATH "/var/mail" - #endif - - #define BUFFSIZE 8192 diff --git a/mail/sylpheed3/pkg-descr b/mail/sylpheed3/pkg-descr deleted file mode 100644 index 3107ae5ca582..000000000000 --- a/mail/sylpheed3/pkg-descr +++ /dev/null @@ -1,12 +0,0 @@ -Sylpheed is an e-mail client (and news reader) based on GTK+ 2, running on -X Window System, and aiming for: - * Quick response - * Graceful, and sophisticated interface - * Easy configuration, intuitive operation - * Abundant features - -Currently, many features are supported including POP3, IMAP, NNTP, -multiple accounts, threading, filtering, MIME attachments, APOP, SMTP -AUTH, SSL, IPv6, GnuPG, internalization, and more. - -WWW: http://sylpheed.good-day.net/ diff --git a/mail/sylpheed3/pkg-plist b/mail/sylpheed3/pkg-plist deleted file mode 100644 index e26db6784e9e..000000000000 --- a/mail/sylpheed3/pkg-plist +++ /dev/null @@ -1,112 +0,0 @@ -bin/sylpheed -%%PORTDOCS%%%%DOCSDIR%%/ChangeLog -%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.ja -%%PORTDOCS%%%%DOCSDIR%%/INSTALL -%%PORTDOCS%%%%DOCSDIR%%/INSTALL.ja -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/README.ja -%%PORTDOCS%%%%DOCSDIR%%/TODO -%%PORTDOCS%%%%DOCSDIR%%/TODO.ja -share/locale/cs/LC_MESSAGES/sylpheed.mo -share/locale/bg/LC_MESSAGES/sylpheed.mo -share/locale/da/LC_MESSAGES/sylpheed.mo -share/locale/de/LC_MESSAGES/sylpheed.mo -share/locale/el/LC_MESSAGES/sylpheed.mo -share/locale/es/LC_MESSAGES/sylpheed.mo -share/locale/et/LC_MESSAGES/sylpheed.mo -share/locale/fr/LC_MESSAGES/sylpheed.mo -share/locale/gl/LC_MESSAGES/sylpheed.mo -share/locale/hr/LC_MESSAGES/sylpheed.mo -share/locale/hu/LC_MESSAGES/sylpheed.mo -share/locale/it/LC_MESSAGES/sylpheed.mo -share/locale/ja/LC_MESSAGES/sylpheed.mo -share/locale/ko/LC_MESSAGES/sylpheed.mo -share/locale/lt/LC_MESSAGES/sylpheed.mo -share/locale/nl/LC_MESSAGES/sylpheed.mo -share/locale/pl/LC_MESSAGES/sylpheed.mo -share/locale/pt_BR/LC_MESSAGES/sylpheed.mo -share/locale/ro/LC_MESSAGES/sylpheed.mo -share/locale/ru/LC_MESSAGES/sylpheed.mo -share/locale/sk/LC_MESSAGES/sylpheed.mo -share/locale/sl/LC_MESSAGES/sylpheed.mo -share/locale/sr/LC_MESSAGES/sylpheed.mo -share/locale/sv/LC_MESSAGES/sylpheed.mo -share/locale/tr/LC_MESSAGES/sylpheed.mo -share/locale/uk/LC_MESSAGES/sylpheed.mo -share/locale/zh_CN/LC_MESSAGES/sylpheed.mo -share/locale/zh_TW.Big5/LC_MESSAGES/sylpheed.mo -%%PORTDOCS%%%%DOCSDIR%%/faq/de/sylpheed-faq-1.html -%%PORTDOCS%%%%DOCSDIR%%/faq/de/sylpheed-faq-2.html -%%PORTDOCS%%%%DOCSDIR%%/faq/de/sylpheed-faq-3.html -%%PORTDOCS%%%%DOCSDIR%%/faq/de/sylpheed-faq.html -%%PORTDOCS%%%%DOCSDIR%%/faq/en/sylpheed-faq-1.html -%%PORTDOCS%%%%DOCSDIR%%/faq/en/sylpheed-faq-2.html -%%PORTDOCS%%%%DOCSDIR%%/faq/en/sylpheed-faq-3.html -%%PORTDOCS%%%%DOCSDIR%%/faq/en/sylpheed-faq.html -%%PORTDOCS%%%%DOCSDIR%%/faq/es/sylpheed-faq-1.html -%%PORTDOCS%%%%DOCSDIR%%/faq/es/sylpheed-faq-2.html -%%PORTDOCS%%%%DOCSDIR%%/faq/es/sylpheed-faq-3.html -%%PORTDOCS%%%%DOCSDIR%%/faq/es/sylpheed-faq.html -%%PORTDOCS%%%%DOCSDIR%%/faq/fr/sylpheed-faq-1.html -%%PORTDOCS%%%%DOCSDIR%%/faq/fr/sylpheed-faq-2.html -%%PORTDOCS%%%%DOCSDIR%%/faq/fr/sylpheed-faq-3.html -%%PORTDOCS%%%%DOCSDIR%%/faq/fr/sylpheed-faq.html -%%PORTDOCS%%%%DOCSDIR%%/faq/it/sylpheed-faq-1.html -%%PORTDOCS%%%%DOCSDIR%%/faq/it/sylpheed-faq-2.html -%%PORTDOCS%%%%DOCSDIR%%/faq/it/sylpheed-faq-3.html -%%PORTDOCS%%%%DOCSDIR%%/faq/it/sylpheed-faq.html -%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-1.html -%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-10.html -%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-11.html -%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-12.html -%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-13.html -%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-14.html -%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-15.html -%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-16.html -%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-17.html -%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-18.html -%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-19.html -%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-2.html -%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-20.html -%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-3.html -%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-4.html -%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-5.html -%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-6.html -%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-7.html -%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-8.html -%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed-9.html -%%PORTDOCS%%%%DOCSDIR%%/manual/en/sylpheed.html -%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-1.html -%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-10.html -%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-11.html -%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-12.html -%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-13.html -%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-14.html -%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-15.html -%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-16.html -%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-17.html -%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-18.html -%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-19.html -%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-2.html -%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-20.html -%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-3.html -%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-4.html -%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-5.html -%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-6.html -%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-7.html -%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-8.html -%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed-9.html -%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed.html -%%PORTDOCS%%%%DOCSDIR%%/manual/ja/sylpheed.sgml -%%PORTDOCS%%@dirrm %%DOCSDIR%%/manual/ja -%%PORTDOCS%%@dirrm %%DOCSDIR%%/manual/en -%%PORTDOCS%%@dirrm %%DOCSDIR%%/manual -%%PORTDOCS%%@dirrm %%DOCSDIR%%/faq/it -%%PORTDOCS%%@dirrm %%DOCSDIR%%/faq/fr -%%PORTDOCS%%@dirrm %%DOCSDIR%%/faq/es -%%PORTDOCS%%@dirrm %%DOCSDIR%%/faq/en -%%PORTDOCS%%@dirrm %%DOCSDIR%%/faq/de -%%PORTDOCS%%@dirrm %%DOCSDIR%%/faq -%%PORTDOCS%%@dirrm %%DOCSDIR%% -@unexec rmdir %D/share/locale/lt/LC_MESSAGES 2>/dev/null || true -@unexec rmdir %D/share/locale/lt 2>/dev/null || true diff --git a/mail/thunderbird-devel/Makefile b/mail/thunderbird-devel/Makefile deleted file mode 100644 index 6ad4933af5f7..000000000000 --- a/mail/thunderbird-devel/Makefile +++ /dev/null @@ -1,219 +0,0 @@ -# New ports collection makefile for: mozilla-thunderbird -# Date created: 4 September 2003 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# -# $FreeBSD$ -# - -PORTNAME= thunderbird -PORTVERSION= 1.0.6 -CATEGORIES= mail -MASTER_SITES= ${MASTER_SITE_MOZILLA} -MASTER_SITE_SUBDIR= thunderbird/releases/${PORTVERSION}/source -DISTNAME= ${PORTNAME}-${PORTVERSION}-source - -MAINTAINER= gnome@FreeBSD.org -COMMENT= Mozilla Thunderbird is standalone mail and news that stands above - -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ - png.5:${PORTSDIR}/graphics/png -BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip - -USE_X_PREFIX= yes - -USE_BZIP2= yes -USE_GMAKE= yes -USE_ICONV= yes -USE_PERL5= yes -USE_REINPLACE= yes -HAS_CONFIGURE= yes -NO_MTREE= yes -PLIST= ${WRKDIR}/plist -ALL_TARGET= default -USE_GNOME= gtk20 libidl -CONFIGURE_ENV= LOCALBASE=${LOCALBASE} -PKGINSTALL= ${WRKDIR}/pkg-install -PKGDEINSTALL= ${WRKDIR}/pkg-deinstall -FAKEDIR= ${WRKDIR}/fake - -NO_MTREE= yes -WRKSRC= ${WRKDIR}/mozilla -LOCAL_SUBDIR= lib/${PORTNAME} -LOCAL_PREFIX= ${PREFIX}/${LOCAL_SUBDIR} -ESD_LIB= libesd.so.2 - -THUNDERBIRD= ${PORTNAME} -THUNDERBIRD_ICON= ${LOCAL_PREFIX}/lib/${PORTNAME}-${PORTVERSION}/chrome/icons/default/default.xpm -MOZ_PIS_SCRIPTS= S50cleanhome -SCRIPTS_DIR= ${FAKEDIR}/${LOCAL_SUBDIR}/lib/${PORTNAME}-${PORTVERSION} -MOZ_PIS_DIR= ${SCRIPTS_DIR}/init.d - -OPTIONS= DEBUG "Build a debugging image" off \ - LOGGING "Enable additional log messages" off \ - OPTIMIZED_CFLAGS "Enable some additional optimizations" off \ - XFT "Enable support for anti-aliased fonts" on - -.include <bsd.port.pre.mk> - -.if ${ARCH} == "alpha" && ${OSVERSION} < 500035 -IGNORE= "core dumps at runtime" -.endif # ${ARCH} == "alpha" && ${OSVERSION} < 500035 - -.if ${PERL_LEVEL} < 500600 -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-config_make-jars.pl -.endif # ${PERL_LEVEL} < 500600 - -.if defined(WITH_DEBUG) -WITH_LOGGING= yes -CONFIGURE_ENV+= WITH_DEBUG=yes -.endif # defined(WITH_DEBUG) - -.if defined(WITH_OPTIMIZED_CFLAGS) -CFLAGS:= -O2 -fno-strict-aliasing ${CFLAGS:N-O*} -.else -CFLAGS:= -O ${CFLAGS:N-O*:N-m*} -CONFIGURE_ENV+= WITH_OPTIMIZE=-O -.endif # defined(WITH_OPTIMIZED_CFLAGS) - -.if defined(WITH_LOGGING) -CONFIGURE_ENV+= WITH_LOGGING=yes -.endif # defined(WITH_LOGGING) - -.if defined(WITHOUT_XFT) -CONFIGURE_ENV+= WITHOUT_XFT=yes -.else -LIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/libXft -.endif # !defined(WITHOUT_XFT) - -CPPFLAGS+= -I${X11BASE}/include -CFLAGS+= ${PTHREAD_CFLAGS} -LDFLAGS+= -L${X11BASE}/lib -LIBS+= ${PTHREAD_LIBS} - -pre-extract:: - @${ECHO_MSG} - @${ECHO_MSG} "Extracting source (this takes a while) ..." - @${ECHO_MSG} - -post-extract:: -# FAKEDIR is here so that nsinstall will install under FAKEDIR, not -# under PREFIX. See pre-install and do-install for details. - @${SED} -e 's|@CPPFLAGS@|${CPPFLAGS}|' \ - -e 's|@CFLAGS@|${CFLAGS}|' \ - -e 's|@LDFLAGS@|${LDFLAGS}|' \ - -e 's|@LIBS@|${LIBS}|' \ - -e 's|@X11BASE@|${X11BASE}|' \ - -e 's|@LOCALBASE@|${LOCALBASE}|' \ - -e 's|@PREFIX@|${FAKEDIR}/lib/thunderbird|' \ - -e 's|@PERL@|${PERL5}|' \ - <${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig - -post-patch: - @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ - ${WRKSRC}/build/unix/run-mozilla.sh - @${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \ - s|-lpthread|${PTHREAD_LIBS}|g' \ - ${WRKSRC}/configure \ - ${WRKSRC}/nsprpub/configure - @${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \ - ${WRKSRC}/nsprpub/configure \ - ${WRKSRC}/security/coreconf/FreeBSD.mk \ - ${WRKSRC}/directory/c-sdk/config/FreeBSD.mk \ - ${WRKSRC}/js/src/Makefile.in - @${REINPLACE_CMD} -E -e 's|libesd\.so\.[0-9]+|${ESD_LIB}|g' \ - ${WRKSRC}/widget/src/gtk2/nsSound.cpp - @${REINPLACE_CMD} -E -e 's|libcups\.so\.[0-9]+|libcups.no|g' \ - ${WRKSRC}/gfx/src/gtk/nsDeviceContextSpecG.cpp - @${REINPLACE_CMD} -e '/accessibility.typeaheadfind.enablesound/s/true/false/ ; \ - /dom.disable_window_open_feature.toolbar/s/false/true/' \ - ${WRKSRC}/modules/libpref/src/init/all.js \ - ${WRKSRC}/extensions/sroaming/resources/content/prefs/all.js \ - ${WRKSRC}/modules/libpref/src/init/all.js - @${REINPLACE_CMD} -e 's|<iconv.h>|\"${LOCALBASE}/include/iconv.h\"|g' \ - ${WRKSRC}/configure \ - ${WRKSRC}/intl/uconv/native/nsNativeUConvService.cpp \ - ${WRKSRC}/xpcom/io/nsNativeCharsetUtils.cpp - @${SED} -e 's|%%MOZDIR%%|${LOCAL_PREFIX}/lib/${PORTNAME}-${PORTVERSION}|g ; \ - s|%%X11BASE%%|${X11BASE}|g' \ - < ${MASTERDIR}/pkg-install.in > ${PKGINSTALL} - @${SED} -e 's|%%MOZDIR%%|${LOCAL_PREFIX}/lib/${PORTNAME}-${PORTVERSION}|g' \ - < ${MASTERDIR}/pkg-deinstall.in > ${PKGDEINSTALL} - @${SED} -e 's|@THUNDERBIRD_ICON@|${THUNDERBIRD_ICON}|' \ - < ${FILESDIR}/thunderbird.desktop.in > ${WRKDIR}/thunderbird.desktop -.for ii in ${MOZ_PIS_SCRIPTS} - @${SED} -e 's|%%MOZILLA%%|${THUNDERBIRD}|g ; \ - s|%%PREFIX%%|${PREFIX}|g ; \ - s|%%X11BASE%%|${X11BASE}|g' \ - < ${FILESDIR}/moz_pis_${ii} > ${WRKDIR}/moz_pis_${ii} -.endfor - -pre-configure: - @if [ -n "`${PKG_INFO} -xI '^bind[0-9]*-base-[0-9]'`" ]; then \ - ${ECHO_CMD} "${PKGNAME}: bind installed with PORT_REPLACES_BASE_BIND causes build problems."; \ - ${FALSE}; \ - fi - -post-build: -# XXX This works around an install problem that is triggered when -# toolkit/profile/src is built after profile/src. - @${TOUCH} -f ${WRKSRC}/profile/build/libprofile.so - -pre-install: -# Overview: the program installs itself in FAKEDIR, then a list is made of the -# files and directories in there. This is the PLIST (packing list) for the -# package, replacing the traditional pkg-plist file. - @${RM} -rf ${FAKEDIR} ${PLIST} - @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \ - Makefile ${MAKE_ARGS} install - @${MKDIR} ${SCRIPTS_DIR} - @${MKDIR} ${MOZ_PIS_DIR} -.for ii in mac win -.for jj in / .jar - @${RM} -rf ${FAKEDIR}/lib/${PORTNAME}/lib/${PORTNAME}-${PORTVERSION}/chrome/en-${ii}${jj} -.endfor -.endfor - @${RM} -fr ${FAKEDIR}/share/idl ${FAKEDIR}/include -.for ii in thunderbird thunderbird-config - @${ECHO_CMD} bin/${ii} >> ${PLIST} -.endfor -.for ii in ${MOZ_PIS_SCRIPTS} - ${INSTALL_SCRIPT} ${WRKDIR}/moz_pis_${ii} ${MOZ_PIS_DIR}/${ii} -.endfor - @${MKDIR} ${FAKEDIR}/${LOCAL_SUBDIR}/lib/${PORTNAME}-${PORTVERSION}/defaults - @${CP} -RL ${WRKSRC}/dist/bin/defaults/isp \ - ${FAKEDIR}/${LOCAL_SUBDIR}/lib/${PORTNAME}-${PORTVERSION}/defaults - @cd ${FAKEDIR} && ${FIND} * ! -type d | ${SORT} >> ${PLIST}; \ - ${FIND} * -type d -empty | ${SORT} | ${SED} -e \ - "s:^:@exec ${MKDIR} %D/:" -e "s:$$: || true:" >> ${PLIST}; \ - ${FIND} * -type d -empty | ${SORT} -r | ${SED} -e \ - "s:^:@unexec ${RMDIR} %D/:" -e "s:$$: || true:" >> ${PLIST}; \ - ${FIND} * -type d ! -empty | ${SORT} -r | ${SED} -e "s:^:@dirrm :" | \ - ${GREP} / >> ${PLIST} - ${ECHO_CMD} 'share/applications/thunderbird.desktop' >> ${PLIST} - ${ECHO_CMD} '@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}' >> ${PLIST} - -do-install: -# This is the actual installation. First, the contents of FAKEDIR are -# just copied to PREFIX. - cd ${FAKEDIR} && ${FIND} * | ${CPIO} -dmp --quiet ${PREFIX} - -post-install: - @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL - ${MKDIR} ${PREFIX}/bin - ${RM} -f ${PREFIX}/bin/thunderbird - ${LN} -s ${LOCAL_PREFIX}/bin/thunderbird \ - ${PREFIX}/bin/thunderbird - ${RM} -f ${PREFIX}/bin/thunderbird-config - ${LN} -s ${LOCAL_PREFIX}/bin/thunderbird-config \ - ${PREFIX}/bin/thunderbird-config - ${PERL} -pi -e 's|${FAKEDIR}|${PREFIX}|g' \ - ${LOCAL_PREFIX}/bin/thunderbird \ - ${LOCAL_PREFIX}/bin/thunderbird-config - ${FIND} ${LOCAL_PREFIX}/lib/pkgconfig -type f | ${XARGS} \ - ${PERL} -pi -e 's|${FAKEDIR}|${PREFIX}|g' - ${MKDIR} ${PREFIX}/share/applications - ${INSTALL_DATA} ${WRKDIR}/thunderbird.desktop ${PREFIX}/share/applications - ${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/thunderbird/default.xpm \ - ${LOCAL_PREFIX}/lib/${PORTNAME}-${PORTVERSION}/chrome/icons/default/default.xpm - -.include <bsd.port.post.mk> diff --git a/mail/thunderbird-devel/distinfo b/mail/thunderbird-devel/distinfo deleted file mode 100644 index bac899b6bf63..000000000000 --- a/mail/thunderbird-devel/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (thunderbird-1.0.6-source.tar.bz2) = a0ddcc8bd5ee2c9be724b6963ad27111 -SIZE (thunderbird-1.0.6-source.tar.bz2) = 33366077 diff --git a/mail/thunderbird-devel/files/extra-patch-config_make-jars.pl b/mail/thunderbird-devel/files/extra-patch-config_make-jars.pl deleted file mode 100644 index a558607ca459..000000000000 --- a/mail/thunderbird-devel/files/extra-patch-config_make-jars.pl +++ /dev/null @@ -1,10 +0,0 @@ ---- config/make-jars.pl.orig Wed Oct 13 16:17:11 2004 -+++ config/make-jars.pl Wed Oct 13 16:17:07 2004 -@@ -40,6 +40,7 @@ - last if ($arg eq "--"); - } - my $defines = join(' ', @ARGV[ $ddindex .. $#ARGV ]); -+splice @ARGV, $ddindex, $#ARGV; - - getopts("d:s:t:f:avlD:o:p:xz:"); - diff --git a/mail/thunderbird-devel/files/moz_pis_S50cleanhome b/mail/thunderbird-devel/files/moz_pis_S50cleanhome deleted file mode 100644 index 348592392043..000000000000 --- a/mail/thunderbird-devel/files/moz_pis_S50cleanhome +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh -# - -# S50cleanhome -# a script to polite ${HOME}/${MOZ_PIS_USER_DIR} - -# We run in our own subshell - -# First, verify protocol -[ "$1" != "start" ] && exit 1 -[ -z "${MOZ_PIS_API}" -o ${MOZ_PIS_API} -ne 2 ] && exit 1 -[ -z "${MOZ_PIS_MOZBINDIR}" -o ! -d "${MOZ_PIS_MOZBINDIR}" ] && exit 1 -[ -z "${HOME}" -o ! -d "${HOME}" ] && exit 1 -[ -z "${MOZ_PIS_USER_DIR}" -o ! -d "${HOME}/${MOZ_PIS_USER_DIR}" ] && exit 1 - -# Try to polite ${HOME}/${MOZ_PIS_USER_DIR} - -# This must be really needed? -# rm -f "${$HOME}/${MOZ_PIS_USER_DIR}/pluginreg.dat" - -# Try to polite profile dirs -if [ -f "${HOME}/${MOZ_PIS_USER_DIR}/profiles.ini" ]; then - sed -e '/Path=/! d' -e "s,Path=,${HOME}/${MOZ_PIS_USER_DIR}/," \ - "${HOME}/${MOZ_PIS_USER_DIR}/profiles.ini" \ - | while read dir - do - [ ! -d "${dir}" ] && continue - # at last, debian do this, we do for new builds - # rm -f "${dir}/XUL.mfasl" - # make reclaculate compreg.dat, xpti.dat for new builds - [ "${dir}/compreg.dat" -ot "${MOZ_PIS_MOZBINDIR}/components.ini" ] && - rm -f "${dir}/compatibility.ini" "${dir}/XUL.mfasl" - done -fi diff --git a/mail/thunderbird-devel/files/mozconfig.in b/mail/thunderbird-devel/files/mozconfig.in deleted file mode 100644 index 2160060a1296..000000000000 --- a/mail/thunderbird-devel/files/mozconfig.in +++ /dev/null @@ -1,74 +0,0 @@ -# .mozconfig.in -*-shell-script-*- -# $FreeBSD$ -###################################################################### -# standard opts from README -export MOZ_THUNDERBIRD=1 -mk_add_options MOZ_MOZ_THUNDERBIRD=1 -ac_add_options --enable-crypto -ac_add_options --disable-mathml -ac_add_options --disable-activex -ac_add_options --disable-activex-scripting -ac_add_options --disable-oji -ac_add_options --disable-necko-disk-cache -ac_add_options --disable-tests -ac_add_options --disable-profilesharing -ac_add_options --enable-single-profile -ac_add_options --disable-freetype2 -ac_add_options --enable-extensions=wallet,spellcheck,xmlextras,webservices -ac_add_options --enable-necko-protocols=http,file,jar,viewsource,res,data -ac_add_options --enable-image-decoders=default,-xbm -ac_add_options --enable-default-toolkit=gtk2 -# See the following URL for approval email for using official branding -# http://people.freebsd.org/~ahze/firefox_thunderbird-approved.txt -ac_add_options --enable-official-branding -###################################################################### -# FBSD specific -export CPPFLAGS="@CPPFLAGS@" -export CFLAGS="@CFLAGS@" -export LIBS="@LIBS@" -export LDFLAGS="@LDFLAGS@" -export CONFIG_SH=/bin/sh -export XP_UNIX=1 -mk_add_options XP_UNIX=1 -export PERL="@PERL@" -mk_add_options PERL=$PERL -# Configure options for installation -ac_add_options --prefix=@PREFIX@ -###################################################################### -# Use ports for these libraries -ac_add_options --with-system-jpeg=@LOCALBASE@ -ac_add_options --with-system-zlib -ac_add_options --with-system-png=@LOCALBASE@ -###################################################################### -# set compile/link features -ac_add_options --with-pthreads -###################################################################### -# conditional from port Makefile -#if test -n "$WITH_REORDER"; then -# ac_add_options --enable-reorder -#else -# ac_add_options --disable-reorder -#fi # test -n "$WITH_REORDER" -if test -n "$WITH_DEBUG"; then - ac_add_options --enable-debug - ac_add_options --disable-strip -else - ac_add_options --disable-debug - ac_add_options --enable-optimize=${WITH_OPTIMIZE} - ac_add_options --enable-strip - export BUILD_OFFICIAL=1 - export MOZILLA_OFFICIAL=1 - mk_add_options BUILD_OFFICIAL=1 - mk_add_options MOZILLA_OFFICIAL=1 -fi # test -n "$WITH_DEBUG" -if test -n "$WITH_LOGGING"; then - ac_add_options --enable-logging -else - ac_add_options --disable-logging -fi # test -n "$WITH_LOGGING" -if test -z "$WITHOUT_XFT"; then - ac_add_options --enable-xft -else - ac_add_options --disable-xft -fi # test -z "$WITHOUT_XFT" -###################################################################### diff --git a/mail/thunderbird-devel/files/patch-Double.cpp b/mail/thunderbird-devel/files/patch-Double.cpp deleted file mode 100644 index 5cd13e4ff4fe..000000000000 --- a/mail/thunderbird-devel/files/patch-Double.cpp +++ /dev/null @@ -1,59 +0,0 @@ ---- extensions/transformiix/source/base/Double.cpp.orig Thu Jan 30 09:26:46 2003 -+++ extensions/transformiix/source/base/Double.cpp Sun Nov 16 01:46:42 2003 -@@ -51,10 +51,10 @@ - //A trick to handle IEEE floating point exceptions on FreeBSD - E.D. - #ifdef __FreeBSD__ - #include <ieeefp.h> --#ifdef __alpha__ --fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP; --#else -+#if defined(__i386__) - fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML; -+#else -+fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP; - #endif - fp_except_t oldmask = fpsetmask(~allmask); - #endif -@@ -75,22 +75,31 @@ - #define TX_DOUBLE_HI32_EXPMASK 0x7ff00000 - #define TX_DOUBLE_HI32_MANTMASK 0x000fffff - -+union ui32dun { -+ PRUint32 i[2]; -+ double d; -+}; -+ - //-- Initialize Double related constants - #ifdef IS_BIG_ENDIAN --const PRUint32 nanMask[2] = {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK, -- 0xffffffff}; --const PRUint32 infMask[2] = {TX_DOUBLE_HI32_EXPMASK, 0}; --const PRUint32 negInfMask[2] = {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT, 0}; -+const union ui32dun nanMask = -+ {{TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK, 0xffffffff}}; -+const union ui32dun infMask = -+ {{TX_DOUBLE_HI32_EXPMASK, 0}}; -+const union ui32dun negInfMask = -+ {{TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT, 0}}; - #else --const PRUint32 nanMask[2] = {0xffffffff, -- TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK}; --const PRUint32 infMask[2] = {0, TX_DOUBLE_HI32_EXPMASK}; --const PRUint32 negInfMask[2] = {0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT}; -+const union ui32dun nanMask = -+ {{0xffffffff, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK}}; -+const union ui32dun infMask = -+ {{0, TX_DOUBLE_HI32_EXPMASK}}; -+const union ui32dun negInfMask = -+ {{0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT}}; - #endif - --const double Double::NaN = *((double*)nanMask); --const double Double::POSITIVE_INFINITY = *((double*)infMask); --const double Double::NEGATIVE_INFINITY = *((double*)negInfMask); -+const double Double::NaN = nanMask.d; -+const double Double::POSITIVE_INFINITY = infMask.d; -+const double Double::NEGATIVE_INFINITY = negInfMask.d; - - /* - * Determines whether the given double represents positive or negative diff --git a/mail/thunderbird-devel/files/patch-bugzilla149334 b/mail/thunderbird-devel/files/patch-bugzilla149334 deleted file mode 100644 index fe1be5bc8fc0..000000000000 --- a/mail/thunderbird-devel/files/patch-bugzilla149334 +++ /dev/null @@ -1,342 +0,0 @@ -Index: gfx/idl/nsIFreeType2.idl -=================================================================== -RCS file: /cvsroot/mozilla/gfx/idl/nsIFreeType2.idl,v -retrieving revision 1.10 -diff -u -3 -p -r1.10 nsIFreeType2.idl ---- gfx/idl/nsIFreeType2.idl 15 Apr 2004 23:30:02 -0000 1.10 -+++ gfx/idl/nsIFreeType2.idl 26 May 2004 10:00:54 -0000 -@@ -76,10 +76,11 @@ native FT_Pointer(FT_Pointer); - native FT_Sfnt_Tag(FT_Sfnt_Tag); - native FT_Size(FT_Size); - --[ptr] native FTC_Image_Desc_p(FTC_Image_Desc); -+[ptr] native FTC_ImageType_p(FTC_ImageType); - native FTC_Face_Requester(FTC_Face_Requester); - native FTC_Font(FTC_Font); --native FTC_Image_Cache(FTC_Image_Cache); -+native FTC_FaceID(FTC_FaceID); -+native FTC_ImageCache(FTC_ImageCache); - native FTC_Manager(FTC_Manager); - - // #ifdef MOZ_SVG -@@ -99,7 +100,7 @@ interface nsIFreeType2 : nsISupports - - readonly attribute FT_Library library; - readonly attribute FTC_Manager FTCacheManager; -- readonly attribute FTC_Image_Cache ImageCache; -+ readonly attribute FTC_ImageCache ImageCache; - - void doneFace(in FT_Face face); - void doneFreeType(in FT_Library lib); -@@ -115,16 +116,16 @@ interface nsIFreeType2 : nsISupports - void outlineDecompose(in FT_Outline_p outline, - in const_FT_Outline_Funcs_p funcs, in voidPtr p); - void setCharmap(in FT_Face face, in FT_CharMap charmap); -- void imageCacheLookup(in FTC_Image_Cache cache, in FTC_Image_Desc_p desc, -+ void imageCacheLookup(in FTC_ImageCache cache, in FTC_ImageType_p desc, - in FT_UInt gindex, out FT_Glyph glyph); -- void managerLookupSize(in FTC_Manager manager, in FTC_Font font, -- out FT_Face face, out FT_Size size); -+ void managerLookupFace(in FTC_Manager manager, in FTC_FaceID face_id, -+ out FT_Face face); - void managerDone(in FTC_Manager manager); - void managerNew(in FT_Library lib, in FT_UInt max_faces, - in FT_UInt max_sizes, in FT_ULong max_bytes, - in FTC_Face_Requester requester, in FT_Pointer req_data, - out FTC_Manager manager); -- void imageCacheNew(in FTC_Manager manager, out FTC_Image_Cache cache); -+ void imageCacheNew(in FTC_Manager manager, out FTC_ImageCache cache); - /* #ifdef MOZ_SVG */ - void glyphTransform(in FT_Glyph glyph, in FT_Matrix_p matrix, - in FT_Vector_p delta); -Index: gfx/src/freetype/nsFreeType.cpp -=================================================================== -RCS file: /cvsroot/mozilla/gfx/src/freetype/nsFreeType.cpp,v -retrieving revision 1.25 -diff -u -3 -p -r1.25 nsFreeType.cpp ---- gfx/src/freetype/nsFreeType.cpp 17 Apr 2004 21:52:29 -0000 1.25 -+++ gfx/src/freetype/nsFreeType.cpp 26 May 2004 10:00:54 -0000 -@@ -110,11 +110,11 @@ FtFuncList nsFreeType2::FtFuncs [] = { - {"FT_New_Face", NS_FT2_OFFSET(nsFT_New_Face), PR_TRUE}, - {"FT_Outline_Decompose", NS_FT2_OFFSET(nsFT_Outline_Decompose), PR_TRUE}, - {"FT_Set_Charmap", NS_FT2_OFFSET(nsFT_Set_Charmap), PR_TRUE}, -- {"FTC_Image_Cache_Lookup", NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup), PR_TRUE}, -- {"FTC_Manager_Lookup_Size", NS_FT2_OFFSET(nsFTC_Manager_Lookup_Size), PR_TRUE}, -+ {"FTC_ImageCache_Lookup", NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup), PR_TRUE}, -+ {"FTC_Manager_LookupFace", NS_FT2_OFFSET(nsFTC_Manager_LookupFace), PR_TRUE}, - {"FTC_Manager_Done", NS_FT2_OFFSET(nsFTC_Manager_Done), PR_TRUE}, - {"FTC_Manager_New", NS_FT2_OFFSET(nsFTC_Manager_New), PR_TRUE}, -- {"FTC_Image_Cache_New", NS_FT2_OFFSET(nsFTC_Image_Cache_New), PR_TRUE}, -+ {"FTC_ImageCache_New", NS_FT2_OFFSET(nsFTC_Image_Cache_New), PR_TRUE}, - // #ifdef MOZ_SVG - {"FT_Glyph_Transform", NS_FT2_OFFSET(nsFT_Glyph_Transform), PR_TRUE}, - {"FT_Get_Kerning", NS_FT2_OFFSET(nsFT_Get_Kerning), PR_TRUE}, -@@ -282,7 +282,7 @@ nsFreeType2::SetCharmap(FT_Face face, FT - } - - NS_IMETHODIMP --nsFreeType2::ImageCacheLookup(FTC_Image_Cache cache, FTC_Image_Desc *desc, -+nsFreeType2::ImageCacheLookup(FTC_ImageCache cache, FTC_ImageType *desc, - FT_UInt glyphID, FT_Glyph *glyph) - { - // call the FreeType2 function via the function pointer -@@ -291,11 +291,11 @@ nsFreeType2::ImageCacheLookup(FTC_Image_ - } - - NS_IMETHODIMP --nsFreeType2::ManagerLookupSize(FTC_Manager manager, FTC_Font font, -- FT_Face *face, FT_Size *size) -+nsFreeType2::ManagerLookupFace(FTC_Manager manager, FTC_FaceID face_id, -+ FT_Face *face) - { - // call the FreeType2 function via the function pointer -- FT_Error error = nsFTC_Manager_Lookup_Size(manager, font, face, size); -+ FT_Error error = nsFTC_Manager_LookupFace(manager, face_id, face); - return error ? NS_ERROR_FAILURE : NS_OK; - } - -@@ -320,7 +320,7 @@ nsFreeType2::ManagerNew(FT_Library libra - } - - NS_IMETHODIMP --nsFreeType2::ImageCacheNew(FTC_Manager manager, FTC_Image_Cache *cache) -+nsFreeType2::ImageCacheNew(FTC_Manager manager, FTC_ImageCache *cache) - { - // call the FreeType2 function via the function pointer - FT_Error error = nsFTC_Image_Cache_New(manager, cache); -@@ -389,7 +389,7 @@ nsFreeType2::SupportsExtFunc(PRBool *res - } - - NS_IMETHODIMP --nsFreeType2::GetImageCache(FTC_Image_Cache *aCache) -+nsFreeType2::GetImageCache(FTC_ImageCache *aCache) - { - *aCache = mImageCache; - return NS_OK; -Index: gfx/src/freetype/nsFreeType.h -=================================================================== -RCS file: /cvsroot/mozilla/gfx/src/freetype/nsFreeType.h,v -retrieving revision 1.17 -diff -u -3 -p -r1.17 nsFreeType.h ---- gfx/src/freetype/nsFreeType.h 17 Apr 2004 21:52:29 -0000 1.17 -+++ gfx/src/freetype/nsFreeType.h 26 May 2004 10:00:54 -0000 -@@ -120,13 +120,13 @@ typedef FT_Error (*FT_Outline_Decompose_ - typedef FT_Error (*FT_New_Face_t)(FT_Library, const char*, FT_Long, FT_Face*); - typedef FT_Error (*FT_Set_Charmap_t)(FT_Face face, FT_CharMap charmap); - typedef FT_Error (*FTC_Image_Cache_Lookup_t) -- (FTC_Image_Cache, FTC_Image_Desc*, FT_UInt, FT_Glyph*); --typedef FT_Error (*FTC_Manager_Lookup_Size_t) -- (FTC_Manager, FTC_Font, FT_Face*, FT_Size*); -+ (FTC_ImageCache, FTC_ImageType*, FT_UInt, FT_Glyph*); -+typedef FT_Error (*FTC_Manager_LookupFace_t) -+ (FTC_Manager, FTC_FaceID, FT_Face*); - typedef FT_Error (*FTC_Manager_Done_t)(FTC_Manager); - typedef FT_Error (*FTC_Manager_New_t)(FT_Library, FT_UInt, FT_UInt, FT_ULong, - FTC_Face_Requester, FT_Pointer, FTC_Manager*); --typedef FT_Error (*FTC_Image_Cache_New_t)(FTC_Manager, FTC_Image_Cache*); -+typedef FT_Error (*FTC_Image_Cache_New_t)(FTC_Manager, FTC_ImageCache*); - // #ifdef MOZ_SVG - typedef FT_Error (*FT_Glyph_Transform_t)(FT_Glyph, FT_Matrix*, FT_Vector*); - typedef FT_Error (*FT_Get_Kerning_t) -@@ -181,7 +181,7 @@ protected: - FT_Outline_Decompose_t nsFT_Outline_Decompose; - FT_Set_Charmap_t nsFT_Set_Charmap; - FTC_Image_Cache_Lookup_t nsFTC_Image_Cache_Lookup; -- FTC_Manager_Lookup_Size_t nsFTC_Manager_Lookup_Size; -+ FTC_Manager_LookupFace_t nsFTC_Manager_LookupFace; - FTC_Manager_Done_t nsFTC_Manager_Done; - FTC_Manager_New_t nsFTC_Manager_New; - FTC_Image_Cache_New_t nsFTC_Image_Cache_New; -@@ -229,7 +229,7 @@ protected: - PRLibrary *mSharedLib; - FT_Library mFreeTypeLibrary; - FTC_Manager mFTCacheManager; -- FTC_Image_Cache mImageCache; -+ FTC_ImageCache mImageCache; - - static nsHashtable *sFontFamilies; - static nsHashtable *sRange1CharSetNames; -Index: gfx/src/ps/nsFontMetricsPS.cpp -=================================================================== -RCS file: /cvsroot/mozilla/gfx/src/ps/nsFontMetricsPS.cpp,v -retrieving revision 1.43 -diff -u -3 -p -r1.43 nsFontMetricsPS.cpp ---- gfx/src/ps/nsFontMetricsPS.cpp 17 Apr 2004 21:52:31 -0000 1.43 -+++ gfx/src/ps/nsFontMetricsPS.cpp 26 May 2004 10:01:03 -0000 -@@ -1140,10 +1140,10 @@ nsFontPSFreeType::Init(nsITrueTypeFontCa - - mPixelSize = NSToIntRound(app2dev * mFont->size); - -- mImageDesc.font.face_id = (void*)mEntry; -- mImageDesc.font.pix_width = mPixelSize; -- mImageDesc.font.pix_height = mPixelSize; -- mImageDesc.image_type = 0; -+ mImageDesc->face_id = (FTC_FaceID)&mEntry; -+ mImageDesc->width = mPixelSize; -+ mImageDesc->height = mPixelSize; -+ mImageDesc->flags = 0; - - nsresult rv; - mFt2 = do_GetService(NS_FREETYPE2_CONTRACTID, &rv); -@@ -1189,7 +1189,7 @@ nsFontPSFreeType::GetWidth(const PRUnich - if (!face) - return 0; - -- FTC_Image_Cache iCache; -+ FTC_ImageCache iCache; - nsresult rv = mFt2->GetImageCache(&iCache); - if (NS_FAILED(rv)) { - NS_ERROR("Failed to get Image Cache"); -@@ -1227,8 +1227,8 @@ nsFontPSFreeType::getFTFace() - - FTC_Manager cManager; - mFt2->GetFTCacheManager(&cManager); -- nsresult rv = mFt2->ManagerLookupSize(cManager, &mImageDesc.font, -- &face, nsnull); -+ nsresult rv = mFt2->ManagerLookupFace(cManager, mImageDesc->face_id, -+ &face); - NS_ASSERTION(rv==0, "failed to get face/size"); - if (rv) - return nsnull; -@@ -1621,16 +1621,16 @@ void nsFT2Type8Generator::GeneratePSFont - mEntry->GetFamilyName(fontName); - mEntry->GetStyleName(styleName); - -- mImageDesc.font.face_id = (void*)mEntry; -+ mImageDesc->face_id = (FTC_FaceID)&mEntry; - // TT glyph has no relation to size -- mImageDesc.font.pix_width = 16; -- mImageDesc.font.pix_height = 16; -- mImageDesc.image_type = 0; -+ mImageDesc->width = 16; -+ mImageDesc->height = 16; -+ mImageDesc->flags = 0; - FT_Face face = nsnull; - FTC_Manager cManager; - mFt2->GetFTCacheManager(&cManager); -- nsresult rv = mFt2->ManagerLookupSize(cManager, &mImageDesc.font, -- &face, nsnull); -+ nsresult rv = mFt2->ManagerLookupFace(cManager, mImageDesc->face_id, -+ &face); - if (NS_FAILED(rv)) - return; - -Index: gfx/src/ps/nsFontMetricsPS.h -=================================================================== -RCS file: /cvsroot/mozilla/gfx/src/ps/nsFontMetricsPS.h,v -retrieving revision 1.25 -diff -u -3 -p -r1.25 nsFontMetricsPS.h ---- gfx/src/ps/nsFontMetricsPS.h 17 Apr 2004 21:52:31 -0000 1.25 -+++ gfx/src/ps/nsFontMetricsPS.h 26 May 2004 10:01:03 -0000 -@@ -319,7 +319,7 @@ protected: - nsCOMPtr<nsITrueTypeFontCatalogEntry> mFaceID; - nsCOMPtr<nsIFreeType2> mFt2; - PRUint16 mPixelSize; -- FTC_Image_Desc mImageDesc; -+ FTC_ImageType mImageDesc; - - - static PRBool AddUserPref(nsIAtom *aLang, const nsFont& aFont, -@@ -362,7 +362,7 @@ public: - protected: - nsCOMPtr<nsITrueTypeFontCatalogEntry> mEntry; - nsCOMPtr<nsIFreeType2> mFt2; -- FTC_Image_Desc mImageDesc; -+ FTC_ImageType mImageDesc; - }; - #endif - -Index: gfx/src/x11shared/nsFontFreeType.cpp -=================================================================== -RCS file: /cvsroot/mozilla/gfx/src/x11shared/nsFontFreeType.cpp,v -retrieving revision 1.14 -diff -u -3 -p -r1.14 nsFontFreeType.cpp ---- gfx/src/x11shared/nsFontFreeType.cpp 17 Apr 2004 21:52:34 -0000 1.14 -+++ gfx/src/x11shared/nsFontFreeType.cpp 26 May 2004 10:01:03 -0000 -@@ -177,7 +177,7 @@ nsFreeTypeFont::getFTFace() - FTC_Manager mgr; - nsresult rv; - mFt2->GetFTCacheManager(&mgr); -- rv = mFt2->ManagerLookupSize(mgr, &mImageDesc.font, &face, nsnull); -+ rv = mFt2->ManagerLookupFace(mgr, mImageDesc->face_id, &face); - NS_ASSERTION(NS_SUCCEEDED(rv), "failed to get face/size"); - if (NS_FAILED(rv)) - return nsnull; -@@ -191,22 +191,15 @@ nsFreeTypeFont::nsFreeTypeFont(nsITrueTy - PRBool embedded_bimap = PR_FALSE; - mFaceID = aFaceID; - mPixelSize = aPixelSize; -- mImageDesc.font.face_id = (void*)mFaceID; -- mImageDesc.font.pix_width = aPixelSize; -- mImageDesc.font.pix_height = aPixelSize; -- mImageDesc.image_type = 0; -+ mImageDesc->face_id = (FTC_FaceID)&mFaceID; -+ mImageDesc->width = aPixelSize; -+ mImageDesc->height = aPixelSize; -+ mImageDesc->flags = 0; - - if (aPixelSize < nsFreeType2::gAntiAliasMinimum) { -- mImageDesc.image_type |= ftc_image_mono; - anti_alias = PR_FALSE; - } - -- if (nsFreeType2::gFreeType2Autohinted) -- mImageDesc.image_type |= ftc_image_flag_autohinted; -- -- if (nsFreeType2::gFreeType2Unhinted) -- mImageDesc.image_type |= ftc_image_flag_unhinted; -- - PRUint32 num_embedded_bitmaps, i; - PRInt32* embedded_bitmapheights; - mFaceID->GetEmbeddedBitmapHeights(&num_embedded_bitmaps, -@@ -218,7 +211,6 @@ nsFreeTypeFont::nsFreeTypeFont(nsITrueTy - if (embedded_bitmapheights[i] == aPixelSize) { - embedded_bimap = PR_TRUE; - // unhinted must be set for embedded bitmaps to be used -- mImageDesc.image_type |= ftc_image_flag_unhinted; - break; - } - } -@@ -312,7 +304,7 @@ nsFreeTypeFont::doGetBoundingMetrics(con - if (!face) - return NS_ERROR_FAILURE; - -- FTC_Image_Cache icache; -+ FTC_ImageCache icache; - mFt2->GetImageCache(&icache); - if (!icache) - return NS_ERROR_FAILURE; -@@ -401,7 +393,7 @@ nsFreeTypeFont::GetWidth(const PRUnichar - if (!face) - return 0; - -- FTC_Image_Cache icache; -+ FTC_ImageCache icache; - mFt2->GetImageCache(&icache); - if (!icache) - return 0; -@@ -723,7 +715,7 @@ nsFreeTypeXImage::DrawString(nsRendering - if (y%4==0) (*blendPixelFunc)(sub_image, y, ascent-1, black, 255/2); - #endif - -- FTC_Image_Cache icache; -+ FTC_ImageCache icache; - mFt2->GetImageCache(&icache); - if (!icache) - return 0; -Index: gfx/src/x11shared/nsFontFreeType.h -=================================================================== -RCS file: /cvsroot/mozilla/gfx/src/x11shared/nsFontFreeType.h,v -retrieving revision 1.10 -diff -u -3 -p -r1.10 nsFontFreeType.h ---- gfx/src/x11shared/nsFontFreeType.h 17 Apr 2004 21:52:34 -0000 1.10 -+++ gfx/src/x11shared/nsFontFreeType.h 26 May 2004 10:01:03 -0000 -@@ -110,7 +110,7 @@ protected: - XImage *GetXImage(PRUint32 width, PRUint32 height); - nsITrueTypeFontCatalogEntry *mFaceID; - PRUint16 mPixelSize; -- FTC_Image_Desc mImageDesc; -+ FTC_ImageType mImageDesc; - nsCOMPtr<nsIFreeType2> mFt2; - }; - diff --git a/mail/thunderbird-devel/files/patch-build_unix_run-mozilla.sh b/mail/thunderbird-devel/files/patch-build_unix_run-mozilla.sh deleted file mode 100644 index 28bbd1a1154e..000000000000 --- a/mail/thunderbird-devel/files/patch-build_unix_run-mozilla.sh +++ /dev/null @@ -1,11 +0,0 @@ ---- build/unix/run-mozilla.sh.orig Mon Dec 15 18:27:28 2003 -+++ build/unix/run-mozilla.sh Fri Feb 27 11:54:10 2004 -@@ -355,7 +355,7 @@ - fi - ## - ## Set LD_LIBRARY_PATH --LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"} -+LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:%%PREFIX%%/lib/browser_plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"} - if [ -n "$LD_LIBRARYN32_PATH" ] - then - LD_LIBRARYN32_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARYN32_PATH+":$LD_LIBRARYN32_PATH"} diff --git a/mail/thunderbird-devel/files/patch-config-mkdepend-imakemdep.h b/mail/thunderbird-devel/files/patch-config-mkdepend-imakemdep.h deleted file mode 100644 index b688e664475d..000000000000 --- a/mail/thunderbird-devel/files/patch-config-mkdepend-imakemdep.h +++ /dev/null @@ -1,10 +0,0 @@ ---- config/mkdepend/imakemdep.h Fri Sep 4 21:22:25 1998 -+++ config/mkdepend/imakemdep.h Thu Oct 16 22:43:25 2003 -@@ -278,4 +278,7 @@ - "-D__i386__", - # endif -+# if defined(__amd64__) || defined(__x86_64__) -+ "-D__amd64__ -D__x86_64__", -+# endif - # ifdef __GNUC__ - "-traditional", diff --git a/mail/thunderbird-devel/files/patch-config-rules.mk b/mail/thunderbird-devel/files/patch-config-rules.mk deleted file mode 100644 index ecc3c8194dcc..000000000000 --- a/mail/thunderbird-devel/files/patch-config-rules.mk +++ /dev/null @@ -1,14 +0,0 @@ ---- config/rules.mk.orig Tue Aug 26 13:28:47 2003 -+++ config/rules.mk Sun Feb 1 15:11:41 2004 -@@ -444,7 +444,11 @@ - - ifeq ($(OS_ARCH),FreeBSD) - ifdef IS_COMPONENT -+ifneq (,$(filter alpha ia64,$(OS_TEST))) -+EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -lc -+else - EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -+endif - endif - endif - diff --git a/mail/thunderbird-devel/files/patch-configure b/mail/thunderbird-devel/files/patch-configure deleted file mode 100644 index 9e60372adb33..000000000000 --- a/mail/thunderbird-devel/files/patch-configure +++ /dev/null @@ -1,38 +0,0 @@ ---- configure.orig Fri Feb 13 01:06:29 2004 -+++ configure Fri Feb 13 01:07:17 2004 -@@ -9181,7 +9181,7 @@ - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" --LIBS="-liconv $LIBS" -+LIBS="-L$LOCALBASE/lib -liconv $LIBS" - cat > conftest.$ac_ext <<EOF - #line 9187 "configure" - #include "confdefs.h" -@@ -9212,7 +9212,7 @@ - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- _ICONV_LIBS="$_ICONV_LIBS -liconv" -+ _ICONV_LIBS="$_ICONV_LIBS -L$LOCALBASE/lib -liconv" - else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6 -@@ -9222,7 +9222,7 @@ - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" --LIBS="-liconv $LIBS" -+LIBS="-L$LOCALBASE/lib -liconv $LIBS" - cat > conftest.$ac_ext <<EOF - #line 9228 "configure" - #include "confdefs.h" -@@ -9253,7 +9253,7 @@ - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- _ICONV_LIBS="$_ICONV_LIBS -liconv" -+ _ICONV_LIBS="$_ICONV_LIBS -L$LOCALBASE/lib -liconv" - else - echo "$ac_t""no" 1>&6 - fi diff --git a/mail/thunderbird-devel/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp b/mail/thunderbird-devel/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp deleted file mode 100644 index 41c462d74f62..000000000000 --- a/mail/thunderbird-devel/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp +++ /dev/null @@ -1,46 +0,0 @@ ---- extensions/typeaheadfind/src/nsTypeAheadFind.cpp.orig Wed Nov 19 01:20:47 2003 -+++ extensions/typeaheadfind/src/nsTypeAheadFind.cpp Tue Feb 10 02:52:26 2004 -@@ -323,11 +323,11 @@ - prefBranch->GetBoolPref("accessibility.typeaheadfind.startlinksonly", - &mStartLinksOnlyPref); - -- PRBool isSoundEnabled = PR_TRUE; -+ mIsSoundEnabled = PR_TRUE; - prefBranch->GetBoolPref("accessibility.typeaheadfind.enablesound", -- &isSoundEnabled); -+ &mIsSoundEnabled); - nsXPIDLCString soundStr; -- if (isSoundEnabled) { -+ if (mIsSoundEnabled && mIsSoundEnabled) { - prefBranch->GetCharPref("accessibility.typeaheadfind.soundURL", - getter_Copies(soundStr)); - } -@@ -758,7 +758,7 @@ - } - else { - // No find string to backspace in! -- if (mIsBackspaceProtectOn) { -+ if (mIsBackspaceProtectOn && mIsSoundEnabled) { - // This flag should be on only if the last key was a backspace. - // It keeps us from accidentally hitting backspace too many times and - // going back in history when we really just wanted to clear -@@ -1012,7 +1012,9 @@ - - // Error sound (don't fire when backspace is pressed, they're - // trying to correct the mistake!) -- PlayNotFoundSound(); -+ if (mIsSoundEnabled) { -+ PlayNotFoundSound(); -+ } - - // Remove bad character from buffer, so we can continue typing from - // last matched character -@@ -1059,7 +1061,7 @@ - void - nsTypeAheadFind::PlayNotFoundSound() - { -- if (mNotFoundSoundURL.IsEmpty()) // no sound -+ if (mNotFoundSoundURL.IsEmpty() || !mIsSoundEnabled) // no sound - return; - if (!mSoundInterface) { - mSoundInterface = do_CreateInstance("@mozilla.org/sound;1"); diff --git a/mail/thunderbird-devel/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h b/mail/thunderbird-devel/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h deleted file mode 100644 index 07ad43b4334d..000000000000 --- a/mail/thunderbird-devel/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h +++ /dev/null @@ -1,12 +0,0 @@ ---- extensions/typeaheadfind/src/nsTypeAheadFind.h.orig Fri May 23 22:00:33 2003 -+++ extensions/typeaheadfind/src/nsTypeAheadFind.h Mon Feb 9 22:21:43 2004 -@@ -194,6 +194,9 @@ - - nsCString mNotFoundSoundURL; - -+ // Move the sound enabled boolean out for all methods to access. -+ PRBool mIsSoundEnabled; -+ - // PRBool's are used instead of PRPackedBool's where the address of the - // boolean variable is getting passed into a method. For example: - // GetBoolPref("accessibility.typeaheadfind.linksonly", &mLinksOnlyPref); diff --git a/mail/thunderbird-devel/files/patch-mail_app_mozilla.in b/mail/thunderbird-devel/files/patch-mail_app_mozilla.in deleted file mode 100644 index 01091fb2ce3b..000000000000 --- a/mail/thunderbird-devel/files/patch-mail_app_mozilla.in +++ /dev/null @@ -1,472 +0,0 @@ ---- mail/app/mozilla.in.orig Sun Jul 25 01:58:06 2004 -+++ mail/app/mozilla.in Tue Mar 22 23:59:11 2005 -@@ -29,51 +29,82 @@ - ## the mozilla-bin binary to work. - ## - -+# -+# MOZ_PIS, "Mozilla Plugable Init Scripts" -+# MOZ_PIS_ is the name space used -+# These variables and there meaning are specified in -+# mozilla/xpfe/bootstrap/init.d/README - moz_pis_startstop_scripts() - { -- MOZ_USER_DIR="%MOZ_USER_DIR%" -- # MOZ_PIS_ is the name space for "Mozilla Plugable Init Scripts" -- # These variables and there meaning are specified in -- # mozilla/xpfe/bootstrap/init.d/README -- MOZ_PIS_API=2 -- MOZ_PIS_MOZBINDIR="${dist_bin}" -- MOZ_PIS_SESSION_PID="$$" -- MOZ_PIS_USER_DIR="${MOZ_USER_DIR}" -- export MOZ_PIS_API MOZ_PIS_MOZBINDIR MOZ_PIS_SESSION_PID MOZ_PIS_USER_DIR -- -- case "${1}" in -- "start") -- for curr_pis in "${dist_bin}/init.d"/S* "${HOME}/${MOZ_USER_DIR}/init.d"/S* ; do -- if [ -x "${curr_pis}" ] ; then -- case "${curr_pis}" in -- *.sh) . "${curr_pis}" ;; -- *) "${curr_pis}" "start" ;; -- esac -- fi -- done -- ;; -- "stop") -- for curr_pis in "${HOME}/${MOZ_USER_DIR}/init.d"/K* "${dist_bin}/init.d"/K* ; do -- if [ -x "${curr_pis}" ] ; then -- case "${curr_pis}" in -- *.sh) . "${curr_pis}" ;; -- *) "${curr_pis}" "stop" ;; -- esac -- fi -- done -- ;; -- *) -- echo 1>&2 "$0: Internal error in moz_pis_startstop_scripts." -- exit 1 -- ;; -- esac -+ MOZ_PIS_API=2 -+ MOZ_PIS_MOZBINDIR="${dist_bin}" -+ MOZ_PIS_SESSION_PID="$$" -+ MOZ_PIS_USER_DIR="${MOZ_USER_DIR}" -+ export MOZ_PIS_API MOZ_PIS_MOZBINDIR MOZ_PIS_SESSION_PID MOZ_PIS_USER_DIR -+ -+ case "${1}" in -+ "start") -+ for curr_pis in "${MOZ_PIS_MOZBINDIR}/init.d"/S* \ -+ "${HOME}/${MOZ_PIS_USER_DIR}/init.d"/S*; do -+ if [ -x "${curr_pis}" ]; then -+ case "${curr_pis}" in -+ *.sh) -+ . "${curr_pis}" -+ ;; -+ *) -+ ${curr_pis} "start" -+ ;; -+ esac -+ fi -+ done -+ ;; -+ "stop") -+ for curr_pis in "${MOZ_PIS_MOZBINDIR}/init.d"/K* \ -+ "${HOME}/${MOZ_PIS_USER_DIR}/init.d"/K*; do -+ if [ -x "${curr_pis}" ]; then -+ case "${curr_pis}" in -+ *.sh) -+ . "${curr_pis}" -+ ;; -+ *) -+ ${curr_pis} "stop" -+ ;; -+ esac -+ fi -+ done -+ ;; -+ *) -+ echo "$0: Internal error in moz_pis_startstop_scripts." 1>&2 -+ exit 1 -+ ;; -+ esac - } - --#uncomment for debugging -+# uncomment for debugging - #set -x - --moz_libdir=%MOZAPPDIR% --MRE_HOME=%MREDIR% -+# -+# variables -+# -+#location="new-tab" -+#MOZILLA_UILOCALE="en-US" -+#MOZILLA_UIREGION="US" -+ -+# -+# working definitions -+# -+MOZ_USER_DIR="%MOZ_USER_DIR%" -+moz_libdir="%MOZAPPDIR%" -+MRE_HOME="%MREDIR%" -+ -+debugging= # set the debugging level -+here=`pwd` -+ -+if [ ! -d "${MRE_HOME}" ]; then -+ # use moz_libdir as MRE_HOME -+ MRE_HOME="${moz_libdir}" -+fi -+export MRE_HOME - - # Use run-mozilla.sh in the current dir if it exists - # If not, then start resolving symlinks until we find run-mozilla.sh -@@ -82,160 +113,214 @@ - curdir=`dirname "$progname"` - progbase=`basename "$progname"` - run_moz="$curdir/run-mozilla.sh" --if test -x "$run_moz"; then -- dist_bin="$curdir" -- found=1 -+if [ -x "$run_moz" ]; then -+ dist_bin="$curdir" -+ found=1 - else -- here=`/bin/pwd` -- while [ -h "$progname" ]; do -- bn=`basename "$progname"` -- cd `dirname "$progname"` -- progname=`/bin/ls -l "$bn" | sed -e 's/^.* -> //' ` -- if [ ! -x "$progname" ]; then -- break -- fi -- curdir=`dirname "$progname"` -- run_moz="$curdir/run-mozilla.sh" -- if [ -x "$run_moz" ]; then -- cd "$curdir" -- dist_bin=`pwd` -- found=1 -- break -- fi -- done -- cd "$here" -+ while [ -h "${progname}" ]; do -+ bn=`basename "${progname}"` -+ cd `dirname "${progname}"` -+ progname=`ls -l "${bn}" | sed -e 's/^.* -> //'` -+ if [ ! -x "$progname" ]; then -+ break -+ fi -+ curdir=`dirname "${progname}"` -+ run_moz="${curdir}/run-mozilla.sh" -+ if [ -x "${run_moz}" ]; then -+ cd "$curdir" -+ dist_bin=`pwd` -+ run_moz="${dist_bin}/run-mozilla.sh" -+ found=1 -+ break -+ fi -+ done -+ cd "${here}" - fi - if [ $found = 0 ]; then -- # Check default compile-time libdir -- if [ -x "$moz_libdir/run-mozilla.sh" ]; then -- dist_bin="$moz_libdir" -- else -- echo "Cannot find mozilla runtime directory. Exiting." -- exit 1 -- fi --fi -- --script_args="" --moreargs="" --debugging=0 --MOZILLA_BIN="${progbase}-bin" -- --# The following is to check for a currently running instance. --# This is taken almost verbatim from the Mozilla RPM package's launch script. --MOZ_CLIENT_PROGRAM="$dist_bin/mozilla-xremote-client" --check_running() { -- "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" 'ping()' 2>/dev/null >/dev/null -- RETURN_VAL=$? -- if [ $RETURN_VAL -eq 0 ]; then -- echo 1 -- return 1 -+ # Check default compile-time libdir -+ if [ -x "${moz_libdir}/run-mozilla.sh" ]; then -+ dist_bin="$moz_libdir" -+ run_moz="${dist_bin}/run-mozilla.sh" - else -- echo 0 -- return 0 -+ echo "$0: Cannot find mozilla runtime directory. Exiting." 1>&2 -+ exit 1 - fi --} -+fi - -+MOZILLA_BIN="${progbase}-bin" - if [ "$OSTYPE" = "beos" ]; then -- mimeset -F "$MOZILLA_BIN" -+ mimeset -F "$MOZILLA_BIN" - fi - --ALREADY_RUNNING=`check_running` -+# test for binary apps in ${dist_bin} -+if [ -x "${dist_bin}/${MOZILLA_BIN}" ]; then -+ MOZILLA_BIN="${dist_bin}/${progbase}-bin" -+else -+ echo "$0: Cannot find mozilla binary executable. Exiting." 1>&2 -+ exit 1 -+fi -+if [ -x "${dist_bin}/mozilla-xremote-client" ]; then -+ MOZ_CLIENT_PROGRAM="${dist_bin}/mozilla-xremote-client -a ${progbase}" -+else -+ MOZ_CLIENT_PROGRAM="${MOZILLA_BIN} -remote -a ${progbase}" -+fi - --################################################################ Parse Arguments --# If there's a command line argument but it doesn't begin with a - --# it's probably a url. Try to send it to a running instance. --_USE_EXIST=0 --_NEW_WINDOW= --_optOne="$1" --case "${_optOne}" in -- -*) -- ;; -+# guest a default remote command -+_remote_cmd="xfeDoCommand(openInbox)" -+ -+# parse options -+script_args= # null -+moreargs= # null -+target= # null -+ALREADY_RUNNING="test" -+while [ $# -gt 0 ] -+do -+ if [ -n "${target}" ]; then -+ # well, this can't be the target if not last -+ moreargs="${moreargs} \"${target}\"" -+ target= # null -+ fi -+ case "$1" in -+ # preserve [pP] for profile -+ --pure | -pure) -+ MOZILLA_BIN="${MOZILLA_BIN}.pure" -+ shift -+ ;; -+ -g | --debug) -+ script_args="${script_args} -g" -+ debugging=1 -+ shift -+ ;; -+ -d | --debugger) -+ if [ -n "$2" ]; then -+ script_args="${script_args} -d $2" -+ shift 2 -+ else -+ "$0: ERROR, $1 needs an argument. Exiting" 1>&2 -+ exit 1 -+ fi -+ ;; -+ -[Uu][Ii][Ll]ocale) -+ if [ -n "$2" ]; then -+ uilocale="$2" -+ shift 2 -+ else -+ echo "$0: ERROR, $1 needs an argument. Exiting" 1>&2 -+ exit 1 -+ fi -+ ;; -+ -[Uu][Ii][Rr]egion) -+ if [ -n "$2" ]; then -+ uiregion="$2" -+ shift 2 -+ else -+ echo "$0: ERROR, $1 needs an argument. Exiting" 1>&2 -+ exit 1 -+ fi -+ ;; -+ -mail) -+ # mail is default for ithunderbird -+ shift -+ ;; -+ -compose) -+ _remote_cmd="xfeDoCommand(composeMessage)" -+ moreargs="${moreargs} $1" -+ shift -+ ;; -+ -turbo | -nosplash | -quiet) -+ # use remote even with this -+ moreargs="${moreargs} $1" -+ shift -+ ;; -+ -*) -+ # don't use remote with options -+ ALREADY_RUNNING= # null -+ moreargs="${moreargs} $1" -+ shift -+ ;; - *) -- _USE_EXIST=1 -- ;; --esac -- --_optOthers= --_optLast= --for i in "$@"; do -- _optLast="${i}" --done #last arg -- --for i in "$@"; do -- [ $i = ${_optLast} ] && break -- _optOthers="${_optOthers} ${i}" --done #others arg -- --#???: needs check if othersopt begin with -* ? --if [ `expr "${_optLast}" : '.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then -- # Last argument seems to be a local file/directory -- # Check, if it is absolutely specified (ie. /home/foo/file vs. ./file) -- # If it is just "relatively" (./file) specified, make it absolutely -- [ `expr "${_optLast}" : '/.*'` -eq 0 ] && _optLast="file://`pwd`/${_optLast}" --elif [ `expr "${_optLast}" : '.*:/.*'` -gt 0 -o -n "${_optOthers}" ]; then #???? like before... -- _NEW_WINDOW=1 --fi --################################################################ Parse Arguments -- --########################################################################### Main --if [ $ALREADY_RUNNING -eq 1 ]; then -- # There's an instance already running. Use it. -- # Any command line args passed in? -- if [ $# -gt 0 ]; then -- # There were "some" command line args. -- if [ ${_USE_EXIST} -eq 1 ]; then -- # We should use an existing instance, as _USE_EXIST=$_USE_EXIST=-1 -- _open_type="window" -- #_open_type="tab" -- _remote_cmd="openURL(${_optLast} , new-${_open_type})" -- "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" "${_remote_cmd}" -- unset _remote_cmd _open_type -- exit $? -- fi -+ target="$1" -+ shift -+ ;; -+ esac -+done -+ -+# test for a running copy of firefox -+# seems this is not needed -+#if [-n "${ALREADY_RUNNING}" ]; then -+# if [ -n "${DISPLAY}" ]; then -+# if [ -n "${debugging}" ]; then -+# echo "${run_moz} ${MOZ_CLIENT_PROGRAM} ping()" -+# ${run_moz} ${MOZ_CLIENT_PROGRAM} 'ping()' && ALREADY_RUNNING="yes" -+# else -+# ${run_moz} ${MOZ_CLIENT_PROGRAM} 'ping()' >/dev/null 2>&1 && -+# ALREADY_RUNNING="yes" -+# fi -+# elif [ -n "${debugging}" ]; then -+# echo "$0: WARN, no DISPLAY environment" 1>&2 -+# fi -+#fi -+ -+# process target -+if [ -n "${target}" ]; then -+ moreargs="${moreargs} \"${target}\"" -+ if [ -n "${ALREADY_RUNNING}" ]; then -+ if [ `expr "${target}" : '.*:.*'` -eq 0 ]; then -+ # not an URI, don't use xremote -+ ALREADY_RUNNING= # null -+ fi -+ fi -+fi -+ -+# try remote protocol if running -+if [ -n "${ALREADY_RUNNING}" ]; then -+ if [ -n "${target}" ]; then -+ if [ -n "${location}" ]; then -+ _remote_cmd="openURL(${target},${location})" - else -- # No command line args. Open new window/tab -- #exec "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" "xfeDoCommand(openBrowser)" -- "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" "xfeDoCommand(openInbox)" -- exit $? -+ _remote_cmd="openURL(${target})" - fi -+ fi -+ # FIXME problems with freedesktop StartupNotify -+ if [ -n "${debugging}" ]; then -+ echo "${run_moz} ${script_args} ${MOZ_CLIENT_PROGRAM} ${_remote_cmd}" -+ ${run_moz} ${script_args} ${MOZ_CLIENT_PROGRAM} ${_remote_cmd} && -+ exit 0 -+ else -+ ${run_moz} ${script_args} ${MOZ_CLIENT_PROGRAM} ${_remote_cmd} \ -+ >/dev/null 2>&1 && exit 0 -+ fi - fi --# Default action - no running instance or _USE_EXIST (${_USE_EXIST}) ! -eq 1 --########################################################################### Main - --while [ $# -gt 0 ] --do -- case "$1" in -- -p | --pure | -pure) -- MOZILLA_BIN="${MOZILLA_BIN}.pure" -- shift -- ;; -- -g | --debug) -- script_args="$script_args -g" -- debugging=1 -- shift -- ;; -- -d | --debugger) -- script_args="$script_args -d $2" -- shift 2 -- ;; -- *) -- moreargs="$moreargs \"$1\"" -- shift 1 -- ;; -- esac --done -+# fallback to direct invocation -+ -+# UILocale, UIRegion -+if [ -z "${uilocale}" -a -n "${MOZILLA_UILOCALE}" ]; then -+ uilocale="${MOZILLA_UILOCALE}" -+fi -+if [ -z "${uiregion}" -a -n "${MOZILLA_UIREGION}" ]; then -+ uiregion="${MOZILLA_UIREGION}" -+fi -+if [ -n "${uiregion}" -a -z "${uilocale}" ]; then -+ uilocale="en-US" -+fi -+if [ -n "${uilocale}" ]; then -+ if [ -n "${uiregion}" ]; then -+ moreargs="-UIRegion ${uiregion} ${moreargs}" -+ fi -+ moreargs="-UILocale ${uilocale} ${moreargs}" -+fi - --export MRE_HOME --eval "set -- $moreargs" -+# real invocation -+eval "set -- ${moreargs}" - - ## Start addon scripts - moz_pis_startstop_scripts "start" - --if [ $debugging = 1 ] --then -- echo $dist_bin/run-mozilla.sh $script_args $dist_bin/$MOZILLA_BIN "$@" -+if [ -n "${debugging}" ]; then -+ echo "${run_moz} ${script_args} ${MOZILLA_BIN} $@" - fi --"$dist_bin/run-mozilla.sh" $script_args "$dist_bin/$MOZILLA_BIN" "$@" -+${run_moz} ${script_args} ${MOZILLA_BIN} "$@" - exitcode=$? - - ## Stop addon scripts diff --git a/mail/thunderbird-devel/files/patch-nspr-unix.c b/mail/thunderbird-devel/files/patch-nspr-unix.c deleted file mode 100644 index 6bb4ed08fb40..000000000000 --- a/mail/thunderbird-devel/files/patch-nspr-unix.c +++ /dev/null @@ -1,21 +0,0 @@ ---- nsprpub/pr/src/md/unix/unix.c.orig Sat May 31 18:06:04 2003 -+++ nsprpub/pr/src/md/unix/unix.c Sat May 31 18:04:43 2003 -@@ -65,7 +65,8 @@ - * PRInt32* pointer to a _PRSockLen_t* pointer. - */ - #if defined(HAVE_SOCKLEN_T) \ -- || (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) -+ || (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) \ -+ || defined(FREEBSD) - #define _PRSockLen_t socklen_t - #elif defined(IRIX) || defined(HPUX) || defined(OSF1) || defined(SOLARIS) \ - || defined(AIX4_1) || defined(LINUX) || defined(SONY) \ -@@ -73,7 +74,7 @@ - || defined(SUNOS4) || defined(NCR) || defined(DARWIN) \ - || defined(NEXTSTEP) || defined(QNX) - #define _PRSockLen_t int --#elif (defined(AIX) && !defined(AIX4_1)) || defined(FREEBSD) \ -+#elif (defined(AIX) && !defined(AIX4_1)) \ - || defined(NETBSD) || defined(OPENBSD) || defined(UNIXWARE) \ - || defined(DGUX) || defined(VMS) || defined(NTO) - #define _PRSockLen_t size_t diff --git a/mail/thunderbird-devel/files/patch-nsprpub-pr-include-md-_freebsd.cfg b/mail/thunderbird-devel/files/patch-nsprpub-pr-include-md-_freebsd.cfg deleted file mode 100644 index 3ac9a34fbc70..000000000000 --- a/mail/thunderbird-devel/files/patch-nsprpub-pr-include-md-_freebsd.cfg +++ /dev/null @@ -1,161 +0,0 @@ ---- nsprpub/pr/include/md/_freebsd.cfg.orig Wed Jan 2 18:38:25 2002 -+++ nsprpub/pr/include/md/_freebsd.cfg Sun Feb 1 15:09:53 2004 -@@ -91,7 +91,7 @@ - #define PR_ALIGN_OF_DOUBLE 4 - #define PR_ALIGN_OF_POINTER 4 - --#elif defined(__alpha) -+#elif defined(__alpha__) - - #define IS_LITTLE_ENDIAN 1 - #undef IS_BIG_ENDIAN -@@ -138,6 +138,149 @@ - #define PR_ALIGN_OF_DOUBLE 8 - #define PR_ALIGN_OF_POINTER 8 - -+#elif defined(__sparc64__) -+#undef IS_LITTLE_ENDIAN -+#define IS_BIG_ENDIAN 1 -+#define PR_ALIGN_OF_INT64 8 -+#define PR_ALIGN_OF_DOUBLE 8 -+#define IS_64 -+ -+#define PR_BYTES_PER_BYTE 1 -+#define PR_BYTES_PER_SHORT 2 -+#define PR_BYTES_PER_INT 4 -+#define PR_BYTES_PER_INT64 8 -+#define PR_BYTES_PER_LONG 8 -+#define PR_BYTES_PER_FLOAT 4 -+#define PR_BYTES_PER_DOUBLE 8 -+#define PR_BYTES_PER_WORD 8 -+#define PR_BYTES_PER_DWORD 8 -+#define PR_BYTES_PER_WORD_LOG2 3 -+#define PR_BYTES_PER_DWORD_LOG2 3 -+ -+#define PR_BITS_PER_BYTE 8 -+#define PR_BITS_PER_SHORT 16 -+#define PR_BITS_PER_INT 32 -+#define PR_BITS_PER_INT64 64 -+#define PR_BITS_PER_LONG 64 -+#define PR_BITS_PER_FLOAT 32 -+#define PR_BITS_PER_DOUBLE 64 -+#define PR_BITS_PER_WORD 64 -+ -+#define PR_BITS_PER_BYTE_LOG2 3 -+#define PR_BITS_PER_SHORT_LOG2 4 -+#define PR_BITS_PER_INT_LOG2 5 -+#define PR_BITS_PER_INT64_LOG2 6 -+#define PR_BITS_PER_LONG_LOG2 6 -+#define PR_BITS_PER_FLOAT_LOG2 5 -+#define PR_BITS_PER_DOUBLE_LOG2 6 -+#define PR_BITS_PER_WORD_LOG2 6 -+ -+#define PR_ALIGN_OF_SHORT 2 -+#define PR_ALIGN_OF_INT 4 -+#define PR_ALIGN_OF_LONG 8 -+#define PR_ALIGN_OF_FLOAT 4 -+#define PR_ALIGN_OF_POINTER 8 -+ -+#define HAVE_LONG_LONG -+#define HAVE_ALIGNED_DOUBLES -+#define HAVE_ALIGNED_LONGLONGS -+ -+#elif defined(__ia64__) -+#define IS_LITTLE_ENDIAN 1 -+#undef IS_BIG_ENDIAN -+#define HAVE_LONG_LONG -+#define HAVE_ALIGNED_DOUBLES -+#define HAVE_ALIGNED_LONGLONGS -+#define IS_64 -+ -+#define PR_BYTES_PER_BYTE 1 -+#define PR_BYTES_PER_SHORT 2 -+#define PR_BYTES_PER_INT 4 -+#define PR_BYTES_PER_INT64 8 -+#define PR_BYTES_PER_LONG 8 -+#define PR_BYTES_PER_FLOAT 4 -+#define PR_BYTES_PER_DOUBLE 8 -+#define PR_BYTES_PER_WORD 8 -+#define PR_BYTES_PER_DWORD 8 -+ -+#define PR_BITS_PER_BYTE 8 -+#define PR_BITS_PER_SHORT 16 -+#define PR_BITS_PER_INT 32 -+#define PR_BITS_PER_INT64 64 -+#define PR_BITS_PER_LONG 64 -+#define PR_BITS_PER_FLOAT 32 -+#define PR_BITS_PER_DOUBLE 64 -+#define PR_BITS_PER_WORD 64 -+ -+#define PR_BITS_PER_BYTE_LOG2 3 -+#define PR_BITS_PER_SHORT_LOG2 4 -+#define PR_BITS_PER_INT_LOG2 5 -+#define PR_BITS_PER_INT64_LOG2 6 -+#define PR_BITS_PER_LONG_LOG2 6 -+#define PR_BITS_PER_FLOAT_LOG2 5 -+#define PR_BITS_PER_DOUBLE_LOG2 6 -+#define PR_BITS_PER_WORD_LOG2 6 -+ -+#define PR_ALIGN_OF_SHORT 2 -+#define PR_ALIGN_OF_INT 4 -+#define PR_ALIGN_OF_LONG 8 -+#define PR_ALIGN_OF_INT64 8 -+#define PR_ALIGN_OF_FLOAT 4 -+#define PR_ALIGN_OF_DOUBLE 8 -+#define PR_ALIGN_OF_POINTER 8 -+#define PR_ALIGN_OF_WORD 8 -+ -+#define PR_BYTES_PER_WORD_LOG2 3 -+#define PR_BYTES_PER_DWORD_LOG2 3 -+ -+#elif defined(__amd64__) -+#define IS_LITTLE_ENDIAN 1 -+#undef IS_BIG_ENDIAN -+#define IS_64 -+ -+#define PR_BYTES_PER_BYTE 1 -+#define PR_BYTES_PER_SHORT 2 -+#define PR_BYTES_PER_INT 4 -+#define PR_BYTES_PER_INT64 8 -+#define PR_BYTES_PER_LONG 8 -+#define PR_BYTES_PER_FLOAT 4 -+#define PR_BYTES_PER_DOUBLE 8 -+#define PR_BYTES_PER_WORD 8 -+#define PR_BYTES_PER_DWORD 8 -+ -+#define PR_BITS_PER_BYTE 8 -+#define PR_BITS_PER_SHORT 16 -+#define PR_BITS_PER_INT 32 -+#define PR_BITS_PER_INT64 64 -+#define PR_BITS_PER_LONG 64 -+#define PR_BITS_PER_FLOAT 32 -+#define PR_BITS_PER_DOUBLE 64 -+#define PR_BITS_PER_WORD 64 -+ -+#define PR_BITS_PER_BYTE_LOG2 3 -+#define PR_BITS_PER_SHORT_LOG2 4 -+#define PR_BITS_PER_INT_LOG2 5 -+#define PR_BITS_PER_INT64_LOG2 6 -+#define PR_BITS_PER_LONG_LOG2 6 -+#define PR_BITS_PER_FLOAT_LOG2 5 -+#define PR_BITS_PER_DOUBLE_LOG2 6 -+#define PR_BITS_PER_WORD_LOG2 6 -+ -+#define PR_ALIGN_OF_SHORT 2 -+#define PR_ALIGN_OF_INT 4 -+#define PR_ALIGN_OF_LONG 8 -+#define PR_ALIGN_OF_INT64 8 -+#define PR_ALIGN_OF_FLOAT 4 -+#define PR_ALIGN_OF_DOUBLE 8 -+#define PR_ALIGN_OF_POINTER 8 -+#define PR_ALIGN_OF_WORD 8 -+ -+#define PR_BYTES_PER_WORD_LOG2 3 -+#define PR_BYTES_PER_DWORD_LOG2 3 -+ -+#define HAVE_LONG_LONG -+#define HAVE_ALIGNED_DOUBLES -+#define HAVE_ALIGNED_LONGLONGS - #else - - #error "Unknown CPU architecture" diff --git a/mail/thunderbird-devel/files/patch-nsprpub-pr-include-md-_freebsd.h b/mail/thunderbird-devel/files/patch-nsprpub-pr-include-md-_freebsd.h deleted file mode 100644 index 38f21b2ddd6d..000000000000 --- a/mail/thunderbird-devel/files/patch-nsprpub-pr-include-md-_freebsd.h +++ /dev/null @@ -1,13 +0,0 @@ ---- nsprpub/pr/include/md/_freebsd.h.orig Sat Nov 15 23:36:13 2003 -+++ nsprpub/pr/include/md/_freebsd.h Mon Feb 9 22:24:39 2004 -@@ -50,6 +50,10 @@ - #define _PR_SI_ARCHITECTURE "alpha" - #elif defined(__sparc__) - #define _PR_SI_ARCHITECTURE "sparc" -+#elif defined(__ia64__) -+#define _PR_SI_ARCHITECTURE "ia64" -+#elif defined(__amd64__) -+#define _PR_SI_ARCHITECTURE "amd64" - #else - #error "Unknown CPU architecture" - #endif diff --git a/mail/thunderbird-devel/files/patch-nsprpub-pr-include-md-_pth.h b/mail/thunderbird-devel/files/patch-nsprpub-pr-include-md-_pth.h deleted file mode 100644 index 1f8159c70b1f..000000000000 --- a/mail/thunderbird-devel/files/patch-nsprpub-pr-include-md-_pth.h +++ /dev/null @@ -1,11 +0,0 @@ ---- nsprpub/pr/include/md/_pth.h.orig Mon Jul 26 07:23:42 2004 -+++ nsprpub/pr/include/md/_pth.h Mon Jul 26 07:18:37 2004 -@@ -90,7 +90,7 @@ - #define _PT_PTHREAD_MUTEXATTR_INIT pthread_mutexattr_init - #define _PT_PTHREAD_MUTEXATTR_DESTROY pthread_mutexattr_destroy - #define _PT_PTHREAD_MUTEX_INIT(m, a) pthread_mutex_init(&(m), &(a)) --#define _PT_PTHREAD_MUTEX_IS_LOCKED(m) (EBUSY == pthread_mutex_trylock(&(m))) -+#define _PT_PTHREAD_MUTEX_IS_LOCKED(m) (0 != pthread_mutex_trylock(&(m))) - #if defined(DARWIN) - #define _PT_PTHREAD_CONDATTR_INIT(x) 0 - #else diff --git a/mail/thunderbird-devel/files/patch-nsprpub-pr-src-io-prprf.c b/mail/thunderbird-devel/files/patch-nsprpub-pr-src-io-prprf.c deleted file mode 100644 index 74a85ce8b5e2..000000000000 --- a/mail/thunderbird-devel/files/patch-nsprpub-pr-src-io-prprf.c +++ /dev/null @@ -1,14 +0,0 @@ ---- nsprpub/pr/src/io/prprf.c.orig Mon Mar 8 22:18:19 2004 -+++ nsprpub/pr/src/io/prprf.c Mon May 3 13:00:27 2004 -@@ -51,7 +51,10 @@ - ** Note: on some platforms va_list is defined as an array, - ** and requires array notation. - */ --#if (defined(LINUX) && defined(__x86_64__)) -+#if defined(__amd64__) -+#include <stdarg.h> -+#define VARARGS_ASSIGN(foo, bar) va_copy((foo), (bar)) -+#elif (defined(LINUX) && defined(__x86_64__)) - #define VARARGS_ASSIGN(foo, bar) __va_copy((foo), (bar)) - #elif (defined(LINUX) && defined(__powerpc__)) || \ - (defined(LINUX) && defined(__s390__)) || \ diff --git a/mail/thunderbird-devel/files/patch-nsprpub-pr-src-pthreads-ptio.c b/mail/thunderbird-devel/files/patch-nsprpub-pr-src-pthreads-ptio.c deleted file mode 100644 index 08346f235416..000000000000 --- a/mail/thunderbird-devel/files/patch-nsprpub-pr-src-pthreads-ptio.c +++ /dev/null @@ -1,29 +0,0 @@ ---- nsprpub/pr/src/pthreads/ptio.c.orig Mon Jul 14 17:59:47 2003 -+++ nsprpub/pr/src/pthreads/ptio.c Fri Aug 29 15:39:46 2003 -@@ -189,7 +189,7 @@ - #endif - #endif - --#ifdef DARWIN -+#if defined(DARWIN) || defined(FREEBSD) - static PRBool _pr_ipv6_v6only_on_by_default; - /* The IPV6_V6ONLY socket option is not defined on Mac OS X 10.1. */ - #ifndef IPV6_V6ONLY -@@ -1154,7 +1154,7 @@ - _pr_stderr = pt_SetMethods(2, PR_DESC_FILE, PR_FALSE, PR_TRUE); - PR_ASSERT(_pr_stdin && _pr_stdout && _pr_stderr); - --#ifdef DARWIN -+#if defined(DARWIN) || defined(FREEBSD) - /* In Mac OS X v10.3 Panther Beta the IPV6_V6ONLY socket option - * is turned on by default, contrary to what RFC 3493, Section - * 5.3 says. So we have to turn it off. Find out whether we -@@ -3462,7 +3462,7 @@ - if (osfd == -1) pt_MapError(_PR_MD_MAP_SOCKET_ERROR, errno); - else - { --#ifdef DARWIN -+#if defined(DARWIN) || defined(FREEBSD) - if ((domain == AF_INET6) && _pr_ipv6_v6only_on_by_default) - { - int on = 0; diff --git a/mail/thunderbird-devel/files/patch-security-coreconf-FreeBSD.mk b/mail/thunderbird-devel/files/patch-security-coreconf-FreeBSD.mk deleted file mode 100644 index 3e0e14acaaf2..000000000000 --- a/mail/thunderbird-devel/files/patch-security-coreconf-FreeBSD.mk +++ /dev/null @@ -1,28 +0,0 @@ ---- security/coreconf/FreeBSD.mk.orig Wed Mar 26 20:17:25 2003 -+++ security/coreconf/FreeBSD.mk Sun Nov 21 22:59:49 2004 -@@ -43,8 +43,12 @@ - ifeq ($(OS_TEST),alpha) - CPU_ARCH = alpha - else -+ifeq ($(OS_TEST),amd64) -+CPU_ARCH = amd64 -+else - CPU_ARCH = x86 - endif -+endif - - OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK - -@@ -71,7 +75,11 @@ - DLL_SUFFIX = so.1.0 - endif - --MKSHLIB = $(CC) $(DSO_LDOPTS) -+ifneq (,$(filter alpha ia64,$(OS_TEST))) -+MKSHLIB = $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS) -o $@ -+else -+MKSHLIB = $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS) -o $@ -+endif - ifdef MAPFILE - # Add LD options to restrict exported symbols to those in the map file - endif diff --git a/mail/thunderbird-devel/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp b/mail/thunderbird-devel/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp deleted file mode 100644 index 7f8e55f536df..000000000000 --- a/mail/thunderbird-devel/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp +++ /dev/null @@ -1,29 +0,0 @@ ---- uriloader/exthandler/unix/nsGNOMERegistry.cpp.orig Fri Dec 24 04:30:00 2004 -+++ uriloader/exthandler/unix/nsGNOMERegistry.cpp Fri Dec 24 04:34:05 2004 -@@ -143,7 +143,7 @@ - PR_END_MACRO - - // Attempt to open libgconf -- gconfLib = LoadVersionedLibrary("gconf-2", ".4"); -+ gconfLib = PR_LoadLibrary("libgconf-2.so"); - ENSURE_LIB(gconfLib); - - GET_LIB_FUNCTION(gconf, gconf_client_get_default); -@@ -151,7 +151,7 @@ - GET_LIB_FUNCTION(gconf, gconf_client_get_bool); - - // Attempt to open libgnome -- gnomeLib = LoadVersionedLibrary("gnome-2", ".0"); -+ gnomeLib = PR_LoadLibrary("libgnome-2.so"); - ENSURE_LIB(gnomeLib); - - GET_LIB_FUNCTION(gnome, gnome_url_show); -@@ -160,7 +160,7 @@ - GET_LIB_FUNCTION(gnome, gnome_program_get); - - // Attempt to open libgnomevfs -- vfsLib = LoadVersionedLibrary("gnomevfs-2", ".0"); -+ vfsLib = PR_LoadLibrary("libgnomevfs-2.so"); - ENSURE_LIB(vfsLib); - - GET_LIB_FUNCTION(vfs, gnome_vfs_mime_type_from_name); diff --git a/mail/thunderbird-devel/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc b/mail/thunderbird-devel/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc deleted file mode 100644 index ac8cab896d48..000000000000 --- a/mail/thunderbird-devel/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc +++ /dev/null @@ -1,11 +0,0 @@ ---- xpcom/reflect/xptcall/public/xptcstubsdecl.inc.orig Tue Mar 16 03:07:25 2004 -+++ xpcom/reflect/xptcall/public/xptcstubsdecl.inc Mon May 3 13:05:12 2004 -@@ -8,7 +8,7 @@ - * 1 is AddRef - * 2 is Release - */ --#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__)) -+#if !defined(__ia64) - NS_IMETHOD Stub3(); - NS_IMETHOD Stub4(); - NS_IMETHOD Stub5(); diff --git a/mail/thunderbird-devel/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in b/mail/thunderbird-devel/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in deleted file mode 100644 index 51edeb95a7a7..000000000000 --- a/mail/thunderbird-devel/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in +++ /dev/null @@ -1,54 +0,0 @@ ---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig Thu Aug 14 21:00:23 2003 -+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in Sun Feb 1 15:06:40 2004 -@@ -49,6 +49,9 @@ - ifeq (86,$(findstring 86,$(OS_TEST))) - CPPSRCS := xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp - endif -+ifeq (amd64,$(OS_TEST)) -+CPPSRCS := xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp -+endif - endif - # - # New code for Linux, et. al., with gcc -@@ -60,7 +63,7 @@ - endif - endif - # IA64 Linux --ifneq (,$(filter Linux,$(OS_ARCH))) -+ifneq (,$(filter Linux FreeBSD,$(OS_ARCH))) - ifneq (,$(findstring ia64,$(OS_TEST))) - CPPSRCS := xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp - ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s -@@ -106,9 +109,15 @@ - ASFILES := xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s - endif - # -+# FreeBSD/Alpha -+# -+ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDalpha) -+CPPSRCS := xptcinvoke_freebsd_alpha.cpp xptcstubs_freebsd_alpha.cpp -+endif -+# - # Linux/Alpha - # --ifneq (,$(filter Linuxalpha FreeBSDalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) -+ifneq (,$(filter Linuxalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) - CPPSRCS := xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp - endif - # -@@ -294,6 +303,15 @@ - ifeq ($(OS_ARCH)$(OS_TEST),NetBSDsparc) - CPPSRCS := xptcinvoke_sparc_netbsd.cpp xptcstubs_sparc_netbsd.cpp - ASFILES := xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s -+endif -+# -+# FreeBSD/SPARC64 -+# -+ifeq ($(OS_ARCH),FreeBSD) -+ifneq (,$(findstring sparc,$(OS_TEST))) -+CPPSRCS := xptcinvoke_sparc64_freebsd.cpp xptcstubs_sparc64_freebsd.cpp -+ASFILES := xptcinvoke_asm_sparc64_freebsd.s xptcstubs_asm_sparcv9_solaris.s -+endif - endif - # - # Solaris/SPARC diff --git a/mail/thunderbird-devel/files/patch-xptcall-alpha b/mail/thunderbird-devel/files/patch-xptcall-alpha deleted file mode 100644 index 29631a98e61e..000000000000 --- a/mail/thunderbird-devel/files/patch-xptcall-alpha +++ /dev/null @@ -1,459 +0,0 @@ ---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp.orig Tue May 27 01:37:25 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp Tue May 27 01:37:00 2003 -@@ -0,0 +1,184 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+/* ***** BEGIN LICENSE BLOCK ***** -+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1 -+ * -+ * The contents of this file are subject to the Netscape Public License -+ * Version 1.1 (the "License"); you may not use this file except in -+ * compliance with the License. You may obtain a copy of the License at -+ * http://www.mozilla.org/NPL/ -+ * -+ * Software distributed under the License is distributed on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -+ * for the specific language governing rights and limitations under the -+ * License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is -+ * Netscape Communications Corporation. -+ * Portions created by the Initial Developer are Copyright (C) 1998 -+ * the Initial Developer. All Rights Reserved. -+ * -+ * Contributor(s): -+ * -+ * Alternatively, the contents of this file may be used under the terms of -+ * either the GNU General Public License Version 2 or later (the "GPL"), or -+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -+ * in which case the provisions of the GPL or the LGPL are applicable instead -+ * of those above. If you wish to allow use of your version of this file only -+ * under the terms of either the GPL or the LGPL, and not to allow others to -+ * use your version of this file under the terms of the NPL, indicate your -+ * decision by deleting the provisions above and replace them with the notice -+ * and other provisions required by the GPL or the LGPL. If you do not delete -+ * the provisions above, a recipient may use your version of this file under -+ * the terms of any one of the NPL, the GPL or the LGPL. -+ * -+ * ***** END LICENSE BLOCK ***** */ -+ -+/* Platform specific code to invoke XPCOM methods on native objects */ -+ -+/* contributed by Glen Nakamura <glen.nakamura@usa.net> */ -+ -+#include "xptcprivate.h" -+ -+/* Prototype specifies unmangled function name and disables unused warning */ -+static void -+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s) -+__asm__("invoke_copy_to_stack") __attribute__((unused)); -+ -+static void -+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s) -+{ -+ const PRUint8 NUM_ARG_REGS = 6-1; // -1 for "this" pointer -+ -+ for(PRUint32 i = 0; i < paramCount; i++, d++, s++) -+ { -+ if(s->IsPtrData()) -+ { -+ *d = (PRUint64)s->ptr; -+ continue; -+ } -+ switch(s->type) -+ { -+ case nsXPTType::T_I8 : *d = (PRUint64)s->val.i8; break; -+ case nsXPTType::T_I16 : *d = (PRUint64)s->val.i16; break; -+ case nsXPTType::T_I32 : *d = (PRUint64)s->val.i32; break; -+ case nsXPTType::T_I64 : *d = (PRUint64)s->val.i64; break; -+ case nsXPTType::T_U8 : *d = (PRUint64)s->val.u8; break; -+ case nsXPTType::T_U16 : *d = (PRUint64)s->val.u16; break; -+ case nsXPTType::T_U32 : *d = (PRUint64)s->val.u32; break; -+ case nsXPTType::T_U64 : *d = (PRUint64)s->val.u64; break; -+ case nsXPTType::T_FLOAT : -+ if(i < NUM_ARG_REGS) -+ { -+ // convert floats to doubles if they are to be passed -+ // via registers so we can just deal with doubles later -+ union { PRUint64 u64; double d; } t; -+ t.d = (double)s->val.f; -+ *d = t.u64; -+ } -+ else -+ // otherwise copy to stack normally -+ *d = (PRUint64)s->val.u32; -+ break; -+ case nsXPTType::T_DOUBLE : *d = (PRUint64)s->val.u64; break; -+ case nsXPTType::T_BOOL : *d = (PRUint64)s->val.b; break; -+ case nsXPTType::T_CHAR : *d = (PRUint64)s->val.c; break; -+ case nsXPTType::T_WCHAR : *d = (PRUint64)s->val.wc; break; -+ default: -+ // all the others are plain pointer types -+ *d = (PRUint64)s->val.p; -+ break; -+ } -+ } -+} -+ -+/* -+ * XPTC_PUBLIC_API(nsresult) -+ * XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, -+ * PRUint32 paramCount, nsXPTCVariant* params, void* vt) -+ */ -+__asm__( -+ "#### XPTC_InvokeByIndex ####\n" -+".text\n\t" -+ ".align 5\n\t" -+ ".globl XPTC_InvokeByIndex\n\t" -+ ".ent XPTC_InvokeByIndex\n" -+"XPTC_InvokeByIndex:\n\t" -+ ".frame $15,32,$26,0\n\t" -+ ".mask 0x4008000,-32\n\t" -+ "ldgp $29,0($27)\n" -+"$XPTC_InvokeByIndex..ng:\n\t" -+ "subq $30,32,$30\n\t" -+ "stq $26,0($30)\n\t" -+ "stq $15,8($30)\n\t" -+ "bis $30,$30,$15\n\t" -+ ".prologue 1\n\t" -+ -+ /* -+ * Allocate enough stack space to hold the greater of 6 or "paramCount"+1 -+ * parameters. (+1 for "this" pointer) Room for at least 6 parameters -+ * is required for storage of those passed via registers. -+ */ -+ -+ "bis $31,5,$2\n\t" /* count = MAX(5, "paramCount") */ -+ "cmplt $2,$18,$1\n\t" -+ "cmovne $1,$18,$2\n\t" -+ "s8addq $2,16,$1\n\t" /* room for count+1 params (8 bytes each) */ -+ "bic $1,15,$1\n\t" /* stack space is rounded up to 0 % 16 */ -+ "subq $30,$1,$30\n\t" -+ -+ "stq $16,0($30)\n\t" /* save "that" (as "this" pointer) */ -+ "stq $17,16($15)\n\t" /* save "methodIndex" */ -+ -+ "addq $30,8,$16\n\t" /* pass stack pointer */ -+ "bis $18,$18,$17\n\t" /* pass "paramCount" */ -+ "bis $19,$19,$18\n\t" /* pass "params" */ -+ "bsr $26,$invoke_copy_to_stack..ng\n\t" /* call invoke_copy_to_stack */ -+ -+ /* -+ * Copy the first 6 parameters to registers and remove from stack frame. -+ * Both the integer and floating point registers are set for each parameter -+ * except the first which is the "this" pointer. (integer only) -+ * The floating point registers are all set as doubles since the -+ * invoke_copy_to_stack function should have converted the floats. -+ */ -+ "ldq $16,0($30)\n\t" /* integer registers */ -+ "ldq $17,8($30)\n\t" -+ "ldq $18,16($30)\n\t" -+ "ldq $19,24($30)\n\t" -+ "ldq $20,32($30)\n\t" -+ "ldq $21,40($30)\n\t" -+ "ldt $f17,8($30)\n\t" /* floating point registers */ -+ "ldt $f18,16($30)\n\t" -+ "ldt $f19,24($30)\n\t" -+ "ldt $f20,32($30)\n\t" -+ "ldt $f21,40($30)\n\t" -+ -+ "addq $30,48,$30\n\t" /* remove params from stack */ -+ -+ /* -+ * Call the virtual function with the constructed stack frame. -+ */ -+ "bis $16,$16,$1\n\t" /* load "this" */ -+ "ldq $2,16($15)\n\t" /* load "methodIndex" */ -+ "ldq $1,0($1)\n\t" /* load vtable */ -+#if 0 -+ "s8addq $2,16,$2\n\t" /* vtable index = "methodIndex" * 8 + 16 */ -+#else -+ "mulq $2, 8, $2\n\t" -+ "addq $2, 0, $2\n\t" /* vtable index = "methodIndex" * 16 + 24 */ -+#endif -+ "addq $1,$2,$1\n\t" -+ "ldq $27,0($1)\n\t" /* load address of function */ -+ "jsr $26,($27),0\n\t" /* call virtual function */ -+ "ldgp $29,0($26)\n\t" -+ -+ "bis $15,$15,$30\n\t" -+ "ldq $26,0($30)\n\t" -+ "ldq $15,8($30)\n\t" -+ "addq $30,32,$30\n\t" -+ "ret $31,($26),1\n\t" -+ ".end XPTC_InvokeByIndex" -+ ); -+ ---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp.orig Tue May 27 01:37:30 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp Tue May 27 01:37:04 2003 -@@ -0,0 +1,269 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+/* ***** BEGIN LICENSE BLOCK ***** -+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1 -+ * -+ * The contents of this file are subject to the Netscape Public License -+ * Version 1.1 (the "License"); you may not use this file except in -+ * compliance with the License. You may obtain a copy of the License at -+ * http://www.mozilla.org/NPL/ -+ * -+ * Software distributed under the License is distributed on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -+ * for the specific language governing rights and limitations under the -+ * License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is -+ * Netscape Communications Corporation. -+ * Portions created by the Initial Developer are Copyright (C) 1999 -+ * the Initial Developer. All Rights Reserved. -+ * -+ * Contributor(s): -+ * -+ * Alternatively, the contents of this file may be used under the terms of -+ * either the GNU General Public License Version 2 or later (the "GPL"), or -+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -+ * in which case the provisions of the GPL or the LGPL are applicable instead -+ * of those above. If you wish to allow use of your version of this file only -+ * under the terms of either the GPL or the LGPL, and not to allow others to -+ * use your version of this file under the terms of the NPL, indicate your -+ * decision by deleting the provisions above and replace them with the notice -+ * and other provisions required by the GPL or the LGPL. If you do not delete -+ * the provisions above, a recipient may use your version of this file under -+ * the terms of any one of the NPL, the GPL or the LGPL. -+ * -+ * ***** END LICENSE BLOCK ***** */ -+ -+/* Implement shared vtbl methods. */ -+ -+/* contributed by Glen Nakamura <glen.nakamura@usa.net> */ -+ -+#include <sys/types.h> -+#include <machine/cpu.h> -+#include "xptcprivate.h" -+ -+/* Prototype specifies unmangled function name and disables unused warning */ -+static nsresult -+PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args) -+__asm__("PrepareAndDispatch") __attribute__((unused)); -+ -+static nsresult -+PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args) -+{ -+ const PRUint8 PARAM_BUFFER_COUNT = 16; -+ const PRUint8 NUM_ARG_REGS = 6-1; // -1 for "this" pointer -+ -+ nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT]; -+ nsXPTCMiniVariant* dispatchParams = NULL; -+ nsIInterfaceInfo* iface_info = NULL; -+ const nsXPTMethodInfo* info; -+ PRUint8 paramCount; -+ PRUint8 i; -+ nsresult result = NS_ERROR_FAILURE; -+ -+ NS_ASSERTION(self,"no self"); -+ -+ self->GetInterfaceInfo(&iface_info); -+ NS_ASSERTION(iface_info,"no interface info"); -+ -+ iface_info->GetMethodInfo(PRUint16(methodIndex), &info); -+ NS_ASSERTION(info,"no interface info"); -+ -+ paramCount = info->GetParamCount(); -+ -+ // setup variant array pointer -+ if(paramCount > PARAM_BUFFER_COUNT) -+ dispatchParams = new nsXPTCMiniVariant[paramCount]; -+ else -+ dispatchParams = paramBuffer; -+ NS_ASSERTION(dispatchParams,"no place for params"); -+ -+ // args[0] to args[NUM_ARG_REGS] hold floating point register values -+ PRUint64* ap = args + NUM_ARG_REGS; -+ for(i = 0; i < paramCount; i++, ap++) -+ { -+ const nsXPTParamInfo& param = info->GetParam(i); -+ const nsXPTType& type = param.GetType(); -+ nsXPTCMiniVariant* dp = &dispatchParams[i]; -+ -+ if(param.IsOut() || !type.IsArithmetic()) -+ { -+ dp->val.p = (void*) *ap; -+ continue; -+ } -+ // else -+ switch(type) -+ { -+ case nsXPTType::T_I8 : dp->val.i8 = (PRInt8) *ap; break; -+ case nsXPTType::T_I16 : dp->val.i16 = (PRInt16) *ap; break; -+ case nsXPTType::T_I32 : dp->val.i32 = (PRInt32) *ap; break; -+ case nsXPTType::T_I64 : dp->val.i64 = (PRInt64) *ap; break; -+ case nsXPTType::T_U8 : dp->val.u8 = (PRUint8) *ap; break; -+ case nsXPTType::T_U16 : dp->val.u16 = (PRUint16) *ap; break; -+ case nsXPTType::T_U32 : dp->val.u32 = (PRUint32) *ap; break; -+ case nsXPTType::T_U64 : dp->val.u64 = (PRUint64) *ap; break; -+ case nsXPTType::T_FLOAT : -+ if(i < NUM_ARG_REGS) -+ { -+ // floats passed via registers are stored as doubles -+ // in the first NUM_ARG_REGS entries in args -+ dp->val.u64 = (PRUint64) args[i]; -+ dp->val.f = (float) dp->val.d; // convert double to float -+ } -+ else -+ dp->val.u32 = (PRUint32) *ap; -+ break; -+ case nsXPTType::T_DOUBLE : -+ // doubles passed via registers are also stored -+ // in the first NUM_ARG_REGS entries in args -+ dp->val.u64 = (i < NUM_ARG_REGS) ? args[i] : *ap; -+ break; -+ case nsXPTType::T_BOOL : dp->val.b = (PRBool) *ap; break; -+ case nsXPTType::T_CHAR : dp->val.c = (char) *ap; break; -+ case nsXPTType::T_WCHAR : dp->val.wc = (PRUnichar) *ap; break; -+ default: -+ NS_ASSERTION(0, "bad type"); -+ break; -+ } -+ } -+ -+ result = self->CallMethod((PRUint16)methodIndex, info, dispatchParams); -+ -+ NS_RELEASE(iface_info); -+ -+ if(dispatchParams != paramBuffer) -+ delete [] dispatchParams; -+ -+ return result; -+} -+ -+/* -+ * SharedStub() -+ * Collects arguments and calls PrepareAndDispatch. The "methodIndex" is -+ * passed to this function via $1 to preserve the argument registers. -+ */ -+__asm__( -+ "#### SharedStub ####\n" -+".text\n\t" -+ ".align 5\n\t" -+ ".ent SharedStub\n" -+"SharedStub:\n\t" -+ ".frame $30,96,$26,0\n\t" -+ ".mask 0x4000000,-96\n\t" -+ "ldgp $29,0($27)\n" -+"$SharedStub..ng:\n\t" -+ "subq $30,96,$30\n\t" -+ "stq $26,0($30)\n\t" -+ ".prologue 1\n\t" -+ -+ /* -+ * Store arguments passed via registers to the stack. -+ * Floating point registers are stored as doubles and converted -+ * to floats in PrepareAndDispatch if necessary. -+ */ -+ "stt $f17,16($30)\n\t" /* floating point registers */ -+ "stt $f18,24($30)\n\t" -+ "stt $f19,32($30)\n\t" -+ "stt $f20,40($30)\n\t" -+ "stt $f21,48($30)\n\t" -+ "stq $17,56($30)\n\t" /* integer registers */ -+ "stq $18,64($30)\n\t" -+ "stq $19,72($30)\n\t" -+ "stq $20,80($30)\n\t" -+ "stq $21,88($30)\n\t" -+ -+ /* -+ * Call PrepareAndDispatch function. -+ */ -+ "bis $1,$1,$17\n\t" /* pass "methodIndex" */ -+ "addq $30,16,$18\n\t" /* pass "args" */ -+ "bsr $26,$PrepareAndDispatch..ng\n\t" -+ -+ "ldq $26,0($30)\n\t" -+ "addq $30,96,$30\n\t" -+ "ret $31,($26),1\n\t" -+ ".end SharedStub" -+ ); -+ -+#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */ -+/* -+ * nsresult nsXPTCStubBase::Stub##n() -+ * Sets register $1 to "methodIndex" and jumps to SharedStub. -+ */ -+#define STUB_ENTRY(n) \ -+__asm__( \ -+ "#### Stub"#n" ####\n" \ -+".text\n\t" \ -+ ".align 5\n\t" \ -+ ".globl _ZN14nsXPTCStubBase5Stub"#n"Ev\n\t" \ -+ ".ent _ZN14nsXPTCStubBase5Stub"#n"Ev\n" \ -+"_ZN14nsXPTCStubBase5Stub"#n"Ev:\n\t" \ -+ ".frame $30,0,$26,0\n\t" \ -+ "ldgp $29,0($27)\n" \ -+"$_ZN14nsXPTCStubBase5Stub"#n"Ev..ng:\n\t" \ -+ ".prologue 1\n\t" \ -+ "lda $1,"#n"\n\t" \ -+ "br $31,$SharedStub..ng\n\t" \ -+ ".end _ZN14nsXPTCStubBase5Stub"#n"Ev" \ -+ ); \ -+__asm__( \ -+ "#### Stub"#n" ####\n" \ -+".text\n\t" \ -+ ".align 5\n\t" \ -+ ".globl _ZN14nsXPTCStubBase6Stub"#n"Ev\n\t" \ -+ ".ent _ZN14nsXPTCStubBase6Stub"#n"Ev\n" \ -+"_ZN14nsXPTCStubBase6Stub"#n"Ev:\n\t" \ -+ ".frame $30,0,$26,0\n\t" \ -+ "ldgp $29,0($27)\n" \ -+"$_ZN14nsXPTCStubBase6Stub"#n"Ev..ng:\n\t" \ -+ ".prologue 1\n\t" \ -+ "lda $1,"#n"\n\t" \ -+ "br $31,$SharedStub..ng\n\t" \ -+ ".end _ZN14nsXPTCStubBase6Stub"#n"Ev" \ -+ ); \ -+__asm__( \ -+ "#### Stub"#n" ####\n" \ -+".text\n\t" \ -+ ".align 5\n\t" \ -+ ".globl _ZN14nsXPTCStubBase7Stub"#n"Ev\n\t" \ -+ ".ent _ZN14nsXPTCStubBase7Stub"#n"Ev\n" \ -+"_ZN14nsXPTCStubBase7Stub"#n"Ev:\n\t" \ -+ ".frame $30,0,$26,0\n\t" \ -+ "ldgp $29,0($27)\n" \ -+"$_ZN14nsXPTCStubBase7Stub"#n"Ev..ng:\n\t" \ -+ ".prologue 1\n\t" \ -+ "lda $1,"#n"\n\t" \ -+ "br $31,$SharedStub..ng\n\t" \ -+ ".end _ZN14nsXPTCStubBase7Stub"#n"Ev" \ -+ ); -+#else -+/* -+ * nsresult nsXPTCStubBase::Stub##n() -+ * Sets register $1 to "methodIndex" and jumps to SharedStub. -+ */ -+#define STUB_ENTRY(n) \ -+nsresult nsXPTCStubBase::Stub##n() \ -+{ \ -+ nsresult result; \ -+__asm__ __volatile__( \ -+ "ldah $29,0($27)\n\t" \ -+ "lda $29,0($29)\n\t" \ -+ "lda $1, "#n"\n\t" \ -+ "br $31, $SharedStub..ng\n\t" \ -+ "mov $0, %0\n\t" \ -+ : "=r" (result) \ -+ ); \ -+ return result; \ -+} -+#endif -+ -+#define SENTINEL_ENTRY(n) \ -+nsresult nsXPTCStubBase::Sentinel##n() \ -+{ \ -+ NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \ -+ return NS_ERROR_NOT_IMPLEMENTED; \ -+} -+ -+#include "xptcstubsdef.inc" -+ diff --git a/mail/thunderbird-devel/files/patch-xptcall-ia64 b/mail/thunderbird-devel/files/patch-xptcall-ia64 deleted file mode 100644 index 9cd07f7ddbb2..000000000000 --- a/mail/thunderbird-devel/files/patch-xptcall-ia64 +++ /dev/null @@ -1,38 +0,0 @@ ---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ipf64.s.orig Sun Jul 20 00:05:32 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ipf64.s Sun Jul 20 00:06:37 2003 -@@ -8,6 +8,7 @@ - // Section has executable code - .section .text, "ax","progbits" - // procedure named 'XPTC_InvokeByIndex' -+ .global XPTC_InvokeByIndex - .proc XPTC_InvokeByIndex - // manual bundling - .explicit -@@ -24,7 +25,7 @@ - - // XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, - // PRUint32 paramCount, nsXPTCVariant* params); --XPTC_InvokeByIndex:: -+XPTC_InvokeByIndex: - .prologue - .save ar.pfs, r37 - // allocate 4 input args, 6 local args, and 8 output args ---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s.orig Sun Jul 20 00:02:02 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s Sun Jul 20 00:02:40 2003 -@@ -6,6 +6,7 @@ - // Section has executable code - .section .text, "ax","progbits" - // procedure named 'SharedStub' -+ .global SharedStub - .proc SharedStub - // manual bundling - .explicit -@@ -14,7 +15,7 @@ - // .exclass PrepareAndDispatch, @fullyvisible - .type PrepareAndDispatch,@function - --SharedStub:: -+SharedStub: - // 9 arguments, first 8 are the input arguments of previous - // function call. The last one is methodIndex, and is passed in memory - .prologue diff --git a/mail/thunderbird-devel/files/patch-xptcall-sparc64 b/mail/thunderbird-devel/files/patch-xptcall-sparc64 deleted file mode 100644 index 9599a8a71336..000000000000 --- a/mail/thunderbird-devel/files/patch-xptcall-sparc64 +++ /dev/null @@ -1,327 +0,0 @@ ---- /dev/null Mon May 26 13:22:00 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc64_freebsd.cpp Mon May 26 04:12:55 2003 -@@ -0,0 +1,123 @@ -+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- -+ * -+ * The contents of this file are subject to the Mozilla Public -+ * License Version 1.1 (the "License"); you may not use this file -+ * except in compliance with the License. You may obtain a copy of -+ * the License at http://www.mozilla.org/MPL/ -+ * -+ * Software distributed under the License is distributed on an "AS -+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -+ * implied. See the License for the specific language governing -+ * rights and limitations under the License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is Netscape -+ * Communications Corporation. Portions created by Netscape are -+ * Copyright (C) 2001 Netscape Communications Corporation. All -+ * Rights Reserved. -+ * -+ * Contributor(s): -+ * Stuart Parmenter <pavlov@netscape.com> -+ */ -+ -+/* Implement shared vtbl methods. */ -+ -+#include "xptcprivate.h" -+ -+#if defined(sparc) || defined(__sparc__) -+ -+extern "C" nsresult -+PrepareAndDispatch(nsXPTCStubBase* self, PRUint64 methodIndex, PRUint64* args) -+{ -+ -+#define PARAM_BUFFER_COUNT 16 -+ -+ nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT]; -+ nsXPTCMiniVariant* dispatchParams = NULL; -+ nsIInterfaceInfo* iface_info = NULL; -+ const nsXPTMethodInfo* info; -+ PRUint8 paramCount; -+ PRUint8 i; -+ nsresult result = NS_ERROR_FAILURE; -+ -+ NS_ASSERTION(self,"no self"); -+ -+ self->GetInterfaceInfo(&iface_info); -+ NS_ASSERTION(iface_info,"no interface info"); -+ -+ iface_info->GetMethodInfo(PRUint16(methodIndex), &info); -+ NS_ASSERTION(info,"no interface info"); -+ -+ paramCount = info->GetParamCount(); -+ -+ // setup variant array pointer -+ if(paramCount > PARAM_BUFFER_COUNT) -+ dispatchParams = new nsXPTCMiniVariant[paramCount]; -+ else -+ dispatchParams = paramBuffer; -+ NS_ASSERTION(dispatchParams,"no place for params"); -+ -+ PRUint64* ap = args; -+ for(i = 0; i < paramCount; i++, ap++) -+ { -+ const nsXPTParamInfo& param = info->GetParam(i); -+ const nsXPTType& type = param.GetType(); -+ nsXPTCMiniVariant* dp = &dispatchParams[i]; -+ -+ if(param.IsOut() || !type.IsArithmetic()) -+ { -+ dp->val.p = (void*) *ap; -+ continue; -+ } -+ // else -+ switch(type) -+ { -+ case nsXPTType::T_I8 : dp->val.i8 = *((PRInt64*) ap); break; -+ case nsXPTType::T_I16 : dp->val.i16 = *((PRInt64*) ap); break; -+ case nsXPTType::T_I32 : dp->val.i32 = *((PRInt64*) ap); break; -+ case nsXPTType::T_DOUBLE : dp->val.d = *((double*) ap); break; -+ case nsXPTType::T_U64 : dp->val.u64 = *((PRUint64*) ap); break; -+ case nsXPTType::T_I64 : dp->val.i64 = *((PRInt64*) ap); break; -+ case nsXPTType::T_U8 : dp->val.u8 = *((PRUint64*) ap); break; -+ case nsXPTType::T_U16 : dp->val.u16 = *((PRUint64*)ap); break; -+ case nsXPTType::T_U32 : dp->val.u32 = *((PRUint64*)ap); break; -+ case nsXPTType::T_FLOAT : dp->val.f = ((float*) ap)[1]; break; -+ case nsXPTType::T_BOOL : dp->val.b = *((PRInt64*) ap); break; -+ case nsXPTType::T_CHAR : dp->val.c = *((PRUint64*) ap); break; -+ case nsXPTType::T_WCHAR : dp->val.wc = *((PRInt64*) ap); break; -+ default: -+ NS_ASSERTION(0, "bad type"); -+ break; -+ } -+ } -+ -+ result = self->CallMethod((PRUint16)methodIndex, info, dispatchParams); -+ -+ NS_RELEASE(iface_info); -+ -+ if(dispatchParams != paramBuffer) -+ delete [] dispatchParams; -+ -+ return result; -+} -+ -+extern "C" int SharedStub(int, int*); -+ -+#define STUB_ENTRY(n) \ -+nsresult nsXPTCStubBase::Stub##n() \ -+{ \ -+ int dummy; /* defeat tail-call optimization */ \ -+ return SharedStub(n, &dummy); \ -+} -+ -+#define SENTINEL_ENTRY(n) \ -+nsresult nsXPTCStubBase::Sentinel##n() \ -+{ \ -+ NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \ -+ return NS_ERROR_NOT_IMPLEMENTED; \ -+} -+ -+#include "xptcstubsdef.inc" -+ -+#endif /* sparc || __sparc__ */ ---- /dev/null Mon May 26 13:22:00 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc64_freebsd.s Mon May 26 04:06:09 2003 -@@ -0,0 +1,104 @@ -+/* -*- Mode: asm; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- -+ * -+ * The contents of this file are subject to the Mozilla Public -+ * License Version 1.1 (the "License"); you may not use this file -+ * except in compliance with the License. You may obtain a copy of -+ * the License at http://www.mozilla.org/MPL/ -+ * -+ * Software distributed under the License is distributed on an "AS -+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -+ * implied. See the License for the specific language governing -+ * rights and limitations under the License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is Netscape -+ * Communications Corporation. Portions created by Netscape are -+ * Copyright (C) 2001 Netscape Communications Corporation. All -+ * Rights Reserved. -+ * -+ * Contributor(s): -+ * Stuart Parmenter <pavlov@netscape.com> -+ * Chris Seawood <cls@seawood.org> -+ */ -+ -+/* -+ Platform specific code to invoke XPCOM methods on native objects -+ for sparcv9 Solaris. -+ -+ See the SPARC Compliance Definition (SCD) Chapter 3 -+ for more information about what is going on here, including -+ the use of BIAS (0x7ff). -+ The SCD is available from http://www.sparc.com/. -+*/ -+ -+ .global XPTC_InvokeByIndex -+ .type XPTC_InvokeByIndex, #function -+ -+/* -+ XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, -+ PRUint32 paramCount, nsXPTCVariant* params); -+ -+*/ -+XPTC_InvokeByIndex: -+ save %sp,-(128 + 64),%sp ! room for the register window and -+ ! struct pointer, rounded up to 0 % 64 -+ sll %i2,4,%l0 ! assume the worst case -+ ! paramCount * 2 * 8 bytes -+ cmp %l0, 0 ! are there any args? If not, -+ be .invoke ! no need to copy args to stack -+ nop -+ -+ sub %sp,%l0,%sp ! create the additional stack space -+ add %sp,0x7ff+136,%o0 ! step past the register window, the -+ ! struct result pointer and the 'this' slot -+ mov %i2,%o1 ! paramCount -+ call invoke_copy_to_stack -+ mov %i3,%o2 ! params -+ -+! -+! load arguments from stack into the outgoing registers -+! BIAS is 0x7ff (2047) -+! -+ -+! load the %o1..5 64bit (extended word) output registers registers -+ ldx [%sp + 0x7ff + 136],%o1 ! %i1 -+ ldx [%sp + 0x7ff + 144],%o2 ! %i2 -+ ldx [%sp + 0x7ff + 152],%o3 ! %i3 -+ ldx [%sp + 0x7ff + 160],%o4 ! %i4 -+ ldx [%sp + 0x7ff + 168],%o5 ! %i5 -+ -+! load the even number double registers starting with %d2 -+ ldd [%sp + 0x7ff + 136],%f2 -+ ldd [%sp + 0x7ff + 144],%f4 -+ ldd [%sp + 0x7ff + 152],%f6 -+ ldd [%sp + 0x7ff + 160],%f8 -+ ldd [%sp + 0x7ff + 168],%f10 -+ ldd [%sp + 0x7ff + 176],%f12 -+ ldd [%sp + 0x7ff + 184],%f14 -+ ldd [%sp + 0x7ff + 192],%f16 -+ ldd [%sp + 0x7ff + 200],%f18 -+ ldd [%sp + 0x7ff + 208],%f20 -+ ldd [%sp + 0x7ff + 216],%f22 -+ ldd [%sp + 0x7ff + 224],%f24 -+ ldd [%sp + 0x7ff + 232],%f26 -+ ldd [%sp + 0x7ff + 240],%f28 -+ ldd [%sp + 0x7ff + 248],%f30 -+ -+! -+! calculate the target address from the vtable -+! -+.invoke: -+ sll %i1,3,%l0 ! index *= 8 -+! add %l0,16,%l0 ! there are 2 extra entries in the vTable (16bytes) -+ ldx [%i0],%l1 ! *that --> address of vtable -+ ldx [%l0 + %l1],%l0 ! that->vtable[index * 8 + 16] --> address -+ -+ jmpl %l0,%o7 ! call the routine -+ mov %i0,%o0 ! move 'this' pointer to out register -+ -+ mov %o0,%i0 ! propagate return value -+ ret -+ restore -+ -+ .size XPTC_InvokeByIndex, .-XPTC_InvokeByIndex ---- /dev/null Mon May 26 14:00:00 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc64_freebsd.cpp Mon May 26 14:00:49 2003 -@@ -0,0 +1,91 @@ -+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- -+ * -+ * The contents of this file are subject to the Mozilla Public -+ * License Version 1.1 (the "License"); you may not use this file -+ * except in compliance with the License. You may obtain a copy of -+ * the License at http://www.mozilla.org/MPL/ -+ * -+ * Software distributed under the License is distributed on an "AS -+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -+ * implied. See the License for the specific language governing -+ * rights and limitations under the License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is Netscape -+ * Communications Corporation. Portions created by Netscape are -+ * Copyright (C) 2001 Netscape Communications Corporation. All -+ * Rights Reserved. -+ * -+ * Contributor(s): -+ * Stuart Parmenter <pavlov@netscape.com> -+ * Chris Seawood <cls@seawood.org> -+ */ -+ -+ -+/* Platform specific code to invoke XPCOM methods on native objects */ -+ -+#include "xptcprivate.h" -+ -+#if !defined(__sparc) && !defined(__sparc__) -+#error "This code is for Sparc only" -+#endif -+ -+/* Prototype specifies unmangled function name */ -+extern "C" PRUint64 -+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s); -+ -+extern "C" PRUint64 -+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s) -+{ -+ /* -+ We need to copy the parameters for this function to locals and use them -+ from there since the parameters occupy the same stack space as the stack -+ we're trying to populate. -+ */ -+ PRUint64 *l_d = d; -+ nsXPTCVariant *l_s = s; -+ PRUint64 l_paramCount = paramCount; -+ PRUint64 regCount = 0; // return the number of registers to load from the stack -+ -+ for(PRUint64 i = 0; i < l_paramCount; i++, l_d++, l_s++) -+ { -+ if (regCount < 5) regCount++; -+ -+ if (l_s->IsPtrData()) -+ { -+ *l_d = (PRUint64)l_s->ptr; -+ continue; -+ } -+ switch (l_s->type) -+ { -+ case nsXPTType::T_I8 : *((PRInt64*)l_d) = l_s->val.i8; break; -+ case nsXPTType::T_I16 : *((PRInt64*)l_d) = l_s->val.i16; break; -+ case nsXPTType::T_I32 : *((PRInt64*)l_d) = l_s->val.i32; break; -+ case nsXPTType::T_I64 : *((PRInt64*)l_d) = l_s->val.i64; break; -+ -+ case nsXPTType::T_U8 : *((PRUint64*)l_d) = l_s->val.u8; break; -+ case nsXPTType::T_U16 : *((PRUint64*)l_d) = l_s->val.u16; break; -+ case nsXPTType::T_U32 : *((PRUint64*)l_d) = l_s->val.u32; break; -+ case nsXPTType::T_U64 : *((PRUint64*)l_d) = l_s->val.u64; break; -+ -+ /* in the case of floats, we want to put the bits in to the -+ 64bit space right justified... floats in the paramter array on -+ sparcv9 use odd numbered registers.. %f1, %f3, so we have to skip -+ the space that would be occupied by %f0, %f2, etc. -+ */ -+ case nsXPTType::T_FLOAT : *(((float*)l_d) + 1) = l_s->val.f; break; -+ case nsXPTType::T_DOUBLE: *((double*)l_d) = l_s->val.d; break; -+ case nsXPTType::T_BOOL : *((PRInt64*)l_d) = l_s->val.b; break; -+ case nsXPTType::T_CHAR : *((PRUint64*)l_d) = l_s->val.c; break; -+ case nsXPTType::T_WCHAR : *((PRInt64*)l_d) = l_s->val.wc; break; -+ -+ default: -+ // all the others are plain pointer types -+ *((void**)l_d) = l_s->val.p; -+ break; -+ } -+ } -+ -+ return regCount; -+} diff --git a/mail/thunderbird-devel/files/thunderbird.desktop.in b/mail/thunderbird-devel/files/thunderbird.desktop.in deleted file mode 100644 index 814e074814af..000000000000 --- a/mail/thunderbird-devel/files/thunderbird.desktop.in +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Thunderbird -GenericName=Mail Client -Comment=Mail client and News Reader -Exec=thunderbird %U -Icon=@THUNDERBIRD_ICON@ -StartupNotify=false -Terminal=false -Type=Application -Categories=Application;Network; diff --git a/mail/thunderbird-devel/pkg-deinstall.in b/mail/thunderbird-devel/pkg-deinstall.in deleted file mode 100644 index b9b0ca220fbc..000000000000 --- a/mail/thunderbird-devel/pkg-deinstall.in +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# -# Date created: Mon Nov 29, 2003 -# Whom: Thierry Thomas (<thierry@pompo.net>) -# Fix the chrome registry. - -umask 022 -PATH=/bin:/usr/bin - -[ "x$1" = "x" ] && exit 1 -[ "x$2" != "xDEINSTALL" ] && exit 0 - -MOZDIR=%%MOZDIR%% - -rm -rf ${MOZDIR}/chrome/overlayinfo -rm -f ${MOZDIR}/chrome/*.rdf -rm -f ${MOZDIR}/component.reg -rm -f ${MOZDIR}/components.ini -rm -f ${MOZDIR}/defaults.ini -rm -f ${MOZDIR}/components/*.dat -rm -rf ${MOZDIR}/extensions - -exit 0 diff --git a/mail/thunderbird-devel/pkg-descr b/mail/thunderbird-devel/pkg-descr deleted file mode 100644 index 5a21b98b08cc..000000000000 --- a/mail/thunderbird-devel/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -Mozilla Thunderbird is a redesign of the Mozilla mail component with the goal -of becoming a cross-platform stand alone mail application using the XUL -user interface language. See the Mozilla Thunderbird project page for -more details. - -WWW: http://www.mozilla.org/projects/thunderbird/ diff --git a/mail/thunderbird-devel/pkg-install.in b/mail/thunderbird-devel/pkg-install.in deleted file mode 100644 index 0413486236fe..000000000000 --- a/mail/thunderbird-devel/pkg-install.in +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# -# Date created: Mon Nov 29, 2003 -# Whom: Thierry Thomas (<thierry@pompo.net>) -# Fix the chrome registry. - -umask 022 -PATH=/bin:/usr/bin:/usr/local/bin - -[ "x$1" = "x" ] && exit 1 -[ "x$2" != "xPOST-INSTALL" ] && exit 0 - -MOZDIR=%%MOZDIR%% -REGXPCOM=${MOZDIR}/regxpcom -REGCHROME=${MOZDIR}/regchrome -THUNDERBIRD=${MOZDIR}/thunderbird-bin - -echo "===> Building Chrome's registry..." -rm -rf ${MOZDIR}/chrome/overlayinfo -rm -f ${MOZDIR}/chrome/*.rdf -mkdir -p ${MOZDIR}/chrome/overlayinfo -rm -f ${MOZDIR}/component.reg -rm -rf ${MOZDIR}/extensions - -cd ${MOZDIR} || exit 1 -./run-mozilla.sh ${REGXPCOM} || true -./run-mozilla.sh ${REGCHROME} || true -./run-mozilla.sh ${THUNDERBIRD} -register > /dev/null 2>&1 - -exit 0 diff --git a/mail/thunderbird-esr/Makefile b/mail/thunderbird-esr/Makefile deleted file mode 100644 index 6ad4933af5f7..000000000000 --- a/mail/thunderbird-esr/Makefile +++ /dev/null @@ -1,219 +0,0 @@ -# New ports collection makefile for: mozilla-thunderbird -# Date created: 4 September 2003 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# -# $FreeBSD$ -# - -PORTNAME= thunderbird -PORTVERSION= 1.0.6 -CATEGORIES= mail -MASTER_SITES= ${MASTER_SITE_MOZILLA} -MASTER_SITE_SUBDIR= thunderbird/releases/${PORTVERSION}/source -DISTNAME= ${PORTNAME}-${PORTVERSION}-source - -MAINTAINER= gnome@FreeBSD.org -COMMENT= Mozilla Thunderbird is standalone mail and news that stands above - -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ - png.5:${PORTSDIR}/graphics/png -BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip - -USE_X_PREFIX= yes - -USE_BZIP2= yes -USE_GMAKE= yes -USE_ICONV= yes -USE_PERL5= yes -USE_REINPLACE= yes -HAS_CONFIGURE= yes -NO_MTREE= yes -PLIST= ${WRKDIR}/plist -ALL_TARGET= default -USE_GNOME= gtk20 libidl -CONFIGURE_ENV= LOCALBASE=${LOCALBASE} -PKGINSTALL= ${WRKDIR}/pkg-install -PKGDEINSTALL= ${WRKDIR}/pkg-deinstall -FAKEDIR= ${WRKDIR}/fake - -NO_MTREE= yes -WRKSRC= ${WRKDIR}/mozilla -LOCAL_SUBDIR= lib/${PORTNAME} -LOCAL_PREFIX= ${PREFIX}/${LOCAL_SUBDIR} -ESD_LIB= libesd.so.2 - -THUNDERBIRD= ${PORTNAME} -THUNDERBIRD_ICON= ${LOCAL_PREFIX}/lib/${PORTNAME}-${PORTVERSION}/chrome/icons/default/default.xpm -MOZ_PIS_SCRIPTS= S50cleanhome -SCRIPTS_DIR= ${FAKEDIR}/${LOCAL_SUBDIR}/lib/${PORTNAME}-${PORTVERSION} -MOZ_PIS_DIR= ${SCRIPTS_DIR}/init.d - -OPTIONS= DEBUG "Build a debugging image" off \ - LOGGING "Enable additional log messages" off \ - OPTIMIZED_CFLAGS "Enable some additional optimizations" off \ - XFT "Enable support for anti-aliased fonts" on - -.include <bsd.port.pre.mk> - -.if ${ARCH} == "alpha" && ${OSVERSION} < 500035 -IGNORE= "core dumps at runtime" -.endif # ${ARCH} == "alpha" && ${OSVERSION} < 500035 - -.if ${PERL_LEVEL} < 500600 -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-config_make-jars.pl -.endif # ${PERL_LEVEL} < 500600 - -.if defined(WITH_DEBUG) -WITH_LOGGING= yes -CONFIGURE_ENV+= WITH_DEBUG=yes -.endif # defined(WITH_DEBUG) - -.if defined(WITH_OPTIMIZED_CFLAGS) -CFLAGS:= -O2 -fno-strict-aliasing ${CFLAGS:N-O*} -.else -CFLAGS:= -O ${CFLAGS:N-O*:N-m*} -CONFIGURE_ENV+= WITH_OPTIMIZE=-O -.endif # defined(WITH_OPTIMIZED_CFLAGS) - -.if defined(WITH_LOGGING) -CONFIGURE_ENV+= WITH_LOGGING=yes -.endif # defined(WITH_LOGGING) - -.if defined(WITHOUT_XFT) -CONFIGURE_ENV+= WITHOUT_XFT=yes -.else -LIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/libXft -.endif # !defined(WITHOUT_XFT) - -CPPFLAGS+= -I${X11BASE}/include -CFLAGS+= ${PTHREAD_CFLAGS} -LDFLAGS+= -L${X11BASE}/lib -LIBS+= ${PTHREAD_LIBS} - -pre-extract:: - @${ECHO_MSG} - @${ECHO_MSG} "Extracting source (this takes a while) ..." - @${ECHO_MSG} - -post-extract:: -# FAKEDIR is here so that nsinstall will install under FAKEDIR, not -# under PREFIX. See pre-install and do-install for details. - @${SED} -e 's|@CPPFLAGS@|${CPPFLAGS}|' \ - -e 's|@CFLAGS@|${CFLAGS}|' \ - -e 's|@LDFLAGS@|${LDFLAGS}|' \ - -e 's|@LIBS@|${LIBS}|' \ - -e 's|@X11BASE@|${X11BASE}|' \ - -e 's|@LOCALBASE@|${LOCALBASE}|' \ - -e 's|@PREFIX@|${FAKEDIR}/lib/thunderbird|' \ - -e 's|@PERL@|${PERL5}|' \ - <${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig - -post-patch: - @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ - ${WRKSRC}/build/unix/run-mozilla.sh - @${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \ - s|-lpthread|${PTHREAD_LIBS}|g' \ - ${WRKSRC}/configure \ - ${WRKSRC}/nsprpub/configure - @${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \ - ${WRKSRC}/nsprpub/configure \ - ${WRKSRC}/security/coreconf/FreeBSD.mk \ - ${WRKSRC}/directory/c-sdk/config/FreeBSD.mk \ - ${WRKSRC}/js/src/Makefile.in - @${REINPLACE_CMD} -E -e 's|libesd\.so\.[0-9]+|${ESD_LIB}|g' \ - ${WRKSRC}/widget/src/gtk2/nsSound.cpp - @${REINPLACE_CMD} -E -e 's|libcups\.so\.[0-9]+|libcups.no|g' \ - ${WRKSRC}/gfx/src/gtk/nsDeviceContextSpecG.cpp - @${REINPLACE_CMD} -e '/accessibility.typeaheadfind.enablesound/s/true/false/ ; \ - /dom.disable_window_open_feature.toolbar/s/false/true/' \ - ${WRKSRC}/modules/libpref/src/init/all.js \ - ${WRKSRC}/extensions/sroaming/resources/content/prefs/all.js \ - ${WRKSRC}/modules/libpref/src/init/all.js - @${REINPLACE_CMD} -e 's|<iconv.h>|\"${LOCALBASE}/include/iconv.h\"|g' \ - ${WRKSRC}/configure \ - ${WRKSRC}/intl/uconv/native/nsNativeUConvService.cpp \ - ${WRKSRC}/xpcom/io/nsNativeCharsetUtils.cpp - @${SED} -e 's|%%MOZDIR%%|${LOCAL_PREFIX}/lib/${PORTNAME}-${PORTVERSION}|g ; \ - s|%%X11BASE%%|${X11BASE}|g' \ - < ${MASTERDIR}/pkg-install.in > ${PKGINSTALL} - @${SED} -e 's|%%MOZDIR%%|${LOCAL_PREFIX}/lib/${PORTNAME}-${PORTVERSION}|g' \ - < ${MASTERDIR}/pkg-deinstall.in > ${PKGDEINSTALL} - @${SED} -e 's|@THUNDERBIRD_ICON@|${THUNDERBIRD_ICON}|' \ - < ${FILESDIR}/thunderbird.desktop.in > ${WRKDIR}/thunderbird.desktop -.for ii in ${MOZ_PIS_SCRIPTS} - @${SED} -e 's|%%MOZILLA%%|${THUNDERBIRD}|g ; \ - s|%%PREFIX%%|${PREFIX}|g ; \ - s|%%X11BASE%%|${X11BASE}|g' \ - < ${FILESDIR}/moz_pis_${ii} > ${WRKDIR}/moz_pis_${ii} -.endfor - -pre-configure: - @if [ -n "`${PKG_INFO} -xI '^bind[0-9]*-base-[0-9]'`" ]; then \ - ${ECHO_CMD} "${PKGNAME}: bind installed with PORT_REPLACES_BASE_BIND causes build problems."; \ - ${FALSE}; \ - fi - -post-build: -# XXX This works around an install problem that is triggered when -# toolkit/profile/src is built after profile/src. - @${TOUCH} -f ${WRKSRC}/profile/build/libprofile.so - -pre-install: -# Overview: the program installs itself in FAKEDIR, then a list is made of the -# files and directories in there. This is the PLIST (packing list) for the -# package, replacing the traditional pkg-plist file. - @${RM} -rf ${FAKEDIR} ${PLIST} - @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \ - Makefile ${MAKE_ARGS} install - @${MKDIR} ${SCRIPTS_DIR} - @${MKDIR} ${MOZ_PIS_DIR} -.for ii in mac win -.for jj in / .jar - @${RM} -rf ${FAKEDIR}/lib/${PORTNAME}/lib/${PORTNAME}-${PORTVERSION}/chrome/en-${ii}${jj} -.endfor -.endfor - @${RM} -fr ${FAKEDIR}/share/idl ${FAKEDIR}/include -.for ii in thunderbird thunderbird-config - @${ECHO_CMD} bin/${ii} >> ${PLIST} -.endfor -.for ii in ${MOZ_PIS_SCRIPTS} - ${INSTALL_SCRIPT} ${WRKDIR}/moz_pis_${ii} ${MOZ_PIS_DIR}/${ii} -.endfor - @${MKDIR} ${FAKEDIR}/${LOCAL_SUBDIR}/lib/${PORTNAME}-${PORTVERSION}/defaults - @${CP} -RL ${WRKSRC}/dist/bin/defaults/isp \ - ${FAKEDIR}/${LOCAL_SUBDIR}/lib/${PORTNAME}-${PORTVERSION}/defaults - @cd ${FAKEDIR} && ${FIND} * ! -type d | ${SORT} >> ${PLIST}; \ - ${FIND} * -type d -empty | ${SORT} | ${SED} -e \ - "s:^:@exec ${MKDIR} %D/:" -e "s:$$: || true:" >> ${PLIST}; \ - ${FIND} * -type d -empty | ${SORT} -r | ${SED} -e \ - "s:^:@unexec ${RMDIR} %D/:" -e "s:$$: || true:" >> ${PLIST}; \ - ${FIND} * -type d ! -empty | ${SORT} -r | ${SED} -e "s:^:@dirrm :" | \ - ${GREP} / >> ${PLIST} - ${ECHO_CMD} 'share/applications/thunderbird.desktop' >> ${PLIST} - ${ECHO_CMD} '@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}' >> ${PLIST} - -do-install: -# This is the actual installation. First, the contents of FAKEDIR are -# just copied to PREFIX. - cd ${FAKEDIR} && ${FIND} * | ${CPIO} -dmp --quiet ${PREFIX} - -post-install: - @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL - ${MKDIR} ${PREFIX}/bin - ${RM} -f ${PREFIX}/bin/thunderbird - ${LN} -s ${LOCAL_PREFIX}/bin/thunderbird \ - ${PREFIX}/bin/thunderbird - ${RM} -f ${PREFIX}/bin/thunderbird-config - ${LN} -s ${LOCAL_PREFIX}/bin/thunderbird-config \ - ${PREFIX}/bin/thunderbird-config - ${PERL} -pi -e 's|${FAKEDIR}|${PREFIX}|g' \ - ${LOCAL_PREFIX}/bin/thunderbird \ - ${LOCAL_PREFIX}/bin/thunderbird-config - ${FIND} ${LOCAL_PREFIX}/lib/pkgconfig -type f | ${XARGS} \ - ${PERL} -pi -e 's|${FAKEDIR}|${PREFIX}|g' - ${MKDIR} ${PREFIX}/share/applications - ${INSTALL_DATA} ${WRKDIR}/thunderbird.desktop ${PREFIX}/share/applications - ${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/thunderbird/default.xpm \ - ${LOCAL_PREFIX}/lib/${PORTNAME}-${PORTVERSION}/chrome/icons/default/default.xpm - -.include <bsd.port.post.mk> diff --git a/mail/thunderbird-esr/distinfo b/mail/thunderbird-esr/distinfo deleted file mode 100644 index bac899b6bf63..000000000000 --- a/mail/thunderbird-esr/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (thunderbird-1.0.6-source.tar.bz2) = a0ddcc8bd5ee2c9be724b6963ad27111 -SIZE (thunderbird-1.0.6-source.tar.bz2) = 33366077 diff --git a/mail/thunderbird-esr/files/extra-patch-config_make-jars.pl b/mail/thunderbird-esr/files/extra-patch-config_make-jars.pl deleted file mode 100644 index a558607ca459..000000000000 --- a/mail/thunderbird-esr/files/extra-patch-config_make-jars.pl +++ /dev/null @@ -1,10 +0,0 @@ ---- config/make-jars.pl.orig Wed Oct 13 16:17:11 2004 -+++ config/make-jars.pl Wed Oct 13 16:17:07 2004 -@@ -40,6 +40,7 @@ - last if ($arg eq "--"); - } - my $defines = join(' ', @ARGV[ $ddindex .. $#ARGV ]); -+splice @ARGV, $ddindex, $#ARGV; - - getopts("d:s:t:f:avlD:o:p:xz:"); - diff --git a/mail/thunderbird-esr/files/moz_pis_S50cleanhome b/mail/thunderbird-esr/files/moz_pis_S50cleanhome deleted file mode 100644 index 348592392043..000000000000 --- a/mail/thunderbird-esr/files/moz_pis_S50cleanhome +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh -# - -# S50cleanhome -# a script to polite ${HOME}/${MOZ_PIS_USER_DIR} - -# We run in our own subshell - -# First, verify protocol -[ "$1" != "start" ] && exit 1 -[ -z "${MOZ_PIS_API}" -o ${MOZ_PIS_API} -ne 2 ] && exit 1 -[ -z "${MOZ_PIS_MOZBINDIR}" -o ! -d "${MOZ_PIS_MOZBINDIR}" ] && exit 1 -[ -z "${HOME}" -o ! -d "${HOME}" ] && exit 1 -[ -z "${MOZ_PIS_USER_DIR}" -o ! -d "${HOME}/${MOZ_PIS_USER_DIR}" ] && exit 1 - -# Try to polite ${HOME}/${MOZ_PIS_USER_DIR} - -# This must be really needed? -# rm -f "${$HOME}/${MOZ_PIS_USER_DIR}/pluginreg.dat" - -# Try to polite profile dirs -if [ -f "${HOME}/${MOZ_PIS_USER_DIR}/profiles.ini" ]; then - sed -e '/Path=/! d' -e "s,Path=,${HOME}/${MOZ_PIS_USER_DIR}/," \ - "${HOME}/${MOZ_PIS_USER_DIR}/profiles.ini" \ - | while read dir - do - [ ! -d "${dir}" ] && continue - # at last, debian do this, we do for new builds - # rm -f "${dir}/XUL.mfasl" - # make reclaculate compreg.dat, xpti.dat for new builds - [ "${dir}/compreg.dat" -ot "${MOZ_PIS_MOZBINDIR}/components.ini" ] && - rm -f "${dir}/compatibility.ini" "${dir}/XUL.mfasl" - done -fi diff --git a/mail/thunderbird-esr/files/mozconfig.in b/mail/thunderbird-esr/files/mozconfig.in deleted file mode 100644 index 2160060a1296..000000000000 --- a/mail/thunderbird-esr/files/mozconfig.in +++ /dev/null @@ -1,74 +0,0 @@ -# .mozconfig.in -*-shell-script-*- -# $FreeBSD$ -###################################################################### -# standard opts from README -export MOZ_THUNDERBIRD=1 -mk_add_options MOZ_MOZ_THUNDERBIRD=1 -ac_add_options --enable-crypto -ac_add_options --disable-mathml -ac_add_options --disable-activex -ac_add_options --disable-activex-scripting -ac_add_options --disable-oji -ac_add_options --disable-necko-disk-cache -ac_add_options --disable-tests -ac_add_options --disable-profilesharing -ac_add_options --enable-single-profile -ac_add_options --disable-freetype2 -ac_add_options --enable-extensions=wallet,spellcheck,xmlextras,webservices -ac_add_options --enable-necko-protocols=http,file,jar,viewsource,res,data -ac_add_options --enable-image-decoders=default,-xbm -ac_add_options --enable-default-toolkit=gtk2 -# See the following URL for approval email for using official branding -# http://people.freebsd.org/~ahze/firefox_thunderbird-approved.txt -ac_add_options --enable-official-branding -###################################################################### -# FBSD specific -export CPPFLAGS="@CPPFLAGS@" -export CFLAGS="@CFLAGS@" -export LIBS="@LIBS@" -export LDFLAGS="@LDFLAGS@" -export CONFIG_SH=/bin/sh -export XP_UNIX=1 -mk_add_options XP_UNIX=1 -export PERL="@PERL@" -mk_add_options PERL=$PERL -# Configure options for installation -ac_add_options --prefix=@PREFIX@ -###################################################################### -# Use ports for these libraries -ac_add_options --with-system-jpeg=@LOCALBASE@ -ac_add_options --with-system-zlib -ac_add_options --with-system-png=@LOCALBASE@ -###################################################################### -# set compile/link features -ac_add_options --with-pthreads -###################################################################### -# conditional from port Makefile -#if test -n "$WITH_REORDER"; then -# ac_add_options --enable-reorder -#else -# ac_add_options --disable-reorder -#fi # test -n "$WITH_REORDER" -if test -n "$WITH_DEBUG"; then - ac_add_options --enable-debug - ac_add_options --disable-strip -else - ac_add_options --disable-debug - ac_add_options --enable-optimize=${WITH_OPTIMIZE} - ac_add_options --enable-strip - export BUILD_OFFICIAL=1 - export MOZILLA_OFFICIAL=1 - mk_add_options BUILD_OFFICIAL=1 - mk_add_options MOZILLA_OFFICIAL=1 -fi # test -n "$WITH_DEBUG" -if test -n "$WITH_LOGGING"; then - ac_add_options --enable-logging -else - ac_add_options --disable-logging -fi # test -n "$WITH_LOGGING" -if test -z "$WITHOUT_XFT"; then - ac_add_options --enable-xft -else - ac_add_options --disable-xft -fi # test -z "$WITHOUT_XFT" -###################################################################### diff --git a/mail/thunderbird-esr/files/patch-Double.cpp b/mail/thunderbird-esr/files/patch-Double.cpp deleted file mode 100644 index 5cd13e4ff4fe..000000000000 --- a/mail/thunderbird-esr/files/patch-Double.cpp +++ /dev/null @@ -1,59 +0,0 @@ ---- extensions/transformiix/source/base/Double.cpp.orig Thu Jan 30 09:26:46 2003 -+++ extensions/transformiix/source/base/Double.cpp Sun Nov 16 01:46:42 2003 -@@ -51,10 +51,10 @@ - //A trick to handle IEEE floating point exceptions on FreeBSD - E.D. - #ifdef __FreeBSD__ - #include <ieeefp.h> --#ifdef __alpha__ --fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP; --#else -+#if defined(__i386__) - fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML; -+#else -+fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP; - #endif - fp_except_t oldmask = fpsetmask(~allmask); - #endif -@@ -75,22 +75,31 @@ - #define TX_DOUBLE_HI32_EXPMASK 0x7ff00000 - #define TX_DOUBLE_HI32_MANTMASK 0x000fffff - -+union ui32dun { -+ PRUint32 i[2]; -+ double d; -+}; -+ - //-- Initialize Double related constants - #ifdef IS_BIG_ENDIAN --const PRUint32 nanMask[2] = {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK, -- 0xffffffff}; --const PRUint32 infMask[2] = {TX_DOUBLE_HI32_EXPMASK, 0}; --const PRUint32 negInfMask[2] = {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT, 0}; -+const union ui32dun nanMask = -+ {{TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK, 0xffffffff}}; -+const union ui32dun infMask = -+ {{TX_DOUBLE_HI32_EXPMASK, 0}}; -+const union ui32dun negInfMask = -+ {{TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT, 0}}; - #else --const PRUint32 nanMask[2] = {0xffffffff, -- TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK}; --const PRUint32 infMask[2] = {0, TX_DOUBLE_HI32_EXPMASK}; --const PRUint32 negInfMask[2] = {0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT}; -+const union ui32dun nanMask = -+ {{0xffffffff, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK}}; -+const union ui32dun infMask = -+ {{0, TX_DOUBLE_HI32_EXPMASK}}; -+const union ui32dun negInfMask = -+ {{0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT}}; - #endif - --const double Double::NaN = *((double*)nanMask); --const double Double::POSITIVE_INFINITY = *((double*)infMask); --const double Double::NEGATIVE_INFINITY = *((double*)negInfMask); -+const double Double::NaN = nanMask.d; -+const double Double::POSITIVE_INFINITY = infMask.d; -+const double Double::NEGATIVE_INFINITY = negInfMask.d; - - /* - * Determines whether the given double represents positive or negative diff --git a/mail/thunderbird-esr/files/patch-bugzilla149334 b/mail/thunderbird-esr/files/patch-bugzilla149334 deleted file mode 100644 index fe1be5bc8fc0..000000000000 --- a/mail/thunderbird-esr/files/patch-bugzilla149334 +++ /dev/null @@ -1,342 +0,0 @@ -Index: gfx/idl/nsIFreeType2.idl -=================================================================== -RCS file: /cvsroot/mozilla/gfx/idl/nsIFreeType2.idl,v -retrieving revision 1.10 -diff -u -3 -p -r1.10 nsIFreeType2.idl ---- gfx/idl/nsIFreeType2.idl 15 Apr 2004 23:30:02 -0000 1.10 -+++ gfx/idl/nsIFreeType2.idl 26 May 2004 10:00:54 -0000 -@@ -76,10 +76,11 @@ native FT_Pointer(FT_Pointer); - native FT_Sfnt_Tag(FT_Sfnt_Tag); - native FT_Size(FT_Size); - --[ptr] native FTC_Image_Desc_p(FTC_Image_Desc); -+[ptr] native FTC_ImageType_p(FTC_ImageType); - native FTC_Face_Requester(FTC_Face_Requester); - native FTC_Font(FTC_Font); --native FTC_Image_Cache(FTC_Image_Cache); -+native FTC_FaceID(FTC_FaceID); -+native FTC_ImageCache(FTC_ImageCache); - native FTC_Manager(FTC_Manager); - - // #ifdef MOZ_SVG -@@ -99,7 +100,7 @@ interface nsIFreeType2 : nsISupports - - readonly attribute FT_Library library; - readonly attribute FTC_Manager FTCacheManager; -- readonly attribute FTC_Image_Cache ImageCache; -+ readonly attribute FTC_ImageCache ImageCache; - - void doneFace(in FT_Face face); - void doneFreeType(in FT_Library lib); -@@ -115,16 +116,16 @@ interface nsIFreeType2 : nsISupports - void outlineDecompose(in FT_Outline_p outline, - in const_FT_Outline_Funcs_p funcs, in voidPtr p); - void setCharmap(in FT_Face face, in FT_CharMap charmap); -- void imageCacheLookup(in FTC_Image_Cache cache, in FTC_Image_Desc_p desc, -+ void imageCacheLookup(in FTC_ImageCache cache, in FTC_ImageType_p desc, - in FT_UInt gindex, out FT_Glyph glyph); -- void managerLookupSize(in FTC_Manager manager, in FTC_Font font, -- out FT_Face face, out FT_Size size); -+ void managerLookupFace(in FTC_Manager manager, in FTC_FaceID face_id, -+ out FT_Face face); - void managerDone(in FTC_Manager manager); - void managerNew(in FT_Library lib, in FT_UInt max_faces, - in FT_UInt max_sizes, in FT_ULong max_bytes, - in FTC_Face_Requester requester, in FT_Pointer req_data, - out FTC_Manager manager); -- void imageCacheNew(in FTC_Manager manager, out FTC_Image_Cache cache); -+ void imageCacheNew(in FTC_Manager manager, out FTC_ImageCache cache); - /* #ifdef MOZ_SVG */ - void glyphTransform(in FT_Glyph glyph, in FT_Matrix_p matrix, - in FT_Vector_p delta); -Index: gfx/src/freetype/nsFreeType.cpp -=================================================================== -RCS file: /cvsroot/mozilla/gfx/src/freetype/nsFreeType.cpp,v -retrieving revision 1.25 -diff -u -3 -p -r1.25 nsFreeType.cpp ---- gfx/src/freetype/nsFreeType.cpp 17 Apr 2004 21:52:29 -0000 1.25 -+++ gfx/src/freetype/nsFreeType.cpp 26 May 2004 10:00:54 -0000 -@@ -110,11 +110,11 @@ FtFuncList nsFreeType2::FtFuncs [] = { - {"FT_New_Face", NS_FT2_OFFSET(nsFT_New_Face), PR_TRUE}, - {"FT_Outline_Decompose", NS_FT2_OFFSET(nsFT_Outline_Decompose), PR_TRUE}, - {"FT_Set_Charmap", NS_FT2_OFFSET(nsFT_Set_Charmap), PR_TRUE}, -- {"FTC_Image_Cache_Lookup", NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup), PR_TRUE}, -- {"FTC_Manager_Lookup_Size", NS_FT2_OFFSET(nsFTC_Manager_Lookup_Size), PR_TRUE}, -+ {"FTC_ImageCache_Lookup", NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup), PR_TRUE}, -+ {"FTC_Manager_LookupFace", NS_FT2_OFFSET(nsFTC_Manager_LookupFace), PR_TRUE}, - {"FTC_Manager_Done", NS_FT2_OFFSET(nsFTC_Manager_Done), PR_TRUE}, - {"FTC_Manager_New", NS_FT2_OFFSET(nsFTC_Manager_New), PR_TRUE}, -- {"FTC_Image_Cache_New", NS_FT2_OFFSET(nsFTC_Image_Cache_New), PR_TRUE}, -+ {"FTC_ImageCache_New", NS_FT2_OFFSET(nsFTC_Image_Cache_New), PR_TRUE}, - // #ifdef MOZ_SVG - {"FT_Glyph_Transform", NS_FT2_OFFSET(nsFT_Glyph_Transform), PR_TRUE}, - {"FT_Get_Kerning", NS_FT2_OFFSET(nsFT_Get_Kerning), PR_TRUE}, -@@ -282,7 +282,7 @@ nsFreeType2::SetCharmap(FT_Face face, FT - } - - NS_IMETHODIMP --nsFreeType2::ImageCacheLookup(FTC_Image_Cache cache, FTC_Image_Desc *desc, -+nsFreeType2::ImageCacheLookup(FTC_ImageCache cache, FTC_ImageType *desc, - FT_UInt glyphID, FT_Glyph *glyph) - { - // call the FreeType2 function via the function pointer -@@ -291,11 +291,11 @@ nsFreeType2::ImageCacheLookup(FTC_Image_ - } - - NS_IMETHODIMP --nsFreeType2::ManagerLookupSize(FTC_Manager manager, FTC_Font font, -- FT_Face *face, FT_Size *size) -+nsFreeType2::ManagerLookupFace(FTC_Manager manager, FTC_FaceID face_id, -+ FT_Face *face) - { - // call the FreeType2 function via the function pointer -- FT_Error error = nsFTC_Manager_Lookup_Size(manager, font, face, size); -+ FT_Error error = nsFTC_Manager_LookupFace(manager, face_id, face); - return error ? NS_ERROR_FAILURE : NS_OK; - } - -@@ -320,7 +320,7 @@ nsFreeType2::ManagerNew(FT_Library libra - } - - NS_IMETHODIMP --nsFreeType2::ImageCacheNew(FTC_Manager manager, FTC_Image_Cache *cache) -+nsFreeType2::ImageCacheNew(FTC_Manager manager, FTC_ImageCache *cache) - { - // call the FreeType2 function via the function pointer - FT_Error error = nsFTC_Image_Cache_New(manager, cache); -@@ -389,7 +389,7 @@ nsFreeType2::SupportsExtFunc(PRBool *res - } - - NS_IMETHODIMP --nsFreeType2::GetImageCache(FTC_Image_Cache *aCache) -+nsFreeType2::GetImageCache(FTC_ImageCache *aCache) - { - *aCache = mImageCache; - return NS_OK; -Index: gfx/src/freetype/nsFreeType.h -=================================================================== -RCS file: /cvsroot/mozilla/gfx/src/freetype/nsFreeType.h,v -retrieving revision 1.17 -diff -u -3 -p -r1.17 nsFreeType.h ---- gfx/src/freetype/nsFreeType.h 17 Apr 2004 21:52:29 -0000 1.17 -+++ gfx/src/freetype/nsFreeType.h 26 May 2004 10:00:54 -0000 -@@ -120,13 +120,13 @@ typedef FT_Error (*FT_Outline_Decompose_ - typedef FT_Error (*FT_New_Face_t)(FT_Library, const char*, FT_Long, FT_Face*); - typedef FT_Error (*FT_Set_Charmap_t)(FT_Face face, FT_CharMap charmap); - typedef FT_Error (*FTC_Image_Cache_Lookup_t) -- (FTC_Image_Cache, FTC_Image_Desc*, FT_UInt, FT_Glyph*); --typedef FT_Error (*FTC_Manager_Lookup_Size_t) -- (FTC_Manager, FTC_Font, FT_Face*, FT_Size*); -+ (FTC_ImageCache, FTC_ImageType*, FT_UInt, FT_Glyph*); -+typedef FT_Error (*FTC_Manager_LookupFace_t) -+ (FTC_Manager, FTC_FaceID, FT_Face*); - typedef FT_Error (*FTC_Manager_Done_t)(FTC_Manager); - typedef FT_Error (*FTC_Manager_New_t)(FT_Library, FT_UInt, FT_UInt, FT_ULong, - FTC_Face_Requester, FT_Pointer, FTC_Manager*); --typedef FT_Error (*FTC_Image_Cache_New_t)(FTC_Manager, FTC_Image_Cache*); -+typedef FT_Error (*FTC_Image_Cache_New_t)(FTC_Manager, FTC_ImageCache*); - // #ifdef MOZ_SVG - typedef FT_Error (*FT_Glyph_Transform_t)(FT_Glyph, FT_Matrix*, FT_Vector*); - typedef FT_Error (*FT_Get_Kerning_t) -@@ -181,7 +181,7 @@ protected: - FT_Outline_Decompose_t nsFT_Outline_Decompose; - FT_Set_Charmap_t nsFT_Set_Charmap; - FTC_Image_Cache_Lookup_t nsFTC_Image_Cache_Lookup; -- FTC_Manager_Lookup_Size_t nsFTC_Manager_Lookup_Size; -+ FTC_Manager_LookupFace_t nsFTC_Manager_LookupFace; - FTC_Manager_Done_t nsFTC_Manager_Done; - FTC_Manager_New_t nsFTC_Manager_New; - FTC_Image_Cache_New_t nsFTC_Image_Cache_New; -@@ -229,7 +229,7 @@ protected: - PRLibrary *mSharedLib; - FT_Library mFreeTypeLibrary; - FTC_Manager mFTCacheManager; -- FTC_Image_Cache mImageCache; -+ FTC_ImageCache mImageCache; - - static nsHashtable *sFontFamilies; - static nsHashtable *sRange1CharSetNames; -Index: gfx/src/ps/nsFontMetricsPS.cpp -=================================================================== -RCS file: /cvsroot/mozilla/gfx/src/ps/nsFontMetricsPS.cpp,v -retrieving revision 1.43 -diff -u -3 -p -r1.43 nsFontMetricsPS.cpp ---- gfx/src/ps/nsFontMetricsPS.cpp 17 Apr 2004 21:52:31 -0000 1.43 -+++ gfx/src/ps/nsFontMetricsPS.cpp 26 May 2004 10:01:03 -0000 -@@ -1140,10 +1140,10 @@ nsFontPSFreeType::Init(nsITrueTypeFontCa - - mPixelSize = NSToIntRound(app2dev * mFont->size); - -- mImageDesc.font.face_id = (void*)mEntry; -- mImageDesc.font.pix_width = mPixelSize; -- mImageDesc.font.pix_height = mPixelSize; -- mImageDesc.image_type = 0; -+ mImageDesc->face_id = (FTC_FaceID)&mEntry; -+ mImageDesc->width = mPixelSize; -+ mImageDesc->height = mPixelSize; -+ mImageDesc->flags = 0; - - nsresult rv; - mFt2 = do_GetService(NS_FREETYPE2_CONTRACTID, &rv); -@@ -1189,7 +1189,7 @@ nsFontPSFreeType::GetWidth(const PRUnich - if (!face) - return 0; - -- FTC_Image_Cache iCache; -+ FTC_ImageCache iCache; - nsresult rv = mFt2->GetImageCache(&iCache); - if (NS_FAILED(rv)) { - NS_ERROR("Failed to get Image Cache"); -@@ -1227,8 +1227,8 @@ nsFontPSFreeType::getFTFace() - - FTC_Manager cManager; - mFt2->GetFTCacheManager(&cManager); -- nsresult rv = mFt2->ManagerLookupSize(cManager, &mImageDesc.font, -- &face, nsnull); -+ nsresult rv = mFt2->ManagerLookupFace(cManager, mImageDesc->face_id, -+ &face); - NS_ASSERTION(rv==0, "failed to get face/size"); - if (rv) - return nsnull; -@@ -1621,16 +1621,16 @@ void nsFT2Type8Generator::GeneratePSFont - mEntry->GetFamilyName(fontName); - mEntry->GetStyleName(styleName); - -- mImageDesc.font.face_id = (void*)mEntry; -+ mImageDesc->face_id = (FTC_FaceID)&mEntry; - // TT glyph has no relation to size -- mImageDesc.font.pix_width = 16; -- mImageDesc.font.pix_height = 16; -- mImageDesc.image_type = 0; -+ mImageDesc->width = 16; -+ mImageDesc->height = 16; -+ mImageDesc->flags = 0; - FT_Face face = nsnull; - FTC_Manager cManager; - mFt2->GetFTCacheManager(&cManager); -- nsresult rv = mFt2->ManagerLookupSize(cManager, &mImageDesc.font, -- &face, nsnull); -+ nsresult rv = mFt2->ManagerLookupFace(cManager, mImageDesc->face_id, -+ &face); - if (NS_FAILED(rv)) - return; - -Index: gfx/src/ps/nsFontMetricsPS.h -=================================================================== -RCS file: /cvsroot/mozilla/gfx/src/ps/nsFontMetricsPS.h,v -retrieving revision 1.25 -diff -u -3 -p -r1.25 nsFontMetricsPS.h ---- gfx/src/ps/nsFontMetricsPS.h 17 Apr 2004 21:52:31 -0000 1.25 -+++ gfx/src/ps/nsFontMetricsPS.h 26 May 2004 10:01:03 -0000 -@@ -319,7 +319,7 @@ protected: - nsCOMPtr<nsITrueTypeFontCatalogEntry> mFaceID; - nsCOMPtr<nsIFreeType2> mFt2; - PRUint16 mPixelSize; -- FTC_Image_Desc mImageDesc; -+ FTC_ImageType mImageDesc; - - - static PRBool AddUserPref(nsIAtom *aLang, const nsFont& aFont, -@@ -362,7 +362,7 @@ public: - protected: - nsCOMPtr<nsITrueTypeFontCatalogEntry> mEntry; - nsCOMPtr<nsIFreeType2> mFt2; -- FTC_Image_Desc mImageDesc; -+ FTC_ImageType mImageDesc; - }; - #endif - -Index: gfx/src/x11shared/nsFontFreeType.cpp -=================================================================== -RCS file: /cvsroot/mozilla/gfx/src/x11shared/nsFontFreeType.cpp,v -retrieving revision 1.14 -diff -u -3 -p -r1.14 nsFontFreeType.cpp ---- gfx/src/x11shared/nsFontFreeType.cpp 17 Apr 2004 21:52:34 -0000 1.14 -+++ gfx/src/x11shared/nsFontFreeType.cpp 26 May 2004 10:01:03 -0000 -@@ -177,7 +177,7 @@ nsFreeTypeFont::getFTFace() - FTC_Manager mgr; - nsresult rv; - mFt2->GetFTCacheManager(&mgr); -- rv = mFt2->ManagerLookupSize(mgr, &mImageDesc.font, &face, nsnull); -+ rv = mFt2->ManagerLookupFace(mgr, mImageDesc->face_id, &face); - NS_ASSERTION(NS_SUCCEEDED(rv), "failed to get face/size"); - if (NS_FAILED(rv)) - return nsnull; -@@ -191,22 +191,15 @@ nsFreeTypeFont::nsFreeTypeFont(nsITrueTy - PRBool embedded_bimap = PR_FALSE; - mFaceID = aFaceID; - mPixelSize = aPixelSize; -- mImageDesc.font.face_id = (void*)mFaceID; -- mImageDesc.font.pix_width = aPixelSize; -- mImageDesc.font.pix_height = aPixelSize; -- mImageDesc.image_type = 0; -+ mImageDesc->face_id = (FTC_FaceID)&mFaceID; -+ mImageDesc->width = aPixelSize; -+ mImageDesc->height = aPixelSize; -+ mImageDesc->flags = 0; - - if (aPixelSize < nsFreeType2::gAntiAliasMinimum) { -- mImageDesc.image_type |= ftc_image_mono; - anti_alias = PR_FALSE; - } - -- if (nsFreeType2::gFreeType2Autohinted) -- mImageDesc.image_type |= ftc_image_flag_autohinted; -- -- if (nsFreeType2::gFreeType2Unhinted) -- mImageDesc.image_type |= ftc_image_flag_unhinted; -- - PRUint32 num_embedded_bitmaps, i; - PRInt32* embedded_bitmapheights; - mFaceID->GetEmbeddedBitmapHeights(&num_embedded_bitmaps, -@@ -218,7 +211,6 @@ nsFreeTypeFont::nsFreeTypeFont(nsITrueTy - if (embedded_bitmapheights[i] == aPixelSize) { - embedded_bimap = PR_TRUE; - // unhinted must be set for embedded bitmaps to be used -- mImageDesc.image_type |= ftc_image_flag_unhinted; - break; - } - } -@@ -312,7 +304,7 @@ nsFreeTypeFont::doGetBoundingMetrics(con - if (!face) - return NS_ERROR_FAILURE; - -- FTC_Image_Cache icache; -+ FTC_ImageCache icache; - mFt2->GetImageCache(&icache); - if (!icache) - return NS_ERROR_FAILURE; -@@ -401,7 +393,7 @@ nsFreeTypeFont::GetWidth(const PRUnichar - if (!face) - return 0; - -- FTC_Image_Cache icache; -+ FTC_ImageCache icache; - mFt2->GetImageCache(&icache); - if (!icache) - return 0; -@@ -723,7 +715,7 @@ nsFreeTypeXImage::DrawString(nsRendering - if (y%4==0) (*blendPixelFunc)(sub_image, y, ascent-1, black, 255/2); - #endif - -- FTC_Image_Cache icache; -+ FTC_ImageCache icache; - mFt2->GetImageCache(&icache); - if (!icache) - return 0; -Index: gfx/src/x11shared/nsFontFreeType.h -=================================================================== -RCS file: /cvsroot/mozilla/gfx/src/x11shared/nsFontFreeType.h,v -retrieving revision 1.10 -diff -u -3 -p -r1.10 nsFontFreeType.h ---- gfx/src/x11shared/nsFontFreeType.h 17 Apr 2004 21:52:34 -0000 1.10 -+++ gfx/src/x11shared/nsFontFreeType.h 26 May 2004 10:01:03 -0000 -@@ -110,7 +110,7 @@ protected: - XImage *GetXImage(PRUint32 width, PRUint32 height); - nsITrueTypeFontCatalogEntry *mFaceID; - PRUint16 mPixelSize; -- FTC_Image_Desc mImageDesc; -+ FTC_ImageType mImageDesc; - nsCOMPtr<nsIFreeType2> mFt2; - }; - diff --git a/mail/thunderbird-esr/files/patch-build_unix_run-mozilla.sh b/mail/thunderbird-esr/files/patch-build_unix_run-mozilla.sh deleted file mode 100644 index 28bbd1a1154e..000000000000 --- a/mail/thunderbird-esr/files/patch-build_unix_run-mozilla.sh +++ /dev/null @@ -1,11 +0,0 @@ ---- build/unix/run-mozilla.sh.orig Mon Dec 15 18:27:28 2003 -+++ build/unix/run-mozilla.sh Fri Feb 27 11:54:10 2004 -@@ -355,7 +355,7 @@ - fi - ## - ## Set LD_LIBRARY_PATH --LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"} -+LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:%%PREFIX%%/lib/browser_plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"} - if [ -n "$LD_LIBRARYN32_PATH" ] - then - LD_LIBRARYN32_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARYN32_PATH+":$LD_LIBRARYN32_PATH"} diff --git a/mail/thunderbird-esr/files/patch-config-mkdepend-imakemdep.h b/mail/thunderbird-esr/files/patch-config-mkdepend-imakemdep.h deleted file mode 100644 index b688e664475d..000000000000 --- a/mail/thunderbird-esr/files/patch-config-mkdepend-imakemdep.h +++ /dev/null @@ -1,10 +0,0 @@ ---- config/mkdepend/imakemdep.h Fri Sep 4 21:22:25 1998 -+++ config/mkdepend/imakemdep.h Thu Oct 16 22:43:25 2003 -@@ -278,4 +278,7 @@ - "-D__i386__", - # endif -+# if defined(__amd64__) || defined(__x86_64__) -+ "-D__amd64__ -D__x86_64__", -+# endif - # ifdef __GNUC__ - "-traditional", diff --git a/mail/thunderbird-esr/files/patch-config-rules.mk b/mail/thunderbird-esr/files/patch-config-rules.mk deleted file mode 100644 index ecc3c8194dcc..000000000000 --- a/mail/thunderbird-esr/files/patch-config-rules.mk +++ /dev/null @@ -1,14 +0,0 @@ ---- config/rules.mk.orig Tue Aug 26 13:28:47 2003 -+++ config/rules.mk Sun Feb 1 15:11:41 2004 -@@ -444,7 +444,11 @@ - - ifeq ($(OS_ARCH),FreeBSD) - ifdef IS_COMPONENT -+ifneq (,$(filter alpha ia64,$(OS_TEST))) -+EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -lc -+else - EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -+endif - endif - endif - diff --git a/mail/thunderbird-esr/files/patch-configure b/mail/thunderbird-esr/files/patch-configure deleted file mode 100644 index 9e60372adb33..000000000000 --- a/mail/thunderbird-esr/files/patch-configure +++ /dev/null @@ -1,38 +0,0 @@ ---- configure.orig Fri Feb 13 01:06:29 2004 -+++ configure Fri Feb 13 01:07:17 2004 -@@ -9181,7 +9181,7 @@ - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" --LIBS="-liconv $LIBS" -+LIBS="-L$LOCALBASE/lib -liconv $LIBS" - cat > conftest.$ac_ext <<EOF - #line 9187 "configure" - #include "confdefs.h" -@@ -9212,7 +9212,7 @@ - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- _ICONV_LIBS="$_ICONV_LIBS -liconv" -+ _ICONV_LIBS="$_ICONV_LIBS -L$LOCALBASE/lib -liconv" - else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6 -@@ -9222,7 +9222,7 @@ - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" --LIBS="-liconv $LIBS" -+LIBS="-L$LOCALBASE/lib -liconv $LIBS" - cat > conftest.$ac_ext <<EOF - #line 9228 "configure" - #include "confdefs.h" -@@ -9253,7 +9253,7 @@ - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- _ICONV_LIBS="$_ICONV_LIBS -liconv" -+ _ICONV_LIBS="$_ICONV_LIBS -L$LOCALBASE/lib -liconv" - else - echo "$ac_t""no" 1>&6 - fi diff --git a/mail/thunderbird-esr/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp b/mail/thunderbird-esr/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp deleted file mode 100644 index 41c462d74f62..000000000000 --- a/mail/thunderbird-esr/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp +++ /dev/null @@ -1,46 +0,0 @@ ---- extensions/typeaheadfind/src/nsTypeAheadFind.cpp.orig Wed Nov 19 01:20:47 2003 -+++ extensions/typeaheadfind/src/nsTypeAheadFind.cpp Tue Feb 10 02:52:26 2004 -@@ -323,11 +323,11 @@ - prefBranch->GetBoolPref("accessibility.typeaheadfind.startlinksonly", - &mStartLinksOnlyPref); - -- PRBool isSoundEnabled = PR_TRUE; -+ mIsSoundEnabled = PR_TRUE; - prefBranch->GetBoolPref("accessibility.typeaheadfind.enablesound", -- &isSoundEnabled); -+ &mIsSoundEnabled); - nsXPIDLCString soundStr; -- if (isSoundEnabled) { -+ if (mIsSoundEnabled && mIsSoundEnabled) { - prefBranch->GetCharPref("accessibility.typeaheadfind.soundURL", - getter_Copies(soundStr)); - } -@@ -758,7 +758,7 @@ - } - else { - // No find string to backspace in! -- if (mIsBackspaceProtectOn) { -+ if (mIsBackspaceProtectOn && mIsSoundEnabled) { - // This flag should be on only if the last key was a backspace. - // It keeps us from accidentally hitting backspace too many times and - // going back in history when we really just wanted to clear -@@ -1012,7 +1012,9 @@ - - // Error sound (don't fire when backspace is pressed, they're - // trying to correct the mistake!) -- PlayNotFoundSound(); -+ if (mIsSoundEnabled) { -+ PlayNotFoundSound(); -+ } - - // Remove bad character from buffer, so we can continue typing from - // last matched character -@@ -1059,7 +1061,7 @@ - void - nsTypeAheadFind::PlayNotFoundSound() - { -- if (mNotFoundSoundURL.IsEmpty()) // no sound -+ if (mNotFoundSoundURL.IsEmpty() || !mIsSoundEnabled) // no sound - return; - if (!mSoundInterface) { - mSoundInterface = do_CreateInstance("@mozilla.org/sound;1"); diff --git a/mail/thunderbird-esr/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h b/mail/thunderbird-esr/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h deleted file mode 100644 index 07ad43b4334d..000000000000 --- a/mail/thunderbird-esr/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h +++ /dev/null @@ -1,12 +0,0 @@ ---- extensions/typeaheadfind/src/nsTypeAheadFind.h.orig Fri May 23 22:00:33 2003 -+++ extensions/typeaheadfind/src/nsTypeAheadFind.h Mon Feb 9 22:21:43 2004 -@@ -194,6 +194,9 @@ - - nsCString mNotFoundSoundURL; - -+ // Move the sound enabled boolean out for all methods to access. -+ PRBool mIsSoundEnabled; -+ - // PRBool's are used instead of PRPackedBool's where the address of the - // boolean variable is getting passed into a method. For example: - // GetBoolPref("accessibility.typeaheadfind.linksonly", &mLinksOnlyPref); diff --git a/mail/thunderbird-esr/files/patch-mail_app_mozilla.in b/mail/thunderbird-esr/files/patch-mail_app_mozilla.in deleted file mode 100644 index 01091fb2ce3b..000000000000 --- a/mail/thunderbird-esr/files/patch-mail_app_mozilla.in +++ /dev/null @@ -1,472 +0,0 @@ ---- mail/app/mozilla.in.orig Sun Jul 25 01:58:06 2004 -+++ mail/app/mozilla.in Tue Mar 22 23:59:11 2005 -@@ -29,51 +29,82 @@ - ## the mozilla-bin binary to work. - ## - -+# -+# MOZ_PIS, "Mozilla Plugable Init Scripts" -+# MOZ_PIS_ is the name space used -+# These variables and there meaning are specified in -+# mozilla/xpfe/bootstrap/init.d/README - moz_pis_startstop_scripts() - { -- MOZ_USER_DIR="%MOZ_USER_DIR%" -- # MOZ_PIS_ is the name space for "Mozilla Plugable Init Scripts" -- # These variables and there meaning are specified in -- # mozilla/xpfe/bootstrap/init.d/README -- MOZ_PIS_API=2 -- MOZ_PIS_MOZBINDIR="${dist_bin}" -- MOZ_PIS_SESSION_PID="$$" -- MOZ_PIS_USER_DIR="${MOZ_USER_DIR}" -- export MOZ_PIS_API MOZ_PIS_MOZBINDIR MOZ_PIS_SESSION_PID MOZ_PIS_USER_DIR -- -- case "${1}" in -- "start") -- for curr_pis in "${dist_bin}/init.d"/S* "${HOME}/${MOZ_USER_DIR}/init.d"/S* ; do -- if [ -x "${curr_pis}" ] ; then -- case "${curr_pis}" in -- *.sh) . "${curr_pis}" ;; -- *) "${curr_pis}" "start" ;; -- esac -- fi -- done -- ;; -- "stop") -- for curr_pis in "${HOME}/${MOZ_USER_DIR}/init.d"/K* "${dist_bin}/init.d"/K* ; do -- if [ -x "${curr_pis}" ] ; then -- case "${curr_pis}" in -- *.sh) . "${curr_pis}" ;; -- *) "${curr_pis}" "stop" ;; -- esac -- fi -- done -- ;; -- *) -- echo 1>&2 "$0: Internal error in moz_pis_startstop_scripts." -- exit 1 -- ;; -- esac -+ MOZ_PIS_API=2 -+ MOZ_PIS_MOZBINDIR="${dist_bin}" -+ MOZ_PIS_SESSION_PID="$$" -+ MOZ_PIS_USER_DIR="${MOZ_USER_DIR}" -+ export MOZ_PIS_API MOZ_PIS_MOZBINDIR MOZ_PIS_SESSION_PID MOZ_PIS_USER_DIR -+ -+ case "${1}" in -+ "start") -+ for curr_pis in "${MOZ_PIS_MOZBINDIR}/init.d"/S* \ -+ "${HOME}/${MOZ_PIS_USER_DIR}/init.d"/S*; do -+ if [ -x "${curr_pis}" ]; then -+ case "${curr_pis}" in -+ *.sh) -+ . "${curr_pis}" -+ ;; -+ *) -+ ${curr_pis} "start" -+ ;; -+ esac -+ fi -+ done -+ ;; -+ "stop") -+ for curr_pis in "${MOZ_PIS_MOZBINDIR}/init.d"/K* \ -+ "${HOME}/${MOZ_PIS_USER_DIR}/init.d"/K*; do -+ if [ -x "${curr_pis}" ]; then -+ case "${curr_pis}" in -+ *.sh) -+ . "${curr_pis}" -+ ;; -+ *) -+ ${curr_pis} "stop" -+ ;; -+ esac -+ fi -+ done -+ ;; -+ *) -+ echo "$0: Internal error in moz_pis_startstop_scripts." 1>&2 -+ exit 1 -+ ;; -+ esac - } - --#uncomment for debugging -+# uncomment for debugging - #set -x - --moz_libdir=%MOZAPPDIR% --MRE_HOME=%MREDIR% -+# -+# variables -+# -+#location="new-tab" -+#MOZILLA_UILOCALE="en-US" -+#MOZILLA_UIREGION="US" -+ -+# -+# working definitions -+# -+MOZ_USER_DIR="%MOZ_USER_DIR%" -+moz_libdir="%MOZAPPDIR%" -+MRE_HOME="%MREDIR%" -+ -+debugging= # set the debugging level -+here=`pwd` -+ -+if [ ! -d "${MRE_HOME}" ]; then -+ # use moz_libdir as MRE_HOME -+ MRE_HOME="${moz_libdir}" -+fi -+export MRE_HOME - - # Use run-mozilla.sh in the current dir if it exists - # If not, then start resolving symlinks until we find run-mozilla.sh -@@ -82,160 +113,214 @@ - curdir=`dirname "$progname"` - progbase=`basename "$progname"` - run_moz="$curdir/run-mozilla.sh" --if test -x "$run_moz"; then -- dist_bin="$curdir" -- found=1 -+if [ -x "$run_moz" ]; then -+ dist_bin="$curdir" -+ found=1 - else -- here=`/bin/pwd` -- while [ -h "$progname" ]; do -- bn=`basename "$progname"` -- cd `dirname "$progname"` -- progname=`/bin/ls -l "$bn" | sed -e 's/^.* -> //' ` -- if [ ! -x "$progname" ]; then -- break -- fi -- curdir=`dirname "$progname"` -- run_moz="$curdir/run-mozilla.sh" -- if [ -x "$run_moz" ]; then -- cd "$curdir" -- dist_bin=`pwd` -- found=1 -- break -- fi -- done -- cd "$here" -+ while [ -h "${progname}" ]; do -+ bn=`basename "${progname}"` -+ cd `dirname "${progname}"` -+ progname=`ls -l "${bn}" | sed -e 's/^.* -> //'` -+ if [ ! -x "$progname" ]; then -+ break -+ fi -+ curdir=`dirname "${progname}"` -+ run_moz="${curdir}/run-mozilla.sh" -+ if [ -x "${run_moz}" ]; then -+ cd "$curdir" -+ dist_bin=`pwd` -+ run_moz="${dist_bin}/run-mozilla.sh" -+ found=1 -+ break -+ fi -+ done -+ cd "${here}" - fi - if [ $found = 0 ]; then -- # Check default compile-time libdir -- if [ -x "$moz_libdir/run-mozilla.sh" ]; then -- dist_bin="$moz_libdir" -- else -- echo "Cannot find mozilla runtime directory. Exiting." -- exit 1 -- fi --fi -- --script_args="" --moreargs="" --debugging=0 --MOZILLA_BIN="${progbase}-bin" -- --# The following is to check for a currently running instance. --# This is taken almost verbatim from the Mozilla RPM package's launch script. --MOZ_CLIENT_PROGRAM="$dist_bin/mozilla-xremote-client" --check_running() { -- "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" 'ping()' 2>/dev/null >/dev/null -- RETURN_VAL=$? -- if [ $RETURN_VAL -eq 0 ]; then -- echo 1 -- return 1 -+ # Check default compile-time libdir -+ if [ -x "${moz_libdir}/run-mozilla.sh" ]; then -+ dist_bin="$moz_libdir" -+ run_moz="${dist_bin}/run-mozilla.sh" - else -- echo 0 -- return 0 -+ echo "$0: Cannot find mozilla runtime directory. Exiting." 1>&2 -+ exit 1 - fi --} -+fi - -+MOZILLA_BIN="${progbase}-bin" - if [ "$OSTYPE" = "beos" ]; then -- mimeset -F "$MOZILLA_BIN" -+ mimeset -F "$MOZILLA_BIN" - fi - --ALREADY_RUNNING=`check_running` -+# test for binary apps in ${dist_bin} -+if [ -x "${dist_bin}/${MOZILLA_BIN}" ]; then -+ MOZILLA_BIN="${dist_bin}/${progbase}-bin" -+else -+ echo "$0: Cannot find mozilla binary executable. Exiting." 1>&2 -+ exit 1 -+fi -+if [ -x "${dist_bin}/mozilla-xremote-client" ]; then -+ MOZ_CLIENT_PROGRAM="${dist_bin}/mozilla-xremote-client -a ${progbase}" -+else -+ MOZ_CLIENT_PROGRAM="${MOZILLA_BIN} -remote -a ${progbase}" -+fi - --################################################################ Parse Arguments --# If there's a command line argument but it doesn't begin with a - --# it's probably a url. Try to send it to a running instance. --_USE_EXIST=0 --_NEW_WINDOW= --_optOne="$1" --case "${_optOne}" in -- -*) -- ;; -+# guest a default remote command -+_remote_cmd="xfeDoCommand(openInbox)" -+ -+# parse options -+script_args= # null -+moreargs= # null -+target= # null -+ALREADY_RUNNING="test" -+while [ $# -gt 0 ] -+do -+ if [ -n "${target}" ]; then -+ # well, this can't be the target if not last -+ moreargs="${moreargs} \"${target}\"" -+ target= # null -+ fi -+ case "$1" in -+ # preserve [pP] for profile -+ --pure | -pure) -+ MOZILLA_BIN="${MOZILLA_BIN}.pure" -+ shift -+ ;; -+ -g | --debug) -+ script_args="${script_args} -g" -+ debugging=1 -+ shift -+ ;; -+ -d | --debugger) -+ if [ -n "$2" ]; then -+ script_args="${script_args} -d $2" -+ shift 2 -+ else -+ "$0: ERROR, $1 needs an argument. Exiting" 1>&2 -+ exit 1 -+ fi -+ ;; -+ -[Uu][Ii][Ll]ocale) -+ if [ -n "$2" ]; then -+ uilocale="$2" -+ shift 2 -+ else -+ echo "$0: ERROR, $1 needs an argument. Exiting" 1>&2 -+ exit 1 -+ fi -+ ;; -+ -[Uu][Ii][Rr]egion) -+ if [ -n "$2" ]; then -+ uiregion="$2" -+ shift 2 -+ else -+ echo "$0: ERROR, $1 needs an argument. Exiting" 1>&2 -+ exit 1 -+ fi -+ ;; -+ -mail) -+ # mail is default for ithunderbird -+ shift -+ ;; -+ -compose) -+ _remote_cmd="xfeDoCommand(composeMessage)" -+ moreargs="${moreargs} $1" -+ shift -+ ;; -+ -turbo | -nosplash | -quiet) -+ # use remote even with this -+ moreargs="${moreargs} $1" -+ shift -+ ;; -+ -*) -+ # don't use remote with options -+ ALREADY_RUNNING= # null -+ moreargs="${moreargs} $1" -+ shift -+ ;; - *) -- _USE_EXIST=1 -- ;; --esac -- --_optOthers= --_optLast= --for i in "$@"; do -- _optLast="${i}" --done #last arg -- --for i in "$@"; do -- [ $i = ${_optLast} ] && break -- _optOthers="${_optOthers} ${i}" --done #others arg -- --#???: needs check if othersopt begin with -* ? --if [ `expr "${_optLast}" : '.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then -- # Last argument seems to be a local file/directory -- # Check, if it is absolutely specified (ie. /home/foo/file vs. ./file) -- # If it is just "relatively" (./file) specified, make it absolutely -- [ `expr "${_optLast}" : '/.*'` -eq 0 ] && _optLast="file://`pwd`/${_optLast}" --elif [ `expr "${_optLast}" : '.*:/.*'` -gt 0 -o -n "${_optOthers}" ]; then #???? like before... -- _NEW_WINDOW=1 --fi --################################################################ Parse Arguments -- --########################################################################### Main --if [ $ALREADY_RUNNING -eq 1 ]; then -- # There's an instance already running. Use it. -- # Any command line args passed in? -- if [ $# -gt 0 ]; then -- # There were "some" command line args. -- if [ ${_USE_EXIST} -eq 1 ]; then -- # We should use an existing instance, as _USE_EXIST=$_USE_EXIST=-1 -- _open_type="window" -- #_open_type="tab" -- _remote_cmd="openURL(${_optLast} , new-${_open_type})" -- "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" "${_remote_cmd}" -- unset _remote_cmd _open_type -- exit $? -- fi -+ target="$1" -+ shift -+ ;; -+ esac -+done -+ -+# test for a running copy of firefox -+# seems this is not needed -+#if [-n "${ALREADY_RUNNING}" ]; then -+# if [ -n "${DISPLAY}" ]; then -+# if [ -n "${debugging}" ]; then -+# echo "${run_moz} ${MOZ_CLIENT_PROGRAM} ping()" -+# ${run_moz} ${MOZ_CLIENT_PROGRAM} 'ping()' && ALREADY_RUNNING="yes" -+# else -+# ${run_moz} ${MOZ_CLIENT_PROGRAM} 'ping()' >/dev/null 2>&1 && -+# ALREADY_RUNNING="yes" -+# fi -+# elif [ -n "${debugging}" ]; then -+# echo "$0: WARN, no DISPLAY environment" 1>&2 -+# fi -+#fi -+ -+# process target -+if [ -n "${target}" ]; then -+ moreargs="${moreargs} \"${target}\"" -+ if [ -n "${ALREADY_RUNNING}" ]; then -+ if [ `expr "${target}" : '.*:.*'` -eq 0 ]; then -+ # not an URI, don't use xremote -+ ALREADY_RUNNING= # null -+ fi -+ fi -+fi -+ -+# try remote protocol if running -+if [ -n "${ALREADY_RUNNING}" ]; then -+ if [ -n "${target}" ]; then -+ if [ -n "${location}" ]; then -+ _remote_cmd="openURL(${target},${location})" - else -- # No command line args. Open new window/tab -- #exec "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" "xfeDoCommand(openBrowser)" -- "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" "xfeDoCommand(openInbox)" -- exit $? -+ _remote_cmd="openURL(${target})" - fi -+ fi -+ # FIXME problems with freedesktop StartupNotify -+ if [ -n "${debugging}" ]; then -+ echo "${run_moz} ${script_args} ${MOZ_CLIENT_PROGRAM} ${_remote_cmd}" -+ ${run_moz} ${script_args} ${MOZ_CLIENT_PROGRAM} ${_remote_cmd} && -+ exit 0 -+ else -+ ${run_moz} ${script_args} ${MOZ_CLIENT_PROGRAM} ${_remote_cmd} \ -+ >/dev/null 2>&1 && exit 0 -+ fi - fi --# Default action - no running instance or _USE_EXIST (${_USE_EXIST}) ! -eq 1 --########################################################################### Main - --while [ $# -gt 0 ] --do -- case "$1" in -- -p | --pure | -pure) -- MOZILLA_BIN="${MOZILLA_BIN}.pure" -- shift -- ;; -- -g | --debug) -- script_args="$script_args -g" -- debugging=1 -- shift -- ;; -- -d | --debugger) -- script_args="$script_args -d $2" -- shift 2 -- ;; -- *) -- moreargs="$moreargs \"$1\"" -- shift 1 -- ;; -- esac --done -+# fallback to direct invocation -+ -+# UILocale, UIRegion -+if [ -z "${uilocale}" -a -n "${MOZILLA_UILOCALE}" ]; then -+ uilocale="${MOZILLA_UILOCALE}" -+fi -+if [ -z "${uiregion}" -a -n "${MOZILLA_UIREGION}" ]; then -+ uiregion="${MOZILLA_UIREGION}" -+fi -+if [ -n "${uiregion}" -a -z "${uilocale}" ]; then -+ uilocale="en-US" -+fi -+if [ -n "${uilocale}" ]; then -+ if [ -n "${uiregion}" ]; then -+ moreargs="-UIRegion ${uiregion} ${moreargs}" -+ fi -+ moreargs="-UILocale ${uilocale} ${moreargs}" -+fi - --export MRE_HOME --eval "set -- $moreargs" -+# real invocation -+eval "set -- ${moreargs}" - - ## Start addon scripts - moz_pis_startstop_scripts "start" - --if [ $debugging = 1 ] --then -- echo $dist_bin/run-mozilla.sh $script_args $dist_bin/$MOZILLA_BIN "$@" -+if [ -n "${debugging}" ]; then -+ echo "${run_moz} ${script_args} ${MOZILLA_BIN} $@" - fi --"$dist_bin/run-mozilla.sh" $script_args "$dist_bin/$MOZILLA_BIN" "$@" -+${run_moz} ${script_args} ${MOZILLA_BIN} "$@" - exitcode=$? - - ## Stop addon scripts diff --git a/mail/thunderbird-esr/files/patch-nspr-unix.c b/mail/thunderbird-esr/files/patch-nspr-unix.c deleted file mode 100644 index 6bb4ed08fb40..000000000000 --- a/mail/thunderbird-esr/files/patch-nspr-unix.c +++ /dev/null @@ -1,21 +0,0 @@ ---- nsprpub/pr/src/md/unix/unix.c.orig Sat May 31 18:06:04 2003 -+++ nsprpub/pr/src/md/unix/unix.c Sat May 31 18:04:43 2003 -@@ -65,7 +65,8 @@ - * PRInt32* pointer to a _PRSockLen_t* pointer. - */ - #if defined(HAVE_SOCKLEN_T) \ -- || (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) -+ || (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) \ -+ || defined(FREEBSD) - #define _PRSockLen_t socklen_t - #elif defined(IRIX) || defined(HPUX) || defined(OSF1) || defined(SOLARIS) \ - || defined(AIX4_1) || defined(LINUX) || defined(SONY) \ -@@ -73,7 +74,7 @@ - || defined(SUNOS4) || defined(NCR) || defined(DARWIN) \ - || defined(NEXTSTEP) || defined(QNX) - #define _PRSockLen_t int --#elif (defined(AIX) && !defined(AIX4_1)) || defined(FREEBSD) \ -+#elif (defined(AIX) && !defined(AIX4_1)) \ - || defined(NETBSD) || defined(OPENBSD) || defined(UNIXWARE) \ - || defined(DGUX) || defined(VMS) || defined(NTO) - #define _PRSockLen_t size_t diff --git a/mail/thunderbird-esr/files/patch-nsprpub-pr-include-md-_freebsd.cfg b/mail/thunderbird-esr/files/patch-nsprpub-pr-include-md-_freebsd.cfg deleted file mode 100644 index 3ac9a34fbc70..000000000000 --- a/mail/thunderbird-esr/files/patch-nsprpub-pr-include-md-_freebsd.cfg +++ /dev/null @@ -1,161 +0,0 @@ ---- nsprpub/pr/include/md/_freebsd.cfg.orig Wed Jan 2 18:38:25 2002 -+++ nsprpub/pr/include/md/_freebsd.cfg Sun Feb 1 15:09:53 2004 -@@ -91,7 +91,7 @@ - #define PR_ALIGN_OF_DOUBLE 4 - #define PR_ALIGN_OF_POINTER 4 - --#elif defined(__alpha) -+#elif defined(__alpha__) - - #define IS_LITTLE_ENDIAN 1 - #undef IS_BIG_ENDIAN -@@ -138,6 +138,149 @@ - #define PR_ALIGN_OF_DOUBLE 8 - #define PR_ALIGN_OF_POINTER 8 - -+#elif defined(__sparc64__) -+#undef IS_LITTLE_ENDIAN -+#define IS_BIG_ENDIAN 1 -+#define PR_ALIGN_OF_INT64 8 -+#define PR_ALIGN_OF_DOUBLE 8 -+#define IS_64 -+ -+#define PR_BYTES_PER_BYTE 1 -+#define PR_BYTES_PER_SHORT 2 -+#define PR_BYTES_PER_INT 4 -+#define PR_BYTES_PER_INT64 8 -+#define PR_BYTES_PER_LONG 8 -+#define PR_BYTES_PER_FLOAT 4 -+#define PR_BYTES_PER_DOUBLE 8 -+#define PR_BYTES_PER_WORD 8 -+#define PR_BYTES_PER_DWORD 8 -+#define PR_BYTES_PER_WORD_LOG2 3 -+#define PR_BYTES_PER_DWORD_LOG2 3 -+ -+#define PR_BITS_PER_BYTE 8 -+#define PR_BITS_PER_SHORT 16 -+#define PR_BITS_PER_INT 32 -+#define PR_BITS_PER_INT64 64 -+#define PR_BITS_PER_LONG 64 -+#define PR_BITS_PER_FLOAT 32 -+#define PR_BITS_PER_DOUBLE 64 -+#define PR_BITS_PER_WORD 64 -+ -+#define PR_BITS_PER_BYTE_LOG2 3 -+#define PR_BITS_PER_SHORT_LOG2 4 -+#define PR_BITS_PER_INT_LOG2 5 -+#define PR_BITS_PER_INT64_LOG2 6 -+#define PR_BITS_PER_LONG_LOG2 6 -+#define PR_BITS_PER_FLOAT_LOG2 5 -+#define PR_BITS_PER_DOUBLE_LOG2 6 -+#define PR_BITS_PER_WORD_LOG2 6 -+ -+#define PR_ALIGN_OF_SHORT 2 -+#define PR_ALIGN_OF_INT 4 -+#define PR_ALIGN_OF_LONG 8 -+#define PR_ALIGN_OF_FLOAT 4 -+#define PR_ALIGN_OF_POINTER 8 -+ -+#define HAVE_LONG_LONG -+#define HAVE_ALIGNED_DOUBLES -+#define HAVE_ALIGNED_LONGLONGS -+ -+#elif defined(__ia64__) -+#define IS_LITTLE_ENDIAN 1 -+#undef IS_BIG_ENDIAN -+#define HAVE_LONG_LONG -+#define HAVE_ALIGNED_DOUBLES -+#define HAVE_ALIGNED_LONGLONGS -+#define IS_64 -+ -+#define PR_BYTES_PER_BYTE 1 -+#define PR_BYTES_PER_SHORT 2 -+#define PR_BYTES_PER_INT 4 -+#define PR_BYTES_PER_INT64 8 -+#define PR_BYTES_PER_LONG 8 -+#define PR_BYTES_PER_FLOAT 4 -+#define PR_BYTES_PER_DOUBLE 8 -+#define PR_BYTES_PER_WORD 8 -+#define PR_BYTES_PER_DWORD 8 -+ -+#define PR_BITS_PER_BYTE 8 -+#define PR_BITS_PER_SHORT 16 -+#define PR_BITS_PER_INT 32 -+#define PR_BITS_PER_INT64 64 -+#define PR_BITS_PER_LONG 64 -+#define PR_BITS_PER_FLOAT 32 -+#define PR_BITS_PER_DOUBLE 64 -+#define PR_BITS_PER_WORD 64 -+ -+#define PR_BITS_PER_BYTE_LOG2 3 -+#define PR_BITS_PER_SHORT_LOG2 4 -+#define PR_BITS_PER_INT_LOG2 5 -+#define PR_BITS_PER_INT64_LOG2 6 -+#define PR_BITS_PER_LONG_LOG2 6 -+#define PR_BITS_PER_FLOAT_LOG2 5 -+#define PR_BITS_PER_DOUBLE_LOG2 6 -+#define PR_BITS_PER_WORD_LOG2 6 -+ -+#define PR_ALIGN_OF_SHORT 2 -+#define PR_ALIGN_OF_INT 4 -+#define PR_ALIGN_OF_LONG 8 -+#define PR_ALIGN_OF_INT64 8 -+#define PR_ALIGN_OF_FLOAT 4 -+#define PR_ALIGN_OF_DOUBLE 8 -+#define PR_ALIGN_OF_POINTER 8 -+#define PR_ALIGN_OF_WORD 8 -+ -+#define PR_BYTES_PER_WORD_LOG2 3 -+#define PR_BYTES_PER_DWORD_LOG2 3 -+ -+#elif defined(__amd64__) -+#define IS_LITTLE_ENDIAN 1 -+#undef IS_BIG_ENDIAN -+#define IS_64 -+ -+#define PR_BYTES_PER_BYTE 1 -+#define PR_BYTES_PER_SHORT 2 -+#define PR_BYTES_PER_INT 4 -+#define PR_BYTES_PER_INT64 8 -+#define PR_BYTES_PER_LONG 8 -+#define PR_BYTES_PER_FLOAT 4 -+#define PR_BYTES_PER_DOUBLE 8 -+#define PR_BYTES_PER_WORD 8 -+#define PR_BYTES_PER_DWORD 8 -+ -+#define PR_BITS_PER_BYTE 8 -+#define PR_BITS_PER_SHORT 16 -+#define PR_BITS_PER_INT 32 -+#define PR_BITS_PER_INT64 64 -+#define PR_BITS_PER_LONG 64 -+#define PR_BITS_PER_FLOAT 32 -+#define PR_BITS_PER_DOUBLE 64 -+#define PR_BITS_PER_WORD 64 -+ -+#define PR_BITS_PER_BYTE_LOG2 3 -+#define PR_BITS_PER_SHORT_LOG2 4 -+#define PR_BITS_PER_INT_LOG2 5 -+#define PR_BITS_PER_INT64_LOG2 6 -+#define PR_BITS_PER_LONG_LOG2 6 -+#define PR_BITS_PER_FLOAT_LOG2 5 -+#define PR_BITS_PER_DOUBLE_LOG2 6 -+#define PR_BITS_PER_WORD_LOG2 6 -+ -+#define PR_ALIGN_OF_SHORT 2 -+#define PR_ALIGN_OF_INT 4 -+#define PR_ALIGN_OF_LONG 8 -+#define PR_ALIGN_OF_INT64 8 -+#define PR_ALIGN_OF_FLOAT 4 -+#define PR_ALIGN_OF_DOUBLE 8 -+#define PR_ALIGN_OF_POINTER 8 -+#define PR_ALIGN_OF_WORD 8 -+ -+#define PR_BYTES_PER_WORD_LOG2 3 -+#define PR_BYTES_PER_DWORD_LOG2 3 -+ -+#define HAVE_LONG_LONG -+#define HAVE_ALIGNED_DOUBLES -+#define HAVE_ALIGNED_LONGLONGS - #else - - #error "Unknown CPU architecture" diff --git a/mail/thunderbird-esr/files/patch-nsprpub-pr-include-md-_freebsd.h b/mail/thunderbird-esr/files/patch-nsprpub-pr-include-md-_freebsd.h deleted file mode 100644 index 38f21b2ddd6d..000000000000 --- a/mail/thunderbird-esr/files/patch-nsprpub-pr-include-md-_freebsd.h +++ /dev/null @@ -1,13 +0,0 @@ ---- nsprpub/pr/include/md/_freebsd.h.orig Sat Nov 15 23:36:13 2003 -+++ nsprpub/pr/include/md/_freebsd.h Mon Feb 9 22:24:39 2004 -@@ -50,6 +50,10 @@ - #define _PR_SI_ARCHITECTURE "alpha" - #elif defined(__sparc__) - #define _PR_SI_ARCHITECTURE "sparc" -+#elif defined(__ia64__) -+#define _PR_SI_ARCHITECTURE "ia64" -+#elif defined(__amd64__) -+#define _PR_SI_ARCHITECTURE "amd64" - #else - #error "Unknown CPU architecture" - #endif diff --git a/mail/thunderbird-esr/files/patch-nsprpub-pr-include-md-_pth.h b/mail/thunderbird-esr/files/patch-nsprpub-pr-include-md-_pth.h deleted file mode 100644 index 1f8159c70b1f..000000000000 --- a/mail/thunderbird-esr/files/patch-nsprpub-pr-include-md-_pth.h +++ /dev/null @@ -1,11 +0,0 @@ ---- nsprpub/pr/include/md/_pth.h.orig Mon Jul 26 07:23:42 2004 -+++ nsprpub/pr/include/md/_pth.h Mon Jul 26 07:18:37 2004 -@@ -90,7 +90,7 @@ - #define _PT_PTHREAD_MUTEXATTR_INIT pthread_mutexattr_init - #define _PT_PTHREAD_MUTEXATTR_DESTROY pthread_mutexattr_destroy - #define _PT_PTHREAD_MUTEX_INIT(m, a) pthread_mutex_init(&(m), &(a)) --#define _PT_PTHREAD_MUTEX_IS_LOCKED(m) (EBUSY == pthread_mutex_trylock(&(m))) -+#define _PT_PTHREAD_MUTEX_IS_LOCKED(m) (0 != pthread_mutex_trylock(&(m))) - #if defined(DARWIN) - #define _PT_PTHREAD_CONDATTR_INIT(x) 0 - #else diff --git a/mail/thunderbird-esr/files/patch-nsprpub-pr-src-io-prprf.c b/mail/thunderbird-esr/files/patch-nsprpub-pr-src-io-prprf.c deleted file mode 100644 index 74a85ce8b5e2..000000000000 --- a/mail/thunderbird-esr/files/patch-nsprpub-pr-src-io-prprf.c +++ /dev/null @@ -1,14 +0,0 @@ ---- nsprpub/pr/src/io/prprf.c.orig Mon Mar 8 22:18:19 2004 -+++ nsprpub/pr/src/io/prprf.c Mon May 3 13:00:27 2004 -@@ -51,7 +51,10 @@ - ** Note: on some platforms va_list is defined as an array, - ** and requires array notation. - */ --#if (defined(LINUX) && defined(__x86_64__)) -+#if defined(__amd64__) -+#include <stdarg.h> -+#define VARARGS_ASSIGN(foo, bar) va_copy((foo), (bar)) -+#elif (defined(LINUX) && defined(__x86_64__)) - #define VARARGS_ASSIGN(foo, bar) __va_copy((foo), (bar)) - #elif (defined(LINUX) && defined(__powerpc__)) || \ - (defined(LINUX) && defined(__s390__)) || \ diff --git a/mail/thunderbird-esr/files/patch-nsprpub-pr-src-pthreads-ptio.c b/mail/thunderbird-esr/files/patch-nsprpub-pr-src-pthreads-ptio.c deleted file mode 100644 index 08346f235416..000000000000 --- a/mail/thunderbird-esr/files/patch-nsprpub-pr-src-pthreads-ptio.c +++ /dev/null @@ -1,29 +0,0 @@ ---- nsprpub/pr/src/pthreads/ptio.c.orig Mon Jul 14 17:59:47 2003 -+++ nsprpub/pr/src/pthreads/ptio.c Fri Aug 29 15:39:46 2003 -@@ -189,7 +189,7 @@ - #endif - #endif - --#ifdef DARWIN -+#if defined(DARWIN) || defined(FREEBSD) - static PRBool _pr_ipv6_v6only_on_by_default; - /* The IPV6_V6ONLY socket option is not defined on Mac OS X 10.1. */ - #ifndef IPV6_V6ONLY -@@ -1154,7 +1154,7 @@ - _pr_stderr = pt_SetMethods(2, PR_DESC_FILE, PR_FALSE, PR_TRUE); - PR_ASSERT(_pr_stdin && _pr_stdout && _pr_stderr); - --#ifdef DARWIN -+#if defined(DARWIN) || defined(FREEBSD) - /* In Mac OS X v10.3 Panther Beta the IPV6_V6ONLY socket option - * is turned on by default, contrary to what RFC 3493, Section - * 5.3 says. So we have to turn it off. Find out whether we -@@ -3462,7 +3462,7 @@ - if (osfd == -1) pt_MapError(_PR_MD_MAP_SOCKET_ERROR, errno); - else - { --#ifdef DARWIN -+#if defined(DARWIN) || defined(FREEBSD) - if ((domain == AF_INET6) && _pr_ipv6_v6only_on_by_default) - { - int on = 0; diff --git a/mail/thunderbird-esr/files/patch-security-coreconf-FreeBSD.mk b/mail/thunderbird-esr/files/patch-security-coreconf-FreeBSD.mk deleted file mode 100644 index 3e0e14acaaf2..000000000000 --- a/mail/thunderbird-esr/files/patch-security-coreconf-FreeBSD.mk +++ /dev/null @@ -1,28 +0,0 @@ ---- security/coreconf/FreeBSD.mk.orig Wed Mar 26 20:17:25 2003 -+++ security/coreconf/FreeBSD.mk Sun Nov 21 22:59:49 2004 -@@ -43,8 +43,12 @@ - ifeq ($(OS_TEST),alpha) - CPU_ARCH = alpha - else -+ifeq ($(OS_TEST),amd64) -+CPU_ARCH = amd64 -+else - CPU_ARCH = x86 - endif -+endif - - OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK - -@@ -71,7 +75,11 @@ - DLL_SUFFIX = so.1.0 - endif - --MKSHLIB = $(CC) $(DSO_LDOPTS) -+ifneq (,$(filter alpha ia64,$(OS_TEST))) -+MKSHLIB = $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS) -o $@ -+else -+MKSHLIB = $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS) -o $@ -+endif - ifdef MAPFILE - # Add LD options to restrict exported symbols to those in the map file - endif diff --git a/mail/thunderbird-esr/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp b/mail/thunderbird-esr/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp deleted file mode 100644 index 7f8e55f536df..000000000000 --- a/mail/thunderbird-esr/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp +++ /dev/null @@ -1,29 +0,0 @@ ---- uriloader/exthandler/unix/nsGNOMERegistry.cpp.orig Fri Dec 24 04:30:00 2004 -+++ uriloader/exthandler/unix/nsGNOMERegistry.cpp Fri Dec 24 04:34:05 2004 -@@ -143,7 +143,7 @@ - PR_END_MACRO - - // Attempt to open libgconf -- gconfLib = LoadVersionedLibrary("gconf-2", ".4"); -+ gconfLib = PR_LoadLibrary("libgconf-2.so"); - ENSURE_LIB(gconfLib); - - GET_LIB_FUNCTION(gconf, gconf_client_get_default); -@@ -151,7 +151,7 @@ - GET_LIB_FUNCTION(gconf, gconf_client_get_bool); - - // Attempt to open libgnome -- gnomeLib = LoadVersionedLibrary("gnome-2", ".0"); -+ gnomeLib = PR_LoadLibrary("libgnome-2.so"); - ENSURE_LIB(gnomeLib); - - GET_LIB_FUNCTION(gnome, gnome_url_show); -@@ -160,7 +160,7 @@ - GET_LIB_FUNCTION(gnome, gnome_program_get); - - // Attempt to open libgnomevfs -- vfsLib = LoadVersionedLibrary("gnomevfs-2", ".0"); -+ vfsLib = PR_LoadLibrary("libgnomevfs-2.so"); - ENSURE_LIB(vfsLib); - - GET_LIB_FUNCTION(vfs, gnome_vfs_mime_type_from_name); diff --git a/mail/thunderbird-esr/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc b/mail/thunderbird-esr/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc deleted file mode 100644 index ac8cab896d48..000000000000 --- a/mail/thunderbird-esr/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc +++ /dev/null @@ -1,11 +0,0 @@ ---- xpcom/reflect/xptcall/public/xptcstubsdecl.inc.orig Tue Mar 16 03:07:25 2004 -+++ xpcom/reflect/xptcall/public/xptcstubsdecl.inc Mon May 3 13:05:12 2004 -@@ -8,7 +8,7 @@ - * 1 is AddRef - * 2 is Release - */ --#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__)) -+#if !defined(__ia64) - NS_IMETHOD Stub3(); - NS_IMETHOD Stub4(); - NS_IMETHOD Stub5(); diff --git a/mail/thunderbird-esr/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in b/mail/thunderbird-esr/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in deleted file mode 100644 index 51edeb95a7a7..000000000000 --- a/mail/thunderbird-esr/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in +++ /dev/null @@ -1,54 +0,0 @@ ---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig Thu Aug 14 21:00:23 2003 -+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in Sun Feb 1 15:06:40 2004 -@@ -49,6 +49,9 @@ - ifeq (86,$(findstring 86,$(OS_TEST))) - CPPSRCS := xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp - endif -+ifeq (amd64,$(OS_TEST)) -+CPPSRCS := xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp -+endif - endif - # - # New code for Linux, et. al., with gcc -@@ -60,7 +63,7 @@ - endif - endif - # IA64 Linux --ifneq (,$(filter Linux,$(OS_ARCH))) -+ifneq (,$(filter Linux FreeBSD,$(OS_ARCH))) - ifneq (,$(findstring ia64,$(OS_TEST))) - CPPSRCS := xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp - ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s -@@ -106,9 +109,15 @@ - ASFILES := xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s - endif - # -+# FreeBSD/Alpha -+# -+ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDalpha) -+CPPSRCS := xptcinvoke_freebsd_alpha.cpp xptcstubs_freebsd_alpha.cpp -+endif -+# - # Linux/Alpha - # --ifneq (,$(filter Linuxalpha FreeBSDalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) -+ifneq (,$(filter Linuxalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) - CPPSRCS := xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp - endif - # -@@ -294,6 +303,15 @@ - ifeq ($(OS_ARCH)$(OS_TEST),NetBSDsparc) - CPPSRCS := xptcinvoke_sparc_netbsd.cpp xptcstubs_sparc_netbsd.cpp - ASFILES := xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s -+endif -+# -+# FreeBSD/SPARC64 -+# -+ifeq ($(OS_ARCH),FreeBSD) -+ifneq (,$(findstring sparc,$(OS_TEST))) -+CPPSRCS := xptcinvoke_sparc64_freebsd.cpp xptcstubs_sparc64_freebsd.cpp -+ASFILES := xptcinvoke_asm_sparc64_freebsd.s xptcstubs_asm_sparcv9_solaris.s -+endif - endif - # - # Solaris/SPARC diff --git a/mail/thunderbird-esr/files/patch-xptcall-alpha b/mail/thunderbird-esr/files/patch-xptcall-alpha deleted file mode 100644 index 29631a98e61e..000000000000 --- a/mail/thunderbird-esr/files/patch-xptcall-alpha +++ /dev/null @@ -1,459 +0,0 @@ ---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp.orig Tue May 27 01:37:25 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp Tue May 27 01:37:00 2003 -@@ -0,0 +1,184 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+/* ***** BEGIN LICENSE BLOCK ***** -+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1 -+ * -+ * The contents of this file are subject to the Netscape Public License -+ * Version 1.1 (the "License"); you may not use this file except in -+ * compliance with the License. You may obtain a copy of the License at -+ * http://www.mozilla.org/NPL/ -+ * -+ * Software distributed under the License is distributed on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -+ * for the specific language governing rights and limitations under the -+ * License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is -+ * Netscape Communications Corporation. -+ * Portions created by the Initial Developer are Copyright (C) 1998 -+ * the Initial Developer. All Rights Reserved. -+ * -+ * Contributor(s): -+ * -+ * Alternatively, the contents of this file may be used under the terms of -+ * either the GNU General Public License Version 2 or later (the "GPL"), or -+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -+ * in which case the provisions of the GPL or the LGPL are applicable instead -+ * of those above. If you wish to allow use of your version of this file only -+ * under the terms of either the GPL or the LGPL, and not to allow others to -+ * use your version of this file under the terms of the NPL, indicate your -+ * decision by deleting the provisions above and replace them with the notice -+ * and other provisions required by the GPL or the LGPL. If you do not delete -+ * the provisions above, a recipient may use your version of this file under -+ * the terms of any one of the NPL, the GPL or the LGPL. -+ * -+ * ***** END LICENSE BLOCK ***** */ -+ -+/* Platform specific code to invoke XPCOM methods on native objects */ -+ -+/* contributed by Glen Nakamura <glen.nakamura@usa.net> */ -+ -+#include "xptcprivate.h" -+ -+/* Prototype specifies unmangled function name and disables unused warning */ -+static void -+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s) -+__asm__("invoke_copy_to_stack") __attribute__((unused)); -+ -+static void -+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s) -+{ -+ const PRUint8 NUM_ARG_REGS = 6-1; // -1 for "this" pointer -+ -+ for(PRUint32 i = 0; i < paramCount; i++, d++, s++) -+ { -+ if(s->IsPtrData()) -+ { -+ *d = (PRUint64)s->ptr; -+ continue; -+ } -+ switch(s->type) -+ { -+ case nsXPTType::T_I8 : *d = (PRUint64)s->val.i8; break; -+ case nsXPTType::T_I16 : *d = (PRUint64)s->val.i16; break; -+ case nsXPTType::T_I32 : *d = (PRUint64)s->val.i32; break; -+ case nsXPTType::T_I64 : *d = (PRUint64)s->val.i64; break; -+ case nsXPTType::T_U8 : *d = (PRUint64)s->val.u8; break; -+ case nsXPTType::T_U16 : *d = (PRUint64)s->val.u16; break; -+ case nsXPTType::T_U32 : *d = (PRUint64)s->val.u32; break; -+ case nsXPTType::T_U64 : *d = (PRUint64)s->val.u64; break; -+ case nsXPTType::T_FLOAT : -+ if(i < NUM_ARG_REGS) -+ { -+ // convert floats to doubles if they are to be passed -+ // via registers so we can just deal with doubles later -+ union { PRUint64 u64; double d; } t; -+ t.d = (double)s->val.f; -+ *d = t.u64; -+ } -+ else -+ // otherwise copy to stack normally -+ *d = (PRUint64)s->val.u32; -+ break; -+ case nsXPTType::T_DOUBLE : *d = (PRUint64)s->val.u64; break; -+ case nsXPTType::T_BOOL : *d = (PRUint64)s->val.b; break; -+ case nsXPTType::T_CHAR : *d = (PRUint64)s->val.c; break; -+ case nsXPTType::T_WCHAR : *d = (PRUint64)s->val.wc; break; -+ default: -+ // all the others are plain pointer types -+ *d = (PRUint64)s->val.p; -+ break; -+ } -+ } -+} -+ -+/* -+ * XPTC_PUBLIC_API(nsresult) -+ * XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, -+ * PRUint32 paramCount, nsXPTCVariant* params, void* vt) -+ */ -+__asm__( -+ "#### XPTC_InvokeByIndex ####\n" -+".text\n\t" -+ ".align 5\n\t" -+ ".globl XPTC_InvokeByIndex\n\t" -+ ".ent XPTC_InvokeByIndex\n" -+"XPTC_InvokeByIndex:\n\t" -+ ".frame $15,32,$26,0\n\t" -+ ".mask 0x4008000,-32\n\t" -+ "ldgp $29,0($27)\n" -+"$XPTC_InvokeByIndex..ng:\n\t" -+ "subq $30,32,$30\n\t" -+ "stq $26,0($30)\n\t" -+ "stq $15,8($30)\n\t" -+ "bis $30,$30,$15\n\t" -+ ".prologue 1\n\t" -+ -+ /* -+ * Allocate enough stack space to hold the greater of 6 or "paramCount"+1 -+ * parameters. (+1 for "this" pointer) Room for at least 6 parameters -+ * is required for storage of those passed via registers. -+ */ -+ -+ "bis $31,5,$2\n\t" /* count = MAX(5, "paramCount") */ -+ "cmplt $2,$18,$1\n\t" -+ "cmovne $1,$18,$2\n\t" -+ "s8addq $2,16,$1\n\t" /* room for count+1 params (8 bytes each) */ -+ "bic $1,15,$1\n\t" /* stack space is rounded up to 0 % 16 */ -+ "subq $30,$1,$30\n\t" -+ -+ "stq $16,0($30)\n\t" /* save "that" (as "this" pointer) */ -+ "stq $17,16($15)\n\t" /* save "methodIndex" */ -+ -+ "addq $30,8,$16\n\t" /* pass stack pointer */ -+ "bis $18,$18,$17\n\t" /* pass "paramCount" */ -+ "bis $19,$19,$18\n\t" /* pass "params" */ -+ "bsr $26,$invoke_copy_to_stack..ng\n\t" /* call invoke_copy_to_stack */ -+ -+ /* -+ * Copy the first 6 parameters to registers and remove from stack frame. -+ * Both the integer and floating point registers are set for each parameter -+ * except the first which is the "this" pointer. (integer only) -+ * The floating point registers are all set as doubles since the -+ * invoke_copy_to_stack function should have converted the floats. -+ */ -+ "ldq $16,0($30)\n\t" /* integer registers */ -+ "ldq $17,8($30)\n\t" -+ "ldq $18,16($30)\n\t" -+ "ldq $19,24($30)\n\t" -+ "ldq $20,32($30)\n\t" -+ "ldq $21,40($30)\n\t" -+ "ldt $f17,8($30)\n\t" /* floating point registers */ -+ "ldt $f18,16($30)\n\t" -+ "ldt $f19,24($30)\n\t" -+ "ldt $f20,32($30)\n\t" -+ "ldt $f21,40($30)\n\t" -+ -+ "addq $30,48,$30\n\t" /* remove params from stack */ -+ -+ /* -+ * Call the virtual function with the constructed stack frame. -+ */ -+ "bis $16,$16,$1\n\t" /* load "this" */ -+ "ldq $2,16($15)\n\t" /* load "methodIndex" */ -+ "ldq $1,0($1)\n\t" /* load vtable */ -+#if 0 -+ "s8addq $2,16,$2\n\t" /* vtable index = "methodIndex" * 8 + 16 */ -+#else -+ "mulq $2, 8, $2\n\t" -+ "addq $2, 0, $2\n\t" /* vtable index = "methodIndex" * 16 + 24 */ -+#endif -+ "addq $1,$2,$1\n\t" -+ "ldq $27,0($1)\n\t" /* load address of function */ -+ "jsr $26,($27),0\n\t" /* call virtual function */ -+ "ldgp $29,0($26)\n\t" -+ -+ "bis $15,$15,$30\n\t" -+ "ldq $26,0($30)\n\t" -+ "ldq $15,8($30)\n\t" -+ "addq $30,32,$30\n\t" -+ "ret $31,($26),1\n\t" -+ ".end XPTC_InvokeByIndex" -+ ); -+ ---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp.orig Tue May 27 01:37:30 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp Tue May 27 01:37:04 2003 -@@ -0,0 +1,269 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+/* ***** BEGIN LICENSE BLOCK ***** -+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1 -+ * -+ * The contents of this file are subject to the Netscape Public License -+ * Version 1.1 (the "License"); you may not use this file except in -+ * compliance with the License. You may obtain a copy of the License at -+ * http://www.mozilla.org/NPL/ -+ * -+ * Software distributed under the License is distributed on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -+ * for the specific language governing rights and limitations under the -+ * License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is -+ * Netscape Communications Corporation. -+ * Portions created by the Initial Developer are Copyright (C) 1999 -+ * the Initial Developer. All Rights Reserved. -+ * -+ * Contributor(s): -+ * -+ * Alternatively, the contents of this file may be used under the terms of -+ * either the GNU General Public License Version 2 or later (the "GPL"), or -+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -+ * in which case the provisions of the GPL or the LGPL are applicable instead -+ * of those above. If you wish to allow use of your version of this file only -+ * under the terms of either the GPL or the LGPL, and not to allow others to -+ * use your version of this file under the terms of the NPL, indicate your -+ * decision by deleting the provisions above and replace them with the notice -+ * and other provisions required by the GPL or the LGPL. If you do not delete -+ * the provisions above, a recipient may use your version of this file under -+ * the terms of any one of the NPL, the GPL or the LGPL. -+ * -+ * ***** END LICENSE BLOCK ***** */ -+ -+/* Implement shared vtbl methods. */ -+ -+/* contributed by Glen Nakamura <glen.nakamura@usa.net> */ -+ -+#include <sys/types.h> -+#include <machine/cpu.h> -+#include "xptcprivate.h" -+ -+/* Prototype specifies unmangled function name and disables unused warning */ -+static nsresult -+PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args) -+__asm__("PrepareAndDispatch") __attribute__((unused)); -+ -+static nsresult -+PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args) -+{ -+ const PRUint8 PARAM_BUFFER_COUNT = 16; -+ const PRUint8 NUM_ARG_REGS = 6-1; // -1 for "this" pointer -+ -+ nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT]; -+ nsXPTCMiniVariant* dispatchParams = NULL; -+ nsIInterfaceInfo* iface_info = NULL; -+ const nsXPTMethodInfo* info; -+ PRUint8 paramCount; -+ PRUint8 i; -+ nsresult result = NS_ERROR_FAILURE; -+ -+ NS_ASSERTION(self,"no self"); -+ -+ self->GetInterfaceInfo(&iface_info); -+ NS_ASSERTION(iface_info,"no interface info"); -+ -+ iface_info->GetMethodInfo(PRUint16(methodIndex), &info); -+ NS_ASSERTION(info,"no interface info"); -+ -+ paramCount = info->GetParamCount(); -+ -+ // setup variant array pointer -+ if(paramCount > PARAM_BUFFER_COUNT) -+ dispatchParams = new nsXPTCMiniVariant[paramCount]; -+ else -+ dispatchParams = paramBuffer; -+ NS_ASSERTION(dispatchParams,"no place for params"); -+ -+ // args[0] to args[NUM_ARG_REGS] hold floating point register values -+ PRUint64* ap = args + NUM_ARG_REGS; -+ for(i = 0; i < paramCount; i++, ap++) -+ { -+ const nsXPTParamInfo& param = info->GetParam(i); -+ const nsXPTType& type = param.GetType(); -+ nsXPTCMiniVariant* dp = &dispatchParams[i]; -+ -+ if(param.IsOut() || !type.IsArithmetic()) -+ { -+ dp->val.p = (void*) *ap; -+ continue; -+ } -+ // else -+ switch(type) -+ { -+ case nsXPTType::T_I8 : dp->val.i8 = (PRInt8) *ap; break; -+ case nsXPTType::T_I16 : dp->val.i16 = (PRInt16) *ap; break; -+ case nsXPTType::T_I32 : dp->val.i32 = (PRInt32) *ap; break; -+ case nsXPTType::T_I64 : dp->val.i64 = (PRInt64) *ap; break; -+ case nsXPTType::T_U8 : dp->val.u8 = (PRUint8) *ap; break; -+ case nsXPTType::T_U16 : dp->val.u16 = (PRUint16) *ap; break; -+ case nsXPTType::T_U32 : dp->val.u32 = (PRUint32) *ap; break; -+ case nsXPTType::T_U64 : dp->val.u64 = (PRUint64) *ap; break; -+ case nsXPTType::T_FLOAT : -+ if(i < NUM_ARG_REGS) -+ { -+ // floats passed via registers are stored as doubles -+ // in the first NUM_ARG_REGS entries in args -+ dp->val.u64 = (PRUint64) args[i]; -+ dp->val.f = (float) dp->val.d; // convert double to float -+ } -+ else -+ dp->val.u32 = (PRUint32) *ap; -+ break; -+ case nsXPTType::T_DOUBLE : -+ // doubles passed via registers are also stored -+ // in the first NUM_ARG_REGS entries in args -+ dp->val.u64 = (i < NUM_ARG_REGS) ? args[i] : *ap; -+ break; -+ case nsXPTType::T_BOOL : dp->val.b = (PRBool) *ap; break; -+ case nsXPTType::T_CHAR : dp->val.c = (char) *ap; break; -+ case nsXPTType::T_WCHAR : dp->val.wc = (PRUnichar) *ap; break; -+ default: -+ NS_ASSERTION(0, "bad type"); -+ break; -+ } -+ } -+ -+ result = self->CallMethod((PRUint16)methodIndex, info, dispatchParams); -+ -+ NS_RELEASE(iface_info); -+ -+ if(dispatchParams != paramBuffer) -+ delete [] dispatchParams; -+ -+ return result; -+} -+ -+/* -+ * SharedStub() -+ * Collects arguments and calls PrepareAndDispatch. The "methodIndex" is -+ * passed to this function via $1 to preserve the argument registers. -+ */ -+__asm__( -+ "#### SharedStub ####\n" -+".text\n\t" -+ ".align 5\n\t" -+ ".ent SharedStub\n" -+"SharedStub:\n\t" -+ ".frame $30,96,$26,0\n\t" -+ ".mask 0x4000000,-96\n\t" -+ "ldgp $29,0($27)\n" -+"$SharedStub..ng:\n\t" -+ "subq $30,96,$30\n\t" -+ "stq $26,0($30)\n\t" -+ ".prologue 1\n\t" -+ -+ /* -+ * Store arguments passed via registers to the stack. -+ * Floating point registers are stored as doubles and converted -+ * to floats in PrepareAndDispatch if necessary. -+ */ -+ "stt $f17,16($30)\n\t" /* floating point registers */ -+ "stt $f18,24($30)\n\t" -+ "stt $f19,32($30)\n\t" -+ "stt $f20,40($30)\n\t" -+ "stt $f21,48($30)\n\t" -+ "stq $17,56($30)\n\t" /* integer registers */ -+ "stq $18,64($30)\n\t" -+ "stq $19,72($30)\n\t" -+ "stq $20,80($30)\n\t" -+ "stq $21,88($30)\n\t" -+ -+ /* -+ * Call PrepareAndDispatch function. -+ */ -+ "bis $1,$1,$17\n\t" /* pass "methodIndex" */ -+ "addq $30,16,$18\n\t" /* pass "args" */ -+ "bsr $26,$PrepareAndDispatch..ng\n\t" -+ -+ "ldq $26,0($30)\n\t" -+ "addq $30,96,$30\n\t" -+ "ret $31,($26),1\n\t" -+ ".end SharedStub" -+ ); -+ -+#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */ -+/* -+ * nsresult nsXPTCStubBase::Stub##n() -+ * Sets register $1 to "methodIndex" and jumps to SharedStub. -+ */ -+#define STUB_ENTRY(n) \ -+__asm__( \ -+ "#### Stub"#n" ####\n" \ -+".text\n\t" \ -+ ".align 5\n\t" \ -+ ".globl _ZN14nsXPTCStubBase5Stub"#n"Ev\n\t" \ -+ ".ent _ZN14nsXPTCStubBase5Stub"#n"Ev\n" \ -+"_ZN14nsXPTCStubBase5Stub"#n"Ev:\n\t" \ -+ ".frame $30,0,$26,0\n\t" \ -+ "ldgp $29,0($27)\n" \ -+"$_ZN14nsXPTCStubBase5Stub"#n"Ev..ng:\n\t" \ -+ ".prologue 1\n\t" \ -+ "lda $1,"#n"\n\t" \ -+ "br $31,$SharedStub..ng\n\t" \ -+ ".end _ZN14nsXPTCStubBase5Stub"#n"Ev" \ -+ ); \ -+__asm__( \ -+ "#### Stub"#n" ####\n" \ -+".text\n\t" \ -+ ".align 5\n\t" \ -+ ".globl _ZN14nsXPTCStubBase6Stub"#n"Ev\n\t" \ -+ ".ent _ZN14nsXPTCStubBase6Stub"#n"Ev\n" \ -+"_ZN14nsXPTCStubBase6Stub"#n"Ev:\n\t" \ -+ ".frame $30,0,$26,0\n\t" \ -+ "ldgp $29,0($27)\n" \ -+"$_ZN14nsXPTCStubBase6Stub"#n"Ev..ng:\n\t" \ -+ ".prologue 1\n\t" \ -+ "lda $1,"#n"\n\t" \ -+ "br $31,$SharedStub..ng\n\t" \ -+ ".end _ZN14nsXPTCStubBase6Stub"#n"Ev" \ -+ ); \ -+__asm__( \ -+ "#### Stub"#n" ####\n" \ -+".text\n\t" \ -+ ".align 5\n\t" \ -+ ".globl _ZN14nsXPTCStubBase7Stub"#n"Ev\n\t" \ -+ ".ent _ZN14nsXPTCStubBase7Stub"#n"Ev\n" \ -+"_ZN14nsXPTCStubBase7Stub"#n"Ev:\n\t" \ -+ ".frame $30,0,$26,0\n\t" \ -+ "ldgp $29,0($27)\n" \ -+"$_ZN14nsXPTCStubBase7Stub"#n"Ev..ng:\n\t" \ -+ ".prologue 1\n\t" \ -+ "lda $1,"#n"\n\t" \ -+ "br $31,$SharedStub..ng\n\t" \ -+ ".end _ZN14nsXPTCStubBase7Stub"#n"Ev" \ -+ ); -+#else -+/* -+ * nsresult nsXPTCStubBase::Stub##n() -+ * Sets register $1 to "methodIndex" and jumps to SharedStub. -+ */ -+#define STUB_ENTRY(n) \ -+nsresult nsXPTCStubBase::Stub##n() \ -+{ \ -+ nsresult result; \ -+__asm__ __volatile__( \ -+ "ldah $29,0($27)\n\t" \ -+ "lda $29,0($29)\n\t" \ -+ "lda $1, "#n"\n\t" \ -+ "br $31, $SharedStub..ng\n\t" \ -+ "mov $0, %0\n\t" \ -+ : "=r" (result) \ -+ ); \ -+ return result; \ -+} -+#endif -+ -+#define SENTINEL_ENTRY(n) \ -+nsresult nsXPTCStubBase::Sentinel##n() \ -+{ \ -+ NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \ -+ return NS_ERROR_NOT_IMPLEMENTED; \ -+} -+ -+#include "xptcstubsdef.inc" -+ diff --git a/mail/thunderbird-esr/files/patch-xptcall-ia64 b/mail/thunderbird-esr/files/patch-xptcall-ia64 deleted file mode 100644 index 9cd07f7ddbb2..000000000000 --- a/mail/thunderbird-esr/files/patch-xptcall-ia64 +++ /dev/null @@ -1,38 +0,0 @@ ---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ipf64.s.orig Sun Jul 20 00:05:32 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ipf64.s Sun Jul 20 00:06:37 2003 -@@ -8,6 +8,7 @@ - // Section has executable code - .section .text, "ax","progbits" - // procedure named 'XPTC_InvokeByIndex' -+ .global XPTC_InvokeByIndex - .proc XPTC_InvokeByIndex - // manual bundling - .explicit -@@ -24,7 +25,7 @@ - - // XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, - // PRUint32 paramCount, nsXPTCVariant* params); --XPTC_InvokeByIndex:: -+XPTC_InvokeByIndex: - .prologue - .save ar.pfs, r37 - // allocate 4 input args, 6 local args, and 8 output args ---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s.orig Sun Jul 20 00:02:02 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s Sun Jul 20 00:02:40 2003 -@@ -6,6 +6,7 @@ - // Section has executable code - .section .text, "ax","progbits" - // procedure named 'SharedStub' -+ .global SharedStub - .proc SharedStub - // manual bundling - .explicit -@@ -14,7 +15,7 @@ - // .exclass PrepareAndDispatch, @fullyvisible - .type PrepareAndDispatch,@function - --SharedStub:: -+SharedStub: - // 9 arguments, first 8 are the input arguments of previous - // function call. The last one is methodIndex, and is passed in memory - .prologue diff --git a/mail/thunderbird-esr/files/patch-xptcall-sparc64 b/mail/thunderbird-esr/files/patch-xptcall-sparc64 deleted file mode 100644 index 9599a8a71336..000000000000 --- a/mail/thunderbird-esr/files/patch-xptcall-sparc64 +++ /dev/null @@ -1,327 +0,0 @@ ---- /dev/null Mon May 26 13:22:00 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc64_freebsd.cpp Mon May 26 04:12:55 2003 -@@ -0,0 +1,123 @@ -+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- -+ * -+ * The contents of this file are subject to the Mozilla Public -+ * License Version 1.1 (the "License"); you may not use this file -+ * except in compliance with the License. You may obtain a copy of -+ * the License at http://www.mozilla.org/MPL/ -+ * -+ * Software distributed under the License is distributed on an "AS -+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -+ * implied. See the License for the specific language governing -+ * rights and limitations under the License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is Netscape -+ * Communications Corporation. Portions created by Netscape are -+ * Copyright (C) 2001 Netscape Communications Corporation. All -+ * Rights Reserved. -+ * -+ * Contributor(s): -+ * Stuart Parmenter <pavlov@netscape.com> -+ */ -+ -+/* Implement shared vtbl methods. */ -+ -+#include "xptcprivate.h" -+ -+#if defined(sparc) || defined(__sparc__) -+ -+extern "C" nsresult -+PrepareAndDispatch(nsXPTCStubBase* self, PRUint64 methodIndex, PRUint64* args) -+{ -+ -+#define PARAM_BUFFER_COUNT 16 -+ -+ nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT]; -+ nsXPTCMiniVariant* dispatchParams = NULL; -+ nsIInterfaceInfo* iface_info = NULL; -+ const nsXPTMethodInfo* info; -+ PRUint8 paramCount; -+ PRUint8 i; -+ nsresult result = NS_ERROR_FAILURE; -+ -+ NS_ASSERTION(self,"no self"); -+ -+ self->GetInterfaceInfo(&iface_info); -+ NS_ASSERTION(iface_info,"no interface info"); -+ -+ iface_info->GetMethodInfo(PRUint16(methodIndex), &info); -+ NS_ASSERTION(info,"no interface info"); -+ -+ paramCount = info->GetParamCount(); -+ -+ // setup variant array pointer -+ if(paramCount > PARAM_BUFFER_COUNT) -+ dispatchParams = new nsXPTCMiniVariant[paramCount]; -+ else -+ dispatchParams = paramBuffer; -+ NS_ASSERTION(dispatchParams,"no place for params"); -+ -+ PRUint64* ap = args; -+ for(i = 0; i < paramCount; i++, ap++) -+ { -+ const nsXPTParamInfo& param = info->GetParam(i); -+ const nsXPTType& type = param.GetType(); -+ nsXPTCMiniVariant* dp = &dispatchParams[i]; -+ -+ if(param.IsOut() || !type.IsArithmetic()) -+ { -+ dp->val.p = (void*) *ap; -+ continue; -+ } -+ // else -+ switch(type) -+ { -+ case nsXPTType::T_I8 : dp->val.i8 = *((PRInt64*) ap); break; -+ case nsXPTType::T_I16 : dp->val.i16 = *((PRInt64*) ap); break; -+ case nsXPTType::T_I32 : dp->val.i32 = *((PRInt64*) ap); break; -+ case nsXPTType::T_DOUBLE : dp->val.d = *((double*) ap); break; -+ case nsXPTType::T_U64 : dp->val.u64 = *((PRUint64*) ap); break; -+ case nsXPTType::T_I64 : dp->val.i64 = *((PRInt64*) ap); break; -+ case nsXPTType::T_U8 : dp->val.u8 = *((PRUint64*) ap); break; -+ case nsXPTType::T_U16 : dp->val.u16 = *((PRUint64*)ap); break; -+ case nsXPTType::T_U32 : dp->val.u32 = *((PRUint64*)ap); break; -+ case nsXPTType::T_FLOAT : dp->val.f = ((float*) ap)[1]; break; -+ case nsXPTType::T_BOOL : dp->val.b = *((PRInt64*) ap); break; -+ case nsXPTType::T_CHAR : dp->val.c = *((PRUint64*) ap); break; -+ case nsXPTType::T_WCHAR : dp->val.wc = *((PRInt64*) ap); break; -+ default: -+ NS_ASSERTION(0, "bad type"); -+ break; -+ } -+ } -+ -+ result = self->CallMethod((PRUint16)methodIndex, info, dispatchParams); -+ -+ NS_RELEASE(iface_info); -+ -+ if(dispatchParams != paramBuffer) -+ delete [] dispatchParams; -+ -+ return result; -+} -+ -+extern "C" int SharedStub(int, int*); -+ -+#define STUB_ENTRY(n) \ -+nsresult nsXPTCStubBase::Stub##n() \ -+{ \ -+ int dummy; /* defeat tail-call optimization */ \ -+ return SharedStub(n, &dummy); \ -+} -+ -+#define SENTINEL_ENTRY(n) \ -+nsresult nsXPTCStubBase::Sentinel##n() \ -+{ \ -+ NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \ -+ return NS_ERROR_NOT_IMPLEMENTED; \ -+} -+ -+#include "xptcstubsdef.inc" -+ -+#endif /* sparc || __sparc__ */ ---- /dev/null Mon May 26 13:22:00 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc64_freebsd.s Mon May 26 04:06:09 2003 -@@ -0,0 +1,104 @@ -+/* -*- Mode: asm; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- -+ * -+ * The contents of this file are subject to the Mozilla Public -+ * License Version 1.1 (the "License"); you may not use this file -+ * except in compliance with the License. You may obtain a copy of -+ * the License at http://www.mozilla.org/MPL/ -+ * -+ * Software distributed under the License is distributed on an "AS -+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -+ * implied. See the License for the specific language governing -+ * rights and limitations under the License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is Netscape -+ * Communications Corporation. Portions created by Netscape are -+ * Copyright (C) 2001 Netscape Communications Corporation. All -+ * Rights Reserved. -+ * -+ * Contributor(s): -+ * Stuart Parmenter <pavlov@netscape.com> -+ * Chris Seawood <cls@seawood.org> -+ */ -+ -+/* -+ Platform specific code to invoke XPCOM methods on native objects -+ for sparcv9 Solaris. -+ -+ See the SPARC Compliance Definition (SCD) Chapter 3 -+ for more information about what is going on here, including -+ the use of BIAS (0x7ff). -+ The SCD is available from http://www.sparc.com/. -+*/ -+ -+ .global XPTC_InvokeByIndex -+ .type XPTC_InvokeByIndex, #function -+ -+/* -+ XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, -+ PRUint32 paramCount, nsXPTCVariant* params); -+ -+*/ -+XPTC_InvokeByIndex: -+ save %sp,-(128 + 64),%sp ! room for the register window and -+ ! struct pointer, rounded up to 0 % 64 -+ sll %i2,4,%l0 ! assume the worst case -+ ! paramCount * 2 * 8 bytes -+ cmp %l0, 0 ! are there any args? If not, -+ be .invoke ! no need to copy args to stack -+ nop -+ -+ sub %sp,%l0,%sp ! create the additional stack space -+ add %sp,0x7ff+136,%o0 ! step past the register window, the -+ ! struct result pointer and the 'this' slot -+ mov %i2,%o1 ! paramCount -+ call invoke_copy_to_stack -+ mov %i3,%o2 ! params -+ -+! -+! load arguments from stack into the outgoing registers -+! BIAS is 0x7ff (2047) -+! -+ -+! load the %o1..5 64bit (extended word) output registers registers -+ ldx [%sp + 0x7ff + 136],%o1 ! %i1 -+ ldx [%sp + 0x7ff + 144],%o2 ! %i2 -+ ldx [%sp + 0x7ff + 152],%o3 ! %i3 -+ ldx [%sp + 0x7ff + 160],%o4 ! %i4 -+ ldx [%sp + 0x7ff + 168],%o5 ! %i5 -+ -+! load the even number double registers starting with %d2 -+ ldd [%sp + 0x7ff + 136],%f2 -+ ldd [%sp + 0x7ff + 144],%f4 -+ ldd [%sp + 0x7ff + 152],%f6 -+ ldd [%sp + 0x7ff + 160],%f8 -+ ldd [%sp + 0x7ff + 168],%f10 -+ ldd [%sp + 0x7ff + 176],%f12 -+ ldd [%sp + 0x7ff + 184],%f14 -+ ldd [%sp + 0x7ff + 192],%f16 -+ ldd [%sp + 0x7ff + 200],%f18 -+ ldd [%sp + 0x7ff + 208],%f20 -+ ldd [%sp + 0x7ff + 216],%f22 -+ ldd [%sp + 0x7ff + 224],%f24 -+ ldd [%sp + 0x7ff + 232],%f26 -+ ldd [%sp + 0x7ff + 240],%f28 -+ ldd [%sp + 0x7ff + 248],%f30 -+ -+! -+! calculate the target address from the vtable -+! -+.invoke: -+ sll %i1,3,%l0 ! index *= 8 -+! add %l0,16,%l0 ! there are 2 extra entries in the vTable (16bytes) -+ ldx [%i0],%l1 ! *that --> address of vtable -+ ldx [%l0 + %l1],%l0 ! that->vtable[index * 8 + 16] --> address -+ -+ jmpl %l0,%o7 ! call the routine -+ mov %i0,%o0 ! move 'this' pointer to out register -+ -+ mov %o0,%i0 ! propagate return value -+ ret -+ restore -+ -+ .size XPTC_InvokeByIndex, .-XPTC_InvokeByIndex ---- /dev/null Mon May 26 14:00:00 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc64_freebsd.cpp Mon May 26 14:00:49 2003 -@@ -0,0 +1,91 @@ -+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- -+ * -+ * The contents of this file are subject to the Mozilla Public -+ * License Version 1.1 (the "License"); you may not use this file -+ * except in compliance with the License. You may obtain a copy of -+ * the License at http://www.mozilla.org/MPL/ -+ * -+ * Software distributed under the License is distributed on an "AS -+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -+ * implied. See the License for the specific language governing -+ * rights and limitations under the License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is Netscape -+ * Communications Corporation. Portions created by Netscape are -+ * Copyright (C) 2001 Netscape Communications Corporation. All -+ * Rights Reserved. -+ * -+ * Contributor(s): -+ * Stuart Parmenter <pavlov@netscape.com> -+ * Chris Seawood <cls@seawood.org> -+ */ -+ -+ -+/* Platform specific code to invoke XPCOM methods on native objects */ -+ -+#include "xptcprivate.h" -+ -+#if !defined(__sparc) && !defined(__sparc__) -+#error "This code is for Sparc only" -+#endif -+ -+/* Prototype specifies unmangled function name */ -+extern "C" PRUint64 -+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s); -+ -+extern "C" PRUint64 -+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s) -+{ -+ /* -+ We need to copy the parameters for this function to locals and use them -+ from there since the parameters occupy the same stack space as the stack -+ we're trying to populate. -+ */ -+ PRUint64 *l_d = d; -+ nsXPTCVariant *l_s = s; -+ PRUint64 l_paramCount = paramCount; -+ PRUint64 regCount = 0; // return the number of registers to load from the stack -+ -+ for(PRUint64 i = 0; i < l_paramCount; i++, l_d++, l_s++) -+ { -+ if (regCount < 5) regCount++; -+ -+ if (l_s->IsPtrData()) -+ { -+ *l_d = (PRUint64)l_s->ptr; -+ continue; -+ } -+ switch (l_s->type) -+ { -+ case nsXPTType::T_I8 : *((PRInt64*)l_d) = l_s->val.i8; break; -+ case nsXPTType::T_I16 : *((PRInt64*)l_d) = l_s->val.i16; break; -+ case nsXPTType::T_I32 : *((PRInt64*)l_d) = l_s->val.i32; break; -+ case nsXPTType::T_I64 : *((PRInt64*)l_d) = l_s->val.i64; break; -+ -+ case nsXPTType::T_U8 : *((PRUint64*)l_d) = l_s->val.u8; break; -+ case nsXPTType::T_U16 : *((PRUint64*)l_d) = l_s->val.u16; break; -+ case nsXPTType::T_U32 : *((PRUint64*)l_d) = l_s->val.u32; break; -+ case nsXPTType::T_U64 : *((PRUint64*)l_d) = l_s->val.u64; break; -+ -+ /* in the case of floats, we want to put the bits in to the -+ 64bit space right justified... floats in the paramter array on -+ sparcv9 use odd numbered registers.. %f1, %f3, so we have to skip -+ the space that would be occupied by %f0, %f2, etc. -+ */ -+ case nsXPTType::T_FLOAT : *(((float*)l_d) + 1) = l_s->val.f; break; -+ case nsXPTType::T_DOUBLE: *((double*)l_d) = l_s->val.d; break; -+ case nsXPTType::T_BOOL : *((PRInt64*)l_d) = l_s->val.b; break; -+ case nsXPTType::T_CHAR : *((PRUint64*)l_d) = l_s->val.c; break; -+ case nsXPTType::T_WCHAR : *((PRInt64*)l_d) = l_s->val.wc; break; -+ -+ default: -+ // all the others are plain pointer types -+ *((void**)l_d) = l_s->val.p; -+ break; -+ } -+ } -+ -+ return regCount; -+} diff --git a/mail/thunderbird-esr/files/thunderbird.desktop.in b/mail/thunderbird-esr/files/thunderbird.desktop.in deleted file mode 100644 index 814e074814af..000000000000 --- a/mail/thunderbird-esr/files/thunderbird.desktop.in +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Thunderbird -GenericName=Mail Client -Comment=Mail client and News Reader -Exec=thunderbird %U -Icon=@THUNDERBIRD_ICON@ -StartupNotify=false -Terminal=false -Type=Application -Categories=Application;Network; diff --git a/mail/thunderbird-esr/pkg-deinstall.in b/mail/thunderbird-esr/pkg-deinstall.in deleted file mode 100644 index b9b0ca220fbc..000000000000 --- a/mail/thunderbird-esr/pkg-deinstall.in +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# -# Date created: Mon Nov 29, 2003 -# Whom: Thierry Thomas (<thierry@pompo.net>) -# Fix the chrome registry. - -umask 022 -PATH=/bin:/usr/bin - -[ "x$1" = "x" ] && exit 1 -[ "x$2" != "xDEINSTALL" ] && exit 0 - -MOZDIR=%%MOZDIR%% - -rm -rf ${MOZDIR}/chrome/overlayinfo -rm -f ${MOZDIR}/chrome/*.rdf -rm -f ${MOZDIR}/component.reg -rm -f ${MOZDIR}/components.ini -rm -f ${MOZDIR}/defaults.ini -rm -f ${MOZDIR}/components/*.dat -rm -rf ${MOZDIR}/extensions - -exit 0 diff --git a/mail/thunderbird-esr/pkg-descr b/mail/thunderbird-esr/pkg-descr deleted file mode 100644 index 5a21b98b08cc..000000000000 --- a/mail/thunderbird-esr/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -Mozilla Thunderbird is a redesign of the Mozilla mail component with the goal -of becoming a cross-platform stand alone mail application using the XUL -user interface language. See the Mozilla Thunderbird project page for -more details. - -WWW: http://www.mozilla.org/projects/thunderbird/ diff --git a/mail/thunderbird-esr/pkg-install.in b/mail/thunderbird-esr/pkg-install.in deleted file mode 100644 index 0413486236fe..000000000000 --- a/mail/thunderbird-esr/pkg-install.in +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# -# Date created: Mon Nov 29, 2003 -# Whom: Thierry Thomas (<thierry@pompo.net>) -# Fix the chrome registry. - -umask 022 -PATH=/bin:/usr/bin:/usr/local/bin - -[ "x$1" = "x" ] && exit 1 -[ "x$2" != "xPOST-INSTALL" ] && exit 0 - -MOZDIR=%%MOZDIR%% -REGXPCOM=${MOZDIR}/regxpcom -REGCHROME=${MOZDIR}/regchrome -THUNDERBIRD=${MOZDIR}/thunderbird-bin - -echo "===> Building Chrome's registry..." -rm -rf ${MOZDIR}/chrome/overlayinfo -rm -f ${MOZDIR}/chrome/*.rdf -mkdir -p ${MOZDIR}/chrome/overlayinfo -rm -f ${MOZDIR}/component.reg -rm -rf ${MOZDIR}/extensions - -cd ${MOZDIR} || exit 1 -./run-mozilla.sh ${REGXPCOM} || true -./run-mozilla.sh ${REGCHROME} || true -./run-mozilla.sh ${THUNDERBIRD} -register > /dev/null 2>&1 - -exit 0 diff --git a/mail/thunderbird3/Makefile b/mail/thunderbird3/Makefile deleted file mode 100644 index 6ad4933af5f7..000000000000 --- a/mail/thunderbird3/Makefile +++ /dev/null @@ -1,219 +0,0 @@ -# New ports collection makefile for: mozilla-thunderbird -# Date created: 4 September 2003 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# -# $FreeBSD$ -# - -PORTNAME= thunderbird -PORTVERSION= 1.0.6 -CATEGORIES= mail -MASTER_SITES= ${MASTER_SITE_MOZILLA} -MASTER_SITE_SUBDIR= thunderbird/releases/${PORTVERSION}/source -DISTNAME= ${PORTNAME}-${PORTVERSION}-source - -MAINTAINER= gnome@FreeBSD.org -COMMENT= Mozilla Thunderbird is standalone mail and news that stands above - -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ - png.5:${PORTSDIR}/graphics/png -BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip - -USE_X_PREFIX= yes - -USE_BZIP2= yes -USE_GMAKE= yes -USE_ICONV= yes -USE_PERL5= yes -USE_REINPLACE= yes -HAS_CONFIGURE= yes -NO_MTREE= yes -PLIST= ${WRKDIR}/plist -ALL_TARGET= default -USE_GNOME= gtk20 libidl -CONFIGURE_ENV= LOCALBASE=${LOCALBASE} -PKGINSTALL= ${WRKDIR}/pkg-install -PKGDEINSTALL= ${WRKDIR}/pkg-deinstall -FAKEDIR= ${WRKDIR}/fake - -NO_MTREE= yes -WRKSRC= ${WRKDIR}/mozilla -LOCAL_SUBDIR= lib/${PORTNAME} -LOCAL_PREFIX= ${PREFIX}/${LOCAL_SUBDIR} -ESD_LIB= libesd.so.2 - -THUNDERBIRD= ${PORTNAME} -THUNDERBIRD_ICON= ${LOCAL_PREFIX}/lib/${PORTNAME}-${PORTVERSION}/chrome/icons/default/default.xpm -MOZ_PIS_SCRIPTS= S50cleanhome -SCRIPTS_DIR= ${FAKEDIR}/${LOCAL_SUBDIR}/lib/${PORTNAME}-${PORTVERSION} -MOZ_PIS_DIR= ${SCRIPTS_DIR}/init.d - -OPTIONS= DEBUG "Build a debugging image" off \ - LOGGING "Enable additional log messages" off \ - OPTIMIZED_CFLAGS "Enable some additional optimizations" off \ - XFT "Enable support for anti-aliased fonts" on - -.include <bsd.port.pre.mk> - -.if ${ARCH} == "alpha" && ${OSVERSION} < 500035 -IGNORE= "core dumps at runtime" -.endif # ${ARCH} == "alpha" && ${OSVERSION} < 500035 - -.if ${PERL_LEVEL} < 500600 -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-config_make-jars.pl -.endif # ${PERL_LEVEL} < 500600 - -.if defined(WITH_DEBUG) -WITH_LOGGING= yes -CONFIGURE_ENV+= WITH_DEBUG=yes -.endif # defined(WITH_DEBUG) - -.if defined(WITH_OPTIMIZED_CFLAGS) -CFLAGS:= -O2 -fno-strict-aliasing ${CFLAGS:N-O*} -.else -CFLAGS:= -O ${CFLAGS:N-O*:N-m*} -CONFIGURE_ENV+= WITH_OPTIMIZE=-O -.endif # defined(WITH_OPTIMIZED_CFLAGS) - -.if defined(WITH_LOGGING) -CONFIGURE_ENV+= WITH_LOGGING=yes -.endif # defined(WITH_LOGGING) - -.if defined(WITHOUT_XFT) -CONFIGURE_ENV+= WITHOUT_XFT=yes -.else -LIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/libXft -.endif # !defined(WITHOUT_XFT) - -CPPFLAGS+= -I${X11BASE}/include -CFLAGS+= ${PTHREAD_CFLAGS} -LDFLAGS+= -L${X11BASE}/lib -LIBS+= ${PTHREAD_LIBS} - -pre-extract:: - @${ECHO_MSG} - @${ECHO_MSG} "Extracting source (this takes a while) ..." - @${ECHO_MSG} - -post-extract:: -# FAKEDIR is here so that nsinstall will install under FAKEDIR, not -# under PREFIX. See pre-install and do-install for details. - @${SED} -e 's|@CPPFLAGS@|${CPPFLAGS}|' \ - -e 's|@CFLAGS@|${CFLAGS}|' \ - -e 's|@LDFLAGS@|${LDFLAGS}|' \ - -e 's|@LIBS@|${LIBS}|' \ - -e 's|@X11BASE@|${X11BASE}|' \ - -e 's|@LOCALBASE@|${LOCALBASE}|' \ - -e 's|@PREFIX@|${FAKEDIR}/lib/thunderbird|' \ - -e 's|@PERL@|${PERL5}|' \ - <${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig - -post-patch: - @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ - ${WRKSRC}/build/unix/run-mozilla.sh - @${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \ - s|-lpthread|${PTHREAD_LIBS}|g' \ - ${WRKSRC}/configure \ - ${WRKSRC}/nsprpub/configure - @${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \ - ${WRKSRC}/nsprpub/configure \ - ${WRKSRC}/security/coreconf/FreeBSD.mk \ - ${WRKSRC}/directory/c-sdk/config/FreeBSD.mk \ - ${WRKSRC}/js/src/Makefile.in - @${REINPLACE_CMD} -E -e 's|libesd\.so\.[0-9]+|${ESD_LIB}|g' \ - ${WRKSRC}/widget/src/gtk2/nsSound.cpp - @${REINPLACE_CMD} -E -e 's|libcups\.so\.[0-9]+|libcups.no|g' \ - ${WRKSRC}/gfx/src/gtk/nsDeviceContextSpecG.cpp - @${REINPLACE_CMD} -e '/accessibility.typeaheadfind.enablesound/s/true/false/ ; \ - /dom.disable_window_open_feature.toolbar/s/false/true/' \ - ${WRKSRC}/modules/libpref/src/init/all.js \ - ${WRKSRC}/extensions/sroaming/resources/content/prefs/all.js \ - ${WRKSRC}/modules/libpref/src/init/all.js - @${REINPLACE_CMD} -e 's|<iconv.h>|\"${LOCALBASE}/include/iconv.h\"|g' \ - ${WRKSRC}/configure \ - ${WRKSRC}/intl/uconv/native/nsNativeUConvService.cpp \ - ${WRKSRC}/xpcom/io/nsNativeCharsetUtils.cpp - @${SED} -e 's|%%MOZDIR%%|${LOCAL_PREFIX}/lib/${PORTNAME}-${PORTVERSION}|g ; \ - s|%%X11BASE%%|${X11BASE}|g' \ - < ${MASTERDIR}/pkg-install.in > ${PKGINSTALL} - @${SED} -e 's|%%MOZDIR%%|${LOCAL_PREFIX}/lib/${PORTNAME}-${PORTVERSION}|g' \ - < ${MASTERDIR}/pkg-deinstall.in > ${PKGDEINSTALL} - @${SED} -e 's|@THUNDERBIRD_ICON@|${THUNDERBIRD_ICON}|' \ - < ${FILESDIR}/thunderbird.desktop.in > ${WRKDIR}/thunderbird.desktop -.for ii in ${MOZ_PIS_SCRIPTS} - @${SED} -e 's|%%MOZILLA%%|${THUNDERBIRD}|g ; \ - s|%%PREFIX%%|${PREFIX}|g ; \ - s|%%X11BASE%%|${X11BASE}|g' \ - < ${FILESDIR}/moz_pis_${ii} > ${WRKDIR}/moz_pis_${ii} -.endfor - -pre-configure: - @if [ -n "`${PKG_INFO} -xI '^bind[0-9]*-base-[0-9]'`" ]; then \ - ${ECHO_CMD} "${PKGNAME}: bind installed with PORT_REPLACES_BASE_BIND causes build problems."; \ - ${FALSE}; \ - fi - -post-build: -# XXX This works around an install problem that is triggered when -# toolkit/profile/src is built after profile/src. - @${TOUCH} -f ${WRKSRC}/profile/build/libprofile.so - -pre-install: -# Overview: the program installs itself in FAKEDIR, then a list is made of the -# files and directories in there. This is the PLIST (packing list) for the -# package, replacing the traditional pkg-plist file. - @${RM} -rf ${FAKEDIR} ${PLIST} - @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \ - Makefile ${MAKE_ARGS} install - @${MKDIR} ${SCRIPTS_DIR} - @${MKDIR} ${MOZ_PIS_DIR} -.for ii in mac win -.for jj in / .jar - @${RM} -rf ${FAKEDIR}/lib/${PORTNAME}/lib/${PORTNAME}-${PORTVERSION}/chrome/en-${ii}${jj} -.endfor -.endfor - @${RM} -fr ${FAKEDIR}/share/idl ${FAKEDIR}/include -.for ii in thunderbird thunderbird-config - @${ECHO_CMD} bin/${ii} >> ${PLIST} -.endfor -.for ii in ${MOZ_PIS_SCRIPTS} - ${INSTALL_SCRIPT} ${WRKDIR}/moz_pis_${ii} ${MOZ_PIS_DIR}/${ii} -.endfor - @${MKDIR} ${FAKEDIR}/${LOCAL_SUBDIR}/lib/${PORTNAME}-${PORTVERSION}/defaults - @${CP} -RL ${WRKSRC}/dist/bin/defaults/isp \ - ${FAKEDIR}/${LOCAL_SUBDIR}/lib/${PORTNAME}-${PORTVERSION}/defaults - @cd ${FAKEDIR} && ${FIND} * ! -type d | ${SORT} >> ${PLIST}; \ - ${FIND} * -type d -empty | ${SORT} | ${SED} -e \ - "s:^:@exec ${MKDIR} %D/:" -e "s:$$: || true:" >> ${PLIST}; \ - ${FIND} * -type d -empty | ${SORT} -r | ${SED} -e \ - "s:^:@unexec ${RMDIR} %D/:" -e "s:$$: || true:" >> ${PLIST}; \ - ${FIND} * -type d ! -empty | ${SORT} -r | ${SED} -e "s:^:@dirrm :" | \ - ${GREP} / >> ${PLIST} - ${ECHO_CMD} 'share/applications/thunderbird.desktop' >> ${PLIST} - ${ECHO_CMD} '@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}' >> ${PLIST} - -do-install: -# This is the actual installation. First, the contents of FAKEDIR are -# just copied to PREFIX. - cd ${FAKEDIR} && ${FIND} * | ${CPIO} -dmp --quiet ${PREFIX} - -post-install: - @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL - ${MKDIR} ${PREFIX}/bin - ${RM} -f ${PREFIX}/bin/thunderbird - ${LN} -s ${LOCAL_PREFIX}/bin/thunderbird \ - ${PREFIX}/bin/thunderbird - ${RM} -f ${PREFIX}/bin/thunderbird-config - ${LN} -s ${LOCAL_PREFIX}/bin/thunderbird-config \ - ${PREFIX}/bin/thunderbird-config - ${PERL} -pi -e 's|${FAKEDIR}|${PREFIX}|g' \ - ${LOCAL_PREFIX}/bin/thunderbird \ - ${LOCAL_PREFIX}/bin/thunderbird-config - ${FIND} ${LOCAL_PREFIX}/lib/pkgconfig -type f | ${XARGS} \ - ${PERL} -pi -e 's|${FAKEDIR}|${PREFIX}|g' - ${MKDIR} ${PREFIX}/share/applications - ${INSTALL_DATA} ${WRKDIR}/thunderbird.desktop ${PREFIX}/share/applications - ${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/thunderbird/default.xpm \ - ${LOCAL_PREFIX}/lib/${PORTNAME}-${PORTVERSION}/chrome/icons/default/default.xpm - -.include <bsd.port.post.mk> diff --git a/mail/thunderbird3/distinfo b/mail/thunderbird3/distinfo deleted file mode 100644 index bac899b6bf63..000000000000 --- a/mail/thunderbird3/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -MD5 (thunderbird-1.0.6-source.tar.bz2) = a0ddcc8bd5ee2c9be724b6963ad27111 -SIZE (thunderbird-1.0.6-source.tar.bz2) = 33366077 diff --git a/mail/thunderbird3/files/extra-patch-config_make-jars.pl b/mail/thunderbird3/files/extra-patch-config_make-jars.pl deleted file mode 100644 index a558607ca459..000000000000 --- a/mail/thunderbird3/files/extra-patch-config_make-jars.pl +++ /dev/null @@ -1,10 +0,0 @@ ---- config/make-jars.pl.orig Wed Oct 13 16:17:11 2004 -+++ config/make-jars.pl Wed Oct 13 16:17:07 2004 -@@ -40,6 +40,7 @@ - last if ($arg eq "--"); - } - my $defines = join(' ', @ARGV[ $ddindex .. $#ARGV ]); -+splice @ARGV, $ddindex, $#ARGV; - - getopts("d:s:t:f:avlD:o:p:xz:"); - diff --git a/mail/thunderbird3/files/moz_pis_S50cleanhome b/mail/thunderbird3/files/moz_pis_S50cleanhome deleted file mode 100644 index 348592392043..000000000000 --- a/mail/thunderbird3/files/moz_pis_S50cleanhome +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh -# - -# S50cleanhome -# a script to polite ${HOME}/${MOZ_PIS_USER_DIR} - -# We run in our own subshell - -# First, verify protocol -[ "$1" != "start" ] && exit 1 -[ -z "${MOZ_PIS_API}" -o ${MOZ_PIS_API} -ne 2 ] && exit 1 -[ -z "${MOZ_PIS_MOZBINDIR}" -o ! -d "${MOZ_PIS_MOZBINDIR}" ] && exit 1 -[ -z "${HOME}" -o ! -d "${HOME}" ] && exit 1 -[ -z "${MOZ_PIS_USER_DIR}" -o ! -d "${HOME}/${MOZ_PIS_USER_DIR}" ] && exit 1 - -# Try to polite ${HOME}/${MOZ_PIS_USER_DIR} - -# This must be really needed? -# rm -f "${$HOME}/${MOZ_PIS_USER_DIR}/pluginreg.dat" - -# Try to polite profile dirs -if [ -f "${HOME}/${MOZ_PIS_USER_DIR}/profiles.ini" ]; then - sed -e '/Path=/! d' -e "s,Path=,${HOME}/${MOZ_PIS_USER_DIR}/," \ - "${HOME}/${MOZ_PIS_USER_DIR}/profiles.ini" \ - | while read dir - do - [ ! -d "${dir}" ] && continue - # at last, debian do this, we do for new builds - # rm -f "${dir}/XUL.mfasl" - # make reclaculate compreg.dat, xpti.dat for new builds - [ "${dir}/compreg.dat" -ot "${MOZ_PIS_MOZBINDIR}/components.ini" ] && - rm -f "${dir}/compatibility.ini" "${dir}/XUL.mfasl" - done -fi diff --git a/mail/thunderbird3/files/mozconfig.in b/mail/thunderbird3/files/mozconfig.in deleted file mode 100644 index 2160060a1296..000000000000 --- a/mail/thunderbird3/files/mozconfig.in +++ /dev/null @@ -1,74 +0,0 @@ -# .mozconfig.in -*-shell-script-*- -# $FreeBSD$ -###################################################################### -# standard opts from README -export MOZ_THUNDERBIRD=1 -mk_add_options MOZ_MOZ_THUNDERBIRD=1 -ac_add_options --enable-crypto -ac_add_options --disable-mathml -ac_add_options --disable-activex -ac_add_options --disable-activex-scripting -ac_add_options --disable-oji -ac_add_options --disable-necko-disk-cache -ac_add_options --disable-tests -ac_add_options --disable-profilesharing -ac_add_options --enable-single-profile -ac_add_options --disable-freetype2 -ac_add_options --enable-extensions=wallet,spellcheck,xmlextras,webservices -ac_add_options --enable-necko-protocols=http,file,jar,viewsource,res,data -ac_add_options --enable-image-decoders=default,-xbm -ac_add_options --enable-default-toolkit=gtk2 -# See the following URL for approval email for using official branding -# http://people.freebsd.org/~ahze/firefox_thunderbird-approved.txt -ac_add_options --enable-official-branding -###################################################################### -# FBSD specific -export CPPFLAGS="@CPPFLAGS@" -export CFLAGS="@CFLAGS@" -export LIBS="@LIBS@" -export LDFLAGS="@LDFLAGS@" -export CONFIG_SH=/bin/sh -export XP_UNIX=1 -mk_add_options XP_UNIX=1 -export PERL="@PERL@" -mk_add_options PERL=$PERL -# Configure options for installation -ac_add_options --prefix=@PREFIX@ -###################################################################### -# Use ports for these libraries -ac_add_options --with-system-jpeg=@LOCALBASE@ -ac_add_options --with-system-zlib -ac_add_options --with-system-png=@LOCALBASE@ -###################################################################### -# set compile/link features -ac_add_options --with-pthreads -###################################################################### -# conditional from port Makefile -#if test -n "$WITH_REORDER"; then -# ac_add_options --enable-reorder -#else -# ac_add_options --disable-reorder -#fi # test -n "$WITH_REORDER" -if test -n "$WITH_DEBUG"; then - ac_add_options --enable-debug - ac_add_options --disable-strip -else - ac_add_options --disable-debug - ac_add_options --enable-optimize=${WITH_OPTIMIZE} - ac_add_options --enable-strip - export BUILD_OFFICIAL=1 - export MOZILLA_OFFICIAL=1 - mk_add_options BUILD_OFFICIAL=1 - mk_add_options MOZILLA_OFFICIAL=1 -fi # test -n "$WITH_DEBUG" -if test -n "$WITH_LOGGING"; then - ac_add_options --enable-logging -else - ac_add_options --disable-logging -fi # test -n "$WITH_LOGGING" -if test -z "$WITHOUT_XFT"; then - ac_add_options --enable-xft -else - ac_add_options --disable-xft -fi # test -z "$WITHOUT_XFT" -###################################################################### diff --git a/mail/thunderbird3/files/patch-Double.cpp b/mail/thunderbird3/files/patch-Double.cpp deleted file mode 100644 index 5cd13e4ff4fe..000000000000 --- a/mail/thunderbird3/files/patch-Double.cpp +++ /dev/null @@ -1,59 +0,0 @@ ---- extensions/transformiix/source/base/Double.cpp.orig Thu Jan 30 09:26:46 2003 -+++ extensions/transformiix/source/base/Double.cpp Sun Nov 16 01:46:42 2003 -@@ -51,10 +51,10 @@ - //A trick to handle IEEE floating point exceptions on FreeBSD - E.D. - #ifdef __FreeBSD__ - #include <ieeefp.h> --#ifdef __alpha__ --fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP; --#else -+#if defined(__i386__) - fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML; -+#else -+fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP; - #endif - fp_except_t oldmask = fpsetmask(~allmask); - #endif -@@ -75,22 +75,31 @@ - #define TX_DOUBLE_HI32_EXPMASK 0x7ff00000 - #define TX_DOUBLE_HI32_MANTMASK 0x000fffff - -+union ui32dun { -+ PRUint32 i[2]; -+ double d; -+}; -+ - //-- Initialize Double related constants - #ifdef IS_BIG_ENDIAN --const PRUint32 nanMask[2] = {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK, -- 0xffffffff}; --const PRUint32 infMask[2] = {TX_DOUBLE_HI32_EXPMASK, 0}; --const PRUint32 negInfMask[2] = {TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT, 0}; -+const union ui32dun nanMask = -+ {{TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK, 0xffffffff}}; -+const union ui32dun infMask = -+ {{TX_DOUBLE_HI32_EXPMASK, 0}}; -+const union ui32dun negInfMask = -+ {{TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT, 0}}; - #else --const PRUint32 nanMask[2] = {0xffffffff, -- TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK}; --const PRUint32 infMask[2] = {0, TX_DOUBLE_HI32_EXPMASK}; --const PRUint32 negInfMask[2] = {0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT}; -+const union ui32dun nanMask = -+ {{0xffffffff, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_MANTMASK}}; -+const union ui32dun infMask = -+ {{0, TX_DOUBLE_HI32_EXPMASK}}; -+const union ui32dun negInfMask = -+ {{0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT}}; - #endif - --const double Double::NaN = *((double*)nanMask); --const double Double::POSITIVE_INFINITY = *((double*)infMask); --const double Double::NEGATIVE_INFINITY = *((double*)negInfMask); -+const double Double::NaN = nanMask.d; -+const double Double::POSITIVE_INFINITY = infMask.d; -+const double Double::NEGATIVE_INFINITY = negInfMask.d; - - /* - * Determines whether the given double represents positive or negative diff --git a/mail/thunderbird3/files/patch-bugzilla149334 b/mail/thunderbird3/files/patch-bugzilla149334 deleted file mode 100644 index fe1be5bc8fc0..000000000000 --- a/mail/thunderbird3/files/patch-bugzilla149334 +++ /dev/null @@ -1,342 +0,0 @@ -Index: gfx/idl/nsIFreeType2.idl -=================================================================== -RCS file: /cvsroot/mozilla/gfx/idl/nsIFreeType2.idl,v -retrieving revision 1.10 -diff -u -3 -p -r1.10 nsIFreeType2.idl ---- gfx/idl/nsIFreeType2.idl 15 Apr 2004 23:30:02 -0000 1.10 -+++ gfx/idl/nsIFreeType2.idl 26 May 2004 10:00:54 -0000 -@@ -76,10 +76,11 @@ native FT_Pointer(FT_Pointer); - native FT_Sfnt_Tag(FT_Sfnt_Tag); - native FT_Size(FT_Size); - --[ptr] native FTC_Image_Desc_p(FTC_Image_Desc); -+[ptr] native FTC_ImageType_p(FTC_ImageType); - native FTC_Face_Requester(FTC_Face_Requester); - native FTC_Font(FTC_Font); --native FTC_Image_Cache(FTC_Image_Cache); -+native FTC_FaceID(FTC_FaceID); -+native FTC_ImageCache(FTC_ImageCache); - native FTC_Manager(FTC_Manager); - - // #ifdef MOZ_SVG -@@ -99,7 +100,7 @@ interface nsIFreeType2 : nsISupports - - readonly attribute FT_Library library; - readonly attribute FTC_Manager FTCacheManager; -- readonly attribute FTC_Image_Cache ImageCache; -+ readonly attribute FTC_ImageCache ImageCache; - - void doneFace(in FT_Face face); - void doneFreeType(in FT_Library lib); -@@ -115,16 +116,16 @@ interface nsIFreeType2 : nsISupports - void outlineDecompose(in FT_Outline_p outline, - in const_FT_Outline_Funcs_p funcs, in voidPtr p); - void setCharmap(in FT_Face face, in FT_CharMap charmap); -- void imageCacheLookup(in FTC_Image_Cache cache, in FTC_Image_Desc_p desc, -+ void imageCacheLookup(in FTC_ImageCache cache, in FTC_ImageType_p desc, - in FT_UInt gindex, out FT_Glyph glyph); -- void managerLookupSize(in FTC_Manager manager, in FTC_Font font, -- out FT_Face face, out FT_Size size); -+ void managerLookupFace(in FTC_Manager manager, in FTC_FaceID face_id, -+ out FT_Face face); - void managerDone(in FTC_Manager manager); - void managerNew(in FT_Library lib, in FT_UInt max_faces, - in FT_UInt max_sizes, in FT_ULong max_bytes, - in FTC_Face_Requester requester, in FT_Pointer req_data, - out FTC_Manager manager); -- void imageCacheNew(in FTC_Manager manager, out FTC_Image_Cache cache); -+ void imageCacheNew(in FTC_Manager manager, out FTC_ImageCache cache); - /* #ifdef MOZ_SVG */ - void glyphTransform(in FT_Glyph glyph, in FT_Matrix_p matrix, - in FT_Vector_p delta); -Index: gfx/src/freetype/nsFreeType.cpp -=================================================================== -RCS file: /cvsroot/mozilla/gfx/src/freetype/nsFreeType.cpp,v -retrieving revision 1.25 -diff -u -3 -p -r1.25 nsFreeType.cpp ---- gfx/src/freetype/nsFreeType.cpp 17 Apr 2004 21:52:29 -0000 1.25 -+++ gfx/src/freetype/nsFreeType.cpp 26 May 2004 10:00:54 -0000 -@@ -110,11 +110,11 @@ FtFuncList nsFreeType2::FtFuncs [] = { - {"FT_New_Face", NS_FT2_OFFSET(nsFT_New_Face), PR_TRUE}, - {"FT_Outline_Decompose", NS_FT2_OFFSET(nsFT_Outline_Decompose), PR_TRUE}, - {"FT_Set_Charmap", NS_FT2_OFFSET(nsFT_Set_Charmap), PR_TRUE}, -- {"FTC_Image_Cache_Lookup", NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup), PR_TRUE}, -- {"FTC_Manager_Lookup_Size", NS_FT2_OFFSET(nsFTC_Manager_Lookup_Size), PR_TRUE}, -+ {"FTC_ImageCache_Lookup", NS_FT2_OFFSET(nsFTC_Image_Cache_Lookup), PR_TRUE}, -+ {"FTC_Manager_LookupFace", NS_FT2_OFFSET(nsFTC_Manager_LookupFace), PR_TRUE}, - {"FTC_Manager_Done", NS_FT2_OFFSET(nsFTC_Manager_Done), PR_TRUE}, - {"FTC_Manager_New", NS_FT2_OFFSET(nsFTC_Manager_New), PR_TRUE}, -- {"FTC_Image_Cache_New", NS_FT2_OFFSET(nsFTC_Image_Cache_New), PR_TRUE}, -+ {"FTC_ImageCache_New", NS_FT2_OFFSET(nsFTC_Image_Cache_New), PR_TRUE}, - // #ifdef MOZ_SVG - {"FT_Glyph_Transform", NS_FT2_OFFSET(nsFT_Glyph_Transform), PR_TRUE}, - {"FT_Get_Kerning", NS_FT2_OFFSET(nsFT_Get_Kerning), PR_TRUE}, -@@ -282,7 +282,7 @@ nsFreeType2::SetCharmap(FT_Face face, FT - } - - NS_IMETHODIMP --nsFreeType2::ImageCacheLookup(FTC_Image_Cache cache, FTC_Image_Desc *desc, -+nsFreeType2::ImageCacheLookup(FTC_ImageCache cache, FTC_ImageType *desc, - FT_UInt glyphID, FT_Glyph *glyph) - { - // call the FreeType2 function via the function pointer -@@ -291,11 +291,11 @@ nsFreeType2::ImageCacheLookup(FTC_Image_ - } - - NS_IMETHODIMP --nsFreeType2::ManagerLookupSize(FTC_Manager manager, FTC_Font font, -- FT_Face *face, FT_Size *size) -+nsFreeType2::ManagerLookupFace(FTC_Manager manager, FTC_FaceID face_id, -+ FT_Face *face) - { - // call the FreeType2 function via the function pointer -- FT_Error error = nsFTC_Manager_Lookup_Size(manager, font, face, size); -+ FT_Error error = nsFTC_Manager_LookupFace(manager, face_id, face); - return error ? NS_ERROR_FAILURE : NS_OK; - } - -@@ -320,7 +320,7 @@ nsFreeType2::ManagerNew(FT_Library libra - } - - NS_IMETHODIMP --nsFreeType2::ImageCacheNew(FTC_Manager manager, FTC_Image_Cache *cache) -+nsFreeType2::ImageCacheNew(FTC_Manager manager, FTC_ImageCache *cache) - { - // call the FreeType2 function via the function pointer - FT_Error error = nsFTC_Image_Cache_New(manager, cache); -@@ -389,7 +389,7 @@ nsFreeType2::SupportsExtFunc(PRBool *res - } - - NS_IMETHODIMP --nsFreeType2::GetImageCache(FTC_Image_Cache *aCache) -+nsFreeType2::GetImageCache(FTC_ImageCache *aCache) - { - *aCache = mImageCache; - return NS_OK; -Index: gfx/src/freetype/nsFreeType.h -=================================================================== -RCS file: /cvsroot/mozilla/gfx/src/freetype/nsFreeType.h,v -retrieving revision 1.17 -diff -u -3 -p -r1.17 nsFreeType.h ---- gfx/src/freetype/nsFreeType.h 17 Apr 2004 21:52:29 -0000 1.17 -+++ gfx/src/freetype/nsFreeType.h 26 May 2004 10:00:54 -0000 -@@ -120,13 +120,13 @@ typedef FT_Error (*FT_Outline_Decompose_ - typedef FT_Error (*FT_New_Face_t)(FT_Library, const char*, FT_Long, FT_Face*); - typedef FT_Error (*FT_Set_Charmap_t)(FT_Face face, FT_CharMap charmap); - typedef FT_Error (*FTC_Image_Cache_Lookup_t) -- (FTC_Image_Cache, FTC_Image_Desc*, FT_UInt, FT_Glyph*); --typedef FT_Error (*FTC_Manager_Lookup_Size_t) -- (FTC_Manager, FTC_Font, FT_Face*, FT_Size*); -+ (FTC_ImageCache, FTC_ImageType*, FT_UInt, FT_Glyph*); -+typedef FT_Error (*FTC_Manager_LookupFace_t) -+ (FTC_Manager, FTC_FaceID, FT_Face*); - typedef FT_Error (*FTC_Manager_Done_t)(FTC_Manager); - typedef FT_Error (*FTC_Manager_New_t)(FT_Library, FT_UInt, FT_UInt, FT_ULong, - FTC_Face_Requester, FT_Pointer, FTC_Manager*); --typedef FT_Error (*FTC_Image_Cache_New_t)(FTC_Manager, FTC_Image_Cache*); -+typedef FT_Error (*FTC_Image_Cache_New_t)(FTC_Manager, FTC_ImageCache*); - // #ifdef MOZ_SVG - typedef FT_Error (*FT_Glyph_Transform_t)(FT_Glyph, FT_Matrix*, FT_Vector*); - typedef FT_Error (*FT_Get_Kerning_t) -@@ -181,7 +181,7 @@ protected: - FT_Outline_Decompose_t nsFT_Outline_Decompose; - FT_Set_Charmap_t nsFT_Set_Charmap; - FTC_Image_Cache_Lookup_t nsFTC_Image_Cache_Lookup; -- FTC_Manager_Lookup_Size_t nsFTC_Manager_Lookup_Size; -+ FTC_Manager_LookupFace_t nsFTC_Manager_LookupFace; - FTC_Manager_Done_t nsFTC_Manager_Done; - FTC_Manager_New_t nsFTC_Manager_New; - FTC_Image_Cache_New_t nsFTC_Image_Cache_New; -@@ -229,7 +229,7 @@ protected: - PRLibrary *mSharedLib; - FT_Library mFreeTypeLibrary; - FTC_Manager mFTCacheManager; -- FTC_Image_Cache mImageCache; -+ FTC_ImageCache mImageCache; - - static nsHashtable *sFontFamilies; - static nsHashtable *sRange1CharSetNames; -Index: gfx/src/ps/nsFontMetricsPS.cpp -=================================================================== -RCS file: /cvsroot/mozilla/gfx/src/ps/nsFontMetricsPS.cpp,v -retrieving revision 1.43 -diff -u -3 -p -r1.43 nsFontMetricsPS.cpp ---- gfx/src/ps/nsFontMetricsPS.cpp 17 Apr 2004 21:52:31 -0000 1.43 -+++ gfx/src/ps/nsFontMetricsPS.cpp 26 May 2004 10:01:03 -0000 -@@ -1140,10 +1140,10 @@ nsFontPSFreeType::Init(nsITrueTypeFontCa - - mPixelSize = NSToIntRound(app2dev * mFont->size); - -- mImageDesc.font.face_id = (void*)mEntry; -- mImageDesc.font.pix_width = mPixelSize; -- mImageDesc.font.pix_height = mPixelSize; -- mImageDesc.image_type = 0; -+ mImageDesc->face_id = (FTC_FaceID)&mEntry; -+ mImageDesc->width = mPixelSize; -+ mImageDesc->height = mPixelSize; -+ mImageDesc->flags = 0; - - nsresult rv; - mFt2 = do_GetService(NS_FREETYPE2_CONTRACTID, &rv); -@@ -1189,7 +1189,7 @@ nsFontPSFreeType::GetWidth(const PRUnich - if (!face) - return 0; - -- FTC_Image_Cache iCache; -+ FTC_ImageCache iCache; - nsresult rv = mFt2->GetImageCache(&iCache); - if (NS_FAILED(rv)) { - NS_ERROR("Failed to get Image Cache"); -@@ -1227,8 +1227,8 @@ nsFontPSFreeType::getFTFace() - - FTC_Manager cManager; - mFt2->GetFTCacheManager(&cManager); -- nsresult rv = mFt2->ManagerLookupSize(cManager, &mImageDesc.font, -- &face, nsnull); -+ nsresult rv = mFt2->ManagerLookupFace(cManager, mImageDesc->face_id, -+ &face); - NS_ASSERTION(rv==0, "failed to get face/size"); - if (rv) - return nsnull; -@@ -1621,16 +1621,16 @@ void nsFT2Type8Generator::GeneratePSFont - mEntry->GetFamilyName(fontName); - mEntry->GetStyleName(styleName); - -- mImageDesc.font.face_id = (void*)mEntry; -+ mImageDesc->face_id = (FTC_FaceID)&mEntry; - // TT glyph has no relation to size -- mImageDesc.font.pix_width = 16; -- mImageDesc.font.pix_height = 16; -- mImageDesc.image_type = 0; -+ mImageDesc->width = 16; -+ mImageDesc->height = 16; -+ mImageDesc->flags = 0; - FT_Face face = nsnull; - FTC_Manager cManager; - mFt2->GetFTCacheManager(&cManager); -- nsresult rv = mFt2->ManagerLookupSize(cManager, &mImageDesc.font, -- &face, nsnull); -+ nsresult rv = mFt2->ManagerLookupFace(cManager, mImageDesc->face_id, -+ &face); - if (NS_FAILED(rv)) - return; - -Index: gfx/src/ps/nsFontMetricsPS.h -=================================================================== -RCS file: /cvsroot/mozilla/gfx/src/ps/nsFontMetricsPS.h,v -retrieving revision 1.25 -diff -u -3 -p -r1.25 nsFontMetricsPS.h ---- gfx/src/ps/nsFontMetricsPS.h 17 Apr 2004 21:52:31 -0000 1.25 -+++ gfx/src/ps/nsFontMetricsPS.h 26 May 2004 10:01:03 -0000 -@@ -319,7 +319,7 @@ protected: - nsCOMPtr<nsITrueTypeFontCatalogEntry> mFaceID; - nsCOMPtr<nsIFreeType2> mFt2; - PRUint16 mPixelSize; -- FTC_Image_Desc mImageDesc; -+ FTC_ImageType mImageDesc; - - - static PRBool AddUserPref(nsIAtom *aLang, const nsFont& aFont, -@@ -362,7 +362,7 @@ public: - protected: - nsCOMPtr<nsITrueTypeFontCatalogEntry> mEntry; - nsCOMPtr<nsIFreeType2> mFt2; -- FTC_Image_Desc mImageDesc; -+ FTC_ImageType mImageDesc; - }; - #endif - -Index: gfx/src/x11shared/nsFontFreeType.cpp -=================================================================== -RCS file: /cvsroot/mozilla/gfx/src/x11shared/nsFontFreeType.cpp,v -retrieving revision 1.14 -diff -u -3 -p -r1.14 nsFontFreeType.cpp ---- gfx/src/x11shared/nsFontFreeType.cpp 17 Apr 2004 21:52:34 -0000 1.14 -+++ gfx/src/x11shared/nsFontFreeType.cpp 26 May 2004 10:01:03 -0000 -@@ -177,7 +177,7 @@ nsFreeTypeFont::getFTFace() - FTC_Manager mgr; - nsresult rv; - mFt2->GetFTCacheManager(&mgr); -- rv = mFt2->ManagerLookupSize(mgr, &mImageDesc.font, &face, nsnull); -+ rv = mFt2->ManagerLookupFace(mgr, mImageDesc->face_id, &face); - NS_ASSERTION(NS_SUCCEEDED(rv), "failed to get face/size"); - if (NS_FAILED(rv)) - return nsnull; -@@ -191,22 +191,15 @@ nsFreeTypeFont::nsFreeTypeFont(nsITrueTy - PRBool embedded_bimap = PR_FALSE; - mFaceID = aFaceID; - mPixelSize = aPixelSize; -- mImageDesc.font.face_id = (void*)mFaceID; -- mImageDesc.font.pix_width = aPixelSize; -- mImageDesc.font.pix_height = aPixelSize; -- mImageDesc.image_type = 0; -+ mImageDesc->face_id = (FTC_FaceID)&mFaceID; -+ mImageDesc->width = aPixelSize; -+ mImageDesc->height = aPixelSize; -+ mImageDesc->flags = 0; - - if (aPixelSize < nsFreeType2::gAntiAliasMinimum) { -- mImageDesc.image_type |= ftc_image_mono; - anti_alias = PR_FALSE; - } - -- if (nsFreeType2::gFreeType2Autohinted) -- mImageDesc.image_type |= ftc_image_flag_autohinted; -- -- if (nsFreeType2::gFreeType2Unhinted) -- mImageDesc.image_type |= ftc_image_flag_unhinted; -- - PRUint32 num_embedded_bitmaps, i; - PRInt32* embedded_bitmapheights; - mFaceID->GetEmbeddedBitmapHeights(&num_embedded_bitmaps, -@@ -218,7 +211,6 @@ nsFreeTypeFont::nsFreeTypeFont(nsITrueTy - if (embedded_bitmapheights[i] == aPixelSize) { - embedded_bimap = PR_TRUE; - // unhinted must be set for embedded bitmaps to be used -- mImageDesc.image_type |= ftc_image_flag_unhinted; - break; - } - } -@@ -312,7 +304,7 @@ nsFreeTypeFont::doGetBoundingMetrics(con - if (!face) - return NS_ERROR_FAILURE; - -- FTC_Image_Cache icache; -+ FTC_ImageCache icache; - mFt2->GetImageCache(&icache); - if (!icache) - return NS_ERROR_FAILURE; -@@ -401,7 +393,7 @@ nsFreeTypeFont::GetWidth(const PRUnichar - if (!face) - return 0; - -- FTC_Image_Cache icache; -+ FTC_ImageCache icache; - mFt2->GetImageCache(&icache); - if (!icache) - return 0; -@@ -723,7 +715,7 @@ nsFreeTypeXImage::DrawString(nsRendering - if (y%4==0) (*blendPixelFunc)(sub_image, y, ascent-1, black, 255/2); - #endif - -- FTC_Image_Cache icache; -+ FTC_ImageCache icache; - mFt2->GetImageCache(&icache); - if (!icache) - return 0; -Index: gfx/src/x11shared/nsFontFreeType.h -=================================================================== -RCS file: /cvsroot/mozilla/gfx/src/x11shared/nsFontFreeType.h,v -retrieving revision 1.10 -diff -u -3 -p -r1.10 nsFontFreeType.h ---- gfx/src/x11shared/nsFontFreeType.h 17 Apr 2004 21:52:34 -0000 1.10 -+++ gfx/src/x11shared/nsFontFreeType.h 26 May 2004 10:01:03 -0000 -@@ -110,7 +110,7 @@ protected: - XImage *GetXImage(PRUint32 width, PRUint32 height); - nsITrueTypeFontCatalogEntry *mFaceID; - PRUint16 mPixelSize; -- FTC_Image_Desc mImageDesc; -+ FTC_ImageType mImageDesc; - nsCOMPtr<nsIFreeType2> mFt2; - }; - diff --git a/mail/thunderbird3/files/patch-build_unix_run-mozilla.sh b/mail/thunderbird3/files/patch-build_unix_run-mozilla.sh deleted file mode 100644 index 28bbd1a1154e..000000000000 --- a/mail/thunderbird3/files/patch-build_unix_run-mozilla.sh +++ /dev/null @@ -1,11 +0,0 @@ ---- build/unix/run-mozilla.sh.orig Mon Dec 15 18:27:28 2003 -+++ build/unix/run-mozilla.sh Fri Feb 27 11:54:10 2004 -@@ -355,7 +355,7 @@ - fi - ## - ## Set LD_LIBRARY_PATH --LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"} -+LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:%%PREFIX%%/lib/browser_plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"} - if [ -n "$LD_LIBRARYN32_PATH" ] - then - LD_LIBRARYN32_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARYN32_PATH+":$LD_LIBRARYN32_PATH"} diff --git a/mail/thunderbird3/files/patch-config-mkdepend-imakemdep.h b/mail/thunderbird3/files/patch-config-mkdepend-imakemdep.h deleted file mode 100644 index b688e664475d..000000000000 --- a/mail/thunderbird3/files/patch-config-mkdepend-imakemdep.h +++ /dev/null @@ -1,10 +0,0 @@ ---- config/mkdepend/imakemdep.h Fri Sep 4 21:22:25 1998 -+++ config/mkdepend/imakemdep.h Thu Oct 16 22:43:25 2003 -@@ -278,4 +278,7 @@ - "-D__i386__", - # endif -+# if defined(__amd64__) || defined(__x86_64__) -+ "-D__amd64__ -D__x86_64__", -+# endif - # ifdef __GNUC__ - "-traditional", diff --git a/mail/thunderbird3/files/patch-config-rules.mk b/mail/thunderbird3/files/patch-config-rules.mk deleted file mode 100644 index ecc3c8194dcc..000000000000 --- a/mail/thunderbird3/files/patch-config-rules.mk +++ /dev/null @@ -1,14 +0,0 @@ ---- config/rules.mk.orig Tue Aug 26 13:28:47 2003 -+++ config/rules.mk Sun Feb 1 15:11:41 2004 -@@ -444,7 +444,11 @@ - - ifeq ($(OS_ARCH),FreeBSD) - ifdef IS_COMPONENT -+ifneq (,$(filter alpha ia64,$(OS_TEST))) -+EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -lc -+else - EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -+endif - endif - endif - diff --git a/mail/thunderbird3/files/patch-configure b/mail/thunderbird3/files/patch-configure deleted file mode 100644 index 9e60372adb33..000000000000 --- a/mail/thunderbird3/files/patch-configure +++ /dev/null @@ -1,38 +0,0 @@ ---- configure.orig Fri Feb 13 01:06:29 2004 -+++ configure Fri Feb 13 01:07:17 2004 -@@ -9181,7 +9181,7 @@ - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" --LIBS="-liconv $LIBS" -+LIBS="-L$LOCALBASE/lib -liconv $LIBS" - cat > conftest.$ac_ext <<EOF - #line 9187 "configure" - #include "confdefs.h" -@@ -9212,7 +9212,7 @@ - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- _ICONV_LIBS="$_ICONV_LIBS -liconv" -+ _ICONV_LIBS="$_ICONV_LIBS -L$LOCALBASE/lib -liconv" - else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6 -@@ -9222,7 +9222,7 @@ - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" --LIBS="-liconv $LIBS" -+LIBS="-L$LOCALBASE/lib -liconv $LIBS" - cat > conftest.$ac_ext <<EOF - #line 9228 "configure" - #include "confdefs.h" -@@ -9253,7 +9253,7 @@ - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- _ICONV_LIBS="$_ICONV_LIBS -liconv" -+ _ICONV_LIBS="$_ICONV_LIBS -L$LOCALBASE/lib -liconv" - else - echo "$ac_t""no" 1>&6 - fi diff --git a/mail/thunderbird3/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp b/mail/thunderbird3/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp deleted file mode 100644 index 41c462d74f62..000000000000 --- a/mail/thunderbird3/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.cpp +++ /dev/null @@ -1,46 +0,0 @@ ---- extensions/typeaheadfind/src/nsTypeAheadFind.cpp.orig Wed Nov 19 01:20:47 2003 -+++ extensions/typeaheadfind/src/nsTypeAheadFind.cpp Tue Feb 10 02:52:26 2004 -@@ -323,11 +323,11 @@ - prefBranch->GetBoolPref("accessibility.typeaheadfind.startlinksonly", - &mStartLinksOnlyPref); - -- PRBool isSoundEnabled = PR_TRUE; -+ mIsSoundEnabled = PR_TRUE; - prefBranch->GetBoolPref("accessibility.typeaheadfind.enablesound", -- &isSoundEnabled); -+ &mIsSoundEnabled); - nsXPIDLCString soundStr; -- if (isSoundEnabled) { -+ if (mIsSoundEnabled && mIsSoundEnabled) { - prefBranch->GetCharPref("accessibility.typeaheadfind.soundURL", - getter_Copies(soundStr)); - } -@@ -758,7 +758,7 @@ - } - else { - // No find string to backspace in! -- if (mIsBackspaceProtectOn) { -+ if (mIsBackspaceProtectOn && mIsSoundEnabled) { - // This flag should be on only if the last key was a backspace. - // It keeps us from accidentally hitting backspace too many times and - // going back in history when we really just wanted to clear -@@ -1012,7 +1012,9 @@ - - // Error sound (don't fire when backspace is pressed, they're - // trying to correct the mistake!) -- PlayNotFoundSound(); -+ if (mIsSoundEnabled) { -+ PlayNotFoundSound(); -+ } - - // Remove bad character from buffer, so we can continue typing from - // last matched character -@@ -1059,7 +1061,7 @@ - void - nsTypeAheadFind::PlayNotFoundSound() - { -- if (mNotFoundSoundURL.IsEmpty()) // no sound -+ if (mNotFoundSoundURL.IsEmpty() || !mIsSoundEnabled) // no sound - return; - if (!mSoundInterface) { - mSoundInterface = do_CreateInstance("@mozilla.org/sound;1"); diff --git a/mail/thunderbird3/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h b/mail/thunderbird3/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h deleted file mode 100644 index 07ad43b4334d..000000000000 --- a/mail/thunderbird3/files/patch-extensions_typeaheadfind_src_nsTypeAheadFind.h +++ /dev/null @@ -1,12 +0,0 @@ ---- extensions/typeaheadfind/src/nsTypeAheadFind.h.orig Fri May 23 22:00:33 2003 -+++ extensions/typeaheadfind/src/nsTypeAheadFind.h Mon Feb 9 22:21:43 2004 -@@ -194,6 +194,9 @@ - - nsCString mNotFoundSoundURL; - -+ // Move the sound enabled boolean out for all methods to access. -+ PRBool mIsSoundEnabled; -+ - // PRBool's are used instead of PRPackedBool's where the address of the - // boolean variable is getting passed into a method. For example: - // GetBoolPref("accessibility.typeaheadfind.linksonly", &mLinksOnlyPref); diff --git a/mail/thunderbird3/files/patch-mail_app_mozilla.in b/mail/thunderbird3/files/patch-mail_app_mozilla.in deleted file mode 100644 index 01091fb2ce3b..000000000000 --- a/mail/thunderbird3/files/patch-mail_app_mozilla.in +++ /dev/null @@ -1,472 +0,0 @@ ---- mail/app/mozilla.in.orig Sun Jul 25 01:58:06 2004 -+++ mail/app/mozilla.in Tue Mar 22 23:59:11 2005 -@@ -29,51 +29,82 @@ - ## the mozilla-bin binary to work. - ## - -+# -+# MOZ_PIS, "Mozilla Plugable Init Scripts" -+# MOZ_PIS_ is the name space used -+# These variables and there meaning are specified in -+# mozilla/xpfe/bootstrap/init.d/README - moz_pis_startstop_scripts() - { -- MOZ_USER_DIR="%MOZ_USER_DIR%" -- # MOZ_PIS_ is the name space for "Mozilla Plugable Init Scripts" -- # These variables and there meaning are specified in -- # mozilla/xpfe/bootstrap/init.d/README -- MOZ_PIS_API=2 -- MOZ_PIS_MOZBINDIR="${dist_bin}" -- MOZ_PIS_SESSION_PID="$$" -- MOZ_PIS_USER_DIR="${MOZ_USER_DIR}" -- export MOZ_PIS_API MOZ_PIS_MOZBINDIR MOZ_PIS_SESSION_PID MOZ_PIS_USER_DIR -- -- case "${1}" in -- "start") -- for curr_pis in "${dist_bin}/init.d"/S* "${HOME}/${MOZ_USER_DIR}/init.d"/S* ; do -- if [ -x "${curr_pis}" ] ; then -- case "${curr_pis}" in -- *.sh) . "${curr_pis}" ;; -- *) "${curr_pis}" "start" ;; -- esac -- fi -- done -- ;; -- "stop") -- for curr_pis in "${HOME}/${MOZ_USER_DIR}/init.d"/K* "${dist_bin}/init.d"/K* ; do -- if [ -x "${curr_pis}" ] ; then -- case "${curr_pis}" in -- *.sh) . "${curr_pis}" ;; -- *) "${curr_pis}" "stop" ;; -- esac -- fi -- done -- ;; -- *) -- echo 1>&2 "$0: Internal error in moz_pis_startstop_scripts." -- exit 1 -- ;; -- esac -+ MOZ_PIS_API=2 -+ MOZ_PIS_MOZBINDIR="${dist_bin}" -+ MOZ_PIS_SESSION_PID="$$" -+ MOZ_PIS_USER_DIR="${MOZ_USER_DIR}" -+ export MOZ_PIS_API MOZ_PIS_MOZBINDIR MOZ_PIS_SESSION_PID MOZ_PIS_USER_DIR -+ -+ case "${1}" in -+ "start") -+ for curr_pis in "${MOZ_PIS_MOZBINDIR}/init.d"/S* \ -+ "${HOME}/${MOZ_PIS_USER_DIR}/init.d"/S*; do -+ if [ -x "${curr_pis}" ]; then -+ case "${curr_pis}" in -+ *.sh) -+ . "${curr_pis}" -+ ;; -+ *) -+ ${curr_pis} "start" -+ ;; -+ esac -+ fi -+ done -+ ;; -+ "stop") -+ for curr_pis in "${MOZ_PIS_MOZBINDIR}/init.d"/K* \ -+ "${HOME}/${MOZ_PIS_USER_DIR}/init.d"/K*; do -+ if [ -x "${curr_pis}" ]; then -+ case "${curr_pis}" in -+ *.sh) -+ . "${curr_pis}" -+ ;; -+ *) -+ ${curr_pis} "stop" -+ ;; -+ esac -+ fi -+ done -+ ;; -+ *) -+ echo "$0: Internal error in moz_pis_startstop_scripts." 1>&2 -+ exit 1 -+ ;; -+ esac - } - --#uncomment for debugging -+# uncomment for debugging - #set -x - --moz_libdir=%MOZAPPDIR% --MRE_HOME=%MREDIR% -+# -+# variables -+# -+#location="new-tab" -+#MOZILLA_UILOCALE="en-US" -+#MOZILLA_UIREGION="US" -+ -+# -+# working definitions -+# -+MOZ_USER_DIR="%MOZ_USER_DIR%" -+moz_libdir="%MOZAPPDIR%" -+MRE_HOME="%MREDIR%" -+ -+debugging= # set the debugging level -+here=`pwd` -+ -+if [ ! -d "${MRE_HOME}" ]; then -+ # use moz_libdir as MRE_HOME -+ MRE_HOME="${moz_libdir}" -+fi -+export MRE_HOME - - # Use run-mozilla.sh in the current dir if it exists - # If not, then start resolving symlinks until we find run-mozilla.sh -@@ -82,160 +113,214 @@ - curdir=`dirname "$progname"` - progbase=`basename "$progname"` - run_moz="$curdir/run-mozilla.sh" --if test -x "$run_moz"; then -- dist_bin="$curdir" -- found=1 -+if [ -x "$run_moz" ]; then -+ dist_bin="$curdir" -+ found=1 - else -- here=`/bin/pwd` -- while [ -h "$progname" ]; do -- bn=`basename "$progname"` -- cd `dirname "$progname"` -- progname=`/bin/ls -l "$bn" | sed -e 's/^.* -> //' ` -- if [ ! -x "$progname" ]; then -- break -- fi -- curdir=`dirname "$progname"` -- run_moz="$curdir/run-mozilla.sh" -- if [ -x "$run_moz" ]; then -- cd "$curdir" -- dist_bin=`pwd` -- found=1 -- break -- fi -- done -- cd "$here" -+ while [ -h "${progname}" ]; do -+ bn=`basename "${progname}"` -+ cd `dirname "${progname}"` -+ progname=`ls -l "${bn}" | sed -e 's/^.* -> //'` -+ if [ ! -x "$progname" ]; then -+ break -+ fi -+ curdir=`dirname "${progname}"` -+ run_moz="${curdir}/run-mozilla.sh" -+ if [ -x "${run_moz}" ]; then -+ cd "$curdir" -+ dist_bin=`pwd` -+ run_moz="${dist_bin}/run-mozilla.sh" -+ found=1 -+ break -+ fi -+ done -+ cd "${here}" - fi - if [ $found = 0 ]; then -- # Check default compile-time libdir -- if [ -x "$moz_libdir/run-mozilla.sh" ]; then -- dist_bin="$moz_libdir" -- else -- echo "Cannot find mozilla runtime directory. Exiting." -- exit 1 -- fi --fi -- --script_args="" --moreargs="" --debugging=0 --MOZILLA_BIN="${progbase}-bin" -- --# The following is to check for a currently running instance. --# This is taken almost verbatim from the Mozilla RPM package's launch script. --MOZ_CLIENT_PROGRAM="$dist_bin/mozilla-xremote-client" --check_running() { -- "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" 'ping()' 2>/dev/null >/dev/null -- RETURN_VAL=$? -- if [ $RETURN_VAL -eq 0 ]; then -- echo 1 -- return 1 -+ # Check default compile-time libdir -+ if [ -x "${moz_libdir}/run-mozilla.sh" ]; then -+ dist_bin="$moz_libdir" -+ run_moz="${dist_bin}/run-mozilla.sh" - else -- echo 0 -- return 0 -+ echo "$0: Cannot find mozilla runtime directory. Exiting." 1>&2 -+ exit 1 - fi --} -+fi - -+MOZILLA_BIN="${progbase}-bin" - if [ "$OSTYPE" = "beos" ]; then -- mimeset -F "$MOZILLA_BIN" -+ mimeset -F "$MOZILLA_BIN" - fi - --ALREADY_RUNNING=`check_running` -+# test for binary apps in ${dist_bin} -+if [ -x "${dist_bin}/${MOZILLA_BIN}" ]; then -+ MOZILLA_BIN="${dist_bin}/${progbase}-bin" -+else -+ echo "$0: Cannot find mozilla binary executable. Exiting." 1>&2 -+ exit 1 -+fi -+if [ -x "${dist_bin}/mozilla-xremote-client" ]; then -+ MOZ_CLIENT_PROGRAM="${dist_bin}/mozilla-xremote-client -a ${progbase}" -+else -+ MOZ_CLIENT_PROGRAM="${MOZILLA_BIN} -remote -a ${progbase}" -+fi - --################################################################ Parse Arguments --# If there's a command line argument but it doesn't begin with a - --# it's probably a url. Try to send it to a running instance. --_USE_EXIST=0 --_NEW_WINDOW= --_optOne="$1" --case "${_optOne}" in -- -*) -- ;; -+# guest a default remote command -+_remote_cmd="xfeDoCommand(openInbox)" -+ -+# parse options -+script_args= # null -+moreargs= # null -+target= # null -+ALREADY_RUNNING="test" -+while [ $# -gt 0 ] -+do -+ if [ -n "${target}" ]; then -+ # well, this can't be the target if not last -+ moreargs="${moreargs} \"${target}\"" -+ target= # null -+ fi -+ case "$1" in -+ # preserve [pP] for profile -+ --pure | -pure) -+ MOZILLA_BIN="${MOZILLA_BIN}.pure" -+ shift -+ ;; -+ -g | --debug) -+ script_args="${script_args} -g" -+ debugging=1 -+ shift -+ ;; -+ -d | --debugger) -+ if [ -n "$2" ]; then -+ script_args="${script_args} -d $2" -+ shift 2 -+ else -+ "$0: ERROR, $1 needs an argument. Exiting" 1>&2 -+ exit 1 -+ fi -+ ;; -+ -[Uu][Ii][Ll]ocale) -+ if [ -n "$2" ]; then -+ uilocale="$2" -+ shift 2 -+ else -+ echo "$0: ERROR, $1 needs an argument. Exiting" 1>&2 -+ exit 1 -+ fi -+ ;; -+ -[Uu][Ii][Rr]egion) -+ if [ -n "$2" ]; then -+ uiregion="$2" -+ shift 2 -+ else -+ echo "$0: ERROR, $1 needs an argument. Exiting" 1>&2 -+ exit 1 -+ fi -+ ;; -+ -mail) -+ # mail is default for ithunderbird -+ shift -+ ;; -+ -compose) -+ _remote_cmd="xfeDoCommand(composeMessage)" -+ moreargs="${moreargs} $1" -+ shift -+ ;; -+ -turbo | -nosplash | -quiet) -+ # use remote even with this -+ moreargs="${moreargs} $1" -+ shift -+ ;; -+ -*) -+ # don't use remote with options -+ ALREADY_RUNNING= # null -+ moreargs="${moreargs} $1" -+ shift -+ ;; - *) -- _USE_EXIST=1 -- ;; --esac -- --_optOthers= --_optLast= --for i in "$@"; do -- _optLast="${i}" --done #last arg -- --for i in "$@"; do -- [ $i = ${_optLast} ] && break -- _optOthers="${_optOthers} ${i}" --done #others arg -- --#???: needs check if othersopt begin with -* ? --if [ `expr "${_optLast}" : '.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then -- # Last argument seems to be a local file/directory -- # Check, if it is absolutely specified (ie. /home/foo/file vs. ./file) -- # If it is just "relatively" (./file) specified, make it absolutely -- [ `expr "${_optLast}" : '/.*'` -eq 0 ] && _optLast="file://`pwd`/${_optLast}" --elif [ `expr "${_optLast}" : '.*:/.*'` -gt 0 -o -n "${_optOthers}" ]; then #???? like before... -- _NEW_WINDOW=1 --fi --################################################################ Parse Arguments -- --########################################################################### Main --if [ $ALREADY_RUNNING -eq 1 ]; then -- # There's an instance already running. Use it. -- # Any command line args passed in? -- if [ $# -gt 0 ]; then -- # There were "some" command line args. -- if [ ${_USE_EXIST} -eq 1 ]; then -- # We should use an existing instance, as _USE_EXIST=$_USE_EXIST=-1 -- _open_type="window" -- #_open_type="tab" -- _remote_cmd="openURL(${_optLast} , new-${_open_type})" -- "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" "${_remote_cmd}" -- unset _remote_cmd _open_type -- exit $? -- fi -+ target="$1" -+ shift -+ ;; -+ esac -+done -+ -+# test for a running copy of firefox -+# seems this is not needed -+#if [-n "${ALREADY_RUNNING}" ]; then -+# if [ -n "${DISPLAY}" ]; then -+# if [ -n "${debugging}" ]; then -+# echo "${run_moz} ${MOZ_CLIENT_PROGRAM} ping()" -+# ${run_moz} ${MOZ_CLIENT_PROGRAM} 'ping()' && ALREADY_RUNNING="yes" -+# else -+# ${run_moz} ${MOZ_CLIENT_PROGRAM} 'ping()' >/dev/null 2>&1 && -+# ALREADY_RUNNING="yes" -+# fi -+# elif [ -n "${debugging}" ]; then -+# echo "$0: WARN, no DISPLAY environment" 1>&2 -+# fi -+#fi -+ -+# process target -+if [ -n "${target}" ]; then -+ moreargs="${moreargs} \"${target}\"" -+ if [ -n "${ALREADY_RUNNING}" ]; then -+ if [ `expr "${target}" : '.*:.*'` -eq 0 ]; then -+ # not an URI, don't use xremote -+ ALREADY_RUNNING= # null -+ fi -+ fi -+fi -+ -+# try remote protocol if running -+if [ -n "${ALREADY_RUNNING}" ]; then -+ if [ -n "${target}" ]; then -+ if [ -n "${location}" ]; then -+ _remote_cmd="openURL(${target},${location})" - else -- # No command line args. Open new window/tab -- #exec "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" "xfeDoCommand(openBrowser)" -- "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" "xfeDoCommand(openInbox)" -- exit $? -+ _remote_cmd="openURL(${target})" - fi -+ fi -+ # FIXME problems with freedesktop StartupNotify -+ if [ -n "${debugging}" ]; then -+ echo "${run_moz} ${script_args} ${MOZ_CLIENT_PROGRAM} ${_remote_cmd}" -+ ${run_moz} ${script_args} ${MOZ_CLIENT_PROGRAM} ${_remote_cmd} && -+ exit 0 -+ else -+ ${run_moz} ${script_args} ${MOZ_CLIENT_PROGRAM} ${_remote_cmd} \ -+ >/dev/null 2>&1 && exit 0 -+ fi - fi --# Default action - no running instance or _USE_EXIST (${_USE_EXIST}) ! -eq 1 --########################################################################### Main - --while [ $# -gt 0 ] --do -- case "$1" in -- -p | --pure | -pure) -- MOZILLA_BIN="${MOZILLA_BIN}.pure" -- shift -- ;; -- -g | --debug) -- script_args="$script_args -g" -- debugging=1 -- shift -- ;; -- -d | --debugger) -- script_args="$script_args -d $2" -- shift 2 -- ;; -- *) -- moreargs="$moreargs \"$1\"" -- shift 1 -- ;; -- esac --done -+# fallback to direct invocation -+ -+# UILocale, UIRegion -+if [ -z "${uilocale}" -a -n "${MOZILLA_UILOCALE}" ]; then -+ uilocale="${MOZILLA_UILOCALE}" -+fi -+if [ -z "${uiregion}" -a -n "${MOZILLA_UIREGION}" ]; then -+ uiregion="${MOZILLA_UIREGION}" -+fi -+if [ -n "${uiregion}" -a -z "${uilocale}" ]; then -+ uilocale="en-US" -+fi -+if [ -n "${uilocale}" ]; then -+ if [ -n "${uiregion}" ]; then -+ moreargs="-UIRegion ${uiregion} ${moreargs}" -+ fi -+ moreargs="-UILocale ${uilocale} ${moreargs}" -+fi - --export MRE_HOME --eval "set -- $moreargs" -+# real invocation -+eval "set -- ${moreargs}" - - ## Start addon scripts - moz_pis_startstop_scripts "start" - --if [ $debugging = 1 ] --then -- echo $dist_bin/run-mozilla.sh $script_args $dist_bin/$MOZILLA_BIN "$@" -+if [ -n "${debugging}" ]; then -+ echo "${run_moz} ${script_args} ${MOZILLA_BIN} $@" - fi --"$dist_bin/run-mozilla.sh" $script_args "$dist_bin/$MOZILLA_BIN" "$@" -+${run_moz} ${script_args} ${MOZILLA_BIN} "$@" - exitcode=$? - - ## Stop addon scripts diff --git a/mail/thunderbird3/files/patch-nspr-unix.c b/mail/thunderbird3/files/patch-nspr-unix.c deleted file mode 100644 index 6bb4ed08fb40..000000000000 --- a/mail/thunderbird3/files/patch-nspr-unix.c +++ /dev/null @@ -1,21 +0,0 @@ ---- nsprpub/pr/src/md/unix/unix.c.orig Sat May 31 18:06:04 2003 -+++ nsprpub/pr/src/md/unix/unix.c Sat May 31 18:04:43 2003 -@@ -65,7 +65,8 @@ - * PRInt32* pointer to a _PRSockLen_t* pointer. - */ - #if defined(HAVE_SOCKLEN_T) \ -- || (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) -+ || (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) \ -+ || defined(FREEBSD) - #define _PRSockLen_t socklen_t - #elif defined(IRIX) || defined(HPUX) || defined(OSF1) || defined(SOLARIS) \ - || defined(AIX4_1) || defined(LINUX) || defined(SONY) \ -@@ -73,7 +74,7 @@ - || defined(SUNOS4) || defined(NCR) || defined(DARWIN) \ - || defined(NEXTSTEP) || defined(QNX) - #define _PRSockLen_t int --#elif (defined(AIX) && !defined(AIX4_1)) || defined(FREEBSD) \ -+#elif (defined(AIX) && !defined(AIX4_1)) \ - || defined(NETBSD) || defined(OPENBSD) || defined(UNIXWARE) \ - || defined(DGUX) || defined(VMS) || defined(NTO) - #define _PRSockLen_t size_t diff --git a/mail/thunderbird3/files/patch-nsprpub-pr-include-md-_freebsd.cfg b/mail/thunderbird3/files/patch-nsprpub-pr-include-md-_freebsd.cfg deleted file mode 100644 index 3ac9a34fbc70..000000000000 --- a/mail/thunderbird3/files/patch-nsprpub-pr-include-md-_freebsd.cfg +++ /dev/null @@ -1,161 +0,0 @@ ---- nsprpub/pr/include/md/_freebsd.cfg.orig Wed Jan 2 18:38:25 2002 -+++ nsprpub/pr/include/md/_freebsd.cfg Sun Feb 1 15:09:53 2004 -@@ -91,7 +91,7 @@ - #define PR_ALIGN_OF_DOUBLE 4 - #define PR_ALIGN_OF_POINTER 4 - --#elif defined(__alpha) -+#elif defined(__alpha__) - - #define IS_LITTLE_ENDIAN 1 - #undef IS_BIG_ENDIAN -@@ -138,6 +138,149 @@ - #define PR_ALIGN_OF_DOUBLE 8 - #define PR_ALIGN_OF_POINTER 8 - -+#elif defined(__sparc64__) -+#undef IS_LITTLE_ENDIAN -+#define IS_BIG_ENDIAN 1 -+#define PR_ALIGN_OF_INT64 8 -+#define PR_ALIGN_OF_DOUBLE 8 -+#define IS_64 -+ -+#define PR_BYTES_PER_BYTE 1 -+#define PR_BYTES_PER_SHORT 2 -+#define PR_BYTES_PER_INT 4 -+#define PR_BYTES_PER_INT64 8 -+#define PR_BYTES_PER_LONG 8 -+#define PR_BYTES_PER_FLOAT 4 -+#define PR_BYTES_PER_DOUBLE 8 -+#define PR_BYTES_PER_WORD 8 -+#define PR_BYTES_PER_DWORD 8 -+#define PR_BYTES_PER_WORD_LOG2 3 -+#define PR_BYTES_PER_DWORD_LOG2 3 -+ -+#define PR_BITS_PER_BYTE 8 -+#define PR_BITS_PER_SHORT 16 -+#define PR_BITS_PER_INT 32 -+#define PR_BITS_PER_INT64 64 -+#define PR_BITS_PER_LONG 64 -+#define PR_BITS_PER_FLOAT 32 -+#define PR_BITS_PER_DOUBLE 64 -+#define PR_BITS_PER_WORD 64 -+ -+#define PR_BITS_PER_BYTE_LOG2 3 -+#define PR_BITS_PER_SHORT_LOG2 4 -+#define PR_BITS_PER_INT_LOG2 5 -+#define PR_BITS_PER_INT64_LOG2 6 -+#define PR_BITS_PER_LONG_LOG2 6 -+#define PR_BITS_PER_FLOAT_LOG2 5 -+#define PR_BITS_PER_DOUBLE_LOG2 6 -+#define PR_BITS_PER_WORD_LOG2 6 -+ -+#define PR_ALIGN_OF_SHORT 2 -+#define PR_ALIGN_OF_INT 4 -+#define PR_ALIGN_OF_LONG 8 -+#define PR_ALIGN_OF_FLOAT 4 -+#define PR_ALIGN_OF_POINTER 8 -+ -+#define HAVE_LONG_LONG -+#define HAVE_ALIGNED_DOUBLES -+#define HAVE_ALIGNED_LONGLONGS -+ -+#elif defined(__ia64__) -+#define IS_LITTLE_ENDIAN 1 -+#undef IS_BIG_ENDIAN -+#define HAVE_LONG_LONG -+#define HAVE_ALIGNED_DOUBLES -+#define HAVE_ALIGNED_LONGLONGS -+#define IS_64 -+ -+#define PR_BYTES_PER_BYTE 1 -+#define PR_BYTES_PER_SHORT 2 -+#define PR_BYTES_PER_INT 4 -+#define PR_BYTES_PER_INT64 8 -+#define PR_BYTES_PER_LONG 8 -+#define PR_BYTES_PER_FLOAT 4 -+#define PR_BYTES_PER_DOUBLE 8 -+#define PR_BYTES_PER_WORD 8 -+#define PR_BYTES_PER_DWORD 8 -+ -+#define PR_BITS_PER_BYTE 8 -+#define PR_BITS_PER_SHORT 16 -+#define PR_BITS_PER_INT 32 -+#define PR_BITS_PER_INT64 64 -+#define PR_BITS_PER_LONG 64 -+#define PR_BITS_PER_FLOAT 32 -+#define PR_BITS_PER_DOUBLE 64 -+#define PR_BITS_PER_WORD 64 -+ -+#define PR_BITS_PER_BYTE_LOG2 3 -+#define PR_BITS_PER_SHORT_LOG2 4 -+#define PR_BITS_PER_INT_LOG2 5 -+#define PR_BITS_PER_INT64_LOG2 6 -+#define PR_BITS_PER_LONG_LOG2 6 -+#define PR_BITS_PER_FLOAT_LOG2 5 -+#define PR_BITS_PER_DOUBLE_LOG2 6 -+#define PR_BITS_PER_WORD_LOG2 6 -+ -+#define PR_ALIGN_OF_SHORT 2 -+#define PR_ALIGN_OF_INT 4 -+#define PR_ALIGN_OF_LONG 8 -+#define PR_ALIGN_OF_INT64 8 -+#define PR_ALIGN_OF_FLOAT 4 -+#define PR_ALIGN_OF_DOUBLE 8 -+#define PR_ALIGN_OF_POINTER 8 -+#define PR_ALIGN_OF_WORD 8 -+ -+#define PR_BYTES_PER_WORD_LOG2 3 -+#define PR_BYTES_PER_DWORD_LOG2 3 -+ -+#elif defined(__amd64__) -+#define IS_LITTLE_ENDIAN 1 -+#undef IS_BIG_ENDIAN -+#define IS_64 -+ -+#define PR_BYTES_PER_BYTE 1 -+#define PR_BYTES_PER_SHORT 2 -+#define PR_BYTES_PER_INT 4 -+#define PR_BYTES_PER_INT64 8 -+#define PR_BYTES_PER_LONG 8 -+#define PR_BYTES_PER_FLOAT 4 -+#define PR_BYTES_PER_DOUBLE 8 -+#define PR_BYTES_PER_WORD 8 -+#define PR_BYTES_PER_DWORD 8 -+ -+#define PR_BITS_PER_BYTE 8 -+#define PR_BITS_PER_SHORT 16 -+#define PR_BITS_PER_INT 32 -+#define PR_BITS_PER_INT64 64 -+#define PR_BITS_PER_LONG 64 -+#define PR_BITS_PER_FLOAT 32 -+#define PR_BITS_PER_DOUBLE 64 -+#define PR_BITS_PER_WORD 64 -+ -+#define PR_BITS_PER_BYTE_LOG2 3 -+#define PR_BITS_PER_SHORT_LOG2 4 -+#define PR_BITS_PER_INT_LOG2 5 -+#define PR_BITS_PER_INT64_LOG2 6 -+#define PR_BITS_PER_LONG_LOG2 6 -+#define PR_BITS_PER_FLOAT_LOG2 5 -+#define PR_BITS_PER_DOUBLE_LOG2 6 -+#define PR_BITS_PER_WORD_LOG2 6 -+ -+#define PR_ALIGN_OF_SHORT 2 -+#define PR_ALIGN_OF_INT 4 -+#define PR_ALIGN_OF_LONG 8 -+#define PR_ALIGN_OF_INT64 8 -+#define PR_ALIGN_OF_FLOAT 4 -+#define PR_ALIGN_OF_DOUBLE 8 -+#define PR_ALIGN_OF_POINTER 8 -+#define PR_ALIGN_OF_WORD 8 -+ -+#define PR_BYTES_PER_WORD_LOG2 3 -+#define PR_BYTES_PER_DWORD_LOG2 3 -+ -+#define HAVE_LONG_LONG -+#define HAVE_ALIGNED_DOUBLES -+#define HAVE_ALIGNED_LONGLONGS - #else - - #error "Unknown CPU architecture" diff --git a/mail/thunderbird3/files/patch-nsprpub-pr-include-md-_freebsd.h b/mail/thunderbird3/files/patch-nsprpub-pr-include-md-_freebsd.h deleted file mode 100644 index 38f21b2ddd6d..000000000000 --- a/mail/thunderbird3/files/patch-nsprpub-pr-include-md-_freebsd.h +++ /dev/null @@ -1,13 +0,0 @@ ---- nsprpub/pr/include/md/_freebsd.h.orig Sat Nov 15 23:36:13 2003 -+++ nsprpub/pr/include/md/_freebsd.h Mon Feb 9 22:24:39 2004 -@@ -50,6 +50,10 @@ - #define _PR_SI_ARCHITECTURE "alpha" - #elif defined(__sparc__) - #define _PR_SI_ARCHITECTURE "sparc" -+#elif defined(__ia64__) -+#define _PR_SI_ARCHITECTURE "ia64" -+#elif defined(__amd64__) -+#define _PR_SI_ARCHITECTURE "amd64" - #else - #error "Unknown CPU architecture" - #endif diff --git a/mail/thunderbird3/files/patch-nsprpub-pr-include-md-_pth.h b/mail/thunderbird3/files/patch-nsprpub-pr-include-md-_pth.h deleted file mode 100644 index 1f8159c70b1f..000000000000 --- a/mail/thunderbird3/files/patch-nsprpub-pr-include-md-_pth.h +++ /dev/null @@ -1,11 +0,0 @@ ---- nsprpub/pr/include/md/_pth.h.orig Mon Jul 26 07:23:42 2004 -+++ nsprpub/pr/include/md/_pth.h Mon Jul 26 07:18:37 2004 -@@ -90,7 +90,7 @@ - #define _PT_PTHREAD_MUTEXATTR_INIT pthread_mutexattr_init - #define _PT_PTHREAD_MUTEXATTR_DESTROY pthread_mutexattr_destroy - #define _PT_PTHREAD_MUTEX_INIT(m, a) pthread_mutex_init(&(m), &(a)) --#define _PT_PTHREAD_MUTEX_IS_LOCKED(m) (EBUSY == pthread_mutex_trylock(&(m))) -+#define _PT_PTHREAD_MUTEX_IS_LOCKED(m) (0 != pthread_mutex_trylock(&(m))) - #if defined(DARWIN) - #define _PT_PTHREAD_CONDATTR_INIT(x) 0 - #else diff --git a/mail/thunderbird3/files/patch-nsprpub-pr-src-io-prprf.c b/mail/thunderbird3/files/patch-nsprpub-pr-src-io-prprf.c deleted file mode 100644 index 74a85ce8b5e2..000000000000 --- a/mail/thunderbird3/files/patch-nsprpub-pr-src-io-prprf.c +++ /dev/null @@ -1,14 +0,0 @@ ---- nsprpub/pr/src/io/prprf.c.orig Mon Mar 8 22:18:19 2004 -+++ nsprpub/pr/src/io/prprf.c Mon May 3 13:00:27 2004 -@@ -51,7 +51,10 @@ - ** Note: on some platforms va_list is defined as an array, - ** and requires array notation. - */ --#if (defined(LINUX) && defined(__x86_64__)) -+#if defined(__amd64__) -+#include <stdarg.h> -+#define VARARGS_ASSIGN(foo, bar) va_copy((foo), (bar)) -+#elif (defined(LINUX) && defined(__x86_64__)) - #define VARARGS_ASSIGN(foo, bar) __va_copy((foo), (bar)) - #elif (defined(LINUX) && defined(__powerpc__)) || \ - (defined(LINUX) && defined(__s390__)) || \ diff --git a/mail/thunderbird3/files/patch-nsprpub-pr-src-pthreads-ptio.c b/mail/thunderbird3/files/patch-nsprpub-pr-src-pthreads-ptio.c deleted file mode 100644 index 08346f235416..000000000000 --- a/mail/thunderbird3/files/patch-nsprpub-pr-src-pthreads-ptio.c +++ /dev/null @@ -1,29 +0,0 @@ ---- nsprpub/pr/src/pthreads/ptio.c.orig Mon Jul 14 17:59:47 2003 -+++ nsprpub/pr/src/pthreads/ptio.c Fri Aug 29 15:39:46 2003 -@@ -189,7 +189,7 @@ - #endif - #endif - --#ifdef DARWIN -+#if defined(DARWIN) || defined(FREEBSD) - static PRBool _pr_ipv6_v6only_on_by_default; - /* The IPV6_V6ONLY socket option is not defined on Mac OS X 10.1. */ - #ifndef IPV6_V6ONLY -@@ -1154,7 +1154,7 @@ - _pr_stderr = pt_SetMethods(2, PR_DESC_FILE, PR_FALSE, PR_TRUE); - PR_ASSERT(_pr_stdin && _pr_stdout && _pr_stderr); - --#ifdef DARWIN -+#if defined(DARWIN) || defined(FREEBSD) - /* In Mac OS X v10.3 Panther Beta the IPV6_V6ONLY socket option - * is turned on by default, contrary to what RFC 3493, Section - * 5.3 says. So we have to turn it off. Find out whether we -@@ -3462,7 +3462,7 @@ - if (osfd == -1) pt_MapError(_PR_MD_MAP_SOCKET_ERROR, errno); - else - { --#ifdef DARWIN -+#if defined(DARWIN) || defined(FREEBSD) - if ((domain == AF_INET6) && _pr_ipv6_v6only_on_by_default) - { - int on = 0; diff --git a/mail/thunderbird3/files/patch-security-coreconf-FreeBSD.mk b/mail/thunderbird3/files/patch-security-coreconf-FreeBSD.mk deleted file mode 100644 index 3e0e14acaaf2..000000000000 --- a/mail/thunderbird3/files/patch-security-coreconf-FreeBSD.mk +++ /dev/null @@ -1,28 +0,0 @@ ---- security/coreconf/FreeBSD.mk.orig Wed Mar 26 20:17:25 2003 -+++ security/coreconf/FreeBSD.mk Sun Nov 21 22:59:49 2004 -@@ -43,8 +43,12 @@ - ifeq ($(OS_TEST),alpha) - CPU_ARCH = alpha - else -+ifeq ($(OS_TEST),amd64) -+CPU_ARCH = amd64 -+else - CPU_ARCH = x86 - endif -+endif - - OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK - -@@ -71,7 +75,11 @@ - DLL_SUFFIX = so.1.0 - endif - --MKSHLIB = $(CC) $(DSO_LDOPTS) -+ifneq (,$(filter alpha ia64,$(OS_TEST))) -+MKSHLIB = $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS) -o $@ -+else -+MKSHLIB = $(CC) -Wl,-Bsymbolic $(DSO_LDOPTS) -o $@ -+endif - ifdef MAPFILE - # Add LD options to restrict exported symbols to those in the map file - endif diff --git a/mail/thunderbird3/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp b/mail/thunderbird3/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp deleted file mode 100644 index 7f8e55f536df..000000000000 --- a/mail/thunderbird3/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp +++ /dev/null @@ -1,29 +0,0 @@ ---- uriloader/exthandler/unix/nsGNOMERegistry.cpp.orig Fri Dec 24 04:30:00 2004 -+++ uriloader/exthandler/unix/nsGNOMERegistry.cpp Fri Dec 24 04:34:05 2004 -@@ -143,7 +143,7 @@ - PR_END_MACRO - - // Attempt to open libgconf -- gconfLib = LoadVersionedLibrary("gconf-2", ".4"); -+ gconfLib = PR_LoadLibrary("libgconf-2.so"); - ENSURE_LIB(gconfLib); - - GET_LIB_FUNCTION(gconf, gconf_client_get_default); -@@ -151,7 +151,7 @@ - GET_LIB_FUNCTION(gconf, gconf_client_get_bool); - - // Attempt to open libgnome -- gnomeLib = LoadVersionedLibrary("gnome-2", ".0"); -+ gnomeLib = PR_LoadLibrary("libgnome-2.so"); - ENSURE_LIB(gnomeLib); - - GET_LIB_FUNCTION(gnome, gnome_url_show); -@@ -160,7 +160,7 @@ - GET_LIB_FUNCTION(gnome, gnome_program_get); - - // Attempt to open libgnomevfs -- vfsLib = LoadVersionedLibrary("gnomevfs-2", ".0"); -+ vfsLib = PR_LoadLibrary("libgnomevfs-2.so"); - ENSURE_LIB(vfsLib); - - GET_LIB_FUNCTION(vfs, gnome_vfs_mime_type_from_name); diff --git a/mail/thunderbird3/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc b/mail/thunderbird3/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc deleted file mode 100644 index ac8cab896d48..000000000000 --- a/mail/thunderbird3/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc +++ /dev/null @@ -1,11 +0,0 @@ ---- xpcom/reflect/xptcall/public/xptcstubsdecl.inc.orig Tue Mar 16 03:07:25 2004 -+++ xpcom/reflect/xptcall/public/xptcstubsdecl.inc Mon May 3 13:05:12 2004 -@@ -8,7 +8,7 @@ - * 1 is AddRef - * 2 is Release - */ --#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__)) -+#if !defined(__ia64) - NS_IMETHOD Stub3(); - NS_IMETHOD Stub4(); - NS_IMETHOD Stub5(); diff --git a/mail/thunderbird3/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in b/mail/thunderbird3/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in deleted file mode 100644 index 51edeb95a7a7..000000000000 --- a/mail/thunderbird3/files/patch-xpcom-reflect-xptcall-src-md-unix-Makefile.in +++ /dev/null @@ -1,54 +0,0 @@ ---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig Thu Aug 14 21:00:23 2003 -+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in Sun Feb 1 15:06:40 2004 -@@ -49,6 +49,9 @@ - ifeq (86,$(findstring 86,$(OS_TEST))) - CPPSRCS := xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp - endif -+ifeq (amd64,$(OS_TEST)) -+CPPSRCS := xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp -+endif - endif - # - # New code for Linux, et. al., with gcc -@@ -60,7 +63,7 @@ - endif - endif - # IA64 Linux --ifneq (,$(filter Linux,$(OS_ARCH))) -+ifneq (,$(filter Linux FreeBSD,$(OS_ARCH))) - ifneq (,$(findstring ia64,$(OS_TEST))) - CPPSRCS := xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp - ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s -@@ -106,9 +109,15 @@ - ASFILES := xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s - endif - # -+# FreeBSD/Alpha -+# -+ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDalpha) -+CPPSRCS := xptcinvoke_freebsd_alpha.cpp xptcstubs_freebsd_alpha.cpp -+endif -+# - # Linux/Alpha - # --ifneq (,$(filter Linuxalpha FreeBSDalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) -+ifneq (,$(filter Linuxalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) - CPPSRCS := xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp - endif - # -@@ -294,6 +303,15 @@ - ifeq ($(OS_ARCH)$(OS_TEST),NetBSDsparc) - CPPSRCS := xptcinvoke_sparc_netbsd.cpp xptcstubs_sparc_netbsd.cpp - ASFILES := xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s -+endif -+# -+# FreeBSD/SPARC64 -+# -+ifeq ($(OS_ARCH),FreeBSD) -+ifneq (,$(findstring sparc,$(OS_TEST))) -+CPPSRCS := xptcinvoke_sparc64_freebsd.cpp xptcstubs_sparc64_freebsd.cpp -+ASFILES := xptcinvoke_asm_sparc64_freebsd.s xptcstubs_asm_sparcv9_solaris.s -+endif - endif - # - # Solaris/SPARC diff --git a/mail/thunderbird3/files/patch-xptcall-alpha b/mail/thunderbird3/files/patch-xptcall-alpha deleted file mode 100644 index 29631a98e61e..000000000000 --- a/mail/thunderbird3/files/patch-xptcall-alpha +++ /dev/null @@ -1,459 +0,0 @@ ---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp.orig Tue May 27 01:37:25 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp Tue May 27 01:37:00 2003 -@@ -0,0 +1,184 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+/* ***** BEGIN LICENSE BLOCK ***** -+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1 -+ * -+ * The contents of this file are subject to the Netscape Public License -+ * Version 1.1 (the "License"); you may not use this file except in -+ * compliance with the License. You may obtain a copy of the License at -+ * http://www.mozilla.org/NPL/ -+ * -+ * Software distributed under the License is distributed on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -+ * for the specific language governing rights and limitations under the -+ * License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is -+ * Netscape Communications Corporation. -+ * Portions created by the Initial Developer are Copyright (C) 1998 -+ * the Initial Developer. All Rights Reserved. -+ * -+ * Contributor(s): -+ * -+ * Alternatively, the contents of this file may be used under the terms of -+ * either the GNU General Public License Version 2 or later (the "GPL"), or -+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -+ * in which case the provisions of the GPL or the LGPL are applicable instead -+ * of those above. If you wish to allow use of your version of this file only -+ * under the terms of either the GPL or the LGPL, and not to allow others to -+ * use your version of this file under the terms of the NPL, indicate your -+ * decision by deleting the provisions above and replace them with the notice -+ * and other provisions required by the GPL or the LGPL. If you do not delete -+ * the provisions above, a recipient may use your version of this file under -+ * the terms of any one of the NPL, the GPL or the LGPL. -+ * -+ * ***** END LICENSE BLOCK ***** */ -+ -+/* Platform specific code to invoke XPCOM methods on native objects */ -+ -+/* contributed by Glen Nakamura <glen.nakamura@usa.net> */ -+ -+#include "xptcprivate.h" -+ -+/* Prototype specifies unmangled function name and disables unused warning */ -+static void -+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s) -+__asm__("invoke_copy_to_stack") __attribute__((unused)); -+ -+static void -+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s) -+{ -+ const PRUint8 NUM_ARG_REGS = 6-1; // -1 for "this" pointer -+ -+ for(PRUint32 i = 0; i < paramCount; i++, d++, s++) -+ { -+ if(s->IsPtrData()) -+ { -+ *d = (PRUint64)s->ptr; -+ continue; -+ } -+ switch(s->type) -+ { -+ case nsXPTType::T_I8 : *d = (PRUint64)s->val.i8; break; -+ case nsXPTType::T_I16 : *d = (PRUint64)s->val.i16; break; -+ case nsXPTType::T_I32 : *d = (PRUint64)s->val.i32; break; -+ case nsXPTType::T_I64 : *d = (PRUint64)s->val.i64; break; -+ case nsXPTType::T_U8 : *d = (PRUint64)s->val.u8; break; -+ case nsXPTType::T_U16 : *d = (PRUint64)s->val.u16; break; -+ case nsXPTType::T_U32 : *d = (PRUint64)s->val.u32; break; -+ case nsXPTType::T_U64 : *d = (PRUint64)s->val.u64; break; -+ case nsXPTType::T_FLOAT : -+ if(i < NUM_ARG_REGS) -+ { -+ // convert floats to doubles if they are to be passed -+ // via registers so we can just deal with doubles later -+ union { PRUint64 u64; double d; } t; -+ t.d = (double)s->val.f; -+ *d = t.u64; -+ } -+ else -+ // otherwise copy to stack normally -+ *d = (PRUint64)s->val.u32; -+ break; -+ case nsXPTType::T_DOUBLE : *d = (PRUint64)s->val.u64; break; -+ case nsXPTType::T_BOOL : *d = (PRUint64)s->val.b; break; -+ case nsXPTType::T_CHAR : *d = (PRUint64)s->val.c; break; -+ case nsXPTType::T_WCHAR : *d = (PRUint64)s->val.wc; break; -+ default: -+ // all the others are plain pointer types -+ *d = (PRUint64)s->val.p; -+ break; -+ } -+ } -+} -+ -+/* -+ * XPTC_PUBLIC_API(nsresult) -+ * XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, -+ * PRUint32 paramCount, nsXPTCVariant* params, void* vt) -+ */ -+__asm__( -+ "#### XPTC_InvokeByIndex ####\n" -+".text\n\t" -+ ".align 5\n\t" -+ ".globl XPTC_InvokeByIndex\n\t" -+ ".ent XPTC_InvokeByIndex\n" -+"XPTC_InvokeByIndex:\n\t" -+ ".frame $15,32,$26,0\n\t" -+ ".mask 0x4008000,-32\n\t" -+ "ldgp $29,0($27)\n" -+"$XPTC_InvokeByIndex..ng:\n\t" -+ "subq $30,32,$30\n\t" -+ "stq $26,0($30)\n\t" -+ "stq $15,8($30)\n\t" -+ "bis $30,$30,$15\n\t" -+ ".prologue 1\n\t" -+ -+ /* -+ * Allocate enough stack space to hold the greater of 6 or "paramCount"+1 -+ * parameters. (+1 for "this" pointer) Room for at least 6 parameters -+ * is required for storage of those passed via registers. -+ */ -+ -+ "bis $31,5,$2\n\t" /* count = MAX(5, "paramCount") */ -+ "cmplt $2,$18,$1\n\t" -+ "cmovne $1,$18,$2\n\t" -+ "s8addq $2,16,$1\n\t" /* room for count+1 params (8 bytes each) */ -+ "bic $1,15,$1\n\t" /* stack space is rounded up to 0 % 16 */ -+ "subq $30,$1,$30\n\t" -+ -+ "stq $16,0($30)\n\t" /* save "that" (as "this" pointer) */ -+ "stq $17,16($15)\n\t" /* save "methodIndex" */ -+ -+ "addq $30,8,$16\n\t" /* pass stack pointer */ -+ "bis $18,$18,$17\n\t" /* pass "paramCount" */ -+ "bis $19,$19,$18\n\t" /* pass "params" */ -+ "bsr $26,$invoke_copy_to_stack..ng\n\t" /* call invoke_copy_to_stack */ -+ -+ /* -+ * Copy the first 6 parameters to registers and remove from stack frame. -+ * Both the integer and floating point registers are set for each parameter -+ * except the first which is the "this" pointer. (integer only) -+ * The floating point registers are all set as doubles since the -+ * invoke_copy_to_stack function should have converted the floats. -+ */ -+ "ldq $16,0($30)\n\t" /* integer registers */ -+ "ldq $17,8($30)\n\t" -+ "ldq $18,16($30)\n\t" -+ "ldq $19,24($30)\n\t" -+ "ldq $20,32($30)\n\t" -+ "ldq $21,40($30)\n\t" -+ "ldt $f17,8($30)\n\t" /* floating point registers */ -+ "ldt $f18,16($30)\n\t" -+ "ldt $f19,24($30)\n\t" -+ "ldt $f20,32($30)\n\t" -+ "ldt $f21,40($30)\n\t" -+ -+ "addq $30,48,$30\n\t" /* remove params from stack */ -+ -+ /* -+ * Call the virtual function with the constructed stack frame. -+ */ -+ "bis $16,$16,$1\n\t" /* load "this" */ -+ "ldq $2,16($15)\n\t" /* load "methodIndex" */ -+ "ldq $1,0($1)\n\t" /* load vtable */ -+#if 0 -+ "s8addq $2,16,$2\n\t" /* vtable index = "methodIndex" * 8 + 16 */ -+#else -+ "mulq $2, 8, $2\n\t" -+ "addq $2, 0, $2\n\t" /* vtable index = "methodIndex" * 16 + 24 */ -+#endif -+ "addq $1,$2,$1\n\t" -+ "ldq $27,0($1)\n\t" /* load address of function */ -+ "jsr $26,($27),0\n\t" /* call virtual function */ -+ "ldgp $29,0($26)\n\t" -+ -+ "bis $15,$15,$30\n\t" -+ "ldq $26,0($30)\n\t" -+ "ldq $15,8($30)\n\t" -+ "addq $30,32,$30\n\t" -+ "ret $31,($26),1\n\t" -+ ".end XPTC_InvokeByIndex" -+ ); -+ ---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp.orig Tue May 27 01:37:30 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp Tue May 27 01:37:04 2003 -@@ -0,0 +1,269 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+/* ***** BEGIN LICENSE BLOCK ***** -+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1 -+ * -+ * The contents of this file are subject to the Netscape Public License -+ * Version 1.1 (the "License"); you may not use this file except in -+ * compliance with the License. You may obtain a copy of the License at -+ * http://www.mozilla.org/NPL/ -+ * -+ * Software distributed under the License is distributed on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -+ * for the specific language governing rights and limitations under the -+ * License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is -+ * Netscape Communications Corporation. -+ * Portions created by the Initial Developer are Copyright (C) 1999 -+ * the Initial Developer. All Rights Reserved. -+ * -+ * Contributor(s): -+ * -+ * Alternatively, the contents of this file may be used under the terms of -+ * either the GNU General Public License Version 2 or later (the "GPL"), or -+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -+ * in which case the provisions of the GPL or the LGPL are applicable instead -+ * of those above. If you wish to allow use of your version of this file only -+ * under the terms of either the GPL or the LGPL, and not to allow others to -+ * use your version of this file under the terms of the NPL, indicate your -+ * decision by deleting the provisions above and replace them with the notice -+ * and other provisions required by the GPL or the LGPL. If you do not delete -+ * the provisions above, a recipient may use your version of this file under -+ * the terms of any one of the NPL, the GPL or the LGPL. -+ * -+ * ***** END LICENSE BLOCK ***** */ -+ -+/* Implement shared vtbl methods. */ -+ -+/* contributed by Glen Nakamura <glen.nakamura@usa.net> */ -+ -+#include <sys/types.h> -+#include <machine/cpu.h> -+#include "xptcprivate.h" -+ -+/* Prototype specifies unmangled function name and disables unused warning */ -+static nsresult -+PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args) -+__asm__("PrepareAndDispatch") __attribute__((unused)); -+ -+static nsresult -+PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args) -+{ -+ const PRUint8 PARAM_BUFFER_COUNT = 16; -+ const PRUint8 NUM_ARG_REGS = 6-1; // -1 for "this" pointer -+ -+ nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT]; -+ nsXPTCMiniVariant* dispatchParams = NULL; -+ nsIInterfaceInfo* iface_info = NULL; -+ const nsXPTMethodInfo* info; -+ PRUint8 paramCount; -+ PRUint8 i; -+ nsresult result = NS_ERROR_FAILURE; -+ -+ NS_ASSERTION(self,"no self"); -+ -+ self->GetInterfaceInfo(&iface_info); -+ NS_ASSERTION(iface_info,"no interface info"); -+ -+ iface_info->GetMethodInfo(PRUint16(methodIndex), &info); -+ NS_ASSERTION(info,"no interface info"); -+ -+ paramCount = info->GetParamCount(); -+ -+ // setup variant array pointer -+ if(paramCount > PARAM_BUFFER_COUNT) -+ dispatchParams = new nsXPTCMiniVariant[paramCount]; -+ else -+ dispatchParams = paramBuffer; -+ NS_ASSERTION(dispatchParams,"no place for params"); -+ -+ // args[0] to args[NUM_ARG_REGS] hold floating point register values -+ PRUint64* ap = args + NUM_ARG_REGS; -+ for(i = 0; i < paramCount; i++, ap++) -+ { -+ const nsXPTParamInfo& param = info->GetParam(i); -+ const nsXPTType& type = param.GetType(); -+ nsXPTCMiniVariant* dp = &dispatchParams[i]; -+ -+ if(param.IsOut() || !type.IsArithmetic()) -+ { -+ dp->val.p = (void*) *ap; -+ continue; -+ } -+ // else -+ switch(type) -+ { -+ case nsXPTType::T_I8 : dp->val.i8 = (PRInt8) *ap; break; -+ case nsXPTType::T_I16 : dp->val.i16 = (PRInt16) *ap; break; -+ case nsXPTType::T_I32 : dp->val.i32 = (PRInt32) *ap; break; -+ case nsXPTType::T_I64 : dp->val.i64 = (PRInt64) *ap; break; -+ case nsXPTType::T_U8 : dp->val.u8 = (PRUint8) *ap; break; -+ case nsXPTType::T_U16 : dp->val.u16 = (PRUint16) *ap; break; -+ case nsXPTType::T_U32 : dp->val.u32 = (PRUint32) *ap; break; -+ case nsXPTType::T_U64 : dp->val.u64 = (PRUint64) *ap; break; -+ case nsXPTType::T_FLOAT : -+ if(i < NUM_ARG_REGS) -+ { -+ // floats passed via registers are stored as doubles -+ // in the first NUM_ARG_REGS entries in args -+ dp->val.u64 = (PRUint64) args[i]; -+ dp->val.f = (float) dp->val.d; // convert double to float -+ } -+ else -+ dp->val.u32 = (PRUint32) *ap; -+ break; -+ case nsXPTType::T_DOUBLE : -+ // doubles passed via registers are also stored -+ // in the first NUM_ARG_REGS entries in args -+ dp->val.u64 = (i < NUM_ARG_REGS) ? args[i] : *ap; -+ break; -+ case nsXPTType::T_BOOL : dp->val.b = (PRBool) *ap; break; -+ case nsXPTType::T_CHAR : dp->val.c = (char) *ap; break; -+ case nsXPTType::T_WCHAR : dp->val.wc = (PRUnichar) *ap; break; -+ default: -+ NS_ASSERTION(0, "bad type"); -+ break; -+ } -+ } -+ -+ result = self->CallMethod((PRUint16)methodIndex, info, dispatchParams); -+ -+ NS_RELEASE(iface_info); -+ -+ if(dispatchParams != paramBuffer) -+ delete [] dispatchParams; -+ -+ return result; -+} -+ -+/* -+ * SharedStub() -+ * Collects arguments and calls PrepareAndDispatch. The "methodIndex" is -+ * passed to this function via $1 to preserve the argument registers. -+ */ -+__asm__( -+ "#### SharedStub ####\n" -+".text\n\t" -+ ".align 5\n\t" -+ ".ent SharedStub\n" -+"SharedStub:\n\t" -+ ".frame $30,96,$26,0\n\t" -+ ".mask 0x4000000,-96\n\t" -+ "ldgp $29,0($27)\n" -+"$SharedStub..ng:\n\t" -+ "subq $30,96,$30\n\t" -+ "stq $26,0($30)\n\t" -+ ".prologue 1\n\t" -+ -+ /* -+ * Store arguments passed via registers to the stack. -+ * Floating point registers are stored as doubles and converted -+ * to floats in PrepareAndDispatch if necessary. -+ */ -+ "stt $f17,16($30)\n\t" /* floating point registers */ -+ "stt $f18,24($30)\n\t" -+ "stt $f19,32($30)\n\t" -+ "stt $f20,40($30)\n\t" -+ "stt $f21,48($30)\n\t" -+ "stq $17,56($30)\n\t" /* integer registers */ -+ "stq $18,64($30)\n\t" -+ "stq $19,72($30)\n\t" -+ "stq $20,80($30)\n\t" -+ "stq $21,88($30)\n\t" -+ -+ /* -+ * Call PrepareAndDispatch function. -+ */ -+ "bis $1,$1,$17\n\t" /* pass "methodIndex" */ -+ "addq $30,16,$18\n\t" /* pass "args" */ -+ "bsr $26,$PrepareAndDispatch..ng\n\t" -+ -+ "ldq $26,0($30)\n\t" -+ "addq $30,96,$30\n\t" -+ "ret $31,($26),1\n\t" -+ ".end SharedStub" -+ ); -+ -+#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */ -+/* -+ * nsresult nsXPTCStubBase::Stub##n() -+ * Sets register $1 to "methodIndex" and jumps to SharedStub. -+ */ -+#define STUB_ENTRY(n) \ -+__asm__( \ -+ "#### Stub"#n" ####\n" \ -+".text\n\t" \ -+ ".align 5\n\t" \ -+ ".globl _ZN14nsXPTCStubBase5Stub"#n"Ev\n\t" \ -+ ".ent _ZN14nsXPTCStubBase5Stub"#n"Ev\n" \ -+"_ZN14nsXPTCStubBase5Stub"#n"Ev:\n\t" \ -+ ".frame $30,0,$26,0\n\t" \ -+ "ldgp $29,0($27)\n" \ -+"$_ZN14nsXPTCStubBase5Stub"#n"Ev..ng:\n\t" \ -+ ".prologue 1\n\t" \ -+ "lda $1,"#n"\n\t" \ -+ "br $31,$SharedStub..ng\n\t" \ -+ ".end _ZN14nsXPTCStubBase5Stub"#n"Ev" \ -+ ); \ -+__asm__( \ -+ "#### Stub"#n" ####\n" \ -+".text\n\t" \ -+ ".align 5\n\t" \ -+ ".globl _ZN14nsXPTCStubBase6Stub"#n"Ev\n\t" \ -+ ".ent _ZN14nsXPTCStubBase6Stub"#n"Ev\n" \ -+"_ZN14nsXPTCStubBase6Stub"#n"Ev:\n\t" \ -+ ".frame $30,0,$26,0\n\t" \ -+ "ldgp $29,0($27)\n" \ -+"$_ZN14nsXPTCStubBase6Stub"#n"Ev..ng:\n\t" \ -+ ".prologue 1\n\t" \ -+ "lda $1,"#n"\n\t" \ -+ "br $31,$SharedStub..ng\n\t" \ -+ ".end _ZN14nsXPTCStubBase6Stub"#n"Ev" \ -+ ); \ -+__asm__( \ -+ "#### Stub"#n" ####\n" \ -+".text\n\t" \ -+ ".align 5\n\t" \ -+ ".globl _ZN14nsXPTCStubBase7Stub"#n"Ev\n\t" \ -+ ".ent _ZN14nsXPTCStubBase7Stub"#n"Ev\n" \ -+"_ZN14nsXPTCStubBase7Stub"#n"Ev:\n\t" \ -+ ".frame $30,0,$26,0\n\t" \ -+ "ldgp $29,0($27)\n" \ -+"$_ZN14nsXPTCStubBase7Stub"#n"Ev..ng:\n\t" \ -+ ".prologue 1\n\t" \ -+ "lda $1,"#n"\n\t" \ -+ "br $31,$SharedStub..ng\n\t" \ -+ ".end _ZN14nsXPTCStubBase7Stub"#n"Ev" \ -+ ); -+#else -+/* -+ * nsresult nsXPTCStubBase::Stub##n() -+ * Sets register $1 to "methodIndex" and jumps to SharedStub. -+ */ -+#define STUB_ENTRY(n) \ -+nsresult nsXPTCStubBase::Stub##n() \ -+{ \ -+ nsresult result; \ -+__asm__ __volatile__( \ -+ "ldah $29,0($27)\n\t" \ -+ "lda $29,0($29)\n\t" \ -+ "lda $1, "#n"\n\t" \ -+ "br $31, $SharedStub..ng\n\t" \ -+ "mov $0, %0\n\t" \ -+ : "=r" (result) \ -+ ); \ -+ return result; \ -+} -+#endif -+ -+#define SENTINEL_ENTRY(n) \ -+nsresult nsXPTCStubBase::Sentinel##n() \ -+{ \ -+ NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \ -+ return NS_ERROR_NOT_IMPLEMENTED; \ -+} -+ -+#include "xptcstubsdef.inc" -+ diff --git a/mail/thunderbird3/files/patch-xptcall-ia64 b/mail/thunderbird3/files/patch-xptcall-ia64 deleted file mode 100644 index 9cd07f7ddbb2..000000000000 --- a/mail/thunderbird3/files/patch-xptcall-ia64 +++ /dev/null @@ -1,38 +0,0 @@ ---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ipf64.s.orig Sun Jul 20 00:05:32 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ipf64.s Sun Jul 20 00:06:37 2003 -@@ -8,6 +8,7 @@ - // Section has executable code - .section .text, "ax","progbits" - // procedure named 'XPTC_InvokeByIndex' -+ .global XPTC_InvokeByIndex - .proc XPTC_InvokeByIndex - // manual bundling - .explicit -@@ -24,7 +25,7 @@ - - // XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, - // PRUint32 paramCount, nsXPTCVariant* params); --XPTC_InvokeByIndex:: -+XPTC_InvokeByIndex: - .prologue - .save ar.pfs, r37 - // allocate 4 input args, 6 local args, and 8 output args ---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s.orig Sun Jul 20 00:02:02 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s Sun Jul 20 00:02:40 2003 -@@ -6,6 +6,7 @@ - // Section has executable code - .section .text, "ax","progbits" - // procedure named 'SharedStub' -+ .global SharedStub - .proc SharedStub - // manual bundling - .explicit -@@ -14,7 +15,7 @@ - // .exclass PrepareAndDispatch, @fullyvisible - .type PrepareAndDispatch,@function - --SharedStub:: -+SharedStub: - // 9 arguments, first 8 are the input arguments of previous - // function call. The last one is methodIndex, and is passed in memory - .prologue diff --git a/mail/thunderbird3/files/patch-xptcall-sparc64 b/mail/thunderbird3/files/patch-xptcall-sparc64 deleted file mode 100644 index 9599a8a71336..000000000000 --- a/mail/thunderbird3/files/patch-xptcall-sparc64 +++ /dev/null @@ -1,327 +0,0 @@ ---- /dev/null Mon May 26 13:22:00 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc64_freebsd.cpp Mon May 26 04:12:55 2003 -@@ -0,0 +1,123 @@ -+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- -+ * -+ * The contents of this file are subject to the Mozilla Public -+ * License Version 1.1 (the "License"); you may not use this file -+ * except in compliance with the License. You may obtain a copy of -+ * the License at http://www.mozilla.org/MPL/ -+ * -+ * Software distributed under the License is distributed on an "AS -+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -+ * implied. See the License for the specific language governing -+ * rights and limitations under the License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is Netscape -+ * Communications Corporation. Portions created by Netscape are -+ * Copyright (C) 2001 Netscape Communications Corporation. All -+ * Rights Reserved. -+ * -+ * Contributor(s): -+ * Stuart Parmenter <pavlov@netscape.com> -+ */ -+ -+/* Implement shared vtbl methods. */ -+ -+#include "xptcprivate.h" -+ -+#if defined(sparc) || defined(__sparc__) -+ -+extern "C" nsresult -+PrepareAndDispatch(nsXPTCStubBase* self, PRUint64 methodIndex, PRUint64* args) -+{ -+ -+#define PARAM_BUFFER_COUNT 16 -+ -+ nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT]; -+ nsXPTCMiniVariant* dispatchParams = NULL; -+ nsIInterfaceInfo* iface_info = NULL; -+ const nsXPTMethodInfo* info; -+ PRUint8 paramCount; -+ PRUint8 i; -+ nsresult result = NS_ERROR_FAILURE; -+ -+ NS_ASSERTION(self,"no self"); -+ -+ self->GetInterfaceInfo(&iface_info); -+ NS_ASSERTION(iface_info,"no interface info"); -+ -+ iface_info->GetMethodInfo(PRUint16(methodIndex), &info); -+ NS_ASSERTION(info,"no interface info"); -+ -+ paramCount = info->GetParamCount(); -+ -+ // setup variant array pointer -+ if(paramCount > PARAM_BUFFER_COUNT) -+ dispatchParams = new nsXPTCMiniVariant[paramCount]; -+ else -+ dispatchParams = paramBuffer; -+ NS_ASSERTION(dispatchParams,"no place for params"); -+ -+ PRUint64* ap = args; -+ for(i = 0; i < paramCount; i++, ap++) -+ { -+ const nsXPTParamInfo& param = info->GetParam(i); -+ const nsXPTType& type = param.GetType(); -+ nsXPTCMiniVariant* dp = &dispatchParams[i]; -+ -+ if(param.IsOut() || !type.IsArithmetic()) -+ { -+ dp->val.p = (void*) *ap; -+ continue; -+ } -+ // else -+ switch(type) -+ { -+ case nsXPTType::T_I8 : dp->val.i8 = *((PRInt64*) ap); break; -+ case nsXPTType::T_I16 : dp->val.i16 = *((PRInt64*) ap); break; -+ case nsXPTType::T_I32 : dp->val.i32 = *((PRInt64*) ap); break; -+ case nsXPTType::T_DOUBLE : dp->val.d = *((double*) ap); break; -+ case nsXPTType::T_U64 : dp->val.u64 = *((PRUint64*) ap); break; -+ case nsXPTType::T_I64 : dp->val.i64 = *((PRInt64*) ap); break; -+ case nsXPTType::T_U8 : dp->val.u8 = *((PRUint64*) ap); break; -+ case nsXPTType::T_U16 : dp->val.u16 = *((PRUint64*)ap); break; -+ case nsXPTType::T_U32 : dp->val.u32 = *((PRUint64*)ap); break; -+ case nsXPTType::T_FLOAT : dp->val.f = ((float*) ap)[1]; break; -+ case nsXPTType::T_BOOL : dp->val.b = *((PRInt64*) ap); break; -+ case nsXPTType::T_CHAR : dp->val.c = *((PRUint64*) ap); break; -+ case nsXPTType::T_WCHAR : dp->val.wc = *((PRInt64*) ap); break; -+ default: -+ NS_ASSERTION(0, "bad type"); -+ break; -+ } -+ } -+ -+ result = self->CallMethod((PRUint16)methodIndex, info, dispatchParams); -+ -+ NS_RELEASE(iface_info); -+ -+ if(dispatchParams != paramBuffer) -+ delete [] dispatchParams; -+ -+ return result; -+} -+ -+extern "C" int SharedStub(int, int*); -+ -+#define STUB_ENTRY(n) \ -+nsresult nsXPTCStubBase::Stub##n() \ -+{ \ -+ int dummy; /* defeat tail-call optimization */ \ -+ return SharedStub(n, &dummy); \ -+} -+ -+#define SENTINEL_ENTRY(n) \ -+nsresult nsXPTCStubBase::Sentinel##n() \ -+{ \ -+ NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \ -+ return NS_ERROR_NOT_IMPLEMENTED; \ -+} -+ -+#include "xptcstubsdef.inc" -+ -+#endif /* sparc || __sparc__ */ ---- /dev/null Mon May 26 13:22:00 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc64_freebsd.s Mon May 26 04:06:09 2003 -@@ -0,0 +1,104 @@ -+/* -*- Mode: asm; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- -+ * -+ * The contents of this file are subject to the Mozilla Public -+ * License Version 1.1 (the "License"); you may not use this file -+ * except in compliance with the License. You may obtain a copy of -+ * the License at http://www.mozilla.org/MPL/ -+ * -+ * Software distributed under the License is distributed on an "AS -+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -+ * implied. See the License for the specific language governing -+ * rights and limitations under the License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is Netscape -+ * Communications Corporation. Portions created by Netscape are -+ * Copyright (C) 2001 Netscape Communications Corporation. All -+ * Rights Reserved. -+ * -+ * Contributor(s): -+ * Stuart Parmenter <pavlov@netscape.com> -+ * Chris Seawood <cls@seawood.org> -+ */ -+ -+/* -+ Platform specific code to invoke XPCOM methods on native objects -+ for sparcv9 Solaris. -+ -+ See the SPARC Compliance Definition (SCD) Chapter 3 -+ for more information about what is going on here, including -+ the use of BIAS (0x7ff). -+ The SCD is available from http://www.sparc.com/. -+*/ -+ -+ .global XPTC_InvokeByIndex -+ .type XPTC_InvokeByIndex, #function -+ -+/* -+ XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, -+ PRUint32 paramCount, nsXPTCVariant* params); -+ -+*/ -+XPTC_InvokeByIndex: -+ save %sp,-(128 + 64),%sp ! room for the register window and -+ ! struct pointer, rounded up to 0 % 64 -+ sll %i2,4,%l0 ! assume the worst case -+ ! paramCount * 2 * 8 bytes -+ cmp %l0, 0 ! are there any args? If not, -+ be .invoke ! no need to copy args to stack -+ nop -+ -+ sub %sp,%l0,%sp ! create the additional stack space -+ add %sp,0x7ff+136,%o0 ! step past the register window, the -+ ! struct result pointer and the 'this' slot -+ mov %i2,%o1 ! paramCount -+ call invoke_copy_to_stack -+ mov %i3,%o2 ! params -+ -+! -+! load arguments from stack into the outgoing registers -+! BIAS is 0x7ff (2047) -+! -+ -+! load the %o1..5 64bit (extended word) output registers registers -+ ldx [%sp + 0x7ff + 136],%o1 ! %i1 -+ ldx [%sp + 0x7ff + 144],%o2 ! %i2 -+ ldx [%sp + 0x7ff + 152],%o3 ! %i3 -+ ldx [%sp + 0x7ff + 160],%o4 ! %i4 -+ ldx [%sp + 0x7ff + 168],%o5 ! %i5 -+ -+! load the even number double registers starting with %d2 -+ ldd [%sp + 0x7ff + 136],%f2 -+ ldd [%sp + 0x7ff + 144],%f4 -+ ldd [%sp + 0x7ff + 152],%f6 -+ ldd [%sp + 0x7ff + 160],%f8 -+ ldd [%sp + 0x7ff + 168],%f10 -+ ldd [%sp + 0x7ff + 176],%f12 -+ ldd [%sp + 0x7ff + 184],%f14 -+ ldd [%sp + 0x7ff + 192],%f16 -+ ldd [%sp + 0x7ff + 200],%f18 -+ ldd [%sp + 0x7ff + 208],%f20 -+ ldd [%sp + 0x7ff + 216],%f22 -+ ldd [%sp + 0x7ff + 224],%f24 -+ ldd [%sp + 0x7ff + 232],%f26 -+ ldd [%sp + 0x7ff + 240],%f28 -+ ldd [%sp + 0x7ff + 248],%f30 -+ -+! -+! calculate the target address from the vtable -+! -+.invoke: -+ sll %i1,3,%l0 ! index *= 8 -+! add %l0,16,%l0 ! there are 2 extra entries in the vTable (16bytes) -+ ldx [%i0],%l1 ! *that --> address of vtable -+ ldx [%l0 + %l1],%l0 ! that->vtable[index * 8 + 16] --> address -+ -+ jmpl %l0,%o7 ! call the routine -+ mov %i0,%o0 ! move 'this' pointer to out register -+ -+ mov %o0,%i0 ! propagate return value -+ ret -+ restore -+ -+ .size XPTC_InvokeByIndex, .-XPTC_InvokeByIndex ---- /dev/null Mon May 26 14:00:00 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc64_freebsd.cpp Mon May 26 14:00:49 2003 -@@ -0,0 +1,91 @@ -+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- -+ * -+ * The contents of this file are subject to the Mozilla Public -+ * License Version 1.1 (the "License"); you may not use this file -+ * except in compliance with the License. You may obtain a copy of -+ * the License at http://www.mozilla.org/MPL/ -+ * -+ * Software distributed under the License is distributed on an "AS -+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -+ * implied. See the License for the specific language governing -+ * rights and limitations under the License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is Netscape -+ * Communications Corporation. Portions created by Netscape are -+ * Copyright (C) 2001 Netscape Communications Corporation. All -+ * Rights Reserved. -+ * -+ * Contributor(s): -+ * Stuart Parmenter <pavlov@netscape.com> -+ * Chris Seawood <cls@seawood.org> -+ */ -+ -+ -+/* Platform specific code to invoke XPCOM methods on native objects */ -+ -+#include "xptcprivate.h" -+ -+#if !defined(__sparc) && !defined(__sparc__) -+#error "This code is for Sparc only" -+#endif -+ -+/* Prototype specifies unmangled function name */ -+extern "C" PRUint64 -+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s); -+ -+extern "C" PRUint64 -+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s) -+{ -+ /* -+ We need to copy the parameters for this function to locals and use them -+ from there since the parameters occupy the same stack space as the stack -+ we're trying to populate. -+ */ -+ PRUint64 *l_d = d; -+ nsXPTCVariant *l_s = s; -+ PRUint64 l_paramCount = paramCount; -+ PRUint64 regCount = 0; // return the number of registers to load from the stack -+ -+ for(PRUint64 i = 0; i < l_paramCount; i++, l_d++, l_s++) -+ { -+ if (regCount < 5) regCount++; -+ -+ if (l_s->IsPtrData()) -+ { -+ *l_d = (PRUint64)l_s->ptr; -+ continue; -+ } -+ switch (l_s->type) -+ { -+ case nsXPTType::T_I8 : *((PRInt64*)l_d) = l_s->val.i8; break; -+ case nsXPTType::T_I16 : *((PRInt64*)l_d) = l_s->val.i16; break; -+ case nsXPTType::T_I32 : *((PRInt64*)l_d) = l_s->val.i32; break; -+ case nsXPTType::T_I64 : *((PRInt64*)l_d) = l_s->val.i64; break; -+ -+ case nsXPTType::T_U8 : *((PRUint64*)l_d) = l_s->val.u8; break; -+ case nsXPTType::T_U16 : *((PRUint64*)l_d) = l_s->val.u16; break; -+ case nsXPTType::T_U32 : *((PRUint64*)l_d) = l_s->val.u32; break; -+ case nsXPTType::T_U64 : *((PRUint64*)l_d) = l_s->val.u64; break; -+ -+ /* in the case of floats, we want to put the bits in to the -+ 64bit space right justified... floats in the paramter array on -+ sparcv9 use odd numbered registers.. %f1, %f3, so we have to skip -+ the space that would be occupied by %f0, %f2, etc. -+ */ -+ case nsXPTType::T_FLOAT : *(((float*)l_d) + 1) = l_s->val.f; break; -+ case nsXPTType::T_DOUBLE: *((double*)l_d) = l_s->val.d; break; -+ case nsXPTType::T_BOOL : *((PRInt64*)l_d) = l_s->val.b; break; -+ case nsXPTType::T_CHAR : *((PRUint64*)l_d) = l_s->val.c; break; -+ case nsXPTType::T_WCHAR : *((PRInt64*)l_d) = l_s->val.wc; break; -+ -+ default: -+ // all the others are plain pointer types -+ *((void**)l_d) = l_s->val.p; -+ break; -+ } -+ } -+ -+ return regCount; -+} diff --git a/mail/thunderbird3/files/thunderbird.desktop.in b/mail/thunderbird3/files/thunderbird.desktop.in deleted file mode 100644 index 814e074814af..000000000000 --- a/mail/thunderbird3/files/thunderbird.desktop.in +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Thunderbird -GenericName=Mail Client -Comment=Mail client and News Reader -Exec=thunderbird %U -Icon=@THUNDERBIRD_ICON@ -StartupNotify=false -Terminal=false -Type=Application -Categories=Application;Network; diff --git a/mail/thunderbird3/pkg-deinstall.in b/mail/thunderbird3/pkg-deinstall.in deleted file mode 100644 index b9b0ca220fbc..000000000000 --- a/mail/thunderbird3/pkg-deinstall.in +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# -# Date created: Mon Nov 29, 2003 -# Whom: Thierry Thomas (<thierry@pompo.net>) -# Fix the chrome registry. - -umask 022 -PATH=/bin:/usr/bin - -[ "x$1" = "x" ] && exit 1 -[ "x$2" != "xDEINSTALL" ] && exit 0 - -MOZDIR=%%MOZDIR%% - -rm -rf ${MOZDIR}/chrome/overlayinfo -rm -f ${MOZDIR}/chrome/*.rdf -rm -f ${MOZDIR}/component.reg -rm -f ${MOZDIR}/components.ini -rm -f ${MOZDIR}/defaults.ini -rm -f ${MOZDIR}/components/*.dat -rm -rf ${MOZDIR}/extensions - -exit 0 diff --git a/mail/thunderbird3/pkg-descr b/mail/thunderbird3/pkg-descr deleted file mode 100644 index 5a21b98b08cc..000000000000 --- a/mail/thunderbird3/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -Mozilla Thunderbird is a redesign of the Mozilla mail component with the goal -of becoming a cross-platform stand alone mail application using the XUL -user interface language. See the Mozilla Thunderbird project page for -more details. - -WWW: http://www.mozilla.org/projects/thunderbird/ diff --git a/mail/thunderbird3/pkg-install.in b/mail/thunderbird3/pkg-install.in deleted file mode 100644 index 0413486236fe..000000000000 --- a/mail/thunderbird3/pkg-install.in +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# -# Date created: Mon Nov 29, 2003 -# Whom: Thierry Thomas (<thierry@pompo.net>) -# Fix the chrome registry. - -umask 022 -PATH=/bin:/usr/bin:/usr/local/bin - -[ "x$1" = "x" ] && exit 1 -[ "x$2" != "xPOST-INSTALL" ] && exit 0 - -MOZDIR=%%MOZDIR%% -REGXPCOM=${MOZDIR}/regxpcom -REGCHROME=${MOZDIR}/regchrome -THUNDERBIRD=${MOZDIR}/thunderbird-bin - -echo "===> Building Chrome's registry..." -rm -rf ${MOZDIR}/chrome/overlayinfo -rm -f ${MOZDIR}/chrome/*.rdf -mkdir -p ${MOZDIR}/chrome/overlayinfo -rm -f ${MOZDIR}/component.reg -rm -rf ${MOZDIR}/extensions - -cd ${MOZDIR} || exit 1 -./run-mozilla.sh ${REGXPCOM} || true -./run-mozilla.sh ${REGCHROME} || true -./run-mozilla.sh ${THUNDERBIRD} -register > /dev/null 2>&1 - -exit 0 |