Attachment 108425 Details for Bug 149254 – file.diff

[patch] file.diff

file.diff (text/plain), 3.88 KB, created by Denis Barov on 2010-08-04 02:40:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Denis Barov

Created: 2010-08-04 02:40:08 UTC

Size: 3.88 KB

patch

obsolete

>diff -urN lensfun.orig/Makefile lensfun/Makefile
>--- lensfun.orig/Makefile	2010-08-04 04:18:23.000000000 +0400
>+++ lensfun/Makefile	2010-08-04 05:26:00.000000000 +0400
>@@ -6,38 +6,40 @@
> #
> 
> PORTNAME=	lensfun
>-PORTVERSION=	0.2.3
>+PORTVERSION=	0.2.5
> CATEGORIES=	graphics
> MASTER_SITES=	BERLIOS
> 
> MAINTAINER=	dindin@dindin.ru
> COMMENT=	Library for fixing lens geometry distortion
> 
>-LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
>+LIB_DEPENDS=	png:${PORTSDIR}/graphics/png
> 
> USE_GMAKE=	yes
> USE_PYTHON=	yes
> USE_BZIP2=	yes
> USE_GNOME=	glib20
> MAKEFILE=	GNUmakefile
>+LIBVERSION= 2
> 
> LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
> CXXFLAGS+=	-I${LOCALBASE}/include
> 
> HAS_CONFIGURE=	yes
> CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}"
>-CONFIGURE_ARGS= --prefix=${PREFIX} --target=${TARGET}
>+CONFIGURE_ARGS= --prefix=${PREFIX} --target=${TARGET} --vectorization=SSE
> 
> post-patch:
> 	@${REINPLACE_CMD} -e '1s|#!/usr/bin/python|#!/usr/bin/env python|' \
> 		-e 's|make --version|gmake --version|' \
> 		-e '/add_config_mak.*DOXYGEN/ d' \
> 		${WRKSRC}/configure
>-	@${REINPLACE_CMD} \
>-		-e 's|cp -d|/bin/cp |' ${WRKSRC}/build/mak/host/posix.mak
>-	@${REINPLACE_CMD} -e 's|lib64|lib|' ${WRKSRC}/ac.py
>-	@${REINPLACE_CMD} \
>-		-e 's|$$(CONF_LIBDIR)pkgconfig/|$$(CONF_PREFIX)libdata/pkgconfig/|g'\
>-		${WRKSRC}/build/mak/compiler/pkgconfig.mak
>+	@${REINPLACE_CMD} -e 's|{_libdir}/pkgconfig|{_libdir}/../libdata/pkgconfig|' \
>+		${WRKSRC}/build/lensfun.spec.in
>+	@${REINPLACE_CMD} -e 's|CONF_LIBDIR)pkgconfig|CONF_LIBDIR)../libdata/pkgconfig|g' \
>+		${WRKSRC}/build/tibs/compiler/pkgconfig.mak
>+
>+#post-install:
>+#	@${LN} -sf ${PREFIX}/lib/lib${PORTNAME}.so ${PREFIX}/lib/lib${PORTNAME}.so.${LIBVERSION}
> 
> .include <bsd.port.mk>
>diff -urN lensfun.orig/distinfo lensfun/distinfo
>--- lensfun.orig/distinfo	2010-08-04 04:18:23.000000000 +0400
>+++ lensfun/distinfo	2010-08-04 04:26:11.000000000 +0400
>@@ -1,3 +1,3 @@
>-MD5 (lensfun-0.2.3.tar.bz2) = c5c04be4f53e3eef450ff4948d8f65b3
>-SHA256 (lensfun-0.2.3.tar.bz2) = 836ab5869c0e81a54100c389e7274ead183d8dd5ee1992669bad92f57c43484f
>-SIZE (lensfun-0.2.3.tar.bz2) = 151189
>+MD5 (lensfun-0.2.5.tar.bz2) = a10438dffae68a5988fc54b0393a3755
>+SHA256 (lensfun-0.2.5.tar.bz2) = c21498eb1889714af25e4e08474d9faa1e45132c89a8c1ac97340233e988fb87
>+SIZE (lensfun-0.2.5.tar.bz2) = 470733
>diff -urN lensfun.orig/pkg-plist lensfun/pkg-plist
>--- lensfun.orig/pkg-plist	2010-08-04 04:18:23.000000000 +0400
>+++ lensfun/pkg-plist	2010-08-04 05:30:21.000000000 +0400
>@@ -1,12 +1,11 @@
> lib/liblensfun.so
>-lib/liblensfun.so.0
>-lib/liblensfun.so.0.2.3
>-include/lensfun.h
> libdata/pkgconfig/lensfun.pc
>+include/lensfun.h
> %%DATADIR%%/6x6.xml
> %%DATADIR%%/compact-canon.xml
> %%DATADIR%%/compact-casio.xml
> %%DATADIR%%/compact-fujifilm.xml
>+%%DATADIR%%/compact-kodak.xml
> %%DATADIR%%/compact-konica-minolta.xml
> %%DATADIR%%/compact-leica.xml
> %%DATADIR%%/compact-nikon.xml
>@@ -14,14 +13,17 @@
> %%DATADIR%%/compact-panasonic.xml
> %%DATADIR%%/compact-pentax.xml
> %%DATADIR%%/compact-ricoh.xml
>+%%DATADIR%%/compact-sigma.xml
> %%DATADIR%%/compact-sony.xml
> %%DATADIR%%/generic.xml
> %%DATADIR%%/rf-leica.xml
> %%DATADIR%%/slr-canon.xml
> %%DATADIR%%/slr-contax.xml
>+%%DATADIR%%/slr-hasselblad.xml
> %%DATADIR%%/slr-konica-minolta.xml
> %%DATADIR%%/slr-nikon.xml
> %%DATADIR%%/slr-olympus.xml
>+%%DATADIR%%/slr-panasonic.xml
> %%DATADIR%%/slr-pentax.xml
> %%DATADIR%%/slr-samsung.xml
> %%DATADIR%%/slr-schneider.xml
>@@ -30,9 +32,11 @@
> %%DATADIR%%/slr-tamron.xml
> %%DATADIR%%/slr-tokina.xml
> %%DATADIR%%/slr-ussr.xml
>-share/doc/lensfun-0.2.3/README
>-share/doc/lensfun-0.2.3/lgpl-3.0.txt
>-share/doc/lensfun-0.2.3/gpl-3.0.txt
>-share/doc/lensfun-0.2.3/cc-by-sa-3.0.txt
>-@dirrm share/doc/lensfun-0.2.3
>+share/doc/lensfun-0.2.5/README
>+share/doc/lensfun-0.2.5/lgpl-3.0.txt
>+share/doc/lensfun-0.2.5/gpl-3.0.txt
>+share/doc/lensfun-0.2.5/cc-by-sa-3.0.txt
>+@dirrm share/doc/lensfun-0.2.5
> @dirrm %%DATADIR%%
>+@dirrmtry lib/pkgconfig
>+@exec ln -fs lib/liblensfun.so lib/liblensfun.so.2

Actions: View | Diff

Attachments on bug 149254: 108425