--- src/osdep/unix/Makefile.orig	Tue Oct 31 13:55:01 2000
+++ src/osdep/unix/Makefile	Sun Dec 17 23:39:05 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=-g
+CFLAGS+=$(BASECFLAGS) $(EXTRACFLAGS)
 
 CAT=cat
 MAKE=make
@@ -175,6 +175,15 @@
 	 BASECFLAGS="-g -B/usr/lib/big/ -Dvoid=char -Dconst=" \
 	 RANLIB=true ARRC="ar -rc"
 
+bfp:	# FreeBSD Pluggable Authentication Modules
+	$(BUILD) `cat EXTRASPECIALS` 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 \
@@ -190,12 +199,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=$@ \
@@ -704,7 +714,7 @@
 
 build:	clean once $(ARCHIVE)
 
-all:	$(ARCHIVE)
+all:	onceenv
 
 $(ARCHIVE): $(BINARIES)
 	sh -c '$(RM) $(ARCHIVE) || true'