Module Name: src
Committed By: mrg
Date: Thu Jul 4 01:02:24 UTC 2024
Modified Files:
src/external/mit/xorg/bin/iceauth: Makefile
src/external/mit/xorg/bin/xfontsel: Makefile
src/external/mit/xorg/bin/xlsfonts: Makefile
src/external/mit/xorg/bin/xsm: Makefile
Log Message:
updates for iceauth 1.0.10, xlsfonts 1.0.8, xfontsel 1.1.1, and xsm 1.0.6.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/bin/iceauth/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/xfontsel/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/xlsfonts/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/bin/xsm/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/iceauth/Makefile
diff -u src/external/mit/xorg/bin/iceauth/Makefile:1.4 src/external/mit/xorg/bin/iceauth/Makefile:1.5
--- src/external/mit/xorg/bin/iceauth/Makefile:1.4 Mon Jul 20 23:50:23 2015
+++ src/external/mit/xorg/bin/iceauth/Makefile Thu Jul 4 01:02:24 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2015/07/20 23:50:23 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2024/07/04 01:02:24 mrg Exp $
.include <bsd.own.mk>
@@ -8,6 +8,8 @@ SRCS= iceauth.c process.c
LDADD+= -lICE
DPADD+= ${LIBICE}
+CPPFLAGS+= -DHAVE_REALLOCARRAY
+
.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/man
.include "../../xorg-pkg-ver.mk"
Index: src/external/mit/xorg/bin/xfontsel/Makefile
diff -u src/external/mit/xorg/bin/xfontsel/Makefile:1.3 src/external/mit/xorg/bin/xfontsel/Makefile:1.4
--- src/external/mit/xorg/bin/xfontsel/Makefile:1.3 Fri May 31 07:22:21 2013
+++ src/external/mit/xorg/bin/xfontsel/Makefile Thu Jul 4 01:02:24 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2013/05/31 07:22:21 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2024/07/04 01:02:24 mrg Exp $
.include <bsd.own.mk>
@@ -7,9 +7,12 @@ SRCS= xfontsel.c ULabel.c
APPDEFS=XFontSel
-LDADD+= -lXaw -lXmu -lXt -lSM -lICE -lXpm -lXext -lX11
+LDADD+= -lXaw -lXmu -lXt -lSM -lICE -lXpm -lXext -lX11 -lintl
DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} \
- ${LIBXPM} ${LIBXEXT} ${LIBX11}
+ ${LIBXPM} ${LIBXEXT} ${LIBX11} ${LIBINTL}
+
+CPPFLAGS+= -DUSE_GETTEXT -DLOCALEDIR=\"${LOCALEDIR}\"
+CPPFLAGS+= -DPACKAGE_STRING=\"${PACKAGE_STRING}\"
.PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/app-defaults
.PATH: ${X11SRCDIR.${PROG}}/man
Index: src/external/mit/xorg/bin/xlsfonts/Makefile
diff -u src/external/mit/xorg/bin/xlsfonts/Makefile:1.3 src/external/mit/xorg/bin/xlsfonts/Makefile:1.4
--- src/external/mit/xorg/bin/xlsfonts/Makefile:1.3 Mon Jul 20 03:12:57 2015
+++ src/external/mit/xorg/bin/xlsfonts/Makefile Thu Jul 4 01:02:24 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2015/07/20 03:12:57 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2024/07/04 01:02:24 mrg Exp $
.include <bsd.own.mk>
@@ -8,6 +8,8 @@ SRCS= xlsfonts.c dsimple.c
LDADD+= -lXext -lX11
DPADD+= ${LIBXEXT} ${LIBX11}
+CPPFLAGS+=-DHAVE_REALLOCARRAY
+
.PATH: ${X11SRCDIR.${PROG}}
.PATH: ${X11SRCDIR.${PROG}}/man
Index: src/external/mit/xorg/bin/xsm/Makefile
diff -u src/external/mit/xorg/bin/xsm/Makefile:1.4 src/external/mit/xorg/bin/xsm/Makefile:1.5
--- src/external/mit/xorg/bin/xsm/Makefile:1.4 Mon Apr 26 22:04:51 2021
+++ src/external/mit/xorg/bin/xsm/Makefile Thu Jul 4 01:02:24 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2021/04/26 22:04:51 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2024/07/04 01:02:24 mrg Exp $
.include <bsd.own.mk>
@@ -12,6 +12,7 @@ XSMDIR= ${X11ETCDIR}/xsm
CPPFLAGS+=-DHAVE_MKSTEMP -DHAVE_PUTENV
CPPFLAGS.remote.c= -DRSHCMD=\"ssh\"
CPPFLAGS.restart.c= -DSYSTEM_INIT_FILE=\"${XSMDIR}/system.xsm\"
+CPPFLAGS+= -DPACKAGE_STRING=\"${PACKAGE_STRING}\"
CONFIGFILES= system.xsm
FILESDIR= ${XSMDIR}
