6 files changed, 7 insertions, 120 deletions

diff --git a/sysutils/bbsmount/Makefile b/sysutils/bbsmount/Makefile
index 8d2b9ce2e427..ffcc34c91dd7 100644
--- a/sysutils/bbsmount/Makefile
+++ b/sysutils/bbsmount/Makefile
@@ -1,23 +1,21 @@
 # New ports collection makefile for:	bbsmount
 # Date created:				11 October 2003
-# Whom:				Eric J. Christeson <echriste@702com.net>
+# Whom:				Eric J. Christeson <ejc@crackpot.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	bbsmount
-PORTVERSION=	0.3.0p1
-PORTREVISION=	1
+PORTVERSION=	0.3.0p3
 CATEGORIES=	sysutils
 MASTER_SITES=	http://phoenix.inf.upol.cz/~jezberam/bbsmount/files/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/p/pre/}
 
-MAINTAINER=	echriste@702com.net
+MAINTAINER=	ejc@crackpot.org
 COMMENT=	Graphical disk mounter for the Blackbox slit
 
 USE_X_PREFIX=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}
-USE_GMAKE=	yes
 USE_XLIB=	yes
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
diff --git a/sysutils/bbsmount/distinfo b/sysutils/bbsmount/distinfo
index d8c9094feed7..520d02f7cc62 100644
--- a/sysutils/bbsmount/distinfo
+++ b/sysutils/bbsmount/distinfo
@@ -1,2 +1,2 @@
-MD5 (bbsmount-0.3.0pre1.tar.gz) = b5a6590c8be5d820c85e1cb17b942a43
-SIZE (bbsmount-0.3.0pre1.tar.gz) = 141974
+MD5 (bbsmount-0.3.0pre3.tar.gz) = 472cea75cb6a6baef281a27e5954dab9
+SIZE (bbsmount-0.3.0pre3.tar.gz) = 147635
diff --git a/sysutils/bbsmount/files/patch-bbsmount.cc b/sysutils/bbsmount/files/patch-bbsmount.cc
deleted file mode 100644
index fe4f4bd20dd5..000000000000
--- a/sysutils/bbsmount/files/patch-bbsmount.cc
+++ /dev/null
@@ -1,78 +0,0 @@
---- bbsmount.cc.orig	Thu May  8 16:10:07 2003
-+++ bbsmount.cc	Sat Oct 11 08:02:39 2003
-@@ -41,6 +41,9 @@
- #endif /* !TIME_WITH_SYS_TIME */
- 
- #include <pthread.h>
-+#include <sys/param.h>
-+#include <sys/ucred.h>
-+#include <sys/mount.h>
- 
- #include "bbsmount.hh"
- #include "version.h"
-@@ -128,25 +131,18 @@
- {
-     set<int> result;
-     map<string, int>::const_iterator pointer;
--    char buffer[max_mtab_line_length], md[max_mount_device_point_size], mp[max_mount_device_point_size];
--    FILE *mtab;
--
--    mtab = fopen(MTAB_FILE, "rt");
--    if (!mtab) {
--	fprintf(stderr, "Can't open mtab file!");
-+    struct statfs *mbuf;
-+    int i, size;
-+    if((size = getmntinfo(&mbuf, MNT_NOWAIT)) == 0) {
-+	fprintf(stderr, "getmntinfo() failed");
- 	return result;
-+    } 
-+
-+    for(i = 0; i < size; i++) {
-+	pointer = mount_points.find(string(mbuf[i].f_mntonname));
-+	if (pointer != mount_points.end())
-+	  result.insert(pointer->second);
-     }
--    
--    while (!feof(mtab)) {
--	if (fgets(buffer, max_mtab_line_length, mtab) > 0) {
--	    sscanf(buffer, "%s %s", md, mp);
--	    pointer = mount_points.find(string(mp));
--	    if (pointer != mount_points.end())
--		result.insert(pointer->second);
--	}
--    }
--    
--    fclose(mtab);
-     return result;
- }
- 
-@@ -179,26 +175,18 @@
- void *
- check_mounts(void *param)
- {
--    struct stat info;
--    int mtab_size = 0, return_value, counter;
--    time_t mtab_time = time(NULL);
-+    int return_value, counter;
-     map<string, int> mount_points;
- 
-     for (counter = 0; counter < (int)AppWindow->GetMountPointsCount(); counter++)
- 	mount_points[AppWindow->GetMountPoint(counter).GetMountPoint()] = counter;
-     while (!finish_checking) {
--	stat(MTAB_FILE, &info);
--	if ((difftime(info.st_mtime, mtab_time) > 0) || (mtab_size != info.st_size)) {
--	    mtab_size = info.st_size;
--	    mtab_time = info.st_mtime;
--	    update_mount_points(mount_points);
--	    create_notify_event();
--	}
-+	update_mount_points(mount_points);
-+	create_notify_event();
- 	return_value = sleep(AppWindow->GetResources()->app.refresh_time);
- 	if (return_value != 0)
- 	    finish_checking = true;
-     }
--
-     pthread_exit(NULL);
-     return NULL;
- }
diff --git a/sysutils/bbsmount/files/patch-configure b/sysutils/bbsmount/files/patch-configure
deleted file mode 100644
index 3708d21e21f2..000000000000
--- a/sysutils/bbsmount/files/patch-configure
+++ /dev/null
@@ -1,20 +0,0 @@
---- configure.orig	Mon May 12 04:02:56 2003
-+++ configure	Sat Oct 11 08:01:12 2003
-@@ -5308,7 +5308,7 @@
- #include <$ac_header>
- _ACEOF
- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+  (eval $ac_cpp $CFLAGS conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-@@ -5454,7 +5454,7 @@
- #include <$ac_header>
- _ACEOF
- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
--  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+  (eval $ac_cpp $CFLAGS conftest.$ac_ext) 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
diff --git a/sysutils/bbsmount/files/patch-data-Makefile.am b/sysutils/bbsmount/files/patch-data-Makefile.am
deleted file mode 100644
index 32c73843b38b..000000000000
--- a/sysutils/bbsmount/files/patch-data-Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
---- data/Makefile.am.orig	Mon May 12 04:06:36 2003
-+++ data/Makefile.am	Sat Oct 11 11:30:00 2003
-@@ -1,10 +1,8 @@
- configdir = $(datadir)/bbtools
- exampledir = $(pkgdatadir)/examples
- 
--config_DATA =	bbsmount.bb \
--		bbsmount.style \
--		bbsmount.nobb \
--		README.bbsmount
-+config_DATA =	bbsmount.style \
-+		bbsmount.nobb
- 
- example_DATA = bbsmount.bb.ex
- 
diff --git a/sysutils/bbsmount/pkg-plist b/sysutils/bbsmount/pkg-plist
index 5adaefa5ac57..12d5c02c553d 100644
--- a/sysutils/bbsmount/pkg-plist
+++ b/sysutils/bbsmount/pkg-plist
@@ -1,8 +1,10 @@
 bin/tkmsg
 bin/bbsmount
+share/bbtools/bbsmount.bb
 share/bbtools/bbsmount.bb-sample
 share/bbtools/bbsmount.nobb
 share/bbtools/bbsmount.style
+share/bbtools/README.bbsmount
 share/bbsmount/examples/bbsmount.bb.ex
 share/bbsmount/images/notfound.xpm
 share/bbsmount/images/mountedcd.xpm