Revision: 8347
http://gar.svn.sourceforge.net/gar/?rev=8347&view=rev
Author: wahwah
Date: 2010-02-04 12:54:45 +0000 (Thu, 04 Feb 2010)
Log Message:
-----------
slack: Patched all the occurences of /usr/bin/perl.
Modified Paths:
--------------
csw/mgar/pkg/slack/trunk/Makefile
csw/mgar/pkg/slack/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/slack/trunk/files/0001-OpenCSW-layout.patch
csw/mgar/pkg/slack/trunk/files/0002-use-OpenCSW-perl.patch
csw/mgar/pkg/slack/trunk/files/0003-gen_config_file-with-OpenCSW-perl.patch
Removed Paths:
-------------
csw/mgar/pkg/slack/trunk/files/OpenCSW-layout.patch
csw/mgar/pkg/slack/trunk/files/use-OpenCSW-perl.patch
Modified: csw/mgar/pkg/slack/trunk/Makefile
===================================================================
--- csw/mgar/pkg/slack/trunk/Makefile 2010-02-04 12:32:12 UTC (rev 8346)
+++ csw/mgar/pkg/slack/trunk/Makefile 2010-02-04 12:54:45 UTC (rev 8347)
@@ -10,8 +10,9 @@
endef
SPKG_SOURCEURL = http://code.google.com/p/slack/
MASTER_SITES = $(GOOGLE_MIRROR)
-PATCHFILES = OpenCSW-layout.patch
-PATCHFILES += use-OpenCSW-perl.patch
+PATCHFILES = 0001-OpenCSW-layout.patch
+PATCHFILES += 0002-use-OpenCSW-perl.patch
+PATCHFILES += 0003-gen_config_file-with-OpenCSW-perl.patch
DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
RUNTIME_DEP_PKGS_CSWslack += CSWperl
Modified: csw/mgar/pkg/slack/trunk/checksums
===================================================================
--- csw/mgar/pkg/slack/trunk/checksums 2010-02-04 12:32:12 UTC (rev 8346)
+++ csw/mgar/pkg/slack/trunk/checksums 2010-02-04 12:54:45 UTC (rev 8347)
@@ -1,3 +1,4 @@
-a833b28145a02bcda5a3572d8e9500bc OpenCSW-layout.patch
+322b69da09e4676bed40231652b5c4e7 0001-OpenCSW-layout.patch
+f11a6f0d4d7a40c73171ea10aede34e0 0002-use-OpenCSW-perl.patch
+9788deb3ea2ecaa7b722e8b3afeacda1 0003-gen_config_file-with-OpenCSW-perl.patch
4056df8e7e152a6e4e6730708a86bd25 slack-0.15.2.tar.gz
-c9b4cfbdb8bbb49725b3d5214582911a use-OpenCSW-perl.patch
Added: csw/mgar/pkg/slack/trunk/files/0001-OpenCSW-layout.patch
===================================================================
--- csw/mgar/pkg/slack/trunk/files/0001-OpenCSW-layout.patch
(rev 0)
+++ csw/mgar/pkg/slack/trunk/files/0001-OpenCSW-layout.patch 2010-02-04
12:54:45 UTC (rev 8347)
@@ -0,0 +1,44 @@
+From ae2fee3f00fd779ebe738e820050042d439ddbc1 Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <[email protected]>
+Date: Thu, 4 Feb 2010 13:44:58 +0100
+Subject: [PATCH 1/2] OpenCSW layout
+
+---
+ Makefile.common | 10 +++++-----
+ 1 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/Makefile.common b/Makefile.common
+index 198f557..e088698 100644
+--- a/Makefile.common
++++ b/Makefile.common
+@@ -6,22 +6,22 @@ VERSION=0.15.2
+
+ DESTDIR =
+
+-prefix = /
+-exec_prefix = /usr
+-sysconfdir = ${prefix}/etc
++prefix = /opt/csw
++exec_prefix = /opt/csw
++sysconfdir = /etc${prefix}
+ mandir = ${exec_prefix}/share/man
+ bindir = ${exec_prefix}/bin
+ sbindir = ${exec_prefix}/sbin
+ libdir = ${exec_prefix}/lib
+ libexecdir = ${exec_prefix}/lib
+-localstatedir = ${prefix}/var
++localstatedir = /var${prefix}
+
+ slack_libdir = ${libdir}/slack
+ slack_libexecdir = ${libexecdir}/slack
+ slack_localstatedir = ${localstatedir}/lib/slack
+ slack_localcachedir = ${localstatedir}/cache/slack
+
+-INSTALL = install
++INSTALL = ginstall
+ MKDIR = mkdir -p
+
+ PRIVDIRMODE = 0700
+--
+1.6.6
+
Added: csw/mgar/pkg/slack/trunk/files/0002-use-OpenCSW-perl.patch
===================================================================
--- csw/mgar/pkg/slack/trunk/files/0002-use-OpenCSW-perl.patch
(rev 0)
+++ csw/mgar/pkg/slack/trunk/files/0002-use-OpenCSW-perl.patch 2010-02-04
12:54:45 UTC (rev 8347)
@@ -0,0 +1,173 @@
+From a455e74b9e71d83f4a039e8781036e9bb62bf242 Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <[email protected]>
+Date: Thu, 4 Feb 2010 13:45:25 +0100
+Subject: [PATCH 2/2] use OpenCSW perl
+
+---
+ src/slack | 6 +++---
+ src/slack-diff | 2 +-
+ src/slack-getroles | 4 ++--
+ src/slack-installfiles | 4 ++--
+ src/slack-rolediff | 4 ++--
+ src/slack-runscript | 6 +++---
+ src/slack-stage | 4 ++--
+ src/slack-sync | 4 ++--
+ 8 files changed, 17 insertions(+), 17 deletions(-)
+
+diff --git a/src/slack b/src/slack
+index d8e9fbb..3c9c4ce 100755
+--- a/src/slack
++++ b/src/slack
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -w
++#!/opt/csw/bin/perl -w
+ # $Id: slack 180 2008-01-19 08:26:19Z alan $
+ # vim:sw=2
+ # vim600:fdm=marker
+@@ -19,8 +19,8 @@ use File::Path;
+ use File::Find;
+ use POSIX; # for strftime
+
+-use constant LIBEXEC_DIR => '/usr/lib/slack';
+-use constant LIB_DIR => '/usr/lib/slack';
++use constant LIBEXEC_DIR => '/opt/csw/lib/slack';
++use constant LIB_DIR => '/opt/csw/lib/slack';
+ use lib LIB_DIR;
+ use Slack;
+
+diff --git a/src/slack-diff b/src/slack-diff
+index dde4f16..9b2ca65 100755
+--- a/src/slack-diff
++++ b/src/slack-diff
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -w
++#!/opt/csw/bin/perl -w
+ # $Id: slack-diff 122 2006-09-27 07:34:32Z alan $
+ # vim:sw=2
+ # vim600:fdm=marker
+diff --git a/src/slack-getroles b/src/slack-getroles
+index 77eba20..604f4f6 100755
+--- a/src/slack-getroles
++++ b/src/slack-getroles
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -w
++#!/opt/csw/bin/perl -w
+ # $Id: slack-getroles 180 2008-01-19 08:26:19Z alan $
+ # vim:sw=2
+ # vim600:fdm=marker
+@@ -17,7 +17,7 @@ use sigtrap qw(die untrapped normal-signals
+
+ use File::Path;
+
+-use constant LIB_DIR => '/usr/lib/slack';
++use constant LIB_DIR => '/opt/csw/lib/slack';
+ use lib LIB_DIR;
+ use Slack;
+
+diff --git a/src/slack-installfiles b/src/slack-installfiles
+index 65d1e22..5c3659d 100755
+--- a/src/slack-installfiles
++++ b/src/slack-installfiles
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -w
++#!/opt/csw/bin/perl -w
+ # $Id: slack-installfiles 180 2008-01-19 08:26:19Z alan $
+ # vim:sw=2
+ # vim600:fdm=marker
+@@ -17,7 +17,7 @@ use sigtrap qw(die untrapped normal-signals
+
+ use File::Path;
+
+-use constant LIB_DIR => '/usr/lib/slack';
++use constant LIB_DIR => '/opt/csw/lib/slack';
+ use lib LIB_DIR;
+ use Slack;
+
+diff --git a/src/slack-rolediff b/src/slack-rolediff
+index 92def93..bd11fc4 100755
+--- a/src/slack-rolediff
++++ b/src/slack-rolediff
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -w
++#!/opt/csw/bin/perl -w
+ # $Id: slack-rolediff 125 2006-09-27 07:50:07Z alan $
+ # vim:sw=2
+ # vim600:fdm=marker
+@@ -18,7 +18,7 @@ use sigtrap qw(die untrapped normal-signals
+ use File::Path;
+ use File::Find;
+
+-use constant LIB_DIR => '/usr/lib/slack';
++use constant LIB_DIR => '/opt/csw/lib/slack';
+ use lib LIB_DIR;
+ use Slack;
+
+diff --git a/src/slack-runscript b/src/slack-runscript
+index 5125a83..3215074 100755
+--- a/src/slack-runscript
++++ b/src/slack-runscript
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -w
++#!/opt/csw/bin/perl -w
+ # $Id: slack-runscript 118 2006-09-25 18:35:17Z alan $
+ # vim:sw=2
+ # vim600:fdm=marker
+@@ -17,7 +17,7 @@ use sigtrap qw(die untrapped normal-signals
+ use File::Path;
+ use File::Find;
+
+-use constant LIB_DIR => '/usr/lib/slack';
++use constant LIB_DIR => '/opt/csw/lib/slack';
+ use lib LIB_DIR;
+ use Slack;
+
+@@ -57,7 +57,7 @@ die "No roles given!\n\n$usage" unless @ARGV;
+
+ # Start with a clean environment
+ %ENV = (
+- PATH => '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
++ PATH =>
'/opt/csw/sbin:/opt/csw/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin',
+ );
+ # Export certain variables to the environment. These are guaranteed to
+ # be set because we require them in get_options above.
+diff --git a/src/slack-stage b/src/slack-stage
+index 3833736..43f1bce 100755
+--- a/src/slack-stage
++++ b/src/slack-stage
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -w
++#!/opt/csw/bin/perl -w
+ # $Id: slack-stage 180 2008-01-19 08:26:19Z alan $
+ # vim:sw=2
+ # vim600:fdm=marker
+@@ -19,7 +19,7 @@ use sigtrap qw(die untrapped normal-signals
+ use File::Path;
+ use File::Find;
+
+-use constant LIB_DIR => '/usr/lib/slack';
++use constant LIB_DIR => '/opt/csw/lib/slack';
+ use lib LIB_DIR;
+ use Slack;
+
+diff --git a/src/slack-sync b/src/slack-sync
+index 3c58034..c886ce1 100755
+--- a/src/slack-sync
++++ b/src/slack-sync
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -w
++#!/opt/csw/bin/perl -w
+ # $Id: slack-sync 180 2008-01-19 08:26:19Z alan $
+ # vim:sw=2
+ # vim600:fdm=marker
+@@ -17,7 +17,7 @@ use sigtrap qw(die untrapped normal-signals
+
+ use File::Path;
+
+-use constant LIB_DIR => '/usr/lib/slack';
++use constant LIB_DIR => '/opt/csw/lib/slack';
+ use lib LIB_DIR;
+ use Slack;
+
+--
+1.6.6
+
Added:
csw/mgar/pkg/slack/trunk/files/0003-gen_config_file-with-OpenCSW-perl.patch
===================================================================
--- csw/mgar/pkg/slack/trunk/files/0003-gen_config_file-with-OpenCSW-perl.patch
(rev 0)
+++ csw/mgar/pkg/slack/trunk/files/0003-gen_config_file-with-OpenCSW-perl.patch
2010-02-04 12:54:45 UTC (rev 8347)
@@ -0,0 +1,22 @@
+From e80d079670eec46817df4756d014a32f5c0f4c42 Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <[email protected]>
+Date: Thu, 4 Feb 2010 13:51:00 +0100
+Subject: [PATCH] gen_config_file with OpenCSW perl
+
+---
+ test/gen_config_file | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/test/gen_config_file b/test/gen_config_file
+index b70161e..99461b2 100755
+--- a/test/gen_config_file
++++ b/test/gen_config_file
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -w
++#!/opt/csw/bin/perl -w
+
+ use test_util qw(gen_config_file);
+
+--
+1.6.6
+
Deleted: csw/mgar/pkg/slack/trunk/files/OpenCSW-layout.patch
===================================================================
--- csw/mgar/pkg/slack/trunk/files/OpenCSW-layout.patch 2010-02-04 12:32:12 UTC
(rev 8346)
+++ csw/mgar/pkg/slack/trunk/files/OpenCSW-layout.patch 2010-02-04 12:54:45 UTC
(rev 8347)
@@ -1,33 +0,0 @@
---- work/solaris8-sparc/build-isa-sparcv8/slack-0.15.2/Makefile.common.orig
2008-04-21 03:06:15.000000000 +0200
-+++ work/solaris8-sparc/build-isa-sparcv8/slack-0.15.2/Makefile.common
2010-02-04 13:29:57.516978313 +0100
-@@ -4,24 +4,22 @@
- PACKAGE=slack
- VERSION=0.15.2
-
--DESTDIR =
--
--prefix = /
--exec_prefix = /usr
--sysconfdir = ${prefix}/etc
-+prefix = /opt/csw
-+exec_prefix = /opt/csw
-+sysconfdir = /etc${prefix}
- mandir = ${exec_prefix}/share/man
- bindir = ${exec_prefix}/bin
- sbindir = ${exec_prefix}/sbin
- libdir = ${exec_prefix}/lib
- libexecdir = ${exec_prefix}/lib
--localstatedir = ${prefix}/var
-+localstatedir = /var${prefix}
-
--slack_libdir = ${libdir}/slack
-+slack_libdir = ${libdir}/perl/csw
- slack_libexecdir = ${libexecdir}/slack
- slack_localstatedir = ${localstatedir}/lib/slack
- slack_localcachedir = ${localstatedir}/cache/slack
-
--INSTALL = install
-+INSTALL = ginstall
- MKDIR = mkdir -p
-
- PRIVDIRMODE = 0700
Deleted: csw/mgar/pkg/slack/trunk/files/use-OpenCSW-perl.patch
===================================================================
--- csw/mgar/pkg/slack/trunk/files/use-OpenCSW-perl.patch 2010-02-04
12:32:12 UTC (rev 8346)
+++ csw/mgar/pkg/slack/trunk/files/use-OpenCSW-perl.patch 2010-02-04
12:54:45 UTC (rev 8347)
@@ -1,8 +0,0 @@
---- slack-0.15.2/test/gen_config_file.orig 2010-02-04 02:09:19.029289626
+0100
-+++ slack-0.15.2/test/gen_config_file 2010-02-04 02:09:27.503141517 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -w
-+#!/opt/csw/bin/perl -w
-
- use test_util qw(gen_config_file);
-
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
devel mailing list
[email protected]
https://lists.opencsw.org/mailman/listinfo/devel
