View | Details | Raw Unified | Return to bug 196182 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-24 / +2 lines)
Lines 2-8 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	lensfun
4
PORTNAME=	lensfun
5
PORTVERSION=	0.2.8
5
PORTVERSION=	0.3.0
6
CATEGORIES=	graphics
6
CATEGORIES=	graphics
7
MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}
7
MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}
8
8
Lines 13-44 Link Here
13
13
14
LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png
14
LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png
15
15
16
USES=		gmake pkgconfig python:build tar:bzip2
16
USES=		cmake:outsource pkgconfig tar:bzip2
17
USE_GNOME=	glib20
17
USE_GNOME=	glib20
18
USE_LDCONFIG=	yes
18
USE_LDCONFIG=	yes
19
19
20
HAS_CONFIGURE=	yes
21
CONFIGURE_ENV=	LD="${CXX}" AR="${AR}"
22
CONFIGURE_ARGS=	--prefix=${PREFIX} --target=${TARGET} --vectorization=SSE
23
MAKE_ARGS=	V=1	# we want to know what's going on during the build
24
MAKEFILE=	GNUmakefile
25
LIBVERSION=	2
26
27
PLIST_SUB+=	LIBVERSION=${LIBVERSION}
20
PLIST_SUB+=	LIBVERSION=${LIBVERSION}
28
21
29
post-patch: .SILENT
30
	${REINPLACE_CMD} -e '1s|#!/usr/bin/python|#!${PYTHON_CMD}|' \
31
		-e 's|make --version|g&|' -e '/DOXYGEN/d' \
32
		-e '/GNU Make/d' ${WRKSRC}/configure
33
	${REINPLACE_CMD} -e \
34
		's|CONF_LIBDIR)pkgconfig|CONF_LIBDIR)../libdata/pkgconfig|' \
35
			${WRKSRC}/build/tibs/compiler/pkgconfig.mak
36
	${REINPLACE_CMD} -e '/-s -O3/d' \
37
		${WRKSRC}/build/tibs/compiler/gcc.mak
38
	${REINPLACE_CMD} -e '/GROUPS/s| DOCS||' ${WRKSRC}/build/tibs/rules.mak
39
40
post-install:
41
	${LN} -sf lib${PORTNAME}.so \
42
		${STAGEDIR}${PREFIX}/lib/lib${PORTNAME}.so.${LIBVERSION}
43
44
.include <bsd.port.mk>
22
.include <bsd.port.mk>
(-)distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (lensfun-0.2.8.tar.bz2) = f88f97fbc78259a2b2edddef295caf50770901107c8469e54bb5e9699faa1a48
1
SHA256 (lensfun-0.3.0.tar.bz2) = c2c3c03873cb549d49d42f118fcb0ffa95d1e45b9ff395e19facb63bf699bec1
2
SIZE (lensfun-0.2.8.tar.bz2) = 628913
2
SIZE (lensfun-0.3.0.tar.bz2) = 636694
(-)files/patch-CMakeLists.txt (+10 lines)
Line 0 Link Here
1
--- CMakeLists.txt.orig	2014-09-30 17:37:34 UTC
2
+++ CMakeLists.txt
3
@@ -68,6 +68,7 @@ ENDIF()
4
 # find dependencies
5
 FIND_PACKAGE(GLIB2 REQUIRED)
6
 INCLUDE_DIRECTORIES(${GLIB2_INCLUDE_DIRS})
7
+LINK_DIRECTORIES(${GLIB2_LIBRARY_DIRS})
8
 
9
 IF(BUILD_AUXFUN)
10
   FIND_PACKAGE(PNG REQUIRED)
(-)files/patch-libs_lensfun_CMakeLists.txt (+9 lines)
Line 0 Link Here
1
--- libs/lensfun/CMakeLists.txt.orig	2014-12-21 20:06:01 UTC
2
+++ libs/lensfun/CMakeLists.txt
3
@@ -29,5 +29,5 @@ INSTALL(TARGETS lensfun 
4
 
5
 # pkgconfig support
6
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/lensfun.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/lensfun.pc @ONLY)
7
-INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/lensfun.pc DESTINATION ${LIBDIR}/pkgconfig )
8
+INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/lensfun.pc DESTINATION libdata/pkgconfig )
9
 
(-)pkg-plist (-2 / +14 lines)
Lines 1-11 Link Here
1
include/lensfun.h
1
bin/g-lensfun-update-data
2
bin/lensfun-add-adapter
3
bin/lensfun-update-data
4
include/lensfun/lensfun.h
2
lib/liblensfun.so
5
lib/liblensfun.so
3
lib/liblensfun.so.%%LIBVERSION%%
6
lib/liblensfun.so.0
7
lib/liblensfun.so.0.3.0
4
libdata/pkgconfig/lensfun.pc
8
libdata/pkgconfig/lensfun.pc
5
%%DATADIR%%/6x6.xml
9
%%DATADIR%%/6x6.xml
6
%%DATADIR%%/compact-canon.xml
10
%%DATADIR%%/compact-canon.xml
7
%%DATADIR%%/compact-casio.xml
11
%%DATADIR%%/compact-casio.xml
8
%%DATADIR%%/compact-fujifilm.xml
12
%%DATADIR%%/compact-fujifilm.xml
13
%%DATADIR%%/compact-gopro.xml
9
%%DATADIR%%/compact-kodak.xml
14
%%DATADIR%%/compact-kodak.xml
10
%%DATADIR%%/compact-konica-minolta.xml
15
%%DATADIR%%/compact-konica-minolta.xml
11
%%DATADIR%%/compact-leica.xml
16
%%DATADIR%%/compact-leica.xml
Lines 23-32 Link Here
23
%%DATADIR%%/mil-nikon.xml
28
%%DATADIR%%/mil-nikon.xml
24
%%DATADIR%%/mil-olympus.xml
29
%%DATADIR%%/mil-olympus.xml
25
%%DATADIR%%/mil-panasonic.xml
30
%%DATADIR%%/mil-panasonic.xml
31
%%DATADIR%%/mil-pentax.xml
32
%%DATADIR%%/slr-ricoh.xml
26
%%DATADIR%%/mil-samsung.xml
33
%%DATADIR%%/mil-samsung.xml
27
%%DATADIR%%/mil-samyang.xml
34
%%DATADIR%%/mil-samyang.xml
28
%%DATADIR%%/mil-sigma.xml
35
%%DATADIR%%/mil-sigma.xml
29
%%DATADIR%%/mil-sony.xml
36
%%DATADIR%%/mil-sony.xml
37
%%DATADIR%%/mil-zeiss.xml
38
%%DATADIR%%/misc.xml
30
%%DATADIR%%/rf-leica.xml
39
%%DATADIR%%/rf-leica.xml
31
%%DATADIR%%/slr-canon.xml
40
%%DATADIR%%/slr-canon.xml
32
%%DATADIR%%/slr-contax.xml
41
%%DATADIR%%/slr-contax.xml
Lines 45-48 Link Here
45
%%DATADIR%%/slr-sony.xml
54
%%DATADIR%%/slr-sony.xml
46
%%DATADIR%%/slr-tamron.xml
55
%%DATADIR%%/slr-tamron.xml
47
%%DATADIR%%/slr-tokina.xml
56
%%DATADIR%%/slr-tokina.xml
57
%%DATADIR%%/slr-vivitar.xml
48
%%DATADIR%%/slr-ussr.xml
58
%%DATADIR%%/slr-ussr.xml
59
%%DATADIR%%/slr-zeiss.xml
60
%%DATADIR%%/timestamp.txt

Return to bug 196182