summaryrefslogtreecommitdiff
path: root/x11-servers
diff options
context:
space:
mode:
authorSteve Price <steve@FreeBSD.org>1998-09-21 00:04:36 +0000
committerSteve Price <steve@FreeBSD.org>1998-09-21 00:04:36 +0000
commit30f779debfef7e8718ce1b6e8941e575b1331695 (patch)
tree9e584991a3c38b01abbfee2c884f7a18a16b3c81 /x11-servers
parentIf a.out minor number is zero, ELF shlib names should be listed. (diff)
Convert to ELF. These changes are based on a recent thread
on the -current mailing list and at least partial credit goes to the following people for this commit: Joachim Kuebart <joki@kuebart.stuttgart.netsurf.de> Ollivier Robert <roberto@keltia.freenix.fr> NOTE: Kerberos support has been temporarily turned off until someone can make it work.
Notes
Notes: svn path=/head/; revision=13269
Diffstat (limited to 'x11-servers')
-rw-r--r--x11-servers/XFree86-4-Server-snap/Makefile4
-rw-r--r--x11-servers/XFree86-4-Server-snap/pkg-plist18
-rw-r--r--x11-servers/XFree86-4-Server-snap/scripts/configure8
-rw-r--r--x11-servers/XFree86-4-Server/Makefile4
-rw-r--r--x11-servers/XFree86-4-Server/pkg-plist18
-rw-r--r--x11-servers/XFree86-4-Server/scripts/configure8
6 files changed, 50 insertions, 10 deletions
diff --git a/x11-servers/XFree86-4-Server-snap/Makefile b/x11-servers/XFree86-4-Server-snap/Makefile
index 2a1cc0aab112..ba6193f31337 100644
--- a/x11-servers/XFree86-4-Server-snap/Makefile
+++ b/x11-servers/XFree86-4-Server-snap/Makefile
@@ -3,7 +3,7 @@
# Date created: 5 January 1995
# Whom: jmz
#
-# $Id: Makefile,v 1.43 1998/08/05 09:31:39 asami Exp $
+# $Id: Makefile,v 1.44 1998/08/05 19:28:17 jmz Exp $
#
DISTNAME= xc
@@ -60,6 +60,6 @@ pre-fetch:
pre-install:
${MKDIR} /usr/X11R6
post-install:
- ${LDCONFIG} -m ${PREFIX}/lib
+ ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
.include <bsd.port.mk>
diff --git a/x11-servers/XFree86-4-Server-snap/pkg-plist b/x11-servers/XFree86-4-Server-snap/pkg-plist
index e2c6c0a97fd3..bcdf57c5d129 100644
--- a/x11-servers/XFree86-4-Server-snap/pkg-plist
+++ b/x11-servers/XFree86-4-Server-snap/pkg-plist
@@ -1421,42 +1421,55 @@ lib/X11/xserver/SecurityPolicy
lib/X11/xsm/system.xsm
lib/libFS.a
lib/libICE.a
+lib/libICE.so
lib/libICE.so.6.3
lib/libPEX5.a
+lib/libPEX5.so
lib/libPEX5.so.6.0
lib/libSM.a
+lib/libSM.so
lib/libSM.so.6.0
lib/libX11.a
+lib/libX11.so
lib/libX11.so.6.1
lib/libXIE.a
+lib/libXIE.so
lib/libXIE.so.6.0
lib/libXau.a
lib/libXaw.a
+lib/libXaw.so
lib/libXaw.so.6.1
lib/libXdmcp.a
lib/libXdpms.a
lib/libXext.a
+lib/libXext.so
lib/libXext.so.6.3
lib/libXi.a
+lib/libXi.so
lib/libXi.so.6.0
lib/libXmu.a
+lib/libXmu.so
lib/libXmu.so.6.0
lib/libXp.a
+lib/libXp.so
lib/libXp.so.6.2
lib/libXss.a
lib/libXt.a
+lib/libXt.so
lib/libXt.so.6.0
lib/libXtst.a
+lib/libXtst.so
lib/libXtst.so.6.1
lib/libXxf86dga.a
lib/libXxf86misc.a
lib/libXxf86vm.a
lib/liboldX.a
+lib/liboldX.so
lib/liboldX.so.6.0
lib/libxkbfile.a
lib/libxkbui.a
-@exec /sbin/ldconfig -m %B
-@unexec /sbin/ldconfig -R
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
lib/modules/pex5.so
lib/modules/xf86Elo.so
lib/modules/xf86Jstk.so
@@ -2542,6 +2555,7 @@ man/man5/XF86Config.5.gz
@dirrm lib/X11/xkb/types
@dirrm lib/X11/xkb/symbols/sun
@dirrm lib/X11/xkb/symbols/sony
+@dirrm lib/X11/xkb/symbols/sgi
@dirrm lib/X11/xkb/symbols/nec
@dirrm lib/X11/xkb/symbols/fujitsu
@dirrm lib/X11/xkb/symbols/digital
diff --git a/x11-servers/XFree86-4-Server-snap/scripts/configure b/x11-servers/XFree86-4-Server-snap/scripts/configure
index 8be93543648e..299a38014150 100644
--- a/x11-servers/XFree86-4-Server-snap/scripts/configure
+++ b/x11-servers/XFree86-4-Server-snap/scripts/configure
@@ -246,7 +246,8 @@ cat <<'END'
will not be enabled if the kerberos libraries are unavailable.
END
-yesno "Do you want to enable KerberosIV support? [YES] "
+#yesno "Do you want to enable KerberosIV support? [YES] "
+answ=NO
cpkb=NO
if [ $answ = YES ]; then
LIBKRB=/usr/lib/libkrb.a
@@ -267,6 +268,11 @@ if [ $cpkb != NO ]; then
echo "#define HasKrb4 $answ" >> $F
fi
+# ELF detection
+test `sysctl -n kern.osreldate` -ge 300004 &&
+ test `objformat` = elf &&
+ echo "#define UseElfFormat YES" >> $F
+
echo
echo "End of configuration questions. No more user input required"
echo
diff --git a/x11-servers/XFree86-4-Server/Makefile b/x11-servers/XFree86-4-Server/Makefile
index 2a1cc0aab112..ba6193f31337 100644
--- a/x11-servers/XFree86-4-Server/Makefile
+++ b/x11-servers/XFree86-4-Server/Makefile
@@ -3,7 +3,7 @@
# Date created: 5 January 1995
# Whom: jmz
#
-# $Id: Makefile,v 1.43 1998/08/05 09:31:39 asami Exp $
+# $Id: Makefile,v 1.44 1998/08/05 19:28:17 jmz Exp $
#
DISTNAME= xc
@@ -60,6 +60,6 @@ pre-fetch:
pre-install:
${MKDIR} /usr/X11R6
post-install:
- ${LDCONFIG} -m ${PREFIX}/lib
+ ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
.include <bsd.port.mk>
diff --git a/x11-servers/XFree86-4-Server/pkg-plist b/x11-servers/XFree86-4-Server/pkg-plist
index e2c6c0a97fd3..bcdf57c5d129 100644
--- a/x11-servers/XFree86-4-Server/pkg-plist
+++ b/x11-servers/XFree86-4-Server/pkg-plist
@@ -1421,42 +1421,55 @@ lib/X11/xserver/SecurityPolicy
lib/X11/xsm/system.xsm
lib/libFS.a
lib/libICE.a
+lib/libICE.so
lib/libICE.so.6.3
lib/libPEX5.a
+lib/libPEX5.so
lib/libPEX5.so.6.0
lib/libSM.a
+lib/libSM.so
lib/libSM.so.6.0
lib/libX11.a
+lib/libX11.so
lib/libX11.so.6.1
lib/libXIE.a
+lib/libXIE.so
lib/libXIE.so.6.0
lib/libXau.a
lib/libXaw.a
+lib/libXaw.so
lib/libXaw.so.6.1
lib/libXdmcp.a
lib/libXdpms.a
lib/libXext.a
+lib/libXext.so
lib/libXext.so.6.3
lib/libXi.a
+lib/libXi.so
lib/libXi.so.6.0
lib/libXmu.a
+lib/libXmu.so
lib/libXmu.so.6.0
lib/libXp.a
+lib/libXp.so
lib/libXp.so.6.2
lib/libXss.a
lib/libXt.a
+lib/libXt.so
lib/libXt.so.6.0
lib/libXtst.a
+lib/libXtst.so
lib/libXtst.so.6.1
lib/libXxf86dga.a
lib/libXxf86misc.a
lib/libXxf86vm.a
lib/liboldX.a
+lib/liboldX.so
lib/liboldX.so.6.0
lib/libxkbfile.a
lib/libxkbui.a
-@exec /sbin/ldconfig -m %B
-@unexec /sbin/ldconfig -R
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
lib/modules/pex5.so
lib/modules/xf86Elo.so
lib/modules/xf86Jstk.so
@@ -2542,6 +2555,7 @@ man/man5/XF86Config.5.gz
@dirrm lib/X11/xkb/types
@dirrm lib/X11/xkb/symbols/sun
@dirrm lib/X11/xkb/symbols/sony
+@dirrm lib/X11/xkb/symbols/sgi
@dirrm lib/X11/xkb/symbols/nec
@dirrm lib/X11/xkb/symbols/fujitsu
@dirrm lib/X11/xkb/symbols/digital
diff --git a/x11-servers/XFree86-4-Server/scripts/configure b/x11-servers/XFree86-4-Server/scripts/configure
index 8be93543648e..299a38014150 100644
--- a/x11-servers/XFree86-4-Server/scripts/configure
+++ b/x11-servers/XFree86-4-Server/scripts/configure
@@ -246,7 +246,8 @@ cat <<'END'
will not be enabled if the kerberos libraries are unavailable.
END
-yesno "Do you want to enable KerberosIV support? [YES] "
+#yesno "Do you want to enable KerberosIV support? [YES] "
+answ=NO
cpkb=NO
if [ $answ = YES ]; then
LIBKRB=/usr/lib/libkrb.a
@@ -267,6 +268,11 @@ if [ $cpkb != NO ]; then
echo "#define HasKrb4 $answ" >> $F
fi
+# ELF detection
+test `sysctl -n kern.osreldate` -ge 300004 &&
+ test `objformat` = elf &&
+ echo "#define UseElfFormat YES" >> $F
+
echo
echo "End of configuration questions. No more user input required"
echo