PLIST corrected, disable debug, enable pkgsrc optimisation

4 files changed, 43 insertions, 16 deletions

diff --git a/net/openafs/Makefile b/net/openafs/Makefile
index 9ec38c13a61..e61d60839d9 100644
--- a/net/openafs/Makefile
+++ b/net/openafs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/08/10 19:14:16 gendalia Exp $
+# $NetBSD: Makefile,v 1.13 2005/08/11 08:48:04 adam Exp $
 
 DISTNAME=	openafs-1.3.87-src
 PKGNAME=	${DISTNAME:C/-src//}
@@ -14,32 +14,35 @@ CONFLICTS+=	lwp-[0-9]*
 CONFLICTS+=	rx-[0-9]*
 CONFLICTS+=	arla-[0-9]*
 
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-largefile-fileserver --enable-fast-restart
-CONFIGURE_ARGS+= --enable-bitmap-later --disable-kernel-module
-CONFIGURE_ARGS+= --enable-debug --enable-bos-new-config
-CONFIGURE_ARGS+= --enable-namei-fileserver
-CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q}
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--enable-bitmap-later
+CONFIGURE_ARGS+=	--enable-bos-new-config
+CONFIGURE_ARGS+=	--enable-fast-restart
+CONFIGURE_ARGS+=	--enable-largefile-fileserver
+CONFIGURE_ARGS+=	--disable-kernel-module
+CONFIGURE_ARGS+=	--enable-namei-fileserver
+CONFIGURE_ARGS+=	--localstatedir=${VARBASE:Q}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 
 USE_GNU_CONFIGURE_HOST= no
 
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 
-PKG_SUPPORTED_OPTIONS = pam
-PKG_OPTIONS_VAR       = PKG_OPTIONS.openafs
-RCD_SCRIPTS+=	bosserver
+PKG_SUPPORTED_OPTIONS=	pam
+PKG_OPTIONS_VAR=	PKG_OPTIONS.openafs
+RCD_SCRIPTS+=		bosserver
 .include "../../mk/bsd.options.mk"
 
 USE_PKGINSTALL=		yes
 
 .if !empty(PKG_OPTIONS:Mpam)
-CONFIGURE_ARGS+=        --enable-pam
+CONFIGURE_ARGS+=	--enable-pam
 .include "../../mk/pam.buildlink3.mk"
 PLIST_SRC+=		${.CURDIR}/PLIST.pam
 .else
-CONFIGURE_ARGS+=        --disable-pam
+CONFIGURE_ARGS+=	--disable-pam
 .endif
+
 PLIST_SRC+=		${.CURDIR}/PLIST
 OWN_DIRS+=		${PKG_SYSCONFDIR}/openafs
 OWN_DIRS_PERMS+=	${PKG_SYSCONFDIR}/openafs/server ${ROOT_USER} ${ROOT_GROUP} 775
@@ -47,5 +50,6 @@ OWN_DIRS_PERMS+=	${VARBASE}/openafs ${ROOT_USER} ${ROOT_GROUP} 770
 OWN_DIRS+=		${VARBASE}/openafs/logs
 OWN_DIRS_PERMS+=	${VARBASE}/openafs/db ${ROOT_USER} ${ROOT_GROUP} 700
 
-FILES_SUBST+= HOSTNAME_CMD=${HOSTNAME_CMD:Q}
+FILES_SUBST+=		HOSTNAME_CMD=${HOSTNAME_CMD:Q}
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/openafs/PLIST b/net/openafs/PLIST
index 4ce71662348..a05838475f1 100644
--- a/net/openafs/PLIST
+++ b/net/openafs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2005/06/16 17:27:12 gendalia Exp $
+@comment $NetBSD: PLIST,v 1.3 2005/08/11 08:48:04 adam Exp $
 bin/afsmonitor
 bin/bos
 bin/cmdebug
@@ -128,7 +128,15 @@ include/afs/volume.h
 include/afs/xfsattrs.h
 include/afs/xstat_cm.h
 include/afs/xstat_fs.h
+include/des.h
+include/des_conf.h
 include/des_odd.h
+include/des_prototypes.h
+include/lock.h
+include/lwp.h
+include/mit-cpyright.h
+include/potpourri.h
+include/preempt.h
 include/rx/fcrypt.h
 include/rx/rx.h
 include/rx/rx_clock.h
@@ -148,6 +156,7 @@ include/rx/rxkad_prototypes.h
 include/rx/rxstat.h
 include/rx/xdr.h
 include/rx/xdr_prototypes.h
+include/timer.h
 include/ubik.h
 include/ubik_int.h
 lib/afs/libacl.a
diff --git a/net/openafs/distinfo b/net/openafs/distinfo
index eda7f92c0d1..63543dfa302 100644
--- a/net/openafs/distinfo
+++ b/net/openafs/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.6 2005/08/10 19:14:16 gendalia Exp $
+$NetBSD: distinfo,v 1.7 2005/08/11 08:48:04 adam Exp $
 
 SHA1 (openafs-1.3.87-src.tar.bz2) = 6d776941bd0076a3cf4cf66f9986ac032aafb6ac
 RMD160 (openafs-1.3.87-src.tar.bz2) = 3079e046edec673579eb4650ab07a05a4e4ff99b
 Size (openafs-1.3.87-src.tar.bz2) = 10983389 bytes
+SHA1 (patch-aa) = a24cc0d97a0045e44dadbcb195a55c50dfc2d308
diff --git a/net/openafs/patches/patch-aa b/net/openafs/patches/patch-aa
new file mode 100644
index 00000000000..63062728a5c
--- /dev/null
+++ b/net/openafs/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.3 2005/08/11 08:48:33 adam Exp $
+
+--- configure.orig	2005-08-11 10:25:48.000000000 +0000
++++ configure
+@@ -7796,7 +7796,7 @@ if test "x$enable_optimize_lwp" = "xno";
+   LWP_OPTMZ=
+ fi
+ 
+-
++XCFLAGS="${XCFLAGS} ${CFLAGS}"
+ 
+ 
+