Index: head/print/cups-bjnp/pkg-plist =================================================================== --- head/print/cups-bjnp/pkg-plist (revision 463165) +++ head/print/cups-bjnp/pkg-plist (nonexistent) @@ -1 +0,0 @@ -libexec/cups/backend/bjnp Property changes on: head/print/cups-bjnp/pkg-plist ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/print/cups-bjnp/Makefile =================================================================== --- head/print/cups-bjnp/Makefile (revision 463165) +++ head/print/cups-bjnp/Makefile (revision 463166) @@ -1,20 +1,24 @@ # $FreeBSD$ PORTNAME= cups-bjnp -PORTVERSION= 2.0 -PORTREVISION= 2 +PORTVERSION= 2.0.1 CATEGORIES= print MASTER_SITES= SF MAINTAINER= danilo@FreeBSD.org COMMENT= CUPS backend for Canon USB over IP protocol +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING + LIB_DEPENDS= libcups.so:print/cups + +PLIST_FILES= libexec/cups/backend/bjnp GNU_CONFIGURE= yes # Just to avoid a tautological pointer compare in bjnp-commands.c:187 CONFIGURE_ARGS+= --disable-Werror CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib .include Index: head/print/cups-bjnp/distinfo =================================================================== --- head/print/cups-bjnp/distinfo (revision 463165) +++ head/print/cups-bjnp/distinfo (revision 463166) @@ -1,2 +1,3 @@ -SHA256 (cups-bjnp-2.0.tar.gz) = 2acb716680d66f1378cf8dcd45fedf7f72ccc9b66fa80214d6dcb042b5e3c9ab -SIZE (cups-bjnp-2.0.tar.gz) = 140617 +TIMESTAMP = 1519772479 +SHA256 (cups-bjnp-2.0.1.tar.gz) = 95b5940daf6ee46120efef9c05048ade9bb855de36280c140895f9672b2946c0 +SIZE (cups-bjnp-2.0.1.tar.gz) = 143552 Index: head/print/cups-bjnp/files/patch-bjnp-debug.c =================================================================== --- head/print/cups-bjnp/files/patch-bjnp-debug.c (revision 463165) +++ head/print/cups-bjnp/files/patch-bjnp-debug.c (revision 463166) @@ -1,72 +1,72 @@ ---- bjnp-debug.c.orig 2014-09-06 12:38:15 UTC +--- bjnp-debug.c.orig 2018-02-21 11:40:53 UTC +++ bjnp-debug.c @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include "bjnp.h" -@@ -58,7 +58,7 @@ +@@ -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 -@@ -192,9 +192,9 @@ +@@ -192,9 +192,9 @@ bjnp_debug(bjnp_loglevel_t level, const char *fmt, ... { 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 @@ +@@ -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 @@ +@@ -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; /* * Set log level Index: head/print/cups-bjnp/files/patch-configure =================================================================== --- head/print/cups-bjnp/files/patch-configure (revision 463165) +++ head/print/cups-bjnp/files/patch-configure (revision 463166) @@ -1,11 +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 @@ +--- configure.orig 2018-02-21 17:07:41 UTC ++++ configure +@@ -3973,7 +3973,7 @@ done IFS=$ac_save_IFS -for ac_func in ftime \ +for ac_func in gettimeofday \ getaddrinfo \ getnameinfo \ gethostname \