1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-27 00:57:50 +00:00

Upgrade to latest version.

I'm really really really unhappy about these shared library patches.
This code changes WAY too fast to screw with shared libraries.  If they
cause massive breakage again, they're history.
This commit is contained in:
Paul Traina 1997-06-03 06:27:17 +00:00
parent e08982007a
commit 001fa87667
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=6683
5 changed files with 53 additions and 78 deletions

View File

@ -3,7 +3,7 @@
# Date created: 9 Jan 1997
# Whom: pst
#
# $Id: Makefile,v 1.3 1997/01/12 16:10:28 ache Exp $
# $Id: Makefile,v 1.4 1997/05/04 03:17:41 max Exp $
#
DISTNAME= imap-4.1.BETA
@ -11,10 +11,11 @@ PKGNAME= imap-uw-4.1b
CATEGORIES= mail
MASTER_SITES= ftp://ftp.cac.washington.edu/imap/
EXTRACT_SUFX= .tar.Z
NO_CHECKSUM= yes
MAINTAINER= pst@freebsd.org
ALL_TARGET= fbd
ALL_TARGET= bsf
MAN8= ipopd.8 imapd.8
pre-build:

View File

@ -1 +1 @@
MD5 (imap-4.1.BETA.tar.Z) = 3708ced4649889d43376ddb53bfcc617
MD5 (imap-4.1.BETA.tar.Z) = 1a427290be6b2d68ed2278c572652a1a

View File

@ -1,19 +0,0 @@
*** Makefile Mon Dec 9 21:29:12 1996
--- Makefile Thu Jan 9 17:12:15 1997
***************
*** 120,126 ****
# Note on SCO you may have to set LN to "ln".
! a32 a41 aix bsf bsi d-g d41 d54 drs epx gas gso gsu gul hpp hpx hxd lnx lyn mct mnt neb nxt osf ptx sc5 sco sgi shp slx sol sos uw2:
$(MAKE) build OS=$@ PROCESS=an AFS=$(AFS)
# If you use sv4, you may find that it works to move it to use the an process.
--- 120,126 ----
# Note on SCO you may have to set LN to "ln".
! a32 a41 aix bsf bsi d-g d41 d54 drs epx fbd gas gso gsu gul hpp hpx hxd lnx lyn mct mnt neb nxt osf ptx sc5 sco sgi shp slx sol sos uw2:
$(MAKE) build OS=$@ PROCESS=an AFS=$(AFS)
# If you use sv4, you may find that it works to move it to use the an process.

View File

@ -1,34 +1,32 @@
*** src/osdep/unix/Makefile.orig Wed Apr 30 08:26:49 1997
--- src/osdep/unix/Makefile Sun May 4 12:10:20 1997
*** src/osdep/unix/Makefile.orig Thu May 29 00:14:31 1997
--- src/osdep/unix/Makefile Mon Jun 2 23:13:00 1997
***************
*** 32,37 ****
--- 32,38 ----
ARCHIVE=c-client.a
+ SHLIB=libc-client.so.2.0
+ SHLIB=libc-client.so.2.1
ARRC=ar rc
EXTRAAUTHENTICATORS=
DEFAULTAUTHENTICATORS=log
***************
*** 39,46 ****
dummy.o pseudo.o netmsg.o flstring.o fdstring.o \
*** 40,46 ****
rfc822.o nntp.o smtp.o imap4r1.o pop3.o \
bezerk.o mbox.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o
unix.o mbox.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o
CC=cc
! CFLAGS=$(EXTRACFLAGS)
EXTRADRIVERS=mbox
DEFAULTDRIVERS=imap nntp pop3 mh mx mbx tenex mtx mmdf bezerk news phile dummy
DEFAULTDRIVERS=imap nntp pop3 mh mx mbx tenex mtx mmdf unix news phile dummy
LN=ln -s
--- 40,48 ----
dummy.o pseudo.o netmsg.o flstring.o fdstring.o \
--- 41,48 ----
rfc822.o nntp.o smtp.o imap4r1.o pop3.o \
bezerk.o mbox.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o
+ SOFILES= ${BINARIES:.o=.so}
unix.o mbox.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o
CC=cc
! SOFILES=${BINARIES:.o=.so}
! CFLAGS+=$(EXTRACFLAGS)
EXTRADRIVERS=mbox
DEFAULTDRIVERS=imap nntp pop3 mh mx mbx tenex mtx mmdf bezerk news phile dummy
DEFAULTDRIVERS=imap nntp pop3 mh mx mbx tenex mtx mmdf unix news phile dummy
LN=ln -s
***************
*** 52,57 ****
@ -39,66 +37,61 @@
+ # Need this for the shared library rule to work correctly
+ .SUFFIXES: .o .so
+
missing:
@echo "You must specify what type of system"
@false
missing: ../OSTYPE CCTYPE
$(MAKE) `cat ../OSTYPE` CC=`cat CCTYPE`
***************
*** 132,137 ****
--- 137,152 ----
*** 124,135 ****
ACTIVEFILE=/usr/lib/news/active NEWSSPOOL=/usr/spool/news \
CFLAGS="-g -Dconst= -DNFSKLUDGE $(EXTRACFLAGS)"
! bsf: sigpsx # FreeBSD
! $(MAKE) $(ARCHIVE) OS=bsi EXTRADRIVERS="$(EXTRADRIVERS)" \
STDPROTO=unixproto MAILSPOOL=/var/mail \
ACTIVEFILE=/usr/local/news/lib/active NEWSSPOOL=/var/news \
RSHPATH=/usr/bin/rsh \
CFLAGS="-g -O -pipe -DNFSKLUDGE $(EXTRACFLAGS)"
! CFLAGS="-g -O -pipe -DNFSKLUDGE $(EXTRACFLAGS)" \
LDFLAGS="-lcrypt"
+ fbd: sigbsd # FreeBSD
+ $(MAKE) $(ARCHIVE) $(SHLIB) OS=$@ EXTRADRIVERS="$(EXTRADRIVERS)" \
+ STDPROTO=bezerkproto \
+ MAILSPOOL=/var/mail \
+ ACTIVEFILE=/usr/local/news/lib/active \
+ NEWSSPOOL=/var/news \
+ RSHPATH=/usr/bin/rsh \
+ CFLAGS="$(CFLAGS) -DNFSKLUDGE $(EXTRACFLAGS)" \
+ LDFLAGS="-lcrypt"
+
cvx: sigbsd # Convex
$(MAKE) $(ARCHIVE) OS=$@ EXTRADRIVERS="$(EXTRADRIVERS)" \
STDPROTO=bezerkproto MAILSPOOL=/usr/spool/mail \
bsi: sigbsd # BSD/i386
--- 129,140 ----
ACTIVEFILE=/usr/lib/news/active NEWSSPOOL=/usr/spool/news \
CFLAGS="-g -Dconst= -DNFSKLUDGE $(EXTRACFLAGS)"
! bsf: sigbsd # FreeBSD
! $(MAKE) $(ARCHIVE) $(SHLIB) OS=bsi EXTRADRIVERS="$(EXTRADRIVERS)" \
STDPROTO=unixproto MAILSPOOL=/var/mail \
ACTIVEFILE=/usr/local/news/lib/active NEWSSPOOL=/var/news \
RSHPATH=/usr/bin/rsh \
! CFLAGS="$(CFLAGS) -DNFSKLUDGE $(EXTRACFLAGS)" \
LDFLAGS="-lcrypt"
bsi: sigbsd # BSD/i386
***************
*** 456,468 ****
# From here on down is OS-independent
*** 474,485 ****
--- 479,497 ----
clean:
! $(RM) *.o linkage.[ch] auths.c $(ARCHIVE) osdep.* CCTYPE CFLAGS LDFLAGS
$(RM) *.o linkage.[ch] auths.c $(ARCHIVE) osdep.* CCTYPE CFLAGS LDFLAGS
+ $(RM) *.so
$(ARCHIVE): $(BINARIES)
$(RM) $(ARCHIVE)
$(ARRC) $(ARCHIVE) $(BINARIES)
$(RANLIB) $(ARCHIVE)
# Dependencies
bezerk.o: mail.h misc.h osdep.h bezerk.h pseudo.h dummy.h
--- 471,489 ----
# From here on down is OS-independent
clean:
! $(RM) *.o *.so linkage.[ch] auths.c $(ARCHIVE) osdep.* CCTYPE CFLAGS LDFLAGS
$(ARCHIVE): $(BINARIES)
$(RM) $(ARCHIVE)
$(ARRC) $(ARCHIVE) $(BINARIES)
$(RANLIB) $(ARCHIVE)
+ $(SHLIB): $(SOFILES)
+ $(SHLIB): $(SOFILES)
+ ld -Bshareable -x -o $(SHLIB) $(SOFILES)
+
+ .c.so: osdep.h
+ .c.so: osdep.h
+ $(CC) -fpic -DPIC -c $(CFLAGS) ${@:.so=.c} -o $@
+
# Dependencies
bezerk.o: mail.h misc.h osdep.h bezerk.h pseudo.h dummy.h
dummy.o: mail.h misc.h osdep.h dummy.h
***************
*** 511,516 ****
--- 532,557 ----
*** 528,533 ****
--- 540,565 ----
-DRSH=\"$(RSH)\" -DRSHPATH=\"$(RSHPATH)\" \
$(EXTRAOSDEFS) -c os_$(OS).c
$(MV) os_$(OS).o osdep.o
@ -120,8 +113,8 @@
+ -DANONYMOUSHOME=\"$(MAILSPOOL)/anonymous\" \
+ -DACTIVEFILE=\"$(ACTIVEFILE)\" -DNEWSSPOOL=\"$(NEWSSPOOL)\" \
+ -DRSH=\"$(RSH)\" -DRSHPATH=\"$(RSHPATH)\" \
+ $(EXTRAOSDEFS) -c os_$(OS).c -o os_$(OS).so
+ $(MV) os_$(OS).so osdep.so
+ $(EXTRAOSDEFS) -c os_$(OS).c
+ $(MV) os_$(OS).o osdep.so
osdep.h: os_$(OS).h linkage
$(RM) CCTYPE CFLAGS LDFLAGS osdep.h

View File

@ -1,4 +1,4 @@
lib/libc-client.so.2.0
lib/libc-client.so.2.1
lib/libc-client.a
@exec /sbin/ldconfig -m %B
libexec/imapd