- Add patch for NFS headers and unbreak build

- Use UID/GID 171, 71 belongs to Oracle
- Use USE_LIBTOOL and remove .la files
- Use DOCSDIR macro in pkg-plist

PR:		ports/66933
Submitted by:	leeym
Approved by:	maintainer

4 files changed, 29 insertions, 18 deletions

diff --git a/security/sfs/Makefile b/security/sfs/Makefile
index ae91a8428249..3545fcc1b833 100644
--- a/security/sfs/Makefile
+++ b/security/sfs/Makefile
@@ -20,7 +20,7 @@ PLIST_SUB=	SFS_VERSION=${PORTVERSION}
 INFO=		sfs
 
 USE_GMAKE=	yes
-
+USE_LIBTOOL=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-sfsuser=sfs \
 		--with-sfsgroup=sfs \
@@ -30,13 +30,9 @@ CONFIGURE_ARGS+=--with-sfsuser=sfs \
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 500113
-BROKEN=		"Does not compile on FreeBSD ${OSVERSION}"
-.endif
-
 .if ${OSVERSION} > 500000
 LIB_DEPENDS+=	gmp.6:${PORTSDIR}/math/libgmp4
-CONFIGURE_ARGS+=--with-gmp=${PREFIX}
+CONFIGURE_ARGS+=--with-gmp=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=--with-gmp=/usr
 .endif
diff --git a/security/sfs/files/patch-nfsclient b/security/sfs/files/patch-nfsclient
new file mode 100644
index 000000000000..08fa857257b2
--- /dev/null
+++ b/security/sfs/files/patch-nfsclient
@@ -0,0 +1,20 @@
+--- nfsconf.h.orig	Wed May 19 22:42:39 2004
++++ nfsconf.h	Wed May 19 22:43:24 2004
+@@ -33,6 +33,7 @@
+ # include <nfs/nfs.h>
+ #endif /* NEED_NFS_NFS_H */
+ #if NEED_NFSCLIENT_NFS_H
++# include <nfs/nfsproto.h>
+ # include <nfsclient/nfs.h>
+ #endif /* NEED_NFSCLIENT_NFS_H */
+ #if NEED_NFS_MOUNT_H
+--- configure.orig	Wed May 19 22:43:05 2004
++++ configure	Wed May 19 22:41:46 2004
+@@ -9661,6 +9661,7 @@
+ 	cat >conftest.$ac_ext <<_ACEOF
+ #line 9662 "configure"
+ #include "confdefs.h"
++#include <nfs/nfsproto.h>
+ #include <nfsclient/nfs.h>
+ 
+ _ACEOF
diff --git a/security/sfs/pkg-install b/security/sfs/pkg-install
index 55a4cf6bc94a..609bfca2c283 100644
--- a/security/sfs/pkg-install
+++ b/security/sfs/pkg-install
@@ -8,8 +8,8 @@ KEYFILE="$PKG_PREFIX/etc/sfs/sfs_host_key"
 
 USER=sfs
 GROUP=sfs
-UID=71
-GID=71
+UID=171
+GID=171
 PW=/usr/sbin/pw
 
 SFSDIR=/var/spool/sfs
diff --git a/security/sfs/pkg-plist b/security/sfs/pkg-plist
index 30233127810a..b2238ac465d2 100644
--- a/security/sfs/pkg-plist
+++ b/security/sfs/pkg-plist
@@ -136,15 +136,10 @@ lib/sfs
 lib/sfs-%%SFS_VERSION%%/aiod
 lib/sfs-%%SFS_VERSION%%/connect
 lib/sfs-%%SFS_VERSION%%/libarpc.a
-lib/sfs-%%SFS_VERSION%%/libarpc.la
 lib/sfs-%%SFS_VERSION%%/libasync.a
-lib/sfs-%%SFS_VERSION%%/libasync.la
 lib/sfs-%%SFS_VERSION%%/libsfscrypt.a
-lib/sfs-%%SFS_VERSION%%/libsfscrypt.la
 lib/sfs-%%SFS_VERSION%%/libsfsmisc.a
-lib/sfs-%%SFS_VERSION%%/libsfsmisc.la
 lib/sfs-%%SFS_VERSION%%/libsvc.a
-lib/sfs-%%SFS_VERSION%%/libsvc.la
 lib/sfs-%%SFS_VERSION%%/listen
 lib/sfs-%%SFS_VERSION%%/mallock.o
 lib/sfs-%%SFS_VERSION%%/moduled
@@ -168,11 +163,11 @@ sbin/funmount
 sbin/sfscd
 sbin/sfssd
 sbin/vidb
-share/doc/sfs/WELCOME
-share/doc/sfs/README
-share/doc/sfs/README.packageblurb
-share/doc/sfs/README.0.7-upgrade
-@dirrm share/doc/sfs
+%%DOCSDIR%%/WELCOME
+%%DOCSDIR%%/README
+%%DOCSDIR%%/README.packageblurb
+%%DOCSDIR%%/README.0.7-upgrade
+@dirrm %%DOCSDIR%%
 share/sfs/agentrc
 share/sfs/sfs_config
 share/sfs/sfs_srp_parms