From 70b97c41ab05220c291daf23c890309f69cbf126 Mon Sep 17 00:00:00 2001 From: "Justin M. Seger" Date: Fri, 16 Oct 1998 00:55:28 +0000 Subject: Unbreak for current. Submitted by: dima --- net/sharity-light/Makefile | 7 +------ net/sharity-light/files/unshlight.c | 4 ++++ 2 files changed, 5 insertions(+), 6 deletions(-) (limited to 'net/sharity-light') diff --git a/net/sharity-light/Makefile b/net/sharity-light/Makefile index 3bc547ca39b5..fdc8787ef1e9 100644 --- a/net/sharity-light/Makefile +++ b/net/sharity-light/Makefile @@ -3,7 +3,7 @@ # Date created: 14 June 1997 # Whom: Dmitrij Tejblum # -# $Id: Makefile,v 1.6 1998/07/07 19:17:15 dt Exp $ +# $Id: Makefile,v 1.7 1998/10/14 00:26:49 jseger Exp $ # DISTNAME= Sharity-Light.1.0.s @@ -15,11 +15,6 @@ MASTER_SITES= ftp://ftp.obdev.at/pub/Products/Sharity-Light/ \ MAINTAINER= dt@FreeBSD.ORG -OSVERSION!= sysctl -n kern.osreldate -.if ${OSVERSION} >= 300000 -BROKEN= MOUNT_NFS undeclared -.endif - MAN8= smbmount.8 post-extract: diff --git a/net/sharity-light/files/unshlight.c b/net/sharity-light/files/unshlight.c index e167b3611687..b8502060d05a 100644 --- a/net/sharity-light/files/unshlight.c +++ b/net/sharity-light/files/unshlight.c @@ -50,7 +50,11 @@ main(int argc, char** argv) char* s; int error; if (argc > 0 && strcmp(abspath, mntbuf[i].f_mntonname) != 0) continue; +#if defined(__FreeBSD_version) && __FreeBSD_version > 300000 + if (strcmp(mntbuf[i].f_fstypename, "nfs") != 0) continue; +#else if (mntbuf[i].f_type != MOUNT_NFS) continue; +#endif if (strncmp(mntbuf[i].f_mntfromname, "shlight-", 8) != 0) continue; pid=strtoul(mntbuf[i].f_mntfromname+8, &s, 10); if (*s) continue; -- cgit v1.2.3