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

[dmichelsen at users.sourceforge.net]

Revision: 16318
          http://gar.svn.sourceforge.net/gar/?rev=16318&view=rev
Author:   dmichelsen
Date:     2011-11-27 21:53:48 +0000 (Sun, 27 Nov 2011)
Log Message:
-----------
libslang1: Split out soname-specific version of slang

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

Added Paths:
-----------
    csw/mgar/pkg/libslang1/
    csw/mgar/pkg/libslang1/trunk/

Removed Paths:
-------------
    csw/mgar/pkg/libslang1/trunk/

Modified: csw/mgar/pkg/libslang1/trunk/Makefile
===================================================================
--- csw/mgar/pkg/slang/trunk/Makefile	2011-11-27 15:30:15 UTC (rev 16312)
+++ csw/mgar/pkg/libslang1/trunk/Makefile	2011-11-27 21:53:48 UTC (rev 16318)
@@ -1,57 +1,45 @@
 # $Id$
 
 NAME = slang
-VERSION = 2.2.4
+VERSION = 1.4.9
 CATEGORIES = lib
 
-EXTRA_MODULATORS = VERSION
-MODULATIONS_VERSION = 1.4.9 2.2.2
-
-# The old package didn't contain 64 bit, so don't bother building it for compat
-SKIP_MODULATIONS  = isa-sparcv9-garversion-1.4.9
-SKIP_MODULATIONS += isa-amd64-garversion-1.4.9
-
 DESCRIPTION = Library primarily to provide an alternative to libcurses
 define BLURB
 endef
 
-MASTER_SITES = $(foreach V,$(MODULATIONS_VERSION),ftp://space.mit.edu/pub/davis/slang/v$(shell echo $V | perl -ne 'print /(\d+\.\d+)/')/)
-SOURCEFILES = $(foreach VERSION,$(MODULATIONS_VERSION), $(NAME)-$(VERSION).tar.gz)
-DISTFILES = $(SOURCEFILES)
-NOEXTRACT = $(filter-out $(NAME)-$(VERSION).tar.gz,$(SOURCEFILES))
+MASTER_SITES = ftp://space.mit.edu/pub/davis/slang/v$(shell echo $(VERSION) | perl -ne 'print /(\d+\.\d+)/')
+DISTFILES += $(DISTNAME).tar.bz2
 
-# RUNTIME_DEP_PKGS = CSWiconv CSWpcrert CSWpng CSWzlib CSWoniguruma
+VENDOR_URL = http://www.s-lang.org/
 
-SPKG_SOURCEURL = http://www.s-lang.org/
+PACKAGES += CSWlibslang1
+SPKG_DESC_CSWlibslang = Library primarily to provide an alternative to libcurses, libslang.so.1
+PKGFILES_CSWlibslang1 += $(call pkgfiles_lib,libslang.so.1)
 
+# These are locations of fallback terminfo/ directories, /opt/csw/share/terminfo comes first
+# due to our reinplacement
+CHECKPKG_OVERRIDES_CSWlibslang1 += file-with-bad-content|/usr/local|root/opt/csw/lib/libslang.so.1.4.9
+CHECKPKG_OVERRIDES_CSWlibslang1 += file-with-bad-content|/usr/share|root/opt/csw/lib/libslang.so.1.4.9
+
 # Setting -L$(libdir) before the newly built lib confuses function
 # definitions if the installed lib is older than the newly built one.
 LINKER_FLAGS =
 
-UILD64 = 1
-CONFIGURE_ARGS = $(DIRPATHS)
+# No testsuite available
+TEST_TARGET = 
 
-TEST_TARGET_VERSION-1.4.9 =
-TEST_TARGET_VERSION-2.2.2 = check
-TEST_TARGET = $(TEST_TARGET_VERSION-$(VERSION))
+# Make sure to find just the right terminfo files
+REINPLACEMENTS += usr_share_terminfo
+REINPLACE_MATCH_usr_share_terminfo = /usr/share/terminfo
+REINPLACE_WITH_usr_share_terminfo = /opt/csw/share/terminfo
+REINPLACE_FILES_usr_share_terminfo = src/sltermin.c
 
-INSTALL_ARGS_VERSION-1.4.9 = install-elf install-links
-INSTALL_ARGS = $(INSTALL_ARGS_VERSION-$(VERSION))
+INSTALL_ARGS = install-elf install-links
 
-BUILD_ARGS_VERSION-1.4.9 = elf
-BUILD_ARGS = $(BUILD_ARGS_VERSION-$(VERSION))
+BUILD_ARGS = elf
 
-BUILD_OVERRIDE_VARS_VERSION-1.4.9 = ELF_CFLAGS
-BUILD_OVERRIDE_VARS = $(BUILD_OVERRIDE_VARS_VERSION-$(VERSION))
+BUILD_OVERRIDE_VARS = ELF_CFLAGS
 BUILD_OVERRIDE_VAR_ELF_CFLAGS = -K pic $(CFLAGS)
 
-MERGE_SCRIPTS_isa-default-garversion-1.4.9 = copy-only
-MERGE_DIRS_isa-default-garversion-1.4.9 = $(libdir)
-MERGE_SCRIPTS_isa-default64-garversion-1.4.9 = copy-relocated-only
-MERGE_DIRS_isa-default64-garversion-1.4.9 = $(libdir)
-
-MERGE_SCRIPTS_isa-default-garversion-2.2.2 = copy-all
-MERGE_SCRIPTS_isa-default64-garversion-2.2.2 = copy-relocated-only
-MERGE_DIRS_isa-default64-garversion-2.2.2 = $(libdir)
-
 include gar/category.mk

Modified: csw/mgar/pkg/libslang1/trunk/checksums
===================================================================
--- csw/mgar/pkg/slang/trunk/checksums	2011-11-27 15:30:15 UTC (rev 16312)
+++ csw/mgar/pkg/libslang1/trunk/checksums	2011-11-27 21:53:48 UTC (rev 16318)
@@ -1,2 +1 @@
-c73aa62b2d1b215ca55a7337daa3f543  slang-1.4.9.tar.gz
-e7183d0acab9cc35fae12849f8b848e2  slang-2.2.2.tar.gz
+4fbb1a7f1257e065ca830deefe13d350  slang-1.4.9.tar.bz2

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