Font Pfad korrigiert. Kompatiblitätslink wird jetzt in /usr/X11R7/$LIBDIR/X11/fonts angelegt.

git-svn-id: svn://svn.compuextreme.de/Viitor/V962/ViitorMake@5353 504e572c-2e33-0410-9681-be2bf7408885
2010-02-06 17:44:55 +00:00 · 2010-02-06 17:44:55 +00:00 · 44a317e322
commit 44a317e322
parent 0376ea28fd
36 changed files with 82 additions and 2 deletions
--- a/SysBuild/xserv/font-adobe-100dpi
+++ b/SysBuild/xserv/font-adobe-100dpi
@ -89,6 +89,8 @@ mk() {
 		    --prefix=/usr/X11R7
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
+	mkdir -p $TMPROOT/usr/X11R7/$LIBDIR/X11
+	ln -sf /usr/X11R7/share/fonts/X11 $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts
 }

 postmk() {
--- a/SysBuild/xserv/font-adobe-75dpi
+++ b/SysBuild/xserv/font-adobe-75dpi
@ -89,6 +89,8 @@ mk() {
 		    --prefix=/usr/X11R7
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
+	mkdir -p $TMPROOT/usr/X11R7/$LIBDIR/X11
+	ln -sf /usr/X11R7/share/fonts/X11 $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts
 }

 postmk() {
--- a/SysBuild/xserv/font-adobe-utopia-100dpi
+++ b/SysBuild/xserv/font-adobe-utopia-100dpi
@ -89,6 +89,8 @@ mk() {
 		    --prefix=/usr/X11R7
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
+	mkdir -p $TMPROOT/usr/X11R7/$LIBDIR/X11
+	ln -sf /usr/X11R7/share/fonts/X11 $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts
 }

 postmk() {
--- a/SysBuild/xserv/font-adobe-utopia-75dpi
+++ b/SysBuild/xserv/font-adobe-utopia-75dpi
@ -89,6 +89,8 @@ mk() {
 		    --prefix=/usr/X11R7
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
+	mkdir -p $TMPROOT/usr/X11R7/$LIBDIR/X11
+	ln -sf /usr/X11R7/share/fonts/X11 $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts
 }

 postmk() {
--- a/SysBuild/xserv/font-adobe-utopia-type1
+++ b/SysBuild/xserv/font-adobe-utopia-type1
@ -89,6 +89,8 @@ mk() {
 		    --prefix=/usr/X11R7
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
+	mkdir -p $TMPROOT/usr/X11R7/$LIBDIR/X11
+	ln -sf /usr/X11R7/share/fonts/X11 $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts
 }

 postmk() {
--- a/SysBuild/xserv/font-arabic-misc
+++ b/SysBuild/xserv/font-arabic-misc
@ -89,6 +89,8 @@ mk() {
 		    --prefix=/usr/X11R7
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
+	mkdir -p $TMPROOT/usr/X11R7/$LIBDIR/X11
+	ln -sf /usr/X11R7/share/fonts/X11 $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts
 }

 postmk() {
--- a/SysBuild/xserv/font-bh-100dpi
+++ b/SysBuild/xserv/font-bh-100dpi
@ -89,6 +89,8 @@ mk() {
 		    --prefix=/usr/X11R7
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
+	mkdir -p $TMPROOT/usr/X11R7/$LIBDIR/X11
+	ln -sf /usr/X11R7/share/fonts/X11 $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts
 }

 postmk() {
--- a/SysBuild/xserv/font-bh-75dpi
+++ b/SysBuild/xserv/font-bh-75dpi
@ -89,6 +89,8 @@ mk() {
 		    --prefix=/usr/X11R7
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
+	mkdir -p $TMPROOT/usr/X11R7/$LIBDIR/X11
+	ln -sf /usr/X11R7/share/fonts/X11 $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts
 }

 postmk() {
--- a/SysBuild/xserv/font-bh-lucidatypewriter-100dpi
+++ b/SysBuild/xserv/font-bh-lucidatypewriter-100dpi
@ -89,6 +89,8 @@ mk() {
 		    --prefix=/usr/X11R7
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
+	mkdir -p $TMPROOT/usr/X11R7/$LIBDIR/X11
+	ln -sf /usr/X11R7/share/fonts/X11 $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts
 }

 postmk() {
--- a/SysBuild/xserv/font-bh-lucidatypewriter-75dpi
+++ b/SysBuild/xserv/font-bh-lucidatypewriter-75dpi
@ -89,6 +89,8 @@ mk() {
 		    --prefix=/usr/X11R7
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
+	mkdir -p $TMPROOT/usr/X11R7/$LIBDIR/X11
+	ln -sf /usr/X11R7/share/fonts/X11 $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts
 }

 postmk() {
--- a/SysBuild/xserv/font-bh-ttf
+++ b/SysBuild/xserv/font-bh-ttf
@ -89,6 +89,8 @@ mk() {
 		    --prefix=/usr/X11R7
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
+	mkdir -p $TMPROOT/usr/X11R7/$LIBDIR/X11
+	ln -sf /usr/X11R7/share/fonts/X11 $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts
 }

 postmk() {
--- a/SysBuild/xserv/font-bh-type1
+++ b/SysBuild/xserv/font-bh-type1
@ -89,6 +89,8 @@ mk() {
 		    --prefix=/usr/X11R7
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
+	mkdir -p $TMPROOT/usr/X11R7/$LIBDIR/X11
+	ln -sf /usr/X11R7/share/fonts/X11 $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts
 }

 postmk() {
--- a/SysBuild/xserv/font-bitstream-100dpi
+++ b/SysBuild/xserv/font-bitstream-100dpi
@ -89,6 +89,8 @@ mk() {
 		    --prefix=/usr/X11R7
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
+	mkdir -p $TMPROOT/usr/X11R7/$LIBDIR/X11
+	ln -sf /usr/X11R7/share/fonts/X11 $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts
 }

 postmk() {
--- a/SysBuild/xserv/font-bitstream-75dpi
+++ b/SysBuild/xserv/font-bitstream-75dpi
@ -89,6 +89,8 @@ mk() {
 		    --prefix=/usr/X11R7
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
+	mkdir -p $TMPROOT/usr/X11R7/$LIBDIR/X11
+	ln -sf /usr/X11R7/share/fonts/X11 $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts
 }

 postmk() {
--- a/SysBuild/xserv/font-bitstream-speedo
+++ b/SysBuild/xserv/font-bitstream-speedo
@ -89,6 +89,12 @@ mk() {
 		    --prefix=/usr/X11R7
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
+	mkdir -p $TMPROOT/usr/X11R7/share/fonts/X11
+	if [ -d $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts ]; then
+		mv $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts/* $TMPROOT/usr/X11R7/share/fonts/X11
+		rm -r $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts
+		ln -sf /usr/X11R7/share/fonts/X11 $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts
+	fi
 }

 postmk() {
--- a/SysBuild/xserv/font-bitstream-type1
+++ b/SysBuild/xserv/font-bitstream-type1
@ -89,6 +89,8 @@ mk() {
 		    --prefix=/usr/X11R7
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
+	mkdir -p $TMPROOT/usr/X11R7/$LIBDIR/X11
+	ln -sf /usr/X11R7/share/fonts/X11 $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts
 }

 postmk() {
--- a/SysBuild/xserv/font-cronyx-cyrillic
+++ b/SysBuild/xserv/font-cronyx-cyrillic
@ -89,6 +89,8 @@ mk() {
 		    --prefix=/usr/X11R7
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
+	mkdir -p $TMPROOT/usr/X11R7/$LIBDIR/X11
+	ln -sf /usr/X11R7/share/fonts/X11 $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts
 }

 postmk() {
--- a/SysBuild/xserv/font-cursor-misc
+++ b/SysBuild/xserv/font-cursor-misc
@ -89,6 +89,8 @@ mk() {
 		    --prefix=/usr/X11R7
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
+	mkdir -p $TMPROOT/usr/X11R7/$LIBDIR/X11
+	ln -sf /usr/X11R7/share/fonts/X11 $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts
 }

 postmk() {
--- a/SysBuild/xserv/font-daewoo-misc
+++ b/SysBuild/xserv/font-daewoo-misc
@ -89,6 +89,8 @@ mk() {
 		    --prefix=/usr/X11R7
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
+	mkdir -p $TMPROOT/usr/X11R7/$LIBDIR/X11
+	ln -sf /usr/X11R7/share/fonts/X11 $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts
 }

 postmk() {
--- a/SysBuild/xserv/font-dec-misc
+++ b/SysBuild/xserv/font-dec-misc
@ -89,6 +89,8 @@ mk() {
 		    --prefix=/usr/X11R7
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
+	mkdir -p $TMPROOT/usr/X11R7/$LIBDIR/X11
+	ln -sf /usr/X11R7/share/fonts/X11 $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts
 }

 postmk() {
--- a/SysBuild/xserv/font-ibm-type1
+++ b/SysBuild/xserv/font-ibm-type1
@ -89,6 +89,8 @@ mk() {
 		    --prefix=/usr/X11R7
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
+	mkdir -p $TMPROOT/usr/X11R7/$LIBDIR/X11
+	ln -sf /usr/X11R7/share/fonts/X11 $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts
 }

 postmk() {
--- a/SysBuild/xserv/font-isas-misc
+++ b/SysBuild/xserv/font-isas-misc
@ -89,6 +89,8 @@ mk() {
 		    --prefix=/usr/X11R7
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
+	mkdir -p $TMPROOT/usr/X11R7/$LIBDIR/X11
+	ln -sf /usr/X11R7/share/fonts/X11 $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts
 }

 postmk() {
--- a/SysBuild/xserv/font-jis-misc
+++ b/SysBuild/xserv/font-jis-misc
@ -89,6 +89,8 @@ mk() {
 		    --prefix=/usr/X11R7
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
+	mkdir -p $TMPROOT/usr/X11R7/$LIBDIR/X11
+	ln -sf /usr/X11R7/share/fonts/X11 $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts
 }

 postmk() {
--- a/SysBuild/xserv/font-micro-misc
+++ b/SysBuild/xserv/font-micro-misc
@ -89,6 +89,8 @@ mk() {
 		    --prefix=/usr/X11R7
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
+	mkdir -p $TMPROOT/usr/X11R7/$LIBDIR/X11
+	ln -sf /usr/X11R7/share/fonts/X11 $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts
 }

 postmk() {
--- a/SysBuild/xserv/font-misc-cyrillic
+++ b/SysBuild/xserv/font-misc-cyrillic
@ -89,6 +89,8 @@ mk() {
 		    --prefix=/usr/X11R7
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
+	mkdir -p $TMPROOT/usr/X11R7/$LIBDIR/X11
+	ln -sf /usr/X11R7/share/fonts/X11 $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts
 }

 postmk() {
--- a/SysBuild/xserv/font-misc-ethiopic
+++ b/SysBuild/xserv/font-misc-ethiopic
@ -89,6 +89,8 @@ mk() {
 		    --prefix=/usr/X11R7
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
+	mkdir -p $TMPROOT/usr/X11R7/$LIBDIR/X11
+	ln -sf /usr/X11R7/share/fonts/X11 $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts
 }

 postmk() {
--- a/SysBuild/xserv/font-misc-misc
+++ b/SysBuild/xserv/font-misc-misc
@ -89,6 +89,8 @@ mk() {
 		    --prefix=/usr/X11R7
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
+	mkdir -p $TMPROOT/usr/X11R7/$LIBDIR/X11
+	ln -sf /usr/X11R7/share/fonts/X11 $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts
 }

 postmk() {
--- a/SysBuild/xserv/font-mutt-misc
+++ b/SysBuild/xserv/font-mutt-misc
@ -89,6 +89,8 @@ mk() {
 		    --prefix=/usr/X11R7
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
+	mkdir -p $TMPROOT/usr/X11R7/$LIBDIR/X11
+	ln -sf /usr/X11R7/share/fonts/X11 $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts
 }

 postmk() {
--- a/SysBuild/xserv/font-schumacher-misc
+++ b/SysBuild/xserv/font-schumacher-misc
@ -89,6 +89,8 @@ mk() {
 		    --prefix=/usr/X11R7
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
+	mkdir -p $TMPROOT/usr/X11R7/$LIBDIR/X11
+	ln -sf /usr/X11R7/share/fonts/X11 $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts
 }

 postmk() {
--- a/SysBuild/xserv/font-screen-cyrillic
+++ b/SysBuild/xserv/font-screen-cyrillic
@ -89,6 +89,8 @@ mk() {
 		    --prefix=/usr/X11R7
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
+	mkdir -p $TMPROOT/usr/X11R7/$LIBDIR/X11
+	ln -sf /usr/X11R7/share/fonts/X11 $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts
 }

 postmk() {
--- a/SysBuild/xserv/font-sony-misc
+++ b/SysBuild/xserv/font-sony-misc
@ -89,6 +89,8 @@ mk() {
 		    --prefix=/usr/X11R7
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
+	mkdir -p $TMPROOT/usr/X11R7/$LIBDIR/X11
+	ln -sf /usr/X11R7/share/fonts/X11 $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts
 }

 postmk() {
--- a/SysBuild/xserv/font-sun-misc
+++ b/SysBuild/xserv/font-sun-misc
@ -89,6 +89,12 @@ mk() {
 		    --prefix=/usr/X11R7
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
+	mkdir -p $TMPROOT/usr/X11R7/share/fonts/X11
+	if [ -d $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts ]; then
+		mv $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts/* $TMPROOT/usr/X11R7/share/fonts/X11
+		rm -r $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts
+		ln -sf /usr/X11R7/share/fonts/X11 $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts
+	fi
 }

 postmk() {
--- a/SysBuild/xserv/font-util
+++ b/SysBuild/xserv/font-util
@ -102,6 +102,8 @@ mk() {
 		    --prefix=/usr/X11R7
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
+	mkdir -p $TMPROOT/usr/X11R7/$LIBDIR/X11
+	ln -sf /usr/X11R7/share/fonts/X11 $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts
 }

 postmk() {
--- a/SysBuild/xserv/font-winitzki-cyrillic
+++ b/SysBuild/xserv/font-winitzki-cyrillic
@ -89,6 +89,8 @@ mk() {
 		    --prefix=/usr/X11R7
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
+	mkdir -p $TMPROOT/usr/X11R7/$LIBDIR/X11
+	ln -sf /usr/X11R7/share/fonts/X11 $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts
 }

 postmk() {
--- a/SysBuild/xserv/font-xfree86-type1
+++ b/SysBuild/xserv/font-xfree86-type1
@ -89,6 +89,8 @@ mk() {
 		    --prefix=/usr/X11R7
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
+	mkdir -p $TMPROOT/usr/X11R7/$LIBDIR/X11
+	ln -sf /usr/X11R7/share/fonts/X11 $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts
 }

 postmk() {
--- a/SysBuild/xserv/liberation-fonts-ttf
+++ b/SysBuild/xserv/liberation-fonts-ttf
@ -76,8 +76,10 @@ premk() {
 }

 mk() {
-	mkdir -p $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts/TTF
-	cp *.ttf $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts/TTF
+	mkdir -p $TMPROOT/usr/X11R7/share/fonts/X11/TTF
+	cp *.ttf $TMPROOT/usr/X11R7/share/fonts/X11/TTF
+	mkdir -p $TMPROOT/usr/X11R7/$LIBDIR/X11
+	ln -sf /usr/X11R7/share/fonts/X11 $TMPROOT/usr/X11R7/$LIBDIR/X11/fonts
 }

 postmk() {