mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-24 00:45:52 +00:00
Code Issues Releases Activity

Install puttygen even if you set WITHOUT_GTK since it doesn't require gtk.

Browse Source 
PR:		ports/110335
Submitted by:	Kenneth Vestergaard Schmidt<kvs@pil.dk>
This commit is contained in:
Renato Botelho 2007-03-15 17:59:02 +00:00
parent f857b8ea7d
commit d93d277f41
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=187448
2 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
security/putty/Makefile
View File

@ -19,21 +19,21 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/unix
MAKEFILE= Makefile.gtk
CFLAGS+= -DBSD_PTYS -DOMIT_UTMP
.if !defined(WITHOUT_IPV6)
CFLAGS+= -DIPV6
.endif
PLIST_FILES= bin/plink bin/pscp bin/psftp
MAN1= plink.1 pscp.1 psftp.1
PLIST_FILES= bin/plink bin/pscp bin/psftp bin/puttygen
MAN1= plink.1 pscp.1 psftp.1 puttygen.1
.if !defined(WITHOUT_GTK)
USE_GNOME= gtk12
PLIST_FILES+= bin/pterm bin/putty bin/puttygen bin/puttytel
MAN1+= pterm.1 putty.1 puttygen.1 puttytel.1
PLIST_FILES+= bin/pterm bin/putty bin/puttytel
MAN1+= pterm.1 putty.1 puttytel.1
MAKE_ENV+= PUTTY_WITH_GTK=yes
CFLAGS+= `${GTK_CONFIG} --cflags`
.endif
.if !defined(WITHOUT_IPV6)
CFLAGS+= -DIPV6
.endif
post-patch:
@${REINPLACE_CMD} -e 's,gtk-config,${GTK_CONFIG},g; \
s,prefix=/usr/local,prefix=${PREFIX},' \

16
security/putty/files/patch-Makefile.gtk
View File

@ -1,5 +1,5 @@
--- Makefile.gtk.orig Wed Jan 24 18:22:52 2007
+++ Makefile.gtk Sun Feb 11 13:41:43 2007
+++ Makefile.gtk Thu Mar 15 13:55:48 2007
@@ -98,8 +98,8 @@
# TOOLPATH = /opt/gcc/bin
CC = $(TOOLPATH)cc
@ -18,7 +18,7 @@
+ifdef PUTTY_WITH_GTK
all: plink pscp psftp pterm putty puttygen puttytel
+else
+all: plink pscp psftp
+all: plink pscp psftp puttygen
+endif
plink: be_all_s.o cmdline.o cproxy.o ldisc.o logging.o misc.o pinger.o \
@ -32,26 +32,30 @@
$(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) `cat ../version.def` -c ../version.c; \
else \
$(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) $(VER) -c ../version.c; \
@@ -913,6 +917,7 @@
@@ -913,6 +917,8 @@
$(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 pterm $(DESTDIR)$(bindir)/pterm
if test -n "$(UTMP_GROUP)"; then \
chgrp $(UTMP_GROUP) $(DESTDIR)$(bindir)/pterm && \
@@ -924,13 +929,16 @@
@@ -922,15 +928,17 @@
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 puttygen $(DESTDIR)$(bindir)/puttygen
$(INSTALL_PROGRAM) -m 755 puttytel $(DESTDIR)$(bindir)/puttytel
+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/puttygen.1 $(DESTDIR)$(man1dir)/puttygen.1
$(INSTALL_DATA) -m 644 ../doc/puttytel.1 $(DESTDIR)$(man1dir)/puttytel.1
+endif