summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorSteve Price <steve@FreeBSD.org>1999-08-02 00:54:56 +0000
committerSteve Price <steve@FreeBSD.org>1999-08-02 00:54:56 +0000
commit21a7c53a9d575b62a7edb4a731cc2ddd41fb89cf (patch)
tree1386a3b836df546a7369c0b54bb63a56d715ecfe /x11
parentupgrade to 2.43 (diff)
Link the greeting code in statically like we do on the i386 so that xdm
will work again on FreeBSD/Alpha. Reviewed by: gallatin
Notes
Notes: svn path=/head/; revision=20478
Diffstat (limited to 'x11')
-rw-r--r--x11/XFree86-4-libraries/files/patch-611
-rw-r--r--x11/XFree86-4/files/patch-611
-rw-r--r--x11/XFree86-4/pkg-plist.alpha2
-rw-r--r--x11/XFree86/files/patch-611
-rw-r--r--x11/XFree86/pkg-plist.alpha2
5 files changed, 33 insertions, 4 deletions
diff --git a/x11/XFree86-4-libraries/files/patch-6 b/x11/XFree86-4-libraries/files/patch-6
new file mode 100644
index 000000000000..82ba1e24384d
--- /dev/null
+++ b/x11/XFree86-4-libraries/files/patch-6
@@ -0,0 +1,11 @@
+--- programs/xdm/Imakefile.orig Sun Aug 1 15:28:12 1999
++++ programs/xdm/Imakefile Sun Aug 1 15:33:53 1999
+@@ -20,7 +20,7 @@
+ */
+ #ifndef SharedLibXdmGreet
+ #define SharedLibXdmGreet \
+- ((defined(AlphaArchitecture) && \
++ ((defined(AlphaArchitecture) && !defined(FreeBSDArchitecture) && \
+ (!defined(NetBSDArchitecture) || \
+ (defined(NetBSDArchitecture) && HasSharedLibraries))) || \
+ SystemV4)
diff --git a/x11/XFree86-4/files/patch-6 b/x11/XFree86-4/files/patch-6
new file mode 100644
index 000000000000..82ba1e24384d
--- /dev/null
+++ b/x11/XFree86-4/files/patch-6
@@ -0,0 +1,11 @@
+--- programs/xdm/Imakefile.orig Sun Aug 1 15:28:12 1999
++++ programs/xdm/Imakefile Sun Aug 1 15:33:53 1999
+@@ -20,7 +20,7 @@
+ */
+ #ifndef SharedLibXdmGreet
+ #define SharedLibXdmGreet \
+- ((defined(AlphaArchitecture) && \
++ ((defined(AlphaArchitecture) && !defined(FreeBSDArchitecture) && \
+ (!defined(NetBSDArchitecture) || \
+ (defined(NetBSDArchitecture) && HasSharedLibraries))) || \
+ SystemV4)
diff --git a/x11/XFree86-4/pkg-plist.alpha b/x11/XFree86-4/pkg-plist.alpha
index 1009fda95f03..2bac1552716f 100644
--- a/x11/XFree86-4/pkg-plist.alpha
+++ b/x11/XFree86-4/pkg-plist.alpha
@@ -1286,8 +1286,6 @@ lib/X11/xdm/Xservers
lib/X11/xdm/Xsession
lib/X11/xdm/Xsetup_0
lib/X11/xdm/chooser
-lib/X11/xdm/libXdmGreet.so
-lib/X11/xdm/libXdmGreet.so.1
lib/X11/xdm/xdm-config
lib/X11/xinit/xinitrc
lib/X11/xkb/compat.dir
diff --git a/x11/XFree86/files/patch-6 b/x11/XFree86/files/patch-6
new file mode 100644
index 000000000000..82ba1e24384d
--- /dev/null
+++ b/x11/XFree86/files/patch-6
@@ -0,0 +1,11 @@
+--- programs/xdm/Imakefile.orig Sun Aug 1 15:28:12 1999
++++ programs/xdm/Imakefile Sun Aug 1 15:33:53 1999
+@@ -20,7 +20,7 @@
+ */
+ #ifndef SharedLibXdmGreet
+ #define SharedLibXdmGreet \
+- ((defined(AlphaArchitecture) && \
++ ((defined(AlphaArchitecture) && !defined(FreeBSDArchitecture) && \
+ (!defined(NetBSDArchitecture) || \
+ (defined(NetBSDArchitecture) && HasSharedLibraries))) || \
+ SystemV4)
diff --git a/x11/XFree86/pkg-plist.alpha b/x11/XFree86/pkg-plist.alpha
index 1009fda95f03..2bac1552716f 100644
--- a/x11/XFree86/pkg-plist.alpha
+++ b/x11/XFree86/pkg-plist.alpha
@@ -1286,8 +1286,6 @@ lib/X11/xdm/Xservers
lib/X11/xdm/Xsession
lib/X11/xdm/Xsetup_0
lib/X11/xdm/chooser
-lib/X11/xdm/libXdmGreet.so
-lib/X11/xdm/libXdmGreet.so.1
lib/X11/xdm/xdm-config
lib/X11/xinit/xinitrc
lib/X11/xkb/compat.dir