[csw-devel] SF.net SVN: gar:[9818] csw/mgar/pkg/mtwrite/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Wed May 5 12:57:47 CEST 2010
Revision: 9818
http://gar.svn.sourceforge.net/gar/?rev=9818&view=rev
Author: dmichelsen
Date: 2010-05-05 10:57:47 +0000 (Wed, 05 May 2010)
Log Message:
-----------
mtwrite: Some fixes
Modified Paths:
--------------
csw/mgar/pkg/mtwrite/trunk/Makefile
csw/mgar/pkg/mtwrite/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/mtwrite/trunk/files/0001-Use-man3-and-skip-intermediate-lib-dir.patch
csw/mgar/pkg/mtwrite/trunk/files/0002-Hardcode-library-position.patch
csw/mgar/pkg/mtwrite/trunk/files/0003-Fix-path-in-manpage.patch
Removed Paths:
-------------
csw/mgar/pkg/mtwrite/trunk/files/0001-Create-correct-man-directory.patch
csw/mgar/pkg/mtwrite/trunk/files/0002-Calculate-threadcount-instead-of-hardcoding.patch
Modified: csw/mgar/pkg/mtwrite/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mtwrite/trunk/Makefile 2010-05-05 09:58:52 UTC (rev 9817)
+++ csw/mgar/pkg/mtwrite/trunk/Makefile 2010-05-05 10:57:47 UTC (rev 9818)
@@ -9,8 +9,9 @@
MASTER_SITES = http://www.maier-komor.de/mtwrite/
DISTFILES = $(GARNAME)-$(GARVERSION).tgz
-PATCHFILES = 0001-Create-correct-man-directory.patch
-PATCHFILES += 0002-Calculate-threadcount-instead-of-hardcoding.patch
+PATCHFILES = 0001-Use-man3-and-skip-intermediate-lib-dir.patch
+PATCHFILES += 0002-Hardcode-library-position.patch
+PATCHFILES += 0003-Fix-path-in-manpage.patch
# File name regex to get notifications about upstream software releases
UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tgz
Modified: csw/mgar/pkg/mtwrite/trunk/checksums
===================================================================
--- csw/mgar/pkg/mtwrite/trunk/checksums 2010-05-05 09:58:52 UTC (rev 9817)
+++ csw/mgar/pkg/mtwrite/trunk/checksums 2010-05-05 10:57:47 UTC (rev 9818)
@@ -1,3 +1,4 @@
-4a3e8c3a315f81bb36efdee62a2ed770 0001-Create-correct-man-directory.patch
-12d6a72ebbd9d10c1c74740ca3942a15 0002-Calculate-threadcount-instead-of-hardcoding.patch
+38d741f25b39df66bc3a76ad9ca3a564 0001-Use-man3-and-skip-intermediate-lib-dir.patch
+acf7c038a96e406fae02714e721fbeb1 0002-Hardcode-library-position.patch
+62a7d62f1a70e72686dcd6c84cb48717 0003-Fix-path-in-manpage.patch
d1bf9be5af47ac77f9308e9849453057 mtwrite-r90214.tgz
Deleted: csw/mgar/pkg/mtwrite/trunk/files/0001-Create-correct-man-directory.patch
===================================================================
--- csw/mgar/pkg/mtwrite/trunk/files/0001-Create-correct-man-directory.patch 2010-05-05 09:58:52 UTC (rev 9817)
+++ csw/mgar/pkg/mtwrite/trunk/files/0001-Create-correct-man-directory.patch 2010-05-05 10:57:47 UTC (rev 9818)
@@ -1,25 +0,0 @@
-From 8463404c64d85f9f39b164f199feefaf20b0d8cc Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Wed, 5 May 2010 11:46:44 +0200
-Subject: [PATCH 1/2] Create correct man directory
-
----
- Makefile | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 822d63d..82e4986 100644
---- a/Makefile
-+++ b/Makefile
-@@ -32,7 +32,7 @@ clean:
- install: mtwrite.so
- -$(MKDIR) $(PREFIX)/bin
- -$(MKDIR) $(PREFIX)/lib/$(OS)-$(MACH)
-- -$(MKDIR) $(PREFIX)/share/man/man1
-+ -$(MKDIR) $(PREFIX)/share/man/man3
- $(CP) mtwrite.so $(PREFIX)/lib/$(OS)-$(MACH)
- $(CP) mttar mtcp mtgtar mtstar mtunzip $(PREFIX)/bin
- $(CP) mtwrite.3 $(PREFIX)/share/man/man3
---
-1.7.0
-
Added: csw/mgar/pkg/mtwrite/trunk/files/0001-Use-man3-and-skip-intermediate-lib-dir.patch
===================================================================
--- csw/mgar/pkg/mtwrite/trunk/files/0001-Use-man3-and-skip-intermediate-lib-dir.patch (rev 0)
+++ csw/mgar/pkg/mtwrite/trunk/files/0001-Use-man3-and-skip-intermediate-lib-dir.patch 2010-05-05 10:57:47 UTC (rev 9818)
@@ -0,0 +1,28 @@
+From 754fc5773a38db0d2a2196c378fbe4a125628ee5 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Wed, 5 May 2010 12:33:48 +0200
+Subject: [PATCH 1/2] Use man3 and skip intermediate lib dir
+
+---
+ Makefile | 6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 822d63d..d62261d 100644
+--- a/Makefile
++++ b/Makefile
+@@ -31,8 +31,8 @@ clean:
+
+ install: mtwrite.so
+ -$(MKDIR) $(PREFIX)/bin
+- -$(MKDIR) $(PREFIX)/lib/$(OS)-$(MACH)
+- -$(MKDIR) $(PREFIX)/share/man/man1
+- $(CP) mtwrite.so $(PREFIX)/lib/$(OS)-$(MACH)
++ -$(MKDIR) $(PREFIX)/lib
++ -$(MKDIR) $(PREFIX)/share/man/man3
++ $(CP) mtwrite.so $(PREFIX)/lib
+ $(CP) mttar mtcp mtgtar mtstar mtunzip $(PREFIX)/bin
+ $(CP) mtwrite.3 $(PREFIX)/share/man/man3
+--
+1.7.0
+
Deleted: csw/mgar/pkg/mtwrite/trunk/files/0002-Calculate-threadcount-instead-of-hardcoding.patch
===================================================================
--- csw/mgar/pkg/mtwrite/trunk/files/0002-Calculate-threadcount-instead-of-hardcoding.patch 2010-05-05 09:58:52 UTC (rev 9817)
+++ csw/mgar/pkg/mtwrite/trunk/files/0002-Calculate-threadcount-instead-of-hardcoding.patch 2010-05-05 10:57:47 UTC (rev 9818)
@@ -1,89 +0,0 @@
-From bbacd109a1314356064f26397ff68dd1a7fa72f4 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <dam at opencsw.org>
-Date: Wed, 5 May 2010 11:55:37 +0200
-Subject: [PATCH 2/2] Calculate threadcount instead of hardcoding
-
----
- mtcp | 4 ++--
- mtgtar | 4 ++--
- mtstar | 4 ++--
- mttar | 2 +-
- mtunzip | 4 ++--
- 5 files changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/mtcp b/mtcp
-index 5e9a373..62a38f2 100755
---- a/mtcp
-+++ b/mtcp
-@@ -1,8 +1,8 @@
- #!/bin/ksh
- INSTALLDIR=`dirname $0`/../lib
--LD_PRELOAD=$INSTALLDIR/`uname -s`-`uname -m`/mtwrite.so
-+LD_PRELOAD=${LD_PRELOAD:-}:$INSTALLDIR/`uname -s`-`uname -m`/mtwrite.so
- MTWRITE_VERBOSE=${MTWRITE_VERBOSE:=1} # default
--MTWRITE_MAXTHREADS=${MTWRITE_MAXTHREADS:=32} # default
-+MTWRITE_MAXTHREADS=${MTWRITE_MAXTHREADS:=`/usr/sbin/psrinfo | wc -l`} # default
- MTWRITE_MEMPERTHREAD=${MTWRITE_MEMPERTHREAD:=16M} # default
- export LD_PRELOAD MTWRITE_VERBOSE MTWRITE_MAXTHREADS MTWRITE_MEMPERTHREAD
- exec cp $@
-diff --git a/mtgtar b/mtgtar
-index b56399c..0a8e9f3 100755
---- a/mtgtar
-+++ b/mtgtar
-@@ -1,8 +1,8 @@
- #!/bin/ksh
- INSTALLDIR=`dirname $0`/../lib
--LD_PRELOAD=$INSTALLDIR/`uname -s`-`uname -m`/mtwrite.so
-+LD_PRELOAD=${LD_PRELOAD:-}:$INSTALLDIR/`uname -s`-`uname -m`/mtwrite.so
- MTWRITE_VERBOSE=${MTWRITE_VERBOSE:=1} # default
--MTWRITE_MAXTHREADS=${MTWRITE_MAXTHREADS:=32} # default
-+MTWRITE_MAXTHREADS=${MTWRITE_MAXTHREADS:=`/usr/sbin/psrinfo | wc -l`} # default
- MTWRITE_MEMPERTHREAD=${MTWRITE_MEMPERTHREAD:=16M} # default
- export LD_PRELOAD MTWRITE_VERBOSE MTWRITE_MAXTHREADS MTWRITE_MEMPERTHREAD
- exec gtar $@
-diff --git a/mtstar b/mtstar
-index ed37a89..3cb2b1f 100755
---- a/mtstar
-+++ b/mtstar
-@@ -1,8 +1,8 @@
- #!/bin/ksh
- INSTALLDIR=`dirname $0`/../lib
--LD_PRELOAD=$INSTALLDIR/`uname -s`-`uname -m`/mtwrite.so
-+LD_PRELOAD=${LD_PRELOAD:-}:$INSTALLDIR/`uname -s`-`uname -m`/mtwrite.so
- MTWRITE_VERBOSE=${MTWRITE_VERBOSE:=1} # default
--MTWRITE_MAXTHREADS=${MTWRITE_MAXTHREADS:=32} # default
-+MTWRITE_MAXTHREADS=${MTWRITE_MAXTHREADS:=`/usr/sbin/psrinfo | wc -l`} # default
- MTWRITE_MEMPERTHREAD=${MTWRITE_MEMPERTHREAD:=16M} # default
- export LD_PRELOAD MTWRITE_VERBOSE MTWRITE_MAXTHREADS MTWRITE_MEMPERTHREAD
- exec star $@
-diff --git a/mttar b/mttar
-index ec45cec..49e985f 100755
---- a/mttar
-+++ b/mttar
-@@ -2,7 +2,7 @@
- INSTALLDIR=`dirname $0`/../lib
- LD_PRELOAD=${LD_PRELOAD:-}:$INSTALLDIR/`uname -s`-`uname -m`/mtwrite.so
- MTWRITE_VERBOSE=${MTWRITE_VERBOSE:=1} # default
--MTWRITE_MAXTHREADS=${MTWRITE_MAXTHREADS:=32} # default
-+MTWRITE_MAXTHREADS=${MTWRITE_MAXTHREADS:=`/usr/sbin/psrinfo | wc -l`} # default
- MTWRITE_MEMPERTHREAD=${MTWRITE_MEMPERTHREAD:=16M} # default
- export LD_PRELOAD MTWRITE_VERBOSE MTWRITE_MAXTHREADS MTWRITE_MEMPERTHREAD
- exec tar $@
-diff --git a/mtunzip b/mtunzip
-index 1763686..200d0d6 100755
---- a/mtunzip
-+++ b/mtunzip
-@@ -1,8 +1,8 @@
- #!/bin/ksh
- INSTALLDIR=`dirname $0`/../lib
--LD_PRELOAD=$INSTALLDIR/`uname -s`-`uname -m`/mtwrite.so
-+LD_PRELOAD=${LD_PRELOAD:-}:$INSTALLDIR/`uname -s`-`uname -m`/mtwrite.so
- MTWRITE_VERBOSE=${MTWRITE_VERBOSE:=1} # default
--MTWRITE_MAXTHREADS=${MTWRITE_MAXTHREADS:=32} # default
-+MTWRITE_MAXTHREADS=${MTWRITE_MAXTHREADS:=`/usr/sbin/psrinfo | wc -l`} # default
- MTWRITE_MEMPERTHREAD=${MTWRITE_MEMPERTHREAD:=16M} # default
- export LD_PRELOAD MTWRITE_VERBOSE MTWRITE_MAXTHREADS MTWRITE_MEMPERTHREAD
- exec unzip $@
---
-1.7.0
-
Added: csw/mgar/pkg/mtwrite/trunk/files/0002-Hardcode-library-position.patch
===================================================================
--- csw/mgar/pkg/mtwrite/trunk/files/0002-Hardcode-library-position.patch (rev 0)
+++ csw/mgar/pkg/mtwrite/trunk/files/0002-Hardcode-library-position.patch 2010-05-05 10:57:47 UTC (rev 9818)
@@ -0,0 +1,76 @@
+From 252a4e3086661f851e90ea32690ca734548a015b Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Wed, 5 May 2010 12:34:13 +0200
+Subject: [PATCH 2/2] Hardcode library position
+
+---
+ mtcp | 3 +--
+ mtgtar | 3 +--
+ mtstar | 3 +--
+ mttar | 3 +--
+ mtunzip | 3 +--
+ 5 files changed, 5 insertions(+), 10 deletions(-)
+
+diff --git a/mtcp b/mtcp
+index 5e9a373..a6d7aa6 100755
+--- a/mtcp
++++ b/mtcp
+@@ -1,6 +1,5 @@
+ #!/bin/ksh
+-INSTALLDIR=`dirname $0`/../lib
+-LD_PRELOAD=$INSTALLDIR/`uname -s`-`uname -m`/mtwrite.so
++LD_PRELOAD=/opt/csw/lib/mtwrite.so
+ MTWRITE_VERBOSE=${MTWRITE_VERBOSE:=1} # default
+ MTWRITE_MAXTHREADS=${MTWRITE_MAXTHREADS:=32} # default
+ MTWRITE_MEMPERTHREAD=${MTWRITE_MEMPERTHREAD:=16M} # default
+diff --git a/mtgtar b/mtgtar
+index b56399c..f697ebc 100755
+--- a/mtgtar
++++ b/mtgtar
+@@ -1,6 +1,5 @@
+ #!/bin/ksh
+-INSTALLDIR=`dirname $0`/../lib
+-LD_PRELOAD=$INSTALLDIR/`uname -s`-`uname -m`/mtwrite.so
++LD_PRELOAD=/opt/csw/lib/mtwrite.so
+ MTWRITE_VERBOSE=${MTWRITE_VERBOSE:=1} # default
+ MTWRITE_MAXTHREADS=${MTWRITE_MAXTHREADS:=32} # default
+ MTWRITE_MEMPERTHREAD=${MTWRITE_MEMPERTHREAD:=16M} # default
+diff --git a/mtstar b/mtstar
+index ed37a89..ab40828 100755
+--- a/mtstar
++++ b/mtstar
+@@ -1,6 +1,5 @@
+ #!/bin/ksh
+-INSTALLDIR=`dirname $0`/../lib
+-LD_PRELOAD=$INSTALLDIR/`uname -s`-`uname -m`/mtwrite.so
++LD_PRELOAD=/opt/csw/lib/mtwrite.so
+ MTWRITE_VERBOSE=${MTWRITE_VERBOSE:=1} # default
+ MTWRITE_MAXTHREADS=${MTWRITE_MAXTHREADS:=32} # default
+ MTWRITE_MEMPERTHREAD=${MTWRITE_MEMPERTHREAD:=16M} # default
+diff --git a/mttar b/mttar
+index ec45cec..90c85ee 100755
+--- a/mttar
++++ b/mttar
+@@ -1,6 +1,5 @@
+ #!/bin/ksh
+-INSTALLDIR=`dirname $0`/../lib
+-LD_PRELOAD=${LD_PRELOAD:-}:$INSTALLDIR/`uname -s`-`uname -m`/mtwrite.so
++LD_PRELOAD=/opt/csw/lib/mtwrite.so
+ MTWRITE_VERBOSE=${MTWRITE_VERBOSE:=1} # default
+ MTWRITE_MAXTHREADS=${MTWRITE_MAXTHREADS:=32} # default
+ MTWRITE_MEMPERTHREAD=${MTWRITE_MEMPERTHREAD:=16M} # default
+diff --git a/mtunzip b/mtunzip
+index 1763686..a2f6b62 100755
+--- a/mtunzip
++++ b/mtunzip
+@@ -1,6 +1,5 @@
+ #!/bin/ksh
+-INSTALLDIR=`dirname $0`/../lib
+-LD_PRELOAD=$INSTALLDIR/`uname -s`-`uname -m`/mtwrite.so
++LD_PRELOAD=/opt/csw/lib/mtwrite.so
+ MTWRITE_VERBOSE=${MTWRITE_VERBOSE:=1} # default
+ MTWRITE_MAXTHREADS=${MTWRITE_MAXTHREADS:=32} # default
+ MTWRITE_MEMPERTHREAD=${MTWRITE_MEMPERTHREAD:=16M} # default
+--
+1.7.0
+
Added: csw/mgar/pkg/mtwrite/trunk/files/0003-Fix-path-in-manpage.patch
===================================================================
--- csw/mgar/pkg/mtwrite/trunk/files/0003-Fix-path-in-manpage.patch (rev 0)
+++ csw/mgar/pkg/mtwrite/trunk/files/0003-Fix-path-in-manpage.patch 2010-05-05 10:57:47 UTC (rev 9818)
@@ -0,0 +1,25 @@
+From ee74ce1c6c6833f2599dbf57f4ba51ab2610fd14 Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <dam at opencsw.org>
+Date: Wed, 5 May 2010 12:56:17 +0200
+Subject: [PATCH 3/3] Fix path in manpage
+
+---
+ mtwrite.3 | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/mtwrite.3 b/mtwrite.3
+index da61094..9fd8282 100644
+--- a/mtwrite.3
++++ b/mtwrite.3
+@@ -45,7 +45,7 @@ to include
+ for use with a program of your choice. You may want to take a look at
+ the supplied wrapper scripts to learn how to write your own.
+ .SH EXAMPLE
+-env LD_PRELOAD=/usr/local/lib/mtwrite.so cp -r /home/me/mystuff /backup
++env LD_PRELOAD=/opt/csw/lib/mtwrite.so cp -r /home/me/mystuff /backup
+ .SH "ENVIRONMENT VARIABLES"
+ .TP
+ .B MTWRITE_VERBOSE
+--
+1.7.0
+
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