* Update to 0.4.2

* Add FreeBSD support for finding CD burners (untested)


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

5 files changed, 112 insertions, 3 deletions

diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile
index aee5f3d2e..f68f60651 100644
--- a/sysutils/nautilus-cd-burner/Makefile
+++ b/sysutils/nautilus-cd-burner/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nautilus-cd-burner
-PORTVERSION=	0.4.1
+PORTVERSION=	0.4.2
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.4
@@ -26,7 +26,7 @@ GNOME_DESKTOP_VERSION=2
 USE_GNOME=	gnomeprefix gnomehack nautilus2
 USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
diff --git a/sysutils/nautilus-cd-burner/distinfo b/sysutils/nautilus-cd-burner/distinfo
index afdf2105d..11ff03a4a 100644
--- a/sysutils/nautilus-cd-burner/distinfo
+++ b/sysutils/nautilus-cd-burner/distinfo
@@ -1 +1 @@
-MD5 (gnome2/nautilus-cd-burner-0.4.1.tar.bz2) = f006ca9c65deb2281c3c3994ac3c946d
+MD5 (gnome2/nautilus-cd-burner-0.4.2.tar.bz2) = b6624facfa59454cfe7cecb131056b85
diff --git a/sysutils/nautilus-cd-burner/files/patch-Makefile.in b/sysutils/nautilus-cd-burner/files/patch-Makefile.in
new file mode 100644
index 000000000..860918c38
--- /dev/null
+++ b/sysutils/nautilus-cd-burner/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	Tue May 20 17:52:32 2003
++++ Makefile.in	Tue May 20 17:53:10 2003
+@@ -191,7 +191,7 @@
+ 	cd-drive.h	\
+ 	$(NULL)
+ 
+-nautilus_cd_burner_LDADD = $(GUI_LIBS)
++nautilus_cd_burner_LDADD = $(GUI_LIBS) -lcam
+ 
+ ### Mapping daemon
+ 
diff --git a/sysutils/nautilus-cd-burner/files/patch-cd-drive.c b/sysutils/nautilus-cd-burner/files/patch-cd-drive.c
new file mode 100644
index 000000000..241e7c107
--- /dev/null
+++ b/sysutils/nautilus-cd-burner/files/patch-cd-drive.c
@@ -0,0 +1,96 @@
+--- cd-drive.c.orig	Tue May 20 15:47:01 2003
++++ cd-drive.c	Tue May 20 17:55:56 2003
+@@ -40,6 +40,12 @@
+ #include <scsi/sg.h>
+ #endif /* __linux__ */
+ 
++#ifdef __FreeBSD__
++#include <sys/cdio.h>
++#include <sys/cdrio.h>
++#include <camlib.h>
++#endif
++
+ #include <glib.h>
+ #include <libgnome/gnome-i18n.h>
+ 
+@@ -603,6 +609,69 @@
+ }
+ #endif /* __linux__ */
+ 
++#ifdef __FreeBSD__
++GList *
++freebsd_scan (gboolean recorder_only)
++{
++	const char *dev_type = "cd";
++	int fd;
++	int i = 0;
++	GList *cdroms_list = NULL;
++
++	while(1) {
++	    	gchar *dev = g_strdup_printf("/dev/%s%dc", dev_type, i);
++		int rspeed, wspeed;
++		CDDriveType type = CDDRIVE_TYPE_CD_RECORDER;
++		CDDrive *cdrom;
++		struct cam_device *cam_dev;
++
++		if (!g_file_test(dev, G_FILE_TEST_EXISTS)) {
++		    	g_free(dev);
++			return NULL;
++		}
++
++		if ((cam_dev = cam_open_spec_device(dev_type, i, O_RDWR, NULL)) == NULL) {
++		    	g_free(dev);
++			continue;
++		}
++
++		if ((fd = open(dev, O_RDWR, 0)) < 0) {
++		    	g_free(dev);
++			continue;
++		}
++
++		if (ioctl(fd, CDRIOCWRITESPEED, &wspeed) < 0) {
++		    	wspeed = 0;
++			type = CDDRIVE_TYPE_CD_DRIVE;
++		}
++
++		if (ioctl(fd, CDRIOCREADSPEED, &rspeed) < 0) {
++		    	rspeed = 0;
++		}
++
++		if (type == CDDRIVE_TYPE_CD_RECORDER || recorder_only) {
++		    	cdrom = g_new0 (CDDrive, 1);
++			cdrom->display_name = g_strdup_printf("%s %s %s", cam_dev->inq_data.vendor, cam_dev->inq_data.product, cam_dev->inq_data.revision);
++			cdrom->device = g_strdup(dev);
++			cdrom->max_speed_read = rspeed;
++			cdrom->max_speed_write = wspeed;
++			cdrom->cdrecord_id = g_strdup_printf ("%d,%d,%d", cam_dev->bus_id, cam_dev->target_id, cam_dev->target_lun);
++			cdrom->type = type;
++
++			cdroms_list = g_list_append (cdroms_list, cdrom);
++		}
++
++		g_free(dev);
++		free(cam_dev);
++
++		i++;
++	}
++
++	return cdroms_list;
++}
++#endif /* __FreeBSD__ */
++	
++
+ GList *
+ scan_for_cdroms (gboolean recorder_only, gboolean add_image)
+ {
+@@ -611,6 +680,10 @@
+ 
+ #ifdef __linux__
+ 	cdroms = linux_scan (recorder_only);
++#endif
++
++#ifdef __FreeBSD__
++	cdroms = freebsd_scan (recorder_only);
+ #endif
+ 
+ 	if (add_image) {
diff --git a/sysutils/nautilus-cd-burner/pkg-plist b/sysutils/nautilus-cd-burner/pkg-plist
index f643f81a9..80712325c 100644
--- a/sysutils/nautilus-cd-burner/pkg-plist
+++ b/sysutils/nautilus-cd-burner/pkg-plist
@@ -34,6 +34,8 @@ share/locale/no/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/pl/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/pt/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/pt_BR/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/sr/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/sr@Latn/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/sv/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/tr/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/vi/LC_MESSAGES/nautilus-cd-burner.mo