Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/mit/xorg/server xorgconfig got nuked upstream in 2008
details: https://anonhg.NetBSD.org/src/rev/da53e024c674
branches: trunk
changeset: 349046:da53e024c674
user: snj <snj%NetBSD.org@localhost>
date: Mon Nov 21 09:14:12 2016 +0000
description:
xorgconfig got nuked upstream in 2008
diffstat:
external/mit/xorg/server/xorg-server.old/hw/xfree86/utils/Makefile | 3 +-
external/mit/xorg/server/xorg-server.old/hw/xfree86/utils/xorgconfig/Makefile | 33 ----------
external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile | 3 +-
external/mit/xorg/server/xorg-server/hw/xfree86/utils/xorgconfig/Makefile | 33 ----------
4 files changed, 2 insertions(+), 70 deletions(-)
diffs (97 lines):
diff -r 3961c9ae926c -r da53e024c674 external/mit/xorg/server/xorg-server.old/hw/xfree86/utils/Makefile
--- a/external/mit/xorg/server/xorg-server.old/hw/xfree86/utils/Makefile Mon Nov 21 08:48:00 2016 +0000
+++ b/external/mit/xorg/server/xorg-server.old/hw/xfree86/utils/Makefile Mon Nov 21 09:14:12 2016 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.1.1.1 2016/06/10 03:42:14 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2016/11/21 09:14:12 snj Exp $
SUBDIR= cvt gtf
-#SUBDIR= cvt gtf xorgconfig
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
#SUBDIR+=ioport pcitweak scanpci
diff -r 3961c9ae926c -r da53e024c674 external/mit/xorg/server/xorg-server.old/hw/xfree86/utils/xorgconfig/Makefile
--- a/external/mit/xorg/server/xorg-server.old/hw/xfree86/utils/xorgconfig/Makefile Mon Nov 21 08:48:00 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2016/06/10 03:42:14 mrg Exp $
-
-.include <bsd.own.mk>
-
-PROG= xorgconfig
-
-.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/utils/xorgconfig
-
-SRCS= xorgconfig.c cards.c
-
-LDADD= -lxkbfile -lXext -lX11
-DPADD= ${LIBXKBFILE} ${LIBXEXT} ${LIBX11}
-
-CPPFLAGS+= -DCARD_DATABASE_FILE='"${X11USRLIBDIR}/X11/Cards"' \
- -DXKB_RULES_DIR=\"${X11USRLIBDIR}/X11/xkb/rules\" \
- -DXVERSION=${XORG_VERSION_CURRENT} \
- -DWSCONS_SUPPORT -D__XKBDEFRULES__='"xorg"' \
- -D__XCONFIGFILE__='"xorg.conf"' \
- -D__XSERVERNAME__='"Xorg"' \
- -D__XKBDEFRULES__='"xorg"' \
- -DXVENDORNAME='"The X.Org Foundation"' \
- -DFILEMANSUFFIX=\"5\" \
- -DXVERSIONSTRING=\"1.4.2\"
-
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE} == "cats" || ${MACHINE} == "ofppc"
-CPPFLAGS+= -DPCVT_SUPPORT
-.endif
-
-FILES+= Cards
-FILESDIR_Cards= ${X11USRLIBDIR}/X11
-
-.include <bsd.x11.mk>
-.include <bsd.prog.mk>
diff -r 3961c9ae926c -r da53e024c674 external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile Mon Nov 21 08:48:00 2016 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/utils/Makefile Mon Nov 21 09:14:12 2016 +0000
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.16 2016/08/16 07:56:47 mrg Exp $
+# $NetBSD: Makefile,v 1.17 2016/11/21 09:14:12 snj Exp $
SUBDIR= cvt gtf
-#SUBDIR+= xorgconfig
.include <bsd.subdir.mk>
diff -r 3961c9ae926c -r da53e024c674 external/mit/xorg/server/xorg-server/hw/xfree86/utils/xorgconfig/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/utils/xorgconfig/Makefile Mon Nov 21 08:48:00 2016 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-# $NetBSD: Makefile,v 1.8 2011/02/21 04:42:17 mrg Exp $
-
-.include <bsd.own.mk>
-
-PROG= xorgconfig
-
-.PATH: ${X11SRCDIR.xorg-server}/hw/xfree86/utils/xorgconfig
-
-SRCS= xorgconfig.c cards.c
-
-LDADD= -lxkbfile -lXext -lX11
-DPADD= ${LIBXKBFILE} ${LIBXEXT} ${LIBX11}
-
-CPPFLAGS+= -DCARD_DATABASE_FILE='"${X11USRLIBDIR}/X11/Cards"' \
- -DXKB_RULES_DIR=\"${X11USRLIBDIR}/X11/xkb/rules\" \
- -DXVERSION=${XORG_VERSION_CURRENT} \
- -DWSCONS_SUPPORT -D__XKBDEFRULES__='"xorg"' \
- -D__XCONFIGFILE__='"xorg.conf"' \
- -D__XSERVERNAME__='"Xorg"' \
- -D__XKBDEFRULES__='"xorg"' \
- -DXVENDORNAME='"The X.Org Foundation"' \
- -DFILEMANSUFFIX=\"5\" \
- -DXVERSIONSTRING=\"1.4.2\"
-
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE} == "cats" || ${MACHINE} == "ofppc"
-CPPFLAGS+= -DPCVT_SUPPORT
-.endif
-
-FILES+= Cards
-FILESDIR_Cards= ${X11USRLIBDIR}/X11
-
-.include <bsd.x11.mk>
-.include <bsd.prog.mk>
Home |
Main Index |
Thread Index |
Old Index