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