Date: Thu, 23 Oct 2003 17:14:35 +0300 From: "Samy Al Bahra" <samy@kerneled.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/58439: Fix graphics/fujiplay build on 5.X Message-ID: 1066918465@beastie.freebsd.local Resent-Message-ID: <200310231420.h9NEKHk9078895@freefall.freebsd.org>
| raw e-mail | index | archive | help
>Number: 58439 >Category: ports >Synopsis: Fix graphics/fujiplay build on 5.X >Confidential: no >Severity: critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Thu Oct 23 07:20:17 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Samy Al Bahra >Release: FreeBSD 5.1-CURRENT i386 >Organization: Kerneled >Environment: System: FreeBSD beastie.freebsd.local 5.1-CURRENT FreeBSD 5.1-CURRENT #0: Wed Aug 20 18:35:24 AST 2003 samy@beastie.freebsd.local:/usr/src/sys/i386/compile/KERNELED i386 >Description: graphics/fujiplay does not build on 5.X machines due to the usage of multiline string literals (depreciated in gcc 3.X). The patch that follows fixes this. >How-To-Repeat: Build on a 5.X machine. >Fix: diff -ruN fujiplay/Makefile /tmp/fujiplay/Makefile --- fujiplay/Makefile Thu Oct 23 17:10:12 2003 +++ /tmp/fujiplay/Makefile Thu Oct 23 17:10:46 2003 @@ -19,12 +19,6 @@ PORTSDOC= README fujiplay.lsm mx700-commands.html -.include <bsd.port.pre.mk> - -.if ${OSVERSION} >= 501000 -BROKEN= "Does not compile" -.endif - do-install: (cd ${WRKDIR}; ${INSTALL_PROGRAM} fujiplay yycc2ppm ${PREFIX}/bin) .if !defined(NOPORTDOCS) @@ -34,4 +28,4 @@ .endfor .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff -ruN fujiplay/files/patch-fujiplay.c /tmp/fujiplay/files/patch-fujiplay.c --- fujiplay/files/patch-fujiplay.c Thu Jan 1 03:00:00 1970 +++ /tmp/fujiplay/files/patch-fujiplay.c Thu Oct 23 17:09:57 2003 @@ -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 <bousch@topo.math.u-psud.fr> +-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 <bousch@topo.math.u-psud.fr>\n"\ ++"Public domain. Absolutely no warranty.\n"; + + static void sigint_handler (int sig) + { >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1066918465>