6 files changed, 42 insertions, 77 deletions

diff --git a/sysutils/wmfsm/Makefile b/sysutils/wmfsm/Makefile
index 0a8e6a6e7960..02798363fdea 100644
--- a/sysutils/wmfsm/Makefile
+++ b/sysutils/wmfsm/Makefile
@@ -6,20 +6,24 @@
 #
 
 PORTNAME=	wmfsm
-PORTVERSION=	0.31
+PORTVERSION=	0.34
 CATEGORIES=	sysutils windowmaker
-MASTER_SITES=	http://netpedia.net/hosting/wmfsm/source/ \
-		http://e.dyn.mdn.de/mirror/wmfsm/
+MASTER_SITES=	http://www.cs.ubc.ca/~cmg/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Displays filesystem usage of mountpoints in a nice WindowMaker dockapp
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/wmfsm
+USE_X_PREFIX=	yes
+USE_XPM=	yes
+USE_GETOPT_LONG=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
-MAKEFILE=	Makefile.bsd
+MAN1=		wmfsm.1
 PLIST_FILES=	bin/wmfsm
 
-USE_X_PREFIX=	yes
-USE_XPM=	yes
+CPPFLAGS=	-I${X11BASE}/include
+LDFLAGS=	-L${X11BASE}/lib
 
 .include <bsd.port.mk>
diff --git a/sysutils/wmfsm/distinfo b/sysutils/wmfsm/distinfo
index 5c5ec240f172..1744e9b154cf 100644
--- a/sysutils/wmfsm/distinfo
+++ b/sysutils/wmfsm/distinfo
@@ -1,2 +1,2 @@
-MD5 (wmfsm-0.31.tar.gz) = 9b47b44ed9102b8b659168383a0c379e
-SIZE (wmfsm-0.31.tar.gz) = 18522
+MD5 (wmfsm-0.34.tar.gz) = 5ec81127146d8340a698cc5e26a66e43
+SIZE (wmfsm-0.34.tar.gz) = 105220
diff --git a/sysutils/wmfsm/files/patch-aa b/sysutils/wmfsm/files/patch-aa
deleted file mode 100644
index 1e768f203b14..000000000000
--- a/sysutils/wmfsm/files/patch-aa
+++ /dev/null
@@ -1,41 +0,0 @@
-
-$FreeBSD$
-
---- wmfsm.c.orig	Thu Aug 26 09:42:39 1999
-+++ wmfsm.c	Mon Feb  5 00:38:13 2001
-@@ -59,7 +59,7 @@
- #elif  defined(SunOS)
- # define STATFS(a,b) statfs(a,b,sizeof(struct statfs),0)
- # include <sys/statfs.h>
--#elif defined(__OpenBSD__)
-+#elif defined(__OpenBSD__) || defined(__FreeBSD__)
- # define STATFS(a,b) statfs(a,b)
- # include <sys/param.h>
- # include <sys/mount.h>
-@@ -362,7 +362,7 @@
- 
- void readFileSystems(){
- /* Look for the goods between #if defined(__OpenBSD__) -- tschroed */
--#if defined(__OpenBSD__)
-+#if defined(__OpenBSD__) || defined(__FreeBSD__)
- #define MAXMOUNT	32
-     struct statfs sfs[MAXMOUNT];
-     int fscount;
-@@ -379,7 +379,7 @@
- 	    { numberfs--; fscount--; }
- 	else
- 	    mp[numberfs]=strdup(sfs[numberfs].f_mntonname);
--#else /* __OpenBSD__ */
-+#else /* __OpenBSD__ || __FreeBSD__ */
- 
-     FILE    *fp;
-     char    mountPoint[255],dummy[255],fstype[255],options[255];
-@@ -424,7 +424,7 @@
-             mp[numberfs++]=strdup(mountPoint);
-         }
-     }
--#endif /* __OpenBSD__ */
-+#endif /* __OpenBSD__ || __FreeBSD__ */
-     excludeFileSystems();
- }
- void excludeFileSystems(){
diff --git a/sysutils/wmfsm/files/patch-ab b/sysutils/wmfsm/files/patch-ab
deleted file mode 100644
index 78dacc52bc55..000000000000
--- a/sysutils/wmfsm/files/patch-ab
+++ /dev/null
@@ -1,26 +0,0 @@
-
-$FreeBSD$
-
---- Makefile.bsd.orig	Wed Jun 16 09:54:34 1999
-+++ Makefile.bsd	Mon Feb  5 00:38:13 2001
-@@ -1,9 +1,9 @@
--CC     = gcc
-+CC     ?= gcc
- #CC     = /usr/pure/purify-4.1-irix6/purify cc
--CFLAGS = 
--INCDIR = -I/usr/X11R6/include/X11 -I/home/p-sgi2/eilemann/IRIX64/include -I/usr/X11R6/include
--DESTDIR= /usr/X11R6
--LIBDIR = -L/usr/X11R6/lib
-+CFLAGS += 
-+INCDIR = -I${X11BASE}/include/X11 -I${X11BASE}/include
-+DESTDIR= ${PREFIX}
-+LIBDIR = -L${X11BASE}/lib
- # for linux & irix
- LIBS   = -lXpm -lX11 -lXext
- 
-@@ -33,4 +33,4 @@
- 	rm -f wmfsm
- 
- install:: wmfsm
--	install -s -m 0755 wmfsm $(DESTDIR)/bin
-+	${BSD_INSTALL_PROGRAM} wmfsm $(DESTDIR)/bin
diff --git a/sysutils/wmfsm/files/patch-wmfsm::wmfsm.c b/sysutils/wmfsm/files/patch-wmfsm::wmfsm.c
new file mode 100644
index 000000000000..88eaa8cd24ad
--- /dev/null
+++ b/sysutils/wmfsm/files/patch-wmfsm::wmfsm.c
@@ -0,0 +1,28 @@
+--- wmfsm/wmfsm.c.orig	Sat Jul 13 13:06:35 2002
++++ wmfsm/wmfsm.c	Fri Apr  9 23:35:48 2004
+@@ -54,6 +54,12 @@
+ #include <sys/systeminfo.h>
+ #endif /* SVR4 */
+ 
++#ifdef HAVE_SYS_PARAM_H
++#include <sys/param.h>
++#endif
++#ifdef HAVE_SYS_TYPES_H
++#include <sys/types.h>
++#endif
+ #ifdef HAVE_SYS_VFS_H
+ #include <sys/vfs.h>
+ #endif
+@@ -62,12 +68,6 @@
+ #endif
+ #ifdef HAVE_SYS_MOUNT_H
+ #include <sys/mount.h>
+-#endif
+-#ifdef HAVE_SYS_PARAM_H
+-#include <sys/param.h>
+-#endif
+-#ifdef HAVE_SYS_TYPES_H
+-#include <sys/types.h>
+ #endif
+ 
+ #ifdef STATFS_2_ARGUMENTS
diff --git a/sysutils/wmfsm/pkg-descr b/sysutils/wmfsm/pkg-descr
index a5284604ce61..f28cb0d671f6 100644
--- a/sysutils/wmfsm/pkg-descr
+++ b/sysutils/wmfsm/pkg-descr
@@ -1,7 +1,7 @@
 Wmfsm monitors your filesystem usage. It features three display modes,
 different colorschemes and exclusion of filesystems (eg /cdrom).
 
-WWW: http://freshmeat.net/projects/wmfsm/homepage/
+WWW: http://www.cs.ubc.ca/~cmg/
 
 - Steven
 panic@subphase.de