diff options
author | Tilman Keskinoz <arved@FreeBSD.org> | 2003-07-23 16:08:54 +0000 |
---|---|---|
committer | Tilman Keskinoz <arved@FreeBSD.org> | 2003-07-23 16:08:54 +0000 |
commit | f752afb5f61ddbbf1ebf5fd0ef2562e9c36899da (patch) | |
tree | 702a0616ab96b790edfdef951f64861c0185139a /palm/pose | |
parent | Don't force the use of small icons, they're unreadable (and impossible to (diff) |
Unbreak by updating to 3.5
PR: 51423
Submitted by: Helge Oldach <ports-palm-pose-31312@oldach.net>
Notes
Notes:
svn path=/head/; revision=85465
Diffstat (limited to 'palm/pose')
-rw-r--r-- | palm/pose/Makefile | 17 | ||||
-rw-r--r-- | palm/pose/distinfo | 4 | ||||
-rw-r--r-- | palm/pose/files/patch-aa | 18 | ||||
-rw-r--r-- | palm/pose/files/patch-ae | 16 | ||||
-rw-r--r-- | palm/pose/files/patch-af | 11 | ||||
-rw-r--r-- | palm/pose/files/patch-ai | 13 | ||||
-rw-r--r-- | palm/pose/files/patch-ak | 158 | ||||
-rw-r--r-- | palm/pose/pkg-plist | 58 |
8 files changed, 205 insertions, 90 deletions
diff --git a/palm/pose/Makefile b/palm/pose/Makefile index 09fd77b60414..8ee0226dbee6 100644 --- a/palm/pose/Makefile +++ b/palm/pose/Makefile @@ -6,17 +6,16 @@ # PORTNAME= pose -PORTVERSION= 3.1 +PORTVERSION= 3.5 CATEGORIES= palm emulators -MASTER_SITES= http://www.palmos.com/dev/tech/tools/emulator/ -# DISTNAME= emulator_src_31 -DISTFILES= emulator_src_31.tar.gz emulator_skins_16.tar.gz +MASTER_SITES= http://www.palmos.com/dev/tools/emulator/sources/ \ + http://www.palmos.com/dev/tools/emulator/:skins +DISTFILES= emulator_src_3.5.tar.gz \ + emulator-skins-19.tar.gz:skins MAINTAINER= wlloyd@slap.net COMMENT= Palm OS(R) Emulator -BROKEN= "Does not compile" - LIB_DEPENDS= fltk.1:${PORTSDIR}/x11-toolkits/fltk USE_MESA= yes @@ -24,14 +23,16 @@ WRKSRC= ${WRKDIR}/Emulator_Src_${PORTVERSION}/BuildUnix USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --x-includes=${X11BASE}/include \ - --x-libraries=${X11BASE}/lib + --x-libraries=${X11BASE}/lib \ + --with-x --with-fltk=${X11BASE} CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" \ + CFLAGS=-DBROKEN_VIRTUAL_DEFAULT_ARGUMENTS=1 \ LIBS="${PTHREAD_LIBS}" post-install: ${MKDIR} ${PREFIX}/share/pose ${INSTALL_DATA} "${WRKSRC}/../ROMTransfer/Source/ROM_Transfer.prc" ${PREFIX}/share/pose @${SED} -e 's#/usr/local#${PREFIX}#g' ${PKGMESSAGE} - ${CP} -Rp ${WRKDIR}/Skins_v1.6 ${PREFIX}/share/pose/skins + ${CP} -Rp ${WRKDIR}/Skins_v1.9 ${PREFIX}/share/pose/skins .include <bsd.port.mk> diff --git a/palm/pose/distinfo b/palm/pose/distinfo index b351f059e4d7..1078dde28111 100644 --- a/palm/pose/distinfo +++ b/palm/pose/distinfo @@ -1,2 +1,2 @@ -MD5 (emulator_src_31.tar.gz) = 7791c4d56d250f50bebdd8d443da596d -MD5 (emulator_skins_16.tar.gz) = cc577300c700b0cffeecda576a004913 +MD5 (emulator_src_3.5.tar.gz) = c69b10798e524b999739bf1950125655 +MD5 (emulator-skins-19.tar.gz) = 960a83baa3a306442a6ea743543947bd diff --git a/palm/pose/files/patch-aa b/palm/pose/files/patch-aa index 614ec6e6fe88..02d2e27f838d 100644 --- a/palm/pose/files/patch-aa +++ b/palm/pose/files/patch-aa @@ -9,24 +9,6 @@ ;; *-bsdi4*) -@@ -3121,7 +3123,7 @@ - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" --LIBS="-lfltk -L$x_libraries -lXext -lX11 -lm $X_EXTRA_LIBS $LIBS" -+LIBS="-lfltk -lGL -L$x_libraries -lXext -lX11 -lm $X_EXTRA_LIBS $LIBS" - cat > conftest.$ac_ext <<EOF - #line 3127 "configure" - #include "confdefs.h" -@@ -3155,7 +3157,7 @@ - #define $ac_tr_lib 1 - EOF - -- LIBS="-lfltk $LIBS" -+ LIBS="-lfltk -lGL $LIBS" - - else - echo "$ac_t""no" 1>&6 @@ -3188,7 +3190,6 @@ diff --git a/palm/pose/files/patch-ae b/palm/pose/files/patch-ae index 5fbbfbfd9397..d707ac88ebf1 100644 --- a/palm/pose/files/patch-ae +++ b/palm/pose/files/patch-ae @@ -15,14 +15,14 @@ fDataCondition (&fDataMutex), @@ -412,9 +412,9 @@ { - assert (fReadThread == NULL); - assert (fWriteThread == NULL); -- assert (fCommHandle == 0); -- assert (fCommSignalPipeA == 0); -- assert (fCommSignalPipeB == 0); -+ assert (fCommHandle == -1); -+ assert (fCommSignalPipeA == -1); -+ assert (fCommSignalPipeB == -1); + EmAssert (fReadThread == NULL); + EmAssert (fWriteThread == NULL); +- EmAssert (fCommHandle == 0); +- EmAssert (fCommSignalPipeA == 0); +- EmAssert (fCommSignalPipeB == 0); ++ EmAssert (fCommHandle == -1); ++ EmAssert (fCommSignalPipeA == -1); ++ EmAssert (fCommSignalPipeB == -1); } diff --git a/palm/pose/files/patch-af b/palm/pose/files/patch-af deleted file mode 100644 index b3327b82f797..000000000000 --- a/palm/pose/files/patch-af +++ /dev/null @@ -1,11 +0,0 @@ ---- ../SrcShared/Logging.h.orig Fri Mar 30 07:21:43 2001 -+++ ../SrcShared/Logging.h Fri Mar 30 07:22:40 2001 -@@ -18,7 +18,7 @@ - #include "Miscellaneous.h" // StMemory - #include "PreferenceMgr.h" // FOR_EACH_PREF - #include "omnithread.h" // omni_mutex -- -+#include "stdarg.h" // FreeBSD - class EmStreamFile; - - diff --git a/palm/pose/files/patch-ai b/palm/pose/files/patch-ai deleted file mode 100644 index 1f14c1967d05..000000000000 --- a/palm/pose/files/patch-ai +++ /dev/null @@ -1,13 +0,0 @@ ---- ../SrcUnix/fltk_LcdWindow.cpp.orig Fri Mar 30 08:41:10 2001 -+++ ../SrcUnix/fltk_LcdWindow.cpp Fri Mar 30 08:44:49 2001 -@@ -222,7 +222,9 @@ - - if (gSession) - { -- lcd->damageLcdArea (); -+ if ( EmScreen::IsDirty() ) { -+ lcd->damageLcdArea (); -+ } - } - - if (gSession) diff --git a/palm/pose/files/patch-ak b/palm/pose/files/patch-ak new file mode 100644 index 000000000000..7399a212d9d6 --- /dev/null +++ b/palm/pose/files/patch-ak @@ -0,0 +1,158 @@ +diff -ru ../SrcUnix/EmDocumentUnix.cpp.orig ../SrcUnix/EmDocumentUnix.cpp +--- ../SrcUnix/EmDocumentUnix.cpp.orig Fri Mar 29 14:11:19 2002 ++++ ../SrcUnix/EmDocumentUnix.cpp Sat Apr 26 21:20:09 2003 +@@ -95,7 +95,7 @@ + string fullPath = destRef.GetFullPath (); + char* fNameExt = (char*) malloc (fullPath.size () + 4); + strcpy (fNameExt, fullPath.c_str ()); +- filename_setext (fNameExt, ".ppm"); ++ fl_filename_setext (fNameExt, ".ppm"); + + FILE* f = fopen (fNameExt, "wb"); + if (f) +diff -ru ../SrcUnix/espws-2.0/FileBrowser.cxx.orig ../SrcUnix/espws-2.0/FileBrowser.cxx +--- ../SrcUnix/espws-2.0/FileBrowser.cxx.orig Fri Mar 29 14:11:11 2002 ++++ ../SrcUnix/espws-2.0/FileBrowser.cxx Sat Apr 26 21:11:45 2003 +@@ -467,7 +467,7 @@ + + num_files = filename_list(filename, &files); + #else +- num_files = filename_list(directory_, &files); ++ num_files = fl_filename_list(directory_, &files); + #endif /* WIN32 || __EMX__ */ + + if (num_files <= 0) +@@ -480,8 +480,8 @@ + { + sprintf(filename, "%s/%s", directory_, files[i]->d_name); + +- if (filename_isdir(filename) || +- filename_match(files[i]->d_name, pattern_)) ++ if (fl_filename_isdir(filename) || ++ fl_filename_match(files[i]->d_name, pattern_)) + add(files[i]->d_name, FileIcon::find(filename)); + } + +diff -ru ../SrcUnix/espws-2.0/FileChooser2.cxx.orig ../SrcUnix/espws-2.0/FileChooser2.cxx +--- ../SrcUnix/espws-2.0/FileChooser2.cxx.orig Fri Mar 29 14:11:11 2002 ++++ ../SrcUnix/espws-2.0/FileChooser2.cxx Sat Apr 26 21:15:56 2003 +@@ -83,7 +83,7 @@ + #else + if (d[0] != '/' && d[0] != '\\') + #endif /* WIN32 || __EMX__ */ +- filename_absolute(directory_, d); ++ fl_filename_absolute(directory_, d); + else + { + strncpy(directory_, d, sizeof(directory_) - 1); +@@ -170,7 +170,7 @@ + pathname[sizeof(pathname) - 1] = '\0'; + } + +- if (filename_isdir(pathname) && !directory_chooser_) ++ if (fl_filename_isdir(pathname) && !directory_chooser_) + return (0); + else + return (1); +@@ -189,7 +189,7 @@ + pathname[sizeof(pathname) - 1] = '\0'; + } + +- if (!filename_isdir(pathname) || directory_chooser_) ++ if (!fl_filename_isdir(pathname) || directory_chooser_) + count ++; + } + +@@ -237,7 +237,7 @@ + name = fileList->text(i); + sprintf(pathname, "%s/%s", directory_, name); + +- if (!filename_isdir(pathname) || directory_chooser_) ++ if (!fl_filename_isdir(pathname) || directory_chooser_) + { + // Nope, see if this this is "the one"... + count ++; +@@ -264,7 +264,7 @@ + + + // See if the filename is actually a directory... +- if (filename == NULL || filename_isdir(filename)) ++ if (filename == NULL || fl_filename_isdir(filename)) + { + // Yes, just change the current directory... + directory(filename); +@@ -424,7 +424,7 @@ + if ((strlen(pathname) == 2 && pathname[1] == ':') || + filename_isdir(pathname)) + #else +- if (filename_isdir(pathname)) ++ if (fl_filename_isdir(pathname)) + #endif /* WIN32 || __EMX__ */ + { + directory(pathname); +@@ -437,7 +437,7 @@ + { + fileName->value(filename); + +- if (!filename_isdir(pathname) || directory_chooser_) ++ if (!fl_filename_isdir(pathname) || directory_chooser_) + okButton->activate(); + } + } +@@ -500,7 +500,7 @@ + if (((strlen(pathname) == 2 && pathname[1] == ':') || + filename_isdir(pathname)) && !directory_chooser_) + #else +- if (filename_isdir(pathname) && !directory_chooser_) ++ if (fl_filename_isdir(pathname) && !directory_chooser_) + #endif /* WIN32 || __EMX__ */ + directory(pathname); + else if (type_ == CREATE || access(pathname, 0) == 0) +@@ -632,7 +632,7 @@ + sprintf(pathname, "%s/%s", directory_, fileName->value()); + + if ((type_ == CREATE || access(pathname, 0) == 0) && +- (!filename_isdir(pathname) || directory_chooser_)) ++ (!fl_filename_isdir(pathname) || directory_chooser_)) + okButton->activate(); + else + okButton->deactivate(); +diff -ru ../SrcUnix/espws-2.0/FileIcon.cxx.orig ../SrcUnix/espws-2.0/FileIcon.cxx +--- ../SrcUnix/espws-2.0/FileIcon.cxx.orig Fri Mar 29 14:11:11 2002 ++++ ../SrcUnix/espws-2.0/FileIcon.cxx Sat Apr 26 21:18:04 2003 +@@ -230,7 +230,7 @@ + // is found... + for (current = first_; current != (FileIcon *)0; current = current->next_) + if ((current->type_ == filetype || current->type_ == ANY) && +- filename_match(filename, current->pattern_)) ++ fl_filename_match(filename, current->pattern_)) + break; + + // Return the match (if any)... +@@ -472,7 +472,7 @@ + const char *ext; // File extension + + +- if ((ext = filename_ext(f)) == NULL) ++ if ((ext = fl_filename_ext(f)) == NULL) + { + fprintf(stderr, "FileIcon::load(): Unknown file type for \"%s\".\n", f); + return; +@@ -1089,7 +1089,7 @@ + + + entries = (dirent **)0; +- n = filename_list(directory, &entries); ++ n = fl_filename_list(directory, &entries); + + for (i = 0; i < n; i ++) + { +@@ -1099,7 +1099,7 @@ + strcat(full,"/"); + strcat(full, entries[i]->d_name); + +- if (filename_isdir(full)) ++ if (fl_filename_isdir(full)) + load_kde_icons(full); + else + load_kde_mimelnk(full); diff --git a/palm/pose/pkg-plist b/palm/pose/pkg-plist index c38d303db95a..cc93b1484347 100644 --- a/palm/pose/pkg-plist +++ b/palm/pose/pkg-plist @@ -1,30 +1,7 @@ bin/pose share/pose/ROM_Transfer.prc -share/pose/skins/Handspring/Visor_Prism_Japanese.skin -share/pose/skins/Handspring/Visor_Blue_16.jpg -share/pose/skins/Handspring/Visor_Blue_16_Japanese.jpg -share/pose/skins/Handspring/Visor_Blue_32.jpg -share/pose/skins/Handspring/Visor_Blue_32_Japanese.jpg -share/pose/skins/Handspring/Visor_Blue_Japanese.skin -share/pose/skins/Handspring/Visor_Graphite.skin -share/pose/skins/Handspring/Visor_Graphite_16.jpg -share/pose/skins/Handspring/Visor_Graphite_16_Japanese.jpg -share/pose/skins/Handspring/Visor_Graphite_32.jpg -share/pose/skins/Handspring/Visor_Graphite_32_Japanese.jpg -share/pose/skins/Handspring/Visor_Graphite_Japanese.skin -share/pose/skins/Handspring/Visor_Platinum.skin -share/pose/skins/Handspring/Visor_Platinum_16.jpg -share/pose/skins/Handspring/Visor_Prism.skin -share/pose/skins/Handspring/Visor_Platinum_16_Japanese.jpg -share/pose/skins/Handspring/Visor_Platinum_32.jpg -share/pose/skins/Handspring/Visor_Platinum_32_Japanese.jpg -share/pose/skins/Handspring/Visor_Platinum_Japanese.skin -share/pose/skins/Handspring/Visor_Prism_16.jpg -share/pose/skins/Handspring/Visor_Prism_16_Japanese.jpg -share/pose/skins/Handspring/Visor_Prism_32.jpg -share/pose/skins/Handspring/Visor_Prism_32_Japanese.jpg -share/pose/skins/Handspring/Visor_Blue.skin -share/pose/skins/Palm/m100_32.jpg +share/pose/skins/Handspring/WhereAreTheSkins.txt +share/pose/skins/Palm/Workpad_c3_32.jpg share/pose/skins/Palm/Palm_IIIc.skin share/pose/skins/Palm/Palm_IIIe.skin share/pose/skins/Palm/Palm_IIIx.skin @@ -32,10 +9,21 @@ share/pose/skins/Palm/Palm_Pilot.skin share/pose/skins/Palm/Palm_V.skin share/pose/skins/Palm/Palm_VII.skin share/pose/skins/Palm/Palm_VIIx.skin +share/pose/skins/Palm/Palm_i705.skin +share/pose/skins/Palm/Palm_i705_16.jpg +share/pose/skins/Palm/Palm_i705_32.jpg +share/pose/skins/Palm/Palm_m100.skin +share/pose/skins/Palm/Palm_m130.skin +share/pose/skins/Palm/Palm_m130_16.jpg +share/pose/skins/Palm/Palm_m130_32.jpg +share/pose/skins/Palm/Palm_m500.skin +share/pose/skins/Palm/Palm_m505.skin +share/pose/skins/Palm/Palm_m515.skin +share/pose/skins/Palm/Palm_m515_16.jpg +share/pose/skins/Palm/Palm_m515_32.jpg share/pose/skins/Palm/Pilot.skin share/pose/skins/Palm/Workpad.skin share/pose/skins/Palm/Workpad_c3.skin -share/pose/skins/Palm/m100.skin share/pose/skins/Palm/Palm_III_16.jpg share/pose/skins/Palm/Palm_III_32.jpg share/pose/skins/Palm/Palm_IIIc_16.jpg @@ -43,22 +31,26 @@ share/pose/skins/Palm/Palm_IIIc_32.jpg share/pose/skins/Palm/Palm_IIIe_16.jpg share/pose/skins/Palm/Palm_IIIe_32.jpg share/pose/skins/Palm/Palm_IIIx_16.jpg -share/pose/skins/Palm/Palm_VII_16.jpg share/pose/skins/Palm/Palm_IIIx_32.jpg share/pose/skins/Palm/Palm_Pilot_16.jpg share/pose/skins/Palm/Palm_Pilot_32.jpg +share/pose/skins/Palm/Palm_VII_16.jpg share/pose/skins/Palm/Palm_VII_32.jpg share/pose/skins/Palm/Palm_VIIx_16.jpg share/pose/skins/Palm/Palm_VIIx_32.jpg share/pose/skins/Palm/Palm_V_16.jpg share/pose/skins/Palm/Palm_V_32.jpg +share/pose/skins/Palm/Palm_m100_16.jpg +share/pose/skins/Palm/Palm_m100_32.jpg share/pose/skins/Palm/Pilot_16.jpg +share/pose/skins/Palm/Palm_m500_16.jpg +share/pose/skins/Palm/Palm_m500_32.jpg +share/pose/skins/Palm/Palm_m505_16.jpg +share/pose/skins/Palm/Palm_m505_32.jpg share/pose/skins/Palm/Pilot_32.jpg share/pose/skins/Palm/Workpad_16.jpg share/pose/skins/Palm/Workpad_32.jpg share/pose/skins/Palm/Workpad_c3_16.jpg -share/pose/skins/Palm/Workpad_c3_32.jpg -share/pose/skins/Palm/m100_16.jpg share/pose/skins/Palm/Palm_III.skin share/pose/skins/Symbol/Symbol_1500.skin share/pose/skins/Symbol/Symbol_1700.skin @@ -66,9 +58,15 @@ share/pose/skins/Symbol/Symbol_1500_16.jpg share/pose/skins/Symbol/Symbol_1500_32.jpg share/pose/skins/Symbol/Symbol_1700_16.jpg share/pose/skins/Symbol/Symbol_1700_32.jpg +share/pose/skins/TRG/TRGpro_32.jpg +share/pose/skins/TRG/HandEra330Cards.skin +share/pose/skins/TRG/HandEra330Cards_16.jpg +share/pose/skins/TRG/HandEra330Cards_32.jpg +share/pose/skins/TRG/HandEra330_16.jpg +share/pose/skins/TRG/HandEra330_32.jpg share/pose/skins/TRG/TRGpro.skin share/pose/skins/TRG/TRGpro_16.jpg -share/pose/skins/TRG/TRGpro_32.jpg +share/pose/skins/TRG/HandEra330.skin share/pose/skins/ReadMe.txt @dirrm share/pose/skins/Handspring @dirrm share/pose/skins/Palm |