Date: Tue, 11 Feb 2003 00:30:50 +0900 From: KATO Tsuguru <tkato@prontomail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/48150: Update port: x11/wdm to 1.22 Message-ID: <20030211003050.3eabab32.tkato@prontomail.com>
next in thread | raw e-mail | index | archive | help
>Number: 48150 >Category: ports >Synopsis: Update port: x11/wdm to 1.22 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Feb 10 07:40:08 PST 2003 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 4.7-RELEASE-p4 i386 >Organization: >Environment: >Description: - Update to version 1.22 New file: files/patch-ao Remove file: files/patch-Login.c files/patch-al Following PRs should be superseded by this one: [2003/01/21] ports/47299 kris x11/wdm project moved, update MASTER_SITES and WWW [2002/07/02] ports/40124 kris Patch to wdm to allow long passwords >How-To-Repeat: >Fix: diff -urN /usr/ports/x11/wdm/Makefile x11/wdm/Makefile --- /usr/ports/x11/wdm/Makefile Fri Nov 1 22:10:51 2002 +++ x11/wdm/Makefile Mon Feb 10 20:27:45 2003 @@ -6,101 +6,102 @@ # PORTNAME= wdm -PORTVERSION= 1.20 -PORTREVISION= 3 +PORTVERSION= 1.22 CATEGORIES= x11 windowmaker -MASTER_SITES= http://www.tcscs.com/wdm/wdm/ \ +MASTER_SITES= http://voins.program.ru/wdm/ \ http://www.de.freebsd.org/de/gif/bsd/ \ ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= tg DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DAEMONPICS} EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} +DIST_SUBDIR= wdm MAINTAINER= kris@FreeBSD.org -LIB_DEPENDS= wraster.4:${PORTSDIR}/x11-wm/windowmaker \ - PropList.2:${PORTSDIR}/devel/libPropList +LIB_DEPENDS= wraster.4:${PORTSDIR}/x11-wm/windowmaker -DIST_SUBDIR= wdm -USE_REINPLACE= yes USE_X_PREFIX= yes -USE_AUTOMAKE_VER=14 -AUTOMAKE_ARGS= --include-deps -DEF_SERVER?= ${X11BASE}/bin/X -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \ - -DCSRG_BASED -DHAS_SETUSERCONTEXT" \ - LIBS="-L${LOCALBASE}/lib ${LIBPAM}" \ +USE_REINPLACE= yes +USE_AUTOCONF_VER= 253 +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \ DEF_SERVER="${DEF_SERVER}" CONFIGURE_ARGS= --with-logdir=/var/log \ --with-runlockdir=/var/run \ - --with-wdmdir=${PREFIX}/lib/X11/wdm \ + --with-wdmdir=${WDMDIR} \ + --with-nlsdir=${PREFIX}/share/locale \ --with-Logo=beastie.xpm \ - --with-gfx-incs=${X11BASE}/include/WINGs \ - --with-gfx-libs=${X11BASE}/lib \ + --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 -.include <bsd.port.pre.mk> +MAN1= wdm.1 wdmLogin.1 -.if ${XFREE86_VERSION} == 4 -CFLAGS+= -DHAVE_XINERAMA -CONFIGURE_ENV+= LIBS="-Wl,-export-dynamic ${X11BASE}/lib/libXinerama.a" -.endif +CPPFLAGS= -I${LOCALBASE}/include -DCSRG_BASED -DHAS_SETUSERCONTEXT +LDFLAGS= -L${LOCALBASE}/lib -MAN1= wdm.1 wdmLogin.1 +DEF_SERVER?= ${X11BASE}/bin/X + +WDMDIR= ${PREFIX}/lib/X11/wdm DAEMONPICS= beastie.xpm daemon1-HQ-1280x960.jpg -.if ( ${OSVERSION} >= 500028 ) && !defined(WITHOUT_PAM) -WITH_PAM= yes -.endif +.include <bsd.port.pre.mk> .if defined(WITH_PAM) -CONFIGURE_ARGS+= --enable-pam --with-pamdir=${LOCALBASE}/etc/pam.d/ -LIBPAM= -lpam +CONFIGURE_ARGS+= --enable-pam +.endif + +.if ( ${OSVERSION} >= 500028 ) && !defined(WITHOUT_PAM) +WITH_PAM= yes +CONFIGURE_ARGS+= --with-pamdir=${LOCALBASE}/etc/pam.d/ PLIST_SUB+= PAM="" .else PLIST_SUB+= PAM="@comment " +.endif pre-everything:: - @${ECHO_MSG} "To build this port with PAM support, define \"WITH_PAM\"." +.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|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/doc/*.man +.for file in wdmLogin.man wdm.man.in + @${REINPLACE_CMD} -e 's|#configdir#|${WDMDIR}|g' ${WRKSRC}/doc/${file} +.endfor pre-install: - @if [ -e ${PREFIX}/lib/X11/wdm/wdm-config ]; then \ - ${MV} ${PREFIX}/lib/X11/wdm/wdm-config \ - ${PREFIX}/lib/X11/wdm/wdm-config.preserve; \ - fi - @if [ -e ${PREFIX}/lib/X11/wdm/Xsetup_0 ]; then \ - ${MV} ${PREFIX}/lib/X11/wdm/Xsetup_0 \ - ${PREFIX}/lib/X11/wdm/Xsetup_0.preserve; \ - fi + @${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 post-install: - @${CP} ${PREFIX}/lib/X11/wdm/wdm-config \ - ${PREFIX}/lib/X11/wdm/wdm-config.dist - @if [ -e ${PREFIX}/lib/X11/wdm/wdm-config.preserve ]; then \ - ${MV} ${PREFIX}/lib/X11/wdm/wdm-config.preserve \ - ${PREFIX}/lib/X11/wdm/wdm-config; \ - fi - @${CP} ${PREFIX}/lib/X11/wdm/Xsetup_0 \ - ${PREFIX}/lib/X11/wdm/Xsetup_0.dist - @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 + @${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 .for file in ${DAEMONPICS} - @${INSTALL_DATA} ${_DISTDIR}/${file} ${PREFIX}/lib/X11/wdm/pixmaps + @${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_CMD} "To finish installing this port, append the contents of ${FILESDIR}/wdm.pam to your /etc/pam.conf file" + @${ECHO_CMD} "To finish installing this port, append the contents of" + @${ECHO_CMD} "${FILESDIR}/wdm.pam to your /etc/pam.conf file" .endif .endif diff -urN /usr/ports/x11/wdm/distinfo x11/wdm/distinfo --- /usr/ports/x11/wdm/distinfo Thu Apr 11 21:04:47 2002 +++ x11/wdm/distinfo Mon Feb 10 20:07:46 2003 @@ -1,3 +1,3 @@ -MD5 (wdm/wdm-1.20.tar.gz) = ad6e284113f72dcfce92cf6b1cba54fb +MD5 (wdm/wdm-1.22.tar.gz) = 98b20cfb47c9c18d1e2cfc782953494c MD5 (wdm/beastie.xpm) = 0891d7d8ac81514f10aafeb8f8a89ca2 MD5 (wdm/daemon1-HQ-1280x960.jpg) = b38f175cf6b7167484afac423837ed1a diff -urN /usr/ports/x11/wdm/files/patch-Login.c x11/wdm/files/patch-Login.c --- /usr/ports/x11/wdm/files/patch-Login.c Thu Apr 4 23:02:12 2002 +++ x11/wdm/files/patch-Login.c Thu Jan 1 09:00:00 1970 @@ -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 -urN /usr/ports/x11/wdm/files/patch-ab x11/wdm/files/patch-ab --- /usr/ports/x11/wdm/files/patch-ab Wed Dec 22 21:59:30 1999 +++ x11/wdm/files/patch-ab Sun Feb 2 20:07:54 2003 @@ -1,14 +1,14 @@ ---- 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 +--- configs/wdm-config.in.orig Mon Jan 6 04:29:16 2003 ++++ configs/wdm-config.in Sun Feb 2 20:07:39 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: #configdir#/xdm-keys - DisplayManager.servers: #configdir#/Xservers - DisplayManager.accessFile: #configdir#/Xaccess + 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. @@ -18,8 +18,8 @@ ! 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 +-! DisplayManager*wdmBg: pixmap:@DMDIR@/pixmaps/Stars.jpg ++DisplayManager*wdmBg: pixmap:@DMDIR@/pixmaps/daemon1-HQ-1280x960.jpg ! ! optional pixmap for logo - #pixmapcomment#DisplayManager*wdmLogo: #configdir#/pixmaps/#pixmapfile# + @PIXMAPCOMMENT@DisplayManager*wdmLogo: @DMDIR@/pixmaps/@PIXMAPFILE@ diff -urN /usr/ports/x11/wdm/files/patch-ad x11/wdm/files/patch-ad --- /usr/ports/x11/wdm/files/patch-ad Sat Jan 15 04:32:42 2000 +++ x11/wdm/files/patch-ad Mon Feb 10 20:10:43 2003 @@ -1,11 +1,11 @@ ---- 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 @@ +--- doc/wdmLogin.man.orig Mon Feb 10 01:13:25 2003 ++++ doc/wdmLogin.man Mon Feb 10 20:10:21 2003 +@@ -58,7 +58,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 ++\fBwdmLogin\fP can be customized by modifying \fI#configdir#/wdm-config\fP. + .SH ENVIRONMENT VARIABLES + Some variables that defines locale affects the look of wdmLogin. wdm program + will set LANG environment variable according to `wdmLocale' resource in wdm-config diff -urN /usr/ports/x11/wdm/files/patch-ag x11/wdm/files/patch-ag --- /usr/ports/x11/wdm/files/patch-ag Thu Apr 11 03:51:25 2002 +++ x11/wdm/files/patch-ag Sun Feb 2 20:16:13 2003 @@ -1,44 +1,31 @@ ---- 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") +--- configure.ac.orig Mon Jan 6 04:29:16 2003 ++++ configure.ac Sun Feb 2 20:15:38 2003 +@@ -83,13 +83,17 @@ + USE_PAM=yes + AC_MSG_RESULT([yes]) + AC_DEFINE(USE_PAM, 1, [Define if you want wdm to be compiiled with pam support]) +- AC_CHECK_LIB(pam, main, [PASSWDLIB="-lpam -ldl" ++ AC_CHECK_LIB(pam, main, [PASSWDLIB="-lpam" + AC_DEFINE_UNQUOTED(HAVE_PAM_LIB, 1, [Define if libpam is installed])], +- [],-ldl) ++ [AC_CHECK_LIB(pam, main, [PASSWDLIB="-lpam -ldl" ++ AC_DEFINE_UNQUOTED(HAVE_PAM_LIB, 1, [Define if libpam is installed])], ++ [],-ldl)]) + + AC_MSG_CHECKING(for pam directory $PAMDIR) + if test -d "$PAMDIR"; then + AC_MSG_RESULT(exists) ++ elif test -f "/etc/pam.conf"; then ++ AC_MSG_RESULT(using /etc/pam.conf) + else + AC_MSG_RESULT(does not exist) + AC_MSG_WARN([this may not be a pam system <<--------------]) +@@ -487,7 +491,7 @@ + AC_DEFINE_UNQUOTED(WDMDIR, "$DMDIR", [Value is a path to wdm directory]) + AC_DEFINE_UNQUOTED(DEF_XDM_CONFIG, "$DMDIR/wdm-config", [Value is a path to default wdm config file]) + AC_DEFINE_UNQUOTED(DEF_CHOOSER, "$DMDIR/chooser", [Value is a path to default chooser program]) +-AC_DEFINE_UNQUOTED(DEF_AUTH_DIR, "$DMDIR/authdir", [Value is a path to default authdir]) ++AC_DEFINE_UNQUOTED(DEF_AUTH_DIR, "$DMDIR", [Value is a path to default authdir]) AC_SUBST(DMDIR) diff -urN /usr/ports/x11/wdm/files/patch-ai x11/wdm/files/patch-ai --- /usr/ports/x11/wdm/files/patch-ai Tue Nov 9 21:45:59 1999 +++ x11/wdm/files/patch-ai Wed Feb 5 00:07:28 2003 @@ -1,5 +1,14 @@ ---- src/Greet.c.orig Tue Sep 21 23:16:21 1999 -+++ src/Greet.c Wed Nov 3 08:03:00 1999 +--- src/wdm/Greet.c.orig Mon Jan 6 04:29:16 2003 ++++ src/wdm/Greet.c Wed Feb 5 00:07:17 2003 +@@ -140,7 +140,7 @@ + extern int wdmAnimations; + + static int pipe_filedes[2]; +-static char name[128], password[128]; ++static char name[LOGNAME_LEN + 1], password[PASS_LEN + 1]; + static char xsessionArg[256], exitArg[256]; + + struct display *Save_d=NULL; @@ -260,7 +260,7 @@ } @@ -11,7 +20,7 @@ LogError ("Greet cannot exec %s\n", wdmLogin); @@ -405,7 +405,7 @@ "%s exit(%s) by %s\n", - PACKAGE, exitArg, name); + PACKAGE_NAME, exitArg, name); #endif -#if 0 +#if 1 diff -urN /usr/ports/x11/wdm/files/patch-al x11/wdm/files/patch-al --- /usr/ports/x11/wdm/files/patch-al Tue Mar 7 20:52:41 2000 +++ x11/wdm/files/patch-al Thu Jan 1 09:00:00 1970 @@ -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 -urN /usr/ports/x11/wdm/files/patch-am x11/wdm/files/patch-am --- /usr/ports/x11/wdm/files/patch-am Thu Jun 22 14:26:51 2000 +++ x11/wdm/files/patch-am Sun Feb 2 20:19:40 2003 @@ -1,5 +1,5 @@ ---- src/TestLogin.c.orig Thu Jul 1 21:51:28 1999 -+++ src/TestLogin.c Tue Mar 7 22:05:04 2000 +--- src/TestLogin/TestLogin.c.orig Mon Jan 6 04:29:16 2003 ++++ src/TestLogin/TestLogin.c Sun Feb 2 20:19:25 2003 @@ -67,7 +67,9 @@ #include <stdlib.h> #include <string.h> diff -urN /usr/ports/x11/wdm/files/patch-an x11/wdm/files/patch-an --- /usr/ports/x11/wdm/files/patch-an Sun Oct 6 17:12:06 2002 +++ x11/wdm/files/patch-an Mon Feb 10 20:13:23 2003 @@ -1,21 +1,207 @@ ---- ./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 +--- Makefile.in.orig Mon Feb 10 01:13:25 2003 ++++ Makefile.in Mon Feb 10 20:12:26 2003 +@@ -76,10 +76,10 @@ + + install-pam-no: + +-install-pam-yes: $(DESTDIR)$(PAMDIR)/wdm ++install-pam-yes: + + $(DESTDIR)$(DMDIR)/authdir: +- $(INSTALL) -m 700 -D -d $@ ++ $(INSTALL) -m 700 -d $@ + + all-doc: doc/wdm.man + +@@ -174,160 +174,160 @@ + $(CC) $(TestLogin_ldflags) src/TestLogin/TestLogin.o $(TestLogin_libs) -o bin/TestLogin + + $(DESTDIR)$(bindir)/TestLogin: bin/TestLogin +- $(INSTALL_PROGRAM) -D bin/TestLogin $@ ++ $(INSTALL_PROGRAM) bin/TestLogin $@ + + bin/wdm: src/wdm/Greet.o src/wdm/access.o src/wdm/auth.o src/wdm/choose.o src/wdm/daemon.o src/wdm/dm.o src/wdm/dpylist.o src/wdm/error.o src/wdm/file.o src/wdm/genauth.o src/wdm/mitauth.o src/wdm/netaddr.o src/wdm/policy.o src/wdm/protodpy.o src/wdm/reset.o src/wdm/resource.o src/wdm/server.o src/wdm/session.o src/wdm/socket.o src/wdm/streams.o src/wdm/util.o src/wdm/verify.o src/wdm/xdmcp.o + mkdir -p bin + $(CC) $(wdm_ldflags) src/wdm/Greet.o src/wdm/access.o src/wdm/auth.o src/wdm/choose.o src/wdm/daemon.o src/wdm/dm.o src/wdm/dpylist.o src/wdm/error.o src/wdm/file.o src/wdm/genauth.o src/wdm/mitauth.o src/wdm/netaddr.o src/wdm/policy.o src/wdm/protodpy.o src/wdm/reset.o src/wdm/resource.o src/wdm/server.o src/wdm/session.o src/wdm/socket.o src/wdm/streams.o src/wdm/util.o src/wdm/verify.o src/wdm/xdmcp.o $(wdm_libs) -o bin/wdm + + $(DESTDIR)$(bindir)/wdm: bin/wdm +- $(INSTALL_PROGRAM) -D bin/wdm $@ ++ $(INSTALL_PROGRAM) bin/wdm $@ + + bin/wdmLogin: src/wdmLogin/Login.o + mkdir -p bin + $(CC) $(wdmLogin_ldflags) src/wdmLogin/Login.o $(wdmLogin_libs) -o bin/wdmLogin + + $(DESTDIR)$(bindir)/wdmLogin: bin/wdmLogin +- $(INSTALL_PROGRAM) -D bin/wdmLogin $@ ++ $(INSTALL_PROGRAM) bin/wdmLogin $@ + + $(DESTDIR)$(MANDIR)/man1/wdmLogin.1: doc/wdmLogin.man +- $(INSTALL_DATA) -D doc/wdmLogin.man $@ ++ $(INSTALL_DATA) doc/wdmLogin.man $@ + + doc/wdm.man: doc/wdm.man.in + CONFIG_FILES=$@:doc/wdm.man.in CONFIG_HEADERS= ./config.status + + $(DESTDIR)$(MANDIR)/man1/wdm.1: doc/wdm.man +- $(INSTALL_DATA) -D doc/wdm.man $@ ++ $(INSTALL_DATA) doc/wdm.man $@ + + include/Eagle.xpm: pixmaps/Eagle.xpm + ln -s ../pixmaps/Eagle.xpm $@ + + $(DESTDIR)$(DMDIR)/pixmaps/Eagle.xpm: pixmaps/Eagle.xpm +- $(INSTALL_DATA) -D pixmaps/Eagle.xpm $@ ++ $(INSTALL_DATA) pixmaps/Eagle.xpm $@ + + $(DESTDIR)$(DMDIR)/pixmaps/Earth.jpg: pixmaps/Earth.jpg +- $(INSTALL_DATA) -D pixmaps/Earth.jpg $@ ++ $(INSTALL_DATA) pixmaps/Earth.jpg $@ + + include/Earth200x130.xpm: pixmaps/Earth200x130.xpm + ln -s ../pixmaps/Earth200x130.xpm $@ + + $(DESTDIR)$(DMDIR)/pixmaps/Earth200x130.xpm: pixmaps/Earth200x130.xpm +- $(INSTALL_DATA) -D pixmaps/Earth200x130.xpm $@ ++ $(INSTALL_DATA) pixmaps/Earth200x130.xpm $@ + + $(DESTDIR)$(DMDIR)/pixmaps/GnuLinux-logo.jpg: pixmaps/GnuLinux-logo.jpg +- $(INSTALL_DATA) -D pixmaps/GnuLinux-logo.jpg $@ ++ $(INSTALL_DATA) pixmaps/GnuLinux-logo.jpg $@ + + $(DESTDIR)$(DMDIR)/pixmaps/Stars.jpg: pixmaps/Stars.jpg +- $(INSTALL_DATA) -D pixmaps/Stars.jpg $@ ++ $(INSTALL_DATA) pixmaps/Stars.jpg $@ + + $(DESTDIR)$(DMDIR)/pixmaps/StarsLogo.jpg: pixmaps/StarsLogo.jpg +- $(INSTALL_DATA) -D pixmaps/StarsLogo.jpg $@ ++ $(INSTALL_DATA) pixmaps/StarsLogo.jpg $@ + + include/gnuLogo.xpm: pixmaps/gnuLogo.xpm + ln -s ../pixmaps/gnuLogo.xpm $@ + + $(DESTDIR)$(DMDIR)/pixmaps/gnuLogo.xpm: pixmaps/gnuLogo.xpm +- $(INSTALL_DATA) -D pixmaps/gnuLogo.xpm $@ ++ $(INSTALL_DATA) pixmaps/gnuLogo.xpm $@ + + po/ja.mo: po/ja.po + $(MSGFMT) -o $@ po/ja.po + + $(DESTDIR)$(NLSDIR)/ja/LC_MESSAGES/wdm.mo: po/ja.mo +- $(INSTALL_DATA) -D po/ja.mo $@ ++ $(INSTALL_DATA) po/ja.mo $@ + + po/ru.mo: po/ru.po + $(MSGFMT) -o $@ po/ru.po + + $(DESTDIR)$(NLSDIR)/ru/LC_MESSAGES/wdm.mo: po/ru.mo +- $(INSTALL_DATA) -D po/ru.mo $@ ++ $(INSTALL_DATA) po/ru.mo $@ + + $(DESTDIR)$(DMDIR)/GiveConsole: configs/GiveConsole +- $(INSTALL) -m 0755 -D configs/GiveConsole $@ ++ $(INSTALL) -m 0755 configs/GiveConsole $@ + + + $(DESTDIR)$(DMDIR)/TakeConsole: configs/TakeConsole +- $(INSTALL) -m 0755 -D configs/TakeConsole $@ ++ $(INSTALL) -m 0755 configs/TakeConsole $@ + + + $(DESTDIR)$(DMDIR)/Xaccess: configs/Xaccess +- $(INSTALL) -m 0644 -D configs/Xaccess $@ ++ $(INSTALL) -m 0644 configs/Xaccess $@ + + + $(DESTDIR)$(DMDIR)/Xresources: configs/Xresources +- $(INSTALL) -m 0644 -D configs/Xresources $@ ++ $(INSTALL) -m 0644 configs/Xresources $@ + + + $(DESTDIR)$(DMDIR)/Xservers.fs: configs/Xservers.fs +- $(INSTALL) -m 0644 -D configs/Xservers.fs $@ ++ $(INSTALL) -m 0644 configs/Xservers.fs $@ + + + $(DESTDIR)$(DMDIR)/Xsession.XFree86: configs/Xsession.XFree86 +- $(INSTALL) -m 0755 -D configs/Xsession.XFree86 $@ ++ $(INSTALL) -m 0755 configs/Xsession.XFree86 $@ + + + $(DESTDIR)$(DMDIR)/Xsession.orig: configs/Xsession.orig +- $(INSTALL) -m 0644 -D configs/Xsession.orig $@ ++ $(INSTALL) -m 0644 configs/Xsession.orig $@ + + + configs/Xclients: configs/Xclients.in + CONFIG_FILES=$@:configs/Xclients.in CONFIG_HEADERS= ./config.status + + $(DESTDIR)$(DMDIR)/Xclients: configs/Xclients +- $(INSTALL) -m 0755 -D configs/Xclients $@ ++ $(INSTALL) -m 0755 configs/Xclients $@ + + + configs/Xservers: configs/Xservers.in + CONFIG_FILES=$@:configs/Xservers.in CONFIG_HEADERS= ./config.status + + $(DESTDIR)$(DMDIR)/Xservers: configs/Xservers +- $(INSTALL) -m 0644 -D configs/Xservers $@ ++ $(INSTALL) -m 0644 configs/Xservers $@ + + + configs/Xservers.ws: configs/Xservers.ws.in + CONFIG_FILES=$@:configs/Xservers.ws.in CONFIG_HEADERS= ./config.status + + $(DESTDIR)$(DMDIR)/Xservers.ws: configs/Xservers.ws +- $(INSTALL) -m 0644 -D configs/Xservers.ws $@ ++ $(INSTALL) -m 0644 configs/Xservers.ws $@ + + + configs/Xsession: configs/Xsession.in + CONFIG_FILES=$@:configs/Xsession.in CONFIG_HEADERS= ./config.status + + $(DESTDIR)$(DMDIR)/Xsession: configs/Xsession +- $(INSTALL) -m 0755 -D configs/Xsession $@ ++ $(INSTALL) -m 0755 configs/Xsession $@ + + + configs/Xsetup_0: configs/Xsetup_0.in + CONFIG_FILES=$@:configs/Xsetup_0.in CONFIG_HEADERS= ./config.status + + $(DESTDIR)$(DMDIR)/Xsetup_0: configs/Xsetup_0 +- $(INSTALL) -m 0755 -D configs/Xsetup_0 $@ ++ $(INSTALL) -m 0755 configs/Xsetup_0 $@ + + + configs/wdm-config: configs/wdm-config.in + CONFIG_FILES=$@:configs/wdm-config.in CONFIG_HEADERS= ./config.status + + $(DESTDIR)$(DMDIR)/wdm-config: configs/wdm-config +- $(INSTALL) -m 0600 -D configs/wdm-config $@ ++ $(INSTALL) -m 0600 configs/wdm-config $@ + + + configs/wdmReconfig: configs/wdmReconfig.in + CONFIG_FILES=$@:configs/wdmReconfig.in CONFIG_HEADERS= ./config.status + + $(DESTDIR)$(DMDIR)/wdmReconfig: configs/wdmReconfig +- $(INSTALL) -m 0755 -D configs/wdmReconfig $@ ++ $(INSTALL) -m 0755 configs/wdmReconfig $@ + + + $(DESTDIR)$(PAMDIR)/wdm: configs/wdm.pamd +- $(INSTALL) -m 0644 -D configs/wdm.pamd $@ ++ $(INSTALL) -m 0644 configs/wdm.pamd $@ + + + $(DESTDIR)$(DMDIR)/wdm-config.in: configs/wdm-config.in +- $(INSTALL) -m 0644 -D configs/wdm-config.in $@ ++ $(INSTALL) -m 0644 configs/wdm-config.in $@ + + + $(DESTDIR)$(DMDIR)/Xclients.in: configs/Xclients.in +- $(INSTALL) -m 0644 -D configs/Xclients.in $@ ++ $(INSTALL) -m 0644 configs/Xclients.in $@ + + - uninstall-hook: - rm -fr $(DESTDIR)$(configfilesdir)/authdir diff -urN /usr/ports/x11/wdm/files/patch-ao x11/wdm/files/patch-ao --- /usr/ports/x11/wdm/files/patch-ao Thu Jan 1 09:00:00 1970 +++ x11/wdm/files/patch-ao Sun Feb 2 22:36:12 2003 @@ -0,0 +1,11 @@ +--- configs/Xsession.in.orig Mon Jan 6 04:29:16 2003 ++++ configs/Xsession.in Sun Feb 2 22:36:02 2003 +@@ -16,7 +16,7 @@ + 1) + case $1 in + failsafe) +- exec @FAILSAFE@ -geometry 80x24-0-0 ++ exec @FAILSAFE_PATH@ -geometry 80x24-0-0 + ;; + esac + echo $1 >$HOME/.wm_style diff -urN /usr/ports/x11/wdm/pkg-descr x11/wdm/pkg-descr --- /usr/ports/x11/wdm/pkg-descr Sun Apr 30 08:52:55 2000 +++ x11/wdm/pkg-descr Tue Feb 4 21:19:17 2003 @@ -7,4 +7,4 @@ preserved (XFree86 3.3.2.3) with the Login interface based on a WINGs implementation using Tom Rothamel's "external greet" interface. -WWW: http://www.tcscs.com/wdm/ +WWW: http://voins.program.ru/wdm/ diff -urN /usr/ports/x11/wdm/pkg-plist x11/wdm/pkg-plist --- /usr/ports/x11/wdm/pkg-plist Mon Oct 7 20:21:34 2002 +++ x11/wdm/pkg-plist Mon Feb 10 20:41:41 2003 @@ -11,7 +11,7 @@ lib/X11/wdm/Xservers.ws lib/X11/wdm/Xsession lib/X11/wdm/Xsession.XFree86 -lib/X11/wdm/Xsession.in +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) @@ -19,7 +19,6 @@ 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 @@ -30,6 +29,8 @@ @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/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 >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports-bugs" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030211003050.3eabab32.tkato>