Update to 1.2: add share/desktop-directories.

Okayed by jmmv@.

6 files changed, 35 insertions, 23 deletions

diff --git a/misc/libcdio/Makefile b/misc/libcdio/Makefile
index 997380a8dea..98d8ca41512 100644
--- a/misc/libcdio/Makefile
+++ b/misc/libcdio/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2005/04/11 21:46:38 tv Exp $
+# $NetBSD: Makefile,v 1.16 2005/04/19 10:52:26 wiz Exp $
 #
 
-DISTNAME=	libcdio-0.70
+DISTNAME=	libcdio-0.72
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_GNU:=libcdio/}
 
@@ -16,18 +16,11 @@ USE_LIBTOOL=		yes
 PKGCONFIG_OVERRIDE+=	libcdio.pc.in
 PKGCONFIG_OVERRIDE+=	libiso9660.pc.in
 GNU_CONFIGURE=		yes
+TEST_TARGET=		test
 CONFIGURE_ARGS+=	--without-versioned-libs
 
 INFO_FILES=		libcdio.info
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "NetBSD"
-# XXX we just replace the freebsd module so save patches
-pre-patch:
-	${CP} ${FILESDIR}/_cdio_netbsd.c ${WRKSRC}/lib/FreeBSD/freebsd.c
-.endif
-
 .include "../../devel/pkgconfig/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
 .include "../../audio/libcddb/buildlink3.mk"
diff --git a/misc/libcdio/PLIST b/misc/libcdio/PLIST
index b9dbe6b04cb..9f7bc114d33 100644
--- a/misc/libcdio/PLIST
+++ b/misc/libcdio/PLIST
@@ -1,23 +1,41 @@
-@comment $NetBSD: PLIST,v 1.6 2004/10/05 14:23:18 drochner Exp $
+@comment $NetBSD: PLIST,v 1.7 2005/04/19 10:52:26 wiz Exp $
 bin/cd-drive
 bin/cd-info
+bin/cd-paranoia
 bin/cd-read
 bin/iso-info
 bin/iso-read
+include/cdio/bytesex.h
+include/cdio/bytesex_asm.h
 include/cdio/cd_types.h
+include/cdio/cdda.h
 include/cdio/cdio.h
 include/cdio/cdtext.h
+include/cdio/device.h
+include/cdio/disc.h
+include/cdio/ds.h
 include/cdio/dvd.h
 include/cdio/iso9660.h
 include/cdio/logging.h
+include/cdio/paranoia.h
+include/cdio/read.h
 include/cdio/scsi_mmc.h
 include/cdio/sector.h
+include/cdio/track.h
 include/cdio/types.h
 include/cdio/util.h
 include/cdio/version.h
 include/cdio/xa.h
 lib/libcdio.la
+lib/libcdio_cdda.la
+lib/libcdio_paranoia.la
 lib/libiso9660.la
 lib/pkgconfig/libcdio.pc
+lib/pkgconfig/libcdio_cdda.pc
+lib/pkgconfig/libcdio_paranoia.pc
 lib/pkgconfig/libiso9660.pc
+man/jp/man1/cd-paranoia.1
+man/man1/cd-paranoia.1
+@unexec ${RMDIR} %D/man/jp/man1 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/man/jp 2>/dev/null || ${TRUE}
 @dirrm include/cdio
diff --git a/misc/libcdio/distinfo b/misc/libcdio/distinfo
index 9b8cb6479e4..8e26dfbaeb0 100644
--- a/misc/libcdio/distinfo
+++ b/misc/libcdio/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2005/02/24 11:02:55 agc Exp $
+$NetBSD: distinfo,v 1.6 2005/04/19 10:52:26 wiz Exp $
 
-SHA1 (libcdio-0.70.tar.gz) = 57d45525fc5dc8de8c0dc9fd574d90cb534b36df
-RMD160 (libcdio-0.70.tar.gz) = fdbabe1aa484e010d09e9a5612f1ffc9ebe6617f
-Size (libcdio-0.70.tar.gz) = 1474322 bytes
-SHA1 (patch-aa) = ebda7a5453404e6adf4755f768a5293ca9871878
+SHA1 (libcdio-0.72.tar.gz) = 0ab4e084c079b799c08b0b2cbb37576a8031c40d
+RMD160 (libcdio-0.72.tar.gz) = dbca995a45f27c593d06e3bdac1a64adf7dfe6b6
+Size (libcdio-0.72.tar.gz) = 1709094 bytes
+SHA1 (patch-aa) = c571d1f82e3e2c251a002298f88bd6a4d4d357c5
diff --git a/misc/libcdio/patches/patch-aa b/misc/libcdio/patches/patch-aa
index 84e4a0c2b88..101545055f6 100644
--- a/misc/libcdio/patches/patch-aa
+++ b/misc/libcdio/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1 2004/04/19 18:08:27 drochner Exp $
+$NetBSD: patch-aa,v 1.2 2005/04/19 10:52:26 wiz Exp $
 
---- lib/logging.c.orig	2004-04-18 17:24:27.000000000 +0000
-+++ lib/logging.c	2004-04-18 17:25:33.000000000 +0000
-@@ -44,7 +44,9 @@
+--- lib/driver/logging.c.orig	2004-12-18 18:29:32.000000000 +0100
++++ lib/driver/logging.c
+@@ -45,7 +45,9 @@ default_cdio_log_handler (cdio_log_level
          fprintf (stderr, "**ERROR: %s\n", message);
          fflush (stderr);
        }
diff --git a/misc/xdg-dirs/Makefile b/misc/xdg-dirs/Makefile
index d8fb25a7e11..8e30849f177 100644
--- a/misc/xdg-dirs/Makefile
+++ b/misc/xdg-dirs/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2005/04/11 21:46:40 tv Exp $
+# $NetBSD: Makefile,v 1.9 2005/04/19 10:52:26 wiz Exp $
 #
 
-DISTNAME=	xdg-dirs-1.1
+DISTNAME=	xdg-dirs-1.2
 CATEGORIES=	misc gnome kde
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/misc/xdg-dirs/dirs.mk b/misc/xdg-dirs/dirs.mk
index a41af4d74df..ed382996496 100644
--- a/misc/xdg-dirs/dirs.mk
+++ b/misc/xdg-dirs/dirs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: dirs.mk,v 1.1 2004/04/14 15:26:41 jmmv Exp $
+# $NetBSD: dirs.mk,v 1.2 2005/04/19 10:52:26 wiz Exp $
 #
 # This file is intended to be included by mk/dirs.mk, not directly by packages.
 #
@@ -8,6 +8,7 @@ DIRS_XDG_MK=		# defined
 
 XDG_DIRS=		share/application-registry
 XDG_DIRS+=		share/applications
+XDG_DIRS+=		share/desktop-directories
 XDG_DIRS+=		share/icons
 XDG_DIRS+=		share/images
 XDG_DIRS+=		share/mime-info