head 1.21; access; symbols netbsd-11-0-RC4:1.21 netbsd-11-0-RC3:1.21 netbsd-11-0-RC2:1.21 netbsd-11-0-RC1:1.21 perseant-exfatfs-base-20250801:1.21 netbsd-11:1.21.0.2 netbsd-11-base:1.21 netbsd-10-1-RELEASE:1.19 perseant-exfatfs-base-20240630:1.20 perseant-exfatfs:1.20.0.2 perseant-exfatfs-base:1.20 netbsd-8-3-RELEASE:1.13 netbsd-9-4-RELEASE:1.17.2.1 netbsd-10-0-RELEASE:1.19 netbsd-10-0-RC6:1.19 netbsd-10-0-RC5:1.19 netbsd-10-0-RC4:1.19 netbsd-10-0-RC3:1.19 netbsd-10-0-RC2:1.19 netbsd-10-0-RC1:1.19 netbsd-10:1.19.0.2 netbsd-10-base:1.19 netbsd-9-3-RELEASE:1.17 cjep_sun2x-base1:1.17 cjep_sun2x:1.17.0.8 cjep_sun2x-base:1.17 cjep_staticlib_x-base1:1.17 netbsd-9-2-RELEASE:1.17 cjep_staticlib_x:1.17.0.6 cjep_staticlib_x-base:1.17 netbsd-9-1-RELEASE:1.17 phil-wifi-20200421:1.17 phil-wifi-20200411:1.17 is-mlppp:1.17.0.4 is-mlppp-base:1.17 phil-wifi-20200406:1.17 netbsd-8-2-RELEASE:1.13 netbsd-9-0-RELEASE:1.17 netbsd-9-0-RC2:1.17 netbsd-9-0-RC1:1.17 phil-wifi-20191119:1.17 netbsd-9:1.17.0.2 netbsd-9-base:1.17 phil-wifi-20190609:1.17 netbsd-8-1-RELEASE:1.13 netbsd-8-1-RC1:1.13 pgoyette-compat-merge-20190127:1.13 pgoyette-compat-20190127:1.13 pgoyette-compat-20190118:1.13 pgoyette-compat-1226:1.13 pgoyette-compat-1126:1.13 pgoyette-compat-1020:1.13 pgoyette-compat-0930:1.13 pgoyette-compat-0906:1.13 netbsd-7-2-RELEASE:1.13 pgoyette-compat-0728:1.13 netbsd-8-0-RELEASE:1.13 phil-wifi:1.13.0.28 phil-wifi-base:1.13 pgoyette-compat-0625:1.13 netbsd-8-0-RC2:1.13 pgoyette-compat-0521:1.13 pgoyette-compat-0502:1.13 pgoyette-compat-0422:1.13 netbsd-8-0-RC1:1.13 pgoyette-compat-0415:1.13 pgoyette-compat-0407:1.13 pgoyette-compat-0330:1.13 pgoyette-compat-0322:1.13 pgoyette-compat-0315:1.13 netbsd-7-1-2-RELEASE:1.13 pgoyette-compat:1.13.0.26 pgoyette-compat-base:1.13 netbsd-7-1-1-RELEASE:1.13 matt-nb8-mediatek:1.13.0.24 matt-nb8-mediatek-base:1.13 perseant-stdc-iso10646:1.13.0.22 perseant-stdc-iso10646-base:1.13 netbsd-8:1.13.0.20 netbsd-8-base:1.13 prg-localcount2-base3:1.13 prg-localcount2-base2:1.13 prg-localcount2-base1:1.13 prg-localcount2:1.13.0.18 prg-localcount2-base:1.13 pgoyette-localcount-20170426:1.13 bouyer-socketcan-base1:1.13 pgoyette-localcount-20170320:1.13 netbsd-7-1:1.13.0.16 netbsd-7-1-RELEASE:1.13 netbsd-7-1-RC2:1.13 netbsd-7-nhusb-base-20170116:1.13 bouyer-socketcan:1.13.0.14 bouyer-socketcan-base:1.13 pgoyette-localcount-20170107:1.13 netbsd-7-1-RC1:1.13 pgoyette-localcount-20161104:1.13 netbsd-7-0-2-RELEASE:1.13 localcount-20160914:1.13 netbsd-7-nhusb:1.13.0.12 netbsd-7-nhusb-base:1.13 pgoyette-localcount-20160806:1.13 pgoyette-localcount-20160726:1.13 pgoyette-localcount:1.13.0.10 pgoyette-localcount-base:1.13 netbsd-7-0-1-RELEASE:1.13 netbsd-7-0:1.13.0.8 netbsd-7-0-RELEASE:1.13 netbsd-7-0-RC3:1.13 netbsd-7-0-RC2:1.13 netbsd-7-0-RC1:1.13 netbsd-5-2-3-RELEASE:1.3.4.2 netbsd-5-1-5-RELEASE:1.3.4.2 netbsd-6-0-6-RELEASE:1.8 netbsd-6-1-5-RELEASE:1.8 netbsd-7:1.13.0.6 netbsd-7-base:1.13 yamt-pagecache-base9:1.13 yamt-pagecache-tag8:1.8 netbsd-6-1-4-RELEASE:1.8 netbsd-6-0-5-RELEASE:1.8 tls-earlyentropy:1.13.0.4 tls-earlyentropy-base:1.13 riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.13 riastradh-drm2-base3:1.13 netbsd-6-1-3-RELEASE:1.8 netbsd-6-0-4-RELEASE:1.8 netbsd-5-2-2-RELEASE:1.3.4.2 netbsd-5-1-4-RELEASE:1.3.4.2 netbsd-6-1-2-RELEASE:1.8 netbsd-6-0-3-RELEASE:1.8 netbsd-5-2-1-RELEASE:1.3.4.2 netbsd-5-1-3-RELEASE:1.3.4.2 netbsd-6-1-1-RELEASE:1.8 riastradh-drm2-base2:1.13 riastradh-drm2-base1:1.13 riastradh-drm2:1.13.0.2 riastradh-drm2-base:1.13 netbsd-6-1:1.8.0.16 netbsd-6-0-2-RELEASE:1.8 netbsd-6-1-RELEASE:1.8 netbsd-6-1-RC4:1.8 netbsd-6-1-RC3:1.8 agc-symver:1.8.0.14 agc-symver-base:1.8 netbsd-6-1-RC2:1.8 netbsd-6-1-RC1:1.8 yamt-pagecache-base8:1.8 netbsd-5-2:1.3.4.2.0.6 netbsd-6-0-1-RELEASE:1.8 yamt-pagecache-base7:1.8 netbsd-5-2-RELEASE:1.3.4.2 netbsd-5-2-RC1:1.3.4.2 matt-nb6-plus-nbase:1.8 yamt-pagecache-base6:1.8 netbsd-6-0:1.8.0.10 netbsd-6-0-RELEASE:1.8 netbsd-6-0-RC2:1.8 tls-maxphys:1.8.0.8 tls-maxphys-base:1.13 matt-nb6-plus:1.8.0.6 matt-nb6-plus-base:1.8 netbsd-6-0-RC1:1.8 yamt-pagecache-base5:1.8 yamt-pagecache-base4:1.8 netbsd-6:1.8.0.4 netbsd-6-base:1.8 netbsd-5-1-2-RELEASE:1.3.4.2 netbsd-5-1-1-RELEASE:1.3.4.2 yamt-pagecache-base3:1.8 yamt-pagecache-base2:1.8 yamt-pagecache:1.8.0.2 yamt-pagecache-base:1.8 cherry-xenmp:1.7.0.2 cherry-xenmp-base:1.7 bouyer-quota2-nbase:1.6 bouyer-quota2:1.6.0.2 bouyer-quota2-base:1.6 matt-mips64-premerge-20101231:1.6 matt-nb5-mips64-premerge-20101231:1.3.4.1.4.1 matt-nb5-pq3:1.3.4.2.0.4 matt-nb5-pq3-base:1.3.4.2 netbsd-5-1:1.3.4.2.0.2 netbsd-5-1-RELEASE:1.3.4.2 netbsd-5-1-RC4:1.3.4.2 matt-nb5-mips64-k15:1.3.4.1.4.1 netbsd-5-1-RC3:1.3.4.2 netbsd-5-1-RC2:1.3.4.2 netbsd-5-1-RC1:1.3.4.2 netbsd-5-0-2-RELEASE:1.3.4.1 matt-nb5-mips64-premerge-20091211:1.3.4.1 matt-premerge-20091211:1.5 matt-nb5-mips64-u2-k2-k4-k7-k8-k9:1.3.4.1 matt-nb4-mips64-k7-u2a-k9b:1.3.4.1 matt-nb5-mips64-u1-k1-k5:1.3.4.1 matt-nb5-mips64:1.3.4.1.0.4 netbsd-5-0-1-RELEASE:1.3.4.1 jym-xensuspend-nbase:1.5 netbsd-5-0:1.3.4.1.0.2 netbsd-5-0-RELEASE:1.3.4.1 netbsd-5-0-RC4:1.3.4.1 netbsd-5-0-RC3:1.3.4.1 netbsd-5-0-RC2:1.3.4.1 jym-xensuspend:1.4.0.2 jym-xensuspend-base:1.5 netbsd-5-0-RC1:1.3.4.1 haad-dm-base:1.3 haad-dm-base2:1.3 haad-nbase2:1.3 netbsd-5:1.3.0.4 netbsd-5-base:1.3 matt-mips64-base2:1.3 haad-dm:1.3.0.2 haad-dm-base1:1.3 wrstuden-revivesa-base-3:1.2 wrstuden-revivesa:1.2.0.2 wrstuden-revivesa-base-2:1.2 oinkoink:1.1.1.1 mrg-and-rtr:1.1.1; locks; strict; comment @# @; 1.21 date 2025.03.09.08.26.29; author mrg; state Exp; branches; next 1.20; commitid 8iOtktYfGLqgUmMF; 1.20 date 2024.04.29.22.09.11; author mrg; state Exp; branches 1.20.2.1; next 1.19; commitid kU4CZxAL5Uacy58F; 1.19 date 2022.08.19.15.55.36; author nia; state Exp; branches; next 1.18; commitid R61zbZjdpTveovQD; 1.18 date 2022.08.16.22.44.06; author mrg; state Exp; branches; next 1.17; commitid RJT9KbWh8QenK9QD; 1.17 date 2019.03.06.12.40.23; author nakayama; state Exp; branches 1.17.2.1 1.17.8.1; next 1.16; commitid UWrwdGWZVFViSieB; 1.16 date 2019.03.06.03.38.30; author christos; state Exp; branches; next 1.15; commitid ycTAmYes5UDoSfeB; 1.15 date 2019.03.06.01.13.38; author christos; state Exp; branches; next 1.14; commitid nXUXNlbUVLkM4feB; 1.14 date 2019.03.05.08.35.35; author mrg; state Exp; branches; next 1.13; commitid Ds4I8Xhse8T7y9eB; 1.13 date 2013.06.17.15.58.40; author christos; state Exp; branches 1.13.28.1; next 1.12; commitid MlxlBnAiV2ck5ZTw; 1.12 date 2013.06.16.01.51.29; author christos; state Exp; branches; next 1.11; commitid 8cdiEDh5Bn6LqMTw; 1.11 date 2013.06.06.09.13.41; author mrg; state Exp; branches; next 1.10; commitid mOMuAHRFWi6fcxSw; 1.10 date 2013.06.05.00.01.16; author mrg; state Exp; branches; next 1.9; commitid eGrDjRCbzj6qamSw; 1.9 date 2013.05.31.22.49.15; author mrg; state Exp; branches; next 1.8; commitid nGip7Hnh0ka9UPRw; 1.8 date 2011.10.25.16.56.23; author christos; state Exp; branches 1.8.2.1 1.8.8.1; next 1.7; 1.7 date 2011.05.23.17.44.41; author dsl; state Exp; branches; next 1.6; 1.6 date 2009.12.18.17.28.47; author christos; state Exp; branches; next 1.5; 1.5 date 2009.05.06.08.49.37; author mrg; state Exp; branches; next 1.4; 1.4 date 2009.01.02.23.25.57; author spz; state Exp; branches 1.4.2.1; next 1.3; 1.3 date 2008.10.14.23.37.19; author cube; state Exp; branches 1.3.2.1 1.3.4.1; next 1.2; 1.2 date 2008.09.07.14.30.28; author lukem; state Exp; branches 1.2.2.1; next 1.1; 1.1 date 2008.07.29.05.01.22; author mrg; state Exp; branches 1.1.1.1; next ; 1.20.2.1 date 2025.08.02.05.50.39; author perseant; state Exp; branches; next ; commitid 23j6GFaDws3O875G; 1.17.2.1 date 2022.08.29.16.20.45; author martin; state Exp; branches; next ; commitid eF4QIk33xp61dNRD; 1.17.8.1 date 2021.06.06.20.30.46; author cjep; state Exp; branches; next ; commitid XNEGuB48YPLw17WC; 1.13.28.1 date 2019.06.10.22.02.35; author christos; state Exp; branches; next ; commitid jtc8rnCzWiEEHGqB; 1.8.2.1 date 2014.05.22.14.09.37; author yamt; state Exp; branches; next ; commitid FFQX08bYGKywAxBx; 1.8.8.1 date 2013.06.23.06.28.40; author tls; state Exp; branches; next ; commitid OnlO1cBgtQRcIHUw; 1.4.2.1 date 2009.05.13.18.53.23; author jym; state Exp; branches; next ; 1.3.2.1 date 2008.10.14.23.37.19; author haad; state dead; branches; next 1.3.2.2; 1.3.2.2 date 2008.10.19.22.41.00; author haad; state Exp; branches; next ; 1.3.4.1 date 2009.01.09.02.51.40; author snj; state Exp; branches 1.3.4.1.4.1; next 1.3.4.2; 1.3.4.2 date 2009.09.17.04.24.28; author snj; state Exp; branches; next ; 1.3.4.1.4.1 date 2010.04.21.05.24.33; author matt; state Exp; branches; next ; 1.2.2.1 date 2008.09.07.14.30.28; author wrstuden; state dead; branches; next 1.2.2.2; 1.2.2.2 date 2008.09.18.05.18.29; author wrstuden; state Exp; branches; next ; 1.1.1.1 date 2008.07.29.05.01.22; author mrg; state Exp; branches; next ; desc @@ 1.21 log @actually, since Xtrans needs them, add the new -DHAVE_GETADDRINFO, -DHAVE_INET_NTOP, and -DHAVE_STRUCT_SOCKADDR_STORAGE to X11FLAGS.CONNECTION. xdm/xinit gains -DHAVE_ASPRINTF. libX11 gets xim_trans.c compiled properly. @ text @# $NetBSD: Makefile,v 1.20 2024/04/29 22:09:11 mrg Exp $ .include PROG= xdm SRCS= access.c auth.c choose.c daemon.c dm.c dpylist.c \ error.c file.c genauth.c mitauth.c netaddr.c policy.c \ protodpy.c reset.c resource.c server.c session.c socket.c \ util.c xdmauth.c xdmcp.c prngc.c MAN= xdm.8 .if ${MKPIC} == "no" SRCS+= Login.c greet.c verify.c CPPFLAGS+= -DSTATIC_GREETER_LIB .endif DEF_USER_PATH= /sbin:/usr/sbin:/bin:/usr/bin:/usr/games:/usr/pkg/sbin:/usr/pkg/bin:/usr/local/sbin:/usr/local/bin:${X11BINDIR} DEF_SYSTEM_PATH=/sbin:/usr/sbin:/bin:/usr/bin:${X11BINDIR} CPPFLAGS+= -DRETSIGTYPE=void CPPFLAGS+= -DHAVE_ASPRINTF CPPFLAGS.auth.c+= -DBSD44SOCKETS CPPFLAGS.socket.c+= -DBSD44SOCKETS CPPFLAGS.xdmcp.c+= -DBSD44SOCKETS CPPFLAGS.xdmshell.c+= -DHAS_VFORK CPPFLAGS.resource.c+= \ -DDEF_SERVER_LINE="\":0 local ${X11BINDIR}/X :0\"" \ -DXRDB_PROGRAM=\"${X11BINDIR}/xrdb\" \ -DDEF_SESSION="\"${X11BINDIR}/xterm -ls\"" \ -DDEF_USER_PATH=\"${DEF_USER_PATH}\" \ -DDEF_SYSTEM_PATH=\"${DEF_SYSTEM_PATH}\" \ -DDEF_SYSTEM_SHELL=\"/bin/sh\" \ -DDEF_FAILSAFE_CLIENT=\"${X11BINDIR}/xterm\" \ -DDEF_XDM_CONFIG=\"${XDMDIR}/xdm-config\" \ -DDEF_AUTH_DIR=\"${XDMVARDIR}\" \ -DDEF_GREETER_LIB=\"${XDMGREETERLIB}\" LDADD+= -lXau -lXdmcp -lXft -lXinerama -lXpm LDADD+= -lXmu -lXt -lSM -lICE -lXext -lXrender -lX11 LDADD+= -lcrypt -lfreetype -lutil DPADD+= ${LIBXAU} ${LIBXDMCP} ${LIBXFT} ${LIBXINERAMA} ${LIBXPM} DPADD+= ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11} DPADD+= ${LIBCRYPT} ${LIBFREETYPE} ${LIBUTIL} .if (${USE_PAM} != "no") LDADD+= -lpam ${PAM_STATIC_LDADD} DPADD+= ${LIBPAM} ${PAM_STATIC_DPADD} .endif SUBDIR+= chooser config TARGETS+= configinstall .include "Makefile.xdm" CPPFLAGS.resource.c+= -DDEF_CHOOSER=\"${XDMCHOOSERPATH}\" .include "../../xorg-pkg-ver.mk" X11EXTRAMANDEFS+= \ -e 's,CHOOSERPATH,${XDMCHOOSERPATH},' \ -e 's,XDMLOGDIR,${XDMLOGDIR},' \ -e 's,XDMDIR,${XDMDIR},' \ -e 's,BINDIR,${X11BINDIR},' \ -e 's,XDMPIDDIR,${XDMPIDDIR},' \ -e 's,XDMXAUTHDIR,${XDMVARDIR},' \ -e 's,DEF_USER_PATH,${DEF_USER_PATH},' \ -e 's,DEF_SYSTEM_PATH,${DEF_SYSTEM_PATH},' \ -e 's,DEF_GREETER_LIB,${XDMGREETERLIB},' \ -e 's,DEV_RANDOM,${DEV_RANDOM},' \ -e 's,ARC4_RANDOM,1,' .include .include .include @ 1.20 log @xdm(1) was renamed xdm(8) a long while ago. catch up location. add support for section 8 X manuals. amusingly, we already knew to convert __adminmansuffix__ into "8", but not how to create .8 from X .man. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.19 2022/08/19 15:55:36 nia Exp $ d21 1 @ 1.20.2.1 log @Sync with HEAD @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.21 2025/03/09 08:26:29 mrg Exp $ a20 1 CPPFLAGS+= -DHAVE_ASPRINTF @ 1.19 log @xdm: Include "sbin" directories (and games) in DEF_USER_PATH. Upstream's configure.ac picks a DEF_USER_PATH on a per-OS basis. Most of these include the "sbin" directories, with NetBSD being the (only?) exception. However, this is inconsistent with the way a typical login shell is initialized (when using the default skeleton files). To avoid user confusion, harmonize DEF_USER_PATH with our other defaults and with other OSes. PR xsrc/54851 @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.18 2022/08/16 22:44:06 mrg Exp $ d10 1 @ 1.18 log @fix the man page generation, noted by uwe@@ @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.17 2019/03/06 12:40:23 nakayama Exp $ d16 1 a16 1 DEF_USER_PATH= /bin:/usr/bin:/usr/pkg/bin:/usr/local/bin:${X11BINDIR} @ 1.17 log @Centralize pam definitions and tabify. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.16 2019/03/06 03:38:30 christos Exp $ d16 3 d28 2 a29 2 -DDEF_USER_PATH=\"/bin:/usr/bin:/usr/pkg/bin:/usr/local/bin:${X11BINDIR}\" \ -DDEF_SYSTEM_PATH=\"/sbin:/usr/sbin:/bin:/usr/bin:${X11BINDIR}\" \ d58 11 a68 8 -e 's,ARC4_RANDOM,1,' \ -e 's,BINDIR,$(X11BINDIR),' \ -e 's,CHOOSERPATH,$(XDMCHOOSERPATH),' \ -e 's,DGREETERLIBPATH,$(XDMGREETERLIB),' \ -e 's,XDMDIR,$(XDMDIR),' \ -e 's,XDMXAUTHDIR,$(XDMVARDIR),' \ -e 's,XDMLOGDIR,$(XDMLOGDIR),' \ -e 's,XDMPIDDIR,$(XDMPIDDIR),' @ 1.17.2.1 log @Pull up following revision(s) (requested by nia in ticket #1510): external/mit/xorg/bin/xdm/Makefile.xdm: revision 1.11 external/mit/xorg/bin/xdm/Makefile: revision 1.18 external/mit/xorg/bin/xdm/Makefile: revision 1.19 fix the man page generation, noted by uwe@@ xdm: Include "sbin" directories (and games) in DEF_USER_PATH. Upstream's configure.ac picks a DEF_USER_PATH on a per-OS basis. Most of these include the "sbin" directories, with NetBSD being the (only?) exception. However, this is inconsistent with the way a typical login shell is initialized (when using the default skeleton files). To avoid user confusion, harmonize DEF_USER_PATH with our other defaults and with other OSes. PR xsrc/54851 @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.17 2019/03/06 12:40:23 nakayama Exp $ a15 3 DEF_USER_PATH= /sbin:/usr/sbin:/bin:/usr/bin:/usr/games:/usr/pkg/sbin:/usr/pkg/bin:/usr/local/sbin:/usr/local/bin:${X11BINDIR} DEF_SYSTEM_PATH=/sbin:/usr/sbin:/bin:/usr/bin:${X11BINDIR} d25 2 a26 2 -DDEF_USER_PATH=\"${DEF_USER_PATH}\" \ -DDEF_SYSTEM_PATH=\"${DEF_SYSTEM_PATH}\" \ d55 8 a62 11 -e 's,CHOOSERPATH,${XDMCHOOSERPATH},' \ -e 's,XDMLOGDIR,${XDMLOGDIR},' \ -e 's,XDMDIR,${XDMDIR},' \ -e 's,BINDIR,${X11BINDIR},' \ -e 's,XDMPIDDIR,${XDMPIDDIR},' \ -e 's,XDMXAUTHDIR,${XDMVARDIR},' \ -e 's,DEF_USER_PATH,${DEF_USER_PATH},' \ -e 's,DEF_SYSTEM_PATH,${DEF_SYSTEM_PATH},' \ -e 's,DEF_GREETER_LIB,${XDMGREETERLIB},' \ -e 's,DEV_RANDOM,${DEV_RANDOM},' \ -e 's,ARC4_RANDOM,1,' @ 1.17.8.1 log @sync with head @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.17 2019/03/06 12:40:23 nakayama Exp $ d33 2 a34 3 LDADD+= ${XLIBLDADD_XFT} LDADD+= ${XLIBLDADD_XMU} LDADD+= -lXinerama ${XLIBLDADD_XPM} d36 2 a37 1 DPADD+= ${XLIBDPADD_XFT} ${XLIBDPADD_XMU} ${LIBXINERAMA} ${XLIBDPADD_XPM} @ 1.16 log @remove trailing escape @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.15 2019/03/06 01:13:38 christos Exp $ d16 1 a16 1 CPPFLAGS+= -DRETSIGTYPE=void -DHAVE_SECURITY_PAM_TYPES_H -DHAVE_SECURITY_PAM_APPL_H @ 1.15 log @fix build @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.14 2019/03/05 08:35:35 mrg Exp $ d31 1 a31 1 -DDEF_GREETER_LIB=\"${XDMGREETERLIB}\" \ @ 1.14 log @update for xdm 1.1.12: - streams.c is gone (hello 2019!) - man pages other file convert from cpp to sed processing @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.13 2013/06/17 15:58:40 christos Exp $ d16 6 a21 6 CPPFLAGS+= -DRETSIGTYPE=void CPPFLAGS.auth.c= -DBSD44SOCKETS CPPFLAGS.socket.c= -DBSD44SOCKETS CPPFLAGS.xdmcp.c= -DBSD44SOCKETS CPPFLAGS.xdmshell.c= -DHAS_VFORK CPPFLAGS.resource.c= \ d31 1 a31 1 -DDEF_GREETER_LIB=\"${XDMGREETERLIB}\" @ 1.13 log @Remove previous; this is built in ../../lib/libXdmGreet as pointed out by mrg. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.12 2013/06/16 01:51:29 christos Exp $ d9 1 a9 1 streams.c util.c xdmauth.c xdmcp.c prngc.c d52 11 a62 8 X11MANCPP= yes X11EXTRAMANDEFS+= -DARC4_RANDOM \ -DCHOOSERPATH=${XDMCHOOSERPATH} \ -DGREETERLIBPATH=${XDMGREETERLIB} \ -DXDMDIR=${XDMDIR} \ -DXDMXAUTHDIR=${XDMVARDIR} \ -DXDMLOGDIR=${XDMLOGDIR} \ -DXDMPIDDIR=${XDMPIDDIR} @ 1.13.28.1 log @Sync with HEAD @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.17 2019/03/06 12:40:23 nakayama Exp $ d9 1 a9 1 util.c xdmauth.c xdmcp.c prngc.c d17 5 a21 5 CPPFLAGS.auth.c+= -DBSD44SOCKETS CPPFLAGS.socket.c+= -DBSD44SOCKETS CPPFLAGS.xdmcp.c+= -DBSD44SOCKETS CPPFLAGS.xdmshell.c+= -DHAS_VFORK CPPFLAGS.resource.c+= \ d52 8 a59 11 .include "../../xorg-pkg-ver.mk" X11EXTRAMANDEFS+= \ -e 's,ARC4_RANDOM,1,' \ -e 's,BINDIR,$(X11BINDIR),' \ -e 's,CHOOSERPATH,$(XDMCHOOSERPATH),' \ -e 's,DGREETERLIBPATH,$(XDMGREETERLIB),' \ -e 's,XDMDIR,$(XDMDIR),' \ -e 's,XDMXAUTHDIR,$(XDMVARDIR),' \ -e 's,XDMLOGDIR,$(XDMLOGDIR),' \ -e 's,XDMPIDDIR,$(XDMPIDDIR),' @ 1.12 log @In the PIC case, build libXdmGreet; perhaps we should always build and link against it, even in the static case? @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.11 2013/06/06 09:13:41 mrg Exp $ a13 3 .else # XXX: Perhaps always build libXdmGreet and link against that? SUBDIR+= greeter @ 1.11 log @don't build greeter lib with GREET_LIB. it triggers some sort of problem i haven't yet figured out, and our linker doesn't need these hacks with --export-dynamic anyway. if !MKPIC, built the greeter into xdm statically. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.10 2013/06/05 00:01:16 mrg Exp $ d14 3 d48 1 a48 1 SUBDIR= chooser config @ 1.10 log @update properly for xdm 1.1.11: - link libXdmGreet against the same libs that modular does - copy all the config.h defines we need (could do the copy config.h thing here, but we use a bunch of non-standard paths) - support ipv6 properly - move freetype include to Makefile.xdm so the greeter can find it @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.9 2013/05/31 22:49:15 mrg Exp $ d9 6 a14 2 streams.c util.c xdmauth.c xdmcp.c \ Login.c greet.c verify.c prngc.c @ 1.9 log @udpate for xdm 1.1.11: - moved manuals - moved sources - renamed defines - new sources @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.8 2011/10/25 16:56:23 christos Exp $ a46 1 CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/freetype2 @ 1.8 log @Add all the missing HAS_ so that we get back login_cap functionality. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.7 2011/05/23 17:44:41 dsl Exp $ d10 1 a10 1 Login.c greet.c verify.c a43 5 .PATH: ${X11SRCDIR.${PROG}} .PATH: ${X11SRCDIR.${PROG}}/greeter BUILDSYMLINKS+= xdm.man.cpp xdm.man @ 1.8.2.1 log @sync with head. for a reference, the tree before this commit was tagged as yamt-pagecache-tag8. this commit was splitted into small chunks to avoid a limitation of cvs. ("Protocol error: too many arguments") @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.8 2011/10/25 16:56:23 christos Exp $ d9 2 a10 6 streams.c util.c xdmauth.c xdmcp.c prngc.c .if ${MKPIC} == "no" SRCS+= Login.c greet.c verify.c CPPFLAGS+= -DSTATIC_GREETER_LIB .endif d41 1 a41 1 SUBDIR+= chooser config d44 5 d52 1 @ 1.8.8.1 log @resync from head @ text @d1 1 a1 1 # $NetBSD$ d9 2 a10 6 streams.c util.c xdmauth.c xdmcp.c prngc.c .if ${MKPIC} == "no" SRCS+= Login.c greet.c verify.c CPPFLAGS+= -DSTATIC_GREETER_LIB .endif d41 1 a41 1 SUBDIR+= chooser config d44 5 d52 1 @ 1.7 log @Add explicit -lfoo for libraries that are required because of NEEDED entries in other libraries. This avoids a bug in 'ld' which causes it to look in the directory specified by the RPATH entry (in the library with the NEEDED entry) without adding the directory supplied by --sysroot. When the RPATH entry in blindly folloed the link is done w.r.t the systems own libfoo.so which may be missing some symbols. (Or might have a wrong sized data area that would need copying into the programs (or other libraries) data space.) ld also seems to add a NEEDED entry for these libraries directly into the program binary - this doesn't seem right to me. Fixes my build where the installed libX11.so is dated from 2009. CVS :---------------------------------------------------------------------- @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.6 2009/12/18 17:28:47 christos Exp $ d31 1 a31 1 LDADD+= -lcrypt -lfreetype d34 1 a34 1 DPADD+= ${LIBCRYPT} ${LIBFREETYPE} @ 1.6 log @From Patrick Welche: The following trivial typo fix gets rid of "unsecure session"s... XDMATHDIR -> XDMXAUTHDIR @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.5 2009/05/06 08:49:37 mrg Exp $ d30 1 a30 1 LDADD+= -lXmu -lXt -lSM -lICE -lXext -lX11 @ 1.5 log @enable xft for xdm. from yorick hardy. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.4 2009/01/02 23:25:57 spz Exp $ d59 1 a59 1 -DXDMAUTHDIR=${XDMVARDIR} \ @ 1.4 log @make xdm (able to) use PAM fixes PR 39851 @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.3 2008/10/14 23:37:19 cube Exp $ d29 6 a34 4 LDADD+= -lXau -lXdmcp -lXinerama -lXpm -lXmu LDADD+= -lXt -lSM -lICE -lXext -lX11 -lcrypt DPADD+= ${LIBXAU} ${LIBXDMCP} ${LIBXINERAMA} ${LIBXPM} ${LIBXMU} DPADD+= ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11} ${LIBCRYPT} d52 1 @ 1.4.2.1 log @Sync with HEAD. Second commit. See http://mail-index.netbsd.org/source-changes/2009/05/13/msg221222.html @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.5 2009/05/06 08:49:37 mrg Exp $ d29 4 a32 6 LDADD+= -lXau -lXdmcp -lXft -lXinerama -lXpm LDADD+= -lXmu -lXt -lSM -lICE -lXext -lX11 LDADD+= -lcrypt -lfreetype DPADD+= ${LIBXAU} ${LIBXDMCP} ${LIBXFT} ${LIBXINERAMA} ${LIBXPM} DPADD+= ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11} DPADD+= ${LIBCRYPT} ${LIBFREETYPE} a49 1 CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/freetype2 @ 1.3 log @- Adapt to changes on bsd.x11.mk - Remove unnecessary targets that handled .man.pre files - Add transformations for package-specific patterns in man page templates. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.2 2008/09/07 14:30:28 lukem Exp $ d34 5 @ 1.3.4.1 log @Pull up following revision(s) (requested by spz in ticket #238): external/mit/xorg/bin/xdm/Makefile: revision 1.4 external/mit/xorg/bin/xdm/Makefile.xdm: revision 1.2 make xdm (able to) use PAM fixes PR 39851 @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.3 2008/10/14 23:37:19 cube Exp $ a33 5 .if (${USE_PAM} != "no") LDADD+= -lpam ${PAM_STATIC_LDADD} DPADD+= ${LIBPAM} ${PAM_STATIC_DPADD} .endif @ 1.3.4.1.4.1 log @sync to netbsd-5 @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.3.4.2 2009/09/17 04:24:28 snj Exp $ d29 4 a32 6 LDADD+= -lXau -lXdmcp -lXft -lXinerama -lXpm LDADD+= -lXmu -lXt -lSM -lICE -lXext -lX11 LDADD+= -lcrypt -lfreetype DPADD+= ${LIBXAU} ${LIBXDMCP} ${LIBXFT} ${LIBXINERAMA} ${LIBXPM} DPADD+= ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11} DPADD+= ${LIBCRYPT} ${LIBFREETYPE} a49 1 CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/freetype2 @ 1.3.4.2 log @Apply patch (requested by mrg in ticket #958): Sync X.Org reachover build framework and setlists with the new X.Org. @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.5 2009/05/06 08:49:37 mrg Exp $ d29 4 a32 6 LDADD+= -lXau -lXdmcp -lXft -lXinerama -lXpm LDADD+= -lXmu -lXt -lSM -lICE -lXext -lX11 LDADD+= -lcrypt -lfreetype DPADD+= ${LIBXAU} ${LIBXDMCP} ${LIBXFT} ${LIBXINERAMA} ${LIBXPM} DPADD+= ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11} DPADD+= ${LIBCRYPT} ${LIBFREETYPE} a49 1 CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/freetype2 @ 1.3.2.1 log @file Makefile was added on branch haad-dm on 2008-10-19 22:41:00 +0000 @ text @d1 57 @ 1.3.2.2 log @Sync with HEAD. @ text @a0 57 # $NetBSD: Makefile,v 1.3 2008/10/14 23:37:19 cube Exp $ .include PROG= xdm SRCS= access.c auth.c choose.c daemon.c dm.c dpylist.c \ error.c file.c genauth.c mitauth.c netaddr.c policy.c \ protodpy.c reset.c resource.c server.c session.c socket.c \ streams.c util.c xdmauth.c xdmcp.c \ Login.c greet.c verify.c CPPFLAGS+= -DRETSIGTYPE=void CPPFLAGS.auth.c= -DBSD44SOCKETS CPPFLAGS.socket.c= -DBSD44SOCKETS CPPFLAGS.xdmcp.c= -DBSD44SOCKETS CPPFLAGS.xdmshell.c= -DHAS_VFORK CPPFLAGS.resource.c= \ -DDEF_SERVER_LINE="\":0 local ${X11BINDIR}/X :0\"" \ -DXRDB_PROGRAM=\"${X11BINDIR}/xrdb\" \ -DDEF_SESSION="\"${X11BINDIR}/xterm -ls\"" \ -DDEF_USER_PATH=\"/bin:/usr/bin:/usr/pkg/bin:/usr/local/bin:${X11BINDIR}\" \ -DDEF_SYSTEM_PATH=\"/sbin:/usr/sbin:/bin:/usr/bin:${X11BINDIR}\" \ -DDEF_SYSTEM_SHELL=\"/bin/sh\" \ -DDEF_FAILSAFE_CLIENT=\"${X11BINDIR}/xterm\" \ -DDEF_XDM_CONFIG=\"${XDMDIR}/xdm-config\" \ -DDEF_AUTH_DIR=\"${XDMVARDIR}\" \ -DDEF_GREETER_LIB=\"${XDMGREETERLIB}\" LDADD+= -lXau -lXdmcp -lXinerama -lXpm -lXmu LDADD+= -lXt -lSM -lICE -lXext -lX11 -lcrypt DPADD+= ${LIBXAU} ${LIBXDMCP} ${LIBXINERAMA} ${LIBXPM} ${LIBXMU} DPADD+= ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11} ${LIBCRYPT} SUBDIR= chooser config TARGETS+= configinstall .PATH: ${X11SRCDIR.${PROG}} .PATH: ${X11SRCDIR.${PROG}}/greeter BUILDSYMLINKS+= xdm.man.cpp xdm.man .include "Makefile.xdm" CPPFLAGS.resource.c+= -DDEF_CHOOSER=\"${XDMCHOOSERPATH}\" X11MANCPP= yes X11EXTRAMANDEFS+= -DARC4_RANDOM \ -DCHOOSERPATH=${XDMCHOOSERPATH} \ -DGREETERLIBPATH=${XDMGREETERLIB} \ -DXDMDIR=${XDMDIR} \ -DXDMAUTHDIR=${XDMVARDIR} \ -DXDMLOGDIR=${XDMLOGDIR} \ -DXDMPIDDIR=${XDMPIDDIR} .include .include .include @ 1.2 log @Just use a BUILDSYMLINK for xdm.man.cpp -> xdm.man @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $ d46 1 @ 1.2.2.1 log @file Makefile was added on branch wrstuden-revivesa on 2008-09-18 05:18:29 +0000 @ text @d1 56 @ 1.2.2.2 log @Sync with wrstuden-revivesa-base-2. @ text @a0 56 # $NetBSD: Makefile,v 1.2 2008/09/07 14:30:28 lukem Exp $ .include PROG= xdm SRCS= access.c auth.c choose.c daemon.c dm.c dpylist.c \ error.c file.c genauth.c mitauth.c netaddr.c policy.c \ protodpy.c reset.c resource.c server.c session.c socket.c \ streams.c util.c xdmauth.c xdmcp.c \ Login.c greet.c verify.c CPPFLAGS+= -DRETSIGTYPE=void CPPFLAGS.auth.c= -DBSD44SOCKETS CPPFLAGS.socket.c= -DBSD44SOCKETS CPPFLAGS.xdmcp.c= -DBSD44SOCKETS CPPFLAGS.xdmshell.c= -DHAS_VFORK CPPFLAGS.resource.c= \ -DDEF_SERVER_LINE="\":0 local ${X11BINDIR}/X :0\"" \ -DXRDB_PROGRAM=\"${X11BINDIR}/xrdb\" \ -DDEF_SESSION="\"${X11BINDIR}/xterm -ls\"" \ -DDEF_USER_PATH=\"/bin:/usr/bin:/usr/pkg/bin:/usr/local/bin:${X11BINDIR}\" \ -DDEF_SYSTEM_PATH=\"/sbin:/usr/sbin:/bin:/usr/bin:${X11BINDIR}\" \ -DDEF_SYSTEM_SHELL=\"/bin/sh\" \ -DDEF_FAILSAFE_CLIENT=\"${X11BINDIR}/xterm\" \ -DDEF_XDM_CONFIG=\"${XDMDIR}/xdm-config\" \ -DDEF_AUTH_DIR=\"${XDMVARDIR}\" \ -DDEF_GREETER_LIB=\"${XDMGREETERLIB}\" LDADD+= -lXau -lXdmcp -lXinerama -lXpm -lXmu LDADD+= -lXt -lSM -lICE -lXext -lX11 -lcrypt DPADD+= ${LIBXAU} ${LIBXDMCP} ${LIBXINERAMA} ${LIBXPM} ${LIBXMU} DPADD+= ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11} ${LIBCRYPT} SUBDIR= chooser config TARGETS+= configinstall .PATH: ${X11SRCDIR.${PROG}} .PATH: ${X11SRCDIR.${PROG}}/greeter BUILDSYMLINKS+= xdm.man.cpp xdm.man .include "Makefile.xdm" CPPFLAGS.resource.c+= -DDEF_CHOOSER=\"${XDMCHOOSERPATH}\" X11EXTRAMANDEFS+= -DARC4_RANDOM \ -DCHOOSERPATH=${XDMCHOOSERPATH} \ -DGREETERLIBPATH=${XDMGREETERLIB} \ -DXDMDIR=${XDMDIR} \ -DXDMAUTHDIR=${XDMVARDIR} \ -DXDMLOGDIR=${XDMLOGDIR} \ -DXDMPIDDIR=${XDMPIDDIR} .include .include .include @ 1.1 log @Initial revision @ text @d1 1 a1 1 # $NetBSD: Makefile,v 1.9 2004/05/16 10:25:14 lukem Exp $ d40 1 a40 2 xdm.man: xdm.man.cpp $(CC) -E ${.ALLSRC} > ${.TARGET} @ 1.1.1.1 log @initial import of the crossbuild framework for modular Xorg. this is heavily based upon the work rtr@@ did on src/x11, but hacked to work for modern modular Xorg source split. the sources will live in xsrc/external/mit//dist. documentation on using this will come when the above directories are fully populated. there are 192 of them so it may take some time before that is completed. @ text @@