NetBSD port
This commit is contained in:
committed by
Jon Trulson
parent
a4f9413950
commit
2712d5f787
@@ -125,7 +125,8 @@ SYS_LIBRARIES = -ls
|
||||
SYS_LIBRARIES = -lm -lXdmcp
|
||||
#endif
|
||||
|
||||
#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture)
|
||||
#if defined(LinuxArchitecture) || \
|
||||
defined(FreeBSDArchitecture) || defined(NetBSDArchitecture)
|
||||
SYS_LIBRARIES = -lm -lcrypt
|
||||
EXTRA_DEFINES = $(XINOPT)
|
||||
LOGINXLIB = $(XLIB) $(XINLIB)
|
||||
@@ -207,6 +208,8 @@ INCLUDES = -I$(XPROJECTROOT)/include/freetype2
|
||||
NATIVEXBINDIR = /usr/local/bin
|
||||
#elif defined(OpenBSDArchitecture)
|
||||
NATIVEXBINDIR = /usr/X11R6/bin
|
||||
#elif defined(NetBSDArchitecture)
|
||||
NATIVEXBINDIR = /usr/X11R7/bin
|
||||
#else
|
||||
NATIVEXBINDIR = /usr/bin/X11
|
||||
#endif
|
||||
|
||||
@@ -27,7 +27,7 @@ XCOMM ####################################################################
|
||||
|
||||
#define HASH #
|
||||
|
||||
#if !defined(__FreeBSD__)
|
||||
#if !defined(CSRG_BASED)
|
||||
HASH
|
||||
HASH Source TIMEZONE
|
||||
HASH
|
||||
|
||||
@@ -59,6 +59,10 @@ XCOMM
|
||||
#endif
|
||||
#if defined(__FreeBSD__)
|
||||
XDIR=/usr/local/bin
|
||||
#elif defined(__OpenBSD__)
|
||||
XDIR=/usr/X11R6/bin
|
||||
#elif defined(__NetBSD__)
|
||||
XDIR=/usr/X11R7/bin
|
||||
#endif
|
||||
|
||||
$XDIR/xsetroot -default &
|
||||
|
||||
@@ -115,6 +115,8 @@ XCOMM * Local local@console /usr/bin/X11/X :0
|
||||
:0 Local local_uid@tty1 root /usr/bin/X :0
|
||||
#elif defined (__OpenBSD__)
|
||||
:0 Local local@console /usr/X11R6/bin/X :0
|
||||
#elif defined (__NetBSD__)
|
||||
:0 Local local@console /usr/X11R7/bin/X :0
|
||||
#elif defined (__FreeBSD__)
|
||||
:0 Local local@console /usr/local/bin/X :0
|
||||
#else
|
||||
|
||||
@@ -95,6 +95,14 @@ XCOMM ##########################################################################
|
||||
# define cpp_HELLO "$DT_BINPATH/dthello -file $DT_INSTALL/copyright &"
|
||||
#endif
|
||||
|
||||
#ifdef __NetBSD__
|
||||
# define cpp_MAIL "/var/mail/$USER"
|
||||
# define cpp_XINITUSER "$HOME/.xinitrc"
|
||||
# define cpp_XDMSYS "/etc/X11/xdm/Xsession"
|
||||
# undef cpp_HELLO
|
||||
# define cpp_HELLO "$DT_BINPATH/dthello -file $DT_INSTALL/copyright &"
|
||||
#endif
|
||||
|
||||
|
||||
#if 0
|
||||
/*
|
||||
|
||||
@@ -60,6 +60,8 @@ fi
|
||||
XDIR=/usr/bin
|
||||
#elif defined(__OpenBSD__)
|
||||
XDIR=/usr/X11R6/bin
|
||||
#elif defined(__NetBSD__)
|
||||
XDIR=/usr/X11R7/bin
|
||||
#elif defined(__FreeBSD__)
|
||||
XDIR=/usr/local/bin
|
||||
#else
|
||||
|
||||
@@ -60,7 +60,7 @@ then
|
||||
#if defined (__OpenBSD__)
|
||||
/sbin/chown $USER /dev/$ITE
|
||||
/bin/chgrp $USER_GID /dev/$ITE
|
||||
#elif defined (__FreeBSD__)
|
||||
#elif defined (__FreeBSD__) || defined(__NetBSD__)
|
||||
/usr/sbin/chown $USER /dev/$ITE
|
||||
/usr/bin/chgrp $USER_GID /dev/$ITE
|
||||
#else
|
||||
|
||||
@@ -32,7 +32,7 @@
|
||||
HASH
|
||||
HASH Determine Xsession parent
|
||||
HASH
|
||||
#if defined (__osf__) || defined(__OpenBSD__)
|
||||
#if defined (__osf__) || defined(__OpenBSD__) || defined(__NetBSD__)
|
||||
pexec=$(LC_TIME=C ps -p $PPID | awk 'NR==2 {print $5}')
|
||||
#elif defined(USL) && (OSMAJORVERSION > 1)
|
||||
pexec=$(LC_TIME=C ps -p $PPID | awk 'NR==2 {print $6}')
|
||||
@@ -503,6 +503,8 @@ SetKeyboardMap()
|
||||
FONTLIB=/usr/local/lib/X11/fonts
|
||||
#elif defined(__OpenBSD__)
|
||||
FONTLIB=/usr/X11R6/lib/X11/fonts
|
||||
#elif defined(__NetBSD__)
|
||||
FONTLIB=/usr/X11R7/lib/X11/fonts
|
||||
#endif
|
||||
for i in misc 75dpi 100dpi Speedo Type1 PJE
|
||||
do
|
||||
|
||||
@@ -51,6 +51,7 @@
|
||||
* display manager
|
||||
*/
|
||||
|
||||
# include <sys/types.h>
|
||||
# include <sys/signal.h>
|
||||
# include <sys/stat.h>
|
||||
#if defined(__FreeBSD__) && OSMAJORVERSION > 8
|
||||
@@ -61,7 +62,7 @@
|
||||
# include <time.h>
|
||||
# include <utime.h>
|
||||
# include <pwd.h>
|
||||
#if defined(linux) || defined(__FreeBSD__)
|
||||
#if defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__)
|
||||
# include <stdarg.h>
|
||||
#else
|
||||
# include <varargs.h>
|
||||
|
||||
@@ -53,6 +53,7 @@
|
||||
*/
|
||||
|
||||
# include <setjmp.h>
|
||||
# include <sys/types.h>
|
||||
# include <sys/signal.h>
|
||||
# include "dm.h"
|
||||
# include "vgmsg.h"
|
||||
|
||||
@@ -46,6 +46,7 @@
|
||||
* Author: Keith Packard, MIT X Consortium
|
||||
*/
|
||||
|
||||
# include <sys/types.h>
|
||||
# include <sys/signal.h>
|
||||
# include <setjmp.h>
|
||||
# include <pwd.h>
|
||||
|
||||
Reference in New Issue
Block a user