Author: ranger
Date: Tue Feb 6 21:07:00 2007
New Revision: 626
URL:
<http://svn.finkproject.org/websvn/listing.php?sc=1&rev=626&repname=user%3a+ranger>
Log:
updated
Modified:
trunk/experimental/3rdparty/10.3/main/finkinfo/base/dpkg.info
trunk/experimental/3rdparty/10.3/main/finkinfo/base/dpkg.patch
trunk/experimental/3rdparty/10.4/main/finkinfo/base/dpkg.info
trunk/experimental/3rdparty/10.4/main/finkinfo/base/dpkg.patch
trunk/experimental/3rdparty/common/main/finkinfo/base/dpkg.info
trunk/experimental/3rdparty/common/main/finkinfo/base/dpkg.patch
Modified: trunk/experimental/3rdparty/10.3/main/finkinfo/base/dpkg.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/3rdparty/10.3/main/finkinfo/base/dpkg.info&rev=626&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/3rdparty/10.3/main/finkinfo/base/dpkg.info (original)
+++ trunk/experimental/3rdparty/10.3/main/finkinfo/base/dpkg.info Tue Feb 6
21:07:00 2007
@@ -15,16 +15,21 @@
GCC: 3.3
Source: mirror:debian:pool/main/d/%n/%n_%v.tar.gz
+Source-MD5: 88effb358aa04d25036b662d588433a6
Source2: http://alioth.debian.org/frs/download.php/1864/po4a-0.30.tar.gz
+Source2-MD5: eebba7a1e1d8c19f7bd5c6f67e42dc98
+Source3: mirror:sourceforge:fink/gettext-0.14.5.tar.gz
+Source3-MD5: e2f6581626a22a0de66dce1d81d00de3
SourceDirectory: dpkg-%v
-Source-MD5: 88effb358aa04d25036b662d588433a6
-Source2-MD5: eebba7a1e1d8c19f7bd5c6f67e42dc98
PatchScript: <<
#!/bin/sh -ev
- sed 's|@PREFIX@|%p|g' <%a/dpkg.patch | patch -p0
+ sed 's|@PREFIX@|%p|g' <%{PatchFile} | patch -p0
+ cd %b/../gettext-0.14.5/build-aux; perl -pi -e 's/.*chmod.*777.*$//g'
ltmain.sh
find man -type f | xargs perl -pi -e 's,/usr,%p,g; s,/var,%p/var,g;
s,/etc,%p/etc,g;'
ls scripts/*.pl* scripts/*.sh | xargs perl -i -pe
's,([\047`"])/(etc|var),$1%p/$2,g; s,([\047`"])/usr,$1/%p,g;
s,([\047`"])(dpkg[\w-]*|822-date|md5sum|gpg)([\s\047`"]),$1%p/bin/$2$3,g'
<<
+PatchFile: %n.patch
+PatchFile-MD5: 6920748737da75a858ff6063cfc5063d
SetCFLAGS: -I%p/include
SetCPPFLAGS: -fconstant-cfstrings
@@ -35,7 +40,13 @@
if [ $UID -ne 0 ]; then echo "dpkg cannot be built with
--build-as-nobody"; exit 1; fi
- %p/bin/fink -y install gettext-bin gettext-dev gettext-tools
libiconv-dev
+ %p/bin/fink -y install gettext-bin libgettext3-dev libiconv-dev
+ pushd %b/../gettext-0.14.5/gettext-tools
+ env EMACS=no ./configure --prefix="%b/../_inst%p"
--infodir='${prefix}/share/info' --mandir='${prefix}/share/man'
--with-included-gettext --disable-csharp --disable-rpath --disable-shared
+ make
+ rm -rf %b/../_inst
+ make -j1 install
+ popd
export PERL5LIB=`pwd`/../po4a-0.30/lib:"$PERL5LIB"
export PATH=`pwd`/../po4a-0.30:"$PATH"
chmod a+x ../po4a-0.30/po4a*
@@ -51,13 +62,15 @@
export PATH=`pwd`/../po4a-0.30:"$PATH"
chmod a+x ../po4a-0.30/po4a*
mkdir -p %i/share/doc/dpkg
- make install DESTDIR=%d
+ make -j1 install DESTDIR=%d
for lang in de es ja sv; do
install -d -m 755 %i/share/man/$lang/man1
install -c -m 644 man/$lang/md5sum.1 %i/share/man/$lang/man1/
done
install -d -m 755 %i/var/backups
rm -rf %i/lib/dpkg/methods/*
+ install -d -m 755 %i/etc/dpkg/origins
+ install -c -p -m 644 fink/origin.fink %i/etc/dpkg/origins/fink
<<
PreInstScript:
@@ -79,6 +92,7 @@
DescPort: <<
1.13.25
- forward-ported changes to 1.13.25
+- merged changes from fink unstable
1.13.18
- forward-ported changes to 1.13.18
Modified: trunk/experimental/3rdparty/10.3/main/finkinfo/base/dpkg.patch
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/3rdparty/10.3/main/finkinfo/base/dpkg.patch&rev=626&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/3rdparty/10.3/main/finkinfo/base/dpkg.patch (original)
+++ trunk/experimental/3rdparty/10.3/main/finkinfo/base/dpkg.patch Tue Feb 6
21:07:00 2007
@@ -1,4 +1,3 @@
-? fink/dpkg.patch
Index: Makefile.in
===================================================================
RCS file: /cvsroot/fink/3rdparty/dpkg/Makefile.in,v
@@ -39,6 +38,14 @@
}
checkversion(checkedinfo->available.version.version,"(upstream)
version",&errs);
checkversion(checkedinfo->available.version.revision,"Debian
revision",&errs);
+Index: fink/.cvsignore
+===================================================================
+RCS file: fink/.cvsignore
+diff -N fink/.cvsignore
+--- /dev/null 1 Jan 1970 00:00:00 -0000
++++ fink/.cvsignore 6 Feb 2007 17:23:57 -0000 1.1
+@@ -0,0 +1 @@
++dpkg.patch
Index: fink/README
===================================================================
RCS file: fink/README
@@ -90,27 +97,32 @@
RCS file: fink/dpkg.info
diff -N fink/dpkg.info
--- /dev/null 1 Jan 1970 00:00:00 -0000
-+++ fink/dpkg.info 6 Feb 2007 16:52:58 -0000 1.7
-@@ -0,0 +1,109 @@
++++ fink/dpkg.info 6 Feb 2007 18:45:10 -0000 1.13
+@@ -0,0 +1,132 @@
+Package: dpkg
-+Version: 1.13.18
-+Revision: 11
++Version: 1.13.25
++Revision: 1
+Description: The Debian package manager
+License: GPL
+Maintainer: Fink Core Group <[EMAIL PROTECTED]>
+
-+Depends: gettext, libiconv, gzip, tar
++Depends: libgettext3-shlibs, libiconv, gzip, tar
+Essential: yes
+GCC: 3.3
+
-+Source: http://debian.ethz.ch/debian/pool/main/d/%n/%n_%v.tar.gz
-+Source2: http://alioth.debian.org/download.php/1556/po4a-0.25.tar.gz
++Source: mirror:debian:pool/main/d/%n/%n_%v.tar.gz
++Source2: http://alioth.debian.org/frs/download.php/1864/po4a-0.30.tar.gz
+SourceDirectory: dpkg-%v
-+Source-MD5: eb8353d0adfb4231fc4b40225a32758e
-+Source2-MD5: e868a14e5e5212d1e1d78e0905f01fe5
++Source-MD5: 88effb358aa04d25036b662d588433a6
++Source2-MD5: eebba7a1e1d8c19f7bd5c6f67e42dc98
++Source3: mirror:sourceforge:fink/gettext-0.14.5.tar.gz
++Source3-MD5: e2f6581626a22a0de66dce1d81d00de3
++PatchFile: %n.patch
++PatchFile-MD5: X
+PatchScript: <<
+ #!/bin/sh -ev
-+ sed 's|@PREFIX@|%p|g' <%a/dpkg.patch | patch -p0
++ sed 's|@PREFIX@|%p|g' <%{PatchFile} | patch -p0
++ cd %b/../gettext-0.14.5/build-aux; perl -pi -e 's/.*chmod.*777.*$//g'
ltmain.sh
+ find man -type f | xargs perl -pi -e 's,/usr,%p,g; s,/var,%p/var,g;
s,/etc,%p/etc,g;'
+ ls scripts/*.pl* scripts/*.sh | xargs perl -i -pe
's,([\047`"])/(etc|var),$1%p/$2,g; s,([\047`"])/usr,$1/%p,g;
s,([\047`"])(dpkg[\w-]*|822-date|md5sum|gpg)([\s\047`"]),$1%p/bin/$2$3,g'
+<<
@@ -122,10 +134,18 @@
+CompileScript: <<
+#!/bin/sh -ev
+
-+ %p/bin/fink -y install gettext-bin gettext-dev gettext-tools
libiconv-dev
-+ export PERL5LIB=`pwd`/../po4a-0.25/lib:"$PERL5LIB"
-+ export PATH=`pwd`/../po4a-0.25:"$PATH"
-+ chmod a+x ../po4a-0.25/po4a*
++ if [ $UID -ne 0 ]; then echo "dpkg cannot be built with
--build-as-nobody"; exit 1; fi
++
++ %p/bin/fink -y install gettext-bin libgettext3-dev libiconv-dev
++ pushd %b/../gettext-0.14.5/gettext-tools
++ env EMACS=no ./configure --prefix="%b/../_inst%p"
--infodir='${prefix}/share/info' --mandir='${prefix}/share/man'
--with-included-gettext --disable-csharp --disable-rpath --disable-shared
++ make
++ rm -rf %b/../_inst
++ make -j1 install
++ popd
++ export PERL5LIB=`pwd`/../po4a-0.30/lib:"$PERL5LIB"
++ export PATH=`pwd`/../po4a-0.30:"$PATH"
++ chmod a+x ../po4a-0.30/po4a*
+ mv getopt/obstack.* lib/
+ PERL=/usr/bin/perl ./configure --build=%m-apple-darwin %c
+ make
@@ -134,24 +154,30 @@
+InstallScript: <<
+#!/bin/sh -ev
+
-+ export PERL5LIB=`pwd`/../po4a-0.25/lib:"$PERL5LIB"
-+ export PATH=`pwd`/../po4a-0.25:"$PATH"
-+ chmod a+x ../po4a-0.25/po4a*
++ export PERL5LIB=`pwd`/../po4a-0.30/lib:"$PERL5LIB"
++ export PATH=`pwd`/../po4a-0.30:"$PATH"
++ chmod a+x ../po4a-0.30/po4a*
+ mkdir -p %i/share/doc/dpkg
-+ make install DESTDIR=%d
++ make -j1 install DESTDIR=%d
+ for lang in de es ja sv; do
+ install -d -m 755 %i/share/man/$lang/man1
+ install -c -m 644 man/$lang/md5sum.1 %i/share/man/$lang/man1/
+ done
+ install -d -m 755 %i/var/backups
+ rm -rf %i/lib/dpkg/methods/*
++ install -d -m 755 %i/etc/dpkg/origins
++ install -c -p -m 644 fink/origin.fink %i/etc/dpkg/origins/fink
+<<
+
++PreInstScript: <<
++<<
+PostInstScript: <<
-+if [ ! -f %p/var/lib/dpkg/diversions ]; then
-+ touch %p/var/lib/dpkg/diversions
-+ chmod 644 %p/var/lib/dpkg/diversions
-+fi
++ for file in diversions status available; do
++ if [ ! -f %p/var/lib/dpkg/$file ]; then
++ touch %p/var/lib/dpkg/$file
++ chmod 644 %p/var/lib/dpkg/$file
++ fi
++ done
+<<
+
+Homepage: http://packages.qa.debian.org/d/dpkg.html
@@ -161,6 +187,10 @@
+dselect, a full-screen console frontend to dpkg.
+<<
+DescPort: <<
++1.13.25
++- forward-ported changes to 1.13.25
++- merged changes from fink unstable
++
+1.13.18
+- forward-ported changes to 1.13.18
+
@@ -329,6 +359,16 @@
+ close $reader;
+ return \%return;
+}
+Index: fink/origin.fink
+===================================================================
+RCS file: fink/origin.fink
+diff -N fink/origin.fink
+--- /dev/null 1 Jan 1970 00:00:00 -0000
++++ fink/origin.fink 6 Feb 2007 18:45:10 -0000 1.1
+@@ -0,0 +1,3 @@
++Vendor: Fink
++Vendor-URL: http://www.finkproject.org/
++Bugs: http://www.finkproject.org/
Index: lib/Makefile.in
===================================================================
RCS file: /cvsroot/fink/3rdparty/dpkg/lib/Makefile.in,v
Modified: trunk/experimental/3rdparty/10.4/main/finkinfo/base/dpkg.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/3rdparty/10.4/main/finkinfo/base/dpkg.info&rev=626&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/3rdparty/10.4/main/finkinfo/base/dpkg.info (original)
+++ trunk/experimental/3rdparty/10.4/main/finkinfo/base/dpkg.info Tue Feb 6
21:07:00 2007
@@ -15,16 +15,21 @@
GCC: 4.0
Source: mirror:debian:pool/main/d/%n/%n_%v.tar.gz
+Source-MD5: 88effb358aa04d25036b662d588433a6
Source2: http://alioth.debian.org/frs/download.php/1864/po4a-0.30.tar.gz
+Source2-MD5: eebba7a1e1d8c19f7bd5c6f67e42dc98
+Source3: mirror:sourceforge:fink/gettext-0.14.5.tar.gz
+Source3-MD5: e2f6581626a22a0de66dce1d81d00de3
SourceDirectory: dpkg-%v
-Source-MD5: 88effb358aa04d25036b662d588433a6
-Source2-MD5: eebba7a1e1d8c19f7bd5c6f67e42dc98
PatchScript: <<
#!/bin/sh -ev
- sed 's|@PREFIX@|%p|g' <%a/dpkg.patch | patch -p0
+ sed 's|@PREFIX@|%p|g' <%{PatchFile} | patch -p0
+ cd %b/../gettext-0.14.5/build-aux; perl -pi -e 's/.*chmod.*777.*$//g'
ltmain.sh
find man -type f | xargs perl -pi -e 's,/usr,%p,g; s,/var,%p/var,g;
s,/etc,%p/etc,g;'
ls scripts/*.pl* scripts/*.sh | xargs perl -i -pe
's,([\047`"])/(etc|var),$1%p/$2,g; s,([\047`"])/usr,$1/%p,g;
s,([\047`"])(dpkg[\w-]*|822-date|md5sum|gpg)([\s\047`"]),$1%p/bin/$2$3,g'
<<
+PatchFile: %n.patch
+PatchFile-MD5: 6920748737da75a858ff6063cfc5063d
SetCFLAGS: -I%p/include
SetCPPFLAGS: -fconstant-cfstrings
@@ -35,7 +40,13 @@
if [ $UID -ne 0 ]; then echo "dpkg cannot be built with
--build-as-nobody"; exit 1; fi
- %p/bin/fink -y install gettext-bin gettext-dev gettext-tools
libiconv-dev
+ %p/bin/fink -y install gettext-bin libgettext3-dev libiconv-dev
+ pushd %b/../gettext-0.14.5/gettext-tools
+ env EMACS=no ./configure --prefix="%b/../_inst%p"
--infodir='${prefix}/share/info' --mandir='${prefix}/share/man'
--with-included-gettext --disable-csharp --disable-rpath --disable-shared
+ make
+ rm -rf %b/../_inst
+ make -j1 install
+ popd
export PERL5LIB=`pwd`/../po4a-0.30/lib:"$PERL5LIB"
export PATH=`pwd`/../po4a-0.30:"$PATH"
chmod a+x ../po4a-0.30/po4a*
@@ -51,13 +62,15 @@
export PATH=`pwd`/../po4a-0.30:"$PATH"
chmod a+x ../po4a-0.30/po4a*
mkdir -p %i/share/doc/dpkg
- make install DESTDIR=%d
+ make -j1 install DESTDIR=%d
for lang in de es ja sv; do
install -d -m 755 %i/share/man/$lang/man1
install -c -m 644 man/$lang/md5sum.1 %i/share/man/$lang/man1/
done
install -d -m 755 %i/var/backups
rm -rf %i/lib/dpkg/methods/*
+ install -d -m 755 %i/etc/dpkg/origins
+ install -c -p -m 644 fink/origin.fink %i/etc/dpkg/origins/fink
<<
PreInstScript:
@@ -79,6 +92,7 @@
DescPort: <<
1.13.25
- forward-ported changes to 1.13.25
+- merged changes from fink unstable
1.13.18
- forward-ported changes to 1.13.18
Modified: trunk/experimental/3rdparty/10.4/main/finkinfo/base/dpkg.patch
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/3rdparty/10.4/main/finkinfo/base/dpkg.patch&rev=626&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/3rdparty/10.4/main/finkinfo/base/dpkg.patch (original)
+++ trunk/experimental/3rdparty/10.4/main/finkinfo/base/dpkg.patch Tue Feb 6
21:07:00 2007
@@ -1,4 +1,3 @@
-? fink/dpkg.patch
Index: Makefile.in
===================================================================
RCS file: /cvsroot/fink/3rdparty/dpkg/Makefile.in,v
@@ -39,6 +38,14 @@
}
checkversion(checkedinfo->available.version.version,"(upstream)
version",&errs);
checkversion(checkedinfo->available.version.revision,"Debian
revision",&errs);
+Index: fink/.cvsignore
+===================================================================
+RCS file: fink/.cvsignore
+diff -N fink/.cvsignore
+--- /dev/null 1 Jan 1970 00:00:00 -0000
++++ fink/.cvsignore 6 Feb 2007 17:23:57 -0000 1.1
+@@ -0,0 +1 @@
++dpkg.patch
Index: fink/README
===================================================================
RCS file: fink/README
@@ -90,27 +97,32 @@
RCS file: fink/dpkg.info
diff -N fink/dpkg.info
--- /dev/null 1 Jan 1970 00:00:00 -0000
-+++ fink/dpkg.info 6 Feb 2007 16:52:58 -0000 1.7
-@@ -0,0 +1,109 @@
++++ fink/dpkg.info 6 Feb 2007 18:45:10 -0000 1.13
+@@ -0,0 +1,132 @@
+Package: dpkg
-+Version: 1.13.18
-+Revision: 11
++Version: 1.13.25
++Revision: 1
+Description: The Debian package manager
+License: GPL
+Maintainer: Fink Core Group <[EMAIL PROTECTED]>
+
-+Depends: gettext, libiconv, gzip, tar
++Depends: libgettext3-shlibs, libiconv, gzip, tar
+Essential: yes
+GCC: 3.3
+
-+Source: http://debian.ethz.ch/debian/pool/main/d/%n/%n_%v.tar.gz
-+Source2: http://alioth.debian.org/download.php/1556/po4a-0.25.tar.gz
++Source: mirror:debian:pool/main/d/%n/%n_%v.tar.gz
++Source2: http://alioth.debian.org/frs/download.php/1864/po4a-0.30.tar.gz
+SourceDirectory: dpkg-%v
-+Source-MD5: eb8353d0adfb4231fc4b40225a32758e
-+Source2-MD5: e868a14e5e5212d1e1d78e0905f01fe5
++Source-MD5: 88effb358aa04d25036b662d588433a6
++Source2-MD5: eebba7a1e1d8c19f7bd5c6f67e42dc98
++Source3: mirror:sourceforge:fink/gettext-0.14.5.tar.gz
++Source3-MD5: e2f6581626a22a0de66dce1d81d00de3
++PatchFile: %n.patch
++PatchFile-MD5: X
+PatchScript: <<
+ #!/bin/sh -ev
-+ sed 's|@PREFIX@|%p|g' <%a/dpkg.patch | patch -p0
++ sed 's|@PREFIX@|%p|g' <%{PatchFile} | patch -p0
++ cd %b/../gettext-0.14.5/build-aux; perl -pi -e 's/.*chmod.*777.*$//g'
ltmain.sh
+ find man -type f | xargs perl -pi -e 's,/usr,%p,g; s,/var,%p/var,g;
s,/etc,%p/etc,g;'
+ ls scripts/*.pl* scripts/*.sh | xargs perl -i -pe
's,([\047`"])/(etc|var),$1%p/$2,g; s,([\047`"])/usr,$1/%p,g;
s,([\047`"])(dpkg[\w-]*|822-date|md5sum|gpg)([\s\047`"]),$1%p/bin/$2$3,g'
+<<
@@ -122,10 +134,18 @@
+CompileScript: <<
+#!/bin/sh -ev
+
-+ %p/bin/fink -y install gettext-bin gettext-dev gettext-tools
libiconv-dev
-+ export PERL5LIB=`pwd`/../po4a-0.25/lib:"$PERL5LIB"
-+ export PATH=`pwd`/../po4a-0.25:"$PATH"
-+ chmod a+x ../po4a-0.25/po4a*
++ if [ $UID -ne 0 ]; then echo "dpkg cannot be built with
--build-as-nobody"; exit 1; fi
++
++ %p/bin/fink -y install gettext-bin libgettext3-dev libiconv-dev
++ pushd %b/../gettext-0.14.5/gettext-tools
++ env EMACS=no ./configure --prefix="%b/../_inst%p"
--infodir='${prefix}/share/info' --mandir='${prefix}/share/man'
--with-included-gettext --disable-csharp --disable-rpath --disable-shared
++ make
++ rm -rf %b/../_inst
++ make -j1 install
++ popd
++ export PERL5LIB=`pwd`/../po4a-0.30/lib:"$PERL5LIB"
++ export PATH=`pwd`/../po4a-0.30:"$PATH"
++ chmod a+x ../po4a-0.30/po4a*
+ mv getopt/obstack.* lib/
+ PERL=/usr/bin/perl ./configure --build=%m-apple-darwin %c
+ make
@@ -134,24 +154,30 @@
+InstallScript: <<
+#!/bin/sh -ev
+
-+ export PERL5LIB=`pwd`/../po4a-0.25/lib:"$PERL5LIB"
-+ export PATH=`pwd`/../po4a-0.25:"$PATH"
-+ chmod a+x ../po4a-0.25/po4a*
++ export PERL5LIB=`pwd`/../po4a-0.30/lib:"$PERL5LIB"
++ export PATH=`pwd`/../po4a-0.30:"$PATH"
++ chmod a+x ../po4a-0.30/po4a*
+ mkdir -p %i/share/doc/dpkg
-+ make install DESTDIR=%d
++ make -j1 install DESTDIR=%d
+ for lang in de es ja sv; do
+ install -d -m 755 %i/share/man/$lang/man1
+ install -c -m 644 man/$lang/md5sum.1 %i/share/man/$lang/man1/
+ done
+ install -d -m 755 %i/var/backups
+ rm -rf %i/lib/dpkg/methods/*
++ install -d -m 755 %i/etc/dpkg/origins
++ install -c -p -m 644 fink/origin.fink %i/etc/dpkg/origins/fink
+<<
+
++PreInstScript: <<
++<<
+PostInstScript: <<
-+if [ ! -f %p/var/lib/dpkg/diversions ]; then
-+ touch %p/var/lib/dpkg/diversions
-+ chmod 644 %p/var/lib/dpkg/diversions
-+fi
++ for file in diversions status available; do
++ if [ ! -f %p/var/lib/dpkg/$file ]; then
++ touch %p/var/lib/dpkg/$file
++ chmod 644 %p/var/lib/dpkg/$file
++ fi
++ done
+<<
+
+Homepage: http://packages.qa.debian.org/d/dpkg.html
@@ -161,6 +187,10 @@
+dselect, a full-screen console frontend to dpkg.
+<<
+DescPort: <<
++1.13.25
++- forward-ported changes to 1.13.25
++- merged changes from fink unstable
++
+1.13.18
+- forward-ported changes to 1.13.18
+
@@ -329,6 +359,16 @@
+ close $reader;
+ return \%return;
+}
+Index: fink/origin.fink
+===================================================================
+RCS file: fink/origin.fink
+diff -N fink/origin.fink
+--- /dev/null 1 Jan 1970 00:00:00 -0000
++++ fink/origin.fink 6 Feb 2007 18:45:10 -0000 1.1
+@@ -0,0 +1,3 @@
++Vendor: Fink
++Vendor-URL: http://www.finkproject.org/
++Bugs: http://www.finkproject.org/
Index: lib/Makefile.in
===================================================================
RCS file: /cvsroot/fink/3rdparty/dpkg/lib/Makefile.in,v
Modified: trunk/experimental/3rdparty/common/main/finkinfo/base/dpkg.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/3rdparty/common/main/finkinfo/base/dpkg.info&rev=626&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/3rdparty/common/main/finkinfo/base/dpkg.info (original)
+++ trunk/experimental/3rdparty/common/main/finkinfo/base/dpkg.info Tue Feb 6
21:07:00 2007
@@ -5,7 +5,7 @@
License: GPL
Maintainer: Fink Core Group <[EMAIL PROTECTED]>
-Depends: gettext, libiconv, gzip, tar
+Depends: libgettext3-shlibs, libiconv, gzip, tar
Essential: yes
GCC: 3.3
@@ -14,9 +14,14 @@
SourceDirectory: dpkg-%v
Source-MD5: 88effb358aa04d25036b662d588433a6
Source2-MD5: eebba7a1e1d8c19f7bd5c6f67e42dc98
+Source3: mirror:sourceforge:fink/gettext-0.14.5.tar.gz
+Source3-MD5: e2f6581626a22a0de66dce1d81d00de3
+PatchFile: %n.patch
+PatchFile-MD5: 6920748737da75a858ff6063cfc5063d
PatchScript: <<
#!/bin/sh -ev
- sed 's|@PREFIX@|%p|g' <%a/dpkg.patch | patch -p0
+ sed 's|@PREFIX@|%p|g' <%{PatchFile} | patch -p0
+ cd %b/../gettext-0.14.5/build-aux; perl -pi -e 's/.*chmod.*777.*$//g'
ltmain.sh
find man -type f | xargs perl -pi -e 's,/usr,%p,g; s,/var,%p/var,g;
s,/etc,%p/etc,g;'
ls scripts/*.pl* scripts/*.sh | xargs perl -i -pe
's,([\047`"])/(etc|var),$1%p/$2,g; s,([\047`"])/usr,$1/%p,g;
s,([\047`"])(dpkg[\w-]*|822-date|md5sum|gpg)([\s\047`"]),$1%p/bin/$2$3,g'
<<
@@ -30,7 +35,13 @@
if [ $UID -ne 0 ]; then echo "dpkg cannot be built with
--build-as-nobody"; exit 1; fi
- %p/bin/fink -y install gettext-bin gettext-dev gettext-tools
libiconv-dev
+ %p/bin/fink -y install gettext-bin libgettext3-dev libiconv-dev
+ pushd %b/../gettext-0.14.5/gettext-tools
+ env EMACS=no ./configure --prefix="%b/../_inst%p"
--infodir='${prefix}/share/info' --mandir='${prefix}/share/man'
--with-included-gettext --disable-csharp --disable-rpath --disable-shared
+ make
+ rm -rf %b/../_inst
+ make -j1 install
+ popd
export PERL5LIB=`pwd`/../po4a-0.30/lib:"$PERL5LIB"
export PATH=`pwd`/../po4a-0.30:"$PATH"
chmod a+x ../po4a-0.30/po4a*
@@ -46,13 +57,15 @@
export PATH=`pwd`/../po4a-0.30:"$PATH"
chmod a+x ../po4a-0.30/po4a*
mkdir -p %i/share/doc/dpkg
- make install DESTDIR=%d
+ make -j1 install DESTDIR=%d
for lang in de es ja sv; do
install -d -m 755 %i/share/man/$lang/man1
install -c -m 644 man/$lang/md5sum.1 %i/share/man/$lang/man1/
done
install -d -m 755 %i/var/backups
rm -rf %i/lib/dpkg/methods/*
+ install -d -m 755 %i/etc/dpkg/origins
+ install -c -p -m 644 fink/origin.fink %i/etc/dpkg/origins/fink
<<
PreInstScript: <<
@@ -75,6 +88,7 @@
DescPort: <<
1.13.25
- forward-ported changes to 1.13.25
+- merged changes from fink unstable
1.13.18
- forward-ported changes to 1.13.18
Modified: trunk/experimental/3rdparty/common/main/finkinfo/base/dpkg.patch
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/3rdparty/common/main/finkinfo/base/dpkg.patch&rev=626&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/3rdparty/common/main/finkinfo/base/dpkg.patch (original)
+++ trunk/experimental/3rdparty/common/main/finkinfo/base/dpkg.patch Tue Feb 6
21:07:00 2007
@@ -1,4 +1,3 @@
-? fink/dpkg.patch
Index: Makefile.in
===================================================================
RCS file: /cvsroot/fink/3rdparty/dpkg/Makefile.in,v
@@ -39,6 +38,14 @@
}
checkversion(checkedinfo->available.version.version,"(upstream)
version",&errs);
checkversion(checkedinfo->available.version.revision,"Debian
revision",&errs);
+Index: fink/.cvsignore
+===================================================================
+RCS file: fink/.cvsignore
+diff -N fink/.cvsignore
+--- /dev/null 1 Jan 1970 00:00:00 -0000
++++ fink/.cvsignore 6 Feb 2007 17:23:57 -0000 1.1
+@@ -0,0 +1 @@
++dpkg.patch
Index: fink/README
===================================================================
RCS file: fink/README
@@ -90,27 +97,32 @@
RCS file: fink/dpkg.info
diff -N fink/dpkg.info
--- /dev/null 1 Jan 1970 00:00:00 -0000
-+++ fink/dpkg.info 6 Feb 2007 16:52:58 -0000 1.7
-@@ -0,0 +1,109 @@
++++ fink/dpkg.info 6 Feb 2007 18:45:10 -0000 1.13
+@@ -0,0 +1,132 @@
+Package: dpkg
-+Version: 1.13.18
-+Revision: 11
++Version: 1.13.25
++Revision: 1
+Description: The Debian package manager
+License: GPL
+Maintainer: Fink Core Group <[EMAIL PROTECTED]>
+
-+Depends: gettext, libiconv, gzip, tar
++Depends: libgettext3-shlibs, libiconv, gzip, tar
+Essential: yes
+GCC: 3.3
+
-+Source: http://debian.ethz.ch/debian/pool/main/d/%n/%n_%v.tar.gz
-+Source2: http://alioth.debian.org/download.php/1556/po4a-0.25.tar.gz
++Source: mirror:debian:pool/main/d/%n/%n_%v.tar.gz
++Source2: http://alioth.debian.org/frs/download.php/1864/po4a-0.30.tar.gz
+SourceDirectory: dpkg-%v
-+Source-MD5: eb8353d0adfb4231fc4b40225a32758e
-+Source2-MD5: e868a14e5e5212d1e1d78e0905f01fe5
++Source-MD5: 88effb358aa04d25036b662d588433a6
++Source2-MD5: eebba7a1e1d8c19f7bd5c6f67e42dc98
++Source3: mirror:sourceforge:fink/gettext-0.14.5.tar.gz
++Source3-MD5: e2f6581626a22a0de66dce1d81d00de3
++PatchFile: %n.patch
++PatchFile-MD5: X
+PatchScript: <<
+ #!/bin/sh -ev
-+ sed 's|@PREFIX@|%p|g' <%a/dpkg.patch | patch -p0
++ sed 's|@PREFIX@|%p|g' <%{PatchFile} | patch -p0
++ cd %b/../gettext-0.14.5/build-aux; perl -pi -e 's/.*chmod.*777.*$//g'
ltmain.sh
+ find man -type f | xargs perl -pi -e 's,/usr,%p,g; s,/var,%p/var,g;
s,/etc,%p/etc,g;'
+ ls scripts/*.pl* scripts/*.sh | xargs perl -i -pe
's,([\047`"])/(etc|var),$1%p/$2,g; s,([\047`"])/usr,$1/%p,g;
s,([\047`"])(dpkg[\w-]*|822-date|md5sum|gpg)([\s\047`"]),$1%p/bin/$2$3,g'
+<<
@@ -122,10 +134,18 @@
+CompileScript: <<
+#!/bin/sh -ev
+
-+ %p/bin/fink -y install gettext-bin gettext-dev gettext-tools
libiconv-dev
-+ export PERL5LIB=`pwd`/../po4a-0.25/lib:"$PERL5LIB"
-+ export PATH=`pwd`/../po4a-0.25:"$PATH"
-+ chmod a+x ../po4a-0.25/po4a*
++ if [ $UID -ne 0 ]; then echo "dpkg cannot be built with
--build-as-nobody"; exit 1; fi
++
++ %p/bin/fink -y install gettext-bin libgettext3-dev libiconv-dev
++ pushd %b/../gettext-0.14.5/gettext-tools
++ env EMACS=no ./configure --prefix="%b/../_inst%p"
--infodir='${prefix}/share/info' --mandir='${prefix}/share/man'
--with-included-gettext --disable-csharp --disable-rpath --disable-shared
++ make
++ rm -rf %b/../_inst
++ make -j1 install
++ popd
++ export PERL5LIB=`pwd`/../po4a-0.30/lib:"$PERL5LIB"
++ export PATH=`pwd`/../po4a-0.30:"$PATH"
++ chmod a+x ../po4a-0.30/po4a*
+ mv getopt/obstack.* lib/
+ PERL=/usr/bin/perl ./configure --build=%m-apple-darwin %c
+ make
@@ -134,24 +154,30 @@
+InstallScript: <<
+#!/bin/sh -ev
+
-+ export PERL5LIB=`pwd`/../po4a-0.25/lib:"$PERL5LIB"
-+ export PATH=`pwd`/../po4a-0.25:"$PATH"
-+ chmod a+x ../po4a-0.25/po4a*
++ export PERL5LIB=`pwd`/../po4a-0.30/lib:"$PERL5LIB"
++ export PATH=`pwd`/../po4a-0.30:"$PATH"
++ chmod a+x ../po4a-0.30/po4a*
+ mkdir -p %i/share/doc/dpkg
-+ make install DESTDIR=%d
++ make -j1 install DESTDIR=%d
+ for lang in de es ja sv; do
+ install -d -m 755 %i/share/man/$lang/man1
+ install -c -m 644 man/$lang/md5sum.1 %i/share/man/$lang/man1/
+ done
+ install -d -m 755 %i/var/backups
+ rm -rf %i/lib/dpkg/methods/*
++ install -d -m 755 %i/etc/dpkg/origins
++ install -c -p -m 644 fink/origin.fink %i/etc/dpkg/origins/fink
+<<
+
++PreInstScript: <<
++<<
+PostInstScript: <<
-+if [ ! -f %p/var/lib/dpkg/diversions ]; then
-+ touch %p/var/lib/dpkg/diversions
-+ chmod 644 %p/var/lib/dpkg/diversions
-+fi
++ for file in diversions status available; do
++ if [ ! -f %p/var/lib/dpkg/$file ]; then
++ touch %p/var/lib/dpkg/$file
++ chmod 644 %p/var/lib/dpkg/$file
++ fi
++ done
+<<
+
+Homepage: http://packages.qa.debian.org/d/dpkg.html
@@ -161,6 +187,10 @@
+dselect, a full-screen console frontend to dpkg.
+<<
+DescPort: <<
++1.13.25
++- forward-ported changes to 1.13.25
++- merged changes from fink unstable
++
+1.13.18
+- forward-ported changes to 1.13.18
+
@@ -329,6 +359,16 @@
+ close $reader;
+ return \%return;
+}
+Index: fink/origin.fink
+===================================================================
+RCS file: fink/origin.fink
+diff -N fink/origin.fink
+--- /dev/null 1 Jan 1970 00:00:00 -0000
++++ fink/origin.fink 6 Feb 2007 18:45:10 -0000 1.1
+@@ -0,0 +1,3 @@
++Vendor: Fink
++Vendor-URL: http://www.finkproject.org/
++Bugs: http://www.finkproject.org/
Index: lib/Makefile.in
===================================================================
RCS file: /cvsroot/fink/3rdparty/dpkg/lib/Makefile.in,v
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier.
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
