From f26d6afd7ed3498e67df145b94418c6792794655 Mon Sep 17 00:00:00 2001 From: Kiriyama Kazuhiko Date: Thu, 20 Nov 2003 21:20:40 +0000 Subject: [PATCH] Update 1.33 to 1.33_1. * enable to build on 5.X PR: ports/58439 Submitted by: Samy Al Bahra --- graphics/fujiplay/Makefile | 9 +-- graphics/fujiplay/files/patch-fujiplay.c | 74 ++++++++++++++++++++++++ graphics/fujiplay/pkg-plist | 8 +-- 3 files changed, 80 insertions(+), 11 deletions(-) create mode 100644 graphics/fujiplay/files/patch-fujiplay.c diff --git a/graphics/fujiplay/Makefile b/graphics/fujiplay/Makefile index 322b41dc57a7..6c2f0c6a483e 100644 --- a/graphics/fujiplay/Makefile +++ b/graphics/fujiplay/Makefile @@ -7,6 +7,7 @@ PORTNAME= fujiplay PORTVERSION= 1.33 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://topo.math.u-psud.fr/~bousch/ DISTNAME= ${PORTNAME} @@ -19,12 +20,6 @@ NO_WRKSUBDIR= yes PORTSDOC= README fujiplay.lsm mx700-commands.html -.include - -.if ${OSVERSION} >= 501000 -BROKEN= "Does not compile" -.endif - do-install: (cd ${WRKDIR}; ${INSTALL_PROGRAM} fujiplay yycc2ppm ${PREFIX}/bin) .if !defined(NOPORTDOCS) @@ -34,4 +29,4 @@ do-install: .endfor .endif -.include +.include diff --git a/graphics/fujiplay/files/patch-fujiplay.c b/graphics/fujiplay/files/patch-fujiplay.c new file mode 100644 index 000000000000..4382d2d2cfdd --- /dev/null +++ b/graphics/fujiplay/files/patch-fujiplay.c @@ -0,0 +1,74 @@ +--- fujiplay.c.orig Thu Oct 23 17:04:58 2003 ++++ fujiplay.c Thu Oct 23 17:09:08 2003 +@@ -759,40 +759,38 @@ + return 1; + } + +-const char *Usage = "\ +-Usage: fujiplay [OPTIONS] PICTURES... (download) +- charge NUMBER (recharge the flash) +- shoot (take picture) +- preview (preview to standard output) +- upload FILES... +- delete FILES... +- setid STRING (set camera ID) +- setflash MODE (0=Off, 1=On, 2=Strobe, 3=Auto) +- setdate gmt|local|YYYYMMDDHHMMSS +-Options: +- -B NUMBER Set baudrate (115200, 57600, 38400, 19200, 9600 or 0) +- -D DEVICE Select another device file (default is /dev/fujifilm) +- -L List command set +- -7 DS-7 compatibility mode (experimental) +- -d Delete pictures after successful download +- -f Force (overwrite existing files) +- -p Assume picture numbers instead of frame numbers +- -h Display this help message +- -v Version information +-Pictures: +- all All pictures +- last Last picture +- 4 Only picture 4 +- 2-10 Pictures between 2 and 10 +-Files: +- DSCxxxxx.JPG Files to delete or to upload into the camera +-"; ++const char *Usage = ++"Usage: fujiplay [OPTIONS] PICTURES... (download)\n"\ ++" charge NUMBER (recharge the flash)\n"\ ++" shoot (take picture)\n"\ ++" preview (preview to standard output)\n"\ ++" upload FILES...\n"\ ++" delete FILES...\n"\ ++" setid STRING (set camera ID)\n"\ ++" setflash MODE (0=Off, 1=On, 2=Strobe, 3=Auto)\n"\ ++" setdate gmt|local|YYYYMMDDHHMMSS\n"\ ++"Options:\n"\ ++" -B NUMBER Set baudrate (115200, 57600, 38400, 19200, 9600 or 0)\n"\ ++" -D DEVICE Select another device file (default is /dev/fujifilm)\n"\ ++" -L List command set\n"\ ++" -7 DS-7 compatibility mode (experimental)\n"\ ++" -d Delete pictures after successful download\n"\ ++" -f Force (overwrite existing files)\n"\ ++" -p Assume picture numbers instead of frame numbers\n"\ ++" -h Display this help message\n"\ ++" -v Version information\n"\ ++"Pictures:\n"\ ++" all All pictures\n"\ ++" last Last picture\n"\ ++" 4 Only picture 4\n"\ ++" 2-10 Pictures between 2 and 10\n"\ ++"Files:\n"\ ++" DSCxxxxx.JPG Files to delete or to upload into the camera\n"; + +-const char *Copyright = "\ +-Fujiplay, $Id: fujiplay.c,v 1.33 1999/02/22 14:13:01 bousch Exp $ +-Written by Thierry Bousch +-Public domain. Absolutely no warranty. +-"; ++const char *Copyright = ++"Fujiplay, $Id: fujiplay.c,v 1.33 1999/02/22 14:13:01 bousch Exp $\n"\ ++"Written by Thierry Bousch \n"\ ++"Public domain. Absolutely no warranty.\n"; + + static void sigint_handler (int sig) + { diff --git a/graphics/fujiplay/pkg-plist b/graphics/fujiplay/pkg-plist index 65313fe76bf9..cfdf12ee7350 100644 --- a/graphics/fujiplay/pkg-plist +++ b/graphics/fujiplay/pkg-plist @@ -1,6 +1,6 @@ bin/fujiplay bin/yycc2ppm -share/doc/fujiplay/README -share/doc/fujiplay/fujiplay.lsm -share/doc/fujiplay/mx700-commands.html -@dirrm share/doc/fujiplay +%%DOCSDIR%%/README +%%DOCSDIR%%/fujiplay.lsm +%%DOCSDIR%%/mx700-commands.html +@dirrm %%DOCSDIR%%