Various ports have patches to cast NULL used as a sentinel to a pointer.
These are no longer needed since unistd.h r1.63 et al: "Define NULL as a
void * instead of a long integer, as required by Single Unix. Kernel and
bootblocks still use the old 0L value until all the NULL abuses in the
code are fixed."
OK to remove them?
Index: audio/xmp/Makefile
===================================================================
RCS file: /cvs/ports/audio/xmp/Makefile,v
retrieving revision 1.45
diff -u -p -r1.45 Makefile
--- audio/xmp/Makefile 19 Sep 2011 13:48:15 -0000 1.45
+++ audio/xmp/Makefile 21 Feb 2012 22:02:55 -0000
@@ -13,6 +13,7 @@ PKGNAME-audacious= audacious-${DISTNAME}
PKGNAME-bmp= bmp-${DISTNAME}
PKGNAME-xmms= xmms-${DISTNAME}
CATEGORIES= audio
+REVISION-main = 0
REVISION-audacious = 0
REVISION-bmp = 0
REVISION-xmms = 0
Index: audio/xmp/patches/patch-src_misc_oxm_c
===================================================================
RCS file: audio/xmp/patches/patch-src_misc_oxm_c
diff -N audio/xmp/patches/patch-src_misc_oxm_c
--- audio/xmp/patches/patch-src_misc_oxm_c 16 Dec 2009 07:49:29 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_misc_oxm_c,v 1.1 2009/12/16 07:49:29 jakemsr Exp $
---- src/misc/oxm.c.orig Tue Dec 15 23:21:14 2009
-+++ src/misc/oxm.c Tue Dec 15 23:21:36 2009
-@@ -150,7 +150,7 @@ static char *oggdec(FILE *f, int len, int res, int *ne
-
- snprintf(b, 10, "-b%d", res);
- execlp("oggdec", "oggdec", "-Q", b, "-e0", "-R", "-s1",
-- "-o-", "-", NULL);
-+ "-o-", "-", (char
*)NULL);
-
- do { /* drain input data */
- l = read(STDIN_FILENO, buf, 1024);
Index: devel/git/Makefile
===================================================================
RCS file: /cvs/ports/devel/git/Makefile,v
retrieving revision 1.84
diff -u -p -r1.84 Makefile
--- devel/git/Makefile 8 Nov 2011 10:27:49 -0000 1.84
+++ devel/git/Makefile 21 Feb 2012 22:02:55 -0000
@@ -11,7 +11,7 @@ PKGNAME-svn = git-svn-${V}
PKGNAME-x11 = git-x11-${V}
CATEGORIES = devel
-REVISION-main = 3
+REVISION-main = 4
REVISION-svn = 2
REVISION-x11 = 2
Index: devel/git/patches/patch-imap-send_c
===================================================================
RCS file: devel/git/patches/patch-imap-send_c
diff -N devel/git/patches/patch-imap-send_c
--- devel/git/patches/patch-imap-send_c 29 Apr 2011 11:09:12 -0000 1.10
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-imap-send_c,v 1.10 2011/04/29 11:09:12 stsp Exp $
---- imap-send.c.orig Sun Apr 24 19:48:31 2011
-+++ imap-send.c Thu Apr 28 18:00:41 2011
-@@ -1068,7 +1068,7 @@ static struct store *imap_open_store(struct imap_serve
- /* open connection to IMAP server */
-
- if (srvc->tunnel) {
-- const char *argv[] = { srvc->tunnel, NULL };
-+ const char *argv[] = { srvc->tunnel, (void *)NULL };
- struct child_process tunnel = {NULL};
-
- imap_info("Starting tunnel '%s'... ", srvc->tunnel);
Index: devel/mk/Makefile
===================================================================
RCS file: /cvs/ports/devel/mk/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- devel/mk/Makefile 15 Nov 2010 19:46:00 -0000 1.9
+++ devel/mk/Makefile 21 Feb 2012 22:02:55 -0000
@@ -4,7 +4,7 @@ COMMENT= Streamlined replacement for mak
VERSION= 2.0
DISTNAME= mk-${VERSION}
-REVISION = 0
+REVISION= 1
CATEGORIES= devel plan9
MASTER_SITES= ${HOMEPAGE}
HOMEPAGE= http://pdos.lcs.mit.edu/~rsc/software/
Index: devel/mk/patches/patch-unix_c
===================================================================
RCS file: devel/mk/patches/patch-unix_c
diff -N devel/mk/patches/patch-unix_c
--- devel/mk/patches/patch-unix_c 20 Dec 2007 15:47:18 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,27 +0,0 @@
-$OpenBSD: patch-unix_c,v 1.2 2007/12/20 15:47:18 ajacoutot Exp $
---- unix.c.orig Thu Feb 13 16:05:44 2003
-+++ unix.c Thu Dec 20 16:46:01 2007
-@@ -128,9 +128,9 @@ execsh(char *args, char *cmd, Bufblock *buf, Envy *e)
- if (e)
- exportenv(e);
- if(shflags)
-- execl(shell, shellname, shflags, args, 0);
-+ execl(shell, shellname, shflags, args, (void
*)NULL);
- else
-- execl(shell, shellname, args, 0);
-+ execl(shell, shellname, args, (void *)NULL);
- mkperror(shell);
- _exit(1);
- }
-@@ -193,9 +193,9 @@ pipecmd(char *cmd, Envy *e, int *fd)
- if(e)
- exportenv(e);
- if(shflags)
-- execl(shell, shellname, shflags, "-c", cmd, 0);
-+ execl(shell, shellname, shflags, "-c", cmd, (void
*)NULL);
- else
-- execl(shell, shellname, "-c", cmd, 0);
-+ execl(shell, shellname, "-c", cmd, (void *)NULL);
- mkperror(shell);
- _exit(1);
- }
Index: games/netris/Makefile
===================================================================
RCS file: /cvs/ports/games/netris/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- games/netris/Makefile 18 Oct 2010 18:00:18 -0000 1.20
+++ games/netris/Makefile 21 Feb 2012 22:02:55 -0000
@@ -3,6 +3,7 @@
COMMENT= network head-to-head version of T*tris
DISTNAME= netris-0.52
+REVISION= 0
CATEGORIES= games
HOMEPAGE= http://www.netris.org/
Index: games/netris/patches/patch-robot_c
===================================================================
RCS file: games/netris/patches/patch-robot_c
diff -N games/netris/patches/patch-robot_c
--- games/netris/patches/patch-robot_c 3 Mar 2004 22:51:00 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-robot_c,v 1.1 2004/03/03 22:51:00 xsa Exp $
---- robot.c.orig 2003-08-13 03:33:02.000000000 +0200
-+++ robot.c 2004-03-03 16:03:26.000000000 +0100
-@@ -63,7 +63,7 @@ ExtFunc void InitRobot(char *robotProg)
- close(to[1]);
- close(from[0]);
- close(from[1]);
-- execl("/bin/sh", "sh", "-c", robotProg, NULL);
-+ execl("/bin/sh", "sh", "-c", robotProg, (char *)NULL);
- die("execl failed");
- }
- close(to[0]);
Index: graphics/fxtv/Makefile
===================================================================
RCS file: /cvs/ports/graphics/fxtv/Makefile,v
retrieving revision 1.43
diff -u -p -r1.43 Makefile
--- graphics/fxtv/Makefile 17 Nov 2010 08:05:13 -0000 1.43
+++ graphics/fxtv/Makefile 21 Feb 2012 22:02:55 -0000
@@ -5,7 +5,7 @@ ONLY_FOR_ARCHS= i386 macppc amd64
COMMENT= capture utility for Brooktree-based cards
DISTNAME= fxtv-1.03
-REVISION = 4
+REVISION= 5
CATEGORIES= graphics
HOMEPAGE= http://people.freebsd.org/~rhh/fxtv/
Index: graphics/fxtv/patches/patch-tvutil_c
===================================================================
RCS file: /cvs/ports/graphics/fxtv/patches/patch-tvutil_c,v
retrieving revision 1.5
diff -u -p -r1.5 patch-tvutil_c
--- graphics/fxtv/patches/patch-tvutil_c 22 May 2010 14:12:50 -0000
1.5
+++ graphics/fxtv/patches/patch-tvutil_c 21 Feb 2012 22:02:55 -0000
@@ -10,12 +10,3 @@ $OpenBSD: patch-tvutil_c,v 1.5 2010/05/2
#endif
int i;
size_t len;
-@@ -399,7 +399,7 @@ void TVUTILPipeSetup( char *shell_cmd,
-
- CleanupChildFileDesc();
- if ( shell_cmd != NULL )
-- execl( "/bin/sh", "sh", "-c", shell_cmd, NULL );
-+ execl( "/bin/sh", "sh", "-c", shell_cmd, (void *)NULL );
- else
- execvp( shell_cmd2[0], shell_cmd2 );
- perror( "PipeSetup: exec failed" );
Index: graphics/gtkimageview/Makefile
===================================================================
RCS file: /cvs/ports/graphics/gtkimageview/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- graphics/gtkimageview/Makefile 2 Nov 2011 08:46:37 -0000 1.9
+++ graphics/gtkimageview/Makefile 21 Feb 2012 22:02:55 -0000
@@ -3,7 +3,7 @@
COMMENT= image viewer widget for gtk
DISTNAME= gtkimageview-1.6.4
-REVISION= 4
+REVISION= 5
SHARED_LIBS= gtkimageview 0.0
Index: graphics/gtkimageview/patches/patch-tests_interactive_c
===================================================================
RCS file: graphics/gtkimageview/patches/patch-tests_interactive_c
diff -N graphics/gtkimageview/patches/patch-tests_interactive_c
--- graphics/gtkimageview/patches/patch-tests_interactive_c 10 May 2010
08:38:44 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-$OpenBSD: patch-tests_interactive_c,v 1.1 2010/05/10 08:38:44 robert Exp $
---- tests/interactive.c.orig Mon May 10 10:34:00 2010
-+++ tests/interactive.c Mon May 10 10:34:57 2010
-@@ -55,7 +55,7 @@ init_open_dialog ()
-
GTK_RESPONSE_CANCEL,
-
GTK_STOCK_OPEN,
-
GTK_RESPONSE_ACCEPT,
-- NULL);
-+ (char
*)NULL);
- }
-
- //////////////////////////////////////////////////////////////////////
-@@ -238,7 +238,7 @@ menu_item_select_cb (GtkMenuItem *proxy)
- GtkAction *action = g_object_get_data (G_OBJECT (proxy), "gtk-action");
-
- char *msg;
-- g_object_get (G_OBJECT (action), "tooltip", &msg, NULL);
-+ g_object_get (G_OBJECT (action), "tooltip", &msg, (char *)NULL);
-
- if (msg)
- {
Index: lang/ucblogo/Makefile
===================================================================
RCS file: /cvs/ports/lang/ucblogo/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- lang/ucblogo/Makefile 25 Apr 2011 15:01:28 -0000 1.10
+++ lang/ucblogo/Makefile 21 Feb 2012 22:02:56 -0000
@@ -2,7 +2,7 @@
COMMENT= berkeley's implementation of the logo programming language
DISTNAME= ucblogo-5.5
-REVISION= 1
+REVISION= 2
CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_BACKUP}
Index: lang/ucblogo/patches/patch-wrksp_c
===================================================================
RCS file: /cvs/ports/lang/ucblogo/patches/patch-wrksp_c,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-wrksp_c
--- lang/ucblogo/patches/patch-wrksp_c 1 Jun 2006 05:58:15 -0000 1.1.1.1
+++ lang/ucblogo/patches/patch-wrksp_c 21 Feb 2012 22:02:56 -0000
@@ -12,12 +12,3 @@ $OpenBSD: patch-wrksp_c,v 1.1.1.1 2006/0
#define WANT_EVAL_REGS 1
#include "logo.h"
#include "globals.h"
-@@ -1519,7 +1523,7 @@ NODE *ledit(NODE *args) {
- #endif
- #else /* !ibm (so unix) */
- if (fork() == 0) {
-- execlp(editor, editorname, tmp_filename, 0);
-+ execlp(editor, editorname, tmp_filename, (void*)NULL);
- exit(1);
- }
- wait(0);
Index: mail/courier-authlib/Makefile
===================================================================
RCS file: /cvs/ports/mail/courier-authlib/Makefile,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile
--- mail/courier-authlib/Makefile 18 Nov 2011 13:16:06 -0000 1.27
+++ mail/courier-authlib/Makefile 21 Feb 2012 22:02:56 -0000
@@ -13,7 +13,7 @@ PKGNAME-mysql= ${DISTNAME:S/lib-/lib-my
PKGNAME-pgsql= ${DISTNAME:S/lib-/lib-pgsql-/}
PKGNAME-userdb= ${DISTNAME:S/lib-/lib-userdb-/}
-REVISION-main= 5
+REVISION-main= 6
REVISION-ldap= 3
REVISION-mysql= 3
REVISION-pgsql= 3
Index: mail/courier-authlib/patches/patch-authpipelib_c
===================================================================
RCS file: mail/courier-authlib/patches/patch-authpipelib_c
diff -N mail/courier-authlib/patches/patch-authpipelib_c
--- mail/courier-authlib/patches/patch-authpipelib_c 25 Jun 2007 12:12:26
-0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-authpipelib_c,v 1.2 2007/06/25 12:12:26 espie Exp $
---- authpipelib.c.orig Thu Aug 11 01:41:21 2005
-+++ authpipelib.c Mon Jun 25 12:35:33 2007
-@@ -42,7 +42,7 @@ static void execChild(int to[], int from[])
- close(STDOUT_FILENO); dup2(from[1], STDOUT_FILENO);
- close(to[0]); close(to[1]); close(from[0]); close(from[1]);
-
-- execl(PIPE_PROGRAM, PIPE_PROGRAM, NULL);
-+ execl(PIPE_PROGRAM, PIPE_PROGRAM, (char *)NULL);
-
- DPRINTF("pipe: failed to execute %s: %s",PIPE_PROGRAM, strerror(errno));
- exit(1);
Index: mail/courier-imap/Makefile
===================================================================
RCS file: /cvs/ports/mail/courier-imap/Makefile,v
retrieving revision 1.79
diff -u -p -r1.79 Makefile
--- mail/courier-imap/Makefile 23 Jan 2012 09:14:15 -0000 1.79
+++ mail/courier-imap/Makefile 21 Feb 2012 22:02:56 -0000
@@ -4,6 +4,7 @@ COMMENT-main= imap server for maildir f
COMMENT-pop3= pop3 server for maildir format mailboxes
V= 4.10.0
+REVISION= 0
DISTNAME= courier-imap-${V}
PKGNAME-main= ${DISTNAME}
FULLPKGNAME-pop3= courier-pop3-${V}
Index: mail/courier-imap/patches/patch-imap_imaplogin_c
===================================================================
RCS file: mail/courier-imap/patches/patch-imap_imaplogin_c
diff -N mail/courier-imap/patches/patch-imap_imaplogin_c
--- mail/courier-imap/patches/patch-imap_imaplogin_c 9 May 2011 09:30:26
-0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-imap_imaplogin_c,v 1.3 2011/05/09 09:30:26 giovanni Exp $
---- imap/imaplogin.c.orig Mon Apr 4 17:02:32 2011
-+++ imap/imaplogin.c Wed Apr 13 15:53:46 2011
-@@ -234,7 +234,7 @@ int login_callback(struct authinfo *ainfo, void *dummy
- execl(imapd, imapd,
- ainfo->maildir ?
- ainfo->maildir:defaultmaildir,
-- NULL);
-+ (char *)NULL);
- fprintf(stderr, "ERR: exec(%s)
failed!!\n",
- imapd);
- }
Index: mail/courier-imap/patches/patch-imap_pop3login_c
===================================================================
RCS file: mail/courier-imap/patches/patch-imap_pop3login_c
diff -N mail/courier-imap/patches/patch-imap_pop3login_c
--- mail/courier-imap/patches/patch-imap_pop3login_c 9 May 2011 09:30:26
-0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-imap_pop3login_c,v 1.3 2011/05/09 09:30:26 giovanni Exp $
---- imap/pop3login.c.orig Mon Apr 4 17:02:32 2011
-+++ imap/pop3login.c Wed Apr 13 15:53:46 2011
-@@ -212,7 +212,7 @@ static int login_callback(struct authinfo *ainfo, void
- execl(pop3d, pop3d,
- ainfo->maildir ?
- ainfo->maildir:defaultmaildir,
-- NULL);
-+ (char *)NULL);
- fprintf(stderr, "ERR: exec(%s) failed!!\n",
- pop3d);
- }
Index: print/gutenprint/Makefile
===================================================================
RCS file: /cvs/ports/print/gutenprint/Makefile,v
retrieving revision 1.26
diff -u -p -r1.26 Makefile
--- print/gutenprint/Makefile 4 May 2011 14:55:02 -0000 1.26
+++ print/gutenprint/Makefile 21 Feb 2012 22:02:56 -0000
@@ -6,6 +6,7 @@ COMMENT-foomatic= Foomatic data for gute
# XXX On major update, update the gutenprint-ijs.X.X substitution in the
# print/foomatic-db port and bump.
V= 5.2.7
+REVISION= 0
DISTNAME= gutenprint-${V}
PKGNAME-main= ${DISTNAME}
PKGNAME-foomatic= foomatic-db-${DISTNAME}
Index: print/gutenprint/patches/patch-src_gutenprintui2_plist_c
===================================================================
RCS file: /cvs/ports/print/gutenprint/patches/patch-src_gutenprintui2_plist_c,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_gutenprintui2_plist_c
--- print/gutenprint/patches/patch-src_gutenprintui2_plist_c 23 Mar 2009
17:17:33 -0000 1.2
+++ print/gutenprint/patches/patch-src_gutenprintui2_plist_c 21 Feb 2012
22:02:56 -0000
@@ -21,12 +21,3 @@ $OpenBSD: patch-src_gutenprintui2_plist_
"-n" },
{ "SysV", N_("System V lp"), "lp -s", "-d", "-oraw", "/usr/bin/lp",
"/usr/bin/lpstat -v | awk '/^device for /i {sub(\":\", \"\", $3); print
$3}'",
-@@ -1661,7 +1661,7 @@ stpui_print(const stpui_plist_t *printer, stpui_image_
- locale = g_strdup(setlocale(LC_NUMERIC, NULL));
- setlocale(LC_NUMERIC, "C");
- #endif
-- execl("/bin/sh", "/bin/sh", "-c", command, NULL);
-+ execl("/bin/sh", "/bin/sh", "-c", command, (char
*)NULL);
- /* NOTREACHED */
- _exit (1);
- }
Index: sysutils/dvd+rw-tools/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/dvd+rw-tools/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- sysutils/dvd+rw-tools/Makefile 22 Nov 2010 09:34:10 -0000 1.9
+++ sysutils/dvd+rw-tools/Makefile 21 Feb 2012 22:02:56 -0000
@@ -3,7 +3,7 @@
COMMENT= mastering tools for DVD+RW/+R/-R/-RW
DISTNAME= dvd+rw-tools-7.0
-REVISION = 0
+REVISION = 1
CATEGORIES= sysutils
HOMEPAGE= http://fy.chalmers.se/~appro/linux/DVD+RW/
Index: sysutils/dvd+rw-tools/patches/patch-growisofs_c
===================================================================
RCS file: sysutils/dvd+rw-tools/patches/patch-growisofs_c
diff -N sysutils/dvd+rw-tools/patches/patch-growisofs_c
--- sysutils/dvd+rw-tools/patches/patch-growisofs_c 26 Jan 2008 02:21:28
-0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-$OpenBSD: patch-growisofs_c,v 1.3 2008/01/26 02:21:28 jakemsr Exp $
---- growisofs.c.orig Thu Jan 17 22:18:18 2008
-+++ growisofs.c Thu Jan 17 22:18:18 2008
-@@ -2296,7 +2296,7 @@ int builtin_dd (int infd,int outfd,off64_t outoff)
- fcntl (in_fd,F_SETFD,rval&~FD_CLOEXEC);
-
- sprintf (str,"%d",in_fd);
-- execlp (argv0,"-umount",str,in_device,NULL);
-+ execlp (argv0,"-umount",str,in_device,(char *)NULL);
- exit (FATAL_START(errno));
- }
- while (1)
-@@ -2908,7 +2908,7 @@ int main (int argc, char *argv[])
- fflush (stdout);
- #if defined(__unix) || defined(__unix__)
- setuid(getuid());
-- execlp (mkisofs_argv[0],mkisofs_argv[0],"-version",NULL);
-+ execlp (mkisofs_argv[0],mkisofs_argv[0],"-version",(char
*)NULL);
- #elif defined(_WIN32)
- if (_spawnl (_P_WAIT,mkisofs_argv[0],
- "mkisofs.exe","-version",NULL) != -1)
Index: x11/compiz/core/Makefile
===================================================================
RCS file: /cvs/ports/x11/compiz/core/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- x11/compiz/core/Makefile 29 Oct 2011 08:12:32 -0000 1.17
+++ x11/compiz/core/Makefile 21 Feb 2012 22:02:56 -0000
@@ -6,7 +6,7 @@ COMMENT = OpenGL window and compositing
V = 0.8.2
DISTNAME = compiz-${V}
-REVISION= 11
+REVISION= 12
SHARED_LIBS = decoration 0.0
Index: x11/compiz/core/patches/patch-src_screen_c
===================================================================
RCS file: x11/compiz/core/patches/patch-src_screen_c
diff -N x11/compiz/core/patches/patch-src_screen_c
--- x11/compiz/core/patches/patch-src_screen_c 1 Sep 2009 01:49:14 -0000
1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_screen_c,v 1.1.1.1 2009/09/01 01:49:14 fgsch Exp $
---- src/screen.c.orig Sun Aug 2 07:24:01 2009
-+++ src/screen.c Sun Aug 2 07:24:08 2009
-@@ -3515,7 +3515,7 @@ runCommand (CompScreen *s,
-
- putenv (screenString);
-
-- exit (execl ("/bin/sh", "/bin/sh", "-c", command, NULL));
-+ exit (execl ("/bin/sh", "/bin/sh", "-c", command, (char *)NULL));
- }
- }
-
