4 files changed, 33 insertions, 45 deletions

diff --git a/sysutils/xcdroast/Makefile b/sysutils/xcdroast/Makefile
index 3327437b3423..d550cd09ee14 100644
--- a/sysutils/xcdroast/Makefile
+++ b/sysutils/xcdroast/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	xcdroast
-PORTVERSION=	0.98.a.14
-PORTREVISION=	1
+PORTVERSION=	0.98.a.15
+PORTREVISION=	0
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 		http://www.xcdroast.org/download/
@@ -23,7 +23,6 @@ RUN_DEPENDS=	cdrecord:${PORTSDIR}/sysutils/cdrtools \
 		mkisofs:${PORTSDIR}/sysutils/mkisofs
 
 USE_X_PREFIX=	yes
-USE_GNOME=	gdkpixbuf
 GNU_CONFIGURE=	yes
 USE_AUTOCONF_VER=	253
 
@@ -36,6 +35,17 @@ CONFIGURE_ARGS=	--with-cdrtools-prefix=${LOCALBASE} \
 
 MAN1=		xcdroast.1
 
+.if defined(WITH_GTK2)
+RUN_DEPENDS+=	pkg-config:${PORTSDIR}/devel/pkgconfig
+LIB_DEPENDS+=	glib-2.0.200:${PORTSDIR}/devel/glib20 \
+		gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20
+CONFIGURE_ARGS+=--enable-gtk2
+USE_GNOME=	gtk20
+.else
+CONFIGURE_ARGS+=--disable-gtk2
+USE_GNOME=	gdkpixbuf
+.endif
+
 .if defined(WITH_NONROOT)
 CONFIGURE_ARGS+=--enable-nonrootmode
 .else
diff --git a/sysutils/xcdroast/distinfo b/sysutils/xcdroast/distinfo
index 08969a5695cd..1415d19ca7fa 100644
--- a/sysutils/xcdroast/distinfo
+++ b/sysutils/xcdroast/distinfo
@@ -1 +1 @@
-MD5 (xcdroast-0.98alpha14.tar.gz) = c5f3f1ab6ff6d286bd984def54ef0c54
+MD5 (xcdroast-0.98alpha15.tar.gz) = 2a9c1d9f2ef58713c453e674b989be3e
diff --git a/sysutils/xcdroast/files/patch-aclocal.m4 b/sysutils/xcdroast/files/patch-aclocal.m4
index 5ead686fcb92..1775aee9a56d 100644
--- a/sysutils/xcdroast/files/patch-aclocal.m4
+++ b/sysutils/xcdroast/files/patch-aclocal.m4
@@ -1,43 +1,18 @@
---- aclocal.m4.orig	Wed Jul 17 20:48:30 2002
-+++ aclocal.m4	Thu Jul 18 16:38:49 2002
-@@ -545,7 +545,7 @@
-   rm -f conf.gdk_pixbuftest
- ])
- 
--# gettext.m4 serial 13 (gettext-0.11.1)
-+# gettext.m4 serial 14 (gettext-0.11.2)
- dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
- dnl This file is free software, distributed under the terms of the GNU
- dnl General Public License.  As a special exception to the GNU General
-@@ -689,14 +689,13 @@
-             dnl Now see whether libintl exists and does not depend on libiconv.
-             AC_TRY_LINK([#include <libintl.h>
- extern int _nl_msg_cat_cntr;
--extern int *_nl_domain_bindings;
- extern
- #ifdef __cplusplus
- "C"
- #endif
- const char *_nl_expand_alias ();],
-               [bindtextdomain ("", "");
--return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings + *_nl_expand_alias (0)],
-+return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
-               gt_cv_func_gnugettext_libintl=yes,
-               gt_cv_func_gnugettext_libintl=no)
-             dnl Now see whether libintl exists and depends on libiconv.
-@@ -704,14 +703,13 @@
-               LIBS="$LIBS $LIBICONV"
-               AC_TRY_LINK([#include <libintl.h>
+--- aclocal.m4.orig	Sun Oct 26 00:51:41 2003
++++ aclocal.m4	Thu Oct 30 23:28:02 2003
+@@ -1367,9 +1367,13 @@
+         AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc,
+          [AC_TRY_LINK([#include <libintl.h>
  extern int _nl_msg_cat_cntr;
--extern int *_nl_domain_bindings;
- extern
- #ifdef __cplusplus
- "C"
- #endif
- const char *_nl_expand_alias ();],
-                 [bindtextdomain ("", "");
--return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings + *_nl_expand_alias (0)],
+-extern int *_nl_domain_bindings;],
++extern 
++#ifdef __cplusplus
++"C"
++#endif
++const char *_nl_expand_alias ();],
+             [bindtextdomain ("", "");
+-return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings],
 +return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
-                [LIBINTL="$LIBINTL $LIBICONV"
-                 LTLIBINTL="$LTLIBINTL $LTLIBICONV"
-                 gt_cv_func_gnugettext_libintl=yes
+             gt_cv_func_gnugettext_libc=yes,
+             gt_cv_func_gnugettext_libc=no)])
+ 
diff --git a/sysutils/xcdroast/pkg-plist b/sysutils/xcdroast/pkg-plist
index 35a9b5964c27..e32433ff3acf 100644
--- a/sysutils/xcdroast/pkg-plist
+++ b/sysutils/xcdroast/pkg-plist
@@ -31,12 +31,15 @@ share/locale/hu/LC_MESSAGES/xcdroast.mo
 share/locale/id/LC_MESSAGES/xcdroast.mo
 share/locale/it/LC_MESSAGES/xcdroast.mo
 share/locale/ja/LC_MESSAGES/xcdroast.mo
+share/locale/lv/LC_MESSAGES/xcdroast.mo
 share/locale/nl/LC_MESSAGES/xcdroast.mo
 share/locale/no/LC_MESSAGES/xcdroast.mo
 share/locale/pl/LC_MESSAGES/xcdroast.mo
 share/locale/pt_BR/LC_MESSAGES/xcdroast.mo
+share/locale/ro/LC_MESSAGES/xcdroast.mo
 share/locale/ru/LC_MESSAGES/xcdroast.mo
 share/locale/sk/LC_MESSAGES/xcdroast.mo
+share/locale/sq_AL/LC_MESSAGES/xcdroast.mo
 share/locale/sv/LC_MESSAGES/xcdroast.mo
 share/locale/tr/LC_MESSAGES/xcdroast.mo
 share/locale/uk/LC_MESSAGES/xcdroast.mo