Thu Oct 15 07:29:02 2009 UTC ()
PLIST fix; rev.bump


(adam)
diff -r1.12 -r1.13 pkgsrc/devel/boost-libs/Makefile
diff -r1.7 -r1.8 pkgsrc/devel/boost-libs/PLIST
diff -r1.13 -r1.14 pkgsrc/devel/boost-python/Makefile
diff -r1.5 -r1.6 pkgsrc/devel/boost-python/PLIST
diff -r1.19 -r1.20 pkgsrc/meta-pkgs/boost/Makefile.common
cvs diff -r1.12 -r1.13 pkgsrc/devel/boost-libs/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/boost-libs/Makefile 2008/09/13 16:14:13 1.12
+++ pkgsrc/devel/boost-libs/Makefile 2009/10/15 07:29:01 1.13
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile,v 1.12 2008/09/13 16:14:13 jmmv Exp $ 1# $NetBSD: Makefile,v 1.13 2009/10/15 07:29:01 adam Exp $
2# 
3 2
 3PKGREVISION= 1
4BOOST_PACKAGE= libs 4BOOST_PACKAGE= libs
5BOOST_COMMENT= (binary libraries) 5BOOST_COMMENT= (binary libraries)
6BOOST_CONFIG= installed 6BOOST_CONFIG= installed
7BOOST_INSTALL_LIBS= yes 7BOOST_INSTALL_LIBS= yes
8 8
9PKG_DESTDIR_SUPPORT= user-destdir 9PKG_DESTDIR_SUPPORT= user-destdir
10 10
11.include "../../meta-pkgs/boost/Makefile.common" 11.include "../../meta-pkgs/boost/Makefile.common"
12 12
13BJAM_ARGS+= --without-python 13BJAM_ARGS+= --without-python
14 14
15.include "../../devel/boost-jam/bjam.mk" 15.include "../../devel/boost-jam/bjam.mk"
16 16
cvs diff -r1.7 -r1.8 pkgsrc/devel/boost-libs/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/boost-libs/PLIST 2009/10/14 06:40:08 1.7
+++ pkgsrc/devel/boost-libs/PLIST 2009/10/15 07:29:01 1.8
@@ -1,42 +1,60 @@ @@ -1,42 +1,60 @@
1@comment $NetBSD: PLIST,v 1.7 2009/10/14 06:40:08 adam Exp $ 1@comment $NetBSD: PLIST,v 1.8 2009/10/15 07:29:01 adam Exp $
2lib/libboost_date_time.a 2lib/libboost_date_time.a
3lib/libboost_date_time.so 3lib/libboost_date_time.so
 4lib/libboost_date_time.so.${BOOST_VERSION}
4lib/libboost_filesystem.a 5lib/libboost_filesystem.a
5lib/libboost_filesystem.so 6lib/libboost_filesystem.so
 7lib/libboost_filesystem.so.${BOOST_VERSION}
6lib/libboost_graph.a 8lib/libboost_graph.a
7lib/libboost_graph.so 9lib/libboost_graph.so
 10lib/libboost_graph.so.${BOOST_VERSION}
8lib/libboost_iostreams.a 11lib/libboost_iostreams.a
9lib/libboost_iostreams.so 12lib/libboost_iostreams.so
 13lib/libboost_iostreams.so.${BOOST_VERSION}
10lib/libboost_math_c99.a 14lib/libboost_math_c99.a
11lib/libboost_math_c99.so 15lib/libboost_math_c99.so
 16lib/libboost_math_c99.so.${BOOST_VERSION}
12lib/libboost_math_c99f.a 17lib/libboost_math_c99f.a
13lib/libboost_math_c99f.so 18lib/libboost_math_c99f.so
 19lib/libboost_math_c99f.so.${BOOST_VERSION}
14@comment lib/libboost_math_c99l.a 20@comment lib/libboost_math_c99l.a
15@comment lib/libboost_math_c99l.so 21@comment lib/libboost_math_c99l.so
16lib/libboost_math_tr1.a 22lib/libboost_math_tr1.a
17lib/libboost_math_tr1.so 23lib/libboost_math_tr1.so
 24lib/libboost_math_tr1.so.${BOOST_VERSION}
18lib/libboost_math_tr1f.a 25lib/libboost_math_tr1f.a
19lib/libboost_math_tr1f.so 26lib/libboost_math_tr1f.so
 27lib/libboost_math_tr1f.so.${BOOST_VERSION}
20@comment lib/libboost_math_tr1l.a 28@comment lib/libboost_math_tr1l.a
21@comment lib/libboost_math_tr1l.so 29@comment lib/libboost_math_tr1l.so
22lib/libboost_prg_exec_monitor.a 30lib/libboost_prg_exec_monitor.a
23lib/libboost_prg_exec_monitor.so 31lib/libboost_prg_exec_monitor.so
 32lib/libboost_prg_exec_monitor.so.${BOOST_VERSION}
24lib/libboost_program_options.a 33lib/libboost_program_options.a
25lib/libboost_program_options.so 34lib/libboost_program_options.so
 35lib/libboost_program_options.so.${BOOST_VERSION}
26lib/libboost_regex.a 36lib/libboost_regex.a
27lib/libboost_regex.so 37lib/libboost_regex.so
 38lib/libboost_regex.so.${BOOST_VERSION}
28lib/libboost_serialization.a 39lib/libboost_serialization.a
29lib/libboost_serialization.so 40lib/libboost_serialization.so
 41lib/libboost_serialization.so.${BOOST_VERSION}
30lib/libboost_signals.a 42lib/libboost_signals.a
31lib/libboost_signals.so 43lib/libboost_signals.so
 44lib/libboost_signals.so.${BOOST_VERSION}
32lib/libboost_system.a 45lib/libboost_system.a
33lib/libboost_system.so 46lib/libboost_system.so
 47lib/libboost_system.so.${BOOST_VERSION}
34lib/libboost_test_exec_monitor.a 48lib/libboost_test_exec_monitor.a
35lib/libboost_thread.a 49lib/libboost_thread.a
36lib/libboost_thread.so 50lib/libboost_thread.so
 51lib/libboost_thread.so.${BOOST_VERSION}
37lib/libboost_unit_test_framework.a 52lib/libboost_unit_test_framework.a
38lib/libboost_unit_test_framework.so 53lib/libboost_unit_test_framework.so
 54lib/libboost_unit_test_framework.so.${BOOST_VERSION}
39lib/libboost_wave.a 55lib/libboost_wave.a
40lib/libboost_wave.so 56lib/libboost_wave.so
 57lib/libboost_wave.so.${BOOST_VERSION}
41lib/libboost_wserialization.a 58lib/libboost_wserialization.a
42lib/libboost_wserialization.so 59lib/libboost_wserialization.so
 60lib/libboost_wserialization.so.${BOOST_VERSION}
cvs diff -r1.13 -r1.14 pkgsrc/devel/boost-python/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/boost-python/Attic/Makefile 2009/10/14 06:40:08 1.13
+++ pkgsrc/devel/boost-python/Attic/Makefile 2009/10/15 07:29:02 1.14
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile,v 1.13 2009/10/14 06:40:08 adam Exp $ 1# $NetBSD: Makefile,v 1.14 2009/10/15 07:29:02 adam Exp $
2# 
3 2
 3PKGREVISION= 1
4BOOST_PACKAGE= python 4BOOST_PACKAGE= python
5BOOST_COMMENT= (Boost.Python binary library) 5BOOST_COMMENT= (Boost.Python binary library)
6BOOST_CONFIG= installed 6BOOST_CONFIG= installed
7 7
8PKG_DESTDIR_SUPPORT= user-destdir 8PKG_DESTDIR_SUPPORT= user-destdir
9 9
10.include "../../meta-pkgs/boost/Makefile.common" 10.include "../../meta-pkgs/boost/Makefile.common"
11 11
12BJAM_ARGS+= --user-config=${WRKSRC}/user-config.jam 12BJAM_ARGS+= --user-config=${WRKSRC}/user-config.jam
13BJAM_ARGS+= --with-python 13BJAM_ARGS+= --with-python
14MAKE_ENV+= BOOST_BUILD_PATH=${WRKSRC} 14MAKE_ENV+= BOOST_BUILD_PATH=${WRKSRC}
15PYTHON_VERSIONS_ACCEPTED= 26 25 15PYTHON_VERSIONS_ACCEPTED= 26 25
16 16
cvs diff -r1.5 -r1.6 pkgsrc/devel/boost-python/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/boost-python/Attic/PLIST 2009/10/14 06:40:08 1.5
+++ pkgsrc/devel/boost-python/Attic/PLIST 2009/10/15 07:29:02 1.6
@@ -1,3 +1,4 @@ @@ -1,3 +1,4 @@
1@comment $NetBSD: PLIST,v 1.5 2009/10/14 06:40:08 adam Exp $ 1@comment $NetBSD: PLIST,v 1.6 2009/10/15 07:29:02 adam Exp $
2lib/libboost_python.a 2lib/libboost_python.a
3lib/libboost_python.so 3lib/libboost_python.so
 4lib/libboost_python.so.${BOOST_VERSION}
cvs diff -r1.19 -r1.20 pkgsrc/meta-pkgs/boost/Makefile.common (expand / switch to unified diff)

--- pkgsrc/meta-pkgs/boost/Makefile.common 2009/10/14 06:40:08 1.19
+++ pkgsrc/meta-pkgs/boost/Makefile.common 2009/10/15 07:29:02 1.20
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile.common,v 1.19 2009/10/14 06:40:08 adam Exp $ 1# $NetBSD: Makefile.common,v 1.20 2009/10/15 07:29:02 adam Exp $
2 2
3BOOST_PACKAGE?= undefined 3BOOST_PACKAGE?= undefined
4BOOST_COMMENT?= undefined 4BOOST_COMMENT?= undefined
5 5
6BOOST_VERSION= 1.40.0 6BOOST_VERSION= 1.40.0
7BOOST_SHORT_VERSION= ${BOOST_VERSION:S/./_/:C/\..*$//} 7BOOST_SHORT_VERSION= ${BOOST_VERSION:S/./_/:C/\..*$//}
8 8
9DISTNAME= boost_${BOOST_VERSION:S/./_/g} 9DISTNAME= boost_${BOOST_VERSION:S/./_/g}
10CATEGORIES= devel 10CATEGORIES= devel
11 11
12.if ${BOOST_PACKAGE} == "meta-pkg" 12.if ${BOOST_PACKAGE} == "meta-pkg"
13 13
14PKGNAME= boost-${BOOST_VERSION} 14PKGNAME= boost-${BOOST_VERSION}
@@ -23,26 +23,28 @@ EXTRACT_SUFX= .tar.bz2 @@ -23,26 +23,28 @@ EXTRACT_SUFX= .tar.bz2
23MAINTAINER= jmmv@NetBSD.org 23MAINTAINER= jmmv@NetBSD.org
24HOMEPAGE= http://www.boost.org/ 24HOMEPAGE= http://www.boost.org/
25COMMENT= Free, peer-reviewed portable C++ source libraries ${BOOST_COMMENT} 25COMMENT= Free, peer-reviewed portable C++ source libraries ${BOOST_COMMENT}
26 26
27CONFLICTS+= boost<1.36.0 27CONFLICTS+= boost<1.36.0
28 28
29DISTINFO_FILE= ${.CURDIR}/../../meta-pkgs/boost/distinfo 29DISTINFO_FILE= ${.CURDIR}/../../meta-pkgs/boost/distinfo
30PATCHDIR= ${.CURDIR}/../../meta-pkgs/boost/patches 30PATCHDIR= ${.CURDIR}/../../meta-pkgs/boost/patches
31 31
32USE_TOOLS+= pax 32USE_TOOLS+= pax
33USE_LANGUAGES= c c++ 33USE_LANGUAGES= c c++
34GCC_REQD+= 3.2 # if using gcc; ignored otherwise 34GCC_REQD+= 3.2 # if using gcc; ignored otherwise
35 35
 36PLIST_SUBST+= BOOST_VERSION="${BOOST_VERSION}"
 37
36SUBST_CLASSES+= fix-prefix 38SUBST_CLASSES+= fix-prefix
37SUBST_STAGE.fix-prefix= pre-configure 39SUBST_STAGE.fix-prefix= pre-configure
38SUBST_MESSAGE.fix-prefix= Fixing prefix. 40SUBST_MESSAGE.fix-prefix= Fixing prefix.
39SUBST_FILES.fix-prefix= Jamroot 41SUBST_FILES.fix-prefix= Jamroot
40SUBST_VARS.fix-prefix= PREFIX 42SUBST_VARS.fix-prefix= PREFIX
41 43
42.include "../../mk/bsd.prefs.mk" 44.include "../../mk/bsd.prefs.mk"
43 45
44.if ${OPSYS} == "Darwin" 46.if ${OPSYS} == "Darwin"
45# Prevent using a pkgsrc libtool in OS X because the darwin toolset needs 47# Prevent using a pkgsrc libtool in OS X because the darwin toolset needs
46# the native libtool from /usr/bin. 48# the native libtool from /usr/bin.
47post-wrapper: 49post-wrapper:
48 ln -s /usr/bin/libtool ${WRAPPER_BINDIR}/libtool 50 ln -s /usr/bin/libtool ${WRAPPER_BINDIR}/libtool