Attachment 39959 Details for Bug 62886 – mico-2.3.11_2.patch

[patch] mico-2.3.11_2.patch

mico-2.3.11_2.patch (text/plain), 5.09 KB, created by Sergey Matveychuk on 2004-02-15 20:40:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sergey Matveychuk

Created: 2004-02-15 20:40:12 UTC

Size: 5.09 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/devel/mico.orig/Makefile /usr/ports/devel/mico/Makefile
>--- /usr/ports/devel/mico.orig/Makefile	Wed Feb  4 08:19:43 2004
>+++ /usr/ports/devel/mico/Makefile	Sun Feb 15 23:10:47 2004
>@@ -2,12 +2,12 @@
> # Date created:        11 July 1998
> # Whom:                Marc G. Fournier <scrappy@freebsd.org>
> #
>-# $FreeBSD: ports/devel/mico/Makefile,v 1.69 2004/02/04 05:19:43 marcus Exp $
>+# $FreeBSD: ports/devel/mico/Makefile,v 1.68 2003/11/05 08:08:01 sergei Exp $
> #
> 
> PORTNAME=	mico
> PORTVERSION=	2.3.11
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	devel
> MASTER_SITES=	http://www.mico.org/:src \
> 		http://www.ciam.ru/~sem/FreeBSD/:docs
>@@ -23,12 +23,38 @@
> USE_REINPLACE=		yes
> USE_GMAKE=		yes
> USE_AUTOCONF_VER=	253
>+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
>+
>+OPTIONS=	SERVICES "Build with all services, not only ORB" on \
>+		SSL "Build with SSL" on \
>+		X11 "Build with X11 support" off \
>+		QT "Build with QT support" off \
>+		GTK "Build with GTK support" off \
>+		SYSTEM_GCC "Build with system gcc. (Only for 4.x)" off \
>+		DEBUG "Build debug version" off
>+
>+# stolen from bsd.port.mk (for OPTIONS works)
>+PORT_DBDIR?=	/var/db/ports
>+
>+OPTIONSFILE?=	${PORT_DBDIR}/${PORTNAME}/options
>+.if exists(${OPTIONSFILE}) && !make(rmconfig)
>+.include "${OPTIONSFILE}"
>+.endif
>+.if exists(${OPTIONSFILE}.local)
>+.include "${OPTIONSFILE}.local"
>+.endif
>+# ================
>+
> .if !defined(WITH_SYSTEM_GCC)
> USE_GCC=		3.3
> .endif
> 
> CONFIGURE_ARGS=		--enable-cd --disable-mini-stl --enable-threads
>-.if !defined(WITHOUT_SERVICES)
>+
>+.if defined(WITH_DEBUG)
>+CONFIGURE_ARGS+=	--enable-debug
>+.endif
>+.if defined(WITH_SERVICES)
> CONFIGURE_ARGS+=	--enable-ccm --enable-life --enable-externalize
> .else
> CONFIGURE_ARGS+=	--disable-coss
>@@ -74,8 +100,6 @@
> 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}
>@@ -84,18 +108,7 @@
> MAN5=		micorc.5
> MAN8=		ird.8 micod.8 nsd.8
> 
>-pre-fetch:
>-	@${ECHO_MSG} "============================================================================"
>-.if ${OSVERSION} < 500035
>-	@${ECHO_MSG} "Use WITH_SYSTEM_GCC=yes to build Mico with system gcc."
>-	@${ECHO_MSG} ""
>-.endif
>-	@${ECHO_MSG} "Following options are allowed:"
>-	@${ECHO_MSG} ""
>-	@${ECHO_MSG} "WITHOUT_SERVICES=yes  - build without services, only ORB"
>-	@${ECHO_MSG} "WITHOUT_SSL=yes       - build without SSL and security services"
>-	@${ECHO_MSG} "WITH_X11=yes, WITH_QT=yes, WITH_GTK=yes, WITH_TCL=yes"
>-	@${ECHO_MSG} "============================================================================"
>+.include <bsd.port.pre.mk>
> 
> post-extract:
> 	@${TAR} xzf ${DISTDIR}/doc-html.tar.gz -C ${WRKDIR}
>diff -ruN --exclude=CVS /usr/ports/devel/mico.orig/distinfo /usr/ports/devel/mico/distinfo
>--- /usr/ports/devel/mico.orig/distinfo	Wed Nov  5 11:08:01 2003
>+++ /usr/ports/devel/mico/distinfo	Sat Feb 14 06:27:18 2004
>@@ -1,2 +1,4 @@
> MD5 (mico-2.3.11.tar.gz) = 669d98ec5da2f6c50937a2a25e797eec
>+SIZE (mico-2.3.11.tar.gz) = 2523850
> MD5 (doc-html.tar.gz) = f32f618cfb2da541efd5dba50c3e2273
>+SIZE (doc-html.tar.gz) = 133700
>diff -ruN --exclude=CVS /usr/ports/devel/mico.orig/files/patch-fixes::lifecycle /usr/ports/devel/mico/files/patch-fixes::lifecycle
>--- /usr/ports/devel/mico.orig/files/patch-fixes::lifecycle	Wed Nov  5 11:08:02 2003
>+++ /usr/ports/devel/mico/files/patch-fixes::lifecycle	Sun Feb 15 21:20:07 2004
>@@ -1,5 +1,5 @@
>---- coss/lifecycle/Makefile.orig	Fri Feb 14 13:55:55 2003
>-+++ coss/lifecycle/Makefile	Fri Jul  4 12:33:15 2003
>+--- coss/lifecycle/Makefile.orig	Mon Oct 13 13:49:23 2003
>++++ coss/lifecycle/Makefile	Sun Feb 15 21:15:07 2004
> @@ -101,6 +101,8 @@
>  	$(CXX) $(CXXFLAGS) $(LDFLAGS) genericfactory.o $(LDLIBS) -o genericfactory
>  	$(POSTLD) $@
>@@ -9,6 +9,19 @@
>  CosLifeCycle.h CosLifeCycle.cc: \
>  		../../include/coss/CosLifeCycle.idl $(IDL)
>  	$(IDL) $(IDLFLAGS) --name CosLifeCycle \
>+@@ -149,6 +151,12 @@
>+ 	$(IBINCMD) lifecontainmentd $(INSTDIR)/bin
>+ 	$(IDIRCMD) $(INSTDIR)/bin
>+ 	$(IBINCMD) lifereferenced $(INSTDIR)/bin
>++	$(IDIRCMD) $(INSTDIR)/bin
>++	$(IBINCMD) lifecriteriad $(INSTDIR)/bin
>++	$(IDIRCMD) $(INSTDIR)/bin
>++	$(IBINCMD) factoryfinderd $(INSTDIR)/bin
>++	$(IDIRCMD) $(INSTDIR)/bin
>++	$(IBINCMD) genericfactory $(INSTDIR)/bin
>+ 
>+ 
>+ ifeq (.depend, $(wildcard .depend))
> --- coss/lifecycle/FactoryFinder_impl.cc.orig	Fri Jul  4 14:44:09 2003
> +++ coss/lifecycle/FactoryFinder_impl.cc	Fri Jul  4 16:44:03 2003
> @@ -28,6 +28,8 @@
>diff -ruN --exclude=CVS /usr/ports/devel/mico.orig/pkg-plist /usr/ports/devel/mico/pkg-plist
>--- /usr/ports/devel/mico.orig/pkg-plist	Wed Nov  5 11:08:01 2003
>+++ /usr/ports/devel/mico/pkg-plist	Sun Feb 15 22:00:38 2004
>@@ -6,11 +6,14 @@
> %%MICO_SERVICE%%bin/extcriteriad
> %%MICO_SERVICE%%bin/extnoded
> %%MICO_SERVICE%%bin/extreferenced
>+%%MICO_SERVICE%%bin/factoryfinderd
>+%%MICO_SERVICE%%bin/genericfactory
> bin/idl
> bin/imr
> bin/iordump
> bin/ird
> %%MICO_SERVICE%%bin/lifecontainmentd
>+%%MICO_SERVICE%%bin/lifecriteriad
> %%MICO_SERVICE%%bin/lifenoded
> %%MICO_SERVICE%%bin/lifereferenced
> bin/mico-ar

Actions: View | Diff

Attachments on bug 62886: 39959