CVS commit: pkgsrc

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc
From: "Nia Alarie" <nia%netbsd.org@localhost>
Date: Tue, 10 May 2022 11:50:55 +0000

Module Name:    pkgsrc
Committed By:   nia
Date:           Tue May 10 11:50:55 UTC 2022

Modified Files:
        pkgsrc/graphics/libggi: Makefile PLIST
        pkgsrc/net/md-whois: Makefile
        pkgsrc/net/ttt: Makefile
        pkgsrc/security/gnupg: Makefile
        pkgsrc/wm/icewm: Makefile.common
        pkgsrc/wm/sawfish: Makefile

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


To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 pkgsrc/graphics/libggi/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/graphics/libggi/PLIST
cvs rdiff -u -r1.35 -r1.36 pkgsrc/net/md-whois/Makefile
cvs rdiff -u -r1.35 -r1.36 pkgsrc/net/ttt/Makefile
cvs rdiff -u -r1.161 -r1.162 pkgsrc/security/gnupg/Makefile
cvs rdiff -u -r1.72 -r1.73 pkgsrc/wm/icewm/Makefile.common
cvs rdiff -u -r1.102 -r1.103 pkgsrc/wm/sawfish/Makefile

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

Modified files:

Index: pkgsrc/graphics/libggi/Makefile
diff -u pkgsrc/graphics/libggi/Makefile:1.60 pkgsrc/graphics/libggi/Makefile:1.61
--- pkgsrc/graphics/libggi/Makefile:1.60        Sun Aug 16 22:38:55 2020
+++ pkgsrc/graphics/libggi/Makefile     Tue May 10 11:50:55 2022
@@ -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_
 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

Index: pkgsrc/graphics/libggi/PLIST
diff -u pkgsrc/graphics/libggi/PLIST:1.16 pkgsrc/graphics/libggi/PLIST:1.17
--- pkgsrc/graphics/libggi/PLIST:1.16   Sat Jan 30 15:19:26 2010
+++ pkgsrc/graphics/libggi/PLIST        Tue May 10 11:50:55 2022
@@ -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

Index: pkgsrc/net/md-whois/Makefile
diff -u pkgsrc/net/md-whois/Makefile:1.35 pkgsrc/net/md-whois/Makefile:1.36
--- pkgsrc/net/md-whois/Makefile:1.35   Mon May 24 19:53:19 2021
+++ pkgsrc/net/md-whois/Makefile        Tue May 10 11:50:55 2022
@@ -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 \

Index: pkgsrc/net/ttt/Makefile
diff -u pkgsrc/net/ttt/Makefile:1.35 pkgsrc/net/ttt/Makefile:1.36
--- pkgsrc/net/ttt/Makefile:1.35        Sun Apr 25 06:05:21 2021
+++ pkgsrc/net/ttt/Makefile     Tue May 10 11:50:54 2022
@@ -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"

Index: pkgsrc/security/gnupg/Makefile
diff -u pkgsrc/security/gnupg/Makefile:1.161 pkgsrc/security/gnupg/Makefile:1.162
--- pkgsrc/security/gnupg/Makefile:1.161        Wed Dec  8 16:06:17 2021
+++ pkgsrc/security/gnupg/Makefile      Tue May 10 11:50:55 2022
@@ -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

Index: pkgsrc/wm/icewm/Makefile.common
diff -u pkgsrc/wm/icewm/Makefile.common:1.72 pkgsrc/wm/icewm/Makefile.common:1.73
--- pkgsrc/wm/icewm/Makefile.common:1.72        Mon Aug 17 20:20:16 2020
+++ pkgsrc/wm/icewm/Makefile.common     Tue May 10 11:50:55 2022
@@ -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_APPL
 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"

Index: pkgsrc/wm/sawfish/Makefile
diff -u pkgsrc/wm/sawfish/Makefile:1.102 pkgsrc/wm/sawfish/Makefile:1.103
--- pkgsrc/wm/sawfish/Makefile:1.102    Mon Apr  4 01:26:39 2022
+++ pkgsrc/wm/sawfish/Makefile  Tue May 10 11:50:55 2022
@@ -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 
 
 .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=

Prev by Date: CVS commit: pkgsrc/comms
Next by Date: CVS commit: pkgsrc/net/ttt
Previous by Thread: CVS commit: pkgsrc/comms
Next by Thread: CVS commit: pkgsrc/net/ttt
Indexes:

Home | Main Index | Thread Index | Old Index