summaryrefslogtreecommitdiff
path: root/mail/imap-uw
diff options
context:
space:
mode:
Diffstat (limited to 'mail/imap-uw')
-rw-r--r--mail/imap-uw/Makefile30
-rw-r--r--mail/imap-uw/files/md54
-rw-r--r--mail/imap-uw/files/patch-sum12
-rw-r--r--mail/imap-uw/patches/patch-aa14
-rw-r--r--mail/imap-uw/patches/patch-ab8
-rw-r--r--mail/imap-uw/patches/patch-ae32
-rw-r--r--mail/imap-uw/patches/patch-af15
-rw-r--r--mail/imap-uw/patches/patch-ah8
-rw-r--r--mail/imap-uw/pkg/COMMENT2
-rw-r--r--mail/imap-uw/pkg/MESSAGE11
-rw-r--r--mail/imap-uw/pkg/PLIST16
11 files changed, 91 insertions, 61 deletions
diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile
index affa29164e7..0fe619ae114 100644
--- a/mail/imap-uw/Makefile
+++ b/mail/imap-uw/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2000/04/10 03:21:02 simonb Exp $
+# $NetBSD: Makefile,v 1.11 2000/05/19 03:58:55 jlam Exp $
#
-DISTNAME= imap-4.5
-PKGNAME= imap-uw-4.5
+DISTNAME= imap-4.7c2
+PKGNAME= imap-uw-4.7c2
CATEGORIES= mail
MASTER_SITES= ftp://ftp.cac.washington.edu/imap/
EXTRACT_SUFX= .tar.Z
@@ -10,16 +10,22 @@ EXTRACT_SUFX= .tar.Z
MAINTAINER= tv@netbsd.org
HOMEPAGE= http://www.washington.edu/imap/
-USE_LIBTOOL= yes
+USE_LIBTOOL= # defined
+
+WRKSRC= ${WRKDIR}/imap-4.7c
+MESSAGE_FILE= ${WRKDIR}/MESSAGE
INST_PROG= ${LIBTOOL} ${INSTALL_PROGRAM}
INST_LIB= ${LIBTOOL} ${INSTALL_DATA}
-MESSAGE_FILE= ${WRKDIR}/.MESSAGE
+DOC_DIR= ${PREFIX}/share/doc/imap-uw
do-configure:
- @${SED} -e 's|@PREFIX@|${PREFIX}|' ${WRKSRC}/src/imapd/imapd.8c >${WRKSRC}/imapd.8
- @${SED} -e 's|@PREFIX@|${PREFIX}|' ${WRKSRC}/src/ipopd/ipopd.8c >${WRKSRC}/ipopd.8
- @${SED} -e 's|@PREFIX@|${PREFIX}|' ${PKGDIR}/MESSAGE >${MESSAGE_FILE}
+ ${SED} -e 's|@PREFIX@|${PREFIX}|g' \
+ < ${WRKSRC}/src/imapd/imapd.8c > ${WRKDIR}/imapd.8
+ ${SED} -e 's|@PREFIX@|${PREFIX}|g' \
+ < ${WRKSRC}/src/ipopd/ipopd.8c > ${WRKDIR}/ipopd.8
+ ${SED} -e 's|@PREFIX@|${PREFIX}|g' \
+ < ${PKGDIR}/MESSAGE > ${MESSAGE_FILE}
do-build:
cd ${WRKSRC} && ${MAKE} neb PREFIX=${PREFIX} CC="${LIBTOOL} ${CC}"
@@ -32,9 +38,13 @@ do-install:
${INST_PROG} ${WRKSRC}/ipopd/ipop3d ${PREFIX}/libexec
${INST_PROG} ${WRKSRC}/mtest/mtest ${PREFIX}/sbin
${LN} -sf ${PREFIX}/libexec/imapd ${PREFIX}/sbin/rimapd
- ${INSTALL_MAN} ${WRKSRC}/imapd.8 ${PREFIX}/man/man8
- ${INSTALL_MAN} ${WRKSRC}/ipopd.8 ${PREFIX}/man/man8
+ ${INSTALL_MAN} ${WRKDIR}/imapd.8 ${PREFIX}/man/man8
+ ${INSTALL_MAN} ${WRKDIR}/ipopd.8 ${PREFIX}/man/man8
${LN} -sf ipopd.8 ${PREFIX}/man/man8/ipop2d.8
${LN} -sf ipopd.8 ${PREFIX}/man/man8/ipop3d.8
+ ${INSTALL_DATA_DIR} ${DOC_DIR}
+ ${INSTALL_DATA} ${WRKSRC}/docs/FAQ ${DOC_DIR}
+ ${INSTALL_DATA} ${WRKSRC}/docs/RELNOTES ${DOC_DIR}
+ ${INSTALL_DATA} ${WRKSRC}/docs/*.txt ${DOC_DIR}
.include "../../mk/bsd.pkg.mk"
diff --git a/mail/imap-uw/files/md5 b/mail/imap-uw/files/md5
index a944562cbc6..c37bcab3374 100644
--- a/mail/imap-uw/files/md5
+++ b/mail/imap-uw/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.5 1999/02/08 23:31:59 tron Exp $
+$NetBSD: md5,v 1.6 2000/05/19 03:58:56 jlam Exp $
-MD5 (imap-4.5.tar.Z) = 24e5ff01e0f14ecc647f10a9148a9dbd
+MD5 (imap-4.7c2.tar.Z) = 1a27c7684094a8c94baf294552467060
diff --git a/mail/imap-uw/files/patch-sum b/mail/imap-uw/files/patch-sum
index b54ca032408..7238c3b8300 100644
--- a/mail/imap-uw/files/patch-sum
+++ b/mail/imap-uw/files/patch-sum
@@ -1,11 +1,11 @@
-$NetBSD: patch-sum,v 1.3 1999/11/25 14:32:42 tron Exp $
+$NetBSD: patch-sum,v 1.4 2000/05/19 03:58:56 jlam Exp $
-MD5 (patch-aa) = c385fd7821ae7209ff8c6b73f60829b5
-MD5 (patch-ab) = fff307bd32fb969938366b2731523cd9
+MD5 (patch-aa) = 618edd77602a401a70f2ad0e4f3dcb6c
+MD5 (patch-ab) = 686ca8ed99a8c27ffe8dd873beb995d0
MD5 (patch-ac) = af18863cad9851603b47b604eaffb13c
MD5 (patch-ad) = 7f4bdb112125a0537a7e101093be8d07
-MD5 (patch-ae) = 75b4b34b2882d282cb57c5f0853fe2cf
-MD5 (patch-af) = 0381e9ade01a520a673f6cb2d2a71104
+MD5 (patch-ae) = 5d835b323c7550f645ac16d767988001
+MD5 (patch-af) = 3301d969c79118ae742f824aa9d90812
MD5 (patch-ag) = 0da043e9e17ea708ee15b71d4747ea93
-MD5 (patch-ah) = 77f2d8c0b1bc5cfb088fcc5f4b6420cb
+MD5 (patch-ah) = c0f26ffac24476290f60f25beb30206e
MD5 (patch-ai) = 03c45f118c746a0acb5fc6b39fcb661e
diff --git a/mail/imap-uw/patches/patch-aa b/mail/imap-uw/patches/patch-aa
index 65fd04f5ea9..aa42298053f 100644
--- a/mail/imap-uw/patches/patch-aa
+++ b/mail/imap-uw/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.4 1999/11/25 14:32:43 tron Exp $
+$NetBSD: patch-aa,v 1.5 2000/05/19 03:58:57 jlam Exp $
---- Makefile.orig Wed Jan 27 23:40:30 1999
-+++ Makefile Thu Nov 25 15:22:08 1999
-@@ -32,7 +32,7 @@
+--- Makefile.orig Mon Nov 15 15:20:34 1999
++++ Makefile Tue May 2 15:37:12 2000
+@@ -110,7 +110,7 @@
# *** TEMPORARY FOR PINE 4.10 BUILD ***
@@ -11,12 +11,12 @@ $NetBSD: patch-aa,v 1.4 1999/11/25 14:32:43 tron Exp $
# *** TEMPORARY FOR PINE 4.10 BUILD ***
# Normal command to build IMAP toolkit:
-@@ -392,7 +392,7 @@
+@@ -402,7 +402,7 @@
# *** TEMPORARY FOR PINE 4.10 BUILD ***
echo GSSDIR=$(GSSDIR) >> c-client/EXTRASPECIALS
# *** TEMPORARY FOR PINE 4.10 BUILD ***
-- $(CD) c-client;$(MAKE) $(OS) BUILDOPTIONS='$(BUILDOPTIONS)' $(EXTRASPECIALS)
-+ $(CD) c-client;$(MAKE) $(OS) BUILDOPTIONS='$(BUILDOPTIONS)' $(EXTRASPECIALS) PREFIX=$(PREFIX) CC="$(CC)"
+- $(CD) c-client;$(MAKE) $(OS) BUILDOPTIONS="$(BUILDOPTIONS)" $(EXTRASPECIALS)
++ $(CD) c-client;$(MAKE) $(OS) BUILDOPTIONS="$(BUILDOPTIONS)" $(EXTRASPECIALS) PREFIX=$(PREFIX) CC="$(CC)"
echo $(OS) > OSTYPE
$(TOUCH) rebuild
diff --git a/mail/imap-uw/patches/patch-ab b/mail/imap-uw/patches/patch-ab
index c5d945e47ac..ac71abdef70 100644
--- a/mail/imap-uw/patches/patch-ab
+++ b/mail/imap-uw/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.4 1999/11/25 14:32:43 tron Exp $
+$NetBSD: patch-ab,v 1.5 2000/05/19 03:58:57 jlam Exp $
---- src/imapd/Makefile.orig Sat Nov 21 04:26:03 1998
-+++ src/imapd/Makefile Thu Nov 25 15:13:27 1999
-@@ -52,7 +52,7 @@
+--- src/imapd/Makefile.orig Thu Nov 4 02:50:56 1999
++++ src/imapd/Makefile Tue May 2 15:13:29 2000
+@@ -54,7 +54,7 @@
# Get local definitions from c-client directory
C = ../c-client
diff --git a/mail/imap-uw/patches/patch-ae b/mail/imap-uw/patches/patch-ae
index 76567661746..b357ea83739 100644
--- a/mail/imap-uw/patches/patch-ae
+++ b/mail/imap-uw/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.7 1999/11/25 14:32:43 tron Exp $
+$NetBSD: patch-ae,v 1.8 2000/05/19 03:58:57 jlam Exp $
---- src/osdep/unix/Makefile.orig Wed Jan 27 00:17:39 1999
-+++ src/osdep/unix/Makefile Thu Nov 25 15:08:49 1999
-@@ -95,7 +95,7 @@
+--- src/osdep/unix/Makefile.orig Tue Nov 16 21:05:48 1999
++++ src/osdep/unix/Makefile Tue May 2 15:18:30 2000
+@@ -99,7 +99,7 @@
# Normally no need to change any of these
@@ -11,7 +11,7 @@ $NetBSD: patch-ae,v 1.7 1999/11/25 14:32:43 tron Exp $
BINARIES=mail.o misc.o newsrc.o smanager.o osdep.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 \
-@@ -118,7 +118,7 @@
+@@ -122,7 +122,7 @@
# Here if no make argument established
missing: osdep.h
@@ -20,7 +20,7 @@ $NetBSD: patch-ae,v 1.7 1999/11/25 14:32:43 tron Exp $
osdep.h:
@echo You must specify what type of system
-@@ -375,10 +375,11 @@
+@@ -386,10 +386,11 @@
neb: # NetBSD
$(BUILD) `cat EXTRASPECIALS` OS=bsi \
@@ -34,14 +34,12 @@ $NetBSD: patch-ae,v 1.7 1999/11/25 14:32:43 tron Exp $
BASELDFLAGS="-lcrypt"
nxt: # NEXTSTEP
-@@ -612,8 +613,8 @@
-
- $(ARCHIVE): $(BINARIES)
- sh -c '$(RM) $(ARCHIVE) || true'
-- @cat ARCHIVE
-- @$(SH) ARCHIVE
-+ $(CC) -o $(ARCHIVE) $(BINARIES:.o=.lo) -rpath $(PREFIX)/lib \
-+ -version-info 3:0
-
- # Cleanup
-
+@@ -709,7 +710,7 @@
+ -DACTIVEFILE=\"$(ACTIVEFILE)\" -DNEWSSPOOL=\"$(NEWSSPOOL)\" \
+ -DRSHPATH=\"$(RSHPATH)\" -DLOCKPGM=\"$(LOCKPGM)\" > OSCFLAGS
+ echo $(BASELDFLAGS) $(EXTRALDFLAGS) > LDFLAGS
+- echo "$(ARRC) $(ARCHIVE) $(BINARIES);$(RANLIB) $(ARCHIVE)" > ARCHIVE
++ echo "$(CC) -o $(ARCHIVE) $(BINARIES:.o=.lo) -rpath $(PREFIX)/lib -version-info 4:0" > ARCHIVE
+ ./drivers $(EXTRADRIVERS) $(DEFAULTDRIVERS) dummy
+ ./mkauths $(EXTRAAUTHENTICATORS) $(DEFAULTAUTHENTICATORS)
+ $(LN) os_$(OS).h osdep.h
diff --git a/mail/imap-uw/patches/patch-af b/mail/imap-uw/patches/patch-af
index ccb40840c9a..2e5cff92184 100644
--- a/mail/imap-uw/patches/patch-af
+++ b/mail/imap-uw/patches/patch-af
@@ -1,7 +1,7 @@
-$NetBSD: patch-af,v 1.2 1998/08/07 11:09:38 agc Exp $
+$NetBSD: patch-af,v 1.3 2000/05/19 03:58:57 jlam Exp $
---- src/imapd/imapd.8c.orig Sun Jul 19 11:09:19 1998
-+++ src/imapd/imapd.8c Sun Jul 19 11:09:44 1998
+--- src/imapd/imapd.8c.orig Mon Oct 12 22:31:21 1998
++++ src/imapd/imapd.8c Tue May 2 15:41:45 2000
@@ -3,7 +3,7 @@
.SH NAME
IMAPd \- Internet Message Access Protocol server
@@ -11,3 +11,12 @@ $NetBSD: patch-af,v 1.2 1998/08/07 11:09:38 agc Exp $
.SH DESCRIPTION
.I imapd
is a server which supports the
+@@ -26,7 +26,7 @@
+ by many Unix-based clients. To do this, the
+ .I imapd
+ binary must have a link to
+-.I /etc/rimapd
++.I @PREFIX@/sbin/rimapd
+ since this is where this software expects it to be located.
+ .SH "SEE ALSO"
+ rsh(1C) ipopd(8C)
diff --git a/mail/imap-uw/patches/patch-ah b/mail/imap-uw/patches/patch-ah
index 7496208b4bf..002db1c37ce 100644
--- a/mail/imap-uw/patches/patch-ah
+++ b/mail/imap-uw/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.1 1998/12/07 20:48:16 tv Exp $
+$NetBSD: patch-ah,v 1.2 2000/05/19 03:58:57 jlam Exp $
---- src/osdep/unix/env_unix.c.orig Mon Dec 7 15:48:04 1998
-+++ src/osdep/unix/env_unix.c Mon Dec 7 15:48:21 1998
-@@ -812,7 +812,7 @@
+--- src/osdep/unix/env_unix.c.orig Wed May 3 13:33:01 2000
++++ src/osdep/unix/env_unix.c Thu May 18 23:43:57 2000
+@@ -1127,7 +1127,7 @@
FILE *f = fopen (file,"r");
/* no file or ill-advised usage */
if (!(f && (s = fgets (tmp,MAILTMPLEN,f)) && (t = strchr (s,'\n')) &&
diff --git a/mail/imap-uw/pkg/COMMENT b/mail/imap-uw/pkg/COMMENT
index 9e45c53c42e..a369e136da4 100644
--- a/mail/imap-uw/pkg/COMMENT
+++ b/mail/imap-uw/pkg/COMMENT
@@ -1 +1 @@
-University of Washington's IMAP, POP2, and POP3 server
+University of Washington's IMAP, POP2, and POP3 servers
diff --git a/mail/imap-uw/pkg/MESSAGE b/mail/imap-uw/pkg/MESSAGE
index 523c107f4a1..0ff7c64b368 100644
--- a/mail/imap-uw/pkg/MESSAGE
+++ b/mail/imap-uw/pkg/MESSAGE
@@ -1,13 +1,14 @@
===========================================================================
+$NetBSD: MESSAGE,v 1.5 2000/05/19 03:58:58 jlam Exp $
Add the following to /etc/services:
- imap2 143/tcp # Interim Mail Access Proto v2
- imap2 143/udp
+ imap 143/tcp # Internet Message Access Protocol
+ imap 143/udp
Add the following to /etc/inetd.conf:
- imap2 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
+ 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
To put the changes into effect, reboot the machine or "kill -HUP"
your inetd.
diff --git a/mail/imap-uw/pkg/PLIST b/mail/imap-uw/pkg/PLIST
index 3aa8979830e..86bab37ac9f 100644
--- a/mail/imap-uw/pkg/PLIST
+++ b/mail/imap-uw/pkg/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.5 2000/04/10 03:21:02 simonb Exp $
-lib/libimapuw.so.3.0
+@comment $NetBSD: PLIST,v 1.6 2000/05/19 03:58:58 jlam Exp $
+lib/libimapuw.so.4.0
libexec/imapd
libexec/ipop2d
libexec/ipop3d
@@ -9,3 +9,15 @@ man/man8/ipop2d.8
man/man8/ipop3d.8
sbin/mtest
sbin/rimapd
+share/doc/imap-uw/FAQ
+share/doc/imap-uw/RELNOTES
+share/doc/imap-uw/bugs.txt
+share/doc/imap-uw/calendar.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
+@dirrm share/doc/imap-uw
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-29 14:34:52 +0000