OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 31-Jan-2003 17:18:16
Branch: HEAD Handle: 2003013116181501
Added files:
openpkg-src/ddd ddd.patch
Modified files:
openpkg-src/ddd ddd.spec
Log:
Second stage done, and the ddd build now succeeds.
Summary:
Revision Changes Path
1.1 +60 -0 openpkg-src/ddd/ddd.patch
1.3 +2 -1 openpkg-src/ddd/ddd.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/ddd/ddd.patch
============================================================================
$ cvs diff -u -r0 -r1.1 ddd.patch
--- /dev/null 2003-01-31 17:18:16.000000000 +0100
+++ ddd.patch 2003-01-31 17:18:16.000000000 +0100
@@ -0,0 +1,60 @@
+diff -Naur ddd-3.3.1.orig/ddd/config.h ddd-3.3.1/ddd/config.h
+--- ddd-3.3.1.orig/ddd/config.h Tue Jan 28 14:28:12 2003
++++ ddd-3.3.1/ddd/config.h Fri Jan 31 14:53:34 2003
+@@ -139,7 +139,7 @@
+ /* #undef HAVE_FREEZE_OSTRSTREAMBUF */
+
+ /* Define if the ios::iostate type is defined or declared in <iostream.h>. */
+-/* #undef HAVE_IOSTATE */
++#define HAVE_IOSTATE 1
+
+ /* Define if your C++ compiler supports long long types. */
+ #define HAVE_LONG_LONG 1
+diff -Naur ddd-3.3.1.orig/ddd/logplayer.C ddd-3.3.1/ddd/logplayer.C
+--- ddd-3.3.1.orig/ddd/logplayer.C Wed Jan 29 17:55:33 2003
++++ ddd-3.3.1/ddd/logplayer.C Wed Jan 29 17:55:51 2003
+@@ -42,12 +42,14 @@
+ #include "config.h"
+ #include "streampos.h"
+
+-#include <iostream.h>
+-#include <fstream.h>
+-#include <stdlib.h>
+-#include <stdio.h>
++#include <iostream>
++#include <fstream>
++#include <cstdlib>
++#include <cstdio>
+ #include <unistd.h>
+-#include <ctype.h>
++#include <cctype>
++
++using std::ifstream;
+
+ #include <setjmp.h>
+ #include <signal.h>
+diff -Naur ddd-3.3.1.orig/ddd/strclass.C ddd-3.3.1/ddd/strclass.C
+--- ddd-3.3.1.orig/ddd/strclass.C Fri Mar 30 14:31:46 2001
++++ ddd-3.3.1/ddd/strclass.C Thu Jan 30 13:59:13 2003
+@@ -41,14 +41,16 @@
+ #include "strclass.h"
+ #include "config.h"
+ #include "return.h"
+-#include <ctype.h>
+-#include <limits.h>
+-#include <new.h>
+-#include <stdlib.h>
++#include <cctype>
++#include <climits>
++#include <new>
++#include <cstdlib>
+
+ #if HAVE_LIMITS_H
+-#include <limits.h>
++#include <climits>
+ #endif
++
++using std::ifstream;
+
+ void string::error(const char* msg) const
+ {
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/ddd/ddd.spec
============================================================================
$ cvs diff -u -r1.2 -r1.3 ddd.spec
--- openpkg-src/ddd/ddd.spec 31 Jan 2003 12:25:45 -0000 1.2
+++ openpkg-src/ddd/ddd.spec 31 Jan 2003 16:18:16 -0000 1.3
@@ -37,6 +37,7 @@
# list of sources
Source0: ftp://ftp.gnu.org/gnu/ddd/ddd-%{version}.tar.gz
+Patch0: ddd.patch
# build information
Prefix: %{l_prefix}
@@ -64,7 +65,6 @@
CXXFLAGS="%{l_cxxflags -O}" \
CPPFLAGS="%{l_cppflags}" \
LDFLAGS="%{l_ldflags}" \
- ./configure --prefix=/tmp/ddd --x-includes=/usr/X11R6/include
--x-libraries=/usr/X11R6/lib --with-xpm-includes=/sw --with-motif-includes=/sw
--with-motif-libraries=/sw --with-readline-libraries=/sw
./configure \
--prefix=%{l_prefix} \
--x-includes=`%{l_prefix}/etc/rc --query x11_incdir` \
@@ -73,6 +73,7 @@
--with-motif-includes=%{l_prefix} \
--with-motif-libraries=%{l_prefix} \
--with-readline-libraries=%{l_prefix}
+ %{l_patch} -p1 <%{SOURCE ddd.patch}
%{l_make} %{l_mflags -O}
%install
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
