Date: Mon, 5 May 2003 11:30:12 -0700 (PDT) From: Helge Oldach <ports-palm-pose-31312@oldach.net> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/51423: palm/ports/pose fails to build Message-ID: <200305051830.h45IUCas086784@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/51423; it has been noted by GNATS.
From: Helge Oldach <ports-palm-pose-31312@oldach.net>
To: FreeBSD-gnats-submit@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org
Cc:
Subject: Re: ports/51423: palm/ports/pose fails to build
Date: Mon, 5 May 2003 20:20:35 +0200 (CEST)
Oops, again. The archive was incomplete...
Below is a shar archive upgrading ports/palm/pose to 3.5. Note that this
includes patches to enable POSE to run against recent fltk toolkits. I
have successfully tested against fltk 1.1.3 which is the current ports
release at this moment.
# This is a shell archive. Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file". Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
# .
# ./files
# ./files/patch-ak
# ./files/patch-ae
# ./files/patch-ac
# ./files/patch-aa
# ./Makefile
# ./distinfo
# ./pkg-descr
# ./pkg-message
# ./pkg-plist
#
echo c - .
mkdir -p . > /dev/null 2>&1
echo c - ./files
mkdir -p ./files > /dev/null 2>&1
echo x - ./files/patch-ak
sed 's/^X//' >./files/patch-ak << 'END-of-./files/patch-ak'
Xdiff -ru ../SrcUnix/EmDocumentUnix.cpp.orig ../SrcUnix/EmDocumentUnix.cpp
X--- ../SrcUnix/EmDocumentUnix.cpp.orig Fri Mar 29 14:11:19 2002
X+++ ../SrcUnix/EmDocumentUnix.cpp Sat Apr 26 21:20:09 2003
X@@ -95,7 +95,7 @@
X string fullPath = destRef.GetFullPath ();
X char* fNameExt = (char*) malloc (fullPath.size () + 4);
X strcpy (fNameExt, fullPath.c_str ());
X- filename_setext (fNameExt, ".ppm");
X+ fl_filename_setext (fNameExt, ".ppm");
X
X FILE* f = fopen (fNameExt, "wb");
X if (f)
Xdiff -ru ../SrcUnix/espws-2.0/FileBrowser.cxx.orig ../SrcUnix/espws-2.0/FileBrowser.cxx
X--- ../SrcUnix/espws-2.0/FileBrowser.cxx.orig Fri Mar 29 14:11:11 2002
X+++ ../SrcUnix/espws-2.0/FileBrowser.cxx Sat Apr 26 21:11:45 2003
X@@ -467,7 +467,7 @@
X
X num_files = filename_list(filename, &files);
X #else
X- num_files = filename_list(directory_, &files);
X+ num_files = fl_filename_list(directory_, &files);
X #endif /* WIN32 || __EMX__ */
X
X if (num_files <= 0)
X@@ -480,8 +480,8 @@
X {
X sprintf(filename, "%s/%s", directory_, files[i]->d_name);
X
X- if (filename_isdir(filename) ||
X- filename_match(files[i]->d_name, pattern_))
X+ if (fl_filename_isdir(filename) ||
X+ fl_filename_match(files[i]->d_name, pattern_))
X add(files[i]->d_name, FileIcon::find(filename));
X }
X
Xdiff -ru ../SrcUnix/espws-2.0/FileChooser2.cxx.orig ../SrcUnix/espws-2.0/FileChooser2.cxx
X--- ../SrcUnix/espws-2.0/FileChooser2.cxx.orig Fri Mar 29 14:11:11 2002
X+++ ../SrcUnix/espws-2.0/FileChooser2.cxx Sat Apr 26 21:15:56 2003
X@@ -83,7 +83,7 @@
X #else
X if (d[0] != '/' && d[0] != '\\')
X #endif /* WIN32 || __EMX__ */
X- filename_absolute(directory_, d);
X+ fl_filename_absolute(directory_, d);
X else
X {
X strncpy(directory_, d, sizeof(directory_) - 1);
X@@ -170,7 +170,7 @@
X pathname[sizeof(pathname) - 1] = '\0';
X }
X
X- if (filename_isdir(pathname) && !directory_chooser_)
X+ if (fl_filename_isdir(pathname) && !directory_chooser_)
X return (0);
X else
X return (1);
X@@ -189,7 +189,7 @@
X pathname[sizeof(pathname) - 1] = '\0';
X }
X
X- if (!filename_isdir(pathname) || directory_chooser_)
X+ if (!fl_filename_isdir(pathname) || directory_chooser_)
X count ++;
X }
X
X@@ -237,7 +237,7 @@
X name = fileList->text(i);
X sprintf(pathname, "%s/%s", directory_, name);
X
X- if (!filename_isdir(pathname) || directory_chooser_)
X+ if (!fl_filename_isdir(pathname) || directory_chooser_)
X {
X // Nope, see if this this is "the one"...
X count ++;
X@@ -264,7 +264,7 @@
X
X
X // See if the filename is actually a directory...
X- if (filename == NULL || filename_isdir(filename))
X+ if (filename == NULL || fl_filename_isdir(filename))
X {
X // Yes, just change the current directory...
X directory(filename);
X@@ -424,7 +424,7 @@
X if ((strlen(pathname) == 2 && pathname[1] == ':') ||
X filename_isdir(pathname))
X #else
X- if (filename_isdir(pathname))
X+ if (fl_filename_isdir(pathname))
X #endif /* WIN32 || __EMX__ */
X {
X directory(pathname);
X@@ -437,7 +437,7 @@
X {
X fileName->value(filename);
X
X- if (!filename_isdir(pathname) || directory_chooser_)
X+ if (!fl_filename_isdir(pathname) || directory_chooser_)
X okButton->activate();
X }
X }
X@@ -500,7 +500,7 @@
X if (((strlen(pathname) == 2 && pathname[1] == ':') ||
X filename_isdir(pathname)) && !directory_chooser_)
X #else
X- if (filename_isdir(pathname) && !directory_chooser_)
X+ if (fl_filename_isdir(pathname) && !directory_chooser_)
X #endif /* WIN32 || __EMX__ */
X directory(pathname);
X else if (type_ == CREATE || access(pathname, 0) == 0)
X@@ -632,7 +632,7 @@
X sprintf(pathname, "%s/%s", directory_, fileName->value());
X
X if ((type_ == CREATE || access(pathname, 0) == 0) &&
X- (!filename_isdir(pathname) || directory_chooser_))
X+ (!fl_filename_isdir(pathname) || directory_chooser_))
X okButton->activate();
X else
X okButton->deactivate();
Xdiff -ru ../SrcUnix/espws-2.0/FileIcon.cxx.orig ../SrcUnix/espws-2.0/FileIcon.cxx
X--- ../SrcUnix/espws-2.0/FileIcon.cxx.orig Fri Mar 29 14:11:11 2002
X+++ ../SrcUnix/espws-2.0/FileIcon.cxx Sat Apr 26 21:18:04 2003
X@@ -230,7 +230,7 @@
X // is found...
X for (current = first_; current != (FileIcon *)0; current = current->next_)
X if ((current->type_ == filetype || current->type_ == ANY) &&
X- filename_match(filename, current->pattern_))
X+ fl_filename_match(filename, current->pattern_))
X break;
X
X // Return the match (if any)...
X@@ -472,7 +472,7 @@
X const char *ext; // File extension
X
X
X- if ((ext = filename_ext(f)) == NULL)
X+ if ((ext = fl_filename_ext(f)) == NULL)
X {
X fprintf(stderr, "FileIcon::load(): Unknown file type for \"%s\".\n", f);
X return;
X@@ -1089,7 +1089,7 @@
X
X
X entries = (dirent **)0;
X- n = filename_list(directory, &entries);
X+ n = fl_filename_list(directory, &entries);
X
X for (i = 0; i < n; i ++)
X {
X@@ -1099,7 +1099,7 @@
X strcat(full,"/");
X strcat(full, entries[i]->d_name);
X
X- if (filename_isdir(full))
X+ if (fl_filename_isdir(full))
X load_kde_icons(full);
X else
X load_kde_mimelnk(full);
END-of-./files/patch-ak
echo x - ./files/patch-ae
sed 's/^X//' >./files/patch-ae << 'END-of-./files/patch-ae'
X--- ../SrcUnix/EmTransportSerialUnix.cpp.orig Fri Mar 30 11:41:13 2001
X+++ ../SrcUnix/EmTransportSerialUnix.cpp Fri Mar 30 11:47:36 2001
X@@ -382,9 +382,9 @@
X EmHostTransportSerial::EmHostTransportSerial (void) :
X fReadThread (NULL),
X fWriteThread (NULL),
X- fCommHandle (0),
X- fCommSignalPipeA (0),
X- fCommSignalPipeB (0),
X+ fCommHandle (-1),
X+ fCommSignalPipeA (-1),
X+ fCommSignalPipeB (-1),
X fTimeToQuit (false),
X fDataMutex (),
X fDataCondition (&fDataMutex),
X@@ -412,9 +412,9 @@
X {
X EmAssert (fReadThread == NULL);
X EmAssert (fWriteThread == NULL);
X- EmAssert (fCommHandle == 0);
X- EmAssert (fCommSignalPipeA == 0);
X- EmAssert (fCommSignalPipeB == 0);
X+ EmAssert (fCommHandle == -1);
X+ EmAssert (fCommSignalPipeA == -1);
X+ EmAssert (fCommSignalPipeB == -1);
X }
X
X
X@@ -450,7 +450,7 @@
X
X if (fCommHandle <= 0)
X {
X- fCommHandle = 0;
X+ fCommHandle = -1;
X
X return errno;
X }
X@@ -480,7 +480,7 @@
X
X ErrCode EmHostTransportSerial::CreateCommThreads (const EmTransportSerial::ConfigSerial& /*config*/)
X {
X- if (fCommHandle)
X+ if (fCommHandle != -1)
X {
X PRINTF ("EmTransportSerial::HostOpen: Creating serial port handler threads...");
X
X@@ -525,35 +525,38 @@
X
X // Signal the threads to quit.
X
X- fDataMutex.lock ();
X+ if ( fCommSignalPipeA != -1 && fCommSignalPipeB != -1 ) {
X+ fDataMutex.lock ();
X+
X+ fTimeToQuit = true;
X+
X+ int dummy = 0;
X+ write (fCommSignalPipeB, &dummy, sizeof (dummy)); // Signals CommRead.
X
X- fTimeToQuit = true;
X+ fDataCondition.broadcast (); // Signals CommWrite.
X+ fDataMutex.unlock ();
X
X- int dummy = 0;
X- write (fCommSignalPipeB, &dummy, sizeof (dummy)); // Signals CommRead.
X+ // Wait for the threads to quit.
X
X- fDataCondition.broadcast (); // Signals CommWrite.
X- fDataMutex.unlock ();
X-
X- // Wait for the threads to quit.
X+ if (fReadThread)
X+ {
X+ fReadThread->join (NULL);
X+ fWriteThread->join (NULL);
X+ }
X
X- if (fReadThread)
X- {
X- fReadThread->join (NULL);
X- fWriteThread->join (NULL);
X- }
X+ // Thread objects delete themselves, so set our references to NULL.
X
X- // Thread objects delete themselves, so set our references to NULL.
X+ fReadThread = NULL;
X+ fWriteThread = NULL;
X
X- fReadThread = NULL;
X- fWriteThread = NULL;
X+ // Close the signal pipe.
X
X- // Close the signal pipe.
X+ close (fCommSignalPipeA);
X+ close (fCommSignalPipeB);
X
X- close (fCommSignalPipeA);
X- close (fCommSignalPipeB);
X+ fCommSignalPipeA = fCommSignalPipeB = 0;
X
X- fCommSignalPipeA = fCommSignalPipeB = 0;
X+ }
X
X return errNone;
X }
X@@ -573,11 +576,13 @@
X
X ErrCode EmHostTransportSerial::CloseCommPort (void)
X {
X- (void) close (fCommHandle);
X-
X- fCommHandle = 0;
X-
X- return errNone;
X+ if ( fCommHandle != -1 ) {
X+ int result = close (fCommHandle);
X+
X+ fCommHandle = -1;
X+ }
X+
X+ return errNone;
X }
X
X
END-of-./files/patch-ae
echo x - ./files/patch-ac
sed 's/^X//' >./files/patch-ac << 'END-of-./files/patch-ac'
X--- ../SrcUnix/EmTransportSerialUnix.cpp.orig Wed Apr 19 20:27:37 2000
X+++ ../SrcUnix/EmTransportSerialUnix.cpp Sun May 14 13:20:23 2000
X@@ -311,6 +311,12 @@
X #ifdef __QNXNTO__
X results.push_back ("/dev/ser1");
X results.push_back ("/dev/ser2");
X+#elif __FreeBSD__
X+ results.push_back ("/dev/pilot");
X+ results.push_back ("/dev/cuaa0");
X+ results.push_back ("/dev/cuaa1");
X+ results.push_back ("/dev/cuaa2");
X+ results.push_back ("/dev/cuaa3");
X #else
X results.push_back ("/dev/ttyS0");
X results.push_back ("/dev/ttyS1");
END-of-./files/patch-ac
echo x - ./files/patch-aa
sed 's/^X//' >./files/patch-aa << 'END-of-./files/patch-aa'
X--- configure.orig Thu Mar 29 10:43:55 2001
X+++ configure Thu Mar 29 10:51:21 2001
X@@ -3105,6 +3105,8 @@
X *-freebsd*)
X THREAD_FLAGS="-pthread -D_THREAD_SAFE -D_REENTRANT -DPthreadDraftVersion=10"
X THREAD_LIBS=
X+ POSER_CFLAGS="$POSER_CFLAGS $CFLAGS $FLAGS $_WARNINGS_CFLAGS"
X+ POSER_CXXFLAGS="$POSER_CXXFLAGS $CFLAGS $FLAGS $_WARNINGS_CXXFLAGS"
X ;;
X
X *-bsdi4*)
X@@ -3188,7 +3190,6 @@
X
X
X
X-FLAGS_OPTIMIZE="-O2"
X
X
X
END-of-./files/patch-aa
echo x - ./Makefile
sed 's/^X//' >./Makefile << 'END-of-./Makefile'
X# New ports collection makefile for: pose
X# Date created: Sat May 6 14:03:08 CEST 2000
X# Whom: Dirk Froemberg <dirk@FreeBSD.org>
X#
X# $FreeBSD: ports/palm/pose/Makefile,v 1.7 2003/02/21 13:19:56 knu Exp $
X#
X
XPORTNAME= pose
XPORTVERSION= 3.5
XCATEGORIES= palm emulators
XMASTER_SITES= http://www.palmos.com/dev/tech/tools/emulator/
X# DISTNAME= emulator_src_31
XDISTFILES= emulator_src_3.5.tar.gz emulator-skins-19.tar.gz
X
XMAINTAINER= wlloyd@slap.net
XCOMMENT= Palm OS(R) Emulator
X
XLIB_DEPENDS= fltk.1:${PORTSDIR}/x11-toolkits/fltk
X
XUSE_MESA= yes
XWRKSRC= ${WRKDIR}/Emulator_Src_${PORTVERSION}/BuildUnix
XUSE_GMAKE= yes
XGNU_CONFIGURE= yes
XCONFIGURE_ARGS= --x-includes=${X11BASE}/include \
X --x-libraries=${X11BASE}/lib \
X --with-x --with-fltk=${X11BASE}
XCONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" \
X CFLAGS=-DBROKEN_VIRTUAL_DEFAULT_ARGUMENTS=1 \
X LIBS="${PTHREAD_LIBS}"
X
Xpost-install:
X ${MKDIR} ${PREFIX}/share/pose
X ${INSTALL_DATA} "${WRKSRC}/../ROMTransfer/Source/ROM_Transfer.prc" ${PREFIX}/share/pose
X @${SED} -e 's#/usr/local#${PREFIX}#g' ${PKGMESSAGE}
X ${CP} -Rp ${WRKDIR}/Skins_v1.9 ${PREFIX}/share/pose/skins
X
X.include <bsd.port.mk>
END-of-./Makefile
echo x - ./distinfo
sed 's/^X//' >./distinfo << 'END-of-./distinfo'
XMD5 (emulator_src_3.5.tar.gz) = c69b10798e524b999739bf1950125655
XMD5 (emulator-skins-19.tar.gz) = 960a83baa3a306442a6ea743543947bd
END-of-./distinfo
echo x - ./pkg-descr
sed 's/^X//' >./pkg-descr << 'END-of-./pkg-descr'
XThe Palm OS(R) Emulator is software that emulates the hardware of
Xthe various models of Palm OS(R) platform devices. It is extremely
Xvaluable for writing, testing and debugging applications. Create
X"virtual" handhelds by running the Emulator on Windows, Mac OS, or
XUnix computers.
X
XEmulated devices can be loaded with new ROMs, so you can test your
Xapplication with virtual devices, including different devices than
Xyou own, foreign language ROMs, and debug-enabled ROMs for extra
Xerror checking and debugging features.
X
XIt was based on "Copilot", written by several different developers,
Xprincipally Greg Hewgill. Palm enhanced it with new features,
Xdebugging support, and support for more recent ROMs.
X
XWWW: http://www.palmos.com/dev/tech/tools/emulator/
END-of-./pkg-descr
echo x - ./pkg-message
sed 's/^X//' >./pkg-message << 'END-of-./pkg-message'
X
XTo transfer the ROM of your palm install /usr/local/share/pose/ROM Transfer.prc
Xon your device.
X
END-of-./pkg-message
echo x - ./pkg-plist
sed 's/^X//' >./pkg-plist << 'END-of-./pkg-plist'
Xbin/pose
Xshare/pose/ROM_Transfer.prc
Xshare/pose/skins/Handspring/WhereAreTheSkins.txt
Xshare/pose/skins/Palm/Workpad_c3_32.jpg
Xshare/pose/skins/Palm/Palm_IIIc.skin
Xshare/pose/skins/Palm/Palm_IIIe.skin
Xshare/pose/skins/Palm/Palm_IIIx.skin
Xshare/pose/skins/Palm/Palm_Pilot.skin
Xshare/pose/skins/Palm/Palm_V.skin
Xshare/pose/skins/Palm/Palm_VII.skin
Xshare/pose/skins/Palm/Palm_VIIx.skin
Xshare/pose/skins/Palm/Palm_i705.skin
Xshare/pose/skins/Palm/Palm_i705_16.jpg
Xshare/pose/skins/Palm/Palm_i705_32.jpg
Xshare/pose/skins/Palm/Palm_m100.skin
Xshare/pose/skins/Palm/Palm_m130.skin
Xshare/pose/skins/Palm/Palm_m130_16.jpg
Xshare/pose/skins/Palm/Palm_m130_32.jpg
Xshare/pose/skins/Palm/Palm_m500.skin
Xshare/pose/skins/Palm/Palm_m505.skin
Xshare/pose/skins/Palm/Palm_m515.skin
Xshare/pose/skins/Palm/Palm_m515_16.jpg
Xshare/pose/skins/Palm/Palm_m515_32.jpg
Xshare/pose/skins/Palm/Pilot.skin
Xshare/pose/skins/Palm/Workpad.skin
Xshare/pose/skins/Palm/Workpad_c3.skin
Xshare/pose/skins/Palm/Palm_III_16.jpg
Xshare/pose/skins/Palm/Palm_III_32.jpg
Xshare/pose/skins/Palm/Palm_IIIc_16.jpg
Xshare/pose/skins/Palm/Palm_IIIc_32.jpg
Xshare/pose/skins/Palm/Palm_IIIe_16.jpg
Xshare/pose/skins/Palm/Palm_IIIe_32.jpg
Xshare/pose/skins/Palm/Palm_IIIx_16.jpg
Xshare/pose/skins/Palm/Palm_IIIx_32.jpg
Xshare/pose/skins/Palm/Palm_Pilot_16.jpg
Xshare/pose/skins/Palm/Palm_Pilot_32.jpg
Xshare/pose/skins/Palm/Palm_VII_16.jpg
Xshare/pose/skins/Palm/Palm_VII_32.jpg
Xshare/pose/skins/Palm/Palm_VIIx_16.jpg
Xshare/pose/skins/Palm/Palm_VIIx_32.jpg
Xshare/pose/skins/Palm/Palm_V_16.jpg
Xshare/pose/skins/Palm/Palm_V_32.jpg
Xshare/pose/skins/Palm/Palm_m100_16.jpg
Xshare/pose/skins/Palm/Palm_m100_32.jpg
Xshare/pose/skins/Palm/Pilot_16.jpg
Xshare/pose/skins/Palm/Palm_m500_16.jpg
Xshare/pose/skins/Palm/Palm_m500_32.jpg
Xshare/pose/skins/Palm/Palm_m505_16.jpg
Xshare/pose/skins/Palm/Palm_m505_32.jpg
Xshare/pose/skins/Palm/Pilot_32.jpg
Xshare/pose/skins/Palm/Workpad_16.jpg
Xshare/pose/skins/Palm/Workpad_32.jpg
Xshare/pose/skins/Palm/Workpad_c3_16.jpg
Xshare/pose/skins/Palm/Palm_III.skin
Xshare/pose/skins/Symbol/Symbol_1500.skin
Xshare/pose/skins/Symbol/Symbol_1700.skin
Xshare/pose/skins/Symbol/Symbol_1500_16.jpg
Xshare/pose/skins/Symbol/Symbol_1500_32.jpg
Xshare/pose/skins/Symbol/Symbol_1700_16.jpg
Xshare/pose/skins/Symbol/Symbol_1700_32.jpg
Xshare/pose/skins/TRG/TRGpro_32.jpg
Xshare/pose/skins/TRG/HandEra330Cards.skin
Xshare/pose/skins/TRG/HandEra330Cards_16.jpg
Xshare/pose/skins/TRG/HandEra330Cards_32.jpg
Xshare/pose/skins/TRG/HandEra330_16.jpg
Xshare/pose/skins/TRG/HandEra330_32.jpg
Xshare/pose/skins/TRG/TRGpro.skin
Xshare/pose/skins/TRG/TRGpro_16.jpg
Xshare/pose/skins/TRG/HandEra330.skin
Xshare/pose/skins/ReadMe.txt
X@dirrm share/pose/skins/Handspring
X@dirrm share/pose/skins/Palm
X@dirrm share/pose/skins/Symbol
X@dirrm share/pose/skins/TRG
X@dirrm share/pose/skins
X@dirrm share/pose
END-of-./pkg-plist
exit
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200305051830.h45IUCas086784>