Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 5 Dec 2013 19:58:01 +0000 (UTC)
From:      Antoine Brodin <antoine@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r335682 - head/net/ssvnc
Message-ID:  <201312051958.rB5Jw1TV019094@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: antoine
Date: Thu Dec  5 19:58:01 2013
New Revision: 335682
URL: http://svnweb.freebsd.org/changeset/ports/335682

Log:
  - Fix packaging without DOCS or with ULTRAFTP
  - Use new LIB_DEPENDS syntax and tk:wrapper
  - Simplify ULTRAFTP option with MAKE_ARGS
  
  PR:		ports/184157
  Submitted by:	wblock (previous version)

Modified:
  head/net/ssvnc/Makefile
  head/net/ssvnc/pkg-plist

Modified: head/net/ssvnc/Makefile
==============================================================================
--- head/net/ssvnc/Makefile	Thu Dec  5 19:32:43 2013	(r335681)
+++ head/net/ssvnc/Makefile	Thu Dec  5 19:58:01 2013	(r335682)
@@ -13,16 +13,15 @@ COMMENT=	Enhanced TightVNC Viewer (SSVNC
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg
+LIB_DEPENDS=	libjpeg.so.11:${PORTSDIR}/graphics/jpeg
 RUN_DEPENDS=	stunnel:${PORTSDIR}/security/stunnel \
 		xterm:${PORTSDIR}/x11/xterm
 
-OPTIONS_DEFINE=	ULTRAFTP DOCS
+OPTIONS_DEFINE=	DOCS ULTRAFTP
 ULTRAFTP_DESC=	UltraVNC File Transfer support (Java required)
 
-USES=		imake:env gmake perl5
+USES=		imake:env gmake perl5 tk:wrapper
 USE_XORG=	xi xmu xt xaw ice xpm xext sm
-USE_TK_WRAPPER=	yes
 USE_PERL5=	run
 
 MAKE_ENV+=	ROOT=${STAGEDIR}
@@ -33,6 +32,7 @@ MAKE_ENV+=	ROOT=${STAGEDIR}
 USE_JAVA=	yes
 PLIST_SUB+=	ULTRAFTP=""
 .else
+MAKE_ARGS+=	JSRC=""
 PLIST_SUB+=	ULTRAFTP="@comment "
 .endif
 
@@ -45,24 +45,15 @@ 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 ! ${PORT_OPTIONS:MULTRAFTP}
-	@${REINPLACE_CMD} -e "s|sh -c 'type javac'|:|" \
-		-e "s|sh -c 'type jar'|:|" \
-		-e 's|cd $$(JSRC);|: |' \
-		-e 's|cp -p $$(ARCHIVE)|:|' \
-		${WRKSRC}/Makefile
-.endif
 
 do-configure:
-	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} config
+	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} config
 
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${MAN1PREFIX}/man/man1
 .for man in ssvnc.1 ssvncviewer.1
 	${INSTALL_MAN} ${WRKSRC}/man/man1/${man} \
 		${STAGEDIR}${MAN1PREFIX}/man/man1
 .endfor
-.endif
 
 .include <bsd.port.mk>

Modified: head/net/ssvnc/pkg-plist
==============================================================================
--- head/net/ssvnc/pkg-plist	Thu Dec  5 19:32:43 2013	(r335681)
+++ head/net/ssvnc/pkg-plist	Thu Dec  5 19:58:01 2013	(r335682)
@@ -10,12 +10,12 @@ lib/ssvnc/ultravnc_dsm_helper
 lib/ssvnc/unwrap.so
 lib/ssvnc/util/ss_vncviewer
 lib/ssvnc/util/ssvnc.tcl
+%%ULTRAFTP%%lib/ssvnc/util/ultraftp.jar
 lib/ssvnc/vncstorepw
 lib/ssvnc/vncviewer
 man/man1/ssvnc-gui.1.gz
 man/man1/ssvnc.1.gz
 man/man1/ssvncviewer.1.gz
-%%ULTRAFTP%%lib/ssvnc/ultraftp.jar
 share/applications/ssvnc.desktop
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/stunnel-server.conf



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312051958.rB5Jw1TV019094>