Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 31 May 2018 12:27:52 +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: r471203 - head/emulators/wine-devel
Message-ID:  <201805311227.w4VCRqR4059444@repo.freebsd.org>

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

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



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