diff options
| author | cvs <cvs@pkgsrc.org> | 2007-03-23 19:00:19 +0000 |
|---|---|---|
| committer | cvs <cvs@pkgsrc.org> | 2007-03-23 19:00:19 +0000 |
| commit | da1b24d6fdfe442753c8272da5432c8fcaa1f43c (patch) | |
| tree | 8c7c348db30abadfdc6b77822405d9ffe7b79103 /mail/imap-uw | |
| parent | da5bb3f20f33565c1db65018aabd8cf59023cfef (diff) | |
| download | pkgsrc-jlam-pkgviews.tar.gz | |
Creating branch jlam-pkgviewsjlam-pkgviews
Diffstat (limited to 'mail/imap-uw')
41 files changed, 0 insertions, 1081 deletions
diff --git a/mail/imap-uw/DESCR b/mail/imap-uw/DESCR deleted file mode 100644 index 396c4441c81..00000000000 --- a/mail/imap-uw/DESCR +++ /dev/null @@ -1,6 +0,0 @@ -The UW imapd is the reference implementation of the IMAP4 protocol for -interactive remote retrieval of mail and storage of mail folders. Also -included are POP2 and POP3 servers and an IMAP protocol tester (mtest). - -The Pine mail program includes an IMAP4 client driver, as does Netscape -version 4 and above. diff --git a/mail/imap-uw/MESSAGE b/mail/imap-uw/MESSAGE deleted file mode 100644 index 5fff7ccfd33..00000000000 --- a/mail/imap-uw/MESSAGE +++ /dev/null @@ -1,18 +0,0 @@ -=========================================================================== -$NetBSD: MESSAGE,v 1.4 2006/07/26 20:00:27 jlam Exp $ - -Add the following to /etc/services (if not already there): - - imap 143/tcp # Internet Message Access Protocol - imap 143/udp - -Add the following to /etc/inetd.conf: - - imap stream tcp nowait root ${PREFIX}/libexec/imapd imapd - pop2 stream tcp nowait root ${PREFIX}/libexec/ipop2d ipop2d - pop3 stream tcp nowait root ${PREFIX}/libexec/ipop3d ipop3d - -You will need to make inetd reload its configuration for the changes to -take effect. - -=========================================================================== diff --git a/mail/imap-uw/MESSAGE.ssl b/mail/imap-uw/MESSAGE.ssl deleted file mode 100644 index 301a77f88eb..00000000000 --- a/mail/imap-uw/MESSAGE.ssl +++ /dev/null @@ -1,23 +0,0 @@ -=========================================================================== -$NetBSD: MESSAGE.ssl,v 1.1 2006/07/26 20:00:27 jlam Exp $ - -Add the following to /etc/services (if not already there): - - imaps 993/tcp # imap4 protocol over TLS/SSL - imaps 993/udp # imap4 protocol over TLS/SSL - pop3s 995/tcp # pop3 protocol over TLS/SSL (was spop3) - pop3s 995/udp # pop3 protocol over TLS/SSL (was spop3) - -Add the following to /etc/inetd.conf: - - imaps stream tcp nowait root ${PREFIX}/libexec/imapd imapd - pop3s stream tcp nowait root ${PREFIX}/libexec/ipop3d ipop3d - -The imapd daemon looks for the following files to use SSL: - - ${SSLCERTS}/imapd.pem (certificate) - ${SSLKEYS}/imapd.pem (private key) - -and similarly for the ipopd daemon. - -=========================================================================== diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile deleted file mode 100644 index 52922d4388a..00000000000 --- a/mail/imap-uw/Makefile +++ /dev/null @@ -1,143 +0,0 @@ -# $NetBSD: Makefile,v 1.116 2007/03/21 19:39:08 jwise Exp $ -# -# ATTENTION: -# The Kerberos support in this software is known to be problematic. If you -# upgrade this package you *must* test it on a system with Kerberos libraries -# but not running Kerberos before committing the changes. - -DISTNAME= imap-2004g -PKGNAME= ${DISTNAME:S/-/-uw-/} -PKGREVISION= 2 -CATEGORIES= mail -MASTER_SITES= ftp://ftp.cac.washington.edu/imap/ -EXTRACT_SUFX= .tar.Z - -MAINTAINER= jwise@NetBSD.org -HOMEPAGE= http://www.washington.edu/imap/ -COMMENT= University of Washington's IMAP, POP2, and POP3 servers - -USE_LIBTOOL= yes -MAKE_ENV+= LIBTOOL=libtool -MAKE_ENV+= LTCOMPILE="libtool --mode=compile" -MAKE_ENV+= LTLINK="libtool --mode=link" -LTINSTALL_PROGRAM= ${SETENV} ${MAKE_ENV} ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} -LTINSTALL_LIB= ${SETENV} ${MAKE_ENV} ${LIBTOOL} --mode=install ${INSTALL_LIB} - -.include "../../mk/bsd.prefs.mk" - -# Each platform has its own special target in the imap Makefiles. -OPSYSVARS+= BUILD_TARGET -BUILD_TARGET.SunOS= gso -.if ${OPSYS} == Linux && exists(/usr/include/security/pam_appl.h) -BUILD_TARGET.Linux= lnp -.else -BUILD_TARGET.Linux= slx -.endif -BUILD_TARGET.Darwin= osx -.if ${OPSYS} == "IRIX" -. if ${OS_VERSION} >= 6.5 -BUILD_TARGET.IRIX= sg6 -. else -BUILD_TARGET.IRIX= sgi -. endif -.endif -BUILD_TARGET.OSF1= osf -BUILD_TARGET.OpenBSD= bso -.if ${OPSYS} == NetBSD && exists(/usr/include/security/pam_appl.h) -BUILD_TARGET.NetBSD= nep -.endif -BUILD_TARGET.*= neb -MESSAGE_SRC= ${PKGDIR}/MESSAGE - -.include "options.mk" - -# The defaults for these values are set in pkgsrc/mk/defaults/mk.conf. -#IMAP_UW_CCLIENT_MBOX_FMT?= unix -#IMAP_UW_MAILSPOOLHOME?= .Mailbox -BUILD_DEFS+= IMAP_UW_CCLIENT_MBOX_FMT IMAP_UW_MAILSPOOLHOME - -CCLIENT_LIB= libc-client.la -CCLIENT_PICLIB= libc-client_pic.a -CCLIENT_MAJOR= 4 -CCLIENT_MINOR= 3 -MAKE_ENV+= CCLIENT_MAJOR=${CCLIENT_MAJOR:Q} -MAKE_ENV+= CCLIENT_MINOR=${CCLIENT_MINOR:Q} - -EXTRASPECIALS+= CREATEPROTO=${IMAP_UW_CCLIENT_MBOX_FMT:Q}proto - -MAKE_FLAGS+= EXTRALDFLAGS=${LDFLAGS:Q} -MAKE_FLAGS+= EXTRACFLAGS=${CFLAGS:Q} -MAKE_FLAGS+= EXTRASPECIALS=${EXTRASPECIALS:Q} - -SUBST_CLASSES+= mbox -SUBST_STAGE.mbox= do-configure -SUBST_FILES.mbox= src/osdep/unix/env_unix.c -.if defined(IMAP_USE_MAILSPOOLHOME) -SUBST_SED.mbox= -e 's|@SPOOLDIR@|myhomedir ()|' \ - -e 's|@MAILBOX@|"${IMAP_UW_MAILSPOOLHOME}"|' -.else -SUBST_SED.mbox= -e 's|@SPOOLDIR@|MAILSPOOL|' \ - -e 's|@MAILBOX@|myusername ()|' -.endif - -SUBST_CLASSES+= man -SUBST_STAGE.man= post-build -SUBST_FILES.man= src/imapd/imapd.8 src/ipopd/ipopd.8 -SUBST_SED.man= -e "s|/usr/etc/imapd|${PREFIX}/libexec/imapd|g" \ - -e "s|/etc/rimapd|${PREFIX}/sbin/rimapd|g" \ - -e "s|/usr/etc/ipop2d|${PREFIX}/libexec/ipop2d|g" \ - -e "s|/usr/etc/ipop3d|${PREFIX}/libexec/ipop3d|g" - -INSTALLATION_DIRS+= bin lib libexec sbin \ - ${PKGMANDIR}/man1 ${PKGMANDIR}/man8 - -# Generate _pic.a library from shared objects. -post-build: - cd ${WRKSRC}/c-client; \ - ${LIBTOOL} --mode=link ${CC} -o ${CCLIENT_PICLIB:.a=.la} *.lo - -do-install: install-headers install-lib install-doc - ${LTINSTALL_PROGRAM} ${WRKSRC}/imapd/imapd ${PREFIX}/libexec - ${LTINSTALL_PROGRAM} ${WRKSRC}/ipopd/ipop2d ${PREFIX}/libexec - ${LTINSTALL_PROGRAM} ${WRKSRC}/ipopd/ipop3d ${PREFIX}/libexec - ${LTINSTALL_PROGRAM} ${WRKSRC}/mtest/mtest ${PREFIX}/sbin - ${LN} -sf ../libexec/imapd ${PREFIX}/sbin/rimapd - ${INSTALL_MAN} ${WRKSRC}/src/imapd/imapd.8 ${PREFIX}/${PKGMANDIR}/man8 - ${INSTALL_MAN} ${WRKSRC}/src/ipopd/ipopd.8 ${PREFIX}/${PKGMANDIR}/man8 - ${LN} -sf ipopd.8 ${PREFIX}/${PKGMANDIR}/man8/ipop2d.8 - ${LN} -sf ipopd.8 ${PREFIX}/${PKGMANDIR}/man8/ipop3d.8 - ${LTINSTALL_PROGRAM} ${WRKSRC}/mailutil/mailutil ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/src/mailutil/mailutil.1 ${PREFIX}/${PKGMANDIR}/man1 - ${LTINSTALL_PROGRAM} ${WRKSRC}/dmail/dmail ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/src/dmail/dmail.1 ${PREFIX}/${PKGMANDIR}/man1 - ${LTINSTALL_PROGRAM} ${WRKSRC}/mlock/mlock ${PREFIX}/bin - ${LTINSTALL_PROGRAM} ${WRKSRC}/tmail/tmail ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/src/tmail/tmail.1 ${PREFIX}/${PKGMANDIR}/man1 - -.PHONY: install-headers install-lib install-doc -install-headers: - ${INSTALL_DATA_DIR} ${PREFIX}/include/c-client - ${CAT} ${PKGDIR}/PLIST | \ - while read entry; do \ - case "$$entry" in \ - include/c-client/*) \ - src="${WRKSRC}/c-client/`${BASENAME} $$entry`"; \ - dest="${PREFIX}/$$entry"; \ - ${INSTALL_DATA} $$src $$dest; \ - esac; \ - done - -install-lib: - ${LTINSTALL_LIB} ${WRKSRC}/c-client/${CCLIENT_LIB} ${PREFIX}/lib - ${INSTALL_LIB} ${WRKSRC}/c-client/.libs/${CCLIENT_PICLIB} ${PREFIX}/lib - ${RANLIB} ${PREFIX}/lib/${CCLIENT_PICLIB} - -DOCDIR= ${PREFIX}/share/doc/${PKGBASE} -install-doc: - ${INSTALL_DATA_DIR} ${DOCDIR} - ${CP} -R ${WRKSRC}/docs/* ${DOCDIR} - ${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DOCDIR} - ${FIND} ${DOCDIR} -type d -print | ${XARGS} ${CHMOD} ${PKGDIRMODE} - ${FIND} ${DOCDIR} -type f -print | ${XARGS} ${CHMOD} ${SHAREMODE} - -.include "../../mk/bsd.pkg.mk" diff --git a/mail/imap-uw/PLIST b/mail/imap-uw/PLIST deleted file mode 100644 index 7cbd17670b1..00000000000 --- a/mail/imap-uw/PLIST +++ /dev/null @@ -1,95 +0,0 @@ -@comment $NetBSD: PLIST,v 1.12 2006/07/26 20:00:27 jlam Exp $ -bin/dmail -bin/mailutil -bin/mlock -bin/tmail -include/c-client/c-client.h -include/c-client/env.h -include/c-client/env_unix.h -include/c-client/flocksim.h -include/c-client/flstring.h -include/c-client/fs.h -include/c-client/ftl.h -include/c-client/imap4r1.h -include/c-client/linkage.c -include/c-client/linkage.h -include/c-client/mail.h -include/c-client/misc.h -include/c-client/netmsg.h -include/c-client/newsrc.h -include/c-client/nl.h -include/c-client/nntp.h -include/c-client/osdep.h -include/c-client/rfc822.h -include/c-client/smtp.h -include/c-client/tcp.h -include/c-client/utf8.h -lib/libc-client.la -lib/libc-client_pic.a -libexec/imapd -libexec/ipop2d -libexec/ipop3d -man/man1/dmail.1 -man/man1/mailutil.1 -man/man1/tmail.1 -man/man8/imapd.8 -man/man8/ipop2d.8 -man/man8/ipop3d.8 -man/man8/ipopd.8 -sbin/mtest -sbin/rimapd -share/doc/imap-uw/BUILD -share/doc/imap-uw/CONFIG -share/doc/imap-uw/FAQ.html -share/doc/imap-uw/FAQ.txt -share/doc/imap-uw/IPv6.txt -share/doc/imap-uw/RELNOTES -share/doc/imap-uw/SSLBUILD -share/doc/imap-uw/Y2K -share/doc/imap-uw/bugs.txt -share/doc/imap-uw/calendar.txt -share/doc/imap-uw/commndmt.txt -share/doc/imap-uw/draft/README -share/doc/imap-uw/draft/compare.txt -share/doc/imap-uw/draft/i18n.txt -share/doc/imap-uw/draft/sort.txt -share/doc/imap-uw/drivers.txt -share/doc/imap-uw/formats.txt -share/doc/imap-uw/imaprc.txt -share/doc/imap-uw/internal.txt -share/doc/imap-uw/locking.txt -share/doc/imap-uw/md5.txt -share/doc/imap-uw/naming.txt -share/doc/imap-uw/rfc/rfc1731.txt -share/doc/imap-uw/rfc/rfc1732.txt -share/doc/imap-uw/rfc/rfc1733.txt -share/doc/imap-uw/rfc/rfc2061.txt -share/doc/imap-uw/rfc/rfc2062.txt -share/doc/imap-uw/rfc/rfc2086.txt -share/doc/imap-uw/rfc/rfc2087.txt -share/doc/imap-uw/rfc/rfc2088.txt -share/doc/imap-uw/rfc/rfc2177.txt -share/doc/imap-uw/rfc/rfc2180.txt -share/doc/imap-uw/rfc/rfc2192.txt -share/doc/imap-uw/rfc/rfc2193.txt -share/doc/imap-uw/rfc/rfc2195.txt -share/doc/imap-uw/rfc/rfc2221.txt -share/doc/imap-uw/rfc/rfc2222.txt -share/doc/imap-uw/rfc/rfc2234.txt -share/doc/imap-uw/rfc/rfc2245.txt -share/doc/imap-uw/rfc/rfc2342.txt -share/doc/imap-uw/rfc/rfc2359.txt -share/doc/imap-uw/rfc/rfc2595.txt -share/doc/imap-uw/rfc/rfc2683.txt -share/doc/imap-uw/rfc/rfc2971.txt -share/doc/imap-uw/rfc/rfc3348.txt -share/doc/imap-uw/rfc/rfc3501.txt -share/doc/imap-uw/rfc/rfc3502.txt -share/doc/imap-uw/rfc/rfc3503.txt -share/doc/imap-uw/rfc/rfc3516.txt -share/doc/imap-uw/rfc/rfc3656.txt -share/doc/imap-uw/rfc/rfc3691.txt -@dirrm share/doc/imap-uw/rfc -@dirrm share/doc/imap-uw/draft -@dirrm share/doc/imap-uw -@dirrm include/c-client diff --git a/mail/imap-uw/buildlink3.mk b/mail/imap-uw/buildlink3.mk deleted file mode 100644 index 0611835b5bc..00000000000 --- a/mail/imap-uw/buildlink3.mk +++ /dev/null @@ -1,22 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.10 2006/07/26 20:00:27 jlam Exp $ - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ -IMAP_UW_BUILDLINK3_MK:= ${IMAP_UW_BUILDLINK3_MK}+ - -.if !empty(BUILDLINK_DEPTH:M+) -BUILDLINK_DEPENDS+= imap-uw -.endif - -BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nimap-uw} -BUILDLINK_PACKAGES+= imap-uw -BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}imap-uw - -.if !empty(IMAP_UW_BUILDLINK3_MK:M+) -BUILDLINK_API_DEPENDS.imap-uw+= imap-uw>=2004 -BUILDLINK_ABI_DEPENDS.imap-uw+= imap-uw>=2004enb1 -BUILDLINK_PKGSRCDIR.imap-uw?= ../../mail/imap-uw -.endif # IMAP_UW_BUILDLINK3_MK - -.include "../../security/openssl/buildlink3.mk" - -BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} diff --git a/mail/imap-uw/distinfo b/mail/imap-uw/distinfo deleted file mode 100644 index 50ada3c58a0..00000000000 --- a/mail/imap-uw/distinfo +++ /dev/null @@ -1,37 +0,0 @@ -$NetBSD: distinfo,v 1.31 2006/09/11 13:44:27 tron Exp $ - -SHA1 (imap-2004g.tar.Z) = 791a8bb247ca51ce0a4c32e814a2f736c2bcf066 -RMD160 (imap-2004g.tar.Z) = a016a06ba073e879d2574a6395ce1074ea74c687 -Size (imap-2004g.tar.Z) = 2246713 bytes -SHA1 (patch-aa) = e18ec6b1674e71865a8aabe41b5da24c572edcb5 -SHA1 (patch-ab) = fbe43bfc811058433936e6eb61bfc7d69f819e45 -SHA1 (patch-ac) = 802b456555f6e79f60444cfe32d42e053d73cef8 -SHA1 (patch-ad) = e4b64935d0af726d3771489df411454788722727 -SHA1 (patch-ae) = 2e33641db5081e0f15e612db98f841591d5b2dd7 -SHA1 (patch-af) = 5800937da2881849508c9012bc268e5acd2fff3e -SHA1 (patch-ag) = 452fcfc1bd17d3cc65e5012db56d37af25bcf3b6 -SHA1 (patch-ah) = 06d780220e21b4dd4b601f66efb6e73ee95991e2 -SHA1 (patch-ai) = c495ed39fbc01e1d8b05f6acd3d11394978f9b43 -SHA1 (patch-aj) = 607286c1fd5eb97a07ffb812387f6a005aaee9c5 -SHA1 (patch-ak) = c798b2aad17091526c667a552839cfe1ec0e23c9 -SHA1 (patch-al) = 2915edc654c185311e09cef571b443c4a9ff7e3c -SHA1 (patch-am) = 0aea2cbe98da312740e678355b11fc964a822cda -SHA1 (patch-ao) = 777b30793ea2e1f33be14e34d837f1f0cc5d0d67 -SHA1 (patch-ap) = ce224812b0744a699e5e07916ca04510bf62da25 -SHA1 (patch-aq) = 7cf038fcb8e072fa46604ac0ac8c02c0d6d3608e -SHA1 (patch-ar) = 6c7cc6c03b87af90866230624c476c7868e323fe -SHA1 (patch-as) = 3760b2126f761be4d09c807f7d21b0ed7b1b89bb -SHA1 (patch-at) = aeb907f8a9a2438490ecd9dc0251b396b4507968 -SHA1 (patch-au) = 88c14e0f2aa61c34f0255d09f6d00e30328f5c82 -SHA1 (patch-av) = 24043b6d1ed9c4cc9a72735caf82ad5a08ff3ee6 -SHA1 (patch-aw) = 46d108d26b9cc414bb2b3b5f5c5325a3d210bf5e -SHA1 (patch-ax) = 136eebbdac13434659583e370443ab2033969ae3 -SHA1 (patch-ay) = 6004d14891d3f7004af834d2e4b217369e2f6ee1 -SHA1 (patch-az) = 6372149e6fec8ffc5091ef5dcca959884c720d1b -SHA1 (patch-ba) = 64b89d377501861ddeecaf58f845132b95ac8f75 -SHA1 (patch-bb) = 220bfb5885dd73cf3375b26bda6be1ea2d39d069 -SHA1 (patch-bc) = b3cd7d728de313cd00af2d9c99cadc2478006232 -SHA1 (patch-bd) = 2dbffe2f11d1c0c2b05eabe3fc976c230e821709 -SHA1 (patch-be) = 032ae39806995e27aba5ab67089a467d3fbe5597 -SHA1 (patch-bf) = 42eee80df6095a7ca0141306743786f6f44545f8 -SHA1 (patch-bg) = 778318297c8a5af995286e447c23503790152bb9 diff --git a/mail/imap-uw/hacks.mk b/mail/imap-uw/hacks.mk deleted file mode 100644 index a781c361e59..00000000000 --- a/mail/imap-uw/hacks.mk +++ /dev/null @@ -1,13 +0,0 @@ -# $NetBSD: hacks.mk,v 1.1 2006/07/26 20:00:27 jlam Exp $ - -.include "../../mk/compiler.mk" - -### [Thu Jan 23 01:28:36 2003 UTC : dmcmahill] -### On PowerPC, building with optimisation with GCC causes an "attempt -### to free unreference scalar". Remove optimisation flags as a -### workaround until GCC is fixed. -### -.if !empty(CC_VERSION:Mgcc*) && !empty(MACHINE_PLATFORM:MNetBSD-*-alpha) -PKG_HACKS+= alpha-codegen -BUILDLINK_TRANSFORM+= rename:-O[0-9]*:-O -.endif diff --git a/mail/imap-uw/options.mk b/mail/imap-uw/options.mk deleted file mode 100644 index ad394cc12c3..00000000000 --- a/mail/imap-uw/options.mk +++ /dev/null @@ -1,74 +0,0 @@ -# $NetBSD: options.mk,v 1.3 2006/07/26 20:00:27 jlam Exp $ - -.include "../../mk/bsd.prefs.mk" - -PKG_OPTIONS_VAR= PKG_OPTIONS.imap-uw -PKG_SUPPORTED_OPTIONS+= imapuw-cleartextpwd imapuw-whoson inet6 ssl -PKG_SUGGESTED_OPTIONS+= imapuw-cleartextpwd ssl - -# On NetBSD 1.x, using the native Kerberos 5 implementation causes -# interoperability problems with OpenSSL 0.9.7 and above. -# -.if !empty(MACHINE_PLATFORM:MNetBSD-1.*) -CHECK_BUILTIN.heimdal:= yes -. include "../../security/heimdal/builtin.mk" -CHECK_BUILTIN.heimdal:= no -. if !empty(USE_BUILTIN.heimdal:M[nN][oO]) -PKG_SUPPORTED_OPTIONS+= kerberos -. endif -.else -PKG_SUPPORTED_OPTIONS+= kerberos -.endif - -.include "../../mk/bsd.options.mk" - -### -### Support both IPv6 and IPv4 connections. -### -.if !empty(PKG_OPTIONS:Minet6) -MAKE_FLAGS+= IP=6 -.else -MAKE_FLAGS+= IP=4 -.endif - -### -### Support GSSAPI authentication via Kerberos 5. -### -.if !empty(PKG_OPTIONS:Mkerberos) -. include "../../mk/krb5.buildlink3.mk" -MAKE_ENV+= KRB5_TYPE=${KRB5_TYPE} -MAKE_FLAGS+= EXTRAAUTHENTICATORS=gss -EXTRASPECIALS+= GSSDIR=${KRB5BASE} -CFLAGS.heimdal= -DHEIMDAL_KRB5 -CFLAGS+= ${CFLAGS.${KRB5_TYPE}} -.endif - -### -### Support using WHOSON for authentication. -### -.if !empty(PKG_OPTIONS:Mimapuw-whoson) -. include "../../net/whoson/buildlink3.mk" -LDFLAGS+= -lwhoson -CFLAGS+= -DUSE_WHOSON -.endif - -### -### Support SSL/TLS connections. -### -.if !empty(PKG_OPTIONS:Mssl) -. include "../../security/openssl/buildlink3.mk" -. if !empty(PKG_OPTIONS:Mimapuw-cleartextpwd) -MAKE_FLAGS+= SSLTYPE=unix # plaintext auth -. else -MAKE_FLAGS+= SSLTYPE=nopwd # plaintext auth only over SSL/TLS -. endif -MESSAGE_SRC+= ${PKGDIR}/MESSAGE.ssl -MESSAGE_SUBST+= SSLCERTS=${SSLCERTS:Q} -MESSAGE_SUBST+= SSLKEYS=${SSLKEYS:Q} - -EXTRASPECIALS+= SSLDIR=${SSLBASE:Q} -EXTRASPECIALS+= SSLCERTS=${SSLCERTS:Q} -EXTRASPECIALS+= SSLKEYS=${SSLKEYS:Q} -.else -MAKE_FLAGS+= SSLTYPE=none # no SSL/TLS -.endif diff --git a/mail/imap-uw/patches/patch-aa b/mail/imap-uw/patches/patch-aa deleted file mode 100644 index 3068afeb1fc..00000000000 --- a/mail/imap-uw/patches/patch-aa +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-aa,v 1.18 2006/09/11 13:44:27 tron Exp $ - ---- Makefile.orig 2005-04-30 21:50:20.000000000 +0100 -+++ Makefile 2006-09-11 14:18:20.000000000 +0100 -@@ -296,7 +296,7 @@ - - # Note on SCO you may have to set LN to "ln". - --a32 a41 aix bs3 bsi d-g d54 do4 drs epx ga4 gas gh9 ghp ghs go5 gsc gsg gso gul hpp hpx lnp lyn mct mnt neb nec nto nxt nx3 osf os4 ptx qnx sc5 sco sgi sg6 shp sl4 sl5 slx snx soc sol sos uw2: an -+a32 a41 aix bs3 bsi d-g d54 do4 drs epx ga4 gas gh9 ghp ghs go5 gsc gsg gso gul hpp hpx lnp lyn mct mnt neb nec nep nto nxt nx3 osf os4 ptx qnx sc5 sco sgi sg6 shp sl4 sl5 slx snx soc sol sos uw2: an - $(BUILD) BUILDTYPE=$@ - - # If you use sv4, you may find that it works to move it to use the an process. -@@ -474,9 +474,6 @@ - @echo + In order to rectify this problem, you MUST build with: - @echo ++ SSLTYPE=$(SSLTYPE).nopwd - @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -- @echo -- @echo Do you want to continue this build anyway? Type y or n please: -- @$(SH) -c 'read x; case "$$x" in y) exit 0;; *) exit 1;; esac' - - sslnone: - @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -@@ -489,9 +486,6 @@ - @echo ++ SSLTYPE=nopwd - @echo + You must also have OpenSSL or equivalent installed. - @echo +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -- @echo -- @echo Do you want to continue this build anyway? Type y or n please: -- @$(SH) -c 'read x; case "$$x" in y) exit 0;; *) exit 1;; esac' - - - # C compiler types diff --git a/mail/imap-uw/patches/patch-ab b/mail/imap-uw/patches/patch-ab deleted file mode 100644 index 7840e2dc203..00000000000 --- a/mail/imap-uw/patches/patch-ab +++ /dev/null @@ -1,90 +0,0 @@ -$NetBSD: patch-ab,v 1.21 2006/09/11 13:44:27 tron Exp $ - ---- src/osdep/unix/Makefile.orig 2005-04-30 21:51:13.000000000 +0100 -+++ src/osdep/unix/Makefile 2006-09-11 14:19:56.000000000 +0100 -@@ -124,7 +124,7 @@ - - # Normally no need to change any of these - --ARCHIVE=c-client.a -+ARCHIVE=libc-client.la - BINARIES=osdep.o mail.o misc.o newsrc.o smanager.o utf8.o siglocal.o \ - dummy.o pseudo.o netmsg.o flstring.o fdstring.o \ - rfc822.o nntp.o smtp.o imap4r1.o pop3.o \ -@@ -403,9 +403,9 @@ - SPOOLDIR=/var/spool MAILSPOOL=/var/mail \ - ACTIVEFILE=/usr/share/news/active \ - RSHPATH=/usr/bin/rsh \ -- BASECFLAGS="-g $(GCCOPTLEVEL)" \ -+ BASECFLAGS="" \ - BASELDFLAGS="-lsocket -lnsl -lgen" \ -- RANLIB=true CC=gcc -+ RANLIB=true - - gsu: # GCC SUN-OS - $(BUILD) `$(CAT) SPECIALS` OS=sun \ -@@ -495,9 +495,9 @@ - $(BUILD) `$(CAT) SPECIALS` OS=bsi \ - CRXTYPE=nfs \ - SPOOLDIR=/var \ -- ACTIVEFILE=/var/db/news/active \ -+ ACTIVEFILE=/var/news/db/active \ - RSHPATH=/usr/bin/rsh \ -- BASECFLAGS="-g -O -pipe" \ -+ BASECFLAGS="-pipe" \ - BASELDFLAGS="-lcrypt" - - nec: # NEC UX -@@ -510,6 +510,16 @@ - BASELDFLAGS="-lsocket -lnsl -lgen" \ - RANLIB=true CC=/usr/abiccs/bin/cc - -+nep: # NetBSD with PAM -+ $(BUILD) `$(CAT) SPECIALS` OS=bsi \ -+ CHECKPW=pam \ -+ CRXTYPE=nfs \ -+ SPOOLDIR=/var \ -+ ACTIVEFILE=/var/news/db/active \ -+ RSHPATH=/usr/bin/rsh \ -+ BASECFLAGS="-pipe" \ -+ BASELDFLAGS="-lpam" -+ - nto: # QNX Neutrino RTP - $(BUILD) `$(CAT) SPECIALS` OS=$@ \ - CRXTYPE=nfs \ -@@ -549,7 +559,7 @@ - $(BUILD) `$(CAT) SPECIALS` OS=$@ \ - CRXTYPE=nfs \ - SPOOLDIR=/var/spool MAILSPOOL=/var/mail \ -- BASECFLAGS="-g -O -Wno-pointer-sign" -+ BASECFLAGS="-Wno-pointer-sign" - - ptx: # PTX - $(BUILD) `$(CAT) SPECIALS` OS=$@ \ -@@ -811,7 +821,7 @@ - @$(SH) ARCHIVE - - .c.o: -- `$(CAT) CCTYPE` -c `$(CAT) CFLAGS` $*.c -+ $(LTCOMPILE) `$(CAT) CCTYPE` -c `$(CAT) CFLAGS` $*.c - - - # Cleanup -@@ -869,7 +879,7 @@ - @echo pem.h, buffer.h, bio.h, and crypto.h, that means that OpenSSL - @echo is not installed on your system. Either install OpenSSL first - @echo or build with command: make `$(CAT) OSTYPE` SSLTYPE=none -- `$(CAT) CCTYPE` -c `$(CAT) CFLAGS` `$(CAT) OSCFLAGS` -c osdep.c -+ $(LTCOMPILE) `$(CAT) CCTYPE` -c `$(CAT) CFLAGS` `$(CAT) OSCFLAGS` -c osdep.c - - osdep.c: osdepbas.c osdepckp.c osdeplog.c osdepssl.c - $(CAT) osdepbas.c osdepckp.c osdeplog.c osdepssl.c > osdep.c -@@ -924,7 +934,7 @@ - -DACTIVEFILE=\"$(ACTIVEFILE)\" -DNEWSSPOOL=\"$(NEWSSPOOL)\" \ - -DRSHPATH=\"$(RSHPATH)\" -DLOCKPGM=\"$(LOCKPGM)\" > OSCFLAGS - echo $(BASELDFLAGS) $(EXTRALDFLAGS) > LDFLAGS -- echo "$(ARRC) $(ARCHIVE) $(BINARIES);$(RANLIB) $(ARCHIVE)" > ARCHIVE -+ echo "$(LTLINK) $(CC) -o $(ARCHIVE) $(BINARIES:.o=.lo) -rpath $(PREFIX)/lib -version-info $(CCLIENT_MAJOR):$(CCLIENT_MINOR) \`$(CAT) LDFLAGS\`" > ARCHIVE - echo $(OS) > OSTYPE - ./drivers $(EXTRADRIVERS) $(DEFAULTDRIVERS) dummy - ./mkauths $(EXTRAAUTHENTICATORS) $(DEFAULTAUTHENTICATORS) diff --git a/mail/imap-uw/patches/patch-ac b/mail/imap-uw/patches/patch-ac deleted file mode 100644 index 889aa10010e..00000000000 --- a/mail/imap-uw/patches/patch-ac +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ac,v 1.6 2006/07/26 20:00:27 jlam Exp $ - ---- src/mailutil/Makefile.orig 2002-11-18 19:41:46.000000000 -0500 -+++ src/mailutil/Makefile -@@ -19,7 +19,7 @@ - - - C = ../c-client --CCLIENTLIB = $C/c-client.a -+CCLIENTLIB = $C/libc-client.la - SHELL = /bin/sh - - # Get local definitions from c-client directory -@@ -29,7 +29,7 @@ CFLAGS = -I$C `cat $C/CFLAGS` - LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS` - - mailutil: $(CCLIENTLIB) mailutil.o -- $(CC) $(CFLAGS) -o mailutil mailutil.o $(LDFLAGS) -+ $(LTLINK) $(CC) $(CFLAGS) -o mailutil mailutil.o $(LDFLAGS) - - mailutil.o: $C/mail.h $C/misc.h $C/osdep.h - diff --git a/mail/imap-uw/patches/patch-ad b/mail/imap-uw/patches/patch-ad deleted file mode 100644 index 79163224251..00000000000 --- a/mail/imap-uw/patches/patch-ad +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ad,v 1.6 2006/07/26 20:00:27 jlam Exp $ - ---- src/dmail/Makefile.orig 2002-11-18 19:43:31.000000000 -0500 -+++ src/dmail/Makefile -@@ -18,7 +18,7 @@ - - - C = ../c-client --CCLIENTLIB = $C/c-client.a -+CCLIENTLIB = $C/libc-client.la - SHELL = /bin/sh - - # Get local definitions from c-client directory -@@ -28,7 +28,7 @@ CFLAGS = -I$C `cat $C/CFLAGS` - LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS` - - dmail: $(CCLIENTLIB) dmail.o -- $(CC) $(CFLAGS) -o dmail dmail.o $(LDFLAGS) -+ $(LTLINK) $(CC) $(CFLAGS) -o dmail dmail.o $(LDFLAGS) - - dmail.o: $C/mail.h $C/misc.h $C/osdep.h - diff --git a/mail/imap-uw/patches/patch-ae b/mail/imap-uw/patches/patch-ae deleted file mode 100644 index c17bf1315e0..00000000000 --- a/mail/imap-uw/patches/patch-ae +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ae,v 1.16 2006/07/26 20:00:27 jlam Exp $ - ---- src/tmail/Makefile.orig 2002-11-18 19:45:14.000000000 -0500 -+++ src/tmail/Makefile -@@ -18,7 +18,7 @@ - - - C = ../c-client --CCLIENTLIB = $C/c-client.a -+CCLIENTLIB = $C/libc-client.la - SHELL = /bin/sh - - # Get local definitions from c-client directory -@@ -28,7 +28,7 @@ CFLAGS = -I$C `cat $C/CFLAGS` - LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS` - - tmail: $(CCLIENTLIB) tmail.o -- $(CC) $(CFLAGS) -o tmail tmail.o $(LDFLAGS) -+ $(LTLINK) $(CC) $(CFLAGS) -o tmail tmail.o $(LDFLAGS) - - tmail.o: $C/mail.h $C/misc.h $C/osdep.h - diff --git a/mail/imap-uw/patches/patch-af b/mail/imap-uw/patches/patch-af deleted file mode 100644 index 198b4cc5046..00000000000 --- a/mail/imap-uw/patches/patch-af +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-af,v 1.6 2006/07/26 20:00:27 jlam Exp $ - ---- src/osdep/unix/kerb_mit.c.orig 2003-10-17 12:39:42.000000000 -0400 -+++ src/osdep/unix/kerb_mit.c -@@ -18,9 +18,15 @@ - * CPYRIGHT, included with this Distribution. - */ - -+#ifdef HEIMDAL_KRB5 -+#include <gssapi/gssapi.h> -+#include <krb5/krb5.h> -+#define gss_nt_service_name GSS_C_NT_HOSTBASED_SERVICE -+#else - #define PROTOTYPE(x) x - #include <gssapi/gssapi_generic.h> - #include <gssapi/gssapi_krb5.h> -+#endif - - - long kerberos_server_valid (void); diff --git a/mail/imap-uw/patches/patch-ag b/mail/imap-uw/patches/patch-ag deleted file mode 100644 index e51b23a5416..00000000000 --- a/mail/imap-uw/patches/patch-ag +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ag,v 1.4 2005/12/03 00:52:54 joerg Exp $ - ---- src/osdep/unix/os_bsi.c.orig 2005-12-02 23:38:04.000000000 +0000 -+++ src/osdep/unix/os_bsi.c -@@ -30,7 +30,6 @@ - #include <netdb.h> - #include <ctype.h> - #include <errno.h> --extern int errno; /* just in case */ - #include <pwd.h> - #include "misc.h" - diff --git a/mail/imap-uw/patches/patch-ah b/mail/imap-uw/patches/patch-ah deleted file mode 100644 index e0e69af4394..00000000000 --- a/mail/imap-uw/patches/patch-ah +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ah,v 1.7 2005/12/03 00:52:54 joerg Exp $ - ---- src/osdep/unix/dummy.c.orig 2005-12-02 23:44:29.000000000 +0000 -+++ src/osdep/unix/dummy.c -@@ -22,7 +22,6 @@ - #include <stdio.h> - #include <ctype.h> - #include <errno.h> --extern int errno; /* just in case */ - #include "mail.h" - #include "osdep.h" - #include <pwd.h> diff --git a/mail/imap-uw/patches/patch-ai b/mail/imap-uw/patches/patch-ai deleted file mode 100644 index bcd6c2bc8b8..00000000000 --- a/mail/imap-uw/patches/patch-ai +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ai,v 1.4 2004/05/13 18:14:34 adam Exp $ - ---- src/mtest/mtest.c.orig 2004-05-01 17:22:07.000000000 +0000 -+++ src/mtest/mtest.c -@@ -33,6 +33,11 @@ - - /* Excellent reasons to hate ifdefs, and why my real code never uses them */ - -+#if defined(__NetBSD__) /* NetBSD no longer defines unix. */ -+# undef unix -+# define unix 1 -+#endif -+ - #ifndef unix - # define unix 0 - #endif diff --git a/mail/imap-uw/patches/patch-aj b/mail/imap-uw/patches/patch-aj deleted file mode 100644 index 239fb5a2aa6..00000000000 --- a/mail/imap-uw/patches/patch-aj +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-aj,v 1.12 2006/07/26 20:00:27 jlam Exp $ - ---- src/osdep/unix/Makefile.gss.orig 2003-03-04 22:29:59.000000000 -0500 -+++ src/osdep/unix/Makefile.gss -@@ -21,11 +21,13 @@ - # Extended flags needed for additional authenticators. You may need to modify. - - GSSDIR=/usr/local --GSSCFLAGS= -I$(GSSDIR)/include -DGSS_C_NT_HOSTBASED_SERVICE=gss_nt_service_name -+GSSCFLAGS= -I$(GSSDIR)/include -I$(GSSDIR)/include/krb5 - GSSOLDLDFLAGS= -L$(GSSDIR)/lib -lgssapi_krb5 -lkrb5 -lcrypto -lcom_err - GSSNEWLDFLAGS= -L$(GSSDIR)/lib -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err - - gss: # GSSAPI Kerberos V flags - echo $(GSSCFLAGS) >> OSCFLAGS -- sh -c '(test -f $(GSSDIR)/lib/libk5crypto.a) && echo $(GSSNEWLDFLAGS) || echo $(GSSOLDLDFLAGS)' >> LDFLAGS -+ sh -c '(test -f $(GSSDIR)/lib/libk5crypto.a) && echo $(GSSNEWLDFLAGS) || echo $(GSSOLDLDFLAGS)' > LDFLAGS.gss1 -+ sh -c '(test -z "$(KRB5_CONFIG)") || $(KRB5_CONFIG) --libs gssapi' > LDFLAGS.gss2 -+ sh -c '(test -z "$(KRB5_CONFIG)") && cat LDFLAGS.gss1 || cat LDFLAGS.gss2' >> LDFLAGS - echo "#include \"kerb_mit.c\"" >> auths.c diff --git a/mail/imap-uw/patches/patch-ak b/mail/imap-uw/patches/patch-ak deleted file mode 100644 index 5c6dfc4a4e0..00000000000 --- a/mail/imap-uw/patches/patch-ak +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-ak,v 1.2 2005/08/12 19:47:17 tv Exp $ - ---- src/osdep/unix/ckp_gss.c.orig 2005-06-05 19:43:50.000000000 -0400 -+++ src/osdep/unix/ckp_gss.c 2005-08-12 15:08:39.000000000 -0400 -@@ -30,6 +30,7 @@ - { - char tmp[MAILTMPLEN]; - krb5_context ctx; -+ krb5_error error; - krb5_timestamp now; - krb5_principal service; - krb5_creds *crd = (krb5_creds *) memset (fs_get (sizeof (krb5_creds)),0, -@@ -39,7 +40,9 @@ - /* make service name */ - sprintf (tmp,"%s@%s",(char *) mail_parameters (NIL,GET_SERVICENAME,NIL), - tcp_serverhost ()); -- krb5_init_context (&ctx); /* get a context */ -+ error = krb5_init_context (&ctx); /* get a context */ -+ if (error) -+ return NIL; - /* get time, client and server principals */ - if (!krb5_timeofday (ctx,&now) && - !krb5_parse_name (ctx,pw->pw_name,&crd->client) && diff --git a/mail/imap-uw/patches/patch-al b/mail/imap-uw/patches/patch-al deleted file mode 100644 index 497d3cf26dd..00000000000 --- a/mail/imap-uw/patches/patch-al +++ /dev/null @@ -1,55 +0,0 @@ -$NetBSD: patch-al,v 1.6 2006/07/26 20:00:27 jlam Exp $ - ---- src/c-client/auth_gss.c.orig 2005-05-03 20:24:03.000000000 -0400 -+++ src/c-client/auth_gss.c -@@ -18,6 +18,14 @@ - * CPYRIGHT, included with this Distribution. - */ - -+#ifdef HEIMDAL_KRB5 -+#include <gssapi/gssapi.h> -+#include <krb5/krb5.h> -+#define gss_nt_service_name GSS_C_NT_HOSTBASED_SERVICE -+#else -+#include <gssapi/gssapi_generic.h> -+#include <gssapi/gssapi_krb5.h> -+#endif - - long auth_gssapi_valid (void); - long auth_gssapi_client (authchallenge_t challenger,authrespond_t responder, -@@ -56,15 +64,32 @@ long auth_gssapi_valid (void) - OM_uint32 smn; - gss_buffer_desc buf; - gss_name_t name; -+ krb5_context ctx; -+ krb5_keytab kt; -+ krb5_kt_cursor csr; -+ -+ /* make a context */ -+ if (krb5_init_context (&ctx)) -+ return NIL; - /* make service name */ - sprintf (tmp,"%s@%s",(char *) mail_parameters (NIL,GET_SERVICENAME,NIL), - mylocalhost ()); - buf.length = strlen (buf.value = tmp); - /* see if can build a name */ - if (gss_import_name (&smn,&buf,GSS_C_NT_HOSTBASED_SERVICE,&name) != -- GSS_S_COMPLETE) return NIL; -- /* remove server method if no keytab */ -- if (!kerberos_server_valid ()) auth_gss.server = NIL; -+ GSS_S_COMPLETE) { -+ krb5_free_context (ctx); /* finished with context */ -+ return NIL; -+ } -+ -+ /* get default keytab */ -+ if (!krb5_kt_default (ctx,&kt)) { -+ /* can do server if have good keytab */ -+ if (!krb5_kt_start_seq_get (ctx,kt,&csr)) -+ auth_gss.server = auth_gssapi_server; -+ krb5_kt_close (ctx,kt); /* finished with keytab */ -+ } -+ krb5_free_context (ctx); /* finished with context */ - gss_release_name (&smn,&name);/* finished with name */ - return LONGT; - } diff --git a/mail/imap-uw/patches/patch-am b/mail/imap-uw/patches/patch-am deleted file mode 100644 index 14b4c35a903..00000000000 --- a/mail/imap-uw/patches/patch-am +++ /dev/null @@ -1,41 +0,0 @@ -$NetBSD: patch-am,v 1.5 2006/07/26 20:00:27 jlam Exp $ - ---- src/osdep/unix/env_unix.c.orig 2004-09-13 17:31:19.000000000 -0400 -+++ src/osdep/unix/env_unix.c -@@ -21,6 +21,9 @@ - #include <grp.h> - #include <signal.h> - #include <sys/wait.h> -+#ifdef USE_WHOSON -+#include <whoson.h> -+#endif /* USE_WHOSON */ - - /* c-client environment parameters */ - -@@ -567,7 +570,15 @@ long server_login (char *user,char *pwd, - else if (disablePlaintext) err = "disabled"; - else if (!(authuser && *authuser)) pw = valpwd (user,pwd,argc,argv); - else if (valpwd (authuser,pwd,argc,argv)) pw = pwuser (user); -- if (pw && pw_login (pw,authuser,pw->pw_name,NIL,argc,argv)) return T; -+ if (pw && pw_login (pw,authuser,pw->pw_name,NIL,argc,argv)) { -+#ifdef USE_WHOSON -+ struct sockaddr_in sin; -+ int sinlen = sizeof (struct sockaddr_in); -+ if (getpeername(0,(struct sockaddr *) &sin,&sinlen) == 0) -+ wso_login(inet_ntoa(sin.sin_addr),user,NULL,0); -+#endif -+ return T; -+ } - syslog (level|LOG_AUTH,"Login %s user=%.64s auth=%.64s host=%.80s",err, - user,(authuser && *authuser) ? authuser : user,tcp_clienthost ()); - sleep (3); /* slow down possible cracker */ -@@ -830,7 +841,8 @@ char *sysinbox () - { - char tmp[MAILTMPLEN]; - if (!sysInbox) { /* initialize if first time */ -- sprintf (tmp,"%s/%s",MAILSPOOL,myusername ()); -+ /* Substitute SPOOLDIR and MAILBOX appropriately for pkgsrc. */ -+ sprintf (tmp,"%s/%s",@SPOOLDIR@,@MAILBOX@); - sysInbox = cpystr (tmp); /* system inbox is from mail spool */ - } - return sysInbox; diff --git a/mail/imap-uw/patches/patch-ao b/mail/imap-uw/patches/patch-ao deleted file mode 100644 index a86a3cae1ac..00000000000 --- a/mail/imap-uw/patches/patch-ao +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ao,v 1.1 2005/12/03 00:52:54 joerg Exp $ - ---- src/c-client/netmsg.c.orig 2005-12-02 23:46:56.000000000 +0000 -+++ src/c-client/netmsg.c -@@ -21,7 +21,6 @@ - - #include <stdio.h> - #include <errno.h> --extern int errno; /* just in case */ - #include "mail.h" - #include "osdep.h" - #include "misc.h" diff --git a/mail/imap-uw/patches/patch-ap b/mail/imap-uw/patches/patch-ap deleted file mode 100644 index 76535505c5a..00000000000 --- a/mail/imap-uw/patches/patch-ap +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ap,v 1.1 2005/12/03 00:52:54 joerg Exp $ - ---- src/osdep/unix/unix.c.orig 2005-12-02 23:51:06.000000000 +0000 -+++ src/osdep/unix/unix.c -@@ -34,7 +34,6 @@ - #include <stdio.h> - #include <ctype.h> - #include <errno.h> --extern int errno; /* just in case */ - #include <signal.h> - #include "mail.h" - #include "osdep.h" diff --git a/mail/imap-uw/patches/patch-aq b/mail/imap-uw/patches/patch-aq deleted file mode 100644 index d9767a540b4..00000000000 --- a/mail/imap-uw/patches/patch-aq +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-aq,v 1.1 2005/12/03 00:52:54 joerg Exp $ - ---- src/osdep/unix/mbx.c.orig 2005-12-02 23:52:39.000000000 +0000 -+++ src/osdep/unix/mbx.c -@@ -29,7 +29,6 @@ - #include <stdio.h> - #include <ctype.h> - #include <errno.h> --extern int errno; /* just in case */ - #include "mail.h" - #include "osdep.h" - #include <pwd.h> diff --git a/mail/imap-uw/patches/patch-ar b/mail/imap-uw/patches/patch-ar deleted file mode 100644 index e5ef1baba85..00000000000 --- a/mail/imap-uw/patches/patch-ar +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ar,v 1.1 2005/12/03 00:52:54 joerg Exp $ - ---- src/osdep/unix/mmdf.c.orig 2005-12-02 23:59:15.000000000 +0000 -+++ src/osdep/unix/mmdf.c -@@ -22,7 +22,6 @@ - #include <stdio.h> - #include <ctype.h> - #include <errno.h> --extern int errno; /* just in case */ - #include <signal.h> - #include "mail.h" - #include "osdep.h" diff --git a/mail/imap-uw/patches/patch-as b/mail/imap-uw/patches/patch-as deleted file mode 100644 index e4fb5e41454..00000000000 --- a/mail/imap-uw/patches/patch-as +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-as,v 1.1 2005/12/03 00:52:54 joerg Exp $ - ---- src/osdep/unix/tenex.c.orig 2005-12-03 00:01:26.000000000 +0000 -+++ src/osdep/unix/tenex.c -@@ -34,7 +34,6 @@ - #include <stdio.h> - #include <ctype.h> - #include <errno.h> --extern int errno; /* just in case */ - #include "mail.h" - #include "osdep.h" - #include <sys/stat.h> diff --git a/mail/imap-uw/patches/patch-at b/mail/imap-uw/patches/patch-at deleted file mode 100644 index 5053269ade8..00000000000 --- a/mail/imap-uw/patches/patch-at +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-at,v 1.1 2005/12/03 00:52:54 joerg Exp $ - ---- src/osdep/unix/mtx.c.orig 2005-12-03 00:05:28.000000000 +0000 -+++ src/osdep/unix/mtx.c -@@ -29,7 +29,6 @@ - #include <stdio.h> - #include <ctype.h> - #include <errno.h> --extern int errno; /* just in case */ - #include "mail.h" - #include "osdep.h" - #include <pwd.h> diff --git a/mail/imap-uw/patches/patch-au b/mail/imap-uw/patches/patch-au deleted file mode 100644 index aa897012f11..00000000000 --- a/mail/imap-uw/patches/patch-au +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-au,v 1.1 2005/12/03 00:52:54 joerg Exp $ - ---- src/osdep/unix/news.c.orig 2005-12-03 00:09:50.000000000 +0000 -+++ src/osdep/unix/news.c -@@ -22,7 +22,6 @@ - #include <stdio.h> - #include <ctype.h> - #include <errno.h> --extern int errno; /* just in case */ - #include "mail.h" - #include "osdep.h" - #include <sys/stat.h> diff --git a/mail/imap-uw/patches/patch-av b/mail/imap-uw/patches/patch-av deleted file mode 100644 index 1daf1b41666..00000000000 --- a/mail/imap-uw/patches/patch-av +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-av,v 1.1 2005/12/03 00:52:54 joerg Exp $ - ---- src/osdep/unix/phile.c.orig 2005-12-03 00:15:34.000000000 +0000 -+++ src/osdep/unix/phile.c -@@ -22,7 +22,6 @@ - #include <stdio.h> - #include <ctype.h> - #include <errno.h> --extern int errno; /* just in case */ - #include <signal.h> - #include "mail.h" - #include "osdep.h" diff --git a/mail/imap-uw/patches/patch-aw b/mail/imap-uw/patches/patch-aw deleted file mode 100644 index 28c608a231d..00000000000 --- a/mail/imap-uw/patches/patch-aw +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-aw,v 1.1 2005/12/03 00:52:54 joerg Exp $ - ---- src/osdep/unix/mh.c.orig 2005-12-03 00:28:43.000000000 +0000 -+++ src/osdep/unix/mh.c -@@ -22,7 +22,6 @@ - #include <stdio.h> - #include <ctype.h> - #include <errno.h> --extern int errno; /* just in case */ - #include "mail.h" - #include "osdep.h" - #include <pwd.h> diff --git a/mail/imap-uw/patches/patch-ax b/mail/imap-uw/patches/patch-ax deleted file mode 100644 index b8f1d833d11..00000000000 --- a/mail/imap-uw/patches/patch-ax +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ax,v 1.1 2005/12/03 00:52:54 joerg Exp $ - ---- src/osdep/unix/mx.c.orig 2005-12-03 00:43:02.000000000 +0000 -+++ src/osdep/unix/mx.c -@@ -22,7 +22,6 @@ - #include <stdio.h> - #include <ctype.h> - #include <errno.h> --extern int errno; /* just in case */ - #include "mail.h" - #include "osdep.h" - #include <pwd.h> diff --git a/mail/imap-uw/patches/patch-ay b/mail/imap-uw/patches/patch-ay deleted file mode 100644 index 5833c5030b3..00000000000 --- a/mail/imap-uw/patches/patch-ay +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ay,v 1.1 2005/12/03 00:52:55 joerg Exp $ - ---- src/ipopd/ipop2d.c.orig 2005-12-03 00:45:23.000000000 +0000 -+++ src/ipopd/ipop2d.c -@@ -24,7 +24,6 @@ - #include <stdio.h> - #include <ctype.h> - #include <errno.h> --extern int errno; /* just in case */ - #include <signal.h> - #include <time.h> - #include "c-client.h" diff --git a/mail/imap-uw/patches/patch-az b/mail/imap-uw/patches/patch-az deleted file mode 100644 index 44769875263..00000000000 --- a/mail/imap-uw/patches/patch-az +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-az,v 1.1 2005/12/03 00:52:55 joerg Exp $ - ---- src/tmail/tmail.c.orig 2005-12-03 00:46:07.000000000 +0000 -+++ src/tmail/tmail.c -@@ -21,7 +21,6 @@ - #include <stdio.h> - #include <pwd.h> - #include <errno.h> --extern int errno; /* just in case */ - #include <sysexits.h> - #include <sys/file.h> - #include <sys/stat.h> diff --git a/mail/imap-uw/patches/patch-ba b/mail/imap-uw/patches/patch-ba deleted file mode 100644 index 9fd85a47df3..00000000000 --- a/mail/imap-uw/patches/patch-ba +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ba,v 1.1 2005/12/03 00:52:55 joerg Exp $ - ---- src/ipopd/ipop3d.c.orig 2005-12-03 00:46:31.000000000 +0000 -+++ src/ipopd/ipop3d.c -@@ -23,7 +23,6 @@ - #include <stdio.h> - #include <ctype.h> - #include <errno.h> --extern int errno; /* just in case */ - #include <signal.h> - #include <time.h> - #include "c-client.h" diff --git a/mail/imap-uw/patches/patch-bb b/mail/imap-uw/patches/patch-bb deleted file mode 100644 index 9cc7d28a375..00000000000 --- a/mail/imap-uw/patches/patch-bb +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-bb,v 1.1 2005/12/03 00:52:55 joerg Exp $ - ---- src/mailutil/mailutil.c.orig 2005-12-03 00:46:42.000000000 +0000 -+++ src/mailutil/mailutil.c -@@ -21,7 +21,6 @@ - - #include <stdio.h> - #include <errno.h> --extern int errno; /* just in case */ - #include "mail.h" - #include "osdep.h" - #include "misc.h" diff --git a/mail/imap-uw/patches/patch-bc b/mail/imap-uw/patches/patch-bc deleted file mode 100644 index 2950c5c53bd..00000000000 --- a/mail/imap-uw/patches/patch-bc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-bc,v 1.1 2005/12/03 00:52:55 joerg Exp $ - ---- src/imapd/imapd.c.orig 2005-12-03 00:46:59.000000000 +0000 -+++ src/imapd/imapd.c -@@ -23,7 +23,6 @@ - #include <stdio.h> - #include <ctype.h> - #include <errno.h> --extern int errno; /* just in case */ - #include <signal.h> - #include <time.h> - #include "c-client.h" diff --git a/mail/imap-uw/patches/patch-bd b/mail/imap-uw/patches/patch-bd deleted file mode 100644 index ed3201787b5..00000000000 --- a/mail/imap-uw/patches/patch-bd +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-bd,v 1.1 2005/12/03 00:52:55 joerg Exp $ - ---- src/dmail/dmail.c.orig 2005-12-03 00:47:14.000000000 +0000 -+++ src/dmail/dmail.c -@@ -21,7 +21,6 @@ - #include <stdio.h> - #include <pwd.h> - #include <errno.h> --extern int errno; /* just in case */ - #include <sysexits.h> - #include <sys/file.h> - #include <sys/stat.h> diff --git a/mail/imap-uw/patches/patch-be b/mail/imap-uw/patches/patch-be deleted file mode 100644 index 2737608ce21..00000000000 --- a/mail/imap-uw/patches/patch-be +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-be,v 1.1 2006/07/26 20:00:27 jlam Exp $ - ---- src/imapd/Makefile.orig 2004-06-29 17:26:28.000000000 -0400 -+++ src/imapd/Makefile -@@ -45,7 +45,7 @@ SHELL= /bin/sh - # Get local definitions from c-client directory - - C = ../c-client --CCLIENTLIB = $C/c-client.a -+CCLIENTLIB = $C/libc-client.la - CC = `cat $C/CCTYPE` - CFLAGS = -I$C `cat $C/CFLAGS` $(NSBD) $(ENBD) -DANOFILE=\"$(ANO)\" \ - -DALERTFILE=\"$(ALERT)\" -DNNTPFILE=\"$(NNTP)\" \ -@@ -55,7 +55,7 @@ LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS` - all: imapd - - imapd: $(CCLIENTLIB) imapd.o -- $(CC) $(CFLAGS) -o imapd imapd.o $(LDFLAGS) -+ $(LTLINK) $(CC) $(CFLAGS) -o imapd imapd.o $(LDFLAGS) - - imapd.o: $C/mail.h $C/misc.h $C/osdep.h - diff --git a/mail/imap-uw/patches/patch-bf b/mail/imap-uw/patches/patch-bf deleted file mode 100644 index 130c255d7c4..00000000000 --- a/mail/imap-uw/patches/patch-bf +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-bf,v 1.1 2006/07/26 20:00:27 jlam Exp $ - ---- src/ipopd/Makefile.orig 2000-10-24 19:55:07.000000000 -0400 -+++ src/ipopd/Makefile -@@ -19,7 +19,7 @@ - - - C = ../c-client --CCLIENTLIB = $C/c-client.a -+CCLIENTLIB = $C/libc-client.la - SHELL = /bin/sh - - # Get local definitions from c-client directory -@@ -31,10 +31,10 @@ LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS` - ipopd: ipop2d ipop3d - - ipop2d: $(CCLIENTLIB) ipop2d.o -- $(CC) $(CFLAGS) -o ipop2d ipop2d.o $(LDFLAGS) -+ $(LTLINK) $(CC) $(CFLAGS) -o ipop2d ipop2d.o $(LDFLAGS) - - ipop3d: $(CCLIENTLIB) ipop3d.o -- $(CC) $(CFLAGS) -o ipop3d ipop3d.o $(LDFLAGS) -+ $(LTLINK) $(CC) $(CFLAGS) -o ipop3d ipop3d.o $(LDFLAGS) - - ipop2d.o: $C/mail.h $C/misc.h $C/osdep.h - diff --git a/mail/imap-uw/patches/patch-bg b/mail/imap-uw/patches/patch-bg deleted file mode 100644 index a58d65b0ab6..00000000000 --- a/mail/imap-uw/patches/patch-bg +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-bg,v 1.1 2006/07/26 20:00:27 jlam Exp $ - ---- src/mtest/Makefile.orig 2000-10-24 19:55:39.000000000 -0400 -+++ src/mtest/Makefile -@@ -19,7 +19,7 @@ - - - C = ../c-client --CCLIENTLIB = $C/c-client.a -+CCLIENTLIB = $C/libc-client.la - SHELL = /bin/sh - - # Get local definitions from c-client directory -@@ -31,7 +31,7 @@ LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS` - all: mtest - - mtest: $(CCLIENTLIB) mtest.o -- $(CC) $(CFLAGS) -o mtest mtest.o $(LDFLAGS) -+ $(LTLINK) $(CC) $(CFLAGS) -o mtest mtest.o $(LDFLAGS) - - mtest.o: $C/mail.h $C/misc.h $C/osdep.h $C/rfc822.h $C/smtp.h $C/nntp.h - |