Sat Feb 6 20:03:01 2010 UTC ()
- make sure the authdir exists, reported on tech-pkg@ by  Dennis den Brok.
- don't include compiler.mk twice
- bump PKGREVISION


(tnn)
diff -r1.11 -r1.12 pkgsrc/x11/xdm/Makefile
cvs diff -r1.11 -r1.12 pkgsrc/x11/xdm/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/xdm/Makefile 2010/01/28 15:14:33 1.11
+++ pkgsrc/x11/xdm/Makefile 2010/02/06 20:03:01 1.12
@@ -1,66 +1,71 @@ @@ -1,66 +1,71 @@
1# $NetBSD: Makefile,v 1.11 2010/01/28 15:14:33 tnn Exp $ 1# $NetBSD: Makefile,v 1.12 2010/02/06 20:03:01 tnn Exp $
2 2
3DISTNAME= xdm-1.1.9 3DISTNAME= xdm-1.1.9
 4PKGREVISION= 1
4CATEGORIES= x11 5CATEGORIES= x11
5MASTER_SITES= ${MASTER_SITE_XORG:=app/} 6MASTER_SITES= ${MASTER_SITE_XORG:=app/}
6EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
7 8
8MAINTAINER= blair.sadewitz@gmail.com 9MAINTAINER= blair.sadewitz@gmail.com
9HOMEPAGE= http://xorg.freedesktop.org/ 10HOMEPAGE= http://xorg.freedesktop.org/
10COMMENT= X Display Manager from modular X.org 11COMMENT= X Display Manager from modular X.org
11 12
12DEPENDS+= sessreg-[0-9]*:../../x11/sessreg 13DEPENDS+= sessreg-[0-9]*:../../x11/sessreg
13 14
14PKG_DESTDIR_SUPPORT= user-destdir 15PKG_DESTDIR_SUPPORT= user-destdir
15 16
16CONFIGURE_ARGS+= --enable-dynamic-greeter 17CONFIGURE_ARGS+= --enable-dynamic-greeter
17CONFIGURE_ARGS+= --enable-tcp-transport 18CONFIGURE_ARGS+= --enable-tcp-transport
18CONFIGURE_ARGS+= --enable-unix-transport 19CONFIGURE_ARGS+= --enable-unix-transport
19 20
20USE_TOOLS+= pkg-config 21USE_TOOLS+= pkg-config
21GNU_CONFIGURE= yes 22GNU_CONFIGURE= yes
22USE_LIBTOOL= yes 23USE_LIBTOOL= yes
23 24
24RCD_SCRIPTS= xdm 25RCD_SCRIPTS= xdm
25 26
 27BUILD_DEFS+= VARBASE
 28CONFIGURE_ARGS+= --with-authdir=${VARBASE}/lib/xdm
 29OWN_DIRS_PERMS+= ${VARBASE}/lib/xdm \
 30 ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0755
 31
26.include "../../mk/compiler.mk" 32.include "../../mk/compiler.mk"
27 33
28.if !empty(CC_VERSION:Mgcc-[3-4]*) 34.if !empty(CC_VERSION:Mgcc-[3-4]*)
29CFLAGS+= -fno-strict-aliasing 35CFLAGS+= -fno-strict-aliasing
30.endif 36.endif
31 37
 38.if empty(PKGSRC_COMPILER:Mgcc)
 39CONFIGURE_ENV+= ac_cv_path_RAWCPP="cc -E -Uunix -"
 40.endif
 41
32.if ${OPSYS} == "NetBSD" 42.if ${OPSYS} == "NetBSD"
33CONFIGURE_ARGS+= --with-random-device=/dev/urandom 43CONFIGURE_ARGS+= --with-random-device=/dev/urandom
34.endif 44.endif
35 45
36# The following forces the X server to start on the 5th virtual terminal. 46# The following forces the X server to start on the 5th virtual terminal.
37# This is suboptimal but matches the defaults for the xdm configuration, 47# This is suboptimal but matches the defaults for the xdm configuration,
38# which should work for most installations. See the definition of 48# which should work for most installations. See the definition of
39# DEFAULTVT in xsrc/xfree/xc/programs/xdm/config/Imakefile. 49# DEFAULTVT in xsrc/xfree/xc/programs/xdm/config/Imakefile.
40# 50#
41# If we do not do this, we hit a very annoying and obscure problem: during 51# If we do not do this, we hit a very annoying and obscure problem: during
42# system startup, xdm starts before init spawns gettys. If the X server 52# system startup, xdm starts before init spawns gettys. If the X server
43# is started before init spawns the gettys (which easily happens on slow 53# is started before init spawns the gettys (which easily happens on slow
44# machines), it grabs the first virtual terminal (instead of the first 54# machines), it grabs the first virtual terminal (instead of the first
45# "free" one). Later on, when the first getty is started, it grabs the 55# "free" one). Later on, when the first getty is started, it grabs the
46# same terminal X used (the first one). As a result, only one of them 56# same terminal X used (the first one). As a result, only one of them
47# will receive key presses. And on slow machines, X will have lost access 57# will receive key presses. And on slow machines, X will have lost access
48# to the keyboard. 58# to the keyboard.
49.if (${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD") && \ 59.if (${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD") && \
50 (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64") 60 (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64")
51CONFIGURE_ARGS+= --with-default-vt=vt05 61CONFIGURE_ARGS+= --with-default-vt=vt05
52.endif 62.endif
53 63
54.include "../../mk/compiler.mk" 
55.if empty(PKGSRC_COMPILER:Mgcc) 
56CONFIGURE_ENV+= ac_cv_path_RAWCPP="cc -E -Uunix -" 
57.endif 
58 
59.include "options.mk" 64.include "options.mk"
60 65
61.include "../../x11/libXaw/buildlink3.mk" 66.include "../../x11/libXaw/buildlink3.mk"
62.include "../../x11/libXft/buildlink3.mk" 67.include "../../x11/libXft/buildlink3.mk"
63.include "../../x11/libXmu/buildlink3.mk" 68.include "../../x11/libXmu/buildlink3.mk"
64.include "../../x11/libXinerama/buildlink3.mk" 69.include "../../x11/libXinerama/buildlink3.mk"
65.include "../../mk/pam.buildlink3.mk" 70.include "../../mk/pam.buildlink3.mk"
66.include "../../mk/bsd.pkg.mk" 71.include "../../mk/bsd.pkg.mk"