FreeBSD Bugzilla – Attachment 116537 Details for
Bug 158490
Update port: multimedia/photofilmstrip to 1.4.3
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
file.diff
file.diff (text/plain), 7.98 KB, created by
tkato432
on 2011-06-29 19:30:21 UTC
(
hide
)
Description:
file.diff
Filename:
MIME Type:
Creator:
tkato432
Created:
2011-06-29 19:30:21 UTC
Size:
7.98 KB
patch
obsolete
>diff -urN /usr/ports/multimedia/photofilmstrip/Makefile multimedia/photofilmstrip/Makefile >--- /usr/ports/multimedia/photofilmstrip/Makefile 2011-04-27 16:33:29.000000000 +0900 >+++ multimedia/photofilmstrip/Makefile 2011-06-29 23:11:34.000000000 +0900 >@@ -7,40 +7,76 @@ > # > > PORTNAME= photofilmstrip >-PORTVERSION= 1.4.1 >+PORTVERSION= 1.4.3 > CATEGORIES= multimedia python >-MASTER_SITES= SF/photostoryx/${PORTNAME}/${PORTVERSION}/ >+MASTER_SITES= SF/photostoryx/${PORTNAME}/${PORTVERSION} > PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} > > MAINTAINER= ports@FreeBSD.org >-COMMENT= PhotoFilmStrip creates movies out of your pictures >+COMMENT= Creates movies out of your pictures > >-RUN_DEPENDS= mplayer:${PORTSDIR}/multimedia/mplayer \ >- ${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 >+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 \ >+ mencoder:${PORTSDIR}/multimedia/mencoder \ >+ mplayer:${PORTSDIR}/multimedia/mplayer >+ >+LICENSE= GPLv2 >+LICENSE_FILE= ${WRKSRC}/COPYING > > USE_PYTHON= yes > USE_WX= 2.8+ > WX_COMPS= python:lib > WX_UNICODE= yes > USE_GETTEXT= yes >+ALL_TARGET= compile > >-LICENSE= GPLv2 >-LICENSE_FILE= ${WRKSRC}/COPYING >+PFSDIR= ${PYTHONPREFIX_SITELIBDIR}/${PORTNAME} > > pre-everything:: > @${ECHO_MSG} "To run ${PORTNAME}, you must have sqlite3 installed with extensions enabled." > >-ALL_TARGET= compile >- > post-patch: >- @${REINPLACE_CMD} -e 's|/usr|${PREFIX}|' ${WRKSRC}/Makefile.rules >- @${REINPLACE_CMD} -e 's|^appdir.*|appdir = ${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}|' ${WRKSRC}/Makefile.rules >- @${REINPLACE_CMD} -e 's|prefix=.*||' \ >- -e 's|export.*|export PFSDIR=${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}|' \ >- -e 's|/usr/bin/python|${PYTHON_CMD}|' ${WRKSRC}/build/${PORTNAME} >- @${REINPLACE_CMD} -e 's|prefix=.*||' \ >- -e 's|export.*|export PFSDIR=${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}|' \ >- -e 's|/usr/bin/python|${PYTHON_CMD}|' ${WRKSRC}/build/${PORTNAME}-cli >- @${REINPLACE_CMD} -e 's|/usr|${PREFIX}|' ${WRKSRC}/build/${PORTNAME}.desktop >+ @${REINPLACE_CMD} -e \ >+ 's|make -C|$$(MAKE) -C|g' ${WRKSRC}/Makefile >+ @${REINPLACE_CMD} -e \ >+ '/^prefix/s|=.*|= ${PREFIX}|g ; \ >+ /^appdir/s|=.*|= ${PFSDIR}|g' ${WRKSRC}/Makefile.rules >+ @${REINPLACE_CMD} -e \ >+ '/^prefix/d ; \ >+ /^export/s|=.*|=${PFSDIR}|g ; \ >+ s|/usr/bin/python|${PYTHON_CMD}|g' ${WRKSRC}/build/${PORTNAME} >+ @${REINPLACE_CMD} -e \ >+ '/^prefix/d ; \ >+ /^export/s|=.*|=${PFSDIR}|g ; \ >+ s|/usr/bin/python|${PYTHON_CMD}|g' ${WRKSRC}/build/${PORTNAME}-cli >+ @${REINPLACE_CMD} -e \ >+ '/^Version/s|=.*|=${PORTVERION}|g ; \ >+ s|/usr/share/pixmaps/||g ; \ >+ /^Categories/s|=.*|=Application;AudioVideo;AudioVideoEditing|g ; \ >+ /^OnlyShowIn/d' ${WRKSRC}/build/${PORTNAME}.desktop >+ >+do-install: >+ ${INSTALL_SCRIPT} ${WRKSRC}/build/${PORTNAME} ${PREFIX}/bin >+ ${INSTALL_SCRIPT} ${WRKSRC}/build/${PORTNAME}-cli ${PREFIX}/bin >+ @${MKDIR} ${PFSDIR} >+ ${INSTALL_DATA} ${WRKSRC}/src/${PORTNAME}-cli.py ${PFSDIR} >+ ${INSTALL_DATA} ${WRKSRC}/src/${PORTNAME}-gui.py ${PFSDIR} >+.for dir in cli core gui lib res >+ @(cd ${WRKSRC}/src && \ >+ ${FIND} ${dir} ! \( -name '*.bak' -o -name '*.orig' \) | \ >+ ${CPIO} -pdm -R ${SHAREOWN}:${SHAREGRP} ${PFSDIR}) >+.endfor >+ @${MKDIR} ${PFSDIR}/doc >+ ${INSTALL_DATA} ${WRKSRC}/doc/photofilmstrip/* ${PFSDIR}/doc >+ @${FIND} ${PFSDIR} -type d | ${XARGS} ${CHMOD} a+rx >+ @${FIND} ${PFSDIR} -type f | ${XARGS} ${CHMOD} ${SHAREMODE} >+ @${MKDIR} ${PREFIX}/share/applications >+ ${INSTALL_DATA} ${WRKSRC}/build/${PORTNAME}.desktop ${PREFIX}/share/applications >+.for lang in cs de en fr it ko pt >+ @${MKDIR} ${PREFIX}/share/locale/${lang}/LC_MESSAGES >+ ${INSTALL_DATA} ${WRKSRC}/po/${lang}.mo \ >+ ${PREFIX}/share/locale/${lang}/LC_MESSAGES/PhotoFilmStrip.mo >+.endfor >+ @${MKDIR} ${PREFIX}/share/pixmaps >+ ${INSTALL_DATA} ${WRKSRC}/build/${PORTNAME}.xpm ${PREFIX}/share/pixmaps > > .include <bsd.port.mk> >diff -urN /usr/ports/multimedia/photofilmstrip/distinfo multimedia/photofilmstrip/distinfo >--- /usr/ports/multimedia/photofilmstrip/distinfo 2011-04-21 19:34:11.000000000 +0900 >+++ multimedia/photofilmstrip/distinfo 2011-06-26 21:37:34.000000000 +0900 >@@ -1,2 +1,2 @@ >-SHA256 (photofilmstrip-1.4.1.tar.gz) = ec34fd5437fe73b08f477ecb8cdf609b18aa334b82a5f7ebbcdfc0c0906417ae >-SIZE (photofilmstrip-1.4.1.tar.gz) = 21854312 >+SHA256 (photofilmstrip-1.4.3.tar.gz) = 63cbd346cc17215ae8b23ab602d1167317d503b4d43df9e013cc469397614116 >+SIZE (photofilmstrip-1.4.3.tar.gz) = 21905862 >diff -urN /usr/ports/multimedia/photofilmstrip/files/patch-Makefile multimedia/photofilmstrip/files/patch-Makefile >--- /usr/ports/multimedia/photofilmstrip/files/patch-Makefile 2011-02-11 09:55:39.000000000 +0900 >+++ multimedia/photofilmstrip/files/patch-Makefile 1970-01-01 09:00:00.000000000 +0900 >@@ -1,73 +0,0 @@ >---- ./Makefile.orig 2010-12-20 01:52:21.000000000 -0800 >-+++ ./Makefile 2011-02-05 12:17:23.000000000 -0800 >-@@ -7,7 +7,7 @@ >- compile: >- python -c "import compileall, re;compileall.compile_dir('.', rx=re.compile('/[.]svn'), force=True, quiet=True)" >- python -OO -c "import compileall, re;compileall.compile_dir('.', rx=re.compile('/[.]svn'), force=True, quiet=True)" >-- >-+ >- target=`echo $@`; \ >- make -C po $$target >- >-@@ -15,7 +15,7 @@ >- if [ -e ./dist ] ; then rm -r ./dist ; fi >- find . -name "*.pyc" -exec rm {} ';' >- find . -name "*.pyo" -exec rm {} ';' >-- >-+ >- target=`echo $@`; \ >- make -C po $$target >- >-@@ -23,23 +23,35 @@ >- >- install: >- $(mkdir) "$(DESTDIR)$(appdir)" >-- cp -r "$(srcdir)/src/cli/" "$(DESTDIR)$(appdir)" >-- cp -r "$(srcdir)/src/core/" "$(DESTDIR)$(appdir)" >-- cp -r "$(srcdir)/src/gui/" "$(DESTDIR)$(appdir)" >-- cp -r "$(srcdir)/src/lib/" "$(DESTDIR)$(appdir)" >-- cp -r "$(srcdir)/src/res/" "$(DESTDIR)$(appdir)" >-+ chmod 0755 $(DESTDIR)$(appdir) >-+ cp -r "$(srcdir)/src/cli" "$(DESTDIR)$(appdir)/" >-+ cp -r "$(srcdir)/src/core" "$(DESTDIR)$(appdir)/" >-+ $(mkdir) "$(DESTDIR)$(appdir)/doc" >-+ cp -r "$(srcdir)/doc/$(appname)/" "$(DESTDIR)$(appdir)/doc/" >-+ cp -r "$(srcdir)/src/gui" "$(DESTDIR)$(appdir)/" >-+ rm -f $(DESTDIR)$(appdir)/gui/*.orig >-+ cp -r "$(srcdir)/src/lib" "$(DESTDIR)$(appdir)/" >-+ cp -r "$(srcdir)/src/res" "$(DESTDIR)$(appdir)/" >- cp "$(srcdir)/src/$(appname)-cli.py" "$(DESTDIR)$(appdir)/" >- cp "$(srcdir)/src/$(appname)-gui.py" "$(DESTDIR)$(appdir)/" >-- >-+ chmod -R 0644 $(DESTDIR)$(appdir)/* >-+ find $(DESTDIR)$(appdir) -type d -exec chmod 0755 {} \; >-+ >- $(mkdir) "$(DESTDIR)$(desktopdir)" >-+ chmod 0755 $(DESTDIR)$(desktopdir) >- cp "$(srcdir)/build/$(appname).desktop" "$(DESTDIR)$(desktopdir)/" >-+ chmod 0644 $(DESTDIR)$(desktopdir)/$(appname).desktop >- $(mkdir) "$(DESTDIR)$(pixmapdir)" >-+ chmod 0755 $(DESTDIR)$(pixmapdir) >- cp "$(srcdir)/build/$(appname).xpm" "$(DESTDIR)$(pixmapdir)/" >-- >-+ chmod 0644 $(DESTDIR)$(pixmapdir)/$(appname).xpm >-+ >- $(mkdir) "$(DESTDIR)$(bindir)" >- cp "$(srcdir)/build/$(appname)" "$(DESTDIR)$(bindir)/" >-+ chmod 0755 $(DESTDIR)$(bindir)/$(appname) >- cp "$(srcdir)/build/$(appname)-cli" "$(DESTDIR)$(bindir)/" >-- >-+ chmod 0755 $(DESTDIR)$(bindir)/$(appname)-cli >-+ >- target=`echo $@`; \ >- make -C po $$target >- >-@@ -49,7 +61,7 @@ >- rm -f "$(DESTDIR)$(pixmapdir)/$(appname).xpm" >- rm -f "$(DESTDIR)$(bindir)/$(appname)" >- rm -f "$(DESTDIR)$(bindir)/$(appname)-cli" >-- >-+ >- target=`echo $@`; \ >- make -C po $$target >- >diff -urN /usr/ports/multimedia/photofilmstrip/files/patch-build__photofilmstrip.desktop multimedia/photofilmstrip/files/patch-build__photofilmstrip.desktop >--- /usr/ports/multimedia/photofilmstrip/files/patch-build__photofilmstrip.desktop 2011-02-11 09:55:39.000000000 +0900 >+++ multimedia/photofilmstrip/files/patch-build__photofilmstrip.desktop 1970-01-01 09:00:00.000000000 +0900 >@@ -1,16 +0,0 @@ >---- ./build/photofilmstrip.desktop.orig 2011-02-05 12:17:33.000000000 -0800 >-+++ ./build/photofilmstrip.desktop 2011-02-05 12:18:17.000000000 -0800 >-@@ -1,5 +1,5 @@ >- [Desktop Entry] >--Version=1.3.4 >-+Version=1.4.0 >- Encoding=UTF-8 >- Name=PhotoFilmStrip >- GenericName=Slideshow Creator >-@@ -9,5 +9,4 @@ >- Terminal=false >- Type=Application >- StartupNotify=false >--Categories=AudioVideo; >--OnlyShowIn=GNOME;XFCE; >-+Categories=Application;AudioVideo;AudioVideoEditing
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 158490
: 116537