Author: jue Date: 2006-03-15 08:08:44 +0100 (Wed, 15 Mar 2006) New Revision: 930 Modified: crux-2.2/ports/opt/x11/.footprint crux-2.2/ports/opt/x11/.md5sum crux-2.2/ports/opt/x11/.nostrip crux-2.2/ports/opt/x11/Pkgfile crux-2.2/ports/opt/x11/host.def Log: x11: adopted port Modified: crux-2.2/ports/opt/x11/.footprint =================================================================== --- crux-2.2/ports/opt/x11/.footprint 2006-03-15 07:05:51 UTC (rev 929) +++ crux-2.2/ports/opt/x11/.footprint 2006-03-15 07:08:44 UTC (rev 930) @@ -41,8 +41,13 @@ -rw-r--r-- root/root etc/X11/app-defaults/Xvidtune drwxr-xr-x root/root etc/X11/fs/ -rw-r--r-- root/root etc/X11/fs/config +drwxr-xr-x root/root etc/X11/init.d/ +-rwxr-xr-x root/root etc/X11/init.d/xprint drwxr-xr-x root/root etc/X11/lbxproxy/ -rw-r--r-- root/root etc/X11/lbxproxy/AtomControl +drwxr-xr-x root/root etc/X11/profile.d/ +-rwxr-xr-x root/root etc/X11/profile.d/xprint.csh +-rwxr-xr-x root/root etc/X11/profile.d/xprint.sh drwxr-xr-x root/root etc/X11/proxymngr/ -rw-r--r-- root/root etc/X11/proxymngr/pmconfig drwxr-xr-x root/root etc/X11/rstart/ @@ -78,7 +83,7 @@ -rwxr-xr-x root/root etc/X11/xdm/Xstartup -rwxr-xr-x root/root etc/X11/xdm/Xwilling lrwxrwxrwx root/root etc/X11/xdm/authdir -> ../../../var/lib/xdm -lrwxrwxrwx root/root etc/X11/xdm/chooser -> /usr/X11R6/bin/chooser +-rwxr-xr-x root/root etc/X11/xdm/chooser drwxr-xr-x root/root etc/X11/xdm/pixmaps/ -rw-r--r-- root/root etc/X11/xdm/pixmaps/xorg-bw.xpm -rw-r--r-- root/root etc/X11/xdm/pixmaps/xorg.xpm @@ -473,6 +478,7 @@ drwxr-xr-x root/root etc/X11/xserver/C/print/ddx-config/ drwxr-xr-x root/root etc/X11/xserver/C/print/ddx-config/raster/ -rw-r--r-- root/root etc/X11/xserver/C/print/ddx-config/raster/pcl +-rw-r--r-- root/root etc/X11/xserver/C/print/ddx-config/raster/postscript (EMPTY) drwxr-xr-x root/root etc/X11/xserver/C/print/models/ drwxr-xr-x root/root etc/X11/xserver/C/print/models/CANONBJ10E-GS/ lrwxrwxrwx root/root etc/X11/xserver/C/print/models/CANONBJ10E-GS/fonts -> ../GSdefault/fonts @@ -560,6 +566,7 @@ -rw-r--r-- root/root etc/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00093.pmf -rw-r--r-- root/root etc/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00094.pmf -rw-r--r-- root/root etc/X11/xserver/C/print/models/HPDJ1600C/fonts/README +-rw-r--r-- root/root etc/X11/xserver/C/print/models/HPDJ1600C/fonts/fonts.alias (EMPTY) -rw-r--r-- root/root etc/X11/xserver/C/print/models/HPDJ1600C/fonts/fonts.dir -rw-r--r-- root/root etc/X11/xserver/C/print/models/HPDJ1600C/fonts/lpr0ye1a.pmf -rw-r--r-- root/root etc/X11/xserver/C/print/models/HPDJ1600C/model-config @@ -643,6 +650,7 @@ -rw-r--r-- root/root etc/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00093.pmf -rw-r--r-- root/root etc/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00094.pmf -rw-r--r-- root/root etc/X11/xserver/C/print/models/HPLJ4family/fonts/README +-rw-r--r-- root/root etc/X11/xserver/C/print/models/HPLJ4family/fonts/fonts.alias (EMPTY) -rw-r--r-- root/root etc/X11/xserver/C/print/models/HPLJ4family/fonts/fonts.dir -rw-r--r-- root/root etc/X11/xserver/C/print/models/HPLJ4family/fonts/lpr0ye1a.pmf -rw-r--r-- root/root etc/X11/xserver/C/print/models/HPLJ4family/model-config @@ -1454,7 +1462,6 @@ -rwxr-xr-x root/root usr/X11R6/bin/bitmap -rwxr-xr-x root/root usr/X11R6/bin/bmtoa -rwxr-xr-x root/root usr/X11R6/bin/ccmakedep --rwxr-xr-x root/root usr/X11R6/bin/chooser -rwxr-xr-x root/root usr/X11R6/bin/cleanlinks -rwxr-xr-x root/root usr/X11R6/bin/cxpm -rwxr-xr-x root/root usr/X11R6/bin/dga @@ -1990,6 +1997,7 @@ -rw-r--r-- root/root usr/X11R6/include/X11/extensions/syncstr.h -rw-r--r-- root/root usr/X11R6/include/X11/extensions/vldXvMC.h -rw-r--r-- root/root usr/X11R6/include/X11/extensions/xcmiscstr.h +-rw-r--r-- root/root usr/X11R6/include/X11/extensions/xevieplaceholder.h (EMPTY) -rw-r--r-- root/root usr/X11R6/include/X11/extensions/xf86bigfont.h -rw-r--r-- root/root usr/X11R6/include/X11/extensions/xf86bigfstr.h -rw-r--r-- root/root usr/X11R6/include/X11/extensions/xf86dga.h @@ -9269,9 +9277,10 @@ -rw-r--r-- root/root usr/X11R6/man/man7/XStandards.7.gz -rw-r--r-- root/root usr/X11R6/man/man7/Xprint.7.gz -rw-r--r-- root/root usr/X11R6/man/man7/Xsecurity.7.gz +-rw-r--r-- root/root usr/X11R6/man/whatis (EMPTY) drwxr-xr-x root/root usr/include/ -lrwxrwxrwx root/root usr/include/GL -> ../../../usr/X11R6/include/GL -lrwxrwxrwx root/root usr/include/X11 -> ../../../usr/X11R6/include/X11 +lrwxrwxrwx root/root usr/include/GL -> ../X11R6/include/GL +lrwxrwxrwx root/root usr/include/X11 -> ../X11R6/include/X11 drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/xcomposite.pc Modified: crux-2.2/ports/opt/x11/.md5sum =================================================================== --- crux-2.2/ports/opt/x11/.md5sum 2006-03-15 07:05:51 UTC (rev 929) +++ crux-2.2/ports/opt/x11/.md5sum 2006-03-15 07:08:44 UTC (rev 930) @@ -1,5 +1,5 @@ 52ad69832db5c36c7041f90625ed4598 X11R6.9.0-src.tar.bz2 -45bc12fe1b64176a6a153850e71b184b host.def +350fcd02934035da94f73f2b39e24fc9 host.def 3196b65d8c4416cad412a0c49d75c461 x11-6.9.0-linux_config.patch 5527ad8177942a919981d4fba690879a x11-6.9.0-xterm256.patch 05f76e7c05dcda1dcb065e2f1eeaa88f xdm Modified: crux-2.2/ports/opt/x11/.nostrip =================================================================== --- crux-2.2/ports/opt/x11/.nostrip 2006-03-15 07:05:51 UTC (rev 929) +++ crux-2.2/ports/opt/x11/.nostrip 2006-03-15 07:08:44 UTC (rev 930) @@ -1 +1 @@ -^usr/X11R6/lib/modules/.*$ +^usr/X11R6/lib64/modules/.*$ Modified: crux-2.2/ports/opt/x11/Pkgfile =================================================================== --- crux-2.2/ports/opt/x11/Pkgfile 2006-03-15 07:05:51 UTC (rev 929) +++ crux-2.2/ports/opt/x11/Pkgfile 2006-03-15 07:08:44 UTC (rev 930) @@ -1,45 +1,43 @@ # Description: The Open Group X Window System -# URL: http://www.x.org -# Maintainer: Brett Goulder, predatorfreak at dcaf-security dot org -# Packager: Brett Goulder, predatorfreak at dcaf-security dot org -# Depends on: fontconfig, libpng +# Maintainer: J�rgen Daubert, juergen dot daubert at t-online dot de +# Packager: Daniel Mueller, daniel at danm dot de +# URL: http://xorg.freedesktop.org/wiki/ +# Depends on: ncurses, libpng, fontconfig name=x11 version=6.9.0 -release=1 -source=(http://xorg.freedesktop.org/releases/X11R$version/src-single/X11R$version-sr... \ - xdm \ - host.def \ - $name-$version-linux_config.patch \ - $name-$version-xterm256.patch) +release=2 +source=(http://ftp.x.org/pub/X11R${version}/src-single/X11R${version}-src.tar.bz2 \ + $name-$version-xterm256.patch $name-$version-linux_config.patch xdm host.def) build() { cd xc - patch -p1 < ../$name-$version-linux_config.patch - patch -p1 < ../$name-$version-xterm256.patch + patch -p1 < $SRC/$name-$version-xterm256.patch + patch -p1 < $SRC/$name-$version-linux_config.patch + sed "s/#CFLAGS#/$CFLAGS/" $SRC/host.def > config/cf/host.def make World make DESTDIR=$PKG install make DESTDIR=$PKG install.man + + rm -rf $PKG/usr/X11R6/lib/X11/doc \ + $PKG/usr/X11R6/src \ + $PKG/usr/include/GL \ + $PKG/etc/rc.d \ + $PKG/usr/lib + install -D -m 755 $SRC/xdm $PKG/etc/rc.d/xdm - rm -rf \ - $PKG/usr/X11R6/lib/X11/doc \ - $PKG/usr/X11R6/src \ - $PKG/usr/include/GL \ - $PKG/usr/lib - ln -s ../../../usr/X11R6/include/X11 $PKG/usr/include/X11 - ln -s ../../../usr/X11R6/include/GL $PKG/usr/include/GL - install -d $PKG/usr/lib - mv $PKG/usr/X11R6/lib/pkgconfig $PKG/usr/lib - chmod -R +w $PKG + ln -s ../X11R6/include/X11 $PKG/usr/include/X11 + ln -s ../X11R6/include/GL $PKG/usr/include/GL + touch $PKG/usr/X11R6/man/whatis + # Fix a bug with XDM, otherwise you may not be able to # type your login-info. - sed -i 's|:0 local.*|& vt7|' $PKG/etc/X11/xdm/Xservers - # Remove empty files. - find $PKG -depth -type f -empty -exec rm -rf {} \; - # Remove nonsense. - rm -rf $PKG/etc/{init.d,profile.d,rc.d/rc*.d} - # Odd place for a binary... - mv $PKG/etc/X11/xdm/chooser $PKG/usr/X11R6/bin - ln -s /usr/X11R6/bin/chooser $PKG/etc/X11/xdm/chooser + sed -i -e 's|:0 local.*|& vt7|' $PKG/etc/X11/xdm/Xservers + + mkdir -p $PKG/usr/lib + mv $PKG/usr/X11R6/lib/pkgconfig $PKG/usr/lib + mv $PKG/etc/{init.d,profile.d} $PKG/etc/X11 + + chmod -R +w $PKG } Modified: crux-2.2/ports/opt/x11/host.def =================================================================== --- crux-2.2/ports/opt/x11/host.def 2006-03-15 07:05:51 UTC (rev 929) +++ crux-2.2/ports/opt/x11/host.def 2006-03-15 07:08:44 UTC (rev 930) @@ -10,10 +10,6 @@ #define SharedLibXau YES -#define BuildXterm YES -#define InstallXtermSetUID NO -#define InstallXtermSetGID NO - #define HasNCurses YES #define HasFreetype2 YES #define HasFontconfig YES @@ -31,6 +27,10 @@ #define BuildAllSpecsDocs NO #define BuildIPv6 YES +#define BuildXterm YES +#define InstallXtermSetUID NO +#define InstallXtermSetGID NO + #define BuildCyrillicFonts YES #define BuildKOI8_RFonts YES #define BuildArabicFonts YES