- Update to 2.0.42

Everything works except the burn cd function, it contains linuxisms.

4 files changed, 37 insertions, 28 deletions

diff --git a/graphics/lphoto/Makefile b/graphics/lphoto/Makefile
index ddbadbb5a1ab..50daa3a34ede 100644
--- a/graphics/lphoto/Makefile
+++ b/graphics/lphoto/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	lphoto
-PORTVERSION=	1.0.26
-PORTREVISION=	2
+PORTVERSION=	2.0.42
 CATEGORIES=	graphics
 MASTER_SITES=	http://software.linspire.com/emptypool/lindowsos/pool/main/l/lphoto/
 DISTNAME=	${PORTNAME}_${PORTVERSION}-0.0.0.45.lindows0.1
@@ -16,33 +15,35 @@ MAINTAINER=	ahze@FreeBSD.org
 COMMENT=	A complete desktop solution for digital photo management
 
 BUILD_DEPENDS=	kdepyuic:${PORTSDIR}/x11-toolkits/py-kde
-LIB_DEPENDS=	Magick.7:${PORTSDIR}/graphics/ImageMagick
+# libs for burning cd/vcd in lphoto, does not work in freebsd.
+#LIB_DEPENDS=	Magick.7:${PORTSDIR}/graphics/ImageMagic \
+#		vcdinfo.0:${PORTSDIR}/multimedia/vcdimager \
+#		avcodec.1:${PORTSDIR}/multimedia/ffmpeg
 RUN_DEPENDS=	gphoto2:${PORTSDIR}/graphics/gphoto2 \
-		kdepyuic:${PORTSDIR}/x11-toolkits/py-kde
+		kdepyuic:${PORTSDIR}/x11-toolkits/py-kde \
+		${PYTHON_SITELIBDIR}/OpenGL/GL/GL__init__.py:${PORTSDIR}/graphics/py-opengl
+#		cdrecord:${PORTSDIR}/sysutils/cdrtools
 
 USE_REINPLACE=	yes
 USE_PYTHON=	yes
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-# Hack to use OPTIONS since OPTIONS is listed below bsd.port.pre.mk
-OPTIONS=
-
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == "i386"
-OPTIONS+=	JPEGMMX "Use JPEG with MMX optimization" off
-.endif
-
-.if defined(WITH_JPEGMMX)
+.if ${ARCH}=="i386"
+.if ${MACHINE_CPU:Mmmx} && !defined(WITHOUT_JPEGMMX)
 RUN_DEPENDS+=	jpegtran-mmx:${PORTSDIR}/graphics/jpeg-mmx
-.endif
+
+pre_everything::
+	@${ECHO_MSG} "===> Define WITHOUT_JPEGMMX to disable jpeg-mmx support"
+	@${ECHO_MSG} "===>"
 
 post-patch:
-.if defined(WITH_JPEGMMX)
 	@${REINPLACE_CMD} -e 's|jpegtran|jpegtran-mmx|' \
 		${WRKSRC}/Lphoto/photolibrary.py
 .endif
+.endif
 
 do-install:
 	@cd ${WRKSRC} && ${PYTHON_CMD} install.py -d ${PREFIX}/${PYTHON_SITELIBDIR:S/${PYTHONBASE}//} -b ${PREFIX}/bin
diff --git a/graphics/lphoto/distinfo b/graphics/lphoto/distinfo
index 23de04adf94d..d0116ef3259a 100644
--- a/graphics/lphoto/distinfo
+++ b/graphics/lphoto/distinfo
@@ -1,2 +1,2 @@
-MD5 (lphoto_1.0.26-0.0.0.45.lindows0.1.tar.gz) = 0aab95d251cce351b094acdae7df68b2
-SIZE (lphoto_1.0.26-0.0.0.45.lindows0.1.tar.gz) = 148017
+MD5 (lphoto_2.0.42-0.0.0.45.lindows0.1.tar.gz) = 397635ed22be8c720b6f1856533b4219
+SIZE (lphoto_2.0.42-0.0.0.45.lindows0.1.tar.gz) = 205261
diff --git a/graphics/lphoto/files/patch-Lphoto_lphoto.py b/graphics/lphoto/files/patch-Lphoto_lphoto.py
deleted file mode 100644
index dd959f73a1ee..000000000000
--- a/graphics/lphoto/files/patch-Lphoto_lphoto.py
+++ /dev/null
@@ -1,12 +0,0 @@
---- Lphoto/lphoto.py.orig	Sun Nov  7 13:31:59 2004
-+++ Lphoto/lphoto.py	Sun Nov  7 13:32:12 2004
-@@ -635,7 +635,8 @@
- 	KCmdLineArgs.init(sys.argv,about)
- 	#KUniqueApplication.addCmdLineOptions()
- 	#app = KApplication(sys.argv, "Lphoto")
--	app = KUniqueApplication()
-+	#app = KUniqueApplication()
-+	app = KApplication()
- 	LWaitCursor.setApp(app)
- 	mw = LMainPhoto(app)
- 	mw.setIcon(QPixmap(paths.art("icon.png")))
diff --git a/graphics/lphoto/pkg-plist b/graphics/lphoto/pkg-plist
index fa0db470f652..1a072d6c27ad 100644
--- a/graphics/lphoto/pkg-plist
+++ b/graphics/lphoto/pkg-plist
@@ -1,4 +1,8 @@
 bin/lphoto
+%%PYTHON_SITELIBDIR%%/Lphoto/CDR.py
+%%PYTHON_SITELIBDIR%%/Lphoto/CDR.pyc
+%%PYTHON_SITELIBDIR%%/Lphoto/CDROM.py
+%%PYTHON_SITELIBDIR%%/Lphoto/CDROM.pyc
 %%PYTHON_SITELIBDIR%%/Lphoto/LICENSE.GPL
 %%PYTHON_SITELIBDIR%%/Lphoto/LPixmapPushButton.py
 %%PYTHON_SITELIBDIR%%/Lphoto/LPixmapPushButton.pyc
@@ -12,6 +16,8 @@ bin/lphoto
 %%PYTHON_SITELIBDIR%%/Lphoto/albumlist.pyc
 %%PYTHON_SITELIBDIR%%/Lphoto/backtick.py
 %%PYTHON_SITELIBDIR%%/Lphoto/backtick.pyc
+%%PYTHON_SITELIBDIR%%/Lphoto/cdrecord.py
+%%PYTHON_SITELIBDIR%%/Lphoto/cdrecord.pyc
 %%PYTHON_SITELIBDIR%%/Lphoto/config.py
 %%PYTHON_SITELIBDIR%%/Lphoto/config.pyc
 %%PYTHON_SITELIBDIR%%/Lphoto/dragobjects.py
@@ -22,6 +28,8 @@ bin/lphoto
 %%PYTHON_SITELIBDIR%%/Lphoto/email.pyc
 %%PYTHON_SITELIBDIR%%/Lphoto/export.py
 %%PYTHON_SITELIBDIR%%/Lphoto/export.pyc
+%%PYTHON_SITELIBDIR%%/Lphoto/glshow.py
+%%PYTHON_SITELIBDIR%%/Lphoto/glshow.pyc
 %%PYTHON_SITELIBDIR%%/Lphoto/html.py
 %%PYTHON_SITELIBDIR%%/Lphoto/html.pyc
 %%PYTHON_SITELIBDIR%%/Lphoto/images/buttonadd.png
@@ -38,6 +46,8 @@ bin/lphoto
 %%PYTHON_SITELIBDIR%%/Lphoto/images/icon.png
 %%PYTHON_SITELIBDIR%%/Lphoto/images/importcamera.png
 %%PYTHON_SITELIBDIR%%/Lphoto/images/labelstar.png
+%%PYTHON_SITELIBDIR%%/Lphoto/images/lphoto.png
+%%PYTHON_SITELIBDIR%%/Lphoto/images/lphoto_48.png
 %%PYTHON_SITELIBDIR%%/Lphoto/images/servicedesktop.png
 %%PYTHON_SITELIBDIR%%/Lphoto/images/serviceemail.png
 %%PYTHON_SITELIBDIR%%/Lphoto/images/servicehtml.png
@@ -78,16 +88,26 @@ bin/lphoto
 %%PYTHON_SITELIBDIR%%/Lphoto/preferences.pyc
 %%PYTHON_SITELIBDIR%%/Lphoto/printer.py
 %%PYTHON_SITELIBDIR%%/Lphoto/printer.pyc
+%%PYTHON_SITELIBDIR%%/Lphoto/shellprocess.py
+%%PYTHON_SITELIBDIR%%/Lphoto/shellprocess.pyc
 %%PYTHON_SITELIBDIR%%/Lphoto/slideshow.py
 %%PYTHON_SITELIBDIR%%/Lphoto/slideshow.pyc
+%%PYTHON_SITELIBDIR%%/Lphoto/templates/flash/resources/index.html
+%%PYTHON_SITELIBDIR%%/Lphoto/templates/flash/resources/lphotos.swf
+%%PYTHON_SITELIBDIR%%/Lphoto/templates/flash/template.py
+%%PYTHON_SITELIBDIR%%/Lphoto/templates/flash/template.pyc
 %%PYTHON_SITELIBDIR%%/Lphoto/templates/standard/resources/lphoto.gif
 %%PYTHON_SITELIBDIR%%/Lphoto/templates/standard/template.py
 %%PYTHON_SITELIBDIR%%/Lphoto/templates/standard/template.pyc
 %%PYTHON_SITELIBDIR%%/Lphoto/templates/standard/template.xsl
 %%PYTHON_SITELIBDIR%%/Lphoto/utils.py
 %%PYTHON_SITELIBDIR%%/Lphoto/utils.pyc
+%%PYTHON_SITELIBDIR%%/Lphoto/vcd.py
+%%PYTHON_SITELIBDIR%%/Lphoto/vcd.pyc
 @dirrm %%PYTHON_SITELIBDIR%%/Lphoto/templates/standard/resources
 @dirrm %%PYTHON_SITELIBDIR%%/Lphoto/templates/standard
+@dirrm %%PYTHON_SITELIBDIR%%/Lphoto/templates/flash/resources
+@dirrm %%PYTHON_SITELIBDIR%%/Lphoto/templates/flash
 @dirrm %%PYTHON_SITELIBDIR%%/Lphoto/templates
 @dirrm %%PYTHON_SITELIBDIR%%/Lphoto/images
 @dirrm %%PYTHON_SITELIBDIR%%/Lphoto