Attachment 114724 Details for Bug 156421 – znc-0.098.patch

[patch] znc-0.098.patch

znc-0.098.patch (text/plain), 6.20 KB, created by Jase Thew on 2011-04-15 15:00:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jase Thew

Created: 2011-04-15 15:00:20 UTC

Size: 6.20 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/irc/znc.orig/Makefile /usr/ports/irc/znc/Makefile
>--- /usr/ports/irc/znc.orig/Makefile	2010-12-17 09:29:13.000000000 +0000
>+++ /usr/ports/irc/znc/Makefile	2011-04-15 14:32:15.369726158 +0100
>@@ -6,13 +6,14 @@
> #
> 
> PORTNAME=	znc
>-PORTVERSION=	0.096
>+PORTVERSION=	0.098
> CATEGORIES=	irc ipv6
>-MASTER_SITES=	SF
>+MASTER_SITES=	http://znc.in/releases/
> 
> MAINTAINER=	miwi@FreeBSD.org
> COMMENT=	An advanced IRC bouncer
> 
>+FETCH_ARGS?=	-Fpr
> GNU_CONFIGURE=	yes
> USE_GMAKE=	yes
> USE_GNOME=	gnomehack pkgconfig
>@@ -26,9 +27,10 @@
> 		PERL		"Enable Perl module support" on \
> 		TCL		"Enable TCL module support" off \
> 		TCLALLOWALL	"Allow non-admin users to load TCL module" off \
>+		PYTHON		"Enable Python module support" off \
> 		SASL		"Enable SASL module support" off
> 
>-.include <bsd.port.pre.mk>
>+.include <bsd.port.options.mk>
> 
> .if defined(WITH_DEBUG)
> CONFIGURE_ARGS+=	--enable-debug
>@@ -57,7 +59,7 @@
> CONFIGURE_ARGS+=	--enable-perl
> USE_PERL5=		yes
> PLIST_SUB+=		PERL=""
>-BUILD_DEPENDS+=		swig>0:${PORTSDIR}/devel/swig13
>+BUILD_DEPENDS+=		swig>=1.3.40:${PORTSDIR}/devel/swig13
> .else
> PLIST_SUB+=		PERL="@comment "
> .endif
>@@ -79,6 +81,16 @@
> CXXFLAGS+=		-DMOD_MODTCL_ALLOW_EVERYONE
> .endif
> 
>+.if defined(WITH_PYTHON)
>+USE_PYTHON=	3.1
>+USE_PERL5_BUILD=	yes
>+PLIST_SUB+=	PYTHON=""
>+CONFIGURE_ARGS+=	--enable-python=${PYTHON_VERSION}-config
>+BUILD_DEPENDS+=	swig>=1.3.40:${PORTSDIR}/devel/swig13
>+.else
>+PLIST_SUB+=	PYTHON="@comment "
>+.endif
>+
> .if defined(WITH_SASL)
> LIB_DEPENDS+=		sasl2.2:${PORTSDIR}/security/cyrus-sasl2
> CONFIGURE_ARGS+=	--enable-sasl
>@@ -99,4 +111,4 @@
> MANCOMPRESSED=	yes
> MAN1=		znc.1 znc-buildmod.1 znc-config.1
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>diff -ruN --exclude=CVS /usr/ports/irc/znc.orig/distinfo /usr/ports/irc/znc/distinfo
>--- /usr/ports/irc/znc.orig/distinfo	2010-12-17 09:29:13.000000000 +0000
>+++ /usr/ports/irc/znc/distinfo	2011-04-15 14:32:15.349690420 +0100
>@@ -1,2 +1,2 @@
>-SHA256 (znc-0.096.tar.gz) = 3d0961b63ae2174df788958a5eb08f791345341bbe4698dad4111d746e5de016
>-SIZE (znc-0.096.tar.gz) = 617914
>+SHA256 (znc-0.098.tar.gz) = 3b88d33c21e464aa82c84b2dc3bcd52dec95c87a052bb80aff6336dbb4043eb4
>+SIZE (znc-0.098.tar.gz) = 637247
>diff -ruN --exclude=CVS /usr/ports/irc/znc.orig/files/patch-modules-Makefile_in /usr/ports/irc/znc/files/patch-modules-Makefile_in
>--- /usr/ports/irc/znc.orig/files/patch-modules-Makefile_in	1970-01-01 01:00:00.000000000 +0100
>+++ /usr/ports/irc/znc/files/patch-modules-Makefile_in	2011-04-15 14:32:15.392760594 +0100
>@@ -0,0 +1,11 @@
>+--- modules/Makefile.in.orig	2011-04-15 05:32:38.106160701 +0100
>++++ modules/Makefile.in	2011-04-15 05:33:09.936858977 +0100
>+@@ -103,7 +103,7 @@
>+ 
>+ install_metadirs: create_install_dir
>+ 	for a in $(srcdir)/*; do \
>+-		d=$$(echo $$a | sed -e "s:$(srcdir)/::g;s:modperl::;s:modpython::"); \
>++		d=$$(echo $$a | sed -e "s:$(srcdir)/::g;s:modperl::;s:modpython::;s:modtcl::"); \
>+ 		if [ -d $$a ] && [ -f $${d}.so ]; then \
>+ 			cp -R $$a $(DESTDIR)$(DATADIR); \
>+ 			find $(DESTDIR)$(DATADIR)/$$a -type d -exec chmod 0755 '{}' \;; \
>diff -ruN --exclude=CVS /usr/ports/irc/znc.orig/pkg-plist /usr/ports/irc/znc/pkg-plist
>--- /usr/ports/irc/znc.orig/pkg-plist	2010-12-17 09:29:13.000000000 +0000
>+++ /usr/ports/irc/znc/pkg-plist	2011-04-15 14:32:15.341672382 +0100
>@@ -25,6 +25,7 @@
> include/znc/defines.h
> include/znc/main.h
> include/znc/znc.h
>+include/znc/zncconfig.h
> libdata/pkgconfig/znc.pc
> lib/znc/admin.so
> lib/znc/adminlog.so
>@@ -103,6 +104,7 @@
> share/znc/notes/files/trash.gif
> share/znc/stickychan/tmpl/index.tmpl
> share/znc/stickychan/tmpl/stickychan_WebadminChan.tmpl
>+share/znc/perform/tmpl/index.tmpl
> share/znc/webadmin/tmpl/listusers.tmpl
> share/znc/webadmin/tmpl/settings.tmpl
> share/znc/webadmin/tmpl/traffic.tmpl
>@@ -132,40 +134,48 @@
> %%OPENSSL%%lib/znc/crypt.so
> %%OPENSSL%%lib/znc/savebuff.so
> %%OPENSSL%%lib/znc/schat.so
>+%%PERL%%lib/znc/perleval.pm
> %%PERL%%lib/znc/modperl.so
> %%PERL%%lib/znc/modperl/startup.pl
> %%PERL%%lib/znc/modperl/ZNC.pm
> %%PERL%%lib/znc/modperl/ZNC.so
>+%%PYTHON%%lib/znc/modpython.so
>+%%PYTHON%%lib/znc/modpython/znc_core.pyc
>+%%PYTHON%%lib/znc/modpython/znc.pyc
>+%%PYTHON%%lib/znc/modpython/_znc_core.so
> %%SASL%%lib/znc/saslauth.so
> %%TCL%%lib/znc/modtcl.so
> %%TCL%%share/znc/modtcl/modtcl.tcl
> %%TCL%%share/znc/modtcl/binds.tcl
> @dirrm include/znc
>-@dirrmtry lib/znc/modperl
>-@dirrmtry lib/znc
>-@dirrmtry share/znc/blockuser/tmpl
>-@dirrmtry share/znc/blockuser
>-@dirrmtry share/znc/lastseen/tmpl
>-@dirrmtry share/znc/lastseen
>-@dirrmtry share/znc/modtcl
>-@dirrmtry share/znc/notes/files
>-@dirrmtry share/znc/notes/tmpl
>-@dirrmtry share/znc/notes
>-@dirrmtry share/znc/stickychan/tmpl
>-@dirrmtry share/znc/stickychan
>-@dirrmtry share/znc/webadmin/tmpl
>-@dirrmtry share/znc/webadmin
>-@dirrmtry share/znc/webskins/_default_/pub
>-@dirrmtry share/znc/webskins/_default_/tmpl
>-@dirrmtry share/znc/webskins/_default_
>-@dirrmtry share/znc/webskins/dark-clouds/pub
>-@dirrmtry share/znc/webskins/dark-clouds/tmpl
>-@dirrmtry share/znc/webskins/dark-clouds
>-@dirrmtry share/znc/webskins/forest/pub
>-@dirrmtry share/znc/webskins/forest/tmpl
>-@dirrmtry share/znc/webskins/forest
>-@dirrmtry share/znc/webskins/ice/pub
>-@dirrmtry share/znc/webskins/ice/tmpl
>-@dirrmtry share/znc/webskins/ice
>-@dirrmtry share/znc/webskins
>-@dirrmtry share/znc
>+%%PYTHON%%@dirrm lib/znc/modpython
>+%%PERL%%@dirrm lib/znc/modperl
>+@dirrm lib/znc
>+@dirrm share/znc/blockuser/tmpl
>+@dirrm share/znc/blockuser
>+@dirrm share/znc/lastseen/tmpl
>+@dirrm share/znc/lastseen
>+%%TCL%%@dirrm share/znc/modtcl
>+@dirrm share/znc/notes/files
>+@dirrm share/znc/notes/tmpl
>+@dirrm share/znc/notes
>+@dirrm share/znc/perform/tmpl/
>+@dirrm share/znc/perform/
>+@dirrm share/znc/stickychan/tmpl
>+@dirrm share/znc/stickychan
>+@dirrm share/znc/webadmin/tmpl
>+@dirrm share/znc/webadmin
>+@dirrm share/znc/webskins/_default_/pub
>+@dirrm share/znc/webskins/_default_/tmpl
>+@dirrm share/znc/webskins/_default_
>+@dirrm share/znc/webskins/dark-clouds/pub
>+@dirrm share/znc/webskins/dark-clouds/tmpl
>+@dirrm share/znc/webskins/dark-clouds
>+@dirrm share/znc/webskins/forest/pub
>+@dirrm share/znc/webskins/forest/tmpl
>+@dirrm share/znc/webskins/forest
>+@dirrm share/znc/webskins/ice/pub
>+@dirrm share/znc/webskins/ice/tmpl
>+@dirrm share/znc/webskins/ice
>+@dirrm share/znc/webskins
>+@dirrm share/znc

Actions: View | Diff

Attachments on bug 156421: 114724