Date: Mon, 24 Mar 2014 02:39:42 +0200 (EET) From: Johannes Jost Meixner <xmj@chaot.net> To: FreeBSD-gnats-submit@freebsd.org Cc: xmj@chaot.net Subject: ports/187891: [PATCH] net/linux-nx-client: Stage Message-ID: <14547640286540404192.enqueue@mx12.chaot.net> Resent-Message-ID: <201403240040.s2O0e1OR001501@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 187891 >Category: ports >Synopsis: [PATCH] net/linux-nx-client: Stage >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Mar 24 00:40:01 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Johannes Jost Meixner >Release: FreeBSD 11.0-CURRENT amd64 >Organization: Goldener Grund OUe >Environment: System: FreeBSD mx12.chaot.net 11.0-CURRENT FreeBSD 11.0-CURRENT #6: Wed Mar 19 11:02:48 EET 2014 >Description: - Stagify Generated with FreeBSD Port Tools 1.00.2014.03.22 (mode: change, diff: SVN) >How-To-Repeat: >Fix: --- linux-nx-client-3.4.0.patch begins here --- Index: Makefile =================================================================== --- Makefile (revision 348914) +++ Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= linux-nx-client PORTVERSION= 3.4.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net MASTER_SITES= http://web04.nomachine.com/download/${PORTVERSION}/Linux/ DISTNAME= nxclient-${PORTVERSION}-5.i386 @@ -28,47 +28,46 @@ # 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 + ${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} ${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 + ${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 <bsd.port.mk> --- linux-nx-client-3.4.0.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?14547640286540404192.enqueue>