[csw-devel] SF.net SVN: gar:[12540] csw/mgar/pkg/cvs/trunk

[dmichelsen at users.sourceforge.net]

Revision: 12540
          http://gar.svn.sourceforge.net/gar/?rev=12540&view=rev
Author:   dmichelsen
Date:     2011-01-14 12:49:33 +0000 (Fri, 14 Jan 2011)

Log Message:
-----------
cvs: Update standard cvs to 1.12.13 (feature) and make cvs_feature a link to standard cvs

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

Removed Paths:
-------------
    csw/mgar/pkg/cvs/trunk/files/CSWcvs.gspec

Property Changed:
----------------
    csw/mgar/pkg/cvs/trunk/


Property changes on: csw/mgar/pkg/cvs/trunk
___________________________________________________________________
Modified: svn:externals
   - gar https://gar.svn.sourceforge.net/svnroot/gar/csw/mgar/gar/v1

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


Modified: csw/mgar/pkg/cvs/trunk/Makefile
===================================================================
--- csw/mgar/pkg/cvs/trunk/Makefile	2011-01-14 12:38:10 UTC (rev 12539)
+++ csw/mgar/pkg/cvs/trunk/Makefile	2011-01-14 12:49:33 UTC (rev 12540)
@@ -1,5 +1,5 @@
 NAME = cvs
-VERSION = 1.11.23
+VERSION = 1.12.13
 CATEGORIES = utils
 
 DESCRIPTION = Concurrent Versioning System
@@ -15,24 +15,44 @@
   various operations and works well over a wide area network.
 endef
 
-MASTER_SITES = http://ftp.gnu.org/non-gnu/cvs/source/stable/$(VERSION)/
-UPSTREAM_MASTER_SITES = http://ftp.gnu.org/non-gnu/cvs/source/stable/
+MASTER_SITES = http://ftp.gnu.org/non-gnu/cvs/source/feature/$(VERSION)/
+UPSTREAM_MASTER_SITES = http://ftp.gnu.org/non-gnu/cvs/source/feature/
+
 DISTFILES = $(DISTNAME).tar.bz2
-DISTFILES += $(call admfiles,CSWcvs,)
 
+PACKAGES += CSWcvs
+CATALOGNAME_CSWcvs = cvs
+SPKG_DESC_CSWcvs = $(DESCRIPTION)
+RUNTIME_DEP_PKGS_CSWcvs += CSWggettextrt
+RUNTIME_DEP_PKGS_CSWcvs += CSWkrb5lib
+RUNTIME_DEP_PKGS_CSWcvs += CSWosslrt
+RUNTIME_DEP_PKGS_CSWcvs += CSWzlib
+
+PACKAGES += CSWcvs-feature
+CATALONGAME_CSWcvs-feature = cvs_feature
+SPKG_DESC_CSWcvs-feature = Legacy package as CSWcvs now contains the feature CVS
+PKGFILES_CSWcvs-feature = $(prefix)/cvs-feature
+ARCHALL_CSWcvs-feature = 1
+RUNTIME_DEP_PKGS_CSWcvs-feature = CSWcvs
+CHECKPKG_OVERRIDES_CSWcvs-feature += surplus-dependency|CSWcvs
+
 CONFIGURE_ARGS = $(DIRPATHS)
+CONFIGURE_ARGS += --with-external-zlib=$(prefix)
 
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = (\d+(?:\.\d+)*)
 
 TEST_TARGET = check
 
-# Test suite won't run as root!
-TEST_SCRIPTS =
+# The testsuite runs for more than one hour!
+# SKIPTEST ?= 1
 
 include gar/category.mk
 
-post-install:
-	@rm -f $(DESTDIR)$(infodir)/dir
+# Only GNU 'id' understands option '-u'
+PATH := /opt/csw/gnu:$(PATH)
+
+post-install-modulated:
 	@gln -sf ../share/cvs/contrib/rcs2log $(DESTDIR)$(bindir)/rcslog
+	@gln -s . $(DESTDIR)$(prefix)/cvs-feature
 	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/cvs/trunk/checksums
===================================================================
--- csw/mgar/pkg/cvs/trunk/checksums	2011-01-14 12:38:10 UTC (rev 12539)
+++ csw/mgar/pkg/cvs/trunk/checksums	2011-01-14 12:49:33 UTC (rev 12540)
@@ -1,2 +1 @@
-0213ea514e231559d6ff8f80a34117f0  download/cvs-1.11.23.tar.bz2
-6054c81d25a4c2829b53d57cad115f15  download/CSWcvs.gspec
+956ab476ce276c2d19d583e227dbdbea  cvs-1.12.13.tar.bz2

Deleted: csw/mgar/pkg/cvs/trunk/files/CSWcvs.gspec
===================================================================
--- csw/mgar/pkg/cvs/trunk/files/CSWcvs.gspec	2011-01-14 12:38:10 UTC (rev 12539)
+++ csw/mgar/pkg/cvs/trunk/files/CSWcvs.gspec	2011-01-14 12:49:33 UTC (rev 12540)
@@ -1,4 +0,0 @@
-%var            bitname cvs
-%var            pkgname CSWcvs
-%include        url file://%{PKGLIB}/csw_dyndepend.gspec
-%copyright      url file://%{WORKSRC}/COPYING


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