Attachment #168309 for bug #208075

View | Details | Raw Unified | Return to bug 208075
Collapse All | Expand All





PORTNAME=	efl
PORTVERSION=	1.16.1
PORTREVISION=	1
CATEGORIES=	devel enlightenment
MASTER_SITES=	http://download.enlightenment.org/rel/libs/${PORTNAME}/



PLIST_SUB=	BRANCHVERSION=${PORTVERSION:R} PORTVERSION=${PORTVERSION}

OPTIONS_DEFINE=		AVAHI FRIBIDI HARFBUZZ NLS NVIDIA PHYSICS PULSEAUDIO
OPTIONS_GROUP=		EMOTION INPUT LOADER
OPTIONS_GROUP_EMOTION=	GSTREAMER LIBXINE V4L
OPTIONS_GROUP_INPUT=	IBUS SCIM
OPTIONS_GROUP_LOADER=	OPENJPEG WEBP
OPTIONS_RADIO=		ENGINE SSL
OPTIONS_RADIO_ENGINE=	OPENGL SDL
OPTIONS_DEFAULT=	FRIBIDI HARFBUZZ PHYSICS OPENSSL GSTREAMER OPENGL
OPTIONS_RADIO_SSL=	OPENSSL GNUTLS NOSSL
OPTIONS_SUB=		yes

HARFBUZZ_DESC=		OpenType text shaping engine

PLIST_SUB+=			AUDIO="@comment "
.endif

.if ${PORT_OPTIONS:MOPENSSL}
USE_OPENSSL=			yes
CONFIGURE_ARGS+=--with-crypto=openssl
# Will use port-installed OpenSSL if found at build-time
CONFIGURE_ARGS+=		--with-crypto=none
.endif

.if ${PORT_OPTIONS:MGNUTLS}
LIB_DEPENDS+=	libgnutls.so:${PORTSDIR}/security/gnutls
CONFIGURE_ARGS+=--with-crypto=gnutls
.endif

.if ${PORT_OPTIONS:MNOSSL}
CONFIGURE_ARGS+=--with-crypto=none
.endif

.if ${PORT_OPTIONS:MGSTREAMER} || ${PORT_OPTIONS:MLIBXINE} || ${PORT_OPTIONS:MV4L}
PLIST_SUB+=			EMOTION=""
.else

Lines 1-5 Link Here

(-)files/patch-configure.ac (-2 / +20 lines)
1	--- configure.ac.orig 2015-06-12 05:40:48.754367679 -0700	1	--- configure.ac 2015-12-23 20:12:40.000000000 -0500
2	+++ configure.ac 2015-06-12 05:45:05.521352761 -0700	2	+++ configure.ac 2016-03-16 16:52:19.579519000 -0400
		3	@@ -359,5 +359,7 @@
		4
		5	openssl)
		6	- EFL_DEPEND_PKG([crypto], [OPENSSL], [openssl])
		7	+ EFL_DEPEND_PKG([crypto], [OPENSSL], [openssl],
		8	+ [AC_MSG_RESULT([using port-installed OpenSSL])],
		9	+ [AC_MSG_RESULT([using base OpenSSL])])
		10	;;
		11	esac
3	@@ -414,12 +414,12 @@	12	@@ -414,12 +414,12 @@
4	execinfo.h \	13	execinfo.h \
5	mcheck.h \	14	mcheck.h \
Lines 22-24 Link Here
22	have_inotify="${ac_cv_header_sys_inotify_h}"	31	have_inotify="${ac_cv_header_sys_inotify_h}"
23	AM_CONDITIONAL([HAVE_INOTIFY], [test "x${have_inotify}" = "xyes"])	32	AM_CONDITIONAL([HAVE_INOTIFY], [test "x${have_inotify}" = "xyes"])
24		33
		34	--- m4/efl.m4 2015-07-08 14:33:28.000000000 -0400
		35	+++ m4/efl.m4 2016-03-16 17:03:49.133764000 -0400
		36	@@ -189,5 +189,5 @@
		37	[dnl
		38	m4_pushdef([DOWNEFL], m4_translit([$1], [-A-Z], [_a-z]))dnl
		39	requirements_pc_[]m4_defn([DOWNEFL])="${requirements_pc_crypto} ${requirements_pc_[][]m4_defn([DOWNEFL])}"
		40	-requirements_pc_deps_[]m4_defn([DOWNEFL])="${requirements_pc_deps_crypto} ${requirements_pc_deps_[][]m4_defn([DOWNEFL])}"
		41	+requirements_pc_deps_[]m4_defn([DOWNEFL])=`echo ${requirements_pc_deps_crypto} ${requirements_pc_deps_[][]m4_defn([DOWNEFL])} \| xargs`
		42	requirements_libs_[]m4_defn([DOWNEFL])="${requirements_libs_crypto} ${requirements_libs_[][]m4_defn([DOWNEFL])}"

Line 0 Link Here

(-)files/patch-gnutls (+8 lines)
	1	--- src/lib/emile/emile_cipher_gnutls.c 2015-12-23 19:24:38.000000000 -0500
	2	+++ src/lib/emile/emile_cipher_gnutls.c 2016-03-16 19:07:15.061448000 -0400
	3	@@ -385,5 +385,4 @@
	4	priority = "NORMAL:%VERIFY_ALLOW_X509_V1_CA_CRT:!VERS-SSL3.0";
	5	break;
	6	- case EMILE_SSLv3:
	7	default:
	8	return NULL;

Return to bug 208075

Lines 3-8 Link Here

(-)Makefile (-7 / +17 lines)
3		3
4	PORTNAME= efl	4	PORTNAME= efl
5	PORTVERSION= 1.16.1	5	PORTVERSION= 1.16.1
		6	PORTREVISION= 1
6	CATEGORIES= devel enlightenment	7	CATEGORIES= devel enlightenment
7	MASTER_SITES= http://download.enlightenment.org/rel/libs/${PORTNAME}/	8	MASTER_SITES= http://download.enlightenment.org/rel/libs/${PORTNAME}/
8		9
Lines 34-47 Link Here
34		35
35	PLIST_SUB= BRANCHVERSION=${PORTVERSION:R} PORTVERSION=${PORTVERSION}	36	PLIST_SUB= BRANCHVERSION=${PORTVERSION:R} PORTVERSION=${PORTVERSION}
36		37
37	OPTIONS_DEFINE= AVAHI FRIBIDI HARFBUZZ NLS NVIDIA PHYSICS PULSEAUDIO SSL	38	OPTIONS_DEFINE= AVAHI FRIBIDI HARFBUZZ NLS NVIDIA PHYSICS PULSEAUDIO
38	OPTIONS_GROUP= EMOTION INPUT LOADER	39	OPTIONS_GROUP= EMOTION INPUT LOADER
39	OPTIONS_GROUP_EMOTION= GSTREAMER LIBXINE V4L	40	OPTIONS_GROUP_EMOTION= GSTREAMER LIBXINE V4L
40	OPTIONS_GROUP_INPUT= IBUS SCIM	41	OPTIONS_GROUP_INPUT= IBUS SCIM
41	OPTIONS_GROUP_LOADER= OPENJPEG WEBP	42	OPTIONS_GROUP_LOADER= OPENJPEG WEBP
42	OPTIONS_RADIO= ENGINE	43	OPTIONS_RADIO= ENGINE SSL
43	OPTIONS_RADIO_ENGINE= OPENGL SDL	44	OPTIONS_RADIO_ENGINE= OPENGL SDL
44	OPTIONS_DEFAULT= FRIBIDI HARFBUZZ PHYSICS SSL GSTREAMER OPENGL	45	OPTIONS_DEFAULT= FRIBIDI HARFBUZZ PHYSICS OPENSSL GSTREAMER OPENGL
		46	OPTIONS_RADIO_SSL= OPENSSL GNUTLS NOSSL
45	OPTIONS_SUB= yes	47	OPTIONS_SUB= yes
46		48
47	HARFBUZZ_DESC= OpenType text shaping engine	49	HARFBUZZ_DESC= OpenType text shaping engine
Lines 106-118 Link Here
106	PLIST_SUB+= AUDIO="@comment "	108	PLIST_SUB+= AUDIO="@comment "
107	.endif	109	.endif
108		110
109	.if ${PORT_OPTIONS:MSSL}	111	.if ${PORT_OPTIONS:MOPENSSL}
110	USE_OPENSSL= yes	112	USE_OPENSSL= yes
111	WITH_OPENSSL_PORT= yes	113	CONFIGURE_ARGS+=--with-crypto=openssl
112	.else	114	# Will use port-installed OpenSSL if found at build-time
113	CONFIGURE_ARGS+= --with-crypto=none
114	.endif	115	.endif
115		116
		117	.if ${PORT_OPTIONS:MGNUTLS}
		118	LIB_DEPENDS+= libgnutls.so:${PORTSDIR}/security/gnutls
		119	CONFIGURE_ARGS+=--with-crypto=gnutls
		120	.endif
		121
		122	.if ${PORT_OPTIONS:MNOSSL}
		123	CONFIGURE_ARGS+=--with-crypto=none
		124	.endif
		125
116	.if ${PORT_OPTIONS:MGSTREAMER} \|\| ${PORT_OPTIONS:MLIBXINE} \|\| ${PORT_OPTIONS:MV4L}	126	.if ${PORT_OPTIONS:MGSTREAMER} \|\| ${PORT_OPTIONS:MLIBXINE} \|\| ${PORT_OPTIONS:MV4L}
117	PLIST_SUB+= EMOTION=""	127	PLIST_SUB+= EMOTION=""
118	.else	128	.else