From owner-svn-ports-all@freebsd.org Thu May 31 12:27:53 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 60EC1F7A7BF; Thu, 31 May 2018 12:27:53 +0000 (UTC) (envelope-from gerald@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 137618228F; Thu, 31 May 2018 12:27:53 +0000 (UTC) (envelope-from gerald@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E42D51A248; Thu, 31 May 2018 12:27:52 +0000 (UTC) (envelope-from gerald@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4VCRqNQ059445; Thu, 31 May 2018 12:27:52 GMT (envelope-from gerald@FreeBSD.org) Received: (from gerald@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4VCRqR4059444; Thu, 31 May 2018 12:27:52 GMT (envelope-from gerald@FreeBSD.org) Message-Id: <201805311227.w4VCRqR4059444@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gerald set sender to gerald@FreeBSD.org using -f From: Gerald Pfeifer Date: Thu, 31 May 2018 12:27:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r471203 - head/emulators/wine-devel X-SVN-Group: ports-head X-SVN-Commit-Author: gerald X-SVN-Commit-Paths: head/emulators/wine-devel X-SVN-Commit-Revision: 471203 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.26 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: Thu, 31 May 2018 12:27:53 -0000 Author: gerald Date: Thu May 31 12:27:52 2018 New Revision: 471203 URL: https://svnweb.freebsd.org/changeset/ports/471203 Log: Replace explicit settings of CFLAGS and LDFLAGS in favor of USES=localbase (the former predating the latter by at least a decade alas with variation). PR: 226396 Submitted by: John Hein Modified: head/emulators/wine-devel/Makefile Modified: head/emulators/wine-devel/Makefile ============================================================================== --- head/emulators/wine-devel/Makefile Thu May 31 12:16:24 2018 (r471202) +++ head/emulators/wine-devel/Makefile Thu May 31 12:27:52 2018 (r471203) @@ -26,8 +26,6 @@ LIB_DEPENDS= libxml2.so:textproc/libxml2 CONFLICTS_INSTALL= wine-[0-9]* wine-staging-[0-9]* i386-wine-[0-9]* \ i386-wine-staging-[0-9]* i386-wine-devel-[0-9]* -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib GNU_CONFIGURE= yes CONFIGURE_ARGS+=--verbose \ --disable-kerberos \ @@ -45,7 +43,7 @@ CONFIGURE_ARGS+=--verbose \ --without-udev CONFIGURE_ENV= CPPBIN="${CPP}" FLEX="${LOCALBASE}/bin/flex" WINELIBDIR?= ${PREFIX}/lib -USES= bison compiler:c11 desktop-file-utils gmake shebangfix tar:xz +USES= bison compiler:c11 desktop-file-utils gmake localbase shebangfix tar:xz .if !defined(USE_LDCONFIG32) USE_LDCONFIG= ${WINELIBDIR} ${WINELIBDIR}/wine .endif @@ -57,7 +55,7 @@ SUB_FILES= pkg-message PORTDATA= l_intl.nls wine.inf OPTIONS_DEFINE= CUPS DOCS DOSBOX GNUTLS HAL LDAP LIBXSLT MPG123 OPENAL STAGING V4L VKD3D WINEMAKER X11 GECKO MONO -OPTIONS_DEFAULT=GNUTLS X11 +OPTIONS_DEFAULT=GNUTLS X11 STAGING OPTIONS_SUB= yes DOSBOX_DESC= Use DOSBox to run MS-DOS programs