Tue May 19 10:52:33 2009 UTC ()
Explicitly enable xinerama support (bl3.mk was already included).
Fixes PR 41449 by Pierre Pronchery.

While here:
Remove excessive quoting operators, and convert to user-destdir.


(wiz)
diff -r1.78 -r1.79 pkgsrc/wm/windowmaker/Makefile
cvs diff -r1.78 -r1.79 pkgsrc/wm/windowmaker/Makefile (expand / switch to unified diff)

--- pkgsrc/wm/windowmaker/Makefile 2009/05/01 13:39:31 1.78
+++ pkgsrc/wm/windowmaker/Makefile 2009/05/19 10:52:33 1.79
@@ -1,108 +1,111 @@ @@ -1,108 +1,111 @@
1# $NetBSD: Makefile,v 1.78 2009/05/01 13:39:31 zafer Exp $ 1# $NetBSD: Makefile,v 1.79 2009/05/19 10:52:33 wiz Exp $
2 2
3DISTNAME= WindowMaker-0.92.0 3DISTNAME= WindowMaker-0.92.0
4PKGNAME= ${DISTNAME:S/WindowMaker/windowmaker/} 4PKGNAME= ${DISTNAME:S/WindowMaker/windowmaker/}
5PKGREVISION= 7 5PKGREVISION= 8
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
15BROKEN_GETTEXT_DETECTION= yes 15BROKEN_GETTEXT_DETECTION= yes
16 16
17USE_TOOLS+= msgfmt 17USE_TOOLS+= msgfmt
18USE_LIBTOOL= yes 18USE_LIBTOOL= yes
19USE_PKGLOCALEDIR= yes 19USE_PKGLOCALEDIR= yes
20GNU_CONFIGURE= yes 20GNU_CONFIGURE= yes
21CONFIGURE_ARGS+= --enable-usermenu 21CONFIGURE_ARGS+= --enable-usermenu
22CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR:Q} 22CONFIGURE_ARGS+= --enable-xinerama
23CONFIGURE_ARGS+= --with-gnustepdir=${PREFIX:Q}/share/GNUstep 23CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR}
24CONFIGURE_ARGS+= --with-nlsdir=${PREFIX:Q}/${PKGLOCALEDIR:Q}/locale 24CONFIGURE_ARGS+= --with-gnustepdir=${PREFIX}/share/GNUstep
 25CONFIGURE_ARGS+= --with-nlsdir=${PREFIX}/${PKGLOCALEDIR}/locale
25CONFIGURE_ENV+= LINGUAS=yes 26CONFIGURE_ENV+= LINGUAS=yes
26CONFIGURE_ENV+= CPP_PATH=${CPP:Q} 27CONFIGURE_ENV+= CPP_PATH=${CPP:Q}
27REPLACE_PERL+= util/wkdemenu.pl 28REPLACE_PERL+= util/wkdemenu.pl
28 29
 30PKG_DESTDIR_SUPPORT= user-destdir
 31
 32INSTALLATION_DIRS= share/WindowMaker/SoundSets
 33INSTALLATION_DIRS+= share/WindowMaker/Sounds
 34INSTALLATION_DIRS+= share/doc/WindowMaker
 35
29.include "../../mk/compiler.mk" 36.include "../../mk/compiler.mk"
30 37
31.if ${MACHINE_ARCH} != "i386" 38.if ${MACHINE_ARCH} != "i386"
32CONFIGURE_ENV+= ac_cv_c_inline_asm=no 39CONFIGURE_ENV+= ac_cv_c_inline_asm=no
33.endif 40.endif
34 41
35.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32" 42.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
36GCC_REQD+= 3.0 43GCC_REQD+= 3.0
37.endif 44.endif
38 45
39PKG_SYSCONFSUBDIR= WindowMaker 46PKG_SYSCONFSUBDIR= WindowMaker
40EGDIR= ${PREFIX}/share/examples/WindowMaker 47EGDIR= ${PREFIX}/share/examples/WindowMaker
41CONF_FILES= 48CONF_FILES=
42.for f in WMGLOBAL WMRootMenu WMState WMWindowAttributes WindowMaker 49.for f in WMGLOBAL WMRootMenu WMState WMWindowAttributes WindowMaker
43CONF_FILES+= ${EGDIR:Q}/${f:Q} ${PKG_SYSCONFDIR:Q}/${f:Q} 50CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
44.endfor 51.endfor
45 52
46# WINDOWMAKER_OPTIONS is a space-separated list of compile-time options 53# WINDOWMAKER_OPTIONS is a space-separated list of compile-time options
47# to support. Currently supported options: 54# to support. Currently supported options:
48# 55#
49# kde enable support for kde/kwm window manager hints 56# kde enable support for kde/kwm window manager hints
50# gnome enable support for GNOME window manager hints 57# gnome enable support for GNOME window manager hints
51# openlook enable support for OPEN LOOK(tm) window manager hints 58# openlook enable support for OPEN LOOK(tm) window manager hints
52# vdesktop enable support for virtual desktop. 59# vdesktop enable support for virtual desktop.
53 60
54WINDOWMAKER_OPTIONS?= gnome kde openlook vdesktop 61WINDOWMAKER_OPTIONS?= gnome kde openlook vdesktop
55 62
56BUILD_DEFS+= WINDOWMAKER_OPTIONS 63BUILD_DEFS+= WINDOWMAKER_OPTIONS
57 64
58.for option in ${WINDOWMAKER_OPTIONS} 65.for option in ${WINDOWMAKER_OPTIONS}
59CONFIGURE_ARGS+= --enable-${option:Q} 66CONFIGURE_ARGS+= --enable-${option}
60.endfor 67.endfor
61 68
62post-extract: 69post-extract:
63 ${RM} -f ${WRKSRC:Q}/WindowMaker/Defaults/WMState \ 70 ${RM} -f ${WRKSRC}/WindowMaker/Defaults/WMState \
64 ${WRKSRC:Q}/WindowMaker/Defaults/WMWindowAttributes \ 71 ${WRKSRC}/WindowMaker/Defaults/WMWindowAttributes \
65 ${WRKSRC:Q}/WindowMaker/Defaults/WindowMaker \ 72 ${WRKSRC}/WindowMaker/Defaults/WindowMaker \
66 ${WRKSRC:Q}/po/zh_TW.Big5.po 73 ${WRKSRC}/po/zh_TW.Big5.po
67 set -e; \ 74 set -e; \
68 for manfile in ${WRKSRC:Q}/doc/*.1x ${WRKSRC:Q}/doc/*/*.1x; \ 75 for manfile in ${WRKSRC}/doc/*.1x ${WRKSRC}/doc/*/*.1x; \
69 do \ 76 do \
70 ${MV} "$$manfile" `${ECHO} "$$manfile" | ${SED} "s/1x$$/1/"`; \ 77 ${MV} "$$manfile" `${ECHO} "$$manfile" | ${SED} "s/1x$$/1/"`; \
71 done; 78 done;
72 set -e; \ 79 set -e; \
73 cd ${WRKSRC:Q} && \ 80 cd ${WRKSRC} && \
74 for f in WINGs/wapplication.c WindowMaker/Defaults/WindowMaker.in \ 81 for f in WINGs/wapplication.c WindowMaker/Defaults/WindowMaker.in \
75 WPrefs.app/Paths.c WindowMaker/menu* WindowMaker/plmenu*; do \ 82 WPrefs.app/Paths.c WindowMaker/menu* WindowMaker/plmenu*; do \
76 ${SED} -e "s|/usr/local|${PREFIX}|g" \ 83 ${SED} -e "s|/usr/local|${PREFIX}|g" \
77 -e "s|${PREFIX}/GNUstep|${PREFIX}/share/GNUstep|g" \ 84 -e "s|${PREFIX}/GNUstep|${PREFIX}/share/GNUstep|g" \
78 "$$f" > "$$f".new && \ 85 "$$f" > "$$f".new && \
79 ${MV} "$$f".new "$$f"; \ 86 ${MV} "$$f".new "$$f"; \
80 done 87 done
81 88
82post-install: 89post-install:
83 ${INSTALL_DATA_DIR} ${PREFIX:Q}/share/WindowMaker/SoundSets 90 ${TOUCH} ${DESTDIR}${PREFIX}/share/WindowMaker/SoundSets/.directory
84 ${INSTALL_DATA_DIR} ${PREFIX:Q}/share/WindowMaker/Sounds 91 ${TOUCH} ${DESTDIR}${PREFIX}/share/WindowMaker/Sounds/.directory
85 ${TOUCH} ${PREFIX:Q}/share/WindowMaker/SoundSets/.directory 92 cd ${WRKSRC} && \
86 ${TOUCH} ${PREFIX:Q}/share/WindowMaker/Sounds/.directory 
87 ${INSTALL_DATA_DIR} ${PREFIX:Q}/share/doc/WindowMaker 
88 cd ${WRKSRC:Q} && \ 
89 ${INSTALL_DATA} \ 93 ${INSTALL_DATA} \
90 README README.definable-cursor FAQ FAQ.I18N \ 94 README README.definable-cursor FAQ FAQ.I18N \
91 ${PREFIX:Q}/share/doc/WindowMaker 95 ${DESTDIR}${PREFIX}/share/doc/WindowMaker
92 
93BUILDLINK_DEPMETHOD.libXt?= build 
94 96
95.include "../../converters/libiconv/buildlink3.mk" 97.include "../../converters/libiconv/buildlink3.mk"
96.include "../../devel/gettext-lib/buildlink3.mk" 98.include "../../devel/gettext-lib/buildlink3.mk"
97.include "../../graphics/libungif/buildlink3.mk" 99.include "../../graphics/libungif/buildlink3.mk"
98.include "../../graphics/jpeg/buildlink3.mk" 100.include "../../graphics/jpeg/buildlink3.mk"
99.include "../../graphics/png/buildlink3.mk" 101.include "../../graphics/png/buildlink3.mk"
100.include "../../graphics/tiff/buildlink3.mk" 102.include "../../graphics/tiff/buildlink3.mk"
101.include "../../x11/libX11/buildlink3.mk" 103.include "../../x11/libX11/buildlink3.mk"
102.include "../../x11/libXext/buildlink3.mk" 104.include "../../x11/libXext/buildlink3.mk"
103.include "../../x11/libXft/buildlink3.mk" 105.include "../../x11/libXft/buildlink3.mk"
104.include "../../x11/libXinerama/buildlink3.mk" 106.include "../../x11/libXinerama/buildlink3.mk"
105.include "../../x11/libXpm/buildlink3.mk" 107.include "../../x11/libXpm/buildlink3.mk"
 108BUILDLINK_DEPMETHOD.libXt?= build
106.include "../../x11/libXt/buildlink3.mk" 109.include "../../x11/libXt/buildlink3.mk"
107.include "../../x11/xextproto/buildlink3.mk" 110.include "../../x11/xextproto/buildlink3.mk"
108.include "../../mk/bsd.pkg.mk" 111.include "../../mk/bsd.pkg.mk"