- remove unnecessary NULL casts

- sync WANTLIB

audio/grip/Makefile

@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.40 2010/11/15 00:22:47 espie Exp $
+# $OpenBSD: Makefile,v 1.41 2011/04/16 21:21:24 jasper Exp $
 
 COMMENT=	front-end to external cd audio rippers and mp3 encoders
 
 DISTNAME=	grip-3.2.0
-REVISION=	18
+REVISION=	19
 CATEGORIES=	audio
 
 HOMEPAGE=	http://www.nostatic.org/grip/
@@ -16,16 +16,17 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB += c freetype crypto m X11 ICE Xrender stdc++ SM
-WANTLIB += Xcomposite Xdamage dbus-1 gio-2.0 pthread ssl fontconfig z Xau
-WANTLIB += Xdmcp expat png gthread-2.0 gnomevfs-2 glib-2.0 gmodule-2.0
-WANTLIB += gobject-2.0 gtk-x11-2.0 bonobo-activation art_lgpl_2 bonobo-2
-WANTLIB += atk-1.0 gconf-2 bonoboui-2 popt pangoft2-1.0 gnomecanvas-2
-WANTLIB += xml2 ORBit-2 pango-1.0 gdk_pixbuf-2.0 gdk-x11-2.0
-WANTLIB += gnome-2 cairo pangocairo-1.0 idn Xcursor Xext Xfixes Xi Xinerama
-WANTLIB += Xrandr gnome-keyring gailutil pixman-1 pthread-stubs xcb gnomeui-2
-WANTLIB += id3>=3.8 curl>=3 vte>=8 cdda_interface cdda_paranoia
-WANTLIB += xcb-render xcb-render-util
+WANTLIB += GL ICE ORBit-2 SM X11 Xau Xcomposite Xcursor Xdamage
+WANTLIB += Xdmcp Xext Xfixes Xi Xinerama Xrandr Xrender Xxf86vm
+WANTLIB += art_lgpl_2 atk-1.0 bonobo-2 bonobo-activation bonoboui-2
+WANTLIB += c cairo canberra cdda_interface cdda_paranoia crypto
+WANTLIB += curl drm expat fontconfig freetype gailutil gconf-2
+WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0
+WANTLIB += gnome-2 gnome-keyring gnomecanvas-2 gnomeui-2 gnomevfs-2
+WANTLIB += gobject-2.0 gthread-2.0 gtk-x11-2.0 id3 idn m pango-1.0
+WANTLIB += pangocairo-1.0 pangoft2-1.0 pixman-1 png popt pthread
+WANTLIB += pthread-stubs ssl stdc++ vte xcb xcb-render xcb-shm
+WANTLIB += xml2 z
 
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=grip/}
 

audio/grip/patches/patch-src_rip_c

@@ -1,4 +1,4 @@
-$OpenBSD: patch-src_rip_c,v 1.5 2008/05/13 14:20:25 naddy Exp $
+$OpenBSD: patch-src_rip_c,v 1.6 2011/04/16 21:21:24 jasper Exp $
 --- src/rip.c.orig	Thu Apr 15 20:21:15 2004
 +++ src/rip.c	Tue May 13 16:15:31 2008
 @@ -27,7 +27,7 @@
@@ -10,21 +10,3 @@ $OpenBSD: patch-src_rip_c,v 1.5 2008/05/13 14:20:25 naddy Exp $
  #include <sys/param.h>
  #include <sys/mount.h>
  #endif
-@@ -393,7 +393,7 @@ static void AddSQLEntry(GripInfo *ginfo,EncodeTrack *e
- 	    "-t",enc_track->song_name,"-d",enc_track->disc_name,
- 	    "-g",ID3GenreString(enc_track->id3_genre),"-y",year_str,
- 	    "-n",track_str,
--	    "-f",frame_str,"-l",length_str,"-m",playtime_str,NULL);
-+	    "-f",frame_str,"-l",length_str,"-m",playtime_str,(void *)NULL);
-     else
-       execlp("mp3insert","mp3insert",
- 	    "-p",enc_track->mp3_filename,
-@@ -401,7 +401,7 @@ static void AddSQLEntry(GripInfo *ginfo,EncodeTrack *e
- 	    "-t",enc_track->song_name,"-d",enc_track->disc_name,
- 	    "-g",ID3GenreString(enc_track->id3_genre),"-y",year_str,
- 	    "-n",track_str,
--	    "-f",frame_str,"-l",length_str,"-m",playtime_str,NULL);
-+	    "-f",frame_str,"-l",length_str,"-m",playtime_str,(void *)NULL);
-     
-     _exit(0);
-   }

audio/libmikmod/Makefile

@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.19 2010/10/18 16:52:45 espie Exp $
+# $OpenBSD: Makefile,v 1.20 2011/04/16 21:21:24 jasper Exp $
 
 COMMENT=	mikmod sound library
 
 VERSION=	3.1.10
 DISTNAME=	libmikmod-${VERSION}
-REVISION=	8
+REVISION=	9
 SHARED_LIBS +=	mikmod               2.4      # .2.4
 CATEGORIES=    	audio devel
 

audio/libmikmod/patches/patch-drivers_drv_pipe_c

@@ -1,12 +0,0 @@
-$OpenBSD: patch-drivers_drv_pipe_c,v 1.1 2002/12/24 21:53:52 pvalchev Exp $
---- drivers/drv_pipe.c.orig	Tue Dec 24 13:45:48 2002
-+++ drivers/drv_pipe.c	Tue Dec 24 13:45:50 2002
-@@ -120,7 +120,7 @@ static BOOL pipe_Init(void)
- 			}
- 			close(pipefd[1]);
- 			if (!MD_DropPrivileges())
--				execl("/bin/sh","sh","-c",target,NULL);
-+				execl("/bin/sh","sh","-c",target,(void *)NULL);
- 			exit(127);
- 	}
- 	close(pipefd[0]);