Changeset 2158

Show
Ignore:
Timestamp:
12/29/07 08:05:22 (1 year ago)
Author:
alexander
Message:

Merged applicable changes from trunk

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/minimal/Makefile

    r2125 r2158  
    396396        @sed -i 's/Version:$$/Version: $(VERSION)/' $(MP)/etc/issue* 
    397397        @install -m644 doc/lfscd-remastering-howto.txt $(MP)/root 
    398         @sed -e 's/\[version\]/$(VERSION)/' -e 's/\\_/_/g' \ 
     398        @sed -e 's/\[Version\]/$(VERSION)/' -e 's/\\_/_/g' \ 
    399399            doc/README.txt >$(MP)/root/README.txt 
    400400        @install -m600 root/.bashrc $(MP)/root/.bashrc 

  • branches/minimal/doc/README.txt

    r2145 r2158  
    11Official Linux From Scratch LiveCD 
    22================================== 
    3 Version: [version] 
     3Version: [Version] 
    44 
    55 

  • branches/minimal/packages/libxml2/Makefile

    r1816 r2158  
    11# LibXML2 Makefile 
     2 
     3# Don't upgrade to 2.6.30 - will segfault on x86_64 
     4# see http://bugs.debian.org/439967 and its duplicates 
    25 
    36NM= libxml2 

  • branches/minimal/packages/pkgconfig/Makefile

    r1816 r2158  
    22 
    33NM= pkg-config 
    4 VRS= 0.21 
     4VRS= 0.22 
    55DIR= $(NM)-$(VRS) 
    66 
    77FILE= $(DIR).tar.gz 
    88URL-$(FILE)= http://pkgconfig.freedesktop.org/releases/$(FILE) 
    9 SHA-$(FILE)= b2508ba8404cad46ec42f6f58cbca43ae59d715f 
     9SHA-$(FILE)= 3ec40bda9864d7aa3c912c6ae87a750fd8b6e420 
    1010 
    1111# Targets 

  • branches/minimal/packages/speech-dispatcher/Makefile

    r2120 r2158  
    22 
    33NM= speech-dispatcher 
    4 VRS= 0.6.4 
     4VRS= 0.6.5 
    55DIR= $(NM)-$(VRS) 
    66 
    77FILE= $(DIR).tar.gz 
    88URL-$(FILE)= http://www.freebsoft.org/pub/projects/speechd/$(FILE) 
    9 SHA-$(FILE)= 9350cffa71bb1d960cefe0dae66af5bfe9036570 
     9SHA-$(FILE)= 5f2cd4964bf96e49e41bc6fe908f8f482f9ea0e7 
    1010 
    11 PATCH1= $(DIR)-host-1.patch 
    1211# Targets 
    1312 
    …… 
    2221 
    2322compile-stage2: 
    24         patch -Np1 -i ../$(PATCH1) 
    2523        sed -i  -e 's/LogLevel  3/LogLevel  0/' \ 
    2624                -e 's/# DefaultLanguage  "en"/DefaultLanguage  "en"/' \ 
    2725                -e 's/^AddModule/#Addmodule/' \ 
    2826                -e 's/#\(.*sd_espeak.*\)$$/\1/' \ 
    29                 -e 's/DefaultModule flite/DefaultModule espeak/' \ 
    3027                config/speechd.conf.in 
    3128        ./configure --prefix=/usr --sysconfdir=/etc 

  • branches/minimal/packages/speechd-up/Makefile

    r2085 r2158  
    88URL-$(FILE)= http://www.freebsoft.org/pub/projects/speechd-up/$(FILE) 
    99SHA-$(FILE)= ad31c9a15fd8f5616aff4d35713f736ad8266a92 
     10 
     11PATCH1= speechd-up-0.4-onechar-1.patch 
    1012 
    1113# Targets 
    …… 
    2123 
    2224compile-stage2: 
     25        patch -Np1 -i ../$(PATCH1) 
    2326        ./configure --prefix=/usr --sysconfdir=/etc 
    2427        make 

  • branches/minimal/packages/w3m/Makefile

    r1843 r2158  
    22 
    33NM= w3m 
    4 VRS= 0.5.1 
     4VRS= 0.5.2 
    55DIR= $(NM)-$(VRS) 
    66 
    77FILE= $(DIR).tar.gz 
    88URL-$(FILE)= http://heanet.dl.sourceforge.net/sourceforge/$(NM)/$(FILE) 
    9 SHA-$(FILE)= 7da299648c236772bcde9b0e92e23346c8af0aca 
     9SHA-$(FILE)= 484522547ae6dbb342d3858a2a53a65451e273f9 
    1010 
    1111PATCH1= $(DIR)-gpm_fix-1.patch 
    12 URL-$(PATCH1)= http://www.linuxfromscratch.org/~alexander/patches/$(PATCH1) 
    13 SHA-$(PATCH1)= 3480a66f8bcdb1d97d082f5c8a9ef7892914c9f1 
     12 
    1413# Targets 
    1514 
    …… 
    2019        'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)' 
    2120 
    22 stage2: Makefile $(FILE) $(PATCH1) 
     21stage2: Makefile $(FILE) 
    2322        $(std_build) 
    2423 
    …… 
    2726        autoconf 
    2827        ./configure --prefix=/usr --libexecdir=/usr/lib --sysconfdir=/etc \ 
    29             --datarootdir=/usr/share --enable-image \ 
    30             --with-mailer=/usr/bin/mutt --with-browser=/usr/bin/mozilla 
    31         make datarootdir=/usr/share 
    32         make datarootdir=/usr/share install 
     28            --enable-image \ 
     29            --with-mailer=/usr/bin/mutt --with-browser=/usr/bin/seamonkey 
     30        make 
     31        make install 
    3332        install -v -D -m 644 doc/keymap.default /etc/w3m/keymap 
    3433        install -v -D -m 644 doc/menu.default /etc/w3m/menu 
    3534        install -v -d -m 755 /usr/share/doc/w3m-$(VRS)/html 
    36         install -v -m 644 doc/{HISTORY,READM*,keymap.*,menu.*} /usr/share/doc/$(DIR) 
    37         install -v -m 644 doc/*.html /usr/share/doc/$(DIR)/html 
     35        install -v -m 644 doc/{HISTORY,READM*,keymap.*,menu.*,*.html} /usr/share/doc/$(DIR) 
    3836 
    3937clean: