[pkgsrc/trunk]: pkgsrc/net net/samba{,4}: Restrict ``disabling PIE hack'' for...

[rin <rin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/fdc5d30bcf81
branches:  trunk
changeset: 381073:fdc5d30bcf81
user:      rin <rin%pkgsrc.org@localhost>
date:      Mon Jun 27 20:59:39 2022 +0000

description:
net/samba{,4}: Restrict ``disabling PIE hack'' for NetBSD/powerpc
prior to 9.0.

ld.elf_so(1) for 9.0 and later support R_PPC_ADDR16_HA (== 6) and
friends:

http://cvsweb.netbsd.org/bsdweb.cgi/src/libexec/ld.elf_so/arch/powerpc/ppc_reloc.c#rev1.58.2.1

Bump revision.

Close PR pkg/38961.

diffstat:

 net/samba/Makefile  |  4 ++--
 net/samba/hacks.mk  |  6 +++---
 net/samba4/Makefile |  4 ++--
 net/samba4/hacks.mk |  6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

diffs (61 lines):

diff -r e2c4e2f6c56b -r fdc5d30bcf81 net/samba/Makefile
--- a/net/samba/Makefile        Mon Jun 27 16:16:16 2022 +0000
+++ b/net/samba/Makefile        Mon Jun 27 20:59:39 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.291 2021/12/08 16:06:07 adam Exp $
+# $NetBSD: Makefile,v 1.292 2022/06/27 20:59:39 rin Exp $
 
 DISTNAME=      samba-${VERSION}
 CATEGORIES=    net
@@ -10,7 +10,7 @@
 LICENSE=       gnu-gpl-v3
 
 VERSION=       3.6.25
-PKGREVISION=   31
+PKGREVISION=   32
 
 CONFLICTS+=    ja-samba-[0-9]* pam-smbpass-[0-9]* winbind-[0-9]*
 
diff -r e2c4e2f6c56b -r fdc5d30bcf81 net/samba/hacks.mk
--- a/net/samba/hacks.mk        Mon Jun 27 16:16:16 2022 +0000
+++ b/net/samba/hacks.mk        Mon Jun 27 20:59:39 2022 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: hacks.mk,v 1.1 2010/03/08 22:19:07 jmmv Exp $
+# $NetBSD: hacks.mk,v 1.2 2022/06/27 20:59:39 rin Exp $
 
 # Enabling PIE results in a 'Unsupported relocation type 6 in non-PLT
-# relocations' error under NetBSD/macppc.
-.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "powerpc"
+# relocations' error under NetBSD/powerpc < 9.0.
+.if !empty(MACHINE_PLATFORM:MNetBSD-[1-8].*-powerpc)
 PKG_HACKS+=            pie
 CONFIGURE_ARGS+=       --disable-pie
 .endif
diff -r e2c4e2f6c56b -r fdc5d30bcf81 net/samba4/Makefile
--- a/net/samba4/Makefile       Mon Jun 27 16:16:16 2022 +0000
+++ b/net/samba4/Makefile       Mon Jun 27 20:59:39 2022 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.142 2022/03/24 10:16:13 hauke Exp $
+# $NetBSD: Makefile,v 1.143 2022/06/27 20:59:40 rin Exp $
 
 DISTNAME=      samba-4.15.6
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    net
 MASTER_SITES=  https://download.samba.org/pub/samba/stable/
 
diff -r e2c4e2f6c56b -r fdc5d30bcf81 net/samba4/hacks.mk
--- a/net/samba4/hacks.mk       Mon Jun 27 16:16:16 2022 +0000
+++ b/net/samba4/hacks.mk       Mon Jun 27 20:59:39 2022 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: hacks.mk,v 1.2 2022/06/21 09:47:49 he Exp $
+# $NetBSD: hacks.mk,v 1.3 2022/06/27 20:59:40 rin Exp $
 
 # Enabling PIE results in a 'Unsupported relocation type 6 in non-PLT
-# relocations' error under NetBSD/macppc.
-.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "powerpc"
+# relocations' error under NetBSD/powerpc < 9.0.
+.if !empty(MACHINE_PLATFORM:MNetBSD-[1-8].*-powerpc)
 PKG_HACKS+=            pie
 CONFIGURE_ARGS+=       --without-pie
 .endif