From toni@iso.egotaivas.com  Sat Apr 17 12:32:41 2004
Return-Path: <toni@iso.egotaivas.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 528BF16A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 17 Apr 2004 12:32:41 -0700 (PDT)
Received: from iso.egotaivas.com (iso.egotaivas.com [193.65.195.170])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9E5BA43D3F
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 17 Apr 2004 12:32:40 -0700 (PDT)
	(envelope-from toni@iso.egotaivas.com)
Received: from iso.egotaivas.com (toni@localhost.egotaivas.com [127.0.0.1])
	by iso.egotaivas.com (8.12.10/8.12.10) with ESMTP id i3HJWcRh042702;
	Sat, 17 Apr 2004 22:32:39 +0300 (EEST)
	(envelope-from toni@iso.egotaivas.com)
Received: (from toni@localhost)
	by iso.egotaivas.com (8.12.10/8.12.10/Submit) id i3HJWchB042701;
	Sat, 17 Apr 2004 22:32:38 +0300 (EEST)
	(envelope-from toni)
Message-Id: <200404171932.i3HJWchB042701@iso.egotaivas.com>
Date: Sat, 17 Apr 2004 22:32:38 +0300 (EEST)
From: Toni Viemero <toni.viemero@iki.fi>
To: FreeBSD-gnats-submit@freebsd.org
Cc: filippo@widestore.net
Subject: [PATCH] net/whois: update to 4.6.14
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         65683
>Category:       ports
>Synopsis:       [PATCH] net/whois: update to 4.6.14
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pav
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Apr 17 12:40:16 PDT 2004
>Closed-Date:    Mon Apr 19 04:18:11 PDT 2004
>Last-Modified:  Mon Apr 19 04:18:11 PDT 2004
>Originator:     Toni Viemero
>Release:        FreeBSD 5.2.1-RELEASE-p4 i386
>Organization:
>Environment:
System: FreeBSD iso.egotaivas.com 5.2.1-RELEASE-p4 FreeBSD 5.2.1-RELEASE-p4 #1: Wed Mar 31 21:45:56 EEST 2004
>Description:
- Update to 4.6.14

Changelog:
  * Removed whois.oleane.net from the list of RIPE-like servers, because
    apparently it's not one anymore.

Port maintainer (filippo@widestore.net) is cc'd.
>How-To-Repeat:
>Fix:

--- whois-4.6.14.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/net/whois/Makefile /home/toni/ports/whois/Makefile
--- /usr/ports/net/whois/Makefile	Tue Apr 13 21:40:28 2004
+++ /home/toni/ports/whois/Makefile	Sat Apr 17 22:30:23 2004
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	whois
-PORTVERSION=	4.6.13
+PORTVERSION=	4.6.14
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL}
 DISTNAME=	${PORTNAME}_${PORTVERSION}
diff -ruN --exclude=CVS /usr/ports/net/whois/distinfo /home/toni/ports/whois/distinfo
--- /usr/ports/net/whois/distinfo	Tue Apr 13 21:40:28 2004
+++ /home/toni/ports/whois/distinfo	Sat Apr 17 22:31:10 2004
@@ -1,2 +1,2 @@
-MD5 (whois_4.6.13.tar.gz) = 66068605f636ce79a017f1bc770251a3
-SIZE (whois_4.6.13.tar.gz) = 50400
+MD5 (whois_4.6.14.tar.gz) = fab689586c30fad567d7d1f924e9c937
+SIZE (whois_4.6.14.tar.gz) = 50570
--- whois-4.6.14.patch ends here ---

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: pav 
State-Changed-When: Sat Apr 17 16:36:05 PDT 2004 
State-Changed-Why:  
Asked maintainer for approval. 


Responsible-Changed-From-To: freebsd-ports-bugs->pav 
Responsible-Changed-By: pav 
Responsible-Changed-When: Sat Apr 17 16:36:05 PDT 2004 
Responsible-Changed-Why:  
Handle 

http://www.freebsd.org/cgi/query-pr.cgi?pr=65683 

From: Pav Lucistnik <pav@FreeBSD.org>
To: freebsd-gnats-submit@FreeBSD.org, toni.viemero@iki.fi,
	filippo@widestore.net
Cc:  
Subject: Re: ports/65683: [PATCH] net/whois: update to 4.6.14
Date: Sun, 18 Apr 2004 01:36:02 +0200

 Dear maintainer of FreeBSD port net/whois, please take a look at
 
 http://www.freebsd.org/cgi/query-pr.cgi?q=65683
 
 Do you approve this update?
 
 -- 
 Pav Lucistnik <pav@oook.cz>
               <pav@FreeBSD.org>
 
 What do we know about love? Love is like a pear.  Pear is sweet and havea
 specific shape. Try to exactly define the shape of a pear.
   -- Marigold: 50 Years Of Poetry

From: Filippo Natali <filippo.natali@widestore.net>
To: pav@FreeBSD.org
Cc: freebsd-gnats-submit@FreeBSD.org, toni.viemero@iki.fi,
	filippo@widestore.net
Subject: Re: ports/65683: [PATCH] net/whois: update to 4.6.14
Date: Mon, 19 Apr 2004 11:44:31 +0200

 On Dom, 2004-04-18 at 01:36, Pav Lucistnik wrote:
 > Dear maintainer of FreeBSD port net/whois, please take a look at
 > 
 > http://www.freebsd.org/cgi/query-pr.cgi?q=65683
 > 
 > Do you approve this update?
 
 I prepared a refurbishment for this port too, the following patch:
 - updates whois to 4.6.14
 - gets rid of gmake
 - introduces WITHOUT_NLS option
 
 [begin of patch]
 diff -Nru whois.bak/Makefile whois/Makefile
 --- whois.bak/Makefile	Tue Apr 13 17:57:01 2004
 +++ whois/Makefile	Mon Apr 19 11:31:36 2004
 @@ -6,7 +6,7 @@
  #
  
  PORTNAME=	whois
 -PORTVERSION=	4.6.13
 +PORTVERSION=	4.6.14
  CATEGORIES=	net
  MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL}
  DISTNAME=	${PORTNAME}_${PORTVERSION}
 @@ -16,20 +16,35 @@
  
  MAN1=	whois.1
  
 -USE_GETTEXT=	yes
  USE_ICONV=	yes
  USE_PERL5_BUILD=	yes
  USE_REINPLACE=	yes
 -USE_GMAKE=	yes
  USE_GETOPT_LONG=	yes
  WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
  
  MAKE_ENV=	LDFLAGS="${LDFLAGS}"
  MAKE_ARGS=	OPTS=""
  
 +.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\=/usr/local|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
  
  .include <bsd.port.mk>
 diff -Nru whois.bak/distinfo whois/distinfo
 --- whois.bak/distinfo	Tue Apr 13 17:57:01 2004
 +++ whois/distinfo	Mon Apr 19 11:31:36 2004
 @@ -1,2 +1,2 @@
 -MD5 (whois_4.6.13.tar.gz) = 66068605f636ce79a017f1bc770251a3
 -SIZE (whois_4.6.13.tar.gz) = 50400
 +MD5 (whois_4.6.14.tar.gz) = fab689586c30fad567d7d1f924e9c937
 +SIZE (whois_4.6.14.tar.gz) = 50570
 diff -Nru whois.bak/files/have_nls-patch whois/files/have_nls-patch
 --- whois.bak/files/have_nls-patch	Thu Jan  1 01:00:00 1970
 +++ whois/files/have_nls-patch	Mon Apr 19 11:31:36 2004
 @@ -0,0 +1,10 @@
 +--- config.h.old	Mon Apr 19 10:54:11 2004
 ++++ config.h	Mon Apr 19 10:54:17 2004
 +@@ -24,7 +24,6 @@
 + /* which versions? */
 + # define HAVE_GETOPT_LONG
 + # define HAVE_GETADDRINFO
 +-# define ENABLE_NLS
 + # define LOCALEDIR "/usr/local/share/locale"
 + #endif
 + 
 diff -Nru whois.bak/files/patch-aa whois/files/patch-aa
 --- whois.bak/files/patch-aa	Mon Oct 13 15:54:40 2003
 +++ whois/files/patch-aa	Mon Apr 19 11:31:36 2004
 @@ -1,7 +1,7 @@
 -*** work/whois-4.6.6/Makefile	Thu Dec  5 01:22:15 2002
 ---- Makefile	Thu Oct  2 10:53:29 2003
 +*** work/whois-4.6.13/Makefile	Tue Feb 10 17:24:29 2004
 +--- Makefile	Thu Apr 15 16:11:14 2004
  ***************
 -*** 9,16 ****
 +*** 9,24 ****
    #LDFLAGS=-lintl
    
    # FreeBSD
 @@ -10,29 +10,46 @@
    
    # OS/2 EMX
    #LDFLAGS=-lsocket -Zexe -Dstrncasecmp=strnicmp
 ---- 9,16 ----
 +  
 +! ifdef HAVE_LIBIDN
 +  LIBIDN += -lidn
 +  CFLAGS += -DHAVE_LIBIDN
 +! endif
 +  
 +  PERL=perl
 +  
 +--- 9,24 ----
    #LDFLAGS=-lintl
    
    # FreeBSD
 -! LDFLAGS+=-L%%LOCALBASE%%/lib -lintl
 -! CFLAGS+=-I%%LOCALBASE%%/include
 +! 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
 +  
  ***************
 -*** 35,41 ****
 +*** 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) $@
 +! 	cd po && $(MAKE) $@
    
    
 ---- 35,41 ----
 +  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/
 -  	cd po && $(MAKE) $@
    
    
 +  distclean: clean
 diff -Nru whois.bak/files/patch-ac whois/files/patch-ac
 --- whois.bak/files/patch-ac	Thu Jan  1 01:00:00 1970
 +++ whois/files/patch-ac	Mon Apr 19 11:31:36 2004
 @@ -0,0 +1,30 @@
 +*** work/whois-4.6.13/po/Makefile	Thu Apr 15 15:58:17 2004
 +--- po/Makefile	Thu Apr 15 15:58:47 2004
 +***************
 +*** 7,12 ****
 +--- 7,14 ----
 +  
 +  POTFILES=../whois.c ../mkpasswd.c
 +  
 ++ .SUFFIXES:      .po .mo
 ++ 
 +  all: $(PACKAGE).pot $(CATALOGS)
 +  
 +  $(PACKAGE).pot: $(POTFILES)
 +***************
 +*** 31,37 ****
 +  	  fi; \
 +  	done
 +  
 +! %.mo: %.po
 +  	msgfmt --statistics --check --verbose --output-file=$@ $<
 +  
 +  clean:
 +--- 33,39 ----
 +  	  fi; \
 +  	done
 +  
 +! .po.mo:
 +  	msgfmt --statistics --check --verbose --output-file=$@ $<
 +  
 +  clean:
 diff -Nru whois.bak/pkg-plist whois/pkg-plist
 --- whois.bak/pkg-plist	Mon Nov 10 15:11:50 2003
 +++ whois/pkg-plist	Mon Apr 19 11:31:36 2004
 @@ -1,23 +1,23 @@
  bin/whois
 -share/locale/de/LC_MESSAGES/whois.mo
 -share/locale/el/LC_MESSAGES/whois.mo
 -share/locale/es/LC_MESSAGES/whois.mo
 -share/locale/fr/LC_MESSAGES/whois.mo
 -share/locale/it/LC_MESSAGES/whois.mo
 -share/locale/no/LC_MESSAGES/whois.mo
 -share/locale/pl/LC_MESSAGES/whois.mo
 -@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
 -@unexec rmdir %D/share/locale/pl 2>/dev/null || true
 -@unexec rmdir %D/share/locale/no/LC_MESSAGES 2>/dev/null || true
 -@unexec rmdir %D/share/locale/no 2>/dev/null || true
 -@unexec rmdir %D/share/locale/it/LC_MESSAGES 2>/dev/null || true
 -@unexec rmdir %D/share/locale/it 2>/dev/null || true
 -@unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true
 -@unexec rmdir %D/share/locale/fr 2>/dev/null || true
 -@unexec rmdir %D/share/locale/es/LC_MESSAGES 2>/dev/null || true
 -@unexec rmdir %D/share/locale/es 2>/dev/null || true
 -@unexec rmdir %D/share/locale/el/LC_MESSAGES 2>/dev/null || true
 -@unexec rmdir %D/share/locale/el 2>/dev/null || true
 -@unexec rmdir %D/share/locale/de/LC_MESSAGES 2>/dev/null || true
 -@unexec rmdir %D/share/locale/de 2>/dev/null || true
 -@unexec rmdir %D/share/locale 2>/dev/null || true
 +%%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/fr/LC_MESSAGES/whois.mo
 +%%NLS%%share/locale/it/LC_MESSAGES/whois.mo
 +%%NLS%%share/locale/no/LC_MESSAGES/whois.mo
 +%%NLS%%share/locale/pl/LC_MESSAGES/whois.mo
 +%%NLS%%@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
 +%%NLS%%@unexec rmdir %D/share/locale/pl 2>/dev/null || true
 +%%NLS%%@unexec rmdir %D/share/locale/no/LC_MESSAGES 2>/dev/null || true
 +%%NLS%%@unexec rmdir %D/share/locale/no 2>/dev/null || true
 +%%NLS%%@unexec rmdir %D/share/locale/it/LC_MESSAGES 2>/dev/null || true
 +%%NLS%%@unexec rmdir %D/share/locale/it 2>/dev/null || true
 +%%NLS%%@unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true
 +%%NLS%%@unexec rmdir %D/share/locale/fr 2>/dev/null || true
 +%%NLS%%@unexec rmdir %D/share/locale/es/LC_MESSAGES 2>/dev/null || true
 +%%NLS%%@unexec rmdir %D/share/locale/es 2>/dev/null || true
 +%%NLS%%@unexec rmdir %D/share/locale/el/LC_MESSAGES 2>/dev/null || true
 +%%NLS%%@unexec rmdir %D/share/locale/el 2>/dev/null || true
 +%%NLS%%@unexec rmdir %D/share/locale/de/LC_MESSAGES 2>/dev/null || true
 +%%NLS%%@unexec rmdir %D/share/locale/de 2>/dev/null || true
 +%%NLS%%@unexec rmdir %D/share/locale 2>/dev/null || true
 [end of patch]
 
 regards,
 Filippo Natali
 -- 
 Widestore srl
 Via Borgo dei Leoni 70/F - 44100 Ferrara (Italy)
 Tel +39 0532 242425 Fax +39 0532 242298 - +39 0532 213000
 email: filippo.natali@widestore.net
 web: http://www.widestore.net
 
State-Changed-From-To: feedback->closed 
State-Changed-By: pav 
State-Changed-When: Mon Apr 19 04:17:57 PDT 2004 
State-Changed-Why:  
Maintainer's version committed, thank you for your submission 

http://www.freebsd.org/cgi/query-pr.cgi?pr=65683 
>Unformatted:
