[pkgsrc/trunk]: pkgsrc/sysutils/mencvcd Files from DISTDIR should not be copi...

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/521a46b33612
branches:  trunk
changeset: 534809:521a46b33612
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Thu Nov 01 08:34:42 2007 +0000

description:
Files from DISTDIR should not be copied with the -p option, since they
could be write-protected by file flags, which makes it difficult to
remove them with "make clean".

While here, replaced some custom code with things that have been added
to the pkgsrc infrastructure. This makes the Makefile a bit shorter.

diffstat:

 sysutils/mencvcd/Makefile         |  17 ++++++-----------
 sysutils/mencvcd/distinfo         |   4 ++--
 sysutils/mencvcd/patches/patch-aa |   7 +------
 3 files changed, 9 insertions(+), 19 deletions(-)

diffs (72 lines):

diff -r 5beebd985094 -r 521a46b33612 sysutils/mencvcd/Makefile
--- a/sysutils/mencvcd/Makefile Thu Nov 01 08:32:17 2007 +0000
+++ b/sysutils/mencvcd/Makefile Thu Nov 01 08:34:42 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2007/03/04 11:29:58 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2007/11/01 08:34:42 rillig Exp $
 
 DISTNAME=      mencvcd
 PKGNAME=       ${DISTNAME}-0.3
@@ -12,7 +12,6 @@
 HOMEPAGE=      http://hammelmann.gmxhome.de/projects_en.html
 COMMENT=       Script for converting movie files into (S)VCD format
 
-DEPENDS+=      bash-[0-9]*:../../shells/bash
 DEPENDS+=      cdrdao>=1.1.9:../../sysutils/cdrdao
 DEPENDS+=      lame>=3.96.1:../../audio/lame
 DEPENDS+=      mjpegtools>=1.6.2:../../multimedia/mjpegtools
@@ -21,20 +20,16 @@
 DEPENDS+=      sox>=12.16:../../audio/sox
 DEPENDS+=      vcdimager>=0.6.2:../../sysutils/vcdimager
 
-NO_CONFIGURE=  YES
 DIST_SUBDIR=   ${PKGNAME_NOREV}
+WRKSRC=                ${WRKDIR}
+NO_BUILD=      yes
 
 INSTALLATION_DIRS=     bin
 
-do-extract:
-       ${MKDIR} ${WRKSRC}
-       ${CP} -p ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME} ${WRKSRC}
-
-do-build:
-       ${ECHO} "#!${LOCALBASE}/bin/bash" >${WRKSRC}/mencvcd.bash
-       ${TAIL} +2 ${WRKSRC}/mencvcd >>${WRKSRC}/mencvcd.bash
+REPLACE_BASH=  mencvcd
+USE_TOOLS+=    bash:run
 
 do-install:
-       ${INSTALL_SCRIPT} ${WRKSRC}/mencvcd.bash ${PREFIX}/bin/mencvcd
+       ${INSTALL_SCRIPT} ${WRKSRC}/mencvcd ${PREFIX}/bin/mencvcd
 
 .include "../../mk/bsd.pkg.mk"
diff -r 5beebd985094 -r 521a46b33612 sysutils/mencvcd/distinfo
--- a/sysutils/mencvcd/distinfo Thu Nov 01 08:32:17 2007 +0000
+++ b/sysutils/mencvcd/distinfo Thu Nov 01 08:34:42 2007 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2005/02/24 13:40:55 agc Exp $
+$NetBSD: distinfo,v 1.5 2007/11/01 08:34:43 rillig Exp $
 
 SHA1 (mencvcd-0.3/mencvcd) = a3ace9d50e0722946286b8704b800ccbce86233b
 RMD160 (mencvcd-0.3/mencvcd) = 3785524bf26a9c7630a08a29b246d209c0b19d3c
 Size (mencvcd-0.3/mencvcd) = 13038 bytes
-SHA1 (patch-aa) = 445903a8a90e86ff45b891cd2769c8602ff261ee
+SHA1 (patch-aa) = 3bc66db72486cc08766aa3b54ff44fe6a8b958b4
diff -r 5beebd985094 -r 521a46b33612 sysutils/mencvcd/patches/patch-aa
--- a/sysutils/mencvcd/patches/patch-aa Thu Nov 01 08:32:17 2007 +0000
+++ b/sysutils/mencvcd/patches/patch-aa Thu Nov 01 08:34:42 2007 +0000
@@ -1,12 +1,7 @@
-$NetBSD: patch-aa,v 1.2 2005/02/02 09:11:27 tron Exp $
+$NetBSD: patch-aa,v 1.3 2007/11/01 08:34:43 rillig Exp $
 
 --- mencvcd.orig       2003-06-13 21:06:02.000000000 +0100
 +++ mencvcd    2005-02-02 08:20:24.000000000 +0000
-@@ -1,4 +1,3 @@
--#!/bin/sh
- #
- # Version:          0.3
- #
 @@ -23,7 +22,7 @@
                exit 1
        fi