head 1.4; access; symbols pkgsrc-2013Q2:1.4.0.10 pkgsrc-2013Q2-base:1.4 pkgsrc-2012Q4:1.4.0.8 pkgsrc-2012Q4-base:1.4 pkgsrc-2011Q4:1.4.0.6 pkgsrc-2011Q4-base:1.4 pkgsrc-2011Q2:1.4.0.4 pkgsrc-2011Q2-base:1.4 pkgsrc-2009Q4:1.4.0.2 pkgsrc-2009Q4-base:1.4 pkgsrc-2009Q2:1.3.0.20 pkgsrc-2009Q2-base:1.3 pkgsrc-2009Q1:1.3.0.18 pkgsrc-2009Q1-base:1.3 pkgsrc-2008Q4:1.3.0.16 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.14 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.12 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.10 pkgsrc-2008Q2-base:1.3 cwrapper:1.3.0.8 pkgsrc-2008Q1:1.3.0.6 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.4 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.2 pkgsrc-2007Q3-base:1.3 pkgsrc-20070920:1.1.1.2 pkgsrc-2007Q2:1.2.0.18 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.16 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.14 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.12 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.10 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.8 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.6 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.4 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.2 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.1.1.1.0.10 pkgsrc-2005Q1-base:1.1.1.1 pkgsrc-2004Q4:1.1.1.1.0.8 pkgsrc-2004Q4-base:1.1.1.1 pkgsrc-2004Q3:1.1.1.1.0.6 pkgsrc-2004Q3-base:1.1.1.1 pkgsrc-2004Q2:1.1.1.1.0.4 pkgsrc-2004Q2-base:1.1.1.1 pkgsrc-2004Q1:1.1.1.1.0.2 pkgsrc-2004Q1-base:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.4 date 2009.07.26.18.38.14; author drochner; state dead; branches; next 1.3; 1.3 date 2007.09.19.23.46.07; author wiz; state Exp; branches; next 1.2; 1.2 date 2005.05.18.22.02.20; author wiz; state dead; branches; next 1.1; 1.1 date 2004.02.22.16.31.00; author jmmv; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2004.02.22.16.31.00; author jmmv; state Exp; branches; next 1.1.1.2; 1.1.1.2 date 2007.09.19.23.41.38; author wiz; state Exp; branches; next ; desc @@ 1.4 log @cleanup patches and pkgsrc support for the cd slave which hasn't been built for a while, cleanup unnecessary dependencies, bump PKGREVISION @ text @$NetBSD: patch-ab,v 1.3 2007/09/19 23:46:07 wiz Exp $ --- gnome-cd/gst-cdrom.c.orig 2007-01-22 15:01:38.000000000 +0100 +++ gnome-cd/gst-cdrom.c @@@@ -36,14 +36,14 @@@@ #ifdef __linux__ #include -#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__) || defined(__sun) +#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__) || defined(__sun) || defined(__DragonFly__) #include #endif -#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) #include #endif -#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) # define GST_CDROM_IOCTL_CDCAPABILITY_REQUEST CDIOCCAPABILITY # define GST_CDROM_IOCTL_EJECT_REQUEST CDIOCEJECT #elif defined(__NetBSD__) || defined(__OpenBSD__) @@@@ -851,7 +851,7 @@@@ gst_cdrom_update_cd (GnomeCDRom * gnome_ /* GstCdparanoiaCDRom *lcd = GST_CDPARANOIA_CDROM (cdrom); GstCdparanoiaCDRomPrivate *priv; -#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) struct ioc_read_toc_single_entry tocentry; #elif defined(__NetBSD__) || defined(__OpenBSD__) struct ioc_read_toc_entry tocentries; @@@@ -869,7 +869,7 @@@@ gst_cdrom_update_cd (GnomeCDRom * gnome_ return; } -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__) +#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) if (ioctl (cdrom->fd, CDIOREADTOCHEADER, priv->tochdr) < 0) { #else if (ioctl (cdrom->fd, CDROMREADTOCHDR, priv->tochdr) < 0) { @@@@ -880,7 +880,7 @@@@ gst_cdrom_update_cd (GnomeCDRom * gnome_ return; } -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__) +#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) priv->track0 = priv->tochdr->starting_track; priv->track1 = priv->tochdr->ending_track; #else @@@@ -893,8 +893,8 @@@@ gst_cdrom_update_cd (GnomeCDRom * gnome_ priv->track_info = g_malloc ((priv->number_tracks + 1) * sizeof (GstCdparanoiaCDRomTrackInfo)); -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__) -#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) +#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) for (i = 0, j = priv->track0; i < priv->number_tracks; i++, j++) { tocentry.track = j; tocentry.address_format = CD_MSF_FORMAT; @@@@ -906,7 +906,7 @@@@ gst_cdrom_update_cd (GnomeCDRom * gnome_ tocentries.address_format = CD_MSF_FORMAT; #endif -#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) if (ioctl (cdrom->fd, CDIOREADTOCENTRY, &tocentry) < 0) { #else if (ioctl (cdrom->fd, CDIOREADTOCENTRYS, &tocentries) < 0) { @@@@ -916,7 +916,7 @@@@ gst_cdrom_update_cd (GnomeCDRom * gnome_ } priv->track_info[i].track = j; -#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) priv->track_info[i].audio_track = tocentry.entry.control != CDROM_DATA_TRACK ? 1 : 0; ASSIGN_MSF (priv->track_info[i].address, @@@@ -943,8 +943,8 @@@@ gst_cdrom_update_cd (GnomeCDRom * gnome_ tocentry.cdte_addr.msf); #endif } -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__) -#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) +#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) tocentry.track = CDROM_LEADOUT; tocentry.address_format = CD_MSF_FORMAT; if (ioctl (cdrom->fd, CDIOREADTOCENTRY, &tocentry) < 0) { @@@@ -957,7 +957,7 @@@@ gst_cdrom_update_cd (GnomeCDRom * gnome_ gst_cdparanoia_cdrom_invalidate (lcd); return; } -#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) ASSIGN_MSF (priv->track_info[priv->number_tracks].address, tocentry.entry.addr.msf); #else @ 1.3 log @Finish move of gnome2-media to gnome-media. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.6 2007/04/11 18:05:07 drochner Exp $ @ 1.2 log @Remove gnome1 packages except as needed for gnucash. Ok'd by jmmv@@ and rh@@ (gnome 1 maintainers). @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.1 2004/02/22 16:31:00 jmmv Exp $ d3 3 a5 4 --- gmix/Makefile.in.orig Tue Jun 12 18:58:12 2001 +++ gmix/Makefile.in @@@@ -146,7 +146,7 @@@@ gmix_SOURCES = gmix.c gmix.h prefs.c prefs.h d7 10 d18 17 a34 2 -gmix_LDADD = $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(INTLLIBS) $(GMIX_LIBS) +gmix_LDADD = $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(INTLLIBS) $(GMIX_LIBS) -lossaudio d36 8 d45 54 a98 1 Audio_in_files = gmix.desktop.in @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.2 2001/08/13 18:38:55 rh Exp $ @ 1.1.1.1 log @Move gnome-media from audio to the multimedia category. This is version 1.2.3nb9. @ text @@ 1.1.1.2 log @Re-import gnome-media so that PKGNAME and directory name match. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.6 2007/04/11 18:05:07 drochner Exp $ d3 4 a6 3 --- gnome-cd/gst-cdrom.c.orig 2007-01-22 15:01:38.000000000 +0100 +++ gnome-cd/gst-cdrom.c @@@@ -36,14 +36,14 @@@@ a7 10 #ifdef __linux__ #include -#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__) || defined(__sun) +#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__) || defined(__sun) || defined(__DragonFly__) #include #endif -#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) #include #endif d9 2 a10 17 -#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) # define GST_CDROM_IOCTL_CDCAPABILITY_REQUEST CDIOCCAPABILITY # define GST_CDROM_IOCTL_EJECT_REQUEST CDIOCEJECT #elif defined(__NetBSD__) || defined(__OpenBSD__) @@@@ -851,7 +851,7 @@@@ gst_cdrom_update_cd (GnomeCDRom * gnome_ /* GstCdparanoiaCDRom *lcd = GST_CDPARANOIA_CDROM (cdrom); GstCdparanoiaCDRomPrivate *priv; -#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) struct ioc_read_toc_single_entry tocentry; #elif defined(__NetBSD__) || defined(__OpenBSD__) struct ioc_read_toc_entry tocentries; @@@@ -869,7 +869,7 @@@@ gst_cdrom_update_cd (GnomeCDRom * gnome_ return; } a11 8 -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__) +#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) if (ioctl (cdrom->fd, CDIOREADTOCHEADER, priv->tochdr) < 0) { #else if (ioctl (cdrom->fd, CDROMREADTOCHDR, priv->tochdr) < 0) { @@@@ -880,7 +880,7 @@@@ gst_cdrom_update_cd (GnomeCDRom * gnome_ return; } d13 1 a13 54 -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__) +#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) priv->track0 = priv->tochdr->starting_track; priv->track1 = priv->tochdr->ending_track; #else @@@@ -893,8 +893,8 @@@@ gst_cdrom_update_cd (GnomeCDRom * gnome_ priv->track_info = g_malloc ((priv->number_tracks + 1) * sizeof (GstCdparanoiaCDRomTrackInfo)); -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__) -#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) +#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) for (i = 0, j = priv->track0; i < priv->number_tracks; i++, j++) { tocentry.track = j; tocentry.address_format = CD_MSF_FORMAT; @@@@ -906,7 +906,7 @@@@ gst_cdrom_update_cd (GnomeCDRom * gnome_ tocentries.address_format = CD_MSF_FORMAT; #endif -#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) if (ioctl (cdrom->fd, CDIOREADTOCENTRY, &tocentry) < 0) { #else if (ioctl (cdrom->fd, CDIOREADTOCENTRYS, &tocentries) < 0) { @@@@ -916,7 +916,7 @@@@ gst_cdrom_update_cd (GnomeCDRom * gnome_ } priv->track_info[i].track = j; -#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) priv->track_info[i].audio_track = tocentry.entry.control != CDROM_DATA_TRACK ? 1 : 0; ASSIGN_MSF (priv->track_info[i].address, @@@@ -943,8 +943,8 @@@@ gst_cdrom_update_cd (GnomeCDRom * gnome_ tocentry.cdte_addr.msf); #endif } -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__) -#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) +#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) tocentry.track = CDROM_LEADOUT; tocentry.address_format = CD_MSF_FORMAT; if (ioctl (cdrom->fd, CDIOREADTOCENTRY, &tocentry) < 0) { @@@@ -957,7 +957,7 @@@@ gst_cdrom_update_cd (GnomeCDRom * gnome_ gst_cdparanoia_cdrom_invalidate (lcd); return; } -#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) ASSIGN_MSF (priv->track_info[priv->number_tracks].address, tocentry.entry.addr.msf); #else @