7 files changed, 131 insertions, 130 deletions

diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile
index caa140833199..a8b2b5c4d500 100644
--- a/mail/imap-uw/Makefile
+++ b/mail/imap-uw/Makefile
@@ -20,9 +20,10 @@ DISTFILES=	${DISTNAME}2${EXTRACT_SUFX} \
 
 MAINTAINER=	imap-uw@freebsd.ady.ro
 
+LIB_DEPENDS=	c-client4.7:${PORTSDIR}/mail/cclient
+
 Y2K=		http://www.washington.edu/imap/IMAP-FAQs/FAQ-00002.html
 
-INSTALLS_SHLIB=	yes
 PAMAUTH?=	yes
 .if ${PAMAUTH} != "no"
 ALL_TARGET=	bfp
@@ -31,42 +32,17 @@ ALL_TARGET=	bsf
 .endif
 MAN8=		ipopd.8 imapd.8
 
-SHLIBBASE=	c-client4
-SHLIBMAJ=	7
-SHLIBNAME=	lib${SHLIBBASE}.so.${SHLIBMAJ}
-MAKE_ENV=	SHLIBNAME=${SHLIBNAME} SHLIBBASE=${SHLIBBASE}
-PLIST_SUB=	SHLIBNAME=${SHLIBNAME} SHLIBBASE=${SHLIBBASE}
-
 .include <bsd.port.pre.mk>
 
-.if ${PORTOBJFORMAT} == "aout"
-SHLIBNAME=	lib${SHLIBBASE}.so.${SHLIBMAJ}.0
-.endif
-
 pre-extract:
 .if !defined(BATCH) && !defined(PACKAGE_BUILDING)
 	@${SH} ${PKGDIR}/INSTALL foo PRE-INSTALL || ${FALSE}
 .endif
 
-post-configure:
-	@${ECHO_MSG} ">> The c-client shared library will be named ${SHLIBNAME}"
-.if ${PAMAUTH} != "no"
-	@${ECHO_MSG} ">> Building with PAM support"
-	@${ECHO_MSG} ">> You can disable PAM support building with \"PAMAUTH=no\""
-.endif
-
 post-build:
 	@(cd ${WRKDIR}/mlock; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} all)
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/c-client/mail.h ${PREFIX}/include
-	${INSTALL_DATA} ${WRKSRC}/c-client/rfc822.h ${PREFIX}/include
-	${INSTALL_DATA} ${WRKSRC}/c-client/linkage.h ${PREFIX}/include
-	${INSTALL} ${COPY} ${STRIP} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
-		${WRKSRC}/c-client/${SHLIBNAME} ${PREFIX}/lib
-	${LN} -sf ${SHLIBNAME} ${PREFIX}/lib/lib${SHLIBBASE}.so
-	${INSTALL_DATA} ${WRKSRC}/c-client/c-client.a \
-		${PREFIX}/lib/lib${SHLIBBASE}.a
 	${INSTALL_PROGRAM} ${WRKSRC}/imapd/imapd ${PREFIX}/libexec
 	${INSTALL_PROGRAM} ${WRKSRC}/ipopd/ipop2d ${PREFIX}/libexec
 	${INSTALL_PROGRAM} ${WRKSRC}/ipopd/ipop3d ${PREFIX}/libexec
@@ -78,9 +54,4 @@ do-install:
 	${INSTALL_MAN} \
 		${WRKSRC}/src/ipopd/ipopd.8c ${PREFIX}/man/man8/ipopd.8
 
-post-install:
-.if ${PAMAUTH} != "no"
-	@${CAT} ${PKGMESSAGE}
-.endif
-
 .include <bsd.port.post.mk>
diff --git a/mail/imap-uw/files/patch-ab b/mail/imap-uw/files/patch-ab
index f7ff4debaed3..528cd9025a23 100644
--- a/mail/imap-uw/files/patch-ab
+++ b/mail/imap-uw/files/patch-ab
@@ -1,11 +1,11 @@
---- src/osdep/unix/Makefile.orig	Wed Nov 17 04:05:48 1999
-+++ src/osdep/unix/Makefile	Sun Feb 13 14:06:11 2000
+--- src/osdep/unix/Makefile.orig	Tue Nov 16 18:05:48 1999
++++ src/osdep/unix/Makefile	Fri Jul  7 00:38:22 2000
 @@ -86,7 +86,7 @@
  # Commands possibly overriden by the individual port
  
  ARRC=ar rc
 -CC=cc
-+#CC=cc
++CC?=cc
  LN=ln -s
  RANLIB=ranlib
  
@@ -18,18 +18,7 @@
  MAKE=make
  MV=mv
  RM=rm -rf
-@@ -119,6 +119,10 @@
-  PASSWDTYPE=$(PASSWDTYPE) SPECIALAUTHENTICATORS="$(SPECIALAUTHENTICATORS)"
- BUILD=$(MAKE) build $(BUILDOPTIONS)
- 
-+# Need this for the shared library rule to work correctly
-+.SUFFIXES: .o .so
-+SOFILES=${BINARIES:.o=.so}
-+
- # Here if no make argument established
- 
- missing: osdep.h
-@@ -178,6 +182,15 @@
+@@ -178,6 +178,15 @@
  	 BASECFLAGS="-g -B/usr/lib/big/ -Dvoid=char -Dconst= -DNFSKLUDGE" \
  	 RANLIB=true ARRC="ar -rc"
  
@@ -45,7 +34,7 @@
  bs3:	# BSD/i386 3.0 or higher
  	$(BUILD) `cat EXTRASPECIALS` OS=bsi CHECKPW=bsi LOGINPW=bsi \
  	 SPOOLDIR=/var NEWSSPOOL=/var/news/spool \
-@@ -194,7 +207,8 @@
+@@ -194,7 +203,8 @@
  	 SPOOLDIR=/var \
  	 ACTIVEFILE=/usr/local/news/lib/active \
  	 RSHPATH=/usr/bin/rsh \
@@ -55,59 +44,15 @@
  	 BASELDFLAGS="-lcrypt"
  
  bsi:	# BSD/i386
-@@ -627,19 +641,31 @@
+@@ -627,9 +637,9 @@
  
  # Build it!
  
 -build:	clean once $(ARCHIVE)
-+build:	clean once $(ARCHIVE) $(SHLIBNAME)
++build:	clean all
  
 -all:	$(ARCHIVE)
-+all:	$(ARCHIVE) $(SHLIBNAME)
++all:	onceenv
  
  $(ARCHIVE): $(BINARIES)
  	sh -c '$(RM) $(ARCHIVE) || true'
- 	@cat ARCHIVE
- 	@$(SH) ARCHIVE
- 
-+$(SHLIBNAME): $(SOFILES)
-+.if $(PORTOBJFORMAT) == "elf"
-+	ld -shared -x -soname $(SHLIBNAME) -o $(SHLIBNAME) $(SOFILES)
-+.else
-+	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 $@
-+
- # Cleanup
- 
- clean:
- 	sh -c '$(RM) auths.c flockbsd.c linkage.[ch] siglocal.c osdep*.[ch] *.o ARCHIVE *FLAGS *TYPE $(ARCHIVE) || true'
-+	$(RM) *.so $(SHLIBNAME)
- 
- 
- # Dependencies
-@@ -673,7 +699,7 @@
- 
- # OS-dependent
- 
--osdep.o:mail.h misc.h env.h fs.h ftl.h nl.h tcp.h \
-+OSDEPS= mail.h misc.h env.h fs.h ftl.h nl.h tcp.h \
- 	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 \
-@@ -685,7 +711,12 @@
- 	write.c \
- 	strerror.c strpbrk.c strstr.c strtok.c strtoul.c \
- 	OSCFLAGS
-+
-+osdep.o: $(OSDEPS)
- 	$(CC) $(CFLAGS) `cat OSCFLAGS` -c osdep.c
-+
-+osdep.so: $(OSDEPS)
-+	$(CC) -fpic -DPIC -c $(CFLAGS) `cat OSCFLAGS` osdep.c -o $@
- 
- osdep.c: osdepbas.c osdepckp.c osdeplog.c
- 	cat osdepbas.c osdepckp.c osdeplog.c > osdep.c
diff --git a/mail/imap-uw/files/patch-ac b/mail/imap-uw/files/patch-ac
index 9d324e6b5e40..5d635ea2d0a1 100644
--- a/mail/imap-uw/files/patch-ac
+++ b/mail/imap-uw/files/patch-ac
@@ -1,5 +1,5 @@
---- src/imapd/Makefile.orig	Sat Nov 21 05:26:03 1998
-+++ src/imapd/Makefile	Sat Feb 27 17:19:33 1999
+--- src/imapd/Makefile.orig	Wed Nov  3 23:50:56 1999
++++ src/imapd/Makefile	Fri Jul  7 00:31:53 2000
 @@ -31,9 +31,9 @@
  # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  
@@ -12,34 +12,29 @@
  SHELL= /bin/sh
  
  #  The "Manage Mail" menu item of Netscape Messager puts up an error message
-@@ -56,7 +56,7 @@
+@@ -54,21 +54,16 @@
+ # Get local definitions from c-client directory
+ 
+ C = ../c-client
+-CCLIENTLIB = $C/c-client.a
++#CCLIENTLIB = $C/c-client.a
  CC = `cat $C/CCTYPE`
- CFLAGS = -I$C `cat $C/CFLAGS` $(EXTRACFLAGS) -DANOFILE=\"$(ANO)\" \
+-CFLAGS = -I$C `cat $C/CFLAGS` $(EXTRACFLAGS) -DANOFILE=\"$(ANO)\" \
++CFLAGS = `cat $C/CFLAGS` $(EXTRACFLAGS) -DANOFILE=\"$(ANO)\" \
  	-DALERTFILE=\"$(ALERT)\" -DUSERALERTFILE=\"$(USERALERT)\"
 -LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS`
-+LDFLAGS = -L$C -l$(SHLIBBASE) `cat $C/LDFLAGS`
++LDFLAGS = $(EXTRALDFLAGS) `cat $C/LDFLAGS`
  
  all:	imapd
  
---- src/ipopd/Makefile.orig	Wed Apr 15 01:41:55 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 -l$(SHLIBBASE) `cat $C/LDFLAGS`
- 
- ipopd: ipop2d ipop3d
- 
---- src/mtest/Makefile.orig	Wed Apr 15 01:42:04 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 -l$(SHLIBBASE) `cat $C/LDFLAGS`
- 
- all:	mtest
- 
+-imapd: $(CCLIENTLIB) imapd.o
++imapd: imapd.o
+ 	$(CC) $(CFLAGS) -o imapd imapd.o $(LDFLAGS)
+-
+-imapd.o: $C/mail.h $C/misc.h $C/osdep.h
+-
+-$(CCLIENTLIB):
+-	cd $C;make
+ 
+ clean:
+ 	rm -f *.o imapd || true
diff --git a/mail/imap-uw/files/patch-ad b/mail/imap-uw/files/patch-ad
index 464a98cd60ec..d5c962c5dfae 100644
--- a/mail/imap-uw/files/patch-ad
+++ b/mail/imap-uw/files/patch-ad
@@ -1,5 +1,5 @@
---- Makefile.orig	Mon Nov 15 22:20:34 1999
-+++ Makefile	Sun Dec 19 14:52:58 1999
+--- Makefile.orig	Mon Nov 15 12:20:34 1999
++++ Makefile	Fri Jul  7 00:35:00 2000
 @@ -49,6 +49,7 @@
  # art	AIX 2.2.1 for RT
  # asv	Altos SVR4
@@ -8,7 +8,34 @@
  # bs3	BSD/i386 3.0 and higher
  # bsd	generic BSD 4.3 (as in ancient 1980s version)
  # bsf	FreeBSD
-@@ -293,7 +294,7 @@
+@@ -244,12 +245,12 @@
+ #	gradually-increasing intervals, starting at 2800-2900, and becoming
+ #	permanent at 48,300.
+ 
+-EXTRACFLAGS=
++EXTRACFLAGS=-I$(PREFIX)/include/c-client
+ 
+ 
+ # Extra linker flags (additional/alternative libraries, etc.)
+ 
+-EXTRALDFLAGS=
++EXTRALDFLAGS=-L$(PREFIX)/lib -lc-client4
+ 
+ 
+ # Special make flags (e.g. to override make environment variables)
+@@ -285,15 +286,15 @@
+ 
+ all:	c-client rebuild bundled
+ 
+-c-client:
+-	@echo Not processed yet.  In a first-time build, you must specify
+-	@echo the system type so that the sources are properly processed.
+-	@false
++#c-client:
++#	@echo Not processed yet.  In a first-time build, you must specify
++#	@echo the system type so that the sources are properly processed.
++#	@false
+ 
  
  # Note on SCO you may have to set LN to "ln".
  
diff --git a/mail/imap-uw/files/patch-af b/mail/imap-uw/files/patch-af
new file mode 100644
index 000000000000..0520676e2461
--- /dev/null
+++ b/mail/imap-uw/files/patch-af
@@ -0,0 +1,37 @@
+--- src/ipopd/Makefile.orig	Tue Apr 14 15:41:55 1998
++++ src/ipopd/Makefile	Fri Jul  7 00:27:30 2000
+@@ -32,29 +32,22 @@
+ 
+ 
+ C = ../c-client
+-CCLIENTLIB = $C/c-client.a
++#CCLIENTLIB = $C/c-client.a
+ SHELL = /bin/sh
+ 
+ # Get local definitions from c-client directory
+ 
+ CC = `cat $C/CCTYPE`
+-CFLAGS = -I$C `cat $C/CFLAGS`
+-LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS`
++CFLAGS = `cat $C/CFLAGS`
++LDFLAGS = `cat $C/LDFLAGS`
+ 
+ ipopd: ipop2d ipop3d
+ 
+-ipop2d: $(CCLIENTLIB) ipop2d.o
++ipop2d: ipop2d.o
+ 	$(CC) $(CFLAGS) -o ipop2d ipop2d.o $(LDFLAGS)
+ 
+-ipop3d: $(CCLIENTLIB) ipop3d.o
++ipop3d: ipop3d.o
+ 	$(CC) $(CFLAGS) -o ipop3d ipop3d.o $(LDFLAGS)
+-
+-ipop2d.o: $C/mail.h $C/misc.h $C/osdep.h
+-
+-ipop3d.o: $C/mail.h $C/misc.h $C/osdep.h
+-
+-$(CCLIENTLIB):
+-	cd $C;make
+ 
+ clean:
+ 	rm -f *.o ipop2d ipop3d || true
diff --git a/mail/imap-uw/files/patch-ag b/mail/imap-uw/files/patch-ag
new file mode 100644
index 000000000000..d21bfc9e34ee
--- /dev/null
+++ b/mail/imap-uw/files/patch-ag
@@ -0,0 +1,32 @@
+--- src/mtest/Makefile.orig	Tue Apr 14 15:42:04 1998
++++ src/mtest/Makefile	Fri Jul  7 00:28:59 2000
+@@ -32,24 +32,20 @@
+ 
+ 
+ C = ../c-client
+-CCLIENTLIB = $C/c-client.a
++#CCLIENTLIB = $C/c-client.a
+ SHELL = /bin/sh
+ 
+ # Get local definitions from c-client directory
+ 
+ CC = `cat $C/CCTYPE`
+-CFLAGS = -I$C `cat $C/CFLAGS`
+-LDFLAGS = $(CCLIENTLIB) `cat $C/LDFLAGS`
++CFLAGS = `cat $C/CFLAGS`
++LDFLAGS = `cat $C/LDFLAGS`
++
+ 
+ all:	mtest
+ 
+-mtest: $(CCLIENTLIB) mtest.o
++mtest: mtest.o
+ 	$(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
+-
+-$(CCLIENTLIB):
+-	cd $C;make
+ 
+ clean:
+ 	rm -f *.o mtest || true
diff --git a/mail/imap-uw/pkg-plist b/mail/imap-uw/pkg-plist
index bc4817116cae..f9a47a833f22 100644
--- a/mail/imap-uw/pkg-plist
+++ b/mail/imap-uw/pkg-plist
@@ -1,10 +1,4 @@
 bin/mboxtest
-include/mail.h
-include/rfc822.h
-include/linkage.h
-lib/lib%%SHLIBBASE%%.a
-lib/%%SHLIBNAME%%
-lib/lib%%SHLIBBASE%%.so
 libexec/imapd
 libexec/ipop2d
 libexec/ipop3d