update to 3.1

PR:		26335
Submitted by:	    William Lloyd <wlloyd@galt.slap.net> (new maintainer)

11 files changed, 195 insertions, 93 deletions

diff --git a/palm/pose/Makefile b/palm/pose/Makefile
index 9cfe26f76de4..6d97c05793ae 100644
--- a/palm/pose/Makefile
+++ b/palm/pose/Makefile
@@ -6,12 +6,13 @@
 #
 
 PORTNAME=	pose
-PORTVERSION=	3.0a6
+PORTVERSION=	3.1
 CATEGORIES=	palm emulators
 MASTER_SITES=	http://www.palmos.com/dev/tech/tools/emulator/
-DISTNAME=	emulator_src_30a6
+# DISTNAME=	emulator_src_31
+DISTFILES=	emulator_src_31.tar.gz emulator_skins_16.tar.gz
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	wlloyd@slap.net
 
 LIB_DEPENDS=	fltk.1:${PORTSDIR}/x11-toolkits/fltk
 
@@ -24,7 +25,8 @@ CONFIGURE_ARGS=	--x-includes=${X11BASE}/include \
 
 post-install:
 	${MKDIR} ${PREFIX}/share/pose
-	${INSTALL_DATA} "${WRKSRC}/../ROMTransfer/Source/ROM Transfer.prc" ${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
 
 .include <bsd.port.mk>
diff --git a/palm/pose/distinfo b/palm/pose/distinfo
index 3e31440a5fee..b351f059e4d7 100644
--- a/palm/pose/distinfo
+++ b/palm/pose/distinfo
@@ -1 +1,2 @@
-MD5 (emulator_src_30a6.tar.gz) = 64076fe4b9a32745ef7e98715bb1002f
+MD5 (emulator_src_31.tar.gz) = 7791c4d56d250f50bebdd8d443da596d
+MD5 (emulator_skins_16.tar.gz) = cc577300c700b0cffeecda576a004913
diff --git a/palm/pose/files/patch-aa b/palm/pose/files/patch-aa
index 5e128b0bc5b7..614ec6e6fe88 100644
--- a/palm/pose/files/patch-aa
+++ b/palm/pose/files/patch-aa
@@ -1,23 +1,24 @@
---- configure.orig	Wed Apr 19 20:27:38 2000
-+++ configure	Sat May  6 16:53:56 2000
-@@ -1099,6 +1099,7 @@
- 
- echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
- if test "$ac_test_CFLAGS" = set; then
-+echo "HALLO, HALLO!!!!"
-   CFLAGS="$ac_save_CFLAGS"
- elif test $ac_cv_prog_cc_g = yes; then
-   if test "$GCC" = yes; then
-@@ -3064,7 +3065,7 @@
+--- configure.orig	Thu Mar 29 10:43:55 2001
++++ configure	Thu Mar 29 10:51:21 2001
+@@ -3105,6 +3105,8 @@
+ *-freebsd*)
+ 	THREAD_FLAGS="-pthread -D_THREAD_SAFE -D_REENTRANT -DPthreadDraftVersion=10"
+ 	THREAD_LIBS=
++	POSER_CFLAGS="$POSER_CFLAGS $CFLAGS $FLAGS $_WARNINGS_CFLAGS"
++	POSER_CXXFLAGS="$POSER_CXXFLAGS $CFLAGS $FLAGS $_WARNINGS_CXXFLAGS"
+ 	;;
+ 
+ *-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 3070 "configure"
+ #line 3127 "configure"
  #include "confdefs.h"
-@@ -3098,7 +3099,7 @@
+@@ -3155,7 +3157,7 @@
  #define $ac_tr_lib 1
  EOF
  
@@ -26,7 +27,7 @@
  
  else
    echo "$ac_t""no" 1>&6
-@@ -3131,7 +3132,6 @@
+@@ -3188,7 +3190,6 @@
  
  
  
@@ -34,14 +35,3 @@
  
  
  
-@@ -3150,8 +3150,8 @@
- 
- 
- FLAGS="$FLAGS_COMMON $FLAGS_OPTIMIZE $FLAGS_PROFILE $FLAGS_PALM_PROFILE $FLAGS_DEBUG"
--POSER_CFLAGS="$POSER_CFLAGS $FLAGS $_WARNINGS_CFLAGS"
--POSER_CXXFLAGS="$POSER_CXXFLAGS $FLAGS $_WARNINGS_CXXFLAGS"
-+POSER_CFLAGS="$POSER_CFLAGS $CFLAGS $FLAGS $_WARNINGS_CFLAGS"
-+POSER_CXXFLAGS="$POSER_CXXFLAGS $CFLAGS $FLAGS $_WARNINGS_CXXFLAGS"
- 
- 
- 
diff --git a/palm/pose/files/patch-ab b/palm/pose/files/patch-ab
deleted file mode 100644
index e3c007b256a3..000000000000
--- a/palm/pose/files/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../SrcShared/EmulatorTypes.h.orig	Wed Apr 19 20:27:35 2000
-+++ ../SrcShared/EmulatorTypes.h	Sat May  6 13:22:40 2000
-@@ -442,10 +442,6 @@
- #if PLATFORM_UNIX || PLATFORM_MAC
- 	#include <sys/types.h>
- 	#include <sys/socket.h>			// socklen_t
--
--	#if (defined(__svr4__) && defined(sun)) || defined (__FreeBSD__)
--		typedef int			socklen_t;	// not defined in <sys/socket.h> on solaris or FreeBSD
--	#endif
- #else
- 	typedef int			socklen_t;
- #endif
diff --git a/palm/pose/files/patch-ad b/palm/pose/files/patch-ad
deleted file mode 100644
index c3f8db902250..000000000000
--- a/palm/pose/files/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.am-	Wed Apr 19 11:27:37 2000
-+++ Makefile.am	Mon Jun 19 02:48:11 2000
-@@ -256,7 +256,7 @@
- 
- bin_PROGRAMS	=	pose
- 
--pose_LDADD		=	-L/usr/lib -L/usr/local/lib $(X_LIBS) -lXext -lX11 $(THREAD_LIBS) -lm
-+pose_LDADD		=	-L/usr/local/lib $(X_LIBS) -lXext -lX11 $(THREAD_LIBS) -lm
- pose_LDADD		+=	-L./Gzip -lposergzip
- pose_LDADD		+=	-L./jpeg -lposerjpeg
- 
diff --git a/palm/pose/files/patch-ae b/palm/pose/files/patch-ae
index 5aabfc25290a..5fbbfbfd9397 100644
--- a/palm/pose/files/patch-ae
+++ b/palm/pose/files/patch-ae
@@ -1,6 +1,6 @@
---- ../SrcUnix/EmTransportSerialUnix.cpp-	Mon Jun 19 02:03:59 2000
-+++ ../SrcUnix/EmTransportSerialUnix.cpp	Mon Jun 19 02:16:39 2000
-@@ -372,9 +372,9 @@
+--- ../SrcUnix/EmTransportSerialUnix.cpp.orig	Fri Mar 30 11:41:13 2001
++++ ../SrcUnix/EmTransportSerialUnix.cpp	Fri Mar 30 11:47:36 2001
+@@ -382,9 +382,9 @@
  EmHostTransportSerial::EmHostTransportSerial (void) :
  	fReadThread (NULL),
  	fWriteThread (NULL),
@@ -13,7 +13,7 @@
  	fTimeToQuit (false),
  	fDataMutex (),
  	fDataCondition (&fDataMutex),
-@@ -402,9 +402,9 @@
+@@ -412,9 +412,9 @@
  {
  	assert (fReadThread == NULL);
  	assert (fWriteThread == NULL);
@@ -26,7 +26,7 @@
  }
  
  
-@@ -440,7 +440,7 @@
+@@ -450,7 +450,7 @@
  
  		if (fCommHandle <= 0)
  		{
@@ -35,7 +35,7 @@
  
  			return errno;
  		}
-@@ -470,7 +470,7 @@
+@@ -480,7 +480,7 @@
  
  ErrCode EmHostTransportSerial::CreateCommThreads (const EmTransportSerial::ConfigSerial& /*config*/)
  {
@@ -44,75 +44,81 @@
  	{
  		PRINTF ("EmTransportSerial::HostOpen: Creating serial port handler threads...");
  
-@@ -510,35 +510,37 @@
- {
+@@ -525,35 +525,38 @@
+ 
  	// Signal the threads to quit.
  
 -	fDataMutex.lock ();
 +	if ( fCommSignalPipeA != -1 && fCommSignalPipeB != -1 ) {
-+		fDataMutex.lock ();
++	  fDataMutex.lock ();
++	  
++	  fTimeToQuit = true;
++	  
++	  int dummy = 0;
++	  write (fCommSignalPipeB, &dummy, sizeof (dummy));		// Signals CommRead.
  
 -	fTimeToQuit = true;
-+		fTimeToQuit = true;
++	  fDataCondition.broadcast ();	// Signals CommWrite.
++	  fDataMutex.unlock ();
  
 -	int dummy = 0;
 -	write (fCommSignalPipeB, &dummy, sizeof (dummy));		// Signals CommRead.
-+		int dummy = 0;
-+		write (fCommSignalPipeB, &dummy, sizeof (dummy));		// Signals CommRead.
++	  // Wait for the threads to quit.
  
 -	fDataCondition.broadcast ();	// Signals CommWrite.
 -	fDataMutex.unlock ();
-+		fDataCondition.broadcast ();	// Signals CommWrite.
-+		fDataMutex.unlock ();
- 
+-
 -	// Wait for the threads to quit.
-+		// Wait for the threads to quit.
++	  if (fReadThread)
++		{
++		  fReadThread->join (NULL);
++		  fWriteThread->join (NULL);
++		}
  
 -	if (fReadThread)
 -	{
 -		fReadThread->join (NULL);
 -		fWriteThread->join (NULL);
 -	}
-+		if (fReadThread)
-+		{
-+			fReadThread->join (NULL);
-+			fWriteThread->join (NULL);
-+		}
++	  // Thread objects delete themselves, so set our references to NULL.
  
 -	// Thread objects delete themselves, so set our references to NULL.
-+		// Thread objects delete themselves, so set our references to NULL.
++	  fReadThread = NULL;
++	  fWriteThread = NULL;
  
 -	fReadThread = NULL;
 -	fWriteThread = NULL;
-+		fReadThread = NULL;
-+		fWriteThread = NULL;
++	  // Close the signal pipe.
  
 -	// Close the signal pipe.
-+		// Close the signal pipe.
++	  close (fCommSignalPipeA);
++	  close (fCommSignalPipeB);
  
 -	close (fCommSignalPipeA);
 -	close (fCommSignalPipeB);
-+		close (fCommSignalPipeA);
-+		close (fCommSignalPipeB);
++	  fCommSignalPipeA = fCommSignalPipeB = 0;
  
 -	fCommSignalPipeA = fCommSignalPipeB = 0;
-+		fCommSignalPipeA = fCommSignalPipeB = -1;
 +	}
  
  	return errNone;
  }
-@@ -558,10 +560,11 @@
+@@ -573,11 +576,13 @@
  
  ErrCode EmHostTransportSerial::CloseCommPort (void)
  {
--	int	result;
--	result = close (fCommHandle);
-+	if ( fCommHandle != -1 ) {
-+		int result = close (fCommHandle);
- 
+-	(void) close (fCommHandle);
+-
 -	fCommHandle = 0;
-+		fCommHandle = -1;
-+	}
- 
- 	return errNone;
+-
+-	return errNone;
++  if ( fCommHandle != -1 ) {
++	int result = close (fCommHandle);
++	
++	fCommHandle = -1;
++  }
++  
++  return errNone;
  }
+ 
+ 
diff --git a/palm/pose/files/patch-af b/palm/pose/files/patch-af
new file mode 100644
index 000000000000..b3327b82f797
--- /dev/null
+++ b/palm/pose/files/patch-af
@@ -0,0 +1,11 @@
+--- ../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-ag b/palm/pose/files/patch-ag
new file mode 100644
index 000000000000..c85eb2d919cb
--- /dev/null
+++ b/palm/pose/files/patch-ag
@@ -0,0 +1,17 @@
+--- ../SrcShared/EmScreen.cpp.orig	Fri Mar 30 07:45:11 2001
++++ ../SrcShared/EmScreen.cpp	Fri Mar 30 07:50:48 2001
+@@ -181,6 +181,14 @@
+ 	}
+ }
+ 
++Bool EmScreen::IsDirty ()
++{
++    if ( gScreenDirtyLow >= gScreenDirtyHigh )
++    {
++        return false;
++    }
++    return true;
++}
+ 
+ /***********************************************************************
+  *
diff --git a/palm/pose/files/patch-ah b/palm/pose/files/patch-ah
new file mode 100644
index 000000000000..cb2ffa26c308
--- /dev/null
+++ b/palm/pose/files/patch-ah
@@ -0,0 +1,11 @@
+--- ../SrcShared/EmScreen.h.orig	Fri Mar 30 07:51:38 2001
++++ ../SrcShared/EmScreen.h	Fri Mar 30 07:54:33 2001
+@@ -50,6 +50,8 @@
+ 		static void 			Dispose 			(void);
+ 
+ 		static void 			MarkDirty			(emuptr address, uint32 size);
++		static Bool 			IsDirty			();
++
+ 		static void 			InvalidateAll		(void);
+ 
+ 		static Bool 			GetBits 			(EmScreenUpdateInfo&);
diff --git a/palm/pose/files/patch-ai b/palm/pose/files/patch-ai
new file mode 100644
index 000000000000..1f14c1967d05
--- /dev/null
+++ b/palm/pose/files/patch-ai
@@ -0,0 +1,13 @@
+--- ../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/pkg-plist b/palm/pose/pkg-plist
index c9f7a1b57f9f..c38d303db95a 100644
--- a/palm/pose/pkg-plist
+++ b/palm/pose/pkg-plist
@@ -1,3 +1,78 @@
 bin/pose
-share/pose/ROM Transfer.prc
+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/Palm/Palm_IIIc.skin
+share/pose/skins/Palm/Palm_IIIe.skin
+share/pose/skins/Palm/Palm_IIIx.skin
+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/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
+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_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/Pilot_16.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
+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.skin
+share/pose/skins/TRG/TRGpro_16.jpg
+share/pose/skins/TRG/TRGpro_32.jpg
+share/pose/skins/ReadMe.txt
+@dirrm share/pose/skins/Handspring
+@dirrm share/pose/skins/Palm
+@dirrm share/pose/skins/Symbol
+@dirrm share/pose/skins/TRG
+@dirrm share/pose/skins
 @dirrm share/pose