diff options
Diffstat (limited to 'chat/scrollz')
| -rw-r--r-- | chat/scrollz/Makefile | 36 | ||||
| -rw-r--r-- | chat/scrollz/PLIST | 72 | ||||
| -rw-r--r-- | chat/scrollz/distinfo | 14 | ||||
| -rw-r--r-- | chat/scrollz/options.mk | 65 | ||||
| -rw-r--r-- | chat/scrollz/patches/patch-Makefile.in | 17 | ||||
| -rw-r--r-- | chat/scrollz/patches/patch-aa | 6 | ||||
| -rw-r--r-- | chat/scrollz/patches/patch-source_input.c | 26 | ||||
| -rw-r--r-- | chat/scrollz/patches/patch-source_screen.c | 15 | ||||
| -rw-r--r-- | chat/scrollz/patches/patch-source_translat.c | 24 |
9 files changed, 192 insertions, 83 deletions
diff --git a/chat/scrollz/Makefile b/chat/scrollz/Makefile index b15db662641..51e202450e4 100644 --- a/chat/scrollz/Makefile +++ b/chat/scrollz/Makefile @@ -1,35 +1,29 @@ -# $NetBSD: Makefile,v 1.18 2014/02/12 23:17:37 tron Exp $ +# $NetBSD: Makefile,v 1.19 2015/07/27 22:31:30 wiz Exp $ # -DISTNAME= ScrollZ-1.9.5 -PKGNAME= scrollz-1.9.5 -PKGREVISION= 1 +DISTNAME= ScrollZ-2.2.3 +PKGNAME= ${DISTNAME:tl} CATEGORIES= chat -MASTER_SITES= ftp://ftp.scrollz.com/pub/ScrollZ/source/ +MASTER_SITES= http://www.scrollz.info/download/ MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://www.scrollz.com/ +HOMEPAGE= http://www.scrollz.info/ COMMENT= Advanced IRC client based on ircII client -LICENSE= 2-clause-bsd +LICENSE= modified-bsd # XXX ? -MAKE_JOBS_SAFE= no +MAKE_JOBS_SAFE= no GNU_CONFIGURE= yes -INSTALLATION_DIRS+= ${PKGMANDIR}/man1 +SUBST_CLASSES+= mandir +SUBST_FILES.mandir= Makefile.in +SUBST_MESSAGE.mandir= Fixing PKGMANDIR path. +SUBST_SED.mandir= -e 's|@prefix@/share/man/man1|@mandir@/man1|1' +SUBST_STAGE.mandir= pre-configure -PKG_OPTIONS_VAR= PKG_OPTIONS.scrollz -PKG_SUPPORTED_OPTIONS= inet6 ssl -PKG_SUGGESTED_OPTIONS= inet6 ssl +.include "options.mk" -.include "../../mk/bsd.options.mk" - -.if !empty(PKG_OPTIONS:Minet6) -CONFIGURE_ARGS+= --enable-ipv6 -.endif -.if !empty(PKG_OPTIONS:Mssl) -CONFIGURE_ARGS+= --with-ssl -.include "../../security/openssl/buildlink3.mk" -.endif +post-install: + ${CHMOD} -x ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/scrollz.1 .include "../../mk/bsd.pkg.mk" diff --git a/chat/scrollz/PLIST b/chat/scrollz/PLIST index 45e981b48b9..b0183e44bc7 100644 --- a/chat/scrollz/PLIST +++ b/chat/scrollz/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2009/06/14 18:28:44 joerg Exp $ +@comment $NetBSD: PLIST,v 1.7 2015/07/27 22:31:30 wiz Exp $ bin/scrollz bin/${PKGNAME} man/man1/scrollz.1 @@ -12,6 +12,7 @@ share/scrollz/help/addchan share/scrollz/help/addf share/scrollz/help/addfchan share/scrollz/help/addfflag +share/scrollz/help/addmon share/scrollz/help/addn share/scrollz/help/adds share/scrollz/help/addw @@ -34,9 +35,11 @@ share/scrollz/help/awayencr share/scrollz/help/awaysave share/scrollz/help/awayt share/scrollz/help/ban +share/scrollz/help/bantime share/scrollz/help/bantype share/scrollz/help/basics share/scrollz/help/beep +share/scrollz/help/bind/accept_last_chat share/scrollz/help/bind/backspace share/scrollz/help/bind/backward_character share/scrollz/help/bind/backward_history @@ -59,6 +62,7 @@ share/scrollz/help/bind/forward_character share/scrollz/help/bind/forward_history share/scrollz/help/bind/forward_word share/scrollz/help/bind/help_character +share/scrollz/help/bind/insert_autoreply share/scrollz/help/bind/insert_tabkey_next share/scrollz/help/bind/insert_tabkey_prev share/scrollz/help/bind/keys @@ -75,6 +79,8 @@ share/scrollz/help/bind/next_window share/scrollz/help/bind/nothing share/scrollz/help/bind/parse_command share/scrollz/help/bind/previous_window +share/scrollz/help/bind/push_empty_stack +share/scrollz/help/bind/push_line share/scrollz/help/bind/quit_irc share/scrollz/help/bind/quote_character share/scrollz/help/bind/refresh_inputline @@ -145,6 +151,7 @@ share/scrollz/help/chpass share/scrollz/help/chsignoff share/scrollz/help/cjoin share/scrollz/help/clear +share/scrollz/help/clearmon share/scrollz/help/cleartab share/scrollz/help/color share/scrollz/help/commands @@ -240,6 +247,7 @@ share/scrollz/help/j share/scrollz/help/join share/scrollz/help/k share/scrollz/help/keys +share/scrollz/help/keyx share/scrollz/help/kick share/scrollz/help/kickonban share/scrollz/help/kickonflood @@ -257,6 +265,7 @@ share/scrollz/help/links share/scrollz/help/list share/scrollz/help/listbk share/scrollz/help/listf +share/scrollz/help/listmon share/scrollz/help/listn share/scrollz/help/lists share/scrollz/help/listw @@ -284,6 +293,7 @@ share/scrollz/help/mload share/scrollz/help/mode share/scrollz/help/modelock share/scrollz/help/modeunlock +share/scrollz/help/monitor share/scrollz/help/mop share/scrollz/help/motd share/scrollz/help/mreop @@ -428,6 +438,7 @@ share/scrollz/help/remf share/scrollz/help/remfchan share/scrollz/help/remfflag share/scrollz/help/remlog +share/scrollz/help/remmon share/scrollz/help/remn share/scrollz/help/rems share/scrollz/help/remw @@ -446,6 +457,7 @@ share/scrollz/help/servlist share/scrollz/help/servnotice share/scrollz/help/set/always_split_biggest share/scrollz/help/set/auto_reconnect +share/scrollz/help/set/auto_reconnect_channels share/scrollz/help/set/auto_unmark_away share/scrollz/help/set/auto_whowas share/scrollz/help/set/away_file @@ -456,6 +468,7 @@ share/scrollz/help/set/beep_on_mail share/scrollz/help/set/beep_on_msg share/scrollz/help/set/beep_when_away share/scrollz/help/set/bold_video +share/scrollz/help/set/chanlog_strip_ansi share/scrollz/help/set/channel_name_width share/scrollz/help/set/client_information share/scrollz/help/set/clock @@ -468,12 +481,17 @@ share/scrollz/help/set/ctcp_reply_backlog_seconds share/scrollz/help/set/ctcp_reply_flood_size share/scrollz/help/set/ctcp_reply_ignore_seconds share/scrollz/help/set/dcc_block_size +share/scrollz/help/set/dcc_host share/scrollz/help/set/dcc_ports share/scrollz/help/set/debug share/scrollz/help/set/decrypt_program +share/scrollz/help/set/default_protocol share/scrollz/help/set/display share/scrollz/help/set/display_ansi +share/scrollz/help/set/display_encoding share/scrollz/help/set/eight_bit_characters +share/scrollz/help/set/encrypt_pad_msgs +share/scrollz/help/set/encrypt_pad_public share/scrollz/help/set/encrypt_program share/scrollz/help/set/exec_protection share/scrollz/help/set/flood_after @@ -497,11 +515,14 @@ share/scrollz/help/set/hold_mode_max share/scrollz/help/set/hyper_dcc share/scrollz/help/set/indent share/scrollz/help/set/input_aliases +share/scrollz/help/set/input_encoding share/scrollz/help/set/input_prompt share/scrollz/help/set/input_protection share/scrollz/help/set/insert_mode share/scrollz/help/set/inverse_video +share/scrollz/help/set/irc_encoding share/scrollz/help/set/irchost +share/scrollz/help/set/iso2022_support share/scrollz/help/set/lastlog share/scrollz/help/set/lastlog_ansi share/scrollz/help/set/lastlog_level @@ -516,21 +537,26 @@ share/scrollz/help/set/max_wallop_nicks share/scrollz/help/set/menu share/scrollz/help/set/minimum_servers share/scrollz/help/set/minimum_users +share/scrollz/help/set/netsplit_time share/scrollz/help/set/no_ask_nickname share/scrollz/help/set/no_ctcp_flood share/scrollz/help/set/notify_handler share/scrollz/help/set/notify_level share/scrollz/help/set/notify_on_termination +share/scrollz/help/set/notify_show_name share/scrollz/help/set/notify_string share/scrollz/help/set/novice share/scrollz/help/set/old_encrypt_program share/scrollz/help/set/pause_after_motd +share/scrollz/help/set/rate_limit_join share/scrollz/help/set/realname share/scrollz/help/set/same_window_only +share/scrollz/help/set/save_encryption_keys share/scrollz/help/set/scroll share/scrollz/help/set/scroll_lines share/scrollz/help/set/scrollz_string share/scrollz/help/set/send_ignore_msg +share/scrollz/help/set/send_userhost_on_nick_in_use share/scrollz/help/set/set share/scrollz/help/set/shell share/scrollz/help/set/shell_flags @@ -552,14 +578,19 @@ share/scrollz/help/set/status_format share/scrollz/help/set/status_hold share/scrollz/help/set/status_hold_lines share/scrollz/help/set/status_insert +share/scrollz/help/set/status_lines share/scrollz/help/set/status_loadavg share/scrollz/help/set/status_mail share/scrollz/help/set/status_mode share/scrollz/help/set/status_notify +share/scrollz/help/set/status_notify_repw_end_var +share/scrollz/help/set/status_notify_repw_start_var share/scrollz/help/set/status_oper share/scrollz/help/set/status_overwrite share/scrollz/help/set/status_query share/scrollz/help/set/status_reverse +share/scrollz/help/set/status_scrolled +share/scrollz/help/set/status_scrolled_lines share/scrollz/help/set/status_server share/scrollz/help/set/status_umode share/scrollz/help/set/status_uptime @@ -568,12 +599,12 @@ share/scrollz/help/set/status_voice share/scrollz/help/set/status_window share/scrollz/help/set/suppress_server_motd share/scrollz/help/set/tab_max -share/scrollz/help/set/translation +share/scrollz/help/set/trace share/scrollz/help/set/truncate_public_channel share/scrollz/help/set/underline_video -share/scrollz/help/set/use_old_msg share/scrollz/help/set/user_information share/scrollz/help/set/user_wallops +share/scrollz/help/set/username share/scrollz/help/set/verbose_ctcp share/scrollz/help/set/warn_of_ignores share/scrollz/help/set/xterm_geomoptstr @@ -583,6 +614,7 @@ share/scrollz/help/setaway share/scrollz/help/setback share/scrollz/help/settings share/scrollz/help/showaway +share/scrollz/help/showchan share/scrollz/help/showidle share/scrollz/help/showkill share/scrollz/help/shownick @@ -679,42 +711,10 @@ share/scrollz/help/window/sticky share/scrollz/help/window/swap share/scrollz/help/window/title share/scrollz/help/window/unbind +share/scrollz/help/window/unname share/scrollz/help/window/window share/scrollz/help/wkill share/scrollz/help/ww share/scrollz/help/xecho share/scrollz/help/xtype -share/scrollz/translation/ASCII -share/scrollz/translation/CP437 -share/scrollz/translation/CP850 -share/scrollz/translation/DANISH -share/scrollz/translation/DEC_MCS -share/scrollz/translation/DG_MCS -share/scrollz/translation/DUTCH -share/scrollz/translation/FINNISH -share/scrollz/translation/FRENCH -share/scrollz/translation/FRENCH_CANADIAN -share/scrollz/translation/GERMAN -share/scrollz/translation/HP_MCS -share/scrollz/translation/IRV -share/scrollz/translation/ITALIAN -share/scrollz/translation/JIS -share/scrollz/translation/MACINTOSH -share/scrollz/translation/NEXT -share/scrollz/translation/NORWEGIAN_1 -share/scrollz/translation/NORWEGIAN_2 -share/scrollz/translation/POLISH -share/scrollz/translation/POLISH_NOPL -share/scrollz/translation/PORTUGUESE -share/scrollz/translation/PORTUGUESE_COM -share/scrollz/translation/RUSSIAN -share/scrollz/translation/RUSSIAN_ALT -share/scrollz/translation/RUSSIAN_WIN -share/scrollz/translation/SPANISH -share/scrollz/translation/SWEDISH -share/scrollz/translation/SWEDISH_NAMES -share/scrollz/translation/SWEDISH_NAMES_COM -share/scrollz/translation/SWISS -share/scrollz/translation/UNITED_KINGDOM -share/scrollz/translation/UNITED_KINGDOM_COM @pkgdir share/scrollz/script diff --git a/chat/scrollz/distinfo b/chat/scrollz/distinfo index 860d3df9e91..46af3c2bf01 100644 --- a/chat/scrollz/distinfo +++ b/chat/scrollz/distinfo @@ -1,7 +1,9 @@ -$NetBSD: distinfo,v 1.9 2013/04/22 21:18:45 zafer Exp $ +$NetBSD: distinfo,v 1.10 2015/07/27 22:31:30 wiz Exp $ -SHA1 (ScrollZ-1.9.5.tar.gz) = 33496b0e8f4e87b3de9ce78a47d5b77b66b155c0 -RMD160 (ScrollZ-1.9.5.tar.gz) = 8817697f6c47f47bcecef196793cb1cffc0031ba -Size (ScrollZ-1.9.5.tar.gz) = 906167 bytes -SHA1 (patch-Makefile.in) = 81bf541e740e1ee855d6e2b43a8eb75892416f5c -SHA1 (patch-aa) = 8c30f9e340a291ff2badcf733861f74e4a44f413 +SHA1 (ScrollZ-2.2.3.tar.gz) = 81acfc32f13369e30878ead9f52c598f62f90abd +RMD160 (ScrollZ-2.2.3.tar.gz) = eb0e8eabb200c20b86b206e22f4a62ec08032be2 +Size (ScrollZ-2.2.3.tar.gz) = 948958 bytes +SHA1 (patch-aa) = da3ce0d9f5e9169def974c2d9cf190833963b9b8 +SHA1 (patch-source_input.c) = 76f2c7b8badf061b8763c95ec668149ad198a3eb +SHA1 (patch-source_screen.c) = f4165aeb2d6c7c51cb506ea7d689fcddf06a8f10 +SHA1 (patch-source_translat.c) = 281e55cc33bf26dfde9abdc56eccf228c5baa732 diff --git a/chat/scrollz/options.mk b/chat/scrollz/options.mk new file mode 100644 index 00000000000..448f7bb1eeb --- /dev/null +++ b/chat/scrollz/options.mk @@ -0,0 +1,65 @@ +# $NetBSD: options.mk,v 1.1 2015/07/27 22:31:30 wiz Exp $ + +PKG_OPTIONS_VAR= PKG_OPTIONS.scrollz +PKG_SUPPORTED_OPTIONS= efence inet6 regexp utf8 +PKG_SUGGESTED_OPTIONS+= efence inet6 +PKG_OPTIONS_OPTIONAL_GROUPS= socks ssl +PKG_OPTIONS_GROUP.socks= socks4 socks5 +PKG_OPTIONS_GROUP.ssl= gnutls openssl + +.include "../../mk/bsd.options.mk" + +.if !empty(PKG_OPTIONS:Mefence) +.include "../../devel/electric-fence/buildlink3.mk" +CONFIGURE_ARGS+= --with-efence +.else +CONFIGURE_ARGS+= --disable-efence +.endif + +.if !empty(PKG_OPTIONS:Mgnutls) +.include "../../security/gnutls/buildlink3.mk" +CONFIGURE_ARGS+= --enable-fish --with-ssl +.else +CONFIGURE_ARGS+= --disable-fish --without-ssl +.endif + +.if !empty(PKG_OPTIONS:Minet6) +CONFIGURE_ARGS+= --enable-ipv6 +.else +CONFIGURE_ARGS+= --disable-ipv6 +.endif + +.if !empty(PKG_OPTIONS:Mopenssl) +.include "../../security/openssl/buildlink3.mk" +CONFIGURE_ARGS+= --disable-fish --with-openssl +.else +CONFIGURE_ARGS+= --without-openssl +.endif + +.if !empty(PKG_OPTIONS:Mregexp) +CONFIGURE_ARGS+= --enable-regexp +.else +CONFIGURE_ARGS+= --disable-regexp +.endif + +.if !empty(PKG_OPTIONS:Msocks4) +.include "../../net/socks4/buildlink3.mk" +CONFIGURE_ARGS+= --with-socks4=${BUILDLINK_PREFIX.socks4} +.else +CONFIGURE_ARGS+= --disable-socks4 +.endif + +.if !empty(PKG_OPTIONS:Msocks5) +.include "../../net/socks5/buildlink3.mk" +CONFIGURE_ARGS+= --with-socks5=${BUILDLINK_PREFIX.socks5} +.else +CONFIGURE_ARGS+= --disable-socks5 +.endif + +.if !empty(PKG_OPTIONS:Mutf8) +.include "../../converters/libiconv/buildlink3.mk" +CONFIGURE_ARGS+= --enable-utf8 +LIBS+= -liconv +.else +CONFIGURE_ARGS+= --disable-utf8 +.endif diff --git a/chat/scrollz/patches/patch-Makefile.in b/chat/scrollz/patches/patch-Makefile.in deleted file mode 100644 index f9b902cac3e..00000000000 --- a/chat/scrollz/patches/patch-Makefile.in +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-Makefile.in,v 1.2 2013/04/22 21:18:45 zafer Exp $ - -Fix destdir build. - ---- Makefile.in.orig 2004-05-12 17:53:07.000000000 +0200 -+++ Makefile.in 2012-01-21 01:44:49.816033366 +0100 -@@ -216,8 +216,8 @@ installdirs: - - installhelp: - $(INSTALL_HELP_CMD) -- find $(HELP_DIR) -type d -print | xargs chmod a+rx -- find $(HELP_DIR) -type f -print | xargs chmod a+r -+ find $(DESTDIR)/$(HELP_DIR) -type d -print | xargs chmod a+rx -+ find $(DESTDIR)$(HELP_DIR) -type f -print | xargs chmod a+r - - installtranslation: installdirs - $(INSTALL_TRANSLATION_CMD) diff --git a/chat/scrollz/patches/patch-aa b/chat/scrollz/patches/patch-aa index a3ad447e047..525cfc145b8 100644 --- a/chat/scrollz/patches/patch-aa +++ b/chat/scrollz/patches/patch-aa @@ -1,9 +1,9 @@ -$NetBSD: patch-aa,v 1.4 2007/09/29 12:18:16 rillig Exp $ +$NetBSD: patch-aa,v 1.5 2015/07/27 22:31:30 wiz Exp $ Prototypes must match exactly, says gcc4. ---- source/rijndael-alg-ref.c.orig 2002-01-21 22:37:36.000000000 +0100 -+++ source/rijndael-alg-ref.c 2007-09-29 14:16:54.000000000 +0200 +--- source/rijndael-alg-ref.c.orig 2011-04-29 08:21:18.000000000 +0000 ++++ source/rijndael-alg-ref.c @@ -36,11 +36,11 @@ static word8 shifts[3][4][2] = { }; diff --git a/chat/scrollz/patches/patch-source_input.c b/chat/scrollz/patches/patch-source_input.c new file mode 100644 index 00000000000..335cd1fb38f --- /dev/null +++ b/chat/scrollz/patches/patch-source_input.c @@ -0,0 +1,26 @@ +$NetBSD: patch-source_input.c,v 1.1 2015/07/27 22:31:30 wiz Exp $ + +Fixes incompatible pointer type error. + +--- source/input.c.orig 2011-04-29 08:21:18.000000000 +0000 ++++ source/input.c +@@ -857,8 +857,8 @@ re_encode: + else + /****************************************************************************/ + retval = iconv(mbdata.conv_in, +- &iptr, &isize, +- (char **)&optr, &osize); ++ (const char**)&iptr, &isize, ++ &optr, &osize); + + if (retval == (size_t)-1) + { +@@ -1010,7 +1010,7 @@ get_input() + size_t retval; + + retval = iconv(conv, +- &source, &left, ++ (const char**)&source, &left, + &dest, &space); + if (retval == (size_t)-1) + { diff --git a/chat/scrollz/patches/patch-source_screen.c b/chat/scrollz/patches/patch-source_screen.c new file mode 100644 index 00000000000..bf99720f7f9 --- /dev/null +++ b/chat/scrollz/patches/patch-source_screen.c @@ -0,0 +1,15 @@ +$NetBSD: patch-source_screen.c,v 1.1 2015/07/27 22:31:30 wiz Exp $ + +Fixes incompatible pointer type error. + +--- source/screen.c.orig 2011-04-29 08:21:18.000000000 +0000 ++++ source/screen.c +@@ -613,7 +613,7 @@ display_text(ustr, length) + else + { + retval = iconv(converter, +- &str, &length, ++ (const char**)&str, &length, + &outptr, &outsize); + } + diff --git a/chat/scrollz/patches/patch-source_translat.c b/chat/scrollz/patches/patch-source_translat.c new file mode 100644 index 00000000000..2a33475ea43 --- /dev/null +++ b/chat/scrollz/patches/patch-source_translat.c @@ -0,0 +1,24 @@ +$NetBSD: patch-source_translat.c,v 1.1 2015/07/27 22:31:30 wiz Exp $ + +Fixes incompatible pointer type error. + +--- source/translat.c.orig 2011-04-29 08:21:18.000000000 +0000 ++++ source/translat.c +@@ -379,7 +379,7 @@ displayable_unival(unsigned unival, icon + + /* *outptr = '\0'; */ + retval = iconv(conv_out, +- (iconv_const char**)&utfptr, &utfspace, ++ (const char**)&utfptr, &utfspace, + (char **)&outptr, &outspace); + + /* +@@ -598,7 +598,7 @@ decode_mb(ptr, dest, data) + cptr = (char *)ptr; + cutfptr = (char *)utfptr; + retval = iconv(data->conv_in, +- (iconv_const char**)&ptr, &is, ++ (const char**)&ptr, &is, + (char **)&utfptr, &utfspace); + + data->input_bytes += gave-is; |