diff options
| author | Giuseppe Pilichi <jacula@FreeBSD.org> | 2010-05-31 21:38:16 +0000 |
|---|---|---|
| committer | Giuseppe Pilichi <jacula@FreeBSD.org> | 2010-05-31 21:38:16 +0000 |
| commit | 9fa5d4e59f0a1ef12f3c6956ba954548f38e4c6f (patch) | |
| tree | 0b024f9298a50f471591e08cc3c344175d6ce29d /multimedia/freevo | |
| parent | d4d1113d1d23ae6cc07c7aea8c40132ea9e11b3f (diff) | |
Notes
Diffstat (limited to 'multimedia/freevo')
| -rw-r--r-- | multimedia/freevo/Makefile | 5 | ||||
| -rw-r--r-- | multimedia/freevo/files/patch-src-helpers-recordserver.py | 15 | ||||
| -rw-r--r-- | multimedia/freevo/files/patch-src-www-htdocs-favorites.rpy | 14 | ||||
| -rw-r--r-- | multimedia/freevo/pkg-plist | 4 |
4 files changed, 34 insertions, 4 deletions
diff --git a/multimedia/freevo/Makefile b/multimedia/freevo/Makefile index 3607fe67b17e..447b41332b58 100644 --- a/multimedia/freevo/Makefile +++ b/multimedia/freevo/Makefile @@ -62,11 +62,12 @@ PLIST_SUB+= NLS="" post-patch: .if defined(WITHOUT_NLS) - @${REINPLACE_CMD} -e '451d' ${WRKSRC}/${PORTNAME} + @${REINPLACE_CMD} -e 's| freevo_locale| # freevo_locale|' ${WRKSRC}/${PORTNAME} + @${MV} ${WRKSRC}/i18n ${WRKSRC}/i18n-nls-disabled .endif - @${REINPLACE_CMD} -e 's|/etc/freevo|${PREFIX}/etc/freevo|' ${WRKSRC}/freevo_config.py @${REINPLACE_CMD} -e 's|/etc/freevo|${PREFIX}/etc/freevo|' ${WRKSRC}/local_conf.py.example + @${MV} ${WRKSRC}/src/www/htdocs/favorites.rpy.orig ${WRKDIR} post-install: @${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL diff --git a/multimedia/freevo/files/patch-src-helpers-recordserver.py b/multimedia/freevo/files/patch-src-helpers-recordserver.py new file mode 100644 index 000000000000..5bd1036313da --- /dev/null +++ b/multimedia/freevo/files/patch-src-helpers-recordserver.py @@ -0,0 +1,15 @@ +--- src/helpers/recordserver.py.orig 2009-05-23 08:51:25.000000000 -0400 ++++ src/helpers/recordserver.py 2010-04-09 07:53:38.000000000 -0400 +@@ -503,10 +503,11 @@ + thisprog = progs[proglist[i]] + nextprog = progs[proglist[i+1]] + if thisprog.stop > nextprog.start: +- conflictRating = conflictRating+1 + if thisprog == prog: ++ conflictRating = conflictRating+1 + conflicts.append(nextprog) + elif nextprog == prog: ++ conflictRating = conflictRating+1 + conflicts.append(thisprog) + self.removeRecordingFromSchedule(prog, myScheduledRecordings) + return (conflictRating, conflicts) diff --git a/multimedia/freevo/files/patch-src-www-htdocs-favorites.rpy b/multimedia/freevo/files/patch-src-www-htdocs-favorites.rpy new file mode 100644 index 000000000000..14ede9a60232 --- /dev/null +++ b/multimedia/freevo/files/patch-src-www-htdocs-favorites.rpy @@ -0,0 +1,14 @@ +--- src/www/htdocs/favorites.rpy.orig 2009-02-19 12:59:44.000000000 -0500 ++++ src/www/htdocs/favorites.rpy 2010-02-19 11:03:40.000000000 -0500 +@@ -115,9 +115,9 @@ + fv.tableRowClose() + + def sortByPriority(a,b): +- if (a.priority < b.priority): ++ if (int(a.priority) < int(b.priority)): + return -1 +- elif (a.priority > b.priority): ++ elif (int(a.priority) > int(b.priority)): + return 1 + else: + return 0 diff --git a/multimedia/freevo/pkg-plist b/multimedia/freevo/pkg-plist index 5b2a91a8fdef..ad0b5779c57d 100644 --- a/multimedia/freevo/pkg-plist +++ b/multimedia/freevo/pkg-plist @@ -2342,8 +2342,8 @@ etc/freevo/local_conf.py.example %%NLS%%share/locale/sv/LC_MESSAGES/freevo.po %%NLS%%share/locale/zh_CN/LC_MESSAGES/freevo.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/freevo.po -@dirrm %%NLS%%share/locale/nn_NO/LC_MESSAGES -@dirrm %%NLS%%share/locale/nn_NO +%%NLS%%@dirrm share/locale/nn_NO/LC_MESSAGES +%%NLS%%@dirrm share/locale/nn_NO @dirrmtry etc/freevo @dirrm %%PYTHON_SITELIBDIR%%/freevo/animation @dirrm %%PYTHON_SITELIBDIR%%/freevo/audio/plugins |