Created attachment 153555 [details] irc/znc-1.4 -> 1.6.0 port patch See attached patch. Version bump to 1.6.0, added an option to the makefile to pull in devel/icu if the user wants character encoding support, updated SWIG dependencies, 1.6.0 depends on SWIG 3.0. Apologies if pkg-plist is a bit messy. On my system, the swig package was registered in pkg as 'swig30' from the devel/swig30 port, i'm unsure if this is incorrect (previous versions of this port had the dependency as swig>=2.0.11:devel/swig20). Redid the Makefile.in patch under files/ as the build failed due to the patch not applying cleanly.
Auto-assigned to maintainer jase@FreeBSD.org
Created attachment 153557 [details] irc/znc 1.4 -> 1.6.0 patch (correct dependencies) My sincerest apologies, I'd marked devel/icu as a build dependency for the CHARSET port option when it was in fact a library dependency. Attached is the patch with the correct dependency information present.
Created attachment 153586 [details] irc/znc 1.4 -> 1.6.0 patch This is embarrassing; the pkg-plist I'd submitted also omitted includes/znc/zncconfig.h, breaking `znc-buildmod`. This is my first ports PR, I'm terribly sorry for the mistakes in previous patches I provided.
(In reply to Matthew Connelly from comment #3) Next time just run 'make makeplist' to update the plist, or add/remove as needed please. Your patch reorders it a lot into a weird order and makes the change much less clear. Compare to my version: Index: pkg-plist =================================================================== --- pkg-plist (revision 380615) +++ pkg-plist (working copy) @@ -1,5 +1,6 @@ bin/znc bin/znc-buildmod +etc/rc.d/znc include/znc/Buffer.h include/znc/Chan.h include/znc/Client.h @@ -14,7 +15,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 +33,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 @@ -36,15 +40,18 @@ lib/znc/autoreply.so lib/znc/autovoice.so lib/znc/awaynick.so +lib/znc/awaystore.so lib/znc/block_motd.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/charset.so lib/znc/clearbufferonmsg.so lib/znc/clientnotify.so lib/znc/controlpanel.so +lib/znc/crypt.so lib/znc/ctcpflood.so lib/znc/dcc.so lib/znc/disconkick.so @@ -69,6 +76,8 @@ lib/znc/route_replies.so lib/znc/sample.so lib/znc/sasl.so +lib/znc/savebuff.so +lib/znc/schat.so lib/znc/send_raw.so lib/znc/shell.so lib/znc/simple_away.so @@ -106,10 +115,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 +127,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
A commit references this bug: Author: bdrewery Date: Wed Mar 11 16:04:51 UTC 2015 New revision: 381014 URL: https://svnweb.freebsd.org/changeset/ports/381014 Log: - Update to 1.6.0. This requires a C++11 compiler and library. PR: 198060 Submitted by: Matthew Connelly <freebsd-bugs@maff.im> Approved by: maintainer timeout Changes: head/irc/znc/Makefile head/irc/znc/distinfo head/irc/znc/files/patch-modules-modperl-Makefile_inc head/irc/znc/pkg-plist
Committed, Thanks!