Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/cjep_sun2x]: src/external/mit/xorg/bin Use x11 variables for LDADD and D...



details:   https://anonhg.NetBSD.org/src/rev/e76d6908f87c
branches:  cjep_sun2x
changeset: 1024906:e76d6908f87c
user:      cjep <cjep%NetBSD.org@localhost>
date:      Wed Jun 02 14:46:17 2021 +0000

description:
Use x11 variables for LDADD and DPADD. Now builds on sun2.

diffstat:

 external/mit/xorg/bin/bitmap/Makefile        |  7 +++----
 external/mit/xorg/bin/editres/Makefile       |  7 +++----
 external/mit/xorg/bin/fc-cache/Makefile      |  6 +++---
 external/mit/xorg/bin/fc-cat/Makefile        |  6 +++---
 external/mit/xorg/bin/fc-conflist/Makefile   |  6 +++---
 external/mit/xorg/bin/fc-list/Makefile       |  6 +++---
 external/mit/xorg/bin/fc-match/Makefile      |  6 +++---
 external/mit/xorg/bin/fc-pattern/Makefile    |  6 +++---
 external/mit/xorg/bin/fc-query/Makefile      |  6 +++---
 external/mit/xorg/bin/fc-scan/Makefile       |  6 +++---
 external/mit/xorg/bin/fc-validate/Makefile   |  6 +++---
 external/mit/xorg/bin/fstobdf/Makefile       |  6 +++---
 external/mit/xorg/bin/ico/Makefile           |  6 +++---
 external/mit/xorg/bin/listres/Makefile       |  7 +++----
 external/mit/xorg/bin/oclock/Makefile        |  6 +++---
 external/mit/xorg/bin/proxymngr/Makefile     |  6 +++---
 external/mit/xorg/bin/setxkbmap/Makefile     |  6 +++---
 external/mit/xorg/bin/smproxy/Makefile       |  6 +++---
 external/mit/xorg/bin/transset/Makefile      |  6 +++---
 external/mit/xorg/bin/twm/Makefile           |  6 +++---
 external/mit/xorg/bin/xcmsdb/Makefile        |  6 +++---
 external/mit/xorg/bin/xconsole/Makefile      |  7 +++----
 external/mit/xorg/bin/xcutsel/Makefile       |  7 +++----
 external/mit/xorg/bin/xedit/xedit/Makefile   |  7 +++----
 external/mit/xorg/bin/xev/Makefile           |  6 +++---
 external/mit/xorg/bin/xf86dga/Makefile       |  6 +++---
 external/mit/xorg/bin/xfindproxy/Makefile    |  6 +++---
 external/mit/xorg/bin/xfontsel/Makefile      |  7 +++----
 external/mit/xorg/bin/xgc/Makefile           |  7 +++----
 external/mit/xorg/bin/xhost/Makefile         |  6 +++---
 external/mit/xorg/bin/xinit/Makefile         |  6 +++---
 external/mit/xorg/bin/xkbcomp/Makefile       |  6 +++---
 external/mit/xorg/bin/xkbevd/Makefile        |  6 +++---
 external/mit/xorg/bin/xkbprint/Makefile      |  6 +++---
 external/mit/xorg/bin/xkill/Makefile         |  6 +++---
 external/mit/xorg/bin/xload/Makefile         |  7 +++----
 external/mit/xorg/bin/xlsatoms/Makefile      |  6 +++---
 external/mit/xorg/bin/xlsclients/Makefile    |  6 +++---
 external/mit/xorg/bin/xlsfonts/Makefile      |  6 +++---
 external/mit/xorg/bin/xmag/Makefile          |  7 +++----
 external/mit/xorg/bin/xman/Makefile          |  7 +++----
 external/mit/xorg/bin/xmessage/Makefile      |  7 +++----
 external/mit/xorg/bin/xmh/Makefile           |  7 +++----
 external/mit/xorg/bin/xmodmap/Makefile       |  6 +++---
 external/mit/xorg/bin/xmore/Makefile         |  7 +++----
 external/mit/xorg/bin/xprop/Makefile         |  6 +++---
 external/mit/xorg/bin/xrandr/Makefile        |  6 +++---
 external/mit/xorg/bin/xrdb/Makefile          |  6 +++---
 external/mit/xorg/bin/xrefresh/Makefile      |  6 +++---
 external/mit/xorg/bin/xsetmode/Makefile      |  6 +++---
 external/mit/xorg/bin/xsetpointer/Makefile   |  6 +++---
 external/mit/xorg/bin/xsetwallpaper/Makefile |  6 +++---
 external/mit/xorg/bin/xsm/Makefile           |  7 +++----
 external/mit/xorg/bin/xstdcmap/Makefile      |  6 +++---
 external/mit/xorg/bin/xvinfo/Makefile        |  6 +++---
 external/mit/xorg/bin/xwd/Makefile           |  6 +++---
 external/mit/xorg/bin/xwud/Makefile          |  6 +++---
 57 files changed, 171 insertions(+), 186 deletions(-)

diffs (truncated from 1124 to 300 lines):

diff -r 09497a392509 -r e76d6908f87c external/mit/xorg/bin/bitmap/Makefile
--- a/external/mit/xorg/bin/bitmap/Makefile     Wed Jun 02 14:27:56 2021 +0000
+++ b/external/mit/xorg/bin/bitmap/Makefile     Wed Jun 02 14:46:17 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.4 2013/05/31 09:14:18 mrg Exp $
+#      $NetBSD: Makefile,v 1.4.36.1 2021/06/02 14:46:17 cjep Exp $
 
 .include <bsd.own.mk>
 
@@ -14,9 +14,8 @@
 
 CPPFLAGS+=     -DHAVE_MKSTEMP -DHAVE_LRINT
 
-LDADD+=        -lXaw -lXmu -lXt -lSM -lICE -lXpm -lXext -lX11 -lm
-DPADD+=        ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} \
-       ${LIBXPM} ${LIBXEXT} ${LIBX11} ${LIBM}
+LDADD+=        ${XLIBLDADD_XAW} -lm
+DPADD+=        ${XLIBDPADD_XAW} ${LIBM}
 
 SUBDIR=        bmtoa atobm app-defaults
 
diff -r 09497a392509 -r e76d6908f87c external/mit/xorg/bin/editres/Makefile
--- a/external/mit/xorg/bin/editres/Makefile    Wed Jun 02 14:27:56 2021 +0000
+++ b/external/mit/xorg/bin/editres/Makefile    Wed Jun 02 14:46:17 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2013/05/31 05:24:49 mrg Exp $
+#      $NetBSD: Makefile,v 1.3.36.1 2021/06/02 14:46:17 cjep Exp $
 
 .include <bsd.own.mk>
 
@@ -8,9 +8,8 @@
 
 APPDEFS=Editres.ad Editres-color.ad
 
-LDADD+=        -lXaw -lXmu -lXt -lSM -lICE -lXpm -lXext -lX11
-DPADD+=        ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} \
-       ${LIBXPM} ${LIBXEXT} ${LIBX11}
+LDADD+=        ${XLIBLDADD_XAW}
+DPADD+=        ${XLIBDPADD_XAW}
 
 .PATH: ${X11SRCDIR.${PROG}}
 .PATH: ${X11SRCDIR.${PROG}}/man
diff -r 09497a392509 -r e76d6908f87c external/mit/xorg/bin/fc-cache/Makefile
--- a/external/mit/xorg/bin/fc-cache/Makefile   Wed Jun 02 14:27:56 2021 +0000
+++ b/external/mit/xorg/bin/fc-cache/Makefile   Wed Jun 02 14:46:17 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.4 2018/07/04 12:25:48 maya Exp $
+#      $NetBSD: Makefile,v 1.4.8.1 2021/06/02 14:46:18 cjep Exp $
 
 .include <bsd.own.mk>
 
@@ -8,8 +8,8 @@
 CPPFLAGS+=     -DHAVE_CONFIG_H -I${X11SRCDIR.fontconfig}/../include
 CPPFLAGS+=     -DHAVE_GETOPT_LONG=1
 
-LDADD+=        -lfontconfig -lfreetype -lexpat
-DPADD+=        ${LIBFONTCONFIG} ${LIBFREETYPE} ${LIBEXPAT}
+LDADD+=        ${XLIBLDADD_FC}
+DPADD+=        ${XLIBDPADD_FC}
 
 .PATH: ${X11SRCDIR.fontconfig}/${PROG}
 
diff -r 09497a392509 -r e76d6908f87c external/mit/xorg/bin/fc-cat/Makefile
--- a/external/mit/xorg/bin/fc-cat/Makefile     Wed Jun 02 14:27:56 2021 +0000
+++ b/external/mit/xorg/bin/fc-cat/Makefile     Wed Jun 02 14:46:17 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2018/07/04 12:25:49 maya Exp $
+#      $NetBSD: Makefile,v 1.3.8.1 2021/06/02 14:46:18 cjep Exp $
 
 .include <bsd.own.mk>
 
@@ -7,8 +7,8 @@
 CPPFLAGS+=     -I${X11SRCDIR.fontconfig} -I.
 CPPFLAGS+=     -DHAVE_GETOPT_LONG=1
 
-LDADD+=        -lfontconfig -lfreetype -lexpat
-DPADD+=        ${LIBFONTCONFIG} ${LIBFREETYPE} ${LIBEXPAT}
+LDADD+=        ${XLIBLDADD_FC}
+DPADD+=        ${XLIBDPADD_FC}
 
 .PATH: ${X11SRCDIR.fontconfig}/${PROG}
 
diff -r 09497a392509 -r e76d6908f87c external/mit/xorg/bin/fc-conflist/Makefile
--- a/external/mit/xorg/bin/fc-conflist/Makefile        Wed Jun 02 14:27:56 2021 +0000
+++ b/external/mit/xorg/bin/fc-conflist/Makefile        Wed Jun 02 14:46:17 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1 2019/03/08 09:58:24 mrg Exp $
+#      $NetBSD: Makefile,v 1.1.10.1 2021/06/02 14:46:18 cjep Exp $
 
 .include <bsd.own.mk>
 
@@ -7,8 +7,8 @@
 CPPFLAGS+=     -I${X11SRCDIR.fontconfig} -I.
 CPPFLAGS+=     -DHAVE_GETOPT_LONG=1
 
-LDADD+=        -lfontconfig -lfreetype -lexpat
-DPADD+=        ${LIBFONTCONFIG} ${LIBFREETYPE} ${LIBEXPAT}
+LDADD+=        ${XLIBLDADD_FC}
+DPADD+=        ${XLIBDPADD_FC}
 
 .PATH: ${X11SRCDIR.fontconfig}/${PROG}
 
diff -r 09497a392509 -r e76d6908f87c external/mit/xorg/bin/fc-list/Makefile
--- a/external/mit/xorg/bin/fc-list/Makefile    Wed Jun 02 14:27:56 2021 +0000
+++ b/external/mit/xorg/bin/fc-list/Makefile    Wed Jun 02 14:46:17 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2018/07/04 12:25:49 maya Exp $
+#      $NetBSD: Makefile,v 1.3.8.1 2021/06/02 14:46:18 cjep Exp $
 
 .include <bsd.own.mk>
 
@@ -7,8 +7,8 @@
 CPPFLAGS+=     -I${X11SRCDIR.fontconfig} -I.
 CPPFLAGS+=     -DHAVE_GETOPT_LONG=1
 
-LDADD+=        -lfontconfig -lfreetype -lexpat
-DPADD+=        ${LIBFONTCONFIG} ${LIBFREETYPE} ${LIBEXPAT}
+LDADD+=        ${XLIBLDADD_FC}
+DPADD+=        ${XLIBDPADD_FC}
 
 .PATH: ${X11SRCDIR.fontconfig}/${PROG}
 
diff -r 09497a392509 -r e76d6908f87c external/mit/xorg/bin/fc-match/Makefile
--- a/external/mit/xorg/bin/fc-match/Makefile   Wed Jun 02 14:27:56 2021 +0000
+++ b/external/mit/xorg/bin/fc-match/Makefile   Wed Jun 02 14:46:17 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.4 2018/07/04 12:25:49 maya Exp $
+#      $NetBSD: Makefile,v 1.4.8.1 2021/06/02 14:46:18 cjep Exp $
 
 .include <bsd.own.mk>
 
@@ -7,8 +7,8 @@
 CPPFLAGS+=     -I${X11SRCDIR.fontconfig} -I.
 CPPFLAGS+=     -DHAVE_GETOPT_LONG=1
 
-LDADD+=        -lfontconfig -lfreetype -lexpat -lbz2 -lz
-DPADD+=        ${LIBFONTCONFIG} ${LIBFREETYPE} ${LIBEXPAT} ${LIBBZ2} ${LIBZ}
+LDADD+=        ${XLIBLDADD_FC}
+DPADD+=        ${XLIBDPADD_FC}
 
 .PATH: ${X11SRCDIR.fontconfig}/${PROG}
 
diff -r 09497a392509 -r e76d6908f87c external/mit/xorg/bin/fc-pattern/Makefile
--- a/external/mit/xorg/bin/fc-pattern/Makefile Wed Jun 02 14:27:56 2021 +0000
+++ b/external/mit/xorg/bin/fc-pattern/Makefile Wed Jun 02 14:46:17 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2018/07/04 12:25:49 maya Exp $
+#      $NetBSD: Makefile,v 1.3.8.1 2021/06/02 14:46:18 cjep Exp $
 
 .include <bsd.own.mk>
 
@@ -7,8 +7,8 @@
 CPPFLAGS+=     -I${X11SRCDIR.fontconfig} -I. -I${DESTDIR}${X11INCDIR}/freetype2
 CPPFLAGS+=     -DHAVE_GETOPT_LONG=1
 
-LDADD+=        -lfontconfig -lfreetype -lexpat
-DPADD+=        ${LIBFONTCONFIG} ${LIBFREETYPE} ${LIBEXPAT}
+LDADD+=        ${XLIBLDADD_FC}
+DPADD+=        ${XLIBDPADD_FC}
 
 .PATH: ${X11SRCDIR.fontconfig}/${PROG}
 
diff -r 09497a392509 -r e76d6908f87c external/mit/xorg/bin/fc-query/Makefile
--- a/external/mit/xorg/bin/fc-query/Makefile   Wed Jun 02 14:27:56 2021 +0000
+++ b/external/mit/xorg/bin/fc-query/Makefile   Wed Jun 02 14:46:17 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.4 2018/07/04 12:25:49 maya Exp $
+#      $NetBSD: Makefile,v 1.4.8.1 2021/06/02 14:46:18 cjep Exp $
 
 .include <bsd.own.mk>
 
@@ -7,8 +7,8 @@
 CPPFLAGS+=     -I${X11SRCDIR.fontconfig} -I. -I${DESTDIR}${X11INCDIR}/freetype2
 CPPFLAGS+=     -DHAVE_GETOPT_LONG=1
 
-LDADD+=        -lfontconfig -lfreetype -lexpat
-DPADD+=        ${LIBFONTCONFIG} ${LIBFREETYPE} ${LIBEXPAT}
+LDADD+=        ${XLIBLDADD_FC}
+DPADD+=        ${XLIBDPADD_FC}
 
 .PATH: ${X11SRCDIR.fontconfig}/${PROG}
 
diff -r 09497a392509 -r e76d6908f87c external/mit/xorg/bin/fc-scan/Makefile
--- a/external/mit/xorg/bin/fc-scan/Makefile    Wed Jun 02 14:27:56 2021 +0000
+++ b/external/mit/xorg/bin/fc-scan/Makefile    Wed Jun 02 14:46:17 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2018/07/04 12:25:49 maya Exp $
+#      $NetBSD: Makefile,v 1.3.8.1 2021/06/02 14:46:18 cjep Exp $
 
 .include <bsd.own.mk>
 
@@ -7,8 +7,8 @@
 CPPFLAGS+=     -I${X11SRCDIR.fontconfig} -I. -I${DESTDIR}${X11INCDIR}/freetype2
 CPPFLAGS+=     -DHAVE_GETOPT_LONG=1
 
-LDADD+=        -lfontconfig -lfreetype -lexpat
-DPADD+=        ${LIBFONTCONFIG} ${LIBFREETYPE} ${LIBEXPAT}
+LDADD+=        ${XLIBLDADD_FC}
+DPADD+=        ${XLIBDPADD_FC}
 
 .PATH: ${X11SRCDIR.fontconfig}/${PROG}
 
diff -r 09497a392509 -r e76d6908f87c external/mit/xorg/bin/fc-validate/Makefile
--- a/external/mit/xorg/bin/fc-validate/Makefile        Wed Jun 02 14:27:56 2021 +0000
+++ b/external/mit/xorg/bin/fc-validate/Makefile        Wed Jun 02 14:46:17 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2018/07/04 12:25:49 maya Exp $
+#      $NetBSD: Makefile,v 1.2.8.1 2021/06/02 14:46:18 cjep Exp $
 
 .include <bsd.own.mk>
 
@@ -7,8 +7,8 @@
 CPPFLAGS+=     -I${X11SRCDIR.fontconfig} -I. -I${DESTDIR}${X11INCDIR}/freetype2
 CPPFLAGS+=     -DHAVE_GETOPT_LONG=1
 
-LDADD+=        -lfontconfig -lfreetype -lexpat
-DPADD+=        ${LIBFONTCONFIG} ${LIBFREETYPE} ${LIBEXPAT}
+LDADD+=        ${XLIBLDADD_FC}
+DPADD+=        ${XLIBDPADD_FC}
 
 .PATH: ${X11SRCDIR.fontconfig}/${PROG}
 
diff -r 09497a392509 -r e76d6908f87c external/mit/xorg/bin/fstobdf/Makefile
--- a/external/mit/xorg/bin/fstobdf/Makefile    Wed Jun 02 14:27:56 2021 +0000
+++ b/external/mit/xorg/bin/fstobdf/Makefile    Wed Jun 02 14:46:17 2021 +0000
@@ -1,12 +1,12 @@
-#      $NetBSD: Makefile,v 1.3 2015/07/22 07:58:00 mrg Exp $
+#      $NetBSD: Makefile,v 1.3.24.1 2021/06/02 14:46:19 cjep Exp $
 
 .include <bsd.own.mk>
 
 PROG=  fstobdf
 SRCS=  chars.c fstobdf.c header.c props.c
 
-LDADD+=        -lFS -lXext -lX11
-DPADD+=        ${LIBFS} ${LIBXEXT} ${LIBX11}
+LDADD+=        -lFS ${XLIBLDADD_XEXT}
+DPADD+=        ${LIBFS} ${XLIBDPADD_XEXT}
 
 .PATH: ${X11SRCDIR.${PROG}}
 .PATH: ${X11SRCDIR.${PROG}}/man
diff -r 09497a392509 -r e76d6908f87c external/mit/xorg/bin/ico/Makefile
--- a/external/mit/xorg/bin/ico/Makefile        Wed Jun 02 14:27:56 2021 +0000
+++ b/external/mit/xorg/bin/ico/Makefile        Wed Jun 02 14:46:17 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2018/03/11 08:03:20 mrg Exp $
+#      $NetBSD: Makefile,v 1.3.10.1 2021/06/02 14:46:19 cjep Exp $
 
 .include <bsd.own.mk>
 
@@ -6,8 +6,8 @@
 
 CPPFLAGS+=-DMULTITHREAD ${X11FLAGS.THREADS} ${X11FLAGS.EXTENSION}
 
-LDADD+=        -lXext -lX11 -lpthread -lm
-DPADD+=        ${LIBXEXT} ${LIBX11} ${LIBPTHREAD} ${LIBM}
+LDADD+=        ${XLIBLDADD_XEXT} -lpthread -lm
+DPADD+=        ${XLIBDPADD_XEXT} ${LIBPTHREAD} ${LIBM}
 
 .PATH: ${X11SRCDIR.${PROG}}
 .PATH: ${X11SRCDIR.${PROG}}/man
diff -r 09497a392509 -r e76d6908f87c external/mit/xorg/bin/listres/Makefile
--- a/external/mit/xorg/bin/listres/Makefile    Wed Jun 02 14:27:56 2021 +0000
+++ b/external/mit/xorg/bin/listres/Makefile    Wed Jun 02 14:46:17 2021 +0000
@@ -1,12 +1,11 @@
-#      $NetBSD: Makefile,v 1.2 2013/05/31 05:24:49 mrg Exp $
+#      $NetBSD: Makefile,v 1.2.36.1 2021/06/02 14:46:19 cjep Exp $
 
 .include <bsd.own.mk>
 
 PROG=  listres
 
-LDADD+=        -lXaw -lXmu -lXt -lSM -lICE -lXpm -lXext -lX11
-DPADD+=        ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} \
-       ${LIBXPM} ${LIBXEXT} ${LIBX11}
+LDADD+= ${XLIBLDADD_XAW}
+DPADD+= ${XLIBDPADD_XAW}
 
 .PATH: ${X11SRCDIR.${PROG}}
 .PATH: ${X11SRCDIR.${PROG}}/man
diff -r 09497a392509 -r e76d6908f87c external/mit/xorg/bin/oclock/Makefile
--- a/external/mit/xorg/bin/oclock/Makefile     Wed Jun 02 14:27:56 2021 +0000
+++ b/external/mit/xorg/bin/oclock/Makefile     Wed Jun 02 14:46:17 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2013/05/31 06:24:05 mrg Exp $
+#      $NetBSD: Makefile,v 1.3.36.1 2021/06/02 14:46:19 cjep Exp $
 
 .include <bsd.own.mk>
 
@@ -7,8 +7,8 @@
 
 APPDEFS=Clock-color
 
-LDADD+=        -lXmu -lXt -lSM -lICE -lXext -lX11 -lm
-DPADD+=        ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXEXT} ${LIBX11} ${LIBM}
+LDADD+=        ${XLIBLDADD_XMU} -lm
+DPADD+=        ${XLIBDPADD_XMU} ${LIBM}
 
 .PATH: ${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/app-defaults
 .PATH: ${X11SRCDIR.${PROG}}/man



Home | Main Index | Thread Index | Old Index