CVS commit: pkgsrc/devel/boost-libs

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Tue Apr 12 13:05:07 UTC 2022

Modified Files:
        pkgsrc/devel/boost-libs: Makefile

Log Message:
boost-libs: fix detection of pkgsrc zlib and bzip2

Also does not (afaict) depend on expat any more. Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.93 -r1.94 pkgsrc/devel/boost-libs/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/boost-libs/Makefile
diff -u pkgsrc/devel/boost-libs/Makefile:1.93 pkgsrc/devel/boost-libs/Makefile:1.94
--- pkgsrc/devel/boost-libs/Makefile:1.93       Mon Jan 10 01:23:31 2022
+++ pkgsrc/devel/boost-libs/Makefile    Tue Apr 12 13:05:07 2022
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.93 2022/01/10 01:23:31 ryoon Exp $
+# $NetBSD: Makefile,v 1.94 2022/04/12 13:05:07 tnn Exp $
 
 BOOST_PACKAGE=         libs
 BOOST_COMMENT=         (binary libraries)
 BOOST_CONFIG=          installed
 BOOST_INSTALL_LIBS=    yes
+PKGREVISION=           1
 
 .include "../../meta-pkgs/boost/Makefile.common"
 
@@ -51,13 +52,11 @@ GENERATE_PLIST+=    cd ${DESTDIR:Q}/${PREFI
 
 UNLIMIT_RESOURCES+=    stacksize
 
-MAKE_ENV+=     BZIP2_INCLUDE=${BUILDLINK_PREFIX.bzip2}/include
-MAKE_ENV+=     BZIP2_LIBPATH=${BUILDLINK_PREFIX.bzip2}/lib
-MAKE_ENV+=     EXPAT_INCLUDE=${BUILDLINK_PREFIX.expat}/include
-MAKE_ENV+=     EXPAT_LIBPATH=${BUILDLINK_PREFIX.expat}/lib
-MAKE_ENV+=     ICU_PATH=${BUILDLINK_PREFIX.icu}
-MAKE_ENV+=     ZLIB_INCLUDE=${BUILDLINK_PREFIX.zlib}/include
-MAKE_ENV+=     ZLIB_LIBPATH=${BUILDLINK_PREFIX.zlib}/lib
+CONFIGURE_ENV+=        BZIP2_INCLUDE=${BUILDLINK_PREFIX.bzip2}/include
+CONFIGURE_ENV+=        BZIP2_LIBRARY_PATH=${BUILDLINK_PREFIX.bzip2}/lib
+CONFIGURE_ENV+=        ICU_PATH=${BUILDLINK_PREFIX.icu}
+CONFIGURE_ENV+=        ZLIB_INCLUDE=${BUILDLINK_PREFIX.zlib}/include
+CONFIGURE_ENV+=        ZLIB_LIBRARY_PATH=${BUILDLINK_PREFIX.zlib}/lib
 
 .include "../../devel/boost-jam/bjam.mk"
 
@@ -69,7 +68,6 @@ do-install: boost-install-libs
 .include "../../archivers/zstd/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../textproc/expat/buildlink3.mk"
 .include "../../textproc/icu/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"