[csw-devel] SF.net SVN: gar:[21186] csw/mgar/pkg/erlang/trunk

[dmichelsen at users.sourceforge.net]

Revision: 21186
          http://gar.svn.sourceforge.net/gar/?rev=21186&view=rev
Author:   dmichelsen
Date:     2013-05-23 16:22:20 +0000 (Thu, 23 May 2013)
Log Message:
-----------
erlang/trunk: Update to R16B

Modified Paths:
--------------
    csw/mgar/pkg/erlang/trunk/Makefile
    csw/mgar/pkg/erlang/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/erlang/trunk/files/0001-Fix-main-signature.patch

Modified: csw/mgar/pkg/erlang/trunk/Makefile
===================================================================
--- csw/mgar/pkg/erlang/trunk/Makefile	2013-05-23 13:24:03 UTC (rev 21185)
+++ csw/mgar/pkg/erlang/trunk/Makefile	2013-05-23 16:22:20 UTC (rev 21186)
@@ -1,6 +1,6 @@
 # $Id$
 NAME = erlang
-VERSION = R15B02
+VERSION = R16B
 GARTYPE = v2
 
 DESCRIPTION = A functional programming language from Ericsson
@@ -15,9 +15,12 @@
 DISTNAME = otp_src_$(VERSION)
 DISTFILES  = $(DISTNAME).tar.gz
 
+PATCHFILES += 0001-Fix-main-signature.patch
+
 # TBD:
 # - Solaris 10 x86 needs a libdlpi.so symlink:
 #     ln -s /lib/libdlpi.so.1 /lib/libdlpi.so
+# Solaris patches needed 145923-03 (sparc) or 145924-03 (i386)
 
 # We want DTrace
 PACKAGING_PLATFORMS = solaris10-sparc solaris10-i386
@@ -26,8 +29,8 @@
 
 PACKAGES += CSWerlang
 SPKG_DESC_CSWerlang = A functional programming language from Ericsson
-RUNTIME_DEP_PKGS_CSWerlang += CSWemacscommon
 RUNTIME_DEP_PKGS_CSWerlang += CSWlibncurses5
+RUNTIME_DEP_PKGS_CSWerlang += CSWlibssl1-0-0
 
 PACKAGES += CSWerlang-dev
 SPKG_DESC_CSWerlang-dev = Ericson Erlang OTP library sources and headers

Modified: csw/mgar/pkg/erlang/trunk/checksums
===================================================================
--- csw/mgar/pkg/erlang/trunk/checksums	2013-05-23 13:24:03 UTC (rev 21185)
+++ csw/mgar/pkg/erlang/trunk/checksums	2013-05-23 16:22:20 UTC (rev 21186)
@@ -1 +1 @@
-ccbe5e032a2afe2390de8913bfe737a1  otp_src_R15B02.tar.gz
+7ee131515bc496e7522e0dec2a4c26e3  otp_src_R16B.tar.gz

Added: csw/mgar/pkg/erlang/trunk/files/0001-Fix-main-signature.patch
===================================================================
--- csw/mgar/pkg/erlang/trunk/files/0001-Fix-main-signature.patch	                        (rev 0)
+++ csw/mgar/pkg/erlang/trunk/files/0001-Fix-main-signature.patch	2013-05-23 16:22:20 UTC (rev 21186)
@@ -0,0 +1,48 @@
+From 22d2c18e2b5df4a56267748c972993e26c715595 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Thu, 23 May 2013 16:25:11 +0200
+Subject: [PATCH] Fix main signature
+
+---
+ lib/os_mon/c_src/ferrule.c    | 2 +-
+ lib/os_mon/c_src/mod_syslog.c | 4 +++-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/lib/os_mon/c_src/ferrule.c b/lib/os_mon/c_src/ferrule.c
+index 744f302..f22f750 100644
+--- a/lib/os_mon/c_src/ferrule.c
++++ b/lib/os_mon/c_src/ferrule.c
+@@ -50,7 +50,7 @@
+ #define		FDS_STDIN	0
+ #define		FDS_PIPE	1
+ 
+-main(int argc, char *argv[])
++int main(int argc, char *argv[])
+ /*	usage: ferrule ownpath */
+ {
+     int		i, pipe_fd;
+diff --git a/lib/os_mon/c_src/mod_syslog.c b/lib/os_mon/c_src/mod_syslog.c
+index 87fbfba..6f8b566 100644
+--- a/lib/os_mon/c_src/mod_syslog.c
++++ b/lib/os_mon/c_src/mod_syslog.c
+@@ -47,7 +47,7 @@
+ #define		TRUE		1
+ #define		WAIT		1
+ 
+-main(int argc, char *argv[])
++int main(int argc, char *argv[])
+ /*	usage: mod_syslog mode ownpath syslogconf */
+ {
+     int	syslogd_pid, n_lines_copied=0;
+@@ -128,6 +128,8 @@ main(int argc, char *argv[])
+        make_exit(PIPE_NOT_FOUND);
+        else */
+     make_exit(OK);
++
++    return 0;
+ }
+ 
+ void	make_exit(int exit_code)
+-- 
+1.8.1.4
+

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