- Update to 2.15.3 (now using hal)

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@6418 df743ca5-7f9a-e211-a948-0013205c9059

4 files changed, 14 insertions, 38 deletions

diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile
index e331005e3..29bcc0097 100644
--- a/sysutils/nautilus-cd-burner/Makefile
+++ b/sysutils/nautilus-cd-burner/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/nautilus-cd-burner/Makefile,v 1.98 2006/04/30 06:13:43 ahze Exp $
+#   $MCom$
 #
 
 PORTNAME=	nautilus-cd-burner
-PORTVERSION=	2.15.2
+PORTVERSION=	2.15.3
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -21,8 +21,8 @@ USE_GETTEXT=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 GNOME_DESKTOP_VERSION=2
-USE_GNOME=	gnomeprefix gnomehack intlhack nautilus2
-GNU_CONFIGURE=	yes
+USE_GNOME=	gnomeprefix gnomehack intlhack nautilus2 ltverhack
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--disable-hal
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/sysutils/nautilus-cd-burner/distinfo b/sysutils/nautilus-cd-burner/distinfo
index daad91704..037f5e725 100644
--- a/sysutils/nautilus-cd-burner/distinfo
+++ b/sysutils/nautilus-cd-burner/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/nautilus-cd-burner-2.15.2.tar.bz2) = d7138dd1668b3d3a6fcbd2fc7ce9b4c7
-SHA256 (gnome2/nautilus-cd-burner-2.15.2.tar.bz2) = 5d38702a1256b5215ade6cf9a38ed645d53e9b65279ab396a16905981e0b3553
-SIZE (gnome2/nautilus-cd-burner-2.15.2.tar.bz2) = 666667
+MD5 (gnome2/nautilus-cd-burner-2.15.3.tar.bz2) = 9c508a19359e510ed48793e81599c168
+SHA256 (gnome2/nautilus-cd-burner-2.15.3.tar.bz2) = 4c83af456baf7336de1010ade385a7a70b79d12362f0bb0fd1e3387ff601c548
+SIZE (gnome2/nautilus-cd-burner-2.15.3.tar.bz2) = 653696
diff --git a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive.c b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive.c
deleted file mode 100644
index a2241b21a..000000000
--- a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive.c
+++ /dev/null
@@ -1,30 +0,0 @@
---- src/nautilus-burn-drive.c.orig	Tue Aug 23 11:55:56 2005
-+++ src/nautilus-burn-drive.c	Sat Sep 10 20:32:26 2005
-@@ -471,7 +471,6 @@ get_disc_type (const char *dev_path)
- 	struct cd_toc_entry              entry;
- 	int                              i;
- #endif
--	int                              type;
- #ifndef CDROM_DATA_TRACK
- #define CDROM_DATA_TRACK 4
- #endif
-@@ -483,6 +482,10 @@ get_disc_type (const char *dev_path)
- 
- 	if (ioctl (fd, CDIOREADTOCHEADER, &header) < 0) {
- 		close (fd);
-+		if (errno == EINVAL)
-+			/* If you try to read the TOC header of a blank disc
-+			 * on FreeBSD, you get EINVAL. */
-+			return CDS_NO_INFO;
- 	    	return -1;
- 	}
- 
-@@ -649,7 +652,7 @@ nautilus_burn_drive_get_media_type_from_
- 		*is_blank = mmc_profile & 0x10000;
- 
- 	disc_type = get_disc_type (device);
--	disc_type_get_info (disc_type, is_blank, has_data, has_audio);
-+	disc_type_get_info (disc_type, NULL, has_data, has_audio);
- 
- 	switch (mmc_profile & 0xFFFF) {
- 	case -1:
diff --git a/sysutils/nautilus-cd-burner/pkg-plist b/sysutils/nautilus-cd-burner/pkg-plist
index 13cd7b4f6..c718a2e2a 100644
--- a/sysutils/nautilus-cd-burner/pkg-plist
+++ b/sysutils/nautilus-cd-burner/pkg-plist
@@ -1,14 +1,20 @@
 bin/nautilus-cd-burner
 etc/gnome-vfs-2.0/modules/mapping-modules.conf
+include/libnautilus-burn/nautilus-burn-drive-monitor.h
 include/libnautilus-burn/nautilus-burn-drive-selection.h
 include/libnautilus-burn/nautilus-burn-drive.h
 include/libnautilus-burn/nautilus-burn-features.h
+include/libnautilus-burn/nautilus-burn-init.h
 include/libnautilus-burn/nautilus-burn-recorder.h
+include/libnautilus-burn/nautilus-burn.h
+lib/gnome-vfs-2.0/modules/libmapping.a
 lib/gnome-vfs-2.0/modules/libmapping.la
 lib/gnome-vfs-2.0/modules/libmapping.so
+lib/libnautilus-burn.a
 lib/libnautilus-burn.la
 lib/libnautilus-burn.so
-lib/libnautilus-burn.so.3
+lib/libnautilus-burn.so.4
+lib/nautilus/extensions-1.0/libnautilus-burn-extension.a
 lib/nautilus/extensions-1.0/libnautilus-burn-extension.la
 lib/nautilus/extensions-1.0/libnautilus-burn-extension.so
 libdata/pkgconfig/libnautilus-burn.pc