From owner-svn-ports-head@FreeBSD.ORG  Thu Jul 25 22:57:40 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 95FBDD03;
 Thu, 25 Jul 2013 22:57:40 +0000 (UTC) (envelope-from jgh@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 837B625E3;
 Thu, 25 Jul 2013 22:57:40 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6PMvePA045661;
 Thu, 25 Jul 2013 22:57:40 GMT (envelope-from jgh@svn.freebsd.org)
Received: (from jgh@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6PMve6o045660;
 Thu, 25 Jul 2013 22:57:40 GMT (envelope-from jgh@svn.freebsd.org)
Message-Id: <201307252257.r6PMve6o045660@svn.freebsd.org>
From: Jason Helfman <jgh@FreeBSD.org>
Date: Thu, 25 Jul 2013 22:57:40 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r323676 - head/net/ssvnc
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 25 Jul 2013 22:57:40 -0000

Author: jgh
Date: Thu Jul 25 22:57:40 2013
New Revision: 323676
URL: http://svnweb.freebsd.org/changeset/ports/323676

Log:
  - unbreak package creation
  - while here standardize on empty PORT_OPTIONS and convert USE_GMAKE to USES
  
  PR:		180850
  Reported by:	Alfred Bartsch <bartsch@dssgmbh.de>

Modified:
  head/net/ssvnc/Makefile

Modified: head/net/ssvnc/Makefile
==============================================================================
--- head/net/ssvnc/Makefile	Thu Jul 25 22:56:06 2013	(r323675)
+++ head/net/ssvnc/Makefile	Thu Jul 25 22:57:40 2013	(r323676)
@@ -20,13 +20,13 @@ RUN_DEPENDS=	stunnel:${PORTSDIR}/securit
 OPTIONS_DEFINE=	ULTRAFTP DOCS
 ULTRAFTP_DESC=	UltraVNC File Transfer support (Java required)
 
-USES=		imake:env
+USES=		imake:env gmake
 USE_XORG=	xi xmu xt xaw ice xpm xext sm
 USE_TK_WRAPPER=	yes
 USE_PERL5_RUN=	yes
-USE_GMAKE=	yes
 
-MAN1=		ssvnc-gui.1 ssvncviewer.1
+MAN1=		ssvnc.1 ssvncviewer.1
+NO_INSTALL_MANPAGES=	yes
 
 .include <bsd.port.options.mk>
 
@@ -37,7 +37,7 @@ PLIST_SUB+=	ULTRAFTP=""
 PLIST_SUB+=	ULTRAFTP="@comment "
 .endif
 
-.if empty(PORT_OPTIONS:MDOCS)
+.if ! ${PORT_OPTIONS:MDOCS}
 MAKE_ARGS+=	DOCS=""
 .endif
 
@@ -46,7 +46,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|[[:<:]]ssvnc[[:>:]]|ssvnc-gui|' ${WRKSRC}/man/man1/ssvnc.1
 	@${REINPLACE_CMD} -e 's|/usr/local/bin|${LOCALBASE}/bin|' \
 		-e 's|^CC =|CC ?=|' ${WRKSRC}/vncstorepw/Makefile
-.if empty(PORT_OPTIONS:MULTRAFTP)
+.if ! ${PORT_OPTIONS:MULTRAFTP}
 	@${REINPLACE_CMD} -e "s|sh -c 'type javac'|:|" \
 		-e "s|sh -c 'type jar'|:|" \
 		-e 's|cd $$(JSRC);|: |' \
@@ -59,5 +59,11 @@ do-configure:
 
 post-install:
 	@${ECHO_CMD}; ${CAT} ${PKGMESSAGE}; ${ECHO_CMD}
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${MAN1PREFIX}/man/man1
+.for man in ${MAN1}
+	${INSTALL_MAN} ${WRKSRC}/man/man1/${man} ${MAN1PREFIX}/man/man1
+.endfor
+.endif
 
 .include <bsd.port.mk>