--- src/osdep/unix/Makefile.orig	Tue Mar  6 07:07:37 2001
+++ src/osdep/unix/Makefile	Tue Apr  3 23:48:08 2001
@@ -22,16 +22,23 @@
 
 EXTRAAUTHENTICATORS=
 EXTRADRIVERS=mbox
-PASSWDTYPE=std
+PASSWDTYPE=pam
 SSLTYPE=none
 
 
 # Extended flags needed for SSL.  You may need to modify.
 
-SSLDIR=/usr/local/ssl
+.if ${OSVERSION} >= 400014
+SSLDIR=/usr
+SSLCERTS=$(PREFIX)/certs
+SSLINCLUDE=$(SSLDIR)/include/openssl
+SSLLIB=$(SSLDIR)/lib
+.else
+SSLDIR=$(PREFIX)
 SSLCERTS=$(SSLDIR)/certs
-SSLINCLUDE=$(SSLDIR)/include
+SSLINCLUDE=$(SSLDIR)/include/openssl
 SSLLIB=$(SSLDIR)/lib
+.endif
 
 SSLCRYPTO=-lcrypto
 
@@ -60,7 +67,7 @@
 # AFSLDFLAGS may also need -L/usr/ucblib -lucb
 DCECFLAGS= -DDCE_MINIMAL -DPASSWD_OVERRIDE=\"/opt/pop3/passwd/passwd\"
 DCELDFLAGS= -ldce
-PAMLDFLAGS= -lpam -ldl
+PAMLDFLAGS= -lpam
 
 
 # Build parameters normally set by the individual port
@@ -97,7 +104,7 @@
 # Commands possibly overriden by the individual port
 
 ARRC=ar rc
-CC=cc
+CC?=cc
 LN=ln -s
 RANLIB=ranlib
 
@@ -115,7 +122,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=-g
+CFLAGS+=$(BASECFLAGS) $(EXTRACFLAGS)
 
 CAT=cat
 MAKE=make
@@ -198,6 +205,15 @@
 	 BASECFLAGS="-g -B/usr/lib/big/ -Dvoid=char -Dconst=" \
 	 RANLIB=true ARRC="ar -rc"
 
+bfp:	# FreeBSD Pluggable Authentication Modules
+	$(BUILD) `cat SPECIALS` OS=bsi SIGTYPE=psx CHECKPW=pam \
+	 SPOOLDIR=/var \
+	 ACTIVEFILE=/usr/local/news/lib/active \
+	 RSHPATH=/usr/bin/rsh \
+	 LOCKPGM=$(PREFIX)/libexec/mlock \
+	 BASECFLAGS="-DNFSKLUDGE" \
+	 BASELDFLAGS="-lpam -lcrypt"
+
 bs3:	# BSD/i386 3.0 or higher
 	$(BUILD) `$(CAT) SPECIALS` OS=bsi \
 	 CHECKPW=bsi LOGINPW=bsi CRXTYPE=nfs \
@@ -213,12 +229,13 @@
 
 bsf:	# FreeBSD
 	$(BUILD) `$(CAT) SPECIALS` OS=$@ \
-	 SIGTYPE=psx CRXTYPE=nfs \
+	 SIGTYPE=psx CRXTYPE=nfs CHECKPW=pam \
 	 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=$@ \
@@ -754,7 +771,7 @@
 
 build:	clean once $(ARCHIVE)
 
-all:	$(ARCHIVE)
+all:	onceenv
 
 $(ARCHIVE): $(BINARIES)
 	sh -c '$(RM) $(ARCHIVE) || true'