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

[dmichelsen at users.sourceforge.net]

Revision: 13725
          http://gar.svn.sourceforge.net/gar/?rev=13725&view=rev
Author:   dmichelsen
Date:     2011-03-10 13:49:14 +0000 (Thu, 10 Mar 2011)

Log Message:
-----------
readline: General relayout and splitting

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

Added Paths:
-----------
    csw/mgar/pkg/readline/tags/legacy/

Removed Paths:
-------------
    csw/mgar/pkg/readline/trunk/legacy/

Modified: csw/mgar/pkg/readline/trunk/Makefile
===================================================================
--- csw/mgar/pkg/readline/trunk/Makefile	2011-03-10 13:47:38 UTC (rev 13724)
+++ csw/mgar/pkg/readline/trunk/Makefile	2011-03-10 13:49:14 UTC (rev 13725)
@@ -1,10 +1,7 @@
 NAME = readline
-VERSION = 6.1
+VERSION = 6.2
 CATEGORIES = lib
 
-EXTRA_MODULATORS = VERSION
-MODULATIONS_VERSION = 4.3 5.2 6.1
-
 DESCRIPTION = GNU readline
 define BLURB
   The Readline library provides a set of functions for use by applications
@@ -16,20 +13,47 @@
 endef
 
 MASTER_SITES = $(GNU_MIRROR)
-DISTFILES  = $(foreach V,$(MODULATIONS_VERSION),$(NAME)-$(V).tar.gz)
+DISTFILES  = $(NAME)-$(VERSION).tar.gz
+PATCHFILES += patch-history.3.diff
 
-PATCHFILES_isa-sparcv8-garversion-6.1 = patch-history.3.diff
-PATCHFILES_isa-sparcv9-garversion-6.1 = patch-history.3.diff
-PATCHFILES_isa-i386-garversion-6.1 = patch-history.3.diff
-PATCHFILES_isa-amd64-garversion-6.1 = patch-history.3.diff
+VENDOR_URL = http://tiswww.case.edu/php/chet/readline/rltop.html
 
-RUNTIME_DEP_PKGS = CSWncurses
+# From pkg/readline43
+FOREIGN_PACKAGES += CSWlibhistory4
+OBSOLETES_CSWlibhistory4 = CSWreadline
+FOREIGN_PACKAGES += CSWlibreadline4
+OBSOLETES_CSWlibhreadline4 = CSWreadline
 
-# We define upstream file regex so we can be notifed of new upstream software release
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
+# From pkg/readline52
+FOREIGN_PACKAGES += CSWlibhistory5
+OBSOLETES_CSWlibhistory5 = CSWreadline
+FOREIGN_PACKAGES += CSWlibreadline5
+OBSOLETES_CSWlibhreadline5 = CSWreadline
 
+PACKAGES += CSWlibhistory6
+CATALOGNAME_CSWlibhistory6 = libhistory6
+SPKG_DESC_CSWlibhistory6 = GNU readline library, libhistory.so.6
+PKGFILES_CSWlibhistory6 = $(call pkgfiles_lib,libhistory.so.6)
+# This dependency is not really necessary, just because we unconditionally add
+# "-lncurses" to LDFLAGS as this does not happen automatically.
+RUNTIME_DEP_PKGS_CSWlibhistory6 += CSWncurses
+OBSOLETES_CSWlibhistory6 = CSWreadline
+
+PACKAGES += CSWlibreadline6
+CATALOGNAME_CSWlibreadline6 = libreadline6
+SPKG_DESC_CSWlibreadline6 = GNU readline library, libreadline.so.6
+PKGFILES_CSWlibreadline6 = $(call pkgfiles_lib,libreadline.so.6)
+RUNTIME_DEP_PKGS_CSWlibreadline6 += CSWncurses
+OBSOLETES_CSWlibhreadline6 = CSWreadline
+
+PACKAGES += CSWlibreadline-dev
+CATALOGNAME_CSWlibreadline-dev = libreadline_dev
+SPKG_DESC_CSWlibreadline-dev = GNU readline development files
+# PKGFILES is catchall
+RUNTIME_DEP_PKGS_CSWlibreadline-dev += CSWlibhistory6
+RUNTIME_DEP_PKGS_CSWlibreadline-dev += CSWlibreadline6
+
 BUILD64 = 1
-
 NORUNPATH = 1
 
 CONFIGURE_ARGS  = $(DIRPATHS)
@@ -37,26 +61,11 @@
 
 TEST_TARGET = check
 
-MERGE_SCRIPTS_isa-default-garversion-4.3 = copy-only
-MERGE_DIRS_isa-default-garversion-4.3 = $(libdir)
-MERGE_SCRIPTS_isa-default64-garversion-4.3 = copy-relocated-only
-MERGE_DIRS_isa-default64-garversion-4.3 = $(libdir)
-
-MERGE_SCRIPTS_isa-default-garversion-5.2 = copy-only
-MERGE_DIRS_isa-default-garversion-5.2 = $(libdir)
-MERGE_SCRIPTS_isa-default64-garversion-5.2 = copy-relocated-only
-MERGE_DIRS_isa-default64-garversion-5.2 = $(libdir)
-
-MERGE_SCRIPTS_isa-default-garversion-6.1 = copy-all
-MERGE_SCRIPTS_isa-default64-garversion-6.1 = copy-relocated-only
-MERGE_DIRS_isa-default64-garversion-6.1 = $(bindir) $(sbindir) $(libexecdir) $(libdir)
-
-SPKG_SOURCEURL = http://tiswww.case.edu/php/chet/readline/rltop.html
-
 include gar/category.mk
 
-post-install:
-	@chmod 555 $(DESTDIR)$(libdir)/libhistory.*
-	@chmod 555 $(DESTDIR)$(libdir)/libreadline.*
+post-install-modulated:
+	perl -pi -e 's,/usr/local/lib,$(libdir),' \
+		$(DESTDIR)/opt/csw/share/readline/rl-fgets.c
+	@$(MAKECOOKIE)
 
 LDFLAGS := $(filter-out -xarch=%,$(filter-out -m%,$(LDFLAGS))) -R$(libdir) -lncurses

Modified: csw/mgar/pkg/readline/trunk/checksums
===================================================================
--- csw/mgar/pkg/readline/trunk/checksums	2011-03-10 13:47:38 UTC (rev 13724)
+++ csw/mgar/pkg/readline/trunk/checksums	2011-03-10 13:49:14 UTC (rev 13725)
@@ -1,4 +1 @@
-8db909e6af79c3f5c266fad1972b4e41  patch-history.3.diff
-f86f7cb717ab321fe15f1bbcb058c11e  readline-4.3.tar.gz
-e39331f32ad14009b9ff49cc10c5e751  readline-5.2.tar.gz
-fc2f7e714fe792db1ce6ddc4c9fb4ef3  readline-6.1.tar.gz
+67948acb2ca081f23359d0256e9a271c  readline-6.2.tar.gz


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