diff options
author | Kirill Ponomarev <krion@FreeBSD.org> | 2003-08-27 19:15:38 +0000 |
---|---|---|
committer | Kirill Ponomarev <krion@FreeBSD.org> | 2003-08-27 19:15:38 +0000 |
commit | 3b1474b3edfb3ce82fe5eace726eb786a8e526b2 (patch) | |
tree | 65427bb0b1862d50fb8ffa17cb28e36223668ada /x11-wm/icewm | |
parent | - Fix MASTER_SITES (diff) |
- Update to version 1.2.12
PR: 56042
Submitted by: Ports Fury
Notes
Notes:
svn path=/head/; revision=87812
Diffstat (limited to 'x11-wm/icewm')
-rw-r--r-- | x11-wm/icewm/Makefile | 32 | ||||
-rw-r--r-- | x11-wm/icewm/distinfo | 2 | ||||
-rw-r--r-- | x11-wm/icewm/files/patch-at | 35 | ||||
-rw-r--r-- | x11-wm/icewm/pkg-plist | 2 |
4 files changed, 47 insertions, 24 deletions
diff --git a/x11-wm/icewm/Makefile b/x11-wm/icewm/Makefile index 41ce96c20ef0..8e080a0e12c2 100644 --- a/x11-wm/icewm/Makefile +++ b/x11-wm/icewm/Makefile @@ -6,8 +6,7 @@ # PORTNAME= icewm -PORTVERSION= 1.2.11 -PORTREVISION= 1 +PORTVERSION= 1.2.12 CATEGORIES= x11-wm MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -26,6 +25,7 @@ GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" CONFIGURE_ARGS= --enable-shaped-decorations \ + --enable-guievents \ --with-cfgdir=${DATADIR} \ --with-libdir=${DATADIR} \ --with-kdedatadir=${LOCALBASE}/share \ @@ -35,22 +35,28 @@ CONFIGURE_ARGS= --enable-shaped-decorations \ .include <bsd.port.pre.mk> .if ${HAVE_GNOME:Mgnomedesktop}!="" -USE_GNOME+= gnomedesktop imlib -CONFIGURE_ARGS+= --with-imlib --without-xpm --enable-menus-gnome2 \ - --enable-guievents --with-icesound=esound +USE_GNOME+= gnomedesktop +CONFIGURE_ARGS+= --enable-menus-gnome2 INSTALL_TARGET= install install-gnome -PLIST_SUB+= ESOUND="" GNOMEDESKTOP="" +PLIST_SUB+= GNOMEDESKTOP="" PKGNAMESUFFIX= -gnome .else +PLIST_SUB+= GNOMEDESKTOP="@comment " +.endif + +.if ${HAVE_GNOME:Mimlib}!="" +USE_GNOME+= imlib +CONFIGURE_ARGS+= --with-imlib +.else USE_XPM= yes -CONFIGURE_ARGS+= --without-imlib --with-xpm +CONFIGURE_ARGS+= --without-imlib +.endif + .if ${HAVE_GNOME:Mesound}!="" USE_GNOME+= esound -CONFIGURE_ARGS+= --enable-guievents --with-icesound=esound -PLIST_SUB+= ESOUND="" GNOMEDESKTOP="@comment " +CONFIGURE_ARGS+= --with-icesound=esound .else -PLIST_SUB+= ESOUND="@comment " GNOMEDESKTOP="@comment " -.endif +CONFIGURE_ARGS+= --with-icesound=oss .endif .if ${XFREE86_VERSION} < 4 || defined(WITHOUT_XFT) @@ -59,6 +65,10 @@ CONFIGURE_ARGS+= --enable-corefonts --disable-xfreetype LIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/Xft .endif +.if ${ARCH} != "i386" || defined(WITHOUT_X86_ASM) +CONFIGURE_ARGS+= --disable-x86-asm +.endif + post-patch: .for file in src/gnome2.cc @${REINPLACE_CMD} -e \ diff --git a/x11-wm/icewm/distinfo b/x11-wm/icewm/distinfo index 6cff1ac5bfaa..7f10c13b9246 100644 --- a/x11-wm/icewm/distinfo +++ b/x11-wm/icewm/distinfo @@ -1 +1 @@ -MD5 (icewm-1.2.11.tar.gz) = 4aeb61b5c28e86edbbb8a8d360785010 +MD5 (icewm-1.2.12.tar.gz) = 5d7f9d93bee1f17761f4f281c7f087bc diff --git a/x11-wm/icewm/files/patch-at b/x11-wm/icewm/files/patch-at index 9657da8ac7eb..dee6b6bfec5a 100644 --- a/x11-wm/icewm/files/patch-at +++ b/x11-wm/icewm/files/patch-at @@ -1,6 +1,6 @@ ---- src/acpustatus.cc.orig Sun Mar 9 04:37:52 2003 -+++ src/acpustatus.cc Thu Apr 24 05:09:50 2003 -@@ -26,7 +26,16 @@ +--- src/acpustatus.cc.orig Tue Aug 19 15:16:17 2003 ++++ src/acpustatus.cc Tue Aug 26 00:30:57 2003 +@@ -27,7 +27,16 @@ #include "intl.h" @@ -18,7 +18,7 @@ #define UPDATE_INTERVAL 500 -@@ -49,13 +58,42 @@ +@@ -50,13 +59,42 @@ color[IWM_SYS] = new YColor(clrCpuSys); color[IWM_IDLE] = *clrCpuIdle ? new YColor(clrCpuIdle) : NULL; @@ -62,7 +62,7 @@ getStatus(); updateStatus(); updateToolTip(); -@@ -70,6 +108,13 @@ +@@ -71,6 +109,13 @@ delete color[IWM_NICE]; color[IWM_NICE] = 0; delete color[IWM_SYS]; color[IWM_SYS] = 0; delete color[IWM_IDLE]; color[IWM_IDLE] = 0; @@ -76,7 +76,7 @@ } void CPUStatus::paint(Graphics &g, const YRect &/*r*/) { -@@ -80,13 +125,34 @@ +@@ -81,13 +126,34 @@ int nice = cpu[i][IWM_NICE]; int sys = cpu[i][IWM_SYS]; int idle = cpu[i][IWM_IDLE]; @@ -103,7 +103,7 @@ +#endif if (sys) { +#ifdef __FreeBSD__ -+ totald -= nice; ++ totald -= sys; + n = (h * totald)/ total; +#else n = (h * (total - sys)) / total; // check rounding @@ -111,7 +111,20 @@ if (n >= y) n = y; g.setColor(color[IWM_SYS]); g.drawLine(i, y, i, n); -@@ -102,7 +168,12 @@ +@@ -95,7 +161,12 @@ + } + + if (nice) { ++#ifdef __FreeBSD__ ++ totald -= nice; ++ n = (h * totald)/ total; ++#else + n = (h * (total - sys - nice))/ total; ++#endif + if (n >= y) n = y; + g.setColor(color[IWM_NICE]); + g.drawLine(i, y, i, n); +@@ -103,7 +174,12 @@ } if (user) { @@ -124,7 +137,7 @@ if (n >= y) n = y; g.setColor(color[IWM_USER]); g.drawLine(i, y, i, n); -@@ -152,6 +223,14 @@ +@@ -153,6 +229,14 @@ sprintf(load, _("CPU Load: %3.2f %3.2f %3.2f, %d processes."), l1, l5, l15, sys.procs); setToolTip(load); @@ -139,7 +152,7 @@ #endif } -@@ -169,13 +248,43 @@ +@@ -170,13 +254,43 @@ cpu[i - 1][IWM_NICE] = cpu[i][IWM_NICE]; cpu[i - 1][IWM_SYS] = cpu[i][IWM_SYS]; cpu[i - 1][IWM_IDLE] = cpu[i][IWM_IDLE]; @@ -184,7 +197,7 @@ char *p, buf[128]; long cur[IWM_STATES]; int len, fd = open("/proc/stat", O_RDONLY); -@@ -209,8 +318,8 @@ +@@ -210,8 +324,8 @@ cpu[taskBarCPUSamples-1][IWM_USER], cpu[taskBarCPUSamples-1][IWM_NICE], cpu[taskBarCPUSamples-1][IWM_SYS], cpu[taskBarCPUSamples-1][IDLE]); #endif diff --git a/x11-wm/icewm/pkg-plist b/x11-wm/icewm/pkg-plist index e37c73b61cd1..2ff61e9b0b5b 100644 --- a/x11-wm/icewm/pkg-plist +++ b/x11-wm/icewm/pkg-plist @@ -1,7 +1,7 @@ @comment $FreeBSD$ bin/icehelp bin/icesh -%%ESOUND%%bin/icesound +bin/icesound bin/icewm %%GNOMEDESKTOP%%bin/icewm-menu-gnome2 bin/icewmbg |