4 files changed, 10 insertions, 10 deletions
diff --git a/net/samba/Makefile b/net/samba/Makefile
index d716ff72e04..f2c93c9bcc8 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -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 @@ COMMENT=	SMB/CIFS protocol server suite
 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 --git a/net/samba/hacks.mk b/net/samba/hacks.mk
index f72242a513f..e4f38831d30 100644
--- a/net/samba/hacks.mk
+++ b/net/samba/hacks.mk
@@ -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 --git a/net/samba4/Makefile b/net/samba4/Makefile
index 1d12f1c3b8c..716aec0378f 100644
--- a/net/samba4/Makefile
+++ b/net/samba4/Makefile
@@ -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 --git a/net/samba4/hacks.mk b/net/samba4/hacks.mk
index 7fe4296ced8..4420d91f423 100644
--- a/net/samba4/hacks.mk
+++ b/net/samba4/hacks.mk
@@ -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