From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Dec 2 07:00:23 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id AC49616A407 for ; Sat, 2 Dec 2006 07:00:23 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.FreeBSD.org (Postfix) with ESMTP id 709E643C9D for ; Sat, 2 Dec 2006 07:00:04 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id kB270Mlu088722 for ; Sat, 2 Dec 2006 07:00:23 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id kB270MET088721; Sat, 2 Dec 2006 07:00:22 GMT (envelope-from gnats) Resent-Date: Sat, 2 Dec 2006 07:00:22 GMT Resent-Message-Id: <200612020700.kB270MET088721@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Peter Johnson Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 56BFD16A407 for ; Sat, 2 Dec 2006 06:54:01 +0000 (UTC) (envelope-from pete@tortall.net) Received: from cvs.tortall.net (cvs.tortall.net [69.55.238.110]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6507743CA2 for ; Sat, 2 Dec 2006 06:53:42 +0000 (GMT) (envelope-from pete@tortall.net) Received: from localhost (cvs [69.55.238.110]) by cvs.tortall.net (Postfix) with ESMTP id BBA9918CBA for ; Fri, 1 Dec 2006 22:54:00 -0800 (PST) Received: from cvs.tortall.net ([69.55.238.110]) by localhost (cvs.tortall.net [69.55.238.110]) (amavisd-new, port 10024) with ESMTP id e4PMKvyx3Y7W for ; Fri, 1 Dec 2006 22:53:59 -0800 (PST) Received: by cvs.tortall.net (Postfix, from userid 1000) id 6DE9118E0F; Fri, 1 Dec 2006 22:53:59 -0800 (PST) Message-Id: <20061202065359.6DE9118E0F@cvs.tortall.net> Date: Fri, 1 Dec 2006 22:53:59 -0800 (PST) From: Peter Johnson To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/106201: [PATCH] news/PicMonger: Fix BROKENness X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Peter Johnson List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Dec 2006 07:00:23 -0000 >Number: 106201 >Category: ports >Synopsis: [PATCH] news/PicMonger: Fix BROKENness >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sat Dec 02 07:00:17 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Peter Johnson >Release: FreeBSD 6.1-RELEASE i386 >Organization: >Environment: System: FreeBSD 6.1-RELEASE >Description: Fix bad C++, which currently has the port marked as BROKEN on >= 5.x (>= gcc 3.4.2). >How-To-Repeat: Marked BROKEN on >= 5.x (due to bad C++). >Fix: Patch attached. --- unbreak-PicMonger.patch begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/news/PicMonger/Makefile,v retrieving revision 1.18 diff -u -r1.18 Makefile --- Makefile 29 May 2006 05:53:26 -0000 1.18 +++ Makefile 2 Dec 2006 06:51:24 -0000 @@ -7,7 +7,7 @@ PORTNAME= PicMonger PORTVERSION= 0.9.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= news graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR=picmonger @@ -23,10 +23,4 @@ USE_GNOME= imlib GNU_CONFIGURE= yes -.include - -.if ${OSVERSION} >= 500113 -BROKEN= "Does not compile (bad C++ code)" -.endif - -.include +.include Index: files/patch-ErrorLogger.cpp =================================================================== RCS file: files/patch-ErrorLogger.cpp diff -N files/patch-ErrorLogger.cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-ErrorLogger.cpp 2 Dec 2006 06:51:24 -0000 @@ -0,0 +1,11 @@ +--- ErrorLogger.cpp.orig Tue Mar 14 23:43:02 2000 ++++ ErrorLogger.cpp Fri Dec 1 22:27:20 2006 +@@ -28,6 +28,8 @@ + using std::ofstream; + using std::string; + using std::list; ++using std::ios; ++using std::endl; + + ErrorLogger* ErrorLogger::instance = 0; + Index: files/patch-Exceptions.cpp =================================================================== RCS file: files/patch-Exceptions.cpp diff -N files/patch-Exceptions.cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-Exceptions.cpp 2 Dec 2006 06:51:24 -0000 @@ -0,0 +1,53 @@ +--- Exceptions.cpp.orig Tue Mar 28 02:00:12 2000 ++++ Exceptions.cpp Fri Dec 1 22:24:08 2006 +@@ -29,8 +29,8 @@ + + /////////////////////////////////////////////////////////////////////////////////// + +-Basic::Basic( const string& location = "Unknown", +- const string& condition = "Unknown" ) ++Basic::Basic( const string& location, ++ const string& condition ) + : abort(false), loc( location ), cond( condition ) + { + } +@@ -65,8 +65,8 @@ + + //////////////////////////////////////////////////////////////////////////////////// + +-Fatal::Fatal( const string& location = "Unknown", +- const string& condition = "Fatal Error" ) ++Fatal::Fatal( const string& location, ++ const string& condition ) + : Basic( location, condition ) + { + } +@@ -81,7 +81,7 @@ + + //////////////////////////////////////////////////////////////////////////////////// + +-NullPointer::NullPointer( const string& location = "Unknown" ) ++NullPointer::NullPointer( const string& location ) + : Fatal( location, "Attempted to dereference or access a null pointer." ) + {} + +@@ -94,8 +94,8 @@ + } + + //////////////////////////////////////////////////////////////////////////////////// +-FileAccess::FileAccess( const string& location = "Unknown", +- const string& filename = "Filename Not Specified" ) ++FileAccess::FileAccess( const string& location, ++ const string& filename ) + : Basic( location, "File Not Found or Access Denied" ), fname( filename ) + {} + +@@ -160,7 +160,7 @@ + //////////////////////////////////////////////////////////////////////////////////// + + TimeOut::TimeOut( const string& location, HtmlGenerator *htmlgen, +- const string& pending_io = "(Err During Read)" ) ++ const string& pending_io ) + : Basic( location, "Socket I/O Timed Out" ), pend_io( pending_io ), + p_htgen( htmlgen ) + {} Index: files/patch-FileTypeState.cpp =================================================================== RCS file: files/patch-FileTypeState.cpp diff -N files/patch-FileTypeState.cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-FileTypeState.cpp 2 Dec 2006 06:51:24 -0000 @@ -0,0 +1,14 @@ +--- FileTypeState.cpp.orig Tue Apr 18 21:22:46 2000 ++++ FileTypeState.cpp Fri Dec 1 22:45:01 2006 +@@ -21,6 +21,11 @@ + #include + #include // need getenv() + ++using std::ofstream; ++using std::ifstream; ++using std::ios; ++using std::flush; ++ + // Implemented as a Singleton to simplify access from both filetype dialog and + // newsscanner without having to maintain references to each other + Index: files/patch-FilenameCleaner.cpp =================================================================== RCS file: files/patch-FilenameCleaner.cpp diff -N files/patch-FilenameCleaner.cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-FilenameCleaner.cpp 2 Dec 2006 06:51:24 -0000 @@ -0,0 +1,14 @@ +--- FilenameCleaner.cpp.orig Tue Apr 11 12:01:47 2000 ++++ FilenameCleaner.cpp Fri Dec 1 22:46:08 2006 +@@ -5,8 +5,11 @@ + #include "FileTypeState.h" // need enum FileTypes + #include // need tolower() + #include ++#include + + using std::strstream; ++using std::cerr; ++using std::endl; + + FilenameCleaner::FilenameCleaner() + { Index: files/patch-GroupState.cpp =================================================================== RCS file: files/patch-GroupState.cpp diff -N files/patch-GroupState.cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-GroupState.cpp 2 Dec 2006 06:51:24 -0000 @@ -0,0 +1,12 @@ +--- GroupState.cpp.orig Tue Mar 14 23:43:08 2000 ++++ GroupState.cpp Fri Dec 1 22:47:05 2006 +@@ -24,6 +24,9 @@ + #include // need getenv + + using std::string; ++using std::ifstream; ++using std::ofstream; ++using std::ios; + + GroupState::GroupState(const string& groupname, const string& max_msg_id) + : group(groupname) Index: files/patch-GroupState.h =================================================================== RCS file: files/patch-GroupState.h diff -N files/patch-GroupState.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-GroupState.h 2 Dec 2006 06:51:24 -0000 @@ -0,0 +1,10 @@ +--- GroupState.h.orig Tue Mar 14 23:43:08 2000 ++++ GroupState.h Fri Dec 1 22:47:53 2006 +@@ -26,6 +26,7 @@ + + using std::string; + using std::map; ++using std::less; + + typedef map< string, string, less > GroupStateData; + typedef GroupStateData::value_type StatePair; Index: files/patch-HtmlPage.cpp =================================================================== RCS file: files/patch-HtmlPage.cpp diff -N files/patch-HtmlPage.cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-HtmlPage.cpp 2 Dec 2006 06:51:24 -0000 @@ -0,0 +1,11 @@ +--- HtmlPage.cpp.orig Tue Apr 4 01:59:24 2000 ++++ HtmlPage.cpp Fri Dec 1 22:34:09 2006 +@@ -26,6 +26,8 @@ + #endif + + using std::string; ++using std::ios; ++using std::endl; + + HtmlPage::HtmlPage( const string& path, + const string& _filename, Index: files/patch-HtmlPage.h =================================================================== RCS file: files/patch-HtmlPage.h diff -N files/patch-HtmlPage.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-HtmlPage.h 2 Dec 2006 06:51:24 -0000 @@ -0,0 +1,10 @@ +--- HtmlPage.h.orig Wed Mar 22 01:20:48 2000 ++++ HtmlPage.h Fri Dec 1 22:33:36 2006 +@@ -27,6 +27,7 @@ + #include "Exceptions.h" + + using std::string; ++using std::ofstream; + + class HtmlPage { + Index: files/patch-InetSocket.cpp =================================================================== RCS file: files/patch-InetSocket.cpp diff -N files/patch-InetSocket.cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-InetSocket.cpp 2 Dec 2006 06:51:24 -0000 @@ -0,0 +1,20 @@ +--- InetSocket.cpp.orig Tue Mar 14 23:43:09 2000 ++++ InetSocket.cpp Fri Dec 1 22:20:58 2006 +@@ -31,7 +31,7 @@ + #include + #include + +-InetSocket::InetSocket(int type=SOCK_STREAM, int protocol=0) ++InetSocket::InetSocket(int type, int protocol) + : type_(type), protocol_(protocol) + { + local_fd = socket( PF_INET, type_, protocol_ ); +@@ -58,7 +58,7 @@ + return result; + } + +-int InetSocket::s_bind( int port, const char *dotquad = (const char *)0) ++int InetSocket::s_bind( int port, const char *dotquad) + { + // construct local address to which we want our unnamed socket bound + if (!dotquad) Index: files/patch-NewsScanner.cpp =================================================================== RCS file: files/patch-NewsScanner.cpp diff -N files/patch-NewsScanner.cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-NewsScanner.cpp 2 Dec 2006 06:51:24 -0000 @@ -0,0 +1,11 @@ +--- NewsScanner.cpp.orig Fri Jul 14 12:58:22 2000 ++++ NewsScanner.cpp Fri Dec 1 22:19:44 2006 +@@ -58,7 +58,7 @@ + + + NewsScanner::NewsScanner(NewsScannerView *nsv, const char* saddr, +- const char* ng, ScanOrder so=NS_FORWARD) ++ const char* ng, ScanOrder so) + + : p_NSV(nsv), so_(so), htmlgen("."), p_htgen( 0 ), + serv_addr( saddr ), serv_port( 119 ), group( ng ), Index: files/patch-OptionsTab.cpp =================================================================== RCS file: files/patch-OptionsTab.cpp diff -N files/patch-OptionsTab.cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-OptionsTab.cpp 2 Dec 2006 06:51:24 -0000 @@ -0,0 +1,11 @@ +--- OptionsTab.cpp.orig Tue Apr 11 20:40:30 2000 ++++ OptionsTab.cpp Fri Dec 1 22:35:20 2006 +@@ -8,6 +8,8 @@ + #include + + using std::cerr; ++using std::string; ++using std::endl; + + OptionsTab::OptionsTab() + : Gtk::Table( 4, 1, true ) Index: files/patch-ad =================================================================== RCS file: /home/ncvs/ports/news/PicMonger/files/patch-ad,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 patch-ad --- files/patch-ad 24 Jul 2000 05:57:31 -0000 1.1.1.1 +++ files/patch-ad 2 Dec 2006 06:51:24 -0000 @@ -1,6 +1,6 @@ ---- HtmlOptionState.cpp.old Sun Jul 23 01:47:29 2000 -+++ HtmlOptionState.cpp Sun Jul 23 01:47:43 2000 -@@ -17,6 +17,9 @@ +--- HtmlOptionState.cpp.orig Fri Jul 14 12:58:22 2000 ++++ HtmlOptionState.cpp Fri Dec 1 22:39:45 2006 +@@ -17,11 +17,15 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -10,3 +10,9 @@ #include "HtmlOptionState.h" #include + using std::ifstream; + using std::ofstream; ++using std::ios; + + HtmlOptionState* HtmlOptionState::instance = 0; + HtmlOptionState* HtmlOptionState::Instance() Index: files/patch-imlib.h =================================================================== RCS file: files/patch-imlib.h diff -N files/patch-imlib.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-imlib.h 2 Dec 2006 06:51:24 -0000 @@ -0,0 +1,11 @@ +--- imlib.h.orig Sun Apr 23 00:11:09 2000 ++++ imlib.h Fri Dec 1 22:18:13 2006 +@@ -29,7 +29,7 @@ + + #include + #include +- ++using std::string; + class Gdk_Imlib + { + public: --- unbreak-PicMonger.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: