Fix building on Darwin

3 files changed, 37 insertions, 10 deletions

diff --git a/graphics/lensfun/Makefile b/graphics/lensfun/Makefile
index f5f657cb88a..2bdc2ca70cb 100644
--- a/graphics/lensfun/Makefile
+++ b/graphics/lensfun/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2013/03/01 14:49:53 gdt Exp $
-#
+# $NetBSD: Makefile,v 1.24 2013/08/04 19:12:00 adam Exp $
 
 DISTNAME=	lensfun-0.2.7
 CATEGORIES=	graphics
@@ -15,33 +14,45 @@ LICENSE=	gnu-lgpl-v3
 # Defer, because cmake is coming.
 BUILD_DEPENDS+=	makedepend-[0-9]*:../../devel/makedepend
 
+USE_LANGUAGES=		c c++
+USE_TOOLS+=		gmake pkg-config gsed
 HAS_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--prefix=${PREFIX} --libdir=${PREFIX}/lib
+CONFIGURE_ARGS+=	--libdir=${PREFIX}/lib
+CONFIGURE_ARGS+=	--prefix=${PREFIX}
 CONFIGURE_ARGS+=	--vectorization=
 MAKE_FILE=		GNUmakefile
 
 CONFIG_SHELL=		${PYTHONBIN}
 PYTHON_FOR_BUILD_ONLY=	yes
 REPLACE_PYTHON=		configure
-USE_LANGUAGES=		c c++
-USE_TOOLS+=		gmake pkg-config gsed
 PKGCONFIG_OVERRIDE=	libs/lensfun/lensfun.pc.in
 
+.include "../../mk/bsd.prefs.mk"
+
 # Starting in 0.2.6, the library is misinstalled as liblensfun.so,
 # with no .0 variant.  Manually fix it, because that's easier than
 # understanding the build, and upstream is moving to cmake anyway.
 post-install:
+.if ${OPSYS} == "Darwin"
+	${MV} ${DESTDIR}${PREFIX}/lib/liblensfun.dylib \
+		${DESTDIR}${PREFIX}/lib/liblensfun.${PKGVERSION_NOREV}.dylib
+	${LN} -s liblensfun.${PKGVERSION_NOREV}.dylib \
+		${DESTDIR}${PREFIX}/lib/liblensfun.0.dylib
+	${LN} -s liblensfun.${PKGVERSION_NOREV}.dylib \
+		${DESTDIR}${PREFIX}/lib/liblensfun.dylib
+.else
 	${MV} ${DESTDIR}${PREFIX}/lib/liblensfun.so \
-		${DESTDIR}${PREFIX}/lib/liblensfun.so.${PKGVERSION:C/nb[0-9]*//}
-	${LN} -s liblensfun.so.${PKGVERSION:C/nb[0-9]*//} \
+		${DESTDIR}${PREFIX}/lib/liblensfun.so.${PKGVERSION_NOREV}
+	${LN} -s liblensfun.so.${PKGVERSION_NOREV} \
 		${DESTDIR}${PREFIX}/lib/liblensfun.so.0
-	${LN} -s liblensfun.so.${PKGVERSION:C/nb[0-9]*//} \
+	${LN} -s liblensfun.so.${PKGVERSION_NOREV} \
 		${DESTDIR}${PREFIX}/lib/liblensfun.so
+.endif
 
 .include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
 # png: for test programs only
 .include "../../graphics/png/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"
 # DO NOT DELETE
diff --git a/graphics/lensfun/distinfo b/graphics/lensfun/distinfo
index 113d40921bc..a0d6f0f845d 100644
--- a/graphics/lensfun/distinfo
+++ b/graphics/lensfun/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2013/03/04 14:44:25 joerg Exp $
+$NetBSD: distinfo,v 1.11 2013/08/04 19:12:00 adam Exp $
 
 SHA1 (lensfun-0.2.7.tar.bz2) = f26121093dfee85d6371c2c79dae22e6d1b8d0d6
 RMD160 (lensfun-0.2.7.tar.bz2) = 87cee31658f1083734356c678b934a712bccefad
@@ -7,4 +7,5 @@ SHA1 (patch-aa) = d31dd742f232aa8a75f50f14f782918ba11a8119
 SHA1 (patch-ab) = 5455bda9546dce6cc5b4a73429092afdee04bd23
 SHA1 (patch-ad) = f9d54534d3be809e8517ec262e776c9d1785acd8
 SHA1 (patch-ae) = c7f47ac5081d52244f38d0fc40795c7cb00f40e4
+SHA1 (patch-build_tibs_compiler_pkgconfig.mak) = 692dd4c04c3b1f348a8c7ef5a1c708cf254a0b14
 SHA1 (patch-libs_auxfun_image.cpp) = 613b2f80ede85285195c20eb096cd70fe6783b1a
diff --git a/graphics/lensfun/patches/patch-build_tibs_compiler_pkgconfig.mak b/graphics/lensfun/patches/patch-build_tibs_compiler_pkgconfig.mak
new file mode 100644
index 00000000000..943f81322b9
--- /dev/null
+++ b/graphics/lensfun/patches/patch-build_tibs_compiler_pkgconfig.mak
@@ -0,0 +1,15 @@
+$NetBSD: patch-build_tibs_compiler_pkgconfig.mak,v 1.1 2013/08/04 19:12:00 adam Exp $
+
+Install pkgconfig file also on Darwin.
+
+--- build/tibs//compiler/pkgconfig.mak.orig	2013-08-04 19:08:20.000000000 +0000
++++ build/tibs//compiler/pkgconfig.mak
+@@ -4,7 +4,7 @@ ifdef CONF_LIBDIR
+ # Try to guess here if target supports pkgconfig
+ # - Any POSIX platform
+ # - Cross-compiling on a POSIX target for WINDOWS (mingw32)
+-ifneq ($(findstring /posix/,/$(TARGET)/)$(findstring /posix-windows/,/$(HOST)-$(TARGET)/),)
++ifneq ($(findstring /posix/,/$(TARGET)/)$(findstring /mac/,/$(TARGET)/),)
+ 
+ XFNAME.PKGCONFIG = $(addprefix $$(OUT),$1)
+ MKDEPS.PKGCONFIG = $1