Update of /cvsroot/fink/experimental/thesin/finkinfo
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv18543
Modified Files:
dpkg.info
Log Message:
Few more changes that allow future to work
Index: dpkg.info
===================================================================
RCS file: /cvsroot/fink/experimental/thesin/finkinfo/dpkg.info,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- dpkg.info 23 Jun 2013 14:17:33 -0000 1.45
+++ dpkg.info 24 Jun 2013 03:00:55 -0000 1.46
@@ -76,11 +76,19 @@
# Fink uses "x86_64" instead of "amd64"
perl -pi -e 's,amd64,x86_64,g' *table debian/archtable scripts/Makefile.in
scripts/Makefile.am scripts/t/200_Dpkg_Shlibs/basictags.c
scripts/t/200_Dpkg_Shlibs/basictags.symbols
scripts/t/200_Dpkg_Shlibs/objdump.basictags-x86_64 scripts/t/200_Dpkg_Shlibs.t
-# Fix for gnutar (Slightly modified for bootstrap version)
-#perl -pi -e 's,\"tar\",\"/usr/bin/gnutar\",g' dpkg-deb/build.c
dpkg-deb/extract.c lib/dpkg/dpkg.h lib/dpkg/subproc.c
-#perl -pi -e 's,--warning=no-timestamp,--format=gnu,g' dpkg-deb/extract.c
-# Fix for gnutar
-perl -pi -e 's,\"tar\",\"%p/bin/gnutar\",g' dpkg-deb/build.c
dpkg-deb/extract.c lib/dpkg/dpkg.h lib/dpkg/subproc.c
+# Fix for tar (Slightly modified for dpkg-bootstrap)
+if [ "%n" = "dpkg-bootstrap" ]; then \
+ if [ `/usr/bin/sw_vers -productVersion | cut -d'.' -f1-2` > 10.8 ]; then \
+ perl -pi -e 's,\"tar\",\"/usr/bin/tar\",g' dpkg-deb/build.c
dpkg-deb/extract.c lib/dpkg/dpkg.h lib/dpkg/subproc.c; \
+ perl -pi -e 's,--warning=no-timestamp,-v,g' dpkg-deb/extract.c; \
+ perl -pi -e 's,--format=gnu,--format=ustar,g' dpkg-deb/build.c; \
+ else \
+ perl -pi -e 's,\"tar\",\"/usr/bin/gnutar\",g' dpkg-deb/build.c
dpkg-deb/extract.c lib/dpkg/dpkg.h lib/dpkg/subproc.c; \
+ perl -pi -e 's,--warning=no-timestamp,--format=gnu,g' dpkg-deb/extract.c; \
+ fi \
+else \
+ perl -pi -e 's,\"tar\",\"%p/bin/gnutar\",g' dpkg-deb/build.c
dpkg-deb/extract.c lib/dpkg/dpkg.h lib/dpkg/subproc.c; \
+fi
# Fix for --disable-nls
perl -pi -e 's,defined\(__GNUG__\),defined(__NOTGNUG__),g' lib/compat/gettext.h
@@ -135,7 +143,7 @@
## currently in fink
# install -c -p -m 644 debian/shlibs.default %i/etc/dpkg
install -c -p -m 644 debian/shlibs.override %i/etc/dpkg
- install -c -p -m 644 fink/buildflags.conf %i/etc/dpkg/
+ install -c -p -m 644 fink/buildflags.conf %i/etc/dpkg
rm -rf %i/lib/dpkg/methods/*
install -m 0755 fink/md5sum %i/bin
------------------------------------------------------------------------------
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
