[csw-devel] SF.net SVN: gar:[10210] csw/mgar/pkg/sharutils/trunk

[wahwah at users.sourceforge.net]

Revision: 10210
          http://gar.svn.sourceforge.net/gar/?rev=10210&view=rev
Author:   wahwah
Date:     2010-06-13 22:02:32 +0000 (Sun, 13 Jun 2010)

Log Message:
-----------
sharutils: Fixes for 4.9, removing a patch that was applied upstream.

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

Removed Paths:
-------------
    csw/mgar/pkg/sharutils/trunk/files/sun-sed.patch

Modified: csw/mgar/pkg/sharutils/trunk/Makefile
===================================================================
--- csw/mgar/pkg/sharutils/trunk/Makefile	2010-06-13 20:32:20 UTC (rev 10209)
+++ csw/mgar/pkg/sharutils/trunk/Makefile	2010-06-13 22:02:32 UTC (rev 10210)
@@ -5,7 +5,7 @@
 GARNAME = sharutils
 GARVERSION = 4.9
 CATEGORIES = utils
-DESCRIPTION = makes so-called shell archives out of many files
+DESCRIPTION = Makes so-called shell archives out of many files
 define BLURB
 endef
 SPKG_SOURCEURL = http://www.gnu.org/software/sharutils/
@@ -14,11 +14,14 @@
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 TEST_TARGET = check
 CONFIGURE_ARGS = $(DIRPATHS)
-PATCHFILES = sun-sed.patch
 BUILD64 = 1
 # To make the test use gmd5sum
 MD5SUM = gmd5sum
 RUNTIME_DEP_PKGS_CSWsharutils += CSWggettextrt
-BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS_CSWsharutils) CSWtextutils
+BUILD_DEP_PKGS = $(RUNTIME_DEP_PKGS_CSWsharutils) CSWcoreutils
 export MD5SUM
 include gar/category.mk
+
+post-merge:
+	rm $(PKGROOT)$(libdir)/charset.alias
+	@$(MAKECOOKIE)

Deleted: csw/mgar/pkg/sharutils/trunk/files/sun-sed.patch
===================================================================
--- csw/mgar/pkg/sharutils/trunk/files/sun-sed.patch	2010-06-13 20:32:20 UTC (rev 10209)
+++ csw/mgar/pkg/sharutils/trunk/files/sun-sed.patch	2010-06-13 22:02:32 UTC (rev 10210)
@@ -1,11 +0,0 @@
---- sharutils-4.6.3/tests/shar-3.orig	2010-02-25 14:08:59.744913513 +0100
-+++ sharutils-4.6.3/tests/shar-3	2010-02-25 14:09:36.584244695 +0100
-@@ -16,7 +16,7 @@
- 
- cd ${top_builddir}
- find . -type f | \
--  sed s,^./,,  | \
-+  sed 's,^./,,'  | \
-   ${shar} -q ${opts}
- 
- cd ${testdir}


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