diff options
| author | bapt <bapt@FreeBSD.org> | 2013-01-31 21:38:42 +0800 |
|---|---|---|
| committer | bapt <bapt@FreeBSD.org> | 2013-01-31 21:38:42 +0800 |
| commit | 4bcc7b42bb70613448f06e4c9bf9ee4954a45279 (patch) | |
| tree | 384a6fe89b7bf8bffcc478f3462d538eea755790 | |
| parent | 3abf6e1909ca1ed94d5f66c10c68147f3f687a2f (diff) | |
| download | freebsd-ports-gnome-4bcc7b42bb70613448f06e4c9bf9ee4954a45279.tar.gz freebsd-ports-gnome-4bcc7b42bb70613448f06e4c9bf9ee4954a45279.tar.zst freebsd-ports-gnome-4bcc7b42bb70613448f06e4c9bf9ee4954a45279.zip | |
Chase boost update
161 files changed, 1899 insertions, 579 deletions
diff --git a/audio/ardour/Makefile b/audio/ardour/Makefile index 9e7a4f77bd22..26833797a019 100644 --- a/audio/ardour/Makefile +++ b/audio/ardour/Makefile @@ -1,12 +1,9 @@ -# New ports collection makefile for: Ardour -# Date created: 2006-12-04 -# Whom: Edward Tomasz Napierala <trasz@pin.if.uz.zgora.pl> -# +# Created by: Edward Tomasz Napierala <trasz@pin.if.uz.zgora.pl> # $FreeBSD$ -# PORTNAME= ardour PORTVERSION= 2.8.14 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= http://freebsd.nsu.ru/distfiles/ diff --git a/audio/ardour/files/patch-boost-1.52 b/audio/ardour/files/patch-boost-1.52 new file mode 100644 index 000000000000..ac9bbf034896 --- /dev/null +++ b/audio/ardour/files/patch-boost-1.52 @@ -0,0 +1,13 @@ +--- SConstruct.orig 2012-11-21 00:30:54.000000000 +0100 ++++ SConstruct 2012-11-21 17:34:02.000000000 +0100 +@@ -955,7 +961,9 @@ + # FLAC .... + # + +-# boost (we don't link against boost, just use some header files) ++# boost (we need to link against boost with >=1.50. header files alone will not work anymore) ++ ++env.Append(LIBS=['boost_system']) + + libraries['boost'] = LibraryInfo () + prep_libcheck(env, libraries['boost']) diff --git a/audio/cpp-xmms2/Makefile b/audio/cpp-xmms2/Makefile index 8fcf8d963618..d4f9c7a2134b 100644 --- a/audio/cpp-xmms2/Makefile +++ b/audio/cpp-xmms2/Makefile @@ -1,14 +1,14 @@ # Created by: Alexander Botero-Lowry <alex@foxybanana.com> # $FreeBSD$ -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= audio PKGNAMEPREFIX= cpp- MAINTAINER= madpilot@FreeBSD.org COMMENT= C++ Bindings for XMMS2 -LIB_DEPENDS+= boost_signals.4:${PORTSDIR}/devel/boost-libs \ +LIB_DEPENDS+= boost_signals:${PORTSDIR}/devel/boost-libs \ xmmsclient.6:${PORTSDIR}/audio/xmms2 MASTERDIR= ${.CURDIR}/../xmms2 diff --git a/audio/mp3plot/Makefile b/audio/mp3plot/Makefile index ac37d1029528..09e2fefd1e19 100644 --- a/audio/mp3plot/Makefile +++ b/audio/mp3plot/Makefile @@ -1,20 +1,16 @@ -# New ports collection makefile for: mp3plot -# Date created: 12 June 2007 -# Whom: Andrew Pantyukhin <infofarmer@FreeBSD.org> -# +# Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org> # $FreeBSD$ -# PORTNAME= mp3plot DISTVERSION= 0.6.0 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= audio MASTER_SITES= http://p.outlyer.net/mp3plot/files/ MAINTAINER= sylvio@FreeBSD.org COMMENT= Mp3 bitrate plot tool -LIB_DEPENDS= boost_thread.4:${PORTSDIR}/devel/boost-libs +LIB_DEPENDS= boost_thread:${PORTSDIR}/devel/boost-libs OPTIONS= GD "Enable support for GD library" on \ IMAGEMAGICK "Enable support for Magick++" off @@ -24,6 +20,7 @@ LICENSE= GPLv2 GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-boost-program-options=boost_program_options \ --with-boost-thread=boost_thread +CONFIGURE_ENV+= "LIBS=-lboost_system" MAN1= ${PORTNAME}.1 PLIST_FILES= bin/${PORTNAME} @@ -46,6 +43,8 @@ CONFIGURE_ARGS+= --disable-magick .endif post-patch: - @${REINPLACE_CMD} -e '/bldtype_/s|-O2||g' ${WRKSRC}/configure + @${REINPLACE_CMD} -e '/bldtype_/s|-O2||g' \ + -e 's|^extra_LD.*||g' \ + ${WRKSRC}/configure .include <bsd.port.post.mk> diff --git a/audio/mumble/Makefile b/audio/mumble/Makefile index c53ae6ea3739..16141c00bbb6 100644 --- a/audio/mumble/Makefile +++ b/audio/mumble/Makefile @@ -1,13 +1,9 @@ -# New ports collection makefile for: mumble -# Date created: 1 February 2009 -# Whom: marius nuennerich -# +# Created by: marius nuennerich # $FreeBSD$ -# PORTNAME= mumble PORTVERSION= 1.2.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio MASTER_SITES= SF/${PORTNAME}/Mumble/${PORTVERSION} diff --git a/audio/patchage/Makefile b/audio/patchage/Makefile index 2f0b89364a10..6b6ad7c9a95f 100644 --- a/audio/patchage/Makefile +++ b/audio/patchage/Makefile @@ -1,13 +1,9 @@ -# New ports collection makefile for: patchage -# Date created: 2008-07-22 -# Whom: Edward Tomasz Napierala <trasz@FreeBSD.org> -# +# Created by: Edward Tomasz Napierala <trasz@FreeBSD.org> # $FreeBSD$ -# PORTNAME= patchage PORTVERSION= 0.5.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio MASTER_SITES= http://download.drobilla.net/ \ http://frugalware.mirrors.tds.net/pub/linux/frugalware/frugalware-current/source/xmultimedia-extra/patchage/ @@ -20,7 +16,7 @@ LICENSE_COMB= dual LIB_DEPENDS= jack.0:${PORTSDIR}/audio/jack \ raul.10:${PORTSDIR}/audio/raul \ - boost_date_time.4:${PORTSDIR}/devel/boost-libs \ + boost_date_time:${PORTSDIR}/devel/boost-libs \ dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ glibmm-2.4.1:${PORTSDIR}/devel/glibmm \ glademm-2.4:${PORTSDIR}/devel/libglademm24 \ diff --git a/audio/raul/Makefile b/audio/raul/Makefile index b386b0c45837..b0d340bc6c7f 100644 --- a/audio/raul/Makefile +++ b/audio/raul/Makefile @@ -1,12 +1,9 @@ -# New ports collection makefile for: raul -# Date created: 2008-07-22 -# Whom: Edward Tomasz Napierala <trasz@FreeBSD.org> -# +# Created by: Edward Tomasz Napierala <trasz@FreeBSD.org> # $FreeBSD$ -# PORTNAME= raul PORTVERSION= 0.8.0 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= http://download.drobilla.net/ @@ -16,7 +13,7 @@ COMMENT= C++ utility library primarily aimed at audio/musical applications LICENSE= GPLv2 GPLv3 LICENSE_COMB= dual -LIB_DEPENDS= boost_date_time.4:${PORTSDIR}/devel/boost-libs +LIB_DEPENDS= boost_date_time:${PORTSDIR}/devel/boost-libs USE_BZIP2= yes USE_GNOME= glib20 diff --git a/cad/kicad-devel/Makefile b/cad/kicad-devel/Makefile index 9ab682cff857..2057049dc031 100644 --- a/cad/kicad-devel/Makefile +++ b/cad/kicad-devel/Makefile @@ -1,13 +1,9 @@ -# New ports collection makefile for: kicad-devel -# Date created: 27 October 2009 -# Whom: Michael Reifenberger <mr@FreeBSD.org> -# +# Created by: Michael Reifenberger <mr@FreeBSD.org> # $FreeBSD$ -# PORTNAME= kicad DISTVERSION= r${BZR_SRC_REV} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= cad DIST_SUBDIR= ${PORTNAME} MASTER_SITES= ${MASTER_SITE_LOCAL} @@ -18,7 +14,7 @@ PKGNAMESUFFIX= -devel MAINTAINER= mr@FreeBSD.org COMMENT= Schematic and PCB editing software -LIB_DEPENDS= boost_thread.4:${PORTSDIR}/devel/boost-libs +LIB_DEPENDS= boost_thread:${PORTSDIR}/devel/boost-libs CONFLICTS= kicad-2008* diff --git a/cad/kicad/Makefile b/cad/kicad/Makefile index 4957769cc0b5..e1877b4760f1 100644 --- a/cad/kicad/Makefile +++ b/cad/kicad/Makefile @@ -1,13 +1,9 @@ -# New ports collection makefile for: kicad -# Date created: 29 November 2005 -# Whom: Thierry Thomas <thierry@FreeBSD.org> -# +# Created by: Thierry Thomas <thierry@FreeBSD.org> # $FreeBSD$ -# PORTNAME= kicad DISTVERSION= 2010-05-05-BZR2356 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= cad MASTER_SITES= ftp://iut-tice.ujf-grenoble.fr/cao/ \ @@ -19,7 +15,7 @@ EXTRACT_ONLY= ${SFNAME}-stable${EXTRACT_SUFX} MAINTAINER= thierry@FreeBSD.org COMMENT= Schematic and PCB editing software -LIB_DEPENDS= boost_thread.4:${PORTSDIR}/devel/boost-libs +LIB_DEPENDS= boost_thread:${PORTSDIR}/devel/boost-libs RUN_DEPENDS= ${LOCALBASE}/share/kicad/library/74xx.dcm:${PORTSDIR}/cad/kicad-library CONFLICTS= kicad-devel* diff --git a/chinese/librime/Makefile b/chinese/librime/Makefile index 50902b632c9c..a562d5b90fac 100644 --- a/chinese/librime/Makefile +++ b/chinese/librime/Makefile @@ -3,6 +3,7 @@ PORTNAME= librime PORTVERSION= 0.9.4 +PORTREVISION= 1 CATEGORIES= chinese textproc MASTER_SITES= GOOGLE_CODE DISTFILES= ${DISTNAME}${EXTRACT_SUFX} brise-${DATA_VER}.tar.gz diff --git a/comms/gnuradio/Makefile b/comms/gnuradio/Makefile index 1b8a1d36bd1f..3bb56939a25a 100644 --- a/comms/gnuradio/Makefile +++ b/comms/gnuradio/Makefile @@ -2,6 +2,7 @@ PORTNAME= gnuradio PORTVERSION= 3.6.2 +PORTREVISION= 1 CATEGORIES= comms astro hamradio MASTER_SITES= http://gnuradio.org/releases/gnuradio/ diff --git a/comms/usrp/Makefile b/comms/usrp/Makefile index d7841d612789..338c46a55a15 100644 --- a/comms/usrp/Makefile +++ b/comms/usrp/Makefile @@ -2,6 +2,7 @@ PORTNAME= usrp PORTVERSION= 3.4.3 +PORTREVISION= 1 CATEGORIES= comms hamradio MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= adrian diff --git a/databases/akonadi/Makefile b/databases/akonadi/Makefile index 449c6ca27535..660e6b8ac09f 100644 --- a/databases/akonadi/Makefile +++ b/databases/akonadi/Makefile @@ -1,12 +1,9 @@ -# New ports collection Makefile for: akonadi -# Date created: 2008-01-20 -# Whom: miwi -# +# Created by: miwi # $FreeBSD$ PORTNAME= akonadi PORTVERSION= 1.7.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= databases kde ipv6 MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTNAME}/src/ diff --git a/databases/flare/Makefile b/databases/flare/Makefile index 2fd3d9f5d5a2..d8243f2af647 100644 --- a/databases/flare/Makefile +++ b/databases/flare/Makefile @@ -1,13 +1,9 @@ -# New ports collection makefile for: flare -# Date created: 2010-05-29 -# Whom: Norikatsu Shigemura <nork@FreeBSD.org> -# +# Created by: Norikatsu Shigemura <nork@FreeBSD.org> # $FreeBSD$ -# PORTNAME= flare PORTVERSION= 1.0.9 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= databases MASTER_SITES= http://labs.gree.jp/data/source/ EXTRACT_SUFX= .tgz @@ -15,8 +11,8 @@ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= Flare - distributed and persistent key-value storage -LIB_DEPENDS= boost_program_options.4:${PORTSDIR}/devel/boost-libs \ - tokyocabinet.9:${PORTSDIR}/databases/tokyocabinet +LIB_DEPENDS= boost_program_options:${PORTSDIR}/devel/boost-libs \ + tokyocabinet:${PORTSDIR}/databases/tokyocabinet LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING diff --git a/databases/mongodb/Makefile b/databases/mongodb/Makefile index 8fa82f9f5886..08ab51b71b2d 100644 --- a/databases/mongodb/Makefile +++ b/databases/mongodb/Makefile @@ -1,13 +1,9 @@ -# New ports collection makefile for: mongodb -# Date created: 3 November 2009 -# Whom: Mirko Zinn <mail@derzinn.de> -# +# Created by: Mirko Zinn <mail@derzinn.de> # $FreeBSD$ -# PORTNAME= mongodb PORTVERSION= 2.2.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases net MASTER_SITES= http://downloads.mongodb.org/src/ DISTNAME= ${PORTNAME}-src-r${PORTVERSION} diff --git a/databases/mongodb/files/patch-boost-1.52 b/databases/mongodb/files/patch-boost-1.52 new file mode 100644 index 000000000000..60bb474f93f6 --- /dev/null +++ b/databases/mongodb/files/patch-boost-1.52 @@ -0,0 +1,215 @@ +--- src/mongo/db/db.cpp 2012-08-28 08:28:11.000000000 +0300 ++++ src/mongo/db/db.cpp 2012-10-21 18:25:50.000000000 +0300 +@@ -348,7 +348,7 @@ + boost::filesystem::path path( dbpath ); + for ( boost::filesystem::directory_iterator i( path ); + i != boost::filesystem::directory_iterator(); ++i ) { +- string fileName = boost::filesystem::path(*i).leaf(); ++ string fileName = boost::filesystem::path(*i).leaf().string(); + if ( boost::filesystem::is_directory( *i ) && + fileName.length() && fileName[ 0 ] == '$' ) + boost::filesystem::remove_all( *i ); +@@ -748,11 +748,11 @@ + dbExecCommand = argv[0]; + + srand(curTimeMicros()); +-#if( BOOST_VERSION >= 104500 ) +- boost::filesystem::path::default_name_check( boost::filesystem2::no_check ); +-#else +- boost::filesystem::path::default_name_check( boost::filesystem::no_check ); +-#endif ++// #if( BOOST_VERSION >= 104500 ) ++// boost::filesystem::path::default_name_check( boost::filesystem2::no_check ); ++// #else ++// boost::filesystem::path::default_name_check( boost::filesystem::no_check ); ++// #endif + + { + unsigned x = 0x12345678; +@@ -1083,7 +1083,7 @@ + if (params.count("shutdown")){ + bool failed = false; + +- string name = ( boost::filesystem::path( dbpath ) / "mongod.lock" ).native_file_string(); ++ string name = ( boost::filesystem::path( dbpath ) / "mongod.lock" ).string(); + if ( !boost::filesystem::exists( name ) || boost::filesystem::file_size( name ) == 0 ) + failed = true; + +--- src/mongo/db/dur.cpp 2012-08-28 08:28:11.000000000 +0300 ++++ src/mongo/db/dur.cpp 2012-10-21 18:25:50.000000000 +0300 +@@ -770,7 +770,7 @@ + + bool samePartition = true; + try { +- const string dbpathDir = boost::filesystem::path(dbpath).native_directory_string(); ++ const string dbpathDir = boost::filesystem::path(dbpath).string(); + samePartition = onSamePartition(getJournalDir().string(), dbpathDir); + } + catch(...) { +--- src/mongo/db/dur_journal.cpp 2012-08-28 08:28:11.000000000 +0300 ++++ src/mongo/db/dur_journal.cpp 2012-10-21 18:25:50.000000000 +0300 +@@ -176,7 +176,7 @@ + for ( boost::filesystem::directory_iterator i( getJournalDir() ); + i != boost::filesystem::directory_iterator(); + ++i ) { +- string fileName = boost::filesystem::path(*i).leaf(); ++ string fileName = boost::filesystem::path(*i).leaf().string(); + if( anyFiles || str::startsWith(fileName, "j._") ) + return true; + } +@@ -194,7 +194,7 @@ + for ( boost::filesystem::directory_iterator i( getJournalDir() ); + i != boost::filesystem::directory_iterator(); + ++i ) { +- string fileName = boost::filesystem::path(*i).leaf(); ++ string fileName = boost::filesystem::path(*i).leaf().string(); + if( str::startsWith(fileName, "j._") ) { + try { + removeOldJournalFile(*i); +--- src/mongo/db/dur_recover.cpp 2012-08-28 08:28:11.000000000 +0300 ++++ src/mongo/db/dur_recover.cpp 2012-10-21 18:25:50.000000000 +0300 +@@ -72,7 +72,7 @@ + i != boost::filesystem::directory_iterator(); + ++i ) { + boost::filesystem::path filepath = *i; +- string fileName = boost::filesystem::path(*i).leaf(); ++ string fileName = boost::filesystem::path(*i).leaf().string(); + if( str::startsWith(fileName, "j._") ) { + unsigned u = str::toUnsigned( str::after(fileName, '_') ); + if( m.count(u) ) { +@@ -85,7 +85,7 @@ + if( i != m.begin() && m.count(i->first - 1) == 0 ) { + uasserted(13532, + str::stream() << "unexpected file in journal directory " << dir.string() +- << " : " << boost::filesystem::path(i->second).leaf() << " : can't find its preceeding file"); ++ << " : " << boost::filesystem::path(i->second).leaf().string() << " : can't find its preceeding file"); + } + files.push_back(i->second); + } +--- src/mongo/db/instance.cpp 2012-08-28 08:28:11.000000000 +0300 ++++ work/mongodb-src-r2.2.0/src/mongo/db/instance.cpp 2012-10-21 18:25:50.000000000 +0300 +@@ -833,13 +833,13 @@ + i != boost::filesystem::directory_iterator(); ++i ) { + if ( directoryperdb ) { + boost::filesystem::path p = *i; +- string dbName = p.leaf(); ++ string dbName = p.leaf().string(); + p /= ( dbName + ".ns" ); + if ( exists( p ) ) + names.push_back( dbName ); + } + else { +- string fileName = boost::filesystem::path(*i).leaf(); ++ string fileName = boost::filesystem::path(*i).leaf().string(); + if ( fileName.length() > 3 && fileName.substr( fileName.length() - 3, 3 ) == ".ns" ) + names.push_back( fileName.substr( 0, fileName.length() - 3 ) ); + } +@@ -1102,7 +1102,7 @@ + } + + void acquirePathLock(bool doingRepair) { +- string name = ( boost::filesystem::path( dbpath ) / "mongod.lock" ).native_file_string(); ++ string name = ( boost::filesystem::path( dbpath ) / "mongod.lock" ).string(); + + bool oldFile = false; + +--- src/mongo/db/pdfile.cpp 2012-08-28 08:28:11.000000000 +0300 ++++ src/mongo/db/pdfile.cpp 2012-10-21 18:25:50.000000000 +0300 +@@ -1675,7 +1675,7 @@ + virtual bool apply( const Path &p ) { + if ( !boost::filesystem::exists( p ) ) + return false; +- boostRenameWrapper( p, newPath_ / ( p.leaf() + ".bak" ) ); ++ boostRenameWrapper( p, newPath_ / ( p.leaf().string() + ".bak" ) ); + return true; + } + virtual const char * op() const { +@@ -1783,7 +1783,7 @@ + uniqueReservedPath( ( preserveClonedFilesOnFailure || backupOriginalFiles ) ? + "backup" : "_tmp" ); + MONGO_ASSERT_ON_EXCEPTION( boost::filesystem::create_directory( reservedPath ) ); +- string reservedPathString = reservedPath.native_directory_string(); ++ string reservedPathString = reservedPath.string(); + + bool res; + { +--- src/mongo/dbtests/framework.cpp 2012-08-28 08:28:11.000000000 +0300 ++++ src/mongo/dbtests/framework.cpp 2012-10-21 18:25:50.000000000 +0300 +@@ -199,7 +199,7 @@ + boost::filesystem::create_directory(p); + } + +- string dbpathString = p.native_directory_string(); ++ string dbpathString = p.string(); + dbpath = dbpathString.c_str(); + + cmdLine.prealloc = false; +--- src/mongo/pch.h 2012-08-28 08:28:11.000000000 +0300 ++++ src/mongo/pch.h 2012-10-21 18:25:50.000000000 +0300 +@@ -44,7 +44,7 @@ + #include "string.h" + #include "limits.h" + +-#define BOOST_FILESYSTEM_VERSION 2 ++#define BOOST_FILESYSTEM_VERSION 3 + #include <boost/shared_ptr.hpp> + #include <boost/smart_ptr.hpp> + #include <boost/function.hpp> +--- src/mongo/shell/shell_utils_launcher.cpp 2012-08-28 08:28:11.000000000 +0300 ++++ src/mongo/shell/shell_utils_launcher.cpp 2012-10-21 18:25:50.000000000 +0300 +@@ -184,7 +184,7 @@ + } + #endif + +- _argv.push_back( programPath.native_file_string() ); ++ _argv.push_back( programPath.string() ); + + _port = -1; + +--- src/mongo/tools/restore.cpp 2012-08-28 08:28:11.000000000 +0300 ++++ src/mongo/tools/restore.cpp 2012-10-21 18:25:50.000000000 +0300 +@@ -174,7 +174,7 @@ + log(2) << "drillDown: " << root.string() << endl; + + // skip hidden files and directories +- if (root.leaf()[0] == '.' && root.leaf() != ".") ++ if (root.leaf().string()[0] == '.' && root.leaf().string() != ".") + return; + + if ( is_directory( root ) ) { +@@ -255,7 +255,7 @@ + + verify( ns.size() ); + +- string oldCollName = root.leaf(); // Name of the collection that was dumped from ++ string oldCollName = root.leaf().string(); // Name of the collection that was dumped from + oldCollName = oldCollName.substr( 0 , oldCollName.find_last_of( "." ) ); + if (use_coll) { + ns += "." + _coll; +@@ -287,7 +287,7 @@ + if (!boost::filesystem::exists(metadataFile.string())) { + // This is fine because dumps from before 2.1 won't have a metadata file, just print a warning. + // System collections shouldn't have metadata so don't warn if that file is missing. +- if (!startsWith(metadataFile.leaf(), "system.")) { ++ if (!startsWith(metadataFile.leaf().string(), "system.")) { + log() << metadataFile.string() << " not found. Skipping." << endl; + } + } else { +--- src/mongo/tools/tool.cpp 2012-08-28 08:28:11.000000000 +0300 ++++ src/mongo/tools/tool.cpp 2012-10-21 18:25:50.000000000 +0300 +@@ -118,11 +118,11 @@ + // we want durability to be disabled. + cmdLine.dur = false; + +-#if( BOOST_VERSION >= 104500 ) +- boost::filesystem::path::default_name_check( boost::filesystem2::no_check ); +-#else +- boost::filesystem::path::default_name_check( boost::filesystem::no_check ); +-#endif ++// #if( BOOST_VERSION >= 104500 ) ++// boost::filesystem::path::default_name_check( boost::filesystem2::no_check ); ++// #else ++// boost::filesystem::path::default_name_check( boost::filesystem::no_check ); ++// #endif + + _name = argv[0]; diff --git a/databases/mysql-connector-c++/Makefile b/databases/mysql-connector-c++/Makefile index 37c154a87b3a..9b49315deb5f 100644 --- a/databases/mysql-connector-c++/Makefile +++ b/databases/mysql-connector-c++/Makefile @@ -1,12 +1,9 @@ -# New ports collection Makefile for: mysql-connector-c++ -# Date created: 25 August 2011 -# Whom: gahr -# +# Created by: gahr # $FreeBSD$ -# PORTNAME= mysql-connector-c++ PORTVERSION= 1.1.1 +PORTREVISION= 1 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_MYSQL} MASTER_SITE_SUBDIR= Connector-C++ @@ -16,7 +13,7 @@ COMMENT= A MySQL database connector for C++ LICENSE= GPLv2 -LIB_DEPENDS= boost_regex.4:${PORTSDIR}/devel/boost-libs +LIB_DEPENDS= boost_regex:${PORTSDIR}/devel/boost-libs USE_MYSQL= 51+ USE_LDCONFIG= yes diff --git a/deskutils/gnote/Makefile b/deskutils/gnote/Makefile index cc9ddb560c23..6d21360b65c2 100644 --- a/deskutils/gnote/Makefile +++ b/deskutils/gnote/Makefile @@ -3,7 +3,7 @@ PORTNAME= gnote PORTVERSION= 0.7.6 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= deskutils gnome MASTER_SITES= GNOME @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 \ pcre.3:${PORTSDIR}/devel/pcre \ gtkspell.0:${PORTSDIR}/textproc/gtkspell \ - boost_filesystem.4:${PORTSDIR}/devel/boost-libs \ + boost_filesystem:${PORTSDIR}/devel/boost-libs \ uuid.1:${PORTSDIR}/misc/e2fsprogs-libuuid USE_GMAKE= yes diff --git a/deskutils/kdepim4-runtime/Makefile b/deskutils/kdepim4-runtime/Makefile index 4ba6abcf3ae7..08667ec1bfbe 100644 --- a/deskutils/kdepim4-runtime/Makefile +++ b/deskutils/kdepim4-runtime/Makefile @@ -1,11 +1,9 @@ -# New ports collection Makefile for: kdepimp4 -# Date created: 2008-31-05 -# Whom: miwi -# +# Created by: miwi # $FreeBSD$ PORTNAME= kdepim-runtime PORTVERSION= ${KDE4_VERSION} +PORTREVISION= 1 CATEGORIES= deskutils kde ipv6 MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src @@ -14,7 +12,7 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Libraries for KDE-PIM applications -LIB_DEPENDS= boost_thread.4:${PORTSDIR}/devel/boost-libs +LIB_DEPENDS= boost_thread:${PORTSDIR}/devel/boost-libs BUILD_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt CONFLICTS_INSTALL= kdepim-runtime-4.4.* diff --git a/deskutils/kdepim4/Makefile b/deskutils/kdepim4/Makefile index 65e13af34352..b1b391a1e9ac 100644 --- a/deskutils/kdepim4/Makefile +++ b/deskutils/kdepim4/Makefile @@ -3,7 +3,7 @@ PORTNAME= kdepim PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= deskutils kde ipv6 MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src @@ -15,7 +15,7 @@ COMMENT= Libraries for KDE-PIM applications LIB_DEPENDS= gpgme.19:${PORTSDIR}/security/gpgme \ assuan.0:${PORTSDIR}/security/libassuan \ sasl2:${PORTSDIR}/security/cyrus-sasl2 \ - boost_thread.4:${PORTSDIR}/devel/boost-libs \ + boost_thread:${PORTSDIR}/devel/boost-libs \ grantlee_gui.0:${PORTSDIR}/devel/grantlee \ clucene-core:${PORTSDIR}/textproc/clucene BUILD_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt diff --git a/deskutils/kdepim44-runtime/Makefile b/deskutils/kdepim44-runtime/Makefile index 10d82ce06b13..ea05e6abe556 100644 --- a/deskutils/kdepim44-runtime/Makefile +++ b/deskutils/kdepim44-runtime/Makefile @@ -1,12 +1,9 @@ -# New ports collection Makefile for: kdepimp4 -# Date created: 2008-31-05 -# Whom: miwi -# +# Created by: miwi # $FreeBSD$ PORTNAME= kdepim-runtime PORTVERSION= 4.4.11.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= deskutils kde ipv6 MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/kdepim-${PORTVERSION}/src diff --git a/deskutils/kdepim44/Makefile b/deskutils/kdepim44/Makefile index 074c2480d968..6c761fbdb6ce 100644 --- a/deskutils/kdepim44/Makefile +++ b/deskutils/kdepim44/Makefile @@ -1,12 +1,9 @@ -# New ports collection Makefile for: kdepimp4 -# Date created: 2008-31-05 -# Whom: miwi -# +# Created by: miwi # $FreeBSD$ PORTNAME= kdepim PORTVERSION= 4.4.11.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= deskutils kde ipv6 MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/kdepim-${PORTVERSION}/src diff --git a/deskutils/kdepimlibs4/Makefile b/deskutils/kdepimlibs4/Makefile index 3acdccfdd4dc..8173f959386e 100644 --- a/deskutils/kdepimlibs4/Makefile +++ b/deskutils/kdepimlibs4/Makefile @@ -1,12 +1,9 @@ -# New ports collection Makefile for: kdepimplibs -# Date created: 2008-01-20 -# Whom: arved -# +# Created by: arved # $FreeBSD$ PORTNAME= kdepimlibs PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= deskutils kde ipv6 MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src @@ -17,7 +14,7 @@ COMMENT= Libraries for KDE-PIM applications LIB_DEPENDS= gpgme.19:${PORTSDIR}/security/gpgme \ sasl2:${PORTSDIR}/security/cyrus-sasl2 \ - boost_thread.4:${PORTSDIR}/devel/boost-libs \ + boost_thread:${PORTSDIR}/devel/boost-libs \ ical:${PORTSDIR}/devel/libical \ uuid.1:${PORTSDIR}/misc/e2fsprogs-libuuid \ prison.0:${PORTSDIR}/graphics/prison diff --git a/deskutils/launchy/Makefile b/deskutils/launchy/Makefile index 5dadd461faa9..bcbcb04e5d58 100644 --- a/deskutils/launchy/Makefile +++ b/deskutils/launchy/Makefile @@ -10,7 +10,7 @@ MASTER_SITES= SF/${PORTNAME}/Launchy%20on%20Linux/${PORTVERSION} MAINTAINER= eadler@FreeBSD.org COMMENT= An open source keystroke launcher -BUILD_DEPENDS= ${LOCALBASE}/include/boost/spirit/core.hpp:${PORTSDIR}/devel/boost-libs +BUILD_DEPENDS= ${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs RUN_DEPENDS= ${LOCALBASE}/bin/xdg-open:${PORTSDIR}/devel/xdg-utils USE_DOS2UNIX= readme.lyx readme.txt diff --git a/deskutils/pinot/Makefile b/deskutils/pinot/Makefile index e68ffbed8665..86927b590a3e 100644 --- a/deskutils/pinot/Makefile +++ b/deskutils/pinot/Makefile @@ -3,6 +3,7 @@ PORTNAME= pinot PORTVERSION= 1.03 +PORTREVISION= 1 CATEGORIES= deskutils MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} #MASTER_SITES= http://colinf.chez.com/pinot/ @@ -19,7 +20,7 @@ LIB_DEPENDS= xapian:${PORTSDIR}/databases/xapian-core \ exttextcat-2.0:${PORTSDIR}/textproc/libexttextcat \ dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ xml\\+\\+-2.6:${PORTSDIR}/textproc/libxml++26 \ - boost_thread.4:${PORTSDIR}/devel/boost-libs \ + boost_thread:${PORTSDIR}/devel/boost-libs \ execinfo.1:${PORTSDIR}/devel/libexecinfo \ exif.12:${PORTSDIR}/graphics/libexif \ exiv2.12:${PORTSDIR}/graphics/exiv2 \ diff --git a/deskutils/strigi/Makefile b/deskutils/strigi/Makefile index 4c35ac12251c..2fc490f9aece 100644 --- a/deskutils/strigi/Makefile +++ b/deskutils/strigi/Makefile @@ -3,7 +3,7 @@ PORTNAME= strigi PORTVERSION= 0.7.7 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= deskutils MASTER_SITES= http://rdieter.fedorapeople.org/strigi/ #MASTER_SITES= http://www.vandenoever.info/software/strigi/ \ diff --git a/devel/avro-cpp/Makefile b/devel/avro-cpp/Makefile index 21344aa4ff1c..14538a82524c 100644 --- a/devel/avro-cpp/Makefile +++ b/devel/avro-cpp/Makefile @@ -3,6 +3,7 @@ PORTNAME= avro PORTVERSION= 1.7.3 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= APACHE MASTER_SITE_SUBDIR= ${PORTNAME}/stable diff --git a/devel/cocaine-core/Makefile b/devel/cocaine-core/Makefile index dbd13706125c..77cf5c88d9e3 100644 --- a/devel/cocaine-core/Makefile +++ b/devel/cocaine-core/Makefile @@ -3,6 +3,7 @@ PORTNAME= cocaine-core PORTVERSION= 0.10 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= GH GHC @@ -26,6 +27,12 @@ GH_ACCOUNT= zloidemon GH_COMMIT= 7d0f35c GH_TAGNAME= master +MAKE_JOBS_SAFE= yes + CONFLICTS= json-c-[0-9]* +post-patch: + @${REINPLACE_CMD} -e "s,boost_thread,boost_thread ${PTHREAD_LIBS},g" \ + ${WRKSRC}/CMakeLists.txt + .include <bsd.port.mk> diff --git a/devel/eblob/Makefile b/devel/eblob/Makefile index 1d7104be153b..14354fdc3016 100644 --- a/devel/eblob/Makefile +++ b/devel/eblob/Makefile @@ -3,6 +3,7 @@ PORTNAME= eblob PORTVERSION= 0.17.5 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= g.veniamin@googlemail.com diff --git a/devel/edb/Makefile b/devel/edb/Makefile index 09bdffc76f08..7c48ff3c05d5 100644 --- a/devel/edb/Makefile +++ b/devel/edb/Makefile @@ -2,7 +2,7 @@ PORTNAME= edb PORTVERSION= 0.9.18 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= http://codef00.com/projects/ DISTNAME= debugger-${PORTVERSION} diff --git a/devel/kdesdk4/Makefile b/devel/kdesdk4/Makefile index b9d214088e2b..cfcd9a0cc139 100644 --- a/devel/kdesdk4/Makefile +++ b/devel/kdesdk4/Makefile @@ -1,11 +1,9 @@ -# New ports collection Makefile for: kdesdk -# Date created: 2008-01-31 -# Whom: Martin Wilke <miwi@FreeBSD.org> -# +# Created by: Martin Wilke <miwi@FreeBSD.org> # $FreeBSD$ PORTNAME= kdesdk PORTVERSION= ${KDE4_VERSION} +PORTREVISION= 1 CATEGORIES= devel kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src @@ -15,7 +13,7 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KDE Software Development Kit LIB_DEPENDS= svn_client-1.0:${PORTSDIR}/devel/subversion \ - boost_thread.4:${PORTSDIR}/devel/boost-libs \ + boost_thread:${PORTSDIR}/devel/boost-libs \ hunspell-1.3.0:${PORTSDIR}/textproc/hunspell \ qca.2:${PORTSDIR}/devel/qca BUILD_DEPENDS= ${LOCALBASE}/include/ltdl.h:${PORTSDIR}/devel/libltdl diff --git a/devel/kdevplatform/Makefile b/devel/kdevplatform/Makefile index 062c98a2772e..cd642344f6f4 100644 --- a/devel/kdevplatform/Makefile +++ b/devel/kdevplatform/Makefile @@ -1,12 +1,9 @@ -# New ports collection makefile for: kdevplatform -# Date created: Sun Aug 23 17:14:39 UTC 2009 -# Whom: Golyashov Sergei <svvord@mail.ru> -# +# Created by: Golyashov Sergei <svvord@mail.ru> # $FreeBSD$ PORTNAME= kdevplatform PORTVERSION= ${KDEVELOP_VERSION:S/4./1./} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDEVELOP_BRANCH}/kdevelop/${KDEVELOP_VERSION}/src @@ -16,7 +13,7 @@ MAINTAINER= kde@FreeBSD.org COMMENT= KDE development platform LIB_DEPENDS= svn_client-1.0:${PORTSDIR}/devel/subversion \ - boost_thread.4:${PORTSDIR}/devel/boost-libs \ + boost_thread:${PORTSDIR}/devel/boost-libs \ qjson.0:${PORTSDIR}/devel/qjson USE_BZIP2= yes diff --git a/devel/libXGP/Makefile b/devel/libXGP/Makefile index b83ca23d9759..5c42179ad09b 100644 --- a/devel/libXGP/Makefile +++ b/devel/libXGP/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: libXGP -# Date created: 20 August 2006 -# Whom: Andrew Pantyukhin <infofarmer@FreeBSD.org> -# +# Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org> # $FreeBSD$ -# PORTNAME= libXGP MASTERDIR= ${.CURDIR}/../libYGP diff --git a/devel/libYGP/Makefile b/devel/libYGP/Makefile index 4244aa7751e9..5202f526523c 100644 --- a/devel/libYGP/Makefile +++ b/devel/libYGP/Makefile @@ -1,13 +1,9 @@ -# New ports collection makefile for: libygp -# Date created: 2 August 2006 -# Whom: Andrew Pantyukhin <infofarmer@FreeBSD.org> -# +# Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org> # $FreeBSD$ -# PORTNAME?= libYGP PORTVERSION= 0.9.42 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= SF/libymp/libymp/libYGP-${PORTVERSION} DISTNAME= libYGP-${PORTVERSION} @@ -19,7 +15,7 @@ LIB_DEPENDS= gmp.10:${PORTSDIR}/math/gmp \ boost_filesystem:${PORTSDIR}/devel/boost-libs USE_BZIP2= yes -USE_GCC= any +USE_GCC= 4.6+ GNU_CONFIGURE= yes USE_GNOME= gnomehack USE_LDCONFIG= yes @@ -30,8 +26,6 @@ CONFIGURE_ARGS= --with-libintl-prefix=${LOCALBASE} --with-gmp\ --disable-static --disable-rpath --enable-network-trav USE_GMAKE= yes -CXXFLAGS+= -DBOOST_FILESYSTEM_VERSION=2 - .if ${PORTNAME:M*XGP} LIB_DEPENDS+= gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 PLIST_SUB= YGP="@comment " XGP="" @@ -41,6 +35,7 @@ MKIN_PATCH= s/^(SUBDIRS = ).*$$/\1XGP/; .else PLIST_SUB= XGP="@comment " YGP="" MKIN_PATCH= s/@MYSUBDIRS@/YGP/; +BROKEN= Does not build with recent boost .endif post-patch: diff --git a/devel/libiqxmlrpc/Makefile b/devel/libiqxmlrpc/Makefile index 2b0be611f10c..be7f95e0546d 100644 --- a/devel/libiqxmlrpc/Makefile +++ b/devel/libiqxmlrpc/Makefile @@ -1,13 +1,9 @@ -# New ports collection makefile for: libiqxmlrpc -# Date created: 1 Apr 2008 -# Whom: Max Khon <fjoe@FreeBSD.org> -# +# Created by: Max Khon <fjoe@FreeBSD.org> # $FreeBSD$ -# PORTNAME= libiqxmlrpc PORTVERSION= 0.11.1 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= SF @@ -15,7 +11,7 @@ MAINTAINER= fjoe@FreeBSD.org COMMENT= Free, object-oriented XML-RPC implementation written in C++ BUILD_DEPENDS= doxygen:${PORTSDIR}/devel/doxygen -LIB_DEPENDS= boost_thread.4:${PORTSDIR}/devel/boost-libs +LIB_DEPENDS= boost_thread:${PORTSDIR}/devel/boost-libs LICENSE= BSD @@ -27,6 +23,7 @@ CMAKE_ARGS= -Dbuild_docs=off .endif LDFLAGS+= -L${LOCALBASE}/lib USE_LDCONFIG= yes +USE_OPENSSL= yes PORTDATA= * diff --git a/devel/libslave/Makefile b/devel/libslave/Makefile index 6355ed3a6995..ef05b3de34f6 100644 --- a/devel/libslave/Makefile +++ b/devel/libslave/Makefile @@ -3,6 +3,7 @@ PORTNAME= libslave PORTVERSION= 0.0.${DATE} +PORTREVISION= 1 CATEGORIES= devel databases MASTER_SITES= GH GHC diff --git a/devel/nemiver/Makefile b/devel/nemiver/Makefile index dbf0f44bb06e..e9733fd586df 100644 --- a/devel/nemiver/Makefile +++ b/devel/nemiver/Makefile @@ -3,7 +3,7 @@ PORTNAME= nemiver PORTVERSION= 0.8.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} diff --git a/devel/qt4-moc/files/patch-src__tools__moc__main.cpp b/devel/qt4-moc/files/patch-src__tools__moc__main.cpp new file mode 100644 index 000000000000..f8411f3e8fa8 --- /dev/null +++ b/devel/qt4-moc/files/patch-src__tools__moc__main.cpp @@ -0,0 +1,10 @@ +--- ./src/tools/moc/main.cpp.orig 2013-01-30 16:16:31.615488856 +0000 ++++ ./src/tools/moc/main.cpp 2013-01-30 16:16:52.991681291 +0000 +@@ -187,6 +187,7 @@ + Moc moc; + pp.macros["Q_MOC_RUN"]; + pp.macros["__cplusplus"]; ++ pp.macros["BOOST_TT_HAS_OPERATOR_HPP_INCLUDED"]; + QByteArray filename; + QByteArray output; + FILE *in = 0; diff --git a/devel/ros/Makefile b/devel/ros/Makefile index 49c6ebebdc62..180acdc0917b 100644 --- a/devel/ros/Makefile +++ b/devel/ros/Makefile @@ -1,11 +1,9 @@ -# New ports collection makefile for: ros -# Date created: 2010-08-01 -# Whom: Rene Ladan <rene@FreeBSD.org> -# +# Created by: Rene Ladan <rene@FreeBSD.org> # $FreeBSD$ PORTNAME= ros PORTVERSION= 1.4.10 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= https://code.ros.org/svn/release/download/stacks/${STACKNAME}/${STACKNAME}-${PORTVERSION}/ DIST_SUBDIR= ros diff --git a/devel/sdts++/Makefile b/devel/sdts++/Makefile index 7b93f9b36ae4..9ba467ccd7ee 100644 --- a/devel/sdts++/Makefile +++ b/devel/sdts++/Makefile @@ -3,7 +3,7 @@ PORTNAME= sdts++ PORTVERSION= 1.5.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel MASTER_SITES= http://thor-f5.er.usgs.gov/sdts/sdtsxx/ \ http://lychnobite.org/sdts/ diff --git a/devel/simgear/Makefile b/devel/simgear/Makefile index 73a3c66160b9..1ec263953e19 100644 --- a/devel/simgear/Makefile +++ b/devel/simgear/Makefile @@ -2,6 +2,7 @@ PORTNAME= simgear PORTVERSION= 2.8.0 +PORTREVISION= 1 CATEGORIES= devel games MASTER_SITES= http://mirrors.ibiblio.org/pub/mirrors/simgear/ftp/Source/ \ ftp://ftp.de.flightgear.org/pub/simgear/Source/ \ diff --git a/devel/smack/Makefile b/devel/smack/Makefile index 8d5b1cd36855..9e56f5418788 100644 --- a/devel/smack/Makefile +++ b/devel/smack/Makefile @@ -3,6 +3,7 @@ PORTNAME= smack PORTVERSION= 0.5.0 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= g.veniamin@googlemail.com diff --git a/devel/subcommander/Makefile b/devel/subcommander/Makefile index aef8718a25a2..8450a5e62ae9 100644 --- a/devel/subcommander/Makefile +++ b/devel/subcommander/Makefile @@ -1,13 +1,9 @@ -# New ports collection makefile for: subcommander -# Date created: 22 July 2007 -# Whom: sutra -# +# Created by: sutra # $FreeBSD$ -# PORTNAME= subcommander PORTVERSION= 1.2.3 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= devel MASTER_SITES= http://subcommander.tigris.org/files/documents/1759/42385/ DISTNAME= Subcommander-${PORTVERSION} @@ -16,7 +12,7 @@ MAINTAINER= cyberbotx@cyberbotx.com COMMENT= Qt based multiplatform subversion client, diff & merge tool LIB_DEPENDS= neon.27:${PORTSDIR}/www/neon29 \ - boost_thread.4:${PORTSDIR}/devel/boost-libs \ + boost_thread:${PORTSDIR}/devel/boost-libs \ svn_client-1.0:${PORTSDIR}/devel/subversion16 CONFLICTS_BUILD=subversion-1.7.[0-9]* diff --git a/devel/subcommander2/Makefile b/devel/subcommander2/Makefile index bf67ab24c48c..9fc7783bf0f2 100644 --- a/devel/subcommander2/Makefile +++ b/devel/subcommander2/Makefile @@ -3,6 +3,7 @@ PORTNAME= subcommander PORTVERSION= 2.0.0.b5.2 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= DEBIAN DISTNAME= ${PORTNAME}_${PORTVERSION:R:S,.b,~b,}p${PORTVERSION:E}.orig diff --git a/devel/uatraits/Makefile b/devel/uatraits/Makefile index 138f8f8af2cc..02037215b72e 100644 --- a/devel/uatraits/Makefile +++ b/devel/uatraits/Makefile @@ -3,7 +3,7 @@ PORTNAME= uatraits PORTVERSION= 20121112 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel www MASTER_SITES= http://people.freebsd.org/~demon/ diff --git a/dns/powerdns-devel/Makefile b/dns/powerdns-devel/Makefile index c192f4388db2..17af23e5480a 100644 --- a/dns/powerdns-devel/Makefile +++ b/dns/powerdns-devel/Makefile @@ -2,7 +2,7 @@ PORTNAME= powerdns PORTVERSION= 3.2.r4 -PORTREVISION?= 0 +PORTREVISION?= 1 PORTEPOCH= 1 CATEGORIES= dns ipv6 MASTER_SITES= http://powerdnssec.org/downloads/ @@ -14,7 +14,7 @@ COMMENT= An advanced DNS server with multiple backends including SQL LICENSE= GPLv2 -LIB_DEPENDS= boost_serialization.[4-9]:${PORTSDIR}/devel/boost-libs +LIB_DEPENDS= boost_serialization:${PORTSDIR}/devel/boost-libs USE_LUA= 5.1 LUA_COMPS= lua diff --git a/dns/powerdns/Makefile b/dns/powerdns/Makefile index a38fc593500f..88d899a88be2 100644 --- a/dns/powerdns/Makefile +++ b/dns/powerdns/Makefile @@ -2,7 +2,7 @@ PORTNAME= powerdns PORTVERSION= 3.1 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES= dns ipv6 MASTER_SITES= http://downloads.powerdns.com/releases/ \ http://mirrors.evolva.ro/powerdns.com/releases/ @@ -14,7 +14,7 @@ COMMENT= An advanced DNS server with multiple backends including SQL LICENSE= GPLv2 BUILD_DEPENDS= bjam:${PORTSDIR}/devel/boost-jam -LIB_DEPENDS= boost_serialization.[4-9]:${PORTSDIR}/devel/boost-libs +LIB_DEPENDS= boost_serialization:${PORTSDIR}/devel/boost-libs # botan.0:${PORTSDIR}/security/botan USE_LUA= 5.1 diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile index bee43a93a248..f72679c6e40a 100644 --- a/editors/abiword/Makefile +++ b/editors/abiword/Makefile @@ -1,14 +1,10 @@ -# New ports collection makefile for: AbiWord2 -# Date created: 22 February 2003 -# Whom: Joe Marcus Clarke <marcus@FreeBSD.org> -# +# Created by: Joe Marcus Clarke <marcus@FreeBSD.org> # $FreeBSD$ # $MCom: ports/editors/abiword/Makefile,v 1.13 2009/11/10 13:56:18 kwm Exp $ -# PORTNAME= abiword PORTVERSION= 2.8.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= editors MASTER_SITES= http://www.abisource.com/downloads/%SUBDIR%/${PORTVERSION}/source/ MASTER_SITE_SUBDIR= abiword @@ -58,7 +54,7 @@ CONFIGURE_ARGS+= --enable-debug --enable-symbols .if defined(WITH_BOOST) CONFIGURE_ARGS+= --with-boost -LIB_DEPENDS+= boost_system.4:${PORTSDIR}/devel/boost-libs +LIB_DEPENDS+= boost_system:${PORTSDIR}/devel/boost-libs .else CONFIGURE_ARGS+= --without-boost .endif diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile index 92460f0db7d5..9fb1d9b55592 100644 --- a/editors/calligra/Makefile +++ b/editors/calligra/Makefile @@ -2,7 +2,7 @@ PORTNAME= calligra PORTVERSION= ${CALLIGRA_VERSION} -PORTREVSION= 1 +PORTREVSION= 2 CATEGORIES= editors kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${CALLIGRA_BRANCH}/${PORTNAME}-${PORTVERSION}/ @@ -13,7 +13,7 @@ COMMENT= KDE graphic art and office suite LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \ IlmImf:${PORTSDIR}/graphics/OpenEXR \ - boost_thread.4:${PORTSDIR}/devel/boost-libs \ + boost_thread:${PORTSDIR}/devel/boost-libs \ qca.2:${PORTSDIR}/devel/qca \ exiv2.12:${PORTSDIR}/graphics/exiv2 \ lcms2.2:${PORTSDIR}/graphics/lcms2 \ diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile index 9aa1e87fadd8..afb893f68833 100644 --- a/editors/libreoffice/Makefile +++ b/editors/libreoffice/Makefile @@ -2,7 +2,7 @@ .include "${.CURDIR}/Makefile.common" -PORTREVISION= 1 +PORTREVISION= 2 MASTER_SITE_SUBDIR= src/${PORTVERSION}/ MASTER_SITES+= http://dev-www.libreoffice.org/src/:ext \ @@ -46,7 +46,7 @@ LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo \ nss3.1:${PORTSDIR}/security/nss \ SampleICC.2:${PORTSDIR}/graphics/sampleicc \ png15:${PORTSDIR}/graphics/png \ - cmis-0.2.0:${PORTSDIR}/net/libcmis \ + cmis-0.3:${PORTSDIR}/net/libcmis \ RUN_DEPENDS= ${LOCALBASE}/lib/X11/fonts/Liberation/LiberationMono-Bold.ttf:${PORTSDIR}/x11-fonts/liberation-fonts-ttf \ ${LOCALBASE}/lib/X11/fonts/LinLibertineG/LinLibertine_DR_G.ttf:${PORTSDIR}/x11-fonts/linuxlibertine-g \ diff --git a/editors/madedit/Makefile b/editors/madedit/Makefile index 66acbc147640..c4474e97bb15 100644 --- a/editors/madedit/Makefile +++ b/editors/madedit/Makefile @@ -1,13 +1,9 @@ -# New ports collection makefile for: madedit -# Date created: 2007-08-08 -# Whom: Xin LI <delphij@FreeBSD.org> -# +# Created by: Xin LI <delphij@FreeBSD.org> # $FreeBSD$ -# PORTNAME= madedit PORTVERSION= 0.2.9 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= editors MASTER_SITES= SF/${PORTNAME}/MadEdit/MadEdit-${PORTVERSION} diff --git a/editors/pdfedit/Makefile b/editors/pdfedit/Makefile index a5b3ab7b28cf..9269fe3a2ecf 100644 --- a/editors/pdfedit/Makefile +++ b/editors/pdfedit/Makefile @@ -1,13 +1,9 @@ -# New ports collection makefile for: pdfedit -# Date created: 2007-12-20 -# Whom: alepulver -# +# Created by: alepulver # $FreeBSD$ -# PORTNAME= pdfedit PORTVERSION= 0.4.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= editors MASTER_SITES= SF @@ -15,7 +11,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Free editor for manipulating PDF documents (QT3 GUI and CLI) BUILD_DEPENDS= qmake:${PORTSDIR}/devel/qmake -LIB_DEPENDS= boost_filesystem.4:${PORTSDIR}/devel/boost-libs \ +LIB_DEPENDS= boost_filesystem:${PORTSDIR}/devel/boost-libs \ t1.5:${PORTSDIR}/devel/t1lib DEPRECATED= Depends on QT3; unmaintained diff --git a/finance/kmymoney-kde4/Makefile b/finance/kmymoney-kde4/Makefile index 02acdc814517..a3a90c7d54d8 100644 --- a/finance/kmymoney-kde4/Makefile +++ b/finance/kmymoney-kde4/Makefile @@ -2,7 +2,7 @@ PORTNAME= kmymoney PORTVERSION= 4.6.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= finance kde MASTER_SITES= SF/${PORTNAME}2/KMyMoney-KDE4/${PORTVERSION} diff --git a/games/0ad/Makefile b/games/0ad/Makefile index 8e9a37009299..c248f3664632 100644 --- a/games/0ad/Makefile +++ b/games/0ad/Makefile @@ -2,7 +2,7 @@ PORTNAME= 0ad PORTVERSION= 0.0.12 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= SF/zero-ad/releases DISTFILES= ${PORTNAME}-${PORTVERSION}-alpha-unix-build.tar.xz \ diff --git a/games/allacrost/Makefile b/games/allacrost/Makefile index e85a8ff2c523..8cb9f019d9ed 100644 --- a/games/allacrost/Makefile +++ b/games/allacrost/Makefile @@ -1,13 +1,9 @@ -# New ports collection makefile for: allacrost -# Date created: 03 Oct 2006 -# Whom: Dmitry Marakasov <amdmi3@amdmi3.ru> -# +# Created by: Dmitry Marakasov <amdmi3@amdmi3.ru> # $FreeBSD$ -# PORTNAME= allacrost PORTVERSION= 1.0.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-demo/${PORTVERSION} DISTNAME= ${PORTNAME}_demo_source_${PORTVERSION} @@ -15,11 +11,11 @@ DISTNAME= ${PORTNAME}_demo_source_${PORTVERSION} MAINTAINER= amdmi3@FreeBSD.org COMMENT= A single player 2D role-playing game -LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \ png15:${PORTSDIR}/graphics/png \ ogg:${PORTSDIR}/audio/libogg \ - vorbis.4:${PORTSDIR}/audio/libvorbis \ - boost_thread.4:${PORTSDIR}/devel/boost-libs + vorbis:${PORTSDIR}/audio/libvorbis \ + boost_thread:${PORTSDIR}/devel/boost-libs LICENSE= GPLv2 diff --git a/games/arx-libertatis/Makefile b/games/arx-libertatis/Makefile index 95affc9b91a8..550bdab1d09b 100644 --- a/games/arx-libertatis/Makefile +++ b/games/arx-libertatis/Makefile @@ -1,12 +1,9 @@ -# New ports collection makefile for: arx-libertatis -# Date created: 24 Apr 2012 -# Whom: Dmitry Marakasov <amdmi3@FreeBSD.org> -# +# Created by: Dmitry Marakasov <amdmi3@FreeBSD.org> # $FreeBSD$ -# PORTNAME= arx-libertatis PORTVERSION= 1.0.3 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://cloud.github.com/downloads/arx/ArxLibertatis/ \ http://mirror.amdmi3.ru/distfiles/ @@ -16,10 +13,10 @@ COMMENT= Cross-platform port of Arx Fatalis LICENSE= GPLv3 -LIB_DEPENDS= IL.2:${PORTSDIR}/graphics/devil \ - GLEW.1:${PORTSDIR}/graphics/glew \ - freetype.9:${PORTSDIR}/print/freetype2 \ - boost_program_options.4:${PORTSDIR}/devel/boost-libs +LIB_DEPENDS= IL:${PORTSDIR}/graphics/devil \ + GLEW:${PORTSDIR}/graphics/glew \ + freetype:${PORTSDIR}/print/freetype2 \ + boost_program_options:${PORTSDIR}/devel/boost-libs USE_XZ= yes USE_OPENAL= yes diff --git a/games/asc/Makefile b/games/asc/Makefile index 0699163b8662..a060fb43c5cd 100644 --- a/games/asc/Makefile +++ b/games/asc/Makefile @@ -1,13 +1,9 @@ -# New ports collection makefile for: asc -# Date created: 16 February 2000 -# Whom: Maxim Sobolev <sobomax@FreeBSD.org> -# +# Created by: Maxim Sobolev <sobomax@FreeBSD.org> # $FreeBSD$ -# PORTNAME= asc PORTVERSION= 2.5.0.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}-hq/ASC%20Source/${PORTVERSION:R} \ http://www.asc-hq.org/music/ @@ -22,10 +18,10 @@ LICENSE= GPLv2 BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip \ ${LOCALBASE}/lib/libloki.so:${PORTSDIR}/devel/loki -LIB_DEPENDS= vorbis.4:${PORTSDIR}/audio/libvorbis \ - boost_regex.4:${PORTSDIR}/devel/boost-libs \ +LIB_DEPENDS= vorbis:${PORTSDIR}/audio/libvorbis \ + boost_regex:${PORTSDIR}/devel/boost-libs \ sigc-1.2.5:${PORTSDIR}/devel/libsigc++12 \ - expat.6:${PORTSDIR}/textproc/expat2 + expat:${PORTSDIR}/textproc/expat2 RUN_DEPENDS:= ${BUILD_DEPENDS} OPTIONS_DEFINE= MUSIC XVID diff --git a/games/bastet/Makefile b/games/bastet/Makefile index 9e631620ae01..27ca408adbf9 100644 --- a/games/bastet/Makefile +++ b/games/bastet/Makefile @@ -1,12 +1,9 @@ -# New ports collection makefile for: bastet -# Date created: 21 Oct 2004 -# Whom: Michael Nottebrock <lofi@freebsd.org> -# +# Created by: Michael Nottebrock <lofi@freebsd.org> # $FreeBSD$ -# PORTNAME= bastet PORTVERSION= 0.43 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://fph.altervista.org/prog/files/ EXTRACT_SUFX= .tgz diff --git a/games/burrtools/Makefile b/games/burrtools/Makefile index 030706386ba3..bbaa406d5799 100644 --- a/games/burrtools/Makefile +++ b/games/burrtools/Makefile @@ -1,14 +1,9 @@ -# ex:ts=8 -# Ports collection makefile for: burrtools -# Date created: Mar 23, 2007 -# Whom: ijliao -# +# Created by: ijliao # $FreeBSD$ -# PORTNAME= burrtools PORTVERSION= 0.6.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= SF \ http://www.c-s.li/ports/ diff --git a/games/ember/Makefile b/games/ember/Makefile index 166e11a7dadd..b09d737e8ea5 100644 --- a/games/ember/Makefile +++ b/games/ember/Makefile @@ -3,6 +3,7 @@ PORTNAME= ember PORTVERSION= 0.7.0 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= SF/worldforge/Ember%20%28OGRE%20client%29/${PORTVERSION} \ http://amber.worldforge.org/ember/releases/stable/ @@ -19,7 +20,7 @@ LIB_DEPENDS= sigc-2.0:${PORTSDIR}/devel/libsigc++20 \ varconf-1.0.8:${PORTSDIR}/devel/varconf \ mercator-0.3.3:${PORTSDIR}/devel/mercator \ wfut-0.2:${PORTSDIR}/devel/libwfut \ - boost_thread.4:${PORTSDIR}/devel/boost-libs \ + boost_thread:${PORTSDIR}/devel/boost-libs \ CEGUIBase-0.7.9.0:${PORTSDIR}/graphics/cegui CONFIGURE_ARGS= --with-png-prefix=${LOCALBASE} --enable-binreloc \ diff --git a/games/flightgear/Makefile b/games/flightgear/Makefile index e71c534c6364..283add2214cf 100644 --- a/games/flightgear/Makefile +++ b/games/flightgear/Makefile @@ -1,12 +1,9 @@ -# New ports collection makefile for: flightgear -# Date created: 26 June 1999 -# Whom: Brian Buchanan <brian@CSUA.Berkeley.EDU> -# +# Created by: Brian Buchanan <brian@CSUA.Berkeley.EDU> # $FreeBSD$ -# PORTNAME= flightgear PORTVERSION= 2.8.0 +PORTREVISION= 1 CATEGORIES= games # see http://www.flightgear.org/templates.js MASTER_SITES= http://mirrors.ibiblio.org/pub/mirrors/flightgear/ftp/Source/ \ diff --git a/games/frogatto/Makefile b/games/frogatto/Makefile index 41afcc88108b..b891aee58f7b 100644 --- a/games/frogatto/Makefile +++ b/games/frogatto/Makefile @@ -3,13 +3,14 @@ PORTNAME= frogatto PORTVERSION= 1.2 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= GH MAINTAINER= fiziologus@gmail.com COMMENT= An old-school 2D classic adventure platformer game -LIB_DEPENDS= boost_thread.4:${PORTSDIR}/devel/boost-libs \ +LIB_DEPENDS= boost_thread:${PORTSDIR}/devel/boost-libs \ png15:${PORTSDIR}/graphics/png NO_PACKAGE= Package will be 144M, set FORCE_PACKAGE if you really want it diff --git a/games/galaxyhack/Makefile b/games/galaxyhack/Makefile index 694aa69a3352..51c3beec3fa1 100644 --- a/games/galaxyhack/Makefile +++ b/games/galaxyhack/Makefile @@ -1,13 +1,9 @@ -# New ports collection makefile for: galaxyhack -# Date created: 10 Aug 2005 -# Whom: Alejandro Pulver <alejandro@varnet.biz> -# +# Created by: Alejandro Pulver <alejandro@varnet.biz> # $FreeBSD$ -# PORTNAME= galaxyhack PORTVERSION= 1.74 -PORTREVISION= 11 +PORTREVISION= 13 CATEGORIES= games MASTER_SITES= SF DISTFILES= ${DISTNAME}${EXTRACT_SUFX} @@ -16,7 +12,7 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= ports@FreeBSD.org COMMENT= AI script based strategy game -LIB_DEPENDS= boost_filesystem.4:${PORTSDIR}/devel/boost-libs \ +LIB_DEPENDS= boost_filesystem:${PORTSDIR}/devel/boost-libs \ freetype.9:${PORTSDIR}/print/freetype2 USE_BZIP2= yes @@ -25,8 +21,6 @@ USE_GMAKE= yes USE_SDL= gfx image mixer sdl WRKSRC= ${WRKDIR}/${PORTNAME}/src -CXXFLAGS+= -DBOOST_FILESYSTEM_VERSION=2 - OPTIONS_DEFINE= FLEETS OPTIMIZED_CFLAGS OPTIONS_DEFAULT= OPTIMIZED_CFLAGS FLEETS_DESC= Install additional fleets diff --git a/games/galaxyhack/files/patch-SetupBattle.cpp b/games/galaxyhack/files/patch-SetupBattle.cpp index 77702eaa72c3..355a2c7bc048 100644 --- a/games/galaxyhack/files/patch-SetupBattle.cpp +++ b/games/galaxyhack/files/patch-SetupBattle.cpp @@ -5,7 +5,7 @@ #include <sstream> -#include <boost/filesystem/exception.hpp> -+#include <boost/filesystem/path.hpp> ++#include <boost/filesystem.hpp> using std::stringstream; using std::getline; diff --git a/games/galaxyhack/files/patch-boost-1.52 b/games/galaxyhack/files/patch-boost-1.52 new file mode 100644 index 000000000000..ac824e4efbcf --- /dev/null +++ b/games/galaxyhack/files/patch-boost-1.52 @@ -0,0 +1,77 @@ +--- ForceSelectWin.cpp.orig 2012-08-20 17:35:01.000000000 +0200 ++++ ForceSelectWin.cpp 2012-08-20 17:47:19.000000000 +0200 +@@ -1596,15 +1596,15 @@ + fs::directory_iterator directoryEnd; // default construction yields past-the-end + for (fs::directory_iterator iter(sourcePath); iter != directoryEnd; ++iter) { + if (is_directory(*iter)) { +- fs::create_directory(destPath.string() + "/" + iter->leaf()); +- DoCopy(sourcePath.string() + "/" + iter->leaf(), destPath.string() + "/" + iter->leaf()); ++ fs::create_directory(destPath.string() + "/" + iter->path().filename().string()); ++ DoCopy(sourcePath.string() + "/" + iter->path().filename().string(), destPath.string() + "/" + iter->path().filename().string()); + continue; + } + string destFile; +- if (iter->leaf() == sideName + ".dat") ++ if (iter->path().filename() == sideName + ".dat") + destFile = theInput + ".dat"; + else +- destFile = iter->leaf(); ++ destFile = iter->path().filename().string(); + + fs::copy_file(*iter, destPath.string() + "/" + destFile); + } +--- Main.cpp.orig 2012-08-20 17:48:13.000000000 +0200 ++++ Main.cpp 2012-08-20 17:50:51.000000000 +0200 +@@ -339,12 +339,6 @@ + + void GameInit(char* argv[]) { + namespace fs = boost::filesystem; +- //boost is really quite stupid +- #ifndef WIN32 +- fs::path::default_name_check(fs::windows_name); +- #else +- fs::path::default_name_check(fs::native); +- #endif + + FindHomePath(); + LoadSettings(argv); +--- Menu_Base.cpp.orig 2012-08-20 17:51:05.000000000 +0200 ++++ Menu_Base.cpp 2012-08-20 17:52:15.000000000 +0200 +@@ -206,7 +206,7 @@ + + fs::directory_iterator directoryEnd; // default construction yields past-the-end + for (fs::directory_iterator iter(directory); iter != directoryEnd; ++iter) { +- string filename = iter->leaf(); ++ string filename = iter->path().filename().string(); + + if (filename.find('.') == filename.npos) + continue; +@@ -237,7 +237,7 @@ + fs::directory_iterator directoryEnd; // default construction yields past-the-end + for (fs::directory_iterator iter(globalSettings.bdp + "fleets/"); iter != directoryEnd; ++iter) { + if (fs::is_directory(*iter)) { +- string fleetName = iter->leaf(); ++ string fleetName = iter->path().filename().string(); + + if (CheckFleetExists(fleetName)) { + tempItem.desc = fleetName; +@@ -261,7 +261,7 @@ + fs::path iterPath(GetFleetDir(whichSide)); + fs::directory_iterator directoryEnd; // default construction yields past-the-end + for (fs::directory_iterator iter(iterPath); iter != directoryEnd; ++iter) { +- string filename = iter->leaf(); ++ string filename = iter->path().filename().string(); + + if (filename.find('.') == filename.npos) + continue; +--- Stuff.cpp.orig 2012-08-20 17:52:36.000000000 +0200 ++++ Stuff.cpp 2012-08-20 17:53:11.000000000 +0200 +@@ -657,7 +657,7 @@ + fs::directory_iterator directoryEnd; // default construction yields past-the-end + for (fs::directory_iterator iter(tempPath); iter != directoryEnd; ++iter) { + if (fs::is_directory(*iter) && !fs::is_empty(*iter)) +- RemoveDirectory(iter->string()); ++ RemoveDirectory(iter->path().string()); + else + fs::remove(*iter); + } diff --git a/games/glob2/Makefile b/games/glob2/Makefile index 69cc1813927c..1f8a3c370150 100644 --- a/games/glob2/Makefile +++ b/games/glob2/Makefile @@ -1,13 +1,9 @@ -# New ports collection makefile for: glob2 -# Date created: Wed 21 apr 2004 -# Whom: thierry@pompo.net -# +# Created by: thierry@pompo.net # $FreeBSD$ -# PORTNAME= glob2 PORTVERSION= 0.9.4.4 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SAVANNAH} MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTVERSION:R} @@ -18,7 +14,7 @@ COMMENT= Globulation 2 - a free and innovative strategy game LIB_DEPENDS= vorbis.4:${PORTSDIR}/audio/libvorbis \ speex.1:${PORTSDIR}/audio/speex \ fribidi.3:${PORTSDIR}/converters/fribidi \ - boost_thread.4:${PORTSDIR}/devel/boost-libs \ + boost_thread:${PORTSDIR}/devel/boost-libs \ freetype.9:${PORTSDIR}/print/freetype2 # Should work with portaudio v19_20071207 # Can be built with portaudio2 but does not run cleanly diff --git a/games/glob2/files/patch-SConstruct b/games/glob2/files/patch-SConstruct index 876a38fd0cc5..a4c34367362b 100644 --- a/games/glob2/files/patch-SConstruct +++ b/games/glob2/files/patch-SConstruct @@ -1,9 +1,28 @@ ---- SConstruct.orig Sun Sep 2 05:14:53 2007 -+++ SConstruct Tue Sep 4 23:02:18 2007 -@@ -1,5 +1,6 @@ +--- SConstruct.orig 2009-08-30 19:23:30.000000000 +0000 ++++ SConstruct 2013-01-28 16:42:04.024490217 +0000 +@@ -14,6 +14,7 @@ + def establish_options(env): opts = Options('options_cache.py') + opts.Add("CCFLAGS", "Manually add to the CCFLAGS", "") opts.Add("CXXFLAGS", "Manually add to the CXXFLAGS", "-g") - opts.Add("LINKFLAGS", "Manually add to the LINKFLAGS", "") - opts.Add("INSTALLDIR", "Installation Directory", "/usr/local/share") + opts.Add("LINKFLAGS", "Manually add to the LINKFLAGS", "-g") + if isDarwinPlatform: +@@ -111,14 +112,17 @@ + missing.append("zlib") + + boost_thread = '' ++ boost_system = '' + if conf.CheckLib("boost_thread") and conf.CheckCXXHeader("boost/thread/thread.hpp"): + boost_thread="boost_thread" ++ boost_system="boost_system" + elif conf.CheckLib("boost_thread-mt") and conf.CheckCXXHeader("boost/thread/thread.hpp"): + boost_thread="boost_thread-mt" + else: + print "Could not find libboost_thread or libboost_thread-mt or boost/thread/thread.hpp" + missing.append("libboost_thread") + env.Append(LIBS=[boost_thread]) ++ env.Append(LIBS=[boost_system]) + + boost_date_time = '' + if conf.CheckLib("boost_date_time") and conf.CheckCXXHeader("boost/date_time/posix_time/posix_time.hpp"): diff --git a/games/lander/Makefile b/games/lander/Makefile index 64847fa10fb2..cec05cf96329 100644 --- a/games/lander/Makefile +++ b/games/lander/Makefile @@ -1,13 +1,9 @@ -# New ports collection makefile for: lander -# Date created: 21 Feb 2009 -# Whom: Dmitry Marakasov <amdmi3@FreeBSD.org> -# +# Created by: Dmitry Marakasov <amdmi3@FreeBSD.org> # $FreeBSD$ -# PORTNAME= lander -PORTVERSION= 0.6.2 -PORTREVISION= 3 +PORTVERSION= 0.6.4 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://www.nickg.me.uk/files/ \ http://mirror.amdmi3.ru/distfiles/ @@ -16,7 +12,7 @@ MAINTAINER= amdmi3@FreeBSD.org COMMENT= Lunar Lander clone LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \ - boost_filesystem.4:${PORTSDIR}/devel/boost-libs + boost_filesystem:${PORTSDIR}/devel/boost-libs GNU_CONFIGURE= yes USE_GETTEXT= yes @@ -25,7 +21,7 @@ USE_GL= gl glu MAKE_JOBS_SAFE= yes USE_GCC= 4.2+ -CPPFLAGS+= -I${LOCALBASE}/include -DBOOST_FILESYSTEM_VERSION=2 +CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-boost="${LOCALBASE}" \ --with-boost-filesystem=boost_filesystem diff --git a/games/lander/distinfo b/games/lander/distinfo index c5937cf0bd44..c6e27de8a2e6 100644 --- a/games/lander/distinfo +++ b/games/lander/distinfo @@ -1,2 +1,2 @@ -SHA256 (lander-0.6.2.tar.gz) = abc34dfafa372239ad586dc9f41e596224b19696ca47c535670fad28c44fe22c -SIZE (lander-0.6.2.tar.gz) = 1868180 +SHA256 (lander-0.6.4.tar.gz) = 48e26b117d7a15701bf8a5594734a80e2e5701e8bed8dab59823a436962f23e9 +SIZE (lander-0.6.4.tar.gz) = 1867588 diff --git a/games/openlierox/Makefile b/games/openlierox/Makefile index 8172f8e014fa..72a12fcebaa3 100644 --- a/games/openlierox/Makefile +++ b/games/openlierox/Makefile @@ -1,13 +1,9 @@ -# New ports collection makefile for: openlierox -# Date created: 12 Oct 2008 -# Whom: Dmitry Marakasov <amdmi3@FreeBSD.org> -# +# Created by: Dmitry Marakasov <amdmi3@FreeBSD.org> # $FreeBSD$ -# PORTNAME= openlierox DISTVERSION= 0.59_beta9 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/OpenLieroX%20${DISTVERSION:C/_/%20/} DISTNAME= OpenLieroX_${DISTVERSION}.src @@ -16,7 +12,7 @@ MAINTAINER= amdmi3@FreeBSD.org COMMENT= Extremely addictive realtime worms shoot-em-up LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd \ - boost_signals.4:${PORTSDIR}/devel/boost-libs \ + boost_signals:${PORTSDIR}/devel/boost-libs \ curl.6:${PORTSDIR}/ftp/curl \ alut.1:${PORTSDIR}/audio/freealut @@ -28,6 +24,7 @@ USE_OPENAL= yes CFLAGS+= -I${LOCALBASE}/include CXXFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib USE_CMAKE= yes CMAKE_ARGS= -DHAWKNL_BUILTIN=YES \ diff --git a/games/pingus/Makefile b/games/pingus/Makefile index d662bbd072fc..1f4ae7aaecf5 100644 --- a/games/pingus/Makefile +++ b/games/pingus/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: pingus -# Date created: 2007-10-05 -# Whom: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> -# +# Created by: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> # $FreeBSD$ -# PORTNAME= pingus PORTVERSION= 0.7.2 @@ -15,7 +11,7 @@ MAINTAINER= acm@FreeBSD.org COMMENT= Free Lemmings-like game LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \ - boost_regex.4:${PORTSDIR}/devel/boost-libs \ + boost_regex:${PORTSDIR}/devel/boost-libs \ physfs.1:${PORTSDIR}/devel/physfs USE_BZIP2= yes diff --git a/games/plee-the-bear/Makefile b/games/plee-the-bear/Makefile index a7a1ed818496..15514d1aa23f 100644 --- a/games/plee-the-bear/Makefile +++ b/games/plee-the-bear/Makefile @@ -1,13 +1,9 @@ -# New ports collection makefile for: plee-the-bear -# Date created: 28 Mar 2008 -# Whom: Dmitry Marakasov <amdmi3@amdmi3.ru> -# +# Created by: Dmitry Marakasov <amdmi3@amdmi3.ru> # $FreeBSD$ -# PORTNAME= plee-the-bear PORTVERSION= 0.6.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/Plee%20the%20Bear/${PORTVERSION:R} diff --git a/games/plee-the-bear/files/patch-boost-1.52 b/games/plee-the-bear/files/patch-boost-1.52 new file mode 100644 index 000000000000..342ca3069d72 --- /dev/null +++ b/games/plee-the-bear/files/patch-boost-1.52 @@ -0,0 +1,409 @@ +diff -up bear-engine/CMakeLists.txt.boost146 bear-engine/CMakeLists.txt +--- bear-engine/CMakeLists.txt.boost146 2012-08-21 15:33:24.606557059 -0500 ++++ bear-engine/CMakeLists.txt 2012-08-21 15:33:24.610557060 -0500 +@@ -56,7 +56,7 @@ if( NOT Boost_FOUND ) + message( FATAL_ERROR + "You must have boost::filesystem, boost::signals, boost::thread and boost::regex libraries installed (at least 1.35)" ) + endif( NOT Boost_FOUND ) +-add_definitions(-D BOOST_FILESYSTEM_VERSION=2) ++add_definitions(-D BOOST_FILESYSTEM_VERSION=3) + + #------------------------------------------------------------------------------- + # Include directories for Boost +diff -up bear-engine/core/src/engine/code/game_local_client.cpp.boost146 bear-engine/core/src/engine/code/game_local_client.cpp +--- bear-engine/core/src/engine/code/game_local_client.cpp.boost146 2011-08-24 16:57:00.000000000 -0500 ++++ bear-engine/core/src/engine/code/game_local_client.cpp 2012-08-21 15:33:24.610557060 -0500 +@@ -368,7 +368,11 @@ std::string bear::engine::game_local_cli + + if ( !result.empty() ) + { ++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2 + boost::filesystem::path path( result, boost::filesystem::native ); ++#else ++ boost::filesystem::path path( result ); ++#endif + path /= name; + result = path.string(); + } +@@ -623,13 +627,22 @@ std::string bear::engine::game_local_cli + */ + std::string bear::engine::game_local_client::get_game_directory() const + { ++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2 + boost::filesystem::path dir + (claw::system_info::get_user_directory(), boost::filesystem::native); ++#else ++ boost::filesystem::path dir ++ (claw::system_info::get_user_directory()); ++#endif + + std::string result; + std::string subdir = '.' + get_game_name_as_filename(); + ++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2 + dir /= boost::filesystem::path(subdir, boost::filesystem::native); ++#else ++ dir /= boost::filesystem::path(subdir); ++#endif + + if ( create_game_directory(dir.string()) ) + result = dir.string(); +@@ -649,7 +662,11 @@ bool bear::engine::game_local_client::cr + ( const std::string& dir ) const + { + bool result = false; ++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2 + boost::filesystem::path path( dir, boost::filesystem::native ); ++#else ++ boost::filesystem::path path( dir ); ++#endif + + if ( boost::filesystem::exists( path ) ) + result = boost::filesystem::is_directory( path ); +diff -up bear-engine/core/src/engine/code/resource_pool.cpp.boost146 bear-engine/core/src/engine/code/resource_pool.cpp +--- bear-engine/core/src/engine/code/resource_pool.cpp.boost146 2011-07-17 14:01:25.000000000 -0500 ++++ bear-engine/core/src/engine/code/resource_pool.cpp 2012-08-21 15:33:24.611557060 -0500 +@@ -137,7 +137,11 @@ bool bear::engine::resource_pool::find_f + const std::string filepath = + *it + boost::filesystem::slash<boost::filesystem::path>::value + name; + #endif ++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2 + const boost::filesystem::path path( filepath, boost::filesystem::native ); ++#else ++ const boost::filesystem::path path( filepath ); ++#endif + + if ( boost::filesystem::exists( path ) ) + if ( !boost::filesystem::is_directory( path ) ) +diff -up bear-factory/animation-editor/src/bf/code/configuration.cpp.boost146 bear-factory/animation-editor/src/bf/code/configuration.cpp +--- bear-factory/animation-editor/src/bf/code/configuration.cpp.boost146 2011-07-17 14:01:25.000000000 -0500 ++++ bear-factory/animation-editor/src/bf/code/configuration.cpp 2012-08-21 15:33:24.611557060 -0500 +@@ -116,10 +116,16 @@ bool bf::configuration::create_config_fi + { + bool result = false; + ++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2 + boost::filesystem::path path + ( path_configuration::get_instance().get_config_directory() + + s_config_file_name, + boost::filesystem::native ); ++#else ++ boost::filesystem::path path ++ ( path_configuration::get_instance().get_config_directory() ++ + s_config_file_name ); ++#endif + + if ( !boost::filesystem::exists( path ) ) + { +diff -up bear-factory/bear-editor/src/bf/code/path_configuration.cpp.boost146 bear-factory/bear-editor/src/bf/code/path_configuration.cpp +--- bear-factory/bear-editor/src/bf/code/path_configuration.cpp.boost146 2011-07-17 14:01:25.000000000 -0500 ++++ bear-factory/bear-editor/src/bf/code/path_configuration.cpp 2012-08-21 15:33:24.611557060 -0500 +@@ -130,7 +130,11 @@ std::string bf::path_configuration::get_ + */ + bool bf::path_configuration::get_full_path( std::string& p ) const + { ++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2 + boost::filesystem::path path( p, boost::filesystem::native ); ++#else ++ boost::filesystem::path path( p ); ++#endif + bool result = boost::filesystem::exists( path ); + std::list<std::string>::const_reverse_iterator it; + +@@ -191,14 +195,22 @@ bf::path_configuration::expand_file_name + */ + bool bf::path_configuration::get_relative_path( std::string& p ) const + { ++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2 + boost::filesystem::path path( p, boost::filesystem::native ); ++#else ++ boost::filesystem::path path( p ); ++#endif + bool result = false; + std::list<std::string>::const_reverse_iterator it; + + for (it=data_path.rbegin(); !result && (it!=data_path.rend()); ++it) + { + bool stop(false); ++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2 + boost::filesystem::path data( *it, boost::filesystem::native ); ++#else ++ boost::filesystem::path data( *it ); ++#endif + boost::filesystem::path::iterator pit = path.begin(); + boost::filesystem::path::iterator dit = data.begin(); + +@@ -214,13 +226,20 @@ bool bf::path_configuration::get_relativ + if ( dit == data.end() ) + { + result = true; ++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2 + p = *pit; ++#else ++ p = pit->string(); ++#endif + for ( ++pit; pit!=path.end(); ++pit ) + #if BOOST_VERSION / 100 % 1000 < 34 +- p += '/' + *pit; +-#else ++ p += '/' + pit->string(); ++#elif BOOST_VERSION / 100 % 1000 < 44 + p += + boost::filesystem::slash<boost::filesystem::path>::value + *pit; ++#else ++ p += ++ boost::filesystem::slash<boost::filesystem::path>::value + pit->string(); + #endif + } + } +@@ -256,6 +275,15 @@ void bf::path_configuration::load() + data_path.push_back(*it); + } + } ++ ++ if ( item_class_path.empty() ) ++ { ++ item_class_path.push_back("/usr/share/bear-factory/item-description"); ++ item_class_path.push_back("/usr/share/bear-factory/plee-the-bear/item-description"); ++ } ++ ++ if ( data_path.empty() ) ++ data_path.push_back("/usr/share/games/plee-the-bear/"); + } // path_configuration::load() + + /*----------------------------------------------------------------------------*/ +@@ -268,8 +296,12 @@ bool bf::path_configuration::create_conf + { + bool result = false; + ++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2 + boost::filesystem::path path + ( get_config_directory(), boost::filesystem::native ); ++#else ++ boost::filesystem::path path ( get_config_directory() ); ++#endif + + if ( boost::filesystem::exists( path ) ) + result = boost::filesystem::is_directory( path ); +@@ -290,9 +322,13 @@ bool bf::path_configuration::create_conf + + if ( create_config_directory() ) + { ++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2 + boost::filesystem::path path + ( get_config_directory() + s_config_file_name, + boost::filesystem::native ); ++#else ++ boost::filesystem::path path ( get_config_directory() + s_config_file_name ); ++#endif + + if ( !boost::filesystem::exists( path ) ) + { +@@ -389,7 +425,11 @@ bool bf::path_configuration::find_random + for (it=data_path.begin(); (it!=data_path.end()) && (candidates.size() < m); + ++it) + { ++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2 + const boost::filesystem::path dirpath( *it, boost::filesystem::native ); ++#else ++ const boost::filesystem::path dirpath( *it ); ++#endif + + if ( boost::filesystem::exists( dirpath ) ) + if ( boost::filesystem::is_directory( dirpath ) ) +@@ -436,13 +476,18 @@ void bf::path_configuration::find_all_fi + ( const std::string& dirname, const std::string& pattern, std::size_t offset, + std::size_t m, std::list<std::string>& result ) const + { ++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2 + const boost::filesystem::path path( dirname, boost::filesystem::native ); ++#else ++ const boost::filesystem::path path( dirname ); ++#endif + + CLAW_PRECOND( boost::filesystem::is_directory(path) ); + + boost::filesystem::directory_iterator it(path); + const boost::filesystem::directory_iterator eit; + ++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2 + for ( ; (it!=eit) && (result.size() < m); ++it ) + if ( boost::filesystem::is_directory(*it) ) + { +@@ -451,6 +496,16 @@ void bf::path_configuration::find_all_fi + } + else if ( glob_match(pattern, it->string(), offset) ) + result.push_back(it->string()); ++#else ++ for ( ; (it!=eit) && (result.size() < m); ++it ) ++ if ( boost::filesystem::is_directory(*it) ) ++ { ++ if ( glob_potential_match(pattern, it->path().string(), offset) ) ++ find_all_files_in_dir(it->path().string(), pattern, offset, m, result); ++ } ++ else if ( glob_match(pattern, it->path().string(), offset) ) ++ result.push_back(it->path().string()); ++#endif + } // path_configuration::find_all_files_in_dir() + + /*----------------------------------------------------------------------------*/ +diff -up bear-factory/bear-editor/src/bf/impl/scan_dir.tpp.boost146 bear-factory/bear-editor/src/bf/impl/scan_dir.tpp +--- bear-factory/bear-editor/src/bf/impl/scan_dir.tpp.boost146 2011-07-17 14:01:25.000000000 -0500 ++++ bear-factory/bear-editor/src/bf/impl/scan_dir.tpp 2012-08-21 15:33:24.611557060 -0500 +@@ -46,7 +46,11 @@ void bf::scan_dir<Func>::operator() + ( const std::string& dir, Func& f, Iterator first_ext, Iterator last_ext ) + { + std::queue<boost::filesystem::path> pending; ++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2 + boost::filesystem::path path(dir, boost::filesystem::native); ++#else ++ boost::filesystem::path path(dir); ++#endif + + if ( !boost::filesystem::exists(path) ) + return; +@@ -64,8 +68,13 @@ void bf::scan_dir<Func>::operator() + for ( ; it!=eit; ++it) + if ( boost::filesystem::is_directory(*it) ) + pending.push(*it); ++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2 + else if (supported_extension( it->string(), first_ext, last_ext )) + f(it->string()); ++#else ++ else if (supported_extension( it->path().string(), first_ext, last_ext )) ++ f(it->path().string()); ++#endif + } + } // scan_dir::operator() + +diff -up bear-factory/CMakeLists.txt.boost146 bear-factory/CMakeLists.txt +--- bear-factory/CMakeLists.txt.boost146 2011-03-22 15:31:21.000000000 -0500 ++++ bear-factory/CMakeLists.txt 2012-08-21 15:33:24.611557060 -0500 +@@ -59,7 +59,7 @@ if( NOT Boost_FOUND ) + message( FATAL_ERROR + "You must have boost::system and boost::filesystem libraries installed (at least 1.35)" ) + endif( NOT Boost_FOUND ) +-add_definitions(-D BOOST_FILESYSTEM_VERSION=2) ++add_definitions(-D BOOST_FILESYSTEM_VERSION=3) + + #------------------------------------------------------------------------------- + # Link directories for Boost +diff -up bear-factory/level-editor/src/bf/code/configuration.cpp.boost146 bear-factory/level-editor/src/bf/code/configuration.cpp +--- bear-factory/level-editor/src/bf/code/configuration.cpp.boost146 2011-07-17 14:01:25.000000000 -0500 ++++ bear-factory/level-editor/src/bf/code/configuration.cpp 2012-08-21 15:33:24.611557060 -0500 +@@ -151,10 +151,16 @@ bool bf::configuration::create_config_fi + { + bool result = false; + ++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2 + boost::filesystem::path path + ( path_configuration::get_instance().get_config_directory() + + s_config_file_name, + boost::filesystem::native ); ++#else ++ boost::filesystem::path path ++ ( path_configuration::get_instance().get_config_directory() ++ + s_config_file_name ); ++#endif + + if ( !boost::filesystem::exists( path ) ) + { +diff -up bear-factory/model-editor/src/bf/code/configuration.cpp.boost146 bear-factory/model-editor/src/bf/code/configuration.cpp +--- bear-factory/model-editor/src/bf/code/configuration.cpp.boost146 2011-07-17 14:01:25.000000000 -0500 ++++ bear-factory/model-editor/src/bf/code/configuration.cpp 2012-08-21 15:33:24.611557060 -0500 +@@ -124,10 +124,16 @@ bool bf::configuration::create_config_fi + { + bool result = false; + ++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2 + boost::filesystem::path path + ( path_configuration::get_instance().get_config_directory() + + s_config_file_name, + boost::filesystem::native ); ++#else ++ boost::filesystem::path path ++ ( path_configuration::get_instance().get_config_directory() ++ + s_config_file_name ); ++#endif + + if ( !boost::filesystem::exists( path ) ) + { +diff -up plee-the-bear/CMakeLists.txt.boost146 plee-the-bear/CMakeLists.txt +--- plee-the-bear/CMakeLists.txt.boost146 2012-08-21 15:33:24.606557059 -0500 ++++ plee-the-bear/CMakeLists.txt 2012-08-21 15:33:24.611557060 -0500 +@@ -94,7 +94,7 @@ if( NOT Boost_FOUND ) + message( FATAL_ERROR + "You must have boost::filesystem and boost::thread libraries installed (at least 1.35)" ) + endif( NOT Boost_FOUND ) +-add_definitions(-D BOOST_FILESYSTEM_VERSION=2) ++add_definitions(-D BOOST_FILESYSTEM_VERSION=3) + + #------------------------------------------------------------------------------- + # Include directories for Boost +diff -up plee-the-bear/data/CMakeLists.txt.boost146 plee-the-bear/data/CMakeLists.txt +--- plee-the-bear/data/CMakeLists.txt.boost146 2010-11-21 08:24:51.000000000 -0600 ++++ plee-the-bear/data/CMakeLists.txt 2012-08-21 15:33:24.611557060 -0500 +@@ -25,6 +25,7 @@ install( + PATTERN "*.gz" EXCLUDE + PATTERN "*.bz2" EXCLUDE + PATTERN "README" EXCLUDE ++ PATTERN "AUTHORS" EXCLUDE + ) + + install( +diff -up plee-the-bear/src/ptb/frame/code/frame_profile_name.cpp.boost146 plee-the-bear/src/ptb/frame/code/frame_profile_name.cpp +--- plee-the-bear/src/ptb/frame/code/frame_profile_name.cpp.boost146 2012-08-21 15:44:43.707601717 -0500 ++++ plee-the-bear/src/ptb/frame/code/frame_profile_name.cpp 2012-08-21 15:45:22.604604268 -0500 +@@ -68,7 +68,11 @@ void ptb::frame_profile_name::validate() + { + boost::filesystem::path path + ( bear::engine::game::get_instance().get_custom_game_file ++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2 + (PTB_PROFILES_FOLDER) + name , boost::filesystem::native ); ++#else ++ (PTB_PROFILES_FOLDER) + name ); ++#endif + + if ( !boost::filesystem::exists(path) ) + { +diff -up plee-the-bear/src/ptb/frame/code/frame_profiles.cpp.boost146 plee-the-bear/src/ptb/frame/code/frame_profiles.cpp +--- plee-the-bear/src/ptb/frame/code/frame_profiles.cpp.boost146 2012-08-21 15:40:49.598586322 -0500 ++++ plee-the-bear/src/ptb/frame/code/frame_profiles.cpp 2012-08-21 15:44:23.805600406 -0500 +@@ -72,8 +72,13 @@ void ptb::frame_profiles::on_focus() + if ( m_msg_result & message_box::s_ok ) + { + boost::filesystem::path path ++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2 + ( bear::engine::game::get_instance().get_custom_game_file + (PTB_PROFILES_FOLDER) + profile , boost::filesystem::native ); ++#else ++ ( bear::engine::game::get_instance().get_custom_game_file ++ (PTB_PROFILES_FOLDER) + profile); ++#endif + + if ( boost::filesystem::exists(path) ) + { +@@ -283,7 +288,11 @@ void ptb::frame_profiles::update_control + unsigned int i = 0; + boost::filesystem::path path + ( bear::engine::game::get_instance().get_custom_game_file ++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2 + (PTB_PROFILES_FOLDER), boost::filesystem::native ); ++#else ++ (PTB_PROFILES_FOLDER) ); ++#endif + + if ( !boost::filesystem::exists(path) ) + boost::filesystem::create_directory( path ); +@@ -297,7 +306,11 @@ void ptb::frame_profiles::update_control + if ( boost::filesystem::is_directory(*it) && + (i < PTB_NUMBER_OF_PROFILES) ) + { ++#if !defined(BOOST_FILESYSTEM_VERSION) || BOOST_FILESYSTEM_VERSION == 2 + std::string dir(it->string()); ++#else ++ std::string dir(it->path().native()); ++#endif + std::string name(dir, path.string().size(), + dir.size() - path.string().size()); + diff --git a/games/pokerth/Makefile b/games/pokerth/Makefile index 7881073f224c..e8c47be228ce 100644 --- a/games/pokerth/Makefile +++ b/games/pokerth/Makefile @@ -3,6 +3,7 @@ PORTNAME= pokerth PORTVERSION= 1.0 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION} DISTNAME= PokerTH-${PORTVERSION}-src diff --git a/games/py-fife/Makefile b/games/py-fife/Makefile index 5372a3457e42..0516036bf35d 100644 --- a/games/py-fife/Makefile +++ b/games/py-fife/Makefile @@ -1,12 +1,9 @@ -# New ports collection makefile for: fife -# Date created: 19 May 2012 -# Whom: GreenDog <fiziologus@gmail.com> -# +# Created by: GreenDog <fiziologus@gmail.com> # $FreeBSD$ PORTNAME= fife PORTVERSION= 0.3.3r3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= http://sourceforge.net/projects/${PORTNAME}/files/active/src/:source \ http://sourceforge.net/projects/${PORTNAME}/files/active/demos/:demo @@ -23,7 +20,7 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/swig:${PORTSDIR}/devel/swig13 LIB_DEPENDS= vorbisfile.6:${PORTSDIR}/audio/libvorbis \ guichan.2:${PORTSDIR}/devel/guichan \ - boost_filesystem.4:${PORTSDIR}/devel/boost-libs \ + boost_filesystem:${PORTSDIR}/devel/boost-libs \ png15:${PORTSDIR}/graphics/png USE_SDL= sdl ttf image diff --git a/games/secretmaryochronicles/Makefile b/games/secretmaryochronicles/Makefile index e7bdcd4e7408..af6d122401a0 100644 --- a/games/secretmaryochronicles/Makefile +++ b/games/secretmaryochronicles/Makefile @@ -1,13 +1,9 @@ -# New ports collection makefile for: secretmaryochronicles -# Date created: 31 Jan 2008 -# Whom: Dmitry Marakasov <amdmi3@amdmi3.ru> -# +# Created by: Dmitry Marakasov <amdmi3@amdmi3.ru> # $FreeBSD$ -# PORTNAME= secretmaryochronicles PORTVERSION= 1.10.git20120512 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= games MASTER_SITES= http://mirror.amdmi3.ru/distfiles/ # SF/smclone/Secret%20Maryo%20Chronicles/${PORTVERSION} @@ -17,7 +13,7 @@ MAINTAINER= amdmi3@FreeBSD.org COMMENT= Secret Maryo Chronicles two-dimensional platform game LIB_DEPENDS= CEGUIBase-0.7.9.0:${PORTSDIR}/graphics/cegui \ - boost_filesystem.4:${PORTSDIR}/devel/boost-libs \ + boost_filesystem:${PORTSDIR}/devel/boost-libs \ png15:${PORTSDIR}/graphics/png USE_BZIP2= yes diff --git a/games/spring/Makefile b/games/spring/Makefile index 0a6794329a48..11d3abea4824 100644 --- a/games/spring/Makefile +++ b/games/spring/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: spring -# Date created: 10 Jan 2008 -# Whom: Dmitry Marakasov <amdmi3@amdmi3.ru> -# +# Created by: Dmitry Marakasov <amdmi3@amdmi3.ru> # $FreeBSD$ -# PORTNAME= spring PORTVERSION= 0.82.7.1 @@ -15,6 +11,8 @@ DISTNAME= ${PORTNAME}_${PORTVERSION}_src MAINTAINER= amdmi3@FreeBSD.org COMMENT= A project aiming to create a new and versatile RTS Engine +BROKEN= Does not build with recent boost + LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \ boost_thread.4:${PORTSDIR}/devel/boost-libs \ IL.2:${PORTSDIR}/graphics/devil \ diff --git a/games/vdrift/Makefile b/games/vdrift/Makefile index 43f1d3cfbaa1..40f9a00ebdb9 100644 --- a/games/vdrift/Makefile +++ b/games/vdrift/Makefile @@ -1,13 +1,9 @@ -# New ports collection makefile for: vdrift -# Date created: 2005-11-09 -# Whom: Jose Alonso Cardenas Marquez <acardenas@bsd.org.pe> -# +# Created by: Jose Alonso Cardenas Marquez <acardenas@bsd.org.pe> # $FreeBSD$ -# PORTNAME= vdrift PORTVERSION= 20100630 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${DATE_VERSION} DISTNAME= ${PORTNAME}-${DATE_VERSION}-src @@ -20,7 +16,7 @@ BUILD_DEPENDS= scons:${PORTSDIR}/devel/scons \ ${LOCALBASE}/lib/libBulletCollision.a:${PORTSDIR}/devel/bullet \ ${LOCALBASE}/include/asio.hpp:${PORTSDIR}/net/asio LIB_DEPENDS= vorbis.4:${PORTSDIR}/audio/libvorbis \ - boost_thread.4:${PORTSDIR}/devel/boost-libs + boost_thread:${PORTSDIR}/devel/boost-libs RUN_DEPENDS= ${LOCALBASE}/share/${PORTNAME}/settings/VDrift.config:${PORTSDIR}/games/vdrift-data USE_BZIP2= yes diff --git a/games/violetland/Makefile b/games/violetland/Makefile index bf5020a0cf29..a9941a07a4e6 100644 --- a/games/violetland/Makefile +++ b/games/violetland/Makefile @@ -3,6 +3,7 @@ PORTNAME= violetland PORTVERSION= 0.4.3 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= GOOGLE_CODE \ http://mirror.amdmi3.ru/distfiles/ @@ -11,7 +12,7 @@ DISTNAME= ${PORTNAME}-v${PORTVERSION}-src MAINTAINER= amdmi3@FreeBSD.org COMMENT= Top-down survival shoot 'em up -LIB_DEPENDS= boost_filesystem.4:${PORTSDIR}/devel/boost-libs +LIB_DEPENDS= boost_filesystem:${PORTSDIR}/devel/boost-libs USE_ZIP= yes USE_SDL= sdl mixer image ttf @@ -19,6 +20,7 @@ USE_GL= gl glu MAKE_JOBS_SAFE= yes USE_CMAKE= yes USE_GETTEXT= yes +USE_DOS2UNIX= yes CMAKE_ARGS= -DDATA_INSTALL_DIR="${DATADIR}" WRKSRC= ${WRKDIR}/${PORTNAME}-v${PORTVERSION} diff --git a/games/violetland/files/patch-boost-1.52 b/games/violetland/files/patch-boost-1.52 new file mode 100644 index 000000000000..c90329f43b04 --- /dev/null +++ b/games/violetland/files/patch-boost-1.52 @@ -0,0 +1,41 @@ +--- CMakeLists.txt.old 2012-11-05 15:19:11.501044743 +0100 ++++ CMakeLists.txt 2012-11-05 15:19:25.415250207 +0100 +@@ -8,7 +8,6 @@ + find_package(SDL_mixer REQUIRED) + find_package(OpenGL REQUIRED) + find_package(Boost COMPONENTS filesystem system REQUIRED) +-add_definitions(-DBOOST_FILESYSTEM_VERSION=2) + + if(${MINGW}) + set(INTL_LIBRARY intl) +--- src/system/utility/FileUtility.cpp.old 2012-11-05 21:26:07.865488297 +0100 ++++ src/system/utility/FileUtility.cpp 2012-11-05 21:30:44.881208230 +0100 +@@ -20,7 +20,7 @@ + + while (dir_it != boost::filesystem::directory_iterator()) { + if (boost::filesystem::is_regular_file(*dir_it)) +- files.push_back(dir_it->filename()); ++ files.push_back(dir_it->path().filename().string()); + ++dir_it; + } + return files; +@@ -32,8 +32,8 @@ + + while (dir_it != boost::filesystem::directory_iterator()) { + if (boost::filesystem::is_directory(*dir_it)) +- if (dir_it->path().filename()[0] != '.') +- subDirs.push_back(dir_it->path().filename()); ++ if (dir_it->path().filename().string()[0] != '.') ++ subDirs.push_back(dir_it->path().filename().string()); + ++dir_it; + } + return subDirs; +@@ -45,7 +45,7 @@ + + while (dir_it != boost::filesystem::directory_iterator()) { + if (boost::filesystem::is_directory(*dir_it)) +- if (dir_it->path().filename()[0] != '.') ++ if (dir_it->path().filename().string()[0] != '.') + ++count; + ++dir_it; + } diff --git a/games/wesnoth/Makefile b/games/wesnoth/Makefile index 129c08f2f519..cc0aa487b0ac 100644 --- a/games/wesnoth/Makefile +++ b/games/wesnoth/Makefile @@ -2,6 +2,7 @@ PORTNAME= wesnoth PORTVERSION= 1.10.5 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}/${PORTNAME}-${PORTVERSION} \ http://files.wesnoth.org/ diff --git a/graphics/agave/Makefile b/graphics/agave/Makefile index 0a7ae383aeb1..5c82f7a80a70 100644 --- a/graphics/agave/Makefile +++ b/graphics/agave/Makefile @@ -1,13 +1,9 @@ -# New ports collection makefile for: gnome-colorscheme -# Date created: 30 August 2005 -# Whom: Piotr Smyrak <smyru@heron.pl> -# +# Created by: Piotr Smyrak <smyru@heron.pl> # $FreeBSD$ -# PORTNAME= agave PORTVERSION= 0.4.2 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= graphics gnome MASTER_SITES= http://download.gna.org/colorscheme/releases/ @@ -15,7 +11,7 @@ MAINTAINER= smyru@heron.pl COMMENT= A color scheme builder for the GNOME desktop LIB_DEPENDS= glademm-2.4.1:${PORTSDIR}/devel/libglademm24 \ - boost_thread.4:${PORTSDIR}/devel/boost-libs + boost_thread:${PORTSDIR}/devel/boost-libs # --disable-gnome option is broken in 0.4.2 #OPTIONS= GNOME "Adds GNOME support" on diff --git a/graphics/aqsis/Makefile b/graphics/aqsis/Makefile index 95f2b8455e15..6d77aeb18df6 100644 --- a/graphics/aqsis/Makefile +++ b/graphics/aqsis/Makefile @@ -1,14 +1,9 @@ -# ex:ts=8 -# Ports collection Makefile for: aqsis -# Date created: Sep 12, 2002 -# Whom: ijliao -# +# Created by: ijliao # $FreeBSD$ -# PORTNAME= aqsis PORTVERSION= 1.8.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-source/${PORTVERSION} @@ -21,7 +16,7 @@ LICENSE_COMB= multi BUILD_DEPENDS= bison:${PORTSDIR}/devel/bison \ xsltproc:${PORTSDIR}/textproc/libxslt LIB_DEPENDS= IlmImf:${PORTSDIR}/graphics/OpenEXR \ - boost_filesystem.4:${PORTSDIR}/devel/boost-libs \ + boost_filesystem:${PORTSDIR}/devel/boost-libs \ tiff.4:${PORTSDIR}/graphics/tiff \ fltk.1:${PORTSDIR}/x11-toolkits/fltk diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile index 0ed1bd9716b2..0eee00318c14 100644 --- a/graphics/blender/Makefile +++ b/graphics/blender/Makefile @@ -3,7 +3,7 @@ PORTNAME= blender PORTVERSION= 2.65a -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics games MASTER_SITES= http://download.blender.org/source/ \ http://mirror.cs.umn.edu/blender.org/source/ \ diff --git a/graphics/enblend/Makefile b/graphics/enblend/Makefile index 1c97c1a2a63b..cd1dd3357fb2 100644 --- a/graphics/enblend/Makefile +++ b/graphics/enblend/Makefile @@ -1,9 +1,5 @@ -# New ports collection makefile for: enblend -# Date created: 19 september 2004 -# Whom: cartola@openit.com.br -# +# Created by: cartola@openit.com.br # $FreeBSD$ -# PORTNAME= enblend PORTVERSION= 4.0 @@ -16,13 +12,13 @@ DISTNAME= enblend-enfuse-${PORTVERSION} MAINTAINER= grog@FreeBSD.org COMMENT= A tool for image blending with multiresolution splines -BUILD_DEPENDS= ${LOCALBASE}/include/boost/pool/pool.hpp:${PORTSDIR}/devel/boost-libs \ - ${LOCALBASE}/bin/makeinfo:${PORTSDIR}/print/texinfo \ +BUILD_DEPENDS= ${LOCALBASE}/bin/makeinfo:${PORTSDIR}/print/texinfo \ OpenEXR>=1.0:${PORTSDIR}/graphics/OpenEXR LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \ lcms:${PORTSDIR}/graphics/lcms \ xmi:${PORTSDIR}/graphics/plotutils \ - tiff:${PORTSDIR}/graphics/tiff + tiff:${PORTSDIR}/graphics/tiff \ + boost_filesystem:${PORTSDIR}/devel/boost-libs RUN_DEPENDS= OpenEXR>=1.0:${PORTSDIR}/graphics/OpenEXR WRKSRC= ${WRKDIR}/enblend-enfuse-4.0-753b534c819d @@ -39,6 +35,8 @@ CONFIGURE_ARGS= MAKEINFO="${LOCALBASE}/bin/makeinfo" USE_GCC= 4.4+ USE_GL= glew glut GNU_CONFIGURE= yes +CONFIGURE_ENV+= "LIBS=-lboost_system" +CONFIGURE_ARGS+= --with-boost-filesystem CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib diff --git a/graphics/enblend/files/patch-boost-1.52 b/graphics/enblend/files/patch-boost-1.52 new file mode 100644 index 000000000000..c9827eb53d29 --- /dev/null +++ b/graphics/enblend/files/patch-boost-1.52 @@ -0,0 +1,125 @@ +--- src/filenameparse.cc Tue Mar 15 18:52:46 2011 +0100 ++++ src/filenameparse.cc Sat Apr 09 20:17:05 2011 -0700 +@@ -50,7 +50,7 @@ + #ifdef HAVE_BOOST_FILESYSTEM + #include <boost/filesystem.hpp> + +-typedef boost::filesystem::basic_path<std::string, boost::filesystem::path_traits> basic_path; ++//typedef boost::filesystem::basic_path<std::string, boost::filesystem::path_traits> basic_path; + #endif + + +@@ -60,7 +60,7 @@ + isRelativePath(const std::string& aFilename) + { + #ifdef HAVE_BOOST_FILESYSTEM +- const basic_path path(aFilename); ++ const boost::filesystem::path path(aFilename); + return !path.has_root_directory(); + #else + const std::string::size_type separator = aFilename.find(PATH_SEPARATOR); +@@ -80,7 +80,7 @@ + extractDirname(const std::string& aFilename) + { + #ifdef HAVE_BOOST_FILESYSTEM +- const basic_path path(aFilename); ++ const boost::filesystem::path path(aFilename); + const std::string directory(path.branch_path().string()); + return directory.empty() ? DOT : directory; + #else +@@ -94,8 +94,8 @@ + extractBasename(const std::string& aFilename) + { + #ifdef HAVE_BOOST_FILESYSTEM +- const basic_path path(aFilename); +- return path.leaf(); ++ const boost::filesystem::path path(aFilename); ++ return path.leaf().string(); + #else + const std::string::size_type separator = aFilename.rfind(PATH_SEPARATOR); + return +@@ -110,7 +110,7 @@ + extractFilename(const std::string& aFilename) + { + #ifdef HAVE_BOOST_FILESYSTEM +- const basic_path path(aFilename); ++ const boost::filesystem::path path(aFilename); + return basename(path); + #else + const std::string::size_type separator = aFilename.rfind(PATH_SEPARATOR); +@@ -134,7 +134,7 @@ + extractExtension(const std::string& aFilename) + { + #ifdef HAVE_BOOST_FILESYSTEM +- const basic_path path(aFilename); ++ const boost::filesystem::path path(aFilename); + return extension(path); + #else + const std::string::size_type dot = aFilename.rfind(DOT); +@@ -151,11 +151,11 @@ + + #ifdef HAVE_BOOST_FILESYSTEM + +-inline basic_path +-removeDotsBoost(const basic_path& aPath) ++inline boost::filesystem::path ++removeDotsBoost(const boost::filesystem::path& aPath) + { +- basic_path result; +- for (basic_path::const_iterator p = aPath.begin(); p != aPath.end(); ++p) ++ boost::filesystem::path result; ++ for (boost::filesystem::path::const_iterator p = aPath.begin(); p != aPath.end(); ++p) + { + if (*p != DOT) + { +@@ -166,11 +166,12 @@ + } + + +-inline basic_path +-removeDotDotsBoost(const basic_path& aPath) ++inline boost::filesystem::path ++removeDotDotsBoost(const boost::filesystem::path& aPath) + { + list_t directories; +- for (basic_path::const_iterator p = aPath.begin(); p != aPath.end(); ++p) ++ for (boost::filesystem::path::const_iterator p = aPath.begin(); p != aPath.end(); ++p) ++ + { + if (*p == DOTDOT && + !directories.empty() && directories.back() != DOTDOT) +@@ -179,10 +180,10 @@ + } + else + { +- directories.push_back(*p); ++ directories.push_back((*p).string()); + } + } +- basic_path result; ++ boost::filesystem::path result; + for (list_t::const_iterator p = directories.begin(); p != directories.end(); ++p) + { + result /= *p; +@@ -295,8 +296,8 @@ + canonicalizePath(const std::string& aPathname, bool keepDot) + { + #ifdef HAVE_BOOST_FILESYSTEM +- const basic_path result = +- removeDotDotsBoost(removeDotsBoost(basic_path(aPathname))); ++ const boost::filesystem::path result = ++ removeDotDotsBoost(removeDotsBoost(boost::filesystem::path(aPathname))); + if (keepDot && result.empty()) + { + return std::string(DOT); +@@ -331,8 +332,8 @@ + concatPath(const std::string& aPathname, const std::string& anotherPathname) + { + #ifdef HAVE_BOOST_FILESYSTEM +- basic_path path(aPathname); +- basic_path leaf(anotherPathname); ++ boost::filesystem::path path(aPathname); ++ boost::filesystem::path leaf(anotherPathname); + path /= leaf; + return path.string(); + #else diff --git a/graphics/evolvotron/Makefile b/graphics/evolvotron/Makefile index 4a478e052e3e..122e6d1f1306 100644 --- a/graphics/evolvotron/Makefile +++ b/graphics/evolvotron/Makefile @@ -1,19 +1,16 @@ -# New ports collection makefile for: evolvotron -# Date created: 16 Mar 2003 -# Whom: David Yeske <dyeske@gmail.com> -# +# Created by: David Yeske <dyeske@gmail.com> # $FreeBSD$ PORTNAME= evolvotron PORTVERSION= 0.6.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Generative software that evolves images/textures/patterns -LIB_DEPENDS= boost_thread.4:${PORTSDIR}/devel/boost-libs +LIB_DEPENDS= boost_thread:${PORTSDIR}/devel/boost-libs WRKSRC= ${WRKDIR}/${PORTNAME} diff --git a/graphics/fracplanet/Makefile b/graphics/fracplanet/Makefile index 156ab27dc45b..c5cc7315bbf2 100644 --- a/graphics/fracplanet/Makefile +++ b/graphics/fracplanet/Makefile @@ -1,13 +1,9 @@ -# New ports collection makefile for: fracplanet -# Date created: 15 Sep 2005 -# Whom: Igor Pokrovsky <ip@doom.homeunix.org> -# +# Created by: Igor Pokrovsky <ip@doom.homeunix.org> # $FreeBSD$ -# PORTNAME= fracplanet PORTVERSION= 0.4.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= SF @@ -15,7 +11,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= An interactive generator of planets and terrain BUILD_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt -LIB_DEPENDS= boost_program_options.4:${PORTSDIR}/devel/boost-libs +LIB_DEPENDS= boost_program_options:${PORTSDIR}/devel/boost-libs WRKSRC= ${WRKDIR}/${PORTNAME} diff --git a/graphics/gnash/Makefile b/graphics/gnash/Makefile index 653f0cef0627..f6cc0119e882 100644 --- a/graphics/gnash/Makefile +++ b/graphics/gnash/Makefile @@ -3,7 +3,7 @@ PORTNAME= gnash PORTVERSION= 0.8.10 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= GNU/${PORTNAME}/${PORTVERSION}/ diff --git a/graphics/gource/Makefile b/graphics/gource/Makefile index 11fbf4b47955..77ee65bb2888 100644 --- a/graphics/gource/Makefile +++ b/graphics/gource/Makefile @@ -1,13 +1,9 @@ -# New ports collection makefile for: gource -# Date created: Nov 25 2009 -# Whom: demon@FreeBSD.org -# +# Created by: demon@FreeBSD.org # $FreeBSD$ -# PORTNAME= gource PORTVERSION= 0.38 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/graphics/gource/files/patch-boost-1.52 b/graphics/gource/files/patch-boost-1.52 new file mode 100644 index 000000000000..d10615f48c40 --- /dev/null +++ b/graphics/gource/files/patch-boost-1.52 @@ -0,0 +1,64 @@ +diff --git a/m4/m4_ax_boost_filesystem.m4 b/m4/ax_boost_filesystem.m4 +index 18df8f4..aebcbf7 100644 +--- m4/m4_ax_boost_filesystem.m4 ++++ m4/m4_ax_boost_filesystem.m4 +@@ -31,7 +31,7 @@ + # and this notice are preserved. This file is offered as-is, without any + # warranty. + +-#serial 22 ++#serial 24 + + AC_DEFUN([AX_BOOST_FILESYSTEM], + [ +@@ -81,14 +81,14 @@ AC_DEFUN([AX_BOOST_FILESYSTEM], + AC_DEFINE(HAVE_BOOST_FILESYSTEM,,[define if the Boost::Filesystem library is available]) + BOOSTLIBDIR=`echo $BOOST_LDFLAGS | sed -e 's/@<:@^\/@:>@*//'` + if test "x$ax_boost_user_filesystem_lib" = "x"; then +- for libextension in `ls $BOOSTLIBDIR/libboost_filesystem*.so* $BOOSTLIBDIR/libboost_filesystem*.dylib* $BOOSTLIBDIR/libboost_filesystem*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_filesystem.*\)\.so.*$;\1;' -e 's;^lib\(boost_filesystem.*\)\.a*$;\1;' -e 's;^lib\(boost_filesystem.*\)\.dylib$;\1;'` ; do ++ for libextension in `ls $BOOSTLIBDIR/libboost_filesystem*.so* $BOOSTLIBDIR/libboost_filesystem*.dylib* $BOOSTLIBDIR/libboost_filesystem*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_filesystem.*\)\.\(dylib\|a\|so\).*$;\1;' | tac` ; do + ax_lib=${libextension} + AC_CHECK_LIB($ax_lib, exit, + [BOOST_FILESYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_FILESYSTEM_LIB) link_filesystem="yes"; break], + [link_filesystem="no"]) + done + if test "x$link_filesystem" != "xyes"; then +- for libextension in `ls $BOOSTLIBDIR/boost_filesystem*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_filesystem.*\)\.dll.*$;\1;' -e 's;^\(boost_filesystem.*\)\.a*$;\1;'` ; do ++ for libextension in `ls $BOOSTLIBDIR/boost_filesystem*.dll* $BOOSTLIBDIR/boost_filesystem*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_filesystem.*\)\.\(dll\|a\).*$;\1;' | tac` ; do + ax_lib=${libextension} + AC_CHECK_LIB($ax_lib, exit, + [BOOST_FILESYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_FILESYSTEM_LIB) link_filesystem="yes"; break], +diff --git a/m4/m4_ax_boost_system.m4 b/m4/ax_boost_system.m4 +index 7fbf6d3..bf82391 100644 +--- m4/m4_ax_boost_system.m4 ++++ m4/m4_ax_boost_system.m4 +@@ -83,14 +83,14 @@ AC_DEFUN([AX_BOOST_SYSTEM], + + LDFLAGS_SAVE=$LDFLAGS + if test "x$ax_boost_user_system_lib" = "x"; then +- for libextension in `ls $BOOSTLIBDIR/libboost_system*.so* $BOOSTLIBDIR/libboost_system*.a* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_system.*\)\.so.*$;\1;' -e 's;^lib\(boost_system.*\)\.a*$;\1;'` ; do ++ for libextension in `ls $BOOSTLIBDIR/libboost_system*.a* $BOOSTLIBDIR/libboost_system*.so* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^lib\(boost_system.*\)\.\(so\|a\).*$;\1;' | tac` ; do + ax_lib=${libextension} + AC_CHECK_LIB($ax_lib, exit, + [BOOST_SYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break], + [link_system="no"]) + done + if test "x$link_system" != "xyes"; then +- for libextension in `ls $BOOSTLIBDIR/boost_system*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_system.*\)\.dll.*$;\1;' -e 's;^\(boost_system.*\)\.a*$;\1;'` ; do ++ for libextension in `ls $BOOSTLIBDIR/boost_system*.{dll,a}* 2>/dev/null | sed 's,.*/,,' | sed -e 's;^\(boost_system.*\)\.\(dll\|a\).*$;\1;' | tac` ; do + ax_lib=${libextension} + AC_CHECK_LIB($ax_lib, exit, + [BOOST_SYSTEM_LIB="-l$ax_lib"; AC_SUBST(BOOST_SYSTEM_LIB) link_system="yes"; break], +diff --git a/src/logmill.cpp b/src/logmill.cpp +index 8fc6153..2a9afd9 100644 +--- src/logmill.cpp ++++ src/logmill.cpp +@@ -176,7 +176,7 @@ RCommitLog* RLogMill::fetchLog(std::string& log_format) { + logfile = repo_path.string(); + } + } +- } catch(boost::filesystem3::filesystem_error& error) { ++ } catch(boost::filesystem::filesystem_error& error) { + } + } + diff --git a/graphics/gsculpt/Makefile b/graphics/gsculpt/Makefile index b07f28026c72..4eb2f7d47adf 100644 --- a/graphics/gsculpt/Makefile +++ b/graphics/gsculpt/Makefile @@ -1,14 +1,9 @@ -# New ports collection makefile for: gSculpt -# Date created: Oct 10, 2001 -# Whom: ijliao -# -# $Carpetsmoker: ports/graphics/gsculpt/Makefile,v 1.4 2007/08/02 13:13:45 carpetsmoker Exp $ +# Created by: ijliao # $FreeBSD$ -# PORTNAME= gsculpt PORTVERSION= 0.99.47 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${DISTNAME:S,-src,,} DISTNAME= gSculpt-${PORTVERSION}-alpha-src @@ -18,7 +13,7 @@ COMMENT= An Opensource 3D modelling application LICENSE= GPLv2 -LIB_DEPENDS= boost_python.4:${PORTSDIR}/devel/boost-python-libs +LIB_DEPENDS= boost_python:${PORTSDIR}/devel/boost-python-libs RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}opengl>0:${PORTSDIR}/graphics/py-opengl \ ${PYTHON_PKGNAMEPREFIX}gtkglext>0:${PORTSDIR}/x11-toolkits/py-gtkglext diff --git a/graphics/hugin/Makefile b/graphics/hugin/Makefile index 5cd17aecd783..e722493f4f6e 100644 --- a/graphics/hugin/Makefile +++ b/graphics/hugin/Makefile @@ -1,13 +1,9 @@ -# New ports collection makefile for: hugin -# Date created: 26 august 2004 -# Whom: cartola (Carlos E. G. Carvalho) -# +# Created by: cartola (Carlos E. G. Carvalho) # $FreeBSD$ -# PORTNAME= hugin PORTVERSION= 2011.4.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:R} diff --git a/graphics/k3d/Makefile b/graphics/k3d/Makefile index a6f29a6db249..27cb28848287 100644 --- a/graphics/k3d/Makefile +++ b/graphics/k3d/Makefile @@ -1,10 +1,5 @@ -# ex:ts=8 -# Ports collection makefile for: k3d -# Date created: Jun 9, 2004 -# Whom: ijliao -# +# Created by: ijliao # $FreeBSD$ -# PORTNAME= k3d PORTVERSION= 0.8.0.2 diff --git a/graphics/libopenraw/Makefile b/graphics/libopenraw/Makefile index 272dd1a8cfc6..1a5472c1d8da 100644 --- a/graphics/libopenraw/Makefile +++ b/graphics/libopenraw/Makefile @@ -3,14 +3,14 @@ PORTNAME= libopenraw PORTVERSION= 0.0.8 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MASTER_SITES= http://libopenraw.freedesktop.org/download/ MAINTAINER= pav@FreeBSD.org COMMENT= Library for camera RAW files decoding -LIB_DEPENDS= boost_thread.4:${PORTSDIR}/devel/boost-libs \ +LIB_DEPENDS= boost_thread:${PORTSDIR}/devel/boost-libs \ jpeg.11:${PORTSDIR}/graphics/jpeg MAKE_JOBS_SAFE= yes diff --git a/graphics/luxrender/Makefile b/graphics/luxrender/Makefile index d994678f595f..002a03a63dee 100644 --- a/graphics/luxrender/Makefile +++ b/graphics/luxrender/Makefile @@ -1,13 +1,9 @@ -# New ports collection makefile for: LuxRender -# Date created: 16 March 2010 -# Whom: Alexey Dokuchaev <danfe@FreeBSD.org> -# +# Created by: Alexey Dokuchaev <danfe@FreeBSD.org> # $FreeBSD$ -# PORTNAME= luxrender PORTVERSION= 0.7.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= http://src.luxrender.net/lux/archive/ \ http://freebsd.nsu.ru/distfiles/luxrender/ @@ -22,7 +18,7 @@ LICENSE= GPLv3 BROKEN= does not build with boost-1.48.0 BUILD_DEPENDS= ${LOCALBASE}/lib/libfreeimage.a:${PORTSDIR}/graphics/freeimage -LIB_DEPENDS= boost_thread.4:${PORTSDIR}/devel/boost-libs \ +LIB_DEPENDS= boost_thread:${PORTSDIR}/devel/boost-libs \ png15:${PORTSDIR}/graphics/png \ IlmImf:${PORTSDIR}/graphics/OpenEXR \ diff --git a/graphics/mapnik/Makefile b/graphics/mapnik/Makefile index c51a869aceff..925441431550 100644 --- a/graphics/mapnik/Makefile +++ b/graphics/mapnik/Makefile @@ -3,7 +3,7 @@ PORTNAME= mapnik PORTVERSION= 2.1.0 -PORTREVISION= 1 +PORTREVISION= 2 DISTVERSIONPREFIX= v CATEGORIES= graphics geography MASTER_SITES= http://cloud.github.com/downloads/${PORTNAME}/${PORTNAME}/ @@ -19,12 +19,12 @@ LIB_DEPENDS= proj:${PORTSDIR}/graphics/proj \ tiff:${PORTSDIR}/graphics/tiff \ jpeg:${PORTSDIR}/graphics/jpeg \ icuuc:${PORTSDIR}/devel/icu \ - boost_system:${PORTSDIR}/devel/boost-libs + boost_system:${PORTSDIR}/devel/boost-libs \ + boost_python:${PORTSDIR}/devel/boost-python-libs BUILD_DEPENDS= ${LOCALBASE}/bin/freetype-config:${PORTSDIR}/print/freetype2 \ icu>=4.2:${PORTSDIR}/devel/icu \ ${PYTHON_PKGNAMEPREFIX}icu>=0.8.1:${PORTSDIR}/devel/py-icu \ boost-libs>=1.47:${PORTSDIR}/devel/boost-libs \ - ${LOCALBASE}/include/boost/python.hpp:${PORTSDIR}/devel/boost-python-libs USE_BZIP2= yes USE_PYTHON= 2.6+ diff --git a/graphics/openimageio/Makefile b/graphics/openimageio/Makefile index 465d8c7e7cde..b8ee83175ddc 100644 --- a/graphics/openimageio/Makefile +++ b/graphics/openimageio/Makefile @@ -3,7 +3,7 @@ PORTNAME?= openimageio PORTVERSION= 1.1.2 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES?= graphics multimedia MASTER_SITES= https://github.com/OpenImageIO/oiio/tarball/ diff --git a/graphics/openshadinglanguage/Makefile b/graphics/openshadinglanguage/Makefile index f1e813deec9b..c5f7e582fc6b 100644 --- a/graphics/openshadinglanguage/Makefile +++ b/graphics/openshadinglanguage/Makefile @@ -3,6 +3,7 @@ PORTNAME= openshadinglanguage PORTVERSION= 1.3.0 +PORTREVISION= 1 CATEGORIES= graphics devel MAINTAINER= FreeBSD@Shaneware.biz diff --git a/graphics/povray37/Makefile b/graphics/povray37/Makefile index 2502793c66a9..9cba1734b6e8 100644 --- a/graphics/povray37/Makefile +++ b/graphics/povray37/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME= povray -PORTREVISION= 1 DISTVERSION= 3.7.0.RC6 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://www.povray.org/beta/source/ DIST_SUBDIR= ${UNIQUENAME} @@ -10,7 +10,7 @@ DIST_SUBDIR= ${UNIQUENAME} MAINTAINER= bkoenig@alpha-tierchen.de COMMENT= Persistence of Vision Ray Tracer -LIB_DEPENDS= boost_thread.4:${PORTSDIR}/devel/boost-libs +LIB_DEPENDS= boost_thread:${PORTSDIR}/devel/boost-libs OPTIONS_DEFINE= X11 PNG JPEG TIFF OPENEXR STATIC IO EXAMPLES DOCS OPTIONS_DEFAULT= PNG JPEG EXAMPLES DOCS @@ -116,6 +116,13 @@ DOC_FILES= AUTHORS ChangeLog NEWS PORTDOCS= * PORTEXAMPLES= * +post-patch: +# Fix with boost 1.52 + @${REINPLACE_CMD} -e 's/TIME_UTC/TIME_UTC_/g' ${WRKSRC}/source/backend/scene/view.cpp \ + ${WRKSRC}/source/base/timer.cpp \ + ${WRKSRC}/vfe/vfepovms.cpp \ + ${WRKSRC}/vfe/unix/platformbase.cpp \ + ${WRKSRC}/vfe/vfesession.cpp pre-build: .if ${PORT_OPTIONS:MSTATIC} && ${PORT_OPTIONS:MTIFF} # graphics/tiff adds dependencies on libjpeg and libjbig diff --git a/graphics/py-exiv2/Makefile b/graphics/py-exiv2/Makefile index 42038a24f7ef..e880345df65a 100644 --- a/graphics/py-exiv2/Makefile +++ b/graphics/py-exiv2/Makefile @@ -3,6 +3,7 @@ PORTNAME= exiv2 PORTVERSION= 0.3.2 +PORTREVISION= 1 CATEGORIES= graphics python MASTER_SITES= https://launchpadlibrarian.net/83595798/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/graphics/py-openimageio/Makefile b/graphics/py-openimageio/Makefile index 54a255daf6d4..f28cd932f564 100644 --- a/graphics/py-openimageio/Makefile +++ b/graphics/py-openimageio/Makefile @@ -2,6 +2,7 @@ # $FreeBSD$ PORTNAME= openimageio +PORTREVISION= 1 CATEGORIES= graphics multimedia python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} diff --git a/graphics/py-visual/Makefile b/graphics/py-visual/Makefile index 9043e12606b7..9e94a878620c 100644 --- a/graphics/py-visual/Makefile +++ b/graphics/py-visual/Makefile @@ -3,7 +3,7 @@ PORTNAME= visual PORTVERSION= 4.b26 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= graphics python MASTER_SITES= SF/${PORTNAME}python/${PORTNAME}-module/VPython%204.beta26 PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -20,7 +20,7 @@ BUILD_DEPENDS= ${PYNUMPY} \ LIB_DEPENDS= gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea \ gtkglextmm-x11-1.2:${PORTSDIR}/x11-toolkits/gtkglextmm \ glademm-2.4.1:${PORTSDIR}/devel/libglademm24 \ - boost_python.4:${PORTSDIR}/devel/boost-python-libs + boost_python:${PORTSDIR}/devel/boost-python-libs RUN_DEPENDS:= ${BUILD_DEPENDS} USE_BZIP2= yes diff --git a/graphics/scantailor/Makefile b/graphics/scantailor/Makefile index becfc872c968..b3e7f0cc0608 100644 --- a/graphics/scantailor/Makefile +++ b/graphics/scantailor/Makefile @@ -1,13 +1,8 @@ -# New ports collection makefile for: scantailor -# Date created: 2010-04-13 -# Whom: Gvozdikov Veniamin <g.veniamin@googlemail.com> -# +# Created by: Gvozdikov Veniamin <g.veniamin@googlemail.com> # $FreeBSD$ -# PORTNAME= scantailor -PORTVERSION= 0.9.10 -PORTREVISION= 2 +PORTVERSION= 0.9.11 CATEGORIES= graphics MASTER_SITES= SF diff --git a/graphics/scantailor/distinfo b/graphics/scantailor/distinfo index f81df36d504e..b2a0b656c50b 100644 --- a/graphics/scantailor/distinfo +++ b/graphics/scantailor/distinfo @@ -1,2 +1,2 @@ -SHA256 (scantailor-0.9.10.tar.gz) = 0b574eabfb65e4dcf3915d00ad3da31d464060458ffaeb49e4257e97301f93a0 -SIZE (scantailor-0.9.10.tar.gz) = 1124348 +SHA256 (scantailor-0.9.11.tar.gz) = e158fa5c38b1c34dec47e611e27d74a0508bc2b6818b84f0d05f98ba184c9c11 +SIZE (scantailor-0.9.11.tar.gz) = 1175866 diff --git a/graphics/visionworkbench/Makefile b/graphics/visionworkbench/Makefile index 00acccb94698..aa8c9ee64ad4 100644 --- a/graphics/visionworkbench/Makefile +++ b/graphics/visionworkbench/Makefile @@ -1,13 +1,9 @@ -# New ports collection makefile for: visionworkbench -# Date created: 2010-01-03 -# Whom: Steve Wills <steve@mouf.net> -# +# Created by: Steve Wills <steve@mouf.net> # $FreeBSD$ -# PORTNAME= visionworkbench PORTVERSION= 2.2.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= http://ti.arc.nasa.gov/m/project/nasa-vision-workbench/ DISTNAME= VisionWorkbench-${PORTVERSION} @@ -29,8 +25,8 @@ USE_PYTHON= 2.4+ LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png -LIB_DEPENDS+= boost_thread.4:${PORTSDIR}/devel/boost-libs -LIB_DEPENDS+= boost_python.4:${PORTSDIR}/devel/boost-python-libs +LIB_DEPENDS+= boost_thread:${PORTSDIR}/devel/boost-libs +LIB_DEPENDS+= boost_python:${PORTSDIR}/devel/boost-python-libs LIB_DEPENDS+= gdal:${PORTSDIR}/graphics/gdal LIB_DEPENDS+= lapack.4:${PORTSDIR}/math/lapack LIB_DEPENDS+= IlmImf:${PORTSDIR}/graphics/OpenEXR @@ -51,6 +47,9 @@ LDFLAGS+= ${PTHREAD_LIBS} CONFIGURE_ENV= CFLAGS="-I${LOCALBASE}/include ${CFLAGS}" \ LIBS="-L${LOCALBASE}/lib ${LDFLAGS}" +post-patch: + @${REINPLACE_CMD} -e "s,-DBOOST_FILESYSTEM_VERSION=2,,g" ${WRKSRC}/configure + pre-configure: echo "HAVE_PKG_FLAPACK=yes" >> ${WRKSRC}/config.options echo "PKG_FLAPACK_LDFLAGS=-L${LOCALBASE}/lib/${CC}" >> ${WRKSRC}/config.options diff --git a/graphics/visionworkbench/files/patch-boost-1.52 b/graphics/visionworkbench/files/patch-boost-1.52 new file mode 100644 index 000000000000..86f9c041c482 --- /dev/null +++ b/graphics/visionworkbench/files/patch-boost-1.52 @@ -0,0 +1,563 @@ +diff --git configure.ac configure.ac +index 4594e56..896220b 100644 +--- configure.ac ++++ configure.ac +@@ -481,7 +481,7 @@ AM_CONDITIONAL(MAKE_MODULE_GPU, [test "$MAKE_MODULE_GPU" = "yes"]) + # final processing + ################################################## + +-VW_CPPFLAGS="-I\${abs_top_srcdir}/src -I\${abs_top_builddir}/src $OTHER_CPPFLAGS -DBOOST_FILESYSTEM_VERSION=2" ++VW_CPPFLAGS="-I\${abs_top_srcdir}/src -I\${abs_top_builddir}/src $OTHER_CPPFLAGS" + VW_LDFLAGS="$OTHER_LDFLAGS" + + # Do this last, to make sure it's not overridden +diff --git src/vw/BundleAdjustment/ControlNetworkLoader.cc src/vw/BundleAdjustment/ControlNetworkLoader.cc +index ed24605..9c092e8 100644 +--- src/vw/BundleAdjustment/ControlNetworkLoader.cc ++++ src/vw/BundleAdjustment/ControlNetworkLoader.cc +@@ -65,8 +65,8 @@ void vw::ba::triangulate_control_point( ControlPoint& cp, + if ( sm.convergence_angle( cp[j].position(), + cp[k].position() ) > + minimum_angle ) { +- count++; +- position_sum += sm( cp[j].position(), cp[k].position(), error ); ++ count++; ++ position_sum += sm( cp[j].position(), cp[k].position(), error ); + error_sum += error; + } + } catch ( const camera::PixelToRayErr& ) { /* Just let it go */ } +@@ -110,7 +110,7 @@ void vw::ba::build_control_network( ba::ControlNetwork& cnet, + fs::path file_path(file); + image_prefix_map[file_path.replace_extension().string()] = count; + crn.add_node( ba::CameraNode<ba::IPFeature>( count, +- file_path.stem() ) ); ++ file_path.stem().string() ) ); + count++; + } + +@@ -128,7 +128,7 @@ void vw::ba::build_control_network( ba::ControlNetwork& cnet, + if ( obj->path().extension() != ".match" ) continue; + + // Pull out the prefixes that made up that match file +- std::string match_base = obj->path().stem(); ++ std::string match_base = obj->path().stem().string(); + size_t split_pt = match_base.find("__"); + if ( split_pt == std::string::npos ) continue; + std::string prefix1 = match_base.substr(0,split_pt); +@@ -143,14 +143,14 @@ void vw::ba::build_control_network( ba::ControlNetwork& cnet, + + // Actually read in the file as it seems we've found something correct + std::vector<ip::InterestPoint> ip1, ip2; +- ip::read_binary_match_file( obj->string(), ip1, ip2 ); ++ ip::read_binary_match_file( obj->path().string(), ip1, ip2 ); + if ( ip1.size() < min_matches ) { +- vw_out(VerboseDebugMessage,"ba") << "\t" << obj->string() << " " ++ vw_out(VerboseDebugMessage,"ba") << "\t" << obj->path().string() << " " + << it1->second << " <-> " << it2->second << " : " + << ip1.size() << " matches. [rejected]\n"; + num_load_rejected += ip1.size(); + } else { +- vw_out(VerboseDebugMessage,"ba") << "\t" << obj->string() << " " ++ vw_out(VerboseDebugMessage,"ba") << "\t" << obj->path().string() << " " + << it1->second << " <-> " << it2->second << " : " + << ip1.size() << " matches.\n"; + num_loaded += ip1.size(); +diff --git src/vw/BundleAdjustment/ControlNetworkLoader.h src/vw/BundleAdjustment/ControlNetworkLoader.h +index 1e4deb4..7e8b270 100644 +--- src/vw/BundleAdjustment/ControlNetworkLoader.h ++++ src/vw/BundleAdjustment/ControlNetworkLoader.h +@@ -59,7 +59,7 @@ + LookupType image_lookup; + for (size_t i = 0; i < image_files.size(); i++ ) { + image_lookup[image_files[i]] = i; +- image_lookup[fs::path(image_files[i]).filename()] = i; ++ image_lookup[fs::path(image_files[i]).filename().string()] = i; + } + + while ( gcp_start != gcp_end ) { +@@ -139,7 +139,7 @@ + LookupType image_lookup; + for (size_t i = 0; i < image_files.size(); i++ ) { + image_lookup[image_files[i]] = i; +- image_lookup[fs::path(image_files[i]).filename()] = i; ++ image_lookup[fs::path(image_files[i]).filename().string()] = i; + } + + while ( gcpcnet_start != gcpcnet_end ) { +diff --git src/vw/FileIO/KML.cc src/vw/FileIO/KML.cc +index be91a5f..f04c41b 100644 +--- src/vw/FileIO/KML.cc ++++ src/vw/FileIO/KML.cc +@@ -259,7 +259,7 @@ + std::ostringstream path; + if ( m_directory != "" ) + path << m_directory << "/"; +- fs::path kml_path( path.str(), fs::native ); ++ fs::path kml_path( path.str() ); + fs::create_directories( kml_path ); + path << m_filename; + kml_path = path.str(); +diff --git src/vw/FileIO/tests/TestTemporaryFile.cxx src/vw/FileIO/tests/TestTemporaryFile.cxx +index 4fcaaaf..05b33cf 100644 +--- src/vw/FileIO/tests/TestTemporaryFile.cxx ++++ src/vw/FileIO/tests/TestTemporaryFile.cxx +@@ -46,15 +46,15 @@ string get_directory(const TemporaryDir& f) { + } + + string get_prefix(const TemporaryFile& f, size_t len) { +- return fs::path(f.filename()).leaf().substr(0, len); ++ return fs::path(f.filename()).filename().string().substr(0, len); + } + + string get_prefix(const TemporaryDir& f, size_t len) { +- return fs::path(f.filename()).leaf().substr(0, len); ++ return fs::path(f.filename()).filename().string().substr(0, len); + } + + string get_suffix(const TemporaryFile& f, size_t len) { +- string fn = fs::path(f.filename()).leaf(); ++ string fn = fs::path(f.filename()).filename().string(); + return fn.substr(fn.size()-len, len); + } + +diff --git src/vw/Mosaic/CelestiaQuadTreeConfig.cc src/vw/Mosaic/CelestiaQuadTreeConfig.cc +index d215843..5a27da1 100644 +--- src/vw/Mosaic/CelestiaQuadTreeConfig.cc ++++ src/vw/Mosaic/CelestiaQuadTreeConfig.cc +@@ -31,7 +31,7 @@ + } + + std::string CelestiaQuadTreeConfig::image_path( QuadTreeGenerator const& qtree, std::string const& name ) { +- fs::path path( qtree.get_name(), fs::native ); ++ fs::path path( qtree.get_name() ); + + Vector<size_t,2> pos(0,0); + for ( size_t i=0; i < name.length(); ++i ) { +@@ -55,7 +55,7 @@ + + path /= oss.str(); + +- return path.native_file_string(); ++ return path.string(); + } + + void CelestiaQuadTreeConfig::configure( QuadTreeGenerator& qtree ) const { +diff --git src/vw/Mosaic/GMapQuadTreeConfig.cc src/vw/Mosaic/GMapQuadTreeConfig.cc +index f47fc05..840ab4e 100644 +--- src/vw/Mosaic/GMapQuadTreeConfig.cc ++++ src/vw/Mosaic/GMapQuadTreeConfig.cc +@@ -30,7 +30,7 @@ + + // for gmaps, origin is upper left, advancing right and down. + std::string GMapQuadTreeConfig::image_path( QuadTreeGenerator const& qtree, std::string const& name ) { +- fs::path path( qtree.get_name(), fs::native ); ++ fs::path path( qtree.get_name() ); + + Vector<size_t, 2> pos(0,0); + BOOST_FOREACH(char n, name) { +@@ -50,11 +50,11 @@ + oss << name.length() << "/" << pos.x() << "/" << pos.y(); + path /= oss.str(); + +- return path.native_file_string(); ++ return path.string(); + } + + boost::shared_ptr<DstImageResource> GMapQuadTreeConfig::tile_resource( QuadTreeGenerator const& /*qtree*/, QuadTreeGenerator::TileInfo const& info, ImageFormat const& format ) { +- create_directories( fs::path( info.filepath, fs::native ).branch_path() ); ++ create_directories( fs::path( info.filepath ).parent_path() ); + return boost::shared_ptr<DstImageResource>( DiskImageResource::create( info.filepath + info.filetype, format, info.filetype ) ); + } + +diff --git src/vw/Mosaic/GigapanQuadTreeConfig.cc src/vw/Mosaic/GigapanQuadTreeConfig.cc +index d9ceac9..685c9fe 100644 +--- src/vw/Mosaic/GigapanQuadTreeConfig.cc ++++ src/vw/Mosaic/GigapanQuadTreeConfig.cc +@@ -98,7 +98,7 @@ + + if ( root_node) { + std::ostringstream json; +- fs::path file_path( info.filepath, fs::native ); ++ fs::path file_path( info.filepath ); + fs::path json_path = change_extension( file_path, ".json" ); + + json << "{" << std::endl +diff --git src/vw/Mosaic/KMLQuadTreeConfig.cc src/vw/Mosaic/KMLQuadTreeConfig.cc +index d527e3a..cd155dc 100644 +--- src/vw/Mosaic/KMLQuadTreeConfig.cc ++++ src/vw/Mosaic/KMLQuadTreeConfig.cc +@@ -235,8 +235,8 @@ + + void KMLQuadTreeConfigData::metadata_func( QuadTreeGenerator const& qtree, QuadTreeGenerator::TileInfo const& info ) const { + std::ostringstream kml; +- fs::path file_path( info.filepath, fs::native ); +- size_t base_len = file_path.branch_path().native_file_string().size() + 1; ++ fs::path file_path( info.filepath ); ++ size_t base_len = file_path.parent_path().string().size() + 1; + fs::path kml_path = change_extension( file_path, ".kml" ); + kml << std::setprecision(10); + +@@ -264,10 +264,11 @@ + m_root_node_tags << " <Style><ListStyle><listItemType>checkHideChildren</listItemType></ListStyle></Style>\n"; + } + +- std::vector<std::pair<std::string,BBox2i> > children = qtree.branches( info.name, info.region_bbox ); ++ std::vector<std::pair<std::string,BBox2i> > children = ++ qtree.branches( info.name, info.region_bbox ); + for( unsigned i=0; i<children.size(); ++i ) { + std::string kmlfile = qtree.image_path(children[i].first) + ".kml"; +- if( exists( fs::path( kmlfile, fs::native ) ) ) { ++ if( exists( fs::path( kmlfile ) ) ) { + num_children++; + kml << kml_network_link( children[i].first.substr(children[i].first.size()-1), + kmlfile.substr(base_len), +@@ -281,7 +282,7 @@ + int draw_order = m_draw_order_offset + int(info.name.size()); + BBox2i go_bbox = (qtree.get_crop_images() ? info.image_bbox : info.region_bbox); + if( exists( fs::path( info.filepath + info.filetype ) ) ) { +- kml << kml_ground_overlay( file_path.leaf() + info.filetype, ++ kml << kml_ground_overlay( file_path.filename().string() + info.filetype, + pixels_to_longlat( info.region_bbox, qtree.get_dimensions() ), + pixels_to_longlat( go_bbox, qtree.get_dimensions() ), + draw_order, qtree.get_tile_size()/2, max_lod ); +@@ -333,7 +334,7 @@ + } + + boost::shared_ptr<DstImageResource> KMLQuadTreeConfigData::tile_resource_func( QuadTreeGenerator const&, QuadTreeGenerator::TileInfo const& info, ImageFormat const& format ) const { +- create_directories( fs::path( info.filepath, fs::native ).branch_path() ); ++ create_directories( fs::path( info.filepath ).parent_path() ); + if( info.filetype == ".png" && (format.pixel_format==VW_PIXEL_RGBA || format.pixel_format==VW_PIXEL_GRAYA) ) { + return boost::shared_ptr<DstImageResource>( new DiskImageResourcePNGAlphaHack( info.filepath+info.filetype, format ) ); + } +diff --git src/vw/Mosaic/QuadTreeGenerator.cc src/vw/Mosaic/QuadTreeGenerator.cc +index 389825d..a4cba6f 100644 +--- src/vw/Mosaic/QuadTreeGenerator.cc ++++ src/vw/Mosaic/QuadTreeGenerator.cc +@@ -28,13 +28,13 @@ + namespace mosaic { + + std::string QuadTreeGenerator::simple_image_path::operator()( QuadTreeGenerator const& qtree, std::string const& name ) { +- fs::path path( qtree.get_name(), fs::native ); ++ fs::path path( qtree.get_name() ); + path /= "r" + name; +- return path.native_file_string(); ++ return path.string(); + } + + std::string QuadTreeGenerator::tiered_image_path::operator()( QuadTreeGenerator const& qtree, std::string const& name, int32 levels_per_directory ) { +- fs::path path( qtree.get_name(), fs::native ); ++ fs::path path( qtree.get_name() ); + + std::string rname = "r" + name; + +@@ -43,14 +43,14 @@ + } + path /= rname; + +- return path.native_file_string(); ++ return path.string(); + } + + std::string QuadTreeGenerator::named_tiered_image_path::operator()( QuadTreeGenerator const& qtree, std::string const& name, int32 levels_per_directory ) { +- fs::path path( qtree.get_name(), fs::native ); ++ fs::path path( qtree.get_name() ); + + if( name.length() == 0 ) { +- path /= change_extension( path, "" ).leaf(); ++ path /= change_extension( path, "" ).filename(); + } + else { + for ( int32 i=0; i<(int32)name.length() - levels_per_directory; i+=levels_per_directory ) { +@@ -59,7 +59,7 @@ + path /= name; + } + +- return path.native_file_string(); ++ return path.string(); + } + + std::vector<std::pair<std::string,vw::BBox2i> > QuadTreeGenerator::default_branch_func::operator()( QuadTreeGenerator const& qtree, std::string const& name, BBox2i const& region ) { +@@ -74,7 +74,7 @@ + } + + boost::shared_ptr<DstImageResource> QuadTreeGenerator::default_tile_resource_func::operator()( QuadTreeGenerator const&, TileInfo const& info, ImageFormat const& format ) { +- create_directories( fs::path( info.filepath, fs::native ).branch_path() ); ++ create_directories( fs::path( info.filepath ).parent_path() ); + return boost::shared_ptr<DstImageResource>( DiskImageResource::create( info.filepath+info.filetype, format ) ); + } + +diff --git src/vw/Mosaic/TMSQuadTreeConfig.cc src/vw/Mosaic/TMSQuadTreeConfig.cc +index 92f4ab9..2f6c30b 100644 +--- src/vw/Mosaic/TMSQuadTreeConfig.cc ++++ src/vw/Mosaic/TMSQuadTreeConfig.cc +@@ -25,7 +25,7 @@ + namespace mosaic { + + std::string TMSQuadTreeConfig::image_path( QuadTreeGenerator const& qtree, std::string const& name ) { +- fs::path path( qtree.get_name(), fs::native ); ++ fs::path path( qtree.get_name() ); + + Vector2i pos(0,0); + for ( int i=0; i<(int)name.length(); ++i ) { +@@ -41,7 +41,7 @@ + oss << name.length() << "/" << pos.x() << "/" << pos.y(); + path /= oss.str(); + +- return path.native_file_string(); ++ return path.string(); + } + + void TMSQuadTreeConfig::configure( QuadTreeGenerator& qtree ) const { +diff --git src/vw/Mosaic/ToastQuadTreeConfig.h src/vw/Mosaic/ToastQuadTreeConfig.h +index 209ff0e..ba2aed6 100644 +--- src/vw/Mosaic/ToastQuadTreeConfig.h ++++ src/vw/Mosaic/ToastQuadTreeConfig.h +@@ -200,13 +200,13 @@ + } + + // Read it in from disk +- fs::path path( qtree->get_name(), fs::native ); ++ fs::path path( qtree->get_name() ); + std::ostringstream filename; + filename << level << "/" << x << "/" << y << "." << qtree->get_file_type(); + path /= filename.str(); + ImageView<PixelT> tile; + if( exists(path) ) { +- read_image( tile, path.native_file_string() ); ++ read_image( tile, path.string() ); + } + + // Save it in the cache. The cache size of 1024 tiles was chosen +@@ -251,7 +251,7 @@ + generate_branch( branch_level, level+1, 2*x+1, 2*y+1, SubProgressCallback(progress_callback, 0.75, 1.00) ); + } + else { +- fs::path path( qtree->get_name(), fs::native ); ++ fs::path path( qtree->get_name() ); + std::ostringstream filename; + filename << level << "/" << x << "/" << y << "." << qtree->get_file_type(); + path /= filename.str(); +@@ -288,8 +288,8 @@ + } + + if( ! is_transparent(tile) ) { +- create_directories( path.branch_path() ); +- write_image( path.native_file_string(), tile ); ++ create_directories( path.parent_path() ); ++ write_image( path.string(), tile ); + } + + progress_callback.report_progress(1); +diff --git src/vw/Mosaic/UniviewQuadTreeConfig.cc src/vw/Mosaic/UniviewQuadTreeConfig.cc +index c6c20b3..e94e0d7 100644 +--- src/vw/Mosaic/UniviewQuadTreeConfig.cc ++++ src/vw/Mosaic/UniviewQuadTreeConfig.cc +@@ -67,7 +67,7 @@ + } + + std::string UniviewQuadTreeConfig::image_path( QuadTreeGenerator const& qtree, std::string const& name ) { +- fs::path path( qtree.get_name(), fs::native ); ++ fs::path path( qtree.get_name() ); + + Vector2i pos(0,0); + for ( int i=0; i<(int)name.length(); ++i ) { +@@ -86,12 +86,12 @@ + oss << name.length()-1 << "/" << pos.y() << "/" << pos.x(); + path /= oss.str(); + +- return path.native_file_string(); ++ return path.string(); + } + + + boost::shared_ptr<DstImageResource> UniviewQuadTreeConfig::terrain_tile_resource( QuadTreeGenerator const& /*qtree*/,QuadTreeGenerator::TileInfo const& info, ImageFormat const& format ) { +- create_directories( fs::path( info.filepath, fs::native ).branch_path() ); ++ create_directories( fs::path( info.filepath ).parent_path() ); + return boost::shared_ptr<DstImageResource>( new UniviewTerrainResource( info.filepath+info.filetype, format ) ); + } + +diff --git src/vw/tools/blend.cc src/vw/tools/blend.cc +index c0f6e29..dbab5a9 100644 +--- src/vw/tools/blend.cc ++++ src/vw/tools/blend.cc +@@ -58,7 +58,7 @@ void do_blend() { + + std::map<std::string,fs::path> image_files; + std::map<std::string,fs::path> offset_files; +- fs::path source_dir_path( mosaic_name, fs::native ); ++ fs::path source_dir_path( mosaic_name ); + fs::directory_iterator pi( source_dir_path ), pend; + for( ; pi != pend; ++pi ) { + if( extension(*pi) == ".offset" ) +diff --git src/vw/tools/correlate.cc src/vw/tools/correlate.cc +index 521206f..e249e55 100644 +--- src/vw/tools/correlate.cc ++++ src/vw/tools/correlate.cc +@@ -95,7 +95,9 @@ int main( int argc, char *argv[] ) { + return 1; + } + +- std::string match_filename = fs::path( left_file_name ).replace_extension().string() + "__" + fs::path( right_file_name ).stem() + ".match"; ++ std::string match_filename = ++ fs::path( left_file_name ).replace_extension().string() + "__" + ++ fs::path( right_file_name ).stem().string() + ".match"; + if ( fs::exists( match_filename ) ) { + vw_out() << "Found a match file. Using it to pre-align images.\n"; + std::vector<ip::InterestPoint> matched_ip1, matched_ip2; +diff --git src/vw/tools/ipalign.cc src/vw/tools/ipalign.cc +index 76c1689..f513827 100644 +--- src/vw/tools/ipalign.cc ++++ src/vw/tools/ipalign.cc +@@ -220,7 +220,7 @@ void align_images( Options & opt ) { + } + std::string output_filename = + fs::path(ref_name).replace_extension().string() + "__" + +- fs::path(input_name).stem() + ".match"; ++ fs::path(input_name).stem().string() + ".match"; + write_binary_match_file(output_filename, final_ip1, final_ip2); + } + +diff --git src/vw/tools/ipmatch.cc src/vw/tools/ipmatch.cc +index 06aa88a..96c690b 100644 +--- src/vw/tools/ipmatch.cc ++++ src/vw/tools/ipmatch.cc +@@ -64,19 +64,19 @@ static void write_match_image(std::string const& out_file_name, + mosaic::ImageComposite<PixelRGB<uint8> > composite; + if ( irsrc1->has_nodata_read() ) { + composite.insert( pixel_cast_rescale<PixelRGB<uint8> >(resample(apply_mask(normalize(create_mask(DiskImageView<PixelGray<float> >(*irsrc1), +- irsrc1->nodata_read()))), sub_scale)), +- 0, 0 ); ++ irsrc1->nodata_read()))), sub_scale)), ++ 0, 0 ); + } else { + composite.insert( pixel_cast_rescale<PixelRGB<uint8> >(resample(normalize(DiskImageView<PixelGray<float> >(*irsrc1)), sub_scale)), +- 0, 0 ); ++ 0, 0 ); + } + if ( irsrc2->has_nodata_read() ) { + composite.insert(pixel_cast_rescale<PixelRGB<uint8> >(resample(apply_mask(normalize(create_mask(DiskImageView<PixelGray<float> >(*irsrc2), +- irsrc2->nodata_read()))), sub_scale)), +- int32(irsrc1->format().cols * sub_scale), 0 ); ++ irsrc2->nodata_read()))), sub_scale)), ++ int32(irsrc1->format().cols * sub_scale), 0 ); + } else { + composite.insert(pixel_cast_rescale<PixelRGB<uint8> >(resample(normalize(DiskImageView<PixelGray<float> >(*irsrc2)), sub_scale)), +- int32(irsrc1->format().cols * sub_scale), 0 ); ++ int32(irsrc1->format().cols * sub_scale), 0 ); + } + composite.set_draft_mode( true ); + composite.prepare(); +@@ -101,7 +101,7 @@ static void write_match_image(std::string const& out_file_name, + + boost::scoped_ptr<vw::DiskImageResource> rsrc( DiskImageResource::create(out_file_name, comp.format()) ); + block_write_image( *rsrc, comp, +- TerminalProgressCallback( "tools.ipmatch", "Writing Debug:" ) ); ++ TerminalProgressCallback( "tools.ipmatch", "Writing Debug:" ) ); + } + + int main(int argc, char** argv) { +@@ -183,7 +183,7 @@ int main(int argc, char** argv) { + vw_out() << "Found " << matched_ip1.size() << " putative matches.\n"; + + std::vector<Vector3> ransac_ip1 = iplist_to_vectorlist(matched_ip1), +- ransac_ip2 = iplist_to_vectorlist(matched_ip2); ++ ransac_ip2 = iplist_to_vectorlist(matched_ip2); + std::vector<size_t> indices; + try { + // RANSAC is used to fit a transform between the matched sets +@@ -214,8 +214,8 @@ int main(int argc, char** argv) { + indices.push_back(i); + } else { + vw_out() << "Unknown RANSAC constraint type: " << ransac_constraint +- << ". Choose one of: [similarity, homography, fundamental, or none]\n"; +- return 1; ++ << ". Choose one of: [similarity, homography, fundamental, or none]\n"; ++ return 1; + } + } catch (const vw::math::RANSACErr& e ) { + vw_out() << "RANSAC Failed: " << e.what() << "\n"; +@@ -230,8 +230,8 @@ int main(int argc, char** argv) { + } + + std::string output_prefix = +- fs::path(input_file_names[i]).replace_extension().string() + "__" + +- fs::path(input_file_names[j]).stem(); ++ fs::path(input_file_names[i]).replace_extension().string() + "__" + ++ fs::path(input_file_names[j]).stem().string(); + write_binary_match_file(output_prefix+".match", final_ip1, final_ip2); + + if (vm.count("debug-image")) { +@@ -244,4 +244,3 @@ int main(int argc, char** argv) { + + return 0; + } +- +diff --git configure.ac configure.ac +index fc96826..4594e56 100644 +--- configure.ac ++++ configure.ac +@@ -205,7 +205,7 @@ AX_PKG_BOOST([BOOST_PROGRAM_OPTIONS BOOST_FILESYSTEM BOOST_THREAD BOOST_GRAPH], + BOOST_REGEX, + [AX_PKG_BOOST_LIB(REGEX, [-lboost_regex], [boost/regex.hpp], [boost::regex(".*");])], + BOOST_DATETIME, +- [AX_PKG_BOOST_LIB(DATETIME, [-lboost_date_time], [boost/date_time/gregorian/gregorian_types.hpp])], ++ [AX_PKG_BOOST_LIB(DATETIME, [-lboost_date_time], [boost/date_time/gregorian/gregorian_types.hpp], [], [$PKG_BOOST_SYSTEM_LIBS])], + BOOST_THREAD, + [AX_PKG_BOOST_LIB(THREAD, [-lboost_thread], [boost/thread/thread.hpp], [boost::mutex();], [$PKG_BOOST_DATETIME_LIBS], [boost/thread/condition.hpp])], + BOOST_IOSTREAMS, +diff --git src/vw/Core/Settings.cc src/vw/Core/Settings.cc +index 068988c..7c1becb 100644 +--- src/vw/Core/Settings.cc ++++ src/vw/Core/Settings.cc +@@ -67,7 +67,11 @@ void Settings::reload_config() { + // call reload_config and deadlock! + + boost::xtime xt; ++#if BOOST_VERSION >= 105000 ++ boost::xtime_get(&xt, boost::TIME_UTC_); ++#else + boost::xtime_get(&xt, boost::TIME_UTC); ++#endif + bool needs_reloading = false; + + // Every five seconds, we attempt to open the log config file to see +diff --git src/vw/Core/Thread.h src/vw/Core/Thread.h +index b1bbdfd..4040a8a 100644 +--- src/vw/Core/Thread.h ++++ src/vw/Core/Thread.h +@@ -175,7 +175,11 @@ + template<typename LockT> + bool timed_wait(LockT &lock, unsigned long milliseconds) { + boost::xtime xt; ++#if BOOST_VERSION >= 105000 ++ boost::xtime_get(&xt, boost::TIME_UTC_); ++#else + boost::xtime_get(&xt, boost::TIME_UTC); ++#endif + while (milliseconds >= 1000) { + xt.sec++; + milliseconds -= 1000; +@@ -187,7 +191,11 @@ + template<typename LockT, typename Pred> + bool timed_wait(LockT &lock, unsigned long milliseconds, Pred pred) { + boost::xtime xt; ++#if BOOST_VERSION >= 105000 ++ boost::xtime_get(&xt, boost::TIME_UTC_); ++#else + boost::xtime_get(&xt, boost::TIME_UTC); ++#endif + while (milliseconds >= 1000) { + xt.sec++; + milliseconds -= 1000; +@@ -269,7 +277,11 @@ + /// threads/processes. + static inline void sleep_ms( uint32 milliseconds ) { + boost::xtime xt; ++#if BOOST_VERSION >= 105000 ++ boost::xtime_get(&xt, boost::TIME_UTC_); ++#else + boost::xtime_get(&xt, boost::TIME_UTC); ++#endif + while (milliseconds >= 1000) { + xt.sec++; + milliseconds -= 1000; diff --git a/lang/hiphop-php/Makefile b/lang/hiphop-php/Makefile index a819fb65cc93..da843f284164 100644 --- a/lang/hiphop-php/Makefile +++ b/lang/hiphop-php/Makefile @@ -3,7 +3,7 @@ PORTNAME= hiphop-php PORTVERSION= 0.0.20120716 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= lang devel www MASTER_SITES= https://github.com/facebook/hiphop-php/tarball/${GITVERSION}/:main \ http://unicode.org/Public/UNIDATA/:unidata \ @@ -32,6 +32,8 @@ LICENSE_DISTFILES_UNICODE= EastAsianWidth.txt \ 8859-11.TXT 8859-13.TXT 8859-14.TXT 8859-15.TXT 8859-16.TXT LICENSE_DISTFILES_ZEND200= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} +BROKEN= Does not build with recent boost + LIB_DEPENDS= icudata:${PORTSDIR}/devel/icu \ boost_thread:${PORTSDIR}/devel/boost-libs \ execinfo:${PORTSDIR}/devel/libexecinfo \ diff --git a/lang/sdcc/Makefile b/lang/sdcc/Makefile index 994deaf4c79e..edd839051cbd 100644 --- a/lang/sdcc/Makefile +++ b/lang/sdcc/Makefile @@ -23,6 +23,7 @@ CONFLICTS_INSTALL= sdcc-[0-9]* GNU_CONFIGURE= yes USE_BZIP2= yes USE_GMAKE= yes +USE_GCC= 4.6+ OPTIONS_DEFINE= DEVLIB DOCS HC08 MCS51 PIC UCSIM Z80 OPTIONS_DEFAULT=${OPTIONS_DEFINE:NDOCS} diff --git a/mail/libmapi/Makefile b/mail/libmapi/Makefile index bd3868e0e263..147f834fbf19 100644 --- a/mail/libmapi/Makefile +++ b/mail/libmapi/Makefile @@ -3,7 +3,7 @@ PORTNAME= libmapi PORTVERSION= 0.9 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= mail MASTER_SITES= SF MASTER_SITE_SUBDIR=openchange/openchange/openchange-${PORTVERSION}%20${CODENAME}/ @@ -43,7 +43,7 @@ CONFIGURE_ARGS+= --disable-swig-perl CONFIGURE_ARGS+= --disable-pymapi .if ${PORT_OPTIONS:MBOOST} || exists(${LOCALBASE}/lib/libboost_thread.so) -LIB_DEPENDS+= boost_thread.4:${PORTSDIR}/devel/boost-libs +LIB_DEPENDS+= boost_thread:${PORTSDIR}/devel/boost-libs PLIST_SUB+= BOOST="" .else PLIST_SUB+= BOOST="@comment " diff --git a/math/carve/Makefile b/math/carve/Makefile index 43dc9b75954c..54730398a202 100644 --- a/math/carve/Makefile +++ b/math/carve/Makefile @@ -3,7 +3,7 @@ PORTNAME= carve PORTVERSION= 1.4.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} EXTRACT_SUFX= .tgz @@ -11,7 +11,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= gahr@FreeBSD.org COMMENT= A fast, robust constructive solid geometry library -LIB_DEPENDS= boost_filesystem.4:${PORTSDIR}/devel/boost-libs +LIB_DEPENDS= boost_filesystem:${PORTSDIR}/devel/boost-libs OPTIONS_DEFINE= GUI diff --git a/math/kig/Makefile b/math/kig/Makefile index 169a72209355..963795b37fe8 100644 --- a/math/kig/Makefile +++ b/math/kig/Makefile @@ -1,12 +1,9 @@ -# New ports collection Makefile for: kig -# Date created: 6 September 2011 -# Whom: Alberto Villa <avilla@FreeBSD.org> -# +# Created by: Alberto Villa <avilla@FreeBSD.org> # $FreeBSD$ -# PORTNAME= kig PORTVERSION= ${KDE4_VERSION} +PORTREVISION= 1 CATEGORIES= math kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src diff --git a/math/py-graphtool/Makefile b/math/py-graphtool/Makefile index 13f3d2c7daca..900dc71ce6d7 100644 --- a/math/py-graphtool/Makefile +++ b/math/py-graphtool/Makefile @@ -1,13 +1,9 @@ -# New ports collection makefile for: py-graphtool -# Date created: 2011-04-29 -# Whom: dikshie <dikshie@sfc.wide.ad.jp> -# +# Created by: dikshie <dikshie@sfc.wide.ad.jp> # $FreeBSD$ -# PORTNAME= graphtool PORTVERSION= 2.2.12 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math python MASTER_SITES= http://downloads.skewed.de/graph-tool/ DISTNAME= graph-tool-${PORTVERSION} @@ -18,8 +14,8 @@ COMMENT= Python module for complex network based on C++ BUILD_DEPENDS= ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}matplotlib>=0.90.1:${PORTSDIR}/math/py-matplotlib \ ${PYTHON_PKGNAMEPREFIX}scipy>=0.8.0:${PORTSDIR}/science/py-scipy -LIB_DEPENDS= boost_python.4:${PORTSDIR}/devel/boost-python-libs \ - boost_graph.4:${PORTSDIR}/devel/boost-libs \ +LIB_DEPENDS= boost_python:${PORTSDIR}/devel/boost-python-libs \ + boost_graph:${PORTSDIR}/devel/boost-libs \ CGAL.5:${PORTSDIR}/math/cgal USE_BZIP2= yes diff --git a/math/rocs/Makefile b/math/rocs/Makefile index 94988859e0ab..bb6e81e7e030 100644 --- a/math/rocs/Makefile +++ b/math/rocs/Makefile @@ -1,12 +1,9 @@ -# New ports collection Makefile for: rocs -# Date created: 6 September 2011 -# Whom: Alberto Villa <avilla@FreeBSD.org> -# +# Created by: Alberto Villa <avilla@FreeBSD.org> # $FreeBSD$ -# PORTNAME= rocs PORTVERSION= ${KDE4_VERSION} +PORTREVISION= 1 CATEGORIES= math kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src @@ -15,7 +12,7 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Graph theory IDE for KDE 4 -LIB_DEPENDS= boost_thread.4:${PORTSDIR}/devel/boost-libs +LIB_DEPENDS= boost_thread:${PORTSDIR}/devel/boost-libs CONFLICTS= kdeedu-4.[0-6].* diff --git a/math/ufc/Makefile b/math/ufc/Makefile index bdf84d08d443..615eed3a950c 100644 --- a/math/ufc/Makefile +++ b/math/ufc/Makefile @@ -1,12 +1,9 @@ -# New ports collection makefile for: ufc -# Date created: 27 March 2012 -# Whom: Jason Bacon <jwbacon@tds.net> -# +# Created by: Jason Bacon <jwbacon@tds.net> # $FreeBSD$ -# PORTNAME= ufc PORTVERSION= 2.0.5 +PORTREVISION= 1 CATEGORIES= math python MASTER_SITES= http://launchpad.net/${PORTNAME}/2.0.x/${PORTVERSION}/+download/ diff --git a/misc/kdeedu3/Makefile b/misc/kdeedu3/Makefile index cf0454a68702..3ad6a708ad6d 100644 --- a/misc/kdeedu3/Makefile +++ b/misc/kdeedu3/Makefile @@ -1,13 +1,9 @@ -# New ports collection makefile for: kdeedu3 -# Date created: 2 November 2001 -# Whom: will@cvs.kde.org -# +# Created by: will@cvs.kde.org # $FreeBSD$ -# PORTNAME= kdeedu PORTVERSION= ${KDE_VERSION} -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES?= misc kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src diff --git a/multimedia/assimp/Makefile b/multimedia/assimp/Makefile index de2aee19dac1..5dac001f9323 100644 --- a/multimedia/assimp/Makefile +++ b/multimedia/assimp/Makefile @@ -3,6 +3,7 @@ PORTNAME= assimp PORTVERSION= 3.0 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTNAME}-3.0 diff --git a/multimedia/bombono/Makefile b/multimedia/bombono/Makefile index 1dd283f65339..2a7292e347ca 100644 --- a/multimedia/bombono/Makefile +++ b/multimedia/bombono/Makefile @@ -1,13 +1,9 @@ -# New ports collection makefile for: multimedia/bombono -# Date created: 07 Sep 2009 -# Whom: Stas Timokhin <stast@bsdportal.ru> -# +# Created by: Stas Timokhin <stast@bsdportal.ru> # $FreeBSD$ -# PORTNAME= bombono PORTVERSION= 1.2.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= multimedia MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-dvd/1.2 DISTNAME= ${PORTNAME}-dvd-${PORTVERSION} @@ -16,7 +12,6 @@ MAINTAINER= pawel@FreeBSD.org COMMENT= DVD authoring program BUILD_DEPENDS= GraphicsMagick>=1.1.7:${PORTSDIR}/graphics/GraphicsMagick \ - boost-libs>=1.48.0:${PORTSDIR}/devel/boost-libs \ mjpegtools>=1.9.0:${PORTSDIR}/multimedia/mjpegtools LIB_DEPENDS= gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 \ xml++-2.6.2:${PORTSDIR}/textproc/libxml++26 \ diff --git a/multimedia/cclive/Makefile b/multimedia/cclive/Makefile index d50290c114c7..6dacdbf83818 100644 --- a/multimedia/cclive/Makefile +++ b/multimedia/cclive/Makefile @@ -3,6 +3,7 @@ PORTNAME= cclive PORTVERSION= 0.7.11 +PORTREVISION= 2 CATEGORIES= multimedia net MASTER_SITES= SF/${PORTNAME}/0.7 \ GOOGLE_CODE @@ -12,7 +13,7 @@ COMMENT= Lightweight command line video extraction tool LICENSE= GPLv3 -LIB_DEPENDS= boost_system.4:${PORTSDIR}/devel/boost-libs \ +LIB_DEPENDS= boost_system:${PORTSDIR}/devel/boost-libs \ curl.6:${PORTSDIR}/ftp/curl \ pcre.3:${PORTSDIR}/devel/pcre \ quvi.7:${PORTSDIR}/multimedia/libquvi diff --git a/multimedia/gstreamer-qt4/Makefile b/multimedia/gstreamer-qt4/Makefile index 6ed699b7fa38..d0fc923886af 100644 --- a/multimedia/gstreamer-qt4/Makefile +++ b/multimedia/gstreamer-qt4/Makefile @@ -3,7 +3,7 @@ PORTNAME= gstreamer PORTVERSION= 0.10.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MASTER_SITES= http://gstreamer.freedesktop.org/src/qt-${PORTNAME}/ PKGNAMESUFFIX= -qt4 diff --git a/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile index 61bfca67ac43..79653fdd0b44 100644 --- a/multimedia/mkvtoolnix/Makefile +++ b/multimedia/mkvtoolnix/Makefile @@ -3,6 +3,7 @@ PORTNAME= mkvtoolnix PORTVERSION= 5.9.0 +PORTREVISION= 1 CATEGORIES= multimedia audio MASTER_SITES= http://www.bunkus.org/videotools/mkvtoolnix/sources/ \ CRITICAL diff --git a/multimedia/vdr-plugin-upnp/Makefile b/multimedia/vdr-plugin-upnp/Makefile index 42d0b3ed811d..2d9ed370760c 100644 --- a/multimedia/vdr-plugin-upnp/Makefile +++ b/multimedia/vdr-plugin-upnp/Makefile @@ -1,13 +1,9 @@ -# New ports collection makefile for: vdr-plugin-upnp -# Date created: Tue Nov 16 18:34:10 CET 2010 -# Whom: Juergen Lock <nox@freebsd.org> -# +# Created by: Juergen Lock <nox@freebsd.org> # $FreeBSD$ -# PORTNAME= vdr-plugin-upnp PORTVERSION= 0.0.2a2 -PORTREVISION= 18 +PORTREVISION= 19 CATEGORIES= multimedia MASTER_SITES= http://projects.vdr-developer.org/attachments/download/177/ DISTNAME= ${PORTNAME:S/-plugin-/-/}-${DISTVERSIONPREFIX}${DISTVERSION:S/a/-alpha/}${DISTVERSIONSUFFIX} diff --git a/multimedia/xbmc-pvr/Makefile b/multimedia/xbmc-pvr/Makefile index 06fca9742747..4e9751501289 100644 --- a/multimedia/xbmc-pvr/Makefile +++ b/multimedia/xbmc-pvr/Makefile @@ -1,13 +1,9 @@ -# New ports collection makefile for: xbmc -# Date created: 2010-09-16 -# Whom: Mickael Maillot <mickael.maillot@gmail.com> -# +# Created by: Mickael Maillot <mickael.maillot@gmail.com> # $FreeBSD$ -# PORTNAME= xbmc PORTVERSION= 70 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= multimedia MASTER_SITES= LOCAL/nox PKGNAMESUFFIX= -pvr-ppa-odk diff --git a/multimedia/xbmc/Makefile b/multimedia/xbmc/Makefile index 6731adc1108b..58c8144dd3b8 100644 --- a/multimedia/xbmc/Makefile +++ b/multimedia/xbmc/Makefile @@ -2,7 +2,7 @@ PORTNAME= xbmc DISTVERSION= 12.0.rc3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MAINTAINER= mickael.maillot@gmail.com diff --git a/net-im/licq-console/Makefile b/net-im/licq-console/Makefile index 8a4a3e96ad42..82c6893bf1d6 100644 --- a/net-im/licq-console/Makefile +++ b/net-im/licq-console/Makefile @@ -3,6 +3,7 @@ PORTNAME= console PORTVERSION= 1.7.1 +PORTREVISION= 1 CATEGORIES= net-im MAINTAINER= dinoex@FreeBSD.org diff --git a/net-im/licq-console/files/patch-window.h b/net-im/licq-console/files/patch-window.h deleted file mode 100644 index f598519eb3fb..000000000000 --- a/net-im/licq-console/files/patch-window.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/window.h.orig Thu Sep 30 03:51:03 2004 -+++ src/window.h Wed Oct 13 14:19:58 2004 -@@ -3,7 +3,7 @@ - - #include <iostream> - extern "C" { --#include <cdk.h> -+#include <cdk/cdk.h> - } - - #define COLOR_YELLOW_BLUE COLOR_YELLOW + 8 diff --git a/net-im/licq-jabber/Makefile b/net-im/licq-jabber/Makefile index a4aacd375fd7..98cfdc497666 100644 --- a/net-im/licq-jabber/Makefile +++ b/net-im/licq-jabber/Makefile @@ -2,6 +2,7 @@ PORTNAME= jabber PORTVERSION= 1.7.1 +PORTREVISION= 1 CATEGORIES= net-im MAINTAINER= dinoex@FreeBSD.org diff --git a/net-im/licq-osd/Makefile b/net-im/licq-osd/Makefile index 0baf30026e5f..43d577175963 100644 --- a/net-im/licq-osd/Makefile +++ b/net-im/licq-osd/Makefile @@ -3,6 +3,7 @@ PORTNAME= osd PORTVERSION= 1.7.1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= net-im diff --git a/net-im/licq-qt-gui/Makefile b/net-im/licq-qt-gui/Makefile index 10ee1cc4fb0b..8da92e37fab8 100644 --- a/net-im/licq-qt-gui/Makefile +++ b/net-im/licq-qt-gui/Makefile @@ -3,6 +3,7 @@ PORTNAME= qt4-gui PORTVERSION= 1.7.1 +PORTREVISION= 1 CATEGORIES= net-im PKGNAMESUFFIX?= ${KDE_SUFFIX}${PKGNAMESUFFIX2} diff --git a/net-im/licq/Makefile b/net-im/licq/Makefile index bb4b7f6492b9..a78566018491 100644 --- a/net-im/licq/Makefile +++ b/net-im/licq/Makefile @@ -3,6 +3,7 @@ PORTNAME= base PORTVERSION= ${LICQ_VER} +PORTREVISION= 1 CATEGORIES= net-im PKGNAMESUFFIX= ${SOCKS_SUFFIX}${PKGNAMESUFFIX2} diff --git a/net-p2p/bitcoin/Makefile b/net-p2p/bitcoin/Makefile index 559d7f6a64c5..4c17359e757e 100644 --- a/net-p2p/bitcoin/Makefile +++ b/net-p2p/bitcoin/Makefile @@ -1,12 +1,9 @@ -# New ports collection makefile for: bitcoin -# Date created: 2011-05-20 -# Whom: Shaun Amott <shaun@FreeBSD.org> -# +# Created by: Shaun Amott <shaun@FreeBSD.org> # $FreeBSD$ -# PORTNAME= bitcoin PORTVERSION= 0.7.1 +PORTREVISION= 1 CATEGORIES= net-p2p finance MAINTAINER= robbak@robbak.com diff --git a/net-p2p/eiskaltdcpp-lib/Makefile b/net-p2p/eiskaltdcpp-lib/Makefile index 36913466c59e..9b2a2db59265 100644 --- a/net-p2p/eiskaltdcpp-lib/Makefile +++ b/net-p2p/eiskaltdcpp-lib/Makefile @@ -1,13 +1,9 @@ -# New ports collection makefile for: net-p2p/eiskaltdc -# Date created: 28 Aug 2009 -# Whom: Stas Timokhin <stast@bsdportal.ru> -# +# Created by: Stas Timokhin <stast@bsdportal.ru> # $FreeBSD$ -# PORTNAME= eiskaltdcpp-lib PORTVERSION= 2.2.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net-p2p MASTER_SITES= GOOGLE_CODE DISTNAME= eiskaltdcpp-${DISTVERSION} diff --git a/net-p2p/libktorrent/Makefile b/net-p2p/libktorrent/Makefile index c558d4dbbd82..7b801a4621af 100644 --- a/net-p2p/libktorrent/Makefile +++ b/net-p2p/libktorrent/Makefile @@ -2,7 +2,7 @@ PORTNAME= libktorrent DISTVERSION= 1.3.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-p2p kde MASTER_SITES= http://ktorrent.org/downloads/${DISTVERSION:C,^1,4,:C,-.*,,}/ diff --git a/net-p2p/libtorrent-rasterbar-15-python/Makefile b/net-p2p/libtorrent-rasterbar-15-python/Makefile index e75a9a2c3687..c69281020119 100644 --- a/net-p2p/libtorrent-rasterbar-15-python/Makefile +++ b/net-p2p/libtorrent-rasterbar-15-python/Makefile @@ -1,13 +1,14 @@ # $FreeBSD$ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +PORTREVISION= 2 COMMENT= Python bindings for libtorrent-rasterbar-15 CATEGORIES= net-p2p python USE_PYTHON= yes -LIB_DEPENDS+= boost_python.4:${PORTSDIR}/devel/boost-python-libs \ +LIB_DEPENDS+= boost_python:${PORTSDIR}/devel/boost-python-libs \ torrent-rasterbar.6:${PORTSDIR}/net-p2p/libtorrent-rasterbar-15 BUILD_WRKSRC= ${WRKSRC}/bindings/python diff --git a/net-p2p/libtorrent-rasterbar-15/Makefile b/net-p2p/libtorrent-rasterbar-15/Makefile index 77251870752b..fe2e33633391 100644 --- a/net-p2p/libtorrent-rasterbar-15/Makefile +++ b/net-p2p/libtorrent-rasterbar-15/Makefile @@ -2,7 +2,7 @@ PORTNAME= libtorrent-rasterbar PORTVERSION= 0.15.9 -PORTREVISION?= 2 +PORTREVISION?= 4 CATEGORIES?= net-p2p ipv6 MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} PROJECTHOST= libtorrent @@ -10,6 +10,8 @@ PROJECTHOST= libtorrent MAINTAINER= ports@FreeBSD.org COMMENT?= C++ library implementing a BitTorrent client +BROKEN= Does not build with recent boost + MAKE_JOBS_SAFE= yes CONFLICTS+= libtorrent-rasterbar-0.1[46789].* @@ -17,7 +19,7 @@ CONFLICTS+= libtorrent-rasterbar-0.1[46789].* NO_LATEST_LINK= yes BUILD_DEPENDS= pkgconf>0:${PORTSDIR}/devel/pkgconf -LIB_DEPENDS+= boost_date_time.4:${PORTSDIR}/devel/boost-libs \ +LIB_DEPENDS+= boost_date_time:${PORTSDIR}/devel/boost-libs \ GeoIP.5:${PORTSDIR}/net/GeoIP USE_GNOME= gnomehack @@ -59,6 +61,15 @@ pre-patch: @${CP} ${WRKSRC}/configure ${WRKSRC}/configure.Dist @${SED} -e 's#COMPILETIME_OPTIONS+="#COMPILETIME_OPTIONS="$$COMPILETIME_OPTIONS #g' \ ${WRKSRC}/configure.Dist > ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's:BOOST_FILESYSTEM_VERSION=2:BOOST_FILESYSTEM_VERSION=3:g' \ + -e 's:BOOST_FILESYSTEM_VERSION 2:BOOST_FILESYSTEM_VERSION 3:g' \ + -e 's:\[BOOST_FILESYSTEM_VERSION\],\[2\]:[BOOST_FILESYSTEM_VERSION],[3]:g' \ + ${WRKSRC}/bindings/python/setup.py \ + ${WRKSRC}/configure \ + ${WRKSRC}/Jamfile \ + ${WRKSRC}/libtorrent-rasterbar-cmake.pc \ + ${WRKSRC}/libtorrent-rasterbar.pc + .if defined(SLAVE_PORT) && ${SLAVE_PORT:L}=="yes" post-patch: slave-post-patch diff --git a/net-p2p/libtorrent-rasterbar-16-python/Makefile b/net-p2p/libtorrent-rasterbar-16-python/Makefile index c56d4eadb4d3..e2b73eb72914 100644 --- a/net-p2p/libtorrent-rasterbar-16-python/Makefile +++ b/net-p2p/libtorrent-rasterbar-16-python/Makefile @@ -1,5 +1,7 @@ # $FreeBSD$ +PORTREVISION= 1 + PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} COMMENT= Python bindings for libtorrent-rasterbar-16 @@ -7,7 +9,7 @@ CATEGORIES= net-p2p python USE_PYTHON= yes -LIB_DEPENDS+= boost_python.4:${PORTSDIR}/devel/boost-python-libs \ +LIB_DEPENDS+= boost_python:${PORTSDIR}/devel/boost-python-libs \ torrent-rasterbar.7:${PORTSDIR}/net-p2p/libtorrent-rasterbar-16 BUILD_WRKSRC= ${WRKSRC}/bindings/python diff --git a/net-p2p/libtorrent-rasterbar-16/Makefile b/net-p2p/libtorrent-rasterbar-16/Makefile index 8c562d767361..48b728846505 100644 --- a/net-p2p/libtorrent-rasterbar-16/Makefile +++ b/net-p2p/libtorrent-rasterbar-16/Makefile @@ -2,7 +2,7 @@ PORTNAME= libtorrent-rasterbar PORTVERSION= 0.16.7 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= net-p2p ipv6 MASTER_SITES= GOOGLE_CODE PROJECTHOST= libtorrent @@ -16,7 +16,7 @@ CONFLICTS+= libtorrent-rasterbar-0.1[45789].* NO_LATEST_LINK= yes -LIB_DEPENDS+= boost_date_time.4:${PORTSDIR}/devel/boost-libs \ +LIB_DEPENDS+= boost_date_time:${PORTSDIR}/devel/boost-libs \ GeoIP:${PORTSDIR}/net/GeoIP USE_PKGCONFIG= build diff --git a/net-p2p/solidcoin/Makefile b/net-p2p/solidcoin/Makefile index 0357914d49e2..04c68f6fac2c 100644 --- a/net-p2p/solidcoin/Makefile +++ b/net-p2p/solidcoin/Makefile @@ -3,7 +3,7 @@ PORTNAME= solidcoin PORTVERSION= 2.041 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net-p2p finance MASTER_SITES= http://solidcoin.info/downloads/ \ http://dl.dropbox.com/u/47582909/ @@ -15,7 +15,7 @@ COMMENT= Alternative Bitcoin peer-to-peer currency client BROKEN= Does not build BUILD_DEPENDS= ${LOCALBASE}/include/boost/graph/parallel/algorithm.hpp:${PORTSDIR}/devel/boost-libs -LIB_DEPENDS= boost_date_time.4:${PORTSDIR}/devel/boost-libs +LIB_DEPENDS= boost_date_time:${PORTSDIR}/devel/boost-libs OPTIONS= GUI "Build with wxWidgets GUI" on diff --git a/net/asio/Makefile b/net/asio/Makefile index c0abb3e111a6..bb1b7ff8ebfe 100644 --- a/net/asio/Makefile +++ b/net/asio/Makefile @@ -1,19 +1,16 @@ -# New ports collection makefile for: asio -# Date created: 2010-11-14 -# Whom: Alonso Cardenas Marquez <acm@FreeBSD.org> -# +# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org> # $FreeBSD$ -# PORTNAME= asio PORTVERSION= 1.4.8 +PORTREVISION= 1 CATEGORIES= net devel MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20(Stable)/ MAINTAINER= acm@FreeBSD.org COMMENT= Cross-platform C++ library for network and low-level I/O programming -LIB_DEPENDS= boost_thread.4:${PORTSDIR}/devel/boost-libs +LIB_DEPENDS= boost_thread:${PORTSDIR}/devel/boost-libs GNU_CONFIGURE= yes USE_GMAKE= yes diff --git a/net/cyphesis/Makefile b/net/cyphesis/Makefile index 5ac8cd01f5f6..2fcdbb313c1d 100644 --- a/net/cyphesis/Makefile +++ b/net/cyphesis/Makefile @@ -3,7 +3,7 @@ PORTNAME= cyphesis PORTVERSION= 0.6.0 -#PORTREVISION= 2 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= SF/worldforge/${PORTNAME}%20%28server%29/${PORTVERSION} diff --git a/net/kdenetwork4/Makefile b/net/kdenetwork4/Makefile index 10e4c5a38193..56ffd1914326 100644 --- a/net/kdenetwork4/Makefile +++ b/net/kdenetwork4/Makefile @@ -1,12 +1,9 @@ -# New ports collection Makefile for: kdepim -# Date created: 2008-01-30 -# Whom: Martin Wilke <miwi@FreeBSD.org> -# +# Created by: Martin Wilke <miwi@FreeBSD.org> # $FreeBSD$ PORTNAME= kdenetwork PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 2 +PORTREVISION= 4 CATEGORIES= net kde ipv6 MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src @@ -30,7 +27,7 @@ LIB_DEPENDS= slp.1:${PORTSDIR}/net/openslp \ v4l2.0:${PORTSDIR}/multimedia/libv4l \ ktorrent:${PORTSDIR}/net-p2p/libktorrent \ jasper.4:${PORTSDIR}/graphics/jasper \ - boost_thread.4:${PORTSDIR}/devel/boost-libs \ + boost_thread:${PORTSDIR}/devel/boost-libs \ gif.5:${PORTSDIR}/graphics/giflib \ mms.0:${PORTSDIR}/net/libmms \ jpeg.11:${PORTSDIR}/graphics/jpeg diff --git a/net/pktanon/Makefile b/net/pktanon/Makefile index 05b2e37b8be5..9463439a915f 100644 --- a/net/pktanon/Makefile +++ b/net/pktanon/Makefile @@ -2,6 +2,7 @@ PORTNAME= pktanon PORTVERSION= 1.2.3 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://www.tm.uka.de/software/pktanon/download/ DISTNAME= ${PORTNAME}-${PORTVERSION}-dev @@ -9,7 +10,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-dev MAINTAINER= wxs@FreeBSD.org COMMENT= Network trace anonymizer -LIB_DEPENDS= boost_regex.4:${PORTSDIR}/devel/boost-libs \ +LIB_DEPENDS= boost_regex:${PORTSDIR}/devel/boost-libs \ xerces-c:${PORTSDIR}/textproc/xerces-c2 GNU_CONFIGURE= yes diff --git a/net/scribe/Makefile b/net/scribe/Makefile index 01b88281551c..6b015b9e6181 100644 --- a/net/scribe/Makefile +++ b/net/scribe/Makefile @@ -1,12 +1,9 @@ -# New ports collection makefile for: scribe -# Date created: 2010-07-15 -# Whom: Jui-Nan Lin <jnlin@csie.nctu.edu.tw> +# Created by: Jui-Nan Lin <jnlin@csie.nctu.edu.tw> # $FreeBSD$ -# PORTNAME= scribe DISTVERSION= 2.2.2012.01.07 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= https://github.com/facebook/scribe/tarball/${GITVERSION}/ DISTNAME= facebook-scribe-${GITVERSION} diff --git a/net/twinkle/Makefile b/net/twinkle/Makefile index 559af0c76649..a0a5da75c935 100644 --- a/net/twinkle/Makefile +++ b/net/twinkle/Makefile @@ -3,7 +3,7 @@ PORTNAME= twinkle PORTVERSION= 1.4.2 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= net MASTER_SITES= http://mfnboer.home.xs4all.nl/twinkle/download/ @@ -14,7 +14,7 @@ BUILD_DEPENDS= qmake:${PORTSDIR}/devel/qmake LIB_DEPENDS= ccgnu2:${PORTSDIR}/devel/commoncpp \ ccrtp:${PORTSDIR}/devel/ccrtp \ sndfile.1:${PORTSDIR}/audio/libsndfile \ - boost_regex.4:${PORTSDIR}/devel/boost-libs \ + boost_regex:${PORTSDIR}/devel/boost-libs \ speex.1:${PORTSDIR}/audio/speex \ ilbc.0:${PORTSDIR}/net/ilbc \ zrtpcpp:${PORTSDIR}/devel/libzrtpcpp diff --git a/net/xorp-devel/Makefile b/net/xorp-devel/Makefile index 3b2d7f4fc841..87bfe9392f99 100644 --- a/net/xorp-devel/Makefile +++ b/net/xorp-devel/Makefile @@ -3,7 +3,7 @@ PORTNAME= xorp-devel PORTVERSION= 2009120801 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= bms @@ -13,7 +13,6 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Open source network routing platform, development branch # Uses libcurses, libcrypto, librt from base system. -BUILD_DEPENDS= ${LOCALBASE}/include/boost/version.hpp:${PORTSDIR}/devel/boost-libs LIB_DEPENDS= boost_regex:${PORTSDIR}/devel/boost-libs \ pcap:${PORTSDIR}/net/libpcap diff --git a/palm/barry/Makefile b/palm/barry/Makefile index b71bede9beeb..ef1b119d4d67 100644 --- a/palm/barry/Makefile +++ b/palm/barry/Makefile @@ -3,14 +3,14 @@ PORTNAME= barry PORTVERSION= 0.12 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= palm MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= C++ library for interfacing with the BlackBerry Handheld -LIB_DEPENDS= boost_thread.4:${PORTSDIR}/devel/boost-libs +LIB_DEPENDS= boost_thread:${PORTSDIR}/devel/boost-libs USE_BZIP2= yes USE_LDCONFIG= yes diff --git a/print/cjk-lyx/Makefile b/print/cjk-lyx/Makefile index c8f2f52bbec6..78a77d95da00 100644 --- a/print/cjk-lyx/Makefile +++ b/print/cjk-lyx/Makefile @@ -1,13 +1,9 @@ -# New ports collection makefile for: cjk-lyx -# Date created: Sa 12 Okt 1996 19:20:51 MET DST -# Whom: Andreas Klemm <andreas@klemm.gtn.com> -# +# Created by: Andreas Klemm <andreas@klemm.gtn.com> # $FreeBSD$ -# PORTNAME= lyx PORTVERSION= 1.4.4 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= print chinese japanese korean MASTER_SITES= ftp://cellular.phys.pusan.ac.kr/CJK-LyX/qt/ \ ftp://ftp.u-aizu.ac.jp/pub/tex/cjk-lyx/qt/ \ diff --git a/print/lyx/Makefile b/print/lyx/Makefile index a4faeb643448..b1982982a091 100644 --- a/print/lyx/Makefile +++ b/print/lyx/Makefile @@ -3,6 +3,7 @@ PORTNAME= lyx PORTVERSION= ${MAJOR_VERSION}.${MINOR_VERSION} +PORTREVISION= 1 CATEGORIES= print editors MASTER_SITES= ftp://ftp.lyx.org/pub/lyx/stable/${MAJOR_VERSION}.x/ \ http://www-ftp.lip6.fr/ftp/pub/lyx/stable/${MAJOR_VERSION}.x/ \ @@ -16,7 +17,7 @@ COMMENT= Document processor interfaced with LaTeX (nearly WYSIWYG) LICENSE= GPLv2 -LIB_DEPENDS= boost_regex.4:${PORTSDIR}/devel/boost-libs \ +LIB_DEPENDS= boost_regex:${PORTSDIR}/devel/boost-libs \ mythes-1.2.0:${PORTSDIR}/textproc/mythes CONFLICTS= lyx-1.[0-9]* diff --git a/print/lyx16/Makefile b/print/lyx16/Makefile index ff133fd065f3..3a78a9e8ddec 100644 --- a/print/lyx16/Makefile +++ b/print/lyx16/Makefile @@ -3,7 +3,7 @@ PORTNAME= lyx PORTVERSION= ${MAJOR_VERSION}.${MINOR_VERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= print editors MASTER_SITES= ftp://ftp.lyx.org/pub/lyx/stable/${MAJOR_VERSION}.x/ \ http://www-ftp.lip6.fr/ftp/pub/lyx/stable/${MAJOR_VERSION}.x/ \ @@ -17,7 +17,7 @@ COMMENT= Document processor interfaced with LaTeX (nearly WYSIWYG) (stable) LICENSE= GPLv2 -LIB_DEPENDS= boost_regex.4:${PORTSDIR}/devel/boost-libs +LIB_DEPENDS= boost_regex:${PORTSDIR}/devel/boost-libs LATEST_LINK= lyx16 CONFLICTS= lyx-1.4* lyx-devel-* lyx-2* diff --git a/print/pdfcube/Makefile b/print/pdfcube/Makefile index 042fe2c04623..45af35ff093e 100644 --- a/print/pdfcube/Makefile +++ b/print/pdfcube/Makefile @@ -1,13 +1,9 @@ -# New ports collection makefile for: pdfcube -# Date created: Apr. 20, 2007 -# Whom: Li-Wen Hsu <lwhsu@FreeBSD.org> -# +# Created by: Li-Wen Hsu <lwhsu@FreeBSD.org> # $FreeBSD$ -# PORTNAME= pdfcube DISTVERSION= 0.0.4-beta -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= print MASTER_SITES= http://code.100allora.it/releases/pdfcube/ diff --git a/print/scribus-devel/Makefile b/print/scribus-devel/Makefile index 0aa77f0c609e..3cd6713f1a69 100644 --- a/print/scribus-devel/Makefile +++ b/print/scribus-devel/Makefile @@ -1,13 +1,9 @@ -# Ports collection makefile for: scribus -# Date created: 2012-05-20 -# Whom: lbartoletti <coer@tuxfamily.org> -# +# Created by: lbartoletti <coer@tuxfamily.org> # $FreeBSD$ -# PORTNAME= scribus PORTVERSION= 1.5.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= print editors MASTER_SITES= http://download.tuxfamily.org/bartcoding/FreeBSD/ \ ${MASTER_SITE_LOCAL} diff --git a/print/scribus/Makefile b/print/scribus/Makefile index f8be7b6ce42b..5a34d23b439e 100644 --- a/print/scribus/Makefile +++ b/print/scribus/Makefile @@ -1,14 +1,11 @@ -# Ports collection makefile for: scribus -# Date created: Mar 15, 2002 -# Whom: ijliao -# +# Created by: ijliao # $Carpetsmoker: ports/print/scribus/Makefile,v 1.2 2007/09/24 08:06:52 carpetsmoker Exp $ # $FreeBSD$ # PORTNAME= scribus PORTVERSION= 1.4.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= print editors MASTER_SITES= SF \ http://www.scribus.net/downloads/${PORTVERSION}/ @@ -23,7 +20,7 @@ LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \ cups.2:${PORTSDIR}/print/cups-client \ freetype.9:${PORTSDIR}/print/freetype2 \ podofo.0:${PORTSDIR}/graphics/podofo \ - boost_thread.4:${PORTSDIR}/devel/boost-libs \ + boost_thread:${PORTSDIR}/devel/boost-libs \ aspell.16:${PORTSDIR}/textproc/aspell \ cairo.2:${PORTSDIR}/graphics/cairo \ hyphen:${PORTSDIR}/textproc/hyphen \ diff --git a/science/peekabot/Makefile b/science/peekabot/Makefile index 1e4ccdd333ce..7cc2bf0d7103 100644 --- a/science/peekabot/Makefile +++ b/science/peekabot/Makefile @@ -3,7 +3,7 @@ PORTNAME= peekabot PORTVERSION= 0.8.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= science MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:R}.x @@ -13,7 +13,7 @@ COMMENT= Distributed real-time 3D visualization tool for robotics researchers LICENSE= BSL GPLv3 LICENSE_COMB= multi -LIB_DEPENDS= boost_regex.4:${PORTSDIR}/devel/boost-libs \ +LIB_DEPENDS= boost_regex:${PORTSDIR}/devel/boost-libs \ xerces-c.3:${PORTSDIR}/textproc/xerces-c3 \ gtkglextmm-x11-1.2:${PORTSDIR}/x11-toolkits/gtkglextmm diff --git a/security/spass/Makefile b/security/spass/Makefile index b724717ade89..291a58ba1dc0 100644 --- a/security/spass/Makefile +++ b/security/spass/Makefile @@ -2,6 +2,7 @@ PORTNAME= spass PORTVERSION= 3.0 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= http://cloud.github.com/downloads/guyru/spass/ DISTFILES= ${DISTNAME}.tar.bz2 diff --git a/sysutils/fusefs-encfs/Makefile b/sysutils/fusefs-encfs/Makefile index e289896c3889..3b2e44ffa29a 100644 --- a/sysutils/fusefs-encfs/Makefile +++ b/sysutils/fusefs-encfs/Makefile @@ -1,13 +1,9 @@ -# New ports collection makefile for: fusefs-encfs -# Date created: 2007-01-05 -# Whom: trasz <trasz@pin.if.uz.zgora.pl> -# +# Created by: trasz <trasz@pin.if.uz.zgora.pl> # $FreeBSD$ -# PORTNAME= encfs PORTVERSION= 1.7.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} PKGNAMEPREFIX= fusefs- @@ -17,7 +13,7 @@ MAINTAINER= olgeni@FreeBSD.org COMMENT= An encrypted pass-through FUSE filesystem LIB_DEPENDS= rlog.5:${PORTSDIR}/devel/rlog \ - boost_serialization.4:${PORTSDIR}/devel/boost-libs + boost_serialization:${PORTSDIR}/devel/boost-libs WRKSRC= ${WRKDIR}/encfs-${PORTVERSION} diff --git a/textproc/sigil/Makefile b/textproc/sigil/Makefile index 7a9e53536fcf..414d53569a1e 100644 --- a/textproc/sigil/Makefile +++ b/textproc/sigil/Makefile @@ -3,7 +3,7 @@ PORTNAME= sigil PORTVERSION= 0.6.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} DISTNAME= Sigil-${PORTVERSION}-Code diff --git a/textproc/xmlwrapp/Makefile b/textproc/xmlwrapp/Makefile index 8db9c0a8fe90..8ac1ca2c5e8b 100644 --- a/textproc/xmlwrapp/Makefile +++ b/textproc/xmlwrapp/Makefile @@ -3,6 +3,7 @@ PORTNAME= xmlwrapp PORTVERSION= 0.6.3 +PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= SF @@ -12,13 +13,12 @@ COMMENT= A modern style C++ library for working with XML data LICENSE= BSD LICENSE_FILE= ${WRKSRC}/LICENSE -LIB_DEPENDS= boost_iostreams.4:${PORTSDIR}/devel/boost-libs +LIB_DEPENDS= boost_iostreams:${PORTSDIR}/devel/boost-libs OPTIONS_DEFINE= XSLT XSLT_DESC= Build libxsltwrap library (requires libxslt) USE_GNOME= gnomehack libxml2 -USE_PERL5_BUILD=yes USE_AUTOTOOLS= libtool CONFIGURE_ARGS= --disable-silent-rules USE_LDCONFIG= yes @@ -26,7 +26,7 @@ USE_PKGCONFIG= yes MAKE_JOBS_SAFE= yes CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +LDFLAGS+= -L${LOCALBASE}/lib -lboost_system .include <bsd.port.options.mk> diff --git a/www/kdewebdev4/Makefile b/www/kdewebdev4/Makefile index 2f61d31149ca..f9a7e79191a1 100644 --- a/www/kdewebdev4/Makefile +++ b/www/kdewebdev4/Makefile @@ -1,11 +1,9 @@ -# New ports collection Makefile for: kdewebdev -# Date created: 2008-01-31 -# Whom: Martin Wilke <miwi@FreeBSD.org> -# +# Created by: Martin Wilke <miwi@FreeBSD.org> # $FreeBSD$ PORTNAME= kdewebdev PORTVERSION= ${KDE4_VERSION} +PORTREVISION= 1 CATEGORIES= www kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src @@ -15,7 +13,7 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Comprehensive html/website development environment LIB_DEPENDS= tidy-0.99.0:${PORTSDIR}/www/tidy-lib \ - boost_thread.4:${PORTSDIR}/devel/boost-libs + boost_thread:${PORTSDIR}/devel/boost-libs LATEST_LINK= ${PORTNAME}4 diff --git a/www/openvrml/Makefile b/www/openvrml/Makefile index 16bf7a313763..a8cac8a2d2a6 100644 --- a/www/openvrml/Makefile +++ b/www/openvrml/Makefile @@ -1,13 +1,9 @@ -# New ports collection makefile for: OpenVRML -# Date created: 8 Jan 2001 -# Whom: Marc van Woerkom <3d@freebsd.org> -# +# Created by: Marc van Woerkom <3d@freebsd.org> # $FreeBSD$ -# PORTNAME= openvrml PORTVERSION= 0.18.9 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= www graphics MASTER_SITES= SF @@ -56,8 +52,8 @@ PORTDOCS= * BROKEN= Gets internal gcc error on ${ARCH} .endif -LIB_DEPENDS+= boost_regex.4:${PORTSDIR}/devel/boost-libs -LIB_DEPENDS+= boost_python.4:${PORTSDIR}/devel/boost-python-libs +LIB_DEPENDS+= boost_regex:${PORTSDIR}/devel/boost-libs +LIB_DEPENDS+= boost_python:${PORTSDIR}/devel/boost-python-libs pre-everything:: @${ECHO_MSG} diff --git a/x11-toolkits/flowcanvas/Makefile b/x11-toolkits/flowcanvas/Makefile index d00f424c6351..d8deb41b86c7 100644 --- a/x11-toolkits/flowcanvas/Makefile +++ b/x11-toolkits/flowcanvas/Makefile @@ -1,23 +1,21 @@ -# New ports collection makefile for: flowcanvas -# Date created: 2008-07-22 -# Whom: Edward Tomasz Napierala <trasz@FreeBSD.org> -# +# Created by: Edward Tomasz Napierala <trasz@FreeBSD.org> # $FreeBSD$ -# PORTNAME= flowcanvas PORTVERSION= 0.7.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-toolkits MASTER_SITES= http://download.drobilla.net/ MAINTAINER= ports@FreeBSD.org COMMENT= An interactive Gtkmm/Gnomecanvasmm widget +BROKEN= Does not build with recent graphviz + LICENSE= GPLv2 GPLv3 LICENSE_COMB= dual -LIB_DEPENDS= boost_date_time.4:${PORTSDIR}/devel/boost-libs \ +LIB_DEPENDS= boost_date_time:${PORTSDIR}/devel/boost-libs \ gvc.6:${PORTSDIR}/graphics/graphviz \ gnomecanvasmm-2.6:${PORTSDIR}/graphics/libgnomecanvasmm26 \ gtkmm-2.4.1:${PORTSDIR}/x11-toolkits/gtkmm24 diff --git a/x11-toolkits/gigi/Makefile b/x11-toolkits/gigi/Makefile index 6c2d5a9a23c3..90ec616f1ad6 100644 --- a/x11-toolkits/gigi/Makefile +++ b/x11-toolkits/gigi/Makefile @@ -1,12 +1,9 @@ -# New ports collection makefile for: gigi -# Date created: 2007-04-29 -# Whom: alepulver -# +# Created by: alepulver # $FreeBSD$ -# PORTNAME= gigi PORTVERSION= 0.8.0.1074 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_LOCAL} @@ -16,7 +13,7 @@ MAINTAINER= oliver@FreeBSD.org COMMENT= OpenGL Graphic User Interface Library LIB_DEPENDS= IL.2:${PORTSDIR}/graphics/devil \ - boost_python.4:${PORTSDIR}/devel/boost-python-libs \ + boost_python:${PORTSDIR}/devel/boost-python-libs \ freetype.9:${PORTSDIR}/print/freetype2 USE_GCC= 4.4+ |