6 files changed, 75 insertions, 31 deletions

diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile
index a9af98dde82f..0ed17b7fecbd 100644
--- a/sysutils/nautilus-cd-burner/Makefile
+++ b/sysutils/nautilus-cd-burner/Makefile
@@ -3,49 +3,48 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/sysutils/nautilus-cd-burner/Makefile,v 1.77 2005/10/03 23:36:08 marcus Exp $
 #
 
 PORTNAME=	nautilus-cd-burner
-PORTVERSION=	2.10.2
+PORTVERSION=	2.12.1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.10
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.12
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	CD burner view for Nautilus
 
-RUN_DEPENDS=	cdrecord:${PORTSDIR}/sysutils/cdrtools-cjk
-
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNOME_DESKTOP_VERSION=2
 USE_GNOME=	gnomeprefix gnomehack intlhack nautilus2
-USE_LIBTOOL_VER=15
+USE_AUTOTOOLS=	libtool:15
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 GCONF_SCHEMAS=	ncb.schemas
 
+OPTIONS=	DVD "Enable DVD support" on \
+		CJK "Use cdrtools-cjk instead of cdrtools" off
+
 .include <bsd.port.pre.mk>
 
-.if exists(${LOCALBASE}/bin/growisofs)
-WITH_DVD=	yes
+.if defined(WITH_CJK)
+RUN_DEPENDS+=	cdrecord:${PORTSDIR}/sysutils/cdrtools-cjk
+WITHOUT_DVD=	yes
+.else
+RUN_DEPENDS+=	cdrecord:${PORTSDIR}/sysutils/cdrtools
 .endif
 
-.if defined(WITH_DVD)
+.if !defined(WITHOUT_DVD)
 RUN_DEPENDS+=	growisofs:${PORTSDIR}/sysutils/dvd+rw-tools
 .endif
 
-pre-everything::
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "${PORTNAME} has the following configurable option(s):"
-	@${ECHO_MSG} "	WITH_DVD	Enable DVD burning support"
-	@${ECHO_MSG} ""
-
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/sysutils/nautilus-cd-burner/distinfo b/sysutils/nautilus-cd-burner/distinfo
index 30c8c2d59ba4..8903df2a73f8 100644
--- a/sysutils/nautilus-cd-burner/distinfo
+++ b/sysutils/nautilus-cd-burner/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/nautilus-cd-burner-2.10.2.tar.bz2) = ed87311d620041d118d408072341343b
-SIZE (gnome2/nautilus-cd-burner-2.10.2.tar.bz2) = 544237
+MD5 (gnome2/nautilus-cd-burner-2.12.1.tar.bz2) = 6fb90feb52340627d4b93a1127654a00
+SIZE (gnome2/nautilus-cd-burner-2.12.1.tar.bz2) = 614118
diff --git a/sysutils/nautilus-cd-burner/files/patch-mapping-protocol.c b/sysutils/nautilus-cd-burner/files/patch-mapping-protocol.c
new file mode 100644
index 000000000000..aab64aa8abb9
--- /dev/null
+++ b/sysutils/nautilus-cd-burner/files/patch-mapping-protocol.c
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 000000000000..e836eb9823f8
--- /dev/null
+++ b/sysutils/nautilus-cd-burner/files/patch-nautilus-burn-drive.c
@@ -0,0 +1,30 @@
+--- nautilus-burn-drive.c.orig	Tue Aug 23 11:55:56 2005
++++ 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/files/patch-nautilus-cd-burner.c b/sysutils/nautilus-cd-burner/files/patch-nautilus-cd-burner.c
index c545be7d5513..9d286fda0065 100644
--- a/sysutils/nautilus-cd-burner/files/patch-nautilus-cd-burner.c
+++ b/sysutils/nautilus-cd-burner/files/patch-nautilus-cd-burner.c
@@ -1,20 +1,18 @@
---- nautilus-cd-burner.c.orig	Mon Feb 28 19:40:05 2005
-+++ nautilus-cd-burner.c	Mon Feb 28 20:05:56 2005
-@@ -23,6 +23,8 @@
-  *          Bastien Nocera <hadess@hadess.net>
+--- 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 <gtk/gtk.h>
- #include <gtk/gtkfilesel.h>
- #include <gtk/gtkseparatormenuitem.h>
-@@ -843,8 +845,19 @@
+ #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) {
--			g_free (filename);
--			filename = g_build_filename (g_get_tmp_dir (), "image.iso.XXXXXX", NULL);
 +			gchar *path1;
 +
 +			path1 = g_strdup_printf ("%s/.ncb", g_get_home_dir());
@@ -23,11 +21,13 @@
 +				mkdir (path1, 0700);
 +			}
 +
-+			if (filename != NULL) {
-+				g_free (filename);
-+			}
+ 			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);
++
+ 			fd = g_mkstemp (filename);
  			close (fd);
  
diff --git a/sysutils/nautilus-cd-burner/pkg-plist b/sysutils/nautilus-cd-burner/pkg-plist
index b368003149ed..f58bdd6772fe 100644
--- a/sysutils/nautilus-cd-burner/pkg-plist
+++ b/sysutils/nautilus-cd-burner/pkg-plist
@@ -6,7 +6,7 @@ include/libnautilus-burn/nautilus-burn-recorder.h
 lib/gnome-vfs-2.0/modules/libmapping.so
 lib/libnautilus-burn.a
 lib/libnautilus-burn.so
-lib/libnautilus-burn.so.1
+lib/libnautilus-burn.so.2
 lib/nautilus/extensions-1.0/libnautilus-burn-extension.so
 libdata/pkgconfig/libnautilus-burn.pc
 libexec/mapping-daemon
@@ -58,6 +58,7 @@ share/locale/mk/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
@@ -78,10 +79,13 @@ share/locale/sv/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/ta/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/th/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/tr/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/ug/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/uk/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/vi/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/xh/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/zh_CN/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/zh_TW/LC_MESSAGES/nautilus-cd-burner.mo
+@unexec rmdir %D/share/locale/ug/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/ug 2> /dev/null || true
 @dirrm share/gnome/nautilus-cd-burner
 @dirrm include/libnautilus-burn