- Fix build with gcc41

PR:		ports/104001
Submitted by:	trasz <trasz@pin.if.uz.zgora.pl>

3 files changed, 104 insertions, 76 deletions

diff --git a/palm/pose/Makefile b/palm/pose/Makefile
index d6a75f6f8247..e5309de43b61 100644
--- a/palm/pose/Makefile
+++ b/palm/pose/Makefile
@@ -34,7 +34,7 @@ CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS}" \
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} != "i386"
-BROKEN=		"Does not compile on !i386"
+BROKEN=		Does not compile on !i386
 .endif
 
 post-install:
diff --git a/palm/pose/files/patch-SrcShared-EmPalmStructs.h b/palm/pose/files/patch-SrcShared-EmPalmStructs.h
new file mode 100644
index 000000000000..e811aba92cd2
--- /dev/null
+++ b/palm/pose/files/patch-SrcShared-EmPalmStructs.h
@@ -0,0 +1,28 @@
+--- ../SrcShared/EmPalmStructs.h.orig	Thu Oct  5 15:19:20 2006
++++ ../SrcShared/EmPalmStructs.h	Thu Oct  5 15:19:43 2006
+@@ -577,9 +577,9 @@
+ 	template <class A>																\
+ 	INLINE_ EmAlias##type<A>& EmAlias##type<A>::operator= (rhs_type val)			\
+ 	{																				\
+-		if (sizeof (asType) == 1)		A::PutByte (this->GetPtr (), (unsigned char) (asType) val);		\
+-		else if (sizeof (asType) == 2)	A::PutWord (this->GetPtr (), (unsigned short) (asType) val);	\
+-		else if (sizeof (asType) == 4)	A::PutLong (this->GetPtr (), (unsigned long) (asType) val);		\
++		if (sizeof (asType) == 1)		A::PutByte (this->GetPtr (), (unsigned char) (asType) (long) val);		\
++		else if (sizeof (asType) == 2)	A::PutWord (this->GetPtr (), (unsigned short) (asType) (long) val);	\
++		else if (sizeof (asType) == 4)	A::PutLong (this->GetPtr (), (unsigned long) (asType) (long) val);		\
+ 		else BadSetter ();															\
+ 																					\
+ 		return *this;																\
+@@ -589,9 +589,9 @@
+ 																					\
+ 	INLINE_ EmProxy##type& EmProxy##type::operator= (rhs_type val)					\
+ 	{																				\
+-		if (sizeof (asType) == 1)		LAS::PutByte (this->GetPtr (), (unsigned char) (asType) val);	\
+-		else if (sizeof (asType) == 2)	LAS::PutWord (this->GetPtr (), (unsigned short) (asType) val);	\
+-		else if (sizeof (asType) == 4)	LAS::PutLong (this->GetPtr (), (unsigned long) (asType) val);	\
++		if (sizeof (asType) == 1)		LAS::PutByte (this->GetPtr (), (unsigned char) (asType) (long) val);	\
++		else if (sizeof (asType) == 2)	LAS::PutWord (this->GetPtr (), (unsigned short) (asType) (long) val);	\
++		else if (sizeof (asType) == 4)	LAS::PutLong (this->GetPtr (), (unsigned long) (asType) (long) val);	\
+ 		else BadSetter ();															\
+ 																					\
+ 		return *this;																\
diff --git a/palm/pose/pkg-plist b/palm/pose/pkg-plist
index cc93b1484347..7271ab1ba84b 100644
--- a/palm/pose/pkg-plist
+++ b/palm/pose/pkg-plist
@@ -1,76 +1,76 @@
 bin/pose
-share/pose/ROM_Transfer.prc
-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
-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/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_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/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_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/HandEra330.skin
-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
+%%DATADIR%%/ROM_Transfer.prc
+%%DATADIR%%/skins/Handspring/WhereAreTheSkins.txt
+%%DATADIR%%/skins/Palm/Workpad_c3_32.jpg
+%%DATADIR%%/skins/Palm/Palm_IIIc.skin
+%%DATADIR%%/skins/Palm/Palm_IIIe.skin
+%%DATADIR%%/skins/Palm/Palm_IIIx.skin
+%%DATADIR%%/skins/Palm/Palm_Pilot.skin
+%%DATADIR%%/skins/Palm/Palm_V.skin
+%%DATADIR%%/skins/Palm/Palm_VII.skin
+%%DATADIR%%/skins/Palm/Palm_VIIx.skin
+%%DATADIR%%/skins/Palm/Palm_i705.skin
+%%DATADIR%%/skins/Palm/Palm_i705_16.jpg
+%%DATADIR%%/skins/Palm/Palm_i705_32.jpg
+%%DATADIR%%/skins/Palm/Palm_m100.skin
+%%DATADIR%%/skins/Palm/Palm_m130.skin
+%%DATADIR%%/skins/Palm/Palm_m130_16.jpg
+%%DATADIR%%/skins/Palm/Palm_m130_32.jpg
+%%DATADIR%%/skins/Palm/Palm_m500.skin
+%%DATADIR%%/skins/Palm/Palm_m505.skin
+%%DATADIR%%/skins/Palm/Palm_m515.skin
+%%DATADIR%%/skins/Palm/Palm_m515_16.jpg
+%%DATADIR%%/skins/Palm/Palm_m515_32.jpg
+%%DATADIR%%/skins/Palm/Pilot.skin
+%%DATADIR%%/skins/Palm/Workpad.skin
+%%DATADIR%%/skins/Palm/Workpad_c3.skin
+%%DATADIR%%/skins/Palm/Palm_III_16.jpg
+%%DATADIR%%/skins/Palm/Palm_III_32.jpg
+%%DATADIR%%/skins/Palm/Palm_IIIc_16.jpg
+%%DATADIR%%/skins/Palm/Palm_IIIc_32.jpg
+%%DATADIR%%/skins/Palm/Palm_IIIe_16.jpg
+%%DATADIR%%/skins/Palm/Palm_IIIe_32.jpg
+%%DATADIR%%/skins/Palm/Palm_IIIx_16.jpg
+%%DATADIR%%/skins/Palm/Palm_IIIx_32.jpg
+%%DATADIR%%/skins/Palm/Palm_Pilot_16.jpg
+%%DATADIR%%/skins/Palm/Palm_Pilot_32.jpg
+%%DATADIR%%/skins/Palm/Palm_VII_16.jpg
+%%DATADIR%%/skins/Palm/Palm_VII_32.jpg
+%%DATADIR%%/skins/Palm/Palm_VIIx_16.jpg
+%%DATADIR%%/skins/Palm/Palm_VIIx_32.jpg
+%%DATADIR%%/skins/Palm/Palm_V_16.jpg
+%%DATADIR%%/skins/Palm/Palm_V_32.jpg
+%%DATADIR%%/skins/Palm/Palm_m100_16.jpg
+%%DATADIR%%/skins/Palm/Palm_m100_32.jpg
+%%DATADIR%%/skins/Palm/Pilot_16.jpg
+%%DATADIR%%/skins/Palm/Palm_m500_16.jpg
+%%DATADIR%%/skins/Palm/Palm_m500_32.jpg
+%%DATADIR%%/skins/Palm/Palm_m505_16.jpg
+%%DATADIR%%/skins/Palm/Palm_m505_32.jpg
+%%DATADIR%%/skins/Palm/Pilot_32.jpg
+%%DATADIR%%/skins/Palm/Workpad_16.jpg
+%%DATADIR%%/skins/Palm/Workpad_32.jpg
+%%DATADIR%%/skins/Palm/Workpad_c3_16.jpg
+%%DATADIR%%/skins/Palm/Palm_III.skin
+%%DATADIR%%/skins/Symbol/Symbol_1500.skin
+%%DATADIR%%/skins/Symbol/Symbol_1700.skin
+%%DATADIR%%/skins/Symbol/Symbol_1500_16.jpg
+%%DATADIR%%/skins/Symbol/Symbol_1500_32.jpg
+%%DATADIR%%/skins/Symbol/Symbol_1700_16.jpg
+%%DATADIR%%/skins/Symbol/Symbol_1700_32.jpg
+%%DATADIR%%/skins/TRG/TRGpro_32.jpg
+%%DATADIR%%/skins/TRG/HandEra330Cards.skin
+%%DATADIR%%/skins/TRG/HandEra330Cards_16.jpg
+%%DATADIR%%/skins/TRG/HandEra330Cards_32.jpg
+%%DATADIR%%/skins/TRG/HandEra330_16.jpg
+%%DATADIR%%/skins/TRG/HandEra330_32.jpg
+%%DATADIR%%/skins/TRG/TRGpro.skin
+%%DATADIR%%/skins/TRG/TRGpro_16.jpg
+%%DATADIR%%/skins/TRG/HandEra330.skin
+%%DATADIR%%/skins/ReadMe.txt
+@dirrm %%DATADIR%%/skins/Handspring
+@dirrm %%DATADIR%%/skins/Palm
+@dirrm %%DATADIR%%/skins/Symbol
+@dirrm %%DATADIR%%/skins/TRG
+@dirrm %%DATADIR%%/skins
+@dirrm %%DATADIR%%