diff -ruN launch.app.old/Makefile /usr/ports/x11/launch.app/Makefile --- launch.app.old/Makefile Thu Jan 10 13:37:44 2002 +++ /usr/ports/x11/launch.app/Makefile Thu Jan 10 13:54:13 2002 @@ -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} @@ -14,6 +14,8 @@ MAINTAINER= ports@FreeBSD.org LIB_DEPENDS= wraster.4:${PORTSDIR}/x11-wm/windowmaker +#LIB_DEPENDS= wraster.4:${PORTSDIR}/x11-wm/windowmaker \ +# PropList.2:${PORTSDIR}/devel/libPropList WRKSRC= ${WRKDIR}/${PORTNAME:S/l/L/} diff -ruN launch.app.old/distinfo /usr/ports/x11/launch.app/distinfo --- launch.app.old/distinfo Thu Jan 10 13:37:22 2002 +++ /usr/ports/x11/launch.app/distinfo Thu Jan 10 13:39:38 2002 @@ -1 +1 @@ -MD5 (Launch.app-0.6.5.tar.gz) = 7444a8d7ec3ca6f0f93840100b779509 +MD5 (Launch.app-0.7.0.tar.gz) = b6ca0abd8dea0cac54daf33fba4db1e9 diff -ruN launch.app.old/files/patch-GNUmakefile /usr/ports/x11/launch.app/files/patch-GNUmakefile --- launch.app.old/files/patch-GNUmakefile Thu Jan 10 13:37:22 2002 +++ /usr/ports/x11/launch.app/files/patch-GNUmakefile Thu Jan 10 13:52:31 2002 @@ -1,25 +1,23 @@ - -$FreeBSD: ports/x11/launch.app/files/patch-GNUmakefile,v 1.1 2001/08/20 15:58:53 sobomax Exp $ - ---- 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 -ruN launch.app.old/files/patch-execute.c /usr/ports/x11/launch.app/files/patch-execute.c --- launch.app.old/files/patch-execute.c Thu Jan 10 13:37:22 2002 +++ /usr/ports/x11/launch.app/files/patch-execute.c Thu Jan 10 13:48:32 2002 @@ -1,22 +1,18 @@ - -$FreeBSD: ports/x11/launch.app/files/patch-execute.c,v 1.1 2001/08/20 15:58:53 sobomax Exp $ - ---- 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,