From f75d2aa2cdd1cbae6291bd0af1754f01618da360 Mon Sep 17 00:00:00 2001
From: Nicola Vitale <nivit@FreeBSD.org>
Date: Tue, 22 Jul 2014 23:24:03 +0000
Subject: [PATCH] - Bump PORTREVISION (change pkg-plist - Take maintainership -
 Use desktop-file-utils and libtool helpers - Add support for stage dir -
 Install a predefined list of RSS feeds - Add
 files/patch-src__libetm-0.4.4__Makefile.in

Build Log:	https://redports.org/buildarchive/20140722225327-99178/
---
 www/tickr/Makefile                               | 16 ++++++++--------
 .../files/patch-src__libetm-0.4.4__Makefile.in   | 11 +++++++++++
 www/tickr/files/patch-src__tickr__tickr.h        |  4 ++--
 www/tickr/pkg-plist                              |  8 ++++----
 4 files changed, 25 insertions(+), 14 deletions(-)
 create mode 100644 www/tickr/files/patch-src__libetm-0.4.4__Makefile.in

diff --git a/www/tickr/Makefile b/www/tickr/Makefile
index 674fc3dfd6c6..8992c1fc7605 100644
--- a/www/tickr/Makefile
+++ b/www/tickr/Makefile
@@ -3,12 +3,12 @@
 
 PORTNAME=	tickr
 PORTVERSION=	0.6.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://www.newsrssticker.com/src/ \
 		LOCAL/nivit/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	News RSS Ticker
 
 LICENSE=	GPLv3
@@ -17,20 +17,20 @@ GNU_CONFIGURE=	yes
 
 PLIST_SUB=	DESKTOPDIR=${DESKTOPDIR:S,${PREFIX}/,,}
 
-REINPLACE_ARGS=	-e 's,%%PREFIX%%,${PREFIX},1' -i.bak
+REINPLACE_ARGS=	-e 's,%%DATADIR%%,${DATADIR},1' -e 's,%%PREFIX%%,${PREFIX},1' -i.bak
 
 DOS2UNIX_GLOB=	tickr.h
-USE_GNOME=	desktopfileutils gtk20 libxml2
-USES=		dos2unix pkgconfig
+USE_GNOME=	gtk20 libxml2
+USES=		desktop-file-utils dos2unix pkgconfig libtool
 
-NO_STAGE=	yes
 post-patch:
 	${REINPLACE_CMD} ${WRKSRC}/${PORTNAME}.desktop ${WRKSRC}/src/tickr/tickr.h
 
 post-install:
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/tickr-url-list ${STAGEDIR}${DATADIR}/tickr-url-list
 	${LOCALBASE}/bin/desktop-file-install \
-		--mode=${SHAREMODE} --dir=${DESKTOPDIR} \
+		--mode=${SHAREMODE} --dir=${STAGEDIR}${DESKTOPDIR} \
 		${WRKSRC}/${PORTNAME}.desktop
-	-${LOCALBASE}/bin/update-desktop-database
 
 .include <bsd.port.mk>
diff --git a/www/tickr/files/patch-src__libetm-0.4.4__Makefile.in b/www/tickr/files/patch-src__libetm-0.4.4__Makefile.in
new file mode 100644
index 000000000000..c8af9233da01
--- /dev/null
+++ b/www/tickr/files/patch-src__libetm-0.4.4__Makefile.in
@@ -0,0 +1,11 @@
+--- ./src/libetm-0.4.4/Makefile.in.orig	2014-07-22 23:41:01.000000000 +0200
++++ ./src/libetm-0.4.4/Makefile.in	2014-07-22 23:42:05.000000000 +0200
+@@ -469,7 +469,7 @@
+ 
+ info-am:
+ 
+-install-data-am: install-libsLIBRARIES
++install-data-am:
+ 
+ install-dvi: install-dvi-am
+ 
diff --git a/www/tickr/files/patch-src__tickr__tickr.h b/www/tickr/files/patch-src__tickr__tickr.h
index bd8538a39a97..cecc75c4c1f0 100644
--- a/www/tickr/files/patch-src__tickr__tickr.h
+++ b/www/tickr/files/patch-src__tickr__tickr.h
@@ -6,8 +6,8 @@
  #ifndef G_OS_WIN32
 -# define INSTALL_PATH		"/usr/share/" APP_CMD
 -# define IMAGES_PATH		INSTALL_PATH "/pixmaps"
-+# define INSTALL_PATH		"%%PREFIX%%/share/"
-+# define IMAGES_PATH		INSTALL_PATH "/pixmaps/" APP_CMD
++# define INSTALL_PATH		"%%DATADIR%%"
++# define IMAGES_PATH		"%%PREFIX%%/share/pixmaps/" APP_CMD
  #else
  # define IMAGES_PATH		APP_NAME	/* Actually not a path but a dir name */
  #endif
diff --git a/www/tickr/pkg-plist b/www/tickr/pkg-plist
index dbb88681fb01..cbd71d3b75c2 100644
--- a/www/tickr/pkg-plist
+++ b/www/tickr/pkg-plist
@@ -1,9 +1,9 @@
 bin/tickr
+%%DESKTOPDIR%%/tickr.desktop
 share/pixmaps/tickr/tickr-icon.png
 share/pixmaps/tickr/tickr-icon.xpm
 share/pixmaps/tickr/tickr-logo.png
 share/pixmaps/tickr/tickr-rss-icon.png
-%%DESKTOPDIR%%/tickr.desktop
-@dirrm share/pixmaps/tickr
-@exec %%LOCALBASE%%/bin/update-desktop-database || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-desktop-database || /usr/bin/true
+%%DATADIR%%/tickr-url-list
+@dirrmtry share/pixmaps/tickr
+@dirrmtry %%DATADIR%%