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

--- 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
-CFLAGS=$(BASECFLAGS) $(EXTRACFLAGS)
+CFLAGS+=$(BASECFLAGS) $(EXTRACFLAGS)
 MAKE=make
 MV=mv
 RM=rm -rf
@@ -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
+SOFILES=${BINARIES:.o=.so}
+
 # Here if no make argument established
 
 missing: osdep.h
@@ -183,7 +187,7 @@
 	 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,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
 
+$(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
@@ -611,7 +627,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 \
@@ -623,7 +639,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
 	sh -c '$(RM) osdep.c || true'
Update to version 4.4. PR: 8760 Submitted by: maintainer 1998-11-21 20:01:56 +00:00			`--- 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 @@`
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`
Update to version 4.4. PR: 8760 Submitted by: maintainer 1998-11-21 20:01:56 +00:00			`@@ -108,6 +108,10 @@`
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`
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`
Update to version 4.4. PR: 8760 Submitted by: maintainer 1998-11-21 20:01:56 +00:00			`@@ -183,7 +187,7 @@`
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			`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`
Update to version 4.4. PR: 8760 Submitted by: maintainer 1998-11-21 20:01:56 +00:00			`@@ -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'`
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
Update to version 4.4. PR: 8760 Submitted by: maintainer 1998-11-21 20:01:56 +00:00			`+$(SHLIBNAME): $(SOFILES)`
Unbreak. Subbmitted by: steve 1998-10-13 23:25:07 +00:00			`+.if $(PORTOBJFORMAT) == "elf"`
Update to version 4.4. PR: 8760 Submitted by: maintainer 1998-11-21 20:01:56 +00:00			`+ ld -shared -x -soname $(SHLIBNAME) -o $(SHLIBNAME) $(SOFILES)`
Unbreak. Subbmitted by: steve 1998-10-13 23:25:07 +00:00			`+.else`
Update to version 4.4. PR: 8760 Submitted by: maintainer 1998-11-21 20:01:56 +00:00			`+ ld -Bshareable -x -o $(SHLIBNAME) $(SOFILES)`
Unbreak. Subbmitted by: steve 1998-10-13 23:25:07 +00:00			`+.endif`
Update to version 4.4. PR: 8760 Submitted by: maintainer 1998-11-21 20:01:56 +00:00			`+ ln -s $(SHLIBNAME) lib$(SHLIBBASE).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			`+`
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'`
Update to version 4.4. PR: 8760 Submitted by: maintainer 1998-11-21 20:01:56 +00:00			`+ $(RM) *.so $(SHLIBNAME)`
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

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`
Update to version 4.4. PR: 8760 Submitted by: maintainer 1998-11-21 20:01:56 +00:00			`@@ -611,7 +627,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 \`
Update to version 4.4. PR: 8760 Submitted by: maintainer 1998-11-21 20:01:56 +00:00			`@@ -623,7 +639,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)`
Update to version 4.4. PR: 8760 Submitted by: maintainer 1998-11-21 20:01:56 +00:00			+ $(CC) -fpic -DPIC -c $(CFLAGS) `cat OSCFLAGS` osdep.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
			`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'`