[128167] trunk/dports/net/nxcomp

[cal at macports.org]

Revision: 128167
          https://trac.macports.org/changeset/128167
Author:   cal at macports.org
Date:     2014-11-15 08:47:42 -0800 (Sat, 15 Nov 2014)
Log Message:
-----------
nxcomp/nxproxy: update to 3.5.0.28, remove patches integrated upstream

Modified Paths:
--------------
    trunk/dports/net/nxcomp/Portfile

Removed Paths:
-------------
    trunk/dports/net/nxcomp/files/patch-nxcomp__Loop.cpp-yosemite-compat.diff
    trunk/dports/net/nxcomp/files/patch-nxcomp__Types.h-dont-use-STL-internals-on-libc++.diff

Modified: trunk/dports/net/nxcomp/Portfile
===================================================================
--- trunk/dports/net/nxcomp/Portfile	2014-11-15 08:17:41 UTC (rev 128166)
+++ trunk/dports/net/nxcomp/Portfile	2014-11-15 16:47:42 UTC (rev 128167)
@@ -4,9 +4,9 @@
 PortSystem              1.0
 
 name                    nxcomp
-version                 3.5.0.27
-checksums               rmd160  0612fb48de38f04f1f5aa3d4de995d60b7e1c50e \
-                        sha256  efbf6eed02b5eb2892828e2237dff4591442e96d0ac83f3d75c62a15101d6a27
+version                 3.5.0.28
+checksums               rmd160  c4e5bc6013c0ff72c0492d820cd8c52027e172ba \
+                        sha256  f0f47a4fe63a20d39a51e1446bb86ffaec70b816853e6db28d2519e72d428a7c
 
 categories              net
 platforms               darwin
@@ -33,8 +33,6 @@
                         -I${prefix}/include
 
 if {${name} eq ${subport}} {
-    revision            2
-
     depends_lib-append  port:libpng \
                         port:jpeg \
                         port:zlib \
@@ -43,9 +41,7 @@
     worksrcdir          nx-libs-${version}/nxcomp
 
     patchfiles          patch-nxcomp__configure.in.diff \
-                        patch-nxcomp__Makefile.in.diff \
-                        patch-nxcomp__Types.h-dont-use-STL-internals-on-libc++.diff \
-                        patch-nxcomp__Loop.cpp-yosemite-compat.diff
+                        patch-nxcomp__Makefile.in.diff
 
     livecheck.url       [lindex ${master_sites} 0]
     livecheck.regex     nx-libs-(\[0-9\]+(\\.\[0-9\]+)+(-\[0-9\]+)?)-lite
@@ -54,7 +50,6 @@
 }
 
 subport nxproxy {
-    revision            0
     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.

Deleted: trunk/dports/net/nxcomp/files/patch-nxcomp__Loop.cpp-yosemite-compat.diff
===================================================================
--- trunk/dports/net/nxcomp/files/patch-nxcomp__Loop.cpp-yosemite-compat.diff	2014-11-15 08:17:41 UTC (rev 128166)
+++ trunk/dports/net/nxcomp/files/patch-nxcomp__Loop.cpp-yosemite-compat.diff	2014-11-15 16:47:42 UTC (rev 128167)
@@ -1,11 +0,0 @@
---- Loop.cpp.orig	2014-10-19 16:28:40.000000000 +0200
-+++ Loop.cpp	2014-10-19 16:31:04.000000000 +0200
-@@ -4183,7 +4183,7 @@
- 
-   #ifdef __APPLE__
- 
--  if (strncasecmp(display, "/tmp/launch", 11) == 0)
-+  if (strstr(display, "/") != NULL)
-   {
-     #ifdef TEST
-     *logofs << "Loop: Using launchd service on socket '"

Deleted: trunk/dports/net/nxcomp/files/patch-nxcomp__Types.h-dont-use-STL-internals-on-libc++.diff
===================================================================
--- trunk/dports/net/nxcomp/files/patch-nxcomp__Types.h-dont-use-STL-internals-on-libc++.diff	2014-11-15 08:17:41 UTC (rev 128166)
+++ trunk/dports/net/nxcomp/files/patch-nxcomp__Types.h-dont-use-STL-internals-on-libc++.diff	2014-11-15 16:47:42 UTC (rev 128167)
@@ -1,37 +0,0 @@
---- Types.h.orig	2013-11-05 01:35:22.000000000 +0100
-+++ Types.h	2013-11-05 01:37:30.000000000 +0100
-@@ -55,6 +55,9 @@
-     return &*(vector < unsigned char >::begin());
-   }
- 
-+  // Avoid overriding clear() when using libc++. Fiddling with STL internals
-+  // doesn't really seem like a good idea to me anyway.
-+  #ifndef _LIBCPP_VECTOR
-   void clear()
-   {
-     #if defined(__STL_USE_STD_ALLOCATORS) || defined(__GLIBCPP_INTERNAL_VECTOR_H)
-@@ -95,12 +98,16 @@
- 
-     #endif  /* #if defined(__STL_USE_STD_ALLOCATORS) || defined(__GLIBCPP_INTERNAL_VECTOR_H) */
-   }
-+  #endif /* #ifdef _LIBCPP_VECTOR */
- };
- 
- class T_messages : public vector < Message * >
- {
-   public:
- 
-+  // Avoid overriding clear() when using libc++. Fiddling with STL internals
-+  // doesn't really seem like a good idea to me anyway.
-+  #ifndef _LIBCPP_VECTOR
-   void clear()
-   {
-     #if defined(__STL_USE_STD_ALLOCATORS) || defined(__GLIBCPP_INTERNAL_VECTOR_H)
-@@ -141,6 +148,7 @@
- 
-     #endif /* #if defined(__STL_USE_STD_ALLOCATORS) || defined(__GLIBCPP_INTERNAL_VECTOR_H) */
-   }
-+  #endif /* #ifndef _LIBCPP_VECTOR */
- };
- 
- typedef md5_byte_t * T_checksum;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141115/b58b3596/attachment.html>