From owner-svn-ports-all@FreeBSD.ORG Tue Jul 22 23:24:04 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 85030CD9; Tue, 22 Jul 2014 23:24:04 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 722FB239C; Tue, 22 Jul 2014 23:24:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6MNO4Z4068713; Tue, 22 Jul 2014 23:24:04 GMT (envelope-from nivit@svn.freebsd.org) Received: (from nivit@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6MNO3H1068709; Tue, 22 Jul 2014 23:24:03 GMT (envelope-from nivit@svn.freebsd.org) Message-Id: <201407222324.s6MNO3H1068709@svn.freebsd.org> From: Nicola Vitale Date: Tue, 22 Jul 2014 23:24:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r362604 - in head/www/tickr: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Jul 2014 23:24:04 -0000 Author: nivit Date: Tue Jul 22 23:24:03 2014 New Revision: 362604 URL: http://svnweb.freebsd.org/changeset/ports/362604 QAT: https://qat.redports.org/buildarchive/r362604/ Log: - 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/ Added: head/www/tickr/files/patch-src__libetm-0.4.4__Makefile.in (contents, props changed) Modified: head/www/tickr/Makefile head/www/tickr/files/patch-src__tickr__tickr.h head/www/tickr/pkg-plist Modified: head/www/tickr/Makefile ============================================================================== --- head/www/tickr/Makefile Tue Jul 22 23:06:03 2014 (r362603) +++ head/www/tickr/Makefile Tue Jul 22 23:24:03 2014 (r362604) @@ -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 Added: head/www/tickr/files/patch-src__libetm-0.4.4__Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/tickr/files/patch-src__libetm-0.4.4__Makefile.in Tue Jul 22 23:24:03 2014 (r362604) @@ -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 + Modified: head/www/tickr/files/patch-src__tickr__tickr.h ============================================================================== --- head/www/tickr/files/patch-src__tickr__tickr.h Tue Jul 22 23:06:03 2014 (r362603) +++ head/www/tickr/files/patch-src__tickr__tickr.h Tue Jul 22 23:24:03 2014 (r362604) @@ -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 Modified: head/www/tickr/pkg-plist ============================================================================== --- head/www/tickr/pkg-plist Tue Jul 22 23:06:03 2014 (r362603) +++ head/www/tickr/pkg-plist Tue Jul 22 23:24:03 2014 (r362604) @@ -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%%