Skip to content

Commit

Permalink
The sed expression in the VALID_VERSION make function only works with…
Browse files Browse the repository at this point in the history
… 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
  • Loading branch information
sbd committed Feb 15, 2012
1 parent 2a3c596 commit 9a8d6fc
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 6 deletions.
15 changes: 12 additions & 3 deletions graphics/lensfun/Makefile
@@ -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
Expand All @@ -22,10 +22,19 @@ MAKE_FILE= GNUmakefile
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"
Expand Down
4 changes: 3 additions & 1 deletion graphics/lensfun/PLIST
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions graphics/lensfun/buildlink3.mk
@@ -1,12 +1,12 @@
# $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

.if !defined(LENSFUN_BUILDLINK3_MK)
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"
Expand Down

0 comments on commit 9a8d6fc

Please sign in to comment.