Revision: 15377
http://gar.svn.sourceforge.net/gar/?rev=15377&view=rev
Author: dmichelsen
Date: 2011-08-19 07:53:35 +0000 (Fri, 19 Aug 2011)
Log Message:
-----------
mtwrite: Update to r100528
Modified Paths:
--------------
csw/mgar/pkg/mtwrite/trunk/Makefile
csw/mgar/pkg/mtwrite/trunk/checksums
csw/mgar/pkg/mtwrite/trunk/files/0002-Hardcode-library-position.patch
Removed Paths:
-------------
csw/mgar/pkg/mtwrite/trunk/files/0001-Use-man3-and-skip-intermediate-lib-dir.patch
csw/mgar/pkg/mtwrite/trunk/files/0003-Fix-path-in-manpage.patch
Modified: csw/mgar/pkg/mtwrite/trunk/Makefile
===================================================================
--- csw/mgar/pkg/mtwrite/trunk/Makefile 2011-08-18 22:19:50 UTC (rev 15376)
+++ csw/mgar/pkg/mtwrite/trunk/Makefile 2011-08-19 07:53:35 UTC (rev 15377)
@@ -1,6 +1,6 @@
# : Makefile 9089 2010-03-11 08:34:46Z wahwah $
NAME = mtwrite
-VERSION = r90214
+VERSION = r100528
CATEGORIES = lib
DESCRIPTION = Library to enable tar and unzip to write multiple files in
parallel
@@ -9,23 +9,34 @@
MASTER_SITES = http://www.maier-komor.de/mtwrite/
DISTFILES = $(NAME)-$(VERSION).tgz
-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 = $(NAME)-(\d+(?:\.\d+)*).tgz
+#PATCHFILES += 0002-Hardcode-library-position.patch
+VENDOR_URL = http://www.maier-komor.de/mtwrite.html
+
LICENSE = lgpl.txt
CONFIGURE_SCRIPTS =
-BUILD_OVERRIDE_VARS = CC
+EXTRA_CFLAGS = -G -g -mt
+EXTRA_LDFLAGS = -zinitarray=init -lthread -ldl -lrt -lumem
+
+BUILD_OVERRIDE_VARS = CC CFLAGS LDFLAGS
BUILD_OVERRIDE_VAR_CC = $(CC)
+BUILD_OVERRIDE_VAR_CFLAGS = $(CFLAGS)
+BUILD_OVERRIDE_VAR_LDFLAGS = $(LDFLAGS)
TEST_SCRIPTS =
INSTALL_OVERRIDE_DIRS = PREFIX
PREFIX=$(prefix)
+# This is the intended shared library name. As it is not meant for use with
+# LD_LIBRARY_PATH only this is ok.
+CHECKPKG_OVERRIDES_CSWmtwrite +=
soname-equals-filename|file=/opt/csw/lib/mtwrite.so
+
include gar/category.mk
+
+post-install-modulated:
+ perl -pi -e 's,/usr/local/lib,$(libdir),' \
+ $(DESTDIR)$(mandir)/man3/mtwrite.3
Modified: csw/mgar/pkg/mtwrite/trunk/checksums
===================================================================
--- csw/mgar/pkg/mtwrite/trunk/checksums 2011-08-18 22:19:50 UTC (rev
15376)
+++ csw/mgar/pkg/mtwrite/trunk/checksums 2011-08-19 07:53:35 UTC (rev
15377)
@@ -1,4 +1 @@
-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
+1eadb3e36f0b10b8616b56be1c3c2112 mtwrite-r100528.tgz
Deleted:
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
2011-08-18 22:19:50 UTC (rev 15376)
+++
csw/mgar/pkg/mtwrite/trunk/files/0001-Use-man3-and-skip-intermediate-lib-dir.patch
2011-08-19 07:53:35 UTC (rev 15377)
@@ -1,28 +0,0 @@
-From 754fc5773a38db0d2a2196c378fbe4a125628ee5 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <d...@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
-
Modified: csw/mgar/pkg/mtwrite/trunk/files/0002-Hardcode-library-position.patch
===================================================================
--- csw/mgar/pkg/mtwrite/trunk/files/0002-Hardcode-library-position.patch
2011-08-18 22:19:50 UTC (rev 15376)
+++ csw/mgar/pkg/mtwrite/trunk/files/0002-Hardcode-library-position.patch
2011-08-19 07:53:35 UTC (rev 15377)
@@ -1,22 +1,21 @@
-From 252a4e3086661f851e90ea32690ca734548a015b Mon Sep 17 00:00:00 2001
+From c3cecb517aad9f2d69df2b4c9898ec0306b4ff76 Mon Sep 17 00:00:00 2001
From: Dagobert Michelsen <d...@opencsw.org>
-Date: Wed, 5 May 2010 12:34:13 +0200
-Subject: [PATCH 2/2] Hardcode library position
+Date: Sat, 22 May 2010 22:16:52 +0200
+Subject: [PATCH] Hardcode library position
---
mtcp | 3 +--
mtgtar | 3 +--
mtstar | 3 +--
- mttar | 3 +--
mtunzip | 3 +--
- 5 files changed, 5 insertions(+), 10 deletions(-)
+ 4 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/mtcp b/mtcp
-index 5e9a373..a6d7aa6 100755
+index 456ef54..431fe6d 100755
--- a/mtcp
+++ b/mtcp
@@ -1,6 +1,5 @@
- #!/bin/ksh
+ #!/bin/sh
-INSTALLDIR=`dirname $0`/../lib
-LD_PRELOAD=$INSTALLDIR/`uname -s`-`uname -m`/mtwrite.so
+LD_PRELOAD=/opt/csw/lib/mtwrite.so
@@ -24,11 +23,11 @@
MTWRITE_MAXTHREADS=${MTWRITE_MAXTHREADS:=32} # default
MTWRITE_MEMPERTHREAD=${MTWRITE_MEMPERTHREAD:=16M} # default
diff --git a/mtgtar b/mtgtar
-index b56399c..f697ebc 100755
+index 0e6e129..5a0fe40 100755
--- a/mtgtar
+++ b/mtgtar
@@ -1,6 +1,5 @@
- #!/bin/ksh
+ #!/bin/sh
-INSTALLDIR=`dirname $0`/../lib
-LD_PRELOAD=$INSTALLDIR/`uname -s`-`uname -m`/mtwrite.so
+LD_PRELOAD=/opt/csw/lib/mtwrite.so
@@ -36,35 +35,23 @@
MTWRITE_MAXTHREADS=${MTWRITE_MAXTHREADS:=32} # default
MTWRITE_MEMPERTHREAD=${MTWRITE_MEMPERTHREAD:=16M} # default
diff --git a/mtstar b/mtstar
-index ed37a89..ab40828 100755
+index 63d5002..64de85a 100755
--- a/mtstar
+++ b/mtstar
@@ -1,6 +1,5 @@
- #!/bin/ksh
+ #!/bin/sh
-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
+index db4e93f..8e4ead4 100755
--- a/mtunzip
+++ b/mtunzip
@@ -1,6 +1,5 @@
- #!/bin/ksh
+ #!/bin/sh
-INSTALLDIR=`dirname $0`/../lib
-LD_PRELOAD=$INSTALLDIR/`uname -s`-`uname -m`/mtwrite.so
+LD_PRELOAD=/opt/csw/lib/mtwrite.so
@@ -72,5 +59,5 @@
MTWRITE_MAXTHREADS=${MTWRITE_MAXTHREADS:=32} # default
MTWRITE_MEMPERTHREAD=${MTWRITE_MEMPERTHREAD:=16M} # default
--
-1.7.0
+1.7.1
Deleted: csw/mgar/pkg/mtwrite/trunk/files/0003-Fix-path-in-manpage.patch
===================================================================
--- csw/mgar/pkg/mtwrite/trunk/files/0003-Fix-path-in-manpage.patch
2011-08-18 22:19:50 UTC (rev 15376)
+++ csw/mgar/pkg/mtwrite/trunk/files/0003-Fix-path-in-manpage.patch
2011-08-19 07:53:35 UTC (rev 15377)
@@ -1,25 +0,0 @@
-From ee74ce1c6c6833f2599dbf57f4ba51ab2610fd14 Mon Sep 17 00:00:00 2001
-From: Dagobert Michelsen <d...@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.
_______________________________________________
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel
