aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--UPDATING8
-rw-r--r--net/gwhois/Makefile1
-rw-r--r--net/whois/Makefile4
-rw-r--r--net/whois/distinfo6
-rw-r--r--net/whois/files/patch-aa4
-rw-r--r--net/whois/pkg-plist2
6 files changed, 16 insertions, 9 deletions
diff --git a/UPDATING b/UPDATING
index 91b34a85b336..98c1ce3e5e1f 100644
--- a/UPDATING
+++ b/UPDATING
@@ -6,6 +6,14 @@ You should get into the habit of checking this file for changes each
time you update your ports collection, before attempting any port
upgrades.
+20070903:
+ AFFECTS: users of net/whois, net/gwhois
+ AUTHOR: nivo+kw+ports.bfa274@is-root.com
+
+ To avoid a conflicting binary name issue, net/whois has renamed its
+ files to mwhois. Please use mwhois if you want to use Marco d'Itri's
+ whois client from now on.
+
20070828:
AFFECTS: users of www/wordpress-mu
AUTHOR: araujo@FreeBSD.org
diff --git a/net/gwhois/Makefile b/net/gwhois/Makefile
index f2df49858b19..056259de641f 100644
--- a/net/gwhois/Makefile
+++ b/net/gwhois/Makefile
@@ -18,7 +18,6 @@ RUN_DEPENDS= p5-libwww>=5.805:${PORTSDIR}/www/p5-libwww \
lynx:${PORTSDIR}/www/lynx \
curl:${PORTSDIR}/ftp/curl
-CONFLICTS= whois-[0-9]*
NO_BUILD= yes
USE_PERL5_RUN= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}
diff --git a/net/whois/Makefile b/net/whois/Makefile
index 8827066a55c1..9689d3cf675e 100644
--- a/net/whois/Makefile
+++ b/net/whois/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= whois
-PORTVERSION= 4.7.21
+PORTVERSION= 4.7.22
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL}
DISTNAME= ${PORTNAME}_${PORTVERSION}
@@ -23,7 +23,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
MAKE_ENV= LDFLAGS="${LDFLAGS}"
MAKE_ARGS= OPTS=""
-MAN1= gwhois.1
+MAN1= mwhois.1
.if !defined(WITHOUT_NLS)
USE_GETTEXT= yes
diff --git a/net/whois/distinfo b/net/whois/distinfo
index 4c7da615e811..2db3699e8e27 100644
--- a/net/whois/distinfo
+++ b/net/whois/distinfo
@@ -1,3 +1,3 @@
-MD5 (whois_4.7.21.tar.gz) = 465479682f31f0627ebc4ab3e365b7d2
-SHA256 (whois_4.7.21.tar.gz) = c62dca7c1bc1da469cb98c08075e716c33ef631cbdf86b819949c306b417df77
-SIZE (whois_4.7.21.tar.gz) = 60132
+MD5 (whois_4.7.22.tar.gz) = 0e91c899a836be0f0cdc4a8ed5af6479
+SHA256 (whois_4.7.22.tar.gz) = 9acdc5b93ad9145dd2da47ea592aeb5b2b170bdac29ca780b186bd4249b3b3a9
+SIZE (whois_4.7.22.tar.gz) = 60511
diff --git a/net/whois/files/patch-aa b/net/whois/files/patch-aa
index 23c86045c028..c5f5e71efe72 100644
--- a/net/whois/files/patch-aa
+++ b/net/whois/files/patch-aa
@@ -38,8 +38,8 @@
- install -m 0755 whois $(BASEDIR)$(prefix)/bin/
- install -m 0644 whois.1 $(BASEDIR)$(prefix)/share/man/man1/
- cd po && $(MAKE) $@
-+ install -m 0755 whois ${PREFIX}/bin/gwhois
-+ install -m 0644 whois.1 ${PREFIX}/man/man1/gwhois.1
++ install -m 0755 whois ${PREFIX}/bin/mwhois
++ install -m 0644 whois.1 ${PREFIX}/man/man1/mwhois.1
install-mkpasswd: mkpasswd
install -m 0755 mkpasswd $(BASEDIR)$(prefix)/bin/
diff --git a/net/whois/pkg-plist b/net/whois/pkg-plist
index efd84f575edd..fddbd7b2c421 100644
--- a/net/whois/pkg-plist
+++ b/net/whois/pkg-plist
@@ -1,4 +1,4 @@
-bin/gwhois
+bin/mwhois
%%NLS%%share/locale/de/LC_MESSAGES/whois.mo
%%NLS%%share/locale/el/LC_MESSAGES/whois.mo
%%NLS%%share/locale/es/LC_MESSAGES/whois.mo