[csw-devel] SF.net SVN: gar:[16790] csw/mgar/pkg/file/branches
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Wed Jan 18 09:54:19 CET 2012
Revision: 16790
http://gar.svn.sourceforge.net/gar/?rev=16790&view=rev
Author: dmichelsen
Date: 2012-01-18 08:54:19 +0000 (Wed, 18 Jan 2012)
Log Message:
-----------
file: Make branch for 5.10
Modified Paths:
--------------
csw/mgar/pkg/file/branches/file-5.10-dam/Makefile
csw/mgar/pkg/file/branches/file-5.10-dam/checksums
Added Paths:
-----------
csw/mgar/pkg/file/branches/file-5.10-dam/
Removed Paths:
-------------
csw/mgar/pkg/file/branches/file-5.10-dam/files/0001-Remove-surplus-flags-output-on-SPARC.patch
csw/mgar/pkg/file/branches/file-5.10-dam/files/0001-libtool-dir-used-for-linking.patch
csw/mgar/pkg/file/branches/file-5.10-dam/files/0002-CSW-runpath.patch
Property changes on: csw/mgar/pkg/file/branches/file-5.10-dam
___________________________________________________________________
Added: svn:ignore
+ cookies
download
work
Modified: csw/mgar/pkg/file/branches/file-5.10-dam/Makefile
===================================================================
--- csw/mgar/pkg/file/trunk/Makefile 2011-11-15 10:21:50 UTC (rev 16195)
+++ csw/mgar/pkg/file/branches/file-5.10-dam/Makefile 2012-01-18 08:54:19 UTC (rev 16790)
@@ -1,7 +1,7 @@
# $Id$
NAME = file
-VERSION = 5.07
+VERSION = 5.10
CATEGORIES = utils
define BLURB
@@ -13,61 +13,46 @@
endef
MASTER_SITES = ftp://ftp.astron.com/pub/file/
-DISTFILES = $(NAME)-$(VERSION).tar.gz
-UFILES_REGEX = $(NAME)-(\d+(?:\.\d+)*).tar.gz
-SPKG_SOURCEURL = http://www.darwinsys.com/file/
-CONFIGURE_ARGS = $(DIRPATHS)
-# These flags are not understood by Sun Studio
-CONFIGURE_ARGS += --disable-warnings
-TEST_TARGET = check
+DISTFILES = $(DISTNAME).tar.gz
-# Patches specific to the 5.04 version:
-# PATCHFILES += 0001-libtool-dir-used-for-linking.patch
-# PATCHFILES += 0002-CSW-runpath.patch
-
-# Patches specific to the 5.05 version:
-PATCHFILES += 0001-Remove-surplus-flags-output-on-SPARC.patch
PATCHFILES += 0002-Do-not-use-find_library-at-runtime.patch
+VENDOR_URL = http://www.darwinsys.com/file/
+
PACKAGES += CSWgfile
-PKGFILES_CSWgfile += $(bindir)/gfile
-PKGFILES_CSWgfile += $(bindir)/$(ISA_DEFAULT64)/gfile
+SPKG_DESC_CSWgfile = A file type guesser
+PKGFILES_CSWgfile += $(call baseisadirs,$(bindir),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 += CSWlibz1
RUNTIME_DEP_PKGS_CSWgfile += CSWlibmagic1
-EXTRA_MERGE_EXCLUDE_FILES = .*\.py[oc]
+# EXTRA_MERGE_EXCLUDE_FILES = .*\.py[oc]
PACKAGES += CSWpy-libmagic
-PKGFILES_CSWpy-libmagic += /opt/csw/lib/python.*
SPKG_DESC_CSWpy-libmagic = Python extension for libmagic
-CATALOGNAME_CSWpy-libmagic = py_libmagic
+PKGFILES_CSWpy-libmagic += /opt/csw/lib/python.*
ARCHALL_CSWpy-libmagic = 1
RUNTIME_DEP_PKGS_CSWpy-libmagic += CSWpython
RUNTIME_DEP_PKGS_CSWpy-libmagic += CSWlibmagic1
PACKAGES += CSWlibmagic-data
-CATALOGNAME_CSWlibmagic-data = libmagic_data
SPKG_DESC_CSWlibmagic-data = Database for libmagic
+# PKGFILES is catchall
ARCHALL_CSWlibmagic-data = 1
# The magic file contains /usr/local as one of the magic constants to detect
# file types.
CHECKPKG_OVERRIDES_CSWlibmagic-data += file-with-bad-content
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_CSWlibmagic1 += CSWzlib
-RUNTIME_DEP_PKGS_CSWlibmagic1 += CSWlibmagic-data
+PKGFILES_CSWlibmagic1 += $(call pkgfiles_lib,libmagic.so.1)
+RUNTIME_DEP_PKGS_CSWlibmagic1 += CSWlibz1
CHECKPKG_OVERRIDES_CSWlibmagic1 += surplus-dependency|CSWlibmagic-data
+OBSOLETED_BY_CSWlibmagic1 += CSWlibmagic
PACKAGES += CSWlibmagic-dev
-SPKG_DESC_CSWlibmagic-dev = Development files for libmagic
-CATALOGNAME_CSWlibmagic-dev = libmagic_dev
+SPKG_DESC_CSWlibmagic-dev = Development files for libmagic.so.1
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
@@ -76,17 +61,23 @@
IGNORE_DESTDIR = 1
# Doesn't hurt to have this on.
-DISTUTILS_DEBUG = 1
-export DISTUTILS_DEBUG
+EXTRA_CONFIGURE_EXPORTS = DISTUTILS_DEBUG
+CONFIGURE_ENV_DISTUTILS_DEBUG = 1
+CONFIGURE_ARGS = $(DIRPATHS)
+# These flags are not understood by Sun Studio
+CONFIGURE_ARGS += --disable-warnings
+
BUILD64 = 1
+PYCOMPILE = 1
+
include gar/category.mk
post-build-modulated:
# This fails for a mysterious reason. Can't find libmagic (-lmagic).
- # (cd $(WORKSRC)/python && python setup.py build --compiler=unix)
- (cd $(WORKSRC)/python && python setup.py build)
+ (cd $(WORKSRC)/python && python setup.py build --compiler=unix)
+ ###(cd $(WORKSRC)/python && python setup.py build)
@$(MAKECOOKIE)
post-install-modulated:
Modified: csw/mgar/pkg/file/branches/file-5.10-dam/checksums
===================================================================
--- csw/mgar/pkg/file/trunk/checksums 2011-11-15 10:21:50 UTC (rev 16195)
+++ csw/mgar/pkg/file/branches/file-5.10-dam/checksums 2012-01-18 08:54:19 UTC (rev 16790)
@@ -1 +1 @@
-b8d1f9a8a644067bd0a703cebf3f4858 file-5.07.tar.gz
+4cea34b087b060772511e066e2038196 file-5.10.tar.gz
Deleted: csw/mgar/pkg/file/branches/file-5.10-dam/files/0001-Remove-surplus-flags-output-on-SPARC.patch
===================================================================
--- csw/mgar/pkg/file/trunk/files/0001-Remove-surplus-flags-output-on-SPARC.patch 2011-11-15 10:21:50 UTC (rev 16195)
+++ csw/mgar/pkg/file/branches/file-5.10-dam/files/0001-Remove-surplus-flags-output-on-SPARC.patch 2012-01-18 08:54:19 UTC (rev 16790)
@@ -1,27 +0,0 @@
-From 9be2ae854b16feecf9aed9cf908faf30e33b0edf Mon Sep 17 00:00:00 2001
-From: Maciej Blizinski <maciej at opencsw.org>
-Date: Fri, 4 Mar 2011 00:30:29 +0100
-Subject: [PATCH] Remove surplus "flags!" output on SPARC
-
----
- src/apprentice.c | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/src/apprentice.c b/src/apprentice.c
-index 49126ac..15d34de 100644
---- a/src/apprentice.c
-+++ b/src/apprentice.c
-@@ -2461,8 +2461,10 @@ bs1(struct magic *m)
- m->in_offset = swap4((uint32_t)m->in_offset);
- m->lineno = swap4((uint32_t)m->lineno);
- if (IS_STRING(m->type)) {
-+ /* This printf causes surplus output on sparc machines.
- if (m->type == FILE_PSTRING)
- printf("flags! %d\n", m->str_flags);
-+ */
- m->str_range = swap4(m->str_range);
- m->str_flags = swap4(m->str_flags);
- }
---
-1.7.3.2
-
Deleted: csw/mgar/pkg/file/branches/file-5.10-dam/files/0001-libtool-dir-used-for-linking.patch
===================================================================
--- csw/mgar/pkg/file/trunk/files/0001-libtool-dir-used-for-linking.patch 2011-11-15 10:21:50 UTC (rev 16195)
+++ csw/mgar/pkg/file/branches/file-5.10-dam/files/0001-libtool-dir-used-for-linking.patch 2012-01-18 08:54:19 UTC (rev 16790)
@@ -1,25 +0,0 @@
-From 071f0c1b11cf21628aa3ec8c092cfd050a11e9d9 Mon Sep 17 00:00:00 2001
-From: Maciej Blizinski <maciej at opencsw.org>
-Date: Sat, 8 May 2010 08:47:26 +0200
-Subject: [PATCH] libtool dir used for linking
-
----
- python/setup.py | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/python/setup.py b/python/setup.py
-index 7c86194..71074c3 100644
---- a/python/setup.py
-+++ b/python/setup.py
-@@ -3,7 +3,7 @@ from distutils.core import setup, Extension
-
- magic_module = Extension('magic',
- libraries = ['magic'],
-- library_dirs = ['./','../','../src','/usr/lib/'],
-+ library_dirs = ['./','../','../src','../src/.libs','/usr/lib/'],
- include_dirs = ['./','../','../src','/usr/include/'],
- sources = ['py_magic.c'])
-
---
-1.7.0
-
Deleted: csw/mgar/pkg/file/branches/file-5.10-dam/files/0002-CSW-runpath.patch
===================================================================
--- csw/mgar/pkg/file/trunk/files/0002-CSW-runpath.patch 2011-11-15 10:21:50 UTC (rev 16195)
+++ csw/mgar/pkg/file/branches/file-5.10-dam/files/0002-CSW-runpath.patch 2012-01-18 08:54:19 UTC (rev 16790)
@@ -1,28 +0,0 @@
-From 19ff890df2c01f4c0fa2f606017ff2ab421240c9 Mon Sep 17 00:00:00 2001
-From: Maciej Blizinski <maciej at opencsw.org>
-Date: Mon, 7 Jun 2010 21:25:39 +0200
-Subject: [PATCH] CSW runpath
-
----
- python/setup.py | 5 +++--
- 1 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/python/setup.py b/python/setup.py
-index 71074c3..086211e 100644
---- a/python/setup.py
-+++ b/python/setup.py
-@@ -3,8 +3,9 @@ from distutils.core import setup, Extension
-
- magic_module = Extension('magic',
- libraries = ['magic'],
-- library_dirs = ['./','../','../src','../src/.libs','/usr/lib/'],
-- include_dirs = ['./','../','../src','/usr/include/'],
-+ library_dirs = ['./','../','../src','../src/.libs','/usr/lib/','/opt/csw/lib'],
-+ include_dirs = ['./','../','../src','/usr/include/','/opt/csw/include'],
-+ runtime_library_dirs = ['/opt/csw/lib'],
- sources = ['py_magic.c'])
-
- setup (name = 'Magic file extensions',
---
-1.7.1
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list