wok-next diff tightvnc/receipt @ rev 21020

Cleaning is almost finished... I should proceed to upgrades.
author Aleksej Bobylev <al.bobylev@gmail.com>
date Fri Nov 02 14:15:08 2018 +0200 (2018-11-02)
parents f99935f1778a
children 5669e8b3be70
line diff
     1.1 --- a/tightvnc/receipt	Fri Aug 24 15:29:24 2018 +0300
     1.2 +++ b/tightvnc/receipt	Fri Nov 02 14:15:08 2018 +0200
     1.3 @@ -3,7 +3,7 @@
     1.4  PACKAGE="tightvnc"
     1.5  VERSION="1.3.10"
     1.6  CATEGORY="x-window"
     1.7 -SHORT_DESC="VNC server (graphical remote control)."
     1.8 +SHORT_DESC="VNC server (graphical remote control)"
     1.9  MAINTAINER="pascal.bellard@slitaz.org"
    1.10  LICENSE="GPL2"
    1.11  TARBALL="$PACKAGE-${VERSION}_unixsrc.tar.bz2"
    1.12 @@ -14,11 +14,9 @@
    1.13  xorg-libXaw-dev xorg-libXt-dev xorg-libXau-dev xorg-libXdmcp-dev \
    1.14  xorg-libXmu-dev xorg-xorgproto \
    1.15  xorg-xauth jpeg-dev zlib-dev xorg-libXrandr-dev"
    1.16 -SPLIT="tightvnc tightvnc-extra tightvnc-java tightvnc-viewer"
    1.17 +SPLIT="$PACKAGE-extra $PACKAGE-java $PACKAGE-viewer"
    1.18  
    1.19 -# Rules to configure and make the package.
    1.20 -compile_rules()
    1.21 -{
    1.22 +compile_rules() {
    1.23  	[ -d vnc_unixsrc ] && mv vnc_unixsrc $src
    1.24  	cd $src
    1.25  	sed -i	-e "s| FONTDIR =.*$| FONTDIR = /usr/share/fonts/X11|" \
    1.26 @@ -29,25 +27,23 @@
    1.27  	cd Xvnc &&
    1.28  	./configure --prefix=/usr $CONFIGURE_ARGS || return 1
    1.29  	  sed 's|PROTO_DEFINES =|PROTO_DEFINES = -D_XOPEN_SOURCE=500L|' \
    1.30 -  	-i programs/Xserver/os/Makefile lib/font/fc/Makefile || return 1
    1.31 +	-i programs/Xserver/os/Makefile lib/font/fc/Makefile || return 1
    1.32  	find -name Makefile | xargs sed -i 's|/usr/X11R6/bin|/usr/bin|g'
    1.33  	make -j1 &&
    1.34 -	make -j1 DESTDIR=$DESTDIR install
    1.35 +	make -j1 DESTDIR=$install install
    1.36  	cd .. &&
    1.37 -	make -j1 DESTDIR=$DESTDIR install
    1.38 +	make -j1 DESTDIR=$install install
    1.39  }
    1.40  
    1.41 -# Rules to gen a SliTaz package suitable for Tazpkg.
    1.42 -genpkg_rules()
    1.43 -{
    1.44 +genpkg_rules() {
    1.45  	case $PACKAGE in
    1.46 -	tightvnc)
    1.47 -		TAGS="remote-desktop vnc"
    1.48 -		DEPENDS="xorg-base-fonts jpeg zlib"
    1.49 -		mkdir -p $fs/usr/bin
    1.50 -		cp -a $install/usr/bin/Xvnc $fs/usr/bin
    1.51 -		cp $src/vncpasswd/vncpasswd $fs/usr/bin
    1.52 -		cat > $fs/usr/bin/startvnc <<EOM
    1.53 +		tightvnc)
    1.54 +			TAGS="remote-desktop vnc"
    1.55 +			DEPENDS="xorg-base-fonts jpeg zlib"
    1.56 +			mkdir -p $fs/usr/bin
    1.57 +			cp -a $install/usr/bin/Xvnc $fs/usr/bin
    1.58 +			cp $src/vncpasswd/vncpasswd $fs/usr/bin
    1.59 +			cat > $fs/usr/bin/startvnc <<EOM
    1.60  #!/bin/sh
    1.61  
    1.62  case "\$1" in
    1.63 @@ -58,41 +54,41 @@
    1.64  EOT
    1.65  	exit 1
    1.66  esac
    1.67 -	
    1.68 +
    1.69  . \$HOME/.config/slitaz/applications.conf
    1.70  Xvnc -ac -geometry \${2:-1920x1024} -depth \${3:-24} :\${1:-1} &
    1.71  export DISPLAY=:\${1:-1}
    1.72  exec \$WINDOW_MANAGER
    1.73  EOM
    1.74 -		chmod +x $fs/usr/bin/startvnc
    1.75 -		;;
    1.76 -	tightvnc-extra)
    1.77 -		CAT="x-window|VNC extra tools."
    1.78 -		TAGS="vnc"
    1.79 -		DEPENDS="perl jpeg zlib xorg-libXdmcp xorg-libXau xorg-libX11 \
    1.80 +			chmod +x $fs/usr/bin/startvnc
    1.81 +			;;
    1.82 +		tightvnc-extra)
    1.83 +			CAT="x-window|extra tools"
    1.84 +			TAGS="vnc"
    1.85 +			DEPENDS="perl jpeg zlib xorg-libXdmcp xorg-libXau xorg-libX11 \
    1.86  			xorg-libXext"
    1.87 -		mkdir -p $fs/usr/bin $fs/etc
    1.88 -		cp $src/vncconnect/vncconnect $src/vncserver $fs/usr/bin
    1.89 -		cp $src/tightvncserver.conf $fs/etc
    1.90 -		cat >> $fs/etc/tightvncserver.conf << 'EOF'
    1.91 +			mkdir -p $fs/usr/bin $fs/etc
    1.92 +			cp $src/vncconnect/vncconnect $src/vncserver $fs/usr/bin
    1.93 +			cp $src/tightvncserver.conf $fs/etc
    1.94 +			cat >> $fs/etc/tightvncserver.conf << 'EOF'
    1.95  $vncClasses = "/usr/share/vnc/classes";
    1.96  $fontPath = "/usr/share/fonts/X11/misc/";
    1.97  EOF
    1.98 -		;;
    1.99 -	tightvnc-java)
   1.100 -		CAT="x-window|VNC Java client."
   1.101 -		DEPENDS="tightvnc"
   1.102 -		mkdir -p $fs/usr/share/vnc 
   1.103 -		cp -pa $src/classes $fs/usr/share/vnc
   1.104 -		;;
   1.105 -	tightvnc-viewer)
   1.106 -		CAT="x-window|VNC client for X."
   1.107 -		TAGS="vnc remote-desktop"
   1.108 -		DEPENDS="jpeg zlib xorg-libXdmcp xorg-libXau xorg-libX11 \
   1.109 +			;;
   1.110 +		tightvnc-java)
   1.111 +			CAT="x-window|Java client"
   1.112 +			DEPENDS="tightvnc"
   1.113 +			mkdir -p $fs/usr/share/vnc
   1.114 +			cp -pa $src/classes $fs/usr/share/vnc
   1.115 +			;;
   1.116 +		tightvnc-viewer)
   1.117 +			CAT="x-window|X client"
   1.118 +			TAGS="vnc remote-desktop"
   1.119 +			DEPENDS="jpeg zlib xorg-libXdmcp xorg-libXau xorg-libX11 \
   1.120  			xorg-libXext xorg-libXp xorg-libXpm xorg-libICE \
   1.121  			xorg-libSM xorg-libXt xorg-libXmu xorg-libXaw"
   1.122 -		mkdir -p $fs/usr/bin
   1.123 -		cp -a $install/usr/bin/vncviewer $fs/usr/bin
   1.124 -		;;
   1.125 +			mkdir -p $fs/usr/bin
   1.126 +			cp -a $install/usr/bin/vncviewer $fs/usr/bin
   1.127 +			;;
   1.128  	esac
   1.129  }