From owner-svn-ports-head@FreeBSD.ORG Sat Dec 22 11:51:50 2012 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 758C3D98; Sat, 22 Dec 2012 11:51:50 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 5A7DE8FC0A; Sat, 22 Dec 2012 11:51:50 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBMBpoNM070478; Sat, 22 Dec 2012 11:51:50 GMT (envelope-from mandree@svn.freebsd.org) Received: (from mandree@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBMBpn98070474; Sat, 22 Dec 2012 11:51:49 GMT (envelope-from mandree@svn.freebsd.org) Message-Id: <201212221151.qBMBpn98070474@svn.freebsd.org> From: Matthias Andree Date: Sat, 22 Dec 2012 11:51:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r309385 - in head/graphics/flphoto: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 22 Dec 2012 11:51:50 -0000 Author: mandree Date: Sat Dec 22 11:51:49 2012 New Revision: 309385 URL: http://svnweb.freebsd.org/changeset/ports/309385 Log: Fix build with CUPS [1], and assorted other fixes: - #include [1] - remove gphoto2 and fltk ABI versions from LIB_DEPENDS, to quiet portlint - fix int-vs-long format string Clang compiler warning in espmsg.c - declare static char *hex const in http-md5.cxx to fix non-writable string literal Clang warning Submitted by: Hans Petter Selasky [1] Added: head/graphics/flphoto/files/patch-Fl_Print_Dialog2.cxx (contents, props changed) head/graphics/flphoto/files/patch-espmsg.c (contents, props changed) head/graphics/flphoto/files/patch-http-md5.cxx (contents, props changed) Modified: head/graphics/flphoto/Makefile (contents, props changed) Modified: head/graphics/flphoto/Makefile ============================================================================== --- head/graphics/flphoto/Makefile Sat Dec 22 11:46:12 2012 (r309384) +++ head/graphics/flphoto/Makefile Sat Dec 22 11:51:49 2012 (r309385) @@ -15,8 +15,8 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-sou MAINTAINER= ports@FreeBSD.org COMMENT= A basic image management and display program -LIB_DEPENDS= gphoto2.2:${PORTSDIR}/graphics/libgphoto2 \ - fltk.1:${PORTSDIR}/x11-toolkits/fltk \ +LIB_DEPENDS= gphoto2:${PORTSDIR}/graphics/libgphoto2 \ + fltk:${PORTSDIR}/x11-toolkits/fltk \ png15:${PORTSDIR}/graphics/png WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} Added: head/graphics/flphoto/files/patch-Fl_Print_Dialog2.cxx ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/flphoto/files/patch-Fl_Print_Dialog2.cxx Sat Dec 22 11:51:49 2012 (r309385) @@ -0,0 +1,10 @@ +--- ./Fl_Print_Dialog2.cxx.orig 2006-11-26 22:45:08.000000000 +0100 ++++ ./Fl_Print_Dialog2.cxx 2012-12-22 12:41:39.000000000 +0100 +@@ -56,6 +56,7 @@ + + #ifdef HAVE_LIBCUPS + # include ++# include + #endif // HAVE_LIBCUPS + + Added: head/graphics/flphoto/files/patch-espmsg.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/flphoto/files/patch-espmsg.c Sat Dec 22 11:51:49 2012 (r309385) @@ -0,0 +1,11 @@ +--- ./espmsg.c.orig 2005-01-23 04:52:44.000000000 +0100 ++++ ./espmsg.c 2012-12-22 12:41:39.000000000 +0100 +@@ -766,7 +766,7 @@ + *bufptr++ = '&'; + *bufptr = '\0'; + +- sprintf(length, "%d", bufptr - buffer); ++ sprintf(length, "%ld", (long)(bufptr - buffer)); + + /* + * Send the request... Added: head/graphics/flphoto/files/patch-http-md5.cxx ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/flphoto/files/patch-http-md5.cxx Sat Dec 22 11:51:49 2012 (r309385) @@ -0,0 +1,11 @@ +--- ./http-md5.cxx.orig 2012-12-22 12:42:25.000000000 +0100 ++++ ./http-md5.cxx 2012-12-22 12:42:28.000000000 +0100 +@@ -120,7 +120,7 @@ + { + int i; /* Looping var */ + char *md5ptr; /* Pointer into MD5 string */ +- static char *hex = "0123456789abcdef"; /* Hex digits */ ++ static char const *hex = "0123456789abcdef"; /* Hex digits */ + + + /*