[csw-devel] SF.net SVN: gar:[12989] csw/mgar/pkg/file/trunk

[wahwah at users.sourceforge.net]

Revision: 12989
          http://gar.svn.sourceforge.net/gar/?rev=12989&view=rev
Author:   wahwah
Date:     2011-01-17 21:27:27 +0000 (Mon, 17 Jan 2011)

Log Message:
-----------
file: Update to 5.05, libmagic1 split off

CSWlibmagic still contains the data file, so it's not a transitional package,
but a shared data package.

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

Modified: csw/mgar/pkg/file/trunk/Makefile
===================================================================
--- csw/mgar/pkg/file/trunk/Makefile	2011-01-17 21:01:43 UTC (rev 12988)
+++ csw/mgar/pkg/file/trunk/Makefile	2011-01-17 21:27:27 UTC (rev 12989)
@@ -1,7 +1,7 @@
 # $Id$
 
 NAME = file
-VERSION = 5.04
+VERSION = 5.05
 CATEGORIES = utils
 
 define BLURB
@@ -20,25 +20,48 @@
 # These flags are not understood by Sun Studio
 CONFIGURE_ARGS += --disable-warnings
 TEST_TARGET = check
-PATCHFILES += 0001-libtool-dir-used-for-linking.patch
-PATCHFILES += 0002-CSW-runpath.patch
+
+NOISAEXEC = 1
+
 PACKAGES += CSWgfile
-PACKAGES += CSWlibmagic
-PACKAGES += CSWpy-libmagic
+# PKGFILES_CSWgfile += $(call baseisadirs,(bindir),gfile)
 PKGFILES_CSWgfile += $(bindir)/gfile
+PKGFILES_CSWgfile += $(bindir)/$(ISA_DEFAULT64)/gfile
 PKGFILES_CSWgfile += $(mandir)/man1/gfile\.1
 PKGFILES_CSWgfile += $(prefix)/gnu/file
+SPKG_DESC_CSWgfile = A file type guesser
+RUNTIME_DEP_PKGS_CSWgfile += CSWzlib
+RUNTIME_DEP_PKGS_CSWgfile += CSWlibmagic1
+EXTRA_MERGE_EXCLUDE_FILES = .*\.py[oc]
+
+PACKAGES += CSWpy-libmagic
 PKGFILES_CSWpy-libmagic += /opt/csw/lib/python.*
-SPKG_DESC_CSWgfile = A file type guesser
-SPKG_DESC_CSWlibmagic = The library behind file(1)
 SPKG_DESC_CSWpy-libmagic = Python extension for libmagic
 CATALOGNAME_CSWpy-libmagic = py_libmagic
-RUNTIME_DEP_PKGS_CSWgfile += CSWlibmagic
-RUNTIME_DEP_PKGS_CSWgfile += CSWzlib
-RUNTIME_DEP_PKGS_CSWlibmagic += CSWzlib
-RUNTIME_DEP_PKGS_CSWpy-libmagic += CSWlibmagic
 RUNTIME_DEP_PKGS_CSWpy-libmagic += CSWpython
+RUNTIME_DEP_PKGS_CSWpy-libmagic += CSWlibmagic1
+ARCHALL_CSWpy-libmagic = 1
+CHECKPKG_OVERRIDES_CSWpy-libmagic += surplus-dependency|CSWlibmagic1
 
+PACKAGES += CSWlibmagic
+ARCHALL_CSWlibmagic = 1
+SPKG_DESC_CSWlibmagic = Database for libmagic
+CHECKPKG_OVERRIDES_CSWlibmagic += surplus-dependency|CSWlibmagic1
+
+PACKAGES += CSWlibmagic1
+CATALOGNAME_CSWlibmagic1 = libmagic1
+PKGFILES_CSWlibmagic1 += $(call baseisadirs,$(libdir),libmagic\.so\.1(\.\d+)*)
+SPKG_DESC_CSWlibmagic1 += The library behind file(1), libmagic.so.1
+RUNTIME_DEP_PKGS_CSWlibmagic += CSWlibmagic1
+RUNTIME_DEP_PKGS_CSWlibmagic1 += CSWzlib
+
+PACKAGES += CSWlibmagic-dev
+SPKG_DESC_CSWlibmagic-dev = Development files for libmagic
+CATALOGNAME_CSWlibmagic-dev = libmagic_dev
+PKGFILES_CSWlibmagic-dev += $(PKGFILES_DEVEL)
+PKGFILES_CSWlibmagic-dev += /opt/csw/lib/libmagic.so
+RUNTIME_DEP_PKGS_CSWlibmagic-dev += CSWlibmagic1
+
 # The "file" util is used during stripbin. As the newly build binary
 # requires libmagic which is not installed yet we must not use the
 # newly built "file".
@@ -48,6 +71,8 @@
 DISTUTILS_DEBUG = 1
 export DISTUTILS_DEBUG
 
+BUILD64 = 1
+
 include gar/category.mk
 
 post-build-modulated:

Modified: csw/mgar/pkg/file/trunk/checksums
===================================================================
--- csw/mgar/pkg/file/trunk/checksums	2011-01-17 21:01:43 UTC (rev 12988)
+++ csw/mgar/pkg/file/trunk/checksums	2011-01-17 21:27:27 UTC (rev 12989)
@@ -1,3 +1 @@
-80e221ff50866a635483cc4f03773d94  0001-libtool-dir-used-for-linking.patch
-58e076108156a426d88c53b05d422673  0002-CSW-runpath.patch
-accade81ff1cc774904b47c72c8aeea0  file-5.04.tar.gz
+0b429063710457be2bd17a18389cb018  file-5.05.tar.gz


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