On Fri, 17 Jan 2014 14:16:13 +0100, Pascal Stumpf wrote:
> Update to 20131230 snapshot, with UTF-8 support.
>
> Could use some wider testing.
Ouch, of course UTF-8 support needs iconv (thanks naddy@). Since that
adds a dependency to the port, make it a FLAVOR.
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/ircII/Makefile,v
retrieving revision 1.41
diff -u -p -r1.41 Makefile
--- Makefile 11 Mar 2013 11:35:48 -0000 1.41
+++ Makefile 17 Jan 2014 18:15:52 -0000
@@ -2,7 +2,7 @@
COMMENT= Internet Relay Chat client
-VERSION= 20111115
+VERSION= 20131230
DISTNAME= ircii-${VERSION}
PKGNAME= ircII-${VERSION}
CATEGORIES= net
@@ -21,12 +21,21 @@ PERMIT_PACKAGE_CDROM= Yes
WANTLIB= c termcap
+FLAVORS = iconv
+FLAVOR ?=
FAKE_FLAGS= INSTALL_IRC_NAME="ircII" \
INSTALL="${INSTALL_PROGRAM}" INSTALL_DATA="${INSTALL_DATA}"
SEPARATE_BUILD= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ENV= IRCLIB='$${datadir}/ircII'
+
+.if ${FLAVOR:Miconv}
+MODULES = converters/libiconv
+CONFIGURE_ENV +=CPPFLAGS="-I${LOCALBASE}/include" LIBS="-liconv"
+.else
+CONFIGURE_ENV +=ac_cv_func_iconv_open=no
+.endif
NO_TEST= Yes
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/ircII/distinfo,v
retrieving revision 1.14
diff -u -p -r1.14 distinfo
--- distinfo 29 Apr 2012 19:00:14 -0000 1.14
+++ distinfo 17 Jan 2014 18:15:52 -0000
@@ -1,5 +1,2 @@
-MD5 (ircii-20111115.tar.bz2) = QCs7rcIac5TZyE0Vod22xQ==
-RMD160 (ircii-20111115.tar.bz2) = ss3K/P3pFOrYgEnVXA1boGgNt0Y=
-SHA1 (ircii-20111115.tar.bz2) = cj+JymwO8AhdqFgHaGXmST++l4g=
-SHA256 (ircii-20111115.tar.bz2) = XGtDkLjtBM87CKO6cvQeupsSXQ/AnGN/fH+B62vdkeY=
-SIZE (ircii-20111115.tar.bz2) = 555731
+SHA256 (ircii-20131230.tar.bz2) = bv+7tEz64Pf2iNOsOGNm2Xo7XGK77sWiUZcd2nI1Js4=
+SIZE (ircii-20131230.tar.bz2) = 552149
Index: patches/patch-Makefile_in
===================================================================
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Makefile_in 17 Jan 2014 18:15:52 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- Makefile.in.orig Fri Jan 17 18:58:52 2014
++++ Makefile.in Fri Jan 17 18:59:05 2014
+@@ -81,7 +81,7 @@ LIBS = @LIBS@
+
+ # Set this to -g if you want to be able to debug the client, otherwise
+ # use -O to have the compiler do some optimization instead.
+-CFLAGS = @CFLAGS@
++CFLAGS = @CFLAGS@ @CPPFLAGS@
+
+ # Set this to -s if you want the binary to be stripped.
+ LDFLAGS = @LDFLAGS@
Index: patches/patch-configure
===================================================================
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-configure 17 Jan 2014 18:15:52 -0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+--- configure.orig Mon Dec 30 17:42:37 2013
++++ configure Fri Jan 17 18:54:23 2014
+@@ -2322,6 +2322,9 @@ else
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char iconv_open(); below. */
+ #include <assert.h>
++#ifdef __OpenBSD__
++#define iconv_open libiconv_open
++#endif
+ /* Override any gcc2 internal prototype to avoid an error. */
+ /* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
Index: patches/patch-doc_ircII_1
===================================================================
RCS file: /cvs/ports/net/ircII/patches/patch-doc_ircII_1,v
retrieving revision 1.6
diff -u -p -r1.6 patch-doc_ircII_1
--- patches/patch-doc_ircII_1 20 Aug 2011 09:11:51 -0000 1.6
+++ patches/patch-doc_ircII_1 17 Jan 2014 18:15:52 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-doc_ircII_1,v 1.6 2011/08/20 09:11:51 sthen Exp $
---- doc/ircII.1.orig Mon Jan 24 05:58:43 2011
-+++ doc/ircII.1 Sat Aug 13 17:56:49 2011
+--- doc/ircII.1.orig Mon Dec 30 17:42:37 2013
++++ doc/ircII.1 Fri Jan 17 14:09:51 2014
@@ -3,7 +3,7 @@
.SH NAME
ircII \- interface to the Internet Relay Chat system
@@ -10,7 +10,7 @@ $OpenBSD: patch-doc_ircII_1,v 1.6 2011/0
.RB [ \-c
.IR chan ]
.RB [ \-p
-@@ -60,7 +60,7 @@ Load the .ircrc file before connection to a server, no
+@@ -67,7 +67,7 @@ Load the .ircrc file before connection to a server, no
.B \-f
Use flow control (^S and ^Q) to stop/start the display.
Normally these are both bound to other functions within
@@ -19,7 +19,7 @@ $OpenBSD: patch-doc_ircII_1,v 1.6 2011/0
This switch is ignored if the
.B \ -d
switch is used.
-@@ -110,7 +110,7 @@ default: the username).
+@@ -117,7 +117,7 @@ default: the username).
.TP
.I server
Set the list of servers with which
@@ -28,7 +28,7 @@ $OpenBSD: patch-doc_ircII_1,v 1.6 2011/0
will try to connect upon startup.
This list is also used by the program's
.B /server
-@@ -142,9 +142,9 @@ is taken to be the Server Group for this server entry.
+@@ -149,9 +149,9 @@ is taken to be the Server Group for this server entry.
.TP
.BI \-a
This adds the normal
@@ -40,7 +40,7 @@ $OpenBSD: patch-doc_ircII_1,v 1.6 2011/0
servers.
.TP
.BI \-v
-@@ -154,7 +154,7 @@ and exit.
+@@ -161,7 +161,7 @@ and exit.
.TP
.BI \-q
Start up
@@ -49,7 +49,7 @@ $OpenBSD: patch-doc_ircII_1,v 1.6 2011/0
quickly -- don't load the IRCRC file.
.TP
.BI \-h " hostname"
-@@ -208,32 +208,32 @@ need to have a leading slash character '/'.
+@@ -215,32 +215,32 @@ need to have a leading slash character '/'.
This allows predefinition of aliases and other features.
.SH EXAMPLES
.TP
@@ -90,7 +90,7 @@ $OpenBSD: patch-doc_ircII_1,v 1.6 2011/0
Interface
.I IRC
with a program called
-@@ -243,7 +243,7 @@ with a program called
+@@ -250,7 +250,7 @@ with a program called
.br
.B "setenv IRCNAME ""The one and only :)"""
.TP
@@ -99,7 +99,7 @@ $OpenBSD: patch-doc_ircII_1,v 1.6 2011/0
Set the username (if not specified elsewhere) to "Mermaid".
The user's name (when provided inside parentheses in response to a
WHOIS command) is set to "The one and only :)".
-@@ -340,9 +340,6 @@ The initial list of servers if none are provided on th
+@@ -347,9 +347,6 @@ The initial list of servers if none are provided on th
.B ircII.motd
Message of the day.
This file is displayed only once each time it is changed.
Index: patches/patch-source_log_c
===================================================================
RCS file: /cvs/ports/net/ircII/patches/patch-source_log_c,v
retrieving revision 1.2
diff -u -p -r1.2 patch-source_log_c
--- patches/patch-source_log_c 2 Jun 2009 17:59:43 -0000 1.2
+++ patches/patch-source_log_c 17 Jan 2014 18:15:52 -0000
@@ -1,9 +1,9 @@
$OpenBSD: patch-source_log_c,v 1.2 2009/06/02 17:59:43 naddy Exp $
---- source/log.c.orig Wed Sep 27 05:16:29 2006
-+++ source/log.c Tue May 19 10:24:31 2009
-@@ -170,9 +170,16 @@ add_to_log(fp, line)
- FILE *fp;
- u_char *line;
+--- source/log.c.orig Mon Dec 30 17:42:38 2013
++++ source/log.c Fri Jan 17 14:09:51 2014
+@@ -163,9 +163,16 @@ set_log_file(u_char *filename)
+ void
+ add_to_log(FILE *fp, u_char *line)
{
+ time_t t;
+ struct tm *tm;
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/ircII/pkg/PLIST,v
retrieving revision 1.20
diff -u -p -r1.20 PLIST
--- pkg/PLIST 29 Apr 2012 19:00:14 -0000 1.20
+++ pkg/PLIST 17 Jan 2014 18:15:52 -0000
@@ -360,6 +360,7 @@ share/ircII/help/set/dccport
share/ircII/help/set/debug
share/ircII/help/set/decrypt_program
share/ircII/help/set/display
+share/ircII/help/set/display_encoding
share/ircII/help/set/eight_bit_characters
share/ircII/help/set/encrypt_program
share/ircII/help/set/exec_protection
@@ -382,10 +383,12 @@ share/ircII/help/set/hold_mode
share/ircII/help/set/hold_mode_max
share/ircII/help/set/indent
share/ircII/help/set/input_aliases
+share/ircII/help/set/input_encoding
share/ircII/help/set/input_prompt
share/ircII/help/set/input_protection
share/ircII/help/set/insert_mode
share/ircII/help/set/inverse_video
+share/ircII/help/set/irc_encoding
share/ircII/help/set/irchost
share/ircII/help/set/lastlog
share/ircII/help/set/lastlog_level
@@ -446,7 +449,6 @@ share/ircII/help/set/status_window
share/ircII/help/set/suppress_server_motd
share/ircII/help/set/tab
share/ircII/help/set/tab_max
-share/ircII/help/set/translation
share/ircII/help/set/underline_video
share/ircII/help/set/user_information
share/ircII/help/set/user_wallops
@@ -608,37 +610,3 @@ share/ircII/script/voice
share/ircII/script/wallopstat
share/ircII/script/whowas
share/ircII/script/window
-share/ircII/translation/
-share/ircII/translation/ASCII
-share/ircII/translation/CP437
-share/ircII/translation/CP850
-share/ircII/translation/DANISH
-share/ircII/translation/DEC_MCS
-share/ircII/translation/DG_MCS
-share/ircII/translation/DUTCH
-share/ircII/translation/FINNISH
-share/ircII/translation/FRENCH
-share/ircII/translation/FRENCH_CANADIAN
-share/ircII/translation/GERMAN
-share/ircII/translation/HP_MCS
-share/ircII/translation/IRV
-share/ircII/translation/ITALIAN
-share/ircII/translation/JIS
-share/ircII/translation/MACINTOSH
-share/ircII/translation/NEXT
-share/ircII/translation/NORWEGIAN_1
-share/ircII/translation/NORWEGIAN_2
-share/ircII/translation/POLISH
-share/ircII/translation/POLISH_NOPL
-share/ircII/translation/PORTUGUESE
-share/ircII/translation/PORTUGUESE_COM
-share/ircII/translation/RUSSIAN
-share/ircII/translation/RUSSIAN_ALT
-share/ircII/translation/RUSSIAN_WIN
-share/ircII/translation/SPANISH
-share/ircII/translation/SWEDISH
-share/ircII/translation/SWEDISH_NAMES
-share/ircII/translation/SWEDISH_NAMES_COM
-share/ircII/translation/SWISS
-share/ircII/translation/UNITED_KINGDOM
-share/ircII/translation/UNITED_KINGDOM_COM
