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

[dmichelsen at users.sourceforge.net]

Revision: 12221
          http://gar.svn.sourceforge.net/gar/?rev=12221&view=rev
Author:   dmichelsen
Date:     2011-01-06 13:20:01 +0000 (Thu, 06 Jan 2011)

Log Message:
-----------
libevent: Remove 1.1a and version modulation, make CSWlibevent stub to legacy version as 2.0 is out

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

Modified: csw/mgar/pkg/libevent/trunk/Makefile
===================================================================
--- csw/mgar/pkg/libevent/trunk/Makefile	2011-01-06 13:12:52 UTC (rev 12220)
+++ csw/mgar/pkg/libevent/trunk/Makefile	2011-01-06 13:20:01 UTC (rev 12221)
@@ -2,15 +2,6 @@
 VERSION = 1.4.14b
 CATEGORIES = lib
 
-EXTRA_MODULATORS = VERSION
-MODULATIONS_VERSION = 1.1a 1.4.14b
-
-SKIP_MODULATIONS = isa-sparcv9-garversion-1.1a
-SKIP_MODULATIONS += isa-amd64-garversion-1.1a
-
-DISTVERSION-1.1a = 1.1a
-DISTVERSION-1.4.14b = 1.4.14b-stable
-
 DESCRIPTION = Event notification library
 define BLURB
   The libevent API provides a mechanism to execute a callback function when a
@@ -20,60 +11,44 @@
 endef
 
 MASTER_SITES = http://www.monkey.org/~provos/
-SOURCEFILES = $(foreach V,$(MODULATIONS_VERSION),$(NAME)-$(DISTVERSION-$V).tar.gz)
-DISTFILES += $(SOURCEFILES)
+DISTNAME = $(NAME)-$(VERSION)-stable
+DISTFILES = $(DISTNAME).tar.gz
 
 # From http://www.monkey.org/~provos/libevent/LICENSE
 DISTFILES += LICENSE
 LICENSE = LICENSE
 
-NOEXTRACT = $(filter-out $(NAME)-$(DISTVERSION-$(VERSION)).tar.gz,$(SOURCEFILES))
+PACKAGES += CSWlibevent1-4-2
+CATALOGNAME_CSWlibevent1-4-2 = libevent1_4_2
+SPKG_DESC_CSWlibevent1-4-2 = Event notification library, libevent-1.4.so.2
+PKGFILES_CSWlibevent1-4-2 = $(PKGFILES_RT)
 
-PACKAGES = CSWlibevent CSWlibevent-devel
-
-RUNTIME_DEP_PKGS_CSWlibevent-devel = CSWlibevent
-
+PACKAGES += CSWlibevent
 CATALOGNAME_CSWlibevent = libevent
-CATALOGNAME_CSWlibevent-devel = libevent_devel
+SPKG_DESC_CSWlibevent = Legacy package as contents moved to soname-specific packages
+RUNTIME_DEP_PKGS_CSWlibevent = CSWlibevent1-4-2
+ARCHALL_CSWlibevent = 1
+PKGFILES_CSWlibevent = NOFILES
 
-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 = $(NAME)-(\d+(?:\.\d+)*)-stable.tar.gz
 
 SPKG_SOURCEURL = http://www.monkey.org/~provos/libevent/
 
-WORKSRC = $(WORKDIR)/$(NAME)-$(DISTVERSION-$(VERSION))
-
 BUILD64 = 1
 NOISAEXEC = 1
 CONFIGURE_ARGS  = $(DIRPATHS) 
 
 TEST_TARGET = verify
 
-MERGE_SCRIPTS_isa-default-garversion-1.1a = copy-only
-MERGE_DIRS_isa-default-garversion-1.1a = $(libdir)
-MERGE_SCRIPTS_isa-extra-garversion-1.1a = copy-relocated-only
-MERGE_DIRS_isa-extra-garversion-1.1a = $(libdir)
+# This is a legacy dependancy
+CHECKPKG_OVERRIDES_CSWlibevent += surplus-dependency|CSWlibevent1-4-2
 
-MERGE_SCRIPTS_isa-default-garversion-1.4.14b = copy-all
-MERGE_SCRIPTS_isa-extra-garversion-1.4.14b = copy-relocated-only
-MERGE_DIRS_isa-extra-garversion-1.4.14b = $(libdir)
+# This is a bug in checkpkg, remove after fixing
+CHECKPKG_OVERRIDES_CSWlibevent1-4-2 += shared-lib-pkgname-mismatch
 
-PKGFILES_CSWlibevent-devel = $(PKGFILES_DEVEL)
-PKGFILES_CSWlibevent-devel += $(bindir)/.*
-
-# This is just for the rpcgen
-CHECKPKG_OVERRIDES_CSWlibevent-devel += missing-dependency|CSWpython
-
-CHECKPKG_OVERRIDES_CSWlibevent-devel += surplus-dependency|CSWlibevent
-
 include gar/category.mk
 
-#LIBS += -lresolv -lnsl
-#export LIBS
-
 post-extract-modulated:
 	-test -f $(WORKSRC)/test/test.sh && 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	2011-01-06 13:12:52 UTC (rev 12220)
+++ csw/mgar/pkg/libevent/trunk/checksums	2011-01-06 13:20:01 UTC (rev 12221)
@@ -1,3 +1 @@
-4d8463a40469ce2e4dfd89b9657fd993  LICENSE
-6cc776458ecaf9247550863702a44d7c  libevent-1.1a.tar.gz
 a00e037e4d3f9e4fe9893e8a2d27918c  libevent-1.4.14b-stable.tar.gz


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