Dimitar Zhekov <jimmy@is-vn.bg>:

1. Copy the latest [V] and [O] tags from xfree86.
2. Fix the creation of X11 -> xfree86-doc symlink. It
stopped working once the code was moved to a separate
package. I remember another problems with this link, and
so made everything verbose. Tested with stages 5 and 9.


git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1358 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc

Documentation/Developers/CHANGELOG-RENE

@@ -10,7 +10,8 @@
  - Alejandro Mery: updates to mnemoc incl. bohem-gc/mono fixes
  - Clifford Wolf: fixed strace useage in Build-Pkg
  - fixed openldap to install the .init (#109)
- - Dimitar Zhekov: fix mplayer doc copy, enable mp3x in lame
+ - Dimitar Zhekov: fixed mplayer doc copy, enabled mp3x in lame, fixed
+		   xfree86-doc
 
 *) 2003-09-07 (2.0.0-rc1 - 2.0.0-rc2)
 

package/x11/xfree86-doc/xfree86-doc.conf

@@ -29,10 +29,11 @@ x11doc_main() {
 	xf_config		# I wonder if this is really required - DZ
 
 	echo "Copy X11 Documentation and creating X11 symlink ..."
-	rm -rf $root/usr/doc/X11
+	rm -rfv ${docdir%/*}/X11
 	cp -rv doc/* $docdir
-	rm -rf $docdir/man	# Not optimal, but man/* is only about 4MB
-	ln -s $docdir X11
+	rm -rfv $docdir/man	# Not optimal, but man/* is only about 4MB
+	cd ${docdir%/*}
+	ln -sv ${docdir##*/} X11
 }
 
 srctar=none

package/x11/xfree86-doc/xfree86-doc.desc

@@ -21,7 +21,7 @@
 [COPY] --- ROCK-COPYRIGHT-NOTE-END ---
 [I] A full set of XFree86 documentation
 
-[T] In addition to the manual pages, XFree86 contains about a full set
+[T] In addition to the manual and html pages, XFree86 contains a full set
 [T] of documentation (about 50MB). You may need it if you are a developer
 [T] and program directly for X without using an extra toolkit, such as QT
 [T] or GTK/GDK, or if you are setting up a X server.
@@ -36,10 +36,9 @@
 
 [L] OpenSource
 [S] Stable
-[V] 4.3.99.8
+[V] 4.3.99.11
 [P] O -----5---9 270.100
 
-# Move these to xf_config.sh:xf_extract()?
-[O] xf_files="X430src-1 X430src-2 X430src-3 X430src-4 X430src-5 X430src-6 X430src-7"
-[O] xf_patches="4.3.0-4.3.99.1.diff.bz2 4.3.99.1-4.3.99.2.diff.bz2 4.3.99.2-4.3.99.3.rediff.bz2 4.3.99.3-4.3.99.4.diff.bz2 4.3.99.4-4.3.99.5.diff.bz2 4.3.99.5-4.3.99.6.diff.bz2 4.3.99.6-4.3.99.7.diff.bz2 4.3.99.7-4.3.99.8.diff.bz2"
+[O] mga_version=2.1
+[O] xf_files="XFree86-4.3.99.11.tar.bz2"
 

package/x11/xfree86/parse-config

@@ -0,0 +1,26 @@
+# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
+# 
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+# Please add additional copyright information _after_ the line containing
+# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
+# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
+# 
+# ROCK Linux: rock-src/package/base/gcc3/parse-config
+# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version. A copy of the GNU General Public
+# License can be found at Documentation/COPYING.
+# 
+# Many people helped and are helping developing ROCK Linux. Please
+# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
+# file for details.
+# 
+# --- ROCK-COPYRIGHT-NOTE-END ---
+
+if [ "$ROCKCFG_PKG_XFREE86_XINERAMA" = 1 ] ; then
+	var_append confopt " " "--with-xinerama"
+fi
+