*** src/osdep/unix/Makefile.orig	Sun Jun 17 17:37:44 2007
--- src/osdep/unix/Makefile	Mon Jul 23 17:34:03 2007
***************
*** 54,66 ****
  
  # Extended flags needed for SSL.  You may need to modify.
  
! SSLDIR=/usr/local/ssl
! SSLCERTS=$(SSLDIR)/certs
  SSLKEYS=$(SSLCERTS)
  SSLINCLUDE=$(SSLDIR)/include
  SSLLIB=$(SSLDIR)/lib
  
! SSLCRYPTO=-lcrypto
  
  # Older versions of MIT Kerberos also have a libcrypto.  If so, you may need
  # to use this instead
--- 54,66 ----
  
  # Extended flags needed for SSL.  You may need to modify.
  
! #SSLDIR=/usr/local/ssl
! SSLCERTS=$(PREFIX)/certs
  SSLKEYS=$(SSLCERTS)
  SSLINCLUDE=$(SSLDIR)/include
  SSLLIB=$(SSLDIR)/lib
  
! SSLCRYPTO=-lcrypto -lcrypt
  
  # Older versions of MIT Kerberos also have a libcrypto.  If so, you may need
  # to use this instead
***************
*** 73,79 ****
  
  SSLCFLAGS= -I$(SSLINCLUDE) -I$(SSLINCLUDE)/openssl\
   -DSSL_CERT_DIRECTORY=\"$(SSLCERTS)\" -DSSL_KEY_DIRECTORY=\"$(SSLKEYS)\"
! SSLLDFLAGS= -L$(SSLLIB) -lssl $(SSLCRYPTO) $(SSLRSA)
  
  
  # Extended flags needed for non-standard passwd types.  You may need to modify.
--- 73,79 ----
  
  SSLCFLAGS= -I$(SSLINCLUDE) -I$(SSLINCLUDE)/openssl\
   -DSSL_CERT_DIRECTORY=\"$(SSLCERTS)\" -DSSL_KEY_DIRECTORY=\"$(SSLKEYS)\"
! SSLLDFLAGS= # -L$(SSLLIB) -lssl $(SSLCRYPTO) $(SSLRSA)
  
  
  # Extended flags needed for non-standard passwd types.  You may need to modify.
***************
*** 87,93 ****
  # AFSLDFLAGS may also need -L/usr/ucblib -lucb
  DCECFLAGS= -DDCE_MINIMAL -DPASSWD_OVERRIDE=\"/opt/pop3/passwd/passwd\"
  DCELDFLAGS= -ldce
! PAMLDFLAGS= -lpam -ldl
  
  
  # Build parameters normally set by the individual port
--- 87,93 ----
  # AFSLDFLAGS may also need -L/usr/ucblib -lucb
  DCECFLAGS= -DDCE_MINIMAL -DPASSWD_OVERRIDE=\"/opt/pop3/passwd/passwd\"
  DCELDFLAGS= -ldce
! PAMLDFLAGS= # -lpam -lcrypt
  
  
  # Build parameters normally set by the individual port
***************
*** 125,131 ****
  # Commands possibly overriden by the individual port
  
  ARRC=ar rc
! CC=cc
  LN=ln -s
  RANLIB=ranlib
  
--- 125,131 ----
  # Commands possibly overriden by the individual port
  
  ARRC=ar rc
! CC?=cc
  LN=ln -s
  RANLIB=ranlib
  
***************
*** 149,155 ****
   dummy.o pseudo.o netmsg.o flstring.o fdstring.o \
   rfc822.o nntp.o smtp.o imap4r1.o pop3.o \
   unix.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o mix.o
! CFLAGS=-g
  
  CAT=cat
  MAKE=make
--- 149,155 ----
   dummy.o pseudo.o netmsg.o flstring.o fdstring.o \
   rfc822.o nntp.o smtp.o imap4r1.o pop3.o \
   unix.o mbx.o mmdf.o tenex.o mtx.o news.o phile.o mh.o mx.o mix.o
! CFLAGS+=$(BASECFLAGS) $(EXTRACFLAGS)
  
  CAT=cat
  MAKE=make
***************
*** 232,237 ****
--- 232,246 ----
  	 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 \
***************
*** 251,258 ****
  	 SPOOLDIR=/var \
  	 ACTIVEFILE=/usr/local/news/lib/active \
  	 RSHPATH=/usr/bin/rsh \
  	 BASECFLAGS="$(GCCCFLAGS)" \
! 	 BASELDFLAGS="-lcrypt"
  
  bsi:	# BSD/i386
  	$(BUILD) `$(CAT) SPECIALS` OS=$@ \
--- 260,268 ----
  	 SPOOLDIR=/var \
  	 ACTIVEFILE=/usr/local/news/lib/active \
  	 RSHPATH=/usr/bin/rsh \
+ 	 LOCKPGM=$(PREFIX)/libexec/mlock \
  	 BASECFLAGS="$(GCCCFLAGS)" \
! 	 BASELDFLAGS=""
  
  bsi:	# BSD/i386
  	$(BUILD) `$(CAT) SPECIALS` OS=$@ \
***************
*** 842,848 ****
  
  build:	clean once $(ARCHIVE)
  
! all:	$(ARCHIVE)
  
  $(ARCHIVE): $(BINARIES)
  	sh -c '$(RM) $(ARCHIVE) || true'
--- 852,858 ----
  
  build:	clean once $(ARCHIVE)
  
! all:	onceenv
  
  $(ARCHIVE): $(BINARIES)
  	sh -c '$(RM) $(ARCHIVE) || true'