CVS commit: src/external/mit/xorg/server/xorg-server.old/hw/xfree86/utils
Module Name:src Committed By: mrg Date: Thu Jul 14 07:42:11 UTC 2022 Modified Files: src/external/mit/xorg/server/xorg-server.old/hw/xfree86/utils: Makefile Log Message: doin't build cvt(1) here any more. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/external/mit/xorg/server/xorg-server.old/hw/xfree86/utils/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/server/xorg-server.old/hw/xfree86/utils
Module Name:src
Committed By: mrg
Date: Thu Jul 14 07:42:11 UTC 2022
Modified Files:
src/external/mit/xorg/server/xorg-server.old/hw/xfree86/utils: Makefile
Log Message:
doin't build cvt(1) here any more.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/xorg-server.old/hw/xfree86/utils/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/server/xorg-server.old/hw/xfree86/utils/Makefile
diff -u src/external/mit/xorg/server/xorg-server.old/hw/xfree86/utils/Makefile:1.2 src/external/mit/xorg/server/xorg-server.old/hw/xfree86/utils/Makefile:1.3
--- src/external/mit/xorg/server/xorg-server.old/hw/xfree86/utils/Makefile:1.2 Mon Nov 21 09:14:12 2016
+++ src/external/mit/xorg/server/xorg-server.old/hw/xfree86/utils/Makefile Thu Jul 14 07:42:11 2022
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2016/11/21 09:14:12 snj Exp $
+# $NetBSD: Makefile,v 1.3 2022/07/14 07:42:11 mrg Exp $
-SUBDIR= cvt gtf
+SUBDIR= gtf
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
#SUBDIR+=ioport pcitweak scanpci
CVS commit: src/external/mit/xorg/server/xorg-server.old/hw/netbsd/x68k
Module Name:src
Committed By: tsutsui
Date: Thu Nov 5 16:06:41 UTC 2020
Modified Files:
src/external/mit/xorg/server/xorg-server.old/hw/netbsd/x68k: Makefile
Log Message:
Cherry-pick Xorg version independent changes from xorg-server.
Reorganize CPPFLAGS.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/xorg-server.old/hw/netbsd/x68k/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/server/xorg-server.old/hw/netbsd/x68k/Makefile
diff -u src/external/mit/xorg/server/xorg-server.old/hw/netbsd/x68k/Makefile:1.2 src/external/mit/xorg/server/xorg-server.old/hw/netbsd/x68k/Makefile:1.3
--- src/external/mit/xorg/server/xorg-server.old/hw/netbsd/x68k/Makefile:1.2 Sat Jul 18 15:24:31 2020
+++ src/external/mit/xorg/server/xorg-server.old/hw/netbsd/x68k/Makefile Thu Nov 5 16:06:41 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2020/07/18 15:24:31 tsutsui Exp $
+# $NetBSD: Makefile,v 1.3 2020/11/05 16:06:41 tsutsui Exp $
.include
@@ -31,16 +31,14 @@ SRCS+= miinitext.c
.PATH: ${X11SRCDIR.xorg-server}/fb
SRCS+= fbcmap_mi.c
-CPPFLAGS+= -I${X11SRCDIR.xorg-server}/include \
- -I${X11SRCDIR.xorg-server}/hw/netbsd/x68k \
- -I${X11SRCDIR.xorg-server}/fb \
- -I${X11SRCDIR.xorg-server}/mi \
- -I${X11SRCDIR.xorg-server}/render \
- -I${DESTDIR}${X11INCDIR}/X11
+CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/netbsd/x68k \
+ ${X11INCS.DIX}
CPPFLAGS+= -UXFree86LOADER -UXF86VIDMODE -UXFreeXDGA -UXF86MISC \
-UXF86DRI -UXF86BIGFONT
+CPPFLAGS+= -UHAVE_XORG_CONFIG_H
+
CPPFLAGS.x68kConfig.c= -DX11_LIBDIR=\"${X11ETCDIR}\"
.include "../../../Makefile.Xserver"
CVS commit: src/external/mit/xorg/server/xorg-server.old/hw/netbsd/x68k
Module Name:src Committed By: tsutsui Date: Thu Nov 5 16:06:41 UTC 2020 Modified Files: src/external/mit/xorg/server/xorg-server.old/hw/netbsd/x68k: Makefile Log Message: Cherry-pick Xorg version independent changes from xorg-server. Reorganize CPPFLAGS. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/external/mit/xorg/server/xorg-server.old/hw/netbsd/x68k/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/server/xorg-server.old/hw/sun
Module Name:src Committed By: tsutsui Date: Tue Aug 4 14:35:24 UTC 2020 Modified Files: src/external/mit/xorg/server/xorg-server.old/hw/sun: Makefile.Xsun Log Message: Sync with xorg-server: > Specify default /var/log/Xsun.%s.log path definitions. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 \ src/external/mit/xorg/server/xorg-server.old/hw/sun/Makefile.Xsun Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/server/xorg-server.old/hw/sun
Module Name:src
Committed By: tsutsui
Date: Tue Aug 4 14:35:24 UTC 2020
Modified Files:
src/external/mit/xorg/server/xorg-server.old/hw/sun: Makefile.Xsun
Log Message:
Sync with xorg-server:
> Specify default /var/log/Xsun.%s.log path definitions.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/server/xorg-server.old/hw/sun/Makefile.Xsun
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/server/xorg-server.old/hw/sun/Makefile.Xsun
diff -u src/external/mit/xorg/server/xorg-server.old/hw/sun/Makefile.Xsun:1.1 src/external/mit/xorg/server/xorg-server.old/hw/sun/Makefile.Xsun:1.2
--- src/external/mit/xorg/server/xorg-server.old/hw/sun/Makefile.Xsun:1.1 Wed Jul 22 19:26:37 2020
+++ src/external/mit/xorg/server/xorg-server.old/hw/sun/Makefile.Xsun Tue Aug 4 14:35:24 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.Xsun,v 1.1 2020/07/22 19:26:37 tsutsui Exp $
+# $NetBSD: Makefile.Xsun,v 1.2 2020/08/04 14:35:24 tsutsui Exp $
.include
@@ -13,6 +13,7 @@ WARNS?= 2
.PATH: ${X11SRCDIR.xorg-server}/hw/sun
BUILDSYMLINKS=
+CPPFLAGS+= -DDEFAULT_LOGDIR=\"/var/log\" -DDEFAULT_LOGPREFIX=\"${PROG}.\"
CPPFLAGS+= -DINCLUDE_CG2_HEADER
#CPPFLAGS+= -DLOWMEMFTPT
CVS commit: src/external/mit/xorg/server/xorg-server.old/hw
Module Name:src
Committed By: tsutsui
Date: Wed Jul 22 19:26:37 UTC 2020
Modified Files:
src/external/mit/xorg/server/xorg-server.old/hw: Makefile
Added Files:
src/external/mit/xorg/server/xorg-server.old/hw/sun: Makefile
Makefile.Xsun
src/external/mit/xorg/server/xorg-server.old/hw/sun/Xsun: Makefile
src/external/mit/xorg/server/xorg-server.old/hw/sun/Xsun24: Makefile
src/external/mit/xorg/server/xorg-server.old/hw/sun/XsunMono: Makefile
Log Message:
Add build glue files for Xorg-Server-1.10'fied monolithic Xsun servers.
Not enabled and just for reference.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/mit/xorg/server/xorg-server.old/hw/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/server/xorg-server.old/hw/sun/Makefile \
src/external/mit/xorg/server/xorg-server.old/hw/sun/Makefile.Xsun
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/server/xorg-server.old/hw/sun/Xsun/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/server/xorg-server.old/hw/sun/Xsun24/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/server/xorg-server.old/hw/sun/XsunMono/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/server/xorg-server.old/hw/Makefile
diff -u src/external/mit/xorg/server/xorg-server.old/hw/Makefile:1.1.1.1 src/external/mit/xorg/server/xorg-server.old/hw/Makefile:1.2
--- src/external/mit/xorg/server/xorg-server.old/hw/Makefile:1.1.1.1 Fri Jun 10 03:42:14 2016
+++ src/external/mit/xorg/server/xorg-server.old/hw/Makefile Wed Jul 22 19:26:37 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2016/06/10 03:42:14 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2020/07/22 19:26:37 tsutsui Exp $
.include "../Makefile.common"
@@ -11,6 +11,12 @@ SUBDIR+= xfree86
SUBDIR+=netbsd/x68k
.endif
+.if ${XSERVER_XSUN} != "no" || \
+${XSERVER_XSUNMONO} != "no" || \
+${XSERVER_XSUN24} != "no"
+SUBDIR+=sun
+.endif
+
.if 0
.if ${XSERVER_XALPHANETBSD} != "no"
SUBDIR+=netbsd/alpha
@@ -52,10 +58,6 @@ SUBDIR+=netbsd/macppc
SUBDIR+=netbsd/newsmips
.endif
-.if ${XSERVER_XSUN} != "no"
-SUBDIR+=sun
-.endif
-
.if ${XSERVER_XVFB} != "no"
SUBDIR+=vfb
.endif
Added files:
Index: src/external/mit/xorg/server/xorg-server.old/hw/sun/Makefile
diff -u /dev/null src/external/mit/xorg/server/xorg-server.old/hw/sun/Makefile:1.1
--- /dev/null Wed Jul 22 19:26:37 2020
+++ src/external/mit/xorg/server/xorg-server.old/hw/sun/Makefile Wed Jul 22 19:26:37 2020
@@ -0,0 +1,15 @@
+# $NetBSD: Makefile,v 1.1 2020/07/22 19:26:37 tsutsui Exp $
+
+.include "../../Makefile.common"
+
+SUBDIR= Xsun
+
+.if ${XSERVER_XSUNMONO} != "no"
+SUBDIR+= XsunMono
+.endif
+
+.if ${XSERVER_XSUN24} != "no"
+SUBDIR+= Xsun24
+.endif
+
+.include
Index: src/external/mit/xorg/server/xorg-server.old/hw/sun/Makefile.Xsun
diff -u /dev/null src/external/mit/xorg/server/xorg-server.old/hw/sun/Makefile.Xsun:1.1
--- /dev/null Wed Jul 22 19:26:37 2020
+++ src/external/mit/xorg/server/xorg-server.old/hw/sun/Makefile.Xsun Wed Jul 22 19:26:37 2020
@@ -0,0 +1,134 @@
+# $NetBSD: Makefile.Xsun,v 1.1 2020/07/22 19:26:37 tsutsui Exp $
+
+.include
+
+PROG?= Xsun
+BINMODE= 4711
+
+.include "../../../Makefile.serverlib"
+.include "../../../Makefile.servermod"
+
+WARNS?= 2
+
+.PATH: ${X11SRCDIR.xorg-server}/hw/sun
+
+BUILDSYMLINKS=
+CPPFLAGS+= -DINCLUDE_CG2_HEADER
+#CPPFLAGS+= -DLOWMEMFTPT
+
+# for Xsun (8bpp)
+.if ${PROG} == "Xsun"
+SRCS= sunInit.c
+SRCS+= sunCfb.c
+# XXX not yet
+#SRCS+= sunGX.c sunCursor.c
+SRCS+= sunMfb.c
+
+BUILDSYMLINKS+= ../../mi/miinitext.c sunInitExt.c
+SRCS+= sunInitExt.c
+.endif
+
+# for XsunMono (1bpp)
+.if ${PROG} == "XsunMono"
+BUILDSYMLINKS+= sunInit.c sunInitMono.c
+SRCS= sunInitMono.c
+SRCS+= sunMfb.c
+
+BUILDSYMLINKS+= ../../mi/miinitext.c sunInExMono.c
+SRCS+= sunInExMono.c
+
+CPPFLAGS.sunInitMono.c= -DSUNMAXDEPTH=1
+CPPFLAGS.sunInExMono.c= -URENDER
+.endif
+
+# for Xsun24 (24bpp)
+.if ${PROG} == "Xsun24"
+BUILDSYMLINKS+= sunInit.c sunInitMulti.c
+SRCS+= sunInitMulti.c
+SRCS+= sunCfb.c
+SRCS+= sunCfb24.c
+SRCS+= sunMfb.c
+
+BUILDSYMLINKS+= ../../mi/miinitext.c sunInitExt.c
+SRCS+= sunInitExt.c
+
+CPPFLAGS.sunInitMulti.c= -DSUNMAXDEPTH=32
+.endif
+
+# for XsunMulti (XXX: incomplete?)
+.if 0
+SRCS+= sunMultiDepth.c
+
+BUILDSYMLINKS+= ../../mi/miinitext.c sunInitExt.c
+SRCS+= sunInitExt.c
+.endif
+
+# common sources
+SRCS+= sunFbs.c sunIo.c sunKbd.c sunKeyMap.c sunMouse.c
+
+.PATH: ${X11SRCDIR.xorg-server}/Xext
+SRCS+= dpmsstubs.c
+
+.PATH: ${X11SRCDIR.xorg-server}/Xi
+SRCS+= stubs.c
+
+.PATH: ${X11SRCDIR.xorg-server}/fb
+SRCS+= fbcmap_mi.c
+
+CPPFLAGS+= -I${X11SRCDIR.xorg-server}/hw/sun \
+ ${X11INCS.DIX}
+
+CPPFLAGS+= -UHAVE_XORG_CONFIG_H
+
+CPPFLAGS+= -UXFree86LOADER -UXF86VIDMODE -UXFreeXDGA -UXF86MISC \
+ -UXF86DRI -UXF86BIGFONT
+
+.include "../../../Makefile.Xserver"
+
+LDADD+=
CVS commit: src/external/mit/xorg/server/xorg-server.old/hw
Module Name:src Committed By: tsutsui Date: Wed Jul 22 19:26:37 UTC 2020 Modified Files: src/external/mit/xorg/server/xorg-server.old/hw: Makefile Added Files: src/external/mit/xorg/server/xorg-server.old/hw/sun: Makefile Makefile.Xsun src/external/mit/xorg/server/xorg-server.old/hw/sun/Xsun: Makefile src/external/mit/xorg/server/xorg-server.old/hw/sun/Xsun24: Makefile src/external/mit/xorg/server/xorg-server.old/hw/sun/XsunMono: Makefile Log Message: Add build glue files for Xorg-Server-1.10'fied monolithic Xsun servers. Not enabled and just for reference. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/mit/xorg/server/xorg-server.old/hw/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/mit/xorg/server/xorg-server.old/hw/sun/Makefile \ src/external/mit/xorg/server/xorg-server.old/hw/sun/Makefile.Xsun cvs rdiff -u -r0 -r1.1 \ src/external/mit/xorg/server/xorg-server.old/hw/sun/Xsun/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/mit/xorg/server/xorg-server.old/hw/sun/Xsun24/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/mit/xorg/server/xorg-server.old/hw/sun/XsunMono/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/server/xorg-server.old/hw/netbsd/x68k
Module Name:src
Committed By: tsutsui
Date: Sat Jul 18 15:24:31 UTC 2020
Modified Files:
src/external/mit/xorg/server/xorg-server.old/hw/netbsd/x68k: Makefile
Log Message:
No need to link miext/libshadow.a.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/mit/xorg/server/xorg-server.old/hw/netbsd/x68k/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/server/xorg-server.old/hw/netbsd/x68k/Makefile
diff -u src/external/mit/xorg/server/xorg-server.old/hw/netbsd/x68k/Makefile:1.1.1.1 src/external/mit/xorg/server/xorg-server.old/hw/netbsd/x68k/Makefile:1.2
--- src/external/mit/xorg/server/xorg-server.old/hw/netbsd/x68k/Makefile:1.1.1.1 Fri Jun 10 03:42:14 2016
+++ src/external/mit/xorg/server/xorg-server.old/hw/netbsd/x68k/Makefile Sat Jul 18 15:24:31 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2016/06/10 03:42:14 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2020/07/18 15:24:31 tsutsui Exp $
.include
@@ -58,7 +58,6 @@ LDADD+= ${LDADD.dix} \
${LDADD.xfixes} \
${LDADD.damageext} \
${LDADD.miext/damage} \
- ${LDADD.miext/shadow} \
${LDADD.miext/sync} \
${LDADD.Xi} \
-lXfont \
@@ -80,7 +79,6 @@ DPADD+= ${LDADD.dix} \
${DPADD.xfixes} \
${DPADD.damageext} \
${DPADD.miext/damage} \
- ${DPADD.miext/shadow} \
${DPADD.miext/sync} \
${DPADD.Xi} \
${LIBXFONT} \
CVS commit: src/external/mit/xorg/server/xorg-server.old/hw/netbsd/x68k
Module Name:src Committed By: tsutsui Date: Sat Jul 18 15:24:31 UTC 2020 Modified Files: src/external/mit/xorg/server/xorg-server.old/hw/netbsd/x68k: Makefile Log Message: No need to link miext/libshadow.a. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/mit/xorg/server/xorg-server.old/hw/netbsd/x68k/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/server/xorg-server.old/hw/vfb
Module Name:src
Committed By: riastradh
Date: Sat Jul 15 13:54:07 UTC 2017
Modified Files:
src/external/mit/xorg/server/xorg-server.old/hw/vfb: Makefile
Log Message:
Missed a MKCRYPTO spot.
...although if nobody noticed, maybe that means this doesn't actually
use libcrypto?
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/xorg-server.old/hw/vfb/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/server/xorg-server.old/hw/vfb/Makefile
diff -u src/external/mit/xorg/server/xorg-server.old/hw/vfb/Makefile:1.3 src/external/mit/xorg/server/xorg-server.old/hw/vfb/Makefile:1.4
--- src/external/mit/xorg/server/xorg-server.old/hw/vfb/Makefile:1.3 Sat Oct 8 20:03:04 2016
+++ src/external/mit/xorg/server/xorg-server.old/hw/vfb/Makefile Sat Jul 15 13:54:07 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2016/10/08 20:03:04 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2017/07/15 13:54:07 riastradh Exp $
.include
@@ -111,10 +111,8 @@ DPADD+= ${DPADD.dix} \
${LIBZ} \
${LIBM}
-.if ${MKCRYPTO:Uno} != "no"
LDADD+= -lcrypto
DPADD+= ${LIBCRYPTO}
-.endif
.if ${MACHINE_ARCH} == "i386"
LDADD+= -li386
CVS commit: src/external/mit/xorg/server/xorg-server.old/hw/vfb
Module Name:src Committed By: riastradh Date: Sat Jul 15 13:54:07 UTC 2017 Modified Files: src/external/mit/xorg/server/xorg-server.old/hw/vfb: Makefile Log Message: Missed a MKCRYPTO spot. ...although if nobody noticed, maybe that means this doesn't actually use libcrypto? To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/external/mit/xorg/server/xorg-server.old/hw/vfb/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/server/xorg-server.old/hw
Module Name:src
Committed By: christos
Date: Wed Jun 29 19:36:35 UTC 2016
Modified Files:
src/external/mit/xorg/server/xorg-server.old/hw/vfb: Makefile
src/external/mit/xorg/server/xorg-server.old/hw/xfree86/Xorg: Makefile
src/external/mit/xorg/server/xorg-server.old/hw/xnest: Makefile
Log Message:
Fix MKCRYPTO=no build
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/mit/xorg/server/xorg-server.old/hw/vfb/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/mit/xorg/server/xorg-server.old/hw/xfree86/Xorg/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/mit/xorg/server/xorg-server.old/hw/xnest/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/server/xorg-server.old/hw/vfb/Makefile
diff -u src/external/mit/xorg/server/xorg-server.old/hw/vfb/Makefile:1.1.1.1 src/external/mit/xorg/server/xorg-server.old/hw/vfb/Makefile:1.2
--- src/external/mit/xorg/server/xorg-server.old/hw/vfb/Makefile:1.1.1.1 Thu Jun 9 23:42:14 2016
+++ src/external/mit/xorg/server/xorg-server.old/hw/vfb/Makefile Wed Jun 29 15:36:35 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2016/06/10 03:42:14 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/29 19:36:35 christos Exp $
.include
@@ -81,8 +81,7 @@ LDADD+= ${LDADD.dix} \
-lpixman-1 \
-lXdmcp \
-lz \
- -lm \
- -lcrypto
+ -lm
DPADD+= ${DPADD.dix} \
${DPADD.fb} \
@@ -111,8 +110,12 @@ DPADD+= ${DPADD.dix} \
${LIBPIXMAN1} \
${LIBXDMCP} \
${LIBZ} \
- ${LIBM} \
- ${LIBCRYPTO}
+ ${LIBM}
+
+.if ${MKCRYPTO:Uno} != "no"
+LDADD+= -lcrypto
+DPADD+= ${LIBCRYPTO}
+.endif
.if ${MACHINE_ARCH} == "i386"
LDADD+= -li386
Index: src/external/mit/xorg/server/xorg-server.old/hw/xfree86/Xorg/Makefile
diff -u src/external/mit/xorg/server/xorg-server.old/hw/xfree86/Xorg/Makefile:1.1.1.1 src/external/mit/xorg/server/xorg-server.old/hw/xfree86/Xorg/Makefile:1.2
--- src/external/mit/xorg/server/xorg-server.old/hw/xfree86/Xorg/Makefile:1.1.1.1 Thu Jun 9 23:42:14 2016
+++ src/external/mit/xorg/server/xorg-server.old/hw/xfree86/Xorg/Makefile Wed Jun 29 15:36:35 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2016/06/10 03:42:14 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/29 19:36:35 christos Exp $
.include
@@ -62,7 +62,6 @@ LDADD+= ${LDADD.hw/xfree86/dixmods/fb}
LDADD+= ${LDADD.hw/xfree86/dixmods/xorgxkb}
LDADD+= -lpixman-1 -lXfont -lfreetype -lXau -lfontenc -lXdmcp
LDADD+= -lpciaccess -ldrm
-LDADD+= -lcrypto
LDADD+= -Wl,--no-whole-archive
.if ${MACHINE_ARCH} == "i386"
@@ -119,8 +118,12 @@ DPADD+= ${DPADD.dix} \
${DPADD.hw/xfree86/i2c} \
${LIBCWRAPPER} \
${LIBXFONT} ${LIBFREETYPE} ${LIBXAU} ${LIBFONTENC} \
- ${LIBPIXMAN1} ${LIBXDMCP} ${LIBZ} ${LIBM} ${LIBPCIACCESS} \
- ${LIBCRYPTO}
+ ${LIBPIXMAN1} ${LIBXDMCP} ${LIBZ} ${LIBM} ${LIBPCIACCESS}
+
+.if ${MKCRYPTO:Uno} != "no"
+LDADD+= -lcrypto
+DPADD+= ${LIBCRYPTO}
+.endif
SYMLINKS= ${X11BINDIR}/Xorg ${X11BINDIR}/X
Index: src/external/mit/xorg/server/xorg-server.old/hw/xnest/Makefile
diff -u src/external/mit/xorg/server/xorg-server.old/hw/xnest/Makefile:1.1.1.1 src/external/mit/xorg/server/xorg-server.old/hw/xnest/Makefile:1.2
--- src/external/mit/xorg/server/xorg-server.old/hw/xnest/Makefile:1.1.1.1 Thu Jun 9 23:42:14 2016
+++ src/external/mit/xorg/server/xorg-server.old/hw/xnest/Makefile Wed Jun 29 15:36:35 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2016/06/10 03:42:14 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2016/06/29 19:36:35 christos Exp $
.include
@@ -71,7 +71,7 @@ LDADD+= ${LDADD.dix} \
${LDADD.glx} \
-lXfont -lXext -lfontenc \
-lpixman-1 -lX11 -lXau \
- -lXdmcp -lfreetype -lm -lcrypto
+ -lXdmcp -lfreetype -lm
DPADD+= ${LDADD.dix} \
${DPADD.fb} \
@@ -95,7 +95,12 @@ DPADD+= ${LDADD.dix} \
${DPADD.glx} \
${LIBXFONT} ${LIBXEXT} ${LIBFONTENC} \
${LIBPIXMAN-1} ${LIBX11} ${LIBXAU} \
- ${LIBXDMCP} ${LIBFREETYPE} ${LIBM} ${LIBCRYPTO}
+ ${LIBXDMCP} ${LIBFREETYPE} ${LIBM}
+
+.if ${MKCRYPTO:Uno} != "no"
+LDADD+= -lcrypto
+DPADD+= ${LIBCRYPTO}
+.endif
.if ${MACHINE_ARCH} == "i386"
LDADD+= -li386
CVS commit: src/external/mit/xorg/server/xorg-server.old/hw
Module Name:src Committed By: christos Date: Wed Jun 29 19:36:35 UTC 2016 Modified Files: src/external/mit/xorg/server/xorg-server.old/hw/vfb: Makefile src/external/mit/xorg/server/xorg-server.old/hw/xfree86/Xorg: Makefile src/external/mit/xorg/server/xorg-server.old/hw/xnest: Makefile Log Message: Fix MKCRYPTO=no build To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/mit/xorg/server/xorg-server.old/hw/vfb/Makefile cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/mit/xorg/server/xorg-server.old/hw/xfree86/Xorg/Makefile cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/mit/xorg/server/xorg-server.old/hw/xnest/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
