blt: fix relro build on *BSD

Remove NetBSD 1.5/1.6 specific code.

Bump PKGREVISION.

3 files changed, 11 insertions, 17 deletions

diff --git a/x11/blt/Makefile b/x11/blt/Makefile
index 81135363bfa..3fcd5af1293 100644
--- a/x11/blt/Makefile
+++ b/x11/blt/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.36 2020/08/17 20:17:48 leot Exp $
+# $NetBSD: Makefile,v 1.37 2022/01/01 15:21:14 wiz Exp $
 
 DISTNAME=	BLT2.4z
 PKGNAME=	blt-2.4z
-PKGREVISION=	11
+PKGREVISION=	12
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=blt/}
 
@@ -22,6 +22,7 @@ CONFIGURE_ARGS+=	--exec-prefix=${PREFIX}
 CONFIGURE_ARGS+=	--with-tcl=${BUILDLINK_PREFIX.tcl}/lib
 CONFIGURE_ARGS+=	--with-tk=${BUILDLINK_PREFIX.tk}/lib
 CONFIGURE_ENV+=		X11BASE=${X11BASE}
+CONFIGURE_ENV+=		LDF=${LDFLAGS:Q}
 CFLAGS+=		-DUSE_INTERP_RESULT
 MAKE_ENV+=		CP=${CP:Q}
 
@@ -29,14 +30,7 @@ CHECK_INTERPRETER_SKIP+=	lib/*/demos/*.tcl
 
 INSTALL_MAKE_FLAGS+=	INSTALL_ROOT=${DESTDIR}
 
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "NetBSD"
-.  if empty(OS_VERSION:M1.[56]*)
 .include "../../mk/pthread.buildlink3.mk"
-.  endif
-.endif
-
 .include "../../lang/tcl/buildlink3.mk"
 .include "../../x11/tk/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
diff --git a/x11/blt/distinfo b/x11/blt/distinfo
index 91308418bd6..7667f796287 100644
--- a/x11/blt/distinfo
+++ b/x11/blt/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2021/10/26 11:33:44 nia Exp $
+$NetBSD: distinfo,v 1.18 2022/01/01 15:21:14 wiz Exp $
 
 BLAKE2s (BLT2.4z.tar.gz) = 21ffc805b1d2d90331a5a6ca37ae63bb09b7a79104fb579196e8f000646756c4
 SHA512 (BLT2.4z.tar.gz) = 6e59cc03c92b452ec3114675124c2095ed4206e7b9750452764f2b21b8c82dfc376a376f0fbc721c5d0e4b56734866cdc653f3d9888a5b36b0a7500da5f8942a
@@ -10,7 +10,7 @@ SHA1 (patch-aa) = 6a28cc2405adcc6037865f174bb48d81909c83d6
 SHA1 (patch-ab) = da9479d5de1053c45753eef611eae2764909f0ec
 SHA1 (patch-ac) = 696f90010831522f46d67052abc0c6068197cfd9
 SHA1 (patch-ad) = cc2579223a5a8a764d797fa16a146999cd4a796d
-SHA1 (patch-ae) = 12da4ffe7ccb272650e58301aaf72bbc43404762
+SHA1 (patch-ae) = 279b10615ec55c4e403b9d998b4b3904c01173c0
 SHA1 (patch-af) = b82641d4aad426fbe9a6781fa828d8aa81f71253
 SHA1 (patch-src_bltNsUtil.h) = 949647e6ca4a4890a51917c268289384da98b7ca
 SHA1 (patch-src_tkButton.c) = 39132933914ee8d52389f5be72cbc02b21e7216e
diff --git a/x11/blt/patches/patch-ae b/x11/blt/patches/patch-ae
index f843ec82885..f6b69528598 100644
--- a/x11/blt/patches/patch-ae
+++ b/x11/blt/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.7 2017/12/18 15:06:26 jperkin Exp $
+$NetBSD: patch-ae,v 1.8 2022/01/01 15:21:14 wiz Exp $
 
 --- configure.orig	2002-10-04 05:33:59.000000000 +0000
 +++ configure
@@ -13,7 +13,7 @@ $NetBSD: patch-ae,v 1.7 2017/12/18 15:06:26 jperkin Exp $
      ;;
  esac
  
-@@ -4072,7 +4072,8 @@ fi
+@@ -4072,7 +4071,8 @@ fi
      EXTRA_LIB_SPECS="-ldl"
      ;;
  
@@ -23,19 +23,19 @@ $NetBSD: patch-ae,v 1.7 2017/12/18 15:06:26 jperkin Exp $
      # Not available on all versions:  check for include file.
      ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6
-@@ -4109,9 +4110,10 @@ test_ok=no
+@@ -4109,9 +4109,10 @@ test_ok=no
  fi
  
      if test "$test_ok" = yes; then
-+      LDFLAGS="-L${prefix}/lib -L${X11BASE}/lib -Wl,-R${prefix}/lib -Wl,-R${X11BASE}/lib"
++      LDFLAGS="-L${prefix}/lib -L${X11BASE}/lib -Wl,-R${prefix}/lib -Wl,-R${X11BASE}/lib ${LDF}"
        SHLIB_CFLAGS="-fpic"
        SHLIB_LD="ld"
 -      SHLIB_LD_FLAGS="-Bshareable -x"
-+      SHLIB_LD_FLAGS="-Bshareable -x -R${prefix}/lib -R${X11BASE}/lib"
++      SHLIB_LD_FLAGS="-Bshareable -x -R${prefix}/lib -R${X11BASE}/lib ${LDF}"
      fi
      ;;
  
-@@ -4181,9 +4183,9 @@ fi
+@@ -4181,9 +4182,9 @@ fi
    *-solaris2*)
  
      SHLIB_CFLAGS="-KPIC"