CVS commit: pkgsrc/misc/autocue

["Alistair G. Crooks" <agc%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   agc
Date:           Wed May 31 23:05:55 UTC 2017

Modified Files:
        pkgsrc/misc/autocue: Makefile
        pkgsrc/misc/autocue/files: autocue.c

Log Message:
Simplify:

+ don't use cdefs
+ use (c) as nearest approximation to a copyright symbol in ASCII

and so:

+ don't try to compile libnbcompat on non-NetBSD platforms for no reason
+ don't try to work out whether we're using clang, and then whether clang
will have an issue with an 8-bit character in a comment


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/misc/autocue/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/misc/autocue/files/autocue.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/misc/autocue/Makefile
diff -u pkgsrc/misc/autocue/Makefile:1.9 pkgsrc/misc/autocue/Makefile:1.10
--- pkgsrc/misc/autocue/Makefile:1.9    Tue Sep 10 14:23:45 2013
+++ pkgsrc/misc/autocue/Makefile        Wed May 31 23:05:55 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2013/09/10 14:23:45 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2017/05/31 23:05:55 agc Exp $
 #
 
 DISTNAME=      autocue-20070224
@@ -12,8 +12,6 @@ COMMENT=      Time-based text formatter, send
 
 DEPENDS+=      xcb-[0-9]*:../../x11/xcb
 
-USE_FEATURES+= cdefs
-
 do-extract:
        @${CP} -R ${FILESDIR} ${WRKSRC}
 
@@ -23,10 +21,4 @@ do-install:
        ${INSTALL_MAN_DIR} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
        ${INSTALL_MAN} ${WRKSRC}/autocue.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
-.include "../../mk/compiler.mk"
-.if !empty(PKGSRC_COMPILER:Mclang)
-BUILDLINK_TRANSFORM+=  rm:-Wno-traditional
-CFLAGS+=       -Wno-invalid-source-encoding
-.endif
-
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/misc/autocue/files/autocue.c
diff -u pkgsrc/misc/autocue/files/autocue.c:1.4 pkgsrc/misc/autocue/files/autocue.c:1.5
--- pkgsrc/misc/autocue/files/autocue.c:1.4     Thu Jul  9 09:44:18 2015
+++ pkgsrc/misc/autocue/files/autocue.c Wed May 31 23:05:55 2017
@@ -1,7 +1,7 @@
-/* $NetBSD: autocue.c,v 1.4 2015/07/09 09:44:18 jperkin Exp $ */
+/* $NetBSD: autocue.c,v 1.5 2017/05/31 23:05:55 agc Exp $ */
 
 /*
- * Copyright � 2006 Alistair Crooks.  All rights reserved.
+ * Copyright (c) 2006,2017 Alistair Crooks.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -27,20 +27,6 @@
  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-
-#if defined(HAVE_NBCOMPAT_H)
-#include <nbcompat.h>
-#include <nbcompat/cdefs.h>
-#else
-#include <sys/cdefs.h>
-#endif
-
-#ifndef lint
-__COPYRIGHT("@(#) Copyright � 2006 \
-               The NetBSD Foundation, Inc.  All rights reserved.");
-__RCSID("$NetBSD: autocue.c,v 1.4 2015/07/09 09:44:18 jperkin Exp $");
-#endif
-
 #include <err.h>
 #include <signal.h>
 #include <stdio.h>
@@ -84,10 +70,10 @@ sigusr2(int s)
 static void
 showbuffer(char *buf, int cc, int maxcut)
 {
-       static int      cut;
-       char            cmd[BUFSIZ * 20];
+       static int       cut;
+       char             cmd[BUFSIZ * 20];
        FILE            *pp;
-       int             s;
+       int              s;
 
        (void) snprintf(cmd, sizeof(cmd), "fmt %d %d | xcb -s %d", FmtGoal, FmtMax, cut);
        if ((pp = popen(cmd, "w")) == NULL) {
@@ -106,8 +92,8 @@ showbuffer(char *buf, int cc, int maxcut
 int
 main(int argc, char **argv)
 {
-       char    buf[BUFSIZ * 20];
-       char    line[BUFSIZ];
+       char     buf[BUFSIZ * 20];
+       char     line[BUFSIZ];
        FILE    *fp;
        int      maxcut;
        int      cc;