Upgrade tilda to latest stable release 1.2.2

Fix/Rework build

PR:		198763
Submitted by:	rodrigo (maintainer)

6 files changed, 29 insertions, 36 deletions

diff --git a/x11/tilda/Makefile b/x11/tilda/Makefile
index 2a13b2f51397..168d4818d515 100644
--- a/x11/tilda/Makefile
+++ b/x11/tilda/Makefile
@@ -1,34 +1,29 @@
 # $FreeBSD$
 
 PORTNAME=	tilda
-PORTVERSION=	0.9.6
-PORTREVISION=	7
+PORTVERSION=	1.2.2
 CATEGORIES=	x11
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
+MASTER_SITES=	https://github.com/lanoxx/${PORTNAME}/archive/
 
 MAINTAINER=	rodrigo@FreeBSD.org
 COMMENT=	Drop down x11 terminal with transparency support
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libconfuse.so:${PORTSDIR}/devel/libconfuse
+LIB_DEPENDS=	libconfuse.so:${PORTSDIR}/devel/libconfuse \
+		libvte2_90.so:${PORTSDIR}/x11-toolkits/vte290
 
+WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTNAME}
 GNU_CONFIGURE=	yes
-USE_GNOME=	gtk20 libglade2 vte
-USES=		gmake gettext pkgconfig
+CONFIGURE_ARGS=	--disable-rpath
+USE_GNOME=	gtk30
+USES=		gmake gettext pkgconfig autoreconf pathfix libtool
+INSTALL_TARGET=	install-strip
 
-DOCS=		AUTHORS ChangeLog README TODO
+DOCS=		AUTHORS ChangeLog HACKING.md README.md TODO.md
 
 OPTIONS_DEFINE=	DOCS
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|ps -C tilda -o pid=|pgrep tilda|' \
-		${WRKSRC}/src/tilda.c
-	@${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \
-		${WRKSRC}/src/tomboykeybinder.h
-	@${REINPLACE_CMD} -e 's|-R$$found_dir|-Wl,-rpath,$$found_dir|g' \
-		${WRKSRC}/configure
-
 post-install:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in ${DOCS}
diff --git a/x11/tilda/distinfo b/x11/tilda/distinfo
index 30eb42e50ee8..28da69f672e7 100644
--- a/x11/tilda/distinfo
+++ b/x11/tilda/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tilda-0.9.6.tar.gz) = b3bd0f63eb83a5001ef26056ca116e5f8005d454f8f82a94f334868862068411
-SIZE (tilda-0.9.6.tar.gz) = 307517
+SHA256 (tilda-1.2.2.tar.gz) = 855ab15423e3de8106975fab2185af4380caeb1bb4c2d0bc60b7674d29f0f4d7
+SIZE (tilda-1.2.2.tar.gz) = 289677
diff --git a/x11/tilda/files/patch-key_grabber.c b/x11/tilda/files/patch-key_grabber.c
deleted file mode 100644
index ae99d9867401..000000000000
--- a/x11/tilda/files/patch-key_grabber.c
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/src/key_grabber.c b/src/key_grabber.c
-index 8c9e67c..b4ca786 100644
---- src/key_grabber.c
-+++ src/key_grabber.c
-@@ -190,8 +190,8 @@ void pull (struct tilda_window_ *tw, enum pull_state state)
-          * Overriding the user time here seems to work a lot better than calling
-          * gtk_window_present_with_time() here, or at the end of the function. I have
-          * no idea why, they should do the same thing. */
--        gdk_x11_window_set_user_time (GTK_WIDGET(tw->window)->window,
--                                      tomboy_keybinder_get_current_event_time());
-+        /*gdk_x11_window_set_user_time (GTK_WIDGET(tw->window)->window,
-+                                      tomboy_keybinder_get_current_event_time());*/
-         gtk_window_move (GTK_WINDOW(tw->window), config_getint ("x_pos"), config_getint ("y_pos"));
-         gtk_widget_show (GTK_WIDGET(tw->window));
- 
diff --git a/x11/tilda/files/patch-tilda.c b/x11/tilda/files/patch-tilda.c
new file mode 100644
index 000000000000..83f402059412
--- /dev/null
+++ b/x11/tilda/files/patch-tilda.c
@@ -0,0 +1,10 @@
+--- src/tilda.c.orig	2014-10-28 11:26:57.000000000 +0000
++++ src/tilda.c	2015-04-09 12:05:56.977831590 +0000
+@@ -12,6 +12,7 @@
+  * You should have received a copy of the GNU Library General Public
+  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+  */
++#include <fcntl.h>
+ #define _POSIX_SOURCE /* feature test macro for signal functions */
+ #define _XOPEN_SOURCE /* feature test macro for popen */
+ 
diff --git a/x11/tilda/pkg-descr b/x11/tilda/pkg-descr
index ef4983ec619c..b2f3ac08956c 100644
--- a/x11/tilda/pkg-descr
+++ b/x11/tilda/pkg-descr
@@ -3,4 +3,4 @@ terminals from first person shooter games, Quake, Doom and Half-Life
 to name a few, where the terminal has no border and is hidden from
 the desktop till a key or keys is hit.
 
-WWW: http://tilda.sourceforge.net/
+WWW: https://github.com/lanoxx/tilda
diff --git a/x11/tilda/pkg-plist b/x11/tilda/pkg-plist
index 4722e988f4b0..ed2d18c0bb59 100644
--- a/x11/tilda/pkg-plist
+++ b/x11/tilda/pkg-plist
@@ -1,5 +1,6 @@
 bin/tilda
 share/applications/tilda.desktop
+share/locale/bg/LC_MESSAGES/tilda.mo
 share/locale/ca/LC_MESSAGES/tilda.mo
 share/locale/cs/LC_MESSAGES/tilda.mo
 share/locale/de/LC_MESSAGES/tilda.mo
@@ -9,6 +10,7 @@ share/locale/es/LC_MESSAGES/tilda.mo
 share/locale/fr/LC_MESSAGES/tilda.mo
 share/locale/hu/LC_MESSAGES/tilda.mo
 share/locale/it/LC_MESSAGES/tilda.mo
+share/locale/lt/LC_MESSAGES/tilda.mo
 share/locale/pl/LC_MESSAGES/tilda.mo
 share/locale/pt/LC_MESSAGES/tilda.mo
 share/locale/pt_BR/LC_MESSAGES/tilda.mo
@@ -19,8 +21,9 @@ share/locale/sv/LC_MESSAGES/tilda.mo
 share/locale/tr/LC_MESSAGES/tilda.mo
 share/locale/zh_CN/LC_MESSAGES/tilda.mo
 share/pixmaps/tilda.png
-share/tilda.glade
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/HACKING.md
+%%PORTDOCS%%%%DOCSDIR%%/README.md
+%%PORTDOCS%%%%DOCSDIR%%/TODO.md
+%%PORTDOCS%%@dir %%DOCSDIR%%