Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 30 Jan 2015 19:48:59 +0000 (UTC)
From:      Muhammad Moinur Rahman <bofh@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r378183 - in head/multimedia/photofilmstrip: . files
Message-ID:  <201501301948.t0UJmxd1032565@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bofh
Date: Fri Jan 30 19:48:59 2015
New Revision: 378183
URL: https://svnweb.freebsd.org/changeset/ports/378183
QAT: https://qat.redports.org/buildarchive/r378183/

Log:
  multimedia/photofilmstrip: Update version 1.5.0=>2.1.0
  
  - Application behavior changed more like working as Python Module
  - Removed pkg-plist in lieu of autoplist
  - databases/py-sqlite3 is now a BUILD_DEPENDS as it fails to build without
    this
  - Removed PORTSCOUT as this version is passed the mentioned versions to
    skip
  
  Differential Revision:	https://reviews.freebsd.org/D1732
  Approved by:		marino(mentor)

Added:
  head/multimedia/photofilmstrip/files/patch-photofilmstrip_gui_HelpViewer.py   (contents, props changed)
Deleted:
  head/multimedia/photofilmstrip/files/patch-src__gui__HelpViewer.py
  head/multimedia/photofilmstrip/pkg-plist
Modified:
  head/multimedia/photofilmstrip/Makefile
  head/multimedia/photofilmstrip/distinfo

Modified: head/multimedia/photofilmstrip/Makefile
==============================================================================
--- head/multimedia/photofilmstrip/Makefile	Fri Jan 30 18:49:26 2015	(r378182)
+++ head/multimedia/photofilmstrip/Makefile	Fri Jan 30 19:48:59 2015	(r378183)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	photofilmstrip
-PORTVERSION=	1.5.0
-PORTREVISION=	7
+PORTVERSION=	2.1.0
 CATEGORIES=	multimedia python
 MASTER_SITES=	SF/photostoryx/${PORTNAME}/${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -14,67 +13,14 @@ COMMENT=	Creates movies out of your pict
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
-		mencoder:${PORTSDIR}/multimedia/mencoder \
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
+RUN_DEPENDS=	mencoder:${PORTSDIR}/multimedia/mencoder \
 		mplayer:${PORTSDIR}/multimedia/mplayer
 
-PORTSCOUT=	skipv:1.9.90,1.9.91	# Unstable Versions
-
-USES=		python
+USES=		python gettext
+USE_PYTHON=	distutils autoplist
 USE_WX=		3.0+
 WX_COMPS=	python:lib
 ALL_TARGET=	compile
 
-PFSDIR=		${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}
-
-OPTIONS_DEFINE=	DOCS NLS
-OPTIONS_SUB=	yes
-NLS_USES=	gettext
-
-pre-everything::
-	@${ECHO_MSG} "To run ${PORTNAME}, you must have sqlite3 installed with extensions enabled."
-
-post-patch:
-	@${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} ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/build/${PORTNAME}-cli ${STAGEDIR}${PREFIX}/bin
-	@${MKDIR} ${STAGEDIR}${PFSDIR}
-	${INSTALL_DATA} ${WRKSRC}/src/${PORTNAME}-cli.py ${STAGEDIR}${PFSDIR}
-	${INSTALL_DATA} ${WRKSRC}/src/${PORTNAME}-gui.py ${STAGEDIR}${PFSDIR}
-.for dir in cli core gui lib res
-	@(cd ${WRKSRC}/src && \
-		${FIND} ${dir} ! \( -name '*.bak' -o -name '*.orig' \) | \
-		${CPIO} -pdm -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${PFSDIR})
-.endfor
-	@${MKDIR} ${STAGEDIR}${PFSDIR}/doc
-	${INSTALL_DATA} ${WRKSRC}/doc/photofilmstrip/* ${STAGEDIR}${PFSDIR}/doc
-	@${FIND} ${STAGEDIR}${PFSDIR} -type d | ${XARGS} ${CHMOD} a+rx
-	@${FIND} ${STAGEDIR}${PFSDIR} -type f | ${XARGS} ${CHMOD} ${SHAREMODE}
-	${INSTALL_DATA} ${WRKSRC}/build/${PORTNAME}.desktop ${STAGEDIR}${PREFIX}/share/applications
-.for lang in cs de en fr it ko nl pt tr
-	@${MKDIR} ${STAGEDIR}${PREFIX}/share/locale/${lang}/LC_MESSAGES
-	${INSTALL_DATA} ${WRKSRC}/po/${lang}.mo \
-		${STAGEDIR}${PREFIX}/share/locale/${lang}/LC_MESSAGES/PhotoFilmStrip.mo
-.endfor
-	${INSTALL_DATA} ${WRKSRC}/build/${PORTNAME}.xpm ${STAGEDIR}${PREFIX}/share/pixmaps
-
 .include <bsd.port.mk>

Modified: head/multimedia/photofilmstrip/distinfo
==============================================================================
--- head/multimedia/photofilmstrip/distinfo	Fri Jan 30 18:49:26 2015	(r378182)
+++ head/multimedia/photofilmstrip/distinfo	Fri Jan 30 19:48:59 2015	(r378183)
@@ -1,2 +1,2 @@
-SHA256 (photofilmstrip-1.5.0.tar.gz) = b931bc3c049a3782e6da9b740d37d6650672e220d9e0b943c5cef38728b945c8
-SIZE (photofilmstrip-1.5.0.tar.gz) = 21924699
+SHA256 (photofilmstrip-2.1.0.tar.gz) = 6889ea2f909a6f5115ddcf14b9b69a7c3cee2bb0277e5093ece750b3018882d5
+SIZE (photofilmstrip-2.1.0.tar.gz) = 243163

Added: head/multimedia/photofilmstrip/files/patch-photofilmstrip_gui_HelpViewer.py
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/photofilmstrip/files/patch-photofilmstrip_gui_HelpViewer.py	Fri Jan 30 19:48:59 2015	(r378183)
@@ -0,0 +1,11 @@
+--- photofilmstrip/gui/HelpViewer.py.orig	2015-01-25 19:27:30.213707995 +0600
++++ photofilmstrip/gui/HelpViewer.py	2015-01-25 19:28:35.363702863 +0600
+@@ -36,7 +36,7 @@
+     def __init__(self):
+         self.__htmlCtrl = wx.html.HtmlHelpController()
+         docFile = os.path.join(os.path.dirname(os.path.abspath(sys.argv[0])), 
+-                               "..", "share", "doc", "photofilmstrip", "photofilmstrip.hhp")
++                               "..", "photofilmstrip", "doc", "photofilmstrip.hhp")
+         fn = os.path.abspath(docFile)
+         self.__htmlCtrl.AddBook(fn)
+         



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501301948.t0UJmxd1032565>