summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoradamw <adamw@FreeBSD.org>2014-08-16 18:10:14 +0000
committeradamw <adamw@FreeBSD.org>2014-08-16 18:10:14 +0000
commit73f94af7749da96f7e4350b5897cd4039fec1284 (patch)
tree8053bd6ceefa93693a15a33e5ccae92f876ea116
parent47c2423b4ab0243301b10b94fb2de3cafd09d515 (diff)
downloadFreeBSD-ports-73f94af7749da96f7e4350b5897cd4039fec1284.zip
FreeBSD-ports-73f94af7749da96f7e4350b5897cd4039fec1284.tar.gz
Fix build with clang.
-rw-r--r--x11/xbelld/files/patch-xbell.c12
-rw-r--r--x11/xbelld/files/patch-xbelld.c23
2 files changed, 27 insertions, 8 deletions
diff --git a/x11/xbelld/files/patch-xbell.c b/x11/xbelld/files/patch-xbell.c
new file mode 100644
index 0000000..98318a6
--- /dev/null
+++ b/x11/xbelld/files/patch-xbell.c
@@ -0,0 +1,12 @@
+--- xbell.c.orig 2002-10-26 20:26:48.000000000 -0400
++++ xbell.c 2014-08-16 14:05:35.000000000 -0400
+@@ -38,8 +38,7 @@
+ #include <sysexits.h>
+
+ #ifndef lint
+-static const char rcsid[] =
+- "$Id: xbell.c,v 1.1 2002/10/27 00:26:48 sethk Exp $";
++__RCSID("$Id: xbell.c,v 1.1 2002/10/27 00:26:48 sethk Exp $");
+ #endif /* !lint */
+
+ int
diff --git a/x11/xbelld/files/patch-xbelld.c b/x11/xbelld/files/patch-xbelld.c
index 280dee3..f8c701fc 100644
--- a/x11/xbelld/files/patch-xbelld.c
+++ b/x11/xbelld/files/patch-xbelld.c
@@ -1,9 +1,16 @@
-
-$FreeBSD$
-
---- xbelld.c.orig
-+++ xbelld.c
-@@ -268,7 +268,7 @@
+--- xbelld.c.orig 2002-10-26 20:28:36.000000000 -0400
++++ xbelld.c 2014-08-16 14:07:14.000000000 -0400
+@@ -60,8 +60,7 @@
+ #include <dirent.h>
+
+ #ifndef lint
+-static const char rcsid[] =
+- "$Id: xbelld.c,v 1.7 2002/10/27 00:28:36 sethk Exp $";
++__RCSID("$Id: xbelld.c,v 1.7 2002/10/27 00:28:36 sethk Exp $");
+ #endif /* !lint */
+
+ #define XskRFilename "XskRFilename"
+@@ -268,7 +267,7 @@
u_int i;
if (!hp->h_size)
@@ -12,7 +19,7 @@ $FreeBSD$
i = hp->h_hash(data) % hp->h_size;
if (!TAILQ_EMPTY(&(hp->h_buckets[i])))
{
-@@ -914,7 +914,7 @@
+@@ -914,7 +913,7 @@
close(dfd);
for (nent = 0, dep = (struct dirent *)dbuf;
(char *)dep - dbuf < nb;
@@ -21,7 +28,7 @@ $FreeBSD$
;
_hash_resize(&(_bd.bd_sndhash), nent * 2);
if (_bd.bd_defsnd)
-@@ -924,7 +924,7 @@
+@@ -924,7 +923,7 @@
}
for (dep = (struct dirent *)dbuf;
(char *)dep - dbuf < nb;
OpenPOWER on IntegriCloud