Date: Sat, 18 Dec 2004 19:31:18 +0200 From: Andrey Slusar <anray@inet.ua> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/75228: [MAINTAINER] news/s-news: fix duplicate define. Message-ID: <E1CfiQI-0003ss-F5@santinel.home.ua> Resent-Message-ID: <200412181740.iBIHeaYa066744@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 75228
>Category: ports
>Synopsis: [MAINTAINER] news/s-news: fix duplicate define.
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sat Dec 18 17:40:36 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Andrey Slusar
>Release: FreeBSD 5.3-STABLE i386
>Organization:
Santinel
>Environment:
System: FreeBSD santinel.home.ua 5.3-STABLE FreeBSD 5.3-STABLE #0: Tue Nov 30 13:06:39 EET 2004 anray@santinel.home.ua:/usr/obj/usr/src/sys/ANRAY i386
>Description:
Fix duplicate HAVE_MALLOC_H.
>How-To-Repeat:
>Fix:
--- s-news.diff begins here ---
Index: news/s-news/files/patch-qnews.c
===================================================================
RCS file: /home/ncvs/ports/news/s-news/files/patch-qnews.c,v
retrieving revision 1.2
diff -u -r1.2 patch-qnews.c
--- news/s-news/files/patch-qnews.c 4 Aug 2004 10:07:22 -0000 1.2
+++ news/s-news/files/patch-qnews.c 18 Dec 2004 17:25:01 -0000
@@ -1,5 +1,5 @@
--- qnews.c.orig Sat May 18 22:21:42 2002
-+++ qnews.c Wed Aug 4 03:24:43 2004
++++ qnews.c Sat Dec 18 19:21:57 2004
@@ -2,6 +2,8 @@
* S-News version 0.1.9 - A Simple News Server
* Copyright (C) 1998 Christopher John Purnell
@@ -9,7 +9,7 @@
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
-@@ -22,7 +24,18 @@
+@@ -22,12 +24,20 @@
#include "config.h"
#endif
@@ -20,15 +20,17 @@
+#endif
+#include <fcntl.h>
+
-+#ifdef HAVE_MALLOC_H
-+#include <malloc.h>
-+#else
-+#include <stdlib.h>
-+#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
-@@ -79,15 +92,37 @@
+ #ifdef HAVE_MALLOC_H
+ #include <malloc.h>
++#else
++#include <stdlib.h>
+ #endif
+ #ifdef STDC_HEADERS
+ #include <string.h>
+@@ -79,15 +89,37 @@
if (match_group(ptr->value,line,end))
{
FILE *fp;
@@ -49,7 +51,7 @@
- return (1);
+ perror(file);
+ return (1);
- }
++ }
+ if (flock(fd,LOCK_EX) == -1)
+ {
+ perror(file);
@@ -59,7 +61,7 @@
+ {
+ perror(file);
+ return (1);
-+ }
+ }
+ #else
+ if (!(fp = fopen(file,"a")))
+ {
@@ -70,7 +72,7 @@
if (fputs(line,fp) < 0 ||
fputc('\n',fp) < 0)
-@@ -103,6 +138,9 @@
+@@ -103,6 +135,9 @@
return (1);
}
@@ -80,7 +82,7 @@
break;
}
}
-@@ -204,7 +242,7 @@
+@@ -204,7 +239,7 @@
return (0);
break;
case '[':
@@ -89,7 +91,7 @@
{
unsigned char rev,mat=0,l=0,h,u=*str;
-@@ -229,6 +267,8 @@
+@@ -229,6 +264,8 @@
if (mat==rev)
return (0);
}
--- s-news.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1CfiQI-0003ss-F5>