Mon Feb 2 11:14:55 2015 UTC ()
Fixed buildlinking


(adam)
diff -r1.14 -r1.15 pkgsrc/converters/libcdr/Makefile
diff -r1.4 -r1.5 pkgsrc/converters/libcdr/buildlink3.mk
cvs diff -r1.14 -r1.15 pkgsrc/converters/libcdr/Makefile (expand / switch to unified diff)

--- pkgsrc/converters/libcdr/Makefile 2014/12/01 11:15:21 1.14
+++ pkgsrc/converters/libcdr/Makefile 2015/02/02 11:14:55 1.15
@@ -1,29 +1,28 @@ @@ -1,29 +1,28 @@
1# $NetBSD: Makefile,v 1.14 2014/12/01 11:15:21 wiz Exp $ 1# $NetBSD: Makefile,v 1.15 2015/02/02 11:14:55 adam Exp $
2 2
3DISTNAME= libcdr-0.1.1 3DISTNAME= libcdr-0.1.1
4CATEGORIES= converters 4CATEGORIES= converters
5MASTER_SITES= http://dev-www.libreoffice.org/src/libcdr/ 5MASTER_SITES= http://dev-www.libreoffice.org/src/libcdr/
6EXTRACT_SUFX= .tar.xz 6EXTRACT_SUFX= .tar.xz
7 7
8MAINTAINER= ftigeot@wolfpond.org 8MAINTAINER= ftigeot@wolfpond.org
9HOMEPAGE= https://wiki.documentfoundation.org/DLP/Libraries/libcdr 9HOMEPAGE= https://wiki.documentfoundation.org/DLP/Libraries/libcdr
10COMMENT= Corel Draw file format importer library 10COMMENT= Corel Draw file format importer library
11LICENSE= gnu-lgpl-v2.1 OR mpl-1.1 OR gnu-gpl-v2 11LICENSE= gnu-lgpl-v2.1 OR mpl-1.1 OR gnu-gpl-v2
12 12
13USE_LANGUAGES= c c++ 13USE_LANGUAGES= c c++
14USE_LIBTOOL= yes 14USE_LIBTOOL= yes
15USE_TOOLS+= pkg-config 15USE_TOOLS+= pkg-config
16 
17GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
18CONFIGURE_ARGS+= --disable-werror 17CONFIGURE_ARGS+= --disable-werror
19CONFIGURE_ARGS+= --without-docs 18CONFIGURE_ARGS+= --without-docs
20PKGCONFIG_OVERRIDE= libcdr.pc.in 19PKGCONFIG_OVERRIDE= libcdr.pc.in
21 20
22.include "../../converters/libwpd/buildlink3.mk" 21.include "../../converters/libwpd/buildlink3.mk"
23.include "../../converters/libwpg/buildlink3.mk" 22.include "../../converters/libwpg/buildlink3.mk"
24.include "../../converters/librevenge/buildlink3.mk" 23.include "../../converters/librevenge/buildlink3.mk"
25.include "../../devel/zlib/buildlink3.mk" 
26.include "../../devel/boost-libs/buildlink3.mk" 24.include "../../devel/boost-libs/buildlink3.mk"
 25.include "../../devel/zlib/buildlink3.mk"
27.include "../../graphics/lcms2/buildlink3.mk" 26.include "../../graphics/lcms2/buildlink3.mk"
28.include "../../textproc/icu/buildlink3.mk" 27.include "../../textproc/icu/buildlink3.mk"
29.include "../../mk/bsd.pkg.mk" 28.include "../../mk/bsd.pkg.mk"
cvs diff -r1.4 -r1.5 pkgsrc/converters/libcdr/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/converters/libcdr/buildlink3.mk 2014/07/22 11:07:58 1.4
+++ pkgsrc/converters/libcdr/buildlink3.mk 2015/02/02 11:14:55 1.5
@@ -1,18 +1,20 @@ @@ -1,18 +1,20 @@
1# $NetBSD: buildlink3.mk,v 1.4 2014/07/22 11:07:58 wiz Exp $ 1# $NetBSD: buildlink3.mk,v 1.5 2015/02/02 11:14:55 adam Exp $
2 2
3BUILDLINK_TREE+= libcdr 3BUILDLINK_TREE+= libcdr
4 4
5.if !defined(LIBCDR_BUILDLINK3_MK) 5.if !defined(LIBCDR_BUILDLINK3_MK)
6LIBCDR_BUILDLINK3_MK:= 6LIBCDR_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.libcdr+= libcdr>=0.0.6 8BUILDLINK_API_DEPENDS.libcdr+= libcdr>=0.0.6
9BUILDLINK_ABI_DEPENDS.libcdr?= libcdr>=0.1.0 9BUILDLINK_ABI_DEPENDS.libcdr+= libcdr>=0.1.0
10BUILDLINK_PKGSRCDIR.libcdr?= ../../converters/libcdr 10BUILDLINK_PKGSRCDIR.libcdr?= ../../converters/libcdr
11 11
12.include "../../converters/libwpd/buildlink3.mk" 12.include "../../converters/libwpd/buildlink3.mk"
13.include "../../converters/libwpg/buildlink3.mk" 13.include "../../converters/libwpg/buildlink3.mk"
14.include "../../converters/librevenge/buildlink3.mk" 14.include "../../converters/librevenge/buildlink3.mk"
 15.include "../../devel/zlib/buildlink3.mk"
15.include "../../graphics/lcms2/buildlink3.mk" 16.include "../../graphics/lcms2/buildlink3.mk"
 17.include "../../textproc/icu/buildlink3.mk"
16.endif # LIBCDR_BUILDLINK3_MK 18.endif # LIBCDR_BUILDLINK3_MK
17 19
18BUILDLINK_TREE+= -libcdr 20BUILDLINK_TREE+= -libcdr