Attachment #116537 for bug #158490

View | Details | Raw Unified | Return to bug 158490
Collapse All | Expand All




#

PORTNAME=	photofilmstrip
PORTVERSION=	1.4.3
CATEGORIES=	multimedia python
MASTER_SITES=	SF/photostoryx/${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

MAINTAINER=	ports@FreeBSD.org
COMMENT=	Creates movies out of your pictures

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

PFSDIR=		${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}
LICENSE_FILE=	${WRKSRC}/COPYING

pre-everything::
	@${ECHO_MSG} "To run ${PORTNAME}, you must have sqlite3 installed with extensions enabled."

ALL_TARGET=	compile

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} ${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>

Lines 1-2 Link Here

(-)multimedia/photofilmstrip/distinfo (-2 / +2 lines)
1	SHA256 (photofilmstrip-1.4.1.tar.gz) = ec34fd5437fe73b08f477ecb8cdf609b18aa334b82a5f7ebbcdfc0c0906417ae	1	SHA256 (photofilmstrip-1.4.3.tar.gz) = 63cbd346cc17215ae8b23ab602d1167317d503b4d43df9e013cc469397614116
2	SIZE (photofilmstrip-1.4.1.tar.gz) = 21854312	2	SIZE (photofilmstrip-1.4.3.tar.gz) = 21905862




--- ./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
 




--- ./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

Return to bug 158490

Lines 7-46 Link Here

(-)multimedia/photofilmstrip/Makefile (-18 / +54 lines)
7	#	7	#
8		8
9	PORTNAME= photofilmstrip	9	PORTNAME= photofilmstrip
10	PORTVERSION= 1.4.1	10	PORTVERSION= 1.4.3
11	CATEGORIES= multimedia python	11	CATEGORIES= multimedia python
12	MASTER_SITES= SF/photostoryx/${PORTNAME}/${PORTVERSION}/	12	MASTER_SITES= SF/photostoryx/${PORTNAME}/${PORTVERSION}
13	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	13	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
14		14
15	MAINTAINER= ports@FreeBSD.org	15	MAINTAINER= ports@FreeBSD.org
16	COMMENT= PhotoFilmStrip creates movies out of your pictures	16	COMMENT= Creates movies out of your pictures
17		17
18	RUN_DEPENDS= mplayer:${PORTSDIR}/multimedia/mplayer \	18	RUN_DEPENDS= ${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 \
19	${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3	19	mencoder:${PORTSDIR}/multimedia/mencoder \
		20	mplayer:${PORTSDIR}/multimedia/mplayer
		21
		22	LICENSE= GPLv2
		23	LICENSE_FILE= ${WRKSRC}/COPYING
20		24
21	USE_PYTHON= yes	25	USE_PYTHON= yes
22	USE_WX= 2.8+	26	USE_WX= 2.8+
23	WX_COMPS= python:lib	27	WX_COMPS= python:lib
24	WX_UNICODE= yes	28	WX_UNICODE= yes
25	USE_GETTEXT= yes	29	USE_GETTEXT= yes
		30	ALL_TARGET= compile
26		31
27	LICENSE= GPLv2	32	PFSDIR= ${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}
28	LICENSE_FILE= ${WRKSRC}/COPYING
29		33
30	pre-everything::	34	pre-everything::
31	@${ECHO_MSG} "To run ${PORTNAME}, you must have sqlite3 installed with extensions enabled."	35	@${ECHO_MSG} "To run ${PORTNAME}, you must have sqlite3 installed with extensions enabled."
32		36
33	ALL_TARGET= compile
34
35	post-patch:	37	post-patch:
36	@${REINPLACE_CMD} -e 's\|/usr\|${PREFIX}\|' ${WRKSRC}/Makefile.rules	38	@${REINPLACE_CMD} -e \
37	@${REINPLACE_CMD} -e 's\|^appdir.*\|appdir = ${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}\|' ${WRKSRC}/Makefile.rules	39	's\|make -C\|$$(MAKE) -C\|g' ${WRKSRC}/Makefile
38	@${REINPLACE_CMD} -e 's\|prefix=.*\|\|' \	40	@${REINPLACE_CMD} -e \
39	-e 's\|export.*\|export PFSDIR=${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}\|' \	41	'/^prefix/s\|=.*\|= ${PREFIX}\|g ; \
40	-e 's\|/usr/bin/python\|${PYTHON_CMD}\|' ${WRKSRC}/build/${PORTNAME}	42	/^appdir/s\|=.*\|= ${PFSDIR}\|g' ${WRKSRC}/Makefile.rules
41	@${REINPLACE_CMD} -e 's\|prefix=.*\|\|' \	43	@${REINPLACE_CMD} -e \
42	-e 's\|export.*\|export PFSDIR=${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}\|' \	44	'/^prefix/d ; \
43	-e 's\|/usr/bin/python\|${PYTHON_CMD}\|' ${WRKSRC}/build/${PORTNAME}-cli	45	/^export/s\|=.*\|=${PFSDIR}\|g ; \
44	@${REINPLACE_CMD} -e 's\|/usr\|${PREFIX}\|' ${WRKSRC}/build/${PORTNAME}.desktop	46	s\|/usr/bin/python\|${PYTHON_CMD}\|g' ${WRKSRC}/build/${PORTNAME}
		47	@${REINPLACE_CMD} -e \
		48	'/^prefix/d ; \
		49	/^export/s\|=.*\|=${PFSDIR}\|g ; \
		50	s\|/usr/bin/python\|${PYTHON_CMD}\|g' ${WRKSRC}/build/${PORTNAME}-cli
		51	@${REINPLACE_CMD} -e \
		52	'/^Version/s\|=.*\|=${PORTVERION}\|g ; \
		53	s\|/usr/share/pixmaps/\|\|g ; \
		54	/^Categories/s\|=.*\|=Application;AudioVideo;AudioVideoEditing\|g ; \
		55	/^OnlyShowIn/d' ${WRKSRC}/build/${PORTNAME}.desktop
		56
		57	do-install:
		58	${INSTALL_SCRIPT} ${WRKSRC}/build/${PORTNAME} ${PREFIX}/bin
		59	${INSTALL_SCRIPT} ${WRKSRC}/build/${PORTNAME}-cli ${PREFIX}/bin
		60	@${MKDIR} ${PFSDIR}
		61	${INSTALL_DATA} ${WRKSRC}/src/${PORTNAME}-cli.py ${PFSDIR}
		62	${INSTALL_DATA} ${WRKSRC}/src/${PORTNAME}-gui.py ${PFSDIR}
		63	.for dir in cli core gui lib res
		64	@(cd ${WRKSRC}/src && \
		65	${FIND} ${dir} ! \( -name '.bak' -o -name '.orig' \) \| \
		66	${CPIO} -pdm -R ${SHAREOWN}:${SHAREGRP} ${PFSDIR})
		67	.endfor
		68	@${MKDIR} ${PFSDIR}/doc
		69	${INSTALL_DATA} ${WRKSRC}/doc/photofilmstrip/* ${PFSDIR}/doc
		70	@${FIND} ${PFSDIR} -type d \| ${XARGS} ${CHMOD} a+rx
		71	@${FIND} ${PFSDIR} -type f \| ${XARGS} ${CHMOD} ${SHAREMODE}
		72	@${MKDIR} ${PREFIX}/share/applications
		73	${INSTALL_DATA} ${WRKSRC}/build/${PORTNAME}.desktop ${PREFIX}/share/applications
		74	.for lang in cs de en fr it ko pt
		75	@${MKDIR} ${PREFIX}/share/locale/${lang}/LC_MESSAGES
		76	${INSTALL_DATA} ${WRKSRC}/po/${lang}.mo \
		77	${PREFIX}/share/locale/${lang}/LC_MESSAGES/PhotoFilmStrip.mo
		78	.endfor
		79	@${MKDIR} ${PREFIX}/share/pixmaps
		80	${INSTALL_DATA} ${WRKSRC}/build/${PORTNAME}.xpm ${PREFIX}/share/pixmaps
45		81
46	.include <bsd.port.mk>	82	.include <bsd.port.mk>

Lines 1-73 Link Here

(-)multimedia/photofilmstrip/files/patch-Makefile (-73 lines)
1	--- ./Makefile.orig 2010-12-20 01:52:21.000000000 -0800
2	+++ ./Makefile 2011-02-05 12:17:23.000000000 -0800
3	@@ -7,7 +7,7 @@
4	compile:
5	python -c "import compileall, re;compileall.compile_dir('.', rx=re.compile('/[.]svn'), force=True, quiet=True)"
6	python -OO -c "import compileall, re;compileall.compile_dir('.', rx=re.compile('/[.]svn'), force=True, quiet=True)"
7	-
8	+
9	target=`echo $@`; \
10	make -C po $$target
11
12	@@ -15,7 +15,7 @@
13	if [ -e ./dist ] ; then rm -r ./dist ; fi
14	find . -name "*.pyc" -exec rm {} ';'
15	find . -name "*.pyo" -exec rm {} ';'
16	-
17	+
18	target=`echo $@`; \
19	make -C po $$target
20
21	@@ -23,23 +23,35 @@
22
23	install:
24	$(mkdir) "$(DESTDIR)$(appdir)"
25	- cp -r "$(srcdir)/src/cli/" "$(DESTDIR)$(appdir)"
26	- cp -r "$(srcdir)/src/core/" "$(DESTDIR)$(appdir)"
27	- cp -r "$(srcdir)/src/gui/" "$(DESTDIR)$(appdir)"
28	- cp -r "$(srcdir)/src/lib/" "$(DESTDIR)$(appdir)"
29	- cp -r "$(srcdir)/src/res/" "$(DESTDIR)$(appdir)"
30	+ chmod 0755 $(DESTDIR)$(appdir)
31	+ cp -r "$(srcdir)/src/cli" "$(DESTDIR)$(appdir)/"
32	+ cp -r "$(srcdir)/src/core" "$(DESTDIR)$(appdir)/"
33	+ $(mkdir) "$(DESTDIR)$(appdir)/doc"
34	+ cp -r "$(srcdir)/doc/$(appname)/" "$(DESTDIR)$(appdir)/doc/"
35	+ cp -r "$(srcdir)/src/gui" "$(DESTDIR)$(appdir)/"
36	+ rm -f $(DESTDIR)$(appdir)/gui/*.orig
37	+ cp -r "$(srcdir)/src/lib" "$(DESTDIR)$(appdir)/"
38	+ cp -r "$(srcdir)/src/res" "$(DESTDIR)$(appdir)/"
39	cp "$(srcdir)/src/$(appname)-cli.py" "$(DESTDIR)$(appdir)/"
40	cp "$(srcdir)/src/$(appname)-gui.py" "$(DESTDIR)$(appdir)/"
41	-
42	+ chmod -R 0644 $(DESTDIR)$(appdir)/*
43	+ find $(DESTDIR)$(appdir) -type d -exec chmod 0755 {} \;
44	+
45	$(mkdir) "$(DESTDIR)$(desktopdir)"
46	+ chmod 0755 $(DESTDIR)$(desktopdir)
47	cp "$(srcdir)/build/$(appname).desktop" "$(DESTDIR)$(desktopdir)/"
48	+ chmod 0644 $(DESTDIR)$(desktopdir)/$(appname).desktop
49	$(mkdir) "$(DESTDIR)$(pixmapdir)"
50	+ chmod 0755 $(DESTDIR)$(pixmapdir)
51	cp "$(srcdir)/build/$(appname).xpm" "$(DESTDIR)$(pixmapdir)/"
52	-
53	+ chmod 0644 $(DESTDIR)$(pixmapdir)/$(appname).xpm
54	+
55	$(mkdir) "$(DESTDIR)$(bindir)"
56	cp "$(srcdir)/build/$(appname)" "$(DESTDIR)$(bindir)/"
57	+ chmod 0755 $(DESTDIR)$(bindir)/$(appname)
58	cp "$(srcdir)/build/$(appname)-cli" "$(DESTDIR)$(bindir)/"
59	-
60	+ chmod 0755 $(DESTDIR)$(bindir)/$(appname)-cli
61	+
62	target=`echo $@`; \
63	make -C po $$target
64
65	@@ -49,7 +61,7 @@
66	rm -f "$(DESTDIR)$(pixmapdir)/$(appname).xpm"
67	rm -f "$(DESTDIR)$(bindir)/$(appname)"
68	rm -f "$(DESTDIR)$(bindir)/$(appname)-cli"
69	-
70	+
71	target=`echo $@`; \
72	make -C po $$target
73

Lines 1-16 Link Here

(-)multimedia/photofilmstrip/files/patch-build__photofilmstrip.desktop (-16 lines)
1	--- ./build/photofilmstrip.desktop.orig 2011-02-05 12:17:33.000000000 -0800
2	+++ ./build/photofilmstrip.desktop 2011-02-05 12:18:17.000000000 -0800
3	@@ -1,5 +1,5 @@
4	[Desktop Entry]
5	-Version=1.3.4
6	+Version=1.4.0
7	Encoding=UTF-8
8	Name=PhotoFilmStrip
9	GenericName=Slideshow Creator
10	@@ -9,5 +9,4 @@
11	Terminal=false
12	Type=Application
13	StartupNotify=false
14	-Categories=AudioVideo;
15	-OnlyShowIn=GNOME;XFCE;
16	+Categories=Application;AudioVideo;AudioVideoEditing