Move libtool-base to cross-libtool-base to make PKGNAME match directory name.

Convert away from USE_CROSSBASE to plain ${PREFIX}/cross.

3 files changed, 58 insertions, 6 deletions

diff --git a/cross/libtool-base/DESCR b/cross/cross-libtool-base/DESCR
index 81aa2fd4301..81aa2fd4301 100644
--- a/cross/libtool-base/DESCR
+++ b/cross/cross-libtool-base/DESCR
diff --git a/cross/libtool-base/Makefile b/cross/cross-libtool-base/Makefile
index 1221b7c20b8..28871e06b11 100644
--- a/cross/libtool-base/Makefile
+++ b/cross/cross-libtool-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2016/02/25 11:35:33 jperkin Exp $
+# $NetBSD: Makefile,v 1.1 2016/06/19 16:19:04 wiz Exp $
 
 # XXX This is kludgerific copypasta of devel/libtool-base/Makefile for
 # cross-compilation.  Please make it go away!
@@ -37,9 +37,6 @@ COMMENT=	Generic shared library support script (the script itself)
 
 CONFLICTS+=	libtool<=1.3.5nb11
 
-# XXX Added for cross-compilation.
-USE_CROSSBASE=	yes
-
 TEST_TARGET=	check
 
 OVERRIDE_DIRDEPTH.install-sh=	1
@@ -60,12 +57,12 @@ CFLAGS.SunOS+=	${_COMPILER_ABI_FLAG.${ABI}}
 # and Fortran compilers.
 #
 USE_LANGUAGES=		c c++
+GNU_CONFIGURE_PREFIX=	${PREFIX}/cross
 CONFIGURE_ARGS+=	--disable-ltdl-install
 
 USE_TOOLS+=		echo
 
 # XXX Added for cross-compilation.
-PLIST_SRC=	../../devel/libtool-base/PLIST
 FILESDIR=	../../devel/libtool-base/files
 
 .PHONY: fix-libtool
@@ -84,7 +81,7 @@ post-build:
 		${FILESDIR}/shlibtool.in > ${WRKSRC}/shlibtool
 
 post-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/shlibtool ${DESTDIR}${PREFIX}/bin/shlibtool
+	${INSTALL_SCRIPT} ${WRKSRC}/shlibtool ${DESTDIR}${PREFIX}/cross/bin/shlibtool
 
 BUILDLINK_DEPMETHOD.dlcompat=	build
 
diff --git a/cross/cross-libtool-base/PLIST b/cross/cross-libtool-base/PLIST
new file mode 100644
index 00000000000..efa0585474b
--- /dev/null
+++ b/cross/cross-libtool-base/PLIST
@@ -0,0 +1,55 @@
+@comment $NetBSD: PLIST,v 1.1 2016/06/19 16:19:04 wiz Exp $
+cross/bin/libtool
+cross/bin/libtoolize
+cross/bin/shlibtool
+cross/man/man1/libtool.1
+cross/man/man1/libtoolize.1
+cross/share/aclocal/argz.m4
+cross/share/aclocal/libtool.m4
+cross/share/aclocal/ltdl.m4
+cross/share/aclocal/ltoptions.m4
+cross/share/aclocal/ltsugar.m4
+cross/share/aclocal/ltversion.m4
+cross/share/aclocal/lt~obsolete.m4
+cross/share/libtool/config/compile
+cross/share/libtool/config/config.guess
+cross/share/libtool/config/config.sub
+cross/share/libtool/config/depcomp
+cross/share/libtool/config/install-sh
+cross/share/libtool/config/ltmain.sh
+cross/share/libtool/config/missing
+cross/share/libtool/libltdl/COPYING.LIB
+cross/share/libtool/libltdl/Makefile.am
+cross/share/libtool/libltdl/Makefile.in
+cross/share/libtool/libltdl/Makefile.inc
+cross/share/libtool/libltdl/README
+cross/share/libtool/libltdl/aclocal.m4
+cross/share/libtool/libltdl/argz.c
+cross/share/libtool/libltdl/argz_.h
+cross/share/libtool/libltdl/config-h.in
+cross/share/libtool/libltdl/configure
+cross/share/libtool/libltdl/configure.ac
+cross/share/libtool/libltdl/libltdl/lt__alloc.h
+cross/share/libtool/libltdl/libltdl/lt__dirent.h
+cross/share/libtool/libltdl/libltdl/lt__glibc.h
+cross/share/libtool/libltdl/libltdl/lt__private.h
+cross/share/libtool/libltdl/libltdl/lt__strl.h
+cross/share/libtool/libltdl/libltdl/lt_dlloader.h
+cross/share/libtool/libltdl/libltdl/lt_error.h
+cross/share/libtool/libltdl/libltdl/lt_system.h
+cross/share/libtool/libltdl/libltdl/slist.h
+cross/share/libtool/libltdl/loaders/dld_link.c
+cross/share/libtool/libltdl/loaders/dlopen.c
+cross/share/libtool/libltdl/loaders/dyld.c
+cross/share/libtool/libltdl/loaders/load_add_on.c
+cross/share/libtool/libltdl/loaders/loadlibrary.c
+cross/share/libtool/libltdl/loaders/preopen.c
+cross/share/libtool/libltdl/loaders/shl_load.c
+cross/share/libtool/libltdl/lt__alloc.c
+cross/share/libtool/libltdl/lt__dirent.c
+cross/share/libtool/libltdl/lt__strl.c
+cross/share/libtool/libltdl/lt_dlloader.c
+cross/share/libtool/libltdl/lt_error.c
+cross/share/libtool/libltdl/ltdl.c
+cross/share/libtool/libltdl/ltdl.h
+cross/share/libtool/libltdl/slist.c