Date: Sun, 21 Feb 2010 12:18:00 GMT From: Jan Henrik Sylvester <me@janh.de> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/144166: emulators/wine patch to (re)enable GnuTLS support Message-ID: <201002211218.o1LCI0nc068970@www.freebsd.org> Resent-Message-ID: <201002211220.o1LCK29D023293@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 144166 >Category: ports >Synopsis: emulators/wine patch to (re)enable GnuTLS support >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Sun Feb 21 12:20:01 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Jan Henrik Sylvester >Release: 8.0-RELEASE-p2 i386 >Organization: >Environment: >Description: Configuring with GnuTLS is needed by some application. Since GnuTLS might not be desired for every build, there should be an option to have it enabled. Unrelated: Writing the patch, I wondered if WITHOUT_CUPS should be changed to WITH_CUPS with the default for CUPS being "Off": --- emulators/wine/Makefile.orig 2010-02-21 12:05:26.000000000 +0100 +++ emulators/wine/Makefile 2010-02-21 12:49:13.000000000 +0100 @@ -55,11 +55,11 @@ .include <bsd.port.pre.mk> -.ifdef WITHOUT_CUPS -CONFIGURE_ARGS+= --without-cups -.else +.ifdef WITH_CUPS CONFIGURE_ARGS+= --with-cups LIB_DEPENDS+= cups.2:${PORTSDIR}/print/cups-base +.else +CONFIGURE_ARGS+= --without-cups .endif .ifdef WITH_HAL >How-To-Repeat: Start the game Warcraft III on a FreeBSD Wine after 1.1.29 (when --without-gnutls was introduced) and watch the application crash upon entering Battle.net. >Fix: The patch attached introduces an option for GnuTLS with default "On". If GnuTLS is known to cause problems, it might be better, if the default was "Off": --- emulators/wine/Makefile.orig 2010-02-19 23:44:14.000000000 +0100 +++ emulators/wine/Makefile 2010-02-21 11:39:30.000000000 +0100 @@ -26,9 +26,9 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --datadir=${DATADIR} --verbose --disable-tests \ - --without-capi --without-gnutls --without-gphoto \ - --without-gsm --without-mpg123 --without-openal \ - --without-sane --without-xcursor + --without-capi --without-gphoto --without-gsm \ + --without-mpg123 --without-openal --without-sane \ + --without-xcursor CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" \ FLEX="${LOCALBASE}/bin/flex" @@ -50,7 +50,8 @@ OPTIONS= CUPS "Use CUPS (Common UNIX Printing System)" Off \ HAL "Use HAL (Hardware Abstraction Layer)" Off \ LDAP "Use LDAP" Off \ - LIBXSLT "Use libxslt (only used by msxml3.dll)" Off + LIBXSLT "Use libxslt (only used by msxml3.dll)" Off \ + GNUTLS "Use GnuTLS" Off .include <bsd.port.pre.mk> @@ -82,6 +83,13 @@ CONFIGURE_ARGS+= --without-xslt .endif +.ifdef WITH_GNUTLS +CONFIGURE_ARGS+= --with-gnutls +LIB_DEPENDS+= gnutls.40:${PORTSDIR}/security/gnutls +.else +CONFIGURE_ARGS+= --without-gnutls +.endif + .if ${OSVERSION} < 603000 IGNORE= fails to properly work on versions of FreeBSD before 6.3 .endif Patch attached with submission follows: --- emulators/wine/Makefile.orig 2010-02-19 23:44:14.000000000 +0100 +++ emulators/wine/Makefile 2010-02-21 12:05:26.000000000 +0100 @@ -26,9 +26,9 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --datadir=${DATADIR} --verbose --disable-tests \ - --without-capi --without-gnutls --without-gphoto \ - --without-gsm --without-mpg123 --without-openal \ - --without-sane --without-xcursor + --without-capi --without-gphoto --without-gsm \ + --without-mpg123 --without-openal --without-sane \ + --without-xcursor CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" \ FLEX="${LOCALBASE}/bin/flex" @@ -50,7 +50,8 @@ OPTIONS= CUPS "Use CUPS (Common UNIX Printing System)" Off \ HAL "Use HAL (Hardware Abstraction Layer)" Off \ LDAP "Use LDAP" Off \ - LIBXSLT "Use libxslt (only used by msxml3.dll)" Off + LIBXSLT "Use libxslt (only used by msxml3.dll)" Off \ + GNUTLS "Use GnuTLS" On .include <bsd.port.pre.mk> @@ -82,6 +83,13 @@ CONFIGURE_ARGS+= --without-xslt .endif +.ifdef WITHOUT_GNUTLS +CONFIGURE_ARGS+= --without-gnutls +.else +CONFIGURE_ARGS+= --with-gnutls +LIB_DEPENDS+= gnutls.40:${PORTSDIR}/security/gnutls +.endif + .if ${OSVERSION} < 603000 IGNORE= fails to properly work on versions of FreeBSD before 6.3 .endif >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201002211218.o1LCI0nc068970>