Wed Feb 15 08:50:18 2012 UTC ()
The sed expression in the VALID_VERSION make function only works with gsed,
so add it to USE_TOOLS.

With the VALID_VERSION function working properly the soname of liblensfun
will now be 'liblensfun.so.0' and liblensfun.so.0 and
liblensfun.so.${PKGVERSION} will also now get installed.

Because the install process installs _three_ copys of liblensfun, delete two
and make them symlinks.

Bump PKGREVISION


(sbd)
diff -r1.12 -r1.13 pkgsrc/graphics/lensfun/Makefile
diff -r1.6 -r1.7 pkgsrc/graphics/lensfun/PLIST
diff -r1.3 -r1.4 pkgsrc/graphics/lensfun/buildlink3.mk
cvs diff -r1.12 -r1.13 pkgsrc/graphics/lensfun/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/lensfun/Makefile 2012/02/06 12:40:29 1.12
+++ pkgsrc/graphics/lensfun/Makefile 2012/02/15 08:50:18 1.13
@@ -1,34 +1,43 @@ @@ -1,34 +1,43 @@
1# $NetBSD: Makefile,v 1.12 2012/02/06 12:40:29 wiz Exp $ 1# $NetBSD: Makefile,v 1.13 2012/02/15 08:50:18 sbd Exp $
2# 2#
3 3
4DISTNAME= lensfun-0.2.5 4DISTNAME= lensfun-0.2.5
5PKGREVISION= 6 5PKGREVISION= 7
6CATEGORIES= graphics 6CATEGORIES= graphics
7MASTER_SITES= http://download.berlios.de/lensfun/ 7MASTER_SITES= http://download.berlios.de/lensfun/
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://lensfun.berlios.de/ 11HOMEPAGE= http://lensfun.berlios.de/
12COMMENT= Library for rectifying defects introduced by photographic equipment 12COMMENT= Library for rectifying defects introduced by photographic equipment
13LICENSE= gnu-lgpl-v3 13LICENSE= gnu-lgpl-v3
14 14
15BUILD_DEPENDS+= makedepend-[0-9]*:../../devel/makedepend 15BUILD_DEPENDS+= makedepend-[0-9]*:../../devel/makedepend
16 16
17HAS_CONFIGURE= yes 17HAS_CONFIGURE= yes
18CONFIGURE_ARGS+= --prefix=${PREFIX} --libdir=${PREFIX}/lib 18CONFIGURE_ARGS+= --prefix=${PREFIX} --libdir=${PREFIX}/lib
19CONFIGURE_ARGS+= --vectorization= 19CONFIGURE_ARGS+= --vectorization=
20CONFIG_SHELL= ${PYTHONBIN} 20CONFIG_SHELL= ${PYTHONBIN}
21MAKE_FILE= GNUmakefile 21MAKE_FILE= GNUmakefile
22PYTHON_FOR_BUILD_ONLY= yes 22PYTHON_FOR_BUILD_ONLY= yes
23REPLACE_PYTHON= configure 23REPLACE_PYTHON= configure
24USE_LANGUAGES= c c++ 24USE_LANGUAGES= c c++
25USE_TOOLS+= gmake pkg-config 25USE_TOOLS+= gmake pkg-config gsed
26PKGCONFIG_OVERRIDE= libs/lensfun/lensfun.pc.in 26PKGCONFIG_OVERRIDE= libs/lensfun/lensfun.pc.in
27PKG_DESTDIR_SUPPORT= user-destdir 27PKG_DESTDIR_SUPPORT= user-destdir
28 28
 29# Why three copys of the file?
 30post-install:
 31 ${RM} -f ${DESTDIR}${PREFIX}/lib/liblensfun.so
 32 ${RM} -f ${DESTDIR}${PREFIX}/lib/liblensfun.so.0
 33 ${LN} -s liblensfun.so.${PKGVERSION:C/nb[0-9]*//} \
 34 ${DESTDIR}${PREFIX}/lib/liblensfun.so.0
 35 ${LN} -s liblensfun.so.${PKGVERSION:C/nb[0-9]*//} \
 36 ${DESTDIR}${PREFIX}/lib/liblensfun.so
 37
29.include "../../devel/glib2/buildlink3.mk" 38.include "../../devel/glib2/buildlink3.mk"
30# png: for test programs only 39# png: for test programs only
31.include "../../graphics/png/buildlink3.mk" 40.include "../../graphics/png/buildlink3.mk"
32.include "../../devel/zlib/buildlink3.mk" 41.include "../../devel/zlib/buildlink3.mk"
33.include "../../lang/python/application.mk" 42.include "../../lang/python/application.mk"
34.include "../../mk/bsd.pkg.mk" 43.include "../../mk/bsd.pkg.mk"
cvs diff -r1.6 -r1.7 pkgsrc/graphics/lensfun/PLIST (expand / switch to unified diff)

--- pkgsrc/graphics/lensfun/PLIST 2011/01/17 16:38:20 1.6
+++ pkgsrc/graphics/lensfun/PLIST 2012/02/15 08:50:18 1.7
@@ -1,16 +1,18 @@ @@ -1,16 +1,18 @@
1@comment $NetBSD: PLIST,v 1.6 2011/01/17 16:38:20 drochner Exp $ 1@comment $NetBSD: PLIST,v 1.7 2012/02/15 08:50:18 sbd Exp $
2include/lensfun.h 2include/lensfun.h
3lib/liblensfun.so 3lib/liblensfun.so
 4lib/liblensfun.so.0
 5lib/liblensfun.so.${PKGVERSION}
4lib/pkgconfig/lensfun.pc 6lib/pkgconfig/lensfun.pc
5share/doc/${PKGNAME}/README 7share/doc/${PKGNAME}/README
6share/doc/${PKGNAME}/cc-by-sa-3.0.txt 8share/doc/${PKGNAME}/cc-by-sa-3.0.txt
7share/doc/${PKGNAME}/gpl-3.0.txt 9share/doc/${PKGNAME}/gpl-3.0.txt
8share/doc/${PKGNAME}/lgpl-3.0.txt 10share/doc/${PKGNAME}/lgpl-3.0.txt
9share/lensfun/6x6.xml 11share/lensfun/6x6.xml
10share/lensfun/compact-canon.xml 12share/lensfun/compact-canon.xml
11share/lensfun/compact-casio.xml 13share/lensfun/compact-casio.xml
12share/lensfun/compact-fujifilm.xml 14share/lensfun/compact-fujifilm.xml
13share/lensfun/compact-kodak.xml 15share/lensfun/compact-kodak.xml
14share/lensfun/compact-konica-minolta.xml 16share/lensfun/compact-konica-minolta.xml
15share/lensfun/compact-leica.xml 17share/lensfun/compact-leica.xml
16share/lensfun/compact-nikon.xml 18share/lensfun/compact-nikon.xml
cvs diff -r1.3 -r1.4 pkgsrc/graphics/lensfun/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/graphics/lensfun/buildlink3.mk 2012/02/06 12:40:29 1.3
+++ pkgsrc/graphics/lensfun/buildlink3.mk 2012/02/15 08:50:18 1.4
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1# $NetBSD: buildlink3.mk,v 1.3 2012/02/06 12:40:29 wiz Exp $ 1# $NetBSD: buildlink3.mk,v 1.4 2012/02/15 08:50:18 sbd Exp $
2 2
3BUILDLINK_TREE+= lensfun 3BUILDLINK_TREE+= lensfun
4 4
5.if !defined(LENSFUN_BUILDLINK3_MK) 5.if !defined(LENSFUN_BUILDLINK3_MK)
6LENSFUN_BUILDLINK3_MK:= 6LENSFUN_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.lensfun+= lensfun>=0.2.2b 8BUILDLINK_API_DEPENDS.lensfun+= lensfun>=0.2.2b
9BUILDLINK_ABI_DEPENDS.lensfun?= lensfun>=0.2.5nb6 9BUILDLINK_ABI_DEPENDS.lensfun?= lensfun>=0.2.5nb7
10BUILDLINK_PKGSRCDIR.lensfun?= ../../graphics/lensfun 10BUILDLINK_PKGSRCDIR.lensfun?= ../../graphics/lensfun
11 11
12.include "../../devel/glib2/buildlink3.mk" 12.include "../../devel/glib2/buildlink3.mk"
13.endif # LENSFUN_BUILDLINK3_MK 13.endif # LENSFUN_BUILDLINK3_MK
14 14
15BUILDLINK_TREE+= -lensfun 15BUILDLINK_TREE+= -lensfun