diff options
author | jmmv <jmmv@pkgsrc.org> | 2005-04-23 10:55:59 +0000 |
---|---|---|
committer | jmmv <jmmv@pkgsrc.org> | 2005-04-23 10:55:59 +0000 |
commit | 5a270e68bcaf8553f28ffd855b5089998fe8eb14 (patch) | |
tree | 5fde72ff7bfed5c7ce75867ab48a5b19c1826da1 /graphics | |
parent | a713279f307fd4de7fd6b9efe2e0a094cf2c7a45 (diff) | |
download | pkgsrc-5a270e68bcaf8553f28ffd855b5089998fe8eb14.tar.gz |
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 (limited to 'graphics')
-rw-r--r-- | graphics/fujiplay/Makefile | 9 | ||||
-rw-r--r-- | graphics/fujiplay/distinfo | 4 | ||||
-rw-r--r-- | graphics/fujiplay/patches/patch-aa | 6 |
3 files changed, 13 insertions, 6 deletions
diff --git a/graphics/fujiplay/Makefile b/graphics/fujiplay/Makefile index 3672da678c2..e7a8618f524 100644 --- a/graphics/fujiplay/Makefile +++ b/graphics/fujiplay/Makefile @@ -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 @@ COMMENT= Download pictures from some Fujifilm digital cameras 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 --git a/graphics/fujiplay/distinfo b/graphics/fujiplay/distinfo index 3786698c755..d39b1708538 100644 --- a/graphics/fujiplay/distinfo +++ b/graphics/fujiplay/distinfo @@ -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 --git a/graphics/fujiplay/patches/patch-aa b/graphics/fujiplay/patches/patch-aa index 4e2331493f2..d4f7c15d1ec 100644 --- a/graphics/fujiplay/patches/patch-aa +++ b/graphics/fujiplay/patches/patch-aa @@ -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 @@ $NetBSD: patch-aa,v 1.4 2005/03/20 12:51:34 jmmv Exp $ -"; - -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> -Public domain. Absolutely no warranty. -"; @@ -89,7 +89,7 @@ $NetBSD: patch-aa,v 1.4 2005/03/20 12:51:34 jmmv Exp $ +" 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>\n" +"Public domain. Absolutely no warranty.\n"; |