[csw-devel] SF.net SVN: gar:[7071] csw/mgar/pkg/libevent/trunk

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Mon Nov 2 13:03:23 CET 2009


Revision: 7071
          http://gar.svn.sourceforge.net/gar/?rev=7071&view=rev
Author:   dmichelsen
Date:     2009-11-02 12:03:23 +0000 (Mon, 02 Nov 2009)

Log Message:
-----------
libevent: Update to version modulate on 1.1b and add 64 bit for latest version

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

Removed Paths:
-------------
    csw/mgar/pkg/libevent/trunk/files/CSWlibevent-devel.depend
    csw/mgar/pkg/libevent/trunk/files/CSWlibevent-devel.gspec
    csw/mgar/pkg/libevent/trunk/files/CSWlibevent-devel.prototype
    csw/mgar/pkg/libevent/trunk/files/CSWlibevent.depend
    csw/mgar/pkg/libevent/trunk/files/CSWlibevent.gspec
    csw/mgar/pkg/libevent/trunk/files/CSWlibevent.prototype
    csw/mgar/pkg/libevent/trunk/files/stdint.diff
    csw/mgar/pkg/libevent/trunk/files/testsh.diff

Modified: csw/mgar/pkg/libevent/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libevent/trunk/Makefile	2009-11-02 08:42:21 UTC (rev 7070)
+++ csw/mgar/pkg/libevent/trunk/Makefile	2009-11-02 12:03:23 UTC (rev 7071)
@@ -1,9 +1,17 @@
 GARNAME = libevent
 GARVERSION = 1.4.12
-DISTVERSION = $(GARVERSION)-stable
 CATEGORIES = lib
 
-DESCRIPTION = event notification library
+EXTRA_MODULATORS = GARVERSION
+MODULATIONS_GARVERSION = 1.1b 1.4.12
+
+SKIP_MODULATIONS = isa-sparcv9-garversion-1.1b
+SKIP_MODULATIONS += isa-amd64-garversion-1.1b
+
+DISTVERSION-1.1b = 1.1b
+DISTVERSION-1.4.12 = 1.4.12-stable
+
+DESCRIPTION = Event notification library
 define BLURB
   The libevent API provides a mechanism to execute a callback function when a
   specific event occurs on a file descriptor or after a timeout has been
@@ -12,21 +20,51 @@
 endef
 
 MASTER_SITES = http://www.monkey.org/~provos/
-DISTFILES    = $(GARNAME)-$(DISTVERSION).tar.gz
-#DISTFILES   += $(call admfiles,CSWlibevent,depend prototype)
-#DISTFILES   += $(call admfiles,CSWlibevent-devel,depend prototype)
+SOURCEFILES = $(foreach V,$(MODULATIONS_GARVERSION),$(GARNAME)-$(DISTVERSION-$V).tar.gz)
+DISTFILES += $(SOURCEFILES)
 
+NOEXTRACT = $(filter-out $(GARNAME)-$(DISTVERSION-$(GARVERSION)).tar.gz,$(SOURCEFILES))
+
+PACKAGES = CSWlibevent CSWlibevent-devel
+
+REQUIRED_PKGS_CSWlibevent-devel = CSWlibevent
+
+CATALOGNAME_CSWlibevent = libevent
+CATALOGNAME_CSWlibevent-devel = libevent_devel
+
+SPKG_DESC_CSWlibevent = Event notification library
+SPKG_DESC_CSWlibevent-devel = Event notification library header files
+
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*)-stable.tar.gz
 
-WORKSRC = $(WORKDIR)/$(GARNAME)-$(DISTVERSION)
+SPKG_SOURCEURL = http://www.monkey.org/~provos/libevent/
 
+WORKSRC = $(WORKDIR)/$(GARNAME)-$(DISTVERSION-$(GARVERSION))
+
+BUILD64 = 1
+NO_ISAEXEC = 1
 CONFIGURE_ARGS  = $(DIRPATHS) 
 
 TEST_TARGET = verify
 
+MERGE_SCRIPTS_isa-default-garversion-1.1b = copy-only
+MERGE_DIRS_isa-default-garversion-1.1b = $(libdir)
+MERGE_SCRIPTS_isa-extra-garversion-1.1b = copy-relocated-only
+MERGE_DIRS_isa-extra-garversion-1.1b = $(libdir)
+
+MERGE_SCRIPTS_isa-default-garversion-1.4.12 = copy-all
+MERGE_SCRIPTS_isa-extra-garversion-1.4.12 = copy-relocated-only
+MERGE_DIRS_isa-extra-garversion-1.4.12 = $(libdir)
+
+PKGFILES_CSWlibevent-devel = $(PKGFILES_DEVEL)
+PKGFILES_CSWlibevent-devel += $(bindir)/.*
+
 include gar/category.mk
 
 #LIBS += -lresolv -lnsl
 #export LIBS
 
+post-extract-modulated:
+	perl -pi -e 's,#!/bin/sh,#!/bin/bash,' $(WORKSRC)/test/test.sh
+	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/libevent/trunk/checksums
===================================================================
--- csw/mgar/pkg/libevent/trunk/checksums	2009-11-02 08:42:21 UTC (rev 7070)
+++ csw/mgar/pkg/libevent/trunk/checksums	2009-11-02 12:03:23 UTC (rev 7071)
@@ -1 +1,2 @@
-77b0d8b9885496871bb083165b35ba11  download/libevent-1.4.12-stable.tar.gz
+ec8dac612aa43ed172f300f396fcec49  libevent-1.1b.tar.gz
+77b0d8b9885496871bb083165b35ba11  libevent-1.4.12-stable.tar.gz

Deleted: csw/mgar/pkg/libevent/trunk/files/CSWlibevent-devel.depend
===================================================================
--- csw/mgar/pkg/libevent/trunk/files/CSWlibevent-devel.depend	2009-11-02 08:42:21 UTC (rev 7070)
+++ csw/mgar/pkg/libevent/trunk/files/CSWlibevent-devel.depend	2009-11-02 12:03:23 UTC (rev 7071)
@@ -1 +0,0 @@
-P CSWlibevent libevent - event notification library

Deleted: csw/mgar/pkg/libevent/trunk/files/CSWlibevent-devel.gspec
===================================================================
--- csw/mgar/pkg/libevent/trunk/files/CSWlibevent-devel.gspec	2009-11-02 08:42:21 UTC (rev 7070)
+++ csw/mgar/pkg/libevent/trunk/files/CSWlibevent-devel.gspec	2009-11-02 12:03:23 UTC (rev 7071)
@@ -1,29 +0,0 @@
-%var            bitname libevent_devel
-%var            pkgname CSWlibevent-devel
-%include        url file://%{PKGLIB}/csw_dyndepend.gspec
-%var            desc libevent development support
-%copyright
-Copyright (c) 2000-2004 Niels Provos <provos at citi.umich.edu>
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-3. The name of the author may not be used to endorse or promote products
-   derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

Deleted: csw/mgar/pkg/libevent/trunk/files/CSWlibevent-devel.prototype
===================================================================
--- csw/mgar/pkg/libevent/trunk/files/CSWlibevent-devel.prototype	2009-11-02 08:42:21 UTC (rev 7070)
+++ csw/mgar/pkg/libevent/trunk/files/CSWlibevent-devel.prototype	2009-11-02 12:03:23 UTC (rev 7071)
@@ -1,14 +0,0 @@
-d none /opt/csw/bin 0755 root bin
-f none /opt/csw/bin/event_rpcgen.py 0755 root bin
-d none /opt/csw/include 0755 root bin
-f none /opt/csw/include/evdns.h 0644 root bin
-f none /opt/csw/include/event.h 0644 root bin
-f none /opt/csw/include/evhttp.h 0644 root bin
-d none /opt/csw/lib 0755 root bin
-f none /opt/csw/lib/libevent.a 0644 root bin
-f none /opt/csw/lib/libevent.la 0755 root bin
-d none /opt/csw/share 0755 root bin
-d none /opt/csw/share/man 0755 root bin
-d none /opt/csw/share/man/man3 0755 root bin
-f none /opt/csw/share/man/man3/evdns.3 0644 root bin
-f none /opt/csw/share/man/man3/event.3 0644 root bin

Deleted: csw/mgar/pkg/libevent/trunk/files/CSWlibevent.depend
===================================================================
--- csw/mgar/pkg/libevent/trunk/files/CSWlibevent.depend	2009-11-02 08:42:21 UTC (rev 7070)
+++ csw/mgar/pkg/libevent/trunk/files/CSWlibevent.depend	2009-11-02 12:03:23 UTC (rev 7071)
@@ -1 +0,0 @@
-P CSWgcc4corert gcc4corert - GNU C Compiler Run Time

Deleted: csw/mgar/pkg/libevent/trunk/files/CSWlibevent.gspec
===================================================================
--- csw/mgar/pkg/libevent/trunk/files/CSWlibevent.gspec	2009-11-02 08:42:21 UTC (rev 7070)
+++ csw/mgar/pkg/libevent/trunk/files/CSWlibevent.gspec	2009-11-02 12:03:23 UTC (rev 7071)
@@ -1,28 +0,0 @@
-%var            bitname libevent
-%var            pkgname CSWlibevent
-%include        url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright
-Copyright (c) 2000-2004 Niels Provos <provos at citi.umich.edu>
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-3. The name of the author may not be used to endorse or promote products
-   derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

Deleted: csw/mgar/pkg/libevent/trunk/files/CSWlibevent.prototype
===================================================================
--- csw/mgar/pkg/libevent/trunk/files/CSWlibevent.prototype	2009-11-02 08:42:21 UTC (rev 7070)
+++ csw/mgar/pkg/libevent/trunk/files/CSWlibevent.prototype	2009-11-02 12:03:23 UTC (rev 7071)
@@ -1,4 +0,0 @@
-d none /opt/csw/lib 0755 root bin
-f none /opt/csw/lib/libevent-1.3e.so.1.0.3 0755 root bin
-s none /opt/csw/lib/libevent-1.3e.so.1=libevent-1.3e.so.1.0.3
-s none /opt/csw/lib/libevent.so=libevent-1.3e.so.1.0.3

Deleted: csw/mgar/pkg/libevent/trunk/files/stdint.diff
===================================================================
--- csw/mgar/pkg/libevent/trunk/files/stdint.diff	2009-11-02 08:42:21 UTC (rev 7070)
+++ csw/mgar/pkg/libevent/trunk/files/stdint.diff	2009-11-02 12:03:23 UTC (rev 7071)
@@ -1,72 +0,0 @@
-diff --speed-large-files --minimal -Nru libevent-1.3e.orig/epoll.c libevent-1.3e/epoll.c
---- libevent-1.3e.orig/epoll.c	2007-07-30 23:41:07.000000000 -0400
-+++ libevent-1.3e/epoll.c	2007-10-18 02:04:33.404892000 -0400
-@@ -28,7 +28,7 @@
- #include "config.h"
- #endif
- 
--#include <stdint.h>
-+//#include <stdint.h>
- #include <sys/types.h>
- #include <sys/tree.h>
- #include <sys/resource.h>
-diff --speed-large-files --minimal -Nru libevent-1.3e.orig/epoll_sub.c libevent-1.3e/epoll_sub.c
---- libevent-1.3e.orig/epoll_sub.c	2007-02-15 19:48:32.000000000 -0500
-+++ libevent-1.3e/epoll_sub.c	2007-10-18 02:04:33.429501000 -0400
-@@ -24,7 +24,7 @@
-  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  */
--#include <stdint.h>
-+//#include <stdint.h>
- 
- #include <sys/param.h>
- #include <sys/types.h>
-diff --speed-large-files --minimal -Nru libevent-1.3e.orig/evdns.c libevent-1.3e/evdns.c
---- libevent-1.3e.orig/evdns.c	2007-09-12 18:20:34.000000000 -0400
-+++ libevent-1.3e/evdns.c	2007-10-18 02:04:33.481063000 -0400
-@@ -80,7 +80,7 @@
- #include <fcntl.h>
- #include <sys/time.h>
- #ifdef HAVE_STDINT_H
--#include <stdint.h>
-+//#include <stdint.h>
- #endif
- #include <stdlib.h>
- #include <string.h>
-diff --speed-large-files --minimal -Nru libevent-1.3e.orig/event.h libevent-1.3e/event.h
---- libevent-1.3e.orig/event.h	2007-07-30 23:41:09.000000000 -0400
-+++ libevent-1.3e/event.h	2007-10-18 02:04:33.528924000 -0400
-@@ -32,7 +32,7 @@
- #endif
- 
- #include <sys/time.h>
--#include <stdint.h>
-+//#include <stdint.h>
- #include <stdarg.h>
- 
- #ifdef WIN32
-diff --speed-large-files --minimal -Nru libevent-1.3e.orig/event_rpcgen.py libevent-1.3e/event_rpcgen.py
---- libevent-1.3e.orig/event_rpcgen.py	2007-07-30 23:41:04.000000000 -0400
-+++ libevent-1.3e/event_rpcgen.py	2007-10-18 02:04:33.561748000 -0400
-@@ -1296,7 +1296,7 @@
-         name, guard, guard)
- 
-     # insert stdint.h - let's hope everyone has it
--    pre += '#include <stdint.h>\n'
-+    #pre += '#include <stdint.h>\n'
- 
-     for statement in headerdirect:
-         pre += '%s\n' % statement
-diff --speed-large-files --minimal -Nru libevent-1.3e.orig/test/regress.gen.h libevent-1.3e/test/regress.gen.h
---- libevent-1.3e.orig/test/regress.gen.h	2007-09-24 23:59:03.000000000 -0400
-+++ libevent-1.3e/test/regress.gen.h	2007-10-18 02:05:43.526021000 -0400
-@@ -5,7 +5,7 @@
- #ifndef _REGRESS_RPC_
- #define _REGRESS_RPC_
- 
--#include <stdint.h>
-+//#include <stdint.h>
- #define EVTAG_HAS(msg, member) ((msg)->member##_set == 1)
- #define EVTAG_ASSIGN(msg, member, args...) (*(msg)->member##_assign)(msg, ## args)
- #define EVTAG_GET(msg, member, args...) (*(msg)->member##_get)(msg, ## args)

Deleted: csw/mgar/pkg/libevent/trunk/files/testsh.diff
===================================================================
--- csw/mgar/pkg/libevent/trunk/files/testsh.diff	2009-11-02 08:42:21 UTC (rev 7070)
+++ csw/mgar/pkg/libevent/trunk/files/testsh.diff	2009-11-02 12:03:23 UTC (rev 7071)
@@ -1,9 +0,0 @@
-diff --speed-large-files --minimal -Nru libevent-1.2a.orig/test/test.sh libevent-1.2a/test/test.sh
---- libevent-1.2a.orig/test/test.sh	2006-10-27 23:28:57.000000000 -0400
-+++ libevent-1.2a/test/test.sh	2007-01-31 02:01:39.633670000 -0500
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/bash
- 
- setup () {
- 	 EVENT_NOKQUEUE=yes; export EVENT_NOKQUEUE


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