diff options
author | Steve Price <steve@FreeBSD.org> | 1998-11-21 20:01:56 +0000 |
---|---|---|
committer | Steve Price <steve@FreeBSD.org> | 1998-11-21 20:01:56 +0000 |
commit | 4045bded6952799c8c3404ef8ccd9f3ec5955f37 (patch) | |
tree | 854433bef3b80254aab5c3df5de942eb8b0665a7 /mail | |
parent | The qgl port has been subsumed by the Qt ports with version greater (diff) |
Update to version 4.4.
PR: 8760
Submitted by: maintainer
Notes
Notes:
svn path=/head/; revision=14741
Diffstat (limited to 'mail')
-rw-r--r-- | mail/imap-uw/Makefile | 33 | ||||
-rw-r--r-- | mail/imap-uw/distinfo | 3 | ||||
-rw-r--r-- | mail/imap-uw/files/patch-ab | 54 | ||||
-rw-r--r-- | mail/imap-uw/files/patch-ac | 12 | ||||
-rw-r--r-- | mail/imap-uw/pkg-comment | 2 | ||||
-rw-r--r-- | mail/imap-uw/pkg-descr | 6 | ||||
-rw-r--r-- | mail/imap-uw/pkg-plist | 6 |
7 files changed, 59 insertions, 57 deletions
diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile index c7ee09d22500..28054570e10c 100644 --- a/mail/imap-uw/Makefile +++ b/mail/imap-uw/Makefile @@ -1,16 +1,15 @@ # New ports collection makefile for: imap-uw -# Version required: 4.2 +# Version required: 4.4 # Date created: 9 Jan 1997 # Whom: pst # -# $Id: Makefile,v 1.21 1998/10/26 13:54:20 steve Exp $ +# $Id: Makefile,v 1.22 1998/11/14 09:43:19 asami Exp $ # -DISTNAME= imap-4.2 -PKGNAME= imap-uw-4.2 +DISTNAME= imap-4.4 +PKGNAME= imap-uw-4.4 CATEGORIES= mail -MASTER_SITES= ftp://ftp.cac.washington.edu/imap/old/ \ - http://www.freebsd.org/~steve/ +MASTER_SITES= ftp://ftp.cac.washington.edu/imap/ EXTRACT_SUFX= .tar.Z MAINTAINER= imap-uw@freebsd.ady.ro @@ -18,26 +17,32 @@ MAINTAINER= imap-uw@freebsd.ady.ro ALL_TARGET= bsf MAN8= ipopd.8 imapd.8 +SHLIBBASE= c-client4 +SHLIBMAJ= 4 +SHLIBNAME= lib${SHLIBBASE}.so.${SHLIBMAJ} +MAKE_ENV= SHLIBNAME=${SHLIBNAME} SHLIBBASE=${SHLIBBASE} +PLIST_SUB= SHLIBNAME=${SHLIBNAME} SHLIBBASE=${SHLIBBASE} + .include <bsd.port.pre.mk> -.if ${PORTOBJFORMAT} == "elf" -SHLIB= libc-client.so.2 -.else -SHLIB= libc-client.so.2.1 +.if ${PORTOBJFORMAT} == "aout" +SHLIBNAME= lib${SHLIBBASE}.so.${SHLIBMAJ}.0 .endif -#pre-build: -# @chmod 755 ${WRKSRC}/src/osdep/unix/drivers ${WRKSRC}/src/osdep/unix/mkauths +post-configure: + @${ECHO_MSG} ">> The c-client shared library will be named ${SHLIBNAME}" # this rule currently isn't called or used, because it's not sufficient to # install just the .a file and mail.h, so we shouldn't install anything at all! +# Remark: only the shared library version is built now ! install-lib: ${INSTALL_DATA} ${WRKSRC}/c-clinet/mail.h ${PREFIX}/include ${INSTALL_DATA} ${WRKSRC}/c-client/c-client.a ${PREFIX}/lib/libc-client.a do-install: - ${INSTALL_DATA} ${WRKSRC}/c-client/${SHLIB} ${PREFIX}/lib - ${LN} -sf ${SHLIB} ${PREFIX}/lib/libc-client.so + ${INSTALL} ${COPY} ${STRIP} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \ + ${WRKSRC}/c-client/${SHLIBNAME} ${PREFIX}/lib + ${LN} -sf ${SHLIBNAME} ${PREFIX}/lib/lib${SHLIBBASE}.so ${INSTALL_PROGRAM} ${WRKSRC}/imapd/imapd ${PREFIX}/libexec ${INSTALL_PROGRAM} ${WRKSRC}/ipopd/ipop2d ${PREFIX}/libexec ${INSTALL_PROGRAM} ${WRKSRC}/ipopd/ipop3d ${PREFIX}/libexec diff --git a/mail/imap-uw/distinfo b/mail/imap-uw/distinfo index 20c9026c183a..ed8849c59fa2 100644 --- a/mail/imap-uw/distinfo +++ b/mail/imap-uw/distinfo @@ -1 +1,2 @@ -MD5 (imap-4.2.tar.Z) = 95931aee4838a37173e8522fb09f9f63 +MD5 (imap-4.4.tar.Z) = 89b1cc8031c4a12da102fb1bc9f842c9 +SIZE (imap-4.4.tar.Z) = 1656459 diff --git a/mail/imap-uw/files/patch-ab b/mail/imap-uw/files/patch-ab index 59d55db387b5..b174a8355cd2 100644 --- a/mail/imap-uw/files/patch-ab +++ b/mail/imap-uw/files/patch-ab @@ -1,12 +1,6 @@ ---- src/osdep/unix/Makefile.orig Thu Jul 16 14:12:22 1998 -+++ src/osdep/unix/Makefile Mon Oct 12 19:21:56 1998 -@@ -88,12 +88,12 @@ - - # Normally no need to change any of these - --ARCHIVE=c-client.a -+ARCHIVE=libc-client.a - BINARIES=mail.o misc.o newsrc.o smanager.o osdep.o utf8.o siglocal.o \ +--- src/osdep/unix/Makefile.orig Wed Sep 9 00:02:26 1998 ++++ src/osdep/unix/Makefile Thu Nov 19 14:00:02 1998 +@@ -93,7 +93,7 @@ dummy.o pseudo.o netmsg.o flstring.o fdstring.o \ rfc822.o nntp.o smtp.o imap4r1.o pop3.o \ unix.o mbox.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o @@ -15,28 +9,18 @@ MAKE=make MV=mv RM=rm -rf -@@ -108,6 +108,15 @@ +@@ -108,6 +108,10 @@ PASSWDTYPE=$(PASSWDTYPE) AFSDIR=$(AFSDIR) GSSDIR=$(GSSDIR) BUILD=$(MAKE) build $(BUILDOPTIONS) $(EXTRASPECIALS) +# Need this for the shared library rule to work correctly +.SUFFIXES: .o .so -+.if ${PORTOBJFORMAT} == "elf" -+SHLIB=libc-client.so.2 -+.else -+SHLIB=libc-client.so.2.1 -+.endif +SOFILES=${BINARIES:.o=.so} + # Here if no make argument established missing: osdep.h -@@ -179,11 +188,11 @@ - BASECFLAGS="-g -Dconst= -DNFSKLUDGE" - - bsf: # FreeBSD -- $(BUILD) OS=bsi SIGTYPE=psx \ -+ $(BUILD) $(SHLIB) OS=bsi SIGTYPE=psx \ +@@ -183,7 +187,7 @@ SPOOLDIR=/var \ ACTIVEFILE=/usr/local/news/lib/active \ RSHPATH=/usr/bin/rsh \ @@ -45,16 +29,28 @@ BASELDFLAGS="-lcrypt" bsi: # BSD/i386 -@@ -565,10 +574,21 @@ +@@ -565,19 +569,31 @@ + + # Build it! + +-build: clean once $(ARCHIVE) ++build: clean once $(SHLIBNAME) + +-all: $(ARCHIVE) ++all: $(SHLIBNAME) + + $(ARCHIVE): $(BINARIES) + sh -c '$(RM) $(ARCHIVE) || true' @cat ARCHIVE @$(SH) ARCHIVE -+$(SHLIB): $(SOFILES) ++$(SHLIBNAME): $(SOFILES) +.if $(PORTOBJFORMAT) == "elf" -+ ld -shared -x -soname $(SHLIB) -o $(SHLIB) $(SOFILES) ++ ld -shared -x -soname $(SHLIBNAME) -o $(SHLIBNAME) $(SOFILES) +.else -+ ld -Bshareable -x -o $(SHLIB) $(SOFILES) ++ ld -Bshareable -x -o $(SHLIBNAME) $(SOFILES) +.endif ++ ln -s $(SHLIBNAME) lib$(SHLIBBASE).so + +.c.so: osdep.h + $(CC) -fpic -DPIC -c $(CFLAGS) ${@:.so=.c} -o $@ @@ -63,11 +59,11 @@ clean: sh -c '$(RM) auths.c flockbsd.c linkage.[ch] siglocal.c osdep*.[ch] *.o ARCHIVE *FLAGS *TYPE $(ARCHIVE) || true' -+ $(RM) *.so $(SHLIB) ++ $(RM) *.so $(SHLIBNAME) # Dependencies -@@ -602,7 +622,7 @@ +@@ -611,7 +627,7 @@ # OS-dependent @@ -76,7 +72,7 @@ osdep.h env_unix.h tcp_unix.h \ osdep.c env_unix.c fs_unix.c ftl_unix.c nl_unix.c tcp_unix.c \ auths.c flock.c flockbsd.c flcksafe.c fsync.c gethstid.c \ -@@ -614,7 +634,12 @@ +@@ -623,7 +639,12 @@ write.c \ strerror.c strpbrk.c strstr.c strtok.c strtoul.c \ OSCFLAGS @@ -85,7 +81,7 @@ $(CC) $(CFLAGS) `cat OSCFLAGS` -c osdep.c + +osdep.so: $(OSDEPS) -+ $(CC) $(CFLAGS) `cat OSCFLAGS` -c osdep.c -o $@ -fpic -DPIC ++ $(CC) -fpic -DPIC -c $(CFLAGS) `cat OSCFLAGS` osdep.c -o $@ osdep.c: osdepbas.c osdepckp.c osdeplog.c sh -c '$(RM) osdep.c || true' diff --git a/mail/imap-uw/files/patch-ac b/mail/imap-uw/files/patch-ac index c5401a0c9688..20d966020d0e 100644 --- a/mail/imap-uw/files/patch-ac +++ b/mail/imap-uw/files/patch-ac @@ -1,5 +1,5 @@ --- src/imapd/Makefile.orig Wed Apr 15 01:41:45 1998 -+++ src/imapd/Makefile Sun May 24 10:46:34 1998 ++++ src/imapd/Makefile Sat Oct 10 21:47:24 1998 @@ -31,8 +31,8 @@ # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. @@ -16,29 +16,29 @@ CFLAGS = -I$C `cat $C/CFLAGS` -DALERTFILE=\"$(ALERT)\" -DANOFILE=\"$(ANO)\" \ $(EXTRACFLAGS) -LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS` -+LDFLAGS = -L$C -lc-client `cat $C/LDFLAGS` ++LDFLAGS = -L$C -l$(SHLIBBASE) `cat $C/LDFLAGS` all: imapd --- src/ipopd/Makefile.orig Wed Apr 15 01:41:55 1998 -+++ src/ipopd/Makefile Sun May 24 10:46:34 1998 ++++ src/ipopd/Makefile Sat Oct 10 21:48:00 1998 @@ -39,7 +39,7 @@ CC = `cat $C/CCTYPE` CFLAGS = -I$C `cat $C/CFLAGS` -LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS` -+LDFLAGS = -L$C -lc-client `cat $C/LDFLAGS` ++LDFLAGS = -L$C -l$(SHLIBBASE) `cat $C/LDFLAGS` ipopd: ipop2d ipop3d --- src/mtest/Makefile.orig Wed Apr 15 01:42:04 1998 -+++ src/mtest/Makefile Sun May 24 10:46:34 1998 ++++ src/mtest/Makefile Sat Oct 10 21:48:18 1998 @@ -39,7 +39,7 @@ CC = `cat $C/CCTYPE` CFLAGS = -I$C `cat $C/CFLAGS` -LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS` -+LDFLAGS = -L$C -lc-client `cat $C/LDFLAGS` ++LDFLAGS = -L$C -l$(SHLIBBASE) `cat $C/LDFLAGS` all: mtest diff --git a/mail/imap-uw/pkg-comment b/mail/imap-uw/pkg-comment index 6e18efcd21cf..f644776e13aa 100644 --- a/mail/imap-uw/pkg-comment +++ b/mail/imap-uw/pkg-comment @@ -1 +1 @@ -University of Washington IMAPv4.1/POP2/POP3 mail servers +University of Washington IMAP4rev1/POP2/POP3 mail servers diff --git a/mail/imap-uw/pkg-descr b/mail/imap-uw/pkg-descr index ba8e165b67be..8d3be9e81bf5 100644 --- a/mail/imap-uw/pkg-descr +++ b/mail/imap-uw/pkg-descr @@ -1,4 +1,4 @@ -This is the IMAP v4 server from the University of Washington. +This is the IMAP4rev1 server from the University of Washington. Included are backwares-comaptible (almost) POP2 and POP3 servers. ipop2d POP2 daemon @@ -10,11 +10,11 @@ The ipop2d, ipop3d, and imapd daemons should be invoked by your pop2 stream tcp nowait root /usr/local/libexec/ipop2d ipop2d pop3 stream tcp nowait root /usr/local/libexec/ipop3d ipop3d -imap2 stream tcp nowait root /usr/local/libexec/imapd imapd +imap4 stream tcp nowait root /usr/local/libexec/imapd imapd You may also have to edit your /etc/services (or Yellow Pages, NetInfo, etc. equivalent) to register these services, such as: pop 109/tcp pop3 110/tcp -imap2 143/tcp [imap2 and imap4 share the same port again] +imap4 143/tcp [imap2 and imap4 share the same port again] diff --git a/mail/imap-uw/pkg-plist b/mail/imap-uw/pkg-plist index 579d5f5f39e5..1a9209c30646 100644 --- a/mail/imap-uw/pkg-plist +++ b/mail/imap-uw/pkg-plist @@ -1,8 +1,8 @@ bin/mboxtest -lib/libc-client.so -lib/libc-client.so.2.1 +lib/%%SHLIBNAME%% +lib/lib%%SHLIBBASE%%.so @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B -@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B +@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R libexec/imapd libexec/ipop2d libexec/ipop3d |