Index: head/sysutils/aimage/Makefile
===================================================================
--- head/sysutils/aimage/Makefile	(revision 471839)
+++ head/sysutils/aimage/Makefile	(revision 471840)
@@ -1,22 +1,26 @@
 # Created by: Chris Calvey <chris@securityforensics.co.uk>
 # $FreeBSD$
 
 PORTNAME=	aimage
 PORTVERSION=	3.2.5
 PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://digitalcorpora.org/downloads/
 
 MAINTAINER=	portmaster@BSDforge.com
 COMMENT=	Advanced Disk Imager
 
 LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libafflib.so:sysutils/afflib
 
 USES=		gmake readline ssl
 GNU_CONFIGURE=	yes
+# Pretend ssl3_new exists for LibreSSL.  It's never really used but
+# configure checks for it.
+CONFIGURE_ARGS=	ac_cv_lib_ssl_ssl3_new=yes
 
 PLIST_FILES=	bin/aimage
 
 .include <bsd.port.mk>
Index: head/sysutils/aimage/files/patch-src_aimage.cpp
===================================================================
--- head/sysutils/aimage/files/patch-src_aimage.cpp	(revision 471839)
+++ head/sysutils/aimage/files/patch-src_aimage.cpp	(revision 471840)
@@ -1,20 +1,20 @@
---- src/aimage.cpp.orig	2018-02-26 16:24:29.829120000 -0800
-+++ src/aimage.cpp	2018-02-26 16:25:21.187218000 -0800
-@@ -344,7 +344,7 @@
+--- src/aimage.cpp.orig	2010-12-17 13:49:50 UTC
++++ src/aimage.cpp
+@@ -344,7 +344,7 @@ void segwrite_callback(struct affcallback_info *acbi)
  	/* log if necessary */
  	if(logfile){
  	    fprintf(logfile,
 -		    "   pagenum=%"I64d" bytes_to_write=%d bytes_written=%d lap_time=%f\n",
 +		    "   pagenum=%" I64d" bytes_to_write=%d bytes_written=%d lap_time=%f\n",
  		    acbi->pagenum,
  		    acbi->bytes_to_write,
  		    acbi->bytes_written,
-@@ -621,7 +621,7 @@
+@@ -621,7 +621,7 @@ int64 scaled_atoi(const char *arg)
      int64 ret=0;
      int multiplier=1;
      char ch,junk;
 -    switch(sscanf(arg,"%"I64d"%c%c",&ret,&ch,&junk)){
 +    switch(sscanf(arg,"%" I64d"%c%c",&ret,&ch,&junk)){
      case 1:
  	return ret;			// no multiplier
      case 2:
Index: head/sysutils/aimage/files/patch-src_imager.cpp
===================================================================
--- head/sysutils/aimage/files/patch-src_imager.cpp	(nonexistent)
+++ head/sysutils/aimage/files/patch-src_imager.cpp	(revision 471840)
@@ -0,0 +1,15 @@
+imager.cpp:857:8: error: value of type '__bind<int &, sockaddr *, unsigned long>' is not contextually convertible to 'bool'
+    if(bind(sock,(sockaddr *)&local,sizeof(local))) err(1,"bind");
+           ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+--- src/imager.cpp.orig	2018-06-05 06:55:20 UTC
++++ src/imager.cpp
+@@ -854,7 +854,7 @@ int imager::socket_listen(int port)
+ #endif
+     local.sin_family = AF_INET;
+     local.sin_port   = htons(port);	// listen on requested port.
+-    if(bind(sock,(sockaddr *)&local,sizeof(local))) err(1,"bind");
++    if(::bind(sock,(sockaddr *)&local,sizeof(local))) err(1,"bind");
+     if(listen(sock,0)) err(1,"listen");		// listen, and only accept one
+     printf("Listening for connection on port %d...\n",port);
+     in = accept(sock,(sockaddr *)&remote,&rsize);

Property changes on: head/sysutils/aimage/files/patch-src_imager.cpp
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property