mirror of
https://git.freebsd.org/ports.git
synced 2025-05-28 08:56:28 -04:00
6b288be1e6
https://www.chiark.greenend.org.uk/~sgtatham/putty/changes.html Deprecate -gtk2 version for Mid-December 2021. Clean up a bit.
61 lines
2.6 KiB
Text
61 lines
2.6 KiB
Text
--- unix/Makefile.gtk.orig 2021-05-02 07:21:01 UTC
|
|
+++ unix/Makefile.gtk
|
|
@@ -104,7 +104,7 @@ GTK_CONFIG = sh -c 'pkg-config gtk+-3.0 x11 $$0 2>/dev
|
|
|
|
unexport CFLAGS # work around a weird issue with krb5-config
|
|
|
|
-CFLAGS = -O2 -Wall -std=gnu99 -Wvla -g -I.././ -I../charset/ -I../windows/ \
|
|
+CFLAGS := $(CFLAGS) -Wall -std=gnu11 -Wvla -I.././ -I../charset/ -I../windows/ \
|
|
-I../unix/ $(shell $(GTK_CONFIG) --cflags) -D _FILE_OFFSET_BITS=64
|
|
XLDFLAGS = $(LDFLAGS) $(shell $(GTK_CONFIG) --libs)
|
|
ULDFLAGS = $(LDFLAGS)
|
|
@@ -131,9 +131,14 @@ man1dir=$(mandir)/man1
|
|
.SUFFIXES:
|
|
|
|
|
|
+ifdef PUTTY_WITH_GTK
|
|
all: cgtest fuzzterm osxlaunch pageant plink pscp psftp psocks psusan pterm \
|
|
ptermapp putty puttyapp puttygen puttytel testcrypt testsc \
|
|
testzlib uppity
|
|
+else
|
|
+all: cgtest fuzzterm osxlaunch plink pscp psftp \
|
|
+ puttygen testcrypt testsc testzlib uppity
|
|
+endif
|
|
|
|
cgtest: cgtest.o conf.o console.o ecc.o import.o marshal.o memory.o \
|
|
millerrabin.o misc.o mpint.o mpunsafe.o notiming.o pockle.o \
|
|
@@ -1805,10 +1810,12 @@ xpmputty.o: ../unix/xpmputty.c
|
|
|
|
install:
|
|
mkdir -p $(DESTDIR)$(bindir) $(DESTDIR)$(man1dir)
|
|
- $(INSTALL_PROGRAM) -m 755 pageant $(DESTDIR)$(bindir)/pageant
|
|
$(INSTALL_PROGRAM) -m 755 plink $(DESTDIR)$(bindir)/plink
|
|
$(INSTALL_PROGRAM) -m 755 pscp $(DESTDIR)$(bindir)/pscp
|
|
$(INSTALL_PROGRAM) -m 755 psftp $(DESTDIR)$(bindir)/psftp
|
|
+ $(INSTALL_PROGRAM) -m 755 puttygen $(DESTDIR)$(bindir)/puttygen
|
|
+ifdef PUTTY_WITH_GTK
|
|
+ $(INSTALL_PROGRAM) -m 755 pageant $(DESTDIR)$(bindir)/pageant
|
|
$(INSTALL_PROGRAM) -m 755 pterm $(DESTDIR)$(bindir)/pterm
|
|
if test -n "$(UTMP_GROUP)"; then \
|
|
chgrp $(UTMP_GROUP) $(DESTDIR)$(bindir)/pterm && \
|
|
@@ -1818,16 +1825,18 @@ install:
|
|
chmod 4755 $(DESTDIR)$(bindir)/pterm; \
|
|
fi
|
|
$(INSTALL_PROGRAM) -m 755 putty $(DESTDIR)$(bindir)/putty
|
|
- $(INSTALL_PROGRAM) -m 755 puttygen $(DESTDIR)$(bindir)/puttygen
|
|
$(INSTALL_PROGRAM) -m 755 puttytel $(DESTDIR)$(bindir)/puttytel
|
|
$(INSTALL_DATA) -m 644 ../doc/pageant.1 $(DESTDIR)$(man1dir)/pageant.1
|
|
+endif
|
|
$(INSTALL_DATA) -m 644 ../doc/plink.1 $(DESTDIR)$(man1dir)/plink.1
|
|
$(INSTALL_DATA) -m 644 ../doc/pscp.1 $(DESTDIR)$(man1dir)/pscp.1
|
|
$(INSTALL_DATA) -m 644 ../doc/psftp.1 $(DESTDIR)$(man1dir)/psftp.1
|
|
+ $(INSTALL_DATA) -m 644 ../doc/puttygen.1 $(DESTDIR)$(man1dir)/puttygen.1
|
|
+ifdef PUTTY_WITH_GTK
|
|
$(INSTALL_DATA) -m 644 ../doc/pterm.1 $(DESTDIR)$(man1dir)/pterm.1
|
|
$(INSTALL_DATA) -m 644 ../doc/putty.1 $(DESTDIR)$(man1dir)/putty.1
|
|
- $(INSTALL_DATA) -m 644 ../doc/puttygen.1 $(DESTDIR)$(man1dir)/puttygen.1
|
|
$(INSTALL_DATA) -m 644 ../doc/puttytel.1 $(DESTDIR)$(man1dir)/puttytel.1
|
|
+endif
|
|
|
|
install-strip:
|
|
$(MAKE) install INSTALL_PROGRAM="$(INSTALL_PROGRAM) -s"
|