Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv6393
Modified Files:
apt.info apt.patch
Log Message:
Starting to add f-v-p to apt, builds, and runs, finds and runs f-v-p but it's
not storing it into the pkgcache.bin yet, WIP
Index: apt.patch
===================================================================
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/apt.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- apt.patch 18 Jun 2013 21:50:53 -0000 1.1
+++ apt.patch 20 Jun 2013 22:40:51 -0000 1.2
@@ -1,537 +1,1041 @@
-diff -ruN apt-0.9.8.2.orig/apt-pkg/contrib/macros.h
apt-0.9.8.2/apt-pkg/contrib/macros.h
---- apt-0.9.8.2.orig/apt-pkg/contrib/macros.h 2013-06-06 11:25:59.000000000
-0600
-+++ apt-0.9.8.2/apt-pkg/contrib/macros.h 2013-06-18 11:55:07.000000000
-0600
-@@ -57,7 +57,9 @@
- // some nice optional GNUC features
- #if __GNUC__ >= 3
- #define __must_check __attribute__ ((warn_unused_result))
-+ #ifndef __APPLE__
- #define __deprecated __attribute__ ((deprecated))
+diff -ruN apt-0.9.8.2.orig/fink/patches/darwin-fixes.patch
apt-0.9.8.2/fink/patches/darwin-fixes.patch
+--- apt-0.9.8.2.orig/fink/patches/darwin-fixes.patch 1969-12-31
17:00:00.000000000 -0700
[...1540 lines suppressed...]
+++# print " http://ftp.de.debian.org/debian,\n";;
++ # print " and the special mirror scheme,\n";
++ # print " mirror:http://www.debian.org/archivemirrors \n";
+++ print " file:@FINKPREFIX@/fink,\n";
+++ print " http://us.dl.sourceforge.net/fink/direct_download\n";;
++ print "\n";
++
++ my $index = 0;
++@@ -246,7 +251,10 @@
++ push (@Config, &get_source());
++ }
++ print "\n";
++- print "$boldon Would you like to add another source?[y/N]$boldoff ";
+++ print "$boldon In most cases, this file was installed by Fink or by apt,"
+++ ." and$boldoff\n";
+++ print "$boldon should NOT be changed. " .
+++ "Do you wish to change (overwrite) it?[y/N]$boldoff ";
++ my $answer = <STDIN>;
++ chomp ($answer);
++ $answer =~ s/\s+/ /og;
Index: apt.info
===================================================================
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/apt.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- apt.info 18 Jun 2013 22:03:23 -0000 1.2
+++ apt.info 20 Jun 2013 22:40:51 -0000 1.3
@@ -31,10 +31,13 @@
<<
PatchFile: %n.patch
-PatchFile-MD5: bc5df423d75d41ef303c8ecbba725dbf
+PatchFile-MD5: b18c35c99ff963379180b9c67e1ff3fd
PatchScript: <<
-# darwin specific changes
-sed -e 's|@FINKPREFIX@|%p|g' < %{PatchFile} | patch -p1
+osxversion=$(sw_vers -productVersion | perl -pi -e 's,(\d\.\d)(\.\d)+?,$1,g');
\
+sed -e 's|@FINKPREFIX@|%p|g' -e "s|@DIST@|$osxversion|g" < %{PatchFile} |
patch -p1
+
+patch -p1 < fink/patches/darwin-fixes.patch
+patch -p1 < fink/patches/f-v-p.patch
echo "x86_64\tx86_64" >> %b/buildlib/archtable
@@ -44,7 +47,7 @@
perl -pi -e 's,po4a,notpo4a,g' configure
# fix paths
-for i in %b/po/*.po %b/po/*.pot %b/doc/po/*.po %b/doc/po/*.pot
%b/doc/*.[13578] %b/doc/*.ent %b/doc/*.sgml %b/doc/*.xmli
%b/doc/examples/apt-https-method-example.conf %b/doc/examples/configure-index
%b/debian/apt.logrotate %b/apt-pkg/deb/debsystem.cc %b/apt-pkg/deb/dpkgpm.cc
%b/apt-pkg/init.cc %b/apt-pkg/acquire-item.cc %b/apt-pkg/aptconfiguration.cc
%b/apt-pkg/contrib/gpgv.cc %b/cmdline/apt-get.cc %b/cmdline/apt-key; do \
+for i in %b/po/*.po %b/po/*.pot %b/doc/po/*.po %b/doc/po/*.pot
%b/doc/*.[13578] %b/doc/*.ent %b/doc/*.sgml %b/doc/*.xmli
%b/doc/examples/apt-https-method-example.conf %b/doc/examples/configure-index
%b/debian/apt.logrotate %b/apt-pkg/deb/debsystem.cc %b/apt-pkg/deb/dpkgpm.cc
%b/apt-pkg/init.cc %b/apt-pkg/acquire-item.cc %b/apt-pkg/aptconfiguration.cc
%b/apt-pkg/contrib/gpgv.cc %b/cmdline/apt-get.cc %b/cmdline/apt-key
%b/dselect/install %b/dselect/update; do \
perl -pi -e 's,/usr/,%p/,g' $i; \
perl -pi -e 's,/var/,%p/var/,g' $i; \
perl -pi -e 's,/etc/,%p/etc/,g' $i; \
------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:
Build for Windows Store.
http://p.sf.net/sfu/windows-dev2dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
