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

add support for apm. while i'm here regenerate patches.

Browse Source 
bump pkgname. maintainer ok.
This commit is contained in:
fgsch 2006-11-04 17:59:19 +00:00
parent 248480c48d
commit 70c0f4d3fc
5 changed files with 51 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
x11/icewm/Makefile
View File

@ -1,8 +1,9 @@
# $OpenBSD: Makefile,v 1.23 2006/11/02 17:53:03 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.24 2006/11/04 17:59:19 fgsch Exp $
COMMENT= "small, fast window manager"
DISTNAME= icewm-1.2.28
PKGNAME= ${DISTNAME}p0
CATEGORIES= x11
HOMEPAGE= http://www.icewm.org/

10
x11/icewm/patches/patch-configure
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-configure,v 1.7 2006/04/01 15:47:10 robert Exp $
--- configure.orig Thu Feb 16 11:41:01 2006
+++ configure Thu Feb 16 11:47:12 2006
$OpenBSD: patch-configure,v 1.8 2006/11/04 17:59:19 fgsch Exp $
--- configure.orig Sun Sep 10 17:12:20 2006
+++ configure Tue Oct 24 12:36:48 2006
@@ -1461,7 +1461,7 @@ test -n "$target_alias" &&
NONENONEs,x,x, &&
program_prefix=${target_alias}-
@ -10,7 +10,7 @@ $OpenBSD: patch-configure,v 1.7 2006/04/01 15:47:10 robert Exp $
APPLICATIONS='icewm icewm-session icesh icewmhint icewmbg icewmtray'
TESTCASES=`echo src/test*.cc | sed 's%src/\([^ ]*\)\.cc%\1%g'`
TESTCASES="$TESTCASES iceview icesame iceicon icerun icelist" # iceclock
@@ -9659,7 +9659,7 @@ if test "${ac_cv_lib_intl_bindtextdomain
@@ -9748,7 +9748,7 @@ if test "${ac_cv_lib_intl_bindtextdomain
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
@ -19,7 +19,7 @@ $OpenBSD: patch-configure,v 1.7 2006/04/01 15:47:10 robert Exp $
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -9717,7 +9717,7 @@ fi
@@ -9807,7 +9807,7 @@ fi
echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5
echo "${ECHO_T}$ac_cv_lib_intl_bindtextdomain" >&6
if test $ac_cv_lib_intl_bindtextdomain = yes; then

30
x11/icewm/patches/patch-src_aapm_cc Normal file
View File

@ -0,0 +1,30 @@
$OpenBSD: patch-src_aapm_cc,v 1.1 2006/11/04 17:59:19 fgsch Exp $
--- src/aapm.cc.orig Tue Oct 24 12:38:18 2006
+++ src/aapm.cc Tue Oct 24 12:39:12 2006
@@ -34,7 +34,7 @@
#include <machine/apm_bios.h>
#endif
-#ifdef __NetBSD__
+#if defined __NetBSD__ || defined __OpenBSD__
#include <sys/file.h>
#include <sys/ioctl.h>
#include <sys/types.h>
@@ -64,7 +64,7 @@ static YColor *taskBarBg = 0;
void ApmStr(char *s, bool Tool) {
#ifdef __FreeBSD__
struct apm_info ai;
-#elif defined __NetBSD__
+#elif defined __NetBSD__ || defined __OpenBSD__
struct apm_power_info ai;
#else
char buf[80];
@@ -105,7 +105,7 @@ void ApmStr(char *s, bool Tool) {
BATlife = ai.ai_batt_life;
BATtime = ai.ai_batt_time == 0 ? -1 : ai.ai_batt_time;
strcpy(units, "sec");
-#elif defined __NetBSD__
+#elif defined __NetBSD__ || defined __OpenBSD__
memset(&ai, 0, sizeof(ai));
if (ioctl(fd, APM_IOC_GETPOWER, &ai) == -1)
{

10
x11/icewm/patches/patch-src_aapm_h Normal file
View File

@ -0,0 +1,10 @@
$OpenBSD: patch-src_aapm_h,v 1.1 2006/11/04 17:59:19 fgsch Exp $
--- src/aapm.h.orig Tue Oct 24 12:59:26 2006
+++ src/aapm.h Tue Oct 24 12:59:34 2006
@@ -1,5 +1,5 @@
-#if defined(linux) || (defined (__FreeBSD__) && defined(i386)) || defined(__NetBSD__)
+#if defined(linux) || (defined (__FreeBSD__) && defined(i386)) || defined(__NetBSD__) || defined(__OpenBSD__)
#include "ywindow.h"
#include "ytimer.h"

8
x11/icewm/patches/patch-src_default_h
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_default_h,v 1.7 2006/07/09 09:32:01 steven Exp $
--- src/default.h.orig Sun Apr 16 18:12:31 2006
+++ src/default.h Sun Jul 9 11:08:34 2006
@@ -136,8 +136,8 @@ XSV(const char *, acpiIgnoreBatteries,
$OpenBSD: patch-src_default_h,v 1.8 2006/11/04 17:59:19 fgsch Exp $
--- src/default.h.orig Sun Sep 10 17:12:11 2006
+++ src/default.h Tue Oct 24 12:36:48 2006
@@ -139,8 +139,8 @@ XSV(const char *, acpiIgnoreBatteries,
#endif
XSV(const char *, mailBoxPath, 0)