Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 16 Jun 2018 12:42:06 +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: r472543 - head/emulators/wine
Message-ID:  <201806161242.w5GCg6tI039953@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <z7dr6ut7gs@snkmail.com>

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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201806161242.w5GCg6tI039953>