Attachment 102032 Details for Bug 141711 – znc-0.076.patch

[patch] znc-0.076.patch

znc-0.076.patch (text/plain), 12.22 KB, created by Jase Thew on 2009-12-17 13:40:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jase Thew

Created: 2009-12-17 13:40:02 UTC

Size: 12.22 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/irc/znc.orig/Makefile /usr/ports/irc/znc/Makefile
>--- /usr/ports/irc/znc.orig/Makefile	2009-08-30 11:39:49.000000000 +0100
>+++ /usr/ports/irc/znc/Makefile	2009-12-17 13:26:09.000000000 +0000
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	znc
>-PORTVERSION=	0.074
>+PORTVERSION=	0.076
> CATEGORIES=	irc ipv6
> MASTER_SITES=	SF
> 
>@@ -17,13 +17,18 @@
> USE_GMAKE=	yes
> USE_GNOME=	gnomehack
> WANT_PERL=	yes
>-CONFIGURE_ARGS=	--disable-c-ares
> 
> OPTIONS=	DEBUG		"Enable debugging" off \
> 		IPV6		"Enable IPv6 support" off \
>+		CARES		"Use c-ares resolver library" off \
> 		OPENSSL		"Enable OpenSSL support" on \
>-		PERL		"Enable Perl support" on \
>-		SASL		"Enable SASL support" off
>+		MODULES		"Build modules" on \
>+		EXTRA		"Build extra modules" off \
>+		PERL		"Enable Perl module support" on \
>+		TCL		"Enable TCL module support" off \
>+		SASL		"Enable SASL module support" off
>+
>+CONFLICTS=	znc-extra-0.07*
> 
> .include <bsd.port.pre.mk>
> 
>@@ -31,8 +36,14 @@
> CONFIGURE_ARGS+=	--enable-debug
> .endif
> 
>-.if defined(WITH_IPV6)
>-CONFIGURE_ARGS+=	--enable-ipv6
>+.if defined(WITHOUT_IPV6)
>+CONFIGURE_ARGS+=	--disable-ipv6
>+.endif
>+
>+.if defined(WITH_CARES)
>+LIB_DEPENDS+=		cares.2:${PORTSDIR}/dns/c-ares
>+.else
>+CONFIGURE_ARGS+=	--disable-c-ares
> .endif
> 
> .if defined(WITH_OPENSSL)
>@@ -45,6 +56,9 @@
> .endif
> 
> .if defined(WITH_PERL)
>+.if defined(WITHOUT_MODULES)
>+IGNORE=			perl support requires MODULES. Please re-run 'make config' and enable MODULES
>+.endif
> USE_PERL5=		yes
> PLIST_SUB+=		PERL=""
> .else
>@@ -52,7 +66,23 @@
> PLIST_SUB+=		PERL="@comment "
> .endif
> 
>+.if defined(WITH_TCL)
>+.if defined(WITHOUT_MODULES)
>+IGNORE=			tcl support requires MODULES. Please re-run 'make config' and enable MODULES
>+.endif
>+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 "
>+.endif
>+
> .if defined(WITH_SASL)
>+.if defined(WITHOUT_MODULES)
>+IGNORE=			sasl support requires MODULES. Please re-run 'make config' and enable MODULES
>+.endif
> LIB_DEPENDS+=		sasl2.2:${PORTSDIR}/security/cyrus-sasl2
> CONFIGURE_ARGS+=	--enable-sasl
> CONFIGURE_ENV+=		LDFLAGS="-L${LOCALBASE}/lib"
>@@ -61,7 +91,30 @@
> PLIST_SUB+=		SASL="@comment "
> .endif
> 
>-MANCOMPREEED=	yes
>-MAN1=		znc.1.gz znc-buildmod.1.gz znc-config.1.gz
>+.if defined(WITHOUT_MODULES)
>+CONFIGURE_ARGS+=	--disable-modules
>+PLIST_SUB+=		MODULES="@comment "
>+.else
>+PLIST_SUB+=		MODULES=""
>+.endif
>+
>+.if defined(WITH_EXTRA)
>+.if defined(WITHOUT_MODULES)
>+IGNORE=			extra modules requires MODULES. Please re-run 'make config' and enable MODULES
>+.endif
>+CONFIGURE_ARGS+=	--enable-extra
>+PLIST_SUB+=		EXTRA=""
>+.else
>+PLIST_SUB+=		EXTRA="@comment "
>+.endif
>+
>+MANCOMPRESSED=	yes
>+MAN1=		znc.1 znc-buildmod.1 znc-config.1
>+
>+post-install:
>+.if !defined(NOPORTEXAMPLES)
>+	${MKDIR} ${EXAMPLESDIR}
>+	${INSTALL_DATA} ${WRKSRC}/znc.conf ${EXAMPLESDIR}/
>+.endif
> 
> .include <bsd.port.post.mk>
>diff -ruN --exclude=CVS /usr/ports/irc/znc.orig/distinfo /usr/ports/irc/znc/distinfo
>--- /usr/ports/irc/znc.orig/distinfo	2009-08-13 12:18:28.000000000 +0100
>+++ /usr/ports/irc/znc/distinfo	2009-12-12 00:45:15.000000000 +0000
>@@ -1,3 +1,3 @@
>-MD5 (znc-0.074.tar.gz) = 378187acd114769f8f97ef2d4b19da25
>-SHA256 (znc-0.074.tar.gz) = 40a655833a095b9131b86c9d9ffdeaf25676076ec3239a81ae274694a67762a7
>-SIZE (znc-0.074.tar.gz) = 401554
>+MD5 (znc-0.076.tar.gz) = 03c2804b91225e83884f06078f6db568
>+SHA256 (znc-0.076.tar.gz) = 12b969483eed637be09f3196f1bbf835bb0d25260266802035ab071ff59c986a
>+SIZE (znc-0.076.tar.gz) = 430534
>diff -ruN --exclude=CVS /usr/ports/irc/znc.orig/pkg-plist /usr/ports/irc/znc/pkg-plist
>--- /usr/ports/irc/znc.orig/pkg-plist	2009-08-13 12:18:28.000000000 +0100
>+++ /usr/ports/irc/znc/pkg-plist	2009-12-17 06:42:53.000000000 +0000
>@@ -14,6 +14,7 @@
> include/znc/Modules.h
> include/znc/Nick.h
> include/znc/Server.h
>+include/znc/SHA256.h
> include/znc/Socket.h
> include/znc/Template.h
> include/znc/Timers.h
>@@ -23,91 +24,116 @@
> include/znc/defines.h
> include/znc/main.h
> include/znc/znc.h
>-lib/znc/admin.so
>-lib/znc/autoattach.so
>-lib/znc/autocycle.so
>-lib/znc/autoop.so
>-lib/znc/away.so
>-lib/znc/awaynick.so
>-lib/znc/chansaver.so
>-lib/znc/crypt.so
>-lib/znc/email.so
>-lib/znc/fail2ban.so
>-lib/znc/imapauth.so
>-lib/znc/keepnick.so
>-lib/znc/kickrejoin.so
>-lib/znc/modperl.pm
>-lib/znc/modperl.so
>-lib/znc/nickserv.so
>-lib/znc/partyline.so
>-lib/znc/perform.so
>-lib/znc/q.so
>-lib/znc/raw.so
>-lib/znc/sample.so
>-%%SASL%%lib/znc/saslauth.so
>-lib/znc/savebuff.so
>-lib/znc/schat.so
>-lib/znc/shell.so
>-lib/znc/simple_away.so
>-lib/znc/stickychan.so
>-lib/znc/watch.so
>-lib/znc/webadmin.so
> libdata/pkgconfig/znc.pc
>-%%DATADIR%%/webadmin/skins/dark-clouds/Channel.tmpl
>-%%DATADIR%%/webadmin/skins/dark-clouds/Error.tmpl
>-%%DATADIR%%/webadmin/skins/dark-clouds/Footer.tmpl
>-%%DATADIR%%/webadmin/skins/dark-clouds/Header.tmpl
>-%%DATADIR%%/webadmin/skins/dark-clouds/ListUsers.tmpl
>-%%DATADIR%%/webadmin/skins/dark-clouds/Main.tmpl
>-%%DATADIR%%/webadmin/skins/dark-clouds/Settings.tmpl
>-%%DATADIR%%/webadmin/skins/dark-clouds/UserPage.tmpl
>-%%DATADIR%%/webadmin/skins/dark-clouds/data/clouds-header.jpg
>-%%DATADIR%%/webadmin/skins/dark-clouds/data/favicon.ico
>-%%DATADIR%%/webadmin/skins/dark-clouds/data/main.css
>-%%DATADIR%%/webadmin/skins/default/Channel.tmpl
>-%%DATADIR%%/webadmin/skins/default/Error.tmpl
>-%%DATADIR%%/webadmin/skins/default/Footer.tmpl
>-%%DATADIR%%/webadmin/skins/default/Header.tmpl
>-%%DATADIR%%/webadmin/skins/default/ListUsers.tmpl
>-%%DATADIR%%/webadmin/skins/default/Main.tmpl
>-%%DATADIR%%/webadmin/skins/default/Settings.tmpl
>-%%DATADIR%%/webadmin/skins/default/UserPage.tmpl
>-%%DATADIR%%/webadmin/skins/default/data/favicon.ico
>-%%DATADIR%%/webadmin/skins/default/data/main.css
>-%%DATADIR%%/webadmin/skins/graphiX/Channel.tmpl
>-%%DATADIR%%/webadmin/skins/graphiX/Error.tmpl
>-%%DATADIR%%/webadmin/skins/graphiX/Footer.tmpl
>-%%DATADIR%%/webadmin/skins/graphiX/Header.tmpl
>-%%DATADIR%%/webadmin/skins/graphiX/ListUsers.tmpl
>-%%DATADIR%%/webadmin/skins/graphiX/Main.tmpl
>-%%DATADIR%%/webadmin/skins/graphiX/Settings.tmpl
>-%%DATADIR%%/webadmin/skins/graphiX/UserPage.tmpl
>-%%DATADIR%%/webadmin/skins/graphiX/data/favicon.ico
>-%%DATADIR%%/webadmin/skins/graphiX/data/graphix_bg.jpg
>-%%DATADIR%%/webadmin/skins/graphiX/data/graphix_header.jpg
>-%%DATADIR%%/webadmin/skins/graphiX/data/main.css
>-%%DATADIR%%/webadmin/skins/ice/Channel.tmpl
>-%%DATADIR%%/webadmin/skins/ice/Error.tmpl
>-%%DATADIR%%/webadmin/skins/ice/Footer.tmpl
>-%%DATADIR%%/webadmin/skins/ice/Header.tmpl
>-%%DATADIR%%/webadmin/skins/ice/ListUsers.tmpl
>-%%DATADIR%%/webadmin/skins/ice/Main.tmpl
>-%%DATADIR%%/webadmin/skins/ice/Settings.tmpl
>-%%DATADIR%%/webadmin/skins/ice/UserPage.tmpl
>-%%DATADIR%%/webadmin/skins/ice/data/favicon.ico
>-%%DATADIR%%/webadmin/skins/ice/data/linkbg.jpg
>-%%DATADIR%%/webadmin/skins/ice/data/main.css
>-%%DATADIR%%/webadmin/skins/ice/data/pagebg.gif
>-@dirrm %%DATADIR%%/webadmin/skins/ice/data
>-@dirrm %%DATADIR%%/webadmin/skins/ice
>-@dirrm %%DATADIR%%/webadmin/skins/graphiX/data
>-@dirrm %%DATADIR%%/webadmin/skins/graphiX
>-@dirrm %%DATADIR%%/webadmin/skins/default/data
>-@dirrm %%DATADIR%%/webadmin/skins/default
>-@dirrm %%DATADIR%%/webadmin/skins/dark-clouds/data
>-@dirrm %%DATADIR%%/webadmin/skins/dark-clouds
>-@dirrm %%DATADIR%%/webadmin/skins
>-@dirrm %%DATADIR%%/webadmin
>-@dirrm %%DATADIR%%
>-@dirrm lib/znc
>+%%MODULES%%lib/znc/admin.so
>+%%MODULES%%lib/znc/adminlog.so
>+%%MODULES%%lib/znc/autoattach.so
>+%%MODULES%%lib/znc/autocycle.so
>+%%MODULES%%lib/znc/autoop.so
>+%%MODULES%%lib/znc/autoreply.so
>+%%MODULES%%lib/znc/awaynick.so
>+%%MODULES%%lib/znc/buffextras.so
>+%%MODULES%%lib/znc/chansaver.so
>+%%MODULES%%lib/znc/email.so
>+%%MODULES%%lib/znc/fail2ban.so
>+%%MODULES%%lib/znc/fixfreenode.so
>+%%MODULES%%lib/znc/imapauth.so
>+%%MODULES%%lib/znc/keepnick.so
>+%%MODULES%%lib/znc/kickrejoin.so
>+%%MODULES%%lib/znc/nickserv.so
>+%%MODULES%%lib/znc/partyline.so
>+%%MODULES%%lib/znc/perform.so
>+%%MODULES%%lib/znc/q.so
>+%%MODULES%%lib/znc/raw.so
>+%%MODULES%%lib/znc/route_replies.so
>+%%MODULES%%lib/znc/sample.so
>+%%MODULES%%lib/znc/shell.so
>+%%MODULES%%lib/znc/simple_away.so
>+%%MODULES%%lib/znc/stickychan.so
>+%%MODULES%%lib/znc/watch.so
>+%%MODULES%%lib/znc/webadmin.so
>+%%MODULES%%share/znc/webadmin/skins/dark-clouds/data/favicon.ico
>+%%MODULES%%share/znc/webadmin/skins/dark-clouds/data/clouds-header.jpg
>+%%MODULES%%share/znc/webadmin/skins/dark-clouds/data/main.css
>+%%MODULES%%share/znc/webadmin/skins/dark-clouds/Footer.tmpl
>+%%MODULES%%share/znc/webadmin/skins/dark-clouds/ListUsers.tmpl
>+%%MODULES%%share/znc/webadmin/skins/dark-clouds/UserPage.tmpl
>+%%MODULES%%share/znc/webadmin/skins/dark-clouds/Error.tmpl
>+%%MODULES%%share/znc/webadmin/skins/dark-clouds/Channel.tmpl
>+%%MODULES%%share/znc/webadmin/skins/dark-clouds/Header.tmpl
>+%%MODULES%%share/znc/webadmin/skins/dark-clouds/Settings.tmpl
>+%%MODULES%%share/znc/webadmin/skins/dark-clouds/Main.tmpl
>+%%MODULES%%share/znc/webadmin/skins/default/data/favicon.ico
>+%%MODULES%%share/znc/webadmin/skins/default/data/main.css
>+%%MODULES%%share/znc/webadmin/skins/default/Footer.tmpl
>+%%MODULES%%share/znc/webadmin/skins/default/ListUsers.tmpl
>+%%MODULES%%share/znc/webadmin/skins/default/UserPage.tmpl
>+%%MODULES%%share/znc/webadmin/skins/default/Error.tmpl
>+%%MODULES%%share/znc/webadmin/skins/default/Header.tmpl
>+%%MODULES%%share/znc/webadmin/skins/default/Channel.tmpl
>+%%MODULES%%share/znc/webadmin/skins/default/Settings.tmpl
>+%%MODULES%%share/znc/webadmin/skins/default/Main.tmpl
>+%%MODULES%%share/znc/webadmin/skins/graphiX/data/favicon.ico
>+%%MODULES%%share/znc/webadmin/skins/graphiX/data/main.css
>+%%MODULES%%share/znc/webadmin/skins/graphiX/data/graphix_header.jpg
>+%%MODULES%%share/znc/webadmin/skins/graphiX/data/graphix_bg.jpg
>+%%MODULES%%share/znc/webadmin/skins/graphiX/Footer.tmpl
>+%%MODULES%%share/znc/webadmin/skins/graphiX/ListUsers.tmpl
>+%%MODULES%%share/znc/webadmin/skins/graphiX/UserPage.tmpl
>+%%MODULES%%share/znc/webadmin/skins/graphiX/Error.tmpl
>+%%MODULES%%share/znc/webadmin/skins/graphiX/Header.tmpl
>+%%MODULES%%share/znc/webadmin/skins/graphiX/Channel.tmpl
>+%%MODULES%%share/znc/webadmin/skins/graphiX/Settings.tmpl
>+%%MODULES%%share/znc/webadmin/skins/graphiX/Main.tmpl
>+%%MODULES%%share/znc/webadmin/skins/ice/data/favicon.ico
>+%%MODULES%%share/znc/webadmin/skins/ice/data/main.css
>+%%MODULES%%share/znc/webadmin/skins/ice/data/pagebg.gif
>+%%MODULES%%share/znc/webadmin/skins/ice/data/linkbg.jpg
>+%%MODULES%%share/znc/webadmin/skins/ice/Footer.tmpl
>+%%MODULES%%share/znc/webadmin/skins/ice/ListUsers.tmpl
>+%%MODULES%%share/znc/webadmin/skins/ice/UserPage.tmpl
>+%%MODULES%%share/znc/webadmin/skins/ice/Error.tmpl
>+%%MODULES%%share/znc/webadmin/skins/ice/Header.tmpl
>+%%MODULES%%share/znc/webadmin/skins/ice/Channel.tmpl
>+%%MODULES%%share/znc/webadmin/skins/ice/Settings.tmpl
>+%%MODULES%%share/znc/webadmin/skins/ice/Main.tmpl
>+%%MODULES%%%%EXTRA%%lib/znc/log.so
>+%%MODULES%%%%EXTRA%%lib/znc/antiidle.so
>+%%MODULES%%%%EXTRA%%lib/znc/autovoice.so
>+%%MODULES%%%%EXTRA%%lib/znc/blockuser.so
>+%%MODULES%%%%EXTRA%%lib/znc/connect_throttle.so
>+%%MODULES%%%%EXTRA%%lib/znc/ctcpflood.so
>+%%MODULES%%%%EXTRA%%lib/znc/discon_kick.so
>+%%MODULES%%%%EXTRA%%lib/znc/droproot.so
>+%%MODULES%%%%EXTRA%%lib/znc/fakeonline.so
>+%%MODULES%%%%EXTRA%%lib/znc/lastseen.so
>+%%MODULES%%%%EXTRA%%lib/znc/listsockets.so
>+%%MODULES%%%%EXTRA%%lib/znc/motdfile.so
>+%%MODULES%%%%EXTRA%%lib/znc/notify_connect.so
>+%%MODULES%%%%EXTRA%%lib/znc/send_raw.so
>+%%MODULES%%%%OPENSSL%%lib/znc/away.so
>+%%MODULES%%%%OPENSSL%%lib/znc/crypt.so
>+%%MODULES%%%%OPENSSL%%lib/znc/savebuff.so
>+%%MODULES%%%%OPENSSL%%lib/znc/schat.so
>+%%MODULES%%%%PERL%%lib/znc/modperl.pm
>+%%MODULES%%%%PERL%%lib/znc/modperl.so
>+%%MODULES%%%%SASL%%lib/znc/saslauth.so
>+%%MODULES%%%%TCL%%lib/znc/modtcl.so
>+%%MODULES%%%%TCL%%share/znc/modtcl/modtcl.tcl
>+%%MODULES%%%%TCL%%share/znc/modtcl/binds.tcl
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/znc.conf
>+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
> @dirrm include/znc
>+@dirrmtry lib/znc
>+@dirrmtry share/znc/webadmin/skins/ice/data
>+@dirrmtry share/znc/webadmin/skins/ice
>+@dirrmtry share/znc/webadmin/skins/graphiX/data
>+@dirrmtry share/znc/webadmin/skins/graphiX
>+@dirrmtry share/znc/webadmin/skins/default/data
>+@dirrmtry share/znc/webadmin/skins/default
>+@dirrmtry share/znc/webadmin/skins/dark-clouds/data
>+@dirrmtry share/znc/webadmin/skins/dark-clouds
>+@dirrmtry share/znc/webadmin/skins
>+@dirrmtry share/znc/webadmin
>+@dirrmtry share/znc/modtcl
>+@dirrmtry share/znc

Actions: View | Diff

Attachments on bug 141711: 102032