6 files changed, 23 insertions, 36 deletions

diff --git a/net-im/corebird/Makefile b/net-im/corebird/Makefile
index 685eca3eb3bc..dd56d1b11117 100644
--- a/net-im/corebird/Makefile
+++ b/net-im/corebird/Makefile
@@ -2,10 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	corebird
-PORTVERSION=	1.1
+PORTVERSION=	1.2
 CATEGORIES=	net-im
 
-MAINTAINER=	cpm@fbsd.es
+MAINTAINER=	cpm@FreeBSD.org
 COMMENT=	GTK3 Twitter client written in Vala
 
 LICENSE=	GPLv3
@@ -27,7 +27,7 @@ INSTALLS_ICONS=	yes
 
 OPTIONS_DEFINE=		GSTREAMER
 OPTIONS_DEFAULT=	GSTREAMER
-GSTREAMER_USE=	gstreamer1=yes,bad,good,libav,x,ximagesrc
+GSTREAMER_USE=	gstreamer1=yes,bad,good,gtksink,libav,x,ximagesrc
 GSTREAMER_CONFIGURE_OFF=	--disable-video
 
 GLIB_SCHEMAS=	org.baedert.corebird.gschema.xml
diff --git a/net-im/corebird/distinfo b/net-im/corebird/distinfo
index f863c90d9b06..f6f2eecbaad5 100644
--- a/net-im/corebird/distinfo
+++ b/net-im/corebird/distinfo
@@ -1,2 +1,2 @@
-SHA256 (baedert-corebird-1.1_GH0.tar.gz) = f6109cc2bdc7ee5893c28861a73df4eeaec4b76b99222a90aec381b03b19c8a7
-SIZE (baedert-corebird-1.1_GH0.tar.gz) = 1757414
+SHA256 (baedert-corebird-1.2_GH0.tar.gz) = b495f2232569a605cf3fd9c8ebc87633ba9645fb5b0a3ec00ac95736dbb15a9c
+SIZE (baedert-corebird-1.2_GH0.tar.gz) = 423619
diff --git a/net-im/corebird/files/patch-Makefile.am b/net-im/corebird/files/patch-Makefile.am
index 40db0c39f23c..9a22d655b046 100644
--- a/net-im/corebird/files/patch-Makefile.am
+++ b/net-im/corebird/files/patch-Makefile.am
@@ -1,10 +1,10 @@
---- Makefile.am.orig	2015-07-17 13:15:47 UTC
+--- Makefile.am.orig	2016-02-29 16:55:42 UTC
 +++ Makefile.am
 @@ -1,6 +1,6 @@
  ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
  
--SUBDIRS = src ui data assets po tests sql
-+SUBDIRS = src ui data assets po sql
- EXTRA_DIST = config.rpath  \
- 						 intltool-extract.in \
- 						 intltool-merge.in \
+-SUBDIRS = src ui data assets po tests
++SUBDIRS = src ui data assets po
+ 
+ EXTRA_DIST = \
+ 	vapi/config.vapi \
diff --git a/net-im/corebird/files/patch-configure.ac b/net-im/corebird/files/patch-configure.ac
index 08dc7ab4e98a..5b3b782a2f7f 100644
--- a/net-im/corebird/files/patch-configure.ac
+++ b/net-im/corebird/files/patch-configure.ac
@@ -1,20 +1,11 @@
---- configure.ac.orig	2015-07-17 13:15:47 UTC
+--- configure.ac.orig	2016-02-29 16:55:42 UTC
 +++ configure.ac
-@@ -93,8 +93,6 @@ GLIB_GSETTINGS
- GETTEXT_PACKAGE=corebird
- AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"], [Gettext Package])
- AC_SUBST(GETTEXT_PACKAGE)
--AM_GNU_GETTEXT([external])
--AM_GNU_GETTEXT_VERSION([0.18.3])
- AM_GLIB_GNU_GETTEXT
- 
- 
-@@ -103,7 +101,7 @@ AC_CONFIG_FILES([Makefile
-                  src/Makefile
-                  ui/Makefile
-                  data/Makefile
--                 data/org.baedert.corebird.desktop.in
-+                 data/corebird.desktop.in
-                  assets/Makefile
-                  assets/128x128/Makefile
-                  assets/96x96/Makefile
+@@ -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 f35f7a8c6807..c17ee3420497 100644
--- a/net-im/corebird/files/patch-data__Makefile.am
+++ b/net-im/corebird/files/patch-data_Makefile.am
@@ -1,8 +1,8 @@
---- data/Makefile.am.orig	2015-07-17 13:15:47 UTC
+--- data/Makefile.am.orig	2016-02-29 16:55:42 UTC
 +++ data/Makefile.am
 @@ -1,6 +1,6 @@
  
- desktopdir = $(prefix)/share/applications
+ 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)
diff --git a/net-im/corebird/pkg-plist b/net-im/corebird/pkg-plist
index 56558c4cd9d8..fa0a9c7db169 100644
--- a/net-im/corebird/pkg-plist
+++ b/net-im/corebird/pkg-plist
@@ -2,10 +2,6 @@ bin/corebird
 man/man1/corebird.1.gz
 share/appdata/org.baedert.corebird.appdata.xml
 share/applications/corebird.desktop
-%%DATADIR%%/sql/accounts/Create.1.sql
-%%DATADIR%%/sql/accounts/Create.2.sql
-%%DATADIR%%/sql/init/Create.1.sql
-%%DATADIR%%/sql/init/Create.2.sql
 share/dbus-1/services/org.baedert.corebird.service
 share/icons/hicolor/256x256/apps/corebird.png
 share/icons/hicolor/128x128/apps/corebird.png