From d98aa91ef4fd331c62b92950f3ab7b800881a5ba Mon Sep 17 00:00:00 2001 From: dholland Date: Sun, 12 Jun 2011 04:47:26 +0000 Subject: Fix build problem on Minix and a couple other minor C issues I noticed while passing by. Closes PR 45048 from Thomas Cort. --- games/sex/Makefile | 3 ++- games/sex/distinfo | 4 ++-- games/sex/patches/patch-ab | 36 ++++++++++++++++++++++++++++++++---- 3 files changed, 36 insertions(+), 7 deletions(-) (limited to 'games/sex') diff --git a/games/sex/Makefile b/games/sex/Makefile index 56333a562e3..c99ee1b761b 100644 --- a/games/sex/Makefile +++ b/games/sex/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.1.1.1 2008/10/26 09:51:52 bjs Exp $ +# $NetBSD: Makefile,v 1.2 2011/06/12 04:47:26 dholland Exp $ DISTNAME= sex-1.0 +PKGREVISION= 1 CATEGORIES= games MASTER_SITES= http://spatula.net/software/sex/ diff --git a/games/sex/distinfo b/games/sex/distinfo index df21e2f952f..67fe2d61c19 100644 --- a/games/sex/distinfo +++ b/games/sex/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.1.1.1 2008/10/26 09:51:52 bjs Exp $ +$NetBSD: distinfo,v 1.2 2011/06/12 04:47:26 dholland Exp $ SHA1 (sex-1.0.tar.gz) = 12da3ac34d630f0967d09b4cbe6e73a88a8973d8 RMD160 (sex-1.0.tar.gz) = 80c7c04f7b77329e4bf20fbf61d6c2fce54d75d6 Size (sex-1.0.tar.gz) = 4820 bytes SHA1 (patch-aa) = 18dbce142a90824cadbc1b30becd0cff4ca35e03 -SHA1 (patch-ab) = 4df48147f5e6bbaf636c17be544e21a1728ec8fb +SHA1 (patch-ab) = 71348d87777d114c2250595da1f0343959756b57 diff --git a/games/sex/patches/patch-ab b/games/sex/patches/patch-ab index 37d6b6ec34f..4653651d894 100644 --- a/games/sex/patches/patch-ab +++ b/games/sex/patches/patch-ab @@ -1,8 +1,27 @@ -$NetBSD: patch-ab,v 1.1.1.1 2008/10/26 09:51:52 bjs Exp $ +$NetBSD: patch-ab,v 1.2 2011/06/12 04:47:26 dholland Exp $ ---- sex.c.orig 2001-04-28 18:21:29.000000000 +0100 -+++ sex.c 2008-10-23 11:00:07.000000000 +0100 -@@ -252,7 +252,7 @@ +- use correct C constructs + +--- sex.c.orig 2001-04-28 17:21:29.000000000 +0000 ++++ sex.c +@@ -10,6 +10,7 @@ + + #include + #include ++#include + #include + #include + +@@ -240,7 +241,7 @@ TABLE list[] = { + {his, SZ(his)}, {dongadj, SZ(dongadj)}, + {dong, SZ(dong)}, {intoher, SZ(intoher)}, + {twatadj, SZ(twatadj)}, {twat, SZ(twat)}, +- {(char **)NULL, (short)NULL}, ++ {NULL, 0}, + }; + + #define LLINE 50 +@@ -252,7 +253,7 @@ int main(int argc, char **argv) register TABLE *ttp; register char *cp; int getpid(); @@ -11,3 +30,12 @@ $NetBSD: patch-ab,v 1.1.1.1 2008/10/26 09:51:52 bjs Exp $ char buffer[2048]; int pos, lastword; +@@ -279,7 +280,7 @@ int main(int argc, char **argv) + buffer[lastword] = '\n'; + lwidth = pos - lastword; + } +- if (isspace(*cp)) { ++ if (isspace((unsigned char)*cp)) { + lastword = pos; + } + pos++; -- cgit v1.2.3