Date: Sun, 15 Dec 2002 08:45:26 +0800 (CST) From: Kuang-che Wu <kcwu@kcwu.dyndns.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/46263: Fix build on -current for misc/dirtree Message-ID: <200212150045.gBF0jQer071663@kcwu.dyndns.org>
next in thread | raw e-mail | index | archive | help
>Number: 46263 >Category: ports >Synopsis: Fix build on -current for misc/dirtree >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Dec 14 16:50:01 PST 2002 >Closed-Date: >Last-Modified: >Originator: Kuang-che Wu >Release: FreeBSD 5.0-CURRENT i386 >Organization: >Environment: System: FreeBSD m722 5.0-CURRENT FreeBSD 5.0-CURRENT #0: Tue Nov 26 18:00:18 CST 2002 root@m722:/usr/obj/usr/src/sys/M722 i386 >Description: Fix build on -current for misc/dirtree >How-To-Repeat: >Fix: diff -urN dirtree/Makefile dirtree.new/Makefile --- dirtree/Makefile Sun Dec 15 08:42:50 2002 +++ dirtree.new/Makefile Sun Dec 15 08:43:08 2002 @@ -23,10 +23,4 @@ MAN1= dirtree.1 -.include <bsd.port.pre.mk> - -.if ${OSVERSION} >= 500035 -BROKEN= "Does not compile on 5.0" -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff -urN dirtree/files/patch-src::CppDir.cpp dirtree.new/files/patch-src::CppDir.cpp --- dirtree/files/patch-src::CppDir.cpp Thu Jan 1 08:00:00 1970 +++ dirtree.new/files/patch-src::CppDir.cpp Sun Dec 15 08:42:39 2002 @@ -0,0 +1,17 @@ +--- src/CppDir.cpp.orig Sun Dec 15 08:31:02 2002 ++++ src/CppDir.cpp Sun Dec 15 08:34:44 2002 +@@ -1,4 +1,5 @@ + #include "CppDir.hh" ++#include <ostream> + + #ifdef LINUX + # include <sys/stat.h> +@@ -152,7 +153,7 @@ + } + } + +-ostream& CppDir::operator << ( ostream& out , File::Type type ) ++std::ostream& CppDir::operator << ( std::ostream& out , File::Type type ) + { + switch( type ) + { diff -urN dirtree/files/patch-src::CppDir.hh dirtree.new/files/patch-src::CppDir.hh --- dirtree/files/patch-src::CppDir.hh Thu Jan 1 08:00:00 1970 +++ dirtree.new/files/patch-src::CppDir.hh Sun Dec 15 08:42:39 2002 @@ -0,0 +1,11 @@ +--- src/CppDir.hh.orig Sun Dec 15 08:32:48 2002 ++++ src/CppDir.hh Sun Dec 15 08:35:12 2002 +@@ -95,7 +95,7 @@ + void close(); ///< closes the directory + }; + +- ostream& operator << ( ostream& out , File::Type type ); ++ std::ostream& operator << ( std::ostream& out , File::Type type ); + std::string concat_dir( std::string path, std::string name ); + } + diff -urN dirtree/files/patch-src::xgetcwd.cpp dirtree.new/files/patch-src::xgetcwd.cpp --- dirtree/files/patch-src::xgetcwd.cpp Thu Jan 1 08:00:00 1970 +++ dirtree.new/files/patch-src::xgetcwd.cpp Sun Dec 15 08:42:39 2002 @@ -0,0 +1,16 @@ +--- src/xgetcwd.cpp.orig Sun Dec 15 08:39:34 2002 ++++ src/xgetcwd.cpp Sun Dec 15 08:39:36 2002 +@@ -11,10 +11,10 @@ + function returns a string */ + std::string xgetcwd() + { +- const unsigned int PATH_MAX = 100; +- const unsigned int PATH_INC = PATH_MAX; ++ const unsigned int PATHMAX = 100; ++ const unsigned int PATH_INC = PATHMAX; + +- unsigned int path_max = PATH_MAX; ++ unsigned int path_max = PATHMAX; + path_max += 2; /* The getcwd docs say to do this. */ + + char* cwd = static_cast<char*>(malloc(path_max)); >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200212150045.gBF0jQer071663>