Re: Bus error
Hi, Hi today, cvsup'ed my source and build world ... and now get an so called Bus error while i want to su, anyone know about it (or fixed it) I think the best is to build debugging version of su: # cd /usr/src/usr.bin/su # make clean # make depend # set CFLAGS=$CFLAGS -g # make # install -o root -g wheel -m 4555 -fschg /usr/obj/usr/src/usr.bin/su/su /usr/bin ( 'make install' will strip the binary and all the nice debug info is gone) Now run su in the debugger, and will probably get a core dump: gdb /usr/bin/su GNU gdb 5.2.1 (FreeBSD) Copyright 2002 Free Software Foundation, Inc. GDB is free software, covered by the GNU General Public License, and you are welcome to change it and/or distribute copies of it under certain conditions. Type show copying to see the conditions. There is absolutely no warranty for GDB. Type show warranty for details. This GDB was configured as i386-undermydesk-freebsd...(no debugging symbols found)... (gdb) run Starting program: /usr/bin/su When it crashes, get a backtrace (in gdb: `bt full' and post it here). Simon signature.asc Description: Digital signature
Re: Bus error
# set CFLAGS=$CFLAGS -g # make Arg! Please use # make CFLAGS='-O -g' instead. signature.asc Description: Digital signature
PRs for dagrab and cdparanoia reworked (was: Re: Fix for WINE on -CURRENT)
please revise the patch and submit follow-up. Done. Tested on both -STABLE and -CURRENT. I am progress of doing the same for dagrab (expect a follow-up to PR 57227 soon). Simon signature.asc Description: Digital signature
Re: PRs for dagrab and cdparanoia reworked (was: Re: Fix for WINE on -CURRENT)
I am progress of doing the same for dagrab (expect a follow-up to PR 57227 soon). There is no need for extra-patches. #ifdef CDIOCREADAUDIO seems to be sufficient enough. The version in GNATs is obsoleted, but my update did not make it there, although it appeared in freebsd-ports-bugs@ (I used the follow-up email-link in the GNATs web interface). I will prepare and test a version that used pread() like yours this night. It will be here then: http://home.leo.org/~barner/freebsd/dagrab-pread.patch Is using CDRIOCSETBLOCKSIZE necessary as well? If yes it shouold be done in enable_cdda callback I think. I don't now. I don't know how to interpret Soren's comments in http://freebsd.rambler.ru/bsdmail/freebsd-current_2003/msg15989.html regarding our situation: The right way of doing audio graps has been to set the wanted blocksize with CDRIOCSETBLOCKSIZE (not needed if all tracks on the CD is of the same size), then just read from the device. Ioctl's was newer meant to be used to read/write data, its also faster to use the R/W path... Can we assue that all tracks on an audio CD are of the same (block) size? What about those mixed-mode CDs (sorry, I don't know the specifications). Moreover, is there a reason we should use CDIOCREADAUDIO on RELENG_4? Please test attached patch. works for me on RELENG_4 and should work on -CURRENT as well. Yep, it works fine for me on 4.9-STABLE and 5.1-CURRENT (and complies with Soren's posting). I think the best solution would be to patch all applications to use this approach. The only question is whether we need CDRIOCSETBLOCKSIZE. Simon signature.asc Description: Digital signature
Re: PRs for dagrab and cdparanoia reworked
FWIW, the mplayer port also cannot play CDDA anymore on current. It probably needs a similar patch. This works for me with a patched version of cdparanoia, which makes sense, since mplayer is linked against libcdda_paranoia.so.0. You can get the patch here: http://home.leo.org/~barner/freebsd/cdparanoia-pread.patch When I run % mplayer cdda:// the CD is played. The following output of fstat makes me believe that that cdparanoia really uses the cooked interface of the ATA driver and not the ATAPICAM interface (although I don't know how that one translates its requests into ATA'ish ones). In short: It works for me with an ATAPI CD/RW drive. Simon signature.asc Description: Digital signature
Re: Fix for WINE on -CURRENT
can you make a patch for cdparanoia as well?
cdparanoia is also broken on recent -CURRENT and testing will be easy.
There is already a PR. I will rewise my patch to use __FreeBSD__ in the
patch file instead of using ${EXTRA_PATCHES}.
http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/57226
This one here should be closed IMHO since there is a cleaner solution
that backing out the change.
http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/58461
Simon
signature.asc
Description: Digital signature
Re: Fixing gcc 3.3 compile failures -- fix for audio/xmixer
--- Xw/Base.c.orig Wed Jul 23 03:56:03 2003 +++ Xw/Base.c Wed Jul 23 03:56:43 2003 @@ -89,8 +89,8 @@ * default translation table */ static char defaultTranslations [] = \ -FocusIn: focus(in) -FocusOut: focus(out) +FocusIn: focus(in)\n\ +FocusOut: focus(out)\n\ KeyTab: tab(); /* signature.asc Description: Digital signature
Re: Fixing gcc 3.3 compile failures -- fix for audio/xmms-tfmx
--- src/xmms_about.c.orig Wed Jul 23 04:53:36 2003 +++ src/xmms_about.cWed Jul 23 04:54:43 2003 @@ -20,11 +20,11 @@ gtk_container_border_width(GTK_CONTAINER(hbox1), 5); label = gtk_label_new( - -TFMX plugin adapted to xmms by David Le Corfec -[EMAIL PROTECTED] -Original code (tfmxplay) by Jonathan H. Pickard, ported to Winamp by Per Linden\n -TFMX was created by Chris Huelsbeck. + \ +TFMX plugin adapted to xmms by David Le Corfec\ +[EMAIL PROTECTED]\n\ +Original code (tfmxplay) by Jonathan H. Pickard, ported to Winamp by Per Linden\n\ +TFMX was created by Chris Huelsbeck.\ ); gtk_box_pack_start(GTK_BOX(dialog_vbox1), label, TRUE, TRUE, 5); signature.asc Description: Digital signature
Re: Fixing gcc 3.3 compile failures -- fix for games/xjumpjump
--- texts.h.origWed Jul 23 03:48:19 2003 +++ texts.h Wed Jul 23 03:48:56 2003 @@ -1,6 +1,6 @@ #define E_MY_PRGNAME xjumpjump -#define E_VERSIONJumpJump-0.12 for X, Feb 26th 1997 by +#define E_VERSIONJumpJump-0.12 for X, Feb 26th 1997 by \ nihil ([EMAIL PROTECTED]) #define E_MY_TITLE XJumpJump v0.12 #define E_MY_TITLE2 by nihil\nHungary\n1997.02.26 @@ -9,7 +9,7 @@ #define E_STR_PRACTISE Hmm... practise a bit more! #define H_STR_PRACTISE Hmm... gyakorolj még egy picit! #define E_STR_CONGRATCongratulations! You have succeed! -#define H_STR_CONGRATGratulálok! Sikerült ezt a pályát +#define H_STR_CONGRATGratulálok! Sikerült ezt a pályát \ leküzdened! #define E_STR_BUT_NEWNew Game signature.asc Description: Digital signature
Re: Fixing gcc 3.3 compile failures -- fix for graphics/xmms-gforce
--- _Unix-X/libxpce/xvhandler.c.origWed Jul 23 04:43:19 2003
+++ _Unix-X/libxpce/xvhandler.c Wed Jul 23 04:44:31 2003
@@ -342,7 +342,7 @@
/* x_DCTCEDoComp() - Do one component for DCTCE */
int x_DCTCEDoComp(int mask, int color) {
- static const char cnames[] = { red, green, blue };
+ static const char cnames[3][20] = { red, green, blue };
static const char cflags[] = { DoRed, DoGreen, DoBlue };
static unsigned long int * const carrays[] = { X_redmap,
X_greenmap,
signature.asc
Description: Digital signature
Re: Fixing gcc 3.3 compile failures -- fix for math/surf
--- Makefile.orig Tue Jul 22 17:13:04 2003
+++ MakefileTue Jul 22 17:13:15 2003
@@ -7,7 +7,7 @@
#
PORTNAME= surf
-PORTVERSION= 1.0.3
+PORTVERSION= 1.0.4
CATEGORIES=math
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=${PORTNAME}
@@ -27,9 +27,5 @@
MAN1= surf.1
.include bsd.port.pre.mk
-
-.if ${OSVERSION} = 500113
-BROKEN= Does not compile (bad C++ code)
-.endif
.include bsd.port.post.mk
--- distinfo.orig Mon Apr 23 18:52:21 2001
+++ distinfoTue Jul 22 16:03:51 2003
@@ -1 +1 @@
-MD5 (surf-1.0.3.tar.gz) = 4d0cea15d9e771e60920dbb25979d1f3
+MD5 (surf-1.0.4.tar.gz) = 4880ecf3d4207ab0a4f2a2f017383b65
--- gtkgui/MainWindowController.cc.orig Tue Jul 22 16:23:20 2003
+++ gtkgui/MainWindowController.cc Tue Jul 22 16:23:30 2003
@@ -28,7 +28,7 @@
#include gtk/gtkitemfactory.h
-#include strstream.h
+#include strstream
// #define DEBUG
#include debug.h
--- gtkgui/Requester.cc.origTue Jul 22 16:23:45 2003
+++ gtkgui/Requester.cc Tue Jul 22 16:24:01 2003
@@ -25,7 +25,7 @@
#include assert.h
#include iostream.h
-#include strstream.h
+#include strstream
#include gtk/gtk.h
--- gtkgui/SaveImageDialog.cc.orig Tue Jul 22 16:24:13 2003
+++ gtkgui/SaveImageDialog.cc Tue Jul 22 16:26:31 2003
@@ -23,9 +23,11 @@
*/
-#include strstream.h
+#include strstream
#include SaveImageDialog.h
+
+using std::ostrstream;
void SaveImageDialog::toggled_dither_method (GtkWidget *w, gpointer data)
{
--- gtkgui/mycolor.cc.orig Tue Jul 22 16:22:12 2003
+++ gtkgui/mycolor.cc Tue Jul 22 16:22:26 2003
@@ -26,7 +26,7 @@
#include assert.h
#include iostream.h
#include stdlib.h
-#include strstream.h
+#include strstream
#include gtk/gtk.h
#include gdk/gdk.h
--- misc/Misc.h.origTue Jul 22 16:14:35 2003
+++ misc/Misc.h Tue Jul 22 16:14:59 2003
@@ -26,7 +26,9 @@
#ifndef MISC_H
#define MISC_H
-#include strstream.h
+#include strstream
+
+using std::ostrstream;
class Misc
{
signature.asc
Description: Digital signature
Re: Fixing gcc 3.3 compile failures -- fix for math/topaz
--- Makefile.orig Wed Jul 23 15:02:46 2003
+++ MakefileWed Jul 23 15:03:08 2003
@@ -6,7 +6,7 @@
#
PORTNAME= topaz
-PORTVERSION= 3.38
+PORTVERSION= 3.39
CATEGORIES=math
MASTER_SITES= http://hp.vector.co.jp/authors/VA007663/topaz/bin/
DISTNAME= ${PORTNAME}-${PORTVERSION:S/./_/}-src
--- distinfo.orig Wed Jul 23 15:02:50 2003
+++ distinfoWed Jul 23 15:02:55 2003
@@ -1 +1 @@
-MD5 (topaz-3_38-src.tar.gz) = b91080b08c836890232b715088d2c34f
+MD5 (topaz-3_39-src.tar.gz) = 5c6179aeb87a4809b9c78d8f1b5e3755
--- topaz/tpv2ps.cc.origFri Jun 27 14:35:40 2003
+++ topaz/tpv2ps.cc Wed Jul 23 15:12:54 2003
@@ -31,7 +31,7 @@
#include math.h
#include string
#include time.h
-#include getopt.h
+//#include getopt.h
//char *optarg;
extern int errno;
@@ -63,7 +63,7 @@
#define buffersize 1024
-char* entry[] = {
+const char entry[13][40] = {
{Times-Roman-Q},
{Times-Bold-Q},
{Times-Italic-Q},
@@ -79,7 +79,7 @@
{Symbol}
};
-char* kentry[] = {
+const char kentry[8][30] = {
{Ryumin-Light-H},
{Ryumin-Light-H},
{Ryumin-Light-H},
signature.asc
Description: Digital signature
Re: Fixing gcc 3.3 compile failures -- fix for net/tp5250
--- src/tn5250.c.orig Tue Jul 22 18:25:06 2003 +++ src/tn5250.cTue Jul 22 18:25:31 2003 @@ -179,7 +179,7 @@ tn5250 [options] HOST[:PORT]\n); #ifdef HAVE_LIBSSL printf(\ - To connect using ssl prefix HOST with 'ssl:'. Example: + To connect using ssl prefix HOST with 'ssl:'. Example:\n\ tn5250 +ssl_verify_server ssl:as400.example.com\n); #endif printf (\n\ signature.asc Description: Digital signature
Re: Fixing gcc 3.3 compile failures -- fix for print/unrtf
--- ps.c.orig Tue Jul 22 18:56:13 2003
+++ ps.cTue Jul 22 19:02:44 2003
@@ -187,7 +187,7 @@
/didShowPage false def \n\
%%--\n\
%% Set up the ISO fonts \n\
-
+\n\
%% Times \n\
%% - \n\
/Times-Roman findfont dup length dict begin { \n\
@@ -196,28 +196,28 @@
/Encoding ISOLatin1Encoding def\n\
currentdict end\n\
/TRomanISO exch definefont pop \n\
-
+\n\
/Times-Bold findfont dup length dict begin { \n\
1 index /FID ne { def } { pop pop } ifelse \n\
} forall \n\
/Encoding ISOLatin1Encoding def\n\
currentdict end\n\
/TBoldISO exch definefont pop \n\
-
+\n\
/Times-BoldItalic findfont dup length dict begin { \n\
1 index /FID ne { def } { pop pop } ifelse \n\
} forall \n\
/Encoding ISOLatin1Encoding def\n\
currentdict end\n\
/TBoldItalicISO exch definefont pop\n\
-
+\n\
/Times-Italic findfont dup length dict begin { \n\
1 index /FID ne { def } { pop pop } ifelse \n\
} forall \n\
/Encoding ISOLatin1Encoding def\n\
currentdict end\n\
/TItalicISO exch definefont pop\n\
-
+\n\
%% Courier \n\
%% - \n\
/Courier-Roman findfont dup length dict begin {\n\
@@ -226,28 +226,28 @@
/Encoding ISOLatin1Encoding def\n\
currentdict end\n\
/CRomanISO exch definefont pop \n\
-
+\n\
/Courier-Bold findfont dup length dict begin { \n\
1 index /FID ne { def } { pop pop } ifelse \n\
} forall \n\
/Encoding ISOLatin1Encoding def\n\
currentdict end\n\
/CBoldISO exch definefont pop \n\
-
+\n\
/Courier-BoldItalic findfont dup length dict begin { \n\
1 index /FID ne { def } { pop pop } ifelse \n\
} forall \n\
/Encoding ISOLatin1Encoding def\n\
currentdict end\n\
/CBoldItalicISO exch definefont pop\n\
-
+\n\
/Courier-Italic findfont dup length dict begin { \n\
1 index /FID ne { def } { pop pop } ifelse \n\
} forall \n\
/Encoding ISOLatin1Encoding def\n\
currentdict end\n\
/CItalicISO exch definefont pop\n\
-
+\n\
%% Symbol \n\
%% - \n\
/Symbol-Roman findfont dup length dict begin { \n\
@@ -256,28 +256,28 @@
/Encoding ISOLatin1Encoding def\n\
currentdict end\n\
/SRomanISO exch definefont pop \n\
-
+\n\
/Symbol-Bold findfont dup length dict begin { \n\
1 index /FID ne { def } { pop pop } ifelse \n\
} forall \n\
/Encoding ISOLatin1Encoding def\n\
currentdict end\n\
/SBoldISO exch definefont pop \n\
-
+\n\
/Symbol-BoldItalic findfont dup length dict begin {\n\
1 index /FID ne { def } { pop pop } ifelse \n\
} forall \n\
/Encoding ISOLatin1Encoding def\n\
currentdict end\n\
/SBoldItalicISO exch definefont pop\n\
-
+\n\
/Symbol-Italic findfont dup length dict begin {\n\
1 index /FID ne { def } { pop pop } ifelse \n\
} forall \n\
/Encoding ISOLatin1Encoding def\n\
currentdict end\n\
/SItalicISO exch definefont pop\n\
-
+\n\
%% Helvetica \n\
%% - \n\
/Helvetica-Roman findfont dup length dict begin { \n\
@@ -286,28 +286,28 @@
/Encoding ISOLatin1Encoding def\n\
currentdict end\n\
/HRomanISO exch definefont pop \n\
-
+\n\
/Helvetica-Bold findfont dup length dict begin { \n\
1 index /FID ne { def } { pop pop } ifelse \n\
} forall \n\
Re: Fixing gcc 3.3 compile failures -- fix for textproc/xmlpp
--- Makefile.orig Wed Jul 23 04:08:36 2003
+++ MakefileWed Jul 23 04:09:11 2003
@@ -21,12 +21,9 @@
.include bsd.port.pre.mk
-.if ${OSVERSION} = 500113
-BROKEN= Does not compile (bad C++ code)
-.endif
-
pre-patch:
@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
's|/usr/local/share|$$(datadir)|g'
+ @${RM} ${WRKSRC}/config.cache
.include bsd.port.post.mk
--- src/xmlcommon.h.origWed Jul 23 04:10:04 2003
+++ src/xmlcommon.h Wed Jul 23 04:12:03 2003
@@ -20,6 +20,8 @@
//! dummy define
#define XMLPP_API
+
+using std::string;
//! handle to a tagname string in a tagname map
typedef int xmltagnamehandle;
--- ./src/xmlpp.cpp.origWed Jul 23 04:12:52 2003
+++ ./src/xmlpp.cpp Wed Jul 23 04:13:52 2003
@@ -21,6 +21,12 @@
//debug
#include iostream
+using std::cout;
+using std::cerr;
+using std::endl;
+using std::ifstream;
+using std::ofstream;
+
namespace xmlpp {
// internal use for saving
--- src/xmltokenizer.cpp.orig Wed Jul 23 04:14:53 2003
+++ src/xmltokenizer.cppWed Jul 23 04:29:18 2003
@@ -15,7 +15,7 @@
// needed includes
#include xmlpp.h
#include xmltokenizer.h
-
+#include iostream
// namespace declaration
namespace xmlpp {
--- test/nodetest.cpp.orig Wed Jul 23 04:18:02 2003
+++ test/nodetest.cpp Wed Jul 23 04:19:01 2003
@@ -5,6 +5,7 @@
*/
#include fstream
+#include iostream
#include xmlpp.h
using namespace xmlpp;
signature.asc
Description: Digital signature
Re: Fixing gcc 3.3 compile failures -fix for textproc/xmlppm
--- IFile.cpp.orig Wed Jul 23 04:32:54 2003
+++ IFile.cpp Wed Jul 23 04:35:43 2003
@@ -100,7 +100,7 @@
while(insz 0) {
size_t result;
outsz = BUFFSIZE;
-result = iconv(ifile-iconv, (char*)inptr, insz, outptr, outsz);
+result = iconv(ifile-iconv, inptr, insz, outptr, outsz);
total += fwrite(outbuf, sizeof(char), BUFFSIZE-outsz, ifile-file);
if(result == (size_t)-1 errno != E2BIG) {
return total;
signature.asc
Description: Digital signature
Re: Fixing gcc 3.3 compile failures -- fix for x11-toolkits/wmapp
--- wmapp.cc.orig Wed Jul 23 03:26:58 2003
+++ wmapp.ccWed Jul 23 03:28:59 2003
@@ -4,11 +4,9 @@
using std::string;
-namespace Unix {
- extern C {
-# include unistd.h // for usleep()
- }
-};
+extern C {
+# include unistd.h // for usleep()
+}
// All the xpms we need:
namespace Xpms {
@@ -254,7 +252,7 @@
while (true) {
// sleep for the specified time in milliseconds
-Unix::usleep(1000 * current()-updatefreq());
+usleep(1000 * current()-updatefreq());
// execute any timed functions which need it
current()-run_timed_functions();
signature.asc
Description: Digital signature
Re: Fixing gcc 3.3 compile failures -- fix for x11toolkits/viewklass
These are quite a lot of files, so I put them into a tar archive http://www.leo.org/~barner/freebsd/x11-toolkits-viewklass_port_patch.tar.gz signature.asc Description: Digital signature
Re: Fixing gcc 3.3 compile failures
--- midimountain/mvcSongProperties.cpp.orig Tue Jul 22 04:23:32 2003
+++ midimountain/mvcSongProperties.cpp Tue Jul 22 04:25:22 2003
@@ -42,7 +42,8 @@
//=
void TMvcSongProperties::SetData( void )
{
- int* tmpInt = new int = 0;
+ int* tmpInt = new int;
+ *tmpInt = 0;
gtk_editable_insert_text( GTK_EDITABLE( FindWidget( txtName )),
fSequence-GetSequenceName(),
@@ -111,4 +112,4 @@
void CancelClickedSongProp( GtkButton *button, gpointer user_data )
{
gtk_widget_hide( ((TMvcSongProperties*)user_data)-GetWidget() );
-}
\ No newline at end of file
+}
signature.asc
Description: Digital signature
Re: Fixing gcc 3.3 compile failures -- fix for net/netmap
--- belgolib/dirs.c.origTue Jul 22 04:58:32 2003 +++ belgolib/dirs.c Tue Jul 22 04:58:46 2003 @@ -1,5 +1,6 @@ #include stdio.h #include dirent.h +#include assert.h #include list signature.asc Description: Digital signature
Re: Fixing gcc 3.3 compile failures -- fix for net/netsaint-plugins
--- plugins/check_by_ssh.c.orig Mon Apr 23 09:43:11 2001 +++ plugins/check_by_ssh.c Tue Jul 22 05:05:52 2003 @@ -191,7 +191,7 @@ if (commands1) remotecmd=strscat(remotecmd,;echo STATUS CODE: $?;); - if (strlen (remotecmd) = 1) + if (remotecmd==NULL) usage (No remotecmd\n); comm = ssprintf(comm,%s %s '%s',comm,hostname,remotecmd); @@ -369,6 +369,8 @@ list of netsaint service names, separated by ':' [optional]\n -n, --name=NAME\n short name of host in netsaint configuration [optional]\n +-v, --verbose\n + short name of host in netsaint configuration [optional]\n \n The most common mode of use is to refer to a local identity file with\n the '-i' option. In this mode, the identity pair should have a null\n @@ -388,7 +390,7 @@ #define OPTIONS \ --H host [-P port] [-f] [-y] [-t timeout] [-i identity]\n +-H host -C command [-fyv] [-P port] [-t timeout] [-i identity]\n\ [-l user] [-n name] [-s servicelist] [-O outputfile] void print_usage(void) signature.asc Description: Digital signature
Re: Fixing gcc 3.3 compile failures -- fix for www/mod_index_rss
--- mod_index_rss.c.origTue Jul 22 04:37:54 2003 +++ mod_index_rss.c Tue Jul 22 04:39:22 2003 @@ -11,18 +11,18 @@ #define TIME_FORMAT %a %b %d %H:%M:%S %Y /* This is the XML header file */ -#define HEADER ?xml version=\1.0\ encoding=\UTF-8\? - -!DOCTYPE rss PUBLIC \-//Netscape Communications//DTD RSS 0.91//EN\ -\http://www.scripting.com/dtd/rss-0_91.dtd\; - -rss version=\0.91\ - -channel +#define HEADER ?xml version=\1.0\ encoding=\UTF-8\?\n\ +\n\ +!DOCTYPE rss PUBLIC \-//Netscape Communications//DTD RSS 0.91//EN\\n\ +\http://www.scripting.com/dtd/rss-0_91.dtd\;\n\ +\n\ +rss version=\0.91\\n\ +\n\ +channel\n\ -#define FOOTER /channel -/rss +#define FOOTER /channel\n\ +/rss\n\ signature.asc Description: Digital signature
Re: Fixing gcc 3.3 compile failures -- patch for graphics/gsculpt
patch-Makefile is in order to make the port respect the CC and CXX
variables.
gsculpt-gcc33-patches.tar.gz contains a whole bunch of patches, mostly
'using std::foo' stuff.
Cheers,
Simon
--- Makefile.orig Mon Jul 21 19:59:12 2003
+++ MakefileMon Jul 21 19:59:38 2003
@@ -27,7 +27,6 @@
# C
-CC := gcc
CFLAGS = ${DEPENDFLAGS}
%.o : %.c
@@ -35,7 +34,6 @@
# C++
-CXX := g++
CXXFLAGS = ${DEPENDFLAGS}
%.o : %.cc
@@ -57,7 +55,7 @@
# linker
-LINKER:= g++
+LINKER:= ${CXX}
LDFLAGS=
LOADLIBES := -O3 -lm `gtk-config --libs`
signature.asc
Description: Digital signature
Re: Fixing gcc 3.3 compile failures -- patch for graphics/gsculpt
gsculpt-gcc33-patches.tar.gz contains a whole bunch of patches, mostly 'using std::foo' stuff. Since the file was cut by the mailing list system: You can find it here: http://www.leo.org/~barner/freebsd/gsculpt-gcc33-patches.tar.gz signature.asc Description: Digital signature
Re: Fixing gcc 3.3 compile failures -- fix for net/netsaint-plugins
--- plugins/check_by_ssh.c.orig Mon Apr 23 09:43:11 2001 +++ plugins/check_by_ssh.c Tue Jul 22 05:05:52 2003 @@ -191,7 +191,7 @@ if (commands1) remotecmd=strscat(remotecmd,;echo STATUS CODE: $?;); - if (strlen (remotecmd) = 1) + if (remotecmd==NULL) usage (No remotecmd\n); comm = ssprintf(comm,%s %s '%s',comm,hostname,remotecmd); This looks like more than a fix for a `compile failure'. The replacement code has different semantics than the new code. What is the `compile failure' that was being fixed here? I don't know, either. This patch was part of the port before I touched it [1]. Perhaps one should write if ((remotecmd==NULL) || (strlen (remotecmd) = 1)) to be on the safe side? Cheers, Simon [1]: http://www.freebsd.org/cgi/cvsweb.cgi/~checkout~/ports/net/netsaint-plugins/files/patch-check_by_ssh.c?rev=1.1content-type=text/plain signature.asc Description: Digital signature
Re: Fixing gcc 3.3 compile failures -- fix for math/freefem
Hi,
-ifstream fin( path );
+std::ifstream fin( path );
A much smaller patch could be produced with
using namespace std;
as appropriate.
Have you checked with the upstream author to see which approach is
likely to be rolled into the distribution?
Actually, upgrading the port to the lastest freefem version would have
been enough *doh* :o) (patch attached)
To answer your question: the freefem authors decided not to use the
'using namespace std' approach.
Cheers,
Simon
--- Makefile.orig Thu Jun 5 01:41:14 2003
+++ MakefileMon Jul 21 00:42:53 2003
@@ -6,7 +6,7 @@
#
PORTNAME= freefem
-PORTVERSION= 3.5.4
+PORTVERSION= 3.5.7
CATEGORIES=math cad
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=kfem
@@ -24,10 +24,6 @@
MAN1= freefem.1
.include bsd.port.pre.mk
-
-.if ${OSVERSION} = 500113
-BROKEN= Does not compile (bad C++ code)
-.endif
post-patch:
@${REINPLACE_CMD} -e 's|-O3 |\$$CXXFLAGS |g' ${WRKSRC}/configure
--- distinfo.orig Tue Mar 26 17:04:16 2002
+++ distinfoMon Jul 21 00:38:13 2003
@@ -1 +1 @@
-MD5 (freefem-3.5.4.tar.gz) = 746fe6487085011493a805e23507ae30
+MD5 (freefem-3.5.7.tar.gz) = e8f22515ab56f8e79fb789a11f8d4bef
signature.asc
Description: Digital signature
Re: Fixing gcc 3.3 compile failures -- fix for audio/cmp3
[...]
If you are running 4.x, you can also help to develop fixes for these
ports by installing the gcc33 port and setting
CC=/usr/local/bin/gcc33
CXX=/usr/local/bin/g++33
[...]
Hi, since I have some spare time today, I fixed some of the broken
ports (I will start with those ports that are maintained by ports@).
I am running 4.8-STABLE with the g++33 (GCC) 3.3.1 20030707 port.
I will also check the fixed ports with the base systems gcc.
For clarity's sake I will one email per fixed port.
You will find the patches for audio/cmp3 attached to this email.
Regards,
Simon
--- cmp3listfiles.c.origFri Jul 18 17:55:33 2003
+++ cmp3listfiles.c Fri Jul 18 17:56:23 2003
@@ -270,13 +270,13 @@
/* XXX - alert person */
return;
fprintf(outfile,
-##
-# Dumped Cmp3 playlist ass file
-#
-# Addable features (on individual lines):
-# %%[command] - executes commands initially using system() call
-# @ - randomizes this playlist at load time
-# $ - turns on repeat mode at load time
+##\n\
+# Dumped Cmp3 playlist ass file\n\
+#\n\
+# Addable features (on individual lines):\n\
+# %%[command] - executes commands initially using system() call\n\
+# @ - randomizes this playlist at load time\n\
+# $ - turns on repeat mode at load time\n\
#\n\n);
filename = shmptr-plhead;
--- rnmp3.c.origFri Jul 18 18:00:43 2003
+++ rnmp3.c Fri Jul 18 18:02:36 2003
@@ -256,25 +256,21 @@
void usage()
{
-printf(rnmp3 %s:
-
-Usage - pipe names into rnmp3. (\find | rnmp3 args\)
-If first parameter starts with -, the following string will be removed
-from all names if they exist (enclose spaces with \\)
-If any other commands are entered, commands will not be executed,
-just printed
-
-rnmp3 Rename
-rnmp3 test Don't rename, just show changes
-rnmp3 -\string\ Rename after removing \string\
-rnmp3 -\string\ testDon't rename after removing \string\
-rnmp3 --test test Rename after removing \-test\
-
-Before - \1-This is my (file name) man.mp3\
-After - \01-ThisIsMy-FileName-Man.mp3\
-
-Suggested uses:
-find . | rnmp3
+printf(rnmp3 %s:\n\n\
+Usage - pipe names into rnmp3. (\find | rnmp3 args\)\n\
+If first parameter starts with -, the following string will be removed\n\
+from all names if they exist (enclose spaces with \\)\n\
+If any other commands are entered, commands will not be executed,\n\
+just printed\n\n\
+rnmp3 Rename\n\
+rnmp3 test Don't rename, just show changes\n\
+rnmp3 -\string\ Rename after removing \string\\n\
+rnmp3 -\string\ testDon't rename after removing \string\\n\
+rnmp3 --test test Rename after removing \-test\\n\n\
+Before - \1-This is my (file name) man.mp3\\n\
+After - \01-ThisIsMy-FileName-Man.mp3\\n\n\
+Suggested uses:\n\
+find . | rnmp3\n\
find . -type f | rnmp3\n, VERSION);
exit(0);
signature.asc
Description: Digital signature
Re: Fixing gcc 3.3 compile failures -- fix for games/battleball
--- Makefile.orig Fri Jul 18 17:46:10 2003
+++ MakefileFri Jul 18 17:46:39 2003
@@ -21,11 +21,9 @@
MAKE_ENV= PTHREAD_LIBS=${PTHREAD_LIBS} \
PTHREAD_CFLAGS=${PTHREAD_CFLAGS}
-.include bsd.port.pre.mk
+CFLAGS += -Wno-deprecated
-.if ${OSVERSION} = 500113
-BROKEN= Does not compile (bad C++ code)
-.endif
+.include bsd.port.pre.mk
do-install:
@ ${INSTALL_PROGRAM} ${WRKSRC}/battleball ${PREFIX}/bin
--- lib3d/general.h.origFri Sep 3 04:25:19 1999
+++ lib3d/general.h Fri Jul 18 17:42:41 2003
@@ -25,9 +25,15 @@
typedef unsigned int uint;
typedef unsigned long ulong;
+#ifdef __GNUC__
+#if __GNUC__ 3
#define and
#define or ||
#define not !
+#endif
+
+// TODO - what about non-GNU C++ compilers?
+#endif
#define forii(limit) for (int i= 0; i limit; i++)
#define forij(limit) for (int j= 0; j limit; j++)
--- lib3d/xform.h.orig Fri Jul 18 17:28:08 2003
+++ lib3d/xform.h Fri Jul 18 17:26:11 2003
@@ -64,6 +64,7 @@
//===
class tmtrx {
+ friend struct player;
typedef double fourby3[4][3];
fourby3 m;
signature.asc
Description: Digital signature
Re: Fixing gcc 3.3 compile failures -- fix for multimedia/avinfo
--- messages.c.orig Fri Jul 18 17:14:00 2003 +++ messages.c Fri Jul 18 17:14:42 2003 @@ -43,7 +43,7 @@ Author: %Z, Site: %U\n\ Comment: %p\n\n\ Audio codec information:\n\ -Signatire: %w\t\tName: %P\n +Signatire: %w\t\tName: %P\n\ AVInfo 0.7.1 \n,, struct-report,Struct report\n\n\ signature.asc Description: Digital signature
Re: Fixing gcc 3.3 compile failures -- fix for devel/ecgi
--- html2h/html2h.c.origSat Jul 19 02:31:37 2003
+++ html2h/html2h.c Sat Jul 19 02:32:42 2003
@@ -6,15 +6,15 @@
void usage()
{
- printf(
-html2h v0.1
-usage:
- html2h input.html [output.h]
-
- if output is not set, input.h will be generated and overwritten!
-
- debug messages are written to stderr!
-
+ printf(\
+html2h v0.1\n\
+usage:\n\
+ html2h input.html [output.h]\n\
+\n\
+ if output is not set, input.h will be generated and overwritten!\n\
+\n\
+ debug messages are written to stderr!\n\
+\n\
);
exit(0);
@@ -415,4 +415,4 @@
{
fprintf(stderr, %s%s\n, msg, comment);
exit(1);
-}
\ No newline at end of file
+}
signature.asc
Description: Digital signature
Re: Fixing gcc 3.3 compile failures -- fix for math/freefem
--- freefem/fem/femDisk.cpp.origSat Jul 19 04:09:32 2003
+++ freefem/fem/femDisk.cpp Sat Jul 19 04:13:43 2003
@@ -95,7 +95,7 @@
char *result = 0;
int dummy;
-ifstream fin( path );
+std::ifstream fin( path );
if ( fin.fail() )
{
@@ -198,7 +198,7 @@
int i;
char *result = NULL;
-ofstream fout( path );
+std::ofstream fout( path );
if ( fout.fail() )
{
@@ -210,11 +210,11 @@
*/
if ((result = strstr (path,.amdba)) != NULL) /* amdba format */
{
- fout t-getNumberOfPoints() t-getNumberOfCells() endl;
+ fout t-getNumberOfPoints() t-getNumberOfCells() std::endl;
for (i = 0; i t-getNumberOfPoints(); i++)
{
- fout i+1 t-rp[i][0] t-rp[i][1] t-ng[i]
endl;
+ fout i+1 t-rp[i][0] t-rp[i][1] t-ng[i]
std::endl;
}
@@ -224,13 +224,13 @@
t-tr[i][0]+1
t-tr[i][1]+1
t-tr[i][2]+1
-t-ngt[i] endl;
+t-ngt[i] std::endl;
}
}
else if ((result = strstr (path,.am_fmt)) != NULL)/* am_fmt format */
{
#if 0
- fout t-getNumberOfPoints() t-getNumberOfCells() endl;
+ fout t-getNumberOfPoints() t-getNumberOfCells() std::endl;
dummy = 0;
for (i = 0; i t-getNumberOfCells(); i++)
@@ -238,39 +238,39 @@
fout t-tr[i][0]+1
t-tr[i][1]+1
t-tr[i][2]+1
- endl;
+ std::endl;
END_OF_LINE(data, dummy, 1);
}
if (dummy) fprintf(data,\n);
dummy = 0;
for (i = 0; i t-getNumberOfPoints(); i++)
{
- fout t-rp[i][0] t-rp[i][1] endl;
+ fout t-rp[i][0] t-rp[i][1] std::endl;
END_OF_LINE (data, dummy, 1);
}
if (dummy) fprintf(data,\n);
dummy = 0;
for (i = 0; i t-getNumberOfCells(); i++)
{
- fout t-ngt[i] endl;
+ fout t-ngt[i] std::endl;
END_OF_LINE (data, dummy, 9);
}
if (dummy) fprintf(data,\n);
dummy = 0;
for (i = 0; i t-getNumberOfPoints(); i++)
{
- fout t-ng[i] endl;
+ fout t-ng[i] std::endl;
END_OF_LINE (data, dummy, 9);
}
#endif
}
else
{
- fout t-getNumberOfPoints() t-getNumberOfCells() endl;
+ fout t-getNumberOfPoints() t-getNumberOfCells() std::endl;
for (i = 0; i t-getNumberOfPoints(); i++)
{
- fout t-rp[i][0] t-rp[i][1] t-ng[i] endl;
+ fout t-rp[i][0] t-rp[i][1] t-ng[i] std::endl;
}
@@ -279,7 +279,7 @@
fout t-tr[i][0]+1
t-tr[i][1]+1
t-tr[i][2]+1
-t-ngt[i] endl;
+t-ngt[i] std::endl;
}
}
return 0;
@@ -317,9 +317,9 @@
saveparam (fcts * param, femMesh * t, char *path, int N)
{
int k, ns = t-getNumberOfPoints();
-ofstream file (path);
+std::ofstream file (path);
file.precision (8);
-file nsN endl;
+file nsN std::endl;
for (k = 0; k ns; k++)
{
if (N == 1)
@@ -373,7 +373,7 @@
file (param)-nuyy2[k] ;
file ;
}
- file endl;
+ file std::endl;
}
file.close ();
return 0;
@@ -383,9 +383,9 @@
int
saveconst (creal f, char *path)
{
-ofstream file (path, ios::out | ios::app);
-// file.seekoff(0,ios::end,0);
-file f endl;
+std::ofstream file (path, std::ios::out | std::ios::app);
+// file.seekoff(0,std::ios::end,0);
+file f std::endl;
file.close ();
return 0;
}
--- freefem/fem/femGibbs.cpp.orig Sat Jul 19 04:10:36 2003
+++ freefem/fem/femGibbs.cppSat Jul 19 04:19:02 2003
@@ -38,6 +38,7 @@
#include math.h
#include stdio.h
#include stdlib.h
+#include string.h
//
// Freefem includes
@@ -1173,9 +1174,9 @@
{
f = new femPoint[ns];
for (i = 0; i ns; ++i)
-f[i] = rp[i];
+memcpy (f[i], rp[i], sizeof (femPoint));
for (i = 0; i ns; ++i)
-rp[r[i] - 1] = f[i];
+memcpy (rp[r[i] - 1], f[i], sizeof (femPoint));
for (j = 0; j nt; ++j)
for (i = 0; i 3; i++)
--- freefem/fem/femGraphicX11.cpp.orig Sat Jul 19 04:10:02 2003
+++ freefem/fem/femGraphicX11.cpp Sat Jul 19 04:12:31 2003
@@ -118,7 +118,7 @@
void
out_of_memory ()
{
- cerr FreeFEM error: operator new failed; not enough memory endl;
+ std::cerr FreeFEM error: operator new failed; not enough memory std::endl;
exit (-1);
}
--- freefem/fem/femMisc.cpp.origSat Jul 19 04:09:41 2003
+++ freefem/fem/femMisc.cpp Sat Jul 19
Re: Fixing gcc 3.3 compile failures -- fix for science/euler
--- metaps.c.orig Sat Jul 19 02:38:38 2003
+++ metaps.cSat Jul 19 02:39:09 2003
@@ -209,7 +209,7 @@
// rectangle clipping
// x1 y1 x2 y2 setclip
static char setclipmacro[]= /setclip {\n\
-gsave
+gsave\
/y2 exch def\n\
/x2 exch def\n\
/y1 exch def\n\
signature.asc
Description: Digital signature
Re: Fixing gcc 3.3 compile failures -- fix for shells/flash
--- screens/nc_about.c.orig Mon Jan 17 11:57:20 2000
+++ screens/nc_about.c Sat Jul 19 03:21:09 2003
@@ -86,856 +86,855 @@
*/
struct anim A[]=
-{{\
-
-___ _ __ __
- / / / / | / ___// / / /
- / /_ / / / /| | \\__ \\/ /_/ /
- / __/ / /___/ ___ |___/ / __ /
-/_/ /_/_/ |_//_/ /_/
-
-,1500},{\
-
-
-
- /\\
- / \\/\\
- /`/ / \\
--
-,40},{\
-
-
-
- /\\
- / \\/\\
- ` _ '/`/ / \\
--
-,40},{\
-
-
-
- /\\
- ` _ ' / \\/\\
- - (_) - /`/ / \\
--
-,40},{\
-
-
-
- ` _ '/\\
- - (_) - / \\/\\
-' ` /`/ / \\
--
-,40},{\
-
-
- ` _ '
- - (_) - /\\
-' `/ \\/\\
- /`/ / \\
--
-,40},{\
-
- ` _ '
- - (_) -
-' ` /\\
- / \\/\\
- /`/ / \\
--
-,100},{\
-
- ` _ '
-) - (_) -
-_) ' ` /\\
- / \\/\\
- /`/ / \\
--
-,20},{\
-
-_ ` _ '
- )- (_) -
-__) ' ` /\\
- / \\/\\
- /`/ / \\
--
-,20},{\
-
-__ ` _ '
- ) - (_) -
-___)' ` /\\
- / \\/\\
- /`/ / \\
--
-,20},{\
-
-___` _ '
- ) - (_) -
-) ' ` /\\
- / \\/\\
- /`/ / \\
--
-,20},{\
-
- ___ ` _ '
-( ) - (_) -
-_) ' ` /\\
- / \\/\\
- /`/ / \\
--
-,20},{\
-
- ___ ` _ '
-_( )- (_) -
-__) ' ` /\\
- / \\/\\
- /`/ / \\
--
-,20},{\
-
- ___ ` _ '
-__( ) - (_) -
-___)' ` /\\
- / \\/\\
- /`/ / \\
--
-,20},{\
-
-___` _ '
- __( ) - (_) -
-(___) ' ` /\\
- / \\/\\
- /`/ / \\
--
-,20},{\
-
- ___ ` _ '
- __( ) - (_) -
- (___) ' ` /\\
- / \\/\\
- /`/ / \\
--
-,20},{\
-
- ___ ` _ '
- __( )- (_) -
- (___) ' ` /\\
- / \\/\\
- /`/ / \\
--
-,20},{\
-
- ___ ` _ '
-__( ) (_) -
- (___)' ` /\\
- / \\/\\
- /`/ / \\
--
-,20},{\
-
-___` _ '
- __( ) (_) -
-(___) ` /\\
- / \\/\\
- /`/ / \\
--
-,20},{\
-
- ___ _ '
- __( )(_) -
- (___) ` /\\
- / \\/\\
- /`/ / \\
--
-,20},{\
-
- ___ _ '
- __( )_) -
- (___) ` /\\
- / \\/\\
- /`/ / \\
--
-,20},{\
-
- '
-__( )) -
- (___)` /\\
- / \\/\\
- /`/ / \\
--
-,20},{\
-
- `___ '
- __( ) -
-(___) /\\
- / \\/\\
- /`/ / \\
--
-,20},{\
-
- ` ___ '
- __( ) -
- (___)/\\
- / \\/\\
- /`/ / \\
--
-,20},{\
-
- ` ___'
- -__( )-
- (___) /\\
- / \\/\\
- /`/ / \\
--
-,20},{\
-
- ` ___
- - _(( )
- (___) /\\
-
Re: Fixing gcc 3.3 compile failures -- fix for graphics/giram
Is marked broken: BROKEN=Fails to patch but the patches do apply and the port does build. signature.asc Description: Digital signature
Re: Fixing gcc 3.3 compile failures -- fix for editors/hte
--- htapp.cc.orig Sat Jul 19 05:35:07 2003 +++ htapp.ccSat Jul 19 05:39:02 2003 @@ -2028,7 +2028,7 @@ get_stdbounds_tool(b); ht_project_window *project_window=new ht_project_window(); - project_window-init(b, project window, FS_KILLER | FS_TITLE | FS_NUMBER | FS_MOVE | FS_RESIZE, 0, (ht_project*)project); + project_window-init(b, project window, FS_KILLER | FS_TITLE | FS_NUMBER | FS_MOVE | FS_RESIZE, 0, (ht_project**)project); bounds k = b; k.x = b.w-2; signature.asc Description: Digital signature
Re: Fixing gcc 3.3 compile failures -- fix for science/gdis
--- rdf.c.orig Sat Jul 19 05:08:36 2003 +++ rdf.c Sat Jul 19 05:09:00 2003 @@ -445,8 +445,8 @@ printf(calculate_rdf(): a = %f b = %f c = %f alpha = %f beta = %f gamma = %f\n, model-pbc[0], model-pbc[1], model-pbc[2], model-pbc[3], model-pbc[4], model-pbc[5]); - printf(calculate_rdf(): latmat[0] = %f latmat[1] = %f latmat[2] = %f - \ncalculate_rdf(): latmat[3] = %f latmat[4] = %f latmat[5] = %f + printf(calculate_rdf(): latmat[0] = %f latmat[1] = %f latmat[2] = %f\ + \ncalculate_rdf(): latmat[3] = %f latmat[4] = %f latmat[5] = %f\ \ncalculate_rdf(): latmat[6] = %f latmat[7] = %f latmat[8] = %f\n, model-latmat[0], model-latmat[1], model-latmat[2], model-latmat[3], model-latmat[4], model-latmat[5], signature.asc Description: Digital signature
Re: Fixing gcc 3.3 compile failures -- fix for sysutils/lsmlib
--- main.c.orig Sat Jul 19 06:04:26 2003 +++ main.c Sat Jul 19 06:03:37 2003 @@ -21,7 +21,7 @@ #define USAGE usage: lsm [-h] [-o file] [dir] \n \ \n \ \th \t: print this help message\n \ -\tv \t: print current version\n +\tv \t: print current version\n\ \to file \t: use file as output \n\n\n\ signature.asc Description: Digital signature
Re: Fixing gcc 3.3 compile failures -- fix for x11/imwheel
The attached patch includes the existing patch file patch-ab, which is
obsolete now.
--- util.c.orig Tue Oct 31 13:06:05 2000
+++ util.c Sat Jul 19 05:45:59 2003
@@ -330,11 +330,11 @@
fclose(f);
if(pid0 useFifo)
{
- fprintf(stderr,\
-ERROR: imwheel is already running or there is a stale pid file
- check on processes listed below.
- run with -k to kill running imwheels.
- remove pid file %s.
+ fprintf(stderr,\n\
+ERROR: imwheel is already running or there is a stale pid file\n\
+ check on processes listed below.\n\
+ run with -k to kill running imwheels.\n\
+ remove pid file %s.\n\
or run with -p to avoid the pid file altogether.\n,PIDFILE);
if((f=fopen(PIDFILE,r)))
{
@@ -710,7 +710,7 @@
struct WinAction *getRC()
{
- char fname[2][1024]={,/etc/imwheelrc}, line[1024], *p, *q, winid[1024];
+ char fname[2][1024]={,/usr/X11R6/etc/imwheelrc}, line[1024], *p, *q,
winid[1024];
int fi,i;
struct WinAction *newwa=NULL;
FILE *f=NULL;
signature.asc
Description: Digital signature
