experimental/dmacks/finkinfo apt.info,1.1,1.2 apt.patch,1.1,1.2

[Daniel M. <dm...@us...>]

Update of /cvsroot/fink/experimental/dmacks/finkinfo
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9676/10.3/experimental/dmacks/finkinfo

Modified Files:
	apt.info apt.patch 
Log Message:
Reduce differences between different-tree .patch files.


Index: apt.patch
===================================================================
RCS file: /cvsroot/fink/experimental/dmacks/finkinfo/apt.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- apt.patch	30 Sep 2004 14:09:26 -0000	1.1
+++ apt.patch	30 Sep 2004 22:32:07 -0000	1.2
@@ -753,7 +753,7 @@
  my @known_access         = ('http', 'ftp', 'file');
 -my @typical_distributions = ('stable', 'unstable', 'frozen', 'non-US');
 -my @typical_components    = ('main', 'contrib', 'non-free');
-+my @typical_distributions = ('10.3/release', '10.3/current');
++my @typical_distributions = ('@DIST@/release', '@DIST@/current');
 +my @typical_components    = ('main', 'crypto');
  
  my %known_access           = map {($_,$_)} @known_access;
@@ -766,7 +766,7 @@
 -  $distribution = "stable" unless $distribution;
 -  $components   = "main contrib non-free" unless $components;
 +  $urn          = "http://us.dl.sourceforge.net/fink/direct_download" unless $urn;
-+  $distribution = "10.3/release" unless $distribution;
++  $distribution = "@DIST@/release" unless $distribution;
 +  $components   = "main" unless $components;
  
      
@@ -917,7 +917,7 @@
  install. Alternatively a specific distribution can be selected by 
  following the package name with a slash and the version of the 
 -distribution or the Archive name (stable, frozen, unstable).
-+distribution or the Archive name (10.3/release or 10.3/current).
++distribution or the Archive name (@DIST@/release or @DIST@/current).
  
  Both of the version selection mechanisms can downgrade packages and must
  be used with care.
@@ -949,7 +949,7 @@
 -generally one of stable, unstable, or 
 -frozen, while component is one of main, 
 -contrib, non-free, or non-us. The 
-+generally one of 10.3/release or 10.3/current,
++generally one of @DIST@/release or @DIST@/current,
 +while component is one of main or crypto. The
  deb-src type describes a debian distribution's source code in 
  the same form as the deb type. A deb-src line is 

Index: apt.info
===================================================================
RCS file: /cvsroot/fink/experimental/dmacks/finkinfo/apt.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- apt.info	30 Sep 2004 14:09:26 -0000	1.1
+++ apt.info	30 Sep 2004 22:32:06 -0000	1.2
@@ -8,7 +8,7 @@
 Source-MD5: 274fb64e2e67318b4c9c94599785c37d
 SourceDirectory: %n-%v
 PatchScript: <<
- sed 's|@PREFIX@|%p|g' <%a/%n.patch | patch -p1
+ sed -e 's|@PREFIX@|%p|g' -e 's|@DIST@|10.3|g' <%a/%n.patch | patch -p1
  sh patch_flush
  for i in `grep -rl '#ifdef __GNUG__' .` ; do perl -pi.bak -e 's/#ifdef __GNUG__/#if defined(__GNUG__) && !defined(__APPLE_CC__)/' $i; done
  for i in `grep -rl '#ifdef __GNUG__' .` ; do perl -pi.bak -e 's/#ifdef __GNUG__/#if defined(__GNUG__) && !defined(__APPLE_CC__)/' $i ; done