Changeset 2139

Show
Ignore:
Timestamp:
11/27/07 08:27:11 (1 year ago)
Author:
alexander
Message:

Merged all changes since r2130 from trunk

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/minimal/packages/alsa-firmware/Makefile

    r2090 r2139  
    2121 
    2222compile-stage2: 
     23        sed -i s/multisound// Makefile.in 
    2324        ./configure --prefix=/usr --disable-loader 
    2425        make 

  • branches/minimal/packages/blfs-bootscripts/Makefile

    r1992 r2139  
    3535        install -m754 blfs/init.d/nfs-server /etc/rc.d/init.d/  
    3636        install -m754 blfs/init.d/nfs-client /etc/rc.d/init.d/  
    37         install -m754 blfs/init.d/iptables /etc/rc.d/init.d/  
    3837        install -m754 blfs/init.d/rsyncd /etc/rc.d/init.d/ 
    3938        sed -i 's| --compress||' /etc/rc.d/init.d/rsyncd 

  • branches/minimal/packages/hibernate-script/Makefile

    r1871 r2139  
    11# hibernate-script Makefile 
    22 
     3# Do not update - new versions are buggy (call hooks more than once) 
    34NM= hibernate-script 
    45VRS= 1.91 
    …… 
    67 
    78FILE= $(DIR).tar.gz 
    8 URL-$(FILE)= http://at-mirror.suspend2.net/downloads/all/$(FILE) 
     9URL-$(FILE)= http://at-mirror.tuxonice.net/downloads/all/$(FILE) 
    910SHA-$(FILE)= b81808f499068937a9696e977ef1cfd499d21eee 
    1011 

  • branches/minimal/packages/iptables/Makefile

    r1975 r2139  
    2121 
    2222compile-stage2: 
    23         make PREFIX=/usr LIBDIR=/lib BINDIR=/bin MANDIR=/usr/share/man KERNEL_DIR=/usr 
    24         make PREFIX=/usr LIBDIR=/lib BINDIR=/bin MANDIR=/usr/share/man KERNEL_DIR=/usr install 
     23        sed -i 's/name="$$node/name="node/' iptables.xslt 
     24        make PREFIX=/usr LIBDIR=/lib BINDIR=/sbin MANDIR=/usr/share/man KERNEL_DIR=/usr 
     25        make PREFIX=/usr LIBDIR=/lib BINDIR=/sbin MANDIR=/usr/share/man KERNEL_DIR=/usr install 
     26        install -v -m644 iptables.xslt /lib/iptables 
    2527 
    2628clean: 

  • branches/minimal/packages/jhalfs/Makefile

    r2052 r2139  
    1010 
    1111FILE1= configuration 
     12 
     13PATCH1= jhalfs-2.3.1-locale-1.patch 
    1214# Targets 
    1315 
    …… 
    1921 
    2022stage2: Makefile $(FILE) $(FILE1) 
    21         @$(call echo_message, Building) 
     23        $(std_build) 
     24 
     25compile-stage2: 
     26        patch -Np1 -i ../$(PATCH1) 
     27        cp ../$(FILE1) . 
    2228        mkdir -p /home/jhalfs 
    2329        cp -v $(ROOT)/root/.bashrc /home/jhalfs/.bashrc 
    24         cd /home/jhalfs ; unpack $(SRC)/$(FILE) 
    25         cp -v $(FILE1) /home/jhalfs/$(DIR) 
     30        cp -av . /home/jhalfs/$(DIR) 
    2631        chown -R jhalfs:jhalfs /home/jhalfs 
    2732        @touch $@ 

  • branches/minimal/packages/less/Makefile

    r1945 r2139  
    66 
    77FILE= $(DIR).tar.gz 
    8 URL-$(FILE)= http://www.greenwoodsoftware.com/less/$(FILE) 
     8URL-$(FILE)= $(HTTP)/$(NM)/$(FILE) 
    99SHA-$(FILE)= 7aeab848682c3ac7cd9ba54e4c96199f9fdf25e5 
    1010 

  • branches/minimal/packages/linux32/Makefile

    r2019 r2139  
    1919        install -m644 linux32.1 /usr/share/man/man1 
    2020        ln -sf linux32 /usr/bin/linux64 
    21         ln -sf linux32 /usr/share/man/man1/linux64.1 
     21        ln -sf linux32.1 /usr/share/man/man1/linux64.1 
    2222 
    2323clean: 

  • branches/minimal/packages/module-init-tools/Makefile

    r2078 r2139  
    2626compile-stage2: 
    2727        patch -Np1 -i ../$(PATCH1) 
    28         ./configure --prefix=/ --enable-zlib 
     28        ./configure --prefix=/ --mandir=/usr/share/man --enable-zlib 
    2929        make 
    30         make install 
     30        make INSTALL=install install 
    3131        install -m644 $(ROOT)/etc/modprobe.conf /etc/modprobe.conf 
    3232 

  • branches/minimal/packages/ncftp/Makefile

    r1816 r2139  
    66 
    77FILE= $(DIR)-src.tar.bz2 
    8 URL-$(FILE)= http://ftp.belnet.be/pub/mirror/ftp.ncftp.com/ncftp/$(FILE) 
     8URL-$(FILE)= http://ftp.belnet.be/mirror/ftp.ncftp.com/ncftp/older_versions/$(FILE) 
    99SHA-$(FILE)= 708222170df81ed957e4f187213d69ea21e4f7dd 
    1010 

  • branches/minimal/packages/net-firmware/Makefile

    r2033 r2139  
    7676FILE16= $(DIR16).zip 
    7777URL-$(FILE16)= http://www.ralinktech.com.tw/data/$(FILE16) 
    78 SHA-$(FILE16)= fded9f76ce620595b876b23b6a8c416af596dc5b 
     78SHA-$(FILE16)= 8a50899160d1ef1cd9770e4f0426930fb2b42a1b 
    7979 
    8080DIR17= RT71W_Firmware_V1.8 
    8181FILE17= $(DIR17).zip 
    8282URL-$(FILE17)= http://www.ralinktech.com.tw/data/$(FILE17) 
    83 SHA-$(FILE17)= 8f40bd8448c136e7edcc005f45e657258085ab8e 
     83SHA-$(FILE17)= 51541bec5cf2fe6ff46e46a0bb157b774d2ff050 
    8484 
    8585DIR18= iwlwifi-3945-ucode-2.14.4 

  • branches/minimal/packages/subversion/Makefile

    r1864 r2139  
    2626compile-stage2: 
    2727        unpack ../$(FILE2) --strip-components=1 
    28         ./configure --prefix=/usr --with-ssl \ 
     28        unset VERSION ; ./configure --prefix=/usr --with-ssl \ 
    2929         --with-editor=/usr/bin/vim \ 
    3030         --with-installbuilddir=/usr/share/apr/build 
    31         make 
    32         make install 
     31        unset VERSION ; make 
     32        unset VERSION ; make install 
    3333        install -v -d -m755 /usr/share/doc/$(DIR) 
    3434        cp -v -R doc/* /usr/share/doc/$(DIR) 

  • branches/minimal/packages/vim/Makefile

    r2052 r2139  
    6565        for L in "" fr it pl ru ; do \ 
    6666            ln -sfv vim.1 /usr/share/man/$L/man1/vi.1 ; done 
    67         ln -sfv ../vim/$(DIR)/doc /usr/share/doc/vim-$(VRS) 
     67        ln -nsfv ../vim/$(DIR)/doc /usr/share/doc/vim-$(VRS) 
    6868        cp $(ROOT)/etc/vimrc /etc 
    6969 

  • branches/minimal/packages/xfsprogs/Makefile

    r1986 r2139  
    66 
    77FILE=$(NM)_$(VRS)-1.tar.gz 
    8 URL-$(FILE)= ftp://oss.sgi.com/projects/xfs/cmd_tars/$(FILE) 
     8URL-$(FILE)= http://www.linuxfromscratch.org/~alexander/$(FILE) 
    99SHA-$(FILE)= 79996d24faefa89d46eb678d4c1c08d25d20dec7 
    1010