3 files changed, 40 insertions, 58 deletions
diff --git a/net/whois/Makefile b/net/whois/Makefile
index dbacff7a0296..960550a466e9 100644
--- a/net/whois/Makefile
+++ b/net/whois/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	whois
-PORTVERSION=	4.6.14
+PORTVERSION=	4.6.15
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL}
 DISTNAME=	${PORTNAME}_${PORTVERSION}
diff --git a/net/whois/distinfo b/net/whois/distinfo
index 2103e88020ad..2038a7cef3e6 100644
--- a/net/whois/distinfo
+++ b/net/whois/distinfo
@@ -1,2 +1,2 @@
-MD5 (whois_4.6.14.tar.gz) = fab689586c30fad567d7d1f924e9c937
-SIZE (whois_4.6.14.tar.gz) = 50570
+MD5 (whois_4.6.15.tar.gz) = eee43077b5c1bb2dff1d76c52b76f26a
+SIZE (whois_4.6.15.tar.gz) = 50705
diff --git a/net/whois/files/patch-aa b/net/whois/files/patch-aa
index 311f780c0898..cabb6fa31c98 100644
--- a/net/whois/files/patch-aa
+++ b/net/whois/files/patch-aa
@@ -1,55 +1,37 @@
-*** work/whois-4.6.13/Makefile	Tue Feb 10 17:24:29 2004
---- Makefile	Thu Apr 15 16:11:14 2004
-***************
-*** 9,24 ****
-  #LDFLAGS=-lintl
-  
-  # FreeBSD
-! #LDFLAGS=-L/usr/local/lib -lgnugetopt -lintl
-! #CFLAGS=-I/usr/local/include
-  
-  # OS/2 EMX
-  #LDFLAGS=-lsocket -Zexe -Dstrncasecmp=strnicmp
-  
-! ifdef HAVE_LIBIDN
-  LIBIDN += -lidn
-  CFLAGS += -DHAVE_LIBIDN
-! endif
-  
-  PERL=perl
-  
---- 9,24 ----
-  #LDFLAGS=-lintl
-  
-  # FreeBSD
-! LDFLAGS+=-L/usr/local/lib
-! CFLAGS+=-I/usr/local/include
-  
-  # OS/2 EMX
-  #LDFLAGS=-lsocket -Zexe -Dstrncasecmp=strnicmp
-  
-! .ifdef HAVE_LIBIDN
-  LIBIDN += -lidn
-  CFLAGS += -DHAVE_LIBIDN
-! .endif
-  
-  PERL=perl
-  
-***************
-*** 42,49 ****
-  install: whois
-  	install -m 0755 whois $(BASEDIR)$(prefix)/bin/
-  	strip $(BASEDIR)$(prefix)/bin/whois
-! 	install -m 0644 whois.1 $(BASEDIR)$(prefix)/share/man/man1/
-! 	cd po && $(MAKE) $@
-  
-  
-  distclean: clean
---- 42,48 ----
-  install: whois
-  	install -m 0755 whois $(BASEDIR)$(prefix)/bin/
-  	strip $(BASEDIR)$(prefix)/bin/whois
-! 	install -m 0644 whois.1 $(BASEDIR)$(prefix)/man/man1/
-  
-  
-  distclean: clean
+--- Makefile.orig	Tue Feb 10 17:24:29 2004
++++ Makefile	Fri May 21 08:09:06 2004
+@@ -9,16 +9,16 @@
+ #LDFLAGS=-lintl
+ 
+ # FreeBSD
+-#LDFLAGS=-L/usr/local/lib -lgnugetopt -lintl
+-#CFLAGS=-I/usr/local/include
++LDFLAGS+=-L/usr/local/lib
++CFLAGS+=-I/usr/local/include
+ 
+ # OS/2 EMX
+ #LDFLAGS=-lsocket -Zexe -Dstrncasecmp=strnicmp
+ 
+-ifdef HAVE_LIBIDN
++.ifdef HAVE_LIBIDN
+ LIBIDN += -lidn
+ CFLAGS += -DHAVE_LIBIDN
+-endif
++.endif
+ 
+ PERL=perl
+ 
+@@ -40,10 +40,9 @@
+ 	$(PERL) -w make_tld_serv.pl < tld_serv_list > tld_serv.h
+ 
+ install: whois
+-	install -m 0755 whois $(BASEDIR)$(prefix)/bin/
+-	strip $(BASEDIR)$(prefix)/bin/whois
+-	install -m 0644 whois.1 $(BASEDIR)$(prefix)/share/man/man1/
+-	cd po && $(MAKE) $@
++	install -m 0755 whois ${PREFIX}/bin/
++	strip ${PREFIX}/bin/whois
++	install -m 0644 whois.1 ${PREFIX}/man/man1/
+ 
+ 
+ distclean: clean