diff --git a/devel/ddd/Makefile b/devel/ddd/Makefile index af613f6e93f..00bf08a480f 100644 --- a/devel/ddd/Makefile +++ b/devel/ddd/Makefile @@ -1,10 +1,9 @@ -# $OpenBSD: Makefile,v 1.33 2002/05/13 18:50:39 espie Exp $ +# $OpenBSD: Makefile,v 1.34 2002/10/13 21:45:46 naddy Exp $ COMMENT= "Data Display Debugger, graphical front-end for GDB, etc" DISTNAME= ddd-3.3 CATEGORIES= devel -NEED_VERSION= 1.402 MASTER_SITES= ${MASTER_SITE_GNU:=ddd/} HOMEPAGE= http://www.gnu.org/software/ddd/ @@ -19,8 +18,6 @@ USE_GMAKE= Yes CONFIGURE_STYLE=gnu MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/libiberty \ ${WRKSRC}/readline/support -CONFIGURE_ENV= INSTALL_PROGRAM="${INSTALL_PROGRAM}" \ - INSTALL_DATA="${INSTALL_DATA}" CONFIGURE_ARGS= --with-readline-libraries=/usr/lib MAKE_FLAGS= MAINTAINER="'${MAINTAINER}'" diff --git a/devel/ddd/patches/patch-ddd_aclocal_m4 b/devel/ddd/patches/patch-ddd_aclocal_m4 new file mode 100644 index 00000000000..6856ff81a9e --- /dev/null +++ b/devel/ddd/patches/patch-ddd_aclocal_m4 @@ -0,0 +1,15 @@ +$OpenBSD: patch-ddd_aclocal_m4,v 1.1 2002/10/13 21:45:46 naddy Exp $ +--- ddd/aclocal.m4.orig Sun Oct 13 21:35:46 2002 ++++ ddd/aclocal.m4 Sun Oct 13 21:43:58 2002 +@@ -941,7 +941,10 @@ AC_LANG_CPLUSPLUS + AC_TRY_COMPILE([#include ], + [streampos scan_start;], + ice_cv_have_streampos=yes, +-ice_cv_have_streampos=no) ++AC_TRY_COMPILE([#include ], ++[streampos scan_start;], ++ice_cv_have_streampos=yes, ++ice_cv_have_streampos=no)) + AC_LANG_RESTORE + ]) + AC_MSG_RESULT($ice_cv_have_streampos) diff --git a/devel/ddd/patches/patch-ddd_comm-manag_C b/devel/ddd/patches/patch-ddd_comm-manag_C index a733d2f065d..a1050f797ab 100644 --- a/devel/ddd/patches/patch-ddd_comm-manag_C +++ b/devel/ddd/patches/patch-ddd_comm-manag_C @@ -1,6 +1,6 @@ -$OpenBSD: patch-ddd_comm-manag_C,v 1.2 2002/03/21 05:28:21 fgsch Exp $ ---- ddd/comm-manag.C.orig Tue Jan 16 09:51:37 2001 -+++ ddd/comm-manag.C Wed Mar 13 04:38:32 2002 +$OpenBSD: patch-ddd_comm-manag_C,v 1.3 2002/10/13 21:45:46 naddy Exp $ +--- ddd/comm-manag.C.orig Tue Jan 16 05:51:37 2001 ++++ ddd/comm-manag.C Fri Oct 11 12:13:38 2002 @@ -85,6 +85,7 @@ char comm_manager_rcsid[] = #include @@ -9,7 +9,7 @@ $OpenBSD: patch-ddd_comm-manag_C,v 1.2 2002/03/21 05:28:21 fgsch Exp $ //----------------------------------------------------------------------------- -@@ -800,13 +801,15 @@ void init_session(const string& restart, +@@ -800,13 +801,16 @@ void init_session(const string& restart, info = new InitSessionInfo; info->restart = restart; info->settings = settings; @@ -23,7 +23,8 @@ $OpenBSD: patch-ddd_comm-manag_C,v 1.2 2002/03/21 05:28:21 fgsch Exp $ { - ofstream os(info->tempfile); -+ ofstream os(temp_fd); ++ close(temp_fd); // hack but how to mix mkstemp & ofstream ... ++ ofstream os(info->tempfile); // without a ctor ofstream(fd) ? while (init_commands != "") { string cmd = init_commands.before('\n'); diff --git a/devel/ddd/patches/patch-ddd_configure b/devel/ddd/patches/patch-ddd_configure new file mode 100644 index 00000000000..cb36bc5fd18 --- /dev/null +++ b/devel/ddd/patches/patch-ddd_configure @@ -0,0 +1,27 @@ +$OpenBSD: patch-ddd_configure,v 1.1 2002/10/13 21:45:46 naddy Exp $ +--- ddd/configure.orig Sun Oct 13 21:34:55 2002 ++++ ddd/configure Sun Oct 13 21:45:43 2002 +@@ -6121,7 +6121,23 @@ else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* ++ cat > conftest.$ac_ext < ++int main() { ++streampos scan_start; ++; return 0; } ++EOF ++if { (eval echo configure:6133: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ rm -rf conftest* ++ ice_cv_have_streampos=yes ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -rf conftest* + ice_cv_have_streampos=no ++fi ++rm -f conftest* + fi + rm -f conftest* + ac_ext=C diff --git a/devel/ddd/patches/patch-ddd_exit_C b/devel/ddd/patches/patch-ddd_exit_C index 562fe563948..bf2ae5206b0 100644 --- a/devel/ddd/patches/patch-ddd_exit_C +++ b/devel/ddd/patches/patch-ddd_exit_C @@ -1,7 +1,7 @@ -$OpenBSD: patch-ddd_exit_C,v 1.2 2002/03/21 05:28:21 fgsch Exp $ ---- ddd/exit.C.orig Tue Dec 19 12:45:49 2000 -+++ ddd/exit.C Wed Mar 13 04:32:03 2002 -@@ -1149,8 +1149,10 @@ void report_core(ostream& log) +$OpenBSD: patch-ddd_exit_C,v 1.3 2002/10/13 21:45:46 naddy Exp $ +--- ddd/exit.C.orig Tue Dec 19 08:45:49 2000 ++++ ddd/exit.C Fri Oct 11 12:20:34 2002 +@@ -1149,8 +1149,11 @@ void report_core(ostream& log) if (!is_core_file("core")) return; @@ -10,7 +10,8 @@ $OpenBSD: patch-ddd_exit_C,v 1.2 2002/03/21 05:28:21 fgsch Exp $ + char temp_name[] = "/tmp/ddd.XXXXXXXXXX"; + int temp_fd = mkstemp(temp_name); + string tempfile = temp_name; -+ ofstream os(temp_fd); ++ close(temp_fd); // hack ... ++ ofstream os(temp_name); // ... no ofstream(fd) ctor os << "set verbose off\n" "set height 0\n" diff --git a/devel/ddd/patches/patch-ddd_strclass_C b/devel/ddd/patches/patch-ddd_strclass_C new file mode 100644 index 00000000000..4d69fba3897 --- /dev/null +++ b/devel/ddd/patches/patch-ddd_strclass_C @@ -0,0 +1,12 @@ +$OpenBSD: patch-ddd_strclass_C,v 1.1 2002/10/13 21:45:46 naddy Exp $ +--- ddd/strclass.C.orig Sun Oct 13 19:56:55 2002 ++++ ddd/strclass.C Sun Oct 13 19:59:42 2002 +@@ -1431,7 +1431,7 @@ istream& operator>>(istream& s, string& + } + x.rep->s[i] = 0; + x.rep->len = i; +- int new_state = s.rdstate(); ++ ios::iostate new_state = s.rdstate(); + if (i == 0) + new_state |= ios::failbit; + if (ch == EOF)