View | Details | Raw Unified | Return to bug 250275 | Differences between
and this patch

Collapse All | Expand All

(-)b/net/whois/Makefile (-1 / +3 lines)
Lines 1-48 Link Here
1
# Created by: Filippo Natali <filippo@widestore.net>
1
# Created by: Filippo Natali <filippo@widestore.net>
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	whois
4
PORTNAME=	whois
5
DISTVERSIONPREFIX=	v
5
DISTVERSIONPREFIX=	v
6
DISTVERSION=	5.5.6
6
DISTVERSION=	5.5.7
7
CATEGORIES=	net
7
CATEGORIES=	net
8
8
9
MAINTAINER=	coco@executive-computing.de
9
MAINTAINER=	coco@executive-computing.de
10
COMMENT=	Marco d'Itri whois client
10
COMMENT=	Marco d'Itri whois client
11
11
12
LICENSE=	GPLv2+
12
LICENSE=	GPLv2+
13
LICENSE_FILE=	${WRKSRC}/COPYING
13
LICENSE_FILE=	${WRKSRC}/COPYING
14
14
15
LIB_DEPENDS=	libidn2.so:dns/libidn2
16
15
USES=		iconv gmake perl5 pkgconfig
17
USES=		iconv gmake perl5 pkgconfig
16
USE_PERL5=	build
18
USE_PERL5=	build
17
MAKE_ARGS=	BASEDIR="${STAGEDIR}"
19
MAKE_ARGS=	BASEDIR="${STAGEDIR}"
18
20
19
OPTIONS_DEFINE=	NLS
21
OPTIONS_DEFINE=	NLS
20
22
21
OPTIONS_SUB=	yes
23
OPTIONS_SUB=	yes
22
NLS_USES=	gettext
24
NLS_USES=	gettext
23
25
24
USE_GITHUB=	yes
26
USE_GITHUB=	yes
25
GH_ACCOUNT=	rfc1036
27
GH_ACCOUNT=	rfc1036
26
28
27
post-patch:
29
post-patch:
28
	@${REINPLACE_CMD} -e "s|%%MWHOISCONF%%|${PREFIX}/etc/mwhois.conf|g" ${WRKSRC}/whois.1
30
	@${REINPLACE_CMD} -e "s|%%MWHOISCONF%%|${PREFIX}/etc/mwhois.conf|g" ${WRKSRC}/whois.1
29
	@${REINPLACE_CMD} -e "s|%%MWHOIS%%|mwhois|g" ${WRKSRC}/Makefile
31
	@${REINPLACE_CMD} -e "s|%%MWHOIS%%|mwhois|g" ${WRKSRC}/Makefile
30
	@${REINPLACE_CMD} -e "s|%%MWHOIS%%|mwhois|g" ${WRKSRC}/po/Makefile
32
	@${REINPLACE_CMD} -e "s|%%MWHOIS%%|mwhois|g" ${WRKSRC}/po/Makefile
31
	@${REINPLACE_CMD} -e "s|%%MWHOIS%%|mwhois|g" ${WRKSRC}/whois.1
33
	@${REINPLACE_CMD} -e "s|%%MWHOIS%%|mwhois|g" ${WRKSRC}/whois.1
32
	@${REINPLACE_CMD} -e "s|%%MWHOIST%%|MWHOIS|g" ${WRKSRC}/whois.1
34
	@${REINPLACE_CMD} -e "s|%%MWHOIST%%|MWHOIS|g" ${WRKSRC}/whois.1
33
	@${REINPLACE_CMD} -e "s|%%MWHOIST%%|MWHOIS|g" ${WRKSRC}/whois.conf.5
35
	@${REINPLACE_CMD} -e "s|%%MWHOIST%%|MWHOIS|g" ${WRKSRC}/whois.conf.5
34
	@${REINPLACE_CMD} -e "s|%%MWHOIS%%|mwhois|g" ${WRKSRC}/whois.conf.5
36
	@${REINPLACE_CMD} -e "s|%%MWHOIS%%|mwhois|g" ${WRKSRC}/whois.conf.5
35
	@${REINPLACE_CMD} -e "s|%%MWHOISCONF%%|${PREFIX}/etc/mwhois.conf|g" ${WRKSRC}/whois.conf.5
37
	@${REINPLACE_CMD} -e "s|%%MWHOISCONF%%|${PREFIX}/etc/mwhois.conf|g" ${WRKSRC}/whois.conf.5
36
	@${REINPLACE_CMD} -e "s|%%MWHOISCONF%%|${PREFIX}/etc/mwhois.conf|g" ${WRKSRC}/config.h
38
	@${REINPLACE_CMD} -e "s|%%MWHOISCONF%%|${PREFIX}/etc/mwhois.conf|g" ${WRKSRC}/config.h
37
	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/config.h
39
	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/config.h
38
40
39
post-patch-NLS-off:
41
post-patch-NLS-off:
40
	@${REINPLACE_CMD} -e "s| pos||" -e "s| install-pos||" \
42
	@${REINPLACE_CMD} -e "s| pos||" -e "s| install-pos||" \
41
			-e "s|-lintl||" ${WRKSRC}/Makefile
43
			-e "s|-lintl||" ${WRKSRC}/Makefile
42
	@${REINPLACE_CMD} -e "s|# define ENABLE_NLS||" ${WRKSRC}/config.h
44
	@${REINPLACE_CMD} -e "s|# define ENABLE_NLS||" ${WRKSRC}/config.h
43
45
44
post-install:
46
post-install:
45
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/mwhois
47
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/mwhois
46
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/mkpasswd
48
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/mkpasswd
47
49
48
.include <bsd.port.mk>
50
.include <bsd.port.mk>
(-)b/net/whois/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1586583966
1
TIMESTAMP = 1602430665
2
SHA256 (rfc1036-whois-v5.5.6_GH0.tar.gz) = fa86a9da4b6e79b6a04b0110f7f4f46214d038a051fef3d0767a09b44e49e8c8
2
SHA256 (rfc1036-whois-v5.5.7_GH0.tar.gz) = ae389c1486cdeae99f5f02940f98f5d7ff1f08ac0f96810365159b27b0189b5e
3
SIZE (rfc1036-whois-v5.5.6_GH0.tar.gz) = 103581
3
SIZE (rfc1036-whois-v5.5.7_GH0.tar.gz) = 102666
(-)b/net/whois/files/patch-po_Makefile (-3 / +3 lines)
Lines 1-35 Link Here
1
--- po/Makefile.orig	2019-12-31 02:05:47 UTC
1
--- po/Makefile.orig	2020-10-03 15:43:15 UTC
2
+++ po/Makefile
2
+++ po/Makefile
3
@@ -1,4 +1,7 @@
3
@@ -1,4 +1,7 @@
4
 prefix = /usr
4
 prefix = /usr
5
+ifdef PREFIX
5
+ifdef PREFIX
6
+prefix := $(PREFIX)
6
+prefix := $(PREFIX)
7
+endif
7
+endif
8
 
8
 
9
 ifdef DESTDIR
9
 ifdef DESTDIR
10
 BASEDIR := $(DESTDIR)
10
 BASEDIR := $(DESTDIR)
11
@@ -8,12 +11,14 @@ INSTALL= install
11
@@ -8,12 +11,14 @@ INSTALL= install
12
 
12
 
13
 INSTALLNLSDIR=$(BASEDIR)$(prefix)/share/locale
13
 INSTALLNLSDIR=$(BASEDIR)$(prefix)/share/locale
14
 
14
 
15
-PACKAGE = whois
15
-PACKAGE = whois
16
+PACKAGE = %%MWHOIS%%
16
+PACKAGE = %%MWHOIS%%
17
 
17
 
18
 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
18
 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
19
 
19
 
20
 POTFILES=../whois.c ../mkpasswd.c
20
 POTFILES=../whois.c ../mkpasswd.c
21
 
21
 
22
+.SUFFIXES:	.po .mo
22
+.SUFFIXES:     .po .mo
23
+
23
+
24
 all: $(PACKAGE).pot $(CATALOGS)
24
 all: $(PACKAGE).pot $(CATALOGS)
25
 
25
 
26
 $(PACKAGE).pot: $(POTFILES)
26
 $(PACKAGE).pot: $(POTFILES)
27
@@ -45,7 +50,7 @@ clean:
27
@@ -45,7 +50,7 @@ clean:
28
 	rm -f *.mo
28
 	rm -f *.mo
29
 
29
 
30
 distclean: clean
30
 distclean: clean
31
-	rm -f whois.pot
31
-	rm -f whois.pot
32
+	rm -f %%MWHOIS%%.pot
32
+	rm -f %%MWHOIS%%.pot
33
 
33
 
34
 install: $(CATALOGS)
34
 install: $(CATALOGS)
35
 	for n in $(CATALOGS); do \
35
 	for n in $(CATALOGS); do \
(-)b/net/whois/files/patch-whois.1 (-12 / +12 lines)
Lines 1-73 Link Here
1
--- whois.1.orig	2019-12-31 02:05:47 UTC
1
--- whois.1.orig	2019-12-31 02:05:47 UTC
2
+++ whois.1
2
+++ whois.1
3
@@ -1,8 +1,8 @@
3
@@ -1,8 +1,8 @@
4
-.TH "WHOIS" "1" "2019-12-30" "Marco d'Itri" "Debian GNU/Linux"
4
-.TH "WHOIS" "1" "2019-12-30" "Marco d'Itri" "Debian GNU/Linux"
5
+.TH "MWHOIS" "1" "2019-12-30" "Marco d'Itri" "Debian GNU/Linux"
5
+.TH "%%MWHOIST%%" "1" "2019-12-30" "Marco d'Itri" "Debian GNU/Linux"
6
 .SH NAME
6
 .SH NAME
7
-whois \- client for the whois directory service
7
-whois \- client for the whois directory service
8
+mwhois \- client for the whois directory service
8
+%%MWHOIS%% \- client for the whois directory service
9
 .SH SYNOPSIS
9
 .SH SYNOPSIS
10
-.B whois
10
-.B whois
11
+.B mwhois
11
+.B %%MWHOIS%%
12
 [
12
 [
13
 .RB {\~ \-h \~|\~ \-\-host \~}
13
 .RB {\~ \-h \~|\~ \-\-host \~}
14
 .I HOST
14
 .I HOST
15
@@ -25,25 +25,25 @@ whois \- client for the whois directory service
15
@@ -25,25 +25,25 @@ whois \- client for the whois directory service
16
 .RB [\~ \-\-verbose \~]
16
 .RB [\~ \-\-verbose \~]
17
 .I OBJECT
17
 .I OBJECT
18
 
18
 
19
-.B whois
19
-.B whois
20
+.B mwhois
20
+.B %%MWHOIS%%
21
 .B \-q
21
 .B \-q
22
 .I KEYWORD
22
 .I KEYWORD
23
 
23
 
24
-.B whois
24
-.B whois
25
+.B mwhois
25
+.B %%MWHOIS%%
26
 .B \-t
26
 .B \-t
27
 .I TYPE
27
 .I TYPE
28
 
28
 
29
-.B whois
29
-.B whois
30
+.B mwhois
30
+.B %%MWHOIS%%
31
 .B \-v
31
 .B \-v
32
 .I TYPE
32
 .I TYPE
33
 
33
 
34
-.B whois \-\-help
34
-.B whois \-\-help
35
+.B mwhois \-\-help
35
+.B %%MWHOIS%% \-\-help
36
 
36
 
37
-.B whois \-\-version
37
-.B whois \-\-version
38
+.B mwhois \-\-version
38
+.B %%MWHOIS%% \-\-version
39
 
39
 
40
 .PP
40
 .PP
41
 .SH DESCRIPTION
41
 .SH DESCRIPTION
42
-.B whois
42
-.B whois
43
+.B mwhois
43
+.B %%MWHOIS%%
44
 searches for an object in a
44
 searches for an object in a
45
 .I RFC 3912
45
 .I RFC 3912
46
 database.
46
 database.
47
@@ -243,7 +243,7 @@ which are not to be interpreted by the client must fol
47
@@ -243,7 +243,7 @@ which are not to be interpreted by the client must fol
48
 separator (which marks the beginning of the query string).
48
 separator (which marks the beginning of the query string).
49
 .P
49
 .P
50
 If the
50
 If the
51
-.I /etc/whois.conf
51
-.I /etc/whois.conf
52
+.I /usr/local/etc/mwhois.conf
52
+.I %%PREFIX%%/etc/%%MWHOIS%%.conf
53
 configuration file exists, it will be consulted
53
 configuration file exists, it will be consulted
54
 to find a server before applying the normal rules. Each line of the
54
 to find a server before applying the normal rules. Each line of the
55
 file should contain a regular expression to be matched against the query
55
 file should contain a regular expression to be matched against the query
56
@@ -259,7 +259,7 @@ by the current system locale.
56
@@ -259,7 +259,7 @@ by the current system locale.
57
 Command line arguments will always be interpreted accordingly to the
57
 Command line arguments will always be interpreted accordingly to the
58
 current system locale and converted to the IDN ASCII Compatible Encoding.
58
 current system locale and converted to the IDN ASCII Compatible Encoding.
59
 .SH "FILES"
59
 .SH "FILES"
60
-/etc/whois.conf
60
-/etc/whois.conf
61
+/usr/local/etc/mwhois.conf
61
+%%PREFIX%%/etc/%%MWHOIS%%.conf
62
 .SH "ENVIRONMENT"
62
 .SH "ENVIRONMENT"
63
 .IP LANG
63
 .IP LANG
64
 When querying
64
 When querying
65
@@ -280,7 +280,7 @@ of objects are located. If the variable does not exist
65
@@ -280,7 +280,7 @@ of objects are located. If the variable does not exist
66
 .I whois.arin.net
66
 .I whois.arin.net
67
 will be queried.
67
 will be queried.
68
 .SH "SEE ALSO"
68
 .SH "SEE ALSO"
69
-.IR whois.conf (5).
69
-.IR whois.conf (5).
70
+.IR /usr/local/etc/mwhois.conf (5).
70
+.IR %%PREFIX%%/etc/%%MWHOIS%%.conf (5).
71
 .P
71
 .P
72
 .IR "RFC 3912" :
72
 .IR "RFC 3912" :
73
 WHOIS Protocol Specification.
73
 WHOIS Protocol Specification.
(-)b/net/whois/files/patch-whois.conf.5 (-6 / +6 lines)
Lines 1-38 Link Here
1
--- whois.conf.5.orig	2019-12-31 02:05:47 UTC
1
--- whois.conf.5.orig	2019-12-31 02:05:47 UTC
2
+++ whois.conf.5
2
+++ whois.conf.5
3
@@ -1,10 +1,10 @@
3
@@ -1,10 +1,10 @@
4
-.TH "WHOIS.CONF" "5" "2019-12-30" "Petr Písař" "Debian GNU/Linux"
4
-.TH "WHOIS.CONF" "5" "2019-12-30" "Petr Písař" "Debian GNU/Linux"
5
+.TH "MWHOIS.CONF" "5" "2019-12-30" "Petr Písař" "Debian GNU/Linux"
5
+.TH "%%MWHOIST%%.CONF" "5" "2019-12-30" "Petr Písař" "Debian GNU/Linux"
6
 
6
 
7
 .SH NAME
7
 .SH NAME
8
-whois.conf \- alternative WHOIS servers list for whois client
8
-whois.conf \- alternative WHOIS servers list for whois client
9
+mwhois.conf \- alternative WHOIS servers list for mwhois client
9
+%%MWHOIS%%.conf \- alternative WHOIS servers list for %%MWHOIS%% client
10
 
10
 
11
 .SH SYNOPSIS
11
 .SH SYNOPSIS
12
-.B /etc/whois.conf
12
-.B /etc/whois.conf
13
+.B /usr/local/etc/mwhois.conf
13
+.B %%PREFIX%%/etc/%%MWHOIS%%.conf
14
 
14
 
15
 .SH DESCRIPTION
15
 .SH DESCRIPTION
16
 This file contains a list of WHOIS servers which can augment or override
16
 This file contains a list of WHOIS servers which can augment or override
17
@@ -18,7 +18,7 @@ Fields are separated by non-empty sequence of space or
17
@@ -18,7 +18,7 @@ Fields are separated by non-empty sequence of space or
18
 A line starting with a hash character is a free comment and it's not
18
 A line starting with a hash character is a free comment and it's not
19
 considered.
19
 considered.
20
 
20
 
21
-The pattern is case-insensitive extended regular expression if whois client
21
-The pattern is case-insensitive extended regular expression if whois client
22
+The pattern is case-insensitive extended regular expression if mwhois client
22
+The pattern is case-insensitive extended regular expression if %%MWHOIS%% client
23
 has been compiled with POSIX regular expressions support. Otherwise, simple
23
 has been compiled with POSIX regular expressions support. Otherwise, simple
24
 case-insensitive suffix comparison against WHOIS object identifier is used.
24
 case-insensitive suffix comparison against WHOIS object identifier is used.
25
 
25
 
26
@@ -37,10 +37,10 @@ encoding (ACE) format.
26
@@ -37,10 +37,10 @@ encoding (ACE) format.
27
 ^as645(1[2-9]|2[0-9]|3[0-4])$    whois.example.net
27
 ^as645(1[2-9]|2[0-9]|3[0-4])$    whois.example.net
28
 
28
 
29
 .SH FILES
29
 .SH FILES
30
-/etc/whois.conf
30
-/etc/whois.conf
31
+/usr/local/etc/mwhois.conf
31
+%%PREFIX%%/etc/%%MWHOIS%%.conf
32
 
32
 
33
 .SH "SEE ALSO"
33
 .SH "SEE ALSO"
34
-.IR whois (1)
34
-.IR whois (1)
35
+.IR mwhois (1)
35
+.IR %%MWHOIS%% (1)
36
 
36
 
37
 .SH AUTHOR
37
 .SH AUTHOR
38
 This manual page was written by Petr Písař
38
 This manual page was written by Petr Písař
(-)b/net/whois/pkg-plist (-1 lines)
Lines 1-20 Link Here
1
bin/mkpasswd
1
bin/mkpasswd
2
bin/mwhois
2
bin/mwhois
3
man/man1/mkpasswd.1.gz
3
man/man1/mkpasswd.1.gz
4
man/man1/mwhois.1.gz
4
man/man1/mwhois.1.gz
5
man/man5/mwhois.conf.5.gz
5
man/man5/mwhois.conf.5.gz
6
%%NLS%%share/locale/cs/LC_MESSAGES/mwhois.mo
6
%%NLS%%share/locale/cs/LC_MESSAGES/mwhois.mo
7
%%NLS%%share/locale/da/LC_MESSAGES/mwhois.mo
7
%%NLS%%share/locale/da/LC_MESSAGES/mwhois.mo
8
%%NLS%%share/locale/de/LC_MESSAGES/mwhois.mo
8
%%NLS%%share/locale/de/LC_MESSAGES/mwhois.mo
9
%%NLS%%share/locale/el/LC_MESSAGES/mwhois.mo
9
%%NLS%%share/locale/el/LC_MESSAGES/mwhois.mo
10
%%NLS%%share/locale/es/LC_MESSAGES/mwhois.mo
10
%%NLS%%share/locale/es/LC_MESSAGES/mwhois.mo
11
%%NLS%%share/locale/eu/LC_MESSAGES/mwhois.mo
11
%%NLS%%share/locale/eu/LC_MESSAGES/mwhois.mo
12
%%NLS%%share/locale/fi/LC_MESSAGES/mwhois.mo
12
%%NLS%%share/locale/fi/LC_MESSAGES/mwhois.mo
13
%%NLS%%share/locale/fr/LC_MESSAGES/mwhois.mo
13
%%NLS%%share/locale/fr/LC_MESSAGES/mwhois.mo
14
%%NLS%%share/locale/it/LC_MESSAGES/mwhois.mo
14
%%NLS%%share/locale/it/LC_MESSAGES/mwhois.mo
15
%%NLS%%share/locale/ja/LC_MESSAGES/mwhois.mo
15
%%NLS%%share/locale/ja/LC_MESSAGES/mwhois.mo
16
%%NLS%%share/locale/nb/LC_MESSAGES/mwhois.mo
17
%%NLS%%share/locale/pl/LC_MESSAGES/mwhois.mo
16
%%NLS%%share/locale/pl/LC_MESSAGES/mwhois.mo
18
%%NLS%%share/locale/pt_BR/LC_MESSAGES/mwhois.mo
17
%%NLS%%share/locale/pt_BR/LC_MESSAGES/mwhois.mo
19
%%NLS%%share/locale/ru/LC_MESSAGES/mwhois.mo
18
%%NLS%%share/locale/ru/LC_MESSAGES/mwhois.mo
20
%%NLS%%share/locale/zh_CN/LC_MESSAGES/mwhois.mo
19
%%NLS%%share/locale/zh_CN/LC_MESSAGES/mwhois.mo

Return to bug 250275