Date: Sun, 9 Nov 2014 23:55:32 +0000 (UTC) From: Gerald Pfeifer <gerald@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r372381 - head/emulators/wine Message-ID: <201411092355.sA9NtWOL088433@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gerald Date: Sun Nov 9 23:55:32 2014 New Revision: 372381 URL: https://svnweb.freebsd.org/changeset/ports/372381 QAT: https://qat.redports.org/buildarchive/r372381/ Log: Merge back several changes and improvements from wine-devel: - Add new option MPG123 (off by default). - Move OPTIONS_SUB and several other statements related to options (..._CONFIGURE_WITH, ..._USES); no functional change. - Sort the sections for the GECKO and MONO options alphabetically. - Remove obsolete check for versions of FreeBSD older than 8.0. - Un-mute all invocations of ${INSTALL_DATA}. Modified: head/emulators/wine/Makefile Modified: head/emulators/wine/Makefile ============================================================================== --- head/emulators/wine/Makefile Sun Nov 9 23:01:33 2014 (r372380) +++ head/emulators/wine/Makefile Sun Nov 9 23:55:32 2014 (r372381) @@ -33,8 +33,8 @@ CONFIGURE_ARGS+=--verbose --disable-test --without-alsa --without-capi --without-dbus \ --with-fontconfig --with-glu \ --without-gphoto --without-gsm --without-gstreamer \ - --with-opengl --without-mpg123 --without-opencl \ - --with-oss --without-sane --without-tiff \ + --with-opengl \ + --without-opencl --with-oss --without-sane --without-tiff \ --without-v4l --with-xcomposite --without-xinerama \ --with-xinput2 --with-xrandr CONFIGURE_ENV= FLEX="${LOCALBASE}/bin/flex" @@ -47,56 +47,54 @@ USES= bison compiler:c11 gmake shebangf SHEBANG_FILES= tools/winemaker tools/winedump/function_grep.pl USE_GL= glu USE_XORG= xcomposite xcursor xi xpm xrandr xrender -OPTIONS_SUB= yes SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message -OPTIONS_DEFINE= CUPS DOSBOX GNUTLS HAL LDAP LIBXSLT OPENAL WINEMAKER GECKO MONO DOCS +OPTIONS_DEFINE= CUPS DOSBOX GNUTLS HAL LDAP LIBXSLT MPG123 OPENAL WINEMAKER GECKO MONO DOCS +OPTIONS_SUB= yes + DOSBOX_DESC= Use DOSBox to run MS-DOS programs LIBXSLT_DESC= Use libxslt (only used by msxml3.dll) WINEMAKER_DESC= Fully support winemaker (requires Perl) GECKO_DESC= Bundle Gecko MSI package for Wine MONO_DESC= Bundle Mono MSI package for Wine -# USES needs to be before bsd.port.pre.mk -OPENAL_USES= openal - PORTDATA= fonts/ generic.ppd l_intl.nls wine.inf PORTSCOUT= limitw:1,even -CUPS_LIB_DEPENDS= libcups.so:${PORTSDIR}/print/cups-client CUPS_CONFIGURE_WITH= cups +CUPS_LIB_DEPENDS= libcups.so:${PORTSDIR}/print/cups-client DOSBOX_RUN_DEPENDS= dosbox:${PORTSDIR}/emulators/dosbox -GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls +GECKO_RUN_DEPENDS= ${DATADIR}/gecko/wine_gecko-2.21-x86.msi:${PORTSDIR}/emulators/wine-gecko + GNUTLS_CONFIGURE_WITH= gnutls +GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls -HAL_LIB_DEPENDS= libhal.so:${PORTSDIR}/sysutils/hal HAL_CONFIGURE_WITH= hal +HAL_LIB_DEPENDS= libhal.so:${PORTSDIR}/sysutils/hal -LDAP_USE= OPENLDAP=yes LDAP_CONFIGURE_WITH= ldap +LDAP_USE= OPENLDAP=yes -LIBXSLT_LIB_DEPENDS= libxslt.so:${PORTSDIR}/textproc/libxslt LIBXSLT_CONFIGURE_WITH= xslt +LIBXSLT_LIB_DEPENDS= libxslt.so:${PORTSDIR}/textproc/libxslt -OPENAL_CONFIGURE_WITH= openal +MONO_RUN_DEPENDS= ${DATADIR}/mono/wine-mono-0.0.8.msi:${PORTSDIR}/emulators/wine-mono -WINEMAKER_RUN_DEPENDS= p5-XML-LibXML>0:${PORTSDIR}/textproc/p5-XML-LibXML +MPG123_CONFIGURE_WITH= mpg123 +MPG123_LIB_DEPENDS= libmpg123.so:${PORTSDIR}/audio/mpg123 -GECKO_RUN_DEPENDS= ${DATADIR}/gecko/wine_gecko-2.21-x86.msi:${PORTSDIR}/emulators/wine-gecko +OPENAL_CONFIGURE_WITH= openal +OPENAL_USES= openal -MONO_RUN_DEPENDS= ${DATADIR}/mono/wine-mono-0.0.8.msi:${PORTSDIR}/emulators/wine-mono +WINEMAKER_RUN_DEPENDS= p5-XML-LibXML>0:${PORTSDIR}/textproc/p5-XML-LibXML .include <bsd.port.pre.mk> -.if ${OSVERSION} < 800000 -IGNORE= lacks required sound support on FreeBSD before 8.0 -.endif - pre-build: cd ${WRKSRC} && ${MAKE_CMD} depend @@ -106,9 +104,9 @@ post-install: @${LN} -sf libwine.so.1 ${STAGEDIR}/${WINELIBDIR}/libwine.so -@${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in README ANNOUNCE AUTHORS - @${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} .endfor - @${INSTALL_DATA} ${WRKSRC}/programs/winedbg/README ${STAGEDIR}${DOCSDIR}/README.winedbg - @${INSTALL_DATA} ${WRKSRC}/tools/winedump/README ${STAGEDIR}${DOCSDIR}/README.winedump + ${INSTALL_DATA} ${WRKSRC}/programs/winedbg/README ${STAGEDIR}${DOCSDIR}/README.winedbg + ${INSTALL_DATA} ${WRKSRC}/tools/winedump/README ${STAGEDIR}${DOCSDIR}/README.winedump .include <bsd.port.post.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411092355.sA9NtWOL088433>