On Thu, Aug 29, 2013 at 02:10:42PM +0200, Joerg Jung wrote:
> > - Update to 1.2 [1]
> >
> > [1] https://github.com/jasperla/openbsd-wip/tree/master/net/sic
>
> I think your attached diff missed the removal of patches/patch-sic_c
> Otherwise it works fine for me. Please find below an updated diff.
>
> If someone can give me an OK, I will commit this.
Please find below a more recent diff, which includes an additional patch
from upstream master.
A simple way to test this port could be:
# sic -n aliceisnotbob
...
:j #debian
...
:l #debian
:quit
Any OKs, please?
Thanks,
Regards,
Joerg
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/sic/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile 17 Jul 2013 03:27:01 -0000 1.4
+++ Makefile 17 Oct 2013 15:30:53 -0000
@@ -2,8 +2,7 @@
COMMENT= simple irc client
-DISTNAME= sic-1.1
-REVISION = 1
+DISTNAME= sic-1.2
CATEGORIES= net
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/sic/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 10 Jul 2012 14:03:18 -0000 1.1.1.1
+++ distinfo 17 Oct 2013 15:30:53 -0000
@@ -1,5 +1,2 @@
-MD5 (sic-1.1.tar.gz) = hW0OX6oVGulgJxPufTSi1Q==
-RMD160 (sic-1.1.tar.gz) = OZDB0m1+0Ge97a4GuC13c6lH3RU=
-SHA1 (sic-1.1.tar.gz) = gW1SJ1j20E5q9rc5bIB3wyst37I=
-SHA256 (sic-1.1.tar.gz) = 8k1jx65fNxXzw4hfW9B9Rf+hsK+DCiVSO67JRlNITcI=
-SIZE (sic-1.1.tar.gz) = 5061
+SHA256 (sic-1.2.tar.gz) = rAf5BZleE7osQ5EtegNfu+eKYo17ocJW9MoTcvtWUYU=
+SIZE (sic-1.2.tar.gz) = 4563
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/net/sic/patches/patch-Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-Makefile
--- patches/patch-Makefile 10 Jul 2012 14:03:18 -0000 1.1.1.1
+++ patches/patch-Makefile 17 Oct 2013 15:30:53 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile,v 1.1.1.1 2012/07/10 14:03:18 zinke Exp $
---- Makefile.orig Mon Jul 9 12:49:37 2012
-+++ Makefile Mon Jul 9 12:54:54 2012
+--- Makefile.orig Sun Jun 16 08:03:32 2013
++++ Makefile Fri Aug 23 08:31:32 2013
@@ -14,14 +14,12 @@ options:
@echo "CC = ${CC}"
@@ -9,7 +9,7 @@ $OpenBSD: patch-Makefile,v 1.1.1.1 2012/
- @${CC} -c ${CFLAGS} $<
+ ${CC} -c ${CFLAGS} $<
- ${OBJ}: config.mk
+ ${OBJ}: config.mk util.c
sic: ${OBJ}
- @echo CC -o $@
Index: patches/patch-config_mk
===================================================================
RCS file: /cvs/ports/net/sic/patches/patch-config_mk,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-config_mk
--- patches/patch-config_mk 10 Jul 2012 14:03:18 -0000 1.1.1.1
+++ patches/patch-config_mk 17 Oct 2013 15:30:53 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-config_mk,v 1.1.1.1 2012/07/10 14:03:18 zinke Exp $
---- config.mk.orig Tue May 25 18:05:48 2010
-+++ config.mk Mon Jul 9 13:12:46 2012
-@@ -4,17 +4,17 @@ VERSION = 1.1
+--- config.mk.orig Sun Jun 16 08:03:32 2013
++++ config.mk Fri Aug 23 08:30:57 2013
+@@ -4,17 +4,17 @@ VERSION = 1.2
# Customize below to fit your system
# paths
Index: patches/patch-sic_c
===================================================================
RCS file: patches/patch-sic_c
diff -N patches/patch-sic_c
--- patches/patch-sic_c 10 Jul 2012 14:03:18 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-sic_c,v 1.1.1.1 2012/07/10 14:03:18 zinke Exp $
---- sic.c.orig Mon Jul 9 16:02:31 2012
-+++ sic.c Mon Jul 9 16:02:41 2012
-@@ -9,7 +9,7 @@
- #include <unistd.h>
-
- static char *host = "irc.oftc.net";
--static char *port = "ircd";
-+static char *port = "6667";
- static char *password;
- static char nick[32];
- static char bufin[4096];
Index: patches/patch-util_c
===================================================================
RCS file: patches/patch-util_c
diff -N patches/patch-util_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-util_c 17 Oct 2013 15:30:53 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- util.c.orig Thu Oct 17 17:22:17 2013
++++ util.c Thu Oct 17 17:22:46 2013
+@@ -49,7 +49,7 @@ strlcpy(char *to, const char *from, int l) {
+
+ static char *
+ eat(char *s, int (*p)(int), int r) {
+- while(s != '\0' && p(*s) == r)
++ while(*s != '\0' && p(*s) == r)
+ s++;
+ return s;
+ }
