Attachment 150867 Details for Bug 196201 – Fix some options

[patch] Fix some options

devel-mico.diff (text/plain), 12.26 KB, created by Pedro F. Giffuni on 2014-12-22 18:55:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pedro F. Giffuni

Created: 2014-12-22 18:55:51 UTC

Size: 12.26 KB

patch

obsolete

>Index: devel/mico/Makefile
>===================================================================
>--- devel/mico/Makefile	(revision 375243)
>+++ devel/mico/Makefile	(working copy)
>@@ -6,7 +6,7 @@
> CATEGORIES=	devel
> MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20${PORTVERSION}/
> 
>-MAINTAINER=	pfg@FreeBSD.org
>+MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Secure, reliable, production-quality, standards-based CORBA middleware
> 
> LICENSE=	GPLv2
>@@ -19,9 +19,10 @@
> GNU_CONFIGURE=		yes
> CONFIGURE_ENV+=		EGREP=`which egrep`
> 
>-OPTIONS_DEFINE=	SERVICES SSL X11 GTK1 DEBUG TCL DOCS
>-OPTIONS_DEFAULT=	SSL SERVICES
>+OPTIONS_DEFINE=	SERVICES CSI X11 GTK1 DEBUG TCL DOCS EXAMPLES
>+OPTIONS_DEFAULT=	CSI SERVICES
> SERVICES_DESC=	With services, plain ORB
>+CSI_DESC=	Build with CSIv2 support
> GTK1_DESC=	Build with GTK1 support
> TCL_DESC=	Build with TCL support
> 
>@@ -31,8 +32,15 @@
> 
> CONFIGURE_ARGS=		--enable-cd --disable-mini-stl --enable-threads
> 
>+USE_OPENSSL=		yes
>+CONFIGURE_ARGS+=	--with-ssl=${OPENSSLBASE}
>+
> MICO_LIBS=	mico micoaux micoir
> 
>+.if ${PORT_OPTIONS:MCSI}
>+CONFIGURE_ARGS+=	--disable-csiv2
>+.endif
>+
> .if ${PORT_OPTIONS:MDEBUG}
> CONFIGURE_ARGS+=	--enable-debug
> .endif
>@@ -79,15 +87,12 @@
> INSTALL_TARGET+=	install-demo
> .endif
> 
>-.if empty(PORT_OPTIONS:MSSL) || empty(PORT_OPTIONS:MSERVICES)
>-MICO_SSL=		"@comment "
>-.else
>-USE_OPENSSL=		yes
>-CONFIGURE_ARGS+=	--with-ssl=${OPENSSLBASE}
>+.if empty(PORT_OPTIONS:MCSI) || empty(PORT_OPTIONS:MSERVICES)
>+MICO_CSI=		"@comment "
> .endif
> 
> PLIST_SUB+=	MICO_X11=${MICO_X11} MICO_QT=${MICO_QT} MICO_GTK=${MICO_GTK} \
>-		MICO_TCL=${MICO_TCL} MICO_SSL=${MICO_SSL} \
>+		MICO_TCL=${MICO_TCL} MICO_CSI=${MICO_CSI} \
> 		MICO_SERVICE=${MICO_SERVICE}
> 
> post-configure:
>Index: devel/mico/pkg-plist
>===================================================================
>--- devel/mico/pkg-plist	(revision 375243)
>+++ devel/mico/pkg-plist	(working copy)
>@@ -408,68 +408,68 @@
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/codesets/hello.idl
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/codesets/runit
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/codesets/server.cc
>-%%PORTEXAMPLES%%%%MICO_SSL%%%%EXAMPLESDIR%%/csiv2/Makefile
>-%%PORTEXAMPLES%%%%MICO_SSL%%%%EXAMPLESDIR%%/csiv2/README
>-%%PORTEXAMPLES%%%%MICO_SSL%%%%EXAMPLESDIR%%/csiv2/hello-1/Makefile
>-%%PORTEXAMPLES%%%%MICO_SSL%%%%EXAMPLESDIR%%/csiv2/hello-1/client.cc
>-%%PORTEXAMPLES%%%%MICO_SSL%%%%EXAMPLESDIR%%/csiv2/hello-1/hello
>-%%PORTEXAMPLES%%%%MICO_SSL%%%%EXAMPLESDIR%%/csiv2/hello-1/hello.idl
>-%%PORTEXAMPLES%%%%MICO_SSL%%%%EXAMPLESDIR%%/csiv2/hello-1/server.cc
>-%%PORTEXAMPLES%%%%MICO_SSL%%%%EXAMPLESDIR%%/csiv2/identity-1/Makefile
>-%%PORTEXAMPLES%%%%MICO_SSL%%%%EXAMPLESDIR%%/csiv2/identity-1/client.cc
>-%%PORTEXAMPLES%%%%MICO_SSL%%%%EXAMPLESDIR%%/csiv2/identity-1/hello
>-%%PORTEXAMPLES%%%%MICO_SSL%%%%EXAMPLESDIR%%/csiv2/identity-1/hello.idl
>-%%PORTEXAMPLES%%%%MICO_SSL%%%%EXAMPLESDIR%%/csiv2/identity-1/server.cc
>-%%PORTEXAMPLES%%%%MICO_SSL%%%%EXAMPLESDIR%%/csiv2/interop/Makefile
>-%%PORTEXAMPLES%%%%MICO_SSL%%%%EXAMPLESDIR%%/csiv2/interop/README
>-%%PORTEXAMPLES%%%%MICO_SSL%%%%EXAMPLESDIR%%/csiv2/interop/adiron/InterOpTest.idl
>-%%PORTEXAMPLES%%%%MICO_SSL%%%%EXAMPLESDIR%%/csiv2/interop/adiron/Makefile
>-%%PORTEXAMPLES%%%%MICO_SSL%%%%EXAMPLESDIR%%/csiv2/interop/adiron/c_cert.pem
>-%%PORTEXAMPLES%%%%MICO_SSL%%%%EXAMPLESDIR%%/csiv2/interop/adiron/c_key.pem
>-%%PORTEXAMPLES%%%%MICO_SSL%%%%EXAMPLESDIR%%/csiv2/interop/adiron/ca_cert.pem
>-%%PORTEXAMPLES%%%%MICO_SSL%%%%EXAMPLESDIR%%/csiv2/interop/adiron/client.cc
>-%%PORTEXAMPLES%%%%MICO_SSL%%%%EXAMPLESDIR%%/csiv2/interop/adiron/client2.cc
>-%%PORTEXAMPLES%%%%MICO_SSL%%%%EXAMPLESDIR%%/csiv2/interop/adiron/get_iors.sh
>-%%PORTEXAMPLES%%%%MICO_SSL%%%%EXAMPLESDIR%%/csiv2/interop/adiron/iiop_csiv2_extedned_hello.sh
>-%%PORTEXAMPLES%%%%MICO_SSL%%%%EXAMPLESDIR%%/csiv2/interop/adiron/iiop_csiv2_hello.sh
>-%%PORTEXAMPLES%%%%MICO_SSL%%%%EXAMPLESDIR%%/csiv2/interop/adiron/iiop_hello.sh
>-%%PORTEXAMPLES%%%%MICO_SSL%%%%EXAMPLESDIR%%/csiv2/interop/adiron/run.sh
>-%%PORTEXAMPLES%%%%MICO_SSL%%%%EXAMPLESDIR%%/csiv2/interop/adiron/s_cert.pem
>-%%PORTEXAMPLES%%%%MICO_SSL%%%%EXAMPLESDIR%%/csiv2/interop/adiron/s_key.pem
>-%%PORTEXAMPLES%%%%MICO_SSL%%%%EXAMPLESDIR%%/csiv2/interop/adiron/server.cc
>-%%PORTEXAMPLES%%%%MICO_SSL%%%%EXAMPLESDIR%%/csiv2/interop/adiron/tls_csiv2_extedned_hello.sh
>-%%PORTEXAMPLES%%%%MICO_SSL%%%%EXAMPLESDIR%%/csiv2/interop/adiron/tls_csiv2_hello.sh
>-%%PORTEXAMPLES%%%%MICO_SSL%%%%EXAMPLESDIR%%/csiv2/interop/adiron/tls_hello.sh
>-%%PORTEXAMPLES%%%%MICO_SSL%%%%EXAMPLESDIR%%/csiv2/tls-hello-1/Makefile
>-%%PORTEXAMPLES%%%%MICO_SSL%%%%EXAMPLESDIR%%/csiv2/tls-hello-1/c_cert.pem
>-%%PORTEXAMPLES%%%%MICO_SSL%%%%EXAMPLESDIR%%/csiv2/tls-hello-1/c_key.pem
>-%%PORTEXAMPLES%%%%MICO_SSL%%%%EXAMPLESDIR%%/csiv2/tls-hello-1/ca_cert.pem
>-%%PORTEXAMPLES%%%%MICO_SSL%%%%EXAMPLESDIR%%/csiv2/tls-hello-1/client.cc
>-%%PORTEXAMPLES%%%%MICO_SSL%%%%EXAMPLESDIR%%/csiv2/tls-hello-1/hello
>-%%PORTEXAMPLES%%%%MICO_SSL%%%%EXAMPLESDIR%%/csiv2/tls-hello-1/hello.idl
>-%%PORTEXAMPLES%%%%MICO_SSL%%%%EXAMPLESDIR%%/csiv2/tls-hello-1/s_cert.pem
>-%%PORTEXAMPLES%%%%MICO_SSL%%%%EXAMPLESDIR%%/csiv2/tls-hello-1/s_key.pem
>-%%PORTEXAMPLES%%%%MICO_SSL%%%%EXAMPLESDIR%%/csiv2/tls-hello-1/server.cc
>-%%PORTEXAMPLES%%%%MICO_SSL%%%%EXAMPLESDIR%%/csiv2/tls-hello-2/Makefile
>-%%PORTEXAMPLES%%%%MICO_SSL%%%%EXAMPLESDIR%%/csiv2/tls-hello-2/c_cert.pem
>-%%PORTEXAMPLES%%%%MICO_SSL%%%%EXAMPLESDIR%%/csiv2/tls-hello-2/c_key.pem
>-%%PORTEXAMPLES%%%%MICO_SSL%%%%EXAMPLESDIR%%/csiv2/tls-hello-2/ca_cert.pem
>-%%PORTEXAMPLES%%%%MICO_SSL%%%%EXAMPLESDIR%%/csiv2/tls-hello-2/client.cc
>-%%PORTEXAMPLES%%%%MICO_SSL%%%%EXAMPLESDIR%%/csiv2/tls-hello-2/hello
>-%%PORTEXAMPLES%%%%MICO_SSL%%%%EXAMPLESDIR%%/csiv2/tls-hello-2/hello.idl
>-%%PORTEXAMPLES%%%%MICO_SSL%%%%EXAMPLESDIR%%/csiv2/tls-hello-2/s_cert.pem
>-%%PORTEXAMPLES%%%%MICO_SSL%%%%EXAMPLESDIR%%/csiv2/tls-hello-2/s_key.pem
>-%%PORTEXAMPLES%%%%MICO_SSL%%%%EXAMPLESDIR%%/csiv2/tls-hello-2/server.cc
>-%%PORTEXAMPLES%%%%MICO_SSL%%%%EXAMPLESDIR%%/csiv2/tls-identity-1/Makefile
>-%%PORTEXAMPLES%%%%MICO_SSL%%%%EXAMPLESDIR%%/csiv2/tls-identity-1/c_cert.pem
>-%%PORTEXAMPLES%%%%MICO_SSL%%%%EXAMPLESDIR%%/csiv2/tls-identity-1/c_key.pem
>-%%PORTEXAMPLES%%%%MICO_SSL%%%%EXAMPLESDIR%%/csiv2/tls-identity-1/ca_cert.pem
>-%%PORTEXAMPLES%%%%MICO_SSL%%%%EXAMPLESDIR%%/csiv2/tls-identity-1/client.cc
>-%%PORTEXAMPLES%%%%MICO_SSL%%%%EXAMPLESDIR%%/csiv2/tls-identity-1/hello
>-%%PORTEXAMPLES%%%%MICO_SSL%%%%EXAMPLESDIR%%/csiv2/tls-identity-1/hello.idl
>-%%PORTEXAMPLES%%%%MICO_SSL%%%%EXAMPLESDIR%%/csiv2/tls-identity-1/s_cert.pem
>-%%PORTEXAMPLES%%%%MICO_SSL%%%%EXAMPLESDIR%%/csiv2/tls-identity-1/s_key.pem
>-%%PORTEXAMPLES%%%%MICO_SSL%%%%EXAMPLESDIR%%/csiv2/tls-identity-1/server.cc
>+%%PORTEXAMPLES%%%%MICO_CSI%%%%EXAMPLESDIR%%/csiv2/Makefile
>+%%PORTEXAMPLES%%%%MICO_CSI%%%%EXAMPLESDIR%%/csiv2/README
>+%%PORTEXAMPLES%%%%MICO_CSI%%%%EXAMPLESDIR%%/csiv2/hello-1/Makefile
>+%%PORTEXAMPLES%%%%MICO_CSI%%%%EXAMPLESDIR%%/csiv2/hello-1/client.cc
>+%%PORTEXAMPLES%%%%MICO_CSI%%%%EXAMPLESDIR%%/csiv2/hello-1/hello
>+%%PORTEXAMPLES%%%%MICO_CSI%%%%EXAMPLESDIR%%/csiv2/hello-1/hello.idl
>+%%PORTEXAMPLES%%%%MICO_CSI%%%%EXAMPLESDIR%%/csiv2/hello-1/server.cc
>+%%PORTEXAMPLES%%%%MICO_CSI%%%%EXAMPLESDIR%%/csiv2/identity-1/Makefile
>+%%PORTEXAMPLES%%%%MICO_CSI%%%%EXAMPLESDIR%%/csiv2/identity-1/client.cc
>+%%PORTEXAMPLES%%%%MICO_CSI%%%%EXAMPLESDIR%%/csiv2/identity-1/hello
>+%%PORTEXAMPLES%%%%MICO_CSI%%%%EXAMPLESDIR%%/csiv2/identity-1/hello.idl
>+%%PORTEXAMPLES%%%%MICO_CSI%%%%EXAMPLESDIR%%/csiv2/identity-1/server.cc
>+%%PORTEXAMPLES%%%%MICO_CSI%%%%EXAMPLESDIR%%/csiv2/interop/Makefile
>+%%PORTEXAMPLES%%%%MICO_CSI%%%%EXAMPLESDIR%%/csiv2/interop/README
>+%%PORTEXAMPLES%%%%MICO_CSI%%%%EXAMPLESDIR%%/csiv2/interop/adiron/InterOpTest.idl
>+%%PORTEXAMPLES%%%%MICO_CSI%%%%EXAMPLESDIR%%/csiv2/interop/adiron/Makefile
>+%%PORTEXAMPLES%%%%MICO_CSI%%%%EXAMPLESDIR%%/csiv2/interop/adiron/c_cert.pem
>+%%PORTEXAMPLES%%%%MICO_CSI%%%%EXAMPLESDIR%%/csiv2/interop/adiron/c_key.pem
>+%%PORTEXAMPLES%%%%MICO_CSI%%%%EXAMPLESDIR%%/csiv2/interop/adiron/ca_cert.pem
>+%%PORTEXAMPLES%%%%MICO_CSI%%%%EXAMPLESDIR%%/csiv2/interop/adiron/client.cc
>+%%PORTEXAMPLES%%%%MICO_CSI%%%%EXAMPLESDIR%%/csiv2/interop/adiron/client2.cc
>+%%PORTEXAMPLES%%%%MICO_CSI%%%%EXAMPLESDIR%%/csiv2/interop/adiron/get_iors.sh
>+%%PORTEXAMPLES%%%%MICO_CSI%%%%EXAMPLESDIR%%/csiv2/interop/adiron/iiop_csiv2_extedned_hello.sh
>+%%PORTEXAMPLES%%%%MICO_CSI%%%%EXAMPLESDIR%%/csiv2/interop/adiron/iiop_csiv2_hello.sh
>+%%PORTEXAMPLES%%%%MICO_CSI%%%%EXAMPLESDIR%%/csiv2/interop/adiron/iiop_hello.sh
>+%%PORTEXAMPLES%%%%MICO_CSI%%%%EXAMPLESDIR%%/csiv2/interop/adiron/run.sh
>+%%PORTEXAMPLES%%%%MICO_CSI%%%%EXAMPLESDIR%%/csiv2/interop/adiron/s_cert.pem
>+%%PORTEXAMPLES%%%%MICO_CSI%%%%EXAMPLESDIR%%/csiv2/interop/adiron/s_key.pem
>+%%PORTEXAMPLES%%%%MICO_CSI%%%%EXAMPLESDIR%%/csiv2/interop/adiron/server.cc
>+%%PORTEXAMPLES%%%%MICO_CSI%%%%EXAMPLESDIR%%/csiv2/interop/adiron/tls_csiv2_extedned_hello.sh
>+%%PORTEXAMPLES%%%%MICO_CSI%%%%EXAMPLESDIR%%/csiv2/interop/adiron/tls_csiv2_hello.sh
>+%%PORTEXAMPLES%%%%MICO_CSI%%%%EXAMPLESDIR%%/csiv2/interop/adiron/tls_hello.sh
>+%%PORTEXAMPLES%%%%MICO_CSI%%%%EXAMPLESDIR%%/csiv2/tls-hello-1/Makefile
>+%%PORTEXAMPLES%%%%MICO_CSI%%%%EXAMPLESDIR%%/csiv2/tls-hello-1/c_cert.pem
>+%%PORTEXAMPLES%%%%MICO_CSI%%%%EXAMPLESDIR%%/csiv2/tls-hello-1/c_key.pem
>+%%PORTEXAMPLES%%%%MICO_CSI%%%%EXAMPLESDIR%%/csiv2/tls-hello-1/ca_cert.pem
>+%%PORTEXAMPLES%%%%MICO_CSI%%%%EXAMPLESDIR%%/csiv2/tls-hello-1/client.cc
>+%%PORTEXAMPLES%%%%MICO_CSI%%%%EXAMPLESDIR%%/csiv2/tls-hello-1/hello
>+%%PORTEXAMPLES%%%%MICO_CSI%%%%EXAMPLESDIR%%/csiv2/tls-hello-1/hello.idl
>+%%PORTEXAMPLES%%%%MICO_CSI%%%%EXAMPLESDIR%%/csiv2/tls-hello-1/s_cert.pem
>+%%PORTEXAMPLES%%%%MICO_CSI%%%%EXAMPLESDIR%%/csiv2/tls-hello-1/s_key.pem
>+%%PORTEXAMPLES%%%%MICO_CSI%%%%EXAMPLESDIR%%/csiv2/tls-hello-1/server.cc
>+%%PORTEXAMPLES%%%%MICO_CSI%%%%EXAMPLESDIR%%/csiv2/tls-hello-2/Makefile
>+%%PORTEXAMPLES%%%%MICO_CSI%%%%EXAMPLESDIR%%/csiv2/tls-hello-2/c_cert.pem
>+%%PORTEXAMPLES%%%%MICO_CSI%%%%EXAMPLESDIR%%/csiv2/tls-hello-2/c_key.pem
>+%%PORTEXAMPLES%%%%MICO_CSI%%%%EXAMPLESDIR%%/csiv2/tls-hello-2/ca_cert.pem
>+%%PORTEXAMPLES%%%%MICO_CSI%%%%EXAMPLESDIR%%/csiv2/tls-hello-2/client.cc
>+%%PORTEXAMPLES%%%%MICO_CSI%%%%EXAMPLESDIR%%/csiv2/tls-hello-2/hello
>+%%PORTEXAMPLES%%%%MICO_CSI%%%%EXAMPLESDIR%%/csiv2/tls-hello-2/hello.idl
>+%%PORTEXAMPLES%%%%MICO_CSI%%%%EXAMPLESDIR%%/csiv2/tls-hello-2/s_cert.pem
>+%%PORTEXAMPLES%%%%MICO_CSI%%%%EXAMPLESDIR%%/csiv2/tls-hello-2/s_key.pem
>+%%PORTEXAMPLES%%%%MICO_CSI%%%%EXAMPLESDIR%%/csiv2/tls-hello-2/server.cc
>+%%PORTEXAMPLES%%%%MICO_CSI%%%%EXAMPLESDIR%%/csiv2/tls-identity-1/Makefile
>+%%PORTEXAMPLES%%%%MICO_CSI%%%%EXAMPLESDIR%%/csiv2/tls-identity-1/c_cert.pem
>+%%PORTEXAMPLES%%%%MICO_CSI%%%%EXAMPLESDIR%%/csiv2/tls-identity-1/c_key.pem
>+%%PORTEXAMPLES%%%%MICO_CSI%%%%EXAMPLESDIR%%/csiv2/tls-identity-1/ca_cert.pem
>+%%PORTEXAMPLES%%%%MICO_CSI%%%%EXAMPLESDIR%%/csiv2/tls-identity-1/client.cc
>+%%PORTEXAMPLES%%%%MICO_CSI%%%%EXAMPLESDIR%%/csiv2/tls-identity-1/hello
>+%%PORTEXAMPLES%%%%MICO_CSI%%%%EXAMPLESDIR%%/csiv2/tls-identity-1/hello.idl
>+%%PORTEXAMPLES%%%%MICO_CSI%%%%EXAMPLESDIR%%/csiv2/tls-identity-1/s_cert.pem
>+%%PORTEXAMPLES%%%%MICO_CSI%%%%EXAMPLESDIR%%/csiv2/tls-identity-1/s_key.pem
>+%%PORTEXAMPLES%%%%MICO_CSI%%%%EXAMPLESDIR%%/csiv2/tls-identity-1/server.cc
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dispatcher/Makefile
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dispatcher/README
> %%PORTEXAMPLES%%%%MICO_GTK%%%%EXAMPLESDIR%%/dispatcher/gtkmico/Makefile
>@@ -755,12 +755,12 @@
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/shlib/hello
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/shlib/hello.idl
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/shlib/server.cc
>-%%PORTEXAMPLES%%%%MICO_SSL%%%%EXAMPLESDIR%%/ssl/Makefile
>-%%PORTEXAMPLES%%%%MICO_SSL%%%%EXAMPLESDIR%%/ssl/c_cert.pem
>-%%PORTEXAMPLES%%%%MICO_SSL%%%%EXAMPLESDIR%%/ssl/c_key.pem
>-%%PORTEXAMPLES%%%%MICO_SSL%%%%EXAMPLESDIR%%/ssl/client.cc
>-%%PORTEXAMPLES%%%%MICO_SSL%%%%EXAMPLESDIR%%/ssl/hello.idl
>-%%PORTEXAMPLES%%%%MICO_SSL%%%%EXAMPLESDIR%%/ssl/s_cert.pem
>-%%PORTEXAMPLES%%%%MICO_SSL%%%%EXAMPLESDIR%%/ssl/s_key.pem
>-%%PORTEXAMPLES%%%%MICO_SSL%%%%EXAMPLESDIR%%/ssl/server.cc
>-%%PORTEXAMPLES%%%%MICO_SSL%%%%EXAMPLESDIR%%/ssl/ssl
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ssl/Makefile
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ssl/c_cert.pem
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ssl/c_key.pem
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ssl/client.cc
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ssl/hello.idl
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ssl/s_cert.pem
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ssl/s_key.pem
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ssl/server.cc
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ssl/ssl

Actions: View | Diff

Attachments on bug 196201: 150867