summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--converters/convmv/Makefile7
-rw-r--r--converters/convmv/distinfo10
-rw-r--r--converters/convmv/patches/patch-ab24
3 files changed, 28 insertions, 13 deletions
diff --git a/converters/convmv/Makefile b/converters/convmv/Makefile
index 6035601c375..b6c5b6b1d0f 100644
--- a/converters/convmv/Makefile
+++ b/converters/convmv/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2006/02/05 23:08:28 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2006/02/11 17:24:17 heinz Exp $
-DISTNAME= convmv-1.08
-PKGREVISION= 1
+DISTNAME= convmv-1.09
CATEGORIES= converters
MASTER_SITES= http://www.j3e.de/linux/convmv/
@@ -33,7 +32,7 @@ REPLACE_PERL+= ${WRKSRC}/convmv
SUBST_CLASSES+= convmv
SUBST_STAGE.convmv= pre-configure
-SUBST_FILES.convmv= ${WRKSRC}/suite/dotests.sh
+SUBST_FILES.convmv= suite/dotests.sh
SUBST_SED.convmv+= "1s|/bin/sh|${SH}|"
TEST_TARGET= test
diff --git a/converters/convmv/distinfo b/converters/convmv/distinfo
index bd71e209edc..2e75cbd76e8 100644
--- a/converters/convmv/distinfo
+++ b/converters/convmv/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/11/25 01:48:02 heinz Exp $
+$NetBSD: distinfo,v 1.2 2006/02/11 17:24:17 heinz Exp $
-SHA1 (convmv-1.08.tar.gz) = 02c90654a40fcab7369dac44c8a6678a4259c5d3
-RMD160 (convmv-1.08.tar.gz) = 99c7d56dd7eb243ec32474de97c748aa0c6fde25
-Size (convmv-1.08.tar.gz) = 20657 bytes
+SHA1 (convmv-1.09.tar.gz) = b8d44519a1110a620afe37d367f0f31542156880
+RMD160 (convmv-1.09.tar.gz) = f4164d07f2c4886003f8e6ca14334a5ab318e9e7
+Size (convmv-1.09.tar.gz) = 21003 bytes
SHA1 (patch-aa) = 9f369bfffcaa4c62b2b9a96828fe25a5ce936e83
-SHA1 (patch-ab) = b62dafd008904e722929fbecff42ef8d48c0c2be
+SHA1 (patch-ab) = f91b95ae447376175108df093d5d802e0d016bd8
diff --git a/converters/convmv/patches/patch-ab b/converters/convmv/patches/patch-ab
index a462b883750..da1ff47c23e 100644
--- a/converters/convmv/patches/patch-ab
+++ b/converters/convmv/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1.1.1 2005/11/25 01:48:02 heinz Exp $
+$NetBSD: patch-ab,v 1.2 2006/02/11 17:24:17 heinz Exp $
---- suite/dotests.sh.orig Sun Dec 14 05:56:54 2003
+--- suite/dotests.sh.orig Fri Dec 9 17:11:46 2005
+++ suite/dotests.sh
-@@ -1,63 +1,72 @@
+@@ -1,77 +1,86 @@
#!/bin/sh
-for d in `ls -d test*` ; do cd $d ; ls -R -g -G --time-style=+ >../out-$d ; cd .. ; done
+
@@ -16,6 +16,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2005/11/25 01:48:02 heinz Exp $
+
+for d in `${CONVMV_LS} -d test*` ; do cd $d ; ${CONVMV_LS} -R -g -G --time-style=+ >../out-$d ; cd .. ; done
#
+ echo smartness-test
rm -rf test2
-cp -a test test2
+${CONVMV_CP} -a test test2
@@ -26,6 +27,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2005/11/25 01:48:02 heinz Exp $
cd ..
diff out-test out2 || { echo "smartness-test failed." ; exit 1; }
#
+ echo double-utf8 test
../convmv -f iso8859-15 -t utf8 --notest -r --nosmart test2
cd test2
-ls -R -g -G --time-style=+ >../out2
@@ -42,6 +44,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2005/11/25 01:48:02 heinz Exp $
pwd
diff out-test out2 || { echo undo-double-utf8 test failed. ; exit 1; }
#
+ echo utf8-to-iso8859-15-test
rm -r test2
-cp -a test test2
+${CONVMV_CP} -a test test2
@@ -50,8 +53,20 @@ $NetBSD: patch-ab,v 1.1.1.1 2005/11/25 01:48:02 heinz Exp $
-ls -R -g -G --time-style=+ >../out2
+${CONVMV_LS} -R -g -G --time-style=+ >../out2
cd ..
- diff out-test-iso8859-15 out2 || { echo iso8859-15-test failed. ; exit 1; }
+ diff out-test-iso8859-15 out2 || { echo utf8-to-iso8859-15-test failed. ; exit 1; }
#
+ echo iso8859-15-to-utf8-test
+ rm -r test2
+-cp -a test-iso8859-15 test2
++${CONVMV_CP} -a test-iso8859-15 test2
+ ../convmv -f iso8859-15 -t utf8 --notest -r test2
+ cd test2
+-ls -R -g -G --time-style=+ >../out2
++${CONVMV_LS} -R -g -G --time-style=+ >../out2
+ cd ..
+ diff out-test out2 || { echo iso8859-15-to-utf8-test failed. ; exit 1; }
+ #
+ echo nfc-test
rm -r test2
-cp -a test test2
+${CONVMV_CP} -a test test2
@@ -69,6 +84,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2005/11/25 01:48:02 heinz Exp $
cd ..
diff out-test out2 || { echo nfc-test failed. ; exit 1; }
#
+ echo escaped-test
rm -r test2
-cp -a test-escaped test2
+${CONVMV_CP} -a test-escaped test2