SF.net SVN: gar:[23718] csw/mgar/pkg/socat/trunk

[dmichelsen at users.sourceforge.net]

Revision: 23718
          http://sourceforge.net/p/gar/code/23718
Author:   dmichelsen
Date:     2014-05-28 10:05:48 +0000 (Wed, 28 May 2014)
Log Message:
-----------
socat/trunk: Work towards release, several tests failing

Modified Paths:
--------------
    csw/mgar/pkg/socat/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/socat/trunk/files/0001-Do-not-use-Wall.patch

Removed Paths:
-------------
    csw/mgar/pkg/socat/trunk/files/CSWsocat.depend
    csw/mgar/pkg/socat/trunk/files/CSWsocat.gspec
    csw/mgar/pkg/socat/trunk/files/CSWsocat.prototype

Modified: csw/mgar/pkg/socat/trunk/Makefile
===================================================================
--- csw/mgar/pkg/socat/trunk/Makefile	2014-05-28 09:49:59 UTC (rev 23717)
+++ csw/mgar/pkg/socat/trunk/Makefile	2014-05-28 10:05:48 UTC (rev 23718)
@@ -38,8 +38,11 @@
 MASTER_SITES = http://www.dest-unreach.org/socat/download/
 DISTFILES    = $(NAME)-$(VERSION).tar.gz
 
+VENDOR_URL = http://www.dest-unreach.org/socat/
 
-RUNTIME_DEP_PKGS = CSWlibssl1-0-0 CSWlibreadline6 CSWlibwrap1
+RUNTIME_DEP_PKGS_CSWsocat += CSWlibssl1-0-0
+RUNTIME_DEP_PKGS_CSWsocat += CSWlibreadline6
+RUNTIME_DEP_PKGS_CSWsocat += CSWlibwrap1
 
 # test.sh uses unescaped nested double quotes (doesn't work with /bin/bash)
 # PATCHFILES += 0001-Escape-nested-double-quotes.patch
@@ -50,7 +53,10 @@
 # Note that test.sh tends to see advanced bash feature creep, don't bother
 # getting them all working with /bin/bash, it's only the test suite.
 #TEST_SCRIPTS = /opt/csw/bin/bash $(WORKSRC)/test.sh
+#TEST_SCRIPTS = $(WORKSRC)/test.sh
 
+TEST_SCRIPTS = custom
+
 # When you run the tests on a non IPV6 system you can set HAVENOT_IP6
 # to shortcut some tests
 #TEST_ENV="HAVENOT_IP6=1"
@@ -120,10 +126,14 @@
 # where TESTNAME is one of the uppercase testnames from above 
 # (for example PTMXWAITSLAVE).
 
-TEST_SCRIPTS =
+# TEST_SCRIPTS =
 
 include gar/category.mk
 
+test-custom:
+	cd $(WORKSRC) && ./test.sh
+	@$(MAKECOOKIE)
+
 post-install-modulated: DOCDEST=$(DESTDIR)$(docdir)/$(NAME)
 post-install-modulated: 
 	ginstall -d $(DOCDEST)

Added: csw/mgar/pkg/socat/trunk/files/0001-Do-not-use-Wall.patch
===================================================================
--- csw/mgar/pkg/socat/trunk/files/0001-Do-not-use-Wall.patch	                        (rev 0)
+++ csw/mgar/pkg/socat/trunk/files/0001-Do-not-use-Wall.patch	2014-05-28 10:05:48 UTC (rev 23718)
@@ -0,0 +1,25 @@
+From 6b4136d6416b1af9f15d8c2662341fb8e5905792 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Mon, 28 Oct 2013 13:27:15 +0100
+Subject: [PATCH] Do not use -Wall
+
+---
+ Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index f319a62..e926aac 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -22,7 +22,7 @@ srcdir = @srcdir@
+ VPATH = @srcdir@
+ 
+ CC = @CC@
+-CCOPTS = $(CCOPT) -Wall -Wno-parentheses
++CCOPTS = $(CCOPT) 
+ 
+ SYSDEFS = @SYSDEFS@
+ CPPFLAGS = -I. @CPPFLAGS@
+-- 
+1.8.3.4
+

Deleted: csw/mgar/pkg/socat/trunk/files/CSWsocat.depend
===================================================================
--- csw/mgar/pkg/socat/trunk/files/CSWsocat.depend	2014-05-28 09:49:59 UTC (rev 23717)
+++ csw/mgar/pkg/socat/trunk/files/CSWsocat.depend	2014-05-28 10:05:48 UTC (rev 23718)
@@ -1,3 +0,0 @@
-P	CSWosslrt      openssl_rt - Openssl runtime libraries
-P	CSWreadline    readline - library to enable interactive line editing
-P	CSWtcpwrap     tcpwrappers - (ipv6.4 patched) lib and tools for pre-screening tcp connections

Deleted: csw/mgar/pkg/socat/trunk/files/CSWsocat.gspec
===================================================================
--- csw/mgar/pkg/socat/trunk/files/CSWsocat.gspec	2014-05-28 09:49:59 UTC (rev 23717)
+++ csw/mgar/pkg/socat/trunk/files/CSWsocat.gspec	2014-05-28 10:05:48 UTC (rev 23718)
@@ -1,4 +0,0 @@
-%var            bitname socat
-%var            pkgname CSWsocat
-%include        url file://%{GARDIR}/pkglib/csw_dyndepend.gspec
-%copyright      url file://%{WORKSRC}/COPYING

Deleted: csw/mgar/pkg/socat/trunk/files/CSWsocat.prototype
===================================================================
--- csw/mgar/pkg/socat/trunk/files/CSWsocat.prototype	2014-05-28 09:49:59 UTC (rev 23717)
+++ csw/mgar/pkg/socat/trunk/files/CSWsocat.prototype	2014-05-28 10:05:48 UTC (rev 23718)
@@ -1,10 +0,0 @@
-d none /opt/csw/bin 0755 root bin
-f none /opt/csw/bin/filan 0755 root bin
-f none /opt/csw/bin/procan 0755 root bin
-f none /opt/csw/bin/socat 0755 root bin
-d none /opt/csw/share/man 0755 root bin
-d none /opt/csw/share/man/man1 0755 root bin
-f none /opt/csw/share/man/man1/socat.1 0644 root bin
-d none /opt/csw/share/doc 0755 root bin
-d none /opt/csw/share/doc/socat 0755 root bin
-f none /opt/csw/share/doc/socat/changelog.CSW=changelog.CSW 0644 root bin

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.