Date: Wed, 13 Jan 2016 12:37:58 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r406037 - head/lang/gnustep-base Message-ID: <201601131237.u0DCbw1U053088@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Wed Jan 13 12:37:57 2016 New Revision: 406037 URL: https://svnweb.freebsd.org/changeset/ports/406037 Log: - Do not hardcode dependency on GnuTLS (security/gnutls). While preferred, it is not required, and limited functionality can be achieved by using OpenSSL instead (per the comment in configure script); both providers can be turned off with --disable-{tls,openssl} switches - Similarly, make ICU support optional as well and replace cryptic regex in BASEVERSION assignment with :R while here Approved by: theraven (maintainer) Modified: head/lang/gnustep-base/Makefile head/lang/gnustep-base/pkg-plist Modified: head/lang/gnustep-base/Makefile ============================================================================== --- head/lang/gnustep-base/Makefile Wed Jan 13 12:33:45 2016 (r406036) +++ head/lang/gnustep-base/Makefile Wed Jan 13 12:37:57 2016 (r406037) @@ -12,27 +12,15 @@ COMMENT= GNUstep Foundation library LICENSE= GPLv3 LGPL3 LICENSE_COMB= multi -OPTIONS_RADIO= ZEROCONF -OPTIONS_RADIO_ZEROCONF= AVAHI MDNS -OPTIONS_DEFAULT= AVAHI - -NOZEROCONF_DESC= Disable Zeroconf (Bonjour) support -AVAHI_DESC?= Zeroconf via Avahi (preferred) -MDNS_DESC?= Zeroconf via mDNSResponder - LIB_DEPENDS+= libffi.so:${PORTSDIR}/devel/libffi LIB_DEPENDS+= libxml2.so:${PORTSDIR}/textproc/libxml2 LIB_DEPENDS+= libxslt.so:${PORTSDIR}/textproc/libxslt LIB_DEPENDS+= libgmp.so:${PORTSDIR}/math/gmp -LIB_DEPENDS+= libgnutls-openssl.so:${PORTSDIR}/security/gnutls -LIB_DEPENDS+= libicuuc.so:${PORTSDIR}/devel/icu LIB_DEPENDS+= libgcrypt.so:${PORTSDIR}/security/libgcrypt GNU_CONFIGURE= yes -CONFIGURE_ARGS= --disable-procfs --disable-openssl --enable-tls \ - --with-tls-prefix=${LOCALBASE} TLS_CONFIG="pkg-config -gnutls"\ - --disable-mixedabi -CONFIGURE_ENV+= OBJCFLAGS='-fobjc-runtime=gnustep-1.7 -fblocks' +CONFIGURE_ARGS= --disable-procfs --disable-mixedabi +CONFIGURE_ENV= OBJCFLAGS='-fobjc-runtime=gnustep-1.7 -fblocks' USES= pkgconfig iconv gnustep USE_GNUSTEP= build USE_LDCONFIG= ${GNUSTEP_SYSTEM_LIBRARIES} @@ -42,7 +30,29 @@ MAKE_FLAGS= OPTFLAG="${CFLAGS}" ETCDIR= ${LOCALBASE}/etc STAGEHEADER= ${STAGEDIR}${PREFIX}/GNUstep/System/Library/Headers -PLIST_SUB+= BASEVERSION=${PORTVERSION:C/[.][0-9]*$//1} +PLIST_SUB+= BASEVERSION=${PORTVERSION:R} + +OPTIONS_DEFINE= ICU +OPTIONS_RADIO= SSL ZEROCONF +OPTIONS_RADIO_SSL= GNUTLS OPENSSL +OPTIONS_RADIO_ZEROCONF= AVAHI MDNS +OPTIONS_DEFAULT= ICU GNUTLS AVAHI +OPTIONS_SUB= yes + +ZEROCONF_DESC= Zeroconf (Bonjour) support +AVAHI_DESC= Zeroconf via Avahi (preferred) +MDNS_DESC= Zeroconf via mDNSResponder + +ICU_LIB_DEPENDS= libicuuc.so:${PORTSDIR}/devel/icu +ICU_CONFIGURE_OFF= --disable-icu + +GNUTLS_LIB_DEPENDS= libgnutls-openssl.so:${PORTSDIR}/security/gnutls +GNUTLS_CONFIGURE_ON= --with-tls-prefix=${LOCALBASE} \ + TLS_CONFIG="pkg-config -gnutls" +GNUTLS_CONFIGURE_OFF= --disable-tls + +OPENSSL_USE= OPENSSL=yes +OPENSSL_CONFIGURE_OFF= --disable-openssl .include <bsd.port.options.mk> @@ -57,8 +67,8 @@ CONFIGURE_ARGS+= --disable-zeroconf .endif post-extract: - @${REINPLACE_CMD} -e "s|/usr/local/|${LOCALBASE}/|" \ - ${WRKSRC}/configure + @${REINPLACE_CMD} -e "s|/usr/local/|${LOCALBASE}/| ; \ + s|HAVE_TLS|HAVE_GNUTLS|" ${WRKSRC}/configure post-install: ${INSTALL_DATA} ${FILESDIR}/gdomap_if ${STAGEDIR}${ETCDIR} Modified: head/lang/gnustep-base/pkg-plist ============================================================================== --- head/lang/gnustep-base/pkg-plist Wed Jan 13 12:33:45 2016 (r406036) +++ head/lang/gnustep-base/pkg-plist Wed Jan 13 12:37:57 2016 (r406037) @@ -823,6 +823,9 @@ GNUstep/System/Library/Libraries/gnustep GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/W-SU GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/WET GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/NSTimeZones/zones/Zulu +%%OPENSSL%%GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/SSL.bundle/Resources/Info-gnustep.plist +%%OPENSSL%%GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/SSL.bundle/SSL +%%OPENSSL%%GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/SSL.bundle/stamp.make GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/Spanish.lproj/Localizable.strings GNUstep/System/Library/Libraries/gnustep-base/Versions/%%BASEVERSION%%/Resources/TraditionalChinese.lproj/Localizable.strings GNUstep/System/Library/Libraries/libgnustep-base.so
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201601131237.u0DCbw1U053088>