Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 9 Jan 2005 21:48:33 +0100 (CET)
From:      Tobias Roth <ports@fsck.ch>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/76010: x11/login.app : update and take maintainership
Message-ID:  <200501092048.j09KmX9d022387@secure.socket.ch>
Resent-Message-ID: <200501092050.j09KoNWY027534@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         76010
>Category:       ports
>Synopsis:       x11/login.app : update and take maintainership
>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:   Sun Jan 09 20:50:23 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Tobias Roth
>Release:        FreeBSD 5.3-STABLE i386
>Organization:
>Environment:
System: FreeBSD localhost 5.3-STABLE FreeBSD 5.3-STABLE #8: Tue Dec 14 07:43:17 CET 2004     roth@localhost:/opt/obj/usr/src/sys/FOOBAR  i386

>Description:
		This updates x11/login.app from 2.0.0.a7_1 to 2.1.1 and
		transmits maintainership from ports@freebsd.org to me.

		Added files:
			Login.app.sh
			patch-Preferences
			patch-Scripts::Login.root
			patch-Scripts::Login.user
			patch-Scripts::Logout.root
			patch-Scripts::PowerOff
			patch-Scripts::Startup
			patch-Scripts::Suspend
			patch-src::config.h
			patch-src::preferences.h
			patch-src::switchuser.c
			
		Deleted files:
			patch-aa
			patch-ac
			patch-ae
			patch-af
			patch-ah
			patch-ai
			patch-aj
			patch-ak
			patch-al
			patch-am
			patch-an
			patch-ao
			patch-ap
			patch-aq
			patch-graphics.c
			patch-panel.c

>How-To-Repeat:
>Fix:
diff -ruN login.app.orig/Makefile login.app/Makefile
--- login.app.orig/Makefile	Wed Feb  4 06:09:47 2004
+++ login.app/Makefile	Sun Jan  9 18:12:37 2005
@@ -6,39 +6,57 @@
 #
 
 PORTNAME=	login.app
-PORTVERSION=	2.0.0.a7
-PORTREVISION=	1
+PORTVERSION=	2.1.1
 CATEGORIES=	x11 windowmaker
-MASTER_SITES=	${MASTER_SITE_LOCAL} \
-		http://wm.current.nu/files/Login.app/ \
-		http://wm.current.nu/files/Login.app/Themes/
-MASTER_SITE_SUBDIR=	sobomax
-DISTFILES=	Login.app-${PORTVERSION:S/.a/-Alpha-/}${EXTRACT_SUFX} \
-		Drone${EXTRACT_SUFX}
+MASTER_SITES=	http://largo.windowmaker.org/files/Login.app/ \
+		http://depot.fsck.ch/mirror/distfiles/
+DISTFILES=	Login.app-${PORTVERSION}${EXTRACT_SUFX}
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Nice looking login interface to your favorite X-Server
+MAINTAINER=	ports@fsck.ch
+COMMENT=	Graphical login interface for X that is themable
 
 LIB_DEPENDS=	wraster.4:${PORTSDIR}/x11-wm/windowmaker \
 		PropList.2:${PORTSDIR}/devel/libPropList
 
 WRKSRC=		${WRKDIR}/Login.app-${PORTVERSION:S/.a/-Alpha-/}
 
-USE_PERL5_BUILD=yes
 USE_X_PREFIX=	yes
-USE_XPM=	yes
-MAKE_ENV=	MKDIR="${MKDIR}"
-
-ALL_TARGET=	Login
+HAS_CONFIGURE=  yes
+CONFIGURE_ARGS= --prefix=${PREFIX}
+USE_GMAKE=	yes
+USE_REINPLACE=	yes
+
+pre-configure:
+	@${REINPLACE_CMD} -e \
+		's|GNUstep/Applications|GNUstep/Apps|' \
+		${WRKSRC}/Makefile.am \
+		${WRKSRC}/Makefile.in \
+		${WRKSRC}/Scripts/Makefile.am \
+		${WRKSRC}/Scripts/Makefile.in \
+		${WRKSRC}/Themes/Linux/Makefile.am \
+		${WRKSRC}/Themes/Linux/Makefile.in \
+		${WRKSRC}/Themes/GNUstep/Makefile.am \
+		${WRKSRC}/Themes/GNUstep/Makefile.in \
+		${WRKSRC}/Themes/Drone/Makefile.in \
+		${WRKSRC}/Themes/Drone/Makefile.am \
+		${WRKSRC}/src/Makefile.in \
+		${WRKSRC}/src/Makefile.am
 
 post-configure:
-	@cd ${WRKSRC} && ${PERL} -pi -e 's|%%X11BASE%%|${X11BASE}|g ; \
-		s|%%LOCALBASE%%|${LOCALBASE}|g' preferences.h Scripts/Login.user \
-		Scripts/Login.root Scripts/Logout.root Scripts/Startup \
-		Preferences config.h
+	@${REINPLACE_CMD} -e \
+		's|%%X11BASE%%|${X11BASE}|; \
+		s|%%LOCALBASE%%|${LOCALBASE}|' \
+		${WRKSRC}/Scripts/Login.user \
+		${WRKSRC}/Scripts/Login.root \
+		${WRKSRC}/Scripts/Logout.root \
+		${WRKSRC}/Scripts/Startup \
+		${WRKSRC}/Preferences \
+		${WRKSRC}/src/config.h \
+		${WRKSRC}/src/preferences.h
 
 post-install:
-	@(cd ${WRKDIR} && ${TAR} --exclude "*.orig" -c -f - Drone) \
-		| (cd ${PREFIX}/GNUstep/Apps/Login.app/Themes && ${TAR} --unlink -x -f -)
+	@${SED} 's|%%X11BASE%%|${PREFIX}|' \
+                ${FILESDIR}/loginapp.sh > ${PREFIX}/etc/rc.d/loginapp.sh
+	@${CHMOD} ${BINMODE} ${PREFIX}/etc/rc.d/loginapp.sh
 
 .include <bsd.port.mk>
diff -ruN login.app.orig/distinfo login.app/distinfo
--- login.app.orig/distinfo	Thu Jan 29 17:13:00 2004
+++ login.app/distinfo	Sat Jan  8 17:10:08 2005
@@ -1,4 +1,4 @@
-MD5 (Login.app-2.0.0-Alpha-7.tar.gz) = 97101446a0fe23e7b528160290126b9e
-SIZE (Login.app-2.0.0-Alpha-7.tar.gz) = 287088
+MD5 (Login.app-2.1.1.tar.gz) = 4d85cbdc505a94f7fbfe37bd0a709e75
+SIZE (Login.app-2.1.1.tar.gz) = 421070
 MD5 (Drone.tar.gz) = 5dd4a22bd23ffe8d66a3a86fb70e502b
 SIZE (Drone.tar.gz) = 51765
diff -ruN login.app.orig/files/loginapp.sh login.app/files/loginapp.sh
--- login.app.orig/files/loginapp.sh	Thu Jan  1 01:00:00 1970
+++ login.app/files/loginapp.sh	Sun Jan  9 18:12:02 2005
@@ -0,0 +1,24 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: login_app
+# REQUIRE: LOGIN
+
+# Add the following line to /etc/rc.conf to enable login.app:
+#
+# login_app_enable="YES"
+#
+# DO NOT CHANGE THESE DEFAULT VALUES HERE
+
+login_app_enable=${login_app_enable-"NO"}
+
+. /etc/rc.subr
+
+name="login_app"
+rcvar=`set_rcvar`
+command="%%X11BASE%%/GNUstep/Apps/Login.app/Login"
+
+load_rc_config $name
+run_rc_command "$1"
diff -ruN login.app.orig/files/patch-Preferences login.app/files/patch-Preferences
--- login.app.orig/files/patch-Preferences	Thu Jan  1 01:00:00 1970
+++ login.app/files/patch-Preferences	Sat Jan  8 18:36:27 2005
@@ -0,0 +1,11 @@
+--- Preferences.orig	Sat Jan  8 18:18:14 2005
++++ Preferences	Sat Jan  8 18:19:05 2005
+@@ -5,7 +5,7 @@
+   ConfirmRestartMessage = "Do you really want to restart the computer (y/n)?";
+   ConfirmPowerOffMessage = "Do you really want to turn off the computer (y/n)?";
+ 
+-  XServer = "/usr/X11R6/bin/X -nolisten tcp";
++  XServer = "%%X11BASE%%/bin/X -nolisten tcp";
+   Theme = "Drone";
+ 
+   DisableWelcomeMessage = Yes;
diff -ruN login.app.orig/files/patch-Scripts::Login.root login.app/files/patch-Scripts::Login.root
--- login.app.orig/files/patch-Scripts::Login.root	Thu Jan  1 01:00:00 1970
+++ login.app/files/patch-Scripts::Login.root	Sat Jan  8 20:49:59 2005
@@ -0,0 +1,21 @@
+--- Scripts/Login.root.orig	Sat Jan  8 20:48:19 2005
++++ Scripts/Login.root	Sat Jan  8 20:47:48 2005
+@@ -1,15 +1,15 @@
+ #!/bin/sh
+ 
+-PATH="/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin"
++PATH="/sbin:/usr/sbin:/bin:/usr/bin:%%LOCALBASE%%/bin:%%X11BASE%%/bin"
+ 
+ #
+ # Make user the owner of /dev/console.
+ #
+-#chown $USER /dev/console
++#/usr/sbin/chown $USER /dev/console
+ 
+ #
+ # Add user to utmp/wtmp.
+ #
+-sessreg -a -w /var/log/wtmp -u /var/run/utmp -l "$DISPLAY" $USER
++%%X11BASE%%/bin/sessreg -a -w /var/log/wtmp -u /var/run/utmp -l "$DISPLAY" $USER
+ 
+ # End of file
diff -ruN login.app.orig/files/patch-Scripts::Login.user login.app/files/patch-Scripts::Login.user
--- login.app.orig/files/patch-Scripts::Login.user	Thu Jan  1 01:00:00 1970
+++ login.app/files/patch-Scripts::Login.user	Sat Jan  8 18:45:46 2005
@@ -0,0 +1,46 @@
+--- Scripts/Login.user.orig	Sat Jan  8 18:41:35 2005
++++ Scripts/Login.user	Sat Jan  8 18:45:07 2005
+@@ -1,32 +1,32 @@
+ #!/bin/sh
+ 
+-PATH="/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin"
++PATH="/bin:/usr/bin:%%LOCALBASE%%/bin:%%X11BASE%%/bin"
+ 
+ #
+ # Try to find the user's init script for X.
+ #   1) Look for ~/.xinitrc
+ #   2) Look for ~/.xsession
+ #   3) Look for ~/.Xclients
+-#   4) Look for /etc/X11/xinit/xinitrc
+-#   5) Look for /usr/X11R6/bin/twm
+-#   6) Look for /usr/X11R6/bin/xterm
++#   4) Look for %%X11BASE%%/lib/X11/xinit/xinitrc
++#   5) Look for %%X11BASE%%/bin/twm
++#   6) Look for %%X11BASE%%/bin/xterm
+ #
+ 
+ xinitrc=$HOME/.xinitrc
+ xsession=$HOME/.xsession
+ xclients=$HOME/.Xclients
+-systemxinitrc=/etc/X11/xinit/xinitrc
+-twm=/usr/X11R6/bin/twm
+-xterm=/usr/X11R6/bin/xterm
++systemxinitrc=%%X11BASE%%/lib/X11/xinit/xinitrc
++twm=%%X11BASE%%/bin/twm
++xterm=%%X11BASE%%/bin/xterm
+ 
+ if [ -r $xinitrc ]; then
+-	exec sh -login $xinitrc
++	exec sh $xinitrc
+ elif [ -r $xsession ]; then
+-	exec sh -login $xsession
++	exec sh $xsession
+ elif [ -r $xclients ]; then
+-	exec sh -login $xclients
++	exec sh $xclients
+ elif [ -r $systemxinitrc ]; then
+-	exec sh -login $systemxinitrc
++	exec sh $systemxinitrc
+ elif [ -x $twm ]; then
+ 	exec $twm
+ elif [ -x $xterm ]; then
diff -ruN login.app.orig/files/patch-Scripts::Logout.root login.app/files/patch-Scripts::Logout.root
--- login.app.orig/files/patch-Scripts::Logout.root	Thu Jan  1 01:00:00 1970
+++ login.app/files/patch-Scripts::Logout.root	Sat Jan  8 20:50:14 2005
@@ -0,0 +1,31 @@
+--- Scripts/Logout.root.orig	Sat Jan  8 20:48:25 2005
++++ Scripts/Logout.root	Sat Jan  8 20:47:48 2005
+@@ -1,23 +1,23 @@
+ #!/bin/sh
+ 
+-PATH="/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin"
++PATH="/sbin:/usr/sbin:/bin:/usr/bin:%%LOCALBASE%%/bin:%%X11BASE%%/bin"
+ 
+ #
+ # Remove the _MOTIF_DRAG_WINDOW property from the root
+ # window. This will prevent some Motif applications from
+ # crashing the next time they are started.
+ #
+-xprop -root -remove _MOTIF_DRAG_WINDOW
++%%X11BASE%%/bin/xprop -root -remove _MOTIF_DRAG_WINDOW
+ 
+ #
+ # Remove user from utmp/wtmp.
+ #
+-sessreg -d -w /var/log/wtmp -u /var/run/utmp -l "$DISPLAY" $USER
++%%X11BASE%%/bin/sessreg -d -w /var/log/wtmp -u /var/run/utmp -l "$DISPLAY" $USER
+ 
+ #
+ # Make root the owner of /dev/console. 
+ #
+-#chmod 622 /dev/console
+-#chown root /dev/console
++#/bin/chmod 622 /dev/console
++#/usr/sbin/chown root /dev/console
+ 
+ # End of file
diff -ruN login.app.orig/files/patch-Scripts::PowerOff login.app/files/patch-Scripts::PowerOff
--- login.app.orig/files/patch-Scripts::PowerOff	Thu Jan  1 01:00:00 1970
+++ login.app/files/patch-Scripts::PowerOff	Sat Jan  8 18:40:15 2005
@@ -0,0 +1,10 @@
+--- Scripts/PowerOff.orig	Sat Jan  8 18:39:45 2005
++++ Scripts/PowerOff	Sat Jan  8 18:39:51 2005
+@@ -3,6 +3,6 @@
+ #
+ # Take the system down for halt.
+ #
+-/sbin/shutdown -h now
++/sbin/shutdown -p now
+ 
+ # End of file
diff -ruN login.app.orig/files/patch-Scripts::Startup login.app/files/patch-Scripts::Startup
--- login.app.orig/files/patch-Scripts::Startup	Thu Jan  1 01:00:00 1970
+++ login.app/files/patch-Scripts::Startup	Sat Jan  8 18:48:14 2005
@@ -0,0 +1,15 @@
+--- Scripts/Startup.orig	Sat Jan  8 18:46:15 2005
++++ Scripts/Startup	Sat Jan  8 18:47:45 2005
+@@ -1,10 +1,10 @@
+ #!/bin/sh
+ 
+-PATH="/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin"
++PATH="/bin:/usr/bin:%%LOCALBASE%%/bin:%%X11BASE%%/bin"
+ 
+ #
+ # Set cursor for the root window.
+ #
+-xsetroot -solid "#000000" -cursor_name left_ptr
++%%X11BASE%%/bin/xsetroot -solid "#000000" -cursor_name left_ptr
+ 
+ # End of file
diff -ruN login.app.orig/files/patch-Scripts::Suspend login.app/files/patch-Scripts::Suspend
--- login.app.orig/files/patch-Scripts::Suspend	Thu Jan  1 01:00:00 1970
+++ login.app/files/patch-Scripts::Suspend	Sat Jan  8 20:46:26 2005
@@ -0,0 +1,22 @@
+--- Scripts/Suspend.orig	Sat Jan  8 18:57:32 2005
++++ Scripts/Suspend	Sat Jan  8 20:45:56 2005
+@@ -4,8 +4,17 @@
+ # Suspend the system, can be handy if you are
+ # using a laptop computer.
+ #
+-if [ apm_available -a -x /usr/bin/apm ]; then
+-    /usr/bin/apm --suspend
++
++apm_out=` /usr/sbin/apm -s 2> /dev/null `
++sysctl_out=` /sbin/sysctl hw.acpi.suspend_state 2> /dev/null `
++suspend_state=` expr "//$sysctl_out" : '.*hw.acpi.suspend_state:.*\(S.*\)' `
++
++if [ -n "$suspend_state" ] ; then
++        /usr/sbin/acpiconf -s $suspend_state
++elif [ -e "/dev/apm" -a -n "$apm_out" ] ; then
++        if [ $apm_out -eq 1 ] ; then
++                /usr/sbin/apm -z
++        fi
+ fi
+ 
+ # End of file
diff -ruN login.app.orig/files/patch-aa login.app/files/patch-aa
--- login.app.orig/files/patch-aa	Thu Dec 14 10:01:22 2000
+++ login.app/files/patch-aa	Thu Jan  1 01:00:00 1970
@@ -1,49 +0,0 @@
---- Makefile.orig	Sun Nov 12 06:54:45 2000
-+++ Makefile	Thu Dec 14 10:50:15 2000
-@@ -3,7 +3,7 @@
- #
- 
- # Directory where Login.app will be installed
--INSTALL_DIR = /usr/local/GNUstep/Apps/Login.app
-+INSTALL_DIR = ${PREFIX}/GNUstep/Apps/Login.app
- 
- # Use shadow passwords, comment out to disable
- SHADOW = -DSHADOW_PASSWD
-@@ -13,8 +13,10 @@
- 
- INSTALL = /usr/bin/install -c
- CC = cc
--CFLAGS += -Wall -pedantic -D_GNU_SOURCE `get-wraster-flags --cflags` $(SHADOW)
--LDFLAGS += `get-wraster-flags --ldflags` `get-wraster-flags --libs` -lXmu -lPropList -lcrypt
-+WRASTER_CFLAGS != ${X11BASE}/bin/get-wraster-flags --cflags
-+WRASTER_LDFLAGS != ${X11BASE}/bin/get-wraster-flags --ldflags --libs
-+CFLAGS += -Wall -pedantic -D_GNU_SOURCE $(WRASTER_CFLAGS) $(SHADOW)
-+LDFLAGS += $(WRASTER_LDFLAGS) -lXmu -lPropList -lcrypt
- 
- TARGET = Login
- 
-@@ -61,16 +63,14 @@
- 	rm -rf $(TARGET) $(OBJS) core `find -name \*~`
- 
- install: $(TARGET)
--	$(INSTALL) -d $(INSTALL_DIR)
--	$(INSTALL) -d $(INSTALL_DIR)/Scripts
--	$(INSTALL) -d $(INSTALL_DIR)/Themes
--	$(INSTALL) -d $(INSTALL_DIR)/Themes/Linux
--	$(INSTALL) -d $(INSTALL_DIR)/Themes/GNUstep
--	$(INSTALL) -s $(TARGET) $(INSTALL_DIR)
--	$(INSTALL) -m 644 Preferences $(INSTALL_DIR)/Preferences
--	$(INSTALL) $(SCRIPTS) $(INSTALL_DIR)/Scripts/
--	$(INSTALL) -m 644 $(THEME_LINUX) $(INSTALL_DIR)/Themes/Linux/
--	$(INSTALL) -m 644 $(THEME_GNUSTEP) $(INSTALL_DIR)/Themes/GNUstep/
-+	$(MKDIR) $(INSTALL_DIR)/Scripts
-+	$(MKDIR) $(INSTALL_DIR)/Themes/Linux
-+	$(MKDIR) $(INSTALL_DIR)/Themes/GNUstep
-+	$(BSD_INSTALL_PROGRAM) $(TARGET) $(INSTALL_DIR)
-+	$(BSD_INSTALL_DATA) Preferences $(INSTALL_DIR)/Preferences
-+	$(BSD_INSTALL_SCRIPT) $(SCRIPTS) $(INSTALL_DIR)/Scripts/
-+	$(BSD_INSTALL_DATA) $(THEME_LINUX) $(INSTALL_DIR)/Themes/Linux/
-+	$(BSD_INSTALL_DATA) $(THEME_GNUSTEP) $(INSTALL_DIR)/Themes/GNUstep/
- 
- uninstall:
- 	rm -rf $(INSTALL_DIR)
diff -ruN login.app.orig/files/patch-ac login.app/files/patch-ac
--- login.app.orig/files/patch-ac	Thu Dec 14 10:01:22 2000
+++ login.app/files/patch-ac	Thu Jan  1 01:00:00 1970
@@ -1,25 +0,0 @@
---- switchuser.c	2000/12/13 19:53:23	1.1
-+++ switchuser.c	2000/12/13 20:23:40
-@@ -77,7 +77,7 @@
-    char*  correct;
-    struct passwd *pw;
- #ifdef SHADOW_PASSWD
--   struct spwd* sp;
-+   struct passwd* sp;
- #endif
- 
-    pw = getpwnam(username);
-@@ -87,10 +87,10 @@
-    }
- 
- #ifdef SHADOW_PASSWD
--   sp = getspnam(pw->pw_name);    
--   endspent();
-+   sp = getpwnam(pw->pw_name);    
-+   endpwent();
-    if(sp) {
--      correct = sp->sp_pwdp;
-+      correct = sp->pw_passwd;
-    }
-    else
- #endif
diff -ruN login.app.orig/files/patch-ae login.app/files/patch-ae
--- login.app.orig/files/patch-ae	Thu Dec 14 10:01:22 2000
+++ login.app/files/patch-ae	Thu Jan  1 01:00:00 1970
@@ -1,46 +0,0 @@
---- Scripts/Login.user.orig	Sat Nov 11 09:24:21 2000
-+++ Scripts/Login.user	Thu Dec 14 10:43:08 2000
-@@ -1,32 +1,32 @@
- #!/bin/sh
- 
--PATH="/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin"
-+PATH="/bin:/usr/bin:%%LOCALBASE%%/bin:%%X11BASE%%/bin"
- 
- #
- # Try to find the user's init script for X.
- #   1) Look for ~/.xinitrc
- #   2) Look for ~/.xsession
- #   3) Look for ~/.Xclients
--#   4) Look for /etc/X11/xinit/xinitrc
--#   5) Look for /usr/X11R6/bin/twm
--#   6) Look for /usr/X11R6/bin/xterm
-+#   4) Look for %%X11BASE%%/lib/X11/xinit/xinitrc
-+#   5) Look for %%X11BASE%%/bin/twm
-+#   6) Look for %%X11BASE%%/bin/xterm
- #
- 
- xinitrc=$HOME/.xinitrc
- xsession=$HOME/.xsession
- xclients=$HOME/.Xclients
--systemxinitrc=/etc/X11/xinit/xinitrc
--twm=/usr/X11R6/bin/twm
--xterm=/usr/X11R6/bin/xterm
-+systemxinitrc=%%X11BASE%%/lib/X11/xinit/xinitrc
-+twm=%%X11BASE%%/bin/twm
-+xterm=%%X11BASE%%/bin/xterm
- 
- if [ -r $xinitrc ]; then
--	exec sh -login $xinitrc
-+	exec sh $xinitrc
- elif [ -r $xsession ]; then
--	exec sh -login $xsession
-+	exec sh $xsession
- elif [ -r $xclients ]; then
--	exec sh -login $xclients
-+	exec sh $xclients
- elif [ -r $systemxinitrc ]; then
--	exec sh -login $systemxinitrc
-+	exec sh $systemxinitrc
- elif [ -x $twm ]; then
- 	exec $twm
- elif [ -x $xterm ]; then
diff -ruN login.app.orig/files/patch-af login.app/files/patch-af
--- login.app.orig/files/patch-af	Thu Dec 14 10:27:27 2000
+++ login.app/files/patch-af	Thu Jan  1 01:00:00 1970
@@ -1,18 +0,0 @@
---- Preferences.orig	Sat Nov 11 11:07:58 2000
-+++ Preferences	Thu Dec 14 00:49:48 2000
-@@ -1,12 +1,12 @@
- {
--  WelcomeMessage = "Welcome to LINUX";
-+  WelcomeMessage = "Welcome to FreeBSD";
-   RestartMessage = "System is rebooting...";
-   PowerOffMessage = "System is shutting down...";
-   ConfirmRestartMessage = "Do you really want to restart the computer (y/n)?";
-   ConfirmPowerOffMessage = "Do you really want to turn off the computer (y/n)?";
- 
--  XServer = "/usr/X11R6/bin/X -nolisten tcp";
--  Theme = "Linux";
-+  XServer = "%%X11BASE%%/bin/X -nolisten tcp";
-+  Theme = "Drone";
- 
-   DisableWelcomeMessage = Yes;
-   DisableUserShutdown = No;
diff -ruN login.app.orig/files/patch-ah login.app/files/patch-ah
--- login.app.orig/files/patch-ah	Thu Dec 14 10:01:22 2000
+++ login.app/files/patch-ah	Thu Jan  1 01:00:00 1970
@@ -1,21 +0,0 @@
---- Scripts/Login.root.orig	Sat Nov 11 10:49:02 2000
-+++ Scripts/Login.root	Thu Dec 14 10:38:58 2000
-@@ -1,15 +1,15 @@
- #!/bin/sh
- 
--PATH="/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin"
-+PATH="/sbin:/usr/sbin:/bin:/usr/bin:%%LOCALBASE%%/bin:%%X11BASE%%/bin"
- 
- #
- # Make user the owner of /dev/console.
- #
--chown $USER /dev/console
-+/usr/sbin/chown $USER /dev/console
- 
- #
- # Add user to utmp/wtmp.
- #
--sessreg -a $USER
-+%%X11BASE%%/bin/sessreg -a $USER
- 
- # End of file
diff -ruN login.app.orig/files/patch-ai login.app/files/patch-ai
--- login.app.orig/files/patch-ai	Thu Dec 14 10:01:22 2000
+++ login.app/files/patch-ai	Thu Jan  1 01:00:00 1970
@@ -1,31 +0,0 @@
---- Scripts/Logout.root.orig	Sat Nov 11 10:49:57 2000
-+++ Scripts/Logout.root	Thu Dec 14 10:38:58 2000
-@@ -1,23 +1,23 @@
- #!/bin/sh
- 
--PATH="/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin"
-+PATH="/sbin:/usr/sbin:/bin:/usr/bin:%%LOCALBASE%%/bin:%%X11BASE%%/bin"
- 
- #
- # Remove the _MOTIF_DRAG_WINDOW property from the root
- # window. This will prevent some Motif applications from
- # crashing the next time they are started.
- #
--xprop -root -remove _MOTIF_DRAG_WINDOW
-+%%X11BASE%%/bin/xprop -root -remove _MOTIF_DRAG_WINDOW
- 
- #
- # Remove user from utmp/wtmp.
- #
--sessreg -d $USER
-+%%X11BASE%%/bin/sessreg -d $USER
- 
- #
- # Make root the owner of /dev/console. 
- #
--chmod 622 /dev/console
--chown root /dev/console
-+/bin/chmod 622 /dev/console
-+/usr/sbin/chown root /dev/console
- 
- # End of file
diff -ruN login.app.orig/files/patch-aj login.app/files/patch-aj
--- login.app.orig/files/patch-aj	Thu Dec 14 10:01:22 2000
+++ login.app/files/patch-aj	Thu Jan  1 01:00:00 1970
@@ -1,11 +0,0 @@
---- preferences.h	2000/12/13 20:54:07	1.1
-+++ preferences.h	2000/12/13 20:54:43
-@@ -39,7 +39,7 @@
- #define DEFAULT_WELCOMEMESSAGE		"Welcome to LINUX"
- #define DEFAULT_POWEROFFMESSAGE		"System is shutting down..."
- #define DEFAULT_RESTARTMESSAGE		"System is rebooting..."
--#define DEFAULT_XSERVER			"/usr/X11R6/bin/X"
-+#define DEFAULT_XSERVER			"%%X11BASE%%/bin/X"
- #define DEFAULT_THEME			"Linux"
- #define DEFAULT_DISABLEWELCOMEMESSAGE	NO
- #define DEFAULT_DISABLEUSERSHUTDOWN	NO
diff -ruN login.app.orig/files/patch-ak login.app/files/patch-ak
--- login.app.orig/files/patch-ak	Thu Dec 14 10:01:22 2000
+++ login.app/files/patch-ak	Thu Jan  1 01:00:00 1970
@@ -1,10 +0,0 @@
---- Scripts/Startup.orig	Sat Nov 11 09:24:57 2000
-+++ Scripts/Startup	Thu Dec 14 10:38:58 2000
-@@ -1,6 +1,6 @@
- #!/bin/sh
- 
--PATH="/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin"
-+PATH="/bin:/usr/bin:%%LOCALBASE%%/bin:%%X11BASE%%/bin"
- 
- #
- # Set cursor for the root window.
diff -ruN login.app.orig/files/patch-al login.app/files/patch-al
--- login.app.orig/files/patch-al	Thu Dec 14 10:01:22 2000
+++ login.app/files/patch-al	Thu Jan  1 01:00:00 1970
@@ -1,11 +0,0 @@
---- config.h	2000/12/13 21:04:54	1.1
-+++ config.h	2000/12/13 21:05:08
-@@ -23,7 +23,7 @@
- #define CONFIG_H
- 
- /* xinit */
--#define XINIT                   "/usr/X11R6/bin/xinit"
-+#define XINIT                   "%%X11BASE%%/bin/xinit"
- 
- /* Theme directory */
- #define THEME_DIR		"Themes"
diff -ruN login.app.orig/files/patch-am login.app/files/patch-am
--- login.app.orig/files/patch-am	Thu Dec 14 10:01:22 2000
+++ login.app/files/patch-am	Thu Jan  1 01:00:00 1970
@@ -1,17 +0,0 @@
---- Themes/Linux/Settings	2000/12/13 21:12:32	1.1
-+++ Themes/Linux/Settings	2000/12/13 21:12:53
-@@ -15,12 +15,12 @@
- 
-   MessagePosition = "231, 130";
-   MessageJustification = Center;
--  MessageFont = "-*-utopia-regular-*-*-*-18-*-*-*-*-*-*-*";
-+  MessageFont = "-*-utopia-regular-*-*-*-19-*-*-*-*-*-*-*";
-   MessageColor = "grey20";
- 
-   HostnamePosition = "450, 80";
-   HostnameJustification = Right;
--  HostnameFont = "-*-utopia-regular-*-*-*-18-*-*-*-*-*-*-*";
-+  HostnameFont = "-*-utopia-regular-*-*-*-19-*-*-*-*-*-*-*";
-   HostnameColor = "grey30";
- 
-   InputFont = "-*-helvetica-medium-r-*-*-18-*-*-*-*-*-*-*";
diff -ruN login.app.orig/files/patch-an login.app/files/patch-an
--- login.app.orig/files/patch-an	Thu Dec 14 10:01:22 2000
+++ login.app/files/patch-an	Thu Jan  1 01:00:00 1970
@@ -1,10 +0,0 @@
---- Scripts/PowerOff.orig	Tue Jul  4 01:03:30 2000
-+++ Scripts/PowerOff	Thu Dec 14 00:28:50 2000
-@@ -3,6 +3,6 @@
- #
- # Take the system down for halt.
- #
--#/sbin/shutdown -h now
-+/sbin/shutdown -p now
- 
- # End of file
diff -ruN login.app.orig/files/patch-ao login.app/files/patch-ao
--- login.app.orig/files/patch-ao	Thu Dec 14 10:01:23 2000
+++ login.app/files/patch-ao	Thu Jan  1 01:00:00 1970
@@ -1,10 +0,0 @@
---- Scripts/Restart	2000/12/13 22:24:55	1.1
-+++ Scripts/Restart	2000/12/13 22:25:01
-@@ -3,6 +3,6 @@
- #
- # Take the system down for reboot.
- #
--#/sbin/shutdown -r now
-+/sbin/shutdown -r now
- 
- # End of file
diff -ruN login.app.orig/files/patch-ap login.app/files/patch-ap
--- login.app.orig/files/patch-ap	Thu Dec 14 10:01:23 2000
+++ login.app/files/patch-ap	Thu Jan  1 01:00:00 1970
@@ -1,17 +0,0 @@
---- Themes/GNUstep/Settings	2000/12/13 22:45:18	1.1
-+++ Themes/GNUstep/Settings	2000/12/13 22:45:39
-@@ -15,12 +15,12 @@
- 
-   MessagePosition = "231, 130";
-   MessageJustification = Center;
--  MessageFont = "-*-utopia-regular-*-*-*-18-*-*-*-*-*-*-*";
-+  MessageFont = "-*-utopia-regular-*-*-*-19-*-*-*-*-*-*-*";
-   MessageColor = "grey20";
- 
-   HostnamePosition = "450, 80";
-   HostnameJustification = Right;
--  HostnameFont = "-*-utopia-regular-*-*-*-18-*-*-*-*-*-*-*";
-+  HostnameFont = "-*-utopia-regular-*-*-*-19-*-*-*-*-*-*-*";
-   HostnameColor = "grey30";
- 
-   InputFont = "-*-helvetica-medium-r-*-*-18-*-*-*-*-*-*-*";
diff -ruN login.app.orig/files/patch-aq login.app/files/patch-aq
--- login.app.orig/files/patch-aq	Thu Dec 14 10:27:27 2000
+++ login.app/files/patch-aq	Thu Jan  1 01:00:00 1970
@@ -1,17 +0,0 @@
---- ../Drone/Settings	2000/12/14 09:12:17	1.1
-+++ ../Drone/Settings	2000/12/14 09:12:54
-@@ -15,12 +15,12 @@
- 
-   MessagePosition = "205, 280";
-   MessageJustification = Center;
--  MessageFont = "-*-utopia-regular-*-*-*-18-*-*-*-*-*-*-*";
-+  MessageFont = "-*-utopia-regular-*-*-*-19-*-*-*-*-*-*-*";
-   MessageColor = "grey20";
- 
-   HostnamePosition = "203, 249";
-   HostnameJustification = center;
--  HostnameFont = "-*-utopia-regular-*-*-*-18-*-*-*-*-*-*-*";
-+  HostnameFont = "-*-utopia-regular-*-*-*-19-*-*-*-*-*-*-*";
-   HostnameColor = "grey30";
- 
-   InputFont = "-*-helvetica-medium-r-*-*-18-*-*-*-*-*-*-*";
diff -ruN login.app.orig/files/patch-graphics.c login.app/files/patch-graphics.c
--- login.app.orig/files/patch-graphics.c	Sat Nov  6 21:48:19 2004
+++ login.app/files/patch-graphics.c	Thu Jan  1 01:00:00 1970
@@ -1,11 +0,0 @@
---- graphics.c.orig	Sun Oct 31 11:44:10 2004
-+++ graphics.c	Sun Oct 31 11:44:54 2004
-@@ -73,7 +73,7 @@
-    img = RCloneImage(bottom);
-    RCombineImages(img, top);
-    setWindowImage(win, img);
--   RDestroyImage(img);
-+   RReleaseImage(img);
- }
- 
- void drawText(Window win, XFontStruct* font, int justification, int x, int y, 
diff -ruN login.app.orig/files/patch-panel.c login.app/files/patch-panel.c
--- login.app.orig/files/patch-panel.c	Sat Nov  6 21:48:19 2004
+++ login.app/files/patch-panel.c	Thu Jan  1 01:00:00 1970
@@ -1,11 +0,0 @@
---- panel.c.orig	Sun Oct 31 11:44:16 2004
-+++ panel.c	Sun Oct 31 11:44:41 2004
-@@ -297,7 +297,7 @@
- 	
-       image = RCreateImageFromDrawable(ctx, panel, 0);
-       RConvertImage(ctx, image, &shrinkPixmap);
--      RDestroyImage(image);
-+      RReleaseImage(image);
- 	
-       XSetWindowBackgroundPixmap(dpy, panel, shrinkPixmap);
-       XUnmapSubwindows(dpy, panel);
diff -ruN login.app.orig/files/patch-src::config.h login.app/files/patch-src::config.h
--- login.app.orig/files/patch-src::config.h	Thu Jan  1 01:00:00 1970
+++ login.app/files/patch-src::config.h	Sat Jan  8 18:35:15 2005
@@ -0,0 +1,11 @@
+--- src/config.h.orig	Sat Jan  8 18:29:31 2005
++++ src/config.h	Sat Jan  8 18:29:45 2005
+@@ -23,7 +23,7 @@
+ #define CONFIG_H
+ 
+ /* xinit */
+-#define XINIT                   "/usr/X11R6/bin/xinit"
++#define XINIT                   "%%X11BASE%%/bin/xinit"
+ 
+ /* Theme directory */
+ #define THEME_DIR		"Themes"
diff -ruN login.app.orig/files/patch-src::preferences.h login.app/files/patch-src::preferences.h
--- login.app.orig/files/patch-src::preferences.h	Thu Jan  1 01:00:00 1970
+++ login.app/files/patch-src::preferences.h	Sat Jan  8 18:35:59 2005
@@ -0,0 +1,11 @@
+--- src/preferences.h.orig	Sun Oct 24 04:15:32 2004
++++ src/preferences.h	Sat Jan  8 18:26:20 2005
+@@ -47,7 +47,7 @@
+ #endif
+ #define DEFAULT_POWEROFFMESSAGE		"System is shutting down..."
+ #define DEFAULT_RESTARTMESSAGE		"System is rebooting..."
+-#define DEFAULT_XSERVER			"/usr/X11R6/bin/X"
++#define DEFAULT_XSERVER			"%%X11BASE%%/bin/X"
+ #define DEFAULT_THEME			"Drone"
+ #define DEFAULT_DISABLEWELCOMEMESSAGE	True
+ #define DEFAULT_DISABLEUSERSHUTDOWN	False
diff -ruN login.app.orig/files/patch-src::switchuser.c login.app/files/patch-src::switchuser.c
--- login.app.orig/files/patch-src::switchuser.c	Thu Jan  1 01:00:00 1970
+++ login.app/files/patch-src::switchuser.c	Sat Jan  8 18:38:59 2005
@@ -0,0 +1,25 @@
+--- src/switchuser.c.orig	Sun Oct 24 04:15:32 2004
++++ src/switchuser.c	Sat Jan  8 18:37:49 2005
+@@ -77,7 +77,7 @@
+    char*  correct;
+    struct passwd *pw;
+ #ifdef SHADOW_PASSWD
+-   struct spwd* sp;
++   struct passwd* sp;
+ #endif
+ 
+    pw = getpwnam(username);
+@@ -87,10 +87,10 @@
+    }
+ 
+ #ifdef SHADOW_PASSWD
+-   sp = getspnam(pw->pw_name);    
+-   endspent();
++   sp = getpwnam(pw->pw_name);    
++   endpwent();
+    if(sp) {
+-      correct = sp->sp_pwdp;
++      correct = sp->pw_passwd;
+    }
+    else
+ #endif
diff -ruN login.app.orig/pkg-descr login.app/pkg-descr
--- login.app.orig/pkg-descr	Thu Dec 14 10:01:21 2000
+++ login.app/pkg-descr	Sat Jan  8 16:48:02 2005
@@ -10,4 +10,4 @@
 It will serve the needs of most users that just want a nice looking login
 interface on their FreeBSD workstation.
 
-WWW: http://wm.current.nu/Login.app/
+WWW: http://largo.windowmaker.org/Login.app/
diff -ruN login.app.orig/pkg-plist login.app/pkg-plist
--- login.app.orig/pkg-plist	Thu Dec 14 10:27:27 2000
+++ login.app/pkg-plist	Sun Jan  9 18:12:49 2005
@@ -1,3 +1,4 @@
+etc/rc.d/loginapp.sh
 GNUstep/Apps/Login.app/Login
 GNUstep/Apps/Login.app/Preferences
 GNUstep/Apps/Login.app/Scripts/Login.root
@@ -7,17 +8,16 @@
 GNUstep/Apps/Login.app/Scripts/Restart
 GNUstep/Apps/Login.app/Scripts/Startup
 GNUstep/Apps/Login.app/Scripts/Suspend
-GNUstep/Apps/Login.app/Themes/Drone/README
 GNUstep/Apps/Login.app/Themes/Drone/Settings
-GNUstep/Apps/Login.app/Themes/Drone/fieldlabels1.png
+GNUstep/Apps/Login.app/Themes/Drone/fieldlabels.png
+GNUstep/Apps/Login.app/Themes/Drone/inputfield1.png
 GNUstep/Apps/Login.app/Themes/Drone/inputfield2.png
-GNUstep/Apps/Login.app/Themes/Drone/inputfield3.png
-GNUstep/Apps/Login.app/Themes/Drone/panel3.png
-GNUstep/Apps/Login.app/Themes/Drone/powerbuttondown2.png
-GNUstep/Apps/Login.app/Themes/Drone/powerbuttonup2.png
-GNUstep/Apps/Login.app/Themes/Drone/restartbuttondown2.png
-GNUstep/Apps/Login.app/Themes/Drone/restartbuttonup2.png
-GNUstep/Apps/Login.app/Themes/Drone/stop1.png
+GNUstep/Apps/Login.app/Themes/Drone/panel.png
+GNUstep/Apps/Login.app/Themes/Drone/powerbuttondown.png
+GNUstep/Apps/Login.app/Themes/Drone/powerbuttonup.png
+GNUstep/Apps/Login.app/Themes/Drone/restartbuttondown.png
+GNUstep/Apps/Login.app/Themes/Drone/restartbuttonup.png
+GNUstep/Apps/Login.app/Themes/Drone/stop.png
 GNUstep/Apps/Login.app/Themes/GNUstep/Settings
 GNUstep/Apps/Login.app/Themes/GNUstep/fieldlabels.tiff
 GNUstep/Apps/Login.app/Themes/GNUstep/inputfield.tiff
>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200501092048.j09KmX9d022387>