[103700] trunk/dports
cal at macports.org
cal at macports.org
Mon Mar 4 15:55:28 PST 2013
Revision: 103700
https://trac.macports.org/changeset/103700
Author: cal at macports.org
Date: 2013-03-04 15:55:28 -0800 (Mon, 04 Mar 2013)
Log Message:
-----------
x2goclient: update to 4.0.0.4, remove patchfiles integrated upstream
nxcomp & nxproxy: switch to patched distfile provided by x2go, unify into one Portfile using subports, update to 3.5.0.17
Modified Paths:
--------------
trunk/dports/aqua/x2goclient/Portfile
trunk/dports/net/nxcomp/Portfile
Added Paths:
-----------
trunk/dports/net/nxcomp/files/
trunk/dports/net/nxcomp/files/patch-nxcomp__Makefile.in.diff
trunk/dports/net/nxcomp/files/patch-nxcomp__configure.in.diff
trunk/dports/net/nxcomp/files/patch-nxproxy__Makefile.in.diff
trunk/dports/net/nxcomp/files/patch-nxproxy__configure.in.diff
Removed Paths:
-------------
trunk/dports/aqua/x2goclient/files/
trunk/dports/net/nxcomp/files/
trunk/dports/net/nxproxy/
Modified: trunk/dports/aqua/x2goclient/Portfile
===================================================================
--- trunk/dports/aqua/x2goclient/Portfile 2013-03-04 23:40:50 UTC (rev 103699)
+++ trunk/dports/aqua/x2goclient/Portfile 2013-03-04 23:55:28 UTC (rev 103700)
@@ -5,7 +5,7 @@
PortGroup qt4 1.0
name x2goclient
-version 4.0.0.2
+version 4.0.0.4
livecheck.url http://code.x2go.org/releases/source/x2goclient/
livecheck.regex ${name}-(\\d+(?:\\.\\d+)*)\\.tar.gz
@@ -22,21 +22,17 @@
homepage http://www.x2go.org/
master_sites http://code.x2go.org/releases/source/${name}/
-checksums sha256 69ffdfd2f5f0ab8598ee26e945ab542927ca4d22cddf3229c107f97ee21c3e63 \
- rmd160 b24effc9ac29542653793eed7e645e195fb89ea4
+checksums sha256 b908b9775b888c0f61b64b4d63bd8042ee0728e69bda1ad4fbfd738ba4f6a325 \
+ rmd160 0194628ed3439746d519e30aa8ad40df6fb9a215
universal_variant yes
supported_archs ppc i386 x86_64
-depends_build port:qt4-mac
depends_lib port:qt4-mac \
port:nxproxy \
port:libssh \
port:xorg-libX11
-patchfiles patch-x2goclient.pro-do-not-set-archflags.patch \
- patch-x2goclient.pro-remove-deployment-target.diff
-
pre-configure {
system -W "${worksrcpath}" "${qt_lrelease_cmd} ${name}.pro"
}
Modified: trunk/dports/net/nxcomp/Portfile
===================================================================
--- trunk/dports/net/nxcomp/Portfile 2013-03-04 23:40:50 UTC (rev 103699)
+++ trunk/dports/net/nxcomp/Portfile 2013-03-04 23:55:28 UTC (rev 103700)
@@ -4,8 +4,7 @@
PortSystem 1.0
name nxcomp
-version 3.5.0-2
-revision 2
+version 3.5.0.17
categories net
platforms darwin
@@ -18,10 +17,10 @@
for use with x2go.
homepage http://www.nomachine.com/
-master_sites http://code.x2go.org/releases/source/nx-libs/nxcomp/
-worksrcdir ${name}
-checksums rmd160 b537b40aedcc0eca6cfac14da8ff702857e04c28 \
- sha256 30a51228509a083b4196e86596a6efb85b2e75e703f5d842158c9a27abb6ebc6
+master_sites http://code.x2go.org/releases/source/nx-libs/
+distname nx-libs-${version}-lite
+checksums rmd160 161a8af6ce7a8df023335bfcdcbed4e2fddc90f9 \
+ sha256 eeafed65885c72ac608b455a92cd6fcdc44209833c50bb5563a206e269dfa4d7
universal_variant yes
supported_archs ppc i386 x86_64
@@ -31,53 +30,51 @@
port:zlib \
port:xorg-xproto
-livecheck.url ${master_sites}
-livecheck.regex ${name}-(\[0-9\]+(\\.\[0-9\]+)+(-\[0-9\]+)?)
+use_autoreconf yes
-set major_version [lindex [split ${version} .] 0]
-set minor_version [join [lrange [split ${version} .] 0 1] .]
-set teeny_version [lindex [split [join [lrange [split ${version} .] 0 2] .] -] 0]
-
-patchfiles patch-Pgn.cpp-libpng15.diff
-
configure.cxxflags-append \
-I${prefix}/include
-post-configure {
- # the makefile would build a .so bundle, which we can't link against.
- # the following lines make the makefile build a dylib
- reinplace -E "s|LDFLAGS =|LDFLAGS = -dynamiclib -install_name ${prefix}/lib/libXcomp.${major_version}.dylib \
- -compatibility_version ${minor_version} -current_version ${teeny_version}|g" ${worksrcpath}/Makefile
- reinplace -E "s|\\.so(\\..*)?\$|\\1.dylib|g" ${worksrcpath}/Makefile
- reinplace -E "s|-bundle$||g" ${worksrcpath}/Makefile
+subport nxcomp {
+ worksrcdir nx-libs-${version}/nxcomp
- # Compiling C++ with -Wmissing-declarations generates a warning
- # There's no C source in this project anyway
- reinplace -E "s|-Wmissing-declarations||g" ${worksrcpath}/Makefile
+ patchfiles patch-nxcomp__configure.in.diff \
+ patch-nxcomp__Makefile.in.diff
+}
- # Our CFLAGS, CXXFLAGS aren't used if we don't do this
- reinplace -E "s|CXXFLAGS =|CXXFLAGS = ${configure.cxxflags}|g" ${worksrcpath}/Makefile
- reinplace -E "s|CCFLAGS =|CCFLAGS = ${configure.cflags}|g" ${worksrcpath}/Makefile
+subport nxproxy {
+ description nxproxy is a compressing proxy for X
+ long_description nxproxy is a library compressing X commands to be passed over network \
+ for use with x2go.
- # Won't build universal without this
- if {[variant_isset universal]} {
- reinplace -E "s|CXXFLAGS =|CXXFLAGS = ${configure.universal_cxxflags}|g" ${worksrcpath}/Makefile
- reinplace -E "s|CCFLAGS =|CCFLAGS = ${configure.universal_cflags}|g" ${worksrcpath}/Makefile
- }
-}
+ worksrcdir nx-libs-${version}/nxproxy
-destroot {
- # the makefile does not provide an install target
- # install headers
- xinstall -d ${destroot}${prefix}/include/${name}
- eval xinstall -m 0644 [glob ${worksrcpath}/NX*.h] ${destroot}${prefix}/include/${name}
+ patchfiles patch-nxproxy__configure.in.diff \
+ patch-nxproxy__Makefile.in.diff
- # install libraries
- set libname libXcomp.${teeny_version}.dylib
+ configure.ldflags-append \
+ -L${prefix}/lib/nx
- xinstall -m 0644 -W ${worksrcpath} libXcomp.a ${destroot}${prefix}/lib/libXcomp.a
- xinstall -m 0755 -W ${worksrcpath} ${libname} ${destroot}${prefix}/lib/${libname}
- ln -s ${libname} ${destroot}${prefix}/lib/libXcomp.${major_version}.dylib
- ln -s ${libname} ${destroot}${prefix}/lib/libXcomp.dylib
+ depends_lib port:nxcomp
+
+ livecheck.type none
}
+livecheck.url ${master_sites}
+livecheck.regex nx-libs-(\[0-9\]+(\\.\[0-9\]+)+(-\[0-9\]+)?)-lite
+
+#destroot {
+# # the makefile does not provide an install target
+# # install headers
+# xinstall -d ${destroot}${prefix}/include/${name}
+# eval xinstall -m 0644 [glob ${worksrcpath}/NX*.h] ${destroot}${prefix}/include/${name}
+#
+# # install libraries
+# set libname libXcomp.${teeny_version}.dylib
+#
+# xinstall -m 0644 -W ${worksrcpath} libXcomp.a ${destroot}${prefix}/lib/libXcomp.a
+# xinstall -m 0755 -W ${worksrcpath} ${libname} ${destroot}${prefix}/lib/${libname}
+# ln -s ${libname} ${destroot}${prefix}/lib/libXcomp.${major_version}.dylib
+# ln -s ${libname} ${destroot}${prefix}/lib/libXcomp.dylib
+#}
+
Added: trunk/dports/net/nxcomp/files/patch-nxcomp__Makefile.in.diff
===================================================================
--- trunk/dports/net/nxcomp/files/patch-nxcomp__Makefile.in.diff (rev 0)
+++ trunk/dports/net/nxcomp/files/patch-nxcomp__Makefile.in.diff 2013-03-04 23:55:28 UTC (rev 103700)
@@ -0,0 +1,54 @@
+--- Makefile.in.orig 2013-03-05 00:09:10.000000000 +0100
++++ Makefile.in 2013-03-05 00:16:19.000000000 +0100
+@@ -91,9 +91,9 @@
+ LIBRARY = Xcomp
+
+ LIBNAME = lib$(LIBRARY)
+-LIBFULL = lib$(LIBRARY).so.$(VERSION)
+-LIBLOAD = lib$(LIBRARY).so.$(LIBVERSION)
+-LIBSHARED = lib$(LIBRARY).so
++LIBFULL = lib$(LIBRARY)$(VERSION).dylib
++LIBLOAD = lib$(LIBRARY)$(LIBVERSION).dylib
++LIBSHARED = lib$(LIBRARY).dylib
+ LIBARCHIVE = lib$(LIBRARY).a
+
+ LIBCYGSHARED = cyg$(LIBRARY).dll
+@@ -231,7 +231,11 @@
+ CXXOBJ = $(CXXSRC:.cpp=.o)
+
+ $(LIBFULL): $(CXXOBJ) $(COBJ)
+- $(CXX) -o $@ $(LDFLAGS) $(CXXOBJ) $(COBJ) $(LIBS)
++ $(CXX) -o $@ \
++ -install_name $(libdir)/nx/$@ \
++ -compatibility_version $(LIBVERSION) \
++ -current_version $(LIBVERSION) \
++ $(LDFLAGS) $(CXXOBJ) $(COBJ) $(LIBS)
+
+ $(LIBLOAD): $(LIBFULL)
+ rm -f $(LIBLOAD)
+@@ -277,9 +281,9 @@
+ ./mkinstalldirs $(DESTDIR)${libdir}/nx
+ ./mkinstalldirs $(DESTDIR)${includedir}/nx
+ $(INSTALL_DATA) $(LIBFULL) $(DESTDIR)${libdir}/nx
+- $(INSTALL_LINK) libXcomp.so.3 $(DESTDIR)${libdir}/nx
+- $(INSTALL_LINK) libXcomp.so $(DESTDIR)${libdir}/nx
+- $(INSTALL_DATA) libXcomp.a $(DESTDIR)${libdir}/nx
++ $(INSTALL_LINK) $(LIBLOAD) $(DESTDIR)${libdir}/nx
++ $(INSTALL_LINK) $(LIBSHARED) $(DESTDIR)${libdir}/nx
++ $(INSTALL_DATA) $(LIBARCHIVE) $(DESTDIR)${libdir}/nx
+ $(INSTALL_DATA) NX*.h $(DESTDIR)${includedir}/nx
+ $(INSTALL_DATA) MD5.h $(DESTDIR)${includedir}/nx
+ echo "Running ldconfig tool, this may take a while..." && ldconfig || true
+@@ -292,9 +296,9 @@
+
+ uninstall.lib:
+ $(RM_FILE) $(DESTDIR)${libdir}/nx/$(LIBFULL)
+- $(RM_FILE) $(DESTDIR)${libdir}/nx/libXcomp.so.3
+- $(RM_FILE) $(DESTDIR)${libdir}/nx/libXcomp.so
+- $(RM_FILE) $(DESTDIR)${libdir}/nx/libXcomp.a
++ $(RM_FILE) $(DESTDIR)${libdir}/nx/$(LIBLOAD)
++ $(RM_FILE) $(DESTDIR)${libdir}/nx/$(LIBSHARED)
++ $(RM_FILE) $(DESTDIR)${libdir}/nx/$(LIBARCHIVE)
+ $(RM_FILE) $(DESTDIR)${includedir}/nx/NXalert.h
+ $(RM_FILE) $(DESTDIR)${includedir}/nx/NX.h
+ $(RM_FILE) $(DESTDIR)${includedir}/nx/NXmitshm.h
Added: trunk/dports/net/nxcomp/files/patch-nxcomp__configure.in.diff
===================================================================
--- trunk/dports/net/nxcomp/files/patch-nxcomp__configure.in.diff (rev 0)
+++ trunk/dports/net/nxcomp/files/patch-nxcomp__configure.in.diff 2013-03-04 23:55:28 UTC (rev 103700)
@@ -0,0 +1,11 @@
+--- configure.in.orig 2013-03-05 00:20:31.000000000 +0100
++++ configure.in 2013-03-05 00:20:38.000000000 +0100
+@@ -187,7 +187,7 @@
+ dnl the options -G -h.
+
+ if test "$DARWIN" = yes; then
+- LDFLAGS="$LDFLAGS -bundle"
++ LDFLAGS="$LDFLAGS -dynamiclib"
+ elif test "$SUN" = yes; then
+ LDFLAGS="$LDFLAGS -G -h \$(LIBLOAD)"
+ else
Added: trunk/dports/net/nxcomp/files/patch-nxproxy__Makefile.in.diff
===================================================================
--- trunk/dports/net/nxcomp/files/patch-nxproxy__Makefile.in.diff (rev 0)
+++ trunk/dports/net/nxcomp/files/patch-nxproxy__Makefile.in.diff 2013-03-04 23:55:28 UTC (rev 103700)
@@ -0,0 +1,16 @@
+--- Makefile.in.org 2013-03-05 00:30:16.000000000 +0100
++++ Makefile.in 2013-03-05 00:31:20.000000000 +0100
+@@ -15,11 +15,11 @@
+ -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \
+ -Wmissing-declarations -Wnested-externs
+
+-CXXINCLUDES = -I. -I../nxcomp
++CXXINCLUDES = -I. -I at prefix@/include/nx
+
+ CC = @CC@
+ CCFLAGS = $(CXXFLAGS)
+-CCINCLUDES = -I. -I../nxcomp
++CCINCLUDES = -I. -I at prefix@/include/nx
+ CCDEFINES =
+
+ LDFLAGS = @LDFLAGS@
Added: trunk/dports/net/nxcomp/files/patch-nxproxy__configure.in.diff
===================================================================
--- trunk/dports/net/nxcomp/files/patch-nxproxy__configure.in.diff (rev 0)
+++ trunk/dports/net/nxcomp/files/patch-nxproxy__configure.in.diff 2013-03-04 23:55:28 UTC (rev 103700)
@@ -0,0 +1,11 @@
+--- configure.in.orig 2013-03-05 00:33:47.000000000 +0100
++++ configure.in 2013-03-05 00:35:11.000000000 +0100
+@@ -161,7 +161,7 @@
+ if test "$CYGWIN32" = yes; then
+ LIBS="$LIBS -L../nxcomp -lXcomp -lstdc++ -Wl,-e,_mainCRTStartup -ljpeg -lpng -lz"
+ else
+- LIBS="$LIBS -L../nxcomp -lXcomp"
++ LIBS="$LIBS -lXcomp"
+ fi
+
+ dnl Find makedepend somewhere.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130304/004a6106/attachment-0001.html>
More information about the macports-changes
mailing list