From owner-svn-ports-all@FreeBSD.ORG Sun Dec 28 19:09:17 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6F9F6303; Sun, 28 Dec 2014 19:09:17 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 50487117A; Sun, 28 Dec 2014 19:09:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBSJ9Hjl019803; Sun, 28 Dec 2014 19:09:17 GMT (envelope-from gblach@FreeBSD.org) Received: (from gblach@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBSJ9GiZ019800; Sun, 28 Dec 2014 19:09:16 GMT (envelope-from gblach@FreeBSD.org) Message-Id: <201412281909.sBSJ9GiZ019800@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: gblach set sender to gblach@FreeBSD.org using -f From: Grzegorz Blach Date: Sun, 28 Dec 2014 19:09:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r375743 - head/devel/efl X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Dec 2014 19:09:17 -0000 Author: gblach Date: Sun Dec 28 19:09:16 2014 New Revision: 375743 URL: https://svnweb.freebsd.org/changeset/ports/375743 QAT: https://qat.redports.org/buildarchive/r375743/ Log: - Use openssl from base on 10.0 or higher, based on [1] - Fix SDL option - Convert ENGINE option group to radio choice - Fix plist when OPENGL is disabled - Add NLS option - Convert USE_AUTOTOOLS to USES=autoreconf - Bump PORTREVISION PR: 195532 [1] Submitted by: Mikhail T. (mi ALDAN algebra com) [1] Modified: head/devel/efl/Makefile head/devel/efl/pkg-plist Modified: head/devel/efl/Makefile ============================================================================== --- head/devel/efl/Makefile Sun Dec 28 19:07:21 2014 (r375742) +++ head/devel/efl/Makefile Sun Dec 28 19:09:16 2014 (r375743) @@ -3,7 +3,7 @@ PORTNAME= efl PORTVERSION= 1.12.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel enlightenment MASTER_SITES= http://download.enlightenment.org/rel/libs/${PORTNAME}/ @@ -24,9 +24,8 @@ LIB_DEPENDS= libjpeg.so:${PORTSDIR}/grap libsndfile.so:${PORTSDIR}/audio/libsndfile DIST_SUBDIR= enlightenment -USE_AUTOTOOLS= automake aclocal autoconf GNU_CONFIGURE= yes -USES= compiler:c++11-lib gmake libtool pathfix pkgconfig shared-mime-info tar:xz +USES= autoreconf compiler:c++11-lib gmake libtool pathfix pkgconfig shared-mime-info tar:xz USE_XORG= x11 xcursor xcomposite xdamage xext xinerama xp xrandr xtst xscrnsaver USE_LDCONFIG= yes @@ -37,13 +36,14 @@ LDFLAGS+= -L${LOCALBASE}/lib PLIST_SUB= BRANCHVERSION=${PORTVERSION:R} PORTVERSION=${PORTVERSION} -OPTIONS_DEFINE= AVAHI FRIBIDI HARFBUZZ NVIDIA PHYSICS PULSEAUDIO SSL -OPTIONS_GROUP= ENGINE EMOTION INPUT LOADER -OPTIONS_GROUP_ENGINE= OPENGL SDL +OPTIONS_DEFINE= AVAHI FRIBIDI HARFBUZZ NLS NVIDIA PHYSICS PULSEAUDIO SSL +OPTIONS_GROUP= EMOTION INPUT LOADER OPTIONS_GROUP_EMOTION= GSTREAMER LIBXINE V4L OPTIONS_GROUP_INPUT= IBUS SCIM OPTIONS_GROUP_LOADER= OPENJPEG WEBP -OPTIONS_DEFAULT= FRIBIDI HARFBUZZ PHYSICS SSL OPENGL GSTREAMER +OPTIONS_RADIO= ENGINE +OPTIONS_RADIO_ENGINE= OPENGL SDL +OPTIONS_DEFAULT= FRIBIDI HARFBUZZ PHYSICS SSL GSTREAMER OPENGL OPTIONS_SUB= yes HARFBUZZ_DESC= OpenType text shaping engine @@ -61,16 +61,14 @@ FRIBIDI_CONFIGURE_ENABLE= fribidi HARFBUZZ_LIB_DEPENDS= libharfbuzz.so:${PORTSDIR}/print/harfbuzz HARFBUZZ_CONFIGURE_ENABLE= harfbuzz -PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio -PULSEAUDIO_CONFIGURE_ENABLE= pulseaudio +NLS_USES= gettext +NLS_CONFIGURE_ENABLE= nls PHYSICS_LIB_DEPENDS= libBulletDynamics.so:${PORTSDIR}/devel/bullet PHYSICS_CONFIGURE_ENABLE= physics -OPENGL_USE= GL=gl - -SLD_USE= SLD=sdl -SLD_CONFIGURE_ENABLE= sdl +PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio +PULSEAUDIO_CONFIGURE_ENABLE= pulseaudio GSTREAMER_USE= GSTREAMER1=core GSTREAMER_CONFIGURE_ENABLE= gstreamer1 @@ -92,11 +90,10 @@ OPENJPEG_CONFIGURE_ENABLE= image-loader- WEBP_LIB_DEPENDS= libwebp.so:${PORTSDIR}/graphics/webp WEBP_CONFIGURE_ENABLE= image-loader-webp -DOCS_BUILD_DEPENDS= doxygen:${PORTSDIR}/devel/doxygen -DOCS_CONFIGURE_ENABLE= doc +OPENGL_USE= GL=gl -NLS_USES= gettext -NLS_CONFIGURE_ENABLE= nls +SDL_USE= SDL=sdl2 +SDL_CONFIGURE_ENABLE= sdl .include @@ -104,17 +101,25 @@ NLS_CONFIGURE_ENABLE= nls EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src-lib-ecore_x-ecore_x_vsync_tool.c .endif +.if ${PORT_OPTIONS:MPULSEAUDIO} +PLIST_SUB+= AUDIO="" +.else +CONFIGURE_ARGS+= --disable-audio +PLIST_SUB+= AUDIO="@comment " +.endif + .if ${PORT_OPTIONS:MSSL} USE_OPENSSL= yes +. if ${OSVERSION} >= 1000000 +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-configure.ac +CONFIGURE_ENV+= ECORE_CON_CFLAGS="-I${OPENSSLINC} -L${OPENSSLLIB}" ECORE_CON_LIBS="-lssl" +. else WITH_OPENSSL_PORT= yes +. endif .else CONFIGURE_ARGS+= --with-crypto=none .endif -.if empty(PORT_OPTIONS:MOPENGL) -CONFIGURE_ARGS+= --with-opengl=none -.endif - .if ${PORT_OPTIONS:MGSTREAMER} || ${PORT_OPTIONS:MLIBXINE} || ${PORT_OPTIONS:MV4L} PLIST_SUB+= EMOTION="" .else @@ -127,17 +132,8 @@ CONFIGURE_ARGS+= --with-glib=yes CONFIGURE_ARGS+= --disable-ibus --with-glib=no .endif -.if ${PORT_OPTIONS:MNLS} -PLIST_SUB+= NLS="" -.else -PLIST_SUB+= NLS="@comment " -.endif - -.if ${PORT_OPTIONS:MPULSEAUDIO} -PLIST_SUB+= AUDIO="" -.else -CONFIGURE_ARGS+= --disable-audio -PLIST_SUB+= AUDIO="@comment " +.if empty(PORT_OPTIONS:MOPENGL) +CONFIGURE_ARGS+= --with-opengl=none .endif pre-patch: Modified: head/devel/efl/pkg-plist ============================================================================== --- head/devel/efl/pkg-plist Sun Dec 28 19:07:21 2014 (r375742) +++ head/devel/efl/pkg-plist Sun Dec 28 19:09:16 2014 (r375743) @@ -469,7 +469,7 @@ lib/efreet/v-%%BRANCHVERSION%%/efreet_ic lib/ethumb/modules/emotion/v-%%BRANCHVERSION%%/module.so lib/ethumb/modules/emotion/v-%%BRANCHVERSION%%/template.edj lib/ethumb_client/utils/v-%%BRANCHVERSION%%/ethumbd_slave -lib/evas/modules/engines/gl_generic/v-%%BRANCHVERSION%%/module.so +%%OPENGL%%lib/evas/modules/engines/gl_generic/v-%%BRANCHVERSION%%/module.so lib/evas/modules/engines/software_x11/v-%%BRANCHVERSION%%/module.so %%OPENGL%%lib/evas/modules/engines/gl_x11/v-%%BRANCHVERSION%%/module.so %%OPENGL%%%%SDL%%lib/evas/modules/engines/gl_sdl/v-%%BRANCHVERSION%%/module.so