cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compilation on -current.

Browse Source 
Thanks to pedro@jazznet.pt
This commit is contained in:
form 2001-08-17 12:28:37 +00:00
parent 55a1e564a7
commit 429bbbd298
2 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sysutils/xosview/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.22 2001/05/06 03:59:15 lebel Exp $
# $OpenBSD: Makefile,v 1.23 2001/08/17 12:28:37 form Exp $
# $NetBSD: Makefile,v 1.9 1998/04/15 10:38:50 agc Exp $
COMMENT= "graphical performance meter"
@ -19,10 +19,8 @@ PERMIT_DISTFILES_FTP= Yes
USE_X11= Yes
CONFIGURE_STYLE=gnu
CONFIGURE_ENV+= CPPFLAGS="-I${X11BASE}/include" LDFLAGS="-L${X11BASE}/lib"
#MAKE_ENV+= UVM=${UVM}
#MAKE_FLAGS= ARCH=${ARCH}
CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" LDFLAGS="-L${X11BASE}/lib" \
UVM=Yes
.if (${MACHINE_ARCH} == "alpha")
BROKEN= "compilation errors"

30
sysutils/xosview/patches/patch-configure
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-configure,v 1.1 2000/07/17 16:24:47 form Exp $
--- configure.orig Mon Jul 17 23:02:37 2000
+++ configure Mon Jul 17 23:09:45 2000
$OpenBSD: patch-configure,v 1.2 2001/08/17 12:28:37 form Exp $
--- configure.orig Tue Jul 18 01:54:42 2000
+++ configure Fri Aug 17 19:19:47 2001
@@ -1676,6 +1676,18 @@ fi
host_dir=linux
@ -20,25 +20,25 @@ $OpenBSD: patch-configure,v 1.1 2000/07/17 16:24:47 form Exp $
## Check for known versions of NetBSD...
netbsd1.[012345]*)
host_os_full=$host_os
@@ -1805,16 +1817,34 @@ EOF
@@ -1813,16 +1825,48 @@ EOF
host_dir=bsd
host_os=freebsd ;;
-openbsd*)
- EXTRALIBS="-lkvm $XPMLIB"
- INSTALL_ARGS='-s -g kmem -m 02555'
+openbsd*)
+openbsd2.[6-9]*)
+ EXTRALIBS="-lkvm $XPMLIB"
+ INSTALL_ARGS='-s -g kmem -m 02555'
NetMeter_Default_Setting=True
cat >> confdefs.h <<\EOF
#define XOSVIEW_OPENBSD 1
+#define HAVE_SWAPCTL 1
EOF
+EOF
+ ## Also check for the existence of UVM. This is a nasty,
+ ## complicated check. This could be avoided by having the *BSD
+ ## platform-specific Makefiles include <bsd.own.mk> on their own.
+
+ cat > confmkfile <<\EOF
+.include <bsd.own.mk>
+all:
@ -51,10 +51,24 @@ $OpenBSD: patch-configure,v 1.1 2000/07/17 16:24:47 form Exp $
+ if test x$uvmstring != x ; then
+ cat >> confdefs.h <<\EOF
+#define UVM 1
+EOF
EOF
+ fi
+ host_dir=bsd
+ host_os=openbsd ;;
+openbsd*)
+ EXTRALIBS="-lkvm $XPMLIB"
+ INSTALL_ARGS='-s -g kmem -m 02555'
+ NetMeter_Default_Setting=True
+ cat >> confdefs.h <<\EOF
+#define XOSVIEW_OPENBSD 1
+#define HAVE_SWAPCTL 1
+EOF
- host_dir=bsd
+ cat >> confdefs.h <<\EOF
+#define UVM 1
+EOF
+ host_dir=bsd
host_os=openbsd ;;
bsdi*)