- Update to 2.13.1

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

13 files changed, 282 insertions, 12 deletions

diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index 4ad539ca2..72ee5a94c 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -3,14 +3,14 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/gnomecontrolcenter2/Makefile,v 1.84 2005/09/04 18:13:33 marcus Exp $
+#   $MCom: ports/sysutils/gnomecontrolcenter2/Makefile,v 1.85 2005/10/03 15:29:07 ahze Exp $
 #
 
 PORTNAME=	gnomecontrolcenter2
-PORTVERSION=	2.12.1
+PORTVERSION=	2.13.1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/control-center/2.12
+MASTER_SITE_SUBDIR=	sources/control-center/2.13
 DISTNAME=	control-center-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -27,7 +27,7 @@ GNOME_DESKTOP_VERSION=2
 USE_GSTREAMER=	yes
 WANT_GNOME=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack metacity nautilus2 \
-		gnomemenus desktopfileutils
+		gnomemenus desktopfileutils nautilus2
 USE_AUTOTOOLS=	libtool:15
 INSTALLS_OMF=	yes
 INSTALLS_SHLIB=	yes
@@ -38,6 +38,7 @@ GCONF_SCHEMAS=	apps_gnome_settings_daemon_default_editor.schemas \
 		apps_gnome_settings_daemon_keybindings.schemas \
 		apps_gnome_settings_daemon_screensaver.schemas \
 		desktop_gnome_font_rendering.schemas \
+		desktop_gnome_peripherals_keyboard.schemas \
 		desktop_gnome_peripherals_keyboard_xkb.schemas \
 		fontilus.schemas themus.schemas
 
diff --git a/sysutils/gnome-control-center/distinfo b/sysutils/gnome-control-center/distinfo
index 550ff98a4..322ac42f6 100644
--- a/sysutils/gnome-control-center/distinfo
+++ b/sysutils/gnome-control-center/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/control-center-2.12.1.tar.bz2) = f3d8520b8544e1f910600ba889e02523
-SIZE (gnome2/control-center-2.12.1.tar.bz2) = 1771524
+MD5 (gnome2/control-center-2.13.1.tar.bz2) = 7de69a91cf552ea7852d2b7d008dcace
+SIZE (gnome2/control-center-2.13.1.tar.bz2) = 1780187
diff --git a/sysutils/gnomecontrolcenter2/Makefile b/sysutils/gnomecontrolcenter2/Makefile
index 4ad539ca2..72ee5a94c 100644
--- a/sysutils/gnomecontrolcenter2/Makefile
+++ b/sysutils/gnomecontrolcenter2/Makefile
@@ -3,14 +3,14 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/gnomecontrolcenter2/Makefile,v 1.84 2005/09/04 18:13:33 marcus Exp $
+#   $MCom: ports/sysutils/gnomecontrolcenter2/Makefile,v 1.85 2005/10/03 15:29:07 ahze Exp $
 #
 
 PORTNAME=	gnomecontrolcenter2
-PORTVERSION=	2.12.1
+PORTVERSION=	2.13.1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/control-center/2.12
+MASTER_SITE_SUBDIR=	sources/control-center/2.13
 DISTNAME=	control-center-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -27,7 +27,7 @@ GNOME_DESKTOP_VERSION=2
 USE_GSTREAMER=	yes
 WANT_GNOME=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack metacity nautilus2 \
-		gnomemenus desktopfileutils
+		gnomemenus desktopfileutils nautilus2
 USE_AUTOTOOLS=	libtool:15
 INSTALLS_OMF=	yes
 INSTALLS_SHLIB=	yes
@@ -38,6 +38,7 @@ GCONF_SCHEMAS=	apps_gnome_settings_daemon_default_editor.schemas \
 		apps_gnome_settings_daemon_keybindings.schemas \
 		apps_gnome_settings_daemon_screensaver.schemas \
 		desktop_gnome_font_rendering.schemas \
+		desktop_gnome_peripherals_keyboard.schemas \
 		desktop_gnome_peripherals_keyboard_xkb.schemas \
 		fontilus.schemas themus.schemas
 
diff --git a/sysutils/gnomecontrolcenter2/distinfo b/sysutils/gnomecontrolcenter2/distinfo
index 550ff98a4..322ac42f6 100644
--- a/sysutils/gnomecontrolcenter2/distinfo
+++ b/sysutils/gnomecontrolcenter2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/control-center-2.12.1.tar.bz2) = f3d8520b8544e1f910600ba889e02523
-SIZE (gnome2/control-center-2.12.1.tar.bz2) = 1771524
+MD5 (gnome2/control-center-2.13.1.tar.bz2) = 7de69a91cf552ea7852d2b7d008dcace
+SIZE (gnome2/control-center-2.13.1.tar.bz2) = 1780187
diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile
new file mode 100644
index 000000000..a28657adc
--- /dev/null
+++ b/sysutils/nautilus-cd-burner/Makefile
@@ -0,0 +1,51 @@
+# New ports collection makefile for:	nautilus-cd-burner
+# Date created:				13 April 2003
+# 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.13.1
+CATEGORIES=	sysutils gnome
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.13
+DIST_SUBDIR=	gnome2
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	CD burner view for Nautilus
+
+USE_BZIP2=	yes
+USE_X_PREFIX=	yes
+USE_REINPLACE=	yes
+USE_GMAKE=	yes
+GNOME_DESKTOP_VERSION=2
+USE_GNOME=	gnomeprefix gnomehack intlhack nautilus2
+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 defined(WITH_CJK)
+RUN_DEPENDS+=	cdrecord:${PORTSDIR}/sysutils/cdrtools-cjk
+WITHOUT_DVD=	yes
+.else
+RUN_DEPENDS+=	cdrecord:${PORTSDIR}/sysutils/cdrtools
+.endif
+
+.if !defined(WITHOUT_DVD)
+RUN_DEPENDS+=	growisofs:${PORTSDIR}/sysutils/dvd+rw-tools
+.endif
+
+post-install:
+	@${CAT} ${PKGMESSAGE}
+
+.include <bsd.port.post.mk>
diff --git a/sysutils/nautilus-cd-burner/distinfo b/sysutils/nautilus-cd-burner/distinfo
new file mode 100644
index 000000000..bdb9bca43
--- /dev/null
+++ b/sysutils/nautilus-cd-burner/distinfo
@@ -0,0 +1,2 @@
+MD5 (gnome2/nautilus-cd-burner-2.13.1.tar.bz2) = e6f99e4443172b550fbb57dfbb6efcea
+SIZE (gnome2/nautilus-cd-burner-2.13.1.tar.bz2) = 618574
diff --git a/sysutils/nautilus-cd-burner/files/patch-configure b/sysutils/nautilus-cd-burner/files/patch-configure
new file mode 100644
index 000000000..e8dbb4a5b
--- /dev/null
+++ b/sysutils/nautilus-cd-burner/files/patch-configure
@@ -0,0 +1,27 @@
+--- configure.orig	Thu Jul 22 10:27:35 2004
++++ configure	Thu Jul 22 10:29:32 2004
+@@ -21015,6 +21015,8 @@
+ if eval "test \"\${$as_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
++  ac_check_lib_save_LIBS=$LIBS
++  LIBS="-lintl $LIBS"
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -21097,6 +21099,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
++      LIBS=$ac_check_lib_save_LIBS
+ fi
+ echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+@@ -21104,6 +21107,7 @@
+   cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
++LIBS="-lintl $LIBS"
+ 
+ fi
+ done
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 000000000..aab64aa8a
--- /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 000000000..e836eb982
--- /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
new file mode 100644
index 000000000..9d286fda0
--- /dev/null
+++ b/sysutils/nautilus-cd-burner/files/patch-nautilus-cd-burner.c
@@ -0,0 +1,33 @@
+--- 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/pkg-descr b/sysutils/nautilus-cd-burner/pkg-descr
new file mode 100644
index 000000000..0bdde4f1a
--- /dev/null
+++ b/sysutils/nautilus-cd-burner/pkg-descr
@@ -0,0 +1,2 @@
+Nautilus-cd-burner allows CDs to be created and burned directly from
+within Nautilus (using the burn:/// URI).
diff --git a/sysutils/nautilus-cd-burner/pkg-message b/sysutils/nautilus-cd-burner/pkg-message
new file mode 100644
index 000000000..3a47ff4fd
--- /dev/null
+++ b/sysutils/nautilus-cd-burner/pkg-message
@@ -0,0 +1,21 @@
+======================================================================
+In order to use nautilus-cd-burner, you must make sure your CD devices
+have the correct permissions.  You must also make sure you have:
+
+device		atapicam
+
+Configured in your kernel if you are using an ATAPI CD/DVD writer.
+To figure out which CD/DVD drive you will be using, run the following
+command as root:
+
+camcontrol devlist
+
+Your output will look similar to the following:
+
+<CREATIVE CD5233E-N 0.20>          at scbus1 target 0 lun 0 (cd0,pass0)
+
+The devices in parenthesis at the end are important.  You must make sure
+the /dev entries for those devices are writable by the users that will
+be using nautilus-cd-burner.  In addition to those devices, /dev/xpt*
+must also be writable to your nautilus-cd-burner users.
+======================================================================
diff --git a/sysutils/nautilus-cd-burner/pkg-plist b/sysutils/nautilus-cd-burner/pkg-plist
new file mode 100644
index 000000000..a6a8d4d1a
--- /dev/null
+++ b/sysutils/nautilus-cd-burner/pkg-plist
@@ -0,0 +1,91 @@
+bin/nautilus-cd-burner
+etc/gnome-vfs-2.0/modules/mapping-modules.conf
+include/libnautilus-burn/nautilus-burn-drive-selection.h
+include/libnautilus-burn/nautilus-burn-drive.h
+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.3
+lib/nautilus/extensions-1.0/libnautilus-burn-extension.so
+libdata/pkgconfig/libnautilus-burn.pc
+libexec/mapping-daemon
+share/gnome/nautilus-cd-burner/cdburn.glade
+share/gnome/nautilus-cd-burner/cdspin1.png
+share/gnome/nautilus-cd-burner/cdspin2.png
+share/gnome/nautilus-cd-burner/cdspin3.png
+share/gnome/nautilus-cd-burner/cdspin4.png
+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/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/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/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
+share/locale/es/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/et/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/eu/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/fa/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/fi/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/fr/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/ga/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/gl/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/gu/LC_MESSAGES/nautilus-cd-burner.mo
+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/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
+share/locale/ja/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/ko/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/lt/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/lv/LC_MESSAGES/nautilus-cd-burner.mo
+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
+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
+share/locale/pt/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/pt_BR/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/ro/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/ru/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/rw/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/sk/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/sl/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/sq/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/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