CVS: crater/x11/xfree86 BUILD, 1.6, 1.7 CONFIGURE, 1.22,
1.23 DEPENDS, 1.2, 1.3 DETAILS, 1.5, 1.6 POST_INSTALL, 1.4,
1.5 PRE_BUILD, 1.4, 1.5 xsession, 1.1, 1.2
nhudson at lunar-linux.org
nhudson at lunar-linux.org
Tue Sep 9 21:25:15 GMT 2003
Update of /var/cvs/lunar/crater/x11/xfree86
In directory dbguin.lunar-linux.org:/tmp/cvs-serv17551
Modified Files:
BUILD CONFIGURE DEPENDS DETAILS POST_INSTALL PRE_BUILD
xsession
Log Message:
Xfree86 4.3.99.10
Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/crater/x11/xfree86/BUILD,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- BUILD 28 Feb 2003 01:31:55 -0000 1.6
+++ BUILD 9 Sep 2003 21:25:13 -0000 1.7
@@ -1,7 +1,7 @@
install_drm() {
DRM_DIR="programs/Xserver/hw/xfree86/os-support/linux/drm/kernel"
- DRM_DEST="/lib/modules/`uname -r`/kernel/drivers"
+ DRM_DEST="/lib/modules/`installed_version linux`/kernel/drivers/char/drm"
mkdir -p $DRM_DEST
cp $DRM_DIR/*.o $DRM_DEST 2>/dev/null
depmod -a
@@ -9,10 +9,6 @@
}
-if [ -e /etc/X11/xinit/xinitrc ]; then
- cp /etc/X11/xinit/xinitrc /etc/X11/xinit/xinitrc.orig
- echo "Your master xinitrc file has been backed up as /etc/X11/xinit/xinitrc.orig"
-fi
if [ -f $CONFIG_CACHE/host.def ]
then cp $CONFIG_CACHE/host.def config/cf/host.def
@@ -20,31 +16,53 @@
message "Building XFree86 takes a very long time."
-
(
-
- echo "#define InstallXdmConfig YES" >> config/cf/site.def
- echo "#define InstallXinitConfig YES" >> config/cf/site.def
+ #removing -Os from copied host.def and cleaning up $CFLAGS
+ #leaving the original file untouched
+ #for when this gcc bug gets fixed
+ #
+ if [ -f config/cf/host.def ]
+ then sedit s"/-Os//g" config/cf/host.def
+ fi &&
+ if (echo $CFLAGS | grep -q -- "-Os"); then
+ export CFLAGS="-O2 ${CFLAGS//-Os/}"
+ fi &&
if module_installed Linux-PAM
then echo "#define HasPam YES" >> config/cf/site.def
- fi
+ fi &&
- export CFLAGS=`echo $CFLAGS | sed s/-funroll-loops//`
- export CFLAGS=`echo $CFLAGS | sed s/-ffast-math//`
- export CXXFLAGS=`echo $CXXFLAGS | sed s/-funroll-loops//`
- export CXXFLAGS=`echo $CXXFLAGS | sed s/-ffast-math//`
- export CPPFLAGS=`echo $CPPFLAGS | sed s/-funroll-loops//`
- export CPPFLAGS=`echo $CPPFLAGS | sed s/-ffast-math//`
+ #
+ #xfree86.org recommends building in a shadow tree [ it appears to fix a breakage
+ #with gcc not setting up the include paths properly, previously include files weren't found if
+ #xfree86 wasn't already installed ]
+ #
+ cd config/util &&
+ make -f Makefile.ini lndir &&
+ cp lndir $SOURCE_DIRECTORY.bld/ &&
+ cd $SOURCE_DIRECTORY.bld &&
+ ./lndir ../xc/ &&
- make World &&
+ make World &&
+
+
+ mkdir lib/font/builtins/unshared &&
+ cp lib/font/builtins/*.* lib/font/builtins/unshared &&
+
+ make &&
prepare_install &&
- cd $SOURCE_DIRECTORY
+ # the following is needed for pkgconfig to find the .pc files
+ mkdir -p /usr/X11R6/lib &&
+ ln -sf /usr/lib/pkgconfig /usr/X11R6/lib &&
make install &&
make install.man &&
install_drm &&
- mkdir -p /usr/X11R6/include/GL &&
- rm -f /usr/X11R6/lib/libz.a &&
+ mkdir -p /usr/X11R6/include/GL
+
+) > $C_FIFO 2>&1 && (
+
+ rm -f /usr/X11R6/include/zlib.h
+ rm -f /usr/X11R6/lib/libz.a
if [ ! -e /etc/skel/.xsession ]; then
cp $SCRIPT_DIRECTORY/xsession /etc/skel/.xsession
@@ -52,27 +70,18 @@
if [ ! -e /usr/bin/X11 ]; then
ln -sf /usr/X11R6/bin /usr/bin/X11
- fi &&
+ fi
if [ ! -e /usr/X11 ]; then
ln -sf X11R6 /usr/X11
- fi &&
+ fi
if [ ! -e /usr/include/X11 ]; then
ln -sf ../X11R6/include/X11 /usr/include/X11
- fi &&
+ fi
if [ ! -e /usr/lib/X11 ]; then
ln -sf ../X11R6/lib/X11 /usr/lib/X11
- fi &&
-
- if [ ! -e /usr/lib/libMesaGLU.so ]; then
- ln -sf /usr/X11R6/lib/libGLU.so.1.3 /usr/lib/libMesaGLU.so
- fi &&
-
- if [ ! -e /usr/X11R6/lib/libMesaGL.so ]; then
- ln -sf /usr/X11R6/lib/libGL.so.1.2 /usr/X11R6/lib/libMesaGL.so
fi
-
-) > $C_FIFO 2>&1
+)
Index: CONFIGURE
===================================================================
RCS file: /var/cvs/lunar/crater/x11/xfree86/CONFIGURE,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- CONFIGURE 2 Mar 2003 20:17:43 -0000 1.22
+++ CONFIGURE 9 Sep 2003 21:25:13 -0000 1.23
@@ -1,8 +1,3 @@
-optimize_platform $GCCVER
- CFLAGS=`echo $CFLAGS | sed s/-funroll-loops//`
- CFLAGS=`echo $CFLAGS | sed s/-ffast-math//`
-echo $CFLAGS
-
build_checklist() {
STATUS=$1
@@ -22,7 +17,7 @@
HELP="Key: [X] = on, [ ] = off"
CHECKLIST="`build_checklist ON Graphics $ON_CARD_DRIVERS`
- `build_checklist OFF Graphics $OFF_CARD_DRIVERS`"
+ `build_checklist OFF Grahpics $OFF_CARD_DRIVERS`"
if XF86CardDrivers=`dialog --backtitle "$BACKTITLE" \
--title "$TITLE" \
@@ -100,46 +95,48 @@
initialize() {
- BACKTITLE="lunar XFree86 host.def Configuration Menu"
+ BACKTITLE="Source Mage XFree86 host.def Configuration Menu"
ON_CARD_DRIVERS="vga vesa v4l"
- OFF_CARD_DRIVERS="mga glint nv tga s3virge sis s3 rendition neomagic i740
+ OFF_CARD_DRIVERS="mga glint nv tga s3virge sis rendition neomagic i740
tdfx savage cirrus vmware tseng trident chips apm
- GlideDriver fbdev i128 ati ark cyrix
- siliconmotion i810 imstt nsc tga"
+ GlideDriver fbdev i128 ati i810 ark cyrix
+ siliconmotion"
CARD_DRIVERS="$ON_CARD_DRIVERS $OFF_CARD_DRIVERS"
ON_DRI=""
- OFF_DRI="gamma TdfxDriDriver mga r128 i810 radeon sis"
+ OFF_DRI="gamma TdfxDriDriver mga i810 i830 r128 radeon sis r200 mach64
+ s3v trident"
DRI="$ON_DRI $OFF_DRI"
ON_INPUT_DRIVERS="mouse keyboard"
- OFF_INPUT_DRIVERS="dynapro elographics magellan microtouch mutouch
- spaceorb wacom void citron digitaledge dmc elographics
- fpit hyperpen js_x kbd palmax penmount summa
- tek4957 ur98"
+ OFF_INPUT_DRIVERS="acecad calcomp citron digitaledge dmc dynapro elographics
+ fpit hyperpen jamstudio magictouch magellan microtouch
+ mutouch palmax penmount summa tek4957 spaceorb wacom void"
INPUT_DRIVERS="$ON_INPUT_DRIVERS $OFF_INPUT_DRIVERS"
- YES_FONT_OPTIONS="MakeLocalFontDir Build75DpiFonts Build100DpiFonts BuildFontServer"
- NO_FONT_OPTIONS="BuildCIDFonts BuildCyrillicFonts
- BuildLatin2Fonts UseKoi8RForCyrillic
- BuildArabicFonts BuildISO8859_6Fonts
- BuildGreekFonts BuildISO8859_7Fonts
- BuildHebrewFonts BuildISO8859_8Fonts
- BuildKOI8_RFonts BuildJapaneseFonts
- BuildJISX0201Fonts BuildKoreanFonts
- BuildChineseFonts InstallFSConfig
- SharedLibFont CompressAllFonts
- GzipFontCompression"
+ YES_FONT_OPTIONS="MakeLocalFontDir Build75DpiFonts Build100DpiFonts
+ BuildType1Fonts BuildTrueTypeFonts BuildSpeedoFonts
+ GzipFontCompression CompressAllFonts"
+ NO_FONT_OPTIONS="BuildCIDFonts BuildCyrillicFonts UseKoi8RForCyrillic
+ BuildLatin2Fonts BuildArabicFonts BuildThaiFonts
+ BuildGreekFonts BuildHebrewFonts BuildJapaneseFonts
+ BuildKoreanFonts BuildBethMarduthoFonts BuildEthiopicFonts
+ BuildChineseFonts BuildISO8859_2Fonts BuildISO8850_3Fonts
+ BuildISO8859_4Fonts BuildISO8859_9Fonts BuildISO8859_10Fonts
+ BuildISO8859_13Fonts BuildISO8859_14Fonts
+ BuildISO8859_15Fonts BuildISO8859_16Fonts
+ BuildBuiltinFonts BuildFontServer InstallFSConfig"
FONT_OPTIONS="$YES_FONT_OPTIONS $NO_FONT_OPTIONS"
- YES_MISC_OPTIONS="HasShm BuildGLULibrary BuildGLXLibrary BuildGlxExt BuildDBE BuildRECORD InstallXinitConfig InstallXdmConfig XprtServer ThreadedX"
- NO_MISC_OPTIONS="BuildServersOnly BuildPexExt XnestServer
- LinuxFBDevSupport XVirtualFramebufferServer
- BuildXF86DRI BuildXF86DRM"
+ YES_MISC_OPTIONS="HasShm BuildXF86DRI BuildXF86DRM BuildGLULibrary
+ BuildGlxExt BuildOSMesaLib
+ InstallXinitConfig InstallXdmConfig"
+ NO_MISC_OPTIONS="BuildServersOnly XnestServer
+ LinuxFBDevSupport XVirtualFramebufferServer"
MISC_OPTIONS="$YES_MISC_OPTIONS $NO_MISC_OPTIONS"
}
@@ -147,34 +144,15 @@
generate_host_def() {
-
- echo "#define DefaultCCOptions $CFLAGS $LDFLAGS"
- echo "#define DefaultGcc2i386Opt $CFLAGS $LDFLAGS"
- echo "#define LibraryCDebugFlags $CFLAGS $LDFLAGS"
- echo "#define DefaultCDebugFlags $CFLAGS $LDFLAGS"
- echo "#define OptimizedCDebugFlags $CFLAGS $LDFLAGS"
-
- if [[ $COPT != "" ]]; then
- echo "#define GccWarningOptions $COPT"
- fi
-
- if [[ -f /proc/mtrr ]]; then
- echo "#define HasMTRRSupport YES"
- fi
-
- case $CPU in
- Pentium*)echo "#define HasMMXSupport YES"
- echo "#define HasSSESupport YES"
- echo "#define MesaUseKatmai YES"
-# if [[ CPU == "Pentium4" ]];
-# echo "#define HasSSE2Support YES"
-# fi
- ;;
- Athlon*)echo "#define HasMMXSupport YES"
- echo "#define Has3DNowSupport YES"
- echo "#define MesaUse3DNow YES"
- ;;
- esac
+ echo "#define DefaultCCOptions $CFLAGS"
+ echo "#define DefaultGcc2i386Opt $CFLAGS"
+ echo "#define LibraryCDebugFlags $CFLAGS"
+ echo "#define DefaultCDebugFlags $CFLAGS"
+ echo "#define OptimizedCDebugFlags $CFLAGS"
+ echo "#define HasZlib YES"
+ echo "#define HasFontconfig YES"
+ echo "#define HasFreetype2 YES"
+ echo "#define HasExpat YES"
if [ -z "$XF86CardDrivers" ]; then
XF86CardDrivers="$ON_CARD_DRIVERS"
@@ -193,6 +171,8 @@
echo "#define DriDrivers $DriDrivers"
fi
+
+
if [ -z "$XInputDrivers" ]; then
echo "#define XInputDrivers mouse"
else
@@ -201,6 +181,8 @@
echo "#define XInputDrivers $XInputDrivers"
fi
+
+
for ITEM in $YES_FONT_OPTIONS; do
echo "#define $ITEM YES"
done
@@ -209,12 +191,6 @@
echo "#define $ITEM NO"
done
- if module_installed freetype2; then
- echo "#define HasFreetype2 YES"
- echo "#define BuildFreetype2Library NO"
- echo "#define Freetype2Dir /usr"
- fi
-
for ITEM in $YES_MISC_OPTIONS; do
echo "#define $ITEM YES"
done
@@ -332,22 +308,12 @@
}
-message "${MESSAGE_COLOR}**WARNING** If you are running this inside a" \
- "existing X server installation I would suggest that you close" \
- "X and run this from the Linux Console"
-message "If you have any problems with installation please remove" \
- "your existing xfree86 module and remove /usr/X11R6"
-message "${MESSAGE_COLOR}The DRI/DRM in xfree86 4.3.0 is not" \
- "compatibile with the DRI/DRM in linux-2.4.20."
-message "If you use DRI/DRM please enable DRM in the" \
- "xfree86 configuration"
-message "and disable it in the linux configuration.${DEFAULT_COLOR}"
-
-
if [ -f $CONFIG_CACHE/host.def ]
then message "Reconfiguration is optional."
fi
-if query "Configure host.def?" n
+echo $CFLAGS
+
+if query "Configure host.def?" y
then configure_host_def
fi
Index: DEPENDS
===================================================================
RCS file: /var/cvs/lunar/crater/x11/xfree86/DEPENDS,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- DEPENDS 28 Feb 2003 01:35:14 -0000 1.2
+++ DEPENDS 9 Sep 2003 21:25:13 -0000 1.3
@@ -1,3 +1,5 @@
-depends perl &&
-depends libpng &&
-optional_depends "freetype2" "" "" "for freetype support"
+depends perl &&
+depends fontconfig &&
+depends zlib &&
+depends libpng &&
+optional_depends "Linux-PAM" "" "" "for PAM authentication"
Index: DETAILS
===================================================================
RCS file: /var/cvs/lunar/crater/x11/xfree86/DETAILS,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- DETAILS 4 Mar 2003 03:25:25 -0000 1.5
+++ DETAILS 9 Sep 2003 21:25:13 -0000 1.6
@@ -1,47 +1,81 @@
MODULE=xfree86
- VERSION=4.3.0
+ VERSION=4.3.99.10
SOURCE=X430src-1.tgz
SOURCE2=X430src-2.tgz
SOURCE3=X430src-3.tgz
- SOURCE4=X430src-4.tgz
- SOURCE5=X430src-5.tgz
- SOURCE6=X430src-6.tgz
- SOURCE7=X430src-7.tgz
- FUZZY="off"
+ SOURCE4=X430src-4.tgz
+ SOURCE5=X430src-5.tgz
+ SOURCE6=X430src-6.tgz
+ SOURCE7=X430src-7.tgz
+ FUZZ=off
SOURCE_DIRECTORY=$BUILD_DIRECTORY/xc
SOURCE_URL[0]=$XFREE86_URL/4.3.0/source/$SOURCE
- SOURCE_URL[1]=ftp://ftp.xfree86.org/pub/XFree86/4.3.0/source/$SOURCE
SOURCE2_URL[0]=$XFREE86_URL/4.3.0/source/$SOURCE2
- SOURCE2_URL[1]=ftp://ftp.xfree86.org/pub/XFree86/4.3.0/source/$SOURCE2
SOURCE3_URL[0]=$XFREE86_URL/4.3.0/source/$SOURCE3
- SOURCE3_URL[1]=ftp://ftp.xfree86.org/pub/XFree86/4.3.0/source/$SOURCE3
SOURCE4_URL[0]=$XFREE86_URL/4.3.0/source/$SOURCE4
- SOURCE4_URL[1]=ftp://ftp.xfree86.org/pub/XFree86/4.3.0/source/$SOURCE4
SOURCE5_URL[0]=$XFREE86_URL/4.3.0/source/$SOURCE5
- SOURCE5_URL[1]=ftp://ftp.xfree86.org/pub/XFree86/4.3.0/source/$SOURCE5
SOURCE6_URL[0]=$XFREE86_URL/4.3.0/source/$SOURCE6
- SOURCE6_URL[1]=ftp://ftp.xfree86.org/pub/XFree86/4.3.0/source/$SOURCE6
SOURCE7_URL[0]=$XFREE86_URL/4.3.0/source/$SOURCE7
- SOURCE7_URL[1]=ftp://ftp.xfree86.org/pub/XFree86/4.3.0/source/$SOURCE7
- WEB_SITE=http://www.xfree86.org
+ SOURCE_VFY=md5:=90fd1261c1a70510a12fececedadf1a9
+ SOURCE2_VFY=md5:b8a1c45dd8c59549e435111115a439d3
+ SOURCE3_VFY=md5:793531f6c1bdf9d4d2f3f878901192b8
+ SOURCE4_VFY=md5:d40bfdcc2ed4e496c1ad7a71f2e3fc64
+ SOURCE5_VFY=md5:3b8d6ded289c64af6055c915f05326e8
+ SOURCE6_VFY=md5:fb8a4e286d9691a13bc2df84e5149a0e
+ SOURCE7_VFY=md5:f689e23a1bf1c15a91c998be971e5660
+ SOURCE8=4.3.0-4.3.99.1.diff.bz2
+ SOURCE8_VFY=md5:d0a45c02da01c1d0454e60c60de27c62
+ SOURCE8_URL=ftp://ftp.xfree86.org/pub/XFree86/develsnaps/$SOURCE8
+ SOURCE9=4.3.99.1-4.3.99.2.diff.bz2
+ SOURCE9_VFY=md5:90dc8859025ddc5fc9cf8ddbabaa775a
+ SOURCE9_URL=ftp://ftp.xfree86.org/pub/XFree86/develsnaps/$SOURCE9
+ SOURCE10=4.3.99.2-4.3.99.3.diff.bz2
+ SOURCE10_VFY=md550af66fc8c9d2da8085b6466f07e40e6
+ SOURCE10_URL=ftp://ftp.xfree86.org/pub/XFree86/develsnaps/$SOURCE10
+ SOURCE11=4.3.99.3-4.3.99.4.diff.bz2
+ SOURCE10_VFY=md5:d48a43d9d364f57fa96ccf15113232b8
+ SOURCE11_URL=ftp://ftp.xfree86.org/pub/XFree86/develsnaps/$SOURCE11
+ SOURCE12=4.3.99.4-4.3.99.5.diff.bz2
+ SOURCE11_VFY=md5:4792fc1915881e4cee2f19183c1edada
+ SOURCE12_URL=ftp://ftp.xfree86.org/pub/XFree86/develsnaps/$SOURCE12
+ SOURCE13=4.3.99.5-4.3.99.6.diff.bz2
+ SOURCE13_VFY=md5:ad6a8b3446b7ae722109ceb1323d154d
+ SOURCE13_URL=ftp://ftp.xfree86.org/pub/XFree86/develsnaps/$SOURCE13
+ SOURCE14=4.3.99.6-4.,3.99.7.diff.bz2
+ SOURCE14_VFY=md5:3bfd976d1e70b03c2026dbc85b1cb8d3
+ SOURCE14_URL=ftp://ftp.xfree86.org/pub/XFree86/develsnaps/$SOURCE14
+ SOURCE15=4.3.99.7-4.3.99.8.diff.bz2
+ SOURCE15_VFY=md5:feec1a22ca4af69f4c4e4bbebd5273d5
+ SOURCE15_URL=ftp://ftp.xfree86.org/pub/XFree86/develsnaps/$SOURCE15
+ SOURCE16=4.3.99.8-4.3.99.9.diff.bz2
+ SOURCE16_VFY=md5:260e4b7d239c17df7d5de356e3399432
+ SOURCE16_URL=ftp://ftp.xfree86.org/pub/XFree86/develsnaps/$SOURCE16
+ SOURCE17=4.3.99.9-4.3.99.10.diff.bz2
+ SOURCE17_VFY=md5:2f2a14ae651c754eba38f2ecbd5278ab
+ SOURCE17_URL=ftp://ftp.xfree86.org/pub/XFree86/develsnaps/$SOURCE17
+ WEB_SITE=http://www.xfree86.org/
ENTERED=20010922
- UPDATED=20030304
- SHORT="xfree86 is a free implementation of the X Window System."
+ UPDATED=20030909
+ SHORT='XFree86 is a free implementation of the X Window System'
cat << EOF
-What is XFree86?
-The XFree86 Project, Inc is an organisation which produces XFree86, a
-freely redistributable open-source implementation of the X Window System
-that runs on UNIX(R) and UNIX-like (like Linux, the BSDs, Mac OS X (aka
-Darwin) and Solaris x86 series) operating systems and OS/2.
-XFree86 is the underlying software that is between the hardware and
-graphical user interface (aka gui) that people see and use. If you are
-using KDE, GNOME, Enlightenment, Blackbox, AfterStep, twm or fvwm then
-you are already using and running XFree86 as these run as our clients.
-Traditionally, The XFree86 Project has focused on Intel x86-based
-platforms, which is where the 86 in our name comes from, but our
-current release supports other platforms like the Alpha, PowerPC, Sparc
-and in-the-works MIPS CPU families.
-Our goal at XFree86 is to have X run on every platform available,
-including those we do not currently support, as the best windowing
-system available on that platform.
+The XFree86 Project, Inc is an organisation which produces
+XFree86, a freely redistributable open-source
+implementation of the X Window System that runs on UNIX(R)
+and UNIX-like (like Linux, the BSDs, Mac OS X (aka Darwin)
+and Solaris x86 series) operating systems and OS/2.
+
+XFree86 is the underlying software that is between the
+hardware and graphical user interface (aka gui) that
+people see and use. If you are using KDE, GNOME,
+Enlightenment, Blackbox, AfterStep, twm or fvwm then you
+are already using and running XFree86 as these run as our
+clients. Traditionally, The XFree86 Project has focused
+on Intel x86-based platforms, which is where the 86 in our
+name comes from, but our current release supports other
+platforms like the Alpha, PowerPC, Sparc and in-the-works
+MIPS CPU families.
+
+Our goal at XFree86 is to have X run on every platform
+available, including those we do not currently support, as
+the best windowing system available on that platform.
EOF
Index: POST_INSTALL
===================================================================
RCS file: /var/cvs/lunar/crater/x11/xfree86/POST_INSTALL,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- POST_INSTALL 28 Feb 2003 21:06:10 -0000 1.4
+++ POST_INSTALL 9 Sep 2003 21:25:13 -0000 1.5
@@ -1,6 +1,7 @@
rm -f $BOOST_LOCK
if module_installed NVIDIA_GLX; then lin NVIDIA_GLX; fi
if module_installed pango; then lin -c pango; fi
+if module_installed fontconfig; then lin -c fontconfig; fi
if ! grep -q '. /etc/profile' /etc/X11/xdm/Xsession; then
sedit 2s:#:.\ /etc/profile: /etc/X11/xdm/Xsession
@@ -13,17 +14,6 @@
# more secure: do not listen on tcp ports
no-listen = tcp
-
-EOF
- fi
-fi
-
-if ! [ -d /usr/lib/pkgconfig ]
-then mkdir -p /usr/lib/pkgconfig
-fi
-
-ln -sf /usr/X11R6/lib/pkgconfig/xft.pc /usr/lib/pkgconfig &&
-ln -sf /usr/X11R6/lib/pkgconfig/fontconfig.pc /usr/lib/pkgconfig &&
message "Running fc-cache please be patient" &&
/usr/X11R6/bin/fc-cache -f
Index: PRE_BUILD
===================================================================
RCS file: /var/cvs/lunar/crater/x11/xfree86/PRE_BUILD,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- PRE_BUILD 28 Feb 2003 20:44:31 -0000 1.4
+++ PRE_BUILD 9 Sep 2003 21:25:13 -0000 1.5
@@ -1,20 +1,23 @@
-if module_installed Xrender; then
- lrm Xrender
-fi
-
-if module_installed Xft; then
- lrm Xft
-fi
-
-if module_installed fontconfig; then
- lrm fontconfig
-fi
+default_pre_build &&
+unpack $SOURCE &&
+unpack $SOURCE2 &&
+unpack $SOURCE3 &&
+unpack $SOURCE4 &&
+unpack $SOURCE5 &&
+unpack $SOURCE6 &&
+unpack $SOURCE7 &&
+mk_source_dir $SOURCE_DIRECTORY.bld &&
-mk_source_dir $SOURCE_DIRECTORY &&
-unpack $SOURCE &&
-unpack $SOURCE2 &&
-unpack $SOURCE3 &&
-unpack $SOURCE4 &&
-unpack $SOURCE5 &&
-unpack $SOURCE6 &&
-unpack $SOURCE7
+cd $SOURCE_DIRECTORY &&
+patch_it $SOURCE_CACHE/$SOURCE7 1 &&
+patch_it $SOURCE_CACHE/$SOURCE8 1 &&
+patch_it $SOURCE_CACHE/$SOURCE9 1 &&
+patch_it $SOURCE_CACHE/$SOURCE10 1 &&
+patch_it $SOURCE_CACHE/$SOURCE11 1 &&
+patch_it $SOURCE_CACHE/$SOURCE12 1 &&
+patch_it $SOURCE_CACHE/$SOURCE13 1 &&
+patch_it $SOURCE_CACHE/$SOURCE14 1 &&
+patch_it $SOURCE_CACHE/$SOURCE15 1 &&
+patch_it $SOURCE_CACHE/$SOURCE16 1 &&
+patch_it $SOURCE_CACHE/$SOURCE17 1 &&
+rm -fr lib/zlib
Index: xsession
===================================================================
RCS file: /var/cvs/lunar/crater/x11/xfree86/xsession,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- xsession 4 Oct 2002 14:19:59 -0000 1.1
+++ xsession 9 Sep 2003 21:25:13 -0000 1.2
@@ -7,12 +7,6 @@
if [ -x /usr/bin/enlightenment ]
then exec enlightenment
-elif [ -x /opt/lunar/kde/3/bin/startkde ]
-then exec /opt/lunar/kde/3/bin/startkde
-
-elif [ -x /opt/lunar/kde/2/bin/startkde ]
-then exec /opt/lunar/kde/2/bin/startkde
-
elif [ -x /usr/bin/wmaker ]
then [ -d ~/GNUstep ] ||
wmaker.inst
@@ -27,4 +21,6 @@
elif [ -x /usr/bin/fvwm2 ]
then exec fvwm2
+elif [ -x /usr/bin/ion ]
+then exec ion
fi
More information about the Lunar-commits
mailing list