Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id ADAD31A923C for ; Sat, 1 Jan 2022 15:21:16 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id DC9B884D53; Sat, 1 Jan 2022 15:21:15 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 1E36F84D50 for ; Sat, 1 Jan 2022 15:21:15 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id 5-9Zot997w7C for ; Sat, 1 Jan 2022 15:21:14 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 6903B84D22 for ; Sat, 1 Jan 2022 15:21:14 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 5A3E4FAEC; Sat, 1 Jan 2022 15:21:14 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_16410504741550" MIME-Version: 1.0 Date: Sat, 1 Jan 2022 15:21:14 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/x11/blt To: pkgsrc-changes@NetBSD.org Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20220101152114.5A3E4FAEC@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_16410504741550 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: wiz Date: Sat Jan 1 15:21:14 UTC 2022 Modified Files: pkgsrc/x11/blt: Makefile distinfo pkgsrc/x11/blt/patches: patch-ae Log Message: blt: fix relro build on *BSD Remove NetBSD 1.5/1.6 specific code. Bump PKGREVISION. To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.37 pkgsrc/x11/blt/Makefile cvs rdiff -u -r1.17 -r1.18 pkgsrc/x11/blt/distinfo cvs rdiff -u -r1.7 -r1.8 pkgsrc/x11/blt/patches/patch-ae Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_16410504741550 Content-Disposition: inline Content-Length: 3863 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/x11/blt/Makefile diff -u pkgsrc/x11/blt/Makefile:1.36 pkgsrc/x11/blt/Makefile:1.37 --- pkgsrc/x11/blt/Makefile:1.36 Mon Aug 17 20:17:48 2020 +++ pkgsrc/x11/blt/Makefile Sat Jan 1 15:21:14 2022 @@ -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/*.t 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" Index: pkgsrc/x11/blt/distinfo diff -u pkgsrc/x11/blt/distinfo:1.17 pkgsrc/x11/blt/distinfo:1.18 --- pkgsrc/x11/blt/distinfo:1.17 Tue Oct 26 11:33:44 2021 +++ pkgsrc/x11/blt/distinfo Sat Jan 1 15:21:14 2022 @@ -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) = 6a28cc2405adcc6037865f 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 Index: pkgsrc/x11/blt/patches/patch-ae diff -u pkgsrc/x11/blt/patches/patch-ae:1.7 pkgsrc/x11/blt/patches/patch-ae:1.8 --- pkgsrc/x11/blt/patches/patch-ae:1.7 Mon Dec 18 15:06:26 2017 +++ pkgsrc/x11/blt/patches/patch-ae Sat Jan 1 15:21:14 2022 @@ -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 ;; 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 # 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" --_----------=_16410504741550--