7 files changed, 54 insertions, 26 deletions

diff --git a/sysutils/xsysstats/Makefile b/sysutils/xsysstats/Makefile
index d8e6216aaa55..7f591c67480e 100644
--- a/sysutils/xsysstats/Makefile
+++ b/sysutils/xsysstats/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	xsysstats
-PORTVERSION=	1.34
+PORTVERSION=	1.51
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	utilities
@@ -15,7 +15,14 @@ DISTNAME=	${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_IMAKE=	yes
+GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
+USE_XLIB=	yes
 MAN1=		xsysstats.1
 
+ALL_TARGET=	xsysstats
+
+pre-patch:
+	${RM} ${WRKSRC}/headers.h && ${TOUCH} ${WRKSRC}/headers.h
+
 .include <bsd.port.mk>
diff --git a/sysutils/xsysstats/distinfo b/sysutils/xsysstats/distinfo
index f773772cd5ef..681587bc1911 100644
--- a/sysutils/xsysstats/distinfo
+++ b/sysutils/xsysstats/distinfo
@@ -1 +1 @@
-MD5 (xsysstats1.34.tar.gz) = 6f8a5a27805bca2a1571cbd5fe816a03
+MD5 (xsysstats1.51.tar.gz) = 90996162e16b45c2e8ae2fd1d8fd4ad3
diff --git a/sysutils/xsysstats/files/patch-Makefile.in b/sysutils/xsysstats/files/patch-Makefile.in
new file mode 100644
index 000000000000..b409e3934ba6
--- /dev/null
+++ b/sysutils/xsysstats/files/patch-Makefile.in
@@ -0,0 +1,12 @@
+--- Makefile.in.orig	Tue May 30 08:07:38 2000
++++ Makefile.in	Sat Nov  9 08:50:56 2002
+@@ -1,6 +1,6 @@
+-CC = @CC@
+-CFLAGS = @CFLAGS@
+-CPPFLAGS = @CPPFLAGS@
++#CC = @CC@
++CFLAGS = -I@x_includes@
++#CPPFLAGS = @CPPFLAGS@
+ LIBS = @LIBS@
+ LDFLAGS = @LDFLAGS@
+ 
diff --git a/sysutils/xsysstats/files/patch-aa b/sysutils/xsysstats/files/patch-aa
deleted file mode 100644
index f2b42522f676..000000000000
--- a/sysutils/xsysstats/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./headers.h.org	Thu Dec  1 18:06:22 1994
-+++ ./headers.h	Mon Mar 27 21:53:02 1995
-@@ -9,7 +9,7 @@
-  * prototypes, this is unneeded.
-  */
- 
--#if !defined(__NetBSD__) && !defined(linux)
-+#if !defined(__NetBSD__) && !defined (__FreeBSD__) && !defined(linux)
- #ifdef __GNUC__
- /* These do not seem to be needed with gcc-2.5.0.  In fact, having
-  * them declared causes errors.
diff --git a/sysutils/xsysstats/files/patch-ab b/sysutils/xsysstats/files/patch-ab
deleted file mode 100644
index 244daed74e6d..000000000000
--- a/sysutils/xsysstats/files/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
---- porting.c.orig	Sun Jul 22 11:19:14 2001
-+++ porting.c	Sun Jul 22 11:23:38 2001
-@@ -33,7 +33,9 @@
- #endif
- #include <rpcsvc/rstat.h>
- 
-+#if !defined(__FreeBSD__) || !defined(__alpha__)
- extern int callrpc(char *, u_long, u_long, u_long, xdrproc_t, char *, xdrproc_t, char *);
-+#endif
- 
- int rstat(char *host, struct statstime *stats)
- {
diff --git a/sysutils/xsysstats/files/patch-xsysstats.c b/sysutils/xsysstats/files/patch-xsysstats.c
new file mode 100644
index 000000000000..7150d1f88d0d
--- /dev/null
+++ b/sysutils/xsysstats/files/patch-xsysstats.c
@@ -0,0 +1,8 @@
+--- xsysstats.c.orig	Sat Nov  9 08:44:11 2002
++++ xsysstats.c	Sat Nov  9 08:44:45 2002
+@@ -1,5 +1,4 @@
+ #include "xsysstats.h"
+-#include "headers.h"
+ #include "patchlevel.h"
+ 
+ struct base_types {
diff --git a/sysutils/xsysstats/files/patch-xsysstats.h b/sysutils/xsysstats/files/patch-xsysstats.h
new file mode 100644
index 000000000000..a7893e2917aa
--- /dev/null
+++ b/sysutils/xsysstats/files/patch-xsysstats.h
@@ -0,0 +1,24 @@
+--- xsysstats.h.orig	Tue May 30 08:46:20 2000
++++ xsysstats.h	Sat Nov  9 08:43:29 2002
+@@ -15,12 +15,9 @@
+ #include <stdio.h>
+ #include <sys/param.h>
+ 
+-#include <stdio.h>
+-#include <sys/param.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <unistd.h>
+-#include <malloc.h>
+ #include <netdb.h>
+ #include <rpcsvc/rstat.h>
+ 
+@@ -138,7 +135,7 @@
+     char    *name;	/*Name of the host */
+ #ifdef USE_NEW_RSTAT
+     CLIENT  *client;	/* client connection for rstat */
+-#endif USE_NEW_RSTAT
++#endif /* USE_NEW_RSTAT */
+ };
+ 
+ extern struct Xss_Window **windows;