[csw-devel] SF.net SVN: gar:[13174] csw/mgar/pkg

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Wed Feb 2 16:06:57 CET 2011


Revision: 13174
          http://gar.svn.sourceforge.net/gar/?rev=13174&view=rev
Author:   dmichelsen
Date:     2011-02-02 15:06:56 +0000 (Wed, 02 Feb 2011)

Log Message:
-----------
aria2: Initial commit, now hangs on ugly c++ problem

Added Paths:
-----------
    csw/mgar/pkg/aria2/
    csw/mgar/pkg/aria2/Makefile
    csw/mgar/pkg/aria2/branches/
    csw/mgar/pkg/aria2/tags/
    csw/mgar/pkg/aria2/trunk/
    csw/mgar/pkg/aria2/trunk/Makefile
    csw/mgar/pkg/aria2/trunk/checksums
    csw/mgar/pkg/aria2/trunk/files/
    csw/mgar/pkg/aria2/trunk/files/0001-Remove-tailing-commas-in-enum.patch
    csw/mgar/pkg/aria2/trunk/files/0002-Use-inttypes-if-stdint-is-not-available.patch

Copied: csw/mgar/pkg/aria2/Makefile (from rev 13157, csw/mgar/pkg/template/Makefile)
===================================================================
--- csw/mgar/pkg/aria2/Makefile	                        (rev 0)
+++ csw/mgar/pkg/aria2/Makefile	2011-02-02 15:06:56 UTC (rev 13174)
@@ -0,0 +1,15 @@
+# vim: ft=make ts=4 sw=4 noet
+
+default:
+	@echo "You are in the pkg/ directory."
+
+%:
+	$(MAKE) -C trunk $* 
+
+paranoid-%:
+	$(MAKE) -C trunk $* || exit 2 
+
+export BUILDLOG ?= $(shell pwd)/buildlog.txt
+
+report-%:
+	$(MAKE) -C trunk $* || echo "	*** make $* in $$i failed ***" >> $(BUILDLOG) 


Property changes on: csw/mgar/pkg/aria2/trunk
___________________________________________________________________
Added: svn:ignore
   + cookies
download
work


Added: svn:externals
   + gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v2


Added: csw/mgar/pkg/aria2/trunk/Makefile
===================================================================
--- csw/mgar/pkg/aria2/trunk/Makefile	                        (rev 0)
+++ csw/mgar/pkg/aria2/trunk/Makefile	2011-02-02 15:06:56 UTC (rev 13174)
@@ -0,0 +1,21 @@
+# $Id$
+NAME = aria2
+VERSION = 1.10.9
+CATEGORIES = utils
+
+DESCRIPTION = The Next Generation Download Utility
+define BLURB
+endef
+
+MASTER_SITES = $(SF_MIRROR)
+DISTFILES  = $(DISTNAME).tar.xz
+
+PATCHFILES += 0001-Remove-tailing-commas-in-enum.patch
+PATCHFILES += 0002-Use-inttypes-if-stdint-is-not-available.patch
+
+# File name regex to get notifications about upstream software releases
+UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.xz
+
+CONFIGURE_ARGS = $(DIRPATHS)
+
+include gar/category.mk


Property changes on: csw/mgar/pkg/aria2/trunk/Makefile
___________________________________________________________________
Added: svn:keywords
   + Id

Added: csw/mgar/pkg/aria2/trunk/checksums
===================================================================
--- csw/mgar/pkg/aria2/trunk/checksums	                        (rev 0)
+++ csw/mgar/pkg/aria2/trunk/checksums	2011-02-02 15:06:56 UTC (rev 13174)
@@ -0,0 +1 @@
+531b27fec0ec3ecae6f8afa2b6445e7e  aria2-1.10.9.tar.xz

Added: csw/mgar/pkg/aria2/trunk/files/0001-Remove-tailing-commas-in-enum.patch
===================================================================
--- csw/mgar/pkg/aria2/trunk/files/0001-Remove-tailing-commas-in-enum.patch	                        (rev 0)
+++ csw/mgar/pkg/aria2/trunk/files/0001-Remove-tailing-commas-in-enum.patch	2011-02-02 15:06:56 UTC (rev 13174)
@@ -0,0 +1,39 @@
+From 76455a514108a4bae8346ebb4f81e927bc11d384 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Wed, 2 Feb 2011 15:42:22 +0100
+Subject: [PATCH 1/2] Remove tailing commas in enum
+
+---
+ src/Logger.h   |    2 +-
+ src/PeerStat.h |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/Logger.h b/src/Logger.h
+index 6d64e6e..5cec7f4 100644
+--- a/src/Logger.h
++++ b/src/Logger.h
+@@ -51,7 +51,7 @@ public:
+     A2_INFO   = 1 << 1,
+     A2_NOTICE = 1 << 2,
+     A2_WARN   = 1 << 3,
+-    A2_ERROR  = 1 << 4,
++    A2_ERROR  = 1 << 4
+   };
+ private:
+   LEVEL logLevel_;
+diff --git a/src/PeerStat.h b/src/PeerStat.h
+index fc491c1..48f3dd2 100644
+--- a/src/PeerStat.h
++++ b/src/PeerStat.h
+@@ -49,7 +49,7 @@ class PeerStat {
+ public:
+   enum STATUS {
+     IDLE,
+-    ACTIVE,
++    ACTIVE
+   };
+ private:
+   cuid_t cuid_;
+-- 
+1.7.3.2
+

Added: csw/mgar/pkg/aria2/trunk/files/0002-Use-inttypes-if-stdint-is-not-available.patch
===================================================================
--- csw/mgar/pkg/aria2/trunk/files/0002-Use-inttypes-if-stdint-is-not-available.patch	                        (rev 0)
+++ csw/mgar/pkg/aria2/trunk/files/0002-Use-inttypes-if-stdint-is-not-available.patch	2011-02-02 15:06:56 UTC (rev 13174)
@@ -0,0 +1,132 @@
+From 226b1019fd220a305bc3e9f364685c3fb2ff584e Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Wed, 2 Feb 2011 15:43:26 +0100
+Subject: [PATCH 2/2] Use inttypes if stdint is not available
+
+---
+ src/DownloadResult.h     |    8 +++++++-
+ src/ProgressAwareEntry.h |    9 ++++++++-
+ src/Segment.h            |    9 ++++++++-
+ src/TimeA2.h             |    8 +++++++-
+ src/TransferStat.h       |    8 +++++++-
+ src/common.h             |    8 +++++++-
+ 6 files changed, 44 insertions(+), 6 deletions(-)
+
+diff --git a/src/DownloadResult.h b/src/DownloadResult.h
+index f224750..e62f925 100644
+--- a/src/DownloadResult.h
++++ b/src/DownloadResult.h
+@@ -37,7 +37,13 @@
+ 
+ #include "common.h"
+ 
+-#include <stdint.h>
++#ifdef HAVE_STDINT_H
++#       include <stdint.h>
++#else
++# ifdef HAVE_INTTYPES_H
++#       include <inttypes.h>
++# endif
++#endif
+ 
+ #include <string>
+ #include <vector>
+diff --git a/src/ProgressAwareEntry.h b/src/ProgressAwareEntry.h
+index 48f0ad0..d658ef1 100644
+--- a/src/ProgressAwareEntry.h
++++ b/src/ProgressAwareEntry.h
+@@ -37,7 +37,14 @@
+ 
+ #include "common.h"
+ 
+-#include <stdint.h>
++#ifdef HAVE_STDINT_H
++#       include <stdint.h>
++#else
++# ifdef HAVE_INTTYPES_H
++#       include <inttypes.h>
++# endif
++#endif
++
+ #include <unistd.h>
+ 
+ #include "SharedHandle.h"
+diff --git a/src/Segment.h b/src/Segment.h
+index b8f38c9..efc181d 100644
+--- a/src/Segment.h
++++ b/src/Segment.h
+@@ -37,7 +37,14 @@
+ 
+ #include "common.h"
+ 
+-#include <stdint.h>
++#ifdef HAVE_STDINT_H
++#       include <stdint.h>
++#else
++# ifdef HAVE_INTTYPES_H
++#       include <inttypes.h>
++# endif
++#endif
++
+ #include <string>
+ 
+ #include "SharedHandle.h"
+diff --git a/src/TimeA2.h b/src/TimeA2.h
+index 97302a5..dd2a1fc 100644
+--- a/src/TimeA2.h
++++ b/src/TimeA2.h
+@@ -37,7 +37,13 @@
+ 
+ #include "common.h"
+ 
+-#include <stdint.h>
++#ifdef HAVE_STDINT_H
++#       include <stdint.h>
++#else
++# ifdef HAVE_INTTYPES_H
++#       include <inttypes.h>
++# endif
++#endif
+ 
+ #include <string>
+ 
+diff --git a/src/TransferStat.h b/src/TransferStat.h
+index b8ffef4..480fccf 100644
+--- a/src/TransferStat.h
++++ b/src/TransferStat.h
+@@ -36,7 +36,13 @@
+ #define D_TRANSFER_STAT_H
+ 
+ #include "common.h"
+-#include <stdint.h>
++#ifdef HAVE_STDINT_H
++#       include <stdint.h>
++#else
++# ifdef HAVE_INTTYPES_H
++#       include <inttypes.h>
++# endif
++#endif
+ 
+ namespace aria2 {
+ 
+diff --git a/src/common.h b/src/common.h
+index dee2bff..c2b9717 100644
+--- a/src/common.h
++++ b/src/common.h
+@@ -77,6 +77,12 @@ typedef _off_t off_t;
+ // use C99 limit macros
+ #define __STDC_LIMIT_MACROS
+ // included here for compatibility issues with old compiler/libraries.
+-#include <stdint.h>
++#ifdef HAVE_STDINT_H
++#	include <stdint.h>
++#else
++# ifdef HAVE_INTTYPES_H
++#	include <inttypes.h>
++# endif
++#endif
+ 
+ #endif // D_COMMON_H
+-- 
+1.7.3.2
+


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


More information about the devel mailing list