o add autoconf to CONFIGURE_STYLE to fix autoconf depend

o no longer require kernel sources since not building lkm; if this changes,
  the attic can be raided
o typo in openafs-setup comments from sthen@; thanks!
o obey CFLAGS and CC
o twiddle lwp.h patch to be OpenBSD specific
bump PKGNAME

net/openafs/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.20 2008/10/08 15:45:55 todd Exp $
+# $OpenBSD: Makefile,v 1.21 2008/10/12 00:12:07 todd Exp $
 
 ONLY_FOR_ARCHS=		i386
 
@@ -6,7 +6,7 @@ COMMENT=		OpenAFS distributed filesystem
 
 VERSION=		1.4.7
 DISTNAME=		openafs-${VERSION}
-PKGNAME=		${DISTNAME}p1
+PKGNAME=		${DISTNAME}p2
 
 CATEGORIES=		net
 
@@ -29,7 +29,8 @@ EXTRACT_SUFX=		-src.tar.bz2
 
 NO_REGRESS=		Yes
 
-CONFIGURE_STYLE=	GNU
+AUTOCONF_VERSION=	2.60
+CONFIGURE_STYLE=	automake autoconf
 
 CONFIGURE_ENV+=		KRB5CFLAGS="-I/usr/include/kerberosV -DUSING_HEIMDAL" \
 			KRB5LIBS="-lkrb5"
@@ -43,31 +44,9 @@ CONFIGURE_ARGS+=	${CONFIGURE_SHARED} \
 			--disable-kernel-module \
 			--enable-supergroups
 
-AUTOCONF_VERSION=	2.60
-BUILD_DEPENDS+=		:autoconf-${AUTOCONF_VERSION}:devel/autoconf/${AUTOCONF_VERSION}
-
 FLAVORS=	debug
 FLAVOR?=
 
-pre-configure:	patch
-	@if [ ! -d /usr/src/sys ] ; then \
-		echo ; \
-		echo "*** Error: Building this package requires the kernel sources" ; \
-		echo "***        to be available in directory /usr/src/sys" ; \
-		echo ; \
-		exit 1 ; \
-	fi
-	@( \
-		cd ${WRKBUILD} ; \
-		cp -p configure configure.orig ; \
-		cp -p configure-libafs configure-libafs.orig ; \
-		env AUTOCONF_VERSION=${AUTOCONF_VERSION} autoconf ; \
-		env AUTOCONF_VERSION=${AUTOCONF_VERSION} \
-			autoconf configure-libafs.in > configure-libafs ; \
-		chmod +x configure-libafs ; \
-		rm -r autom4te.cache \
-	)
-
 post-patch:
 	@sed 's/%OSrev%/'${OSrev}'/g;s/i386/'${ARCH}'/g' \
 		${FILESDIR}/param.i386_obsd.h \

net/openafs/files/README.OpenBSD

@@ -7,7 +7,7 @@ Some knob twiddling you may find useful:
 
         :openfiles-cur=infinity:\
 
-  2. If you increase #2 above 1772 then consider also updating
+  2. If you increase #1 above the default then consider also updating
      kern.maxfiles in /etc/sysctl.conf:
 
 	kern.maxfiles=102400            # increase maximum files

net/openafs/files/openafs-setup

@@ -179,7 +179,7 @@ for OpenAFS to use for data storage.  Partitions should be mounted under
 __EOT
 
 #
-# Santiy checks
+# Sanity checks
 #
 
 # Require root.

net/openafs/patches/patch-src_cf_osconf_m4

@@ -0,0 +1,25 @@
+$OpenBSD: patch-src_cf_osconf_m4,v 1.1 2008/10/12 00:12:07 todd Exp $
+--- src/cf/osconf.m4.orig	Wed Oct  8 11:32:24 2008
++++ src/cf/osconf.m4	Wed Oct  8 11:34:47 2008
+@@ -412,13 +412,19 @@ case $AFS_SYSNAME in
+ 		LEX="flex -l"
+ 		MT_CFLAGS='-DAFS_PTHREAD_ENV -pthread -D_REENTRANT ${XCFLAGS}'
+ 		MT_LIBS="-pthread"
+-		PAM_CFLAGS="-O2 -pipe -fpic"
++		PAM_CFLAGS="${CFLAGS} -pipe -fpic"
+ 		SHLIB_CFLAGS="-fpic"
+ 		SHLIB_LDFLAGS="-shared -Xlinker -x"
+ 		SHLIB_LINKER="${MT_CC} -shared"
+ 		TXLIBS="/usr/lib/libcurses.a"
+-		XCFLAGS="-O2"
++		XCFLAGS="${CFLAGS}"
++		OPTMZ="${CFLAGS}"
++		KERN_OPTMZ="${CFLAGS}"
++		LWP_OPTMZ="${CFLAGS}"
+ 		YACC="yacc"
++		CC="${CC}"
++		CCOBJ="${CC}"
++		MT_CC="${CC}"
+ 		;;
+ 
+ 	parisc_linux24)

net/openafs/patches/patch-src_lwp_lwp_h

@@ -1,12 +1,12 @@
-$OpenBSD: patch-src_lwp_lwp_h,v 1.1 2008/07/21 03:13:01 todd Exp $
---- src/lwp/lwp.h.orig	Mon Apr 28 01:55:49 2008
-+++ src/lwp/lwp.h	Mon Apr 28 01:56:15 2008
-@@ -301,7 +301,7 @@ char lwp_debug;			/* ON = show LWP debugging trace */
+$OpenBSD: patch-src_lwp_lwp_h,v 1.2 2008/10/12 00:12:07 todd Exp $
+--- src/lwp/lwp.h.orig	Thu Mar 13 08:42:31 2008
++++ src/lwp/lwp.h	Sun Aug 24 21:04:52 2008
+@@ -300,6 +300,8 @@ char lwp_debug;			/* ON = show LWP debugging trace */
+ #define AFS_LWP_MINSTACKSIZE  (288 * 1024)
  #elif defined(AFS_LINUX22_ENV)
  #define AFS_LWP_MINSTACKSIZE	(192 * 1024)
- #else
--#define AFS_LWP_MINSTACKSIZE	(48 * 1024)
++#elif defined(AFS_OBSD41_ENV)
 +#define AFS_LWP_MINSTACKSIZE	(480 * 1024)
+ #else
+ #define AFS_LWP_MINSTACKSIZE	(48 * 1024)
  #endif
- 
- /* Action to take on stack overflow. */