libgcrypt-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:		Fri Jul 19 11:23:15 2019 +0200
Changeset:	a4a645b2cae4ec5ae2c804623efdd9c9e0582a5d

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

Log Message:
libgcrypt-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=a4a645b2cae4ec5ae2c804623efdd9c9e0582a5d

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

diffstat:
 libgcrypt-32/Makefile      | 9 +--------
 libgcrypt-32/buildlink3.mk | 3 ++-
 2 files changed, 3 insertions(+), 9 deletions(-)

diffs:
diff --git a/libgcrypt-32/Makefile b/libgcrypt-32/Makefile
index 066b830e16..9426327afb 100644
--- a/libgcrypt-32/Makefile
+++ b/libgcrypt-32/Makefile
@@ -5,9 +5,8 @@ CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.gnupg.org/gcrypt/libgcrypt/
 EXTRACT_SUFX=	.tar.bz2
 ABI=		32
-LIBABISUFFIX?=          /32
-CONFIGURE_ARGS+=        --libdir=${PREFIX}/lib${LIBABISUFFIX}
 CFLAGS+=                -m32
+GNU_CONFIGURE_PREFIX=	${PREFIX}/emul/netbsd32/
 
 PKGNAME=	compat${ABI}_${DISTNAME}
 
@@ -69,12 +68,6 @@ SUBST_VARS.rpath=	COMPILER_RPATH_FLAG
 
 BUILDLINK_API_DEPENDS.libgpg-error+=	libgpg-error>=1.13
 
-remove-non-libraries:
-	echo "Removing non-compat lib package content"
-	find ${DESTDIR}${PREFIX} -path ${DESTDIR}${PREFIX}/lib${LIBABISUFFIX} -prune -or -type f -exec ${RM} {} +
-
-post-install: remove-non-libraries
-
 .include "../../wip/libgpg-error-32/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/libgcrypt-32/buildlink3.mk b/libgcrypt-32/buildlink3.mk
index af8191f5b9..1482157151 100644
--- a/libgcrypt-32/buildlink3.mk
+++ b/libgcrypt-32/buildlink3.mk
@@ -8,7 +8,8 @@ COMPAT32_LIBGCRYPT_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.compat32_libgcrypt+=	compat32_libgcrypt>=1.2.0
 BUILDLINK_ABI_DEPENDS.compat32_libgcrypt+=	compat32_libgcrypt>=1.6.0
 BUILDLINK_PKGSRCDIR.compat32_libgcrypt?=	../../wip/libgcrypt-32
-BUILDLINK_LIBDIRS.compat32_libgcrypt?=		lib/32
+BUILDLINK_LIBDIRS.compat32_libgcrypt?=		emul/netbsd32/lib
+
 
 .include "../../security/libgpg-error/buildlink3.mk"
 .endif # COMPAT32_LIBGCRYPT_BUILDLINK3_MK