forked from Lainports/freebsd-ports
3c7d0e406b
Update imap-uw to the latest version (imap-2000). Update pine4 to the latest version (pine-4.31). Despite the fact that the new releases of imap-uw and pine are intended to improve security, the security warnings on the pine and imap-uw ports have been left intact until they have proven themselves.
106 lines
2.7 KiB
Text
106 lines
2.7 KiB
Text
--- src/osdep/unix/Makefile.orig Tue Oct 31 13:55:01 2000
|
|
+++ src/osdep/unix/Makefile Sun Dec 17 23:19:06 2000
|
|
@@ -74,7 +74,7 @@
|
|
# Commands possibly overriden by the individual port
|
|
|
|
ARRC=ar rc
|
|
-CC=cc
|
|
+#CC=cc
|
|
LN=ln -s
|
|
RANLIB=ranlib
|
|
|
|
@@ -92,7 +92,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)
|
|
|
|
CAT=cat
|
|
MAKE=make
|
|
@@ -109,6 +109,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
|
|
@@ -189,13 +193,14 @@
|
|
BASECFLAGS="-g -Dconst="
|
|
|
|
bsf: # FreeBSD
|
|
- $(BUILD) `$(CAT) SPECIALS` OS=bsi \
|
|
+ $(BUILD) `$(CAT) SPECIALS` OS=bsi CHECKPW=pam \
|
|
SIGTYPE=psx CRXTYPE=nfs \
|
|
SPOOLDIR=/var \
|
|
ACTIVEFILE=/usr/local/news/lib/active \
|
|
RSHPATH=/usr/bin/rsh \
|
|
- BASECFLAGS="-g -O -pipe" \
|
|
- BASELDFLAGS="-lcrypt"
|
|
+ LOCKPGM=$(PREFIX)/libexec/mlock \
|
|
+ BASECFLAGS="-DNFSKLUDGE" \
|
|
+ BASELDFLAGS="-lpam -lcrypt"
|
|
|
|
bsi: # BSD/i386
|
|
$(BUILD) `$(CAT) SPECIALS` OS=$@ \
|
|
@@ -702,19 +707,31 @@
|
|
|
|
# Build it!
|
|
|
|
-build: clean once $(ARCHIVE)
|
|
+build: clean once $(ARCHIVE) $(SHLIBNAME)
|
|
|
|
-all: $(ARCHIVE)
|
|
+all: $(ARCHIVE) $(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 crexcl.c flockbsd.c linkage.[ch] siglocal.c osdep*.[ch] *.o ARCHIVE *FLAGS *TYPE $(ARCHIVE) || true'
|
|
+ sh -c '$(RM) *.so $(SHLIBNAME)'
|
|
|
|
|
|
# Dependencies
|
|
@@ -748,7 +765,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 crexcl.c flock.c flockbsd.c flcksafe.c fsync.c gethstid.c \
|
|
@@ -760,7 +777,12 @@
|
|
write.c \
|
|
strerror.c strpbrk.c strstr.c strtok.c strtoul.c \
|
|
OSCFLAGS
|
|
- $(CC) $(CFLAGS) `$(CAT) OSCFLAGS` -c osdep.c
|
|
+
|
|
+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
|