Index: head/www/tickr/Makefile =================================================================== --- head/www/tickr/Makefile (revision 362603) +++ head/www/tickr/Makefile (revision 362604) @@ -1,36 +1,36 @@ # Created by: Nicola Vitale # $FreeBSD$ 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 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 Index: head/www/tickr/files/patch-src__libetm-0.4.4__Makefile.in =================================================================== --- head/www/tickr/files/patch-src__libetm-0.4.4__Makefile.in (nonexistent) +++ head/www/tickr/files/patch-src__libetm-0.4.4__Makefile.in (revision 362604) @@ -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 + Property changes on: head/www/tickr/files/patch-src__libetm-0.4.4__Makefile.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/tickr/files/patch-src__tickr__tickr.h =================================================================== --- head/www/tickr/files/patch-src__tickr__tickr.h (revision 362603) +++ head/www/tickr/files/patch-src__tickr__tickr.h (revision 362604) @@ -1,13 +1,13 @@ --- ./src/tickr/tickr.h.orig 2013-06-16 15:01:04.000000000 +0200 +++ ./src/tickr/tickr.h 2013-06-16 15:01:29.000000000 +0200 @@ -173,8 +173,8 @@ # define STDERR_FILENAME2 "stderr2.txt" #endif #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 Index: head/www/tickr/pkg-plist =================================================================== --- head/www/tickr/pkg-plist (revision 362603) +++ head/www/tickr/pkg-plist (revision 362604) @@ -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%%