On Sat, Oct 11, 2014 at 04:15:19PM -0400, Julian Andrej wrote: > I forgot to add the new patch to cvs. Here is a fixed diff.
I'll have a look at it. Thanks. > ? cups-bjnp20.diff > Index: Makefile > =================================================================== > RCS file: /cvs/ports/print/cups-bjnp/Makefile,v > retrieving revision 1.1.1.1 > diff -u -p -r1.1.1.1 Makefile > --- Makefile 28 Aug 2014 19:02:19 -0000 1.1.1.1 > +++ Makefile 11 Oct 2014 20:10:18 -0000 > @@ -1,7 +1,7 @@ > # $OpenBSD: Makefile,v 1.1.1.1 2014/08/28 19:02:19 ajacoutot Exp $ > > COMMENT = BJNP protocol backend for CUPS > -DISTNAME = cups-bjnp-1.2.2 > +DISTNAME = cups-bjnp-2.0 > CATEGORIES = print > > HOMEPAGE = http://cups-bjnp.sourceforge.net > Index: distinfo > =================================================================== > RCS file: /cvs/ports/print/cups-bjnp/distinfo,v > retrieving revision 1.1.1.1 > diff -u -p -r1.1.1.1 distinfo > --- distinfo 28 Aug 2014 19:02:19 -0000 1.1.1.1 > +++ distinfo 11 Oct 2014 20:10:18 -0000 > @@ -1,2 +1,2 @@ > -SHA256 (cups-bjnp-1.2.2.tar.gz) = > NdsF8Kk9lp1Y9paeFb6QOeraucZjqJXarzoip0PdYGk= > -SIZE (cups-bjnp-1.2.2.tar.gz) = 141557 > +SHA256 (cups-bjnp-2.0.tar.gz) = KstxZoDWbxN4z43NRf7ff3LMybZvqAIU1tywQrXjyas= > +SIZE (cups-bjnp-2.0.tar.gz) = 140617 > Index: patches/patch-bjnp-debug_c > =================================================================== > RCS file: /cvs/ports/print/cups-bjnp/patches/patch-bjnp-debug_c,v > retrieving revision 1.1.1.1 > diff -u -p -r1.1.1.1 patch-bjnp-debug_c > --- patches/patch-bjnp-debug_c 28 Aug 2014 19:02:19 -0000 1.1.1.1 > +++ patches/patch-bjnp-debug_c 11 Oct 2014 20:10:18 -0000 > @@ -1,7 +1,7 @@ > -$OpenBSD: patch-bjnp-debug_c,v 1.1.1.1 2014/08/28 19:02:19 ajacoutot Exp $ > ---- bjnp-debug.c.orig Mon Jan 21 19:43:27 2013 > -+++ bjnp-debug.c Thu Aug 28 17:00:17 2014 > -@@ -19,7 +19,7 @@ > +$OpenBSD$ > +--- bjnp-debug.c.orig Sat Oct 11 21:11:32 2014 > ++++ bjnp-debug.c Sat Oct 11 21:10:40 2014 > +@@ -20,7 +20,7 @@ > > #include <stdio.h> > #include <stdarg.h> > @@ -10,64 +10,64 @@ $OpenBSD: patch-bjnp-debug_c,v 1.1.1.1 2 > #include <errno.h> > #include "bjnp.h" > > -@@ -59,7 +59,7 @@ static bjnp_loglevel_t debug_level = LOG_ERROR; > - static int to_cups = 0; > +@@ -58,7 +58,7 @@ static logtable_entry_t logtable[] = { > + static bjnp_loglevel_t debug_level = LOG_ERROR; > 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 @@ bjnp_debug (bjnp_loglevel_t level, const char *fmt, .. > +@@ -192,9 +192,9 @@ bjnp_debug(bjnp_loglevel_t level, const char *fmt, ... > { > - 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 @@ bjnp_debug (bjnp_loglevel_t level, const char *fmt, .. > - > - 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 @@ bjnp_set_debug_level (const char *level) > - * 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; > + va_list ap; > + char printbuf[1024]; > +- struct timeb timebuf; > ++ struct timeval timebuf; > + int sec; > +- int msec; > ++ suseconds_t usec; > + > + if (level <= debug_level) { > + /* print received data into a string */ > +@@ -211,16 +211,16 @@ bjnp_debug(bjnp_loglevel_t level, const char *fmt, ... > + /* all log messages may go to the own logfile */ > + > + if (debug_file != NULL) { > +- ftime(&timebuf); > ++ gettimeofday(&timebuf, NULL); > + > +- if ((msec = timebuf.millitm - start_msec) < 0) { > +- msec += 1000; > +- timebuf.time -= 1; > ++ if ((usec = timebuf.tv_usec - start_usec) < 0) { > ++ 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); > + fflush(debug_file); > + } > +@@ -234,12 +234,12 @@ bjnp_set_debug_level(const char *level, const char *fi > + * set debug level to level (string) > + */ > + > +- struct timeb timebuf; > ++ struct timeval timebuf; > + char loglevel[16]; > + > +- 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 > + /* > + * Set log level > Index: patches/patch-bjnp-io_c > =================================================================== > RCS file: patches/patch-bjnp-io_c > diff -N patches/patch-bjnp-io_c > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-bjnp-io_c 11 Oct 2014 20:10:18 -0000 > @@ -0,0 +1,12 @@ > +$OpenBSD$ > +--- bjnp-io.c.orig Sat Oct 11 21:21:33 2014 > ++++ bjnp-io.c Sat Oct 11 21:21:13 2014 > +@@ -161,7 +161,7 @@ bjnp_tcp_connect(printer_t *printer) > + static printer_t * > + bjnp_init_printer(printer_t *printer, http_addr_t *addr, const char *user, > const char *title) > + { > +- uint16_t session_id; > ++ int16_t session_id; > + char host[BJNP_HOST_MAX]; > + int port; > + char family[BJNP_FAMILY_MAX]; > Index: patches/patch-configure > =================================================================== > RCS file: /cvs/ports/print/cups-bjnp/patches/patch-configure,v > retrieving revision 1.1.1.1 > diff -u -p -r1.1.1.1 patch-configure > --- patches/patch-configure 28 Aug 2014 19:02:19 -0000 1.1.1.1 > +++ patches/patch-configure 11 Oct 2014 20:10:18 -0000 > @@ -1,6 +1,6 @@ > -$OpenBSD: patch-configure,v 1.1.1.1 2014/08/28 19:02:19 ajacoutot Exp $ > ---- configure.orig Wed Jan 22 16:56:43 2014 > -+++ configure Thu Aug 28 17:03:41 2014 > +$OpenBSD$ > +--- configure.orig Sat Oct 11 21:03:48 2014 > ++++ configure Sat Oct 11 21:04:26 2014 > @@ -3997,7 +3997,7 @@ done > IFS=$ac_save_IFS > > @@ -10,7 +10,7 @@ $OpenBSD: patch-configure,v 1.1.1.1 2014 > getaddrinfo \ > getnameinfo \ > gethostname \ > -@@ -4912,7 +4912,6 @@ for ac_header in string.h \ > +@@ -4822,7 +4822,6 @@ for ac_header in string.h \ > netinet/in.h \ > sys/socket.h \ > sys/time.h \ -- Antoine
