svn commit: r309979 - head/security/putty

[Matthias Andree]

Author: mandree
Date: Sun Jan  6 12:52:30 2013
New Revision: 309979
URL: http://svnweb.freebsd.org/changeset/ports/309979

Log:
  - Convert to Options NG. Renames GTK option to GTK2 for consistency.
  - Strip Makefile header.
  - Make sure that the port build heeds ${CC}, passing it through MAKE_ARGS.
  - Replace CC-is-clang specific -Wno-empty-body by unconditional -Wno-error.
  - Remove LIB_DEPENDS ABI versions.

Modified:
  head/security/putty/Makefile

Modified: head/security/putty/Makefile
==============================================================================
--- head/security/putty/Makefile	Sun Jan  6 11:29:44 2013	(r309978)
+++ head/security/putty/Makefile	Sun Jan  6 12:52:30 2013	(r309979)
@@ -2,7 +2,7 @@
 
 PORTNAME=	putty
 PORTVERSION=	0.62
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security ipv6
 MASTER_SITES=	http://the.earth.li/~sgtatham/putty/%SUBDIR%/ \
 		ftp://ftp.chiark.greenend.org.uk/users/sgtatham/putty-latest/
@@ -20,8 +20,8 @@ MAKEFILE=	Makefile.gtk
 PLIST_FILES=	bin/plink bin/pscp bin/psftp bin/puttygen
 MAN1=		plink.1 pscp.1 psftp.1 puttygen.1
 
-OPTIONS=	GSSAPI "Enable GSSAPI support" on \
-		GTK    "Enable GTK+ 2 GUI (recommended)" on
+OPTIONS_DEFINE=	GSSAPI GTK2
+OPTIONS_DEFAULT=GSSAPI GTK2
 
 CONFLICTS=	pssh-[0-9]*
 
@@ -29,7 +29,7 @@ CONFLICTS=	pssh-[0-9]*
 
 CFLAGS+=	-DBSD_PTYS -DOMIT_UTMP -DIPV6
 
-.if !defined(WITHOUT_GTK) && !defined(WITHOUT_X11)
+.if ${PORT_OPTIONS:MGTK2} && !defined(WITHOUT_X11)
 USE_GNOME=	gtk20
 PLIST_FILES+=	bin/pterm bin/putty bin/puttytel
 MAN1+=		pterm.1 putty.1 puttytel.1
@@ -40,10 +40,10 @@ MAKE_ARGS+=	GTK_CONFIG=:
 
 .include <bsd.port.pre.mk>
 
-.if !defined(WITHOUT_GSSAPI)
+.if ${PORT_OPTIONS:MGSSAPI}
 _COMPAT=		-DSTATIC_GSSAPI
 .if ${OSVERSION} >= 900000
-LIB_DEPENDS+=		krb5support.0:${PORTSDIR}/security/krb5
+LIB_DEPENDS+=		krb5support:${PORTSDIR}/security/krb5
 .endif
 .else
 _COMPAT=		-DNO_GSSAPI
@@ -55,18 +55,19 @@ _COMPAT+=	-DOMIT_UTMP
 XFLAGS=		-DDEBUG
 .endif
 
-.if ${CC:T} == clang
-XFLAGS+=	-Wno-empty-body
-.endif
+# upstream sets -Werror - there are no issues on 9.1-FreeBSD amd64
+# currently, but override it nonetheless.
+XFLAGS+=	-Wno-error
 
 MAKE_ARGS+=	COMPAT="${_COMPAT}" \
+		CC="${CC}" \
 		XFLAGS="${XFLAGS}" \
 		INSTALL_DATA="${INSTALL_DATA}" \
 		INSTALL_PROGRAM="${INSTALL_PROGRAM}"
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,prefix=/usr/local,prefix=${PREFIX},;\
-			      s,make,${GMAKE},' \
+			      s,make,${GMAKE},'\
 		${WRKSRC}/${MAKEFILE}
 
 .include <bsd.port.post.mk>