Browse Source

Clifford Wolf:


			
			
				rocklinux
			
			
		
Clifford Wolf 18 years ago
parent
commit
c0dfd29a30
43 changed files with 93 additions and 84 deletions
  1. +1
    -0
      package/xorg/appres/appres.desc
  2. +1
    -0
      package/xorg/beforelight/beforelight.desc
  3. +1
    -0
      package/xorg/editres/editres.desc
  4. +1
    -0
      package/xorg/font-arabic-misc/font-arabic-misc.desc
  5. +1
    -0
      package/xorg/font-cronyx-cyrillic/font-cronyx-cyrillic.desc
  6. +1
    -0
      package/xorg/font-daewoo-misc/font-daewoo-misc.desc
  7. +1
    -0
      package/xorg/font-dec-misc/font-dec-misc.desc
  8. +1
    -0
      package/xorg/font-ibm-type1/font-ibm-type1.desc
  9. +1
    -0
      package/xorg/font-jis-misc/font-jis-misc.desc
  10. +1
    -0
      package/xorg/font-micro-misc/font-micro-misc.desc
  11. +1
    -0
      package/xorg/font-misc-cyrillic/font-misc-cyrillic.desc
  12. +1
    -0
      package/xorg/font-misc-ethiopic/font-misc-ethiopic.desc
  13. +1
    -0
      package/xorg/font-misc-meltho/font-misc-meltho.desc
  14. +1
    -0
      package/xorg/font-screen-cyrillic/font-screen-cyrillic.desc
  15. +1
    -0
      package/xorg/font-sun-misc/font-sun-misc.desc
  16. +1
    -0
      package/xorg/font-winitzki-cyrillic/font-winitzki-cyrillic.desc
  17. +1
    -0
      package/xorg/lbxproxy/lbxproxy.desc
  18. +1
    -0
      package/xorg/listres/listres.desc
  19. +1
    -0
      package/xorg/proxymngr/proxymngr.desc
  20. +1
    -0
      package/xorg/rstart/rstart.desc
  21. +1
    -0
      package/xorg/viewres/viewres.desc
  22. +1
    -0
      package/xorg/x11perf/x11perf.desc
  23. +1
    -0
      package/xorg/xbiff/xbiff.desc
  24. +1
    -0
      package/xorg/xcalc/xcalc.desc
  25. +1
    -0
      package/xorg/xclipboard/xclipboard.desc
  26. +1
    -0
      package/xorg/xclock/xclock.desc
  27. +1
    -0
      package/xorg/xconsole/xconsole.desc
  28. +1
    -0
      package/xorg/xedit/xedit.desc
  29. +1
    -0
      package/xorg/xeyes/xeyes.desc
  30. +1
    -0
      package/xorg/xfindproxy/xfindproxy.desc
  31. +1
    -0
      package/xorg/xfs/xfs.desc
  32. +1
    -0
      package/xorg/xload/xload.desc
  33. +1
    -0
      package/xorg/xlogo/xlogo.desc
  34. +1
    -0
      package/xorg/xmag/xmag.desc
  35. +1
    -0
      package/xorg/xman/xman.desc
  36. +1
    -0
      package/xorg/xmh/xmh.desc
  37. +1
    -0
      package/xorg/xmore/xmore.desc
  38. +39
    -84
      package/xorg/xorg-update.sh
  39. +4
    -0
      package/xorg/xphelloworld/xphelloworld.desc
  40. +1
    -0
      package/xorg/xrx/xrx.desc
  41. +10
    -0
      package/xorg/xsm/xsm.desc
  42. +1
    -0
      package/xorg/xwd/xwd.desc
  43. +1
    -0
      package/xorg/xwud/xwud.desc

+ 1
- 0
package/xorg/appres/appres.desc

@ -32,6 +32,7 @@
[M] The ROCK Linux Project
[C] base/x11
[F] CORE
[L] OpenSource
[S] Stable

+ 1
- 0
package/xorg/beforelight/beforelight.desc

@ -32,6 +32,7 @@
[M] The ROCK Linux Project
[C] base/x11
[F] CORE
[L] OpenSource
[S] Stable

+ 1
- 0
package/xorg/editres/editres.desc

@ -32,6 +32,7 @@
[M] The ROCK Linux Project
[C] base/x11
[F] CORE
[L] OpenSource
[S] Stable

+ 1
- 0
package/xorg/font-arabic-misc/font-arabic-misc.desc

@ -32,6 +32,7 @@
[M] The ROCK Linux Project
[C] base/x11 extra/font
[F] CORE
[L] OpenSource
[S] Stable

+ 1
- 0
package/xorg/font-cronyx-cyrillic/font-cronyx-cyrillic.desc

@ -32,6 +32,7 @@
[M] The ROCK Linux Project
[C] base/x11 extra/font
[F] CORE
[L] OpenSource
[S] Stable

+ 1
- 0
package/xorg/font-daewoo-misc/font-daewoo-misc.desc

@ -32,6 +32,7 @@
[M] The ROCK Linux Project
[C] base/x11 extra/font
[F] CORE
[L] OpenSource
[S] Stable

+ 1
- 0
package/xorg/font-dec-misc/font-dec-misc.desc

@ -32,6 +32,7 @@
[M] The ROCK Linux Project
[C] base/x11 extra/font
[F] CORE
[L] OpenSource
[S] Stable

+ 1
- 0
package/xorg/font-ibm-type1/font-ibm-type1.desc

@ -32,6 +32,7 @@
[M] The ROCK Linux Project
[C] base/x11 extra/font
[F] CORE
[L] OpenSource
[S] Stable

+ 1
- 0
package/xorg/font-jis-misc/font-jis-misc.desc

@ -32,6 +32,7 @@
[M] The ROCK Linux Project
[C] base/x11 extra/font
[F] CORE
[L] OpenSource
[S] Stable

+ 1
- 0
package/xorg/font-micro-misc/font-micro-misc.desc

@ -32,6 +32,7 @@
[M] The ROCK Linux Project
[C] base/x11 extra/font
[F] CORE
[L] OpenSource
[S] Stable

+ 1
- 0
package/xorg/font-misc-cyrillic/font-misc-cyrillic.desc

@ -32,6 +32,7 @@
[M] The ROCK Linux Project
[C] base/x11 extra/font
[F] CORE
[L] OpenSource
[S] Stable

+ 1
- 0
package/xorg/font-misc-ethiopic/font-misc-ethiopic.desc

@ -32,6 +32,7 @@
[M] The ROCK Linux Project
[C] base/x11 extra/font
[F] CORE
[L] OpenSource
[S] Stable

+ 1
- 0
package/xorg/font-misc-meltho/font-misc-meltho.desc

@ -32,6 +32,7 @@
[M] The ROCK Linux Project
[C] base/x11 extra/font
[F] CORE
[L] OpenSource
[S] Stable

+ 1
- 0
package/xorg/font-screen-cyrillic/font-screen-cyrillic.desc

@ -32,6 +32,7 @@
[M] The ROCK Linux Project
[C] base/x11 extra/font
[F] CORE
[L] OpenSource
[S] Stable

+ 1
- 0
package/xorg/font-sun-misc/font-sun-misc.desc

@ -32,6 +32,7 @@
[M] The ROCK Linux Project
[C] base/x11 extra/font
[F] CORE
[L] OpenSource
[S] Stable

+ 1
- 0
package/xorg/font-winitzki-cyrillic/font-winitzki-cyrillic.desc

@ -32,6 +32,7 @@
[M] The ROCK Linux Project
[C] base/x11 extra/font
[F] CORE
[L] OpenSource
[S] Stable

+ 1
- 0
package/xorg/lbxproxy/lbxproxy.desc

@ -32,6 +32,7 @@
[M] The ROCK Linux Project
[C] base/x11
[F] CORE
[L] OpenSource
[S] Stable

+ 1
- 0
package/xorg/listres/listres.desc

@ -32,6 +32,7 @@
[M] The ROCK Linux Project
[C] base/x11
[F] CORE
[L] OpenSource
[S] Stable

+ 1
- 0
package/xorg/proxymngr/proxymngr.desc

@ -32,6 +32,7 @@
[M] The ROCK Linux Project
[C] base/x11
[F] CORE
[L] OpenSource
[S] Stable

+ 1
- 0
package/xorg/rstart/rstart.desc

@ -32,6 +32,7 @@
[M] The ROCK Linux Project
[C] base/x11
[F] CORE
[L] OpenSource
[S] Stable

+ 1
- 0
package/xorg/viewres/viewres.desc

@ -32,6 +32,7 @@
[M] The ROCK Linux Project
[C] base/x11
[F] CORE
[L] OpenSource
[S] Stable

+ 1
- 0
package/xorg/x11perf/x11perf.desc

@ -32,6 +32,7 @@
[M] The ROCK Linux Project
[C] base/x11
[F] CORE
[L] OpenSource
[S] Stable

+ 1
- 0
package/xorg/xbiff/xbiff.desc

@ -32,6 +32,7 @@
[M] The ROCK Linux Project
[C] base/x11
[F] CORE
[L] OpenSource
[S] Stable

+ 1
- 0
package/xorg/xcalc/xcalc.desc

@ -32,6 +32,7 @@
[M] The ROCK Linux Project
[C] base/x11
[F] CORE
[L] OpenSource
[S] Stable

+ 1
- 0
package/xorg/xclipboard/xclipboard.desc

@ -32,6 +32,7 @@
[M] The ROCK Linux Project
[C] base/x11
[F] CORE
[L] OpenSource
[S] Stable

+ 1
- 0
package/xorg/xclock/xclock.desc

@ -32,6 +32,7 @@
[M] The ROCK Linux Project
[C] base/x11
[F] CORE
[L] OpenSource
[S] Stable

+ 1
- 0
package/xorg/xconsole/xconsole.desc

@ -32,6 +32,7 @@
[M] The ROCK Linux Project
[C] base/x11
[F] CORE
[L] OpenSource
[S] Stable

+ 1
- 0
package/xorg/xedit/xedit.desc

@ -32,6 +32,7 @@
[M] The ROCK Linux Project
[C] base/x11
[F] CORE
[L] OpenSource
[S] Stable

+ 1
- 0
package/xorg/xeyes/xeyes.desc

@ -32,6 +32,7 @@
[M] The ROCK Linux Project
[C] base/x11
[F] CORE
[L] OpenSource
[S] Stable

+ 1
- 0
package/xorg/xfindproxy/xfindproxy.desc

@ -32,6 +32,7 @@
[M] The ROCK Linux Project
[C] base/x11
[F] CORE
[L] OpenSource
[S] Stable

+ 1
- 0
package/xorg/xfs/xfs.desc

@ -32,6 +32,7 @@
[M] The ROCK Linux Project
[C] base/x11
[F] CORE
[L] OpenSource
[S] Stable

+ 1
- 0
package/xorg/xload/xload.desc

@ -32,6 +32,7 @@
[M] The ROCK Linux Project
[C] base/x11
[F] CORE
[L] OpenSource
[S] Stable

+ 1
- 0
package/xorg/xlogo/xlogo.desc

@ -32,6 +32,7 @@
[M] The ROCK Linux Project
[C] base/x11
[F] CORE
[L] OpenSource
[S] Stable

+ 1
- 0
package/xorg/xmag/xmag.desc

@ -32,6 +32,7 @@
[M] The ROCK Linux Project
[C] base/x11
[F] CORE
[L] OpenSource
[S] Stable

+ 1
- 0
package/xorg/xman/xman.desc

@ -32,6 +32,7 @@
[M] The ROCK Linux Project
[C] base/x11
[F] CORE
[L] OpenSource
[S] Stable

+ 1
- 0
package/xorg/xmh/xmh.desc

@ -32,6 +32,7 @@
[M] The ROCK Linux Project
[C] base/x11
[F] CORE
[L] OpenSource
[S] Stable

+ 1
- 0
package/xorg/xmore/xmore.desc

@ -32,6 +32,7 @@
[M] The ROCK Linux Project
[C] base/x11
[F] CORE
[L] OpenSource
[S] Stable

+ 39
- 84
package/xorg/xorg-update.sh

@ -1,100 +1,55 @@
#!/bin/bash
#
# Usage:
# cd package/xorg && bash xorg-update.sh X11R7.1
update=0
[ "$2" == "-update" ] && update=1
xver="$1"
URL="ftp://ftp.gwdg.de/pub/x11/x.org/pub/$xver/src"
xver="$1" # e.g. X11R7.1
URL="ftp://ftp.gwdg.de/pub/x11/x.org/pub/$xver/src/"
module_list=""
top_prio="110.800"
prio_to_num() {
echo ${1/.}
}
num_to_prio() {
echo "${1:0:3}.${1:3:3}"
}
prio_plus() {
num_to_prio $(( `prio_to_num $top_prio` + $1 ))
}
curl -l "$URL" |
while read N ; do
while read N
do
N="${N%?}"
[ "$N" == "update" ] && continue
[ "$N" == "deprecated" ] && continue
[ "$N" == "everything" ] && continue
echo "$URL$N/"
curl -l "$URL$N/" |
while read P ; do
echo "Checking $URL/$N/ .."
while read P
do
P="${P%?}"
[[ "$P" = *bz2 ]] || continue
P="${P%.tar.bz2}"
pname="${P%%-$xver-*}"
lowpname="`echo $pname | tr '[A-Z]' '[a-z]'`"
pver="${P##*-$xver-}"
if [ "$update" = 0 ] ; then
rm -rf package/xorg/"$lowpname"
misc/archive/newpackage.sh package/xorg/"$lowpname" "$URL$N/$P.tar.bz2"
pname="`echo $P | tr '[A-Z]' '[a-z]'`"
pname="${pname%.tar.bz2}"
pver="${pname#*-x11r*-}"
pname="${pname%-x11r*}"
case "$lowpname" in
util-macros) delta=0 ;;
xorg-sgml-doctools) delta=1 ;;
xorg-docs) delta=2 ;;
*proto*|evieext) delta=3 ;;
xtrans) delta=4 ;;
libxau) delta=5 ;;
libxdmcp) delta=6 ;;
libx11) delta=8 ;;
libxext) delta=10 ;;
libapplewm|libwindowswm|libdmx|libfontenc)
delta=12 ;;
libfs|libice|liblbxutil|liboldx)
delta=14 ;;
libsm) delta=16 ;;
libxt) delta=18 ;;
libxmu|libxpm) delta=20 ;;
libxp|libxaw|libxfixes) delta=22 ;;
libxrender) delta=23 ;;
libxcomposite|libxdamage|libxcursor|libxevie|`
`libxfont|libxfontcache|libxft|libxi|libxinerama|libxkbfile|libxkbui)
delta=24 ;;
libxprintutil) delta=25 ;;
libxprintapputil|libxrandr|libxres|libxscrnsaver|libxtrap|`
`libxtst|libxv|libxvmc|libxxf86dga|libxxf86misc|libxxf86vm)
delta=26 ;;
xbitmaps) delta=28 ;;
# alls apps are delta=30, see below.
xorg-server) delta=32 ;;
xf86-input*) delta=34 ;;
xf86-video*) delta=36 ;;
xcursor-themes|xkbdata) delta=50 ;;
font-util) delta=55 ;;
font-*) delta=60 ;;
xorg-cf-files|imake|makedepend|gccmakedep|lndir)
delta=70 ;;
*) delta=99 ;;
esac
[ "$N" == "app" ] && delta=30
if [ ! -f "$pname/$pname.desc" ]; then
echo "Not found: $pname/$pname.desc ($N) [$lowxver]"
else
if ! egrep -q "^\[V\] $pver( |\$)" "$pname/$pname.desc"; then
sed -i -e"s,\[V\].*,[V] $pver," "$pname/$pname.desc"
fi
if ! egrep -q "^\[D\] .* $P " "$pname/$pname.desc"; then
sed -i -e"s,\[D\].*,\[D\] 0 $P $URL/$N," "$pname/$pname.desc"
fi
fi
sed -i -e"s,\[V\].*,\[V\] $pver," package/xorg/"$lowpname"/"$lowpname".desc
module_list="$module_list $pname"
if [ "$update" = 0 ] ; then
sed -i -e"s,\[P\] \(.*\) ...\....,\[P\] \1 `prio_plus $delta`," package/xorg/"$lowpname"/"$lowpname".desc
sed -i -e"s,\[U\].*,\[U\] http://www.x.org," package/xorg/"$lowpname"/"$lowpname".desc
sed -i -e"s,\[S\].*,\[S\] Stable," package/xorg/"$lowpname"/"$lowpname".desc
sed -i -e"s,\[L\].*,\[L\] OpenSource," package/xorg/"$lowpname"/"$lowpname".desc
sed -i -e"s,\[I\].*,\[I\] X.Org X11 $pname component," package/xorg/"$lowpname"/"$lowpname".desc
sed -i -e"s,\[C\].*,\[C\] base/x11\n\[F\] CORE," package/xorg/"$lowpname"/"$lowpname".desc
sed -i -e"s:\[T\].*:\[T\] The $pname component for the X.Org Foundation X11 Release 7 and above.:" package/xorg/"$lowpname"/"$lowpname".desc
sed -i -e"s:\[A\].*:\[A\] The X.Org Foundation {The X.Org Sourcecode}\n[A] The Open Group X Project Team {Original Sourcecode}:" package/xorg/"$lowpname"/"$lowpname".desc
else
sed -i -e"s,\[D\].*,\[D\] 0 $P.tar.bz2 $URL$N," package/xorg/"$lowpname"/"$lowpname".desc
fi
done < <( curl -s -S -l "$URL/$N/"; )
done < <( curl -s -S -l "$URL/"; )
uniq -c package/xorg/"$lowpname"/"$lowpname".desc | cut -f8- -d" " > tmp.desc
mv tmp.desc package/xorg/"$lowpname"/"$lowpname".desc
for pkg in *
do
[ -d "$pkg" ] || continue
[ "$pkg" = "mesalib" ] && continue
echo '. "$base/package/xorg/xorg_config.sh"' > package/xorg/"$lowpname/$lowpname.conf"
done
if grep -qv " $pkg " <( echo "$module_list "; ); then
echo "Not found on FTP server: $pkg"
fi
done

+ 4
- 0
package/xorg/xphelloworld/xphelloworld.desc

@ -24,6 +24,9 @@
[I] X.Org X11 xphelloworld component
[T] The xphelloworld component for the X.Org Foundation X11 Release 7 and above.
[T]
[T] xphelloworld is a utility for Xprint, the printing system for the
[T] X Window system. It sends a test page to a printer.
[U] http://www.x.org
@ -32,6 +35,7 @@
[M] The ROCK Linux Project
[C] base/x11
# Not flagging as CORE because it needs some other non-core packages
[L] OpenSource
[S] Stable

+ 1
- 0
package/xorg/xrx/xrx.desc

@ -32,6 +32,7 @@
[M] The ROCK Linux Project
[C] base/x11
[F] CORE
[L] OpenSource
[S] Stable

+ 10
- 0
package/xorg/xsm/xsm.desc

@ -24,6 +24,15 @@
[I] X.Org X11 xsm component
[T] The xsm component for the X.Org Foundation X11 Release 7 and above.
[T]
[T] xsm is a session manager. A session is a group of applications, each
[T] of which has a particular state. xsm allows you to create arbitrary
[T] sessions - for example, you might have a "light" session, a "development"
[T] session, or an "xterminal" session. Each session can have its own set of
[T] applications. Within a session, you can perform a "checkpoint" to save
[T] application state, or a "shutdown" to save state and exit the session.
[T] When you log back in to the system, you can load a specific session, and
[T] you can delete sessions you no longer want to keep.
[U] http://www.x.org
@ -32,6 +41,7 @@
[M] The ROCK Linux Project
[C] base/x11
# Not flagging as CORE because it needs some other non-core packages
[L] OpenSource
[S] Stable

+ 1
- 0
package/xorg/xwd/xwd.desc

@ -32,6 +32,7 @@
[M] The ROCK Linux Project
[C] base/x11
[F] CORE
[L] OpenSource
[S] Stable

+ 1
- 0
package/xorg/xwud/xwud.desc

@ -32,6 +32,7 @@
[M] The ROCK Linux Project
[C] base/x11
[F] CORE
[L] OpenSource
[S] Stable

Loading…
Cancel
Save