From owner-svn-ports-head@freebsd.org Sat Jun 16 12:42:07 2018 Return-Path: Delivered-To: svn-ports-head@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 54E751015B07; Sat, 16 Jun 2018 12:42:07 +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 0A37380C60; Sat, 16 Jun 2018 12:42:07 +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 E079B266A3; Sat, 16 Jun 2018 12:42:06 +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 w5GCg6Ii039954; Sat, 16 Jun 2018 12:42:06 GMT (envelope-from gerald@FreeBSD.org) Received: (from gerald@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5GCg6tI039953; Sat, 16 Jun 2018 12:42:06 GMT (envelope-from gerald@FreeBSD.org) Message-Id: <201806161242.w5GCg6tI039953@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gerald set sender to gerald@FreeBSD.org using -f From: Gerald Pfeifer Date: Sat, 16 Jun 2018 12:42:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r472543 - head/emulators/wine X-SVN-Group: ports-head X-SVN-Commit-Author: gerald X-SVN-Commit-Paths: head/emulators/wine X-SVN-Commit-Revision: 472543 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Jun 2018 12:42:07 -0000 Author: gerald Date: Sat Jun 16 12:42:06 2018 New Revision: 472543 URL: https://svnweb.freebsd.org/changeset/ports/472543 Log: Port revision 471203 from the wine-devel port to the main wine port: 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/Makefile Modified: head/emulators/wine/Makefile ============================================================================== --- head/emulators/wine/Makefile Sat Jun 16 12:26:56 2018 (r472542) +++ head/emulators/wine/Makefile Sat Jun 16 12:42:06 2018 (r472543) @@ -24,8 +24,6 @@ LIB_DEPENDS= libxml2.so:textproc/libxml2 CONFLICTS_INSTALL= wine-staging-[0-9]* wine-devel-[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-tests \ --without-alsa --without-capi --without-dbus \ @@ -41,7 +39,7 @@ CONFIGURE_ARGS+=--verbose --disable-tests \ --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