Update of /cvsroot/fink/fink/10.3
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15159/10.3
Modified Files:
Tag: branch-rangerrick_dpkg_test
dpkg-bootstrap.info dpkg.info dpkg.patch
Added Files:
Tag: branch-rangerrick_dpkg_test
dpkg-bootstrap.patch
Log Message:
this is a test of a new dpkg 1.13.18-based bootstrap for xcode 2.3
Index: dpkg.patch
===================================================================
RCS file: /cvsroot/fink/fink/10.3/dpkg.patch,v
retrieving revision 1.7
retrieving revision 1.7.4.1
diff -u -d -r1.7 -r1.7.4.1
--- dpkg.patch 18 Mar 2005 13:46:12 -0000 1.7
+++ dpkg.patch 3 May 2006 16:38:09 -0000 1.7.4.1
@@ -1,359 +1,314 @@
-diff -urN dpkg-1.10.21.orig/Makefile.conf.in dpkg-1.10.21/Makefile.conf.in
---- dpkg-1.10.21.orig/Makefile.conf.in 2003-09-14 08:43:49.000000000 +0900
-+++ dpkg-1.10.21/Makefile.conf.in 2005-03-18 22:13:37.000000000 +0900
-@@ -60,13 +60,13 @@
-
- CPPFLAGS = @CPPFLAGS@
- LD = @LD@
--LDFLAGS = @LDFLAGS@ -L../lib -L../optlib
-+LDFLAGS = @LDFLAGS@ -L../lib -L../optlib -framework
CoreFoundation
- LIBS = @LIBS@ -ldpkg -lopt $(ZLIB_LIBS)
-
[...3556 lines suppressed...]
++ if (verbose)
++ fprintf(stderr, _("FAILED\n"));
++ else
++ fprintf(stderr, _("%s: MD5 check failed for
'%s'\n"), progname, filename);
++ ++failed;
++ } else if (verbose)
++ fprintf(stderr, _("OK\n"));
++ ++checked;
++ }
++ if (verbose && failed)
++ fprintf(stderr, _("%s: %d of %d file(s) failed MD5 check\n"),
progname, failed, checked);
++ if (!checked) {
++ fprintf(stderr, _("%s: no files checked\n"), progname);
++ return 3;
++ }
++ if (!ex && failed)
++ ex = 1;
++ return ex;
++}
++
Index: dpkg-bootstrap.info
===================================================================
RCS file: /cvsroot/fink/fink/10.3/dpkg-bootstrap.info,v
retrieving revision 1.11
retrieving revision 1.11.4.1
diff -u -d -r1.11 -r1.11.4.1
--- dpkg-bootstrap.info 21 Mar 2005 02:38:25 -0000 1.11
+++ dpkg-bootstrap.info 3 May 2006 16:38:07 -0000 1.11.4.1
@@ -8,14 +8,14 @@
Source: mirror:sourceforge:fink/dpkg_%v.tar.gz
SourceDirectory: dpkg-%v
Source-MD5: a9f6c43891db74d727beab7dfc0ee663
-PatchScript: sed 's|@PREFIX@|%p|g' <%a/dpkg.patch | patch -p1
+PatchScript: sed 's|@PREFIX@|%p|g' <%a/dpkg-bootstrap.patch | patch -p1
SetCFLAGS: -no-cpp-precomp -I%p/include
NoSetMAKEFLAGS: true
SetMAKEFLAGS: -j1
ConfigureParams: --without-zlib --without-dselect --without-start-stop-daemon
--without-sgml-doc --with-admindir=%P/var/lib/dpkg --mandir=%p/share/man
--infodir=%p/share/info --srcdir=%b
CompileScript: <<
PERL=/usr/bin/perl ./configure --build=%m-apple-darwin %c
- make EXEFLAGS=-force_flat_namespace
+ make EXEFLAGS="-undefined dynamic_lookup"
<<
InstallScript: <<
mkdir -p %i/share/doc/dpkg
--- NEW FILE: dpkg-bootstrap.patch ---
diff -urN dpkg-1.10.21.orig/Makefile.conf.in dpkg-1.10.21/Makefile.conf.in
--- dpkg-1.10.21.orig/Makefile.conf.in 2003-09-14 08:43:49.000000000 +0900
+++ dpkg-1.10.21/Makefile.conf.in 2005-03-18 22:13:37.000000000 +0900
@@ -60,13 +60,13 @@
CPPFLAGS = @CPPFLAGS@
LD = @LD@
-LDFLAGS = @LDFLAGS@ -L../lib -L../optlib
+LDFLAGS = @LDFLAGS@ -L../lib -L../optlib -framework
CoreFoundation
LIBS = @LIBS@ -ldpkg -lopt $(ZLIB_LIBS)
RANLIB = @RANLIB@
DEFS = @DEFS@ -D_GNU_SOURCE
-INCLUDE_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir) -I$(srcdir)
-I../include -I.. -I. -I$(top_srcdir)/optlib
+INCLUDE_CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir) -I$(srcdir)
-I../include -I.. -I. -I$(top_srcdir)/optlib
-F/System/Library/Frameworks/CoreFoundation.framework
NLS_CFLAGS = -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/intl
-I../intl
NLS_LIBS = @INTLLIBS@
[...2400 lines suppressed...]
and
-.B /usr/share/common-licenses/GPL
+.B @PREFIX@/share/common-licenses/GPL
for details.
+Paths modified by Carsten Klapp to reflect fink distribution, December 2002.
diff -urN dpkg-1.10.21.orig/utils/Makefile.in dpkg-1.10.21/utils/Makefile.in
--- dpkg-1.10.21.orig/utils/Makefile.in 2002-08-25 04:54:19.000000000 +0900
+++ dpkg-1.10.21/utils/Makefile.in 2005-03-18 22:13:37.000000000 +0900
@@ -72,9 +72,9 @@
$(INSTALL_DATA) $(srcdir)/$(MD5_MANPAGES) $(DESTDIR)/$(man1dir)
start-stop-daemon: $(SSD_OBJECTS) ../lib/libdpkg.a
- $(CC) $(LDFLAGS) -o $@ $(SSD_OBJECTS) $(LIBS) $(SSD_LIBS)
+ $(CC) $(LDFLAGS) $(EXEFLAGS) -o $@ $(SSD_OBJECTS) $(LIBS) $(SSD_LIBS)
md5sum-static: LDFLAGS += -static
md5sum-static: ZLIB_LIBS = $(ZLIBS_LIBS_ALSO_STATIC)
md5sum md5sum-static: $(MD5_OBJECTS) ../lib/libdpkg.a
- $(CC) $(LDFLAGS) -o $@ $(MD5_OBJECTS) $(LIBS) $(NLS_LIBS)
+ $(CC) $(LDFLAGS) $(EXEFLAGS) -o $@ $(MD5_OBJECTS) $(LIBS) $(NLS_LIBS)
Index: dpkg.info
===================================================================
RCS file: /cvsroot/fink/fink/10.3/dpkg.info,v
retrieving revision 1.19
retrieving revision 1.19.2.1
diff -u -d -r1.19 -r1.19.2.1
--- dpkg.info 30 Jun 2005 19:08:49 -0000 1.19
+++ dpkg.info 3 May 2006 16:38:09 -0000 1.19.2.1
@@ -1,38 +1,87 @@
Package: dpkg
-Version: 1.10.21
-Revision: 202
-GCC: 3.3
-Depends: gzip, tar, ncurses (>= 5.4-20041023-4)
-BuildDepends: fink (>= 0.23.4-1), gettext-dev, libiconv-dev, libncurses5
-AddShlibDeps: true
-Essential: yes
+Version: 1.13.18
+Revision: 11
+Description: The Debian package manager
+License: GPL
Maintainer: Fink Core Group <[EMAIL PROTECTED]>
-Source: mirror:sourceforge:fink/dpkg_%v.tar.gz
+
+Depends: gettext, 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
SourceDirectory: dpkg-%v
-Source-MD5: a9f6c43891db74d727beab7dfc0ee663
-PatchScript: sed 's|@PREFIX@|%p|g' <%a/dpkg.patch | patch -p1
-SetCFLAGS: -no-cpp-precomp -I%p/include
-NoSetMAKEFLAGS: true
-SetMAKEFLAGS: -j1
+Source-MD5: eb8353d0adfb4231fc4b40225a32758e
+Source2-MD5: e868a14e5e5212d1e1d78e0905f01fe5
+PatchScript: <<
+ #!/bin/sh -ev
+ sed 's|@PREFIX@|%p|g' <%a/dpkg.patch | patch -p0
+ 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'
+<<
+
+SetCFLAGS: -I%p/include
+SetCPPFLAGS: -fconstant-cfstrings
+SetLDFLAGS: -Wl,-framework,CoreFoundation
+ConfigureParams: --without-start-stop-daemon --without-sgml-doc
--with-admindir=%p/var/lib/dpkg --mandir=%p/share/man --infodir=%p/share/info
--srcdir=%b --disable-linker-optimisations --without-dselect
CompileScript: <<
- %p/bin/fink -y --no-use-binary-dist install gettext-bin gettext-dev
libiconv-dev libncurses5
- PERL=/usr/bin/perl ./configure --build=%m-apple-darwin %c
- make EXEFLAGS=-force_flat_namespace
+#!/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*
+ mv getopt/obstack.* lib/
+ PERL=/usr/bin/perl ./configure --build=%m-apple-darwin %c
+ make
<<
-ConfigureParams: --without-start-stop-daemon --without-sgml-doc
--with-admindir=%p/var/lib/dpkg --mandir=%p/share/man --infodir=%p/share/info
--srcdir=%b
+
InstallScript: <<
- mkdir -p %i/share/doc/dpkg
- make install DESTDIR=%d
- install -c -p -m 644 origin.fink %i/etc/dpkg/origins/fink
- rm -rf %i/lib/dpkg/methods/*
+#!/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*
+ mkdir -p %i/share/doc/dpkg
+ make 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/*
<<
-Description: The Debian package manager
+
+PostInstScript: <<
+if [ ! -f %p/var/lib/dpkg/diversions ]; then
+ touch %p/var/lib/dpkg/diversions
+ chmod 644 %p/var/lib/dpkg/diversions
+fi
+<<
+
+Homepage: http://packages.qa.debian.org/d/dpkg.html
DescDetail: <<
dpkg installs and removes binary packages; it is the base of the
distribution. This package also contains some helper programs and
dselect, a full-screen console frontend to dpkg.
<<
DescPort: <<
+1.13.18
+- forward-ported changes to 1.13.18
+
+1.13.16
+- forward-ported changes to 1.13.16
+- remove dselect and curses dependency (will be split into another pkg)
+- remove the getopt stuff (except for obstack, move that to lib)
+- ignore Fink-owned fields
+- use search-and-replace for scripts and man prefix patching
+
+1.13.11
+- forward-ported changes to 1.13.11
+ - md5sum was removed, had to be re-added
+ - getopt was needed, but not automatically included, so had to be added to
the Makefile.in's
+
1.10.9
- Removed --without-zlib flag
- Gets confused about top_srcdir without the --srcdir arg.
@@ -51,13 +100,10 @@
Patched to suppress warning about BuildDependsOnly control field.
Previous versions by Christoph Pfisterer.
+
+Patched to not remove Darwin's system-critical symlinks (/etc /tmp /var)
+
+Patched to hardcode complete paths to our component executables
+instead of relying on PATH
<<
-#
-PostInstScript: <<
-if [ ! -f %p/var/lib/dpkg/diversions ]; then
- touch %p/var/lib/dpkg/diversions
- chmod 644 %p/var/lib/dpkg/diversions
-fi
-<<
-License: GPL
-Homepage: http://packages.qa.debian.org/d/dpkg.html
+
-------------------------------------------------------
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
