- Update to 4.7.30

5 files changed, 61 insertions, 66 deletions

diff --git a/net/whois/Makefile b/net/whois/Makefile
index 1da7c2194241..2079ab352cb2 100644
--- a/net/whois/Makefile
+++ b/net/whois/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	whois
-PORTVERSION=	4.7.28
+PORTVERSION=	4.7.30
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL}
 DISTNAME=	${PORTNAME}_${PORTVERSION}
@@ -20,34 +20,34 @@ USE_PERL5_BUILD=	yes
 
 WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-LDFLAGS+=	-L/usr/local/lib
-CFLAGS+=	-I/usr/local/include
+#LDFLAGS+=	-L/usr/local/lib
+#CFLAGS+=	-I/usr/local/include
 
 MAKE_ENV=	LDFLAGS="${LDFLAGS}"
 MAKE_ARGS=	OPTS=""
 
 MAN1=	whois.1 mkpasswd.1
 
-.if !defined(WITHOUT_NLS)
-USE_GETTEXT=	yes
-LDFLAGS+=	-lintl
-PLIST_SUB+=	NLS=""
-.else
-PLIST_SUB+=	NLS="@comment "
-NO_PO=	yes
-.endif
+#.if !defined(WITHOUT_NLS)
+#USE_GETTEXT=	yes
+#LDFLAGS+=	-lintl
+#PLIST_SUB+=	NLS=""
+#.else
+#PLIST_SUB+=	NLS="@comment "
+#NO_PO=	yes
+#.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g ; \
 		s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e "s|/usr/share|${PREFIX}/share|g" ${WRKSRC}/po/Makefile
-	@if [ -n "${NO_PO}" ]; \
-		then ${PATCH} ${PATCH_ARGS} < ${FILESDIR}/have_nls-patch; \
-	fi
-
-post-install:
-	@if [ ! -n "${NO_PO}" ]; \
-		then cd ${WRKSRC}/po && ${MAKE} install; \
-	fi
+#	@if [ -n "${NO_PO}" ]; \
+#		then ${PATCH} ${PATCH_ARGS} < ${FILESDIR}/have_nls-patch; \
+#	fi
+
+#post-install:
+#	@if [ ! -n "${NO_PO}" ]; \
+#		then cd ${WRKSRC}/po && ${MAKE} install; \
+#	fi
 
 .include <bsd.port.mk>
diff --git a/net/whois/distinfo b/net/whois/distinfo
index 5e186ea5af06..4157d08b1a34 100644
--- a/net/whois/distinfo
+++ b/net/whois/distinfo
@@ -1,3 +1,3 @@
-MD5 (whois_4.7.28.tar.gz) = 90b8f4014d7e2249b74ac0cc56de2360
-SHA256 (whois_4.7.28.tar.gz) = e7b9202f484e3dedbd38968d266adfa9bcf0357095bc20f282962441fc0c3d5a
-SIZE (whois_4.7.28.tar.gz) = 68070
+MD5 (whois_4.7.30.tar.gz) = 0667190491a5a9ded8595b8e330dcc11
+SHA256 (whois_4.7.30.tar.gz) = 67581c0fa7b75ccea366e531b807b02a7f1dbe6fc55d4cd440e8f09eea491d36
+SIZE (whois_4.7.30.tar.gz) = 69685
diff --git a/net/whois/files/have_nls-patch b/net/whois/files/have_nls-patch
index 94dd6b29acc2..936dd2aeb5d0 100644
--- a/net/whois/files/have_nls-patch
+++ b/net/whois/files/have_nls-patch
@@ -1,10 +1,10 @@
---- config.h.old	Mon Apr 19 10:54:11 2004
-+++ config.h	Mon Apr 19 10:54:17 2004
+--- config.h.orgi	2008-12-24 19:41:30.000000000 +0100
++++ config.h	2008-12-24 19:42:35.000000000 +0100
 @@ -24,7 +24,6 @@
  /* which versions? */
  # define HAVE_GETOPT_LONG
  # define HAVE_GETADDRINFO
 -# define ENABLE_NLS
- # define LOCALEDIR "/usr/local/share/locale"
- #endif
- 
+ # ifndef LOCALEDIR
+ #  define LOCALEDIR "/usr/local/share/locale"
+ # endif
diff --git a/net/whois/files/patch-aa b/net/whois/files/patch-aa
index 3541c67cc4ad..6902de97f407 100644
--- a/net/whois/files/patch-aa
+++ b/net/whois/files/patch-aa
@@ -1,7 +1,8 @@
---- Makefile.orig	2008-05-06 11:41:16.000000000 +0200
-+++ Makefile	2008-08-21 13:25:03.000000000 +0200
+--- Makefile.orgi	2008-12-24 19:32:32.000000000 +0100
++++ Makefile	2008-12-24 19:33:58.000000000 +0100
 @@ -1,6 +1,9 @@
- prefix = %%PREFIX%%
+-prefix = /usr
++prefix = %%PREFIX%%
  
 -CFLAGS = -g -O2
 +LDFLAGS+=-L%%LOCALBASE%%/lib -lintl
@@ -10,36 +11,42 @@
 +CFLAGS += -g -O2
  
  PERL = perl
+ INSTALL = install
+@@ -21,7 +24,7 @@
+ endif
  
-@@ -63,22 +66,22 @@
+ ifdef LOCALEDIR
+-DEFS += -DLOCALEDIR=\"$(BASEDIR)$(prefix)/share/locale\"
++DEFS += -DLOCALEDIR=\"$(prefix)/share/locale\"
+ endif
+ 
+ ifdef HAVE_LIBIDN
+@@ -68,19 +71,19 @@
  	$(PERL) -w make_tld_serv.pl < tld_serv_list > $@
  
  ##############################################################################
--install: install-whois install-mkpasswd install-pos
+-install: install-whois install-mkpasswd #install-pos
 +install: install-whois install-mkpasswd
  
  install-whois: whois
- 	install -d $(BASEDIR)$(prefix)/bin/
--	install -d $(BASEDIR)$(prefix)/share/man/man1/
--	install -m 0755 whois $(BASEDIR)$(prefix)/bin/
--	install -m 0644 whois.1 $(BASEDIR)$(prefix)/share/man/man1/
-+	install -d $(prefix)/man/man1/
-+	install -m 0755 whois $(prefix)/bin/
-+	install -m 0644 whois.1 $(prefix)/man/man1/
+-	$(INSTALL) -d $(BASEDIR)$(prefix)/bin/
+-	$(INSTALL) -d $(BASEDIR)$(prefix)/share/man/man1/
+-	$(INSTALL) -m 0755 whois $(BASEDIR)$(prefix)/bin/
+-	$(INSTALL) -m 0644 whois.1 $(BASEDIR)$(prefix)/share/man/man1/
++	$(INSTALL) -d $(prefix)/bin/
++	$(INSTALL) -d $(prefix)/man/man1/
++	$(INSTALL) -m 0755 whois $(prefix)/bin/
++	$(INSTALL) -m 0644 whois.1 $(prefix)/man/man1/
  
  install-mkpasswd: mkpasswd
- 	install -d $(BASEDIR)$(prefix)/bin/
--	install -d $(BASEDIR)$(prefix)/share/man/man1/
--	install -m 0755 mkpasswd $(BASEDIR)$(prefix)/bin/
--	install -m 0644 mkpasswd.1 $(BASEDIR)$(prefix)/share/man/man1/
-+	install -d $(BASEDIR)$(prefix)/man/man1/
-+	install -m 0755 mkpasswd $(prefix)/bin/
-+	install -m 0644 mkpasswd.1 $(prefix)/man/man1/
- 
--install-pos:
--	cd po && $(MAKE) $@
-+#install-pos:
-+#	cd po && $(MAKE) $@
- 
- distclean: clean
- 	rm -f po/whois.pot
+-	$(INSTALL) -d $(BASEDIR)$(prefix)/bin/
+-	$(INSTALL) -d $(BASEDIR)$(prefix)/share/man/man1/
+-	$(INSTALL) -m 0755 mkpasswd $(BASEDIR)$(prefix)/bin/
+-	$(INSTALL) -m 0644 mkpasswd.1 $(BASEDIR)$(prefix)/share/man/man1/
++	$(INSTALL) -d $(prefix)/bin/
++	$(INSTALL) -d $(prefix)/man/man1/
++	$(INSTALL) -m 0755 mkpasswd $(prefix)/bin/
++	$(INSTALL) -m 0644 mkpasswd.1 $(prefix)/man/man1/
+ 
+ install-pos:
+ 	cd po && $(MAKE) install
diff --git a/net/whois/pkg-plist b/net/whois/pkg-plist
index 3c405506c105..cd880713798f 100644
--- a/net/whois/pkg-plist
+++ b/net/whois/pkg-plist
@@ -1,14 +1,2 @@
 bin/whois
 bin/mkpasswd
-%%NLS%%share/locale/cs/LC_MESSAGES/whois.mo
-%%NLS%%share/locale/de/LC_MESSAGES/whois.mo
-%%NLS%%share/locale/el/LC_MESSAGES/whois.mo
-%%NLS%%share/locale/es/LC_MESSAGES/whois.mo
-%%NLS%%share/locale/eu/LC_MESSAGES/whois.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/whois.mo
-%%NLS%%share/locale/it/LC_MESSAGES/whois.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/whois.mo
-%%NLS%%share/locale/no/LC_MESSAGES/whois.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/whois.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/whois.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/whois.mo