Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/base
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv6848/base
Modified Files:
bzip2.info bzip2.patch daemonic.info dpkg.info dpkg.patch
gettext-emacs.info
Log Message:
sync some fink-core stuff from unstable
Index: dpkg.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/base/dpkg.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- dpkg.patch 10 Jun 2007 06:01:38 -0000 1.3
+++ dpkg.patch 20 Dec 2008 19:30:49 -0000 1.4
@@ -659,6 +659,27 @@
+See \...@prefix@/share/doc/dpkg/THANKS.gz\fP for the list of people who have
contributed to \fBdpkg\fP .
.fi
+diff -urN dpkg-1.10.21.orig/main/enquiry.c dpkg-1.10.21/main/enquiry.c
+--- dpkg-1.10.21.orig/main/enquiry.c 2003-10-25 16:03:21.000000000 -0400
++++ dpkg-1.10.21/main/enquiry.c 2008-08-21 11:38:24.000000000 -0400
+@@ -402,7 +402,7 @@
+ FILE *ccpipe;
+ struct varbuf vb;
+ ptrdiff_t ll;
+- char *p, *q;
++ char *p;
+
+ if (*argv) badusage(_("--print-architecture does not take any argument"));
+
+@@ -445,7 +445,7 @@
+ default: internerr("unknown action in printarch");
+ }
+ if (!arch) {
+- *q= 0; arch= p;
++ arch= p;
+ fprintf(stderr, _("dpkg: warning, architecture `%s' not in remapping
table\n"),arch);
+ }
+ if (printf("%s\n",arch) == EOF) werr("stdout");
diff -urN dpkg-1.10.21.orig/main/help.c dpkg-1.10.21/main/help.c
--- dpkg-1.10.21.orig/main/help.c 2003-10-26 05:03:21.000000000 +0900
+++ dpkg-1.10.21/main/help.c 2005-03-18 22:13:37.000000000 +0900
Index: gettext-emacs.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/base/gettext-emacs.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- gettext-emacs.info 14 Oct 2007 21:22:00 -0000 1.5
+++ gettext-emacs.info 20 Dec 2008 19:30:49 -0000 1.6
@@ -1,7 +1,6 @@
Package: gettext-emacs
Version: 0.14.5
-Revision: 1
-Distribution: 10.4
+Revision: 3
#Source: mirror:gnu:gettext/gettext-%v.tar.gz
Source: mirror:sourceforge:fink/gettext-%v.tar.gz
Source-MD5: e2f6581626a22a0de66dce1d81d00de3
Index: dpkg.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/base/dpkg.info,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- dpkg.info 29 Jun 2007 18:56:54 -0000 1.8
+++ dpkg.info 20 Dec 2008 19:30:49 -0000 1.9
@@ -1,6 +1,6 @@
Package: dpkg
Version: 1.10.21
-Revision: 1224
+Revision: 1226
GCC: 4.0
BuildDepends: fink (>= 0.24.12)
Depends: libgettext3-shlibs, libiconv (>= 1.11-1), gzip, tar,
libncurses5-shlibs (>= 5.4-20041023-1006)
@@ -12,10 +12,11 @@
Source2: mirror:sourceforge:fink/gettext-0.14.5.tar.gz
Source2-MD5: e2f6581626a22a0de66dce1d81d00de3
PatchFile: %n.patch
-PatchFile-MD5: 49fc7cb90bb3ae0aa64c359044461699
+PatchFile-MD5: 5a4c81e659db6e3b0a20ded9cc8e75f8
PatchScript: <<
cd %b/..; 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
+ cd optlib; perl -pi -e 's/(getopt|getopt1).c//g' Makefile.in; rm getopt*
<<
SetCFLAGS: -I%p/include
NoSetMAKEFLAGS: true
@@ -89,6 +90,11 @@
(Exit 1 is a non-fatal error for tar; exit 2 is fatal.) patch written by vasi
Fink's make-3.81-1 breaks compiling so use Apple's to be safe.
+
+The on-board getopt needs tweaking for darwin, but isn't needed at all
+because libSystem has what dpkg needs, so just scrap it.
+
+Remove un/misused variable in dpkg enquiry.c (solve bus error in
--architecture)
<<
#
PostInstScript: <<
Index: daemonic.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/base/daemonic.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- daemonic.info 20 Feb 2006 00:47:07 -0000 1.2
+++ daemonic.info 20 Dec 2008 19:30:49 -0000 1.3
@@ -1,14 +1,62 @@
Package: daemonic
Version: 20010902
-Revision: 2
+Revision: 4
Maintainer: Fink Core Group <[email protected]>
Depends: libxml2-bin, libxml2-shlibs
BuildDepends: libiconv-dev, libxml2
+Recommends: bash-completion
Source: mirror:sourceforge:%n/%n-%v.tar.gz
Source-MD5: 20fde65b727578d721bc947d669de7b3
-PatchScript: perl -pi.bak -e 's/static void/void/g' parse.c
+PatchScript: <<
+#!/bin/sh -ex
+ perl -pi -e 's/static void/void/g' parse.c
+ cat >bash_completion <<EOF
+_daemonic_daemons()
+{
+ ls %p/etc/daemons 2>/dev/null | sed -e 's/\.xml//'
+}
+
+_daemonic()
+{
+ local cur prev special i
+
+ COMPREPLY=()
+ cur=\${COMP_WORDS[COMP_CWORD]}
+ prev=\${COMP_WORDS[COMP_CWORD-1]}
+
+ for (( i=0; i < \${#COMP_WORDS}-1; i++ )); do
+ if [[ \${COMP_WORDS[i]} ==
@(enable|disable|install|update|remove|dump) ]]; then
+ special=\${COMP_WORDS[i]}
+ fi
+ done
+
+ if [ -n "\${special}" ]; then
+ case \$special in
+ enable|disable|install|update|remove)
+ COMPREPLY=( \$( _daemonic_daemons ) )
+ ;;
+ dump)
+ COMPREPLY=()
+ ;;
+ esac
+
+ return 0
+ fi
+
+ COMPREPLY=( \$( compgen -W 'enable disable install update remove dump'
-- \$cur ) )
+
+ return 0
+}
+complete -F _daemonic daemonic
+EOF
+<<
CompileScript: make prefix=%p
-InstallScript: make install prefix=%i
+InstallScript: <<
+ make install prefix=%i
+ mkdir -p %i/etc/bash_completion.d
+ install -m755 bash_completion %i/etc/bash_completion.d/daemonic
+<<
+ConfFiles: %p/etc/bash_completion.d/daemonic
DocFiles: COPYING
#
Description: Interface to daemon init scripts
Index: bzip2.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/base/bzip2.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- bzip2.info 14 Aug 2006 02:35:34 -0000 1.3
+++ bzip2.info 20 Dec 2008 19:30:49 -0000 1.4
@@ -1,14 +1,17 @@
Package: bzip2
-Version: 1.0.3
-Revision: 1
+Version: 1.0.5
+Revision: 2
Essential: yes
Depends: %N-shlibs (= %v-%r)
-BuildDepends: fink (>= 0.13.0)
+BuildDepends: fink (>= 0.24.12-1)
Maintainer: Fink Core Group <[email protected]>
-#Source: http://www.bzip.org/%v/%n-%v.tar.gz
-Source: mirror:sourceforge:fink/%n-%v.tar.gz
-Source-MD5: 8a716bebecb6e647d2e8a29ea5d8447f
-Patch: %n.patch
+Source: http://www.bzip.org/%v/%n-%v.tar.gz
+#Source: mirror:sourceforge:fink/%n-%v.tar.gz
+Source-MD5: 3c15a0c8d1d3ee1c46a1634d00617b1a
+PatchFile: %n.patch
+PatchFile-MD5: 6fe75509c38cc356dd7ddfea0cdcd413
+PatchScript: sed 's|@VERSION@|%v|g' < %{PatchFile} | patch -p1
+#Patch: %n.patch
CompileScript: make PREFIX=%p
InstallScript: make install PREFIX=%i
DocFiles: LICENSE README CHANGES manual*.html
@@ -40,6 +43,8 @@
DescPort: <<
Doesn't use autoconf, but comes with a useful Makefile. Anyway, the
patch modifies it to build a shared library instead of a static one.
+
+Adjust the Makefile so that can install to packaging temp-dir cleanly.
<<
License: OSI-Approved
Homepage: http://sources.redhat.com/bzip2/
Index: bzip2.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/base/bzip2.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- bzip2.patch 22 Jun 2006 16:08:53 -0000 1.2
+++ bzip2.patch 20 Dec 2008 19:30:49 -0000 1.3
@@ -1,27 +1,26 @@
-diff -Nurd -x'*~' bzip2-1.0.3.orig/Makefile bzip2-1.0.3/Makefile
---- bzip2-1.0.3.orig/Makefile 2005-02-17 06:28:24.000000000 -0500
-+++ bzip2-1.0.3/Makefile 2005-11-14 16:16:10.000000000 -0500
-@@ -1,14 +1,17 @@
+diff -ru bzip2-1.0.5/Makefile bzip2-1.0.5-patched/Makefile
+--- bzip2-1.0.5/Makefile 2008-02-14 07:39:18.000000000 -0500
++++ bzip2-1.0.5-patched/Makefile 2008-06-11 19:28:40.000000000 -0400
+@@ -11,6 +11,9 @@
+ # This program is released under the terms of the license contained
+ # in the file LICENSE.
+ # ------------------------------------------------------------------
+# This Makefile builds a shared version of the library,
+# libbz2.1.0.2.dylib, with install_name .../libbz2.1.dylib,
+# on Darwin and Mac OS X.
SHELL=/bin/sh
- # To assist in cross-compiling
--CC=gcc
-+CC=cc
- AR=ar
- RANLIB=ranlib
+@@ -21,7 +24,7 @@
LDFLAGS=
BIGFILES=-D_FILE_OFFSET_BITS=64
--CFLAGS=-Wall -Winline -O -g $(BIGFILES)
-+CFLAGS=-fno-common -Wall -Winline -O -g $(BIGFILES)
+-CFLAGS=-Wall -Winline -O2 -g $(BIGFILES)
++CFLAGS=-fno-common -Wall -Winline -O2 -g $(BIGFILES)
# Where you want it installed when you do 'make install'
- PREFIX=/usr
-@@ -22,9 +25,9 @@
+ PREFIX=/usr/local
+@@ -35,9 +38,9 @@
decompress.o \
bzlib.o
@@ -33,15 +32,15 @@
$(CC) $(CFLAGS) $(LDFLAGS) -o bzip2 bzip2.o -L. -lbz2
bzip2recover: bzip2recover.o
-@@ -39,15 +42,21 @@
+@@ -52,15 +55,21 @@
$(RANLIB) libbz2.a ; \
fi
+libbz2.dylib: $(OBJS)
+ rm -f libbz2.dylib libbz2.*.dylib
-+ $(CC) -dynamiclib -o libbz2.1.0.3.dylib $(OBJS) -install_name
$(PREFIX)/lib/libbz2.1.dylib -compatibility_version 1.0.1 -current_version 1.0.3
-+ ln -s libbz2.1.0.3.dylib libbz2.1.dylib
-+ ln -s libbz2.1.0.3.dylib libbz2.dylib
++ $(CC) -dynamiclib -o libb...@[email protected] $(OBJS) -install_name
$(PREFIX)/lib/libbz2.1.dylib -compatibility_version 1.0.1 -current_version
@VERSION@
++ ln -s libb...@[email protected] libbz2.1.dylib
++ ln -s libb...@[email protected] libbz2.dylib
+
check: test
test: bzip2
@@ -61,7 +60,7 @@
cmp sample1.bz2 sample1.rb2
cmp sample2.bz2 sample2.rb2
cmp sample3.bz2 sample3.rb2
-@@ -59,8 +68,9 @@
+@@ -72,8 +81,9 @@
install: bzip2 bzip2recover
if ( test ! -d $(PREFIX)/bin ) ; then mkdir -p $(PREFIX)/bin ; fi
if ( test ! -d $(PREFIX)/lib ) ; then mkdir -p $(PREFIX)/lib ; fi
@@ -73,7 +72,7 @@
if ( test ! -d $(PREFIX)/include ) ; then mkdir -p $(PREFIX)/include ;
fi
cp -f bzip2 $(PREFIX)/bin/bzip2
cp -f bzip2 $(PREFIX)/bin/bunzip2
-@@ -70,12 +80,14 @@
+@@ -83,33 +93,35 @@
chmod a+x $(PREFIX)/bin/bunzip2
chmod a+x $(PREFIX)/bin/bzcat
chmod a+x $(PREFIX)/bin/bzip2recover
@@ -85,16 +84,23 @@
chmod a+r $(PREFIX)/include/bzlib.h
- cp -f libbz2.a $(PREFIX)/lib
- chmod a+r $(PREFIX)/lib/libbz2.a
-+ cp -f libbz2.1.0.3.dylib $(PREFIX)/lib
-+ chmod a+r $(PREFIX)/lib/libbz2.1.0.3.dylib
-+ (cd $(PREFIX)/lib && rm -f libbz2.1.dylib && ln -s libbz2.1.0.3.dylib
libbz2.1.dylib)
-+ (cd $(PREFIX)/lib && rm -f libbz2.dylib && ln -s libbz2.1.0.3.dylib
libbz2.dylib)
++ cp -f libb...@[email protected] $(PREFIX)/lib
++ chmod a+r $(PREFIX)/lib/libb...@[email protected]
++ ln -s libb...@[email protected] $(PREFIX)/lib/libbz2.1.dylib
++ ln -s libb...@[email protected] $(PREFIX)/lib/libbz2.dylib
cp -f bzgrep $(PREFIX)/bin/bzgrep
- ln $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzegrep
- ln $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzfgrep
-@@ -86,17 +98,17 @@
+- ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzegrep
+- ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzfgrep
++ ln -s -f bzgrep $(PREFIX)/bin/bzegrep
++ ln -s -f bzgrep $(PREFIX)/bin/bzfgrep
+ chmod a+x $(PREFIX)/bin/bzgrep
+ cp -f bzmore $(PREFIX)/bin/bzmore
+- ln -s -f $(PREFIX)/bin/bzmore $(PREFIX)/bin/bzless
++ ln -s -f bzmore $(PREFIX)/bin/bzless
+ chmod a+x $(PREFIX)/bin/bzmore
cp -f bzdiff $(PREFIX)/bin/bzdiff
- ln $(PREFIX)/bin/bzdiff $(PREFIX)/bin/bzcmp
+- ln -s -f $(PREFIX)/bin/bzdiff $(PREFIX)/bin/bzcmp
++ ln -s -f bzdiff $(PREFIX)/bin/bzcmp
chmod a+x $(PREFIX)/bin/bzdiff
- cp -f bzgrep.1 bzmore.1 bzdiff.1 $(PREFIX)/man/man1
- chmod a+r $(PREFIX)/man/man1/bzgrep.1
------------------------------------------------------------------------------
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
