Attachment #204691 for bug #238176




# $FreeBSD$

PORTNAME=	ircii
PORTVERSION=	20190117
CATEGORIES=	irc ipv6
MASTER_SITES=	http://ircii.warped.com/


LICENSE=	BSD3CLAUSE

GNU_CONFIGURE=	yes
CONFIGURE_ARGS= --with-warnings
DATADIR=	${PREFIX}/share/irc
USES=		iconv ncurses tar:bzip2



post-patch:
	@${REINPLACE_CMD} -e '/^mandir =/s/@mandir@/$${DESTDIR}&/' \
		-e '/^LDFLAGS =/s/$$/ ${STRIP} ${ICONV_LIB}/' \
		-e '/^INCLUDES =/s|$$| -I${ICONV_PREFIX}/include -DHAVE_ICONV_OPEN|' \
		${WRKSRC}/Makefile.in
	@${REINPLACE_CMD} -e 's|PREFIX/|${PREFIX}/|' ${WRKSRC}/doc/ircII.1

Lines 1-3 Link Here

(-)b/irc/ircII/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1541878948	1	TIMESTAMP = 1558984067
2	SHA256 (ircii-20170704.tar.bz2) = 4e5a70fc4577de06fd5855ab7ca0a501fd16e02d5fd34e434a2b5abac80a2eda	2	SHA256 (ircii-20190117.tar.bz2) = 10316f0a3723e4ce3d67fd5a7df10e6bcf30dd0750fb96d5437cacb16b0e9617
3	SIZE (ircii-20170704.tar.bz2) = 596535	3	SIZE (ircii-20190117.tar.bz2) = 606327

Added Link Here

(-)b/irc/ircII/files/patch-source_alias.c (+11 lines)
1	--- source/alias.c.orig 2019-01-18 10:29:41 UTC
2	+++ source/alias.c
3	@@ -2528,7 +2528,7 @@ function_userhost(u_char *input)
4	static u_char *
5	function_strip(u_char *input)
6	{
7	- u_char tmpbuf[128], *result;
8	+ u_char tmpbuf[128], *result = NULL;
9	u_char *retval = NULL;
10	u_char *chars;
11	u_char cp, dp;

Added Link Here

(-)b/irc/ircII/files/patch-source_help.c (+11 lines)
1	--- source/help.c.orig 2019-05-29 09:55:50 UTC
2	+++ source/help.c
3	@@ -311,7 +311,7 @@ help_topic(u_char path, u_char name)
4	#ifdef ZCAT
5	if (my_strcmp(name + (my_strlen(name) - my_strlen(ZSUFFIX)), ZSUFFIX))
6	{
7	- malloc_snprintf(&filename, "%s/%s%s", path, ZSUFFIX);
8	+ malloc_snprintf(&filename, "%s/%s%s", path, name, ZSUFFIX);
9	if (stat(CP(filename), &sb) == -1)
10	{
11	new_free(&filename);




--- source/mksiginc.c.orig	2014-03-17 20:38:51 UTC
+++ source/mksiginc.c
@@ -35,7 +35,11 @@ IRCII_RCSID("@(#)$eterna: mksiginc.c,v 1
 #define NSIG 64
 #endif
 
+#if defined(SIGRTMAX) && (SIGRTMAX > NSIG)
+#define MY_MAXSIG SIGRTMAX+1
+#else
 #define MY_MAXSIG NSIG+1
+#endif
 char *signames[MY_MAXSIG];
 
 int main(int, char *[]);

Lines 117-122 man/man1/ircII.1.gz Link Here

(-)b/irc/ircII/pkg-plist (-2 / +5 lines)
117	%%HELP%%%%DATADIR%%/help/exit	117	%%HELP%%%%DATADIR%%/help/exit
118	%%HELP%%%%DATADIR%%/help/expressions	118	%%HELP%%%%DATADIR%%/help/expressions
119	%%HELP%%%%DATADIR%%/help/flush	119	%%HELP%%%%DATADIR%%/help/flush
		120	%%HELP%%%%DATADIR%%/help/for
120	%%HELP%%%%DATADIR%%/help/foreach	121	%%HELP%%%%DATADIR%%/help/foreach
121	%%HELP%%%%DATADIR%%/help/help	122	%%HELP%%%%DATADIR%%/help/help
122	%%HELP%%%%DATADIR%%/help/history	123	%%HELP%%%%DATADIR%%/help/history
Lines 128-134 man/man1/ircII.1.gz Link Here
128	%%HELP%%%%DATADIR%%/help/input	129	%%HELP%%%%DATADIR%%/help/input
129	%%HELP%%%%DATADIR%%/help/intro	130	%%HELP%%%%DATADIR%%/help/intro
130	%%HELP%%%%DATADIR%%/help/invite	131	%%HELP%%%%DATADIR%%/help/invite
		132	%%HELP%%%%DATADIR%%/help/ircii/command_line_args
131	%%HELP%%%%DATADIR%%/help/ircii/copyright	133	%%HELP%%%%DATADIR%%/help/ircii/copyright
		134	%%HELP%%%%DATADIR%%/help/ircii/environment_vars
		135	%%HELP%%%%DATADIR%%/help/ircii/programming
		136	%%HELP%%%%DATADIR%%/help/ircii/server_lists
132	%%HELP%%%%DATADIR%%/help/ison	137	%%HELP%%%%DATADIR%%/help/ison
133	%%HELP%%%%DATADIR%%/help/join	138	%%HELP%%%%DATADIR%%/help/join
134	%%HELP%%%%DATADIR%%/help/kick	139	%%HELP%%%%DATADIR%%/help/kick
Lines 288-298 man/man1/ircII.1.gz Link Here
288	%%HELP%%%%DATADIR%%/help/on/send_msg	293	%%HELP%%%%DATADIR%%/help/on/send_msg
289	%%HELP%%%%DATADIR%%/help/on/send_notice	294	%%HELP%%%%DATADIR%%/help/on/send_notice
290	%%HELP%%%%DATADIR%%/help/on/send_public	295	%%HELP%%%%DATADIR%%/help/on/send_public
291	%%HELP%%%%DATADIR%%/help/on/send_talk
292	%%HELP%%%%DATADIR%%/help/on/serial_numbers	296	%%HELP%%%%DATADIR%%/help/on/serial_numbers
293	%%HELP%%%%DATADIR%%/help/on/server_notice	297	%%HELP%%%%DATADIR%%/help/on/server_notice
294	%%HELP%%%%DATADIR%%/help/on/signoff	298	%%HELP%%%%DATADIR%%/help/on/signoff
295	%%HELP%%%%DATADIR%%/help/on/talk
296	%%HELP%%%%DATADIR%%/help/on/timer	299	%%HELP%%%%DATADIR%%/help/on/timer
297	%%HELP%%%%DATADIR%%/help/on/topic	300	%%HELP%%%%DATADIR%%/help/on/topic
298	%%HELP%%%%DATADIR%%/help/on/wall	301	%%HELP%%%%DATADIR%%/help/on/wall

Return to bug 238176

Lines 2-8 Link Here

(-)b/irc/ircII/Makefile (-2 / +3 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= ircii	4	PORTNAME= ircii
5	PORTVERSION= 20170704	5	PORTVERSION= 20190117
6	CATEGORIES= irc ipv6	6	CATEGORIES= irc ipv6
7	MASTER_SITES= http://ircii.warped.com/	7	MASTER_SITES= http://ircii.warped.com/
8		8
Lines 12-17 COMMENT= Small and high extensible IRC client Link Here
12	LICENSE= BSD3CLAUSE	12	LICENSE= BSD3CLAUSE
13		13
14	GNU_CONFIGURE= yes	14	GNU_CONFIGURE= yes
		15	CONFIGURE_ARGS= --with-warnings
15	DATADIR= ${PREFIX}/share/irc	16	DATADIR= ${PREFIX}/share/irc
16	USES= iconv ncurses tar:bzip2	17	USES= iconv ncurses tar:bzip2
17		18
Lines 38-44 LDFLAGS+= -L${ICONV_PREFIX}/lib Link Here
38		39
39	post-patch:	40	post-patch:
40	@${REINPLACE_CMD} -e '/^mandir =/s/@mandir@/$${DESTDIR}&/' \	41	@${REINPLACE_CMD} -e '/^mandir =/s/@mandir@/$${DESTDIR}&/' \
41	-e '/^LDFLAGS =/s/$$/ -s ${ICONV_LIB}/' \	42	-e '/^LDFLAGS =/s/$$/ ${STRIP} ${ICONV_LIB}/' \
42	-e '/^INCLUDES =/s\|$$\| -I${ICONV_PREFIX}/include -DHAVE_ICONV_OPEN\|' \	43	-e '/^INCLUDES =/s\|$$\| -I${ICONV_PREFIX}/include -DHAVE_ICONV_OPEN\|' \
43	${WRKSRC}/Makefile.in	44	${WRKSRC}/Makefile.in
44	@${REINPLACE_CMD} -e 's\|PREFIX/\|${PREFIX}/\|' ${WRKSRC}/doc/ircII.1	45	@${REINPLACE_CMD} -e 's\|PREFIX/\|${PREFIX}/\|' ${WRKSRC}/doc/ircII.1

Removed Link Here

(-)a/irc/ircII/files/patch-source_mksiginc.c (-14 lines)
1	--- source/mksiginc.c.orig 2014-03-17 20:38:51 UTC
2	+++ source/mksiginc.c
3	@@ -35,7 +35,11 @@ IRCII_RCSID("@(#)$eterna: mksiginc.c,v 1
4	#define NSIG 64
5	#endif
6
7	+#if defined(SIGRTMAX) && (SIGRTMAX > NSIG)
8	+#define MY_MAXSIG SIGRTMAX+1
9	+#else
10	#define MY_MAXSIG NSIG+1
11	+#endif
12	char *signames[MY_MAXSIG];
13
14	int main(int, char *[]);