Tue Jul 8 14:57:06 2014 UTC ()
Switch to using libtool to build the shared library.  The bsd.lib.mk
infrastructure appears to use some constructs which are not currently
available in bootstrap-mk-files.

Bump PKGREVISION and add BUILDLINK_ABI_DEPENDS on the new revision, as
we cannot guarantee that the shared library name didn't change.


(jperkin)
diff -r1.2 -r1.3 pkgsrc/textproc/tinyxml/Makefile
diff -r1.1 -r1.2 pkgsrc/textproc/tinyxml/PLIST
diff -r1.1 -r1.2 pkgsrc/textproc/tinyxml/buildlink3.mk
diff -r1.1 -r0 pkgsrc/textproc/tinyxml/files/Makefile
cvs diff -r1.2 -r1.3 pkgsrc/textproc/tinyxml/Makefile (expand / switch to unified diff)

--- pkgsrc/textproc/tinyxml/Makefile 2014/02/16 23:16:05 1.2
+++ pkgsrc/textproc/tinyxml/Makefile 2014/07/08 14:57:06 1.3
@@ -1,26 +1,38 @@ @@ -1,26 +1,38 @@
1# $NetBSD: Makefile,v 1.2 2014/02/16 23:16:05 wiz Exp $ 1# $NetBSD: Makefile,v 1.3 2014/07/08 14:57:06 jperkin Exp $
2 2
3DISTNAME= tinyxml_2_6_2 3DISTNAME= tinyxml_2_6_2
4PKGNAME= tinyxml-2.6.2 4PKGNAME= tinyxml-2.6.2
5PKGREVISION= 1 5PKGREVISION= 2
6CATEGORIES= textproc devel lang 6CATEGORIES= textproc devel lang
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tinyxml/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tinyxml/}
8EXTRACT_SUFX= .zip 8EXTRACT_SUFX= .zip
9 9
10MAINTAINER= pkgsrc@NetBSD.org 10MAINTAINER= pkgsrc@NetBSD.org
11HOMEPAGE= http://www.grinninglizard.com/tinyxml/ 11HOMEPAGE= http://www.grinninglizard.com/tinyxml/
12COMMENT= Simple, small, C++ XML parser 12COMMENT= Simple, small, C++ XML parser
13LICENSE= zlib 13LICENSE= zlib
14 14
15USE_LANGUAGES+= c++ 15USE_LANGUAGES+= c++
 16USE_LIBTOOL= yes
 17
16WRKSRC= ${WRKDIR}/${PKGBASE} 18WRKSRC= ${WRKDIR}/${PKGBASE}
17MAKE_ENV+= SHLIB_MAJOR=2 SHLIB_MINOR=6 SHLIB_TEENY=2 
18MAKE_ENV+= ${BSD_MAKE_ENV} 
19 19
20INSTALL_TARGET= install includes 
21INSTALLATION_DIRS+= include lib 20INSTALLATION_DIRS+= include lib
22 21
23post-extract: 22CXXFLAGS+= -DTIXML_USE_STL=1
24 ${CP} ${FILESDIR}/Makefile ${WRKSRC}/Makefile 23
 24do-build:
 25 cd ${WRKSRC} && ${LIBTOOL} --mode=compile ${COMPILE.cc} tinystr.cpp
 26 cd ${WRKSRC} && ${LIBTOOL} --mode=compile ${COMPILE.cc} tinyxml.cpp
 27 cd ${WRKSRC} && ${LIBTOOL} --mode=compile ${COMPILE.cc} tinyxmlerror.cpp
 28 cd ${WRKSRC} && ${LIBTOOL} --mode=compile ${COMPILE.cc} tinyxmlparser.cpp
 29 cd ${WRKSRC} && ${LIBTOOL} --mode=compile ${COMPILE.cc} xmltest.cpp
 30 cd ${WRKSRC} && ${LIBTOOL} --mode=link ${LINK.cc} \
 31 -o libtinyxml.la *.lo -version-info 2:6:2 -rpath ${PREFIX}/lib
 32
 33do-install:
 34 ${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/libtinyxml.la \
 35 ${DESTDIR}${PREFIX}/lib/
 36 ${INSTALL_DATA} ${WRKSRC}/tinyxml.h ${DESTDIR}${PREFIX}/include/
25 37
26.include "../../mk/bsd.pkg.mk" 38.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1 -r1.2 pkgsrc/textproc/tinyxml/PLIST (expand / switch to unified diff)

--- pkgsrc/textproc/tinyxml/PLIST 2014/02/16 23:05:33 1.1
+++ pkgsrc/textproc/tinyxml/PLIST 2014/07/08 14:57:06 1.2
@@ -1,6 +1,3 @@ @@ -1,6 +1,3 @@
1@comment $NetBSD: PLIST,v 1.1 2014/02/16 23:05:33 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.2 2014/07/08 14:57:06 jperkin Exp $
2include/tinyxml.h 2include/tinyxml.h
3lib/libtinyxml.a 3lib/libtinyxml.la
4lib/libtinyxml.so 
5lib/libtinyxml.so.2 
6lib/libtinyxml.so.${PKGVERSION} 
cvs diff -r1.1 -r1.2 pkgsrc/textproc/tinyxml/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/textproc/tinyxml/buildlink3.mk 2014/02/16 23:05:33 1.1
+++ pkgsrc/textproc/tinyxml/buildlink3.mk 2014/07/08 14:57:06 1.2
@@ -1,12 +1,13 @@ @@ -1,12 +1,13 @@
1# $NetBSD: buildlink3.mk,v 1.1 2014/02/16 23:05:33 wiz Exp $ 1# $NetBSD: buildlink3.mk,v 1.2 2014/07/08 14:57:06 jperkin Exp $
2 2
3BUILDLINK_TREE+= tinyxml 3BUILDLINK_TREE+= tinyxml
4 4
5.if !defined(TINYXML_BUILDLINK3_MK) 5.if !defined(TINYXML_BUILDLINK3_MK)
6TINYXML_BUILDLINK3_MK:= 6TINYXML_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.tinyxml+= tinyxml>=2.6.2 8BUILDLINK_API_DEPENDS.tinyxml+= tinyxml>=2.6.2
 9BUILDLINK_ABI_DEPENDS.tinyxml?= tinyxml>=2.6.2nb2
9BUILDLINK_PKGSRCDIR.tinyxml?= ../../textproc/tinyxml 10BUILDLINK_PKGSRCDIR.tinyxml?= ../../textproc/tinyxml
10.endif # TINYXML_BUILDLINK3_MK 11.endif # TINYXML_BUILDLINK3_MK
11 12
12BUILDLINK_TREE+= -tinyxml 13BUILDLINK_TREE+= -tinyxml
File Deleted: pkgsrc/textproc/tinyxml/files/Attic/Makefile