CVS commit: pkgsrc

["Stephen Borrill" <sborrill%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   sborrill
Date:           Wed Oct 21 10:01:19 UTC 2026

Modified Files:
        pkgsrc/net/nbtscan: Makefile
        pkgsrc/shells/scponly: Makefile
        pkgsrc/textproc/texi2roff: Makefile

Log Message:
*: add LDFLAGS overide that was previously in mk

This is a workaround and should be fixed properly per-package - they
should use the pkgsrc LDFLAGS, but this restores what happened
before the mk/ cleanup.

Fixes relro build for packages that do not honor LDFLAGS.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/net/nbtscan/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/shells/scponly/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/textproc/texi2roff/Makefile

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

Modified files:

Index: pkgsrc/net/nbtscan/Makefile
diff -u pkgsrc/net/nbtscan/Makefile:1.18 pkgsrc/net/nbtscan/Makefile:1.19
--- pkgsrc/net/nbtscan/Makefile:1.18    Mon Aug  3 13:12:30 2026
+++ pkgsrc/net/nbtscan/Makefile Wed Oct 21 10:01:19 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2026/08/03 13:12:30 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2026/10/21 10:01:19 sborrill Exp $
 
 DISTNAME=      nbtscan-1.5.1
 PKGREVISION=   2
@@ -14,6 +14,12 @@ COMMENT=     NetBIOS name network scanner
 
 GNU_CONFIGURE= yes
 
+# FIXME: replace by proper LDFLAGS handling
+_WRAP_EXTRA_ARGS.CC+=  ${_RELRO_LDFLAGS}
+_WRAP_EXTRA_ARGS.CXX+= ${_RELRO_LDFLAGS}
+CWRAPPERS_PREPEND.cc+= ${_RELRO_LDFLAGS}
+CWRAPPERS_PREPEND.cxx+=        ${_RELRO_LDFLAGS}
+
 WRKSRC=                ${WRKDIR}/${DISTNAME}a
 BUILD_TARGET=  nbtscan
 

Index: pkgsrc/shells/scponly/Makefile
diff -u pkgsrc/shells/scponly/Makefile:1.18 pkgsrc/shells/scponly/Makefile:1.19
--- pkgsrc/shells/scponly/Makefile:1.18 Wed May 20 06:09:08 2020
+++ pkgsrc/shells/scponly/Makefile      Wed Oct 21 10:01:19 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2020/05/20 06:09:08 rillig Exp $
+# $NetBSD: Makefile,v 1.19 2026/10/21 10:01:19 sborrill Exp $
 
 DISTNAME=      scponly-4.8
 PKGREVISION=   2
@@ -12,6 +12,12 @@ COMMENT=     Shell that only permits sftp
 
 GNU_CONFIGURE= yes
 
+# FIXME: replace by proper LDFLAGS handling
+_WRAP_EXTRA_ARGS.CC+=  ${_RELRO_LDFLAGS}
+_WRAP_EXTRA_ARGS.CXX+= ${_RELRO_LDFLAGS}
+CWRAPPERS_PREPEND.cc+= ${_RELRO_LDFLAGS}
+CWRAPPERS_PREPEND.cxx+=        ${_RELRO_LDFLAGS}
+
 USE_TOOLS+=            chgrp chmod chown echo id ln ls mkdir mv pwd rm rmdir
 CONFIGURE_ENV+=                scponly_PROG_CHGRP=${TOOLS_CHGRP:Q}
 CONFIGURE_ENV+=                PROG_CHMOD=${TOOLS_CHMOD:Q}

Index: pkgsrc/textproc/texi2roff/Makefile
diff -u pkgsrc/textproc/texi2roff/Makefile:1.11 pkgsrc/textproc/texi2roff/Makefile:1.12
--- pkgsrc/textproc/texi2roff/Makefile:1.11     Thu Oct 25 06:57:04 2012
+++ pkgsrc/textproc/texi2roff/Makefile  Wed Oct 21 10:01:19 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2012/10/25 06:57:04 asau Exp $
+# $NetBSD: Makefile,v 1.12 2026/10/21 10:01:19 sborrill Exp $
 
 DISTNAME=              texi2roff-2.0
 CATEGORIES=            textproc
@@ -8,6 +8,12 @@ MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              http://texinfo.org/texi2roff/
 COMMENT=               Texinfo-to-ROFF direct translator
 
+# FIXME: replace by proper LDFLAGS handling
+_WRAP_EXTRA_ARGS.CC+=  ${_RELRO_LDFLAGS}
+_WRAP_EXTRA_ARGS.CXX+= ${_RELRO_LDFLAGS}
+CWRAPPERS_PREPEND.cc+= ${_RELRO_LDFLAGS}
+CWRAPPERS_PREPEND.cxx+=        ${_RELRO_LDFLAGS}
+
 BUILD_TARGET=
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1