Attachment 164731 Details for Bug 205473 – update irc/znc to 1.6.2

[patch] update irc/znc to 1.6.2

irc_znc.patch (text/plain), 5.01 KB, created by Matthew Rezny on 2015-12-27 18:43:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthew Rezny

Created: 2015-12-27 18:43:51 UTC

Size: 5.01 KB

patch

obsolete

>Index: irc/znc/Makefile
>===================================================================
>--- irc/znc/Makefile	(revision 404446)
>+++ irc/znc/Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	znc
>-PORTVERSION=	1.6.1
>-PORTREVISION=	1
>+PORTVERSION=	1.6.2
> CATEGORIES=	irc ipv6
> MASTER_SITES=	http://znc.in/releases/ \
> 		http://znc.in/releases/archive/
>@@ -18,59 +17,45 @@
> USE_RC_SUBR=	znc
> USES=		compiler:c++11-lib cpe gmake iconv pkgconfig
> 
>-NO_OPTIONS_SORT=	yes
>-
>-OPTIONS_DEFINE=	DEBUG IPV6 OPENSSL CYRUS PERL PYTHON TCL CHARSET DOCS
>+OPTIONS_DEFINE=	CHARSET CYRUS DEBUG DOCS IPV6 OPENSSL PERL PYTHON TCL
> 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
>Index: irc/znc/distinfo
>===================================================================
>--- irc/znc/distinfo	(revision 404446)
>+++ irc/znc/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (znc-1.6.1.tar.gz) = ba49397364f48d6d32ae5242bc1166f21d972f85dd390d6bbe68a63ecbb6c140
>-SIZE (znc-1.6.1.tar.gz) = 1463397
>+SHA256 (znc-1.6.2.tar.gz) = eef17727c0c6433fed1affba0ea76ec7fd60198d2f3c234d8529bd5fb26f0593
>+SIZE (znc-1.6.2.tar.gz) = 1463898
>Index: irc/znc/files/patch-configure
>===================================================================
>--- irc/znc/files/patch-configure	(nonexistent)
>+++ irc/znc/files/patch-configure	(working copy)
>@@ -0,0 +1,15 @@
>+--- 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
>Index: irc/znc/files/patch-modules-modperl-Makefile_inc
>===================================================================
>--- irc/znc/files/patch-modules-modperl-Makefile_inc	(revision 404446)
>+++ irc/znc/files/patch-modules-modperl-Makefile_inc	(nonexistent)
>@@ -1,11 +0,0 @@
>---- modules/modperl/Makefile.inc.orig	2015-02-12 20:51:46.000000000 +0000
>-+++ modules/modperl/Makefile.inc	2015-02-26 02:56:35.000000000 +0000
>-@@ -6,7 +6,7 @@
>- PERL_LD    := $(shell $(PERL) -MExtUtils::Embed -e ldopts)
>- # Perl API is ugly, casting string literals to char* and redeclaring functions :(
>- PERL_CXX   += -Wno-write-strings -Wno-redundant-decls -Wno-missing-declarations
>--PERL_CXX   += -Wno-type-limits -Wno-sign-compare -Wno-strict-overflow -Wno-unused-value
>-+PERL_CXX   += -Wno-sign-compare -Wno-strict-overflow -Wno-unused-value
>- # perl 5.20 will fix this warning: https://rt.perl.org/Public/Bug/Display.html?id=120670
>- PERL_CXX   += -Wno-reserved-user-defined-literal -Wno-literal-suffix
>- # This is for SWIG
>Index: irc/znc/files/patch-src_Csocket.cpp
>===================================================================
>--- irc/znc/files/patch-src_Csocket.cpp	(revision 404446)
>+++ irc/znc/files/patch-src_Csocket.cpp	(working copy)
>@@ -1,4 +1,4 @@
>---- src/Csocket.cpp.orig	2015-04-16 15:00:34 UTC
>+--- src/Csocket.cpp.orig	2015-11-15 17:54:20 UTC
> +++ src/Csocket.cpp
> @@ -47,6 +47,7 @@
>  #include <stdio.h>

Flags:

koobs: maintainer-approval+

Actions: View | Diff

Attachments on bug 205473: 164438 | 164731