Revert "various: Add MULTIARCH support."

[Jonathan Perkin <jperkin%joyent.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Jonathan Perkin <jperkin%joyent.com@localhost>
Pushed By:	jperkin
Date:		Wed Jun 7 11:59:30 2017 +0100
Changeset:	d0ca70945d4b71a357bff7d599d5434a7551ed24

Modified Files:
	libee/Makefile
	libeio/Makefile
	p5-Imager/Makefile
	p5-JavaScript-SpiderMonkey/Makefile
	v8-316/Makefile
	v8/Makefile

Log Message:
Revert "various: Add MULTIARCH support."

This reverts commit 3afcd6f655830003dbfcaf882f6caf465a2a5a4c.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=d0ca70945d4b71a357bff7d599d5434a7551ed24

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 libee/Makefile                      | 1 -
 libeio/Makefile                     | 1 -
 p5-Imager/Makefile                  | 2 --
 p5-JavaScript-SpiderMonkey/Makefile | 2 --
 v8-316/Makefile                     | 8 +++-----
 v8/Makefile                         | 8 +++-----
 6 files changed, 6 insertions(+), 16 deletions(-)

diffs:
diff --git a/libee/Makefile b/libee/Makefile
index cc93bd8735..21d4101de3 100644
--- a/libee/Makefile
+++ b/libee/Makefile
@@ -17,7 +17,6 @@ MAKE_JOBS_SAFE=		no
 
 USE_LIBTOOL=		yes
 USE_TOOLS+=		bash pkg-config
-USE_MULTIARCH=		lib
 
 PKGCONFIG_OVERRIDE+=	libee.pc.in
 
diff --git a/libeio/Makefile b/libeio/Makefile
index 4600e8e89b..206f20c5f0 100644
--- a/libeio/Makefile
+++ b/libeio/Makefile
@@ -14,7 +14,6 @@ LICENSE=	2-clause-bsd OR gnu-gpl-v2
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_TOOLS+=	autoconf automake
-USE_MULTIARCH=	lib
 
 WRKSRC=	${WRKDIR}/${PKGBASE}-${DISTNAME}
 
diff --git a/p5-Imager/Makefile b/p5-Imager/Makefile
index e71f6fe04a..96a4ff92a2 100644
--- a/p5-Imager/Makefile
+++ b/p5-Imager/Makefile
@@ -10,8 +10,6 @@ HOMEPAGE=		http://search.cpan.org/~tonyc/Imager/
 COMMENT=		Perl module for manipulating gray, color, and RGBA format images
 LICENSE=		${PERL5_LICENSE}
 
-USE_MULTIARCH=		lib
-
 PERL5_PACKLIST=		auto/Imager/.packlist
 
 .include "../../fonts/t1lib/buildlink3.mk"
diff --git a/p5-JavaScript-SpiderMonkey/Makefile b/p5-JavaScript-SpiderMonkey/Makefile
index 9db14fd326..f3ff6cd551 100644
--- a/p5-JavaScript-SpiderMonkey/Makefile
+++ b/p5-JavaScript-SpiderMonkey/Makefile
@@ -14,8 +14,6 @@ COMMENT=	Perl interface to the JavaScript Engine
 
 MAKE_PARAMS+=	INC=${PREFIX}/include
 
-USE_MULTIARCH=	lib
-
 SUBST_CLASSES+=		fix-lib
 SUBST_STAGE.fix-lib=	pre-configure
 SUBST_MESSAGE.fix-lib=	Fixing library detection
diff --git a/v8-316/Makefile b/v8-316/Makefile
index 979eacd104..ac6a7b8f5d 100644
--- a/v8-316/Makefile
+++ b/v8-316/Makefile
@@ -15,8 +15,6 @@ BUILD_DEPENDS+=		${PYPKGPREFIX}-gyp-[0-9]*:../../devel/gyp
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		gmake:run
 
-USE_MULTIARCH=		yes
-
 NO_CONFIGURE=		yes
 BUILD_TARGET=		native
 TEST_TARGET=		native.check
@@ -44,7 +42,7 @@ REPLACE_PYTHON=		tools/*.py tools/*/*.py tools/*/*/*.py
 REPLACE_PYTHON+=	third_party/icu/source/*/*.py
 REPLACE_PYTHON+=	third_party/icu/source/*/*/*.py
 
-INSTALLATION_DIRS+=	bin include lib${LIBARCHSUFFIX}
+INSTALLATION_DIRS+=	bin include lib
 
 INSTALL_INCLUDES=	v8-debug.h v8-preparser.h v8-profiler.h
 INSTALL_INCLUDES+=	v8-testing.h v8.h
@@ -56,8 +54,8 @@ do-install:
 	${INSTALL_LIB} ${WRKSRC}/out/native/libv8.dylib ${DESTDIR}${PREFIX}/lib/libv8.1.dylib
 	${LN} -sf libv8.1.dylib ${DESTDIR}${PREFIX}/lib/libv8.dylib
 .else
-	${INSTALL_LIB} ${WRKSRC}/out/native/lib.target/libv8.so ${DESTDIR}${PREFIX}/lib${LIBARCHSUFFIX}/libv8.so.1
-	${LN} -sf libv8.so.1 ${DESTDIR}${PREFIX}/lib${LIBARCHSUFFIX}/libv8.so
+	${INSTALL_LIB} ${WRKSRC}/out/native/lib.target/libv8.so ${DESTDIR}${PREFIX}/lib/libv8.so.1
+	${LN} -sf libv8.so.1 ${DESTDIR}${PREFIX}/lib/libv8.so
 .endif
 .for inc in ${INSTALL_INCLUDES}
 	${INSTALL_DATA} ${WRKSRC}/include/${inc} ${DESTDIR}${PREFIX}/include
diff --git a/v8/Makefile b/v8/Makefile
index 7b85e566c5..81f4da5d9e 100644
--- a/v8/Makefile
+++ b/v8/Makefile
@@ -15,8 +15,6 @@ BUILD_DEPENDS+=		${PYPKGPREFIX}-gyp-[0-9]*:../../devel/gyp
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		gmake:run
 
-USE_MULTIARCH=		yes
-
 NO_CONFIGURE=		yes
 #BUILD_TARGET=		native
 #TEST_TARGET=		native.check
@@ -60,7 +58,7 @@ REPLACE_PYTHON=		tools/*.py tools/*/*.py tools/*/*/*.py
 REPLACE_PYTHON+=	third_party/icu/source/*/*.py
 REPLACE_PYTHON+=	third_party/icu/source/*/*/*.py
 
-INSTALLATION_DIRS+=	bin include lib${LIBARCHSUFFIX}
+INSTALLATION_DIRS+=	bin include lib
 
 INSTALL_INCLUDES=	v8-debug.h v8-platform.h v8-profiler.h
 INSTALL_INCLUDES+=	v8-testing.h v8-util.h v8.h
@@ -82,8 +80,8 @@ do-install:
 	${INSTALL_LIB} ${WRKSRC}/out/native/libv8.dylib ${DESTDIR}${PREFIX}/lib/libv8.1.dylib
 	${LN} -sf libv8.1.dylib ${DESTDIR}${PREFIX}/lib/libv8.dylib
 .else
-	${INSTALL_LIB} ${WRKSRC}/out/native/lib.target/libv8.so ${DESTDIR}${PREFIX}/lib${LIBARCHSUFFIX}/libv8.so.1
-	${LN} -sf libv8.so.1 ${DESTDIR}${PREFIX}/lib${LIBARCHSUFFIX}/libv8.so
+	${INSTALL_LIB} ${WRKSRC}/out/native/lib.target/libv8.so ${DESTDIR}${PREFIX}/lib/libv8.so.1
+	${LN} -sf libv8.so.1 ${DESTDIR}${PREFIX}/lib/libv8.so
 .endif
 .for inc in ${INSTALL_INCLUDES}
 	${INSTALL_DATA} ${WRKSRC}/include/${inc} ${DESTDIR}${PREFIX}/include