aboutsummaryrefslogtreecommitdiff
path: root/security/putty
diff options
context:
space:
mode:
authorRenato Botelho <garga@FreeBSD.org>2007-02-11 17:10:03 +0000
committerRenato Botelho <garga@FreeBSD.org>2007-02-11 17:10:03 +0000
commitf3a1a46ecd3013f87dbccd85a77cc0cc4651f4ca (patch)
tree2dd21b37ba8263aa881bac14cbd7d588061238af /security/putty
parentcde903e19758e811b71e98f000b5d1ecbed4da6e (diff)
downloadports-f3a1a46ecd3013f87dbccd85a77cc0cc4651f4ca.tar.gz
ports-f3a1a46ecd3013f87dbccd85a77cc0cc4651f4ca.zip
Update to 0.59
Notes
Notes: svn path=/head/; revision=184897
Diffstat (limited to 'security/putty')
-rw-r--r--security/putty/Makefile12
-rw-r--r--security/putty/distinfo6
-rw-r--r--security/putty/files/patch-Makefile.gtk24
3 files changed, 22 insertions, 20 deletions
diff --git a/security/putty/Makefile b/security/putty/Makefile
index db82660c4a2a..acf192489076 100644
--- a/security/putty/Makefile
+++ b/security/putty/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= putty
-PORTVERSION= 0.58
-PORTREVISION= 1
+PORTVERSION= 0.59
CATEGORIES= security ipv6
MASTER_SITES= http://the.earth.li/~sgtatham/putty/%SUBDIR%/
MASTER_SITE_SUBDIR= ${PORTVERSION}
@@ -20,23 +19,24 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/unix
MAKEFILE= Makefile.gtk
CFLAGS+= -DBSD_PTYS -DOMIT_UTMP
-.ifndef WITHOUT_IPV6
+.if !defined(WITHOUT_IPV6)
CFLAGS+= -DIPV6
.endif
PLIST_FILES= bin/plink bin/pscp bin/psftp
MAN1= plink.1 pscp.1 psftp.1
-.ifndef WITHOUT_GTK
+.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
MAKE_ENV+= PUTTY_WITH_GTK=yes
+CFLAGS+= `${GTK_CONFIG} --cflags`
.endif
post-patch:
- @${REINPLACE_CMD} -e 's,gtk-config,${GTK_CONFIG},; \
+ @${REINPLACE_CMD} -e 's,gtk-config,${GTK_CONFIG},g; \
s,prefix=/usr/local,prefix=${PREFIX},' \
- ${WRKSRC}/${MAKEFILE}
+ ${WRKSRC}/${MAKEFILE}
.include <bsd.port.mk>
diff --git a/security/putty/distinfo b/security/putty/distinfo
index 25a3dcd9efd7..1b7229e40638 100644
--- a/security/putty/distinfo
+++ b/security/putty/distinfo
@@ -1,3 +1,3 @@
-MD5 (putty-0.58.tar.gz) = ffb78a7db7e4802896189b2112714a9f
-SHA256 (putty-0.58.tar.gz) = f770ae6a76bb261fc65f0fd2faf34cf767b3887c799db0948d2dc70e8c57c433
-SIZE (putty-0.58.tar.gz) = 1567268
+MD5 (putty-0.59.tar.gz) = 2c90f3aecd2e4b41df61fb047a6c8f11
+SHA256 (putty-0.59.tar.gz) = 578006f899a9363a7a627fcd362fbfb4b500c3b265c389df2d1ed292a7653bbc
+SIZE (putty-0.59.tar.gz) = 1736071
diff --git a/security/putty/files/patch-Makefile.gtk b/security/putty/files/patch-Makefile.gtk
index df4e80fefbfe..ea089b89c544 100644
--- a/security/putty/files/patch-Makefile.gtk
+++ b/security/putty/files/patch-Makefile.gtk
@@ -1,15 +1,17 @@
---- Makefile.gtk.orig Fri Apr 29 13:01:07 2005
-+++ Makefile.gtk Fri Apr 29 13:06:39 2005
-@@ -82,7 +82,7 @@
+--- Makefile.gtk.orig Wed Jan 24 18:22:52 2007
++++ Makefile.gtk Sun Feb 11 13:41:43 2007
+@@ -98,8 +98,8 @@
# TOOLPATH = /opt/gcc/bin
CC = $(TOOLPATH)cc
-CFLAGS = -O2 -Wall -Werror -g -I.././ -I../charset/ -I../windows/ -I../unix/ \
+- -I../mac/ -I../macosx/ `gtk-config --cflags` -D _FILE_OFFSET_BITS=64
+CFLAGS += -O2 -Wall -g -I.././ -I../charset/ -I../windows/ -I../unix/ \
- -I../mac/ -I../macosx/ `gtk-config --cflags`
++ -I../mac/ -I../macosx/ -D _FILE_OFFSET_BITS=64
XLDFLAGS = `gtk-config --libs`
ULDFLAGS =#
-@@ -99,7 +99,11 @@
+ INSTALL=install
+@@ -115,7 +115,11 @@
.SUFFIXES:
@@ -19,18 +21,18 @@
+all: plink pscp psftp
+endif
- plink: be_all.o cmdline.o cproxy.o ldisc.o logging.o misc.o pinger.o \
+ plink: be_all_s.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 @@
+@@ -904,7 +908,7 @@
+ $(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) -c ../unix/xpmputty.c
- version.o: FORCE;
- FORCE:
+ version.o: FORCE
- if test -z "$(VER)" && (cd ..; md5sum -c manifest); then \
+ if test -z "$(VER)" ; then \
$(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) `cat ../version.def` -c ../version.c; \
else \
$(CC) $(COMPAT) $(XFLAGS) $(CFLAGS) $(VER) -c ../version.c; \
-@@ -837,6 +841,7 @@
+@@ -913,6 +917,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
@@ -38,7 +40,7 @@
$(INSTALL_PROGRAM) -m 755 pterm $(DESTDIR)$(bindir)/pterm
if test -n "$(UTMP_GROUP)"; then \
chgrp $(UTMP_GROUP) $(DESTDIR)$(bindir)/pterm && \
-@@ -848,13 +853,16 @@
+@@ -924,13 +929,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