pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc *: Remove dodgy hacks for NetBSD versions older than 5.
details: https://anonhg.NetBSD.org/pkgsrc/rev/d591324f5095
branches: trunk
changeset: 379002:d591324f5095
user: nia <nia%pkgsrc.org@localhost>
date: Tue May 10 11:50:54 2022 +0000
description:
*: Remove dodgy hacks for NetBSD versions older than 5.
diffstat:
graphics/libggi/Makefile | 12 ++----------
graphics/libggi/PLIST | 4 ++--
net/md-whois/Makefile | 8 +-------
net/ttt/Makefile | 13 ++-----------
security/gnupg/Makefile | 6 ++----
wm/icewm/Makefile.common | 14 +++-----------
wm/sawfish/Makefile | 4 ++--
7 files changed, 14 insertions(+), 47 deletions(-)
diffs (171 lines):
diff -r aaa5e160d25f -r d591324f5095 graphics/libggi/Makefile
--- a/graphics/libggi/Makefile Tue May 10 11:49:03 2022 +0000
+++ b/graphics/libggi/Makefile Tue May 10 11:50:54 2022 +0000
@@ -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}/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 -r aaa5e160d25f -r d591324f5095 graphics/libggi/PLIST
--- a/graphics/libggi/PLIST Tue May 10 11:49:03 2022 +0000
+++ b/graphics/libggi/PLIST Tue May 10 11:50:54 2022 +0000
@@ -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/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 -r aaa5e160d25f -r d591324f5095 net/md-whois/Makefile
--- a/net/md-whois/Makefile Tue May 10 11:49:03 2022 +0000
+++ b/net/md-whois/Makefile Tue May 10 11:50:54 2022 +0000
@@ -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 @@
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 -r aaa5e160d25f -r d591324f5095 net/ttt/Makefile
--- a/net/ttt/Makefile Tue May 10 11:49:03 2022 +0000
+++ b/net/ttt/Makefile Tue May 10 11:50:54 2022 +0000
@@ -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.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 -r aaa5e160d25f -r d591324f5095 security/gnupg/Makefile
--- a/security/gnupg/Makefile Tue May 10 11:49:03 2022 +0000
+++ b/security/gnupg/Makefile Tue May 10 11:50:54 2022 +0000
@@ -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 @@
.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 -r aaa5e160d25f -r d591324f5095 wm/icewm/Makefile.common
--- a/wm/icewm/Makefile.common Tue May 10 11:49:03 2022 +0000
+++ b/wm/icewm/Makefile.common Tue May 10 11:50:54 2022 +0000
@@ -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_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 @@
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 -r aaa5e160d25f -r d591324f5095 wm/sawfish/Makefile
--- a/wm/sawfish/Makefile Tue May 10 11:49:03 2022 +0000
+++ b/wm/sawfish/Makefile Tue May 10 11:50:54 2022 +0000
@@ -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 @@
.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=
Home |
Main Index |
Thread Index |
Old Index