FreeBSD Bugzilla – Attachment 218755 Details for
Bug 250275
net/whois: Update to 5.5.7
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
net/whois: Update to 5.5.7
net_whois-5.5.7.diff (text/plain), 8.31 KB, created by
Juraj Lutter
on 2020-10-15 09:50:09 UTC
(
hide
)
Description:
net/whois: Update to 5.5.7
Filename:
MIME Type:
Creator:
Juraj Lutter
Created:
2020-10-15 09:50:09 UTC
Size:
8.31 KB
patch
obsolete
>diff --git a/net/whois/Makefile b/net/whois/Makefile >index 3ce332a77581..bd841a325400 100644 >--- a/net/whois/Makefile >+++ b/net/whois/Makefile >@@ -1,48 +1,50 @@ > # Created by: Filippo Natali <filippo@widestore.net> > # $FreeBSD$ > > PORTNAME= whois > DISTVERSIONPREFIX= v >-DISTVERSION= 5.5.6 >+DISTVERSION= 5.5.7 > CATEGORIES= net > > MAINTAINER= coco@executive-computing.de > COMMENT= Marco d'Itri whois client > > LICENSE= GPLv2+ > LICENSE_FILE= ${WRKSRC}/COPYING > >+LIB_DEPENDS= libidn2.so:dns/libidn2 >+ > USES= iconv gmake perl5 pkgconfig > USE_PERL5= build > MAKE_ARGS= BASEDIR="${STAGEDIR}" > > OPTIONS_DEFINE= NLS > > OPTIONS_SUB= yes > NLS_USES= gettext > > USE_GITHUB= yes > GH_ACCOUNT= rfc1036 > > post-patch: > @${REINPLACE_CMD} -e "s|%%MWHOISCONF%%|${PREFIX}/etc/mwhois.conf|g" ${WRKSRC}/whois.1 > @${REINPLACE_CMD} -e "s|%%MWHOIS%%|mwhois|g" ${WRKSRC}/Makefile > @${REINPLACE_CMD} -e "s|%%MWHOIS%%|mwhois|g" ${WRKSRC}/po/Makefile > @${REINPLACE_CMD} -e "s|%%MWHOIS%%|mwhois|g" ${WRKSRC}/whois.1 > @${REINPLACE_CMD} -e "s|%%MWHOIST%%|MWHOIS|g" ${WRKSRC}/whois.1 > @${REINPLACE_CMD} -e "s|%%MWHOIST%%|MWHOIS|g" ${WRKSRC}/whois.conf.5 > @${REINPLACE_CMD} -e "s|%%MWHOIS%%|mwhois|g" ${WRKSRC}/whois.conf.5 > @${REINPLACE_CMD} -e "s|%%MWHOISCONF%%|${PREFIX}/etc/mwhois.conf|g" ${WRKSRC}/whois.conf.5 > @${REINPLACE_CMD} -e "s|%%MWHOISCONF%%|${PREFIX}/etc/mwhois.conf|g" ${WRKSRC}/config.h > @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/config.h > > post-patch-NLS-off: > @${REINPLACE_CMD} -e "s| pos||" -e "s| install-pos||" \ > -e "s|-lintl||" ${WRKSRC}/Makefile > @${REINPLACE_CMD} -e "s|# define ENABLE_NLS||" ${WRKSRC}/config.h > > post-install: > ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/mwhois > ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/mkpasswd > > .include <bsd.port.mk> >diff --git a/net/whois/distinfo b/net/whois/distinfo >index 5c28a8a314f5..6b4754a6540f 100644 >--- a/net/whois/distinfo >+++ b/net/whois/distinfo >@@ -1,3 +1,3 @@ >-TIMESTAMP = 1586583966 >-SHA256 (rfc1036-whois-v5.5.6_GH0.tar.gz) = fa86a9da4b6e79b6a04b0110f7f4f46214d038a051fef3d0767a09b44e49e8c8 >-SIZE (rfc1036-whois-v5.5.6_GH0.tar.gz) = 103581 >+TIMESTAMP = 1602430665 >+SHA256 (rfc1036-whois-v5.5.7_GH0.tar.gz) = ae389c1486cdeae99f5f02940f98f5d7ff1f08ac0f96810365159b27b0189b5e >+SIZE (rfc1036-whois-v5.5.7_GH0.tar.gz) = 102666 >diff --git a/net/whois/files/patch-po_Makefile b/net/whois/files/patch-po_Makefile >index 3d3559540a6f..566974efd3e8 100644 >--- a/net/whois/files/patch-po_Makefile >+++ b/net/whois/files/patch-po_Makefile >@@ -1,35 +1,35 @@ >---- po/Makefile.orig 2019-12-31 02:05:47 UTC >+--- po/Makefile.orig 2020-10-03 15:43:15 UTC > +++ po/Makefile > @@ -1,4 +1,7 @@ > prefix = /usr > +ifdef PREFIX > +prefix := $(PREFIX) > +endif > > ifdef DESTDIR > BASEDIR := $(DESTDIR) > @@ -8,12 +11,14 @@ INSTALL= install > > INSTALLNLSDIR=$(BASEDIR)$(prefix)/share/locale > > -PACKAGE = whois > +PACKAGE = %%MWHOIS%% > >- CATALOGS = cs.mo da.mo de.mo el.mo es.mo eu.mo fi.mo fr.mo it.mo ja.mo nb.mo pl.mo pt_BR.mo ru.mo zh_CN.mo >+ CATALOGS = cs.mo da.mo de.mo el.mo es.mo eu.mo fi.mo fr.mo it.mo ja.mo pl.mo pt_BR.mo ru.mo zh_CN.mo > > POTFILES=../whois.c ../mkpasswd.c > >-+.SUFFIXES: .po .mo >++.SUFFIXES: .po .mo > + > all: $(PACKAGE).pot $(CATALOGS) > > $(PACKAGE).pot: $(POTFILES) > @@ -45,7 +50,7 @@ clean: > rm -f *.mo > > distclean: clean > - rm -f whois.pot > + rm -f %%MWHOIS%%.pot > > install: $(CATALOGS) > for n in $(CATALOGS); do \ >diff --git a/net/whois/files/patch-whois.1 b/net/whois/files/patch-whois.1 >index aafbb6055504..350e958374df 100644 >--- a/net/whois/files/patch-whois.1 >+++ b/net/whois/files/patch-whois.1 >@@ -1,73 +1,73 @@ > --- whois.1.orig 2019-12-31 02:05:47 UTC > +++ whois.1 > @@ -1,8 +1,8 @@ > -.TH "WHOIS" "1" "2019-12-30" "Marco d'Itri" "Debian GNU/Linux" >-+.TH "MWHOIS" "1" "2019-12-30" "Marco d'Itri" "Debian GNU/Linux" >++.TH "%%MWHOIST%%" "1" "2019-12-30" "Marco d'Itri" "Debian GNU/Linux" > .SH NAME > -whois \- client for the whois directory service >-+mwhois \- client for the whois directory service >++%%MWHOIS%% \- client for the whois directory service > .SH SYNOPSIS > -.B whois >-+.B mwhois >++.B %%MWHOIS%% > [ > .RB {\~ \-h \~|\~ \-\-host \~} > .I HOST > @@ -25,25 +25,25 @@ whois \- client for the whois directory service > .RB [\~ \-\-verbose \~] > .I OBJECT > > -.B whois >-+.B mwhois >++.B %%MWHOIS%% > .B \-q > .I KEYWORD > > -.B whois >-+.B mwhois >++.B %%MWHOIS%% > .B \-t > .I TYPE > > -.B whois >-+.B mwhois >++.B %%MWHOIS%% > .B \-v > .I TYPE > > -.B whois \-\-help >-+.B mwhois \-\-help >++.B %%MWHOIS%% \-\-help > > -.B whois \-\-version >-+.B mwhois \-\-version >++.B %%MWHOIS%% \-\-version > > .PP > .SH DESCRIPTION > -.B whois >-+.B mwhois >++.B %%MWHOIS%% > searches for an object in a > .I RFC 3912 > database. > @@ -243,7 +243,7 @@ which are not to be interpreted by the client must fol > separator (which marks the beginning of the query string). > .P > If the > -.I /etc/whois.conf >-+.I /usr/local/etc/mwhois.conf >++.I %%MWHOISCONF%% > configuration file exists, it will be consulted > to find a server before applying the normal rules. Each line of the > file should contain a regular expression to be matched against the query > @@ -259,7 +259,7 @@ by the current system locale. > Command line arguments will always be interpreted accordingly to the > current system locale and converted to the IDN ASCII Compatible Encoding. > .SH "FILES" > -/etc/whois.conf >-+/usr/local/etc/mwhois.conf >++%%MWHOISCONF%% > .SH "ENVIRONMENT" > .IP LANG > When querying > @@ -280,7 +280,7 @@ of objects are located. If the variable does not exist > .I whois.arin.net > will be queried. > .SH "SEE ALSO" > -.IR whois.conf (5). >-+.IR /usr/local/etc/mwhois.conf (5). >++.IR %%MWHOIS%%.conf (5). > .P > .IR "RFC 3912" : > WHOIS Protocol Specification. >diff --git a/net/whois/files/patch-whois.conf.5 b/net/whois/files/patch-whois.conf.5 >index f753f833910d..eebafeeb3c38 100644 >--- a/net/whois/files/patch-whois.conf.5 >+++ b/net/whois/files/patch-whois.conf.5 >@@ -1,38 +1,38 @@ > --- whois.conf.5.orig 2019-12-31 02:05:47 UTC > +++ whois.conf.5 > @@ -1,10 +1,10 @@ > -.TH "WHOIS.CONF" "5" "2019-12-30" "Petr PÃsaÅ" "Debian GNU/Linux" >-+.TH "MWHOIS.CONF" "5" "2019-12-30" "Petr PÃsaÅ" "Debian GNU/Linux" >++.TH "%%MWHOIST%%.CONF" "5" "2019-12-30" "Petr PÃsaÅ" "Debian GNU/Linux" > > .SH NAME > -whois.conf \- alternative WHOIS servers list for whois client >-+mwhois.conf \- alternative WHOIS servers list for mwhois client >++%%MWHOIS%%.conf \- alternative WHOIS servers list for %%MWHOIS%% client > > .SH SYNOPSIS > -.B /etc/whois.conf >-+.B /usr/local/etc/mwhois.conf >++.B %%MWHOISCONF%% > > .SH DESCRIPTION > This file contains a list of WHOIS servers which can augment or override > @@ -18,7 +18,7 @@ Fields are separated by non-empty sequence of space or > A line starting with a hash character is a free comment and it's not > considered. > > -The pattern is case-insensitive extended regular expression if whois client >-+The pattern is case-insensitive extended regular expression if mwhois client >++The pattern is case-insensitive extended regular expression if %%MWHOIS%% client > has been compiled with POSIX regular expressions support. Otherwise, simple > case-insensitive suffix comparison against WHOIS object identifier is used. > > @@ -37,10 +37,10 @@ encoding (ACE) format. > ^as645(1[2-9]|2[0-9]|3[0-4])$ whois.example.net > > .SH FILES > -/etc/whois.conf >-+/usr/local/etc/mwhois.conf >++%%MWHOISCONF%% > > .SH "SEE ALSO" > -.IR whois (1) >-+.IR mwhois (1) >++.IR %%MWHOIS%% (1) > > .SH AUTHOR > This manual page was written by Petr PÃsaÅ >diff --git a/net/whois/pkg-plist b/net/whois/pkg-plist >index 96596b268bfd..4ea2fef051a6 100644 >--- a/net/whois/pkg-plist >+++ b/net/whois/pkg-plist >@@ -1,20 +1,19 @@ > bin/mkpasswd > bin/mwhois > man/man1/mkpasswd.1.gz > man/man1/mwhois.1.gz > man/man5/mwhois.conf.5.gz > %%NLS%%share/locale/cs/LC_MESSAGES/mwhois.mo > %%NLS%%share/locale/da/LC_MESSAGES/mwhois.mo > %%NLS%%share/locale/de/LC_MESSAGES/mwhois.mo > %%NLS%%share/locale/el/LC_MESSAGES/mwhois.mo > %%NLS%%share/locale/es/LC_MESSAGES/mwhois.mo > %%NLS%%share/locale/eu/LC_MESSAGES/mwhois.mo > %%NLS%%share/locale/fi/LC_MESSAGES/mwhois.mo > %%NLS%%share/locale/fr/LC_MESSAGES/mwhois.mo > %%NLS%%share/locale/it/LC_MESSAGES/mwhois.mo > %%NLS%%share/locale/ja/LC_MESSAGES/mwhois.mo >-%%NLS%%share/locale/nb/LC_MESSAGES/mwhois.mo > %%NLS%%share/locale/pl/LC_MESSAGES/mwhois.mo > %%NLS%%share/locale/pt_BR/LC_MESSAGES/mwhois.mo > %%NLS%%share/locale/ru/LC_MESSAGES/mwhois.mo > %%NLS%%share/locale/zh_CN/LC_MESSAGES/mwhois.mo
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 250275
:
218668
|
218754
| 218755