pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/graphics/lensfun The sed expression in the VALID_VERSI...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/28c68061ed5b
branches:  trunk
changeset: 599432:28c68061ed5b
user:      sbd <sbd%pkgsrc.org@localhost>
date:      Wed Feb 15 08:50:18 2012 +0000

description:
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

diffstat:

 graphics/lensfun/Makefile      |  15 ++++++++++++---
 graphics/lensfun/PLIST         |   4 +++-
 graphics/lensfun/buildlink3.mk |   4 ++--
 3 files changed, 17 insertions(+), 6 deletions(-)

diffs (66 lines):

diff -r ca0787b31e31 -r 28c68061ed5b graphics/lensfun/Makefile
--- a/graphics/lensfun/Makefile Wed Feb 15 08:01:19 2012 +0000
+++ b/graphics/lensfun/Makefile Wed Feb 15 08:50:18 2012 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2012/02/06 12:40:29 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2012/02/15 08:50:18 sbd Exp $
 #
 
 DISTNAME=      lensfun-0.2.5
-PKGREVISION=   6
+PKGREVISION=   7
 CATEGORIES=    graphics
 MASTER_SITES=  http://download.berlios.de/lensfun/
 EXTRACT_SUFX=  .tar.bz2
@@ -22,10 +22,19 @@
 PYTHON_FOR_BUILD_ONLY= yes
 REPLACE_PYTHON=                configure
 USE_LANGUAGES=         c c++
-USE_TOOLS+=            gmake pkg-config
+USE_TOOLS+=            gmake pkg-config gsed
 PKGCONFIG_OVERRIDE=    libs/lensfun/lensfun.pc.in
 PKG_DESTDIR_SUPPORT=   user-destdir
 
+# Why three copys of the file?
+post-install:
+       ${RM} -f ${DESTDIR}${PREFIX}/lib/liblensfun.so
+       ${RM} -f ${DESTDIR}${PREFIX}/lib/liblensfun.so.0
+       ${LN} -s liblensfun.so.${PKGVERSION:C/nb[0-9]*//} \
+               ${DESTDIR}${PREFIX}/lib/liblensfun.so.0
+       ${LN} -s liblensfun.so.${PKGVERSION:C/nb[0-9]*//} \
+               ${DESTDIR}${PREFIX}/lib/liblensfun.so
+
 .include "../../devel/glib2/buildlink3.mk"
 # png: for test programs only
 .include "../../graphics/png/buildlink3.mk"
diff -r ca0787b31e31 -r 28c68061ed5b graphics/lensfun/PLIST
--- a/graphics/lensfun/PLIST    Wed Feb 15 08:01:19 2012 +0000
+++ b/graphics/lensfun/PLIST    Wed Feb 15 08:50:18 2012 +0000
@@ -1,6 +1,8 @@
-@comment $NetBSD: PLIST,v 1.6 2011/01/17 16:38:20 drochner Exp $
+@comment $NetBSD: PLIST,v 1.7 2012/02/15 08:50:18 sbd Exp $
 include/lensfun.h
 lib/liblensfun.so
+lib/liblensfun.so.0
+lib/liblensfun.so.${PKGVERSION}
 lib/pkgconfig/lensfun.pc
 share/doc/${PKGNAME}/README
 share/doc/${PKGNAME}/cc-by-sa-3.0.txt
diff -r ca0787b31e31 -r 28c68061ed5b graphics/lensfun/buildlink3.mk
--- a/graphics/lensfun/buildlink3.mk    Wed Feb 15 08:01:19 2012 +0000
+++ b/graphics/lensfun/buildlink3.mk    Wed Feb 15 08:50:18 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2012/02/06 12:40:29 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2012/02/15 08:50:18 sbd Exp $
 
 BUILDLINK_TREE+=       lensfun
 
@@ -6,7 +6,7 @@
 LENSFUN_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.lensfun+=        lensfun>=0.2.2b
-BUILDLINK_ABI_DEPENDS.lensfun?=        lensfun>=0.2.5nb6
+BUILDLINK_ABI_DEPENDS.lensfun?=        lensfun>=0.2.5nb7
 BUILDLINK_PKGSRCDIR.lensfun?=  ../../graphics/lensfun
 
 .include "../../devel/glib2/buildlink3.mk"



Home | Main Index | Thread Index | Old Index