pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/graphics/fujiplay Fix patch-aa (commited by me a while...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/ae868f8de78e
branches:  trunk
changeset: 492948:ae868f8de78e
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Sat Apr 23 10:55:59 2005 +0000

description:
Fix patch-aa (commited by me a while ago) as it contained a CVS Id string
which got replaced at commit time, thus breaking the patch.  Noticed by wiz@.

diffstat:

 graphics/fujiplay/Makefile         |  9 ++++++++-
 graphics/fujiplay/distinfo         |  4 ++--
 graphics/fujiplay/patches/patch-aa |  6 +++---
 3 files changed, 13 insertions(+), 6 deletions(-)

diffs (63 lines):

diff -r f59cf5b7f0d6 -r ae868f8de78e graphics/fujiplay/Makefile
--- a/graphics/fujiplay/Makefile        Sat Apr 23 10:38:27 2005 +0000
+++ b/graphics/fujiplay/Makefile        Sat Apr 23 10:55:59 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/03/10 14:07:29 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/04/23 10:55:59 jmmv Exp $
 #
 
 DISTNAME=      fujiplay
@@ -15,6 +15,13 @@
 DIST_SUBDIR=   fujiplay-1.33
 WRKSRC=                ${WRKDIR}
 
+SUBST_CLASSES+=                cvsid
+SUBST_MESSAGE.cvsid=   "Removing CVS Ids from files."
+SUBST_STAGE.cvsid=     post-extract
+SUBST_SED.cvsid=       -e 's|\$$Id|Id|'
+SUBST_SED.cvsid+=      -e 's| \$$$$||'
+SUBST_FILES.cvsid=     fujiplay.c
+
 xpost-patch:
        cd ${WRKSRC} ; ${MV} fujiplay.c fujiplay.c.orig2 ; \
        ${SED} \
diff -r f59cf5b7f0d6 -r ae868f8de78e graphics/fujiplay/distinfo
--- a/graphics/fujiplay/distinfo        Sat Apr 23 10:38:27 2005 +0000
+++ b/graphics/fujiplay/distinfo        Sat Apr 23 10:55:59 2005 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.7 2005/03/20 12:51:34 jmmv Exp $
+$NetBSD: distinfo,v 1.8 2005/04/23 10:55:59 jmmv Exp $
 
 SHA1 (fujiplay-1.33/fujiplay.tgz) = 6a2a42a87bb78d5eeeb040afb72636aa0aed692c
 RMD160 (fujiplay-1.33/fujiplay.tgz) = 91cbf301bd8e67a5753748d675ee1294c7d31ad7
 Size (fujiplay-1.33/fujiplay.tgz) = 12588 bytes
-SHA1 (patch-aa) = 0f17e6c6f13595eea5e734ab7f0710f5d62f5de9
+SHA1 (patch-aa) = b34130401e97c358ff797a45ee4f5ff8016c2630
 SHA1 (patch-ab) = 9218c7987561e25987b509ead9e70cd4b5e35e24
diff -r f59cf5b7f0d6 -r ae868f8de78e graphics/fujiplay/patches/patch-aa
--- a/graphics/fujiplay/patches/patch-aa        Sat Apr 23 10:38:27 2005 +0000
+++ b/graphics/fujiplay/patches/patch-aa        Sat Apr 23 10:55:59 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.4 2005/03/20 12:51:34 jmmv Exp $
+$NetBSD: patch-aa,v 1.5 2005/04/23 10:55:59 jmmv Exp $
 
 --- fujiplay.c.orig    1999-02-23 10:30:31.000000000 +0100
 +++ fujiplay.c 2005-03-20 13:49:59.000000000 +0100
@@ -56,7 +56,7 @@
 -";
 -
 -const char *Copyright = "\
--Fujiplay, $Id: patch-aa,v 1.4 2005/03/20 12:51:34 jmmv Exp $
+-Fujiplay, Id: fujiplay.c,v 1.33 1999/02/22 14:13:01 bousch Exp
 -Written by Thierry Bousch <bousch%topo.math.u-psud.fr@localhost>
 -Public domain. Absolutely no warranty.
 -";
@@ -89,7 +89,7 @@
 +"  DSCxxxxx.JPG       Files to delete or to upload into the camera\n";
 +
 +const char *Copyright =
-+"Fujiplay, $Id: patch-aa,v 1.4 2005/03/20 12:51:34 jmmv Exp $\n"
++"Fujiplay, Id: fujiplay.c,v 1.33 1999/02/22 14:13:01 bousch Exp\n"
 +"Written by Thierry Bousch <bousch%topo.math.u-psud.fr@localhost>\n"
 +"Public domain. Absolutely no warranty.\n";
  



Home | Main Index | Thread Index | Old Index