Attachment #32035 for bug #53108

View | Details | Raw Unified | Return to bug 53108
Collapse All | Expand All




#

PORTNAME=	wdm
PORTVERSION=	1.25
PORTREVISION=	3
CATEGORIES=	x11 windowmaker
MASTER_SITES=	http://voins.program.ru/wdm/ \
		http://www.de.freebsd.org/de/gif/bsd/ \

MASTER_SITE_SUBDIR=	tg
DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DAEMONPICS}
EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
DIST_SUBDIR=	wdm

MAINTAINER=	kris@FreeBSD.org
COMMENT=	WINGs Display Manager; an xdm replacement

LIB_DEPENDS=	wraster.4:${PORTSDIR}/x11-wm/windowmaker
		PropList.2:${PORTSDIR}/devel/libPropList

USE_BZIP2=	yes
USE_REINPLACE=	yes
USE_X_PREFIX=	yes
USE_REINPLACE=	yes
GNU_CONFIGURE=	yes
CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
			-DCSRG_BASED -DHAS_SETUSERCONTEXT" \
		LIBS="-L${LOCALBASE}/lib ${LIBPAM}" \
		DEF_SERVER="${DEF_SERVER}"
CONFIGURE_ARGS=	--with-logdir=/var/log \
		--with-runlockdir=/var/run \
		--with-wdmdir=${WDMDIR} \
		--with-gfxdir=${WDMDIR}/pixmaps \
		--with-nlsdir=${PREFIX}/share/locale \
		--with-Logo=beastie.xpm \
		--with-gfx-incs=${LOCALBASE}/include \
		--with-gfx-libs=${LOCALBASE}/lib \
		--with-defuserpath=/bin:/usr/bin:/sbin:/usr/sbin:${X11BASE}/bin:${LOCALBASE}/bin \
		--with-defsystempath=/bin:/usr/bin:/sbin:/usr/sbin:${X11BASE}/bin \
		--with-wmlist=wmaker:afterstep:blackbox:ctwm:enlightenment:fvwm:fvwm2:fvwm95:olvwm:qvwm:tvtwm

MAN1=	wdm.1 wdmLogin.1

CPPFLAGS=	-I${LOCALBASE}/include -DCSRG_BASED -DHAS_SETUSERCONTEXT
LDFLAGS=	-L${LOCALBASE}/lib
CONFIGURE_ENV+=	LIBS="-Wl,-export-dynamic ${X11BASE}/lib/libXinerama.a"
.endif

DEF_SERVER?=	${X11BASE}/bin/X

WDMDIR=		${PREFIX}/lib/X11/wdm

DAEMONPICS=	beastie.xpm daemon1-HQ-1280x960.jpg

.include <bsd.port.pre.mk>

.if ( ${OSVERSION} >= 500028 ) && !defined(WITHOUT_PAM)
WITH_PAM=	yes
CONFIGURE_ARGS+=	--with-pamdir=${LOCALBASE}/etc/pam.d/

.if defined(WITH_PAM)
CONFIGURE_ARGS+=	--enable-pam --with-pamdir=${LOCALBASE}/etc/pam.d/
LIBPAM=		-lpam
PLIST_SUB+=	PAM=""
.else
PLIST_SUB+=	PAM="@comment "
.endif

.if !defined(WITH_PAM)
CONFIGURE_ARGS+=	--disable-pam
.endif

pre-everything::
.if !defined(WITH_PAM)
	@${ECHO_MSG}
	@${ECHO_MSG} "If you want to compile with PAM support,"
	@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_PAM=yes\""
	@${ECHO_MSG}
.endif

post-patch:
	@${REINPLACE_CMD} -e 's|$$(DESTDIR)$$(PAMDIR)/wdm||g ; \
		 s| -D | |g' ${WRKSRC}/Makefile.in
	@${REINPLACE_CMD} -e 's|-ldl||g ; \
		 s|/authdir||g' ${WRKSRC}/configure
	@${REINPLACE_CMD} -e \
		's|@FAILSAFE@|@FAILSAFE_PATH@|g' ${WRKSRC}/configs/Xsession.in
	@${REINPLACE_CMD} -e \
		's|#configdir#|${WDMDIR}|g' ${WRKSRC}/doc/wdm.man.in
	@${REINPLACE_CMD} -e \
		's|/etc/X11/wdm|${WDMDIR}|g' ${WRKSRC}/doc/wdmLogin.man
	@${REINPLACE_CMD} -e \
		's|<malloc\.h>|<stdlib.h>|g' ${WRKSRC}/src/TestLogin/TestLogin.c

pre-install:
	@${MKDIR} ${WDMDIR}/pixmaps
.if exists(${WDMDIR}/wdm-config)
	${MV} ${WDMDIR}/wdm-config ${WDMDIR}/wdm-config.preserve
.endif
.if exists(${WDMDIR}/Xsetup_0)
	${MV} ${WDMDIR}/Xsetup_0 ${WDMDIR}/Xsetup_0.preserve
.endif
	fi

post-install:
	@${CP} ${WDMDIR}/wdm-config ${WDMDIR}/wdm-config.dist
.if exists(${WDMDIR}/wdm-config.preserve)
	${MV} ${WDMDIR}/wdm-config.preserve ${WDMDIR}/wdm-config
.endif
	@${CP} ${WDMDIR}/Xsetup_0 ${WDMDIR}/Xsetup_0.dist
.if exists(${WDMDIR}/Xsetup_0.preserve)
	${MV} ${WDMDIR}/Xsetup_0.preserve ${WDMDIR}/Xsetup_0
.endif
	@if [ -e ${PREFIX}/lib/X11/wdm/Xsetup_0.preserve ]; then \
		${MV} ${PREFIX}/lib/X11/wdm/Xsetup_0.preserve \
			${PREFIX}/lib/X11/wdm/Xsetup_0; \
	fi
.for file in ${DAEMONPICS}
	@${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${file} ${WDMDIR}/pixmaps
.endfor
.if defined(WITH_PAM)
.if ( ${OSVERSION} >= 500028 )
	${INSTALL_DATA} ${FILESDIR}/wdm.pam ${LOCALBASE}/etc/pam.d/wdm
.else
	@${ECHO_MSG} "To finish installing this port, append the contents of"
	@${ECHO_MSG} "${FILESDIR}/wdm.pam to your /etc/pam.conf file"
.endif
.endif


Lines 1-3 Link Here

(-)x11/wdm/distinfo (-1 / +1 lines)
1	MD5 (wdm/wdm-1.20.tar.gz) = 7d3a5debe5005ee481e821951d4c9194	1	MD5 (wdm/wdm-1.25.tar.bz2) = 7e9c6f1a9755529d4336b9212fb1b7de
2	MD5 (wdm/beastie.xpm) = 0891d7d8ac81514f10aafeb8f8a89ca2	2	MD5 (wdm/beastie.xpm) = 0891d7d8ac81514f10aafeb8f8a89ca2
3	MD5 (wdm/daemon1-HQ-1280x960.jpg) = b38f175cf6b7167484afac423837ed1a	3	MD5 (wdm/daemon1-HQ-1280x960.jpg) = b38f175cf6b7167484afac423837ed1a




--- src/Login.c	Tue Feb 29 06:17:01 2000
+++ src/Login.c.new	Wed Apr  3 22:36:34 2002
@@ -24,6 +24,9 @@
 #include <X11/xpm.h>
 #include <X11/keysym.h>
 #include <X11/cursorfont.h>
+#ifdef HAVE_XINERAMA
+#include <X11/extensions/Xinerama.h>
+#endif
 #ifdef HAVE_X11_WINGS_H
 #include <X11/WINGs.h>
 #else
@@ -1195,6 +1198,10 @@
 int main(int argc, char **argv)
 {
     WMScreen   *scr;
+    int xine_count; int c;
+#ifdef HAVE_XINERAMA
+    XineramaScreenInfo *xine;
+#endif
 
     ProgName = argv[0];
 
@@ -1210,8 +1217,28 @@
     }
 
     screen_number = DefaultScreen(dpy);
-    screen_width = DisplayWidth(dpy,screen_number);
-    screen_heigth = DisplayHeight(dpy,screen_number);
+#ifdef HAVE_XINERAMA
+    if (XineramaIsActive(dpy)) {
+	xine = XineramaQueryScreens(dpy, &xine_count);
+		
+	if (xine != NULL) {
+		for (c = 0;c < xine_count;c++) {
+			if (xine[c].screen_number == 0) {
+    				screen_width = xine[c].width;
+				screen_heigth = xine[c].height;
+			}
+		}
+	} else {
+		screen_width = DisplayWidth(dpy, screen_number);
+		screen_heigth = DisplayHeight(dpy, screen_number);
+	}
+    } else {
+#endif
+	screen_width = DisplayWidth(dpy,screen_number);
+	screen_heigth = DisplayHeight(dpy,screen_number);
+#ifdef HAVE_XINERAMA
+    }
+#endif
     panel_X = (screen_width  - panel_width)/2;
     panel_Y = (screen_heigth - panel_heigth)/2;
 




--- src/config/wdm-config.in.orig	Thu Sep 16 09:27:58 1999
+++ src/config/wdm-config.in	Mon Dec 20 16:29:51 1999
@@ -3,7 +3,7 @@
 ! wdm configuration file input (sed in Makefile)
 !
 DisplayManager.errorLogFile:    #logdir#/xdm-errors.log
-DisplayManager.pidFile:         #rundir#/xdm-pid
+DisplayManager.pidFile:         #rundir#/xdm.pid
 DisplayManager.keyFile:         #configdir#/xdm-keys
 DisplayManager.servers:         #configdir#/Xservers
 DisplayManager.accessFile:      #configdir#/Xaccess
@@ -25,11 +25,11 @@
 ! display screen background--if not set or set to none, then the
 !                            background is not set by wdm.
 ! DisplayManager*wdmBg:         none
-DisplayManager*wdmBg:           solid:RoyalBlue
+! DisplayManager*wdmBg:         solid:RoyalBlue
 ! DisplayManager*wdmBg:         dgradient:RoyalBlue,FireBrick,Black
 ! DisplayManager*wdmBg:         hgradient:RoyalBlue,FireBrick,Black
 ! DisplayManager*wdmBg:         vgradient:RoyalBlue,FireBrick,Black
-! DisplayManager*wdmBg:         pixmap:#configdir#/pixmaps/Stars.jpg
+DisplayManager*wdmBg:           pixmap:#configdir#/pixmaps/daemon1-HQ-1280x960.jpg
 !
 ! optional pixmap for logo
 #pixmapcomment#DisplayManager*wdmLogo:  #configdir#/pixmaps/#pixmapfile#

Lines 1-11 Link Here

(-)x11/wdm/files/patch-ad (-11 lines)
1	--- doc/wdmLogin.man.orig Fri May 21 20:49:56 1999
2	+++ doc/wdmLogin.man Sat Jan 8 03:33:27 2000
3	@@ -49,7 +49,7 @@
4	to an image file (tiff, png, jpeg and xpm allowed) and it will be
5	scaled to use the full screen.
6	.SH FILES
7	-\fBwdmLogin\fP can be customized by modifying \fI/etc/X11/wdm/wdm-config\fP.
8	+\fBwdmLogin\fP can be customized by modifying \fI%%PREFIX%%/lib/X11/wdm/wdm-config\fP.
9	.SH SEE ALSO
10	.BR wdm (1x)
11	.SH AUTHOR




--- configure.in.orig	Tue Feb 29 18:40:50 2000
+++ configure.in	Thu Apr 11 03:33:45 2002
@@ -50,9 +50,10 @@
 AM_CONDITIONAL(INSTALLPAM, test x$enable_pam = xyes)
 
 if test "$enable_pam" = yes; then
-	AC_CHECK_LIB(pam, main, [PASSWDLIB="-lpam -ldl"
+	AC_CHECK_LIB(pam, main, [PASSWDLIB="-lpam"
 		AC_DEFINE_UNQUOTED(HAVE_PAM_LIB)],
-		[],-ldl)
+		[AC_CHECK_LIB(pam, main, [PASSWDLIB="-lpam -ldl"
+		AC_DEFINE_UNQUOTED(HAVE_PAM_LIB)],[],-ldl)])
 fi
 
 AC_ARG_WITH(pamdir,
@@ -66,6 +67,10 @@
     AC_MSG_CHECKING(for pam directory $PAM_DIR_PATH)
     if test -d "$PAM_DIR_PATH"; then
 	AC_MSG_RESULT(exists)
+    elif test -f "/etc/pam.conf"; then
+	AC_MSG_RESULT(using /etc/pam.conf)
+	PAMDIR=none
+	PAM_DIR_PATH=none
     else
 	AC_MSG_RESULT(does not exist)
 	AC_MSG_WARN([this may not be a pam system <<--------------])
@@ -183,7 +188,7 @@
 
 XLFLAGS="$X_LIBS"
 
-XLIBS="$X_EXTRA_LIBS -lXext -lXt -lX11 -lm"
+XLIBS="$X_PRE_LIBS $X_EXTRA_LIBS -lXext -lXt -lX11 -lm"
 
 XDM_EXTRA_LIBS="-lXmu -lXau -lXdmcp"
 
@@ -504,7 +509,7 @@
 AC_DEFINE_UNQUOTED(WDMDIR,"$DMDIR")
 AC_DEFINE_UNQUOTED(DEF_XDM_CONFIG,"$DMDIR/wdm-config")
 AC_DEFINE_UNQUOTED(DEF_CHOOSER,"$DMDIR/chooser")
-AC_DEFINE_UNQUOTED(DEF_AUTH_DIR,"$DMDIR/authdir")
+AC_DEFINE_UNQUOTED(DEF_AUTH_DIR,"$DMDIR")
 
 AC_SUBST(DMDIR)
 




--- src/Greet.c.orig	Tue Sep 21 23:16:21 1999
+++ src/Greet.c	Wed Nov  3 08:03:00 1999
@@ -260,7 +260,7 @@
         }
         
         execle(wdmLogin, tmp, DisplayName, 
-			 Wm, Logo, HelpFile, DefaultUser, Bg, Animate,
+			 Wm, Logo, Bg, Animate, HelpFile, DefaultUser,
                          NULL, env);
         
         LogError ("Greet cannot exec %s\n", wdmLogin);
@@ -405,7 +405,7 @@
                                 "%s exit(%s) by %s\n", 
                                 PACKAGE, exitArg, name);
 #endif
-#if 0
+#if 1
                         SessionExit (d, UNMANAGE_DISPLAY, FALSE);
 #else
                         Debug ("Killing parent process %d\n", getppid());




--- src/config/Makefile.am.orig	Tue Sep 21 23:16:21 1999
+++ src/config/Makefile.am	Thu Feb 24 01:44:12 2000
@@ -118,8 +118,8 @@
 
 install-data-local:
 if INSTALLPAM
-	$(INSTALL) -d $(DESTDIR)$(PAMDIR)
-	$(INSTALL) -m 644 $(srcdir)/wdm.pamd $(DESTDIR)$(PAMDIR)/wdm
+	[ x$(PAMDIR) = xnone ] || $(INSTALL) -d $(DESTDIR)$(PAMDIR)
+	[ x$(PAMDIR) = xnone ] || $(INSTALL) -m 644 $(srcdir)/wdm.pamd $(DESTDIR)$(PAMDIR)/wdm
 else
 	
 endif




--- src/TestLogin.c.orig	Thu Jul  1 21:51:28 1999
+++ src/TestLogin.c	Tue Mar  7 22:05:04 2000
@@ -67,7 +67,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include <signal.h>
+#ifndef __STDC__
 #include <malloc.h>
+#endif
 
 
 #define forever 1




--- ./src/config/Makefile.in.orig	Sun Oct  6 00:26:45 2002
+++ ./src/config/Makefile.in	Sun Oct  6 00:25:36 2002
@@ -138,7 +138,6 @@
 CLEANFILES = wdm-config Xsetup_0 Xservers Xservers.ws Xsession Xclients
 
 EXTRA_DIST = \
-	wdm.pamd \
 	$(configfiles_DATA) \
 	$(bin_SCRIPTS)
 
@@ -382,10 +381,6 @@
 	$(INSTALL) -m 600 $(srcdir)/wdm-config $(DESTDIR)$(configfilesdir)
 	$(INSTALL) -m 644 $(srcdir)/Xsession.in $(DESTDIR)$(configfilesdir)
 	$(INSTALL) -m 644 $(srcdir)/Xclients.in $(DESTDIR)$(configfilesdir)
-
-install-data-local:
-@INSTALLPAM_TRUE@	$(INSTALL) -d $(DESTDIR)$(PAMDIR)
-@INSTALLPAM_TRUE@	$(INSTALL) -m 644 $(srcdir)/wdm.pamd $(DESTDIR)$(PAMDIR)/wdm
 
 uninstall-hook:
 	rm -fr $(DESTDIR)$(configfilesdir)/authdir




--- configs/wdm-config.in.orig	Sun Jun  1 17:00:09 2003
+++ configs/wdm-config.in	Sun Jun  1 22:45:23 2003
@@ -3,7 +3,7 @@
 ! wdm configuration file input (sed in Makefile)
 !
 DisplayManager.errorLogFile:    @LOGDIR@/xdm-errors.log
-DisplayManager.pidFile:         @RUNDIR@/xdm-pid
+DisplayManager.pidFile:         @RUNDIR@/xdm.pid
 DisplayManager.keyFile:         @DMDIR@/xdm-keys
 DisplayManager.servers:         @DMDIR@/Xservers
 DisplayManager.accessFile:      @DMDIR@/Xaccess
@@ -25,11 +25,11 @@
 ! display screen background--if not set or set to none, then the
 !                            background is not set by wdm.
 ! DisplayManager*wdmBg:         none
-DisplayManager*wdmBg:           solid:RoyalBlue
+! DisplayManager*wdmBg:         solid:RoyalBlue
 ! DisplayManager*wdmBg:         dgradient:RoyalBlue,FireBrick,Black
 ! DisplayManager*wdmBg:         hgradient:RoyalBlue,FireBrick,Black
 ! DisplayManager*wdmBg:         vgradient:RoyalBlue,FireBrick,Black
-! DisplayManager*wdmBg:         pixmap:@GFXDIR@/Stars.jpg
+DisplayManager*wdmBg:           pixmap:@GFXDIR@/daemon1-HQ-1280x960.jpg
 !
 ! optional pixmap for logo
 @PIXMAPCOMMENT@DisplayManager*wdmLogo:  @GFXDIR@/@PIXMAPFILE@




--- src/wdm/loghelpers.c.orig	Sun Jun  1 17:00:09 2003
+++ src/wdm/loghelpers.c	Sun Jun  1 23:30:40 2003
@@ -26,6 +26,21 @@
 #include <sys/wait.h>
 #include <unistd.h>
 
+#ifdef __FreeBSD__
+static char *
+wstrndup(const char *src, size_t size)
+{
+	char *dst;
+
+	dst = malloc(size + 1);
+	if (dst == NULL)
+		return (NULL);
+	dst[size] = '\0';
+	strncpy(dst, src, size);
+	return (dst);
+}
+#endif
+
 /*
  * Function that treats buffer as set of lines separated with '\n'
  * These lines will be directed to WDMLogMessage function with




lib/X11/wdm/Xservers.ws
lib/X11/wdm/Xsession
lib/X11/wdm/Xsession.XFree86
lib/X11/wdm/Xsession.orig
@unexec if cmp -s %D/lib/X11/wdm/Xsetup_0.dist %D/lib/X11/wdm/Xsetup_0; then rm -f %D/lib/X11/wdm/Xsetup_0; fi
lib/X11/wdm/Xsetup_0.dist
@exec [ -f %D/lib/X11/wdm/Xsetup_0 ] || (cp %D/lib/X11/wdm/Xsetup_0.dist %D/lib/X11/wdm/Xsetup_0)

lib/X11/wdm/pixmaps/Earth.jpg
lib/X11/wdm/pixmaps/Earth200x130.xpm
lib/X11/wdm/pixmaps/GnuLinux-logo.jpg
lib/X11/wdm/pixmaps/README
lib/X11/wdm/pixmaps/Stars.jpg
lib/X11/wdm/pixmaps/StarsLogo.jpg
lib/X11/wdm/pixmaps/beastie.xpm

@exec [ -f %D/lib/X11/wdm/wdm-config ] || (cp %D/lib/X11/wdm/wdm-config.dist %D/lib/X11/wdm/wdm-config)
lib/X11/wdm/wdm-config.in
lib/X11/wdm/wdmReconfig
share/locale/de/LC_MESSAGES/wdm.mo
share/locale/ja/LC_MESSAGES/wdm.mo
share/locale/ru/LC_MESSAGES/wdm.mo
@unexec rmdir %D/lib/X11/wdm/pixmaps 2>/dev/null || true
@exec mkdir -p %D/lib/X11/wdm/authdir
@unexec rmdir %D/lib/X11/wdm/authdir/authfiles 2>/dev/null || true

Return to bug 53108

Lines 6-13 Link Here

(-)x11/wdm/Makefile (-50 / +62 lines)
6	#	6	#
7		7
8	PORTNAME= wdm	8	PORTNAME= wdm
9	PORTVERSION= 1.20	9	PORTVERSION= 1.25
10	PORTREVISION= 3
11	CATEGORIES= x11 windowmaker	10	CATEGORIES= x11 windowmaker
12	MASTER_SITES= http://voins.program.ru/wdm/ \	11	MASTER_SITES= http://voins.program.ru/wdm/ \
13	http://www.de.freebsd.org/de/gif/bsd/ \	12	http://www.de.freebsd.org/de/gif/bsd/ \
Lines 15-107 Link Here
15	MASTER_SITE_SUBDIR= tg	14	MASTER_SITE_SUBDIR= tg
16	DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DAEMONPICS}	15	DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DAEMONPICS}
17	EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}	16	EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
		17	DIST_SUBDIR= wdm
18		18
19	MAINTAINER= kris@FreeBSD.org	19	MAINTAINER= kris@FreeBSD.org
20	COMMENT= WINGs Display Manager; an xdm replacement	20	COMMENT= WINGs Display Manager; an xdm replacement
21		21
22	LIB_DEPENDS= wraster.4:${PORTSDIR}/x11-wm/windowmaker \	22	LIB_DEPENDS= wraster.4:${PORTSDIR}/x11-wm/windowmaker
23	PropList.2:${PORTSDIR}/devel/libPropList
24		23
25	DIST_SUBDIR= wdm	24	USE_BZIP2= yes
26	USE_REINPLACE= yes
27	USE_X_PREFIX= yes	25	USE_X_PREFIX= yes
28	USE_AUTOMAKE_VER=14	26	USE_REINPLACE= yes
29	AUTOMAKE_ARGS= --include-deps	27	GNU_CONFIGURE= yes
30	DEF_SERVER?= ${X11BASE}/bin/X	28	CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
31	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \	29	CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
32	-DCSRG_BASED -DHAS_SETUSERCONTEXT" \
33	LIBS="-L${LOCALBASE}/lib ${LIBPAM}" \
34	DEF_SERVER="${DEF_SERVER}"	30	DEF_SERVER="${DEF_SERVER}"
35	CONFIGURE_ARGS= --with-logdir=/var/log \	31	CONFIGURE_ARGS= --with-logdir=/var/log \
36	--with-runlockdir=/var/run \	32	--with-runlockdir=/var/run \
37	--with-wdmdir=${PREFIX}/lib/X11/wdm \	33	--with-wdmdir=${WDMDIR} \
		34	--with-gfxdir=${WDMDIR}/pixmaps \
		35	--with-nlsdir=${PREFIX}/share/locale \
38	--with-Logo=beastie.xpm \	36	--with-Logo=beastie.xpm \
39	--with-gfx-incs=${X11BASE}/include/WINGs \	37	--with-gfx-incs=${LOCALBASE}/include \
40	--with-gfx-libs=${X11BASE}/lib \	38	--with-gfx-libs=${LOCALBASE}/lib \
41	--with-defuserpath=/bin:/usr/bin:/sbin:/usr/sbin:${X11BASE}/bin:${LOCALBASE}/bin \	39	--with-defuserpath=/bin:/usr/bin:/sbin:/usr/sbin:${X11BASE}/bin:${LOCALBASE}/bin \
42	--with-defsystempath=/bin:/usr/bin:/sbin:/usr/sbin:${X11BASE}/bin \	40	--with-defsystempath=/bin:/usr/bin:/sbin:/usr/sbin:${X11BASE}/bin \
43	--with-wmlist=wmaker:afterstep:blackbox:ctwm:enlightenment:fvwm:fvwm2:fvwm95:olvwm:qvwm:tvtwm	41	--with-wmlist=wmaker:afterstep:blackbox:ctwm:enlightenment:fvwm:fvwm2:fvwm95:olvwm:qvwm:tvtwm
44		42
45	.include <bsd.port.pre.mk>	43	MAN1= wdm.1 wdmLogin.1
46		44
47	.if ${XFREE86_VERSION} == 4	45	CPPFLAGS= -I${LOCALBASE}/include -DCSRG_BASED -DHAS_SETUSERCONTEXT
48	CFLAGS+= -DHAVE_XINERAMA	46	LDFLAGS= -L${LOCALBASE}/lib
49	CONFIGURE_ENV+= LIBS="-Wl,-export-dynamic ${X11BASE}/lib/libXinerama.a"
50	.endif
51		47
52	MAN1= wdm.1 wdmLogin.1	48	DEF_SERVER?= ${X11BASE}/bin/X
		49
		50	WDMDIR= ${PREFIX}/lib/X11/wdm
53		51
54	DAEMONPICS= beastie.xpm daemon1-HQ-1280x960.jpg	52	DAEMONPICS= beastie.xpm daemon1-HQ-1280x960.jpg
55		53
		54	.include <bsd.port.pre.mk>
		55
56	.if ( ${OSVERSION} >= 500028 ) && !defined(WITHOUT_PAM)	56	.if ( ${OSVERSION} >= 500028 ) && !defined(WITHOUT_PAM)
57	WITH_PAM= yes	57	WITH_PAM= yes
58	.endif	58	CONFIGURE_ARGS+= --with-pamdir=${LOCALBASE}/etc/pam.d/
59
60	.if defined(WITH_PAM)
61	CONFIGURE_ARGS+= --enable-pam --with-pamdir=${LOCALBASE}/etc/pam.d/
62	LIBPAM= -lpam
63	PLIST_SUB+= PAM=""	59	PLIST_SUB+= PAM=""
64	.else	60	.else
65	PLIST_SUB+= PAM="@comment "	61	PLIST_SUB+= PAM="@comment "
		62	.endif
		63
		64	.if !defined(WITH_PAM)
		65	CONFIGURE_ARGS+= --disable-pam
		66	.endif
66		67
67	pre-everything::	68	pre-everything::
68	@${ECHO_MSG} "To build this port with PAM support, define \"WITH_PAM\"."	69	.if !defined(WITH_PAM)
		70	@${ECHO_MSG}
		71	@${ECHO_MSG} "If you want to compile with PAM support,"
		72	@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_PAM=yes\""
		73	@${ECHO_MSG}
69	.endif	74	.endif
70		75
71	post-patch:	76	post-patch:
72	@${REINPLACE_CMD} -e "s\|%%PREFIX%%\|${PREFIX}\|g" ${WRKSRC}/doc/*.man	77	@${REINPLACE_CMD} -e 's\|$$(DESTDIR)$$(PAMDIR)/wdm\|\|g ; \
		78	s\| -D \| \|g' ${WRKSRC}/Makefile.in
		79	@${REINPLACE_CMD} -e 's\|-ldl\|\|g ; \
		80	s\|/authdir\|\|g' ${WRKSRC}/configure
		81	@${REINPLACE_CMD} -e \
		82	's\|@FAILSAFE@\|@FAILSAFE_PATH@\|g' ${WRKSRC}/configs/Xsession.in
		83	@${REINPLACE_CMD} -e \
		84	's\|#configdir#\|${WDMDIR}\|g' ${WRKSRC}/doc/wdm.man.in
		85	@${REINPLACE_CMD} -e \
		86	's\|/etc/X11/wdm\|${WDMDIR}\|g' ${WRKSRC}/doc/wdmLogin.man
		87	@${REINPLACE_CMD} -e \
		88	's\|<malloc\.h>\|<stdlib.h>\|g' ${WRKSRC}/src/TestLogin/TestLogin.c
73		89
74	pre-install:	90	pre-install:
75	@if [ -e ${PREFIX}/lib/X11/wdm/wdm-config ]; then \	91	@${MKDIR} ${WDMDIR}/pixmaps
76	${MV} ${PREFIX}/lib/X11/wdm/wdm-config \	92	.if exists(${WDMDIR}/wdm-config)
77	${PREFIX}/lib/X11/wdm/wdm-config.preserve; \	93	${MV} ${WDMDIR}/wdm-config ${WDMDIR}/wdm-config.preserve
78	fi	94	.endif
79	@if [ -e ${PREFIX}/lib/X11/wdm/Xsetup_0 ]; then \	95	.if exists(${WDMDIR}/Xsetup_0)
80	${MV} ${PREFIX}/lib/X11/wdm/Xsetup_0 \	96	${MV} ${WDMDIR}/Xsetup_0 ${WDMDIR}/Xsetup_0.preserve
81	${PREFIX}/lib/X11/wdm/Xsetup_0.preserve; \	97	.endif
82	fi
83		98
84	post-install:	99	post-install:
85	@${CP} ${PREFIX}/lib/X11/wdm/wdm-config \	100	@${CP} ${WDMDIR}/wdm-config ${WDMDIR}/wdm-config.dist
86	${PREFIX}/lib/X11/wdm/wdm-config.dist	101	.if exists(${WDMDIR}/wdm-config.preserve)
87	@if [ -e ${PREFIX}/lib/X11/wdm/wdm-config.preserve ]; then \	102	${MV} ${WDMDIR}/wdm-config.preserve ${WDMDIR}/wdm-config
88	${MV} ${PREFIX}/lib/X11/wdm/wdm-config.preserve \	103	.endif
89	${PREFIX}/lib/X11/wdm/wdm-config; \	104	@${CP} ${WDMDIR}/Xsetup_0 ${WDMDIR}/Xsetup_0.dist
90	fi	105	.if exists(${WDMDIR}/Xsetup_0.preserve)
91	@${CP} ${PREFIX}/lib/X11/wdm/Xsetup_0 \	106	${MV} ${WDMDIR}/Xsetup_0.preserve ${WDMDIR}/Xsetup_0
92	${PREFIX}/lib/X11/wdm/Xsetup_0.dist	107	.endif
93	@if [ -e ${PREFIX}/lib/X11/wdm/Xsetup_0.preserve ]; then \
94	${MV} ${PREFIX}/lib/X11/wdm/Xsetup_0.preserve \
95	${PREFIX}/lib/X11/wdm/Xsetup_0; \
96	fi
97	.for file in ${DAEMONPICS}	108	.for file in ${DAEMONPICS}
98	@${INSTALL_DATA} ${_DISTDIR}/${file} ${PREFIX}/lib/X11/wdm/pixmaps	109	@${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${file} ${WDMDIR}/pixmaps
99	.endfor	110	.endfor
100	.if defined(WITH_PAM)	111	.if defined(WITH_PAM)
101	.if ( ${OSVERSION} >= 500028 )	112	.if ( ${OSVERSION} >= 500028 )
102	${INSTALL_DATA} ${FILESDIR}/wdm.pam ${LOCALBASE}/etc/pam.d/wdm	113	${INSTALL_DATA} ${FILESDIR}/wdm.pam ${LOCALBASE}/etc/pam.d/wdm
103	.else	114	.else
104	@${ECHO_CMD} "To finish installing this port, append the contents of ${FILESDIR}/wdm.pam to your /etc/pam.conf file"	115	@${ECHO_MSG} "To finish installing this port, append the contents of"
		116	@${ECHO_MSG} "${FILESDIR}/wdm.pam to your /etc/pam.conf file"
105	.endif	117	.endif
106	.endif	118	.endif
107		119

Lines 1-54 Link Here

(-)x11/wdm/files/patch-Login.c (-54 lines)
1	--- src/Login.c Tue Feb 29 06:17:01 2000
2	+++ src/Login.c.new Wed Apr 3 22:36:34 2002
3	@@ -24,6 +24,9 @@
4	#include <X11/xpm.h>
5	#include <X11/keysym.h>
6	#include <X11/cursorfont.h>
7	+#ifdef HAVE_XINERAMA
8	+#include <X11/extensions/Xinerama.h>
9	+#endif
10	#ifdef HAVE_X11_WINGS_H
11	#include <X11/WINGs.h>
12	#else
13	@@ -1195,6 +1198,10 @@
14	int main(int argc, char **argv)
15	{
16	WMScreen *scr;
17	+ int xine_count; int c;
18	+#ifdef HAVE_XINERAMA
19	+ XineramaScreenInfo *xine;
20	+#endif
21
22	ProgName = argv[0];
23
24	@@ -1210,8 +1217,28 @@
25	}
26
27	screen_number = DefaultScreen(dpy);
28	- screen_width = DisplayWidth(dpy,screen_number);
29	- screen_heigth = DisplayHeight(dpy,screen_number);
30	+#ifdef HAVE_XINERAMA
31	+ if (XineramaIsActive(dpy)) {
32	+ xine = XineramaQueryScreens(dpy, &xine_count);
33	+
34	+ if (xine != NULL) {
35	+ for (c = 0;c < xine_count;c++) {
36	+ if (xine[c].screen_number == 0) {
37	+ screen_width = xine[c].width;
38	+ screen_heigth = xine[c].height;
39	+ }
40	+ }
41	+ } else {
42	+ screen_width = DisplayWidth(dpy, screen_number);
43	+ screen_heigth = DisplayHeight(dpy, screen_number);
44	+ }
45	+ } else {
46	+#endif
47	+ screen_width = DisplayWidth(dpy,screen_number);
48	+ screen_heigth = DisplayHeight(dpy,screen_number);
49	+#ifdef HAVE_XINERAMA
50	+ }
51	+#endif
52	panel_X = (screen_width - panel_width)/2;
53	panel_Y = (screen_heigth - panel_heigth)/2;
54

Lines 1-25 Link Here

(-)x11/wdm/files/patch-ab (-25 lines)
1	--- src/config/wdm-config.in.orig Thu Sep 16 09:27:58 1999
2	+++ src/config/wdm-config.in Mon Dec 20 16:29:51 1999
3	@@ -3,7 +3,7 @@
4	! wdm configuration file input (sed in Makefile)
5	!
6	DisplayManager.errorLogFile: #logdir#/xdm-errors.log
7	-DisplayManager.pidFile: #rundir#/xdm-pid
8	+DisplayManager.pidFile: #rundir#/xdm.pid
9	DisplayManager.keyFile: #configdir#/xdm-keys
10	DisplayManager.servers: #configdir#/Xservers
11	DisplayManager.accessFile: #configdir#/Xaccess
12	@@ -25,11 +25,11 @@
13	! display screen background--if not set or set to none, then the
14	! background is not set by wdm.
15	! DisplayManager*wdmBg: none
16	-DisplayManager*wdmBg: solid:RoyalBlue
17	+! DisplayManager*wdmBg: solid:RoyalBlue
18	! DisplayManager*wdmBg: dgradient:RoyalBlue,FireBrick,Black
19	! DisplayManager*wdmBg: hgradient:RoyalBlue,FireBrick,Black
20	! DisplayManager*wdmBg: vgradient:RoyalBlue,FireBrick,Black
21	-! DisplayManager*wdmBg: pixmap:#configdir#/pixmaps/Stars.jpg
22	+DisplayManager*wdmBg: pixmap:#configdir#/pixmaps/daemon1-HQ-1280x960.jpg
23	!
24	! optional pixmap for logo
25	#pixmapcomment#DisplayManager*wdmLogo: #configdir#/pixmaps/#pixmapfile#

Lines 1-44 Link Here

(-)x11/wdm/files/patch-ag (-44 lines)
1	--- configure.in.orig Tue Feb 29 18:40:50 2000
2	+++ configure.in Thu Apr 11 03:33:45 2002
3	@@ -50,9 +50,10 @@
4	AM_CONDITIONAL(INSTALLPAM, test x$enable_pam = xyes)
5
6	if test "$enable_pam" = yes; then
7	- AC_CHECK_LIB(pam, main, [PASSWDLIB="-lpam -ldl"
8	+ AC_CHECK_LIB(pam, main, [PASSWDLIB="-lpam"
9	AC_DEFINE_UNQUOTED(HAVE_PAM_LIB)],
10	- [],-ldl)
11	+ [AC_CHECK_LIB(pam, main, [PASSWDLIB="-lpam -ldl"
12	+ AC_DEFINE_UNQUOTED(HAVE_PAM_LIB)],[],-ldl)])
13	fi
14
15	AC_ARG_WITH(pamdir,
16	@@ -66,6 +67,10 @@
17	AC_MSG_CHECKING(for pam directory $PAM_DIR_PATH)
18	if test -d "$PAM_DIR_PATH"; then
19	AC_MSG_RESULT(exists)
20	+ elif test -f "/etc/pam.conf"; then
21	+ AC_MSG_RESULT(using /etc/pam.conf)
22	+ PAMDIR=none
23	+ PAM_DIR_PATH=none
24	else
25	AC_MSG_RESULT(does not exist)
26	AC_MSG_WARN([this may not be a pam system <<--------------])
27	@@ -183,7 +188,7 @@
28
29	XLFLAGS="$X_LIBS"
30
31	-XLIBS="$X_EXTRA_LIBS -lXext -lXt -lX11 -lm"
32	+XLIBS="$X_PRE_LIBS $X_EXTRA_LIBS -lXext -lXt -lX11 -lm"
33
34	XDM_EXTRA_LIBS="-lXmu -lXau -lXdmcp"
35
36	@@ -504,7 +509,7 @@
37	AC_DEFINE_UNQUOTED(WDMDIR,"$DMDIR")
38	AC_DEFINE_UNQUOTED(DEF_XDM_CONFIG,"$DMDIR/wdm-config")
39	AC_DEFINE_UNQUOTED(DEF_CHOOSER,"$DMDIR/chooser")
40	-AC_DEFINE_UNQUOTED(DEF_AUTH_DIR,"$DMDIR/authdir")
41	+AC_DEFINE_UNQUOTED(DEF_AUTH_DIR,"$DMDIR")
42
43	AC_SUBST(DMDIR)
44

Lines 1-20 Link Here

(-)x11/wdm/files/patch-ai (-20 lines)
1	--- src/Greet.c.orig Tue Sep 21 23:16:21 1999
2	+++ src/Greet.c Wed Nov 3 08:03:00 1999
3	@@ -260,7 +260,7 @@
4	}
5
6	execle(wdmLogin, tmp, DisplayName,
7	- Wm, Logo, HelpFile, DefaultUser, Bg, Animate,
8	+ Wm, Logo, Bg, Animate, HelpFile, DefaultUser,
9	NULL, env);
10
11	LogError ("Greet cannot exec %s\n", wdmLogin);
12	@@ -405,7 +405,7 @@
13	"%s exit(%s) by %s\n",
14	PACKAGE, exitArg, name);
15	#endif
16	-#if 0
17	+#if 1
18	SessionExit (d, UNMANAGE_DISPLAY, FALSE);
19	#else
20	Debug ("Killing parent process %d\n", getppid());

Lines 1-13 Link Here

(-)x11/wdm/files/patch-al (-13 lines)
1	--- src/config/Makefile.am.orig Tue Sep 21 23:16:21 1999
2	+++ src/config/Makefile.am Thu Feb 24 01:44:12 2000
3	@@ -118,8 +118,8 @@
4
5	install-data-local:
6	if INSTALLPAM
7	- $(INSTALL) -d $(DESTDIR)$(PAMDIR)
8	- $(INSTALL) -m 644 $(srcdir)/wdm.pamd $(DESTDIR)$(PAMDIR)/wdm
9	+ [ x$(PAMDIR) = xnone ] \|\| $(INSTALL) -d $(DESTDIR)$(PAMDIR)
10	+ [ x$(PAMDIR) = xnone ] \|\| $(INSTALL) -m 644 $(srcdir)/wdm.pamd $(DESTDIR)$(PAMDIR)/wdm
11	else
12
13	endif

Lines 1-12 Link Here

(-)x11/wdm/files/patch-am (-12 lines)
1	--- src/TestLogin.c.orig Thu Jul 1 21:51:28 1999
2	+++ src/TestLogin.c Tue Mar 7 22:05:04 2000
3	@@ -67,7 +67,9 @@
4	#include <stdlib.h>
5	#include <string.h>
6	#include <signal.h>
7	+#ifndef __STDC__
8	#include <malloc.h>
9	+#endif
10
11
12	#define forever 1

Lines 1-21 Link Here

(-)x11/wdm/files/patch-an (-21 lines)
1	--- ./src/config/Makefile.in.orig Sun Oct 6 00:26:45 2002
2	+++ ./src/config/Makefile.in Sun Oct 6 00:25:36 2002
3	@@ -138,7 +138,6 @@
4	CLEANFILES = wdm-config Xsetup_0 Xservers Xservers.ws Xsession Xclients
5
6	EXTRA_DIST = \
7	- wdm.pamd \
8	$(configfiles_DATA) \
9	$(bin_SCRIPTS)
10
11	@@ -382,10 +381,6 @@
12	$(INSTALL) -m 600 $(srcdir)/wdm-config $(DESTDIR)$(configfilesdir)
13	$(INSTALL) -m 644 $(srcdir)/Xsession.in $(DESTDIR)$(configfilesdir)
14	$(INSTALL) -m 644 $(srcdir)/Xclients.in $(DESTDIR)$(configfilesdir)
15	-
16	-install-data-local:
17	-@INSTALLPAM_TRUE@ $(INSTALL) -d $(DESTDIR)$(PAMDIR)
18	-@INSTALLPAM_TRUE@ $(INSTALL) -m 644 $(srcdir)/wdm.pamd $(DESTDIR)$(PAMDIR)/wdm
19
20	uninstall-hook:
21	rm -fr $(DESTDIR)$(configfilesdir)/authdir

Line 0 Link Here

(-)x11/wdm/files/patch-configs::wdm-config.in (+25 lines)
	1	--- configs/wdm-config.in.orig Sun Jun 1 17:00:09 2003
	2	+++ configs/wdm-config.in Sun Jun 1 22:45:23 2003
	3	@@ -3,7 +3,7 @@
	4	! wdm configuration file input (sed in Makefile)
	5	!
	6	DisplayManager.errorLogFile: @LOGDIR@/xdm-errors.log
	7	-DisplayManager.pidFile: @RUNDIR@/xdm-pid
	8	+DisplayManager.pidFile: @RUNDIR@/xdm.pid
	9	DisplayManager.keyFile: @DMDIR@/xdm-keys
	10	DisplayManager.servers: @DMDIR@/Xservers
	11	DisplayManager.accessFile: @DMDIR@/Xaccess
	12	@@ -25,11 +25,11 @@
	13	! display screen background--if not set or set to none, then the
	14	! background is not set by wdm.
	15	! DisplayManager*wdmBg: none
	16	-DisplayManager*wdmBg: solid:RoyalBlue
	17	+! DisplayManager*wdmBg: solid:RoyalBlue
	18	! DisplayManager*wdmBg: dgradient:RoyalBlue,FireBrick,Black
	19	! DisplayManager*wdmBg: hgradient:RoyalBlue,FireBrick,Black
	20	! DisplayManager*wdmBg: vgradient:RoyalBlue,FireBrick,Black
	21	-! DisplayManager*wdmBg: pixmap:@GFXDIR@/Stars.jpg
	22	+DisplayManager*wdmBg: pixmap:@GFXDIR@/daemon1-HQ-1280x960.jpg
	23	!
	24	! optional pixmap for logo
	25	@PIXMAPCOMMENT@DisplayManager*wdmLogo: @GFXDIR@/@PIXMAPFILE@

Line 0 Link Here

(-)x11/wdm/files/patch-src::wdm::loghelpers.c (+24 lines)
	1	--- src/wdm/loghelpers.c.orig Sun Jun 1 17:00:09 2003
	2	+++ src/wdm/loghelpers.c Sun Jun 1 23:30:40 2003
	3	@@ -26,6 +26,21 @@
	4	#include <sys/wait.h>
	5	#include <unistd.h>
	6
	7	+#ifdef __FreeBSD__
	8	+static char *
	9	+wstrndup(const char *src, size_t size)
	10	+{
	11	+ char *dst;
	12	+
	13	+ dst = malloc(size + 1);
	14	+ if (dst == NULL)
	15	+ return (NULL);
	16	+ dst[size] = '\0';
	17	+ strncpy(dst, src, size);
	18	+ return (dst);
	19	+}
	20	+#endif
	21	+
	22	/*
	23	* Function that treats buffer as set of lines separated with '\n'
	24	* These lines will be directed to WDMLogMessage function with

Lines 11-17 Link Here

(-)x11/wdm/pkg-plist (-2 / +4 lines)
11	lib/X11/wdm/Xservers.ws	11	lib/X11/wdm/Xservers.ws
12	lib/X11/wdm/Xsession	12	lib/X11/wdm/Xsession
13	lib/X11/wdm/Xsession.XFree86	13	lib/X11/wdm/Xsession.XFree86
14	lib/X11/wdm/Xsession.in	14	lib/X11/wdm/Xsession.orig
15	@unexec if cmp -s %D/lib/X11/wdm/Xsetup_0.dist %D/lib/X11/wdm/Xsetup_0; then rm -f %D/lib/X11/wdm/Xsetup_0; fi	15	@unexec if cmp -s %D/lib/X11/wdm/Xsetup_0.dist %D/lib/X11/wdm/Xsetup_0; then rm -f %D/lib/X11/wdm/Xsetup_0; fi
16	lib/X11/wdm/Xsetup_0.dist	16	lib/X11/wdm/Xsetup_0.dist
17	@exec [ -f %D/lib/X11/wdm/Xsetup_0 ] \|\| (cp %D/lib/X11/wdm/Xsetup_0.dist %D/lib/X11/wdm/Xsetup_0)	17	@exec [ -f %D/lib/X11/wdm/Xsetup_0 ] \|\| (cp %D/lib/X11/wdm/Xsetup_0.dist %D/lib/X11/wdm/Xsetup_0)
Lines 19-25 Link Here
19	lib/X11/wdm/pixmaps/Earth.jpg	19	lib/X11/wdm/pixmaps/Earth.jpg
20	lib/X11/wdm/pixmaps/Earth200x130.xpm	20	lib/X11/wdm/pixmaps/Earth200x130.xpm
21	lib/X11/wdm/pixmaps/GnuLinux-logo.jpg	21	lib/X11/wdm/pixmaps/GnuLinux-logo.jpg
22	lib/X11/wdm/pixmaps/README
23	lib/X11/wdm/pixmaps/Stars.jpg	22	lib/X11/wdm/pixmaps/Stars.jpg
24	lib/X11/wdm/pixmaps/StarsLogo.jpg	23	lib/X11/wdm/pixmaps/StarsLogo.jpg
25	lib/X11/wdm/pixmaps/beastie.xpm	24	lib/X11/wdm/pixmaps/beastie.xpm
Lines 30-35 Link Here
30	@exec [ -f %D/lib/X11/wdm/wdm-config ] \|\| (cp %D/lib/X11/wdm/wdm-config.dist %D/lib/X11/wdm/wdm-config)	29	@exec [ -f %D/lib/X11/wdm/wdm-config ] \|\| (cp %D/lib/X11/wdm/wdm-config.dist %D/lib/X11/wdm/wdm-config)
31	lib/X11/wdm/wdm-config.in	30	lib/X11/wdm/wdm-config.in
32	lib/X11/wdm/wdmReconfig	31	lib/X11/wdm/wdmReconfig
		32	share/locale/de/LC_MESSAGES/wdm.mo
		33	share/locale/ja/LC_MESSAGES/wdm.mo
		34	share/locale/ru/LC_MESSAGES/wdm.mo
33	@unexec rmdir %D/lib/X11/wdm/pixmaps 2>/dev/null \|\| true	35	@unexec rmdir %D/lib/X11/wdm/pixmaps 2>/dev/null \|\| true
34	@exec mkdir -p %D/lib/X11/wdm/authdir	36	@exec mkdir -p %D/lib/X11/wdm/authdir
35	@unexec rmdir %D/lib/X11/wdm/authdir/authfiles 2>/dev/null \|\| true	37	@unexec rmdir %D/lib/X11/wdm/authdir/authfiles 2>/dev/null \|\| true