[Midnightbsd-cvs] mports [20479] trunk/irc/znc/pkg-plist: znc 1.6.0

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Mon Oct 5 18:17:58 EDT 2015


Revision: 20479
          http://svnweb.midnightbsd.org/mports/?rev=20479
Author:   laffer1
Date:     2015-10-05 18:17:57 -0400 (Mon, 05 Oct 2015)
Log Message:
-----------
znc 1.6.0

Modified Paths:
--------------
    trunk/irc/znc/Makefile
    trunk/irc/znc/distinfo
    trunk/irc/znc/files/patch-modules-modperl-Makefile_inc
    trunk/irc/znc/pkg-plist

Added Paths:
-----------
    trunk/irc/znc/files/patch-src_Csocket.cpp

Property Changed:
----------------
    trunk/irc/znc/files/patch-modules-modperl-Makefile_inc
    trunk/irc/znc/files/znc.in

Modified: trunk/irc/znc/Makefile
===================================================================
--- trunk/irc/znc/Makefile	2015-10-05 22:12:18 UTC (rev 20478)
+++ trunk/irc/znc/Makefile	2015-10-05 22:17:57 UTC (rev 20479)
@@ -1,9 +1,10 @@
 # $MidnightBSD$
 
 PORTNAME=	znc
-PORTVERSION=	1.4
+PORTVERSION=	1.6.0
 CATEGORIES=	irc ipv6
-MASTER_SITES=	http://znc.in/releases/
+MASTER_SITES=	http://znc.in/releases/ \
+		http://znc.in/releases/archive/
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	An advanced IRC bouncer
@@ -11,19 +12,19 @@
 LICENSE=	apache2
 
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+=	--disable-perl --disable-python
 USE_RC_SUBR=	znc
-USES=		pkgconfig iconv gmake
+USES=		compiler:c++11-lib cpe gmake iconv pkgconfig
 
 NO_OPTIONS_SORT=	yes
 
-OPTIONS_DEFINE=	DEBUG IPV6 OPENSSL CYRUS PERL PYTHON TCL DOCS
-OPTIONS_DEFAULT=	OPENSSL PERL
+OPTIONS_DEFINE=	DEBUG IPV6 OPENSSL CYRUS TCL CHARSET DOCS
+OPTIONS_DEFAULT=	OPENSSL
 OPTIONS_SUB=	yes
 
 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
 
 CYRUS_CONFIGURE_ON=	--enable-cyrus
@@ -31,14 +32,10 @@
 CYRUS_LIB_DEPENDS=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
 DEBUG_CONFIGURE_ON=	--enable-debug
 IPV6_CONFIGURE_OFF=	--disable-ipv6
-PERL_BUILD_DEPENDS=	swig>=2.0.11:${PORTSDIR}/devel/swig20
-PERL_CONFIGURE_ENABLE=	perl
-PERL_CONFIGURE_ON=	--enable-swig
-PERL_USES=	perl5
-PYTHON_BUILD_DEPENDS=	swig>=2.0.11:${PORTSDIR}/devel/swig20
-PYTHON_CONFIGURE_ON=	--enable-python=python-${PYTHON_VER} --enable-swig
-PYTHON_USES=	perl5
 OPENSSL_CONFIGURE_OFF=	--disable-openssl
+CHARSET_CONFIGURE_OFF=	--disable-charset
+CHARSET_LIB_DEPENDS=	libicuuc.so.53:${PORTSDIR}/devel/icu \
+			libicudata.so.53:${PORTSDIR}/devel/icu
 TCL_CONFIGURE_ENABLE=	tcl
 
 .include <bsd.mport.options.mk>
@@ -48,20 +45,11 @@
 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_PYTHON=		3
-USE_PERL5+=		build
-.endif
-
 PORTDOCS=		README.md
 
 pre-configure:
@@ -92,7 +80,6 @@
 .for f in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
-	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}"
 .endif
 
 .include <bsd.port.mk>

Modified: trunk/irc/znc/distinfo
===================================================================
--- trunk/irc/znc/distinfo	2015-10-05 22:12:18 UTC (rev 20478)
+++ trunk/irc/znc/distinfo	2015-10-05 22:17:57 UTC (rev 20479)
@@ -1,2 +1,2 @@
-SHA256 (znc-1.4.tar.gz) = 86e98fd0ed182d39828c926809f8075d836ee3b70a6dd43dfbb434822f2a7b52
-SIZE (znc-1.4.tar.gz) = 1239648
+SHA256 (znc-1.6.0.tar.gz) = df622aeae34d26193c738dff6499e56ad669ec654484e19623738d84cc80aba7
+SIZE (znc-1.6.0.tar.gz) = 1367962

Modified: trunk/irc/znc/files/patch-modules-modperl-Makefile_inc
===================================================================
--- trunk/irc/znc/files/patch-modules-modperl-Makefile_inc	2015-10-05 22:12:18 UTC (rev 20478)
+++ trunk/irc/znc/files/patch-modules-modperl-Makefile_inc	2015-10-05 22:17:57 UTC (rev 20479)
@@ -1,5 +1,5 @@
---- modules/modperl/Makefile.inc.orig	2012-11-28 11:59:30.509460980 +0000
-+++ modules/modperl/Makefile.inc	2012-11-28 12:00:07.142992057 +0000
+--- 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 :(
@@ -6,6 +6,6 @@
  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
- PERL_CXX   += -DSWIG_TYPE_TABLE=znc
- modperlCXXFLAGS := $(PERL_CXX) -Wno-unused-function


Property changes on: trunk/irc/znc/files/patch-modules-modperl-Makefile_inc
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Added: trunk/irc/znc/files/patch-src_Csocket.cpp
===================================================================
--- trunk/irc/znc/files/patch-src_Csocket.cpp	                        (rev 0)
+++ trunk/irc/znc/files/patch-src_Csocket.cpp	2015-10-05 22:17:57 UTC (rev 20479)
@@ -0,0 +1,10 @@
+--- src/Csocket.cpp.orig	2015-04-16 15:00:34 UTC
++++ src/Csocket.cpp
+@@ -47,6 +47,7 @@
+ #include <stdio.h>
+ #include <openssl/conf.h>
+ #include <openssl/engine.h>
++#include <openssl/comp.h>
+ #endif /* HAVE_LIBSSL */
+ 
+ #ifdef HAVE_ICU


Property changes on: trunk/irc/znc/files/patch-src_Csocket.cpp
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: trunk/irc/znc/files/znc.in
===================================================================
--- trunk/irc/znc/files/znc.in	2015-10-05 22:12:18 UTC (rev 20478)
+++ trunk/irc/znc/files/znc.in	2015-10-05 22:17:57 UTC (rev 20479)

Property changes on: trunk/irc/znc/files/znc.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/irc/znc/pkg-plist
===================================================================
--- trunk/irc/znc/pkg-plist	2015-10-05 22:12:18 UTC (rev 20478)
+++ trunk/irc/znc/pkg-plist	2015-10-05 22:17:57 UTC (rev 20479)
@@ -14,7 +14,9 @@
 include/znc/MD5.h
 include/znc/Modules.h
 include/znc/Nick.h
+include/znc/Query.h
 include/znc/SHA256.h
+include/znc/SSLVerifyHost.h
 include/znc/Server.h
 include/znc/Socket.h
 include/znc/Template.h
@@ -30,6 +32,7 @@
 include/znc/znc.h
 include/znc/zncconfig.h
 lib/znc/adminlog.so
+lib/znc/alias.so
 lib/znc/autoattach.so
 lib/znc/autocycle.so
 lib/znc/autoop.so
@@ -41,7 +44,7 @@
 lib/znc/bouncedcc.so
 lib/znc/buffextras.so
 lib/znc/chansaver.so
-lib/znc/charset.so
+%%CHARSET%%lib/znc/charset.so
 lib/znc/clearbufferonmsg.so
 lib/znc/clientnotify.so
 lib/znc/controlpanel.so
@@ -85,15 +88,6 @@
 %%OPENSSL%%lib/znc/crypt.so
 %%OPENSSL%%lib/znc/savebuff.so
 %%OPENSSL%%lib/znc/schat.so
-%%PERL%%lib/znc/modperl.so
-%%PERL%%lib/znc/modperl/ZNC.pm
-%%PERL%%lib/znc/modperl/ZNC.so
-%%PERL%%lib/znc/modperl/startup.pl
-%%PERL%%lib/znc/perleval.pm
-%%PYTHON%%lib/znc/modpython.so
-%%PYTHON%%lib/znc/modpython/_znc_core.so
-%%PYTHON%%lib/znc/modpython/znc.py
-%%PYTHON%%lib/znc/modpython/znc_core.py
 %%TCL%%lib/znc/modtcl.so
 %%TCL%%share/znc/modtcl/binds.tcl
 %%TCL%%share/znc/modtcl/modtcl.tcl
@@ -106,10 +100,12 @@
 %%DATADIR%%/modules/notes/files/trash.gif
 %%DATADIR%%/modules/notes/tmpl/index.tmpl
 %%DATADIR%%/modules/perform/tmpl/index.tmpl
+%%DATADIR%%/modules/q/tmpl/index.tmpl
 %%DATADIR%%/modules/send_raw/files/select.js
 %%DATADIR%%/modules/send_raw/tmpl/index.tmpl
 %%DATADIR%%/modules/stickychan/tmpl/index.tmpl
 %%DATADIR%%/modules/stickychan/tmpl/stickychan_WebadminChan.tmpl
+%%DATADIR%%/modules/webadmin/files/webadmin.css
 %%DATADIR%%/modules/webadmin/files/webadmin.js
 %%DATADIR%%/modules/webadmin/tmpl/add_edit_chan.tmpl
 %%DATADIR%%/modules/webadmin/tmpl/add_edit_network.tmpl
@@ -116,13 +112,16 @@
 %%DATADIR%%/modules/webadmin/tmpl/add_edit_user.tmpl
 %%DATADIR%%/modules/webadmin/tmpl/del_network.tmpl
 %%DATADIR%%/modules/webadmin/tmpl/del_user.tmpl
+%%DATADIR%%/modules/webadmin/tmpl/encoding_settings.tmpl
 %%DATADIR%%/modules/webadmin/tmpl/index.tmpl
 %%DATADIR%%/modules/webadmin/tmpl/listusers.tmpl
 %%DATADIR%%/modules/webadmin/tmpl/settings.tmpl
 %%DATADIR%%/modules/webadmin/tmpl/traffic.tmpl
+%%DATADIR%%/webskins/_default_/pub/External.png
 %%DATADIR%%/webskins/_default_/pub/_default_.css
 %%DATADIR%%/webskins/_default_/pub/favicon.ico
 %%DATADIR%%/webskins/_default_/pub/global.css
+%%DATADIR%%/webskins/_default_/pub/jquery-1.11.2.min.js
 %%DATADIR%%/webskins/_default_/pub/robots.txt
 %%DATADIR%%/webskins/_default_/tmpl/Banner.tmpl
 %%DATADIR%%/webskins/_default_/tmpl/BaseHeader.tmpl
@@ -161,46 +160,3 @@
 %%DATADIR%%/webskins/ice/pub/pagebg.gif
 %%DATADIR%%/webskins/ice/tmpl/FooterTag.tmpl
 %%DATADIR%%/webskins/ice/tmpl/Header.tmpl
-%%PYTHON%%@dirrmtry lib/znc/modpython
-%%PERL%%@dirrmtry lib/znc/modperl
- at dirrmtry lib/znc
- at dirrmtry include/znc
- at dirrmtry %%DATADIR%%/webskins/ice/tmpl
- at dirrmtry %%DATADIR%%/webskins/ice/pub
- at dirrmtry %%DATADIR%%/webskins/ice
- at dirrmtry %%DATADIR%%/webskins/forest/tmpl
- at dirrmtry %%DATADIR%%/webskins/forest/pub
- at dirrmtry %%DATADIR%%/webskins/forest
- at dirrmtry %%DATADIR%%/webskins/dark-clouds/tmpl
- at dirrmtry %%DATADIR%%/webskins/dark-clouds/pub
- at dirrmtry %%DATADIR%%/webskins/dark-clouds
- at dirrmtry %%DATADIR%%/webskins/_default_/tmpl
- at dirrmtry %%DATADIR%%/webskins/_default_/pub
- at dirrmtry %%DATADIR%%/webskins/_default_
- at dirrmtry %%DATADIR%%/webskins
- at dirrmtry %%DATADIR%%/modules/webadmin/tmpl
- at dirrmtry %%DATADIR%%/modules/webadmin/files
- at dirrmtry %%DATADIR%%/modules/webadmin
- at dirrmtry %%DATADIR%%/modules/stickychan/tmpl
- at dirrmtry %%DATADIR%%/modules/stickychan
- at dirrmtry %%DATADIR%%/modules/send_raw/tmpl
- at dirrmtry %%DATADIR%%/modules/send_raw/files
- at dirrmtry %%DATADIR%%/modules/send_raw
- at dirrmtry %%DATADIR%%/modules/perform/tmpl
- at dirrmtry %%DATADIR%%/modules/perform
- at dirrmtry %%DATADIR%%/modules/notes/tmpl
- at dirrmtry %%DATADIR%%/modules/notes/files
- at dirrmtry %%DATADIR%%/modules/notes
- at dirrmtry %%DATADIR%%/modules/listsockets/tmpl
- at dirrmtry %%DATADIR%%/modules/listsockets
- at dirrmtry %%DATADIR%%/modules/lastseen/tmpl
- at dirrmtry %%DATADIR%%/modules/lastseen
- at dirrmtry %%DATADIR%%/modules/certauth/tmpl
- at dirrmtry %%DATADIR%%/modules/certauth
- at dirrmtry %%DATADIR%%/modules/cert/tmpl
- at dirrmtry %%DATADIR%%/modules/cert
- at dirrmtry %%DATADIR%%/modules/blockuser/tmpl
- at dirrmtry %%DATADIR%%/modules/blockuser
-%%TCL%%@dirrmtry share/znc/modtcl
- at dirrmtry %%DATADIR%%/modules
- at dirrmtry %%DATADIR%%



More information about the Midnightbsd-cvs mailing list