Attachment 102119 Details for Bug 141816 – file.diff

[patch] file.diff

file.diff (text/plain), 13.19 KB, created by tkato432 on 2009-12-20 18:10:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2009-12-20 18:10:03 UTC

Size: 13.19 KB

patch

obsolete

>diff -urN /usr/ports/multimedia/gpodder/Makefile multimedia/gpodder/Makefile
>--- /usr/ports/multimedia/gpodder/Makefile	2009-08-29 14:16:13.000000000 +0900
>+++ multimedia/gpodder/Makefile	2009-12-13 20:38:29.000000000 +0900
>@@ -6,72 +6,65 @@
> #
> 
> PORTNAME=	gpodder
>-PORTVERSION=	0.15.0
>-PORTREVISION=	2
>+PORTVERSION=	2.1
> CATEGORIES=	multimedia
>-MASTER_SITES=	${MASTER_SITE_BERLIOS}
>-MASTER_SITE_SUBDIR=	gpodder
>-DISTNAME=	${PORTNAME}-${PORTVERSION}
>+MASTER_SITES=	BERLIOS
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	A GTK2 podcast aggregrator written in Python
> 
>-BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/feedparser.py:${PORTSDIR}/textproc/py-feedparser \
>-		convert:${PORTSDIR}/graphics/ImageMagick \
>-		help2man:${PORTSDIR}/misc/help2man
>-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/feedparser.py:${PORTSDIR}/textproc/py-feedparser \
>-		${PYTHON_SITELIBDIR}/pysqlite2/_sqlite.so:${PORTSDIR}/databases/py-pysqlite23 \
>+RUN_DEPENDS=	py*-pysqlite>=2.3:${PORTSDIR}/databases/py-pysqlite23 \
>+		py*-dbus>=0:${PORTSDIR}/devel/py-dbus \
>+		py*-notify>=0:${PORTSDIR}/devel/py-notify \
>+		xdg-open:${PORTSDIR}/devel/xdg-utils \
> 		wget:${PORTSDIR}/ftp/wget \
>-		xdg-open:${PORTSDIR}/devel/xdg-utils
>+		gnome-icon-theme>=0:${PORTSDIR}/misc/gnome-icon-theme \
>+		py*-feedparser>=0:${PORTSDIR}/textproc/py-feedparser
>+
>+OPTIONS=	COVERART "Cover Art syncing support" off \
>+		IPOD "iPod synchronization support" off \
>+		MP3TAG "MP3 ID3 tag update support" off \
>+		OGG2MP3 "Ogg Vorbis conversion to MP3 support" off \
>+		SHOWNOTES "HTML episode shownotes support" off \
>+		VIDEO "Video media support using mplayer" off
> 
>-USE_GMAKE=	yes
>-USE_GNOME=	pygtk2 libglade2
>-USE_GETTEXT=	yes
> USE_PYTHON=	yes
>-PLIST_SUB=	PYDISTUTILS_EGGINFO=${PYDISTUTILS_EGGINFO}
>+USE_GNOME=	pygtk2
>+USE_GETTEXT=	yes
> INSTALLS_ICONS=	yes
>+INSTALLS_EGGINFO=yes
> 
>-MANCOMPRESSED=	no
>-MAN1=		${PORTNAME}.1 gpodder-backup.1
>-
>-PORTDOCS=	COPYING PKG-INFO README
>-
>-OPTIONS=	IPOD "iPod synchronization support" off \
>-		VIDEO "Video media support using mplayer" off \
>-		MP3TAG "MP3 ID3 tag update support" off \
>-		OGGTAG "Ogg Vorbis ID3 tag update support" off \
>-		OGG2MP3 "Ogg Vorbis conversion to MP3 support" off
>+MAN1=		gpo.1 ${PORTNAME}.1 ${PORTNAME}-backup.1
> 
> .include <bsd.port.pre.mk>
> 
>-.if defined(WITHOUT_NLS)
>-PLIST_SUB+=	NLS="@comment "
>-.else
>-USE_GETTEXT=	yes
>-PLIST_SUB+=	NLS=""
>+.if defined(WITH_COVERART)
>+RUN_DEPENDS+=	py*-imaging>=0:${PORTSDIR}/graphics/py-imaging
> .endif
> 
> .if defined(WITH_IPOD)
> LIB_DEPENDS+=	gpod.5:${PORTSDIR}/audio/libgpod
>-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/madmodule.so:${PORTSDIR}/audio/py-mad
>+RUN_DEPENDS+=	py*-mad>=0:${PORTSDIR}/audio/py-mad
>+.if !exists(${PYTHON_SITELIBDIR}/gpod/__init__.py)
>+IGNORE=		Requires Python bindings for libgpod. Please uninstall libgpod and reinstall with Python support.
> .endif
>-
>-.if defined(WITH_VIDEO)
>-RUN_DEPENDS+=	mplayer:${PORTSDIR}/multimedia/mplayer \
>-		${PYTHON_SITELIBDIR}/ID3.py:${PORTSDIR}/audio/py-id3
> .endif
> 
> .if defined(WITH_MP3TAG)
>-RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/eyeD3/__init__.py:${PORTSDIR}/audio/py-eyed3
>+RUN_DEPENDS+=	py*-eyed3>=0:${PORTSDIR}/audio/py-eyed3
> .endif
> 
>-.if defined(WITH_OGGTAG)
>-RUN_DEPENDS+=	ogg123:${PORTSDIR}/audio/vorbis-tools
>+.if defined(WITH_OGG2MP3)
>+RUN_DEPENDS+=	lame:${PORTSDIR}/audio/lame \
>+		oggdec:${PORTSDIR}/audio/vorbis-tools
> .endif
> 
>-.if defined(WITH_OGG2MP3)
>-RUN_DEPENDS+=	oggdec:${PORTSDIR}/audio/vorbis-tools \
>-		lame:${PORTSDIR}/audio/lame
>+.if defined(WITH_SHOWNOTES)
>+USE_GNOME+=	pygnomeextras
>+.endif
>+
>+.if defined(WITH_VIDEO)
>+RUN_DEPENDS+=	mplayer:${PORTSDIR}/multimedia/mplayer
> .endif
> 
> post-patch:
>@@ -79,9 +72,9 @@
> 
> post-install:
> .if !defined(NOPORTDOCS)
>-	${MKDIR} ${DOCSDIR}
>-.for i in ${PORTDOCS}
>-	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
>+	@${MKDIR} ${DOCSDIR}
>+.for file in PKG-INFO README 
>+	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
> .endfor
> .endif
> 
>diff -urN /usr/ports/multimedia/gpodder/distinfo multimedia/gpodder/distinfo
>--- /usr/ports/multimedia/gpodder/distinfo	2009-03-15 01:19:21.000000000 +0900
>+++ multimedia/gpodder/distinfo	2009-12-13 20:50:14.000000000 +0900
>@@ -1,3 +1,3 @@
>-MD5 (gpodder-0.15.0.tar.gz) = d5b7dec06766aa658cbff23634d18ea3
>-SHA256 (gpodder-0.15.0.tar.gz) = dd51909be19de0af5fb23360422c7098a66805ca7e927518d458cefd7c68cfae
>-SIZE (gpodder-0.15.0.tar.gz) = 454595
>+MD5 (gpodder-2.1.tar.gz) = 57ed679e3722b7c214956b8d4e13141a
>+SHA256 (gpodder-2.1.tar.gz) = 2134eba889ad9b2306870aab0d43a15efaa0ad54132a7770a92aafca79ef3ccf
>+SIZE (gpodder-2.1.tar.gz) = 694681
>diff -urN /usr/ports/multimedia/gpodder/pkg-plist multimedia/gpodder/pkg-plist
>--- /usr/ports/multimedia/gpodder/pkg-plist	2009-03-15 01:19:21.000000000 +0900
>+++ multimedia/gpodder/pkg-plist	2009-12-15 01:36:14.000000000 +0900
>@@ -1,76 +1,141 @@
>+bin/gpo
> bin/gpodder
> bin/gpodder-backup
>-%%PYTHON_SITELIBDIR%%/%%PYDISTUTILS_EGGINFO%%
>-%%PYTHON_SITELIBDIR%%/gpodder/SimpleGladeApp.py
>-%%PYTHON_SITELIBDIR%%/gpodder/SimpleGladeApp.pyc
> %%PYTHON_SITELIBDIR%%/gpodder/__init__.py
> %%PYTHON_SITELIBDIR%%/gpodder/__init__.pyc
>-%%PYTHON_SITELIBDIR%%/gpodder/cache.py
>-%%PYTHON_SITELIBDIR%%/gpodder/cache.pyc
>+%%PYTHON_SITELIBDIR%%/gpodder/api.py
>+%%PYTHON_SITELIBDIR%%/gpodder/api.pyc
> %%PYTHON_SITELIBDIR%%/gpodder/config.py
> %%PYTHON_SITELIBDIR%%/gpodder/config.pyc
> %%PYTHON_SITELIBDIR%%/gpodder/console.py
> %%PYTHON_SITELIBDIR%%/gpodder/console.pyc
>+%%PYTHON_SITELIBDIR%%/gpodder/corestats.py
>+%%PYTHON_SITELIBDIR%%/gpodder/corestats.pyc
> %%PYTHON_SITELIBDIR%%/gpodder/dbsqlite.py
> %%PYTHON_SITELIBDIR%%/gpodder/dbsqlite.pyc
> %%PYTHON_SITELIBDIR%%/gpodder/download.py
> %%PYTHON_SITELIBDIR%%/gpodder/download.pyc
>-%%PYTHON_SITELIBDIR%%/gpodder/draw.py
>-%%PYTHON_SITELIBDIR%%/gpodder/draw.pyc
>-%%PYTHON_SITELIBDIR%%/gpodder/dumbshelve.py
>-%%PYTHON_SITELIBDIR%%/gpodder/dumbshelve.pyc
>+%%PYTHON_SITELIBDIR%%/gpodder/feedcore.py
>+%%PYTHON_SITELIBDIR%%/gpodder/feedcore.pyc
>+%%PYTHON_SITELIBDIR%%/gpodder/gtkui/__init__.py
>+%%PYTHON_SITELIBDIR%%/gpodder/gtkui/__init__.pyc
>+%%PYTHON_SITELIBDIR%%/gpodder/gtkui/base.py
>+%%PYTHON_SITELIBDIR%%/gpodder/gtkui/base.pyc
>+%%PYTHON_SITELIBDIR%%/gpodder/gtkui/config.py
>+%%PYTHON_SITELIBDIR%%/gpodder/gtkui/config.pyc
>+%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/__init__.py
>+%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/__init__.pyc
>+%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/channel.py
>+%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/channel.pyc
>+%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/dependencymanager.py
>+%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/dependencymanager.pyc
>+%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/deviceplaylist.py
>+%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/deviceplaylist.pyc
>+%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/episodeselector.py
>+%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/episodeselector.pyc
>+%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/podcastdirectory.py
>+%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/podcastdirectory.pyc
>+%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/preferences.py
>+%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/preferences.pyc
>+%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/shownotes.py
>+%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/shownotes.pyc
>+%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/sync.py
>+%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/sync.pyc
>+%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/syncprogress.py
>+%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/syncprogress.pyc
>+%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/trayicon.py
>+%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop/trayicon.pyc
>+%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktopfile.py
>+%%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktopfile.pyc
>+%%PYTHON_SITELIBDIR%%/gpodder/gtkui/download.py
>+%%PYTHON_SITELIBDIR%%/gpodder/gtkui/download.pyc
>+%%PYTHON_SITELIBDIR%%/gpodder/gtkui/draw.py
>+%%PYTHON_SITELIBDIR%%/gpodder/gtkui/draw.pyc
>+%%PYTHON_SITELIBDIR%%/gpodder/gtkui/interface/__init__.py
>+%%PYTHON_SITELIBDIR%%/gpodder/gtkui/interface/__init__.pyc
>+%%PYTHON_SITELIBDIR%%/gpodder/gtkui/interface/addpodcast.py
>+%%PYTHON_SITELIBDIR%%/gpodder/gtkui/interface/addpodcast.pyc
>+%%PYTHON_SITELIBDIR%%/gpodder/gtkui/interface/common.py
>+%%PYTHON_SITELIBDIR%%/gpodder/gtkui/interface/common.pyc
>+%%PYTHON_SITELIBDIR%%/gpodder/gtkui/interface/configeditor.py
>+%%PYTHON_SITELIBDIR%%/gpodder/gtkui/interface/configeditor.pyc
>+%%PYTHON_SITELIBDIR%%/gpodder/gtkui/interface/progress.py
>+%%PYTHON_SITELIBDIR%%/gpodder/gtkui/interface/progress.pyc
>+%%PYTHON_SITELIBDIR%%/gpodder/gtkui/interface/shownotes.py
>+%%PYTHON_SITELIBDIR%%/gpodder/gtkui/interface/shownotes.pyc
>+%%PYTHON_SITELIBDIR%%/gpodder/gtkui/interface/welcome.py
>+%%PYTHON_SITELIBDIR%%/gpodder/gtkui/interface/welcome.pyc
>+%%PYTHON_SITELIBDIR%%/gpodder/gtkui/model.py
>+%%PYTHON_SITELIBDIR%%/gpodder/gtkui/model.pyc
>+%%PYTHON_SITELIBDIR%%/gpodder/gtkui/opml.py
>+%%PYTHON_SITELIBDIR%%/gpodder/gtkui/opml.pyc
>+%%PYTHON_SITELIBDIR%%/gpodder/gtkui/services.py
>+%%PYTHON_SITELIBDIR%%/gpodder/gtkui/services.pyc
>+%%PYTHON_SITELIBDIR%%/gpodder/gtkui/widgets.py
>+%%PYTHON_SITELIBDIR%%/gpodder/gtkui/widgets.pyc
> %%PYTHON_SITELIBDIR%%/gpodder/gui.py
> %%PYTHON_SITELIBDIR%%/gpodder/gui.pyc
>+%%PYTHON_SITELIBDIR%%/gpodder/launcher.py
>+%%PYTHON_SITELIBDIR%%/gpodder/launcher.pyc
> %%PYTHON_SITELIBDIR%%/gpodder/libconverter.py
> %%PYTHON_SITELIBDIR%%/gpodder/libconverter.pyc
>-%%PYTHON_SITELIBDIR%%/gpodder/libgpodder.py
>-%%PYTHON_SITELIBDIR%%/gpodder/libgpodder.pyc
> %%PYTHON_SITELIBDIR%%/gpodder/liblogger.py
> %%PYTHON_SITELIBDIR%%/gpodder/liblogger.pyc
>-%%PYTHON_SITELIBDIR%%/gpodder/libplayers.py
>-%%PYTHON_SITELIBDIR%%/gpodder/libplayers.pyc
>-%%PYTHON_SITELIBDIR%%/gpodder/libpodcasts.py
>-%%PYTHON_SITELIBDIR%%/gpodder/libpodcasts.pyc
>-%%PYTHON_SITELIBDIR%%/gpodder/libtagupdate.py
>-%%PYTHON_SITELIBDIR%%/gpodder/libtagupdate.pyc
>+%%PYTHON_SITELIBDIR%%/gpodder/model.py
>+%%PYTHON_SITELIBDIR%%/gpodder/model.pyc
> %%PYTHON_SITELIBDIR%%/gpodder/my.py
> %%PYTHON_SITELIBDIR%%/gpodder/my.pyc
>-%%PYTHON_SITELIBDIR%%/gpodder/nokiavideocenter.py
>-%%PYTHON_SITELIBDIR%%/gpodder/nokiavideocenter.pyc
> %%PYTHON_SITELIBDIR%%/gpodder/opml.py
> %%PYTHON_SITELIBDIR%%/gpodder/opml.pyc
>-%%PYTHON_SITELIBDIR%%/gpodder/resolver.py
>-%%PYTHON_SITELIBDIR%%/gpodder/resolver.pyc
> %%PYTHON_SITELIBDIR%%/gpodder/services.py
> %%PYTHON_SITELIBDIR%%/gpodder/services.pyc
>+%%PYTHON_SITELIBDIR%%/gpodder/soundcloud.py
>+%%PYTHON_SITELIBDIR%%/gpodder/soundcloud.pyc
> %%PYTHON_SITELIBDIR%%/gpodder/sync.py
> %%PYTHON_SITELIBDIR%%/gpodder/sync.pyc
>-%%PYTHON_SITELIBDIR%%/gpodder/trayicon.py
>-%%PYTHON_SITELIBDIR%%/gpodder/trayicon.pyc
> %%PYTHON_SITELIBDIR%%/gpodder/unittests.py
> %%PYTHON_SITELIBDIR%%/gpodder/unittests.pyc
> %%PYTHON_SITELIBDIR%%/gpodder/util.py
> %%PYTHON_SITELIBDIR%%/gpodder/util.pyc
>+%%PYTHON_SITELIBDIR%%/gpodder/youtube.py
>+%%PYTHON_SITELIBDIR%%/gpodder/youtube.pyc
> share/applications/gpodder.desktop
>-share/gpodder/gpodder.glade
>+%%PORTDOCS%%%%DOCSDIR%%/PKG-INFO
>+%%PORTDOCS%%%%DOCSDIR%%/README
>+%%DATADIR%%/credits.txt
>+%%DATADIR%%/ui/desktop/gpodder.ui
>+%%DATADIR%%/ui/desktop/gpodderaddpodcast.ui
>+%%DATADIR%%/ui/desktop/gpodderchannel.ui
>+%%DATADIR%%/ui/desktop/gpodderconfigeditor.ui
>+%%DATADIR%%/ui/desktop/gpodderdependencymanager.ui
>+%%DATADIR%%/ui/desktop/gpodderdeviceplaylist.ui
>+%%DATADIR%%/ui/desktop/gpodderepisodeselector.ui
>+%%DATADIR%%/ui/desktop/gpodderpodcastdirectory.ui
>+%%DATADIR%%/ui/desktop/gpodderpreferences.ui
>+%%DATADIR%%/ui/desktop/gpoddershownotes.ui
>+%%DATADIR%%/ui/desktop/gpoddersyncprogress.ui
>+%%DATADIR%%/ui/gpodderwelcome.ui
> share/icons/hicolor/16x16/apps/gpodder.png
> share/icons/hicolor/22x22/apps/gpodder.png
> share/icons/hicolor/24x24/apps/gpodder.png
> share/icons/hicolor/48x48/apps/gpodder.png
> share/icons/hicolor/scalable/apps/gpodder.svg
>-%%NLS%%share/locale/cs/LC_MESSAGES/gpodder.mo
>-%%NLS%%share/locale/da/LC_MESSAGES/gpodder.mo
>-%%NLS%%share/locale/de/LC_MESSAGES/gpodder.mo
>-%%NLS%%share/locale/es/LC_MESSAGES/gpodder.mo
>-%%NLS%%share/locale/fi/LC_MESSAGES/gpodder.mo
>-%%NLS%%share/locale/fr/LC_MESSAGES/gpodder.mo
>-%%NLS%%share/locale/gl/LC_MESSAGES/gpodder.mo
>-%%NLS%%share/locale/it/LC_MESSAGES/gpodder.mo
>-%%NLS%%share/locale/nl/LC_MESSAGES/gpodder.mo
>-%%NLS%%share/locale/pt/LC_MESSAGES/gpodder.mo
>-%%NLS%%share/locale/ru/LC_MESSAGES/gpodder.mo
>-%%NLS%%share/locale/sv/LC_MESSAGES/gpodder.mo
>-%%NLS%%share/locale/uk/LC_MESSAGES/gpodder.mo
>+share/locale/cs/LC_MESSAGES/gpodder.mo
>+share/locale/da/LC_MESSAGES/gpodder.mo
>+share/locale/de/LC_MESSAGES/gpodder.mo
>+share/locale/es/LC_MESSAGES/gpodder.mo
>+share/locale/fi/LC_MESSAGES/gpodder.mo
>+share/locale/fr/LC_MESSAGES/gpodder.mo
>+share/locale/gl/LC_MESSAGES/gpodder.mo
>+share/locale/it/LC_MESSAGES/gpodder.mo
>+share/locale/nb/LC_MESSAGES/gpodder.mo
>+share/locale/nl/LC_MESSAGES/gpodder.mo
>+share/locale/pl/LC_MESSAGES/gpodder.mo
>+share/locale/pt/LC_MESSAGES/gpodder.mo
>+share/locale/pt_BR/LC_MESSAGES/gpodder.mo
>+share/locale/ru/LC_MESSAGES/gpodder.mo
>+share/locale/sv/LC_MESSAGES/gpodder.mo
>+share/locale/uk/LC_MESSAGES/gpodder.mo
> share/pixmaps/gpodder.png
> @dirrmtry share/icons/hicolor/scalable/apps
> @dirrmtry share/icons/hicolor/scalable
>@@ -84,6 +149,12 @@
> @dirrmtry share/icons/hicolor/16x16
> @dirrmtry share/icons/hicolor
> @dirrmtry share/icons
>-@dirrm share/gpodder
>+@dirrm %%DATADIR%%/ui/desktop
>+@dirrm %%DATADIR%%/ui
>+@dirrm %%DATADIR%%
>+%%PORTDOCS%%@dirrm %%DOCSDIR%%
> @dirrmtry share/applications
>+@dirrm %%PYTHON_SITELIBDIR%%/gpodder/gtkui/interface
>+@dirrm %%PYTHON_SITELIBDIR%%/gpodder/gtkui/desktop
>+@dirrm %%PYTHON_SITELIBDIR%%/gpodder/gtkui
> @dirrm %%PYTHON_SITELIBDIR%%/gpodder

Actions: View | Diff

Attachments on bug 141816: 102119