*: Remove dodgy hacks for NetBSD versions older than 5.

7 files changed, 14 insertions, 47 deletions

diff --git a/graphics/libggi/Makefile b/graphics/libggi/Makefile
index 5ea4a05f965..83a6e970d0a 100644
--- a/graphics/libggi/Makefile
+++ b/graphics/libggi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2020/08/16 22:38:55 tnn Exp $
+# $NetBSD: Makefile,v 1.61 2022/05/10 11:50:55 nia Exp $
 
 DISTNAME=	libggi-2.2.2.src
 PKGNAME=	${DISTNAME:S/.src//}
@@ -33,15 +33,7 @@ CONF_FILES=		${EGDIR}/libggi.conf ${PKG_SYSCONFDIR}/libggi.conf
 CONF_FILES+=	${EGDIR}/fbdev.conf ${PKG_SYSCONFDIR}/ggi/ggi/targets/fbdev.conf
 .endif
 
-PLIST_VARS+=		libvgl terminfo xf86dga
-
-.if ${OPSYS} == "NetBSD"
-.  if empty(OS_VERSION:M1.[56].*)
-PLIST.terminfo=		yes
-.  endif
-.else
-PLIST.terminfo=		yes
-.endif
+PLIST_VARS+=		libvgl xf86dga
 
 .if ${OPSYS} == "DragonFly" || ${OPSYS} == "FreeBSD"
 PLIST.libvgl=		yes
diff --git a/graphics/libggi/PLIST b/graphics/libggi/PLIST
index 22702b60c69..85e84446fa6 100644
--- a/graphics/libggi/PLIST
+++ b/graphics/libggi/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2010/01/30 15:19:26 tnn Exp $
+@comment $NetBSD: PLIST,v 1.17 2022/05/10 11:50:55 nia Exp $
 bin/cube3d
 bin/ggiteleserver
 bin/monitest
@@ -75,7 +75,7 @@ lib/ggi/display/multi.la
 lib/ggi/display/palemu.la
 lib/ggi/display/sub.la
 lib/ggi/display/tele.la
-${PLIST.terminfo}lib/ggi/display/terminfo.la
+lib/ggi/display/terminfo.la
 lib/ggi/display/tile.la
 lib/ggi/display/trueemu.la
 ${PLIST.libvgl}lib/ggi/display/vgl.la
diff --git a/net/md-whois/Makefile b/net/md-whois/Makefile
index 07a6ac139fc..a9dbaa42728 100644
--- a/net/md-whois/Makefile
+++ b/net/md-whois/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2021/05/24 19:53:19 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2022/05/10 11:50:55 nia Exp $
 #
 # todo: set location of [md-]whois.conf and fix in man page too
 # todo: build and install the po/ files and add to PLIST
@@ -26,12 +26,6 @@ LDFLAGS.SunOS+=	-lnsl -lsocket
 
 INSTALLATION_DIRS+=	bin ${PKGMANDIR}/man1
 
-.include "../../mk/bsd.prefs.mk"
-
-.if (${OPSYS} == "NetBSD" && !empty(OS_VERSION:M4.*))
-MAKE_ENV+=	NEED_OPTARG=YES
-.endif
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/whois ${DESTDIR}${PREFIX}/bin/md-whois
 	${INSTALL_MAN} ${WRKSRC}/whois.1 \
diff --git a/net/ttt/Makefile b/net/ttt/Makefile
index 247d15583ff..72db8a9f5d6 100644
--- a/net/ttt/Makefile
+++ b/net/ttt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2021/04/25 06:05:21 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2022/05/10 11:50:54 nia Exp $
 
 DISTNAME=	ttt-1.8.2
 PKGREVISION=	10
@@ -24,21 +24,12 @@ REPLACE.sys-BLTWISH.old=	.*bltwish
 REPLACE.sys-BLTWISH.new=	${PREFIX}/bin/bltwish
 REPLACE_FILES.sys-BLTWISH=	ttt.tcl
 
-
-.include "../../mk/bsd.prefs.mk"
-
 CFLAGS+=		-DUSE_INTERP_RESULT
 CONFIGURE_ARGS+=	ttt_cv_prog_cflags=${CFLAGS:Q}
 
-.if ${OPSYS} == "NetBSD"
-.  if empty(OS_VERSION:M1.[56]*)
-.include "../../mk/pthread.buildlink3.mk"
-.  endif
-.endif
-
 .include "options.mk"
-
 .include "../../net/libpcap/buildlink3.mk"
 .include "../../x11/blt/buildlink3.mk"
 .include "../../x11/tk/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
index 4b5cba2880b..f1f4b13135b 100644
--- a/security/gnupg/Makefile
+++ b/security/gnupg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.161 2021/12/08 16:06:17 adam Exp $
+# $NetBSD: Makefile,v 1.162 2022/05/10 11:50:55 nia Exp $
 
 DISTNAME=	gnupg-1.4.23
 PKGREVISION=	14
@@ -23,9 +23,7 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 .include "options.mk"
 
-.if ${OPSYS} == "SunOS" || (${OPSYS} == "NetBSD" && !empty(OS_VERSION:M1.[0-6]*))
-CONFIGURE_ARGS+=	--disable-gnupg-iconv
-.endif
+CONFIGURE_ARGS.SunOS+=	--disable-gnupg-iconv
 
 .if (${OPSYS} == "AIX" || ${OPSYS} == "Darwin" || ${OPSYS} == "SunOS") \
     && defined(ABI) && ${ABI} == 64
diff --git a/wm/icewm/Makefile.common b/wm/icewm/Makefile.common
index 7d22c9ee13a..065bd5a8beb 100644
--- a/wm/icewm/Makefile.common
+++ b/wm/icewm/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.72 2020/08/17 20:20:16 leot Exp $
+# $NetBSD: Makefile.common,v 1.73 2022/05/10 11:50:55 nia Exp $
 #
 # used by wm/icewm/Makefile
 # used by wm/icewm-imlib/Makefile
@@ -48,16 +48,7 @@ SUBST_SED.apm=		-e 's,define CONFIG_APPLET_APM 1,undef CONFIG_APPLET_APM,'
 SUBST_MESSAGE.apm=	Disable APM applet.
 .endif
 
-.if ${OPSYS} == "NetBSD"
-.  if !empty(OS_VERSION:M1.*)
-CONFIGURE_ARGS+=	--disable-i18n
-.  else
-CONFIGURE_ARGS+=	--with-unicode-set=utf-32
-.    include "../../converters/libiconv/buildlink3.mk"
-.  endif
-.else
-.  include "../../converters/libiconv/buildlink3.mk"
-.endif
+CONFIGURE_ARGS.NetBSD+=	--with-unicode-set=utf-32
 LIBS.SunOS+=		-lintl
 
 DOCDIR=			${PREFIX}/share/doc/icewm
@@ -76,6 +67,7 @@ post-install:
 	done
 	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${DESTDIR}${HTMLDIR}
 
+.include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../x11/libXft/buildlink3.mk"
diff --git a/wm/sawfish/Makefile b/wm/sawfish/Makefile
index 5b64835935f..38f5110e6d4 100644
--- a/wm/sawfish/Makefile
+++ b/wm/sawfish/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.102 2022/04/04 01:26:39 gutteridge Exp $
+# $NetBSD: Makefile,v 1.103 2022/05/10 11:50:55 nia Exp $
 
 DISTNAME=	sawfish_1.13.0
 PKGNAME=	${DISTNAME:S/_/-/}
@@ -34,7 +34,7 @@ SUBST_SED.env=		-e 's,exec rep,exec env ${REP_ENV_PKGSRC} rep,g'
 
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "NetBSD" && empty(OS_VERSION:M1.*)
+.if ${OPSYS} == "NetBSD"
 REP_ENV_PKGSRC=		LD_PRELOAD=/usr/lib/libpthread.so
 .else
 REP_ENV_PKGSRC=