Attachment 178082 Details for Bug 215401 – v0

[patch] v0

machine_arch.diff (text/plain), 15.54 KB, created by Jan Beich on 2016-12-19 01:40:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2016-12-19 01:40:58 UTC

Size: 15.54 KB

patch

obsolete

>From c544c6d49f882a5639417e3dac28875e64fb94ae Mon Sep 17 00:00:00 2001
>From: Jan Beich <jbeich@FreeBSD.org>
>Date: Sun, 18 Dec 2016 22:25:45 +0000
>Subject: Retrieve ARCH from make(1) cache to speed up index build
>
>PR:		?
>Exp-run by:	?
>Approved by:	?
>---
> Mk/bsd.port.mk                         | 5 +----
> Mk/bsd.port.subdir.mk                  | 5 +----
> benchmarks/nttcp/Makefile              | 1 -
> cad/netgen/Makefile                    | 4 +---
> devel/ald/Makefile                     | 1 -
> emulators/i386-wine-devel/Makefile     | 6 +-----
> emulators/i386-wine-staging/Makefile   | 4 +---
> emulators/i386-wine/Makefile           | 6 +-----
> graphics/EZWGL/Makefile                | 2 --
> java/bootstrap-openjdk/Makefile.update | 4 +---
> java/openjdk6/Makefile                 | 3 ---
> java/openjdk7/Makefile                 | 2 --
> java/openjdk8/Makefile                 | 1 -
> lang/rust-nightly/Makefile             | 1 -
> lang/swi-pl/Makefile                   | 1 -
> multimedia/avidemux/Makefile.common    | 1 -
> multimedia/ffmpeg/Makefile             | 1 -
> multimedia/ffmpeg0/Makefile            | 1 -
> multimedia/gstreamer-ffmpeg/Makefile   | 1 -
> multimedia/handbrake/Makefile          | 2 --
> multimedia/kodi/Makefile               | 1 -
> multimedia/libav/Makefile              | 1 -
> multimedia/mplayer/Makefile.common     | 1 -
> multimedia/mythtv-frontend/Makefile    | 1 -
> multimedia/mythtv/Makefile             | 1 -
> net-im/ejabberd/Makefile               | 1 -
> net/opensips/Makefile                  | 2 --
> sysutils/and/Makefile                  | 1 -
> sysutils/cdrtools-devel/Makefile       | 2 +-
> sysutils/cdrtools/Makefile             | 2 +-
> x11-toolkits/py-kivy/Makefile          | 6 +-----
> x11-toolkits/tk85/Makefile             | 1 -
> 32 files changed, 10 insertions(+), 62 deletions(-)
>
>diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
>index 26492211b6ea..e2bf75d7bc29 100644
>--- a/Mk/bsd.port.mk
>+++ b/Mk/bsd.port.mk
>@@ -1107,10 +1107,7 @@ makepatch:
> MAINTAINER?=	ports@FreeBSD.org
> 
> # Get the architecture
>-.if !defined(ARCH)
>-ARCH!=	${UNAME} -p
>-.endif
>-_EXPORTED_VARS+=	ARCH
>+ARCH?=	${MACHINE_ARCH}
> 
> # Get the operating system type
> .if !defined(OPSYS)
>diff --git a/Mk/bsd.port.subdir.mk b/Mk/bsd.port.subdir.mk
>index 2321b62bfd44..525485a0446c 100644
>--- a/Mk/bsd.port.subdir.mk
>+++ b/Mk/bsd.port.subdir.mk
>@@ -60,10 +60,7 @@ STRIP?=	-s
> # to child makes explicitly, instead of recomputing them tens of thousands of times.
> 
> .if !defined(NOPRECIOUSMAKEVARS)
>-.if !defined(ARCH)
>-ARCH!=	${UNAME} -p
>-.endif
>-_EXPORTED_VARS+=	ARCH
>+ARCH?=	${MACHINE_ARCH}
> 
> .if !defined(OSVERSION)
> .if exists(/usr/include/sys/param.h)
>diff --git a/benchmarks/nttcp/Makefile b/benchmarks/nttcp/Makefile
>index 5e4c7daa523d..631e66d4a2bf 100644
>--- a/benchmarks/nttcp/Makefile
>+++ b/benchmarks/nttcp/Makefile
>@@ -17,7 +17,6 @@ RESTRICTED=	No commercial use
> ALL_TARGET=	nttcp
> USES=		gmake
> MAKE_ENV+=	OPT="${CFLAGS}"
>-NOPRECIOUSMAKEVARS=yes
> 
> PLIST_FILES=	bin/nttcp man/man1/nttcp.1.gz
> 
>diff --git a/cad/netgen/Makefile b/cad/netgen/Makefile
>index e5c93bbd9050..5e66eb6e7a60 100644
>--- a/cad/netgen/Makefile
>+++ b/cad/netgen/Makefile
>@@ -40,14 +40,12 @@ OCC_CONFIGURE_ON=	--enable-occ
> FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
> FFMPEG_CONFIGURE_ON=	--enable-ffmpeg
> 
>-MACHINE=	${OPSYS:tu}
>-
> SUB_LIST=	PREFIX=${PREFIX}
> SUB_FILES=	pkg-message
> MAKE_ENV=	TK_VER=${TK_VER} TCL_VER=${TCL_VER}	\
> 		TCL_INCLUDEDIR="${TCL_INCLUDEDIR}"	\
> 		TK_INCLUDEDIR="${TK_INCLUDEDIR}"	\
>-		MACHINE=${MACHINE} MAKE=${MAKE_CMD}
>+		MACHINE=${OPSYS:tu} MAKE=${MAKE_CMD}
> 
> post-patch:
> 	@${REINPLACE_CMD} -e '/ngdir/s,"\.","${PREFIX}/bin",' \
>diff --git a/devel/ald/Makefile b/devel/ald/Makefile
>index a0258bdb99c3..3b4563960939 100644
>--- a/devel/ald/Makefile
>+++ b/devel/ald/Makefile
>@@ -14,6 +14,5 @@ USES=			readline
> 
> PLIST_FILES=		bin/ald man/man8/ald.8.gz
> ONLY_FOR_ARCHS=		i386
>-NOPRECIOUSMAKEVARS=	yes
> 
> .include <bsd.port.mk>
>diff --git a/emulators/i386-wine-devel/Makefile b/emulators/i386-wine-devel/Makefile
>index 1d7c8c7d8fa5..62cb882fb41b 100644
>--- a/emulators/i386-wine-devel/Makefile
>+++ b/emulators/i386-wine-devel/Makefile
>@@ -5,11 +5,7 @@
> #  - i386 specific port to be slave to ${PORTSDIR}/emulators/wine-devel
> #  - amd64 specific port to be normal port (based on binary package)
> 
>-.if !defined(ARCH)
>-ARCH!=		uname -p
>-.endif
>-
>-.if ${ARCH} == i386
>+.if ${MACHINE_ARCH} == i386
> .include "${.CURDIR}/Makefile.i386"
> .else
> .include "${.CURDIR}/Makefile.inc"
>diff --git a/emulators/i386-wine-staging/Makefile b/emulators/i386-wine-staging/Makefile
>index 71b361ec8f03..d9ae33cc3172 100644
>--- a/emulators/i386-wine-staging/Makefile
>+++ b/emulators/i386-wine-staging/Makefile
>@@ -13,9 +13,7 @@ OPTIONS_DEFAULT=	LIBXSLT MPG123 HAL V4L X11
> SLAVEDIR=	${.CURDIR}/../i386-wine-devel
> PLIST=		${MASTERDIR}/pkg-plist
> 
>-.if !defined(ARCH)
>-ARCH!=          uname -p
>-.endif
>+ARCH?=	${MACHINE_ARCH}
> 
> PKGNAMESUFFIX=	-staging
> .if ${ARCH} == i386
>diff --git a/emulators/i386-wine/Makefile b/emulators/i386-wine/Makefile
>index 3e65cfa1622b..ad6d8ad0b72c 100644
>--- a/emulators/i386-wine/Makefile
>+++ b/emulators/i386-wine/Makefile
>@@ -5,11 +5,7 @@
> #  - i386 specific port to be slave to ${PORTSDIR}/emulators/wine
> #  - amd64 specific port to be normal port (based on binary package)
> 
>-.if !defined(ARCH)
>-ARCH!=		uname -p
>-.endif
>-
>-.if ${ARCH} == i386
>+.if ${MACHINE_ARCH} == i386
> .include "${.CURDIR}/Makefile.i386"
> .else
> .include "${.CURDIR}/Makefile.inc"
>diff --git a/graphics/EZWGL/Makefile b/graphics/EZWGL/Makefile
>index 07d143a625f7..2c475caed209 100644
>--- a/graphics/EZWGL/Makefile
>+++ b/graphics/EZWGL/Makefile
>@@ -22,8 +22,6 @@ LIBS+=		-L${LOCALBASE}/lib
> PORTDOCS=	*
> PORTEXAMPLES=	*
> 
>-NOPRECIOUSMAKEVARS=	yes # Otherwise 'make readmes' is broken
>-
> BROKEN_sparc64=	Does not compile on sparc64
> 
> OPTIONS_DEFINE=	DOCS EXAMPLES
>diff --git a/java/bootstrap-openjdk/Makefile.update b/java/bootstrap-openjdk/Makefile.update
>index c3da35f51d7e..da5c43ccf944 100644
>--- a/java/bootstrap-openjdk/Makefile.update
>+++ b/java/bootstrap-openjdk/Makefile.update
>@@ -25,9 +25,7 @@ JDK_IMAGEDIR?=	${JDK_PORTDIR}/work/stage/usr/local/${JDK_PORT}
> GET_REVISION=	${LOCALBASE}/bin/svnversion ${JDK_PORTDIR}
> TAR?=		/usr/bin/tar
> 
>-.if !defined(ARCH)
>-ARCH!=		${UNAME} -p
>-.endif
>+ARCH?=		${MACHINE_ARCH}
> BUILD_OS!=	${UNAME} -r | ${SED} -e 's/\..*//'
> PORTREVISION!=	${GET_REVISION} 2>/dev/null || ${TRUE}
> 
>diff --git a/java/openjdk6/Makefile b/java/openjdk6/Makefile
>index dcfe195412dd..45c408263058 100644
>--- a/java/openjdk6/Makefile
>+++ b/java/openjdk6/Makefile
>@@ -77,9 +77,6 @@ CATEGORIES+=	ipv6
> RUN_DEPENDS+=	java-zoneinfo>0:java/java-zoneinfo
> .endif
> 
>-# avoid ARCH in MAKEFLAGS, breaks build
>-NOPRECIOUSMAKEVARS=	yes
>-
> ONLY_FOR_ARCHS=	amd64 i386
> 
> BOOTSTRAP_JDKS=	${LOCALBASE}/openjdk6 \
>diff --git a/java/openjdk7/Makefile b/java/openjdk7/Makefile
>index c835fe57969b..b2517e9c2405 100644
>--- a/java/openjdk7/Makefile
>+++ b/java/openjdk7/Makefile
>@@ -99,8 +99,6 @@ DOS2UNIX_FILES=	jdk/src/share/classes/com/sun/org/apache/xml/internal/security/r
> 
> OPENJDK_OSARCH=	bsd-${ARCH:S/i386/i586/}
> 
>-NOPRECIOUSMAKEVARS=	yes
>-
> ONLY_FOR_ARCHS=	i386 amd64
> 
> _MAKE_JOBS=	#
>diff --git a/java/openjdk8/Makefile b/java/openjdk8/Makefile
>index 09df28d03bd9..f1886cff22e3 100644
>--- a/java/openjdk8/Makefile
>+++ b/java/openjdk8/Makefile
>@@ -219,7 +219,6 @@ JDK_OSARCH=	bsd-${ARCH:S/amd64/x86_64/:S/armv6/arm/:S/i386/x86/}
> INSTALLDIR=	${PREFIX}/${PKGBASE}
> 
> NO_CCACHE=		yes
>-NOPRECIOUSMAKEVARS=	yes
> 
> JDK_MAJOR_VERSION=	8
> JDK_UPDATE_VERSION=	112
>diff --git a/lang/rust-nightly/Makefile b/lang/rust-nightly/Makefile
>index 2106d8decb80..c821797cbeb1 100644
>--- a/lang/rust-nightly/Makefile
>+++ b/lang/rust-nightly/Makefile
>@@ -34,7 +34,6 @@ RUST_BOOT_VERSION=	beta
> PORT_LLVM_EXTRACT_ONLY_OFF=	${DISTFILE_llvm}
> PORT_LLVM_GH_PROJECT_OFF=	llvm:llvm
> PORT_LLVM_GH_TAGNAME_OFF=	7ca76af:llvm
>-PORT_LLVM_VARS_OFF=		NOPRECIOUSMAKEVARS=1 # ARCH
> 
> post-extract-PORT_LLVM-off:
> 	@(${RMDIR} ${WRKSRC}/src/llvm && \
>diff --git a/lang/swi-pl/Makefile b/lang/swi-pl/Makefile
>index 22dfbc95ebf2..197442067d69 100644
>--- a/lang/swi-pl/Makefile
>+++ b/lang/swi-pl/Makefile
>@@ -16,7 +16,6 @@ LIB_DEPENDS=	libgmp.so:math/gmp \
> 
> SWIPLDIR=	${PORTNAME:C/-//}-${PORTVERSION}
> 
>-NOPRECIOUSMAKEVARS=	yes
> USE_XORG=	xft xpm xt
> USES=		gmake jpeg libarchive pathfix pkgconfig shebangfix ssl
> MAKE_JOBS_UNSAFE=	yes
>diff --git a/multimedia/avidemux/Makefile.common b/multimedia/avidemux/Makefile.common
>index f94734d5078a..f6e53bc7db41 100644
>--- a/multimedia/avidemux/Makefile.common
>+++ b/multimedia/avidemux/Makefile.common
>@@ -27,7 +27,6 @@ CMAKE_ARGS+=	-DAVIDEMUX_PACKAGER=none
> CMAKE_ARGS+=	-DQT5:BOOL=OFF
> CXXFLAGS+=	-I${LOCALBASE}/include
> MAKE_JOBS_UNSAFE=	yes
>-NOPRECIOUSMAKEVARS=	yes # ARCH
> 
> BUILD_DEPENDS+=	${LOCALBASE}/bin/as:devel/binutils
> CONFIGURE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
>diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
>index 7b947e7ac6b0..c2d8a517c2f6 100644
>--- a/multimedia/ffmpeg/Makefile
>+++ b/multimedia/ffmpeg/Makefile
>@@ -22,7 +22,6 @@ USES=		compiler:c11 cpe gmake localbase perl5 pkgconfig shebangfix tar:bzip2
> USE_LDCONFIG=	yes
> USE_PERL5=	build
> SHEBANG_FILES=	doc/texi2pod.pl
>-NOPRECIOUSMAKEVARS=	yes # ARCH
> 
> PORTSCOUT=	limit:^3\.
> 
>diff --git a/multimedia/ffmpeg0/Makefile b/multimedia/ffmpeg0/Makefile
>index bcbf1464f4a3..200522dfdddc 100644
>--- a/multimedia/ffmpeg0/Makefile
>+++ b/multimedia/ffmpeg0/Makefile
>@@ -27,7 +27,6 @@ USES=		cpe gmake perl5 pkgconfig tar:bzip2 shebangfix
> USE_LDCONFIG=	${PREFIX}/lib/ffmpeg${FFMPEG_SUFFIX}
> USE_PERL5=	build
> SHEBANG_FILES=	doc/texi2pod.pl
>-NOPRECIOUSMAKEVARS=	yes # ARCH
> 
> FFMPEG_SUFFIX=	0
> HAS_CONFIGURE=	yes
>diff --git a/multimedia/gstreamer-ffmpeg/Makefile b/multimedia/gstreamer-ffmpeg/Makefile
>index a5937e0941de..e287b0ce25b4 100644
>--- a/multimedia/gstreamer-ffmpeg/Makefile
>+++ b/multimedia/gstreamer-ffmpeg/Makefile
>@@ -33,7 +33,6 @@ FFMPEG_DESC?=	Use system ffmpeg instead of internal libav
> 
> FFMPEG_LIB_DEPENDS=libavcodec0.so:multimedia/ffmpeg0
> FFMPEG_CONFIGURE_WITH=system-ffmpeg
>-FFMPEG_VARS_OFF=NOPRECIOUSMAKEVARS=yes # ARCH
> 
> FFMPEG_DISTFILES_OFF=libav-${LIBAV_VERSION}.tar.xz:libav
> FFMPEG_BUILD_DEPENDS_OFF=yasm:devel/yasm
>diff --git a/multimedia/handbrake/Makefile b/multimedia/handbrake/Makefile
>index 703084a354ce..f7da1af4e8a5 100644
>--- a/multimedia/handbrake/Makefile
>+++ b/multimedia/handbrake/Makefile
>@@ -68,8 +68,6 @@ MAKEFILE=	GNUmakefile
> ALL_TARGET=	#
> MAKE_JOBS_UNSAFE=	yes
> 
>-NOPRECIOUSMAKEVARS=	yes			# for ffmpeg and x264
>-
> # Enforce linking to bundled libraries instead of system libraries
> LDFLAGS+=	-L${BUILD_WRKSRC}/contrib/lib
> 
>diff --git a/multimedia/kodi/Makefile b/multimedia/kodi/Makefile
>index a1fa31c50df5..7281e37b6bde 100644
>--- a/multimedia/kodi/Makefile
>+++ b/multimedia/kodi/Makefile
>@@ -80,7 +80,6 @@ USE_JAVA=	yes
> USE_GNOME=	libxml2
> USE_LDCONFIG=	yes
> JAVA_BUILD=	jre
>-NOPRECIOUSMAKEVARS=	yes
> INSTALLS_ICONS=	yes
> 
> ONLY_FOR_ARCHS=	i386 amd64
>diff --git a/multimedia/libav/Makefile b/multimedia/libav/Makefile
>index 0ce3eadaf349..28bb528db7cb 100644
>--- a/multimedia/libav/Makefile
>+++ b/multimedia/libav/Makefile
>@@ -20,7 +20,6 @@ USE_XORG=	x11
> HAS_CONFIGURE=	yes
> USE_PERL5=	build
> USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}
>-NOPRECIOUSMAKEVARS=	yes # ARCH
> 
> CPPFLAGS+=	-I${LOCALBASE}/include
> CONFIGURE_ARGS=	--prefix="${PREFIX}" \
>diff --git a/multimedia/mplayer/Makefile.common b/multimedia/mplayer/Makefile.common
>index c68d49ab10dd..b5e3da33edc8 100644
>--- a/multimedia/mplayer/Makefile.common
>+++ b/multimedia/mplayer/Makefile.common
>@@ -18,7 +18,6 @@ LIB_DEPENDS=	libpng.so:graphics/png \
> 		libfreetype.so:print/freetype2
> 
> USES=		compiler:c11 gmake iconv ncurses tar:xz
>-NOPRECIOUSMAKEVARS=	yes # ARCH
> GNU_CONFIGURE=	yes
> CONFIGURE_ENV=	TMPDIR="${WRKSRC}"
> CONFIGURE_ARGS=	--cc="${CC}" \
>diff --git a/multimedia/mythtv-frontend/Makefile b/multimedia/mythtv-frontend/Makefile
>index 72e55ff32988..f2d94ed23d64 100644
>--- a/multimedia/mythtv-frontend/Makefile
>+++ b/multimedia/mythtv-frontend/Makefile
>@@ -29,7 +29,6 @@ GH_TAGNAME=	ad97d24
> WRKSRC_SUBDIR=	${GH_PROJECT}
> 
> ONLY_FOR_ARCHS=	i386 amd64
>-NOPRECIOUSMAKEVARS=	# don't override $(ARCH) in ffmpeg makefiles
> USES=		gmake libtool pkgconfig
> USE_QT4=	gui sql network script linguist_build l10n sql-mysql_run \
> 		moc_build qmake_build rcc_build uic_build
>diff --git a/multimedia/mythtv/Makefile b/multimedia/mythtv/Makefile
>index 50cce249547f..0eeffb3dabec 100644
>--- a/multimedia/mythtv/Makefile
>+++ b/multimedia/mythtv/Makefile
>@@ -31,7 +31,6 @@ WRKSRC_SUBDIR=	${PORTNAME}
> 
> ONLY_FOR_ARCHS=	i386 amd64
> USE_PERL5=	run build
>-NOPRECIOUSMAKEVARS=	# don't override $(ARCH) in ffmpeg makefiles
> USES=		gmake libtool perl5 pkgconfig pathfix shebangfix
> SHEBANG_FILES=	programs/scripts/database/mythconverg_backup.pl \
> 		programs/scripts/database/mythconverg_restore.pl
>diff --git a/net-im/ejabberd/Makefile b/net-im/ejabberd/Makefile
>index 8869ab9e5ca8..cc69c346fe6d 100644
>--- a/net-im/ejabberd/Makefile
>+++ b/net-im/ejabberd/Makefile
>@@ -27,7 +27,6 @@ GROUPS=		${USERS}
> GNU_CONFIGURE=	yes
> USES=		cpe gmake pkgconfig shebangfix
> USE_RC_SUBR=	${PORTNAME}
>-NOPRECIOUSMAKEVARS=	yes
> CPE_VENDOR=	process-one
> 
> OPTIONS_DEFINE=	ODBC PAM DOCS MYSQL PGSQL ICONV RIAK ZLIB REDIS SQLITE TOOLS FULLXML #LOGDB
>diff --git a/net/opensips/Makefile b/net/opensips/Makefile
>index 22b0d41ff637..336b4a79315e 100644
>--- a/net/opensips/Makefile
>+++ b/net/opensips/Makefile
>@@ -45,8 +45,6 @@ USE_RC_SUBR=		opensips
> USES=			gmake ncurses perl5 pkgconfig shebangfix ssl
> USE_GCC=		yes
> 
>-NOPRECIOUSMAKEVARS=	yes
>-
> OPTIONS_DEFINE=		DEBUG DOCS EXAMPLES GEOIP HTTP LDAP MEMCACHED MYSQL PGSQL RADIUS TESTS TLS UNIXODBC
> OPTIONS_DEFAULT=	GEOIP HTTP LDAP MEMCACHED PGSQL RADIUS TLS
> OPTIONS_SUB=		yes
>diff --git a/sysutils/and/Makefile b/sysutils/and/Makefile
>index ab3f1a8818ef..0d3863dff409 100644
>--- a/sysutils/and/Makefile
>+++ b/sysutils/and/Makefile
>@@ -15,7 +15,6 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
> 
> USES=		gmake
> ALL_TARGET=	default
>-NOPRECIOUSMAKEVARS=	yes
> 
> .include <bsd.port.pre.mk>
> 
>diff --git a/sysutils/cdrtools-devel/Makefile b/sysutils/cdrtools-devel/Makefile
>index 6732d23d9965..a7aedd668934 100644
>--- a/sysutils/cdrtools-devel/Makefile
>+++ b/sysutils/cdrtools-devel/Makefile
>@@ -87,7 +87,7 @@ PKGNAMESUFFIX?=	-devel
> MAKE_ENV=	CCOM=cc GMAKE_NOWARN=true INS_BASE=${LOCALBASE} \
> 		INS_RBASE=${LOCALBASE}
> CDRTLSTARGET=	${ARCH}-${OPSYS:tl}-cc
>-CDRTLSXARCH!=	${UNAME} -m
>+CDRTLSXARCH=	${MACHINE}
> 
> .if exists(/usr/include/iconv.h)
> USES+=		iconv
>diff --git a/sysutils/cdrtools/Makefile b/sysutils/cdrtools/Makefile
>index 3395bf799511..936ee7f91bd5 100644
>--- a/sysutils/cdrtools/Makefile
>+++ b/sysutils/cdrtools/Makefile
>@@ -85,7 +85,7 @@ PLIST_SUB+=	RSCSI="@comment "
> MAKE_ENV=	CCOM=cc GMAKE_NOWARN=true INS_BASE=${LOCALBASE} \
> 		INS_RBASE=${LOCALBASE}
> CDRTLSTARGET=	${ARCH}-${OPSYS:tl}-cc
>-CDRTLSXARCH!=	${UNAME} -m
>+CDRTLSXARCH=	${MACHINE}
> 
> .if exists(/usr/include/iconv.h)
> USES+=		iconv
>diff --git a/x11-toolkits/py-kivy/Makefile b/x11-toolkits/py-kivy/Makefile
>index 502f0e814109..bb5072a9fc7a 100644
>--- a/x11-toolkits/py-kivy/Makefile
>+++ b/x11-toolkits/py-kivy/Makefile
>@@ -75,11 +75,7 @@ X11_MAKE_ENV=		USE_X11=1
> X11_MAKE_ENV_OFF=	USE_X11=0
> X11_USE=		XORG=x11
> 
>-.if !defined(ARCH)
>-ARCH!=		uname -p
>-.endif
>-
>-.if ${ARCH} == i386
>+.if ${MACHINE_ARCH} == i386
> OPTIONS_GROUP_VIDEO+=	PYGLET
> .endif
> 
>diff --git a/x11-toolkits/tk85/Makefile b/x11-toolkits/tk85/Makefile
>index 9f324634acc1..90b8cac609d6 100644
>--- a/x11-toolkits/tk85/Makefile
>+++ b/x11-toolkits/tk85/Makefile
>@@ -36,7 +36,6 @@ TEST_TARGET=	do-test
> 
> MAKE_ENV=	SHORT_TK_VER=${SHORT_TK_VER}
> PLIST_SUB=	TK_VER=${TK_VER} SHORT_TK_VER=${SHORT_TK_VER}
>-NOPRECIOUSMAKEVARS=	yes # Otherwise 'make readmes' is broken
> DATADIR=	${PREFIX}/share/${PORTNAME}${TK_VER}
> SUB_FILES=	pkgIndex.tcl
>

Flags:

jbeich: maintainer-approval? (bdrewery)

Actions: View | Diff

Attachments on bug 215401: 178082