Index: head/net/whois/Makefile
===================================================================
--- head/net/whois/Makefile	(revision 367392)
+++ head/net/whois/Makefile	(revision 367393)
@@ -1,46 +1,48 @@
 # Created by: Filippo Natali <filippo@widestore.net>
 # $FreeBSD$
 
 PORTNAME=	whois
-PORTVERSION=	5.1.4
+PORTVERSION=	5.1.5
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL}
-DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	coco@executive-computing.de
 COMMENT=	Marco d'Itri whois client
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		iconv gmake perl5 tar:xz
+USES=		iconv gmake perl5
 USE_PERL5=	build
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 MAKE_ARGS=	BASEDIR="${STAGEDIR}"
 
 OPTIONS_DEFINE=	NLS
 
 OPTIONS_SUB=	yes
 NLS_USES=	gettext
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	rfc1036
+GH_COMMIT=	d346ca6
+GH_TAGNAME=	${GH_COMMIT}
 
 .include <bsd.port.options.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|%%MWHOISCONF%%|${PREFIX}/etc/mwhois.conf|g" ${WRKSRC}/whois.1
 	@${REINPLACE_CMD} -e "s|%%MWHOIS%%|mwhois|g" ${WRKSRC}/whois.1
 	@${REINPLACE_CMD} -e "s|%%MWHOIST%%|MWHOIS|g" ${WRKSRC}/whois.1
 	@${REINPLACE_CMD} -e "s|%%MWHOIST%%|MWHOIS|g" ${WRKSRC}/whois.conf.5
 	@${REINPLACE_CMD} -e "s|%%MWHOIS%%|mwhois|g" ${WRKSRC}/whois.conf.5
 	@${REINPLACE_CMD} -e "s|%%MWHOISCONF%%|${PREFIX}/etc/mwhois.conf|g" ${WRKSRC}/whois.conf.5
 	@${REINPLACE_CMD} -e "s|%%MWHOISCONF%%|${PREFIX}/etc/mwhois.conf|g" ${WRKSRC}/config.h
 .if ! ${PORT_OPTIONS:MNLS}
 	@${REINPLACE_CMD} -e "s| pos||" -e "s| install-pos||" \
 			-e "s|-lintl||" ${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e "s|# define ENABLE_NLS||" ${WRKSRC}/config.h
 .endif
 
 post-stage:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/mwhois
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/mkpasswd
 
 .include <bsd.port.mk>
Index: head/net/whois/distinfo
===================================================================
--- head/net/whois/distinfo	(revision 367392)
+++ head/net/whois/distinfo	(revision 367393)
@@ -1,2 +1,2 @@
-SHA256 (whois_5.1.4.tar.xz) = 678f8677d0e2d4836b14c8e95ad875ec569cec282572635f920888462cc5daef
-SIZE (whois_5.1.4.tar.xz) = 76804
+SHA256 (whois-5.1.5.tar.gz) = b488c51677713694468a030d1559f3acbbe9bca0a22ec2649acbcae3f9ea15ca
+SIZE (whois-5.1.5.tar.gz) = 90846
Index: head/net/whois/files/patch-Makefile
===================================================================
--- head/net/whois/files/patch-Makefile	(revision 367392)
+++ head/net/whois/files/patch-Makefile	(revision 367393)
@@ -1,37 +1,37 @@
 --- Makefile.orig	2014-05-21 16:24:13.000000000 +0200
 +++ Makefile	2014-06-08 18:14:09.000000000 +0200
 @@ -1,6 +1,8 @@
 -prefix = /usr
 +prefix = ${PREFIX}
  
  CFLAGS ?= -g -O2
-+LDFLAGS += -L/usr/local/lib -lintl
-+CFLAGS += -I/usr/local/include
++LDFLAGS += -L${LOCALBASE}/lib -lintl
++CFLAGS += -I${LOCALBASE}/include
  
  PERL = perl
  INSTALL = install
 @@ -98,17 +100,17 @@
  
  install-whois: whois
  	$(INSTALL) -d $(BASEDIR)$(prefix)/bin/
 -	$(INSTALL) -d $(BASEDIR)$(prefix)/share/man/man1/
 -	$(INSTALL) -d $(BASEDIR)$(prefix)/share/man/man5/
 -	$(INSTALL) -m 0755 whois $(BASEDIR)$(prefix)/bin/
 -	$(INSTALL) -m 0644 whois.1 $(BASEDIR)$(prefix)/share/man/man1/
 -	$(INSTALL) -m 0644 whois.conf.5 $(BASEDIR)$(prefix)/share/man/man5/
 +	$(INSTALL) -d $(BASEDIR)$(prefix)/man/man1/
 +	$(INSTALL) -d $(BASEDIR)$(prefix)/man/man5/
 +	$(INSTALL) -m 0755 whois $(BASEDIR)$(prefix)/bin/mwhois
 +	$(INSTALL) -m 0644 whois.1 $(BASEDIR)$(prefix)/man/man1/mwhois.1
 +	$(INSTALL) -m 0644 whois.conf.5 $(BASEDIR)$(prefix)/man/man5/mwhois.conf.5
  
  install-mkpasswd: mkpasswd
  	$(INSTALL) -d $(BASEDIR)$(prefix)/bin/
 -	$(INSTALL) -d $(BASEDIR)$(prefix)/share/man/man1/
 +	$(INSTALL) -d $(BASEDIR)$(prefix)/man/man1/
  	$(INSTALL) -m 0755 mkpasswd $(BASEDIR)$(prefix)/bin/
 -	$(INSTALL) -m 0644 mkpasswd.1 $(BASEDIR)$(prefix)/share/man/man1/
 +	$(INSTALL) -m 0644 mkpasswd.1 $(BASEDIR)$(prefix)/man/man1/
  
  install-pos:
  	cd po && $(MAKE) install