diff -urN /usr/ports/net/jwhois.old/Makefile /usr/ports/net/jwhois/Makefile
--- /usr/ports/net/jwhois.old/Makefile	2015-05-14 12:15:04.000000000 +0200
+++ /usr/ports/net/jwhois/Makefile	2015-08-26 14:16:20.339260000 +0200
@@ -3,7 +3,7 @@
 
 PORTNAME=	jwhois
 PORTVERSION=	4.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net
 MASTER_SITES=	GNU
 
@@ -12,10 +12,12 @@
 
 LICENSE=	GPLv3
 
+LIB_DEPENDS=	libiconv.so:${PORTSDIR}/converters/libiconv
+
 GNU_CONFIGURE=	yes
 USES=		gettext gmake
 CPPFLAGS+=	-I${PREFIX}/include
-LDFLAGS+=	-L${PREFIX}/lib
+LDFLAGS+=	-L${PREFIX}/lib -liconv
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/var/jwhois
 
 OPTIONS_DEFINE=	NLS
diff -urN /usr/ports/net/jwhois.old/files/patch-Makefile.in /usr/ports/net/jwhois/files/patch-Makefile.in
--- /usr/ports/net/jwhois.old/files/patch-Makefile.in	2014-07-29 03:59:16.000000000 +0200
+++ /usr/ports/net/jwhois/files/patch-Makefile.in	2015-08-26 14:12:55.439990000 +0200
@@ -1,6 +1,6 @@
---- Makefile.in.dist	2007-07-01 17:58:12.000000000 +0900
-+++ Makefile.in	2008-05-26 13:42:47.000000000 +0900
-@@ -224,7 +224,7 @@
+--- Makefile.in.orig	2007-07-01 08:58:12 UTC
++++ Makefile.in
+@@ -224,7 +224,7 @@ sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  EXTRA_DIST = config.rpath  m4/ChangeLog config.rpath include/*.h example/jwhois.conf m4/*.m4 jwhois.spec.in jwhois.spec
diff -urN /usr/ports/net/jwhois.old/files/patch-configure /usr/ports/net/jwhois/files/patch-configure
--- /usr/ports/net/jwhois.old/files/patch-configure	2014-06-10 13:35:27.000000000 +0200
+++ /usr/ports/net/jwhois/files/patch-configure	2015-08-26 14:12:55.452876000 +0200
@@ -1,8 +1,6 @@
-Index: configure
-diff -u configure.orig configure
---- configure.orig	2007-07-01 17:56:12.000000000 +0900
-+++ configure	2014-06-10 20:31:03.977495749 +0900
-@@ -5418,7 +5418,7 @@
+--- configure.orig	2007-07-01 08:56:12 UTC
++++ configure
+@@ -5418,7 +5418,7 @@ fi
    fi
    if test "X$ltrpathdirs" != "X"; then
              for found_dir in $ltrpathdirs; do
diff -urN /usr/ports/net/jwhois.old/files/patch-src_Makefile.in /usr/ports/net/jwhois/files/patch-src_Makefile.in
--- /usr/ports/net/jwhois.old/files/patch-src_Makefile.in	2014-07-29 03:59:16.000000000 +0200
+++ /usr/ports/net/jwhois/files/patch-src_Makefile.in	2015-08-26 14:12:55.464731000 +0200
@@ -1,6 +1,6 @@
---- src/Makefile.in.dist	2007-07-01 17:56:14.000000000 +0900
-+++ src/Makefile.in	2008-05-26 13:46:50.000000000 +0900
-@@ -231,6 +231,7 @@
+--- src/Makefile.in.orig	2007-07-01 08:56:14 UTC
++++ src/Makefile.in
+@@ -231,6 +231,7 @@ jwhois_CFLAGS = $(OLDCFLAGS) -DSYSCONFDI
           -DLOCALEDIR="\"$(localedir)\""
  
  jwhois_LDADD = $(top_srcdir)/gl/libgnu.a
diff -urN /usr/ports/net/jwhois.old/files/patch-src_cache.c /usr/ports/net/jwhois/files/patch-src_cache.c
--- /usr/ports/net/jwhois.old/files/patch-src_cache.c	2014-07-29 03:59:16.000000000 +0200
+++ /usr/ports/net/jwhois/files/patch-src_cache.c	2015-08-26 14:12:55.475409000 +0200
@@ -1,6 +1,6 @@
---- src/cache.c.dist	Sun Dec 19 06:46:53 1999
-+++ src/cache.c	Sat Jul 15 22:52:06 2000
-@@ -119,7 +119,7 @@
+--- src/cache.c.orig	2007-06-26 06:58:30 UTC
++++ src/cache.c
+@@ -122,7 +122,7 @@ cache_init(void)
    jconfig_set();
    j = jconfig_getone("jwhois", "cachefile");
    if (!j)