freebsd-ports/mail/imap-uw/files/patch-ab

--- 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 \
  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
-CFLAGS=$(BASECFLAGS) $(EXTRACFLAGS)
+CFLAGS+=$(BASECFLAGS) $(EXTRACFLAGS)
 MAKE=make
 MV=mv
 RM=rm -rf
@@ -108,6 +108,15 @@
  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 \
 	 SPOOLDIR=/var \
 	 ACTIVEFILE=/usr/local/news/lib/active \
 	 RSHPATH=/usr/bin/rsh \
-	 BASECFLAGS="-g -O -pipe -DNFSKLUDGE" \
+	 BASECFLAGS="-DNFSKLUDGE -DIGNORE_LOCK_EACCES_ERRORS" \
 	 BASELDFLAGS="-lcrypt"
 
 bsi:	# BSD/i386
@@ -565,10 +574,21 @@
 	@cat ARCHIVE
 	@$(SH) ARCHIVE
 
+$(SHLIB): $(SOFILES)
+.if $(PORTOBJFORMAT) == "elf"
+	ld -Bshareable -x -o $(SHLIB) $(SOFILES)
+.else
+	ld -Bshareable -x -soname $(SHLIB) -o $(SHLIB) $(SOFILES)
+.endif
+
+.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 $(SHLIB)
 
 
 # Dependencies
@@ -602,7 +622,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 \
@@ -614,7 +634,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) $(CFLAGS) `cat OSCFLAGS` -c osdep.c -o $@ -fpic -DPIC
 
 osdep.c: osdepbas.c osdepckp.c osdeplog.c
 	sh -c '$(RM) osdep.c || true'
Unbreak. Subbmitted by: steve 1998-10-13 23:25:07 +00:00			`--- 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 \`
Make this port compile again with changed source files. This port needs to be converted to getting source files from a more stable cache at FreeBSD, Inc. but I don't recall how to do it, so I just did the annoying bits of making this damn thing compile again. 1998-02-23 23:15:17 +00:00			`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`
			`-CFLAGS=$(BASECFLAGS) $(EXTRACFLAGS)`
			`+CFLAGS+=$(BASECFLAGS) $(EXTRACFLAGS)`
			`MAKE=make`
			`MV=mv`
Update to match the latest release. PR: 6839 Submitted by: maintainer 1998-06-04 20:36:37 +00:00			`RM=rm -rf`
Unbreak. Subbmitted by: steve 1998-10-13 23:25:07 +00:00			`@@ -108,6 +108,15 @@`
Make this port compile again with changed source files. This port needs to be converted to getting source files from a more stable cache at FreeBSD, Inc. but I don't recall how to do it, so I just did the annoying bits of making this damn thing compile again. 1998-02-23 23:15:17 +00:00			`PASSWDTYPE=$(PASSWDTYPE) AFSDIR=$(AFSDIR) GSSDIR=$(GSSDIR)`
			`BUILD=$(MAKE) build $(BUILDOPTIONS) $(EXTRASPECIALS)`
make patch-ab work again. Don´t know, why this worked at home on my -current system. This is now tested on a -stable system ... 1997-11-17 12:34:52 +00:00
			`+# Need this for the shared library rule to work correctly`
			`+.SUFFIXES: .o .so`
Unbreak. Subbmitted by: steve 1998-10-13 23:25:07 +00:00			`+.if ${PORTOBJFORMAT} == "elf"`
			`+SHLIB=libc-client.so.2`
			`+.else`
Make this port compile again with changed source files. This port needs to be converted to getting source files from a more stable cache at FreeBSD, Inc. but I don't recall how to do it, so I just did the annoying bits of making this damn thing compile again. 1998-02-23 23:15:17 +00:00			`+SHLIB=libc-client.so.2.1`
Unbreak. Subbmitted by: steve 1998-10-13 23:25:07 +00:00			`+.endif`
Make this port compile again with changed source files. This port needs to be converted to getting source files from a more stable cache at FreeBSD, Inc. but I don't recall how to do it, so I just did the annoying bits of making this damn thing compile again. 1998-02-23 23:15:17 +00:00			`+SOFILES=${BINARIES:.o=.so}`
make patch-ab work again. Don´t know, why this worked at home on my -current system. This is now tested on a -stable system ... 1997-11-17 12:34:52 +00:00			`+`
Make this port compile again with changed source files. This port needs to be converted to getting source files from a more stable cache at FreeBSD, Inc. but I don't recall how to do it, so I just did the annoying bits of making this damn thing compile again. 1998-02-23 23:15:17 +00:00			`# Here if no make argument established`
make patch-ab work again. Don´t know, why this worked at home on my -current system. This is now tested on a -stable system ... 1997-11-17 12:34:52 +00:00
Make this port compile again with changed source files. This port needs to be converted to getting source files from a more stable cache at FreeBSD, Inc. but I don't recall how to do it, so I just did the annoying bits of making this damn thing compile again. 1998-02-23 23:15:17 +00:00			`missing: osdep.h`
Unbreak. Subbmitted by: steve 1998-10-13 23:25:07 +00:00			`@@ -179,11 +188,11 @@`
Make this port compile again with changed source files. This port needs to be converted to getting source files from a more stable cache at FreeBSD, Inc. but I don't recall how to do it, so I just did the annoying bits of making this damn thing compile again. 1998-02-23 23:15:17 +00:00			`BASECFLAGS="-g -Dconst= -DNFSKLUDGE"`
make patch-ab work again. Don´t know, why this worked at home on my -current system. This is now tested on a -stable system ... 1997-11-17 12:34:52 +00:00
Upgrade to match current again (groan) 1997-12-07 01:02:52 +00:00			`bsf: # FreeBSD`
Make this port compile again with changed source files. This port needs to be converted to getting source files from a more stable cache at FreeBSD, Inc. but I don't recall how to do it, so I just did the annoying bits of making this damn thing compile again. 1998-02-23 23:15:17 +00:00			`- $(BUILD) OS=bsi SIGTYPE=psx \`
			`+ $(BUILD) $(SHLIB) OS=bsi SIGTYPE=psx \`
			`SPOOLDIR=/var \`
			`ACTIVEFILE=/usr/local/news/lib/active \`
			`RSHPATH=/usr/bin/rsh \`
			`- BASECFLAGS="-g -O -pipe -DNFSKLUDGE" \`
			`+ BASECFLAGS="-DNFSKLUDGE -DIGNORE_LOCK_EACCES_ERRORS" \`
			`BASELDFLAGS="-lcrypt"`
make patch-ab work again. Don´t know, why this worked at home on my -current system. This is now tested on a -stable system ... 1997-11-17 12:34:52 +00:00
Upgrade to match current again (groan) 1997-12-07 01:02:52 +00:00			`bsi: # BSD/i386`
Unbreak. Subbmitted by: steve 1998-10-13 23:25:07 +00:00			`@@ -565,10 +574,21 @@`
Update to match the latest release. PR: 6839 Submitted by: maintainer 1998-06-04 20:36:37 +00:00			`@cat ARCHIVE`
			`@$(SH) ARCHIVE`
make patch-ab work again. Don´t know, why this worked at home on my -current system. This is now tested on a -stable system ... 1997-11-17 12:34:52 +00:00
			`+$(SHLIB): $(SOFILES)`
Unbreak. Subbmitted by: steve 1998-10-13 23:25:07 +00:00			`+.if $(PORTOBJFORMAT) == "elf"`
make patch-ab work again. Don´t know, why this worked at home on my -current system. This is now tested on a -stable system ... 1997-11-17 12:34:52 +00:00			`+ ld -Bshareable -x -o $(SHLIB) $(SOFILES)`
Unbreak. Subbmitted by: steve 1998-10-13 23:25:07 +00:00			`+.else`
			`+ ld -Bshareable -x -soname $(SHLIB) -o $(SHLIB) $(SOFILES)`
			`+.endif`
make patch-ab work again. Don´t know, why this worked at home on my -current system. This is now tested on a -stable system ... 1997-11-17 12:34:52 +00:00			`+`
Upgrade to 4.2. PR: 7452 Submitted by: Adrian Penisoara <ady@freebsd.ady.ro> 1998-07-31 06:47:02 +00:00			`+.c.so: osdep.h`
make patch-ab work again. Don´t know, why this worked at home on my -current system. This is now tested on a -stable system ... 1997-11-17 12:34:52 +00:00			`+ $(CC) -fpic -DPIC -c $(CFLAGS) ${@:.so=.c} -o $@`
			`+`
Make this port compile again with changed source files. This port needs to be converted to getting source files from a more stable cache at FreeBSD, Inc. but I don't recall how to do it, so I just did the annoying bits of making this damn thing compile again. 1998-02-23 23:15:17 +00:00			`# Cleanup`

			`clean:`
Upgrade to 4.2. PR: 7452 Submitted by: Adrian Penisoara <ady@freebsd.ady.ro> 1998-07-31 06:47:02 +00:00			`sh -c '$(RM) auths.c flockbsd.c linkage.[ch] siglocal.c osdep.[ch] .o ARCHIVE FLAGS TYPE $(ARCHIVE) \|\| true'`
Make this port compile again with changed source files. This port needs to be converted to getting source files from a more stable cache at FreeBSD, Inc. but I don't recall how to do it, so I just did the annoying bits of making this damn thing compile again. 1998-02-23 23:15:17 +00:00			`+ $(RM) *.so $(SHLIB)`


make patch-ab work again. Don´t know, why this worked at home on my -current system. This is now tested on a -stable system ... 1997-11-17 12:34:52 +00:00			`# Dependencies`
Unbreak. Subbmitted by: steve 1998-10-13 23:25:07 +00:00			`@@ -602,7 +622,7 @@`
make patch-ab work again. Don´t know, why this worked at home on my -current system. This is now tested on a -stable system ... 1997-11-17 12:34:52 +00:00
Make this port compile again with changed source files. This port needs to be converted to getting source files from a more stable cache at FreeBSD, Inc. but I don't recall how to do it, so I just did the annoying bits of making this damn thing compile again. 1998-02-23 23:15:17 +00:00			`# 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 \`
Update to match the latest release. PR: 6839 Submitted by: maintainer 1998-06-04 20:36:37 +00:00			`auths.c flock.c flockbsd.c flcksafe.c fsync.c gethstid.c \`
Unbreak. Subbmitted by: steve 1998-10-13 23:25:07 +00:00			`@@ -614,7 +634,12 @@`
Upgrade to match current again (groan) 1997-12-07 01:02:52 +00:00			`write.c \`
Make this port compile again with changed source files. This port needs to be converted to getting source files from a more stable cache at FreeBSD, Inc. but I don't recall how to do it, so I just did the annoying bits of making this damn thing compile again. 1998-02-23 23:15:17 +00:00			`strerror.c strpbrk.c strstr.c strtok.c strtoul.c \`
			`OSCFLAGS`
			`+`
			`+osdep.o: $(OSDEPS)`
			$(CC) $(CFLAGS) `cat OSCFLAGS` -c osdep.c
make patch-ab work again. Don´t know, why this worked at home on my -current system. This is now tested on a -stable system ... 1997-11-17 12:34:52 +00:00			`+`
Make this port compile again with changed source files. This port needs to be converted to getting source files from a more stable cache at FreeBSD, Inc. but I don't recall how to do it, so I just did the annoying bits of making this damn thing compile again. 1998-02-23 23:15:17 +00:00			`+osdep.so: $(OSDEPS)`
			+ $(CC) $(CFLAGS) `cat OSCFLAGS` -c osdep.c -o $@ -fpic -DPIC

			`osdep.c: osdepbas.c osdepckp.c osdeplog.c`
Upgrade to 4.2. PR: 7452 Submitted by: Adrian Penisoara <ady@freebsd.ady.ro> 1998-07-31 06:47:02 +00:00			`sh -c '$(RM) osdep.c \|\| true'`