SF.net SVN: gar:[22500] csw/mgar/pkg/fish/trunk

[guengel at users.sourceforge.net]

Revision: 22500
          http://gar.svn.sourceforge.net/gar/?rev=22500&view=rev
Author:   guengel
Date:     2013-11-14 11:44:04 +0000 (Thu, 14 Nov 2013)
Log Message:
-----------
fish/trunk: Packaging done.

Modified Paths:
--------------
    csw/mgar/pkg/fish/trunk/Makefile

Added Paths:
-----------
    csw/mgar/pkg/fish/trunk/files/0007-Add-opt-csw-where-deemed-neccessary.patch

Modified: csw/mgar/pkg/fish/trunk/Makefile
===================================================================
--- csw/mgar/pkg/fish/trunk/Makefile	2013-11-14 11:17:35 UTC (rev 22499)
+++ csw/mgar/pkg/fish/trunk/Makefile	2013-11-14 11:44:04 UTC (rev 22500)
@@ -22,9 +22,17 @@
 PATCHFILES += 0004-LinuxSoft-patch-2.patch
 PATCHFILES += 0005-Include-strings.h-to-make-bzero-available.patch
 PATCHFILES += 0006-Include-strings.h-to-make-bzero-available-2.patch
+PATCHFILES += 0007-Add-opt-csw-where-deemed-neccessary.patch
 
+RUNTIME_DEP_PKGS_CSWfish += CSWlibintl8
+RUNTIME_DEP_PKGS_CSWfish += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWfish += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWfish += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWfish += CSWlibncurses5
 
-RUNTIME_PKG_DEPS = CSWcswclassutils
+# That's fine, directory list has been adjusted to include /opt/csw/share
+CHECKPKG_OVERRIDES_CSWfish += file-with-bad-content|/usr/local|root/opt/csw/bin/mimedb
+CHECKPKG_OVERRIDES_CSWfish += file-with-bad-content|/usr/share|root/opt/csw/bin/mimedb
 
 EXTRA_CPPFLAGS = -I$(includedir)/ncurses
 # Ain't pulled in automatically...
@@ -39,6 +47,8 @@
 REINPLACE_WITH = \#!/bin/bash
 REINPLACE_FILES = build_tools/git_version_gen.sh
 
+TEST_SCRIPTS = custom
+
 include gar/category.mk
 
 PATH := $(prefix)/gnu:$(PATH)
@@ -46,3 +56,7 @@
 pre-configure:
 	cd $(WORKSRC) && autoreconf -fi
 	@$(MAKECOOKIE)
+
+test-custom:
+	cd $(WORKSRC) && env $(BUILD_ENV) $(MAKE) test
+	@$(MAKECOOKIE)

Added: csw/mgar/pkg/fish/trunk/files/0007-Add-opt-csw-where-deemed-neccessary.patch
===================================================================
--- csw/mgar/pkg/fish/trunk/files/0007-Add-opt-csw-where-deemed-neccessary.patch	                        (rev 0)
+++ csw/mgar/pkg/fish/trunk/files/0007-Add-opt-csw-where-deemed-neccessary.patch	2013-11-14 11:44:04 UTC (rev 22500)
@@ -0,0 +1,53 @@
+From 82677631e84976b848bb16cd134e1ecae6e86336 Mon Sep 17 00:00:00 2001
+From: Rafael Ostertag <raos at opencsw.org>
+Date: Thu, 14 Nov 2013 12:31:58 +0100
+Subject: [PATCH] Add /opt/csw/* where deemed neccessary
+
+---
+ env.cpp     | 2 +-
+ mimedb.cpp  | 2 +-
+ xdgmime.cpp | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/env.cpp b/env.cpp
+index 13f87b6..7314f26 100644
+--- a/env.cpp
++++ b/env.cpp
+@@ -436,7 +436,7 @@ static void setup_path()
+     const env_var_t path = env_get_string(L"PATH");
+     if (path.missing_or_empty())
+     {
+-        const wchar_t *value = L"/usr/bin" ARRAY_SEP_STR L"/bin";
++        const wchar_t *value = L"/opt/csw/bin" ARRAY_SEP_STR L"/usr/bin" ARRAY_SEP_STR L"/bin";
+         env_set(L"PATH", value, ENV_GLOBAL | ENV_EXPORT);
+     }
+ }
+diff --git a/mimedb.cpp b/mimedb.cpp
+index fdf5da1..e7fcd25 100644
+--- a/mimedb.cpp
++++ b/mimedb.cpp
+@@ -349,7 +349,7 @@ static int append_filenames(string_list_t &list, const char *f, int all)
+ 
+     xdg_data_dirs = getenv("XDG_DATA_DIRS");
+     if (xdg_data_dirs == NULL)
+-        xdg_data_dirs = "/usr/local/share:/usr/share";
++        xdg_data_dirs = "/opt/csw/share:/usr/local/share:/usr/share";
+ 
+     ptr = xdg_data_dirs;
+ 
+diff --git a/xdgmime.cpp b/xdgmime.cpp
+index 39d0a18..e3cd60d 100644
+--- a/xdgmime.cpp
++++ b/xdgmime.cpp
+@@ -211,7 +211,7 @@ xdg_run_command_on_dirs(XdgDirectoryFunc  func,
+ 
+     xdg_data_dirs = getenv("XDG_DATA_DIRS");
+     if (xdg_data_dirs == NULL)
+-        xdg_data_dirs = "/usr/local/share/:/usr/share/";
++        xdg_data_dirs = "/opt/csw/share/:/usr/local/share/:/usr/share/";
+ 
+     ptr = xdg_data_dirs;
+ 
+-- 
+1.8.4.1
+

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