Update to 1.25.

PR:		ports/53108
Submitted by:	Ports Fury
Approved by:	maintainer timeout (1 month)

10 files changed, 49 insertions, 200 deletions

diff --git a/x11/wdm/files/patch-Login.c b/x11/wdm/files/patch-Login.c
deleted file mode 100644
index c4b13687859e..000000000000
--- a/x11/wdm/files/patch-Login.c
+++ /dev/null
@@ -1,54 +0,0 @@
---- 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;
- 
diff --git a/x11/wdm/files/patch-ab b/x11/wdm/files/patch-ab
deleted file mode 100644
index 6d853c9fabf1..000000000000
--- a/x11/wdm/files/patch-ab
+++ /dev/null
@@ -1,25 +0,0 @@
---- 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#
diff --git a/x11/wdm/files/patch-ad b/x11/wdm/files/patch-ad
deleted file mode 100644
index b76034668f45..000000000000
--- a/x11/wdm/files/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/wdmLogin.man.orig	Fri May 21 20:49:56 1999
-+++ doc/wdmLogin.man	Sat Jan  8 03:33:27 2000
-@@ -49,7 +49,7 @@
- to an image file (tiff, png, jpeg and xpm allowed) and it will be
- scaled to use the full screen.
- .SH FILES
--\fBwdmLogin\fP can be customized by modifying \fI/etc/X11/wdm/wdm-config\fP.
-+\fBwdmLogin\fP can be customized by modifying \fI%%PREFIX%%/lib/X11/wdm/wdm-config\fP.
- .SH SEE ALSO
- .BR wdm (1x)
- .SH AUTHOR
diff --git a/x11/wdm/files/patch-ag b/x11/wdm/files/patch-ag
deleted file mode 100644
index 12f7debaa0d2..000000000000
--- a/x11/wdm/files/patch-ag
+++ /dev/null
@@ -1,44 +0,0 @@
---- 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)
- 
diff --git a/x11/wdm/files/patch-ai b/x11/wdm/files/patch-ai
deleted file mode 100644
index a3531143f85d..000000000000
--- a/x11/wdm/files/patch-ai
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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());
diff --git a/x11/wdm/files/patch-al b/x11/wdm/files/patch-al
deleted file mode 100644
index 2e53dca3da4b..000000000000
--- a/x11/wdm/files/patch-al
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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
diff --git a/x11/wdm/files/patch-am b/x11/wdm/files/patch-am
deleted file mode 100644
index d3ed2e424271..000000000000
--- a/x11/wdm/files/patch-am
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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
diff --git a/x11/wdm/files/patch-an b/x11/wdm/files/patch-an
deleted file mode 100644
index 571985e4bc40..000000000000
--- a/x11/wdm/files/patch-an
+++ /dev/null
@@ -1,21 +0,0 @@
---- ./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
diff --git a/x11/wdm/files/patch-configs::wdm-config.in b/x11/wdm/files/patch-configs::wdm-config.in
new file mode 100644
index 000000000000..b42e5a5bddde
--- /dev/null
+++ b/x11/wdm/files/patch-configs::wdm-config.in
@@ -0,0 +1,25 @@
+--- 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@
diff --git a/x11/wdm/files/patch-src::wdm::loghelpers.c b/x11/wdm/files/patch-src::wdm::loghelpers.c
new file mode 100644
index 000000000000..ddaa4081d49d
--- /dev/null
+++ b/x11/wdm/files/patch-src::wdm::loghelpers.c
@@ -0,0 +1,24 @@
+--- 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