Update to 0.15.1

PR:		ports/82082
Submitted by:	ports fury

4 files changed, 115 insertions, 60 deletions

diff --git a/www/syndigator/Makefile b/www/syndigator/Makefile
index 09f770b9a124..0e53a57c581d 100644
--- a/www/syndigator/Makefile
+++ b/www/syndigator/Makefile
@@ -6,8 +6,7 @@
 # $FreeBSD$
 
 PORTNAME=	syndigator
-PORTVERSION=	0.14
-PORTREVISION=	2
+PORTVERSION=	0.15.1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,27 +14,39 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An RSS feed reader based on Gtk2
 
-RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Gtk2.pm:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
-		${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable \
+RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Text/Iconv.pm:${PORTSDIR}/converters/p5-Text-Iconv \
 		${SITE_PERL}/Date/Manip.pm:${PORTSDIR}/devel/p5-Date-Manip \
-		${SITE_PERL}/XML/Simple.pm:${PORTSDIR}/textproc/p5-XML-Simple \
+		${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable \
 		${SITE_PERL}/XML/RSS.pm:${PORTSDIR}/textproc/p5-XML-RSS \
-		${SITE_PERL}/${PERL_ARCH}/Text/Iconv.pm:${PORTSDIR}/converters/p5-Text-Iconv \
+		${SITE_PERL}/XML/Simple.pm:${PORTSDIR}/textproc/p5-XML-Simple \
+		${SITE_PERL}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww \
 		${SITE_PERL}/${PERL_ARCH}/Gnome2.pm:${PORTSDIR}/x11-toolkits/p5-Gnome2 \
-		${SITE_PERL}/${PERL_ARCH}/Gtk2/Html2.pm:${PORTSDIR}/x11-toolkits/p5-Gtk2-Html2 \
-		${SITE_PERL}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww
+		${SITE_PERL}/${PERL_ARCH}/Gtk2.pm:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
+		${SITE_PERL}/${PERL_ARCH}/Gtk2/Html2.pm:${PORTSDIR}/x11-toolkits/p5-Gtk2-Html2
 
-WRKSRC=		${WRKDIR}/${DISTNAME:S/.1-/-/}
 USE_X_PREFIX=	yes
+USE_GNOME=	gnomehier
 USE_PERL5=	yes
-MAKE_ENV=	SITE_PERL=${SITE_PERL} \
-		GNOMEDIR=${X11BASE}/share/gnome
-
-post-install:
-	@${ECHO_CMD} "@cwd ${LOCALBASE}" >> ${TMPPLIST}
-	@${FIND} ${SITE_PERL}/syndigator ! -type d | \
-		${SED} 's,^${LOCALBASE}/,,' >> ${TMPPLIST}
-	@${FIND} ${SITE_PERL}/syndigator -type d | ${SORT} -r | \
-		${SED} 's,^${LOCALBASE}/,@dirrm ,' >> ${TMPPLIST}
+NO_BUILD=	yes
+
+GNOMEDIR=	${PREFIX}/share/gnome
+
+post-patch:
+	@${PERL} -pi -e 's|./lib|${PREFIX}/${SITE_PERL_REL}/${PORTNAME}|g' \
+		${WRKSRC}/syndigator
+	@${PERL} -pi -e 's|./images/|${GNOMEDIR}/pixmaps/${PORTNAME}/|g' \
+		${WRKSRC}/lib/RSSReader/Gtk2UI/IconFactory.pm
+
+do-install:
+	${INSTALL_SCRIPT} ${WRKSRC}/syndigator ${PREFIX}/bin
+	@${MKDIR} ${PREFIX}/${SITE_PERL_REL}/${PORTNAME}
+	cd ${WRKSRC}/lib && ${FIND} . | \
+		${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/${SITE_PERL_REL}/${PORTNAME}
+	@${MKDIR} ${GNOMEDIR}/applications
+	${INSTALL_DATA} ${WRKSRC}/syndigator.desktop ${GNOMEDIR}/applications
+	@${MKDIR} ${GNOMEDIR}/pixmaps
+	${INSTALL_DATA} ${WRKSRC}/icons/*.* ${GNOMEDIR}/pixmaps
+	@${MKDIR} ${GNOMEDIR}/pixmaps/${PORTNAME}
+	${INSTALL_DATA} ${WRKSRC}/images/*.* ${GNOMEDIR}/pixmaps/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/www/syndigator/distinfo b/www/syndigator/distinfo
index 61da01072d67..3087432807ea 100644
--- a/www/syndigator/distinfo
+++ b/www/syndigator/distinfo
@@ -1,2 +1,2 @@
-MD5 (syndigator-0.14.tar.gz) = 0ffd3c164677d4b9abcd9259c32abcd2
-SIZE (syndigator-0.14.tar.gz) = 71981
+MD5 (syndigator-0.15.1.tar.gz) = 6c2bb81e6df331ef51c879c9ce304345
+SIZE (syndigator-0.15.1.tar.gz) = 82474
diff --git a/www/syndigator/files/patch-Makefile b/www/syndigator/files/patch-Makefile
deleted file mode 100644
index a99bba3d07e0..000000000000
--- a/www/syndigator/files/patch-Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
---- Makefile.orig	Tue Apr 20 16:33:54 2004
-+++ Makefile	Tue Apr 20 16:38:57 2004
-@@ -1,12 +1,12 @@
- # Makefile for Syndigator
- 
--PREFIX=/usr
-+#PREFIX=/usr
- BINDIR=$(PREFIX)/bin
--LIBDIR=$(PREFIX)/lib
--DATADIR=$(PREFIX)/share
--IMAGESDIR=$(DATADIR)/syndigator/images
--ICONDIR=$(DATADIR)/pixmaps
--DESKTOPDIR=$(DATADIR)/applications
-+LIBDIR=${SITE_PERL}
-+DATADIR=$(PREFIX)/share/syndigator
-+IMAGESDIR=$(GNOMEDIR)/images
-+ICONDIR=$(GNOMEDIR)/pixmaps
-+DESKTOPDIR=$(GNOMEDIR)/applications
- 
- all:	syndigat
- 
diff --git a/www/syndigator/pkg-plist b/www/syndigator/pkg-plist
index 0f74c5831757..c33a4009efcf 100644
--- a/www/syndigator/pkg-plist
+++ b/www/syndigator/pkg-plist
@@ -1,22 +1,87 @@
 bin/syndigator
+%%SITE_PERL%%/syndigator/RSSReader/Category.pm
+%%SITE_PERL%%/syndigator/RSSReader/Configuration.pm
+%%SITE_PERL%%/syndigator/RSSReader/Exporter/CSV.pm
+%%SITE_PERL%%/syndigator/RSSReader/Exporter/OPML.pm
+%%SITE_PERL%%/syndigator/RSSReader/Exporter.pm
+%%SITE_PERL%%/syndigator/RSSReader/Feed/Message.pm
+%%SITE_PERL%%/syndigator/RSSReader/Feed.pm
+%%SITE_PERL%%/syndigator/RSSReader/Fetcher/FindFeed.pm
+%%SITE_PERL%%/syndigator/RSSReader/Fetcher.pm
+%%SITE_PERL%%/syndigator/RSSReader/Gtk2UI/AddACategory.pm
+%%SITE_PERL%%/syndigator/RSSReader/Gtk2UI/AddAFeedToCategory.pm
+%%SITE_PERL%%/syndigator/RSSReader/Gtk2UI/Category/InfoPane.pm
+%%SITE_PERL%%/syndigator/RSSReader/Gtk2UI/Category/MessageList.pm
+%%SITE_PERL%%/syndigator/RSSReader/Gtk2UI/Category.pm
+%%SITE_PERL%%/syndigator/RSSReader/Gtk2UI/DeleteACategory.pm
+%%SITE_PERL%%/syndigator/RSSReader/Gtk2UI/DeleteAFeed.pm
+%%SITE_PERL%%/syndigator/RSSReader/Gtk2UI/Dialog.pm
+%%SITE_PERL%%/syndigator/RSSReader/Gtk2UI/DiscoverFeed.pm
+%%SITE_PERL%%/syndigator/RSSReader/Gtk2UI/DiscoverFeedSilent.pm
+%%SITE_PERL%%/syndigator/RSSReader/Gtk2UI/ExporterDruid.pm
+%%SITE_PERL%%/syndigator/RSSReader/Gtk2UI/Feed/InfoPane.pm
+%%SITE_PERL%%/syndigator/RSSReader/Gtk2UI/Feed/MessageList.pm
+%%SITE_PERL%%/syndigator/RSSReader/Gtk2UI/Feed/Properties.pm
+%%SITE_PERL%%/syndigator/RSSReader/Gtk2UI/Feed.pm
+%%SITE_PERL%%/syndigator/RSSReader/Gtk2UI/Fetcher.pm
+%%SITE_PERL%%/syndigator/RSSReader/Gtk2UI/GeneralProperties.pm
+%%SITE_PERL%%/syndigator/RSSReader/Gtk2UI/IconFactory.pm
+%%SITE_PERL%%/syndigator/RSSReader/Gtk2UI/ImporterDruid.pm
+%%SITE_PERL%%/syndigator/RSSReader/Gtk2UI/MainWindow.pm
+%%SITE_PERL%%/syndigator/RSSReader/Gtk2UI/Message.pm
+%%SITE_PERL%%/syndigator/RSSReader/Gtk2UI/MessageList.pm
+%%SITE_PERL%%/syndigator/RSSReader/Gtk2UI/Notifiers/PopUpWindow.pm
+%%SITE_PERL%%/syndigator/RSSReader/Gtk2UI/Notifiers/TrayIcon.pm
+%%SITE_PERL%%/syndigator/RSSReader/Gtk2UI/Notifiers.pm
+%%SITE_PERL%%/syndigator/RSSReader/Gtk2UI/Preferences.pm
+%%SITE_PERL%%/syndigator/RSSReader/Gtk2UI/RenameCategoryWindow.pm
+%%SITE_PERL%%/syndigator/RSSReader/Gtk2UI/SaveConfiguration.pm
+%%SITE_PERL%%/syndigator/RSSReader/Gtk2UI/Tree.pm
+%%SITE_PERL%%/syndigator/RSSReader/Gtk2UI/UrlTester.pm
+%%SITE_PERL%%/syndigator/RSSReader/Gtk2UI.pm
+%%SITE_PERL%%/syndigator/RSSReader/Importer/BottomFeeder.pm
+%%SITE_PERL%%/syndigator/RSSReader/Importer/Evolution.pm
+%%SITE_PERL%%/syndigator/RSSReader/Importer/OPML.pm
+%%SITE_PERL%%/syndigator/RSSReader/Importer.pm
+%%SITE_PERL%%/syndigator/RSSReader/Logger.pm
+%%SITE_PERL%%/syndigator/RSSReader/Notifier.pm
+%%SITE_PERL%%/syndigator/RSSReader/Parser/RSS.pm
+%%SITE_PERL%%/syndigator/RSSReader/Parser.pm
+%%SITE_PERL%%/syndigator/RSSReader/UI/Preferences.pm
+%%SITE_PERL%%/syndigator/RSSReader.pm
 share/gnome/applications/syndigator.desktop
-share/gnome/images/closed.png
-share/gnome/images/comment-gs.png
-share/gnome/images/comment.png
-share/gnome/images/fetches_failed.png
-share/gnome/images/fetches_failed_16.png
-share/gnome/images/item-gtk2.png
-share/gnome/images/item-notify-gtk2.png
-share/gnome/images/item-notify.xpm
-share/gnome/images/item.xpm
-share/gnome/images/logo-124x22.xpm
-share/gnome/images/logo-simple.gif
-share/gnome/images/logo-simple.xpm
-share/gnome/images/not_to_keep.xpm
-share/gnome/images/offline.png
-share/gnome/images/online.png
-share/gnome/images/opened.png
-share/gnome/images/post-comment.png
-share/gnome/images/to_keep.png
-share/gnome/images/tokeep-gtk2.png
 share/gnome/pixmaps/syndigator.png
+share/gnome/pixmaps/syndigator/closed.png
+share/gnome/pixmaps/syndigator/comment-gs.png
+share/gnome/pixmaps/syndigator/comment.png
+share/gnome/pixmaps/syndigator/fetches_failed.png
+share/gnome/pixmaps/syndigator/fetches_failed_16.png
+share/gnome/pixmaps/syndigator/item-gtk2.png
+share/gnome/pixmaps/syndigator/item-notify-gtk2.png
+share/gnome/pixmaps/syndigator/item-notify.xpm
+share/gnome/pixmaps/syndigator/item.xpm
+share/gnome/pixmaps/syndigator/logo-124x22.xpm
+share/gnome/pixmaps/syndigator/logo-simple.gif
+share/gnome/pixmaps/syndigator/logo-simple.xpm
+share/gnome/pixmaps/syndigator/not_to_keep.xpm
+share/gnome/pixmaps/syndigator/offline.png
+share/gnome/pixmaps/syndigator/online.png
+share/gnome/pixmaps/syndigator/opened.png
+share/gnome/pixmaps/syndigator/post-comment.png
+share/gnome/pixmaps/syndigator/to_keep.png
+share/gnome/pixmaps/syndigator/tokeep-gtk2.png
+share/gnome/pixmaps/syndigator/trayicon-notify.gif
+share/gnome/pixmaps/syndigator/trayicon.gif
+@dirrm share/gnome/pixmaps/syndigator
+@dirrm %%SITE_PERL%%/syndigator/RSSReader/UI
+@dirrm %%SITE_PERL%%/syndigator/RSSReader/Parser
+@dirrm %%SITE_PERL%%/syndigator/RSSReader/Importer
+@dirrm %%SITE_PERL%%/syndigator/RSSReader/Gtk2UI/Notifiers
+@dirrm %%SITE_PERL%%/syndigator/RSSReader/Gtk2UI/Feed
+@dirrm %%SITE_PERL%%/syndigator/RSSReader/Gtk2UI/Category
+@dirrm %%SITE_PERL%%/syndigator/RSSReader/Gtk2UI
+@dirrm %%SITE_PERL%%/syndigator/RSSReader/Fetcher
+@dirrm %%SITE_PERL%%/syndigator/RSSReader/Feed
+@dirrm %%SITE_PERL%%/syndigator/RSSReader/Exporter
+@dirrm %%SITE_PERL%%/syndigator/RSSReader
+@dirrm %%SITE_PERL%%/syndigator