ports/58014: [MAINTAINER] devel/mico: update to 2.3.11
Sergey Matveychuk
sem at ciam.ru
Tue Nov 4 03:50:23 UTC 2003
The following reply was made to PR ports/58014; it has been noted by GNATS.
From: Sergey Matveychuk <sem at ciam.ru>
To: freebsd-gnats-submit at FreeBSD.org, sem at ciam.ru
Cc:
Subject: Re: ports/58014: [MAINTAINER] devel/mico: update to 2.3.11
Date: Tue, 04 Nov 2003 06:43:57 +0300
This is a multi-part message in MIME format.
--------------010502010309040707010006
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit
OK. Here is a full clean patch.
--------------010502010309040707010006
Content-Type: text/plain;
name="mico.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="mico.patch"
diff -ruN mico.orig/Makefile mico/Makefile
--- mico.orig/Makefile Sun Oct 12 06:35:13 2003
+++ mico/Makefile Tue Nov 4 06:41:27 2003
@@ -6,8 +6,7 @@
#
PORTNAME= mico
-PORTVERSION= 2.3.10
-PORTREVISION= 3
+PORTVERSION= 2.3.11
CATEGORIES= devel
MASTER_SITES= http://www.mico.org/:src \
http://www.ciam.ru/~sem/FreeBSD/:docs
@@ -15,15 +14,16 @@
doc-html.tar.gz:docs
MAINTAINER= sem at ciam.ru
-COMMENT= Fully compliant implementation of CORBA2 with some CORBA3 features
+COMMENT= Fully compliant implementation of CORBA2.4 with some CORBA3 features
WRKSRC= ${WRKDIR}/${PORTNAME}
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
USE_REINPLACE= yes
USE_GMAKE= yes
+USE_AUTOCONF_VER= 253
.if !defined(WITH_SYSTEM_GCC)
-USE_GCC= 3.2
+USE_GCC= 3.3
.endif
CONFIGURE_ARGS= --enable-cd --disable-mini-stl --enable-threads
@@ -100,8 +100,8 @@
@${TAR} xzf ${DISTDIR}/doc-html.tar.gz -C ${WRKDIR}
post-patch:
- @${REINPLACE_CMD} -e "s#-O2#${CFLAGS}#;s#\"-pthread#\"${PTHREAD_LIBS}#" ${WRKSRC}/configure
-.if ${OSVERSION} < 500035 && !defined(WITH_SYSTEM_GCC)
+ @${REINPLACE_CMD} -e "s#\"-O2\"#\"${CFLAGS}\"#;s#\"-pthread#\"${PTHREAD_LIBS}#" ${WRKSRC}/configure.in
+.if ${OSVERSION} < 500035
@${LN} -s /usr/include/g++/FlexLexer.h ${WRKSRC}/include
.endif
diff -ruN mico.orig/distinfo mico/distinfo
--- mico.orig/distinfo Sun Oct 12 06:35:13 2003
+++ mico/distinfo Tue Nov 4 06:41:27 2003
@@ -1,2 +1,2 @@
-MD5 (mico-2.3.10.tar.gz) = a59d63438450b8c46d48f79abae770a8
+MD5 (mico-2.3.11.tar.gz) = 669d98ec5da2f6c50937a2a25e797eec
MD5 (doc-html.tar.gz) = f32f618cfb2da541efd5dba50c3e2273
diff -ruN mico.orig/files/patch-fixes::externalization mico/files/patch-fixes::externalization
--- mico.orig/files/patch-fixes::externalization Sun Oct 12 06:35:13 2003
+++ mico/files/patch-fixes::externalization Tue Nov 4 06:41:20 2003
@@ -103,17 +103,6 @@
// Externalize Root Node
CosObjectIdentity::ObjectIdentifier starting_node_id = starting_node->constant_random_id();
// End
---- coss/externalization/Externalization_impl.cc.orig Fri Jul 4 15:28:31 2003
-+++ coss/externalization/Externalization_impl.cc Fri Jul 4 15:28:51 2003
-@@ -37,6 +37,8 @@
- #include <coss/CosStream_impl.h>
- #include <coss/RegisterHelper.h>
-
-+using std::string;
-+
- #ifndef _WIN32
- Stream_impl::Stream_impl(const char* filename = NULL)
- : POA_CosExternalization::Stream(),
--- coss/externalization/extreferenced.cc.orig Fri Jul 4 17:57:42 2003
+++ coss/externalization/extreferenced.cc Fri Jul 4 17:58:50 2003
@@ -34,8 +34,8 @@
@@ -340,3 +329,24 @@
{
// Node read its non-object data using the primitive StreamIO::read_...(data) function
random_id = sio -> read_unsigned_long();
+--- coss/externalization/Externalization_impl.cc.orig Mon Oct 13 13:49:22 2003
++++ coss/externalization/Externalization_impl.cc Tue Oct 14 04:45:47 2003
+@@ -22,6 +22,9 @@
+ * sedov at postman.simcb.ru
+ */
+
++#include <string>
++using std::string;
++
+ #ifndef _WIN32
+ #include <stream.h>
+ #endif
+@@ -37,7 +40,7 @@
+ #include <coss/CosStream_impl.h>
+ #include <coss/RegisterHelper.h>
+
+-Stream_impl::Stream_impl(const char* filename = NULL)
++Stream_impl::Stream_impl(const char* filename)
+ : POA_CosExternalization::Stream(),
+ POA_CosLifeCycle::LifeCycleObject()
+ {
diff -ruN mico.orig/files/patch-fixes::lifecycle mico/files/patch-fixes::lifecycle
--- mico.orig/files/patch-fixes::lifecycle Sun Oct 12 06:35:13 2003
+++ mico/files/patch-fixes::lifecycle Tue Nov 4 06:41:20 2003
@@ -462,3 +462,16 @@
usage(progName);
return 1;
}
+--- include/coss/CosLifeCycle.idl.orig Tue Oct 14 04:25:27 2003
++++ include/coss/CosLifeCycle.idl Tue Oct 14 04:21:38 2003
+@@ -24,8 +24,8 @@
+ // The purpose of the life cycle service is to
+
+ typedef CosNaming::Name Key;
+- typedef Object Factory;
+- typedef sequence <Factory> Factories;
++ typedef Object Factory_;
++ typedef sequence <Factory_> Factories;
+
+ typedef struct NVP
+ {
diff -ruN mico.orig/files/patch-include::os-math.h mico/files/patch-include::os-math.h
--- mico.orig/files/patch-include::os-math.h Sun Oct 12 06:35:13 2003
+++ mico/files/patch-include::os-math.h Thu Jan 1 03:00:00 1970
@@ -1,24 +0,0 @@
---- os-math.h.orig Mon May 26 14:55:46 2003
-+++ include/mico/os-math.h Tue Jun 24 02:20:33 2003
-@@ -275,6 +275,21 @@
- };
-
- #else // neither _WIN32 nor _POCKET_PC
-+#include <sys/param.h>
-+#if (defined(__FreeBSD__) && __FreeBSD_version >= 500035)
-+#ifndef fpclassify
-+#define fpclassify(x) \
-+ ((sizeof (x) == sizeof (float)) ? __fpclassifyf(x) \
-+ : (sizeof (x) == sizeof (double)) ? __fpclassifyd(x) \
-+ : __fpclassifyl(x))
-+#endif
-+#ifndef isinf
-+#define isinf(x) (fpclassify(x) == FP_INFINITE)
-+#endif
-+#ifndef isnan
-+#define isnan(x) (fpclassify(x) == FP_NAN)
-+#endif
-+#endif
-
- #include <unistd.h>
- #include <signal.h>
diff -ruN mico.orig/files/patch-src::configure mico/files/patch-src::configure
--- mico.orig/files/patch-src::configure Sun Oct 12 06:35:13 2003
+++ mico/files/patch-src::configure Thu Jan 1 03:00:00 1970
@@ -1,43 +0,0 @@
---- configure.orig Mon May 26 14:55:21 2003
-+++ configure Sun Jun 29 05:48:32 2003
-@@ -3130,7 +3130,7 @@
- # System dependencies.
- #
-
--CONF_OPT_FLAGS=-O2
-+CONF_OPT_FLAGS="-O2"
- CONF_DEBUG_FLAGS=-g
- CONF_LIBNSL=yes
- CONF_EXCEPT_FLAGS=
-@@ -3155,7 +3155,7 @@
- CFLAGS="-Wall $CFLAGS"
-
- if test X"$use_speed_tune" = Xyes; then
-- CONF_OPT_FLAGS=-O2
-+ CONF_OPT_FLAGS="-O2"
- fi
-
- CONF_SHARED_CC="$CXX -shared"
-@@ -3233,6 +3233,12 @@
- CXXFLAGS="$CXXFLAGS -D_THREAD_SAFE"
- fi
- ;;
-+ *freebsd5*)
-+ # must not use .so.1.0 here
-+ if test X"$use_threads" = Xyes; then
-+ CXXFLAGS="$CXXFLAGS -D_THREAD_SAFE"
-+ fi
-+ ;;
- *netbsd*)
- # must not use .so.1.0 here
- if test X"$use_threads" = Xyes; then
-@@ -4274,7 +4280,8 @@
- rm -rf conftest*
- if test X"$TCL_VERSION" != X; then
- TCL_VERSION=`echo $TCL_VERSION | tr -d \"`
-- TCL_LIBS=-ltcl$TCL_VERSION
-+ TCL_LIBS="-ltcl$TCL_VERSION -L/usr/local/lib"
-+ TCL_LIBS=`echo $TCL_LIBS | tr -d .`
- HAVE_TCL=yes
- echo "$ac_t""$TCL_VERSION" 1>&6
- else
diff -ruN mico.orig/files/patch-src::configure.in mico/files/patch-src::configure.in
--- mico.orig/files/patch-src::configure.in Thu Jan 1 03:00:00 1970
+++ mico/files/patch-src::configure.in Tue Nov 4 06:41:20 2003
@@ -0,0 +1,50 @@
+--- configure.in.orig Sat Oct 11 02:30:00 2003
++++ configure.in Sat Oct 11 02:34:43 2003
+@@ -594,7 +594,7 @@
+ # System dependencies.
+ #
+
+-CONF_OPT_FLAGS=-O2
++CONF_OPT_FLAGS="-O2"
+ CONF_DEBUG_FLAGS=-g
+ CONF_LIBNSL=yes
+ CONF_EXCEPT_FLAGS=
+@@ -619,7 +619,7 @@
+ CFLAGS="-Wall $CFLAGS"
+
+ if test X"$use_speed_tune" = Xyes; then
+- CONF_OPT_FLAGS=-O2
++ CONF_OPT_FLAGS="-O2"
+ fi
+
+ CONF_SHARED_CC="$CXX -shared"
+@@ -677,7 +677,7 @@
+ CONF_SOEXT=sl
+ CONF_OBJ_SIZE_LIMIT=yes
+ ;;
+- *freebsd4*)
++ *freebsd*)
+ # must not use .so.1.0 here
+ if test X"$use_threads" = Xyes; then
+ CXXFLAGS="$CXXFLAGS -D_THREAD_SAFE"
+@@ -1017,7 +1017,8 @@
+ if test X"$TCL_VERSION" != X; then
+ dnl # remove quotes if any
+ TCL_VERSION=`echo $TCL_VERSION | tr -d \"`
+- TCL_LIBS=-ltcl$TCL_VERSION
++ TCL_LIBS="-ltcl$TCL_VERSION -L/usr/local/lib"
++ TCL_LIBS=`echo $TCL_LIBS | tr -d .`
+ HAVE_TCL=yes
+ AC_MSG_RESULT($TCL_VERSION)
+ else
+@@ -1049,8 +1050,8 @@
+ AC_CHECK_LIB(socket, open)
+ AC_CHECK_LIB(bsd, open)
+
+-AC_CHECK_LIB(elf, open)
+-AC_CHECK_LIB(dl, open)
++#AC_CHECK_LIB(elf, open)
++#AC_CHECK_LIB(dl, open)
+ AC_CHECK_LIB(dld, open)
+ AC_CHECK_LIB(ld, open)
+
diff -ruN mico.orig/pkg-plist mico/pkg-plist
--- mico.orig/pkg-plist Sun Oct 12 06:35:13 2003
+++ mico/pkg-plist Tue Nov 4 06:41:27 2003
@@ -17,11 +17,13 @@
bin/mico-c++
%%MICO_SERVICE%%bin/mico-ccm
%%MICO_SERVICE%%bin/mico-ccmd
+bin/mico-config
bin/mico-cpp
bin/mico-ld
bin/mico-shc++
bin/mico-shld
bin/micod
+bin/mkdepend
%%MICO_SERVICE%%bin/noded
%%MICO_SERVICE%%bin/nsadmin
%%MICO_SERVICE%%bin/nsd
@@ -298,33 +300,33 @@
include/mico/valuetype_impl.h
include/mico/version.h
include/mico/x11.h
-lib/libmico2.3.10.a
-lib/libmico2.3.10.so
-lib/libmico2.3.10.so.1
-lib/libmicoaux2.3.10.a
-lib/libmicoaux2.3.10.so
-lib/libmicoaux2.3.10.so.1
-%%MICO_SERVICE%%lib/libmicoccm2.3.10.a
-%%MICO_SERVICE%%lib/libmicoccm2.3.10.so
-%%MICO_SERVICE%%lib/libmicoccm2.3.10.so.1
-%%MICO_SERVICE%%lib/libmicocoss2.3.10.a
-%%MICO_SERVICE%%lib/libmicocoss2.3.10.so
-%%MICO_SERVICE%%lib/libmicocoss2.3.10.so.1
-%%MICO_GTK%%lib/libmicogtk2.3.10.a
-%%MICO_GTK%%lib/libmicogtk2.3.10.so
-%%MICO_GTK%%lib/libmicogtk2.3.10.so.1
-lib/libmicoir2.3.10.a
-lib/libmicoir2.3.10.so
-lib/libmicoir2.3.10.so.1
-%%MICO_QT%%lib/libmicoqt2.3.10.a
-%%MICO_QT%%lib/libmicoqt2.3.10.so
-%%MICO_QT%%lib/libmicoqt2.3.10.so.1
-%%MICO_TCL%%lib/libmicotcl2.3.10.a
-%%MICO_TCL%%lib/libmicotcl2.3.10.so
-%%MICO_TCL%%lib/libmicotcl2.3.10.so.1
-%%MICO_X11%%lib/libmicox2.3.10.a
-%%MICO_X11%%lib/libmicox2.3.10.so
-%%MICO_X11%%lib/libmicox2.3.10.so.1
+lib/libmico2.3.11.a
+lib/libmico2.3.11.so
+lib/libmico2.3.11.so.1
+lib/libmicoaux2.3.11.a
+lib/libmicoaux2.3.11.so
+lib/libmicoaux2.3.11.so.1
+%%MICO_SERVICE%%lib/libmicoccm2.3.11.a
+%%MICO_SERVICE%%lib/libmicoccm2.3.11.so
+%%MICO_SERVICE%%lib/libmicoccm2.3.11.so.1
+%%MICO_SERVICE%%lib/libmicocoss2.3.11.a
+%%MICO_SERVICE%%lib/libmicocoss2.3.11.so
+%%MICO_SERVICE%%lib/libmicocoss2.3.11.so.1
+%%MICO_GTK%%lib/libmicogtk2.3.11.a
+%%MICO_GTK%%lib/libmicogtk2.3.11.so
+%%MICO_GTK%%lib/libmicogtk2.3.11.so.1
+lib/libmicoir2.3.11.a
+lib/libmicoir2.3.11.so
+lib/libmicoir2.3.11.so.1
+%%MICO_QT%%lib/libmicoqt2.3.11.a
+%%MICO_QT%%lib/libmicoqt2.3.11.so
+%%MICO_QT%%lib/libmicoqt2.3.11.so.1
+%%MICO_TCL%%lib/libmicotcl2.3.11.a
+%%MICO_TCL%%lib/libmicotcl2.3.11.so
+%%MICO_TCL%%lib/libmicotcl2.3.11.so.1
+%%MICO_X11%%lib/libmicox2.3.11.a
+%%MICO_X11%%lib/libmicox2.3.11.so
+%%MICO_X11%%lib/libmicox2.3.11.so.1
lib/mico-setup.csh
lib/mico-setup.sh
%%PORTDOCS%%%%DOCSDIR%%/html/WARNINGS
@@ -416,33 +418,6 @@
%%PORTDOCS%%%%EXAMPLESDIR%%/bench/bench_impl.h
%%PORTDOCS%%%%EXAMPLESDIR%%/bench/client.cc
%%PORTDOCS%%%%EXAMPLESDIR%%/bench/server.cc
-%%PORTDOCS%%%%EXAMPLESDIR%%/boa/Makefile
-%%PORTDOCS%%%%EXAMPLESDIR%%/boa/README
-%%PORTDOCS%%%%EXAMPLESDIR%%/boa/account/Makefile
-%%PORTDOCS%%%%EXAMPLESDIR%%/boa/account/account.idl
-%%PORTDOCS%%%%EXAMPLESDIR%%/boa/account/main.cc
-%%PORTDOCS%%%%EXAMPLESDIR%%/boa/account2/Makefile
-%%PORTDOCS%%%%EXAMPLESDIR%%/boa/account2/account
-%%PORTDOCS%%%%EXAMPLESDIR%%/boa/account2/account.idl
-%%PORTDOCS%%%%EXAMPLESDIR%%/boa/account2/client.cc
-%%PORTDOCS%%%%EXAMPLESDIR%%/boa/account2/server.cc
-%%PORTDOCS%%%%EXAMPLESDIR%%/boa/account3/Makefile
-%%PORTDOCS%%%%EXAMPLESDIR%%/boa/account3/account
-%%PORTDOCS%%%%EXAMPLESDIR%%/boa/account3/account.idl
-%%PORTDOCS%%%%EXAMPLESDIR%%/boa/account3/client.cc
-%%PORTDOCS%%%%EXAMPLESDIR%%/boa/account3/server.cc
-%%PORTDOCS%%%%EXAMPLESDIR%%/boa/account4/Makefile
-%%PORTDOCS%%%%EXAMPLESDIR%%/boa/account4/account
-%%PORTDOCS%%%%EXAMPLESDIR%%/boa/account4/account.idl
-%%PORTDOCS%%%%EXAMPLESDIR%%/boa/account4/client.cc
-%%PORTDOCS%%%%EXAMPLESDIR%%/boa/account4/server.cc
-%%PORTDOCS%%%%EXAMPLESDIR%%/boa/activate/Makefile
-%%PORTDOCS%%%%EXAMPLESDIR%%/boa/activate/client.cc
-%%PORTDOCS%%%%EXAMPLESDIR%%/boa/activate/hello-permethod
-%%PORTDOCS%%%%EXAMPLESDIR%%/boa/activate/hello-shared
-%%PORTDOCS%%%%EXAMPLESDIR%%/boa/activate/hello-unshared
-%%PORTDOCS%%%%EXAMPLESDIR%%/boa/activate/hello.idl
-%%PORTDOCS%%%%EXAMPLESDIR%%/boa/activate/server.cc
%%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/ccm/Makefile
%%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/ccm/events/Makefile
%%PORTDOCS%%%%MICO_SERVICE%%%%EXAMPLESDIR%%/ccm/events/README
@@ -1256,12 +1231,6 @@
%%PORTDOCS%%%%MICO_SERVICE%%@dirrm %%EXAMPLESDIR%%/ccm/hello
%%PORTDOCS%%%%MICO_SERVICE%%@dirrm %%EXAMPLESDIR%%/ccm/events
%%PORTDOCS%%%%MICO_SERVICE%%@dirrm %%EXAMPLESDIR%%/ccm
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/boa/activate
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/boa/account4
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/boa/account3
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/boa/account2
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/boa/account
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/boa
%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/bench
%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
--------------010502010309040707010006--
More information about the freebsd-ports-bugs
mailing list