diff options
| author | skrll <skrll@pkgsrc.org> | 2003-02-24 08:12:31 +0000 |
|---|---|---|
| committer | skrll <skrll@pkgsrc.org> | 2003-02-24 08:12:31 +0000 |
| commit | d47792c6e2e7ef857abce407f4eb210d7722be18 (patch) | |
| tree | f054d3647b2047d4a09b402ae2c2fd90f786a543 | |
| parent | 14327524860e252f325efc5b125a18eaa7e01f9b (diff) | |
| download | pkgsrc-d47792c6e2e7ef857abce407f4eb210d7722be18.tar.gz | |
Let platforms that don't have apm compile ksysguard. This fixes PR 18340
and PR 20439.
| -rw-r--r-- | x11/kdebase3/Makefile | 5 | ||||
| -rw-r--r-- | x11/kdebase3/distinfo | 4 | ||||
| -rw-r--r-- | x11/kdebase3/patches/patch-de | 34 |
3 files changed, 34 insertions, 9 deletions
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile index 7ea85504faf..6585782d328 100644 --- a/x11/kdebase3/Makefile +++ b/x11/kdebase3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2003/02/04 18:06:50 skrll Exp $ +# $NetBSD: Makefile,v 1.18 2003/02/24 08:12:31 skrll Exp $ DISTNAME= kdebase-3.0.5a PKGREVISION= 3 @@ -25,6 +25,9 @@ CONFIGURE_ARGS+= --without-vorbis .if ${OPSYS} == "NetBSD" LIBS+= ${EXPORT_SYMBOLS_LDFLAGS} +.if exists(/usr/include/machine/apmvar.h) +CPPFLAGS+= -D__NetBSD_APM__ +.endif .endif PLIST_SRC= ${WRKDIR}/PLIST.Xdpms diff --git a/x11/kdebase3/distinfo b/x11/kdebase3/distinfo index 469601d4cb2..1ed80934ef9 100644 --- a/x11/kdebase3/distinfo +++ b/x11/kdebase3/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.19 2003/02/04 18:06:50 skrll Exp $ +$NetBSD: distinfo,v 1.20 2003/02/24 08:12:31 skrll Exp $ SHA1 (kdebase-3.0.5a.tar.bz2) = 8d30538e4d84f805bffcd0eb6583f2fee5ce2da1 Size (kdebase-3.0.5a.tar.bz2) = 13117676 bytes @@ -68,7 +68,7 @@ SHA1 (patch-cz) = bb88de51bdb08d37d0c77d90509ac7cc6ae17854 SHA1 (patch-db) = 9af64d1118aa30d99202430efc2921c731ae4a81 SHA1 (patch-dc) = ae7d541d91bd466142984b3680cc1e40834f528d SHA1 (patch-dd) = 2e9da1069c86ccafd19dbd0ed2b4594c5a4e2f71 -SHA1 (patch-de) = 1fbea1abe5a8aefc0eacdc94d4ff60d26fb3c02a +SHA1 (patch-de) = da0cc619f194a806dc437bda163d2b9a9faeadb2 SHA1 (patch-df) = dc52254033ede1582ac375bd47f356045da96970 SHA1 (patch-dg) = 2a0e3e14049665549a793cf0f785fc55cc1c7d5d SHA1 (patch-dh) = a89a4d94a568de02e7d095068356edf6e7011464 diff --git a/x11/kdebase3/patches/patch-de b/x11/kdebase3/patches/patch-de index 6051d22d3f8..0b0d1c867c1 100644 --- a/x11/kdebase3/patches/patch-de +++ b/x11/kdebase3/patches/patch-de @@ -1,10 +1,12 @@ -$NetBSD: patch-de,v 1.2 2002/08/25 19:23:45 jlam Exp $ +$NetBSD: patch-de,v 1.3 2003/02/24 08:12:32 skrll Exp $ --- ksysguard/ksysguardd/FreeBSD/apm.c.orig Tue Sep 18 15:03:53 2001 +++ ksysguard/ksysguardd/FreeBSD/apm.c -@@ -20,7 +20,13 @@ +@@ -20,6 +20,14 @@ */ ++#if defined(__NetBSD_APM__) ++ #include <fcntl.h> +#if defined(__NetBSD__) +#include <machine/apmvar.h> @@ -15,9 +17,7 @@ $NetBSD: patch-de,v 1.2 2002/08/25 19:23:45 jlam Exp $ +#endif #include <stdio.h> - #include "Command.h" -@@ -62,13 +68,22 @@ - int +@@ -63,6 +71,14 @@ int updateApm(void) { - struct apm_info info; @@ -33,10 +33,32 @@ $NetBSD: patch-de,v 1.2 2002/08/25 19:23:45 jlam Exp $ + struct apm_info info; retval = ioctl(ApmFD, APMIO_GETINFO, &info); - +@@ -70,4 +86,5 @@ updateApm(void) BattFill = info.ai_batt_life; BattTime = info.ai_batt_time; +#endif return retval; +@@ -97,2 +114,22 @@ printApmBatTimeInfo(const char* c) + fprintf(CurrentClient, "Remaining battery time\t0\t0\tmin\n"); } ++ ++#else ++ ++void ++initApm(void) ++{ ++} ++ ++void ++exitApm(void) ++{ ++} ++ ++int ++updateApm(void) ++{ ++ return -1; ++} ++ ++#endif |