Use APM only on ports which really support it.

4 files changed, 15 insertions, 9 deletions

diff --git a/x11/gnome-core/Makefile b/x11/gnome-core/Makefile
index 8cf47db2442..e3e6f6c3082 100644
--- a/x11/gnome-core/Makefile
+++ b/x11/gnome-core/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 1999/07/14 23:05:07 tron Exp $
+# $NetBSD: Makefile,v 1.22 1999/08/15 14:58:59 tron Exp $
 #
 
 DISTNAME=		gnome-core-1.0.7
@@ -34,4 +34,10 @@ pre-configure:
 	@${MKDIR} ${WRKDIR}/sys
 	@${LN} -s /usr/include/soundcard.h ${WRKDIR}/sys
 
+.include "../../mk/bsd.prefs.mk"
+
+.if (${OPSYS} == "NetBSD") && exists(/usr/include/machine/apmvar.h)
+CPPFLAGS+=		-D__NetBSD_APM__
+.endif
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gnome-core/files/patch-sum b/x11/gnome-core/files/patch-sum
index d3626904927..95a9cf80ab6 100644
--- a/x11/gnome-core/files/patch-sum
+++ b/x11/gnome-core/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.4 1999/07/15 18:11:49 chopps Exp $
+$NetBSD: patch-sum,v 1.5 1999/08/15 14:58:59 tron Exp $
 
 MD5 (patch-aa) = 23619333796b5c77f083c382384cc205
 MD5 (patch-ab) = 2484badfa1060b151b2c19bd12783f20
@@ -6,5 +6,5 @@ MD5 (patch-ac) = bbff4f111083399fe2e6372cdf85b005
 MD5 (patch-ad) = 8707fdf463e93c12b718fa0f0f389686
 MD5 (patch-ae) = f62405560b5c4fcaf87c1ebdcde59a9a
 MD5 (patch-af) = a18ee68f6e295f5b4607f7b3fb6f3032
-MD5 (patch-ag) = 21427f9ef4c67f7a4b66f97ded73d525
-MD5 (patch-ah) = 8dba84a702ae1de6d1dc9f1a9198ac7c
+MD5 (patch-ag) = 0ddce7d7bfbf857eab8ce9653c5b8863
+MD5 (patch-ah) = 5cce80b3eabd1a604cfebe3e9b5cc256
diff --git a/x11/gnome-core/patches/patch-ag b/x11/gnome-core/patches/patch-ag
index 67f333bdb0b..2224271baff 100644
--- a/x11/gnome-core/patches/patch-ag
+++ b/x11/gnome-core/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.2 1999/07/15 18:09:26 chopps Exp $
+$NetBSD: patch-ag,v 1.3 1999/08/15 14:58:59 tron Exp $
 
 --- applets/battery/read-battery.c.orig	Thu Jul 15 13:59:20 1999
 +++ applets/battery/read-battery.c	Thu Jul 15 14:41:09 1999
@@ -7,7 +7,7 @@ $NetBSD: patch-ag,v 1.2 1999/07/15 18:09:26 chopps Exp $
    return TRUE;
  
 -#else /* ! ( __linux__ || __FreeBSD__) */
-+#elif defined(__NetBSD__)
++#elif defined(__NetBSD_APM__)
 +
 +  struct apm_power_info aip;
 +  int fd;
@@ -44,7 +44,7 @@ $NetBSD: patch-ag,v 1.2 1999/07/15 18:09:26 chopps Exp $
 +  close(fd);
 +  return TRUE;
 +
-+#else /* ! ( __linux__ || __FreeBSD__ || __NetBSD__ ) */
++#else /* ! ( __linux__ || __FreeBSD__ || __NetBSD_APM__ ) */
  
    /* Assume always connected to power.  */
    *ac_online = 1;
diff --git a/x11/gnome-core/patches/patch-ah b/x11/gnome-core/patches/patch-ah
index 7d8321baa9b..d5820d85381 100644
--- a/x11/gnome-core/patches/patch-ah
+++ b/x11/gnome-core/patches/patch-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.2 1999/07/15 18:09:26 chopps Exp $
+$NetBSD: patch-ah,v 1.3 1999/08/15 14:58:59 tron Exp $
 
 --- applets/battery/read-battery.h.orig	Thu Jul 15 13:59:25 1999
 +++ applets/battery/read-battery.h	Thu Jul 15 14:41:22 1999
@@ -6,7 +6,7 @@ $NetBSD: patch-ah,v 1.2 1999/07/15 18:09:26 chopps Exp $
  #include <fcntl.h>
  #include <machine/apm_bios.h>
  #define APMDEV "/dev/apm"
-+#elif defined(__NetBSD__)
++#elif defined(__NetBSD_APM__)
 +#include <sys/ioctl.h>
 +#include <machine/apmvar.h>
 +#include <fcntl.h>