Index: content/web/apache.xml
===================================================================
--- content/web/apache.xml (revision 7ee98495b25ef22ac0fa5348ce04ca481b9d6390)
+++ content/web/apache.xml (revision 47603ac177e6dd2d036c8c43f29516eee00f6a9a)
@@ -25,7 +25,6 @@
The Apache package contains an
-open-source HTTP server. It is
-useful for creating local intranet web sites or running huge web serving
-operations.
+open-source HTTP server. It is useful for creating local
+intranet web sites or running huge web serving operations.
Package information
@@ -88,5 +87,6 @@
/usr/include/apache/* /usr/lib/apache/httpd.exp \
/usr/share/man/man1/{dbmmanage,htdigest,htpasswd}.1 \
- /usr/share/man/man8/{ab,apachectl,apxs,httpd,logresolve,rotatelogs,suexec}.8 &&
+ /usr/share/man/man8/{ab,apachectl,apxs,httpd}.8 &&
+ /usr/share/man/man8/{logresolve,rotatelogs,suexec}.8 &&
chown -R apache:apache /srv/www
Index: content/web/proftpd.xml
===================================================================
--- content/web/proftpd.xml (revision 7ee98495b25ef22ac0fa5348ce04ca481b9d6390)
+++ content/web/proftpd.xml (revision 47603ac177e6dd2d036c8c43f29516eee00f6a9a)
@@ -61,5 +61,6 @@
ln -s false /usr/lib/proftpd/proftpdshell &&
echo /usr/lib/proftpd/proftpdshell >> /etc/shells &&
-useradd -c proftpd -d /home/ftp -g proftpd -s /usr/lib/proftpd/proftpdshell proftpd
+useradd -c proftpd -d /home/ftp -g proftpd \
+ -s /usr/lib/proftpd/proftpdshell proftpd
Index: gnome/add/gnome-games.xml
===================================================================
--- gnome/add/gnome-games.xml (revision 7ee98495b25ef22ac0fa5348ce04ca481b9d6390)
+++ gnome/add/gnome-games.xml (revision 47603ac177e6dd2d036c8c43f29516eee00f6a9a)
@@ -75,5 +75,6 @@
install -d /var/lib/games &&
groupadd games &&
-useradd -c 'Games High Score Owner' -d /var/lib/games -g games -s /bin/false games &&
+useradd -c 'Games High Score Owner' -d /var/lib/games \
+ -g games -s /bin/false games &&
chown games:games /var/lib/games
Index: gnome/add/java-access-bridge.xml
===================================================================
--- gnome/add/java-access-bridge.xml (revision 7ee98495b25ef22ac0fa5348ce04ca481b9d6390)
+++ gnome/add/java-access-bridge.xml (revision 47603ac177e6dd2d036c8c43f29516eee00f6a9a)
@@ -64,8 +64,10 @@
make &&
make install &&
-cat `pkg-config --variable=prefix ORBit-2.0`/share/jar/accessibility.properties \
+cat `pkg-config --variable=prefix \
+ ORBit-2.0`/share/jar/accessibility.properties \
>> $JAVA_HOME/jre/lib/accessibility.properties &&
chmod 444 $JAVA_HOME/jre/lib/accessibility.properties &&
-ln -sf `pkg-config --variable=prefix ORBit-2.0`/share/jar/gnome-java-bridge.jar \
+ln -sf `pkg-config --variable=prefix \
+ ORBit-2.0`/share/jar/gnome-java-bridge.jar \
$JAVA_HOME/jre/lib/ext
Index: x/installing/xfree86.xml
===================================================================
--- x/installing/xfree86.xml (revision 7ee98495b25ef22ac0fa5348ce04ca481b9d6390)
+++ x/installing/xfree86.xml (revision 47603ac177e6dd2d036c8c43f29516eee00f6a9a)
@@ -32,9 +32,14 @@
Package information
-Download (HTTP):
-Download (FTP):
-Download size: &xfree86-size;
-Estimated disk space required: &xfree86-buildsize;
-Estimated build time: &xfree86-time;
+Download (HTTP):
+
+Download (FTP):
+
+Download size:
+&xfree86-size;
+Estimated disk space required:
+&xfree86-buildsize;
+Estimated build time:
+&xfree86-time;
@@ -182,9 +187,9 @@
/* System Related Information. If you read and configure only one
- * section then it should be this one. The Intel architecture defaults are
- * set for a i686 and higher. Axp is for the Alpha architecture and Ppc is
- * for the Power PC. Note that there have been reports that the Ppc
- * optimization line causes segmentation faults during build. If that
- * happens, try building without the DefaultGcc2PpcOpt line. **************/
+ * section then it should be this one. The Intel architecture defaults
+ * are set for a i686 and higher. Axp is for the Alpha architecture
+ * and Ppc is for the Power PC. Note that there have been reports that
+ * the Ppc optimization line causes segmentation faults during build.
+ * If that happens, try building without the DefaultGcc2PpcOpt line. */
/* #define DefaultGcc2i386Opt -O2 -fomit-frame-pointer -march=i686 */
@@ -192,8 +197,9 @@
/* #define DefaultGcc2PpcOpt -O2 -mcpu=750 */
-/* The following definitions are normally set properly by XFree86's scripts.
- * You can uncomment them if you want to make sure. ************************/
+/* The following definitions are normally set properly by XFree86's
+ * scripts. You can uncomment them if you want to make sure. *********/
-/* #define HasMTRRSupport YES */ /* Enabled in kernel see kernel docs*/
+/* #define HasMTRRSupport YES */ /* Enabled in kernel; */
+ /* see kernel docs */
/* #define HasMMXSupport NO */ /* Any i586 or above */
/* #define HasKatmaiSupport NO */ /* PIII SSE instructions */
@@ -201,13 +207,14 @@
-/* This setting reduces compile time a little by omitting rarely used input
- * devices. You can find the complete list in config/cf/xfree86.cf ********/
+/* This setting reduces compile time a little by omitting rarely used
+ * input devices. You can find the complete list in
+ * config/cf/xfree86.cf *********************************************/
#define XInputDrivers mouse void
-/* VIDEO DRIVERS ***********************************************************/
-
-/* If you are sure you only want the drivers for one or a few video cards,
- * you can delete the drivers you do not want. *****************************/
+/* VIDEO DRIVERS ****************************************************/
+
+/* If you are sure you only want the drivers for one or a few video
+ * cards, you can delete the drivers you do not want. ***************/
@@ -222,22 +229,23 @@
-/* USER AND SYSTEM DEFAULT PATHS *******************************************/
-
-/* These settings set the PATH variables used by xdm. See README for *******/
-/* detailed description and modify the following as per your need. *********/
-
-/* #define DefaultSystemPath /usr/bin:/bin:/usr/sbin:/sbin:/usr/X11R6/bin */
+/* USER AND SYSTEM DEFAULT PATHS *************************************/
+
+/* These settings set the PATH variables used by xdm. See README for */
+/* detailed description and modify the following as per your need. ***/
+
+/* #define DefaultSystemPath \
+ /usr/bin:/bin:/usr/sbin:/sbin:/usr/X11R6/bin */
/* #define DefaultUserPath /usr/bin:/bin:/usr/X11R6/bin */
-/* FONT SERVER AND LIBRARY SETTINGS ****************************************/
-
-/* These settings are the defaults ***************************************/
-
-/* #define BuildFontServer YES */ /* For Ghostscript Print Server*/
-/* #define SharedLibFont YES */
-/* #define CompressAllFonts YES */
-/* #define GzipFontCompression YES */
-
-/* These settings ensure we use our libraries ******************************/
+/* FONT SERVER AND LIBRARY SETTINGS **********************************/
+
+/* These settings are the defaults **********************************/
+
+/* #define BuildFontServer YES */ /*For Ghostscript Print Server*/
+/* #define SharedLibFont YES */
+/* #define CompressAllFonts YES */
+/* #define GzipFontCompression YES */
+
+/* These settings ensure we use our libraries ************************/
#define HasFreetype2 YES
#define HasFontconfig YES
@@ -246,8 +254,8 @@
#define HasZlib YES
-/* The font path can be redefined in the XF86Config file *******************/
+/* The font path can be redefined in the XF86Config file *************/
/*
-#define DefaultFontPath $(FONTDIR)/misc/,$(FONTDIR)/75dpi/,\
+#define DefaultFontPath $(FONTDIR)/misc/,$(FONTDIR)/75dpi/,\
$(FONTDIR)/100dpi/,$(FONTDIR)/Type1,$(FONTDIR)/local,\
$(FONTDIR)/TrueType,$(FONTDIR)/CID,$(FONTDIR)/Speedo
@@ -255,6 +263,6 @@
-/* INTERNATIONAL FONTS. Change to YES if you need any of them. These are
- * the defaults. ***********************************************************/
+/* INTERNATIONAL FONTS. Change to YES if you need any of them. These
+ * are the defaults. **************************************************/
/* #define BuildCyrillicFonts NO */
@@ -271,15 +279,15 @@
/* #define BuildChineseFonts NO */
-/* DOCUMENTATION SETTINGS **************************************************/
-
-/* These setting are the defaults. *****************************************/
-
-/* #define BuildLinuxDocHtml NO */ /* X Docs in Html format */
-/* #define BuildLinuxDocPS NO */ /* PostScript format */
-/* #define BuildAllSpecsDocs NO */ /* Various docs */
-/* #define BuildHtmlManPages NO */
+/* DOCUMENTATION SETTINGS ********************************************/
+
+/* These setting are the defaults. ***********************************/
+
+/* #define BuildLinuxDocHtml NO */ /* X Docs in Html format */
+/* #define BuildLinuxDocPS NO */ /* PostScript format */
+/* #define BuildAllSpecsDocs NO */ /* Various docs */
+/* #define BuildHtmlManPages NO */
/* GENERAL SETTINGS: You generally want to leave these alone when
- * building X on an LFS system *********************************************/
+ * building X on an LFS system ***************************************/
#define GccWarningOptions -pipe /* Speed up compiles */
@@ -293,5 +301,5 @@
#define ThreadedX YES
#define HasPam NO
-#define SystemManDirectory /usr/share/man /* Instead of /usr/man */
+#define SystemManDirectory /usr/share/man /*Instead of /usr/man*/
#define HasLibCrypt YES
#define InstallXinitConfig YES
@@ -324,5 +332,6 @@
sed -i -e "s@#include <linux/config.h>@/* & */@" \
`grep -lr linux/config.h *` &&
-( make WORLDOPTS="" World 2>&1 | tee xfree-compile.log && exit $PIPESTATUS ) &&
+( make WORLDOPTS="" World 2>&1 | \
+ tee xfree-compile.log && exit $PIPESTATUS ) &&
make install &&
make install.man &&
Index: x/installing/xorg.xml
===================================================================
--- x/installing/xorg.xml (revision 7ee98495b25ef22ac0fa5348ce04ca481b9d6390)
+++ x/installing/xorg.xml (revision 47603ac177e6dd2d036c8c43f29516eee00f6a9a)
@@ -59,9 +59,14 @@
Package information
-Download (HTTP):
-Download (FTP):
-Download size: &xorg-size;
-Estimated disk space required: &xorg-buildsize;
-Estimated build time: &xorg-time;
+Download (HTTP):
+
+Download (FTP):
+
+Download size:
+&xorg-size;
+Estimated disk space required:
+&xorg-buildsize;
+Estimated build time:
+&xorg-time;
@@ -201,12 +206,15 @@
/* System Related Information. If you read and configure only one
- * section then it should be this one. The Intel architecture defaults are
- * set for a i686 and higher. Axp is for the Alpha architecture and Ppc is
- * for the Power PC. AMD64 is for the Opteron processor. Note that there have
- * been reports that the Ppc optimization line causes segmentation faults during
- * build. If that happens, try building without the DefaultGcc2PpcOpt line. ***********/
-
-/* #define DefaultGcc2i386Opt -O2 -fno-strength-reduce -fno-strict-aliasing -march=i686 */
-/* #define DefaultGccAMD64Opt -O2 -fno-strength-reduce -fno-strict-aliasing */
+ * section then it should be this one. The Intel architecture defaults
+ * are set for a i686 and higher. Axp is for the Alpha architecture
+ * and Ppc is for the Power PC. AMD64 is for the Opteron processor.
+ * Note that there have been reports that the Ppc optimization line
+ * causes segmentation faults during build. If that happens, try
+ * building without the DefaultGcc2PpcOpt line. ***********/
+
+/* #define DefaultGcc2i386Opt -O2 -fno-strength-reduce \
+ -fno-strict-aliasing -march=i686 */
+/* #define DefaultGccAMD64Opt -O2 -fno-strength-reduce \
+ -fno-strict-aliasing */
/* #define DefaultGcc2AxpOpt -O2 -mcpu=ev6 */
/* #define DefaultGcc2PpcOpt -O2 -mcpu=750 */
@@ -219,7 +227,7 @@
/*
- * Which drivers to build. When building a static server, each of these
- * will be included in it. When building the loadable server each of these
- * modules will be built.
+ * Which drivers to build. When building a static server, each of
+ * these will be included in it. When building the loadable server
+ * each of these modules will be built.
*
#define XF86CardDrivers mga glint nv tga s3virge sis rendition \
@@ -227,7 +235,7 @@
cirrus vmware tseng trident chips apm \
GlideDriver fbdev i128 \
- ati AgpGartDrivers DevelDrivers ark cyrix \
- siliconmotion \
- vesa vga XF86OSCardDrivers XF86ExtraCardDrivers
+ ati AgpGartDrivers DevelDrivers ark \
+ cyrix siliconmotion vesa vga \
+ XF86OSCardDrivers XF86ExtraCardDrivers
*/
@@ -237,6 +245,6 @@
#define XInputDrivers mouse keyboard acecad calcomp citron \
digitaledge dmc dynapro elographics \
- microtouch mutouch penmount spaceorb summa \
- wacom void magictouch aiptek
+ microtouch mutouch penmount spaceorb \
+ summa wacom void magictouch aiptek
*/