diff options
Diffstat (limited to 'security/putty/files/patch-Makefile.gtk')
| -rw-r--r-- | security/putty/files/patch-Makefile.gtk | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/security/putty/files/patch-Makefile.gtk b/security/putty/files/patch-Makefile.gtk index 1aff4c1f2c40..df4e80fefbfe 100644 --- a/security/putty/files/patch-Makefile.gtk +++ b/security/putty/files/patch-Makefile.gtk @@ -1,17 +1,17 @@ ---- Makefile.gtk.orig Tue Aug 3 19:42:46 2004 -+++ Makefile.gtk Wed Aug 4 09:58:44 2004 -@@ -80,7 +80,7 @@ +--- Makefile.gtk.orig Fri Apr 29 13:01:07 2005 ++++ Makefile.gtk Fri Apr 29 13:06:39 2005 +@@ -82,7 +82,7 @@ # TOOLPATH = /opt/gcc/bin CC = $(TOOLPATH)cc --CFLAGS = -O2 -Wall -Werror -g -I.././ -I../charset/ -I../unix/ -I../mac/ \ -+CFLAGS += -O2 -Wall -g -I.././ -I../charset/ -I../unix/ -I../mac/ \ - `gtk-config --cflags` +-CFLAGS = -O2 -Wall -Werror -g -I.././ -I../charset/ -I../windows/ -I../unix/ \ ++CFLAGS += -O2 -Wall -g -I.././ -I../charset/ -I../windows/ -I../unix/ \ + -I../mac/ -I../macosx/ `gtk-config --cflags` XLDFLAGS = `gtk-config --libs` ULDFLAGS =# -@@ -98,7 +98,11 @@ - %.o: - $(CC) $(COMPAT) $(FWHACK) $(XFLAGS) $(CFLAGS) -c $< +@@ -99,7 +99,11 @@ + .SUFFIXES: + +ifdef PUTTY_WITH_GTK all: plink pscp psftp pterm putty puttygen puttytel @@ -19,23 +19,26 @@ +all: plink pscp psftp +endif - plink: be_all.o cmdline.o ldisc.o logging.o misc.o portfwd.o proxy.o raw.o \ - rlogin.o settings.o signal.o ssh.o sshaes.o sshblowf.o \ -@@ -616,7 +620,7 @@ + plink: be_all.o cmdline.o cproxy.o ldisc.o logging.o misc.o pinger.o \ + portfwd.o proxy.o raw.o rlogin.o settings.o ssh.o sshaes.o \ +@@ -828,7 +832,7 @@ version.o: FORCE; FORCE: - if test -z "$(VER)" && (cd ..; md5sum -c manifest); then \ + if test -z "$(VER)" ; then \ - $(CC) $(COMPAT) $(FWHACK) $(XFLAGS) $(CFLAGS) `cat ../version.def` -c ../version.c; \ + $(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) `cat ../version.def` -c ../version.c; \ else \ - $(CC) $(COMPAT) $(FWHACK) $(XFLAGS) $(CFLAGS) $(VER) -c ../version.c; \ -@@ -625,17 +629,21 @@ + $(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) $(VER) -c ../version.c; \ +@@ -837,6 +841,7 @@ $(INSTALL_PROGRAM) -m 755 plink $(DESTDIR)$(bindir)/plink $(INSTALL_PROGRAM) -m 755 pscp $(DESTDIR)$(bindir)/pscp $(INSTALL_PROGRAM) -m 755 psftp $(DESTDIR)$(bindir)/psftp +ifdef PUTTY_WITH_GTK $(INSTALL_PROGRAM) -m 755 pterm $(DESTDIR)$(bindir)/pterm + if test -n "$(UTMP_GROUP)"; then \ + chgrp $(UTMP_GROUP) $(DESTDIR)$(bindir)/pterm && \ +@@ -848,13 +853,16 @@ $(INSTALL_PROGRAM) -m 755 putty $(DESTDIR)$(bindir)/putty $(INSTALL_PROGRAM) -m 755 puttygen $(DESTDIR)$(bindir)/puttygen $(INSTALL_PROGRAM) -m 755 puttytel $(DESTDIR)$(bindir)/puttytel |