From owner-svn-ports-all@FreeBSD.ORG Sun Aug 5 15:42:52 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D2FDD1065670; Sun, 5 Aug 2012 15:42:52 +0000 (UTC) (envelope-from gerald@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id BCF0F8FC0A; Sun, 5 Aug 2012 15:42:52 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q75Fgqkv098722; Sun, 5 Aug 2012 15:42:52 GMT (envelope-from gerald@svn.freebsd.org) Received: (from gerald@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q75FgqL7098720; Sun, 5 Aug 2012 15:42:52 GMT (envelope-from gerald@svn.freebsd.org) Message-Id: <201208051542.q75FgqL7098720@svn.freebsd.org> From: Gerald Pfeifer Date: Sun, 5 Aug 2012 15:42:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r302111 - head/emulators/wine X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.5 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, 05 Aug 2012 15:42:52 -0000 Author: gerald Date: Sun Aug 5 15:42:52 2012 New Revision: 302111 URL: http://svn.freebsd.org/changeset/ports/302111 Log: Adapt to the new options framework. Remove ABI version numbers for all library dependencies. Use --with-fontconfig during configuration, since we already have fontconfig as a dependency. Modified: head/emulators/wine/Makefile Modified: head/emulators/wine/Makefile ============================================================================== --- head/emulators/wine/Makefile Sun Aug 5 15:41:15 2012 (r302110) +++ head/emulators/wine/Makefile Sun Aug 5 15:42:52 2012 (r302111) @@ -20,10 +20,10 @@ LICENSE_COMB= dual LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex -LIB_DEPENDS= fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \ - freetype.9:${PORTSDIR}/print/freetype2 \ - jpeg.11:${PORTSDIR}/graphics/jpeg \ - lcms.1:${PORTSDIR}/graphics/lcms \ +LIB_DEPENDS= fontconfig:${PORTSDIR}/x11-fonts/fontconfig \ + freetype:${PORTSDIR}/print/freetype2 \ + jpeg:${PORTSDIR}/graphics/jpeg \ + lcms:${PORTSDIR}/graphics/lcms \ png15:${PORTSDIR}/graphics/png \ xml2:${PORTSDIR}/textproc/libxml2 @@ -33,7 +33,8 @@ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib GNU_CONFIGURE= yes CONFIGURE_ARGS+=--verbose --disable-tests \ - --without-alsa --without-capi --without-dbus --with-glu \ + --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 \ @@ -61,14 +62,11 @@ USE_XORG= xcursor xi xpm xrandr xrender SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message -OPTIONS= CUPS "Use CUPS (Common UNIX Printing System)" Off \ - DOSBOX "Use DOSBox to run MS-DOS programs" 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 \ - OPENAL "Use OpenAL (3D audio library)" Off \ - WINEMAKER "Fully support winemaker (requires Perl)" Off +OPTIONS_DEFINE= CUPS DOSBOX GNUTLS HAL LDAP LIBXSLT OPENAL WINEMAKER + +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) PORTDATA= fonts/ generic.ppd l_intl.nls wine.inf @@ -76,46 +74,46 @@ PORTSCOUT= limitw:1,even .include -.ifdef WITHOUT_CUPS -CONFIGURE_ARGS+= --without-cups -.else +.if ${PORT_OPTIONS:MCUPS} CONFIGURE_ARGS+= --with-cups -LIB_DEPENDS+= cups.2:${PORTSDIR}/print/cups-client +LIB_DEPENDS+= cups:${PORTSDIR}/print/cups-client +.else +CONFIGURE_ARGS+= --without-cups .endif -.ifdef WITH_DOSBOX +.if ${PORT_OPTIONS:MDOSBOX} RUN_DEPENDS+= dosbox:${PORTSDIR}/emulators/dosbox .endif -.ifdef WITH_GNUTLS +.if ${PORT_OPTIONS:MGNU_TLS} CONFIGURE_ARGS+= --with-gnutls -LIB_DEPENDS+= gnutls.47:${PORTSDIR}/security/gnutls +LIB_DEPENDS+= gnutls:${PORTSDIR}/security/gnutls .else CONFIGURE_ARGS+= --without-gnutls .endif -.ifdef WITH_HAL +.if ${PORT_OPTIONS:MHAL} CONFIGURE_ARGS+= --with-hal -LIB_DEPENDS+= hal.1:${PORTSDIR}/sysutils/hal +LIB_DEPENDS+= hal:${PORTSDIR}/sysutils/hal .else CONFIGURE_ARGS+= --without-hal .endif -.ifdef WITH_LDAP +.if ${PORT_OPTIONS:MLDAP} CONFIGURE_ARGS+= --with-ldap USE_OPENLDAP= yes .else CONFIGURE_ARGS+= --without-ldap .endif -.ifdef WITH_LIBXSLT +.if ${PORT_OPTIONS:MLIBXSLT} CONFIGURE_ARGS+= --with-xslt -LIB_DEPENDS+= xslt.2:${PORTSDIR}/textproc/libxslt +LIB_DEPENDS+= xslt:${PORTSDIR}/textproc/libxslt .else CONFIGURE_ARGS+= --without-xslt .endif -.ifdef WITH_OPENAL +.if ${PORT_OPTIONS:MOPENAL} CONFIGURE_ARGS+= --with-openal USE_OPENAL= yes PLIST_SUB+= OPENAL="" @@ -124,7 +122,7 @@ CONFIGURE_ARGS+= --without-openal PLIST_SUB+= OPENAL="@comment " .endif -.ifdef WITH_WINEMAKER +.if ${PORT_OPTIONS:MWINEMAKER} RUN_DEPENDS+= p5-XML-LibXML>0:${PORTSDIR}/textproc/p5-XML-LibXML .endif