7 files changed, 27 insertions, 44 deletions

diff --git a/net-im/corebird/Makefile b/net-im/corebird/Makefile
index d53ca6169911..a55999785fb9 100644
--- a/net-im/corebird/Makefile
+++ b/net-im/corebird/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	corebird
-PORTVERSION=	1.2.2
+PORTVERSION=	1.3
 CATEGORIES=	net-im
 
 MAINTAINER=	cpm@FreeBSD.org
@@ -15,13 +15,13 @@ BUILD_DEPENDS=	valac:lang/vala
 LIB_DEPENDS=	libsoup-2.4.so:devel/libsoup \
 		libnotify.so:devel/libnotify \
 		libjson-glib-1.0.so:devel/json-glib \
-		librest-0.7.so:devel/librest \
-		libgee-0.8.so:devel/libgee
+		librest-0.7.so:devel/librest
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	baedert
 
-USES=		autoreconf gettext gmake libtool pkgconfig sqlite
+USES=		autoreconf compiler:c++11-lang gettext gmake libtool pkgconfig sqlite
+
 GNU_CONFIGURE=	yes
 USE_GNOME=	atk cairo gdkpixbuf2 glib20 gtk30 intltool libxml2 pango
 INSTALLS_ICONS=	yes
@@ -34,8 +34,8 @@ GSTREAMER_CONFIGURE_OFF=	--disable-video
 GLIB_SCHEMAS=	org.baedert.corebird.gschema.xml
 
 post-extract:
-	cd ${WRKSRC}/data && ${MV} org.baedert.corebird.desktop.in.in \
-		corebird.desktop.in.in
+	cd ${WRKSRC}/data && ${MV} org.baedert.corebird.desktop.in \
+		corebird.desktop.in
 
 pre-configure:
 	${MKDIR} ${WRKSRC}/m4
diff --git a/net-im/corebird/distinfo b/net-im/corebird/distinfo
index d20f598e6f86..6e4436b946bf 100644
--- a/net-im/corebird/distinfo
+++ b/net-im/corebird/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1463830755
-SHA256 (baedert-corebird-1.2.2_GH0.tar.gz) = b3d6a9f2e9fcb17acbd1e91159302398d18877f16101612da5a55886f7add752
-SIZE (baedert-corebird-1.2.2_GH0.tar.gz) = 423551
+TIMESTAMP = 1470087209
+SHA256 (baedert-corebird-1.3_GH0.tar.gz) = f4f86a2e898342297c2379c25b6274598d81d8983f185d98753725552f670860
+SIZE (baedert-corebird-1.3_GH0.tar.gz) = 431652
diff --git a/net-im/corebird/files/patch-Makefile.am b/net-im/corebird/files/patch-Makefile.am
index 9a22d655b046..bdbdd1140745 100644
--- a/net-im/corebird/files/patch-Makefile.am
+++ b/net-im/corebird/files/patch-Makefile.am
@@ -1,10 +1,10 @@
---- Makefile.am.orig	2016-02-29 16:55:42 UTC
+--- Makefile.am.orig	2016-08-01 21:40:32 UTC
 +++ Makefile.am
 @@ -1,6 +1,6 @@
  ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
  
--SUBDIRS = src ui data assets po tests
-+SUBDIRS = src ui data assets po
+-SUBDIRS = src data po tests
++SUBDIRS = src data po
  
  EXTRA_DIST = \
  	vapi/config.vapi \
diff --git a/net-im/corebird/files/patch-configure.ac b/net-im/corebird/files/patch-configure.ac
deleted file mode 100644
index f63d4d69b836..000000000000
--- a/net-im/corebird/files/patch-configure.ac
+++ /dev/null
@@ -1,17 +0,0 @@
---- configure.ac.orig	2016-05-10 17:41:05 UTC
-+++ configure.ac
-@@ -1,4 +1,4 @@
--AC_INIT([corebird],[1.2.1],[mail@baedert.org])
-+AC_INIT([corebird],[1.2.2],[mail@baedert.org])
- 
- AC_PREREQ([2.65])
- 
-@@ -113,7 +113,7 @@ Makefile
- src/Makefile
- ui/Makefile
- data/Makefile
--data/org.baedert.corebird.desktop.in
-+data/corebird.desktop.in
- assets/Makefile
- assets/256x256/Makefile
- assets/128x128/Makefile
diff --git a/net-im/corebird/files/patch-data_Makefile.am b/net-im/corebird/files/patch-data_Makefile.am
index c17ee3420497..444e8a90c661 100644
--- a/net-im/corebird/files/patch-data_Makefile.am
+++ b/net-im/corebird/files/patch-data_Makefile.am
@@ -1,10 +1,11 @@
---- data/Makefile.am.orig	2016-02-29 16:55:42 UTC
+--- data/Makefile.am.orig	2016-08-01 21:45:23 UTC
 +++ data/Makefile.am
-@@ -1,6 +1,6 @@
+@@ -2,7 +2,7 @@ iconprefix=$(datarootdir)/icons/hicolor/
+ SUBDIRS = 256x256 128x128 96x96 64x64 48x48 32x32 24x24 16x16
  
  desktopdir = $(datarootdir)/applications
 -desktop_in_files = org.baedert.corebird.desktop.in
 +desktop_in_files = corebird.desktop.in
  desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
- @INTLTOOL_DESKTOP_RULE@
  
+ appdatadir = $(datarootdir)/appdata
diff --git a/net-im/corebird/files/patch-ui_about-dialog.ui b/net-im/corebird/files/patch-ui_about-dialog.ui
deleted file mode 100644
index 143f05ec19fe..000000000000
--- a/net-im/corebird/files/patch-ui_about-dialog.ui
+++ /dev/null
@@ -1,11 +0,0 @@
---- ui/about-dialog.ui.orig	2016-05-10 17:41:05 UTC
-+++ ui/about-dialog.ui
-@@ -6,7 +6,7 @@
-     <property name="title" translatable="yes">About Corebird</property>
-     <property name="type_hint">dialog</property>
-     <property name="program_name">Corebird</property>
--    <property name="version">1.2.1</property>
-+    <property name="version">1.2.2</property>
-     <property name="comments" translatable="yes">Using Font Awesome by Dave Gandy - http://fontawesome.io</property>
-     <property name="website">http://corebird.baedert.org</property>
-     <property name="authors">Timm Bäder&lt;mail@baedert.org&gt; (Bugs go here)
diff --git a/net-im/corebird/pkg-plist b/net-im/corebird/pkg-plist
index fa0a9c7db169..ea8c05861188 100644
--- a/net-im/corebird/pkg-plist
+++ b/net-im/corebird/pkg-plist
@@ -17,18 +17,28 @@ share/locale/ca/LC_MESSAGES/corebird.mo
 share/locale/ca@valencia/LC_MESSAGES/corebird.mo
 share/locale/de/LC_MESSAGES/corebird.mo
 share/locale/en_AU/LC_MESSAGES/corebird.mo
+share/locale/es_419/LC_MESSAGES/corebird.mo
 share/locale/es/LC_MESSAGES/corebird.mo
+share/locale/es_MX/LC_MESSAGES/corebird.mo
 share/locale/es_VE/LC_MESSAGES/corebird.mo
 share/locale/fa/LC_MESSAGES/corebird.mo
 share/locale/fi/LC_MESSAGES/corebird.mo
 share/locale/fr/LC_MESSAGES/corebird.mo
+share/locale/hi/LC_MESSAGES/corebird.mo
 share/locale/hu/LC_MESSAGES/corebird.mo
-share/locale/id_ID/LC_MESSAGES/corebird.mo
+share/locale/id/LC_MESSAGES/corebird.mo
 share/locale/it/LC_MESSAGES/corebird.mo
 share/locale/ja/LC_MESSAGES/corebird.mo
+share/locale/ko/LC_MESSAGES/corebird.mo
 share/locale/lt/LC_MESSAGES/corebird.mo
 share/locale/nl/LC_MESSAGES/corebird.mo
 share/locale/pl/LC_MESSAGES/corebird.mo
+share/locale/pt/LC_MESSAGES/corebird.mo
 share/locale/pt_BR/LC_MESSAGES/corebird.mo
+share/locale/ro/LC_MESSAGES/corebird.mo
 share/locale/ru/LC_MESSAGES/corebird.mo
+share/locale/sr/LC_MESSAGES/corebird.mo
+share/locale/tr/LC_MESSAGES/corebird.mo
+share/locale/uk_UA/LC_MESSAGES/corebird.mo
 share/locale/zh_CN/LC_MESSAGES/corebird.mo
+share/locale/zh_TW/LC_MESSAGES/corebird.mo