diff options
| author | agc <agc@pkgsrc.org> | 2000-07-13 15:48:47 +0000 |
|---|---|---|
| committer | agc <agc@pkgsrc.org> | 2000-07-13 15:48:47 +0000 |
| commit | f3df20f4fce11b82d89b4eb474bebae99ba7a613 (patch) | |
| tree | e3eb26bfda9d559b858593e18f10a184122d5871 | |
| parent | 9aa9298845679f7da1a1efffd1b954e43ee8cd67 (diff) | |
| download | pkgsrc-f3df20f4fce11b82d89b4eb474bebae99ba7a613.tar.gz | |
Reformat the patch to cpumeter.cc so that it applies cleanly.
Add definitions to the environment on Solaris so that xpm is found.
Make the dependency on egcs for Solaris a build dependency.
Re-calculate patch checksums.
| -rw-r--r-- | sysutils/xosview/Makefile | 8 | ||||
| -rw-r--r-- | sysutils/xosview/files/patch-sum | 4 | ||||
| -rw-r--r-- | sysutils/xosview/patches/patch-ae | 25 |
3 files changed, 20 insertions, 17 deletions
diff --git a/sysutils/xosview/Makefile b/sysutils/xosview/Makefile index e9ea96ae7ef..9a0e5e28919 100644 --- a/sysutils/xosview/Makefile +++ b/sysutils/xosview/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2000/06/27 08:17:46 tron Exp $ +# $NetBSD: Makefile,v 1.29 2000/07/13 15:48:47 agc Exp $ # DISTNAME= xosview-1.7.0.b @@ -17,10 +17,12 @@ USE_X11BASE= yes .if ${OPSYS} == "NetBSD" BUILD_DEFS= UVM - .elif ${OPSYS} == "SunOS" -DEPENDS+= egcs-1.1.2:../../lang/egcs +DEPENDS+= xpm-*:../../graphics/xpm +BUILD_DEPENDS+= ${LOCALBASE}/egcs/bin/g++:../../lang/egcs CONFIGURE_ENV+= CXX=${LOCALBASE}/egcs/bin/g++ +CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -I${X11BASE}/include" +CONFIGURE_ENV+= LIBS="${LIBS} -lsocket -lnsl" USE_GMAKE= yes .endif diff --git a/sysutils/xosview/files/patch-sum b/sysutils/xosview/files/patch-sum index c343e738333..43c2c1905a9 100644 --- a/sysutils/xosview/files/patch-sum +++ b/sysutils/xosview/files/patch-sum @@ -1,7 +1,7 @@ -$NetBSD: patch-sum,v 1.5 2000/06/27 08:37:40 tron Exp $ +$NetBSD: patch-sum,v 1.6 2000/07/13 15:48:48 agc Exp $ MD5 (patch-aa) = 01835431e31147cef93fe1cb89aff6a2 MD5 (patch-ab) = 53e16001747ad96a9403eb1c9cde5c1a MD5 (patch-ac) = 4b87a0726f1b944586ad2f861014503a MD5 (patch-ad) = 079f697213f77a037d77ff69dbfcc72d -MD5 (patch-ae) = 423efd3112ef5221b07aff1471505d2a +MD5 (patch-ae) = 2f40cc9808aeb0f5b093d9bdba3d83ea diff --git a/sysutils/xosview/patches/patch-ae b/sysutils/xosview/patches/patch-ae index a3da1275778..770538f12d8 100644 --- a/sysutils/xosview/patches/patch-ae +++ b/sysutils/xosview/patches/patch-ae @@ -1,13 +1,14 @@ -$NetBSD: patch-ae,v 1.6 2000/06/27 08:37:41 tron Exp $ +$NetBSD: patch-ae,v 1.7 2000/07/13 15:48:49 agc Exp $ ---- bsd/cpumeter.cc.orig Tue Feb 16 15:09:22 1999 -+++ bsd/cpumeter.cc Tue Jun 27 10:13:36 2000 -@@ -16,5 +16,8 @@ - // - #include <sys/dkstat.h> // For CPUSTATES #define. BCG -+#if defined(XOSVIEW_NETBSD) && !defined(CPUSTATES) -+#include <sys/sched.h> -+#endif - #include <stdlib.h> // For use of atoi BCG - #include "general.h" - #include "cpumeter.h" +*** bsd/cpumeter.cc.orig Tue Feb 16 14:09:22 1999 +--- bsd/cpumeter.cc Thu Jul 13 16:19:09 2000 +*************** +*** 16,19 **** +--- 16,22 ---- + // + #include <sys/dkstat.h> // For CPUSTATES #define. BCG ++ #if defined(XOSVIEW_NETBSD) && !defined(CPUSTATES) ++ #include <sys/sched.h> ++ #endif + #include <stdlib.h> // For use of atoi BCG + #include "general.h" |