[Midnightbsd-cvs] mports [17478] trunk/irc/znc: znc 1.4
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Tue Sep 23 23:25:26 EDT 2014
Revision: 17478
http://svnweb.midnightbsd.org/mports/?rev=17478
Author: laffer1
Date: 2014-09-23 23:25:25 -0400 (Tue, 23 Sep 2014)
Log Message:
-----------
znc 1.4
Modified Paths:
--------------
trunk/irc/znc/Makefile
trunk/irc/znc/distinfo
trunk/irc/znc/pkg-plist
Removed Paths:
-------------
trunk/irc/znc/files/patch-configure
trunk/irc/znc/files/patch-modules-webadmin_cpp
Modified: trunk/irc/znc/Makefile
===================================================================
--- trunk/irc/znc/Makefile 2014-09-24 03:23:21 UTC (rev 17477)
+++ trunk/irc/znc/Makefile 2014-09-24 03:25:25 UTC (rev 17478)
@@ -1,7 +1,7 @@
# $MidnightBSD$
PORTNAME= znc
-PORTVERSION= 1.0
+PORTVERSION= 1.4
CATEGORIES= irc ipv6
MASTER_SITES= http://znc.in/releases/
@@ -8,99 +8,91 @@
MAINTAINER= ports at MidnightBSD.org
COMMENT= An advanced IRC bouncer
-LICENSE= gpl2
+LICENSE= apache2
-FETCH_ARGS= -Fpr
GNU_CONFIGURE= yes
USE_RC_SUBR= znc
-USES= pkgconfig iconv
-USE_GMAKE= yes
-WANT_PERL= yes
+USES= pkgconfig iconv gmake
NO_OPTIONS_SORT= yes
-OPTIONS_DEFINE= DEBUG IPV6 OPENSSL CYRUS PERL PYTHON TCL
+OPTIONS_DEFINE= DEBUG IPV6 OPENSSL CYRUS PERL PYTHON TCL DOCS
OPTIONS_DEFAULT= OPENSSL PERL
+OPTIONS_SUB= yes
+CYRUS_DESC= Cyrus SASL module
DEBUG_DESC= Debugging support
PERL_DESC= Perl scripting module
PYTHON_DESC= Python scripting module
TCL_DESC= Tcl scripting module
-CYRUS_DESC= Cyrus SASL module
+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
+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
+TCL_CONFIGURE_ENABLE= tcl
+
.include <bsd.mport.options.mk>
-.if ${PORT_OPTIONS:MDEBUG}
-CONFIGURE_ARGS+= --enable-debug
-.endif
-
-.if empty(PORT_OPTIONS:MIPV6)
-CONFIGURE_ARGS+= --disable-ipv6
-.endif
-
.if ${PORT_OPTIONS:MOPENSSL}
EXTENSIONS+= openssl
CONFIGURE_ARGS+= --with-openssl=${OPENSSLBASE}
-PLIST_SUB+= OPENSSL=""
-.else
-CONFIGURE_ARGS+= --disable-openssl
-PLIST_SUB+= OPENSSL="@comment "
.endif
.if ${PORT_OPTIONS:MPERL}
-CONFIGURE_ARGS+= --enable-perl
-USE_PERL5= yes
-PLIST_SUB+= PERL=""
-BUILD_DEPENDS+= swig>=2.0.4:${PORTSDIR}/devel/swig20
-.else
-PLIST_SUB+= PERL="@comment "
+USE_PERL5+= run build
.endif
.if ${PORT_OPTIONS:MTCL}
-USE_TCL= 84+
-.include "${PORTSDIR}/Mk/bsd.tcl.mk"
-CONFIGURE_ARGS+= --enable-tcl --with-tcl=${TCL_LIBDIR}
-PLIST_SUB+= TCL=""
-.else
-CONFIGURE_ARGS+= --without-tcl
-PLIST_SUB+= TCL="@comment "
+USES+= tcl
+CONFIGURE_ARGS+= --with-tcl=${TCL_LIBDIR}
.endif
.if ${PORT_OPTIONS:MPYTHON}
-USE_PYTHON= 3.1-3.2
-USE_PERL5_BUILD= yes
-PLIST_SUB+= PYTHON=""
-CONFIGURE_ARGS+= --enable-python=python-${PYTHON_VER}
-BUILD_DEPENDS+= swig>=2.0.4:${PORTSDIR}/devel/swig20
-.else
-PLIST_SUB+= PYTHON="@comment "
+USE_PYTHON= 3
+USE_PERL5+= build
.endif
-.if ${PORT_OPTIONS:MCYRUS}
-LIB_DEPENDS+= sasl2:${PORTSDIR}/security/cyrus-sasl2
-CONFIGURE_ARGS+= --enable-cyrus
-LDFLAGS+= -L${LOCALBASE}/lib
-PLIST_SUB+= CYRUS=""
-.else
-PLIST_SUB+= CYRUS="@comment "
+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
+ @${REINPLACE_CMD} -e \
+ 's#(char \*\*)##g' \
+ ${WRKSRC}/configure
+# Instead of using bundled swig generated files, delete them to force
+# regeneration using swig 2.0.11+ (fixes port compilation using clang)
+.if ${PORT_OPTIONS:MPERL}
+ @${RM} ${WRKSRC}/modules/modperl/ZNC.cpp
.endif
+.if ${PORT_OPTIONS:MPYTHON}
+ @${RM} ${WRKSRC}/modules/modpython/_znc_core.cpp
+.endif
-MANCOMPRESSED= yes
-MAN1= znc.1 znc-buildmod.1
-
-PORTDOCS= README.md
-
post-patch:
@${REINPLACE_CMD} -e \
's#$$(libdir)/pkgconfig#${PREFIX}/libdata/pkgconfig#' \
${WRKSRC}/Makefile.in
+ @${REINPLACE_CMD} -e \
+ 's#/usr/local#${LOCALBASE}#' ${WRKSRC}/configure
post-install:
.if ${PORT_OPTIONS:MDOCS}
- ${MKDIR} ${DOCSDIR}/
+ ${MKDIR} ${STAGEDIR}${DOCSDIR}
.for f in ${PORTDOCS}
- ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}/
+ ${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 2014-09-24 03:23:21 UTC (rev 17477)
+++ trunk/irc/znc/distinfo 2014-09-24 03:25:25 UTC (rev 17478)
@@ -1,2 +1,2 @@
-SHA256 (znc-1.0.tar.gz) = a85539da42697b26e4d46205def36bb799f83d6aeef401d53c49ee674142062a
-SIZE (znc-1.0.tar.gz) = 1222361
+SHA256 (znc-1.4.tar.gz) = 86e98fd0ed182d39828c926809f8075d836ee3b70a6dd43dfbb434822f2a7b52
+SIZE (znc-1.4.tar.gz) = 1239648
Deleted: trunk/irc/znc/files/patch-configure
===================================================================
--- trunk/irc/znc/files/patch-configure 2014-09-24 03:23:21 UTC (rev 17477)
+++ trunk/irc/znc/files/patch-configure 2014-09-24 03:25:25 UTC (rev 17478)
@@ -1,15 +0,0 @@
---- configure.orig 2012-11-06 16:02:24.000000000 +0000
-+++ configure 2012-11-28 12:03:59.905827557 +0000
-@@ -4567,10 +4567,10 @@
- $ac_path_SWIG -python -py3 -c++ -shadow -I"$srcdir"/swig_lib/python conftest-python.i >&5 && \
- echo "python wrapper created" >&5 && \
- echo "testing std::set... ">&5 && \
-- grep SInt_discard conftest.py >& /dev/null && \
-+ (grep SInt_discard conftest.py) >/dev/null 2>&1 && \
- echo "std::set works" >&5 && \
- echo "testing PyInt_FromSize_t..." >&5 && \
-- grep '#define PyInt_FromSize_t' conftest-python_wrap.cxx >& /dev/null && \
-+ (grep '#define PyInt_FromSize_t' conftest-python_wrap.cxx) >/dev/null 2>&1 && \
- echo "PyInt_FromSize_t is defined" >&5 && \
- $ac_path_SWIG -perl -c++ -shadow -I"$srcdir"/swig_lib/perl5 conftest-perl.i >&5 && \
- echo "perl wrapper created" >&5 && \
Deleted: trunk/irc/znc/files/patch-modules-webadmin_cpp
===================================================================
--- trunk/irc/znc/files/patch-modules-webadmin_cpp 2014-09-24 03:23:21 UTC (rev 17477)
+++ trunk/irc/znc/files/patch-modules-webadmin_cpp 2014-09-24 03:25:25 UTC (rev 17478)
@@ -1,38 +0,0 @@
---- modules/webadmin.cpp.orig 2012-11-06 16:02:20.000000000 +0000
-+++ modules/webadmin.cpp 2013-05-28 12:43:53.258581961 +0100
-@@ -404,7 +404,7 @@
- CIRCNetwork* pNetwork = SafeGetNetworkFromParam(WebSock);
-
- // Admin||Self Check
-- if (!spSession->IsAdmin() && (!spSession->GetUser() || spSession->GetUser() != pNetwork->GetUser())) {
-+ if (!spSession->IsAdmin() && (!spSession->GetUser() || !pNetwork || spSession->GetUser() != pNetwork->GetUser())) {
- return false;
- }
-
-@@ -433,7 +433,7 @@
- CIRCNetwork* pNetwork = SafeGetNetworkFromParam(WebSock);
-
- // Admin||Self Check
-- if (!spSession->IsAdmin() && (!spSession->GetUser() || spSession->GetUser() != pNetwork->GetUser())) {
-+ if (!spSession->IsAdmin() && (!spSession->GetUser() || !pNetwork || spSession->GetUser() != pNetwork->GetUser())) {
- return false;
- }
-
-@@ -457,7 +457,7 @@
- CIRCNetwork* pNetwork = SafeGetNetworkFromParam(WebSock);
-
- // Admin||Self Check
-- if (!spSession->IsAdmin() && (!spSession->GetUser() || spSession->GetUser() != pNetwork->GetUser())) {
-+ if (!spSession->IsAdmin() && (!spSession->GetUser() || !pNetwork || spSession->GetUser() != pNetwork->GetUser())) {
- return false;
- }
-
-@@ -471,7 +471,7 @@
- CIRCNetwork* pNetwork = SafeGetNetworkFromParam(WebSock);
-
- // Admin||Self Check
-- if (!spSession->IsAdmin() && (!spSession->GetUser() || spSession->GetUser() != pNetwork->GetUser())) {
-+ if (!spSession->IsAdmin() && (!spSession->GetUser() || !pNetwork || spSession->GetUser() != pNetwork->GetUser())) {
- return false;
- }
-
Modified: trunk/irc/znc/pkg-plist
===================================================================
--- trunk/irc/znc/pkg-plist 2014-09-24 03:23:21 UTC (rev 17477)
+++ trunk/irc/znc/pkg-plist 2014-09-24 03:25:25 UTC (rev 17478)
@@ -18,6 +18,7 @@
include/znc/Server.h
include/znc/Socket.h
include/znc/Template.h
+include/znc/Threads.h
include/znc/User.h
include/znc/Utils.h
include/znc/WebModules.h
@@ -57,6 +58,7 @@
lib/znc/listsockets.so
lib/znc/log.so
lib/znc/missingmotd.so
+lib/znc/modules_online.so
lib/znc/nickserv.so
lib/znc/notes.so
lib/znc/notify_connect.so
@@ -74,6 +76,8 @@
lib/znc/watch.so
lib/znc/webadmin.so
libdata/pkgconfig/znc.pc
+man/man1/znc-buildmod.1.gz
+man/man1/znc.1.gz
%%CYRUS%%lib/znc/cyrusauth.so
%%OPENSSL%%lib/znc/awaystore.so
%%OPENSSL%%lib/znc/cert.so
@@ -89,9 +93,7 @@
%%PYTHON%%lib/znc/modpython.so
%%PYTHON%%lib/znc/modpython/_znc_core.so
%%PYTHON%%lib/znc/modpython/znc.py
-%%PYTHON%%lib/znc/modpython/znc.pyc
%%PYTHON%%lib/znc/modpython/znc_core.py
-%%PYTHON%%lib/znc/modpython/znc_core.pyc
%%TCL%%lib/znc/modtcl.so
%%TCL%%share/znc/modtcl/binds.tcl
%%TCL%%share/znc/modtcl/modtcl.tcl
More information about the Midnightbsd-cvs
mailing list