Attachment 33080 Details for Bug 54350 – mico.patch

[patch] mico.patch

mico.patch (text/plain), 6.38 KB, created by Sergey Matveychuk on 2003-07-11 02:30:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sergey Matveychuk

Created: 2003-07-11 02:30:17 UTC

Size: 6.38 KB

patch

obsolete

>diff -ruN /usr/ports/devel/mico/Makefile mico/Makefile
>--- /usr/ports/devel/mico/Makefile	Thu Jul 10 04:42:23 2003
>+++ mico/Makefile	Thu Jul 10 13:31:56 2003
>@@ -7,7 +7,7 @@
> 
> PORTNAME=	mico
> PORTVERSION=	2.3.10
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	devel
> MASTER_SITES=	http://www.mico.org/
> 
>@@ -22,7 +22,7 @@
> GNU_CONFIGURE=		yes
> USE_REINPLACE=		yes
> USE_GMAKE=		yes
>-.if defined(WITH_GCC32)
>+.if !defined(WITH_SYSTEM_GCC)
> USE_GCC=		3.2
> .endif
> 
>@@ -65,22 +65,16 @@
> MICO_TCL=		"@comment "
> .endif
> 
>-.include <bsd.port.pre.mk>
>-
> .if defined(WITHOUT_SSL) || defined(WITHOUT_SERVICES)
> MICO_SSL=		"@comment "
> .else
> USE_OPENSSL=		yes
> CONFIGURE_ARGS+=	--enable-ssl=${OPENSSLBASE}
>-CONFIGURE_ARGS+=	--enable-csiv2
>-#
>-# CORBASecV2 doesn't build with gcc32 port because FlexLexer.h absent
>-#
>-.if !( ${OSVERSION} < 500035 && defined(WITH_GCC32) )
>-CONFIGURE_ARGS+=	--enable-csl2
>-.endif
>+CONFIGURE_ARGS+=	--enable-csiv2 --enable-csl2
> .endif
> 
>+.include <bsd.port.pre.mk>
>+
> PLIST_SUB+=	MICO_X11=${MICO_X11} MICO_QT=${MICO_QT} MICO_GTK=${MICO_GTK} \
> 		MICO_TCL=${MICO_TCL} MICO_SSL=${MICO_SSL} \
> 		MICO_SERVICE=${MICO_SERVICE}
>@@ -89,10 +83,11 @@
> MAN5=		micorc.5
> MAN8=		ird.8 micod.8 nsd.8
> 
>+
> pre-fetch:
> 	@${ECHO} "============================================================================"
> .if ${OSVERSION} < 500035
>-	@${ECHO} "Use WITH_GCC32=yes to build Mico with gcc 3.2 for better stability."
>+	@${ECHO} "Use WITH_SYSTEM_GCC=yes to build Mico with system gcc."
> 	@${ECHO}
> .endif
> 	@${ECHO} "Following options are allowed:"
>@@ -107,6 +102,9 @@
> 
> post-patch:
> 	${REINPLACE_CMD} -e "s#-O2#${CFLAGS}#" ${WRKSRC}/configure
>+.if ${OSVERSION} < 500035 && defined(WITH_GCC32)
>+	${LN} -s /usr/include/g++/FlexLexer.h ${WRKSRC}/include
>+.endif
> 
> post-configure:
> 	${FIND} ${WRKSRC}/demo -name Makefile | ${XARGS} \
>diff -ruN /usr/ports/devel/mico/files/patch-fixes::externalization mico/files/patch-fixes::externalization
>--- /usr/ports/devel/mico/files/patch-fixes::externalization	Mon Jul  7 11:24:02 2003
>+++ mico/files/patch-fixes::externalization	Thu Jul 10 04:59:28 2003
>@@ -1,5 +1,5 @@
>---- coss/externalization/Makefile.orig	Fri Feb 14 13:55:55 2003
>-+++ coss/externalization/Makefile	Fri Jul  4 15:01:11 2003
>+--- coss/externalization/Makefile.orig	Wed Jul  9 18:02:19 2003
>++++ coss/externalization/Makefile	Wed Jul  9 18:02:27 2003
> @@ -85,6 +85,8 @@
>  	$(CXX) $(CXXFLAGS) $(LDFLAGS) extreferenced.o $(LDLIBS) -o extreferenced
>  	$(POSTLD) $@
>@@ -9,6 +9,15 @@
>  CosExternalization.h CosExternalization.cc: \
>  		../../include/coss/CosExternalization.idl $(IDL)
>  	$(IDL) $(IDLFLAGS) --name CosExternalization \
>+@@ -125,6 +127,8 @@
>+ 	$(IBINCMD) extcontainmentd $(INSTDIR)/bin
>+ 	$(IDIRCMD) $(INSTDIR)/bin
>+ 	$(IBINCMD) extreferenced $(INSTDIR)/bin
>++	$(IDIRCMD) $(INSTDIR)/bin
>++	$(IBINCMD) extcriteriad $(INSTDIR)/bin
>+ 
>+ 
>+ ifeq (.depend, $(wildcard .depend))
> --- include/coss/CosStream_impl.h.orig	Fri Jul  4 15:24:06 2003
> +++ include/coss/CosStream_impl.h	Fri Jul  4 17:12:36 2003
> @@ -58,8 +58,8 @@
>diff -ruN /usr/ports/devel/mico/pkg-plist mico/pkg-plist
>--- /usr/ports/devel/mico/pkg-plist	Thu Jul 10 04:42:24 2003
>+++ mico/pkg-plist	Thu Jul 10 13:25:23 2003
>@@ -1,11 +1,11 @@
>-%%MICO_SERVICE%%bin/extcontainmentd
>-%%MICO_SERVICE%%bin/extnoded
>-%%MICO_SERVICE%%bin/extreferenced
>-%%MICO_SERVICE%%bin/streamd
> %%MICO_SERVICE%%bin/ccmload
> %%MICO_SERVICE%%bin/componentserver
> %%MICO_SERVICE%%bin/containmentd
> %%MICO_SERVICE%%bin/eventd
>+%%MICO_SERVICE%%bin/extcontainmentd
>+%%MICO_SERVICE%%bin/extcriteriad
>+%%MICO_SERVICE%%bin/extnoded
>+%%MICO_SERVICE%%bin/extreferenced
> bin/idl
> bin/imr
> bin/iordump
>@@ -30,6 +30,7 @@
> %%MICO_SERVICE%%bin/proxyd
> %%MICO_SERVICE%%bin/randomd
> %%MICO_SERVICE%%bin/referenced
>+%%MICO_SERVICE%%bin/streamd
> %%MICO_SERVICE%%bin/timed
> %%MICO_SERVICE%%bin/traderd
> %%MICO_SERVICE%%bin/traversald
>@@ -1000,6 +1001,13 @@
> %%PORTDOCS%%%%MICO_SSL%%share/examples/mico/security/tutorial/ssl
> %%PORTDOCS%%share/examples/mico/services/Makefile
> %%PORTDOCS%%share/examples/mico/services/README
>+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/events/Makefile
>+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/events/client.cc
>+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/events/client2.cc
>+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/events/runit
>+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/events/server.cc
>+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/events/server2.cc
>+%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/events/server3.cc
> %%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/externalize/Documents.idl
> %%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/externalize/DocumentsServer.cc
> %%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/externalize/Documents_impl.cc
>@@ -1017,13 +1025,6 @@
> %%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/externalize/simple-test.cc
> %%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/externalize/stop-servers
> %%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/externalize/test
>-%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/events/Makefile
>-%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/events/client.cc
>-%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/events/client2.cc
>-%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/events/runit
>-%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/events/server.cc
>-%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/events/server2.cc
>-%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/events/server3.cc
> %%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/lifecycle/Documents.idl
> %%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/lifecycle/DocumentsServer.cc
> %%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/lifecycle/Documents_impl.cc
>@@ -1155,8 +1156,8 @@
> %%PORTDOCS%%%%MICO_SERVICE%%@dirrm share/examples/mico/services/naming-lb
> %%PORTDOCS%%%%MICO_SERVICE%%@dirrm share/examples/mico/services/naming
> %%PORTDOCS%%%%MICO_SERVICE%%@dirrm share/examples/mico/services/lifecycle
>-%%PORTDOCS%%%%MICO_SERVICE%%@dirrm share/examples/mico/services/events
> %%PORTDOCS%%%%MICO_SERVICE%%@dirrm share/examples/mico/services/externalize
>+%%PORTDOCS%%%%MICO_SERVICE%%@dirrm share/examples/mico/services/events
> %%PORTDOCS%%@dirrm share/examples/mico/services
> %%PORTDOCS%%%%MICO_SSL%%@dirrm share/examples/mico/security/tutorial
> %%PORTDOCS%%%%MICO_SSL%%@dirrm share/examples/mico/security/l2

Actions: View | Diff

Attachments on bug 54350: 33080