ports/124829: port upgrade and unbreak: net/whois 4.7.26

Lapo Luchini lapo at lapo.it
Sat Jun 21 13:10:02 UTC 2008


>Number:         124829
>Category:       ports
>Synopsis:       port upgrade and unbreak: net/whois 4.7.26
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jun 21 13:10:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator:     Lapo Luchini
>Release:        FreeBSD 6.3-PRERELEASE amd64
>Organization:
>Environment:
System: FreeBSD motoko.lapo.it 6.3-PRERELEASE FreeBSD 6.3-PRERELEASE #8: Thu Dec 13 09:33:49 CET 2007 root at motoko.lapo.it:/usr/obj/usr/src/sys/MOTOKO amd64

>Description:

Current version is broken (doesn't fetch).

Here is a quick attemp to solve the problem.

I switched to "USE_GMAKE" because I don't know how to convert "-include" (which is 
present in the program's Makefile since this release) to BSD make language.
This adds a (quite common) build-dependency but simplify patches.
	
>How-To-Repeat:
>Fix:

--- pr-whois begins here ---
diff -ruN whois.orig/Makefile whois/Makefile
--- whois.orig/Makefile	2008-06-06 15:50:30.000000000 +0200
+++ whois/Makefile	2008-06-21 14:53:51.784392217 +0200
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	whois
-PORTVERSION=	4.7.24
-PORTREVISION=	1
+PORTVERSION=	4.7.26
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL}
 DISTNAME=	${PORTNAME}_${PORTVERSION}
@@ -15,8 +14,7 @@
 MAINTAINER=	nivo+kw+ports.bfa274 at is-root.com
 COMMENT=	Marco d'Itri whois client
 
-BROKEN=		does not fetch
-
+USE_GMAKE=		yes
 USE_ICONV=		yes
 USE_PERL5_BUILD=	yes
 
diff -ruN whois.orig/distinfo whois/distinfo
--- whois.orig/distinfo	2008-03-02 07:21:50.000000000 +0100
+++ whois/distinfo	2008-06-10 12:08:09.755774396 +0200
@@ -1,3 +1,3 @@
-MD5 (whois_4.7.24.tar.gz) = 479ebc79d1e8189e16ab51b4d8981529
-SHA256 (whois_4.7.24.tar.gz) = 9b2841222f122670850d157fd76228aa0942f2f7c19694262904439f5ba50fe0
-SIZE (whois_4.7.24.tar.gz) = 61416
+MD5 (whois_4.7.26.tar.gz) = f069304ae912ff4fdec59f33de405076
+SHA256 (whois_4.7.26.tar.gz) = 515ff7eae37f64f4786ce0fe5d9f7c91790cc64fe73bfda6764d5d4c627d1541
+SIZE (whois_4.7.26.tar.gz) = 67809
diff -ruN whois.orig/files/patch-aa whois/files/patch-aa
--- whois.orig/files/patch-aa	2008-03-02 07:21:50.000000000 +0100
+++ whois/files/patch-aa	2008-06-21 14:57:28.834878369 +0200
@@ -1,6 +1,6 @@
---- Makefile.orig	Thu Jan 10 22:19:40 2008
-+++ Makefile	Thu Jan 10 22:19:38 2008
-@@ -6,23 +6,23 @@
+--- Makefile.orig	2008-04-05 15:46:24.000000000 +0200
++++ Makefile	2008-06-21 14:57:26.965023476 +0200
+@@ -6,8 +6,8 @@
  #whois_LDADD += -lnsl -lsocket
  
  # FreeBSD
@@ -11,35 +11,25 @@
  
  # OS/2 EMX
  #LDFLAGS=-lsocket -Zexe -Dstrncasecmp=strnicmp
- 
--ifdef HAVE_LIBIDN
-+.ifdef HAVE_LIBIDN
- whois_LDADD += -lidn
- whois_CFLAGS += -DHAVE_LIBIDN
--endif
-+.endif
- 
--ifdef HAVE_XCRYPT
-+.ifdef HAVE_XCRYPT
- mkpasswd_LDADD += -lxcrypt
- mkpasswd_CFLAGS += -DHAVE_XCRYPT
--else
-+.else
- mkpasswd_LDADD += -lcrypt
--endif
-+.endif
- 
- PERL := perl
- 
-@@ -55,9 +55,8 @@
+@@ -57,16 +57,15 @@
+ ##############################################################################
  install: whois
  	install -d $(BASEDIR)$(prefix)/bin/
- 	install -d $(BASEDIR)$(prefix)/share/man/man1/
+-	install -d $(BASEDIR)$(prefix)/share/man/man1/
 -	install -m 0755 whois $(BASEDIR)$(prefix)/bin/
 -	install -m 0644 whois.1 $(BASEDIR)$(prefix)/share/man/man1/
 -	cd po && $(MAKE) $@
++	install -d $(BASEDIR)$(prefix)/man/man1/
 +	install -m 0755 whois ${PREFIX}/bin/mwhois
 +	install -m 0644 whois.1 ${PREFIX}/man/man1/mwhois.1
  
  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/
+ 
+ distclean: clean
+ 	rm -f po/whois.pot
--- pr-whois ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:



More information about the freebsd-ports-bugs mailing list