diff options
| author | agc <agc> | 2002-07-18 12:48:51 +0000 |
|---|---|---|
| committer | agc <agc> | 2002-07-18 12:48:51 +0000 |
| commit | 9e43ba9d9cbbe89f22da3ebb7e2dbc4b9b628dbe (patch) | |
| tree | a167d5451efcb11bad87add5bc025fec5456ff33 | |
| parent | 1fc79a574f86f2a06de66b42d7055e5d32b4593b (diff) | |
| download | pkgsrc-9e43ba9d9cbbe89f22da3ebb7e2dbc4b9b628dbe.tar.gz | |
Make this compile - fixes a problem in the bulk build.
| -rw-r--r-- | sysutils/kapm/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/kapm/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/kapm/patches/patch-aa | 18 |
3 files changed, 15 insertions, 11 deletions
diff --git a/sysutils/kapm/Makefile b/sysutils/kapm/Makefile index 15a3e060cfc..bd20ce077c2 100644 --- a/sysutils/kapm/Makefile +++ b/sysutils/kapm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2002/03/13 17:37:43 fredb Exp $ +# $NetBSD: Makefile,v 1.14 2002/07/18 12:48:51 agc Exp $ # DISTNAME= kapm-0.3.1 @@ -18,6 +18,8 @@ DEPENDS+= kdebase-1.1.2nb1:../../x11/kdebase USE_X11BASE= YES # to get things near KDE GNU_CONFIGURE= YES +USE_LIBTOOL= yes +LIBTOOL_OVERRIDE= ${WRKSRC}/libtool EVAL_PREFIX+= QT1DIR=qt1 CONFIGURE_ENV+= QTDIR=${QT1DIR}/qt1 diff --git a/sysutils/kapm/distinfo b/sysutils/kapm/distinfo index 70475f2199d..8d6a556fa0c 100644 --- a/sysutils/kapm/distinfo +++ b/sysutils/kapm/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.3 2001/11/26 23:09:29 hubertf Exp $ +$NetBSD: distinfo,v 1.4 2002/07/18 12:48:51 agc Exp $ SHA1 (kapm-0.3.1.tar.gz) = c667582a076ce0185d3f909a243e4ec7ee69ba93 Size (kapm-0.3.1.tar.gz) = 191413 bytes -SHA1 (patch-aa) = 680a2db74e5c24921e7d53c2ac0dc414353f0c7f +SHA1 (patch-aa) = 1b77d78f74ff21d180313b803741669927b8b1fd SHA1 (patch-ab) = b78aed68c97fa0c34025b06ae3ab1c5b2f03c0ba SHA1 (patch-ac) = fe38363be3b1bef59145f9c3a51acb47c86f47a7 SHA1 (patch-ad) = cdfd6ada3729e0cbe621dc41e1b2c275aac6d0bf diff --git a/sysutils/kapm/patches/patch-aa b/sysutils/kapm/patches/patch-aa index aaa3d53e754..86bdb47272b 100644 --- a/sysutils/kapm/patches/patch-aa +++ b/sysutils/kapm/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.2 2001/11/26 23:09:30 hubertf Exp $ +$NetBSD: patch-aa,v 1.3 2002/07/18 12:48:51 agc Exp $ --- kapm/apm.cpp.orig Wed Oct 20 06:19:57 1999 +++ kapm/apm.cpp -@@ -10,6 +10,13 @@ +@@ -10,6 +10,14 @@ 6) Its packaged as an object */ @@ -11,12 +11,13 @@ $NetBSD: patch-aa,v 1.2 2001/11/26 23:09:30 hubertf Exp $ +# include <fcntl.h> +# include <sys/ioctl.h> +# include <machine/apmvar.h> ++# include <string.h> +# include <unistd.h> +#endif /* __NetBSD__ */ #include <stdio.h> #include <stdlib.h> #include "apm.h" -@@ -29,6 +36,7 @@ +@@ -29,6 +37,7 @@ int apm::check() { #ifndef DEBUG @@ -24,7 +25,7 @@ $NetBSD: patch-aa,v 1.2 2001/11/26 23:09:30 hubertf Exp $ FILE *str; if (!(str = fopen( APM_PROC, "r" ))) -@@ -43,6 +51,15 @@ +@@ -43,6 +52,15 @@ if (!(i.apm_flags & APM_32_BIT_SUPPORT)) return 3; @@ -40,7 +41,7 @@ $NetBSD: patch-aa,v 1.2 2001/11/26 23:09:30 hubertf Exp $ #else // Do initial kernel support emulation setup -@@ -62,6 +79,7 @@ +@@ -62,6 +80,7 @@ void apm::read() { #ifndef DEBUG @@ -48,7 +49,7 @@ $NetBSD: patch-aa,v 1.2 2001/11/26 23:09:30 hubertf Exp $ FILE *str; char buffer[64]; -@@ -71,21 +89,60 @@ +@@ -71,21 +90,61 @@ sscanf( buffer, "%s %d.%d %x %x %x %x %d%% %d %s\n", (char *)i.driver_version, @@ -90,8 +91,9 @@ $NetBSD: patch-aa,v 1.2 2001/11/26 23:09:30 hubertf Exp $ + assert(rc != -1); + close(fd); + -+ i.driver_version = "NetBSD\0\0\0"; /* can't they document what's -+ expected here ?!? */ ++ (void) memset(i.driver_version, 0, sizeof(i.driver_version)); ++ (void) strcpy(i.driver_version, "NetBSD"); ++ + i.apm_version_major = 1; + i.apm_version_minor = 1; /* May be 0 with APM_V10_ONLY + - how to find out ? */ |