Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/pkgsrc/textproc/tinyxml/Makefile,v rcsdiff: /ftp/cvs/cvsroot/pkgsrc/textproc/tinyxml/Makefile,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.2 retrieving revision 1.3 diff -u -p -r1.2 -r1.3 --- 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,8 +1,8 @@ -# $NetBSD: Makefile,v 1.2 2014/02/16 23:16:05 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2014/07/08 14:57:06 jperkin Exp $ DISTNAME= tinyxml_2_6_2 PKGNAME= tinyxml-2.6.2 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= textproc devel lang MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tinyxml/} EXTRACT_SUFX= .zip @@ -13,14 +13,26 @@ COMMENT= Simple, small, C++ XML parser LICENSE= zlib USE_LANGUAGES+= c++ +USE_LIBTOOL= yes + WRKSRC= ${WRKDIR}/${PKGBASE} -MAKE_ENV+= SHLIB_MAJOR=2 SHLIB_MINOR=6 SHLIB_TEENY=2 -MAKE_ENV+= ${BSD_MAKE_ENV} -INSTALL_TARGET= install includes INSTALLATION_DIRS+= include lib -post-extract: - ${CP} ${FILESDIR}/Makefile ${WRKSRC}/Makefile +CXXFLAGS+= -DTIXML_USE_STL=1 + +do-build: + cd ${WRKSRC} && ${LIBTOOL} --mode=compile ${COMPILE.cc} tinystr.cpp + cd ${WRKSRC} && ${LIBTOOL} --mode=compile ${COMPILE.cc} tinyxml.cpp + cd ${WRKSRC} && ${LIBTOOL} --mode=compile ${COMPILE.cc} tinyxmlerror.cpp + cd ${WRKSRC} && ${LIBTOOL} --mode=compile ${COMPILE.cc} tinyxmlparser.cpp + cd ${WRKSRC} && ${LIBTOOL} --mode=compile ${COMPILE.cc} xmltest.cpp + cd ${WRKSRC} && ${LIBTOOL} --mode=link ${LINK.cc} \ + -o libtinyxml.la *.lo -version-info 2:6:2 -rpath ${PREFIX}/lib + +do-install: + ${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/libtinyxml.la \ + ${DESTDIR}${PREFIX}/lib/ + ${INSTALL_DATA} ${WRKSRC}/tinyxml.h ${DESTDIR}${PREFIX}/include/ .include "../../mk/bsd.pkg.mk"