Date: Fri, 22 May 2015 07:21:05 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r386988 - head/audio/xcdplayer/files Message-ID: <201505220721.t4M7L5Hu043587@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Fri May 22 07:21:04 2015 New Revision: 386988 URL: https://svnweb.freebsd.org/changeset/ports/386988 Log: audio/xcdplayer: unbreak on 11.0C and DragonFly In file included from cdrom_freebsd.c:28: /usr/include/sys/buf.h:129:30: error: unknown type name 'vm_page_t' void (*pg_iodone)(void *, vm_page_t *, int, int); ^ cdrom_callb.c:59:6: error: 'cdi' undeclared (first use in this function) if (cdi.state & CDROM_STATE_EJECTED) { ^ cdrom_callb.c:59:18: error: 'CDROM_STATE_EJECTED' undeclared (first use in this function) if (cdi.state & CDROM_STATE_EJECTED) { ^ button_setup.c:583:16: error: 'NODISCSTR' undeclared (first use in this function) disc_title = NODISCSTR; ^ Reported by: pkg-fallout, DPorts Obtained from: https://github.com/jsonn/pkgsrc/commit/4afb403 (modified) Tested by: md5 Modified: head/audio/xcdplayer/files/cdrom_freebsd.c head/audio/xcdplayer/files/patch-button__setup.c head/audio/xcdplayer/files/patch-cdrom__callb.c head/audio/xcdplayer/files/patch-internals.c head/audio/xcdplayer/files/patch-logo__setup.c head/audio/xcdplayer/files/patch-program.c head/audio/xcdplayer/files/patch-shuffle.c Modified: head/audio/xcdplayer/files/cdrom_freebsd.c ============================================================================== --- head/audio/xcdplayer/files/cdrom_freebsd.c Fri May 22 07:15:56 2015 (r386987) +++ head/audio/xcdplayer/files/cdrom_freebsd.c Fri May 22 07:21:04 2015 (r386988) @@ -1,4 +1,5 @@ /* $FreeBSD$ */ +/* $NetBSD: pkgsrc/audio/xcdplayer/files/cdrom_freebsd.c,v 1.6 2005/12/11 20:48:46 joerg Exp $ */ /* * Copyright (C) 1990 Regents of the University of California. * @@ -22,10 +23,6 @@ static int c; # include <sys/param.h> # include <sys/stat.h> # include <string.h> -# if __FreeBSD_version >= 500003 -# include <sys/bio.h> -# endif -# include <sys/buf.h> # include <sys/time.h> #include <sys/ioctl.h> @@ -36,8 +33,13 @@ static int c; # include "cdrom_freebsd.h" # include "app.h" +#ifdef __NetBSD__ +static char cdrom[] = "/dev/rcd0d"; +static char cdrom1[] = "/dev/rmcd0d"; +#else static char cdrom[] = "/dev/cd0c"; static char cdrom1[] = "/dev/mcd0c"; +#endif cdrom_info cdi; char info_filename[256]; Modified: head/audio/xcdplayer/files/patch-button__setup.c ============================================================================== --- head/audio/xcdplayer/files/patch-button__setup.c Fri May 22 07:15:56 2015 (r386987) +++ head/audio/xcdplayer/files/patch-button__setup.c Fri May 22 07:21:04 2015 (r386988) @@ -1,5 +1,6 @@ $FreeBSD$ +$NetBSD: pkgsrc/audio/xcdplayer/patches/patch-ad,v 1.4 2005/12/11 20:48:46 joerg Exp $ --- button_setup.c.orig Tue Jan 12 19:59:47 1993 +++ button_setup.c Mon Aug 25 00:38:35 2003 @@ -7,7 +8,7 @@ $FreeBSD$ # include <X11/Xaw/Toggle.h> # include "cdrom_globs.h" -+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) ++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) +# include "cdrom_freebsd.h" +#endif #ifdef sun Modified: head/audio/xcdplayer/files/patch-cdrom__callb.c ============================================================================== --- head/audio/xcdplayer/files/patch-cdrom__callb.c Fri May 22 07:15:56 2015 (r386987) +++ head/audio/xcdplayer/files/patch-cdrom__callb.c Fri May 22 07:21:04 2015 (r386988) @@ -1,5 +1,6 @@ $FreeBSD$ +$NetBSD: pkgsrc/audio/xcdplayer/patches/patch-ae,v 1.4 2005/12/11 20:48:46 joerg Exp $ --- cdrom_callb.c.orig Tue Jan 12 19:59:48 1993 +++ cdrom_callb.c Mon Aug 25 00:38:35 2003 @@ -7,7 +8,7 @@ $FreeBSD$ # include "debug.h" # include "cdrom_globs.h" -+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) ++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) +# include "cdrom_freebsd.h" +#endif #ifdef sun Modified: head/audio/xcdplayer/files/patch-internals.c ============================================================================== --- head/audio/xcdplayer/files/patch-internals.c Fri May 22 07:15:56 2015 (r386987) +++ head/audio/xcdplayer/files/patch-internals.c Fri May 22 07:21:04 2015 (r386988) @@ -1,10 +1,14 @@ + +$FreeBSD$ +$NetBSD: pkgsrc/audio/xcdplayer/patches/patch-ah,v 1.4 2005/12/11 20:48:46 joerg Exp $ + --- internals.c.orig Tue Jan 12 19:59:45 1993 +++ internals.c Wed May 30 19:20:48 2007 @@ -22,6 +22,9 @@ # include "debug.h" # include "cdrom_globs.h" -+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) ++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) +# include "cdrom_freebsd.h" +#endif #ifdef sun Modified: head/audio/xcdplayer/files/patch-logo__setup.c ============================================================================== --- head/audio/xcdplayer/files/patch-logo__setup.c Fri May 22 07:15:56 2015 (r386987) +++ head/audio/xcdplayer/files/patch-logo__setup.c Fri May 22 07:21:04 2015 (r386988) @@ -1,5 +1,6 @@ $FreeBSD$ +$NetBSD: pkgsrc/audio/xcdplayer/patches/patch-ai,v 1.4 2005/12/11 20:48:46 joerg Exp $ --- logo_setup.c.orig Tue Jan 12 19:59:46 1993 +++ logo_setup.c Mon Aug 25 00:38:35 2003 @@ -7,7 +8,7 @@ $FreeBSD$ # include <stdio.h> # include "cdrom_globs.h" -+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) ++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) +# include "cdrom_freebsd.h" +#endif #ifdef sun Modified: head/audio/xcdplayer/files/patch-program.c ============================================================================== --- head/audio/xcdplayer/files/patch-program.c Fri May 22 07:15:56 2015 (r386987) +++ head/audio/xcdplayer/files/patch-program.c Fri May 22 07:21:04 2015 (r386988) @@ -1,5 +1,6 @@ $FreeBSD$ +$NetBSD: pkgsrc/audio/xcdplayer/patches/patch-ak,v 1.4 2005/12/11 20:48:46 joerg Exp $ --- program.c.orig Tue Jan 12 19:59:49 1993 +++ program.c Mon Aug 25 00:38:35 2003 @@ -12,7 +13,7 @@ $FreeBSD$ # include "debug.h" # include "cdrom_globs.h" -+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) ++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) +# include "cdrom_freebsd.h" +#endif #ifdef sun Modified: head/audio/xcdplayer/files/patch-shuffle.c ============================================================================== --- head/audio/xcdplayer/files/patch-shuffle.c Fri May 22 07:15:56 2015 (r386987) +++ head/audio/xcdplayer/files/patch-shuffle.c Fri May 22 07:21:04 2015 (r386988) @@ -1,5 +1,6 @@ $FreeBSD$ +$NetBSD: pkgsrc/audio/xcdplayer/patches/patch-al,v 1.4 2005/12/11 20:48:46 joerg Exp $ --- shuffle.c.orig Tue Jan 12 19:59:38 1993 +++ shuffle.c Mon Aug 25 00:38:35 2003 @@ -7,7 +8,7 @@ $FreeBSD$ # include "debug.h" # include "cdrom_globs.h" -+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) ++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) +# include "cdrom_freebsd.h" +#endif #ifdef sun
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201505220721.t4M7L5Hu043587>