8 files changed, 112 insertions, 40 deletions

diff --git a/net/Makefile b/net/Makefile
index 18a3532a4548..7a7c9a413888 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.167 1998/07/02 00:23:34 asami Exp $
+# $Id: Makefile,v 1.168 1998/07/04 19:52:36 steve Exp $
 #
 
     SUBDIR += SSLtelnet
@@ -90,11 +90,11 @@
     SUBDIR += rmsg
     SUBDIR += rshell
     SUBDIR += rsync
-    SUBDIR += rumba
     SUBDIR += rwhois
     SUBDIR += samba
     SUBDIR += scotty
     SUBDIR += sendfile
+    SUBDIR += sharity-light
     SUBDIR += sic
     SUBDIR += sirc
     SUBDIR += slirp
diff --git a/net/sharity-light/Makefile b/net/sharity-light/Makefile
index 681a3f5e510e..678edf19c3e4 100644
--- a/net/sharity-light/Makefile
+++ b/net/sharity-light/Makefile
@@ -1,37 +1,35 @@
-# New ports collection makefile for:	rumba
-# Version required:	0.6
+# New ports collection makefile for:	sharity-light
+# Version required:	1.0
 # Date created:		14 June 1997
 # Whom:			Dmitrij Tejblum <dima@tejblum.dnttm.rssi.ru>
 #
-# $Id: Makefile,v 1.3 1998/06/04 04:18:39 vanilla Exp $
+# $Id: Makefile,v 1.4 1998/06/24 18:01:16 dt Exp $
 #
 
-DISTNAME=	rumba.0.6a.s
-PKGNAME=	rumba-0.6a
+DISTNAME=	Sharity-Light.1.0.s
+PKGNAME=	sharity-light-1.0
 CATEGORIES=	net
-MASTER_SITES=	ftp://hal.kph.tuwien.ac.at/pub/NeXT/tools/rumba/ \
-		ftp://ftp.obdev.at/pub/Products/rumba/
-EXTRACT_SUFX=	.gnutar.gz
+MASTER_SITES=	ftp://ftp.obdev.at/pub/Products/SharityLight
 
 MAINTAINER=	dt@FreeBSD.ORG
 
 MAN8=		smbmount.8
 
 post-extract:
-	@${MKDIR} work/unrumba
-	@${CP} ${FILESDIR}/unrumba.c ${WRKDIR}/unrumba
-	@${CP} files/Makefile.unrumba ${WRKDIR}/unrumba/Makefile
+	@${MKDIR} work/unshlight
+	@${CP} ${FILESDIR}/unshlight.c ${WRKDIR}/unshlight
+	@${CP} files/Makefile.unshlight ${WRKDIR}/unshlight/Makefile
 
 post-build:
-	cd ${WRKDIR}/unrumba && make
+	cd ${WRKDIR}/unshlight && make
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/rumba ${PREFIX}/sbin
-	${INSTALL_PROGRAM} ${WRKDIR}/unrumba/unrumba ${PREFIX}/sbin
+	${INSTALL_PROGRAM} ${WRKSRC}/shlight ${PREFIX}/sbin
+	${INSTALL_PROGRAM} ${WRKDIR}/unshlight/unshlight ${PREFIX}/sbin
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/rumba
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/rumba/README
-	${INSTALL_DATA} ${WRKSRC}/FAQ.txt ${PREFIX}/share/doc/rumba/FAQ
+	${MKDIR} ${PREFIX}/share/doc/Sharity-Light
+	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/Sharity-Light/README
+	${INSTALL_DATA} ${WRKSRC}/FAQ.txt ${PREFIX}/share/doc/Sharity-Light/FAQ
 .endif
 	${INSTALL_MAN} ${WRKSRC}/smbmount.8 ${PREFIX}/man/man8
 
diff --git a/net/sharity-light/distinfo b/net/sharity-light/distinfo
index 35ac444d2633..802e84aba378 100644
--- a/net/sharity-light/distinfo
+++ b/net/sharity-light/distinfo
@@ -1 +1 @@
-MD5 (rumba.0.6a.s.gnutar.gz) = 34c8ae89082599a8352b17e4a6ad2e39
+MD5 (Sharity-Light.1.0.s.tar.gz) = 8ee65292b459cb6497655983489e4aa6
diff --git a/net/sharity-light/files/Makefile.unshlight b/net/sharity-light/files/Makefile.unshlight
new file mode 100644
index 000000000000..7026b344fa38
--- /dev/null
+++ b/net/sharity-light/files/Makefile.unshlight
@@ -0,0 +1,4 @@
+PROG=unshlight
+NOMAN=sorry
+
+.include <bsd.prog.mk>
diff --git a/net/sharity-light/files/patch-ad b/net/sharity-light/files/patch-ad
index e3c08e1d19f2..3a3f6b16f96a 100644
--- a/net/sharity-light/files/patch-ad
+++ b/net/sharity-light/files/patch-ad
@@ -27,7 +27,7 @@
 -#RPC_WARNFLAGS = -Wno-unused -Wno-switch -Wno-uninitialized
 +CFLAGS += -Wall
 +INCLUDES = $(MYINCL) $(INCL)
-+THE_CC = cc
++THE_CC := $(CC)
 +RPC_WARNFLAGS = -Wno-unused -Wno-switch -Wno-uninitialized
  
  # For NetBsd
diff --git a/net/sharity-light/files/unshlight.c b/net/sharity-light/files/unshlight.c
new file mode 100644
index 000000000000..e167b3611687
--- /dev/null
+++ b/net/sharity-light/files/unshlight.c
@@ -0,0 +1,73 @@
+#include <sys/param.h>
+#include <sys/mount.h>
+
+#include <err.h>
+#include <sysexits.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <signal.h>
+
+static void usage(void);
+
+int
+main(int argc, char** argv)
+{
+	struct statfs* mntbuf;
+	int mntcount, i;
+	int aflag=0;
+	int ch;
+	
+	while ( (ch = getopt(argc, argv, "a")) != -1) {
+		switch (ch) {
+		case 'a':
+			aflag=1;
+			break;
+		case '?':
+		default:
+			usage();
+		}
+	}
+	argc -= optind;
+	argv += optind;
+	if (aflag && argc != 0)
+		usage();
+	if (!aflag && argc == 0)
+		usage();
+
+	for (; argc>0 || aflag; aflag?(void)(aflag=0):(void)(argc--, argv++)) {
+		char abspath[MAXPATHLEN];
+		pid_t pid=0;
+		if (argc > 0) {
+			if (realpath(argv[0], abspath) == 0) {
+				warn(abspath);
+				continue;
+			}
+		}
+		mntcount=getmntinfo(&mntbuf, MNT_NOWAIT);
+		if (mntcount < 0)
+			err(EX_OSERR, "getmntinfo");
+		for (i=0; i<mntcount; i++) {
+			char* s;
+			int error;
+			if (argc > 0 && strcmp(abspath, mntbuf[i].f_mntonname) != 0) continue;
+			if (mntbuf[i].f_type != MOUNT_NFS) continue;
+			if (strncmp(mntbuf[i].f_mntfromname, "shlight-", 8) != 0) continue;
+			pid=strtoul(mntbuf[i].f_mntfromname+8, &s, 10);
+			if (*s) continue;
+			error = unmount (mntbuf[i].f_mntonname, 0);
+			if (error == 0) {
+				kill (pid, SIGHUP);
+			} else {
+				warn(mntbuf[i].f_mntonname);
+			}
+		}
+		if (argc > 0 && !pid) 
+			warnx("%s: not currently mounted", abspath);
+	}
+}
+
+void
+usage(void)
+{
+	errx(EX_USAGE, "Usage: unshlight [-a] [node]");
+}
diff --git a/net/sharity-light/pkg-descr b/net/sharity-light/pkg-descr
index 22f194983ec4..1adb445dd69e 100644
--- a/net/sharity-light/pkg-descr
+++ b/net/sharity-light/pkg-descr
@@ -1,18 +1,15 @@
-It is part of author's Announcment:
+If you want a short description of what Sharity-Light can do for you: you can 
+mount volumes exported by Windows or related operating systems on your Unix 
+machine. For a more detailed description I will quote from the README file:
 
-This is the first public release of rumba. If you want a short
-description of what rumba can do for you: you can mount volumes exported
-by Windows or related operating systems on your Unix machine. For a more
-detailed description I will quote from the README file:
-
-
-What does rumba do?
-===================
-If you know smbfs for Linux: rumba is roughly the same. It is derived
-from smbfs, but runs as a user level program, not in the kernel. If you
-know samba: rumba is roughly the opposite: a client for the Lanmanager
-protocol. If you know neither of these: rumba lets you mount drives
-exported by Windows (f.Workgroups/95/NT), Lan Manager, OS/2 etc. on
-Unix machines.
+What does Sharity-Light do?
+===========================
+If you know smbfs for Linux: Sharity-Light is roughly the same. It is
+derived from smbfs, but runs as a user level program, not in the kernel.
+If you know samba: Sharity-Light is roughly the opposite: a client for the
+Lanmanager protocol. If you know neither of these: Sharity-Light lets you
+mount drives exported by Windows (f.Workgroups/95/NT), Lan Manager, OS/2
+etc. on Unix machines.
 
 
+For more information, see http://www.obdev.at/Products/
diff --git a/net/sharity-light/pkg-plist b/net/sharity-light/pkg-plist
index 71a7cb2d5cc8..13cac9bf2bf2 100644
--- a/net/sharity-light/pkg-plist
+++ b/net/sharity-light/pkg-plist
@@ -1,5 +1,5 @@
-sbin/rumba
-sbin/unrumba
+sbin/shlight
+sbin/unshlight
 man/man8/smbmount.8.gz
-share/doc/rumba/README
-share/doc/rumba/FAQ
+share/doc/Sharity-Light/README
+share/doc/Sharity-Light/FAQ