Updated to version 1.12.

Pkgsrc changes:
  - The packages supports installation to DESTDIR.
  - No more requirement for coreutils/findutils and patch-ab.
  - Switched to predefined REPLACE_SH instead of using subst.mk directly.
  - Cosmetic changes for MAKEFLAGS.
  - The shell script mk/check/check-portability.sh gets confused by some of
    the file names in the test archive: skip them.
  - Extracting files from testsuite.tar often fails on Darwin (with HFS?)
    so we skip this part.
  - Extract test archive with pax, it is available on every pkgsrc system.
  - Submitted patch-aa to author of convmv long ago.

Changes since version 1.10:
===========================
1.12
- now work with Perl 5.10 using an eval block
- GPL v2 and v3 now

1.11
- test suite compares sorted results of find to fix false alarms on some systems
- test suite now uses tar instead of cp for copying.
- fix a y/n mixup
- at startup we check if Perl::Encode is not too broken (bugs 37757 and 49830
  for now). Recent Perl releases are terribly broken. If this won't improve,
  I'll have to rewrite convmv in a language with more stable core functionality
  :-|. If you are distributor of convmv, please run make test before packaging
  to make sure you don't ship convmv with a broken Perl release.

4 files changed, 25 insertions, 101 deletions

diff --git a/converters/convmv/Makefile b/converters/convmv/Makefile
index 93fdb9de7a8..60bb01102f9 100644
--- a/converters/convmv/Makefile
+++ b/converters/convmv/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2007/01/14 16:25:25 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2008/02/11 23:28:45 heinz Exp $
 
-DISTNAME=		convmv-1.10
+DISTNAME=		convmv-1.12
 CATEGORIES=		converters
 MASTER_SITES=		http://www.j3e.de/linux/convmv/
 
@@ -8,41 +8,34 @@ MAINTAINER=		heinz@NetBSD.org
 HOMEPAGE=		http://j3e.de/linux/convmv/
 COMMENT=		Converts filenames from one encoding to another
 
+PKG_DESTDIR_SUPPORT=	user-destdir
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-BUILD_DEPENDS+=		coreutils-[0-9]*:../../sysutils/coreutils
-BUILD_DEPENDS+=		findutils-[0-9]*:../../sysutils/findutils
-
 USE_LANGUAGES=		# empty
-USE_TOOLS+=		perl:run
+USE_TOOLS+=		pax perl:run
 
 MANCOMPRESSED=		yes
 NO_BUILD=		yes
 
-BUILD_DEFS+=		GNU_PROGRAM_PREFIX
-
-# the test script needs the GNU versions
-MAKE_ENV+=		CONVMV_LS=${GNU_PROGRAM_PREFIX}ls \
-			CONVMV_CP=${GNU_PROGRAM_PREFIX}cp \
-			CONVMV_FIND=${GNU_PROGRAM_PREFIX}find
-
-MAKEFLAGS+=		MANDIR=${PREFIX}/man \
-			INSTALL_MAN_DIR=${INSTALL_MAN_DIR:Q} \
-			INSTALL_SCRIPT_DIR=${INSTALL_SCRIPT_DIR:Q} \
-			INSTALL_MAN=${INSTALL_MAN:Q} \
-			INSTALL_SCRIPT=${INSTALL_SCRIPT:Q}
+MAKEFLAGS+=		MANDIR=${PREFIX}/${PKGMANDIR}
+MAKEFLAGS+=		INSTALL_MAN_DIR=${INSTALL_MAN_DIR:Q}
+MAKEFLAGS+=		INSTALL_SCRIPT_DIR=${INSTALL_SCRIPT_DIR:Q}
+MAKEFLAGS+=		INSTALL_MAN=${INSTALL_MAN:Q}
+MAKEFLAGS+=		INSTALL_SCRIPT=${INSTALL_SCRIPT:Q}
 
 REPLACE_PERL+=		${WRKSRC}/convmv
+REPLACE_SH+=		suite/dotests.sh
 
-SUBST_CLASSES+=		convmv
-SUBST_STAGE.convmv=	pre-configure
-SUBST_FILES.convmv=	suite/dotests.sh
-SUBST_SED.convmv=	-e "1s|/bin/sh|${SH}|"
+CHECK_PORTABILITY_SKIP=	suite/test-nfd/*
 
 TEST_TARGET=		test
 
+.include "../../mk/bsd.prefs.mk"
+
+.if empty(OPSYS:MDarwin)
 post-extract:
 	# use option p to get the right permissions for symlinks
-	cd ${WRKSRC} && ${TAR} -xpf testsuite.tar
+	cd ${WRKSRC} && pax -p p -rf testsuite.tar
+.endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/converters/convmv/distinfo b/converters/convmv/distinfo
index 3bdeccfdd8e..444e431167c 100644
--- a/converters/convmv/distinfo
+++ b/converters/convmv/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.3 2007/01/14 16:25:25 wiz Exp $
+$NetBSD: distinfo,v 1.4 2008/02/11 23:28:45 heinz Exp $
 
-SHA1 (convmv-1.10.tar.gz) = 44cee0c861ced92c5061a0e2287bfb9ef791d22f
-RMD160 (convmv-1.10.tar.gz) = e9faf9e698006b2faa24e65374819053cfa0b6a4
-Size (convmv-1.10.tar.gz) = 21276 bytes
-SHA1 (patch-aa) = 9f369bfffcaa4c62b2b9a96828fe25a5ce936e83
-SHA1 (patch-ab) = 94f9dd6fa7d402c0f1fe9a35b8f89e378b4da0e3
+SHA1 (convmv-1.12.tar.gz) = 7fe095e54f03b2ad689d3e970906373c4214f753
+RMD160 (convmv-1.12.tar.gz) = c805c6c7993e465ea94daa8fe9439c2a5e32ff77
+Size (convmv-1.12.tar.gz) = 23059 bytes
+SHA1 (patch-aa) = 7efbad0d0007e3b67f4af8ec20a2710e33859d9d
diff --git a/converters/convmv/patches/patch-aa b/converters/convmv/patches/patch-aa
index f8656c510c7..295070b473a 100644
--- a/converters/convmv/patches/patch-aa
+++ b/converters/convmv/patches/patch-aa
@@ -1,4 +1,7 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/11/25 01:48:02 heinz Exp $
+$NetBSD: patch-aa,v 1.2 2008/02/11 23:28:46 heinz Exp $
+
+  - make variables overridable and thus the build process more flexible
+    Submitted upstream.
 
 --- Makefile.orig	Thu Jul 24 16:46:30 2003
 +++ Makefile
diff --git a/converters/convmv/patches/patch-ab b/converters/convmv/patches/patch-ab
deleted file mode 100644
index 2f99615ddf9..00000000000
--- a/converters/convmv/patches/patch-ab
+++ /dev/null
@@ -1,71 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2007/01/14 16:25:25 wiz Exp $
-
---- suite/dotests.sh.orig	2006-06-25 22:01:16.000000000 +0000
-+++ suite/dotests.sh
-@@ -1,13 +1,21 @@
- #!/bin/sh
- # this requires GNU find to be used because of -printf feature
- # you might want to change this to GNU find's full path:
--FIND=find
-+FIND=${CONVMV_FIND}
- FINDEXP="%P -- %l\n"
--for dir in `ls -d test*` ; do $FIND $dir/ -printf "$FINDEXP" > out-$dir ; done
-+# make this overridable on non-GNU systems which may have those commands
-+# as gls and gcp
-+CONVMV_LS=${CONVMV_LS:-ls}
-+CONVMV_CP=${CONVMV_CP:-cp}
-+
-+# to get 0777 permissions for symlinks on non-Linux systems
-+umask 0
-+
-+for dir in `${CONVMV_LS} -d test*` ; do $FIND $dir/ -printf "$FINDEXP" > out-$dir ; done
- #
- echo smartness-test
- rm -rf test.tmp
--cp -r test test.tmp
-+${CONVMV_CP} -r test test.tmp
- ../convmv -f iso8859-15 -t utf8 --notest -r test.tmp
- false
- $FIND test.tmp -printf "$FINDEXP" > out.tmp
-@@ -24,21 +32,21 @@ diff out-test out.tmp > diff.tmp|| { ech
- #
- echo utf8-to-iso8859-15-test
- rm -r test.tmp
--cp -r test test.tmp
-+${CONVMV_CP} -r test test.tmp
- ../convmv -f utf8 -t iso8859-15 --notest -r test.tmp
- $FIND test.tmp -printf "$FINDEXP" > out.tmp
- diff out-test-iso8859-15 out.tmp > diff.tmp|| { echo utf8-to-iso8859-15-test failed. ; exit 1; }
- #
- echo iso8859-15-to-utf8-test
- rm -r test.tmp
--cp -r test-iso8859-15 test.tmp
-+${CONVMV_CP} -r test-iso8859-15 test.tmp
- ../convmv -f iso8859-15 -t utf8 --notest -r test.tmp
- $FIND test.tmp -printf "$FINDEXP" > out.tmp
- diff out-test out.tmp > diff.tmp|| { echo iso8859-15-to-utf8-test failed. ; exit 1; }
- #
- echo nfc-test
- rm -r test.tmp
--cp -r test test.tmp
-+${CONVMV_CP} -r test test.tmp
- ../convmv -f utf-8 -t utf-8 --nfd --notest -r test.tmp
- $FIND test.tmp -printf "$FINDEXP" > out.tmp
- diff out-test-nfd out.tmp > diff.tmp|| { echo nfd-test failed. ; exit 1; }
-@@ -49,14 +57,14 @@ diff out-test out.tmp > diff.tmp|| { ech
- #
- echo escaped-test
- rm -r test.tmp
--cp -r test-escaped test.tmp
-+${CONVMV_CP} -r test-escaped test.tmp
- ../convmv --unescape --notest -r test.tmp
- $FIND test.tmp -printf "$FINDEXP" > out.tmp
- diff out-test out.tmp > diff.tmp|| { echo escaped-test failed. ; exit 1; }
- #
- echo upper-test
- rm -r test.tmp
--cp -r test test.tmp
-+${CONVMV_CP} -r test test.tmp
- ../convmv --upper -f utf8 --notest -r test.tmp
- $FIND TEST.TMP -printf "$FINDEXP" > out.tmp
- diff out-test-upper out.tmp > diff.tmp|| { echo upper-test failed. ; exit 1; }