Index: head/devel/popt/Makefile
===================================================================
--- head/devel/popt/Makefile	(revision 445584)
+++ head/devel/popt/Makefile	(revision 445585)
@@ -1,26 +1,28 @@
 # Created by: Yuan-Chen Cheng <ycheng@sinica.edu.tw>
 # $FreeBSD$
 
 PORTNAME=	popt
 PORTVERSION=	1.16
 PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://rpm5.org/files/popt/
 
 MAINTAINER=	jpaetzel@FreeBSD.org
 COMMENT=	Getopt(3) like library with a number of enhancements, from Redhat
 
+LICENSE=	MIT
+
 OPTIONS_DEFINE=	NLS
 
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
 USES=		iconv libtool pathfix
 USE_LDCONFIG=	yes
 
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=	gettext
 OPTIONS_SUB=	yes
 
 .include <bsd.port.mk>
Index: head/devel/popt/files/patch-Makefile.in
===================================================================
--- head/devel/popt/files/patch-Makefile.in	(revision 445584)
+++ head/devel/popt/files/patch-Makefile.in	(revision 445585)
@@ -1,32 +1,32 @@
---- Makefile.in.orig	2010-05-05 04:55:59.000000000 +0800
-+++ Makefile.in	2010-06-16 00:29:47.000000000 +0800
-@@ -92,7 +92,7 @@
+--- Makefile.in.orig	2017-07-12 14:39:00 UTC
++++ Makefile.in
+@@ -92,7 +92,7 @@ am__base_list = \
  am__installdirs = "$(DESTDIR)$(usrlibdir)" "$(DESTDIR)$(man3dir)" \
  	"$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(includedir)"
  LTLIBRARIES = $(usrlib_LTLIBRARIES)
 -libpopt_la_LIBADD =
 +libpopt_la_LIBADD = $(LTLIBINTL)
  am_libpopt_la_OBJECTS = popt.lo poptparse.lo poptconfig.lo popthelp.lo \
  	poptint.lo
  libpopt_la_OBJECTS = $(am_libpopt_la_OBJECTS)
-@@ -349,16 +349,16 @@
+@@ -349,16 +349,16 @@ AM_CPPFLAGS = -I. -I$(top_srcdir)
  noinst_HEADERS = poptint.h system.h
  test1_SOURCES = test1.c
  test1_LDFLAGS = 
 -test1_LDADD = $(usrlib_LTLIBRARIES)
 +test1_LDADD = $(usrlib_LTLIBRARIES) $(LTLIBICONV)
  test2_SOURCES = test2.c
  test2_LDFLAGS = 
 -test2_LDADD = $(usrlib_LTLIBRARIES)
 +test2_LDADD = $(usrlib_LTLIBRARIES) $(LTLIBICONV)
  #test3_SOURCES = test3.c
  #test3_LDFLAGS = 
 -#test3_LDADD = $(usrlib_LTLIBRARIES)
 +#test3_LDADD = $(usrlib_LTLIBRARIES) $(LTLIBICONV)
  tdict_SOURCES = tdict.c
  tdict_LDFLAGS = 
 -tdict_LDADD = $(usrlib_LTLIBRARIES)
 +tdict_LDADD = $(usrlib_LTLIBRARIES) $(LTLIBICONV)
  noinst_SCRIPTS = testit.sh
  TESTS_ENVIRONMENT = \
  test1="$(top_builddir)/test1"
Index: head/devel/popt/files/patch-popt.3
===================================================================
--- head/devel/popt/files/patch-popt.3	(revision 445584)
+++ head/devel/popt/files/patch-popt.3	(revision 445585)
@@ -1,20 +1,20 @@
---- popt.3.orig	2009-07-26 02:52:36.000000000 +0800
-+++ popt.3	2010-06-16 00:39:09.000000000 +0800
-@@ -24,7 +24,7 @@
+--- popt.3.orig	2009-07-25 18:52:36 UTC
++++ popt.3
+@@ -24,7 +24,7 @@ popt \- Parse command line options
  .sp
  .BI "const char ** poptGetArgs(poptContext " con );
  .sp
 -.BI "const char *const poptStrerror(const int " error );
 +.BI "const char * poptStrerror(const int " error );
  .sp
  .BI "const char * poptBadOption(poptContext " con ", int " flags );
  .sp
-@@ -498,7 +498,7 @@
+@@ -498,7 +498,7 @@ Two functions are available to make it easy for applic
  good error messages.
  .HP
  .nf
 -.BI "const char *const poptStrerror(const int " error ");"
 +.BI "const char * poptStrerror(const int " error ");"
  .fi
  This function takes a popt error code and returns a string describing
  .RB "the error, just as with the standard " strerror() " function."
Index: head/devel/popt/files/patch-popt.c
===================================================================
--- head/devel/popt/files/patch-popt.c	(revision 445584)
+++ head/devel/popt/files/patch-popt.c	(revision 445585)
@@ -1,12 +1,12 @@
---- popt.c.orig	2010-01-19 08:39:10.000000000 +0800
-+++ popt.c	2010-06-16 00:38:47.000000000 +0800
-@@ -22,6 +22,9 @@
+--- popt.c.orig	2010-01-19 00:39:10 UTC
++++ popt.c
+@@ -22,6 +22,9 @@ extern long long int strtoll(const char *nptr, /*@null
  #include <float.h>
  #endif
  #include <math.h>
 +#ifdef __FreeBSD__
 +#include <machine/float.h>
 +#endif
  
  #include "poptint.h"