5 files changed, 19 insertions, 63 deletions

diff --git a/comms/syncterm/Makefile b/comms/syncterm/Makefile
index 243851900201..6840cedb92e6 100644
--- a/comms/syncterm/Makefile
+++ b/comms/syncterm/Makefile
@@ -3,19 +3,26 @@
 
 PORTNAME=	syncterm
 PORTVERSION=	0.9.${PORTVER}
-PORTREVISION=	1
 CATEGORIES=	comms
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-0.9.4
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-0.9.5
 DISTNAME=	syncterm-src-${PORTVER}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	shurd@sasktel.net
 COMMENT=	ANSI-BBS terminal which supports telnet, rlogin, and SSH
 
-WRKSRC=		${WRKDIR}/syncterm-${PORTVER}
+LICENSE=	GPLv2
+
+WRKSRC=		${WRKDIR}/syncterm-${PORTVER}/src/syncterm
 USES=		gmake
 MAKEFILE=	GNUmakefile
-PORTVER=	20110320
+MAKE_ARGS+=	DONT_CLOBBER_CC=please
+PORTVER=	20140603
+INSTALLS_ICONS=	yes
+PLIST_FILES=	bin/syncterm \
+		man/man1/syncterm.1.gz \
+		share/applications/syncterm.desktop \
+		share/icons/hicolor/64x64/apps/syncterm.png
 
 OPTIONS_DEFINE=	X11 SDL DEBUG
 OPTIONS_DEFAULT=	X11 SDL
@@ -27,11 +34,13 @@ ONLY_FOR_ARCHS_REASON=	does not configure except on i386 amd64
 
 .if ${ARCH} == "i386" || ${ARCH} == "amd64"
  LIB_DEPENDS+=	libcl.so:${PORTSDIR}/security/cryptlib
+ MAKE_ARGS+=	CRYPTLIBINCLUDE=${LOCALBASE}/include
+ MAKE_ARGS+=	CRYPTLIBDIR=${LOCALBASE}/lib
 .else
  MAKE_ARGS+=	WITHOUT_CRYPTLIB=yes
 .endif
 MAKE_ARGS+=	WITHOUT_PORTAUDIO=yes
-MAKE_ARGS+=	-C syncterm
+MAKE_ARGS+=	-C ${WRKSRC}
 MAKE_ARGS+=	PREFIX="${PREFIX}"
 MAKE_ARGS+=	INSTALL_EXE="${INSTALL_PROGRAM}"
 .if ${PORT_OPTIONS:MX11}
@@ -49,4 +58,7 @@ MAKE_ARGS+=	DEBUG=1
 MAKE_ARGS+=	RELEASE=1
 .endif
 
+pre-build:
+	if ( nm -D ${LOCALBASE}/lib/libcl.so | ${GREP} 'U __stack_chk_fail_local' ) then echo "LDFLAGS+=-fstack-protector" >> ${WRKSRC}/localdefs.mk ; fi
+
 .include <bsd.port.mk>
diff --git a/comms/syncterm/distinfo b/comms/syncterm/distinfo
index 80d46defdf05..78e4c87dd5b5 100644
--- a/comms/syncterm/distinfo
+++ b/comms/syncterm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (syncterm-src-20110320.tgz) = b0733e97b487d91d81979be5ec144b0b2215028c915c8f85b9f1ff4e04e4181f
-SIZE (syncterm-src-20110320.tgz) = 2496504
+SHA256 (syncterm-src-20140603.tgz) = 6ef3a36ab1c106b7f1a390630d937f63371b3806243cfe49dee5658ad230db7e
+SIZE (syncterm-src-20140603.tgz) = 8153746
diff --git a/comms/syncterm/files/patch-build__Common.gmake b/comms/syncterm/files/patch-build__Common.gmake
deleted file mode 100644
index 63be44473afb..000000000000
--- a/comms/syncterm/files/patch-build__Common.gmake
+++ /dev/null
@@ -1,20 +0,0 @@
---- build/Common.gmake.orig	2014-05-23 09:49:47.914404450 +0800
-+++ build/Common.gmake	2014-05-23 09:50:17.504419569 +0800
-@@ -160,7 +160,7 @@ ifdef BUILD_DEPENDS
-  ifdef DONT_CLOBBER_CC
-   CC			?=	gcc
-  else
--  CC			:=	gcc
-+  CC			:=	$(CC)
-  endif
-  CCPRE			:=	$(CC)
-  CC				:=	$(SRC_ROOT)/build/mkdep -a
-@@ -173,7 +173,7 @@ else
-  ifdef DONT_CLOBBER_CC
-   CC			?=	gcc
-  else
--  CC			:=	gcc
-+  CC			:=	$(CC)
-  endif
-  CCPRE			:=	$(CC)
-  CXX			?=	g++
diff --git a/comms/syncterm/files/patch-syncterm__GNUmakefile b/comms/syncterm/files/patch-syncterm__GNUmakefile
deleted file mode 100644
index 2061e775cda6..000000000000
--- a/comms/syncterm/files/patch-syncterm__GNUmakefile
+++ /dev/null
@@ -1,28 +0,0 @@
---- syncterm/GNUmakefile.orig	2011-03-21 05:34:01.000000000 +0800
-+++ syncterm/GNUmakefile	2014-05-23 09:52:57.932390967 +0800
-@@ -152,17 +152,17 @@ syncterm.1.gz: syncterm.man
- 	gzip < syncterm.man > syncterm.1.gz
- 
- installdirs:
--	-mkdir -p ${PREFIX}/bin
--	-mkdir -p ${DESKTOPDIR}
--	-mkdir -p ${MANPREFIX}/man/man1
--	-mkdir -p ${PREFIX}/share/icons/hicolor/64x64/apps
-+	-mkdir -p $(DESTDIR)${PREFIX}/bin
-+	-mkdir -p $(DESTDIR)${DESKTOPDIR}
-+	-mkdir -p $(DESTDIR)${MANPREFIX}/man/man1
-+	-mkdir -p $(DESTDIR)${PREFIX}/share/icons/hicolor/64x64/apps
- 
- install: $(SYNCTERM) syncterm.1.gz installdirs
- 	@echo Installing...
--	${INSTALL_EXE} ${SYNCTERM} ${PREFIX}/bin
--	${INSTALL_DATA} syncterm.png ${PREFIX}/share/icons/hicolor/64x64/apps
--	${INSTALL_DATA} syncterm.desktop ${DESKTOPDIR}
--	${INSTALL_DATA} syncterm.1.gz ${MANPREFIX}/man/man1
-+	${INSTALL_EXE} ${SYNCTERM} $(DESTDIR)${PREFIX}/bin
-+	${INSTALL_DATA} syncterm.png $(DESTDIR)${PREFIX}/share/icons/hicolor/64x64/apps
-+	${INSTALL_DATA} syncterm.desktop $(DESTDIR)${DESKTOPDIR}
-+	${INSTALL_DATA} syncterm.1.gz $(DESTDIR)${MANPREFIX}/man/man1
- 
- devel: tags cscope.out
- 
diff --git a/comms/syncterm/pkg-plist b/comms/syncterm/pkg-plist
index 2367e6edf1b1..e69de29bb2d1 100644
--- a/comms/syncterm/pkg-plist
+++ b/comms/syncterm/pkg-plist
@@ -1,8 +0,0 @@
-bin/syncterm
-man/man1/syncterm.1.gz
-share/applications/syncterm.desktop
-share/icons/hicolor/64x64/apps/syncterm.png
-@dirrmtry share/icons/hicolor/64x64/apps
-@dirrmtry share/icons/hicolor/64x64
-@dirrmtry share/icons/hicolor
-@dirrmtry share/icons