diff options
| author | Patrick Li <pat@FreeBSD.org> | 2001-11-23 06:25:04 +0000 |
|---|---|---|
| committer | Patrick Li <pat@FreeBSD.org> | 2001-11-23 06:25:04 +0000 |
| commit | 7ce3de6b5af037a15b22c966acabfee562b773f5 (patch) | |
| tree | 470ba773585f7e11cb7b81185b4d5c3f416e4b5d /sysutils/x86info | |
| parent | c374ff32b1474aad0d889097eb04fad969885fab (diff) | |
| download | ports-7ce3de6b5af037a15b22c966acabfee562b773f5.tar.gz ports-7ce3de6b5af037a15b22c966acabfee562b773f5.zip | |
Notes
Diffstat (limited to 'sysutils/x86info')
| -rw-r--r-- | sysutils/x86info/Makefile | 5 | ||||
| -rw-r--r-- | sysutils/x86info/distinfo | 2 | ||||
| -rw-r--r-- | sysutils/x86info/files/patch-Makefile | 24 | ||||
| -rw-r--r-- | sysutils/x86info/files/patch-x86info.c | 35 | ||||
| -rw-r--r-- | sysutils/x86info/files/patch-x86info.h | 16 |
5 files changed, 15 insertions, 67 deletions
diff --git a/sysutils/x86info/Makefile b/sysutils/x86info/Makefile index ea2d89fd5a17..5509d99c97e1 100644 --- a/sysutils/x86info/Makefile +++ b/sysutils/x86info/Makefile @@ -6,7 +6,7 @@ # PORTNAME= x86info -PORTVERSION= 1.4 +PORTVERSION= 1.6 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -16,9 +16,6 @@ MAINTAINER= erik@smluc.org ONLY_FOR_ARCHS= i386 -post-patch: - @${PERL} -pi -e "s,gcc,${CC},g" ${WRKSRC}/Makefile - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/x86info ${PREFIX}/bin diff --git a/sysutils/x86info/distinfo b/sysutils/x86info/distinfo index e505bb3909b8..5189dd7d6855 100644 --- a/sysutils/x86info/distinfo +++ b/sysutils/x86info/distinfo @@ -1 +1 @@ -MD5 (x86info-1.4.tgz) = 9921a0932a1f0eda4587a1046ca92217 +MD5 (x86info-1.6.tgz) = 4e8e031e96b584b4decd80bf607f4757 diff --git a/sysutils/x86info/files/patch-Makefile b/sysutils/x86info/files/patch-Makefile index 88d0fde539d3..c7c6e26f2423 100644 --- a/sysutils/x86info/files/patch-Makefile +++ b/sysutils/x86info/files/patch-Makefile @@ -1,18 +1,20 @@ ---- Makefile.orig Mon Oct 15 02:07:53 2001 -+++ Makefile Mon Oct 15 02:08:22 2001 -@@ -1,4 +1,4 @@ +--- Makefile.orig Fri Nov 23 01:07:07 2001 ++++ Makefile Fri Nov 23 01:06:46 2001 +@@ -1,4 +1,3 @@ -CFLAGS = -Wall -W -g -O2 -+#CFLAGS = -Wall -W -g -O2 + all: x86info - OBJS =\ -@@ -22,6 +22,9 @@ +@@ -30,10 +29,10 @@ + eblcr.o x86info: $(OBJS) - gcc -o x86info $(OBJS) -+ -+.c.o: -+ gcc $(CFLAGS) -o $@ -c $< +- gcc -o x86info $(OBJS) ++ $(CC) -o x86info $(OBJS) + + .c.o: +- gcc $(CFLAGS) -o $@ -c $< ++ $(CC) $(CFLAGS) -o $@ -c $< clean: - rm -f *.o x86info + find . -name "*.o" -exec rm {} \; diff --git a/sysutils/x86info/files/patch-x86info.c b/sysutils/x86info/files/patch-x86info.c deleted file mode 100644 index a0e8551559d4..000000000000 --- a/sysutils/x86info/files/patch-x86info.c +++ /dev/null @@ -1,35 +0,0 @@ ---- x86info.c.orig Mon Oct 15 02:04:23 2001 -+++ x86info.c Mon Oct 15 02:06:27 2001 -@@ -11,6 +11,10 @@ - #include <string.h> - #include <stdlib.h> - #include <unistd.h> -+#ifndef linux -+#include <sys/types.h> -+#include <sys/sysctl.h> -+#endif - #include "x86info.h" - - int show_msr=0; -@@ -89,7 +93,21 @@ - return(0); - } - -+#if defined _SC_NPROCESSORS /* linux */ - nrCPUs = sysconf (_SC_NPROCESSORS_CONF); -+#elif defined HW_NCPU /* bsd */ -+ { -+ int mib[2] = { CTL_HW, HW_NCPU }; -+ size_t len; -+ -+ len = sizeof(nrCPUs); -+ sysctl(mib, 2, &nrCPUs, &len, NULL, 0); -+ } -+#else -+ /* unknown interface to count cpu's */ -+ nrCPUs=1; -+#endif -+ - printf ("Found %d CPU", nrCPUs); - if (nrCPUs > 1) - printf ("s"); diff --git a/sysutils/x86info/files/patch-x86info.h b/sysutils/x86info/files/patch-x86info.h deleted file mode 100644 index 96c8c7281f0f..000000000000 --- a/sysutils/x86info/files/patch-x86info.h +++ /dev/null @@ -1,16 +0,0 @@ -diff -urNb x86info.h x86info.h ---- x86info.h.orig Thu Jul 26 14:40:46 2001 -+++ x86info.h Sun Aug 26 23:12:33 2001 -@@ -3,7 +3,12 @@ - * May be used under the terms of the GNU Public License (GPL) - */ - -+#ifdef linux - #include <linux/types.h> -+#else -+#include <machine/types.h> -+#define __u32 int -+#endif - - typedef __u32 u32; - |