6 files changed, 15 insertions, 38 deletions

diff --git a/sysutils/wmfire/Makefile b/sysutils/wmfire/Makefile
index 5ee6fa996e7a..9e3eae43f4c5 100644
--- a/sysutils/wmfire/Makefile
+++ b/sysutils/wmfire/Makefile
@@ -6,20 +6,22 @@
 #
 
 PORTNAME=	wmfire
-PORTVERSION=	0.0.3.9
+PORTVERSION=	1.2.3
 CATEGORIES=	sysutils
-MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= jedgar
-DISTNAME=	wmfire-0.0.3.9pre4
+MASTER_SITES=	http://www.swanson.ukfsn.org/wmfire/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Window Maker dock app showing load average as a flame
 
+LIB_DEPENDS=	gtop-2.0.2:${PORTSDIR}/devel/libgtop2
+
 USE_X_PREFIX=	yes
-USE_XPM=	yes
+USE_GNOME=	gnometarget gtk20
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-x
-CONFIGURE_ENV=	CFLAGS="-I${PREFIX}/include ${CFLAGS}" \
-		LIBS="-L${PREFIX}/lib"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+
+MAN1=		wmfire.1
+PLIST_FILES=	bin/wmfire
 
 .include <bsd.port.mk>
diff --git a/sysutils/wmfire/distinfo b/sysutils/wmfire/distinfo
index e0899ee23941..d6be6ed684d0 100644
--- a/sysutils/wmfire/distinfo
+++ b/sysutils/wmfire/distinfo
@@ -1,3 +1,3 @@
-MD5 (wmfire-0.0.3.9pre4.tar.gz) = a5ea7e73041494dae95eba058d55cab1
-SHA256 (wmfire-0.0.3.9pre4.tar.gz) = b698bfff22821ba71f68f96fc1f3fa558f085d7c773a817cda9989b080b2b2e2
-SIZE (wmfire-0.0.3.9pre4.tar.gz) = 69853
+MD5 (wmfire-1.2.3.tar.gz) = e4bc647777f2181cf1b8e78bcc0850ee
+SHA256 (wmfire-1.2.3.tar.gz) = a254ca65b1df302c35dc5cdabd1d991889816389fb3e92084469c27a090559ba
+SIZE (wmfire-1.2.3.tar.gz) = 90979
diff --git a/sysutils/wmfire/files/patch-aa b/sysutils/wmfire/files/patch-aa
deleted file mode 100644
index 0395788d1daf..000000000000
--- a/sysutils/wmfire/files/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
---- configure.orig	Thu Oct 21 21:23:53 1999
-+++ configure	Thu Oct 21 23:37:39 1999
-@@ -1755,8 +1755,8 @@
- 	linux*)
- 		echo "$ac_t""Linux" 1>&6
- 		;;
--	netbsd*)
--		echo "$ac_t""NetBSD" 1>&6
-+	freebsd*)
-+		echo "$ac_t""FreeBSD" 1>&6
- 		;;
- 	*)
- 		echo "$ac_t""*Unknown*" 1>&6
diff --git a/sysutils/wmfire/files/patch-ab b/sysutils/wmfire/files/patch-ab
deleted file mode 100644
index 44e8ba09f8fc..000000000000
--- a/sysutils/wmfire/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- fireload_cpu.c.orig	Thu Sep 30 10:45:48 1999
-+++ fireload_cpu.c	Thu Oct 21 23:25:10 1999
-@@ -30,7 +30,7 @@
- #  define DELTA(i, x) (cpuinfo[i].cs_new.x - cpuinfo[i].cs_old.x)
- #endif
- 
--#ifdef __NetBSD__
-+#ifdef __FreeBSD__
- /********************************
-  * NetBSD code by Hubert Feyrer *
-  ********************************/
diff --git a/sysutils/wmfire/pkg-descr b/sysutils/wmfire/pkg-descr
index 448a9dac5304..b72f00a36165 100644
--- a/sysutils/wmfire/pkg-descr
+++ b/sysutils/wmfire/pkg-descr
@@ -2,5 +2,7 @@ Window Maker dock app showing load average as a flame.
 
 Not terribly useful, but looks cool.
 
+WWW: http://www.swanson.ukfsn.org/#wmfire
+
 - Chris D. Faulhaber
  <jedgar@FreeBSD.org>
diff --git a/sysutils/wmfire/pkg-plist b/sysutils/wmfire/pkg-plist
deleted file mode 100644
index 93a4691876e6..000000000000
--- a/sysutils/wmfire/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-bin/wmfire
-bin/fireload_cpu
-bin/fireload_file