diff options
| author | Antoine Brodin <antoine@FreeBSD.org> | 2013-12-05 19:58:01 +0000 |
|---|---|---|
| committer | Antoine Brodin <antoine@FreeBSD.org> | 2013-12-05 19:58:01 +0000 |
| commit | 42e7cb3da634a3c87a7b67225a7d763ba9ed7e76 (patch) | |
| tree | 110ae1843a6792da14d1bb2758189bc6af52a3fd /net | |
| parent | Redesigned rc script to use a pidfile instead of attempting to use web API (diff) | |
- 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)
Notes
Notes:
svn path=/head/; revision=335682
Diffstat (limited to 'net')
| -rw-r--r-- | net/ssvnc/Makefile | 19 | ||||
| -rw-r--r-- | net/ssvnc/pkg-plist | 2 |
2 files changed, 6 insertions, 15 deletions
diff --git a/net/ssvnc/Makefile b/net/ssvnc/Makefile index 60195762735b..26adb1c98360 100644 --- a/net/ssvnc/Makefile +++ b/net/ssvnc/Makefile @@ -13,16 +13,15 @@ COMMENT= Enhanced TightVNC Viewer (SSVNC: SSL/SSH VNC viewer) 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> diff --git a/net/ssvnc/pkg-plist b/net/ssvnc/pkg-plist index cdca9c32d8ff..a8a284daf4bb 100644 --- a/net/ssvnc/pkg-plist +++ b/net/ssvnc/pkg-plist @@ -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 |