diff options
| author | jmmv <jmmv> | 2003-01-09 20:12:01 +0000 |
|---|---|---|
| committer | jmmv <jmmv> | 2003-01-09 20:12:01 +0000 |
| commit | ce6d48356265404438ffd031940bc25a49c35898 (patch) | |
| tree | 16c3927914e8edbef7b4271decf5753aecad37ca /wm/icewm | |
| parent | c83d0421d6dc331cdcbdffd1e0ce765a031edc70 (diff) | |
| download | pkgsrc-ce6d48356265404438ffd031940bc25a49c35898.tar.gz | |
Remove useless definition of CONFIG_APM (apm is managed through a configure
argument) as reported in PR pkg/19017 by Sergey Svishchev.
Fix START_XPM definition with START_PIXMAP (the former is completely ignored).
PKGREVISION++ because of this (icewm executable has changed).
Diffstat (limited to 'wm/icewm')
| -rw-r--r-- | wm/icewm/Makefile | 4 | ||||
| -rw-r--r-- | wm/icewm/Makefile.common | 9 |
2 files changed, 5 insertions, 8 deletions
diff --git a/wm/icewm/Makefile b/wm/icewm/Makefile index 0436e468657..4446d60e4fa 100644 --- a/wm/icewm/Makefile +++ b/wm/icewm/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.14 2002/11/21 10:09:59 grant Exp $ +# $NetBSD: Makefile,v 1.15 2003/01/09 20:12:01 jmmv Exp $ PKGNAME= ${DISTNAME} -PKGREVISION= 1 +PKGREVISION= 2 COMMENT= Small, fast and light-weight window manager CONFLICTS+= icewm-gnome-[0-9]* diff --git a/wm/icewm/Makefile.common b/wm/icewm/Makefile.common index 53246f0e0d1..78c1e4528a3 100644 --- a/wm/icewm/Makefile.common +++ b/wm/icewm/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.16 2002/11/21 10:09:59 grant Exp $ +# $NetBSD: Makefile.common,v 1.17 2003/01/09 20:12:01 jmmv Exp $ DISTNAME= icewm-1.2.0 CATEGORIES= x11 wm @@ -23,11 +23,8 @@ CONFIGURE_ARGS+= --disable-apm .endif CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} -.if ${OPSYS} == "NetBSD" -.if exists(/usr/include/machine/apmvar.h) -CPPFLAGS+= -DCONFIG_APM -.endif -CPPFLAGS+= -DSTART_XPM="\"bsd-daemon.xpm\"" +.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD" +CPPFLAGS+= -DSTART_PIXMAP=\"\\\"bsd-daemon.xpm\\\"\" .endif DOCDIR= ${PREFIX}/share/doc/icewm |