cvs commit: ALFS/profiles/BLFS/chapter17 links.xml lynx.xml w3m.xml

jbeckers at linuxfromscratch.org jbeckers at linuxfromscratch.org
Thu May 20 02:28:15 PDT 2004


jbeckers    04/05/20 03:28:15

  Modified:    profiles/BLFS packages.ent
               profiles/BLFS/chapter16 curl.xml gnet.xml libsoup.xml
                        wvstreams.xml
               profiles/BLFS/chapter17 links.xml lynx.xml w3m.xml
  Log:
  chapter 16 and 17 updated
  
  Revision  Changes    Path
  1.41      +23 -23    ALFS/profiles/BLFS/packages.ent
  
  Index: packages.ent
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/packages.ent,v
  retrieving revision 1.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- packages.ent	19 May 2004 15:42:43 -0000	1.40
  +++ packages.ent	20 May 2004 09:28:15 -0000	1.41
  @@ -445,39 +445,39 @@
   
   <!--************* packages for chapter 16 *************-->
   
  -<!ENTITY curl-version   "7.10.7">
  -<!ENTITY curl-package   "curl-7.10.7.tar.bz2">
  -<!ENTITY curl-directory "curl-7.10.7">
  +<!ENTITY curl-version   "7.11.1">
  +<!ENTITY curl-package   "curl-&curl-version;.tar.bz2">
  +<!ENTITY curl-directory "curl-&curl-version;">
   
   <!ENTITY wvstreams-version   "3.70">
  -<!ENTITY wvstreams-package   "wvstreams-3.70.tar.gz">
  -<!ENTITY wvstreams-directory "wvstreams-3.70">
  +<!ENTITY wvstreams-package   "wvstreams-&wvstreams-version;.tar.gz">
  +<!ENTITY wvstreams-directory "wvstreams-&wvstreams-version;">
   
   <!ENTITY wvstreams-wvcrypto-patch     "wvstreams-3.70-wvcrypto.patch">
   <!ENTITY wvstreams-wvresolver-patch   "wvstreams-3.70-wvresolver.patch">
   
  -<!ENTITY gnet-version   "2.0.4">
  -<!ENTITY gnet-package   "gnet-2.0.4.tar.gz">
  -<!ENTITY gnet-directory "gnet-2.0.4">
  -
  -<!ENTITY libsoup-version   "1.99.23">
  -<!ENTITY libsoup-package   "libsoup-1.99.23.tar.bz2">
  -<!ENTITY libsoup-directory "libsoup-1.99.23">
  +<!ENTITY gnet-version   "2.0.5">
  +<!ENTITY gnet-package   "gnet-&gnet-version;.tar.gz">
  +<!ENTITY gnet-directory "gnet-&gnet-version;">
  +
  +<!ENTITY libsoup-version   "1.99.26">
  +<!ENTITY libsoup-package   "libsoup-&libsoup-version;.tar.bz2">
  +<!ENTITY libsoup-directory "libsoup-&libsoup-version;">
   
   
   <!--************* packages for chapter 17 *************-->
   
  -<!ENTITY links-version   "2.1pre11">
  -<!ENTITY links-package   "links-2.1pre11.tar.bz2">
  -<!ENTITY links-directory "links-2.1pre11">
  -
  -<!ENTITY lynx-version   "2.8.4">
  -<!ENTITY lynx-package   "lynx2.8.4.tar.bz2">
  -<!ENTITY lynx-directory "lynx2-8-4">
  -
  -<!ENTITY w3m-version   "0.41">
  -<!ENTITY w3m-package   "w3m-0.4.1.tar.gz">
  -<!ENTITY w3m-directory "w3m-0.4.1">
  +<!ENTITY links-version   "2.1pre14">
  +<!ENTITY links-package   "links-&links-version;.tar.bz2">
  +<!ENTITY links-directory "links-&links-version;">
  +
  +<!ENTITY lynx-version   "2.8.5">
  +<!ENTITY lynx-package   "lynx&lynx-version;.tar.bz2">
  +<!ENTITY lynx-directory "lynx&lynx-version;">
  +
  +<!ENTITY w3m-version   "0.4.2">
  +<!ENTITY w3m-package   "w3m-&w3m-version;.tar.gz">
  +<!ENTITY w3m-directory "w3m-&w3m-version;">
   
   <!--************* packages for chapter 18 *************-->
   
  
  
  
  1.2       +0 -2      ALFS/profiles/BLFS/chapter16/curl.xml
  
  Index: curl.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter16/curl.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- curl.xml	29 Sep 2003 18:11:26 -0000	1.1
  +++ curl.xml	20 May 2004 09:28:15 -0000	1.2
  @@ -26,8 +26,6 @@
   	<make>
   		<param>install</param>
   	</make>
  -
  -	<execute command="/sbin/ldconfig" />
       </stage>
   
       <stage name="Clean-up.">
  
  
  
  1.3       +0 -2      ALFS/profiles/BLFS/chapter16/gnet.xml
  
  Index: gnet.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter16/gnet.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- gnet.xml	22 Nov 2003 20:31:07 -0000	1.2
  +++ gnet.xml	20 May 2004 09:28:15 -0000	1.3
  @@ -25,8 +25,6 @@
   	<make>
   		<param>install</param>
   	</make>
  -
  -	<execute command="/sbin/ldconfig" />
       </stage>
   
       <stage name="Clean-up.">
  
  
  
  1.2       +7 -5      ALFS/profiles/BLFS/chapter16/libsoup.xml
  
  Index: libsoup.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter16/libsoup.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- libsoup.xml	19 Nov 2003 22:28:57 -0000	1.1
  +++ libsoup.xml	20 May 2004 09:28:15 -0000	1.2
  @@ -1,10 +1,11 @@
   <package name="libsoup" version="&libsoup-version;">
   
  -    <packageinfo>
  -        <utilizes>
  -	    <name>openssl</name>
  -	</utilizes>
  -    </packageinfo>
  +	<packageinfo>
  +		<requires><name>glib2</name></requires>
  +		<utilizes><name>gtk-doc</name></utilizes>
  +		<utilizes><name>openssl</name></utilizes>
  +		<utilizes><name>gnutls</name></utilizes>
  +	</packageinfo>
   
   	<stage name="Unpacking a package.">
   		<unpack>
  @@ -20,6 +21,7 @@
   
   		<configure>
   			<param>--prefix=/usr</param>
  +			<param>--libexecdir=/usr/sbin</param>
   		</configure>
   
   		<make />
  
  
  
  1.3       +3 -1      ALFS/profiles/BLFS/chapter16/wvstreams.xml
  
  Index: wvstreams.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter16/wvstreams.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- wvstreams.xml	22 Nov 2003 20:31:07 -0000	1.2
  +++ wvstreams.xml	20 May 2004 09:28:15 -0000	1.3
  @@ -47,13 +47,15 @@
   
   	<make>
   	        <param>PREFIX=/usr</param>
  -	        <param>LDFLAGS=-lcrypt</param>
  +	        <param>LDFLAGS="-lcrypt"</param>
   	</make>
   
   	<make>
   	        <param>PREFIX=/usr</param>
   		<param>install</param>
   	</make>
  +
  +	<execute command="/sbin/ldconfig" />
       </stage>
   
       <stage name="Clean-up.">
  
  
  
  1.3       +1 -1      ALFS/profiles/BLFS/chapter17/links.xml
  
  Index: links.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter17/links.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- links.xml	22 Nov 2003 20:31:07 -0000	1.2
  +++ links.xml	20 May 2004 09:28:15 -0000	1.3
  @@ -1,8 +1,8 @@
   <package name="links" version="&links-version;">
   
           <packageinfo>
  -                <utilizes><name>openssl</name></utilizes>
                   <utilizes><name>gpm</name></utilizes>
  +                <utilizes><name>openssl</name></utilizes>
                   <utilizes><name>libpng</name></utilizes>
                   <utilizes><name>libjpeg</name></utilizes>
                   <utilizes><name>libtiff</name></utilizes>
  
  
  
  1.2       +8 -16     ALFS/profiles/BLFS/chapter17/lynx.xml
  
  Index: lynx.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter17/lynx.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- lynx.xml	29 Sep 2003 18:11:27 -0000	1.1
  +++ lynx.xml	20 May 2004 09:28:15 -0000	1.2
  @@ -1,7 +1,10 @@
   <package name="lynx" version="&lynx-version;">
   
           <packageinfo>
  -                <requires><name>openssl</name></requires>
  +                <utilizes><name>openssl</name></utilizes>
  +                <utilizes><name>gnutls</name></utilizes>
  +                <utilizes><name>mta</name></utilizes>
  +                <utilizes><name>zip</name></utilizes>
           </packageinfo>
   
   	<stage name="Unpacking a package.">
  @@ -19,7 +22,6 @@
   		<configure>
   			<param>--prefix=/usr</param>
   			<param>--libdir=/etc</param>
  -			<param>--with-ssl</param>
   			<param>--with-zlib</param>
   		</configure>
   
  @@ -30,26 +32,16 @@
   		</make>
   
   		<make>
  -			<param>DOCDIR=/usr/share/doc/lynx-&lynx-version;/lynx_doc</param>
  -			<param>HELPDIR=/usr/share/doc/lynx-&lynx-version;/lynx_help</param>
  +			<param>docdir=/usr/share/doc/lynx-&lynx-version;/lynx_doc</param>
  +			<param>helpdir=/usr/share/doc/lynx-&lynx-version;/lynx_help</param>
   			<param>install-doc</param>
   		</make>
   
   		<make>
  -			<param>DOCDIR=/usr/share/doc/lynx-&lynx-version;/lynx_doc</param>
  -			<param>HELPDIR=/usr/share/doc/lynx-&lynx-version;/lynx_help</param>
  +			<param>docdir=/usr/share/doc/lynx-&lynx-version;/lynx_doc</param>
  +			<param>helpdir=/usr/share/doc/lynx-&lynx-version;/lynx_help</param>
   			<param>install-help</param>
   		</make>
  -
  -
  -		<search_replace
  -		    base = "/etc">
  -		    
  -		    <file>lynx.cfg</file>
  -		    <find>t/etc</find>
  -		    <replace>t/usr/share/doc/lynx-&lynx-version;</replace>
  -		</search_replace>
  -
   	</stage>
   
   	<stage name="Clean-up.">
  
  
  
  1.3       +14 -3     ALFS/profiles/BLFS/chapter17/w3m.xml
  
  Index: w3m.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter17/w3m.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- w3m.xml	22 Nov 2003 20:31:07 -0000	1.2
  +++ w3m.xml	20 May 2004 09:28:15 -0000	1.3
  @@ -1,6 +1,8 @@
   <package name="w3m" version="&w3m-version;">
   
           <packageinfo>
  +                <requires><name>gc</name></requires>
  +
                   <utilizes><name>gpm</name></utilizes>
                   <utilizes><name>openssl</name></utilizes>
                   <utilizes><name>imlib</name></utilizes>
  @@ -22,10 +24,9 @@
   		</stageinfo>
   
   		<configure>
  -			<param>-yes</param>
  -			<param>--lang=en</param>
  -			<param>-model=monster</param>
   			<param>--prefix=/usr</param>
  +			<param>--libexecdir=/usr/lib</param>
  +			<param>--sysconfdir=/etc</param>
   		</configure>
   
   		<make/>
  @@ -33,6 +34,16 @@
   		<make>
   			<param>install</param>
   		</make>
  +
  +		<copy>
  +			<source>doc/keymap.default</source>
  +			<destination>/etc/w3m/keymap</destination>
  +		</copy>
  +
  +		<copy>
  +			<source>doc/menu.default</source>
  +			<destination>/etc/w3m/menu</destination>
  +		</copy>
   
   	</stage>
   
  
  
  



More information about the alfs-log mailing list