Update to 0.7.0

PR:		33762
Submitted by:	Oliver Lehmann <lehmann@ans-netz.de>

4 files changed, 22 insertions, 28 deletions

diff --git a/x11/launch.app/Makefile b/x11/launch.app/Makefile
index 25cf292ee5dc..b7481994853c 100644
--- a/x11/launch.app/Makefile
+++ b/x11/launch.app/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	launch.app
-PORTVERSION=	0.6.5
+PORTVERSION=	0.7.0
 CATEGORIES=	x11 windowmaker
 MASTER_SITES=	http://stepmaker.sourceforge.net/launch/
 DISTNAME=	${PORTNAME:S/l/L/}-${PORTVERSION}
diff --git a/x11/launch.app/distinfo b/x11/launch.app/distinfo
index 763ff77c5b3d..e88ffc289e28 100644
--- a/x11/launch.app/distinfo
+++ b/x11/launch.app/distinfo
@@ -1 +1 @@
-MD5 (Launch.app-0.6.5.tar.gz) = 7444a8d7ec3ca6f0f93840100b779509
+MD5 (Launch.app-0.7.0.tar.gz) = b6ca0abd8dea0cac54daf33fba4db1e9
diff --git a/x11/launch.app/files/patch-GNUmakefile b/x11/launch.app/files/patch-GNUmakefile
index 6003e6ccaac8..cd310962ff1b 100644
--- a/x11/launch.app/files/patch-GNUmakefile
+++ b/x11/launch.app/files/patch-GNUmakefile
@@ -1,25 +1,23 @@
-
-$FreeBSD$
-
---- GNUmakefile.orig	Mon Jun  4 14:56:00 2001
-+++ GNUmakefile	Mon Aug 20 18:56:09 2001
+--- GNUmakefile.orig	Thu Oct 18 14:26:03 2001
++++ GNUmakefile	Thu Jan 10 13:52:21 2002
 @@ -1,10 +1,10 @@
 -PREFIX = /usr/local/GNUstep/Apps
 +prefix = $(PREFIX)/GNUstep/Apps
  # Comment out the line below if you don't use shadow passwords
 -SHADOW = yes
--CFLAGS = `get-wraster-flags --cflags` -DPREFIX="\"$(PREFIX)\""
-+#SHADOW = yes
-+CFLAGS += `get-wraster-flags --cflags` -DPREFIX="\"$(prefix)\""
- LDFLAGS = `get-wraster-flags --ldflags`
--LIBS = `get-wraster-flags --libs` -L/usr/X11R6/lib -L/usr/local/GNUstep/lib -lWMaker -lWINGs -lPropList -lcrypt
+-CFLAGS = `get-wings-flags --cflags` -DPREFIX="\"$(PREFIX)\""
+-LDFLAGS = `get-wings-flags --ldflags`
+-LIBS = `get-wings-flags --libs` -lWMaker -lcrypt
 -CC = gcc -O2 -ggdb
-+LIBS = `get-wraster-flags --libs` -L$(X11BASE)/lib -L$(X11BASE)/GNUstep/lib -lWMaker -lWINGs -lPropList -lcrypt
++#SHADOW = yes
++CFLAGS += `get-wings-flags --cflags` -DPREFIX="\"$(prefix)\""
++LDFLAGS = `get-wraster-flags --ldflags`
++LIBS = `get-wings-flags --libs` -L$(X11BASE)/lib -L$(X11BASE)/GNUstep/lib -lWMaker -lcrypt
 +CC ?= gcc
- OBJS = launch.o history.o execute.o user_auth.o exec_panel.o completion.o test_file.o common_panel.o pref_panel.o info.o legal.o
+ OBJS = launch.o history.o execute.o user_auth.o exec_panel.o \
+ completion.o test_file.o common_panel.o preferences.o info.o legal.o utils.o
  
- all: Launch
-@@ -50,21 +50,21 @@
+@@ -51,21 +51,21 @@
  	$(CC) $(CFLAGS) -c legal.c -o legal.o 
  
  install: Launch
diff --git a/x11/launch.app/files/patch-execute.c b/x11/launch.app/files/patch-execute.c
index 04ecd3a982e2..c7b2c8290443 100644
--- a/x11/launch.app/files/patch-execute.c
+++ b/x11/launch.app/files/patch-execute.c
@@ -1,22 +1,18 @@
-
-$FreeBSD$
-
---- execute.c	2001/08/20 09:08:11	1.1
-+++ execute.c	2001/08/20 09:09:29
-@@ -157,13 +157,13 @@
+--- execute.c.orig	Thu Oct 18 13:56:26 2001
++++ execute.c	Thu Jan 10 13:48:12 2002
+@@ -161,13 +161,13 @@
  	pid = fork ();
  	if (pid == 0)
  	{
 -		if (setuid (pw->pw_gid))
 +		if (setgid (pw->pw_gid))
  		{
- 			fprintf (stderr, "unable to set group id\n");
+ //			fprintf (stderr, "unable to set group id\n");
+ 			SMRunAttentionPanel (wm_screen, LaunchPanel->window,
+           "Command Execution", "Unable to set group ID.", NULL, NULL, "Ok");
  		}
 -		if (setgid (pw->pw_uid))
 +		if (setuid (pw->pw_uid))
  		{
--			fprintf (stderr, "unable to set group id\n");
-+			fprintf (stderr, "unable to set user id\n");
- 		}
- 		setenv ("HOME", pw->pw_dir, 1);
- 		setenv ("USER", pw->pw_name, 1);
+ //			fprintf (stderr, "unable to set user id\n");
+ 			SMRunAttentionPanel (wm_screen, LaunchPanel->window,