cvs commit: ALFS/profiles/BLFS/chapter30 gnome-pre-installation.xml

kpfleming at linuxfromscratch.org kpfleming at linuxfromscratch.org
Sat Jul 3 10:14:27 PDT 2004


kpfleming    04/07/03 11:14:27

  Modified:    profiles/BLFS/chapter04 tripwire.xml
               profiles/BLFS/chapter08 libfam.xml
               profiles/BLFS/chapter09 freetype.xml libpng.xml libungif.xml
                        svgalib.xml
               profiles/BLFS/chapter10 bc.xml compface.xml rep-gtk.xml
               profiles/BLFS/chapter11 gpm.xml hdparm.xml unzip.xml
               profiles/BLFS/chapter12 gcc-full.xml gcc295.xml python.xml
               profiles/BLFS/chapter13 ppp.xml
               profiles/BLFS/chapter14 dhcpcd.xml
               profiles/BLFS/chapter16 wvstreams.xml
               profiles/BLFS/chapter18 portmap.xml tcpwrappers.xml
               profiles/BLFS/chapter20 pine.xml
               profiles/BLFS/chapter24 apache.xml
               profiles/BLFS/chapter30 gnome-pre-installation.xml
  Log:
  eliminate unnecessary patch copying
  
  Revision  Changes    Path
  1.2       +1 -2      ALFS/profiles/BLFS/chapter04/tripwire.xml
  
  Index: tripwire.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter04/tripwire.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- tripwire.xml	16 May 2004 02:14:13 -0000	1.1
  +++ tripwire.xml	3 Jul 2004 17:14:26 -0000	1.2
  @@ -7,7 +7,6 @@
   		</unpack>
   
   		<copy>
  -			<source>&packages_dir;/&tripwire-gcc-patch;</source>
   			<source>&packages_dir;/&tripwire-policy-file;</source>
   			<destination>&build_dir;</destination>
   		</copy>
  @@ -22,7 +21,7 @@
   		<patch>
   			<param>-N</param>
   			<param>-p1</param>
  -			<param>-i ../&tripwire-gcc-patch;</param>
  +			<param>-i &packages_dir;/&tripwire-gcc-patch;</param>
   		</patch>
   
   		<make>
  
  
  
  1.6       +1 -6      ALFS/profiles/BLFS/chapter08/libfam.xml
  
  Index: libfam.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter08/libfam.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- libfam.xml	3 Jul 2004 15:33:51 -0000	1.5
  +++ libfam.xml	3 Jul 2004 17:14:26 -0000	1.6
  @@ -17,11 +17,6 @@
   			<archive>&packages_dir;/&blfs-bootscripts-package;</archive>
   			<destination>&build_dir;</destination>
   		</unpack>
  -
  -		<copy>
  -		        <source>&packages_dir;/&libfam-patch;</source>
  -			<destination>&build_dir;</destination>
  -		</copy>
   	</stage>
   
   
  @@ -33,7 +28,7 @@
   		<patch>
   			<param>-N</param>
   			<param>-p1</param>
  -			<param>-i ../&libfam-patch;</param>
  +			<param>-i &packages_dir;/&libfam-patch;</param>
   		</patch>
   
   		<execute command="autoreconf -f -i" />
  
  
  
  1.5       +1 -5      ALFS/profiles/BLFS/chapter09/freetype.xml
  
  Index: freetype.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter09/freetype.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- freetype.xml	3 Jul 2004 15:33:51 -0000	1.4
  +++ freetype.xml	3 Jul 2004 17:14:27 -0000	1.5
  @@ -5,10 +5,6 @@
   			<archive>&packages_dir;/&freetype-package;</archive>
   			<destination>&build_dir;</destination>
   		</unpack>
  -		<copy>
  -		        <source>&packages_dir;/&freetype-bytecode-interpreter-patch;</source>
  -			<destination>&build_dir;</destination>
  -		</copy>
   	</stage>
   
   	<stage name="Installing">
  @@ -19,7 +15,7 @@
   		<patch>
   			<param>-N</param>
   			<param>-p1</param>
  -			<param>-i ../&freetype-bytecode-interpreter-patch;</param>
  +			<param>-i &packages_dir;/&freetype-bytecode-interpreter-patch;</param>
   		</patch>
   
   		<configure>
  
  
  
  1.6       +1 -5      ALFS/profiles/BLFS/chapter09/libpng.xml
  
  Index: libpng.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter09/libpng.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- libpng.xml	3 Jul 2004 15:33:52 -0000	1.5
  +++ libpng.xml	3 Jul 2004 17:14:27 -0000	1.6
  @@ -5,10 +5,6 @@
   			<archive>&packages_dir;/&libpng-package;</archive>
   			<destination>&build_dir;</destination>
   		</unpack>
  -		<copy>
  -		        <source>&packages_dir;/&libpng-link-to-proper-libs-patch;</source>
  -			<destination>&build_dir;</destination>
  -		</copy>
   	</stage>
   
   	<stage name="Installing">
  @@ -19,7 +15,7 @@
   		<patch>
   			<param>-N</param>
   			<param>-p1</param>
  -			<param>-i ../&libpng-link-to-proper-libs-patch;</param>
  +			<param>-i &packages_dir;/&libpng-link-to-proper-libs-patch;</param>
   		</patch>
   
   
  
  
  
  1.5       +1 -7      ALFS/profiles/BLFS/chapter09/libungif.xml
  
  Index: libungif.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter09/libungif.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- libungif.xml	3 Jul 2004 15:33:52 -0000	1.4
  +++ libungif.xml	3 Jul 2004 17:14:27 -0000	1.5
  @@ -5,12 +5,6 @@
   			<archive>&packages_dir;/&libungif-package;</archive>
   			<destination>&build_dir;</destination>
   		</unpack>
  -
  -		<copy>
  -			<source>&packages_dir;/&libungif-patch;</source>
  -			<destination>&build_dir;</destination>
  -		</copy>
  -
   	</stage>
   
   	<stage name="Installing">
  @@ -21,7 +15,7 @@
   		<patch>
   			<param>-N</param>
   			<param>-p1</param>
  -			<param>-i ../&libungif-patch;</param>
  +			<param>-i &packages_dir;/&libungif-patch;</param>
   		</patch>
   
   		<configure>
  
  
  
  1.7       +1 -6      ALFS/profiles/BLFS/chapter09/svgalib.xml
  
  Index: svgalib.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter09/svgalib.xml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- svgalib.xml	3 Jul 2004 16:10:03 -0000	1.6
  +++ svgalib.xml	3 Jul 2004 17:14:27 -0000	1.7
  @@ -5,11 +5,6 @@
   			<archive>&packages_dir;/&svgalib-package;</archive>
   			<destination>&build_dir;</destination>
   		</unpack>
  -
  -		<copy>
  -		        <source>&packages_dir;/&svgalib-gcc3-1-patch;</source>
  -		        <destination>&build_dir;</destination>
  -		</copy>
   	</stage>
   
   	<stage name="Installing">
  @@ -20,7 +15,7 @@
   		<patch>
   			<param>-N</param>
   			<param>-p1</param>
  -			<param>-i ../&svgalib-gcc3-1-patch;</param>
  +			<param>-i &packages_dir;/&svgalib-gcc3-1-patch;</param>
   		</patch>
   
   		<make>
  
  
  
  1.5       +2 -12     ALFS/profiles/BLFS/chapter10/bc.xml
  
  Index: bc.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter10/bc.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- bc.xml	3 Jul 2004 15:33:52 -0000	1.4
  +++ bc.xml	3 Jul 2004 17:14:27 -0000	1.5
  @@ -9,16 +9,6 @@
   			<archive>&packages_dir;/&bc-package;</archive>
   			<destination>&build_dir;</destination>
   		</unpack>
  -
  -		<copy>
  -			<source>&packages_dir;/&bc-flex-invocation-patch;</source>
  -			<destination>&build_dir;</destination>
  -		</copy>
  -
  -		<copy>
  -		        <source>&packages_dir;/&bc-readline-patch;</source>
  -			<destination>&build_dir;</destination>
  -		</copy>
   	</stage>
   
   	<stage name="Installing">
  @@ -29,13 +19,13 @@
   		<patch>
   			<param>-N</param>
   			<param>-p1</param>
  -			<param>-i ../&bc-flex-invocation-patch;</param>
  +			<param>-i &packages_dir;/&bc-flex-invocation-patch;</param>
   		</patch>
   
   		<patch>
   			<param>-N</param>
   			<param>-p1</param>
  -			<param>-i ../&bc-readline-patch;</param>
  +			<param>-i &packages_dir;/&bc-readline-patch;</param>
   		</patch>
   
   		<configure>
  
  
  
  1.4       +1 -6      ALFS/profiles/BLFS/chapter10/compface.xml
  
  Index: compface.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter10/compface.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- compface.xml	3 Jul 2004 15:33:52 -0000	1.3
  +++ compface.xml	3 Jul 2004 17:14:27 -0000	1.4
  @@ -5,11 +5,6 @@
   			<archive>&packages_dir;/&compface-package;</archive>
   			<destination>&build_dir;</destination>
   		</unpack>
  -
  -		<copy>
  -			<source>&packages_dir;/&compface-errno-2-patch;</source>
  -			<destination>&build_dir;</destination>
  -		</copy>
   	</stage>
   
   	<stage name="Installing">
  @@ -20,7 +15,7 @@
   		<patch>
   			<param>-N</param>
   			<param>-p1</param>
  -			<param>-i ../&compface-errno-2-patch;</param>
  +			<param>-i &packages_dir;/&compface-errno-2-patch;</param>
   		</patch>
   
   		<configure>
  
  
  
  1.4       +1 -6      ALFS/profiles/BLFS/chapter10/rep-gtk.xml
  
  Index: rep-gtk.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter10/rep-gtk.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- rep-gtk.xml	3 Jul 2004 15:33:52 -0000	1.3
  +++ rep-gtk.xml	3 Jul 2004 17:14:27 -0000	1.4
  @@ -11,11 +11,6 @@
   			<archive>&packages_dir;/&rep-gtk-package;</archive>
   			<destination>&build_dir;</destination>
   		</unpack>
  -
  -		<copy>
  -			<source>&packages_dir;/&rep-gtk-gtk2.4-patch;</source>
  -			<destination>&build_dir;</destination>
  -		</copy>
   	</stage>
   
   	<stage name="Installing">
  @@ -26,7 +21,7 @@
   		<patch>
   			<param>-N</param>
   			<param>-p1</param>
  -			<param>-i ../&rep-gtk-gtk2.4-patch;</param>
  +			<param>-i &packages_dir;/&rep-gtk-gtk2.4-patch;</param>
   		</patch>
   
   		<configure>
  
  
  
  1.5       +2 -12     ALFS/profiles/BLFS/chapter11/gpm.xml
  
  Index: gpm.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter11/gpm.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- gpm.xml	3 Jul 2004 15:33:52 -0000	1.4
  +++ gpm.xml	3 Jul 2004 17:14:27 -0000	1.5
  @@ -10,16 +10,6 @@
   			<archive>&packages_dir;/&blfs-bootscripts-package;</archive>
   			<destination>&build_dir;</destination>
   		</unpack>
  -
  -		<copy>
  -		        <source>&packages_dir;/&gpm-patch1;</source>
  -		        <destination>&build_dir;</destination>
  -		</copy>
  -
  -		<copy>
  -		        <source>&packages_dir;/&gpm-patch2;</source>
  -		        <destination>&build_dir;</destination>
  -		</copy>
   	</stage>
   
   	<stage name="Installing">
  @@ -30,13 +20,13 @@
   		<patch>
   			<param>-N</param>
   			<param>-p1</param>
  -			<param>-i ../&gpm-patch1;</param>
  +			<param>-i &packages_dir;/&gpm-patch1;</param>
   		</patch>
   
   		<patch>
   			<param>-N</param>
   			<param>-p1</param>
  -			<param>-i ../&gpm-patch2;</param>
  +			<param>-i &packages_dir;/&gpm-patch2;</param>
   		</patch>
   
   		<configure command="LDFLAGS='-lm' ./configure">
  
  
  
  1.5       +1 -6      ALFS/profiles/BLFS/chapter11/hdparm.xml
  
  Index: hdparm.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter11/hdparm.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- hdparm.xml	3 Jul 2004 15:33:52 -0000	1.4
  +++ hdparm.xml	3 Jul 2004 17:14:27 -0000	1.5
  @@ -5,11 +5,6 @@
   			<archive>&packages_dir;/&hdparm-package;</archive>
   			<destination>&build_dir;</destination>
   		</unpack>
  -
  -		<copy>
  -		        <source>&packages_dir;/&hdparm-patch1;</source>
  -		        <destination>&build_dir;</destination>
  -		</copy>
   	</stage>
   
   	<stage name="Installing">
  @@ -20,7 +15,7 @@
   		<patch>
   			<param>-N</param>
   			<param>-p1</param>
  -			<param>-i ../&hdparm-patch1;</param>
  +			<param>-i &packages_dir;/&hdparm-patch1;</param>
   		</patch>
   
   		<make/>
  
  
  
  1.6       +3 -18     ALFS/profiles/BLFS/chapter11/unzip.xml
  
  Index: unzip.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter11/unzip.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- unzip.xml	3 Jul 2004 15:33:52 -0000	1.5
  +++ unzip.xml	3 Jul 2004 17:14:27 -0000	1.6
  @@ -5,21 +5,6 @@
   			<archive>&packages_dir;/&unzip-package;</archive>
   			<destination>&build_dir;</destination>
   		</unpack>
  -
  -		<copy>
  -		        <source>&packages_dir;/&unzip-patch1;</source>
  -			<destination>&build_dir;</destination>
  -		</copy>
  -
  -		<copy>
  -		        <source>&packages_dir;/&unzip-patch2;</source>
  -			<destination>&build_dir;</destination>
  -		</copy>
  -
  -		<copy>
  -		        <source>&packages_dir;/&unzip-patch3;</source>
  -			<destination>&build_dir;</destination>
  -		</copy>
   	</stage>
   
   	<stage name="Installing">
  @@ -30,19 +15,19 @@
   		<patch>
   		        <param>-N</param>
   			<param>-p1</param>
  -			<param>-i ../&unzip-patch1;</param>
  +			<param>-i &packages_dir;/&unzip-patch1;</param>
   		</patch>
   
   		<patch>
   		        <param>-N</param>
   			<param>-p1</param>
  -			<param>-i ../&unzip-patch2;</param>
  +			<param>-i &packages_dir;/&unzip-patch2;</param>
   		</patch>
   
   		<patch>
   		        <param>-N</param>
   			<param>-p1</param>
  -			<param>-i ../&unzip-patch3;</param>
  +			<param>-i &packages_dir;/&unzip-patch3;</param>
   		</patch>
   
   		<copy>
  
  
  
  1.5       +1 -6      ALFS/profiles/BLFS/chapter12/gcc-full.xml
  
  Index: gcc-full.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter12/gcc-full.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- gcc-full.xml	3 Jul 2004 15:33:52 -0000	1.4
  +++ gcc-full.xml	3 Jul 2004 17:14:27 -0000	1.5
  @@ -15,11 +15,6 @@
   		<mkdir>
   		        <name>&build_dir;/gcc-build</name>
   		</mkdir>
  -
  -		<copy>
  -		        <source>&packages_dir;/&gcc-full-patch1;</source>
  -		        <destination>&build_dir;</destination>
  -		</copy>		
   	</stage>
   
   	<stage name="Installing">
  @@ -36,7 +31,7 @@
   		<patch base="&build_dir;/&gcc-full-directory;">
   			<param>-N</param>
   			<param>-p1</param>
  -			<param>-i ../&gcc-full-patch1;</param>
  +			<param>-i &packages_dir;/&gcc-full-patch1;</param>
   		</patch>
   
   		<search_replace base="&build_dir;/&gcc-full-directory;">
  
  
  
  1.4       +3 -11     ALFS/profiles/BLFS/chapter12/gcc295.xml
  
  Index: gcc295.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter12/gcc295.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- gcc295.xml	3 Jul 2004 15:33:52 -0000	1.3
  +++ gcc295.xml	3 Jul 2004 17:14:27 -0000	1.4
  @@ -5,14 +5,6 @@
   			<archive>&packages_dir;/&gcc295-package;</archive>
   			<destination>&build_dir;</destination>
   		</unpack>
  -
  -		<copy>
  -		        <source>&packages_dir;/&gcc295-patch1;</source>
  -			<source>&packages_dir;/&gcc295-patch2;</source>
  -			<source>&packages_dir;/&gcc295-patch3;</source>
  -		        <destination>&build_dir;</destination>
  -		</copy>
  -
   		<mkdir>
   		        <name>&build_dir;/gcc-build</name>
   		</mkdir>
  @@ -26,19 +18,19 @@
   		<patch base="&build_dir;/&gcc295-directory;">
   			<param>-N</param>
   			<param>-p1</param>
  -			<param>-i ../&gcc295-patch1;</param>
  +			<param>-i &packages_dir;/&gcc295-patch1;</param>
   		</patch>
   
   		<patch base="&build_dir;/&gcc295-directory;">
   			<param>-N</param>
   			<param>-p1</param>
  -			<param>-i ../&gcc295-patch2;</param>
  +			<param>-i &packages_dir;/&gcc295-patch2;</param>
   		</patch>
   
   		<patch base="&build_dir;/&gcc295-directory;">
   			<param>-N</param>
   			<param>-p1</param>
  -			<param>-i ../&gcc295-patch3;</param>
  +			<param>-i &packages_dir;/&gcc295-patch3;</param>
   		</patch>
   
   		<configure command="../&gcc295-directory;/configure">
  
  
  
  1.5       +1 -5      ALFS/profiles/BLFS/chapter12/python.xml
  
  Index: python.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter12/python.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- python.xml	3 Jul 2004 15:33:52 -0000	1.4
  +++ python.xml	3 Jul 2004 17:14:27 -0000	1.5
  @@ -15,10 +15,6 @@
   			<archive>&packages_dir;/&python-package;</archive>
   			<destination>&build_dir;</destination>
   		</unpack>
  -		<copy>
  -		        <source>&packages_dir;/&python-patch;</source>
  -			<destination>&build_dir;</destination>
  -		</copy>
   	</stage>
   
   	<stage name="Installing">
  @@ -30,7 +26,7 @@
   		<patch>
   			<param>-N</param>
   			<param>-p1</param>
  -			<param>-i ../&python-patch;</param>
  +			<param>-i &packages_dir;/&python-patch;</param>
   		</patch>
   
   		<configure>
  
  
  
  1.4       +1 -6      ALFS/profiles/BLFS/chapter13/ppp.xml
  
  Index: ppp.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter13/ppp.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ppp.xml	3 Jul 2004 15:33:53 -0000	1.3
  +++ ppp.xml	3 Jul 2004 17:14:27 -0000	1.4
  @@ -5,11 +5,6 @@
   			<archive>&packages_dir;/&ppp-package;</archive>
   			<destination>&build_dir;</destination>
   		</unpack>
  -
  -		<copy>
  -		        <source>&packages_dir;/&ppp-patch;</source>
  -		        <destination>&build_dir;</destination>
  -		</copy>
   	</stage>
   
   	<stage name="Installing">
  @@ -20,7 +15,7 @@
   		<patch base="&build_dir;/&ppp-directory;">
   			<param>-N</param>
   			<param>-p1</param>
  -			<param>-i ../&ppp-patch;</param>
  +			<param>-i &packages_dir;/&ppp-patch;</param>
   		</patch>
   
   		<configure />
  
  
  
  1.5       +1 -6      ALFS/profiles/BLFS/chapter14/dhcpcd.xml
  
  Index: dhcpcd.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter14/dhcpcd.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- dhcpcd.xml	3 Jul 2004 15:33:53 -0000	1.4
  +++ dhcpcd.xml	3 Jul 2004 17:14:27 -0000	1.5
  @@ -10,11 +10,6 @@
   			<archive>&packages_dir;/&blfs-bootscripts-package;</archive>
   			<destination>&build_dir;</destination>
   		</unpack>
  -
  -		<copy>
  -			<source>&packages_dir;/&dhcpcd-patch;</source>
  -			<destination>&build_dir;</destination>
  -		</copy>
   	</stage>
   
   	<stage name="Installing">
  @@ -25,7 +20,7 @@
   		<patch>
   			<param>-N</param>
   			<param>-p1</param>
  -			<param>-i ../&dhcpcd-patch;</param>
  +			<param>-i &packages_dir;/&dhcpcd-patch;</param>
   		</patch>
   
   		<configure>
  
  
  
  1.6       +2 -13     ALFS/profiles/BLFS/chapter16/wvstreams.xml
  
  Index: wvstreams.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter16/wvstreams.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- wvstreams.xml	3 Jul 2004 15:33:53 -0000	1.5
  +++ wvstreams.xml	3 Jul 2004 17:14:27 -0000	1.6
  @@ -9,17 +9,6 @@
   		<archive>&packages_dir;/&wvstreams-package;</archive>
   		<destination>&build_dir;</destination>
   	</unpack>
  -
  -	<copy>
  -	        <source>&packages_dir;/&wvstreams-wvcrypto-patch;</source>
  -		<destination>&build_dir;</destination>
  -	</copy>
  -
  -	<copy>
  -	        <source>&packages_dir;/&wvstreams-wvresolver-patch;</source>
  -		<destination>&build_dir;</destination>
  -	</copy>
  -
       </stage>
   
       <stage name="Installing">
  @@ -30,13 +19,13 @@
   	<patch>
   		<param>-N</param>
   		<param>-p1</param>
  -		<param>-i ../&wvstreams-wvcrypto-patch;</param>
  +		<param>-i &packages_dir;/&wvstreams-wvcrypto-patch;</param>
   	</patch>
   
   	<patch>
   		<param>-N</param>
   		<param>-p1</param>
  -		<param>-i ../&wvstreams-wvresolver-patch;</param>
  +		<param>-i &packages_dir;/&wvstreams-wvresolver-patch;</param>
   	</patch>
   
   	<make>
  
  
  
  1.6       +2 -12     ALFS/profiles/BLFS/chapter18/portmap.xml
  
  Index: portmap.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter18/portmap.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- portmap.xml	3 Jul 2004 15:33:53 -0000	1.5
  +++ portmap.xml	3 Jul 2004 17:14:27 -0000	1.6
  @@ -14,16 +14,6 @@
   			<archive>&packages_dir;/&blfs-bootscripts-package;</archive>
   			<destination>&build_dir;</destination>
   		</unpack>
  -
  -		<copy>
  -			<source>&packages_dir;/&portmap-compilation-fixes-patch;</source>
  -			<destination>&build_dir;</destination>
  -		</copy>
  -
  -		<copy>
  -			<source>&packages_dir;/&portmap-glibc-errno-fix-patch;</source>
  -			<destination>&build_dir;</destination>
  -		</copy>
   	</stage>
   
   	<stage name="Installing">
  @@ -34,13 +24,13 @@
   		<patch>
   			<param>-N</param>
   			<param>-p1</param>
  -			<param>-i ../&portmap-compilation-fixes-patch;</param>
  +			<param>-i &packages_dir;/&portmap-compilation-fixes-patch;</param>
   		</patch>
   
   		<patch>
   			<param>-N</param>
   			<param>-p1</param>
  -			<param>-i ../&portmap-glibc-errno-fix-patch;</param>
  +			<param>-i &packages_dir;/&portmap-glibc-errno-fix-patch;</param>
   		</patch>
   
   		<make/>
  
  
  
  1.5       +1 -6      ALFS/profiles/BLFS/chapter18/tcpwrappers.xml
  
  Index: tcpwrappers.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter18/tcpwrappers.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- tcpwrappers.xml	3 Jul 2004 15:33:53 -0000	1.4
  +++ tcpwrappers.xml	3 Jul 2004 17:14:27 -0000	1.5
  @@ -5,11 +5,6 @@
   			<archive>&packages_dir;/&tcpwrappers-package;</archive>
   			<destination>&build_dir;</destination>
   		</unpack>
  -
  -		<copy>
  -			<source>&packages_dir;/&tcpwrappers-shared-libs-plus-plus-patch;</source>
  -			<destination>&build_dir;</destination>
  -		</copy>
   	</stage>
   
   	<stage name="Installing">
  @@ -20,7 +15,7 @@
   		<patch>
   			<param>-N</param>
   			<param>-p1</param>
  -			<param>-i ../&tcpwrappers-shared-libs-plus-plus-patch;</param>
  +			<param>-i &packages_dir;/&tcpwrappers-shared-libs-plus-plus-patch;</param>
   		</patch>
   
   		<make>
  
  
  
  1.6       +1 -6      ALFS/profiles/BLFS/chapter20/pine.xml
  
  Index: pine.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter20/pine.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- pine.xml	3 Jul 2004 15:33:53 -0000	1.5
  +++ pine.xml	3 Jul 2004 17:14:27 -0000	1.6
  @@ -11,11 +11,6 @@
   			<archive>&packages_dir;/&pine-package;</archive>
   			<destination>&build_dir;</destination>
   		</unpack>
  -
  -		<copy>
  -			<source>&packages_dir;/&pine-patch;</source>
  -			<destination>&build_dir;</destination>
  -		</copy>
   	</stage>
   
   	<stage name="Installing">
  @@ -26,7 +21,7 @@
   		<patch>
   			<param>-N</param>
   			<param>-p1</param>
  -			<param>-i ../&pine-patch;</param>
  +			<param>-i &packages_dir;/&pine-patch;</param>
   		</patch>
   
   		<execute command="./build">
  
  
  
  1.5       +1 -6      ALFS/profiles/BLFS/chapter24/apache.xml
  
  Index: apache.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter24/apache.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- apache.xml	3 Jul 2004 16:12:15 -0000	1.4
  +++ apache.xml	3 Jul 2004 17:14:27 -0000	1.5
  @@ -14,11 +14,6 @@
   			<destination>&build_dir;</destination>
   		</unpack>
   
  -		<copy>
  -			<source>&packages_dir;/&apache-patch;</source>
  -			<destination>&build_dir;</destination>
  -		</copy>
  -	
   		<unpack>
   			<archive>&packages_dir;/&blfs-bootscripts-package;</archive>
   			<destination>&build_dir;</destination>
  @@ -48,7 +43,7 @@
   		<patch>
   			<param>-N</param>
   			<param>-p1</param>
  -			<param>-i ../&apache-patch;</param>
  +			<param>-i &packages_dir;/&apache-patch;</param>
   		</patch>
   
   		<configure>
  
  
  
  1.2       +1 -1      ALFS/profiles/BLFS/chapter30/gnome-pre-installation.xml
  
  Index: gnome-pre-installation.xml
  ===================================================================
  RCS file: /home/cvsroot/ALFS/profiles/BLFS/chapter30/gnome-pre-installation.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- gnome-pre-installation.xml	23 May 2004 22:32:00 -0000	1.1
  +++ gnome-pre-installation.xml	3 Jul 2004 17:14:27 -0000	1.2
  @@ -46,4 +46,4 @@
   
   </stage>
   
  -</package>
  \ No newline at end of file
  +</package>
  
  
  



More information about the alfs-log mailing list