From owner-svn-ports-all@FreeBSD.ORG Wed Mar 26 01:46:21 2014 Return-Path: Delivered-To: svn-ports-all@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 ESMTPS id 886BD394; Wed, 26 Mar 2014 01:46:21 +0000 (UTC) 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 7488432D; Wed, 26 Mar 2014 01:46:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2Q1kL7m009487; Wed, 26 Mar 2014 01:46:21 GMT (envelope-from swills@svn.freebsd.org) Received: (from swills@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2Q1kLpH009486; Wed, 26 Mar 2014 01:46:21 GMT (envelope-from swills@svn.freebsd.org) Message-Id: <201403260146.s2Q1kLpH009486@svn.freebsd.org> From: Steve Wills Date: Wed, 26 Mar 2014 01:46:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r349207 - head/net/linux-nx-client X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Mar 2014 01:46:21 -0000 Author: swills Date: Wed Mar 26 01:46:20 2014 New Revision: 349207 URL: http://svnweb.freebsd.org/changeset/ports/349207 QAT: https://qat.redports.org/buildarchive/r349207/ Log: - Stage PR: ports/187891 Submitted by: Johannes Jost Meixner Modified: head/net/linux-nx-client/Makefile Modified: head/net/linux-nx-client/Makefile ============================================================================== --- head/net/linux-nx-client/Makefile Wed Mar 26 01:44:29 2014 (r349206) +++ head/net/linux-nx-client/Makefile Wed Mar 26 01:46:20 2014 (r349207) @@ -3,7 +3,7 @@ PORTNAME= linux-nx-client PORTVERSION= 3.4.0 -PORTREVISION= 2 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= http://web04.nomachine.com/download/${PORTVERSION}/Linux/ DISTNAME= nxclient-${PORTVERSION}-5.i386 @@ -28,47 +28,46 @@ PLIST_SUB+= PORTVERSION=${PORTVERSION} # Patch binary to expect EINVAL (FreeBSD) instead of EOPNOTSUPP (Linux) when # trying to set TCP_NODELAY on the X11 unix domain socket. -NO_STAGE= yes do-build: ${REINPLACE_CMD} -e 's/\x83\xf8\x5f\x0f\x84/\x83\xf8\x16\x0f\x84/' \ ${NXSRC}/lib/libXcomp.so.${PORTVERSION} do-install: - ${MKDIR} ${NXDST}/bin - ${INSTALL_PROGRAM} ${NXSRC}/bin/* ${NXDST}/bin - ${MKDIR} ${NXDST}/lib + ${MKDIR} ${STAGEDIR}${NXDST}/bin + ${INSTALL_PROGRAM} ${NXSRC}/bin/* ${STAGEDIR}${NXDST}/bin + ${MKDIR} ${STAGEDIR}${NXDST}/lib .for f in libXcomp libXcompsh - ${INSTALL_DATA} ${NXSRC}/lib/${f}.so.${PORTVERSION} ${NXDST}/lib - ${LN} -sf ${f}.so.${PORTVERSION} ${NXDST}/lib/${f}.so - ${LN} -sf ${f}.so.${PORTVERSION} ${NXDST}/lib/${f}.so.3 + ${INSTALL_DATA} ${NXSRC}/lib/${f}.so.${PORTVERSION} ${STAGEDIR}${NXDST}/lib + ${LN} -sf ${f}.so.${PORTVERSION} ${STAGEDIR}${NXDST}/lib/${f}.so + ${LN} -sf ${f}.so.${PORTVERSION} ${STAGEDIR}${NXDST}/lib/${f}.so.3 .endfor - ${INSTALL_DATA} ${NXSRC}/lib/libcrypto.so.0.9.8 ${NXDST}/lib - ${LN} -sf libcrypto.so.0.9.8 ${NXDST}/lib/libcrypto.so - ${MKDIR} ${NXDST}/share - ${INSTALL_DATA} ${NXSRC}/share/keyboards ${NXDST}/share - ${MKDIR} ${NXDST}/share/keys - ${INSTALL_DATA} ${NXSRC}/share/keys/* ${NXDST}/share/keys - ${MKDIR} ${NXDST}/share/images - ${INSTALL_DATA} ${NXSRC}/share/images/* ${NXDST}/share/images - - ${MKDIR} ${LOCALBASE}/share/pixmaps - ${INSTALL_DATA} ${NXSRC}/share/icons/48x48/*.png ${LOCALBASE}/share/pixmaps - ${MKDIR} ${LOCALBASE}/share/icons/crystalsvg/48x48 \ - ${LOCALBASE}/share/icons/crystalsvg/32x32 \ - ${LOCALBASE}/share/icons/crystalsvg/22x22 \ - ${LOCALBASE}/share/icons/crystalsvg/16x16 + ${INSTALL_DATA} ${NXSRC}/lib/libcrypto.so.0.9.8 ${STAGEDIR}${NXDST}/lib + ${LN} -sf libcrypto.so.0.9.8 ${STAGEDIR}${NXDST}/lib/libcrypto.so + ${MKDIR} ${STAGEDIR}${NXDST}/share + ${INSTALL_DATA} ${NXSRC}/share/keyboards ${STAGEDIR}${NXDST}/share + ${MKDIR} ${STAGEDIR}${NXDST}/share/keys + ${INSTALL_DATA} ${NXSRC}/share/keys/* ${STAGEDIR}${NXDST}/share/keys + ${MKDIR} ${STAGEDIR}${NXDST}/share/images + ${INSTALL_DATA} ${NXSRC}/share/images/* ${STAGEDIR}${NXDST}/share/images + + ${MKDIR} ${STAGEDIR}${LOCALBASE}/share/pixmaps + ${INSTALL_DATA} ${NXSRC}/share/icons/48x48/*.png ${STAGEDIR}${LOCALBASE}/share/pixmaps + ${MKDIR} ${STAGEDIR}${LOCALBASE}/share/icons/crystalsvg/48x48 \ + ${STAGEDIR}${LOCALBASE}/share/icons/crystalsvg/32x32 \ + ${STAGEDIR}${LOCALBASE}/share/icons/crystalsvg/22x22 \ + ${STAGEDIR}${LOCALBASE}/share/icons/crystalsvg/16x16 .for x in 16x16 22x22 32x32 48x48 - ${MKDIR} ${LOCALBASE}/share/icons/crystalsvg/${x} + ${MKDIR} ${STAGEDIR}${LOCALBASE}/share/icons/crystalsvg/${x} ${INSTALL_DATA} ${NXSRC}/share/icons/${x}/* \ - ${LOCALBASE}/share/icons/crystalsvg/${x} + ${STAGEDIR}${LOCALBASE}/share/icons/crystalsvg/${x} .endfor .for f in nxclient nxesd nxkill nxservice nxssh + ${BRANDELF} -t Linux ${NXSRC}/bin/${f} ${ECHO_CMD} "#!/bin/sh" > ${WRKSRC}/${f} ${ECHO_CMD} "export NXDIR=${NXDST}" >> ${WRKSRC}/${f} ${ECHO_CMD} "exec \$$NXDIR/bin/${f} \"\$$@\"" >> ${WRKSRC}/${f} - ${INSTALL_SCRIPT} ${WRKSRC}/${f} ${PREFIX}/bin - ${BRANDELF} -t Linux ${NXDST}/bin/${f} + ${INSTALL_SCRIPT} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/bin .endfor .include