libxml2-32: Install package to ${PREFIX}/emul/netbsd32

[Naveen Narayanan <zerous@nocebo.space>]

Module Name:	pkgsrc-wip
Committed By:	Naveen Narayanan <zerous@nocebo.space>
Pushed By:	zerous
Date:		Thu Jul 18 22:47:01 2019 +0200
Changeset:	c74bd61e290a168d7d89c9f113229a9355077741

Modified Files:
	libxml2-32/Makefile
	libxml2-32/buildlink3.mk

Log Message:
libxml2-32: Install package to ${PREFIX}/emul/netbsd32

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

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

diffstat:
 libxml2-32/Makefile      | 12 ++----------
 libxml2-32/buildlink3.mk |  5 +++--
 2 files changed, 5 insertions(+), 12 deletions(-)

diffs:
diff --git a/libxml2-32/Makefile b/libxml2-32/Makefile
index 07b7960bcd..bc4cf52287 100644
--- a/libxml2-32/Makefile
+++ b/libxml2-32/Makefile
@@ -2,7 +2,7 @@
 
 .include "../../wip/libxml2-32/Makefile.common"
 
-ABI?=		32
+ABI=		32
 PKGNAME?=	compat${ABI}_${DISTNAME}
 COMMENT=	XML parser library from the GNOME project
 LICENSE=	modified-bsd
@@ -11,14 +11,12 @@ USE_FEATURES=		glob
 USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake
 GNU_CONFIGURE=		yes
-LIBABISUFFIX?=		/32
-
+GNU_CONFIGURE_PREFIX=	${PREFIX}/emul/netbsd32/
 CONFIGURE_ARGS+=	--with-html-subdir=libxml2
 CONFIGURE_ARGS+=	--with-iconv=${BUILDLINK_PREFIX.iconv}
 CONFIGURE_ARGS+=	--with-zlib=${BUILDLINK_PREFIX.zlib}
 CONFIGURE_ARGS+=	--with-lzma=${BUILDLINK_PREFIX.xz}
 CONFIGURE_ARGS+=	--without-python
-CONFIGURE_ARGS+=        --libdir=${PREFIX}/lib${LIBABISUFFIX}
 CFLAGS+=                -m32
 PKGCONFIG_OVERRIDE=	libxml-2.0.pc.in
 
@@ -44,12 +42,6 @@ BUILDLINK_TRANSFORM.SunOS+=	rm:-Werror=format=2
 
 LDFLAGS.SCO_SV+=	-lm
 
-remove-non-libraries:
-	echo "Removing non-compat library package content"
-	find ${DESTDIR}${PREFIX} -path ${DESTDIR}${PREFIX}/lib${LIBABISUFFIX} -prune -o -type f -exec ${RM} {} +
-
-post-install: remove-non-libraries
-
 .include "../../archivers/xz/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/libxml2-32/buildlink3.mk b/libxml2-32/buildlink3.mk
index 60658c1404..fd6d8b4512 100644
--- a/libxml2-32/buildlink3.mk
+++ b/libxml2-32/buildlink3.mk
@@ -9,9 +9,10 @@ BUILDLINK_API_DEPENDS.compat32_libxml2+=	compat32_libxml2>=2.6.2
 BUILDLINK_ABI_DEPENDS.compat32_libxml2+=	compat32_libxml2>=2.8.0nb2
 #BUILDLINK_PKGSRCDIR.compat32_libxml2?=		../../textproc/compat32_libxml2
 BUILDLINK_PKGSRCDIR.compat32_libxml2?=		../../wip/libxml2-32/
-BUILDLINK_LIBDIRS.compat32_libxml2=		lib/32
+BUILDLINK_LIBDIRS.compat32_libxml2=		emul/netbsd32/lib
+BUILDLINK_INCDIRS.compat32_libxml2=		emul/netbsd32/include
 
-BUILDLINK_FILES.compat32_libxml2+=		bin/xml2-config
+BUILDLINK_FILES.compat32_libxml2+=		emul/netbsd32/bin/xml2-config
 
 USE_FEATURES+=		glob