Revision: 74067 http://trac.macports.org/changeset/74067 Author: jmr@macports.org Date: 2010-12-03 16:16:09 -0800 (Fri, 03 Dec 2010) Log Message: ----------- mozart: update to 1.4.0 (#16488) Modified Paths: -------------- trunk/dports/lang/mozart/Portfile Added Paths: ----------- trunk/dports/lang/mozart/files/casts.diff trunk/dports/lang/mozart/files/patch-platform_dss_configure.ac trunk/dports/lang/mozart/files/patch-platform_emulator_Makefile.in Modified: trunk/dports/lang/mozart/Portfile =================================================================== --- trunk/dports/lang/mozart/Portfile 2010-12-03 21:51:35 UTC (rev 74066) +++ trunk/dports/lang/mozart/Portfile 2010-12-04 00:16:09 UTC (rev 74067) @@ -3,8 +3,9 @@ PortSystem 1.0 name mozart -version 1.3.2 -revision 1 +version 1.4.0 +set tardate 20080704 +set urldate 2008-07-02 categories lang platforms darwin maintainers bfulgham @@ -22,15 +23,39 @@ #depends_lib port:emacs depends_run bin:wish:tk -master_sites http://www.mozart-oz.org/download/mozart-ftp/store/1.3.2-2006-06-15-tar -distfiles mozart-1.3.2.20060615-src.tar.gz -checksums md5 b84fb3932eca573e6b8d5d1b26379371 +master_sites ${homepage}/download/mozart-ftp/store/${version}-${urldate}-tar/ +distname ${name}-${version}.${tardate}-src +checksums md5 d34156dce23a84925f7eae121feb3afe \ + sha1 5a12a1d66c871f01dc1223aa614d4e0bf7717b3f \ + rmd160 090c0af3cba9db422c58c37d5fa3e703c8cc82d7 -patchfiles patch-share-bin-oz.in +patchfiles patch-share-bin-oz.in \ + patch-platform_dss_configure.ac \ + casts.diff \ + patch-platform_emulator_Makefile.in -worksrcdir mozart-1.3.2.20060615 -configure.args --prefix=${prefix}/share/mozart --with-inc-dir=${prefix}/include --with-lib-dir=${prefix}/lib +worksrcdir ${name}-${version}.${tardate} +configure.ldflags +configure.args --prefix=${prefix}/share/mozart \ + --enable-modules-static \ + --disable-contrib-micq +use_autoconf yes +autoconf.dir ${worksrcpath}/platform/dss + +# endless errors in 64-bit due to casting from pointer to int +supported_archs i386 ppc +# and it doesn't consistently use cxxflags +if {[variant_isset universal]} { + set archflags ${configure.universal_cxxflags} +} else { + set archflags ${configure.cxx_archflags} +} +configure.env-append CPU_FLAGS="${archflags}" +eval configure.cxx ${configure.cxx} ${archflags} +configure.args-append --with-cxx="${configure.cxx}" + +use_parallel_build no build.target destroot.args PREFIX=${destroot}${prefix}/share/mozart @@ -50,4 +75,3 @@ file delete -force ${destroot}${prefix}/share/mozart/doc/.htaccess } - Added: trunk/dports/lang/mozart/files/casts.diff =================================================================== --- trunk/dports/lang/mozart/files/casts.diff (rev 0) +++ trunk/dports/lang/mozart/files/casts.diff 2010-12-04 00:16:09 UTC (rev 74067) @@ -0,0 +1,128 @@ +--- platform/dss/src/msl_msgContainer.cc.orig 2008-06-26 23:39:31.000000000 +1000 ++++ platform/dss/src/msl_msgContainer.cc 2010-12-03 16:07:26.000000000 +1100 +@@ -118,8 +118,8 @@ namespace _msl_internal{ //Start namespa + pos = sprintf(buf, "MSGCONTAINER: nof:%d cur:%d DATA:", + a_nof_fields, a_current); + for (int i = 0; i < a_nof_fields; i++) { +- pos += sprintf((buf+pos),"%d|%x ", a_fields[i].a_ft, +- reinterpret_cast<int>(a_fields[i].a_arg)); ++ pos += sprintf((buf+pos),"%d|%lx ", a_fields[i].a_ft, ++ reinterpret_cast<long>(a_fields[i].a_arg)); + } + return buf; + } +@@ -288,7 +288,7 @@ namespace _msl_internal{ //Start namespa + switch (a_fields[a_current].a_ft) { + case FT_NUMBER: + if (bb->canWrite(1+sz_MNumberMax)) { +- int i = reinterpret_cast<int>(m_popVal()); ++ long i = reinterpret_cast<long>(m_popVal()); + dssLog(DLL_DEBUG,"MSGCONTAINER (%p): serilize INT %d", this, i); + bb->m_putByte(TYPE_INT); + bb->m_putInt(i); +@@ -407,7 +407,7 @@ namespace _msl_internal{ //Start namespa + int + MsgCnt::popIntVal(){ + Assert(checkCounters() && m_getFT() == FT_NUMBER); +- return reinterpret_cast<int>(m_popVal()); ++ return reinterpret_cast<long>(m_popVal()); + } + + ExtDataContainerInterface* +@@ -495,7 +495,7 @@ namespace _msl_internal{ //Start namespa + + int MsgCnt::peekMslMessageType() { + Assert(a_fields[0].a_ft == FT_NUMBER); +- return reinterpret_cast<int>(a_fields[0].a_arg); ++ return reinterpret_cast<long>(a_fields[0].a_arg); + } + + MsgContainer* MsgCnt::reincarnate() { +--- platform/dss/src/referenceConsistency.cc.orig 2008-06-26 23:39:31.000000000 +1000 ++++ platform/dss/src/referenceConsistency.cc 2010-12-03 16:22:34.000000000 +1100 +@@ -264,7 +264,7 @@ namespace _dss_internal{ //Start namespa + case RC_OP_SET_WRC_ALPHA: + if (alg == RC_ALG_WRC){ + tmp = m_findAlg(RC_ALG_WRC); +- if (tmp && static_cast<WRC_Home*>(tmp)->setAlpha(reinterpret_cast<int>(data))) ++ if (tmp && static_cast<WRC_Home*>(tmp)->setAlpha(reinterpret_cast<long>(data))) + return true; + } + break; +@@ -280,7 +280,7 @@ namespace _dss_internal{ //Start namespa + case RC_OP_SET_TL_LEASE_PERIOD: + if (alg == RC_ALG_TL){ + tmp = m_findAlg(RC_ALG_TL); +- if (tmp && static_cast<TL_Home*>(tmp)->setLeasePeriod(reinterpret_cast<int>(data))) ++ if (tmp && static_cast<TL_Home*>(tmp)->setLeasePeriod(reinterpret_cast<long>(data))) + return true; + } + break; +@@ -394,7 +394,7 @@ namespace _dss_internal{ //Start namespa + case RC_OP_SET_WRC_ALPHA: + if (alg == RC_ALG_WRC){ + tmp = m_findAlg(RC_ALG_WRC); +- if (tmp && static_cast<WRC_Remote*>(tmp)->setAlpha(reinterpret_cast<int>(data))) ++ if (tmp && static_cast<WRC_Remote*>(tmp)->setAlpha(reinterpret_cast<long>(data))) + return true; + } + break; +@@ -410,7 +410,7 @@ namespace _dss_internal{ //Start namespa + case RC_OP_SET_TL_UPDATE_PERIOD: + if (alg == RC_ALG_TL){ + tmp = m_findAlg(RC_ALG_TL); +- if (tmp && static_cast<TL_Remote*>(tmp)->setUpdatePeriod(reinterpret_cast<int>(data))) ++ if (tmp && static_cast<TL_Remote*>(tmp)->setUpdatePeriod(reinterpret_cast<long>(data))) + return true; + } + break; +--- platform/dss/src/dss_msgLayerInterface.cc.orig 2008-06-26 23:39:31.000000000 +1000 ++++ platform/dss/src/dss_msgLayerInterface.cc 2010-12-03 16:16:05.000000000 +1100 +@@ -563,10 +563,10 @@ namespace _dss_internal{ + if (a_cur == NULL){ + a_cur = buf->a_vec; + gf_MarshalNumber(bb, buf->a_end-buf->a_vec); +- printf("marshaling, RCB totSize %d\n", buf->a_end-buf->a_vec); ++ printf("marshaling, RCB totSize %d\n", (int)(buf->a_end-buf->a_vec)); + } + +- int marshalSize = t_min(bb->availableSpace() - 40, buf->a_end- a_cur); ++ int marshalSize = t_min(bb->availableSpace() - 40, (int)(buf->a_end- a_cur)); + printf("marshaling, RCB blockSize %d\n", marshalSize); + gf_MarshalNumber(bb, marshalSize); + bb->writeToBuffer(a_cur, marshalSize); +@@ -612,10 +612,10 @@ namespace _dss_internal{ + if (a_cur == NULL){ + a_cur = a_buffer->a_vec; + gf_MarshalNumber(bb, a_buffer->a_end - a_buffer->a_vec); +- printf("marshaling, EBA totSize %d\n", a_buffer->a_end - a_buffer->a_vec); ++ printf("marshaling, EBA totSize %d\n", (int)(a_buffer->a_end - a_buffer->a_vec)); + } + +- int marshalSize = t_max(0, t_min(bb->availableSpace() - 40, a_buffer->a_end- a_cur)); ++ int marshalSize = t_max(0, t_min(bb->availableSpace() - 40, (int)(a_buffer->a_end- a_cur))); + printf("marshaling, EBC blockSize %d\n", marshalSize); + gf_MarshalNumber(bb, marshalSize); + bb->writeToBuffer(a_cur, marshalSize); +--- platform/dss/src/dss_psDKS.cc.orig 2008-06-26 23:39:31.000000000 +1000 ++++ platform/dss/src/dss_psDKS.cc 2010-12-03 16:28:27.000000000 +1100 +@@ -184,7 +184,7 @@ namespace _dss_internal{ + PstOutContainerInterface** plcholder = NULL; + PstDataContainer* p = new PstDataContainer(a_node->m_getEnvironment(), plcholder); + // This could be done when we know that a message will be produced... +- printf("Plcholder %d\n", (int)plcholder); ++ printf("Plcholder %ld\n", (long)plcholder); + *plcholder = value; + + switch(a_node->m_broadcastRing(new DksContainerMessage(p))) +--- platform/dss/src/protocol_dksBroadcast.cc.orig 2008-06-26 23:39:31.000000000 +1000 ++++ platform/dss/src/protocol_dksBroadcast.cc 2010-12-03 16:31:14.000000000 +1100 +@@ -71,7 +71,7 @@ void ProtocolDksBcManager::makeGCpreps() + if (a_isFunctional){ + PstDataContainer *pdc = new PstDataContainer(a_proxy->m_getEnvironment(), + pst); +- printf("protocol dksBroadcast %d\n", (int) pst); ++ printf("protocol dksBroadcast %ld\n", (long) pst); + DssDksBcMessage *msg = new DssDksBcMessage(pdc, AO_OO_UPDATE); + a_dks->m_broadcastRing(msg); + }else{ Added: trunk/dports/lang/mozart/files/patch-platform_dss_configure.ac =================================================================== --- trunk/dports/lang/mozart/files/patch-platform_dss_configure.ac (rev 0) +++ trunk/dports/lang/mozart/files/patch-platform_dss_configure.ac 2010-12-04 00:16:09 UTC (rev 74067) @@ -0,0 +1,19 @@ +--- platform/dss/configure.ac.orig 2008-07-02 18:01:31.000000000 +1000 ++++ platform/dss/configure.ac 2010-12-03 15:31:21.000000000 +1100 +@@ -224,7 +224,7 @@ + ;; + esac + +-CPU_FLAGS="" ++if test -z "$CPU_FLAGS"; then + AC_MSG_CHECKING(CPU type) + case "$host_cpu" in + sparc) +@@ -248,6 +248,7 @@ + fi + ;; + esac ++fi + CXXFLAGS="$CPU_FLAGS $CXXFLAGS" + + Added: trunk/dports/lang/mozart/files/patch-platform_emulator_Makefile.in =================================================================== --- trunk/dports/lang/mozart/files/patch-platform_emulator_Makefile.in (rev 0) +++ trunk/dports/lang/mozart/files/patch-platform_emulator_Makefile.in 2010-12-04 00:16:09 UTC (rev 74067) @@ -0,0 +1,11 @@ +--- platform/emulator/Makefile.in.orig 2008-06-26 23:39:31.000000000 +1000 ++++ platform/emulator/Makefile.in 2010-12-04 09:27:20.000000000 +1100 +@@ -358,7 +358,7 @@ + for d in $(SUBDIRS); do (cd $$d; $(MAKE) first); done + + emulator.exe: $(PRGDEP) +- $(LD) $(EMULDFLAGS) $(LDFLAGS) $(LDOPT) -o $@ $(OBJS) $(LIBS) ++ $(LD) $(EMULDFLAGS) $(LDFLAGS) $(LDOPT) -o $@ $(OBJS) $(LIBS) libTk.a + + emulator.dll: $(PRGDEP) + $(DLLTOOL) --as $(AS) --output-def emulator0.def \