From owner-svn-ports-all@FreeBSD.ORG Tue Aug 27 00:35:47 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 470C81D4; Tue, 27 Aug 2013 00:35:47 +0000 (UTC) (envelope-from db@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 33D5E2C0F; Tue, 27 Aug 2013 00:35:47 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7R0ZlLR045752; Tue, 27 Aug 2013 00:35:47 GMT (envelope-from db@svn.freebsd.org) Received: (from db@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7R0Zk7w045748; Tue, 27 Aug 2013 00:35:46 GMT (envelope-from db@svn.freebsd.org) Message-Id: <201308270035.r7R0Zk7w045748@svn.freebsd.org> From: Diane Bruce Date: Tue, 27 Aug 2013 00:35:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r325426 - in head/print/cups-bjnp: . 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-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Aug 2013 00:35:47 -0000 Author: db Date: Tue Aug 27 00:35:46 2013 New Revision: 325426 URL: http://svnweb.freebsd.org/changeset/ports/325426 Log: Update port to latest version. PR: ports/174129 Submitted by: shurd@sasktel.net (Maintainer) Added: head/print/cups-bjnp/files/patch-bjnp-debug.c (contents, props changed) head/print/cups-bjnp/files/patch-configure (contents, props changed) Deleted: head/print/cups-bjnp/files/patch-bjnp.h Modified: head/print/cups-bjnp/Makefile (contents, props changed) head/print/cups-bjnp/distinfo (contents, props changed) Modified: head/print/cups-bjnp/Makefile ============================================================================== --- head/print/cups-bjnp/Makefile Mon Aug 26 23:56:43 2013 (r325425) +++ head/print/cups-bjnp/Makefile Tue Aug 27 00:35:46 2013 (r325426) @@ -1,12 +1,8 @@ -# New ports collection makefile for: cups-bjnp -# Date created: 15 May 2009 -# Whom: shurd@sasktel.net -# # $FreeBSD$ # PORTNAME= cups-bjnp -PORTVERSION= 0.5.3 +PORTVERSION= 1.2.1 PORTREVISION= 4 CATEGORIES= print MASTER_SITES= SF @@ -14,11 +10,10 @@ MASTER_SITES= SF MAINTAINER= shurd@sasktel.net COMMENT= CUPS backend for Canon USB over IP protocol -LIB_DEPENDS= cups.2:${PORTSDIR}/print/cups-client +LIB_DEPENDS= cups:${PORTSDIR}/print/cups-client BUILD_DEPENDS= ${LOCALBASE}/libexec/cups/backend:${PORTSDIR}/print/cups-base GNU_CONFIGURE= yes -CONFIGURE_ENV= LIBS="-lcompat" CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib Modified: head/print/cups-bjnp/distinfo ============================================================================== --- head/print/cups-bjnp/distinfo Mon Aug 26 23:56:43 2013 (r325425) +++ head/print/cups-bjnp/distinfo Tue Aug 27 00:35:46 2013 (r325426) @@ -1,2 +1,2 @@ -SHA256 (cups-bjnp-0.5.3.tar.gz) = 9d369d6c561b81d91006675c4ad3c209548dc7aca63b39be3ffe7756b70dce04 -SIZE (cups-bjnp-0.5.3.tar.gz) = 117082 +SHA256 (cups-bjnp-1.2.1.tar.gz) = bda4ff2a9e9f673018374b75b1cf6f67f5aef3025a3a08d2c9ccf15a2bb8573a +SIZE (cups-bjnp-1.2.1.tar.gz) = 140536 Added: head/print/cups-bjnp/files/patch-bjnp-debug.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/print/cups-bjnp/files/patch-bjnp-debug.c Tue Aug 27 00:35:46 2013 (r325426) @@ -0,0 +1,72 @@ +--- bjnp-debug.c.orig 2013-01-21 10:43:27.000000000 -0800 ++++ bjnp-debug.c 2013-08-14 02:29:30.000000000 -0700 +@@ -19,7 +19,7 @@ + + #include + #include +-#include ++#include + #include + #include "bjnp.h" + +@@ -59,7 +59,7 @@ + static int to_cups = 0; + static FILE *debug_file = NULL; + static time_t start_sec = 0; +-static int start_msec; ++static suseconds_t start_usec; + + /* + * local functions +@@ -186,9 +186,9 @@ + { + va_list ap; + char printbuf[256]; +- struct timeb timebuf; ++ struct timeval timebuf; + int sec; +- int msec; ++ suseconds_t usec; + + /* print received data into a string */ + va_start (ap, fmt); +@@ -204,15 +204,15 @@ + + if ((level <= debug_level) && debug_file) + { +- ftime (&timebuf); +- if ((msec = timebuf.millitm - start_msec) < 0) ++ gettimeofday (&timebuf, NULL); ++ if ((usec = timebuf.tv_usec - start_usec) < 0) + { +- msec += 1000; +- timebuf.time -= 1; ++ usec += 1000000; ++ timebuf.tv_sec -= 1; + } +- sec = timebuf.time - start_sec; ++ sec = timebuf.tv_sec - start_sec; + +- fprintf (debug_file, "%8s: %03d.%03d %s", level2str (level), sec, msec, ++ fprintf (debug_file, "%8s: %03d.%06ld %s", level2str (level), sec, usec, + printbuf); + } + } +@@ -224,13 +224,13 @@ + * set debug level to level (string) + */ + +- struct timeb timebuf; ++ struct timeval timebuf; + char loglevel[16]; + char *separator; + +- ftime (&timebuf); +- start_sec = timebuf.time; +- start_msec = timebuf.millitm; ++ gettimeofday (&timebuf, NULL); ++ start_sec = timebuf.tv_sec; ++ start_usec = timebuf.tv_usec; + + /* + * Split string into loglevel and optional cupslog string Added: head/print/cups-bjnp/files/patch-configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/print/cups-bjnp/files/patch-configure Tue Aug 27 00:35:46 2013 (r325426) @@ -0,0 +1,11 @@ +--- configure.orig 2013-08-14 02:30:58.000000000 -0700 ++++ configure 2013-08-14 02:30:31.000000000 -0700 +@@ -3946,7 +3946,7 @@ + IFS=$ac_save_IFS + + +-for ac_func in ftime \ ++for ac_func in gettimeofday \ + getaddrinfo \ + getnameinfo \ + gethostname \