6 files changed, 108 insertions, 162 deletions

diff --git a/sysutils/xfburn/Makefile b/sysutils/xfburn/Makefile
index 107dabdecc91..bf3b7f9c758a 100644
--- a/sysutils/xfburn/Makefile
+++ b/sysutils/xfburn/Makefile
@@ -2,46 +2,42 @@
 # $FreeBSD$
 
 PORTNAME=	xfburn
-PORTVERSION=	0.4.3
-PORTREVISION=	5
+PORTVERSION=	0.5.0
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=src/apps/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	xfce@FreeBSD.org
 COMMENT=	CD/DVD burning tool for Xfce
 
+LICENSE=	GPLv2
+
 LIB_DEPENDS=	libburn.so:${PORTSDIR}/devel/libburn \
 		libisofs.so:${PORTSDIR}/devel/libisofs
-RUN_DEPENDS=	cdrdao:${PORTSDIR}/sysutils/cdrdao \
-		cdrecord:${PORTSDIR}/sysutils/cdrtools
-
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	GMSGFMT=${PREFIX}/bin/msgfmt DATADIRNAME=share
+RUN_DEPENDS=	cdrdao:${PORTSDIR}/sysutils/cdrdao
 
 USE_BZIP2=	yes
-USE_GNOME=	intltool
-USE_XFCE=	configenv libexo libgui
-USES=		pkgconfig gmake
+GNU_CONFIGURE=	yes
+USE_GNOME=	intltool intlhack glib20 gtk20
+USE_XFCE=	configenv libexo libmenu
+USES=		pkgconfig gmake desktop-file-utils
 INSTALLS_ICONS=	yes
 
-OPTIONS_DEFINE=	DBUS HAL GSTREAMER NLS
-OPTIONS_DEFAULT=	DBUS HAL
-NLS_USE=	USES=gettext
-MLS_CONFIGURE_ENABLE=	nls
-DBUS_LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus
-DBUS_ENABLE=	dbus
-HAL_LIB_DEPENDS=	libhal.so:${PORTSDIR}/sysutils/hal
-HAL_ENABLE=	hal
+CONFIGURE_ARGS=--disable-gudev
+
+OPTIONS_DEFINE=	GSTREAMER NLS
+OPTIONS_SUB=	yes
+NLS_USES=	gettext
+NLS_CONFIGURE_ENABLE=	nls
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGSTREAMER}
-USE_GSTREAMER=	core
-CONFIGURE_ARGS+=	"LDFLAGS=-lgstpbutils-0.10"
+USE_GSTREAMER=	yes
+CONFIGURE_ARGS+=--enable-gstreamer
 .else
-CONFIGURE_ARGS+=	--disable-gstreamer
+CONFIGURE_ARGS+=--disable-gstreamer
 .endif
 
 .include <bsd.port.mk>
diff --git a/sysutils/xfburn/distinfo b/sysutils/xfburn/distinfo
index b1b5e904ed08..231ed59e182e 100644
--- a/sysutils/xfburn/distinfo
+++ b/sysutils/xfburn/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xfce4/xfburn-0.4.3.tar.bz2) = c9993226f0f4e3dea3326ad320a01c165a7e1a485f07fa4a2583475a4e6eaafe
-SIZE (xfce4/xfburn-0.4.3.tar.bz2) = 652080
+SHA256 (xfce4/xfburn-0.5.0.tar.bz2) = 76fad0d4256481830d22d4c3d0da9feb1c26c93ad3ed31ab77b9ffdd9eb02ecb
+SIZE (xfce4/xfburn-0.5.0.tar.bz2) = 745720
diff --git a/sysutils/xfburn/files/patch-configure b/sysutils/xfburn/files/patch-configure
new file mode 100644
index 000000000000..87930a784363
--- /dev/null
+++ b/sysutils/xfburn/files/patch-configure
@@ -0,0 +1,11 @@
+--- ./configure.orig	2014-02-20 17:04:22.000000000 +0000
++++ ./configure	2014-02-20 22:06:19.000000000 +0000
+@@ -12447,7 +12447,7 @@
+ 
+     fi
+   fi
+-     USE_NLS=yes
++     #USE_NLS=yes
+ 
+ 
+     gt_cv_have_gettext=no
diff --git a/sysutils/xfburn/files/patch-xfburn_xfburn-settings.h b/sysutils/xfburn/files/patch-xfburn_xfburn-settings.h
deleted file mode 100644
index 4f7839c1760d..000000000000
--- a/sysutils/xfburn/files/patch-xfburn_xfburn-settings.h
+++ /dev/null
@@ -1,17 +0,0 @@
-patch attached.
-
---- patch-xfburn_xfburn-settings.h begins here ---
---- xfburn/xfburn-settings.h.orig	2009-10-24 17:18:10.000000000 -0400
-+++ xfburn/xfburn-settings.h	2012-06-02 18:19:00.866609000 -0400
-@@ -23,7 +23,7 @@
- #include <config.h>
- #endif /* !HAVE_CONFIG_H */
- 
--#include <glib.h>
-+#include <glib-object.h>
- 
- G_BEGIN_DECLS
- 
---- patch-xfburn_xfburn-settings.h ends here ---
-
-
diff --git a/sysutils/xfburn/pkg-descr b/sysutils/xfburn/pkg-descr
index f8b3012211f4..05848dc03c20 100644
--- a/sysutils/xfburn/pkg-descr
+++ b/sysutils/xfburn/pkg-descr
@@ -1,6 +1,5 @@
-Xfburn is a simple CD/DVD burning tool based on libburnia libraries.
-It can blank CD/DVD-RWs, burn and create iso images, as well as
-burn personal compositions of data to either CD or DVD. It Is
-currently under heavy development.
+Xfburn is a simple CD/DVD burning application based on libburnia libraries,
+which supports erasing, formatting of discs; burning of iso images, audio, and
+data compositions.
 
-WWW: http://www.xfce.org/projects/xfburn/
+WWW: http://goodies.xfce.org/projects/applications/xfburn
diff --git a/sysutils/xfburn/pkg-plist b/sysutils/xfburn/pkg-plist
index eee696768eb0..68dc507ebe3a 100644
--- a/sysutils/xfburn/pkg-plist
+++ b/sysutils/xfburn/pkg-plist
@@ -1,5 +1,3 @@
-%%DATADIR%%/xfburn-toolbars.ui
-%%DATADIR%%/xfburn.ui
 bin/xfburn
 man/man1/xfburn.1.gz
 share/Thunar/sendto/thunar-sendto-xfburn.desktop
@@ -10,12 +8,14 @@ share/icons/hicolor/16x16/stock/media/stock_xfburn-burn-cd.png
 share/icons/hicolor/16x16/stock/media/stock_xfburn-data-copy.png
 share/icons/hicolor/16x16/stock/media/stock_xfburn-import-session.png
 share/icons/hicolor/16x16/stock/media/stock_xfburn-new-data-composition.png
+share/icons/hicolor/16x16/stock/media/stock_xfburn.png
 share/icons/hicolor/22x22/stock/media/stock_xfburn-audio-cd.png
 share/icons/hicolor/22x22/stock/media/stock_xfburn-blank-cdrw.png
 share/icons/hicolor/22x22/stock/media/stock_xfburn-burn-cd.png
 share/icons/hicolor/22x22/stock/media/stock_xfburn-data-copy.png
 share/icons/hicolor/22x22/stock/media/stock_xfburn-import-session.png
 share/icons/hicolor/22x22/stock/media/stock_xfburn-new-data-composition.png
+share/icons/hicolor/22x22/stock/media/stock_xfburn.png
 share/icons/hicolor/24x24/stock/media/stock_xfburn-audio-cd.png
 share/icons/hicolor/24x24/stock/media/stock_xfburn-audio-copy.png
 share/icons/hicolor/24x24/stock/media/stock_xfburn-blank-cdrw.png
@@ -24,138 +24,95 @@ share/icons/hicolor/24x24/stock/media/stock_xfburn-data-copy.png
 share/icons/hicolor/24x24/stock/media/stock_xfburn-format-dvdrw.png
 share/icons/hicolor/24x24/stock/media/stock_xfburn-import-session.png
 share/icons/hicolor/24x24/stock/media/stock_xfburn-new-data-composition.png
+share/icons/hicolor/24x24/stock/media/stock_xfburn.png
 share/icons/hicolor/32x32/stock/media/stock_xfburn-audio-cd.png
 share/icons/hicolor/32x32/stock/media/stock_xfburn-blank-cdrw.png
 share/icons/hicolor/32x32/stock/media/stock_xfburn-burn-cd.png
 share/icons/hicolor/32x32/stock/media/stock_xfburn-data-copy.png
 share/icons/hicolor/32x32/stock/media/stock_xfburn-import-session.png
 share/icons/hicolor/32x32/stock/media/stock_xfburn-new-data-composition.png
+share/icons/hicolor/32x32/stock/media/stock_xfburn.png
 share/icons/hicolor/48x48/stock/media/stock_xfburn-audio-cd.png
 share/icons/hicolor/48x48/stock/media/stock_xfburn-blank-cdrw.png
 share/icons/hicolor/48x48/stock/media/stock_xfburn-burn-cd.png
 share/icons/hicolor/48x48/stock/media/stock_xfburn-data-copy.png
 share/icons/hicolor/48x48/stock/media/stock_xfburn-import-session.png
 share/icons/hicolor/48x48/stock/media/stock_xfburn-new-data-composition.png
+share/icons/hicolor/48x48/stock/media/stock_xfburn.png
 share/icons/hicolor/scalable/stock/media/stock_xfburn-audio-cd.svg
 share/icons/hicolor/scalable/stock/media/stock_xfburn-blank-cdrw.svg
 share/icons/hicolor/scalable/stock/media/stock_xfburn-burn-cd.svg
 share/icons/hicolor/scalable/stock/media/stock_xfburn-data-copy.svg
 share/icons/hicolor/scalable/stock/media/stock_xfburn-import-session.svg
 share/icons/hicolor/scalable/stock/media/stock_xfburn-new-data-composition.svg
-share/locale/ar/LC_MESSAGES/xfburn.mo
-share/locale/ca/LC_MESSAGES/xfburn.mo
-share/locale/cs/LC_MESSAGES/xfburn.mo
-share/locale/da/LC_MESSAGES/xfburn.mo
-share/locale/de/LC_MESSAGES/xfburn.mo
-share/locale/dz/LC_MESSAGES/xfburn.mo
-share/locale/el/LC_MESSAGES/xfburn.mo
-share/locale/en_GB/LC_MESSAGES/xfburn.mo
-share/locale/es/LC_MESSAGES/xfburn.mo
-share/locale/et/LC_MESSAGES/xfburn.mo
-share/locale/eu/LC_MESSAGES/xfburn.mo
-share/locale/fi/LC_MESSAGES/xfburn.mo
-share/locale/fr/LC_MESSAGES/xfburn.mo
-share/locale/gl/LC_MESSAGES/xfburn.mo
-share/locale/he/LC_MESSAGES/xfburn.mo
-share/locale/hu/LC_MESSAGES/xfburn.mo
-share/locale/id/LC_MESSAGES/xfburn.mo
-share/locale/it/LC_MESSAGES/xfburn.mo
-share/locale/ja/LC_MESSAGES/xfburn.mo
-share/locale/ko/LC_MESSAGES/xfburn.mo
-share/locale/lt/LC_MESSAGES/xfburn.mo
-share/locale/lv/LC_MESSAGES/xfburn.mo
-share/locale/nl/LC_MESSAGES/xfburn.mo
-share/locale/pa/LC_MESSAGES/xfburn.mo
-share/locale/pl/LC_MESSAGES/xfburn.mo
-share/locale/pt_BR/LC_MESSAGES/xfburn.mo
-share/locale/ru/LC_MESSAGES/xfburn.mo
-share/locale/sq/LC_MESSAGES/xfburn.mo
-share/locale/sv/LC_MESSAGES/xfburn.mo
-share/locale/tr/LC_MESSAGES/xfburn.mo
-share/locale/uk/LC_MESSAGES/xfburn.mo
-share/locale/ur/LC_MESSAGES/xfburn.mo
-share/locale/zh_CN/LC_MESSAGES/xfburn.mo
-share/locale/zh_TW/LC_MESSAGES/xfburn.mo
-share/locale/ast/LC_MESSAGES/xfburn.mo
-share/locale/kk/LC_MESSAGES/xfburn.mo
-share/locale/nb/LC_MESSAGES/xfburn.mo
-share/locale/pt/LC_MESSAGES/xfburn.mo
-share/locale/ur_PK/LC_MESSAGES/xfburn.mo
+share/icons/hicolor/scalable/stock/media/stock_xfburn.svg
+%%NLS%%share/locale/ar/LC_MESSAGES/xfburn.mo
+%%NLS%%share/locale/ast/LC_MESSAGES/xfburn.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/xfburn.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/xfburn.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/xfburn.mo
+%%NLS%%share/locale/da/LC_MESSAGES/xfburn.mo
+%%NLS%%share/locale/de/LC_MESSAGES/xfburn.mo
+%%NLS%%share/locale/el/LC_MESSAGES/xfburn.mo
+%%NLS%%share/locale/en/LC_MESSAGES/xfburn.mo
+%%NLS%%share/locale/en_AU/LC_MESSAGES/xfburn.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/xfburn.mo
+%%NLS%%share/locale/es/LC_MESSAGES/xfburn.mo
+%%NLS%%share/locale/et/LC_MESSAGES/xfburn.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/xfburn.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/xfburn.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/xfburn.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/xfburn.mo
+%%NLS%%share/locale/he/LC_MESSAGES/xfburn.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/xfburn.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/xfburn.mo
+%%NLS%%share/locale/id/LC_MESSAGES/xfburn.mo
+%%NLS%%share/locale/is/LC_MESSAGES/xfburn.mo
+%%NLS%%share/locale/it/LC_MESSAGES/xfburn.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/xfburn.mo
+%%NLS%%share/locale/kk/LC_MESSAGES/xfburn.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/xfburn.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/xfburn.mo
+%%NLS%%share/locale/lv/LC_MESSAGES/xfburn.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/xfburn.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/xfburn.mo
+%%NLS%%share/locale/nn/LC_MESSAGES/xfburn.mo
+%%NLS%%share/locale/oc/LC_MESSAGES/xfburn.mo
+%%NLS%%share/locale/pa/LC_MESSAGES/xfburn.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/xfburn.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/xfburn.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/xfburn.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/xfburn.mo
+%%NLS%%share/locale/si/LC_MESSAGES/xfburn.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/xfburn.mo
+%%NLS%%share/locale/sq/LC_MESSAGES/xfburn.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/xfburn.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/xfburn.mo
+%%NLS%%share/locale/th/LC_MESSAGES/xfburn.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/xfburn.mo
+%%NLS%%share/locale/ug/LC_MESSAGES/xfburn.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/xfburn.mo
+%%NLS%%share/locale/ur/LC_MESSAGES/xfburn.mo
+%%NLS%%share/locale/ur_PK/LC_MESSAGES/xfburn.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/xfburn.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/xfburn.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/xfburn.mo
+%%DATADIR%%/xfburn-toolbars.ui
+%%DATADIR%%/xfburn.ui
 @dirrm %%DATADIR%%
-@dirrmtry share/locale/ar/LC_MESSAGES
-@dirrmtry share/locale/ar
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/da/LC_MESSAGES
-@dirrmtry share/locale/da
-@dirrmtry share/locale/de/LC_MESSAGES
-@dirrmtry share/locale/de
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
-@dirrmtry share/locale/en_GB/LC_MESSAGES
-@dirrmtry share/locale/en_GB
-@dirrmtry share/locale/es/LC_MESSAGES
-@dirrmtry share/locale/es
-@dirrmtry share/locale/et/LC_MESSAGES
-@dirrmtry share/locale/et
-@dirrmtry share/locale/eu/LC_MESSAGES
-@dirrmtry share/locale/eu
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/fr/LC_MESSAGES
-@dirrmtry share/locale/fr
-@dirrmtry share/locale/gl/LC_MESSAGES
-@dirrmtry share/locale/gl
-@dirrmtry share/locale/he/LC_MESSAGES
-@dirrmtry share/locale/he
-@dirrmtry share/locale/hu/LC_MESSAGES
-@dirrmtry share/locale/hu
-@dirrmtry share/locale/id/LC_MESSAGES
-@dirrmtry share/locale/id
-@dirrmtry share/locale/it/LC_MESSAGES
-@dirrmtry share/locale/it
-@dirrmtry share/locale/ja/LC_MESSAGES
-@dirrmtry share/locale/ja
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@dirrmtry share/locale/lt/LC_MESSAGES
-@dirrmtry share/locale/lt
-@dirrmtry share/locale/lv/LC_MESSAGES
-@dirrmtry share/locale/lv
-@dirrmtry share/locale/nl/LC_MESSAGES
-@dirrmtry share/locale/nl
-@dirrmtry share/locale/pa/LC_MESSAGES
-@dirrmtry share/locale/pa
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/pt_BR/LC_MESSAGES
-@dirrmtry share/locale/pt_BR
-@dirrmtry share/locale/ru/LC_MESSAGES
-@dirrmtry share/locale/ru
-@dirrmtry share/locale/sq/LC_MESSAGES
-@dirrmtry share/locale/sq
-@dirrmtry share/locale/sv/LC_MESSAGES
-@dirrmtry share/locale/sv
-@dirrmtry share/locale/tr/LC_MESSAGES
-@dirrmtry share/locale/tr
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/ur/LC_MESSAGES
-@dirrmtry share/locale/ur
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@dirrmtry share/locale/ast/LC_MESSAGES
-@dirrmtry share/locale/ast
-@dirrmtry share/locale/kk/LC_MESSAGES
-@dirrmtry share/locale/kk
-@dirrmtry share/locale/ur_PK/LC_MESSAGES
-@dirrmtry share/locale/ur_PK
+%%NLS%%@dirrmtry share/locale/ur_PK/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ur_PK
+%%NLS%%@dirrmtry share/locale/ur/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ur
+%%NLS%%@dirrmtry share/locale/ug/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ug
+%%NLS%%@dirrmtry share/locale/si/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/si
+%%NLS%%@dirrmtry share/locale/oc/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/oc
+%%NLS%%@dirrmtry share/locale/kk/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/kk
+%%NLS%%@dirrmtry share/locale/ast/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ast
 @dirrmtry share/Thunar/sendto
 @dirrmtry share/Thunar
-@unexec /bin/rm %D/share/icons/hicolor/icon-theme.cache 2>/dev/null || /usr/bin/true