7 files changed, 51 insertions, 117 deletions

diff --git a/net/uget/Makefile b/net/uget/Makefile
index 38c0a3fe3257..947ae6d61393 100644
--- a/net/uget/Makefile
+++ b/net/uget/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	uget
-PORTVERSION=	1.10.4
-PORTREVISION=	2
+PORTVERSION=	2.0
 CATEGORIES=	net
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	urlget/${PORTNAME}%20%28stable%29/${PORTVERSION}
@@ -14,80 +13,31 @@ COMMENT=	Download manager application
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+BUILD_DEPENDS=	curl-config:${PORTSDIR}/ftp/curl
 LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify
+RUN_DEPENDS=	aria2c:${PORTSDIR}/www/aria2
 
-USES=	gmake pkgconfig
+USES=	gmake pkgconfig gettext-tools compiler:c11
 GNU_CONFIGURE=	yes
 USE_GNOME=	glib20 gtk30 intltool intlhack
 INSTALLS_ICONS=	yes
+INSTALL_TARGET=	install-strip
 
-OPTIONS_DEFINE=	GNUTLS NLS
-OPTIONS_RADIO=	GSTREAMER
-OPTIONS_RADIO_GSTREAMER=	GST01 GST10
-OPTIONS_GROUP=	PLUGINS
-OPTIONS_GROUP_PLUGINS=	PLUG_ARIA PLUG_CURL
-OPTIONS_DEFAULT=	GNUTLS GST10 NLS PLUG_CURL
-# GNUTLS option is currently broken, fixed in 'master' branch
-OPTIONS_EXCLUDE=	GNUTLS
-
-GST010_DESC=	GStreamer 0.10
-GST10_DESC=	GStreamer 1.0
-PLUG_ARIA_DESC=	Aria2 plugin
-PLUG_CURL_DESC=	cURL plugin
+# Avoid warning, with redefinition of typedef (C11 feature)
+CFLAGS+=	-Wno-typedef-redefinition
 
 CONFIGURE_ARGS=--enable-appindicator=no \
-	--disable-pwmd \
-	--enable-hidden
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MGNUTLS}
-LIB_DEPENDS+=	libgnutls.so:${PORTSDIR}/security/gnutls \
+	--disable-pwmd
+
+OPTIONS_DEFINE=	GNUTLS GSTREAMER NLS
+OPTIONS_DEFAULT=	GNUTLS GSTREAMER NLS
+GSTREAMER_USE=	gstreamer1=yes
+GSTREAMER_CONFIGURE_ENABLE=	gstreamer
+NLS_USES=	gettext-runtime
+NLS_CONFIGURE_ENABLE=	nls
+GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls \
 	libgcrypt.so:${PORTSDIR}/security/libgcrypt
-CONFIGURE_ARGS+=--enable-gnutls
-.else
-CONFIGURE_ARGS+=--disable-gnutls
-.endif
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=	gettext
-CONFIGURE_ARGS+=--enable-nls
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MGST10}
-USE_GSTREAMER1=	yes
-CONFIGURE_ARGS+=--enable-gstreamer
-.endif
-
-.if ${PORT_OPTIONS:MGST01}
-USE_GSTREAMER=	yes
-CONFIGURE_ARGS+=--enable-gstreamer
-.endif
-
-.if ! ${PORT_OPTIONS:MGST10} && ! ${PORT_OPTIONS:MGST01}
-CONFIGURE_ARGS+=--disable-gstreamer
-.endif
-
-.if ${PORT_OPTIONS:MPLUG_ARIA}
-BUILD_DEPENDS=	aria2c:${PORTSDIR}/www/aria2
-CONFIGURE_ARGS+=--enable-plugin-aria2
-.else
-CONFIGURE_ARGS+=--disable-plugin-aria2
-.endif
-
-.if ${PORT_OPTIONS:MPLUG_CURL}
-BUILD_DEPENDS=	curl-config:${PORTSDIR}/ftp/curl
-CONFIGURE_ARGS+=--enable-plugin-curl
-.else
-CONFIGURE_ARGS+=--disable-plugin-curl
-.endif
-
-post-install:
-	cd ${WRKSRC}/uget-cmd && \
-		${INSTALL_PROGRAM} uget-cmd ${STAGEDIR}${PREFIX}/bin
+GNUTLS_CONFIGURE_WITH=	gnutls=yes
+OPTIONS_SUB=	yes
 
 .include <bsd.port.mk>
diff --git a/net/uget/distinfo b/net/uget/distinfo
index 15f314447954..87dc04807c2c 100644
--- a/net/uget/distinfo
+++ b/net/uget/distinfo
@@ -1,2 +1,2 @@
-SHA256 (uget-1.10.4.tar.gz) = a25c5cc9af4e87a2c22206f376ffce70697ef743a902ecf028b50a586180a622
-SIZE (uget-1.10.4.tar.gz) = 576147
+SHA256 (uget-2.0.tar.gz) = d857bbf1bb3ca7a9943b26a51e20a488e0750b1e2eeff713ef3fdff40320e496
+SIZE (uget-2.0.tar.gz) = 832837
diff --git a/net/uget/files/patch-uget-gtk__UgApp-gtk-callback.c b/net/uget/files/patch-uget-gtk__UgApp-gtk-callback.c
deleted file mode 100644
index c50729d5827f..000000000000
--- a/net/uget/files/patch-uget-gtk__UgApp-gtk-callback.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- ./uget-gtk/UgApp-gtk-callback.c.orig	2014-07-12 12:08:24.000000000 +0000
-+++ ./uget-gtk/UgApp-gtk-callback.c	2014-07-12 12:08:40.000000000 +0000
-@@ -1334,10 +1334,12 @@
- 	ug_launch_uri ("http://ugetdm.com/reportbug");
- }
- 
-+/*
- void    on_check_updates (GtkWidget* widget, UgAppGtk* app)
- {
- 	ug_launch_uri ("http://ugetdm.com/versioncheck?v=" PACKAGE_VERSION);
- }
-+*/
- 
- void	on_about (GtkWidget* widget, UgAppGtk* app)
- {
-@@ -2008,8 +2010,10 @@
- 			G_CALLBACK (on_support_forum), app);
- 	g_signal_connect (menubar->help.submit_feedback, "activate",
- 			G_CALLBACK (on_submit_feedback), app);
-+	/*
- 	g_signal_connect (menubar->help.check_updates, "activate",
- 			G_CALLBACK (on_check_updates), app);
-+	*/
- 	g_signal_connect (menubar->help.report_bug, "activate",
- 			G_CALLBACK (on_report_bug), app);
- 	g_signal_connect (menubar->help.about_uget, "activate",
diff --git a/net/uget/files/patch-uget-gtk__UgApp-gtk-gui.c b/net/uget/files/patch-uget-gtk__UgApp-gtk-gui.c
deleted file mode 100644
index e74258b2ba0e..000000000000
--- a/net/uget/files/patch-uget-gtk__UgApp-gtk-gui.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- ./uget-gtk/UgApp-gtk-gui.c.orig	2014-07-12 12:11:05.000000000 +0000
-+++ ./uget-gtk/UgApp-gtk-gui.c	2014-07-12 12:12:47.000000000 +0000
-@@ -860,12 +860,14 @@
- 	gtk_menu_shell_append ((GtkMenuShell*)menu, menu_item);
- 	menubar->help.report_bug = menu_item;
- 
-+	/*
- 	// Check for Updates
- 	menu_item = gtk_image_menu_item_new_with_mnemonic(_("Check for Updates"));
- //	image = gtk_image_new_from_stock (GTK_STOCK_DND_MULTIPLE, GTK_ICON_SIZE_MENU);
- //	gtk_image_menu_item_set_image ((GtkImageMenuItem*)menu_item, image);
- 	gtk_menu_shell_append ((GtkMenuShell*)menu, menu_item);
- 	menubar->help.check_updates = menu_item;
-+	*/
- 
- 	// About Uget
- 	menu_item = gtk_image_menu_item_new_from_stock (GTK_STOCK_ABOUT, NULL);
diff --git a/net/uget/files/patch-ui-gtk_UgtkMenubar-ui.c b/net/uget/files/patch-ui-gtk_UgtkMenubar-ui.c
new file mode 100644
index 000000000000..06826980ba5e
--- /dev/null
+++ b/net/uget/files/patch-ui-gtk_UgtkMenubar-ui.c
@@ -0,0 +1,16 @@
+--- ui-gtk/UgtkMenubar-ui.c.orig	2015-03-25 09:15:42 UTC
++++ ui-gtk/UgtkMenubar-ui.c
+@@ -657,13 +657,6 @@ static void ugtk_menubar_help_init (Ugtk
+ 	gtk_menu_shell_append ((GtkMenuShell*)menu, menu_item);
+ 	menubar->help.keyboard_shortcuts = menu_item;
+ 
+-	// Check for Updates
+-	menu_item = gtk_image_menu_item_new_with_mnemonic(_("Check for Updates"));
+-//	image = gtk_image_new_from_stock (GTK_STOCK_DND_MULTIPLE, GTK_ICON_SIZE_MENU);
+-//	gtk_image_menu_item_set_image ((GtkImageMenuItem*)menu_item, image);
+-	gtk_menu_shell_append ((GtkMenuShell*)menu, menu_item);
+-	menubar->help.check_updates = menu_item;
+-
+ 	// About Uget
+ 	menu_item = gtk_image_menu_item_new_from_stock (GTK_STOCK_ABOUT, NULL);
+ 	gtk_menu_shell_append ((GtkMenuShell*)menu, menu_item);
diff --git a/net/uget/files/patch-uget-gtk__UgSetting.c b/net/uget/files/patch-ui-gtk_UgtkSetting.c
index 9b34a309173e..92a266cbd261 100644
--- a/net/uget/files/patch-uget-gtk__UgSetting.c
+++ b/net/uget/files/patch-ui-gtk_UgtkSetting.c
@@ -1,6 +1,6 @@
---- ./uget-gtk/UgSetting.c.orig	2014-01-01 09:39:00.000000000 +0000
-+++ ./uget-gtk/UgSetting.c	2014-07-12 11:51:49.000000000 +0000
-@@ -457,7 +457,7 @@
+--- ui-gtk/UgtkSetting.c.orig	2015-04-30 23:37:53 UTC
++++ ui-gtk/UgtkSetting.c
+@@ -334,7 +334,7 @@ void  ugtk_setting_reset (UgtkSetting* s
  	setting->window.statusbar = TRUE;
  	setting->window.category  = TRUE;
  	setting->window.summary   = TRUE;
diff --git a/net/uget/pkg-plist b/net/uget/pkg-plist
index a6e88eeef2fc..f10bd58ac6e4 100644
--- a/net/uget/pkg-plist
+++ b/net/uget/pkg-plist
@@ -1,5 +1,5 @@
-bin/uget-cmd
 bin/uget-gtk
+bin/uget-gtk-1to2
 share/applications/uget-gtk.desktop
 share/icons/hicolor/128x128/apps/uget-icon.png
 share/icons/hicolor/16x16/apps/uget-icon.png
@@ -27,19 +27,30 @@ share/icons/hicolor/96x96/apps/uget-icon.png
 share/icons/hicolor/scalable/apps/uget-icon.svg
 %%NLS%%share/locale/ar/LC_MESSAGES/uget.mo
 %%NLS%%share/locale/be/LC_MESSAGES/uget.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/uget.mo
 %%NLS%%share/locale/bn_BD/LC_MESSAGES/uget.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/uget.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/uget.mo
 %%NLS%%share/locale/da/LC_MESSAGES/uget.mo
 %%NLS%%share/locale/de/LC_MESSAGES/uget.mo
 %%NLS%%share/locale/es/LC_MESSAGES/uget.mo
+%%NLS%%share/locale/fa/LC_MESSAGES/uget.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/uget.mo
+%%NLS%%share/locale/he/LC_MESSAGES/uget.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/uget.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/uget.mo
 %%NLS%%share/locale/id/LC_MESSAGES/uget.mo
 %%NLS%%share/locale/it/LC_MESSAGES/uget.mo
 %%NLS%%share/locale/ka_GE/LC_MESSAGES/uget.mo
+%%NLS%%share/locale/kk/LC_MESSAGES/uget.mo
+%%NLS%%share/locale/or_IN/LC_MESSAGES/uget.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/uget.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/uget.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/uget.mo
+%%NLS%%share/locale/sk_SK/LC_MESSAGES/uget.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/uget.mo
+%%NLS%%share/locale/sr@latin/LC_MESSAGES/uget.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/uget.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/uget.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/uget.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/uget.mo