8 files changed, 111 insertions, 105 deletions

diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile
index 3e707accfe15..13d3a8f6f993 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.96 2006/04/13 07:52:38 bland Exp $
+#   $MCom: ports/sysutils/nautilus-cd-burner/Makefile,v 1.114 2006/10/03 13:26:18 ahze Exp $
 #
 
 PORTNAME=	nautilus-cd-burner
-PORTVERSION=	2.14.3
+PORTVERSION=	2.16.1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -18,20 +18,22 @@ COMMENT=	CD burner view for Nautilus
 
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_GMAKE=	yes
 GNOME_DESKTOP_VERSION=2
-USE_GNOME=	gnomeprefix gnomehack intlhack nautilus2
-GNU_CONFIGURE=	yes
-INSTALLS_SHLIB=	yes
+USE_GNOME=	gnomeprefix gnomehack intlhack nautilus2 ltverhack
+INSTALLS_ICONS=	yes
+USE_AUTOTOOLS=	libtool:15
+USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--disable-hal
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-GCONF_SCHEMAS=	ncb.schemas
+GCONF_SCHEMAS=	nautilus-cd-burner.schemas
 
 OPTIONS=	DVD "Enable DVD support" on \
-		CJK "Use cdrtools-cjk instead of cdrtools" off
+		CJK "Use cdrtools-cjk instead of cdrtools" off \
+		GNOMEMOUNT "Enable sysutils/gnome-mount support" off
 
 .include <bsd.port.pre.mk>
 
@@ -46,6 +48,14 @@ RUN_DEPENDS+=	cdrecord:${PORTSDIR}/sysutils/cdrtools
 RUN_DEPENDS+=	growisofs:${PORTSDIR}/sysutils/dvd+rw-tools
 .endif
 
+.if defined(WITH_GNOMEMOUNT)
+BUILD_DEPENDS+=	gnome-mount:${PORTSDIR}/sysutils/gnome-mount
+RUN_DEPENDS+=	gnome-mount:${PORTSDIR}/sysutils/gnome-mount
+CONFIGURE_ARGS+=	--enable-gnome-mount
+.else
+CONFIGURE_ARGS+=	--disable-gnome-mount
+.endif
+
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/sysutils/nautilus-cd-burner/distinfo b/sysutils/nautilus-cd-burner/distinfo
index 045c6176c42e..88bc7f99a7e0 100644
--- a/sysutils/nautilus-cd-burner/distinfo
+++ b/sysutils/nautilus-cd-burner/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/nautilus-cd-burner-2.14.3.tar.bz2) = c85642630b3db5ee0a40e2fdbf4fdf94
-SHA256 (gnome2/nautilus-cd-burner-2.14.3.tar.bz2) = 45a8ac59ff4985807a54761b9f370c6d9cd73ff4a50f1c1e1cfe24e6c9c023a3
-SIZE (gnome2/nautilus-cd-burner-2.14.3.tar.bz2) = 682257
+MD5 (gnome2/nautilus-cd-burner-2.16.1.tar.bz2) = f64e98c9b3d3a21cb54dc4d4d3983de2
+SHA256 (gnome2/nautilus-cd-burner-2.16.1.tar.bz2) = 5cc224a8dfb3bbe005f06ac6b9466e4b97bde122c5db8064b25f663e3dac8e2e
+SIZE (gnome2/nautilus-cd-burner-2.16.1.tar.bz2) = 703744
diff --git a/sysutils/nautilus-cd-burner/files/patch-mapping-protocol.c b/sysutils/nautilus-cd-burner/files/patch-mapping-protocol.c
deleted file mode 100644
index aab64aa8abb9..000000000000
--- a/sysutils/nautilus-cd-burner/files/patch-mapping-protocol.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- mapping-protocol.c.orig	Tue May 17 17:14:35 2005
-+++ mapping-protocol.c	Tue May 17 17:15:24 2005
-@@ -24,6 +24,8 @@
-  *          William Jon McCann <mccann@jhu.edu>
-  */
- 
-+#include <sys/types.h>
-+#include <sys/time.h>
- #include <unistd.h>
- #include <string.h>
- #include <fcntl.h>
diff --git a/sysutils/nautilus-cd-burner/files/patch-nautilus-burn-drive.c b/sysutils/nautilus-cd-burner/files/patch-nautilus-burn-drive.c
deleted file mode 100644
index 3a68ad074232..000000000000
--- a/sysutils/nautilus-cd-burner/files/patch-nautilus-burn-drive.c
+++ /dev/null
@@ -1,42 +0,0 @@
---- nautilus-burn-drive.c.orig	Wed Mar 22 11:08:38 2006
-+++ nautilus-burn-drive.c	Thu Jul 13 22:15:30 2006
-@@ -687,7 +687,6 @@
- 	struct cd_toc_entry              entry;
- 	int                              i;
- #endif
--	int                              type;
- #ifndef CDROM_DATA_TRACK
- #define CDROM_DATA_TRACK 4
- #endif
-@@ -699,6 +698,10 @@
- 
- 	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;
- 	}
- 
-@@ -862,7 +865,7 @@
- 		*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:
-@@ -1767,7 +1770,11 @@
- #ifdef USE_GNOME_MOUNT
- 	cmd = g_strdup_printf ("gnome-mount --eject --no-ui --device=%s", drive->device);
- #else
-+#ifdef __FreeBSD__
-+	cmd = g_strdup_printf ("cdcontrol -f %s eject", drive->device);
-+#else
- 	cmd = g_strdup_printf ("eject %s", drive->device);
-+#endif
- #endif
- 
- 	res = g_spawn_command_line_sync (cmd, NULL, NULL, NULL, NULL);
diff --git a/sysutils/nautilus-cd-burner/files/patch-nautilus-cd-burner.c b/sysutils/nautilus-cd-burner/files/patch-nautilus-cd-burner.c
deleted file mode 100644
index 9d286fda0065..000000000000
--- a/sysutils/nautilus-cd-burner/files/patch-nautilus-cd-burner.c
+++ /dev/null
@@ -1,33 +0,0 @@
---- nautilus-cd-burner.c.orig	Wed May 11 18:56:59 2005
-+++ nautilus-cd-burner.c	Tue May 17 17:11:49 2005
-@@ -25,6 +25,8 @@
-  *          William Jon McCann <mccann@jhu.edu>
-  */
- 
-+#include <sys/types.h>
-+#include <sys/stat.h>
- #include <time.h>
- #include <stdio.h>
- #include <stdlib.h>
-@@ -1103,10 +1105,20 @@ burn_cd (const NautilusBurnDrive *drive,
- 		}
- 
- 		if (res == NAUTILUS_BURN_RECORDER_RESULT_RETRY) {
-+			gchar *path1;
-+
-+			path1 = g_strdup_printf ("%s/.ncb", g_get_home_dir());
-+
-+			if (!g_file_test (path1, G_FILE_TEST_EXISTS)) {
-+				mkdir (path1, 0700);
-+			}
-+
- 			g_free (toc_filename);
- 			g_free (filename);
- 
--			filename = g_build_filename (g_get_tmp_dir (), "image.iso.XXXXXX", NULL);
-+			filename = g_build_filename (path1, "image.iso.XXXXXX", NULL);
-+			g_free (path1);
-+
- 			fd = g_mkstemp (filename);
- 			close (fd);
- 
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
new file mode 100644
index 000000000000..9d3ce89ec982
--- /dev/null
+++ b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-burn-drive.c
@@ -0,0 +1,14 @@
+--- src/nautilus-burn-drive.c.orig	Thu Jul 13 22:51:49 2006
++++ src/nautilus-burn-drive.c	Thu Jul 13 22:52:25 2006
+@@ -806,7 +806,11 @@ nautilus_burn_drive_eject (NautilusBurnD
+ #ifdef USE_GNOME_MOUNT
+ 	cmd = g_strdup_printf ("gnome-mount --eject --no-ui --device=%s", drive->priv->device);
+ #else
++#ifdef __FreeBSD_
++	cmd = g_strdup_printf ("cdcontrol -f %s eject", drive->priv->device);
++#else
+ 	cmd = g_strdup_printf ("eject %s", drive->priv->device);
++#endif
+ #endif
+ 
+ 	res = g_spawn_command_line_sync (cmd, NULL, NULL, NULL, NULL);
diff --git a/sysutils/nautilus-cd-burner/files/patch-src_nautilus-cd-burner.c b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-cd-burner.c
new file mode 100644
index 000000000000..3d5585ee2e1d
--- /dev/null
+++ b/sysutils/nautilus-cd-burner/files/patch-src_nautilus-cd-burner.c
@@ -0,0 +1,11 @@
+--- src/nautilus-cd-burner.c.orig	Tue May  9 13:31:13 2006
++++ src/nautilus-cd-burner.c	Mon May 15 21:11:00 2006
+@@ -27,6 +27,8 @@
+ 
+ #include "config.h"
+ 
++#include <sys/types.h>
++#include <sys/stat.h>
+ #include <time.h>
+ #include <stdio.h>
+ #include <stdlib.h>
diff --git a/sysutils/nautilus-cd-burner/pkg-plist b/sysutils/nautilus-cd-burner/pkg-plist
index 64b5322649f4..b01bd7a2615c 100644
--- a/sysutils/nautilus-cd-burner/pkg-plist
+++ b/sysutils/nautilus-cd-burner/pkg-plist
@@ -1,20 +1,26 @@
 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
 libexec/mapping-daemon
 share/gnome/applications/nautilus-cd-burner.desktop
-share/gnome/nautilus-cd-burner/cdburn.glade
+share/gnome/applications/nautilus-cd-burner-open-iso.desktop
 share/gnome/nautilus-cd-burner/cdspin1.png
 share/gnome/nautilus-cd-burner/cdspin2.png
 share/gnome/nautilus-cd-burner/cdspin3.png
@@ -23,19 +29,25 @@ share/gnome/nautilus-cd-burner/cdspin5.png
 share/gnome/nautilus-cd-burner/cdspin6.png
 share/gnome/nautilus-cd-burner/cdspin7.png
 share/gnome/nautilus-cd-burner/cdspin8.png
+share/gnome/nautilus-cd-burner/nautilus-cd-burner.glade
+share/icons/hicolor/16x16/apps/nautilus-cd-burner.png
+share/icons/hicolor/22x22/apps/nautilus-cd-burner.png
+share/icons/hicolor/24x24/apps/nautilus-cd-burner.png
+share/icons/hicolor/scalable/apps/nautilus-cd-burner.svg
 share/locale/am/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/ar/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/az/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/be/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/bg/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/bn/LC_MESSAGES/nautilus-cd-burner.mo
-share/locale/br/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/bn_IN/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/bs/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/ca/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/cs/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/cy/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/da/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/de/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/dz/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/el/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/en_CA/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/en_GB/LC_MESSAGES/nautilus-cd-burner.mo
@@ -52,6 +64,7 @@ share/locale/he/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/hi/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/hr/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/hu/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/hy/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/id/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/is/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/it/LC_MESSAGES/nautilus-cd-burner.mo
@@ -62,13 +75,13 @@ share/locale/lt/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/lv/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/mg/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/mk/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/ml/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/mn/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/ms/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/nb/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/ne/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/nl/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/nn/LC_MESSAGES/nautilus-cd-burner.mo
-share/locale/no/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/or/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/pa/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/pl/LC_MESSAGES/nautilus-cd-burner.mo
@@ -94,15 +107,59 @@ share/locale/xh/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/zh_CN/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/zh_HK/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/zh_TW/LC_MESSAGES/nautilus-cd-burner.mo
+@dirrm share/gnome/nautilus-cd-burner
+@dirrm include/libnautilus-burn
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
 @dirrmtry share/locale/ug/LC_MESSAGES
 @dirrmtry share/locale/ug
 @dirrmtry share/locale/te/LC_MESSAGES
 @dirrmtry share/locale/te
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
 @dirrmtry share/locale/mg/LC_MESSAGES
 @dirrmtry share/locale/mg
-@dirrmtry share/locale/br/LC_MESSAGES
-@dirrmtry share/locale/br
-@dirrm share/gnome/nautilus-cd-burner
-@dirrm include/libnautilus-burn
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/hy/LC_MESSAGES
+@dirrmtry share/locale/hy
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be