SF.net SVN: gar:[22991] csw/mgar/pkg/file/trunk

[dmichelsen at users.sourceforge.net]

Revision: 22991
          http://sourceforge.net/p/gar/code/22991
Author:   dmichelsen
Date:     2014-02-11 11:09:53 +0000 (Tue, 11 Feb 2014)
Log Message:
-----------
file/trunk: Update to 5.16, python version modulation

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	2014-02-11 10:43:09 UTC (rev 22990)
+++ csw/mgar/pkg/file/trunk/Makefile	2014-02-11 11:09:53 UTC (rev 22991)
@@ -1,7 +1,7 @@
 # $Id$
 
 NAME = file
-VERSION = 5.14
+VERSION = 5.16
 GARTYPE = v2
 
 define BLURB
@@ -16,11 +16,21 @@
 DISTFILES  = $(DISTNAME).tar.gz
 
 PATCHFILES += 0002-Do-not-use-find_library-at-runtime.patch
-
 PATCHFILES += 0001-Use-PCRE.patch
 
 VENDOR_URL = http://www.darwinsys.com/file/
 
+EXTRA_MODULATORS += PYTHON_VERSION
+MODULATIONS_PYTHON_VERSION = 2.6 2.7
+# We need 64 bit just once as it is without python anyway
+SKIP_MODULATIONS += isa-sparcv9-python_version-2.7
+SKIP_MODULATIONS += isa-amd64-python_version-2.7
+PYTHON = $(bindir)/python$(PYTHON_VERSION)
+MERGE_SCRIPTS_isa-default-python_version-2.6 += copy-all
+MERGE_SCRIPTS_isa-default-python_version-2.7 += copy-all
+MERGE_SCRIPTS_isa-default64-python_version-2.6 += copy-relocated-only
+MERGE_DIRS_isa-default64-python_version-2.6 += $(libdir)
+
 PACKAGES += CSWgfile
 SPKG_DESC_CSWgfile = A file type guesser
 PKGFILES_CSWgfile += $(call baseisadirs,$(bindir),gfile)
@@ -34,7 +44,15 @@
 ARCHALL_CSWpy-libmagic = 1
 RUNTIME_DEP_PKGS_CSWpy-libmagic += CSWpython
 RUNTIME_DEP_PKGS_CSWpy-libmagic += CSWlibmagic1
+OBSOLETED_BY_CSWpy-libmagic += CSWpy-magic
 
+# This is *obsoleted*! Come on, checkpkg...
+CHECKPKG_OVERRIDES_CSWpy-magic += python-package-missing-py26-files
+CHECKPKG_OVERRIDES_CSWpy-magic += python-package-missing-py-files
+
+# checkpkg cannot detect this
+CHECKPKG_OVERRIDES_CSWpy-libmagic += surplus-dependency|CSWlibmagic1
+
 PACKAGES += CSWlibmagic-data
 SPKG_DESC_CSWlibmagic-data = Database for libmagic
 # PKGFILES is catchall
@@ -78,28 +96,26 @@
 
 include gar/category.mk
 
-post-build:
+post-build-isa-sparcv8plus-python_version-2.6 post-build-isa-sparcv8plus-python_version-2.7:
 	# 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-isa-sparcv8plus-python_version-2.6 post-install-isa-sparcv8plus-python_version-2.7:
+	(cd $(WORKSRC)/python && \
+		$(BUILD_ENV) $(PYTHON) setup.py install --root=$(DESTDIR) --prefix=$(prefix))
+	@$(MAKECOOKIE)
+
 post-install:
-	(cd $(WORKSRC)/python && \
-		$(BUILD_ENV) python setup.py install --root=$(DESTDIR) --prefix=$(prefix))
 	(cd $(DESTDIR) && \
 		mv $(DESTDIR)$(bindir)/file $(DESTDIR)$(bindir)/gfile && \
 		mv $(DESTDIR)$(mandir)/man1/file\.1 $(DESTDIR)$(mandir)/man1/gfile\.1)
 	ginstall -d -m 755 $(DESTDIR)$(prefix)/gnu
 	(cd $(DESTDIR) && \
 		gln -s ../bin/gfile $(DESTDIR)$(prefix)/gnu/file)
-	# Injecting a symlink pointing at libmagic.so.1 on the filesystem, so that
-	# checkpkg realizes that the dependency is necessary.
-	if [ -d $(DESTDIR)$(libdir)/python/site-packages ]; then \
-	  ln -s ../../libmagic.so.1 $(DESTDIR)$(libdir)/python/site-packages/need-libmagic; \
-	fi
 	@$(MAKECOOKIE)
 
-post-merge:
+post-merge-all:
 	$(FILEDIR)/check_pkgroot.sh "$(PKGROOT)"
 	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/file/trunk/checksums
===================================================================
--- csw/mgar/pkg/file/trunk/checksums	2014-02-11 10:43:09 UTC (rev 22990)
+++ csw/mgar/pkg/file/trunk/checksums	2014-02-11 11:09:53 UTC (rev 22991)
@@ -1 +1 @@
-c26625f1d6773ad4bc5a87c0e315632c  file-5.14.tar.gz
+359c0cf41c3d438d17b4d293f3b950dc  file-5.16.tar.gz

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