--- imap/src/osdep/unix/Makefile.orig	Tue Jun 22 13:56:05 2004
+++ imap/src/osdep/unix/Makefile	Sun Aug 22 15:51:12 2004
@@ -99,7 +99,7 @@
 # Commands possibly overriden by the individual port
 
 ARRC=ar rc
-CC=cc
+#CC=cc
 LN=ln -s
 RANLIB=ranlib
 
@@ -219,8 +219,9 @@
 	 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=$@ \