From 31c9530add60998bc51b7e5717f3595313bcfddf Mon Sep 17 00:00:00 2001 From: kili Date: Sun, 6 Nov 2011 20:27:14 +0000 Subject: [PATCH] Update to znc-0.202. From Brad (maintainer). --- net/znc/Makefile | 13 +++-- net/znc/distinfo | 10 ++-- net/znc/patches/patch-man_Makefile_in | 8 +-- net/znc/pkg/PLIST | 76 +++++++++++++++------------ 4 files changed, 58 insertions(+), 49 deletions(-) diff --git a/net/znc/Makefile b/net/znc/Makefile index 8a6c6396a62..d0d457ad48b 100644 --- a/net/znc/Makefile +++ b/net/znc/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.11 2011/05/01 11:28:10 sthen Exp $ +# $OpenBSD: Makefile,v 1.12 2011/11/06 20:27:14 kili Exp $ SHARED_ONLY= Yes COMMENT= advanced IRC bouncer -DISTNAME= znc-0.098 +DISTNAME= znc-0.202 CATEGORIES= net MASTER_SITES= ${HOMEPAGE}releases/ @@ -17,20 +17,19 @@ PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes + WANTLIB= c cares crypto m ssl stdc++ LIB_DEPENDS= net/libcares -MAKE_FLAGS+= VERBOSE=1 +MAKE_FLAGS= VERBOSE=1 SEPARATE_BUILD= concurrent USE_GMAKE= Yes CONFIGURE_STYLE= gnu -CONFIGURE_ARGS+= --disable-optimization +CONFIGURE_ARGS= --disable-optimization +CONFIGURE_ENV= ac_cv_path_GNUMAKE=gmake NO_REGRESS= Yes -post-install: - @chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/znc - .include diff --git a/net/znc/distinfo b/net/znc/distinfo index 53f39824624..ccda97cabbd 100644 --- a/net/znc/distinfo +++ b/net/znc/distinfo @@ -1,5 +1,5 @@ -MD5 (znc-0.098.tar.gz) = Vme0rLHwEwnW7e13q6xwDA== -RMD160 (znc-0.098.tar.gz) = FzFVjPDv+4ieG8VcAbsG/aoeBk8= -SHA1 (znc-0.098.tar.gz) = XxoyttA+0BVTT4MbbdeRCgen2DI= -SHA256 (znc-0.098.tar.gz) = O4jTPCHkZKqCyEstw7zVLeyVyHoFK7gK/2M227QEPrQ= -SIZE (znc-0.098.tar.gz) = 637247 +MD5 (znc-0.202.tar.gz) = PG/0Yg4Tnj2XRc1TERurIA== +RMD160 (znc-0.202.tar.gz) = Fo+In26XAkN3ZxES+2HttIfnTZo= +SHA1 (znc-0.202.tar.gz) = uXoelCw62MehYvumiYwGHAetdZQ= +SHA256 (znc-0.202.tar.gz) = SNlef8V8vK7hkrwZiPp9zTVUQoZ3XTsC7k64IupXzBo= +SIZE (znc-0.202.tar.gz) = 654083 diff --git a/net/znc/patches/patch-man_Makefile_in b/net/znc/patches/patch-man_Makefile_in index 407e02c509f..e520a0dde12 100644 --- a/net/znc/patches/patch-man_Makefile_in +++ b/net/znc/patches/patch-man_Makefile_in @@ -1,6 +1,6 @@ -$OpenBSD: patch-man_Makefile_in,v 1.4 2010/11/22 11:16:33 sthen Exp $ ---- man/Makefile.in.orig Mon Aug 23 13:51:40 2010 -+++ man/Makefile.in Wed Nov 10 20:19:22 2010 +$OpenBSD: patch-man_Makefile_in,v 1.5 2011/11/06 20:27:14 kili Exp $ +--- man/Makefile.in.orig Wed Sep 21 16:20:19 2011 ++++ man/Makefile.in Mon Oct 24 00:19:53 2011 @@ -11,7 +11,7 @@ mandir := @mandir@ INSTALL := @INSTALL@ INSTALL_DATA := @INSTALL_DATA@ @@ -15,7 +15,7 @@ $OpenBSD: patch-man_Makefile_in,v 1.4 2010/11/22 11:16:33 sthen Exp $ install: $(MAN1) mkdir -p $(DESTDIR)$(mandir)/man1 - $(INSTALL_DATA) $(MAN1) $(DESTDIR)$(mandir)/man1 -+ cd $(VPATH) && install -m 644 $(MAN1) $(DESTDIR)$(mandir)/man1 ++ cd $(VPATH) && $(INSTALL_DATA) $(MAN1) $(DESTDIR)$(mandir)/man1 uninstall: for file in $(MAN1) ; do \ diff --git a/net/znc/pkg/PLIST b/net/znc/pkg/PLIST index c5d190fe3f2..5c60fe99c85 100644 --- a/net/znc/pkg/PLIST +++ b/net/znc/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.7 2011/05/01 11:28:10 sthen Exp $ +@comment $OpenBSD: PLIST,v 1.8 2011/11/06 20:27:14 kili Exp $ @bin bin/znc bin/znc-buildmod bin/znc-config @@ -6,9 +6,9 @@ include/znc/ include/znc/Buffer.h include/znc/Chan.h include/znc/Client.h +include/znc/Config.h include/znc/Csocket.h -include/znc/DCCBounce.h -include/znc/DCCSock.h +include/znc/ExecSock.h include/znc/FileUtils.h include/znc/HTTPSock.h include/znc/IRCSock.h @@ -23,10 +23,12 @@ include/znc/Template.h include/znc/User.h include/znc/Utils.h include/znc/WebModules.h +include/znc/ZNCDebug.h include/znc/ZNCString.h include/znc/defines.h include/znc/main.h include/znc/znc.h +include/znc/zncconfig.h lib/pkgconfig/znc.pc lib/znc/ lib/znc/admin.so @@ -35,17 +37,18 @@ lib/znc/autoattach.so lib/znc/autocycle.so lib/znc/autoop.so lib/znc/autoreply.so -lib/znc/away.so lib/znc/awaynick.so lib/znc/blockuser.so +lib/znc/bouncedcc.so lib/znc/buffextras.so +lib/znc/cert.so lib/znc/certauth.so lib/znc/chansaver.so lib/znc/clientnotify.so lib/znc/crypt.so lib/znc/disconkick.so lib/znc/fail2ban.so -lib/znc/fixfreenode.so +lib/znc/identfile.so lib/znc/keepnick.so lib/znc/kickrejoin.so lib/znc/lastseen.so @@ -67,34 +70,41 @@ lib/znc/webadmin.so @man man/man1/znc-config.1 @man man/man1/znc.1 share/znc/ -share/znc/blockuser/ -share/znc/blockuser/tmpl/ -share/znc/blockuser/tmpl/blockuser_WebadminUser.tmpl -share/znc/lastseen/ -share/znc/lastseen/tmpl/ -share/znc/lastseen/tmpl/index.tmpl -share/znc/lastseen/tmpl/lastseen_WebadminUser.tmpl -share/znc/notes/ -share/znc/notes/files/ -share/znc/notes/files/trash.gif -share/znc/notes/tmpl/ -share/znc/notes/tmpl/index.tmpl -share/znc/perform/ -share/znc/perform/tmpl/ -share/znc/perform/tmpl/index.tmpl -share/znc/stickychan/ -share/znc/stickychan/tmpl/ -share/znc/stickychan/tmpl/index.tmpl -share/znc/stickychan/tmpl/stickychan_WebadminChan.tmpl -share/znc/webadmin/ -share/znc/webadmin/tmpl/ -share/znc/webadmin/tmpl/add_edit_chan.tmpl -share/znc/webadmin/tmpl/add_edit_user.tmpl -share/znc/webadmin/tmpl/del_user.tmpl -share/znc/webadmin/tmpl/index.tmpl -share/znc/webadmin/tmpl/listusers.tmpl -share/znc/webadmin/tmpl/settings.tmpl -share/znc/webadmin/tmpl/traffic.tmpl +share/znc/modules/ +share/znc/modules/blockuser/ +share/znc/modules/blockuser/tmpl/ +share/znc/modules/blockuser/tmpl/blockuser_WebadminUser.tmpl +share/znc/modules/cert/ +share/znc/modules/cert/tmpl/ +share/znc/modules/cert/tmpl/index.tmpl +share/znc/modules/certauth/ +share/znc/modules/certauth/tmpl/ +share/znc/modules/certauth/tmpl/index.tmpl +share/znc/modules/lastseen/ +share/znc/modules/lastseen/tmpl/ +share/znc/modules/lastseen/tmpl/index.tmpl +share/znc/modules/lastseen/tmpl/lastseen_WebadminUser.tmpl +share/znc/modules/notes/ +share/znc/modules/notes/files/ +share/znc/modules/notes/files/trash.gif +share/znc/modules/notes/tmpl/ +share/znc/modules/notes/tmpl/index.tmpl +share/znc/modules/perform/ +share/znc/modules/perform/tmpl/ +share/znc/modules/perform/tmpl/index.tmpl +share/znc/modules/stickychan/ +share/znc/modules/stickychan/tmpl/ +share/znc/modules/stickychan/tmpl/index.tmpl +share/znc/modules/stickychan/tmpl/stickychan_WebadminChan.tmpl +share/znc/modules/webadmin/ +share/znc/modules/webadmin/tmpl/ +share/znc/modules/webadmin/tmpl/add_edit_chan.tmpl +share/znc/modules/webadmin/tmpl/add_edit_user.tmpl +share/znc/modules/webadmin/tmpl/del_user.tmpl +share/znc/modules/webadmin/tmpl/index.tmpl +share/znc/modules/webadmin/tmpl/listusers.tmpl +share/znc/modules/webadmin/tmpl/settings.tmpl +share/znc/modules/webadmin/tmpl/traffic.tmpl share/znc/webskins/ share/znc/webskins/_default_/ share/znc/webskins/_default_/pub/