Hi!

Small cleanup for the net/irssi-icb port:

add "-module" to LDFLAGS and behave like all the irssi modules
outthere.

remove now unneeded (char *) casts from NULLs.

add missing time.h

Ciao,
David

Index: Makefile
===================================================================
RCS file: /cvs/ports/net/irssi-icb/Makefile,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile
--- Makefile    14 Jun 2011 10:22:16 -0000      1.27
+++ Makefile    18 Oct 2011 13:28:50 -0000
@@ -5,7 +5,7 @@ SHARED_ONLY=    Yes
 COMMENT=       ICB plugin for irssi
 
 DISTNAME=      irssi-icb-0.14
-REVISION=      7
+REVISION=      8
 MASTER_SITES=   http://distfiles.nl/
 
 CATEGORIES=     net
Index: patches/patch-src_core_Makefile_am
===================================================================
RCS file: /cvs/ports/net/irssi-icb/patches/patch-src_core_Makefile_am,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_core_Makefile_am
--- patches/patch-src_core_Makefile_am  14 Jun 2011 10:22:16 -0000      1.1
+++ patches/patch-src_core_Makefile_am  18 Oct 2011 13:28:50 -0000
@@ -1,6 +1,15 @@
 $OpenBSD: patch-src_core_Makefile_am,v 1.1 2011/06/14 10:22:16 sthen Exp $
---- src/core/Makefile.am.orig  Tue Jun 14 10:53:41 2011
-+++ src/core/Makefile.am       Tue Jun 14 10:53:53 2011
+--- src/core/Makefile.am.orig  Sat May  4 19:21:43 2002
++++ src/core/Makefile.am       Tue Oct 18 15:11:37 2011
+@@ -1,7 +1,7 @@
+ moduledir = $(libdir)/irssi/modules
+ 
+ module_LTLIBRARIES = libicb_core.la
+-libicb_core_la_LDFLAGS = -avoid-version
++libicb_core_la_LDFLAGS = -module -avoid-version
+ 
+ INCLUDES = \
+       $(GLIB_CFLAGS) \
 @@ -12,6 +12,7 @@ libicb_core_la_SOURCES = \
        icb-channels.c \
        icb-commands.c \
Index: patches/patch-src_core_icb-protocol_c
===================================================================
RCS file: /cvs/ports/net/irssi-icb/patches/patch-src_core_icb-protocol_c,v
retrieving revision 1.3
diff -u -p -r1.3 patch-src_core_icb-protocol_c
--- patches/patch-src_core_icb-protocol_c       14 Jun 2011 10:22:16 -0000      
1.3
+++ patches/patch-src_core_icb-protocol_c       18 Oct 2011 13:28:50 -0000
@@ -2,8 +2,8 @@ $OpenBSD: patch-src_core_icb-protocol_c,
 
 Break lines longer than 255 chars
 
---- src/core/icb-protocol.c.orig       Sat May  4 18:21:44 2002
-+++ src/core/icb-protocol.c    Tue Jun 14 10:34:29 2011
+--- src/core/icb-protocol.c.orig       Sat May  4 19:21:44 2002
++++ src/core/icb-protocol.c    Tue Oct 18 15:19:39 2011
 @@ -121,9 +121,93 @@ static void icb_login(ICB_SERVER_REC *server)
  
  void icb_send_open_msg(ICB_SERVER_REC *server, const char *text)
@@ -87,9 +87,9 @@ Break lines longer than 255 chars
 +                      }
 +                      strncpy(buf, text, copylen);
 +                      buf[copylen] = 0;
-+                      sendbuf = g_strconcat(target, " ", buf, (char *) NULL);
++                      sendbuf = g_strconcat(target, " ", buf, NULL);
 +              } else {
-+                      sendbuf = g_strconcat(target, " ", text, (char *) NULL);
++                      sendbuf = g_strconcat(target, " ", text, NULL);
 +              }
 +              icb_send_cmd(server, 'h', "m", sendbuf, NULL);
 +              text += len > copylen ? copylen : len;
Index: patches/patch-src_fe-common_Makefile_am
===================================================================
RCS file: patches/patch-src_fe-common_Makefile_am
diff -N patches/patch-src_fe-common_Makefile_am
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_fe-common_Makefile_am     18 Oct 2011 13:28:50 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/fe-common/Makefile.am.orig     Tue Oct 18 15:12:19 2011
++++ src/fe-common/Makefile.am  Tue Oct 18 15:12:30 2011
+@@ -1,7 +1,7 @@
+ moduledir = $(libdir)/irssi/modules
+ 
+ module_LTLIBRARIES = libfe_icb.la
+-libfe_icb_la_LDFLAGS = -avoid-version
++libfe_icb_la_LDFLAGS = -module -avoid-version
+ 
+ INCLUDES = \
+       $(GLIB_CFLAGS) \
Index: patches/patch-src_fe-common_fe-icb_c
===================================================================
RCS file: /cvs/ports/net/irssi-icb/patches/patch-src_fe-common_fe-icb_c,v
retrieving revision 1.3
diff -u -p -r1.3 patch-src_fe-common_fe-icb_c
--- patches/patch-src_fe-common_fe-icb_c        14 Jun 2011 10:22:16 -0000      
1.3
+++ patches/patch-src_fe-common_fe-icb_c        18 Oct 2011 13:28:50 -0000
@@ -1,7 +1,15 @@
 $OpenBSD: patch-src_fe-common_fe-icb_c,v 1.3 2011/06/14 10:22:16 sthen Exp $
---- src/fe-common/fe-icb.c.orig        Sat Apr 27 21:56:18 2002
-+++ src/fe-common/fe-icb.c     Tue Jun 14 10:40:30 2011
-@@ -24,27 +24,65 @@
+--- src/fe-common/fe-icb.c.orig        Sat Apr 27 22:56:18 2002
++++ src/fe-common/fe-icb.c     Tue Oct 18 15:20:42 2011
+@@ -18,33 +18,73 @@
+     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+ 
++#include <time.h>
++
+ #include "module.h"
+ #include "module-formats.h"
+ #include "signals.h"
  #include "commands.h"
  #include "servers-setup.h"
  #include "levels.h"
@@ -75,7 +83,7 @@ $OpenBSD: patch-src_fe-common_fe-icb_c,v
  static void event_error(ICB_SERVER_REC *server, const char *data)
  {
        printformat(server, NULL, MSGLEVEL_CRAP, ICBTXT_ERROR, data);
-@@ -84,15 +122,351 @@ static void event_personal(ICB_SERVER_REC *server, con
+@@ -84,15 +124,351 @@ static void event_personal(ICB_SERVER_REC *server, con
          icb_split_free(args);
  }
  
@@ -428,7 +436,7 @@ $OpenBSD: patch-src_fe-common_fe-icb_c,v
  static void sig_server_add_fill(SERVER_SETUP_REC *rec,
                                GHashTable *optlist)
  {
-@@ -109,13 +483,23 @@ void fe_icb_init(void)
+@@ -109,13 +485,23 @@ void fe_icb_init(void)
  {
        theme_register(fecommon_icb_formats);
  
@@ -453,7 +461,7 @@ $OpenBSD: patch-src_fe-common_fe-icb_c,v
  
        signal_add("server add fill", (SIGNAL_FUNC) sig_server_add_fill);
        command_set_options("server add", "-icbnet");
-@@ -125,13 +509,23 @@ void fe_icb_init(void)
+@@ -125,13 +511,23 @@ void fe_icb_init(void)
  
  void fe_icb_deinit(void)
  {

Reply via email to