Magellan Linux

  • Back to homepage
    • /[smage]/trunk/extras/nx/nx-3.5.0.33-r1.smage2

    Diff of /trunk/extras/nx/nx-3.5.0.33-r1.smage2

    Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

    revision 30237 by niro, Wed Nov 8 13:24:12 2017 UTC revision 30238 by niro, Thu Nov 9 09:36:49 2017 UTC
    # Line 4  PNAME="nx" Line 4  PNAME="nx"
    4  PVER="3.5.0.33"  PVER="3.5.0.33"
    5  PBUILD="r1"  PBUILD="r1"
    6    
    7  BASE_PVER="${PVER%.*}"  SPLIT_PACKAGES="nxcomp nxcompshad nxcompext nxlibs nxauth nxagent nxproxy x2goagent nx"
       
     SPLIT_PACKAGES="nxcomp nxcompsh nxcompshad nxcompext nxlibs nxauth nxagent nxproxy nxsensor nxssh nxuexec x2goagent nx"  
    8  PCAT="net-misc"  PCAT="net-misc"
    9    
    10  HOMEPAGE="http://www.nomachine.com/"  HOMEPAGE="http://www.nomachine.com/"
    # Line 28  X11_DEPEND=">= x11-libs/libX11-1.6" Line 26  X11_DEPEND=">= x11-libs/libX11-1.6"
    26  NX_DEPEND="${COMMON_DEPEND}"  NX_DEPEND="${COMMON_DEPEND}"
    27  NXCOMP_DEPEND="${STD_DEPEND}  NXCOMP_DEPEND="${STD_DEPEND}
    28   ${MEDIA_DEPEND}"   ${MEDIA_DEPEND}"
     NXCOMPSH_DEPEND="${STD_DEPEND}"  
    29  NXCOMPSHAD_DEPEND="${X11_DEPEND}  NXCOMPSHAD_DEPEND="${X11_DEPEND}
    30   ${COMMON_DEPEND}"   ${COMMON_DEPEND}"
    31  NXCOMPEXT_DEPEND="${STD_DEPEND}  NXCOMPEXT_DEPEND="${STD_DEPEND}
    # Line 42  NXAGENT_DEPEND="${X11_DEPEND} Line 39  NXAGENT_DEPEND="${X11_DEPEND}
    39   >= x11-misc/xkeyboard-config-2.20"   >= x11-misc/xkeyboard-config-2.20"
    40  NXAUTH_DEPEND=">= virtual/glibc"  NXAUTH_DEPEND=">= virtual/glibc"
    41  NXPROXY_DEPEND="${STD_DEPEND}"  NXPROXY_DEPEND="${STD_DEPEND}"
     NXSENSOR_DEPEND=">= dev-libs/glib2-2.54"  
     NXSSH_DEPEND=">= dev-libs/openssl-1.1  
      ${MEDIA_DEPEND}"  
     NXUEXEC_DEPEND=">= virtual/glibc"  
    42    
    43  SDEPEND="${NX_DEPEND}  SDEPEND="${NX_DEPEND}
    44   ${NXCOMP_DEPEND}   ${NXCOMP_DEPEND}
      ${NXCOMPSH_DEPEND}  
    45   ${NXCOMPSHAD_DEPEND}   ${NXCOMPSHAD_DEPEND}
    46   ${NXCOMPEXT_DEPEND}   ${NXCOMPEXT_DEPEND}
    47   ${NXAGENT_DEPEND}   ${NXAGENT_DEPEND}
    48   ${NXAUTH_DEPEND}   ${NXAUTH_DEPEND}
    49   ${NXPROXY_DEPEND}   ${NXPROXY_DEPEND}
      ${NXSENSOR_DEPEND}  
      ${NXSSH_DEPEND}  
      ${NXUEXEC_DEPEND}  
    50   >= x11-misc/gccmakedep-1   >= x11-misc/gccmakedep-1
    51   >= x11-misc/imake-1   >= x11-misc/imake-1
    52   >= x11-protos/xproto-7"   >= x11-protos/xproto-7"
    53    
    54  NXX11_PVER="${BASE_PVER}.32"  SRCDIR="${BUILDDIR}/nx-libs-${PVER}"
     NXCOMPSH_PVER="${BASE_PVER}-1"  
     NXSENSOR_PVER="${BASE_PVER}-1"  
     NXSSH_PVER="${BASE_PVER}-2"  
     NXUEXEC_PVER="${BASE_PVER}-3"  
       
     SRCDIR="${BUILDDIR}/nx-libs-${NXX11_PVER}"  
    55  NXX11_SRCDIR="${SRCDIR}/nx-X11"  NXX11_SRCDIR="${SRCDIR}/nx-X11"
    56  NXAUTH_SRCDIR="${SRCDIR}/nxauth"  NXAUTH_SRCDIR="${SRCDIR}/nxauth"
    57  NXCOMP_SRCDIR="${SRCDIR}/nxcomp"  NXCOMP_SRCDIR="${SRCDIR}/nxcomp"
     NXCOMPSH_SRCDIR="${BUILDDIR}/nxcompsh"  
    58  NXCOMPEXT_SRCDIR="${SRCDIR}/nxcompext"  NXCOMPEXT_SRCDIR="${SRCDIR}/nxcompext"
    59  NXCOMPSHAD_SRCDIR="${SRCDIR}/nxcompshad"  NXCOMPSHAD_SRCDIR="${SRCDIR}/nxcompshad"
    60  NXPROXY_SRCDIR="${SRCDIR}/nxproxy"  NXPROXY_SRCDIR="${SRCDIR}/nxproxy"
     NXSENSOR_SRCDIR="${BUILDDIR}/nxsensor-${NXSENSOR_PVER}"  
     NXSSH_SRCDIR="${BUILDDIR}/nxssh"  
     NXUEXEC_SRCDIR="${BUILDDIR}/nxuexec"  
    61    
    62  NXWRAPPER_PVER=""  NXWRAPPER_PVER="2"
    63  NXWRAPPER_SRCFILE="nxwrapper2.in"  NXWRAPPER_SRCFILE="nxwrapper${NXWRAPPER_PVER}.in"
    64  NXWRAPPER_SRCDIR="${BUILDDIR}/nxwrapper"  NXWRAPPER_SRCDIR="${BUILDDIR}/nxwrapper"
    65    
    66  sminclude mtools  sminclude mtools
    # Line 89  sminclude mtools Line 68  sminclude mtools
    68  SRC_URI=(  SRC_URI=(
    69   http://code.x2go.org/releases/source/nx-libs/nx-libs-${NXX11_PVER}-full.tar.gz   http://code.x2go.org/releases/source/nx-libs/nx-libs-${NXX11_PVER}-full.tar.gz
    70   mirror://${PNAME}/nx-libs/nx-libs-${NXX11_PVER}-full.tar.gz   mirror://${PNAME}/nx-libs/nx-libs-${NXX11_PVER}-full.tar.gz
      mirror://${PNAME}/nxcompsh-${NXCOMPSH_PVER}.tar.gz  
      mirror://${PNAME}/nxsensor-${NXSENSOR_PVER}.tar.gz  
      mirror://${PNAME}/nxssh-${NXSSH_PVER}.tar.gz  
      mirror://${PNAME}/nxuexec-${NXUEXEC_PVER}.tar.gz  
    71   mirror://${PNAME}/${NXWRAPPER_SRCFILE}   mirror://${PNAME}/${NXWRAPPER_SRCFILE}
      mirror://${PNAME}/nxcompsh-3.4.0-gcc43.patch  
    72  )  )
    73    
    74  UP2DATE="updatecmd http://code.x2go.org/releases/source/nx-libs/ | grep 'nx-libs-.*-full.tar.gz ' | sed 's/.*-\(.*\)-full.tar.gz.*/\1/' | upsort_pipe"  UP2DATE="updatecmd http://code.x2go.org/releases/source/nx-libs/ | grep 'nx-libs-.*-full.tar.gz ' | sed 's/.*-\(.*\)-full.tar.gz.*/\1/' | upsort_pipe"
    # Line 105  split_info_nxcomp() Line 79  split_info_nxcomp()
    79   DEPEND="${NXCOMP_DEPEND}"   DEPEND="${NXCOMP_DEPEND}"
    80  }  }
    81    
     split_info_nxcompsh()  
     {  
      DESCRIPTION="Nomachine NX compression service library."  
      DEPEND="${NXCOMPSH_DEPEND}"  
     }  
       
    82  split_info_nxcompext()  split_info_nxcompext()
    83  {  {
    84   DESCRIPTION="Nomachine NX compression library extensions."   DESCRIPTION="Nomachine NX compression library extensions."
    # Line 155  split_info_nxproxy() Line 123  split_info_nxproxy()
    123   == net-misc/nxcomp-${PVER}"   == net-misc/nxcomp-${PVER}"
    124  }  }
    125    
     split_info_nxsensor()  
     {  
      DESCRIPTION="Nomachine NX Gkrellm monitorin sensor."  
      DEPEND="${NXSENSOR_DEPEND}"  
     }  
       
     split_info_nxssh()  
     {  
      DESCRIPTION="Nomachine NX Openssh server."  
      DEPEND="${NXSSH_DEPEND}  
      == net-misc/nxcomp-${PVER}"  
     }  
       
     split_info_nxuexec()  
     {  
      DESCRIPTION="Nomachine NX privileged script executor."  
      DEPEND="${NXUEXEC_DEPEND}"  
     }  
       
    126  split_info_x2goagent()  split_info_x2goagent()
    127  {  {
    128   DESCRIPTION="X2Go wrapper around the Nomachine NX X11 agent server."   DESCRIPTION="X2Go wrapper around the Nomachine NX X11 agent server."
    # Line 184  split_info_nx() Line 133  split_info_nx()
    133  {  {
    134   DESCRIPTION="Meta package to pull in all Nomachine NX support packages."   DESCRIPTION="Meta package to pull in all Nomachine NX support packages."
    135   DEPEND="== net-misc/nxcomp-${PVER}   DEPEND="== net-misc/nxcomp-${PVER}
      == net-misc/nxcompsh-${PVER}  
    136   == net-misc/nxcompshad-${PVER}   == net-misc/nxcompshad-${PVER}
    137   == net-misc/nxcompext-${PVER}   == net-misc/nxcompext-${PVER}
    138   == net-misc/nxlibs-${PVER}   == net-misc/nxlibs-${PVER}
    139   == net-misc/nxauth-${PVER}   == net-misc/nxauth-${PVER}
    140   == net-misc/nxagent-${PVER}   == net-misc/nxagent-${PVER}
    141   == net-misc/nxproxy-${PVER}   == net-misc/nxproxy-${PVER}"
      == net-misc/nxsensor-${PVER}  
      == net-misc/nxssh-${PVER}  
      == net-misc/nxuexec-${PVER}"  
    142   PKGTYPE="virtual"   PKGTYPE="virtual"
    143  }  }
    144    
    145  src_prepare()  src_prepare()
    146  {  {
    147   munpack nx-libs-${NXX11_PVER}-full.tar.gz || die   munpack nx-libs-${NXX11_PVER}-full.tar.gz || die
      munpack nxcompsh-${NXCOMPSH_PVER}.tar.gz || die  
      munpack nxsensor-${NXSENSOR_PVER}.tar.gz || die  
      munpack nxssh-${NXSSH_PVER}.tar.gz || die  
      munpack nxuexec-${NXUEXEC_PVER}.tar.gz || die  
       
      # fix some compile issues with gcc >=4.3  
      cd ${NXCOMPSH_SRCDIR}  
      mpatch nxcompsh-3.4.0-gcc43.patch || die  
       
      # fix missing includes/libs with x2go nx-libs  
      cd ${NXSSH_SRCDIR}  
      sed -i "s:../nxcomp:${SRCDIR}/nxcomp:g" configure.ac || die  
      mautoreconf || die  
    148    
    149   # fix broken Makefile   # fix broken Makefile
    150   cd ${NXCOMPSHAD_SRCDIR}   cd ${NXCOMPSHAD_SRCDIR}
    # Line 247  src_compile() Line 179  src_compile()
    179   CONFIGURE="./configure --prefix=/usr --libdir=/usr/$(mlibdir) --libexecdir=/usr/$(mlibdir) --includedir=/usr/include" \   CONFIGURE="./configure --prefix=/usr --libdir=/usr/$(mlibdir) --libexecdir=/usr/$(mlibdir) --includedir=/usr/include" \
    180   || die   || die
    181    
      cd ${NXCOMPSH_SRCDIR}  
      ./configure --prefix=/usr || die "conf nxcompsh"  
      mmake || die "make nxcompsh"  
       
      cd ${NXSENSOR_SRCDIR}  
      ./configure --prefix=/usr --libdir=/usr/$(mlibdir) --libexecdir=/usr/$(mlibdir) --includedir=/usr/include || die  
      mmake || die  
       
      cd ${NXSSH_SRCDIR}  
      ./configure --prefix=/usr --libdir=/usr/$(mlibdir) --libexecdir=/usr/$(mlibdir) --includedir=/usr/include || die  
      mmake || die  
       
      cd ${NXUEXEC_SRCDIR}  
      ./configure --prefix=/usr --libdir=/usr/$(mlibdir) --libexecdir=/usr/$(mlibdir) --includedir=/usr/include || die  
      mmake || die  
       
    182   cd ${NXWRAPPER_SRCDIR}   cd ${NXWRAPPER_SRCDIR}
    183   sed -e "s:@@NXLIBDIR@@:/usr/$(mlibdir)/nx:g" \   sed -e "s:@@NXLIBDIR@@:/usr/$(mlibdir)/nx:g" \
    184   -e "s:@@NXLOCALLIBDIR@@:/usr/local/$(mlibdir)/nx:g" \   -e "s:@@NXLOCALLIBDIR@@:/usr/local/$(mlibdir)/nx:g" \
    # Line 278  src_install_nxcomp() Line 194  src_install_nxcomp()
    194   minstalldocs doc/README* doc/changelog || die   minstalldocs doc/README* doc/changelog || die
    195  }  }
    196    
     src_install_nxcompsh()  
     {  
      cd ${SRCDIR}  
      minstalldir /usr/$(mlibdir) || die  
      mcopy -a ${NXCOMPSH_SRCDIR}/libXcompsh.so\* /usr/$(mlibdir) || die  
      SRCDIR=${NXCOMPSH_SRCDIR} minstalldocs CHANGELOG COPYING LICENSE || die  
     }  
       
    197  src_install_nxcompext()  src_install_nxcompext()
    198  {  {
    199   cd ${SRCDIR}   cd ${SRCDIR}
    # Line 368  src_install_nxproxy() Line 276  src_install_nxproxy()
    276   minstalldocs doc/README* doc/changelog || die   minstalldocs doc/README* doc/changelog || die
    277  }  }
    278    
     src_install_nxssh()  
     {  
      cd ${SRCDIR}  
      minstalldir /usr/bin || die  
      minstallexec ${NXWRAPPER_SRCDIR}/nxwrapper /usr/bin/nxssh || die  
      minstalldir /usr/$(mlibdir)/nx/bin || die  
      minstallexec ${NXSSH_SRCDIR}/nxssh /usr/$(mlibdir)/nx/bin || die  
      SRCDIR=${NXSSH_SRCDIR} minstalldocs CHANGELOG LICENSE README || die  
     }  
       
     src_install_nxsensor()  
     {  
      cd ${SRCDIR}  
      minstalldir /usr/bin || die  
      minstallexec ${NXWRAPPER_SRCDIR}/nxwrapper /usr/bin/nxsensor || die  
      minstalldir /usr/$(mlibdir)/nx || die  
      minstallexec ${NXSENSOR_SRCDIR}/nxsensor /usr/$(mlibdir)/nx/bin || die  
      SRCDIR=${NXSENSOR_SRCDIR} minstalldocs CHANGELOG LICENSE README || die  
     }  
       
     src_install_nxuexec()  
     {  
      cd ${SRCDIR}  
      minstalldir /usr/bin || die  
      minstallexec ${NXWRAPPER_SRCDIR}/nxwrapper /usr/bin/nxuexec || die  
      minstalldir /usr/$(mlibdir)/nx/bin || die  
      minstallexec ${NXUEXEC_SRCDIR}/nxuexec /usr/$(mlibdir)/nx/bin || die  
      SRCDIR=${NXUEXEC_SRCDIR} minstalldocs CHANGELOG COPYING LICENSE || die  
     }  
       
    279  src_install_x2goagent()  src_install_x2goagent()
    280  {  {
    281   cd ${SRCDIR}   cd ${SRCDIR}
    Legend:
    Removed from v.30237  
    changed lines
      Added in v.30238