diff options
| author | tron <tron@pkgsrc.org> | 1998-02-11 08:10:16 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 1998-02-11 08:10:16 +0000 |
| commit | 0f24d32536821404c84292289b631c6690fdf49d (patch) | |
| tree | be8fc11f698003209487b025ba125430a1318314 /sysutils | |
| parent | ae0f216fb4f70d1358a82973917be9b326d1038c (diff) | |
| download | pkgsrc-0f24d32536821404c84292289b631c6690fdf49d.tar.gz | |
Avoid problem with double inclusion of "machine/cpu.h" on some ports,
fixes PR pkg/4731.
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/xosview/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/xosview/patches/patch-aa | 20 |
2 files changed, 23 insertions, 1 deletions
diff --git a/sysutils/xosview/Makefile b/sysutils/xosview/Makefile index 26b47874012..2624205bfbf 100644 --- a/sysutils/xosview/Makefile +++ b/sysutils/xosview/Makefile @@ -3,7 +3,7 @@ # Date created: Fri Oct 24 10:03:55 BST 1997 # Whom: Alistair Crooks (agc@netbsd.org) # -# $NetBSD: Makefile,v 1.6 1998/01/24 23:35:43 hubertf Exp $ +# $NetBSD: Makefile,v 1.7 1998/02/11 08:10:16 tron Exp $ # DISTNAME= xosview-1.5.1 @@ -16,4 +16,6 @@ GNU_CONFIGURE= yes USE_X11= yes MAN1= xosview.1 +MAKE_FLAGS= ARCH=${ARCH} -f + .include <bsd.port.mk> diff --git a/sysutils/xosview/patches/patch-aa b/sysutils/xosview/patches/patch-aa new file mode 100644 index 00000000000..078f1fb7f5b --- /dev/null +++ b/sysutils/xosview/patches/patch-aa @@ -0,0 +1,20 @@ +--- config/Makefile.netbsd.in.orig Sat Nov 29 21:58:24 1997 ++++ config/Makefile.netbsd.in Wed Feb 11 00:31:43 1998 +@@ -9,6 +9,17 @@ + + CXXFLAGS += -I@top_srcdir@ + ++.include <bsd.port.subdir.mk> ++.if (${ARCH} == "hp300") ++CXXFLAGS += -D_HP300_CPU_H_ ++.endif ++.if (${ARCH} == "mac68k") ++CXXFLAGS += -D_CPU_MACHINE_ ++.endif ++.if (${ARCH} == "x68k") ++CXXFLAGS += -D_X68K_CPU_H_ ++.endif ++ + OBJS = \ + MeterMaker.o \ + cpumeter.o \ |