Sun May 15 10:28:51 2011 UTC ()
Don't even try to use the obsolete Sun-Xinerama stuff. Fixes build on
SunOS.


(hans)
diff -r1.88 -r1.89 pkgsrc/wm/windowmaker/Makefile
cvs diff -r1.88 -r1.89 pkgsrc/wm/windowmaker/Makefile (expand / switch to unified diff)

--- pkgsrc/wm/windowmaker/Makefile 2011/04/22 13:42:03 1.88
+++ pkgsrc/wm/windowmaker/Makefile 2011/05/15 10:28:51 1.89
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.88 2011/04/22 13:42:03 obache Exp $ 1# $NetBSD: Makefile,v 1.89 2011/05/15 10:28:51 hans Exp $
2 2
3DISTNAME= WindowMaker-0.92.0 3DISTNAME= WindowMaker-0.92.0
4PKGNAME= ${DISTNAME:S/WindowMaker/windowmaker/} 4PKGNAME= ${DISTNAME:S/WindowMaker/windowmaker/}
5PKGREVISION= 16 5PKGREVISION= 16
6CATEGORIES= x11 wm windowmaker 6CATEGORIES= x11 wm windowmaker
7MASTER_SITES= http://windowmaker.info/pub/source/release/ \ 7MASTER_SITES= http://windowmaker.info/pub/source/release/ \
8 ftp://ftp.dti.ad.jp/pub/X/WindowMaker/source/release/ 8 ftp://ftp.dti.ad.jp/pub/X/WindowMaker/source/release/
9EXTRACT_SUFX= .tar.bz2 9EXTRACT_SUFX= .tar.bz2
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= http://www.windowmaker.info/ 12HOMEPAGE= http://www.windowmaker.info/
13COMMENT= GNUStep-compliant NEXTSTEP(tm) window manager clone 13COMMENT= GNUStep-compliant NEXTSTEP(tm) window manager clone
14 14
@@ -26,26 +26,30 @@ CONFIGURE_ARGS+= --with-nlsdir=${PREFIX} @@ -26,26 +26,30 @@ CONFIGURE_ARGS+= --with-nlsdir=${PREFIX}
26CONFIGURE_ENV+= LINGUAS=yes 26CONFIGURE_ENV+= LINGUAS=yes
27CONFIGURE_ENV+= CPP_PATH=${CPP:Q} 27CONFIGURE_ENV+= CPP_PATH=${CPP:Q}
28USE_TOOLS+= perl:run 28USE_TOOLS+= perl:run
29REPLACE_PERL+= util/wkdemenu.pl 29REPLACE_PERL+= util/wkdemenu.pl
30 30
31PKG_DESTDIR_SUPPORT= user-destdir 31PKG_DESTDIR_SUPPORT= user-destdir
32 32
33INSTALLATION_DIRS= share/WindowMaker/SoundSets 33INSTALLATION_DIRS= share/WindowMaker/SoundSets
34INSTALLATION_DIRS+= share/WindowMaker/Sounds 34INSTALLATION_DIRS+= share/WindowMaker/Sounds
35INSTALLATION_DIRS+= share/doc/WindowMaker 35INSTALLATION_DIRS+= share/doc/WindowMaker
36 36
37.include "../../mk/compiler.mk" 37.include "../../mk/compiler.mk"
38 38
 39.if !empty(MACHINE_PLATFORM:MSunOS-5.11-*)
 40CONFIGURE_ENV+= ac_cv_lib_Xext_XineramaGetInfo=no
 41.endif
 42
39.if ${MACHINE_ARCH} != "i386" 43.if ${MACHINE_ARCH} != "i386"
40CONFIGURE_ENV+= ac_cv_c_inline_asm=no 44CONFIGURE_ENV+= ac_cv_c_inline_asm=no
41.endif 45.endif
42 46
43.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32" 47.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
44GCC_REQD+= 3.0 48GCC_REQD+= 3.0
45.endif 49.endif
46 50
47PKG_SYSCONFSUBDIR= WindowMaker 51PKG_SYSCONFSUBDIR= WindowMaker
48EGDIR= ${PREFIX}/share/examples/WindowMaker 52EGDIR= ${PREFIX}/share/examples/WindowMaker
49CONF_FILES= 53CONF_FILES=
50.for f in WMGLOBAL WMRootMenu WMState WMWindowAttributes WindowMaker 54.for f in WMGLOBAL WMRootMenu WMState WMWindowAttributes WindowMaker
51CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f} 55CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}