Attachment #164731 for bug #205473




# $FreeBSD$

PORTNAME=	znc
PORTVERSION=	1.6.2
PORTREVISION=	1
CATEGORIES=	irc ipv6
MASTER_SITES=	http://znc.in/releases/ \
		http://znc.in/releases/archive/

USE_RC_SUBR=	znc
USES=		compiler:c++11-lib cpe gmake iconv pkgconfig

OPTIONS_DEFINE=	CHARSET CYRUS DEBUG DOCS IPV6 OPENSSL PERL PYTHON TCL

OPTIONS_DEFINE=	DEBUG IPV6 OPENSSL CYRUS PERL PYTHON TCL CHARSET DOCS
OPTIONS_DEFAULT=	OPENSSL PERL
OPTIONS_SUB=	yes

CHARSET_DESC=	Character encoding support via ICU
CYRUS_DESC=	Cyrus SASL module
DEBUG_DESC=	Debugging support
PERL_DESC=	Perl scripting module
PYTHON_DESC=	Python scripting module
CHARSET_DESC=	Character encoding support via ICU
TCL_DESC=	Tcl scripting module

CHARSET_CONFIGURE_OFF=	--disable-charset
CHARSET_LIB_DEPENDS=	libicuuc.so.55:${PORTSDIR}/devel/icu \
			libicudata.so.55:${PORTSDIR}/devel/icu
CYRUS_CONFIGURE_ON=	--enable-cyrus
CYRUS_LDFLAGS=	-L${LOCALBASE}/lib
CYRUS_LIB_DEPENDS=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
DEBUG_CONFIGURE_ON=	--enable-debug
IPV6_CONFIGURE_OFF=	--disable-ipv6
OPENSSL_CONFIGURE_OFF=	--disable-openssl
OPENSSL_CONFIGURE_ON=	--with-openssl=${OPENSSLBASE}
OPENSSL_USE=	openssl=yes
PERL_BUILD_DEPENDS=	swig30>=3.0.0:${PORTSDIR}/devel/swig30
PERL_CONFIGURE_ENABLE=	perl
PERL_CONFIGURE_ON=	--enable-swig
PERL_USE=	perl5=build,run
PERL_USES=	perl5
PYTHON_BUILD_DEPENDS=	swig30>=3.0.0:${PORTSDIR}/devel/swig30
PYTHON_CONFIGURE_ON=	--enable-python=python-${PYTHON_VER} --enable-swig
PYTHON_USE=	perl5=build
PYTHON_USES=	perl5 python:3
OPENSSL_CONFIGURE_OFF=	--disable-openssl
CHARSET_CONFIGURE_OFF=	--disable-charset
CHARSET_LIB_DEPENDS=	libicuuc.so.55:${PORTSDIR}/devel/icu \
			libicudata.so.55:${PORTSDIR}/devel/icu
TCL_CONFIGURE_ENABLE=	tcl
TCL_CONFIGURE_ON=	--with-tcl=${TCL_LIBDIR}
TCL_USES=	tcl

PORTDOCS=	README.md

.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MOPENSSL}
.include "${PORTSDIR}/Mk/bsd.openssl.mk"
CONFIGURE_ARGS+=	--with-openssl=${OPENSSLBASE}
.endif

.if ${PORT_OPTIONS:MPERL}
USE_PERL5+=		run build
.endif

.if ${PORT_OPTIONS:MTCL}
USES+=			tcl
CONFIGURE_ARGS+=	--with-tcl=${TCL_LIBDIR}
.endif

.if ${PORT_OPTIONS:MPYTHON}
USE_PERL5+=		build
.endif

PORTDOCS=		README.md

pre-configure:
# No need to cast to char** in AM_ICONV, fixes charset/iconv detection
# and by extension, successfully builds charset module

Lines 1-2 Link Here

(-)irc/znc/distinfo (-2 / +2 lines)
1	SHA256 (znc-1.6.1.tar.gz) = ba49397364f48d6d32ae5242bc1166f21d972f85dd390d6bbe68a63ecbb6c140	1	SHA256 (znc-1.6.2.tar.gz) = eef17727c0c6433fed1affba0ea76ec7fd60198d2f3c234d8529bd5fb26f0593
2	SIZE (znc-1.6.1.tar.gz) = 1463397	2	SIZE (znc-1.6.2.tar.gz) = 1463898




--- configure.orig	2015-11-15 17:54:23 UTC
+++ configure
@@ -3388,10 +3388,8 @@ appendLD () {
 
 case "${host_os}" in
 	freebsd*)
-		# -D__GNU_LIBRARY__ makes this work on fbsd 4.11
-		appendCXX -I/usr/local/include -D__GNU_LIBRARY__
-		appendLib -L/usr/local/lib -lcompat
-		appendMod -L/usr/local/lib
+		appendCXX -I/usr/local/include
+		appendLD -L/usr/local/lib
 	;;
 	solaris*)
 		appendLib -lsocket -lnsl -lresolv

Lines 1-11 Link Here

(-)irc/znc/files/patch-modules-modperl-Makefile_inc (-11 lines)
1	--- modules/modperl/Makefile.inc.orig 2015-02-12 20:51:46.000000000 +0000
2	+++ modules/modperl/Makefile.inc 2015-02-26 02:56:35.000000000 +0000
3	@@ -6,7 +6,7 @@
4	PERL_LD := $(shell $(PERL) -MExtUtils::Embed -e ldopts)
5	# Perl API is ugly, casting string literals to char* and redeclaring functions :(
6	PERL_CXX += -Wno-write-strings -Wno-redundant-decls -Wno-missing-declarations
7	-PERL_CXX += -Wno-type-limits -Wno-sign-compare -Wno-strict-overflow -Wno-unused-value
8	+PERL_CXX += -Wno-sign-compare -Wno-strict-overflow -Wno-unused-value
9	# perl 5.20 will fix this warning: https://rt.perl.org/Public/Bug/Display.html?id=120670
10	PERL_CXX += -Wno-reserved-user-defined-literal -Wno-literal-suffix
11	# This is for SWIG

Lines 1-4 Link Here

(-)irc/znc/files/patch-src_Csocket.cpp (-1 / +1 lines)
1	--- src/Csocket.cpp.orig 2015-04-16 15:00:34 UTC	1	--- src/Csocket.cpp.orig 2015-11-15 17:54:20 UTC
2	+++ src/Csocket.cpp	2	+++ src/Csocket.cpp
3	@@ -47,6 +47,7 @@	3	@@ -47,6 +47,7 @@
4	#include <stdio.h>	4	#include <stdio.h>

Return to bug 205473

Lines 2-9 Link Here

(-)irc/znc/Makefile (-30 / +15 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= znc	4	PORTNAME= znc
5	PORTVERSION= 1.6.1	5	PORTVERSION= 1.6.2
6	PORTREVISION= 1
7	CATEGORIES= irc ipv6	6	CATEGORIES= irc ipv6
8	MASTER_SITES= http://znc.in/releases/ \	7	MASTER_SITES= http://znc.in/releases/ \
9	http://znc.in/releases/archive/	8	http://znc.in/releases/archive/
Lines 18-76 Link Here
18	USE_RC_SUBR= znc	17	USE_RC_SUBR= znc
19	USES= compiler:c++11-lib cpe gmake iconv pkgconfig	18	USES= compiler:c++11-lib cpe gmake iconv pkgconfig
20		19
21	NO_OPTIONS_SORT= yes	20	OPTIONS_DEFINE= CHARSET CYRUS DEBUG DOCS IPV6 OPENSSL PERL PYTHON TCL
22
23	OPTIONS_DEFINE= DEBUG IPV6 OPENSSL CYRUS PERL PYTHON TCL CHARSET DOCS
24	OPTIONS_DEFAULT= OPENSSL PERL	21	OPTIONS_DEFAULT= OPENSSL PERL
25	OPTIONS_SUB= yes	22	OPTIONS_SUB= yes
26		23
		24	CHARSET_DESC= Character encoding support via ICU
27	CYRUS_DESC= Cyrus SASL module	25	CYRUS_DESC= Cyrus SASL module
28	DEBUG_DESC= Debugging support	26	DEBUG_DESC= Debugging support
29	PERL_DESC= Perl scripting module	27	PERL_DESC= Perl scripting module
30	PYTHON_DESC= Python scripting module	28	PYTHON_DESC= Python scripting module
31	CHARSET_DESC= Character encoding support via ICU
32	TCL_DESC= Tcl scripting module	29	TCL_DESC= Tcl scripting module
33		30
		31	CHARSET_CONFIGURE_OFF= --disable-charset
		32	CHARSET_LIB_DEPENDS= libicuuc.so.55:${PORTSDIR}/devel/icu \
		33	libicudata.so.55:${PORTSDIR}/devel/icu
34	CYRUS_CONFIGURE_ON= --enable-cyrus	34	CYRUS_CONFIGURE_ON= --enable-cyrus
35	CYRUS_LDFLAGS= -L${LOCALBASE}/lib	35	CYRUS_LDFLAGS= -L${LOCALBASE}/lib
36	CYRUS_LIB_DEPENDS= libsasl2.so:${PORTSDIR}/security/cyrus-sasl2	36	CYRUS_LIB_DEPENDS= libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
37	DEBUG_CONFIGURE_ON= --enable-debug	37	DEBUG_CONFIGURE_ON= --enable-debug
38	IPV6_CONFIGURE_OFF= --disable-ipv6	38	IPV6_CONFIGURE_OFF= --disable-ipv6
		39	OPENSSL_CONFIGURE_OFF= --disable-openssl
		40	OPENSSL_CONFIGURE_ON= --with-openssl=${OPENSSLBASE}
		41	OPENSSL_USE= openssl=yes
39	PERL_BUILD_DEPENDS= swig30>=3.0.0:${PORTSDIR}/devel/swig30	42	PERL_BUILD_DEPENDS= swig30>=3.0.0:${PORTSDIR}/devel/swig30
40	PERL_CONFIGURE_ENABLE= perl	43	PERL_CONFIGURE_ENABLE= perl
41	PERL_CONFIGURE_ON= --enable-swig	44	PERL_CONFIGURE_ON= --enable-swig
		45	PERL_USE= perl5=build,run
42	PERL_USES= perl5	46	PERL_USES= perl5
43	PYTHON_BUILD_DEPENDS= swig30>=3.0.0:${PORTSDIR}/devel/swig30	47	PYTHON_BUILD_DEPENDS= swig30>=3.0.0:${PORTSDIR}/devel/swig30
44	PYTHON_CONFIGURE_ON= --enable-python=python-${PYTHON_VER} --enable-swig	48	PYTHON_CONFIGURE_ON= --enable-python=python-${PYTHON_VER} --enable-swig
		49	PYTHON_USE= perl5=build
45	PYTHON_USES= perl5 python:3	50	PYTHON_USES= perl5 python:3
46	OPENSSL_CONFIGURE_OFF= --disable-openssl
47	CHARSET_CONFIGURE_OFF= --disable-charset
48	CHARSET_LIB_DEPENDS= libicuuc.so.55:${PORTSDIR}/devel/icu \
49	libicudata.so.55:${PORTSDIR}/devel/icu
50	TCL_CONFIGURE_ENABLE= tcl	51	TCL_CONFIGURE_ENABLE= tcl
		52	TCL_CONFIGURE_ON= --with-tcl=${TCL_LIBDIR}
		53	TCL_USES= tcl
51		54
		55	PORTDOCS= README.md
		56
52	.include <bsd.port.options.mk>	57	.include <bsd.port.options.mk>
53		58
54	.if ${PORT_OPTIONS:MOPENSSL}
55	.include "${PORTSDIR}/Mk/bsd.openssl.mk"
56	CONFIGURE_ARGS+= --with-openssl=${OPENSSLBASE}
57	.endif
58
59	.if ${PORT_OPTIONS:MPERL}
60	USE_PERL5+= run build
61	.endif
62
63	.if ${PORT_OPTIONS:MTCL}
64	USES+= tcl
65	CONFIGURE_ARGS+= --with-tcl=${TCL_LIBDIR}
66	.endif
67
68	.if ${PORT_OPTIONS:MPYTHON}
69	USE_PERL5+= build
70	.endif
71
72	PORTDOCS= README.md
73
74	pre-configure:	59	pre-configure:
75	# No need to cast to char** in AM_ICONV, fixes charset/iconv detection	60	# No need to cast to char** in AM_ICONV, fixes charset/iconv detection
76	# and by extension, successfully builds charset module	61	# and by extension, successfully builds charset module

Line 0 Link Here

(-)irc/znc/files/patch-configure (+15 lines)
	1	--- configure.orig 2015-11-15 17:54:23 UTC
	2	+++ configure
	3	@@ -3388,10 +3388,8 @@ appendLD () {
	4
	5	case "${host_os}" in
	6	freebsd*)
	7	- # -D__GNU_LIBRARY__ makes this work on fbsd 4.11
	8	- appendCXX -I/usr/local/include -D__GNU_LIBRARY__
	9	- appendLib -L/usr/local/lib -lcompat
	10	- appendMod -L/usr/local/lib
	11	+ appendCXX -I/usr/local/include
	12	+ appendLD -L/usr/local/lib
	13	;;
	14	solaris*)
	15	appendLib -lsocket -lnsl -lresolv