diff options
| author | gerald <gerald@FreeBSD.org> | 2010-03-01 08:24:22 +0800 |
|---|---|---|
| committer | gerald <gerald@FreeBSD.org> | 2010-03-01 08:24:22 +0800 |
| commit | 331950beb98f83b6bb506ebd8d04901af6b7c609 (patch) | |
| tree | 9d54761338a19d42f47ffee38aefbfe0b05f952d /emulators | |
| parent | cc49e7398cf4ca333d7fb49a4c3c6a899ed70a1d (diff) | |
| download | freebsd-ports-gnome-331950beb98f83b6bb506ebd8d04901af6b7c609.tar.gz freebsd-ports-gnome-331950beb98f83b6bb506ebd8d04901af6b7c609.tar.zst freebsd-ports-gnome-331950beb98f83b6bb506ebd8d04901af6b7c609.zip | |
Add a GNUTLS knob (off by default for now) that controls our use of the
GNU Transport Layer Security library, aka the security/gnutls port.
Before 2009-09-26/revision 1.311 we had used this opportunistically,
then it was disabled across the board to guarantee consistent builds
and packages, and now it's a proper option that is needed for the game
of Warcraft III and possibly others.
PR: 144166
Submitted by: Jan Henrik Sylvester <me@janh.de>
Adjusted by: gerald
Feature safe: yes
Diffstat (limited to 'emulators')
| -rw-r--r-- | emulators/wine-devel/Makefile | 10 | ||||
| -rw-r--r-- | emulators/wine/Makefile | 10 |
2 files changed, 18 insertions, 2 deletions
diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile index f51ae6c8602c..4ebc4c266525 100644 --- a/emulators/wine-devel/Makefile +++ b/emulators/wine-devel/Makefile @@ -26,7 +26,7 @@ LIB_DEPENDS= fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \ GNU_CONFIGURE= yes CONFIGURE_ARGS= --datadir=${DATADIR} --verbose --disable-tests \ - --without-capi --without-gnutls --without-gphoto \ + --without-capi --without-gphoto \ --without-gsm --without-mpg123 --without-openal \ --without-sane --without-xcursor CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ @@ -48,6 +48,7 @@ SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message OPTIONS= CUPS "Use CUPS (Common UNIX Printing System)" Off \ + GNUTLS "Use GnuTLS" Off \ HAL "Use HAL (Hardware Abstraction Layer)" Off \ LDAP "Use LDAP" Off \ LIBXSLT "Use libxslt (only used by msxml3.dll)" Off @@ -61,6 +62,13 @@ CONFIGURE_ARGS+= --with-cups LIB_DEPENDS+= cups.2:${PORTSDIR}/print/cups-base .endif +.ifdef WITH_GNUTLS +CONFIGURE_ARGS+= --with-gnutls +LIB_DEPENDS+= gnutls.40:${PORTSDIR}/security/gnutls +.else +CONFIGURE_ARGS+= --without-gnutls +.endif + .ifdef WITH_HAL CONFIGURE_ARGS+= --with-hal LIB_DEPENDS+= hal.1:${PORTSDIR}/sysutils/hal diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile index f51ae6c8602c..4ebc4c266525 100644 --- a/emulators/wine/Makefile +++ b/emulators/wine/Makefile @@ -26,7 +26,7 @@ LIB_DEPENDS= fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \ GNU_CONFIGURE= yes CONFIGURE_ARGS= --datadir=${DATADIR} --verbose --disable-tests \ - --without-capi --without-gnutls --without-gphoto \ + --without-capi --without-gphoto \ --without-gsm --without-mpg123 --without-openal \ --without-sane --without-xcursor CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ @@ -48,6 +48,7 @@ SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message OPTIONS= CUPS "Use CUPS (Common UNIX Printing System)" Off \ + GNUTLS "Use GnuTLS" Off \ HAL "Use HAL (Hardware Abstraction Layer)" Off \ LDAP "Use LDAP" Off \ LIBXSLT "Use libxslt (only used by msxml3.dll)" Off @@ -61,6 +62,13 @@ CONFIGURE_ARGS+= --with-cups LIB_DEPENDS+= cups.2:${PORTSDIR}/print/cups-base .endif +.ifdef WITH_GNUTLS +CONFIGURE_ARGS+= --with-gnutls +LIB_DEPENDS+= gnutls.40:${PORTSDIR}/security/gnutls +.else +CONFIGURE_ARGS+= --without-gnutls +.endif + .ifdef WITH_HAL CONFIGURE_ARGS+= --with-hal LIB_DEPENDS+= hal.1:${PORTSDIR}/sysutils/hal |