- Update to 1.5.1

- Use REINPLACE_CMD instead of patch files
- Remove unneeded patch
- Cosmetic change
- Update WWW in pkg-descr

Changelog: https://github.com/baedert/corebird/releases/tag/1.5.1

7 files changed, 11 insertions, 41 deletions

diff --git a/net-im/corebird/Makefile b/net-im/corebird/Makefile
index c1c0642a59a2..559db4c7ff89 100644
--- a/net-im/corebird/Makefile
+++ b/net-im/corebird/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	corebird
-PORTVERSION=	1.5
-PORTREVISION=	2
+PORTVERSION=	1.5.1
 CATEGORIES=	net-im
 
 MAINTAINER=	cpm@FreeBSD.org
@@ -43,8 +42,11 @@ NLS_CONFIGURE_OFF=		--disable-nls
 GLIB_SCHEMAS=	org.baedert.corebird.gschema.xml
 
 post-extract:
-	@(cd ${WRKSRC}/data && ${MV} org.baedert.corebird.desktop.in \
-		corebird.desktop.in)
+	@${REINPLACE_CMD} -e 's|tests||' ${WRKSRC}/Makefile.am
+	@${REINPLACE_CMD} -e 's|org.baedert.corebird.desktop.in|corebird.desktop.in|' \
+		${WRKSRC}/data/Makefile.am
+	@cd ${WRKSRC}/data && ${MV} org.baedert.corebird.desktop.in \
+		corebird.desktop.in
 
 # Replace locales files in right place
 post-configure:
diff --git a/net-im/corebird/distinfo b/net-im/corebird/distinfo
index 477f04f81bb9..7718411ba9df 100644
--- a/net-im/corebird/distinfo
+++ b/net-im/corebird/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1493852816
-SHA256 (baedert-corebird-1.5_GH0.tar.gz) = 39d451238ef30bf2caf5568d9c02c6e2a2f8b7256f19786ebcd6557adc815203
-SIZE (baedert-corebird-1.5_GH0.tar.gz) = 492120
+TIMESTAMP = 1499505257
+SHA256 (baedert-corebird-1.5.1_GH0.tar.gz) = 007d0420c8c32134d47d4c06676f9f3fac654ea818af6daf319ac8eb7c007eb6
+SIZE (baedert-corebird-1.5.1_GH0.tar.gz) = 501313
diff --git a/net-im/corebird/files/patch-Makefile.am b/net-im/corebird/files/patch-Makefile.am
deleted file mode 100644
index d9b47c048c88..000000000000
--- a/net-im/corebird/files/patch-Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile.am.orig	2017-05-02 13:34:40 UTC
-+++ Makefile.am
-@@ -1,6 +1,6 @@
- ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
- 
--SUBDIRS = src data po tests
-+SUBDIRS = src data po
- 
- EXTRA_DIST = \
- 	vapi/config.vapi \
diff --git a/net-im/corebird/files/patch-data_Makefile.am b/net-im/corebird/files/patch-data_Makefile.am
deleted file mode 100644
index fc93448302a8..000000000000
--- a/net-im/corebird/files/patch-data_Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
---- data/Makefile.am.orig	2017-05-02 13:34:40 UTC
-+++ data/Makefile.am
-@@ -2,7 +2,7 @@ iconprefix=$(datarootdir)/icons/hicolor/
- SUBDIRS = hicolor
- 
- 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)
- 
- appdatadir = $(datarootdir)/appdata
diff --git a/net-im/corebird/files/patch-src_Corebird.vala b/net-im/corebird/files/patch-src_Corebird.vala
deleted file mode 100644
index b9f16165c73f..000000000000
--- a/net-im/corebird/files/patch-src_Corebird.vala
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/Corebird.vala.orig	2017-05-03 23:08:40 UTC
-+++ src/Corebird.vala
-@@ -194,7 +194,8 @@ public class Corebird : Gtk.Application 
-     base.startup ();
-     this.set_resource_base_path ("/org/baedert/corebird");
- 
--    typeof (LazyMenuButton).ensure ();
-+    new ComposeImageManager ();
-+    new LazyMenuButton ();
- 
- #if DEBUG
-     GLib.Environment.set_variable ("G_MESSAGES_DEBUG", "corebird", true);
diff --git a/net-im/corebird/pkg-descr b/net-im/corebird/pkg-descr
index af33631122e5..8dcd74e96b51 100644
--- a/net-im/corebird/pkg-descr
+++ b/net-im/corebird/pkg-descr
@@ -1,4 +1,4 @@
 Corebird is a native GTK3 Twitter client that provides features
 such as Direct Messages (DMs), Tweet notifications.
 
-WWW: http://corebird.baedert.org/
+WWW: https://corebird.baedert.org
diff --git a/net-im/corebird/pkg-plist b/net-im/corebird/pkg-plist
index 0499eb4005df..04f5e754f3ad 100644
--- a/net-im/corebird/pkg-plist
+++ b/net-im/corebird/pkg-plist
@@ -17,6 +17,7 @@ share/icons/hicolor/96x96/apps/corebird.png
 %%NLS%%share/locale/ca@valencia/LC_MESSAGES/corebird.mo
 %%NLS%%share/locale/de/LC_MESSAGES/corebird.mo
 %%NLS%%share/locale/en_AU/LC_MESSAGES/corebird.mo
+%%NLS%%share/locale/eo/LC_MESSAGES/corebird.mo
 %%NLS%%share/locale/es_419/LC_MESSAGES/corebird.mo
 %%NLS%%share/locale/es/LC_MESSAGES/corebird.mo
 %%NLS%%share/locale/es_MX/LC_MESSAGES/corebird.mo