Skip site navigation (1)Skip section navigation (2)
Date:      11 Nov 2006 22:57:12 -0000
From:      Lapo Luchini <lapo@lapo.it>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        Lapo Luchini <lapo@lapo.it>
Subject:   ports/105417: avoid name clash in port net/whois
Message-ID:  <20061111225712.23090.qmail@mail.lapo.it>
Resent-Message-ID: <200611112300.kABN0iT7076085@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         105417
>Category:       ports
>Synopsis:       avoid name clash in port net/whois
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Nov 11 23:00:43 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Lapo Luchini
>Release:        FreeBSD 6.1-STABLE amd64
>Organization:
>Environment:
System: FreeBSD motoko.lapo.it 6.1-STABLE FreeBSD 6.1-STABLE #4: Fri Sep 1 17:02:50 CEST 2006 root@motoko.lapo.it:/usr/obj/usr/src/sys/MOTOKO amd64

Current net/whois installs as
  /usr/local/bin/whois
the following patch changes that to:
  /usr/local/bin/gwhois
...just like devel/gmake, except there the port name reflect that
as well and I don't know if a repomove would be that useful here.

>Description:
>How-To-Repeat:
>Fix:

--- pr-whois begins here ---
diff -ruN whois-orig/Makefile whois/Makefile
--- whois-orig/Makefile	Tue Oct  3 16:01:44 2006
+++ whois/Makefile	Tue Oct  3 16:03:48 2006
@@ -7,6 +7,7 @@
 
 PORTNAME=	whois
 PORTVERSION=	4.7.17
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL}
 DISTNAME=	${PORTNAME}_${PORTVERSION}
@@ -23,7 +24,7 @@
 MAKE_ENV=	LDFLAGS="${LDFLAGS}"
 MAKE_ARGS=	OPTS=""
 
-MAN1=	whois.1
+MAN1=	gwhois.1
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
diff -ruN whois-orig/files/patch-aa whois/files/patch-aa
--- whois-orig/files/patch-aa	Tue Oct  3 16:01:44 2006
+++ whois/files/patch-aa	Tue Oct  3 16:03:26 2006
@@ -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/
-+	install -m 0644 whois.1 ${PREFIX}/man/man1/
++	install -m 0755 whois ${PREFIX}/bin/gwhois
++	install -m 0644 whois.1 ${PREFIX}/man/man1/gwhois.1
  
  install-mkpasswd: mkpasswd
        install -m 0755 mkpasswd $(BASEDIR)$(prefix)/bin/
diff -ruN whois-orig/pkg-plist whois/pkg-plist
--- whois-orig/pkg-plist	Tue Oct  3 16:01:44 2006
+++ whois/pkg-plist	Tue Oct  3 16:04:09 2006
@@ -1,4 +1,4 @@
-bin/whois
+bin/gwhois
 %%NLS%%share/locale/de/LC_MESSAGES/whois.mo
 %%NLS%%share/locale/el/LC_MESSAGES/whois.mo
 %%NLS%%share/locale/es/LC_MESSAGES/whois.mo
--- pr-whois ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20061111225712.23090.qmail>