Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/libs
In directory
sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv5467/10.4/stable/main/finkinfo/libs
Modified Files:
suikyo.info suikyo.patch
Added Files:
libarchive.info libarchive.patch libotf.info libotf.patch
m17n-db.info m17n-lib.info m17n-lib.patch
Log Message:
Sync with stable.
--- NEW FILE: libarchive.info ---
Package: libarchive
Version: 2.1.10
Revision: 2
Description: Archiver library for tar, pax and others
BuildDepends: bzip2-dev
Depends: %N-shlibs (=%v-%r), bzip2-shlibs
BuildDependsOnly: true
Source: http://people.freebsd.org/~kientzle/libarchive/src/libarchive-%v.tar.gz
Source-MD5: 4c8d9ed796928b9442e1765834ea930c
PatchScript: <<
patch -p1 < %a/%n.patch
/usr/bin/sed -i.bak 's/^\.Fx/FreeBSD/' libarchive/*.[1-9]
<<
ConfigureParams: --mandir=%p/share/man ACLOCAL=: AUTOCONF=: AUTOMAKE=:
AUTOHEADER=:
InstallScript: DESTDIR=%d make install
DocFiles: COPYING README NEWS
SplitOff: <<
Package: %N-shlibs
Depends: bzip2-shlibs
Files: lib/libarchive.*.dylib
Shlibs: %p/lib/libarchive.2.dylib 4.0.0 %n (>= 2.1.6-1) 32
DocFiles: COPYING README NEWS
<<
SplitOff2: <<
Package: bsdtar
Description: FreeBSD's powerful tar
Depends: %N-shlibs (>= %v-%r)
Files: bin share/man/man1
DocFiles: COPYING README NEWS
DescDetail: <<
The bsdtar program is FreeBSD's modern implementation of tar based
on libarchive. It started as a test harness, but has grown into a
feature-competitive replacement for GNU tar.
Following formats are supported ('r' for reading and 'w' for writing).
On read, compression and format are always detected automatically.
[rw] gzip compression
[rw] bzip2 compression
[r ] compress/LZW compression
[r ] GNU tar format (including GNU long filenames, long link names, and
sparse files)
[r ] Solaris 9 extended tar format (including ACLs)
[r ] Old V7 tar archives
[rw] POSIX 1003.1-1988 ustar
[rw] POSIX 1003.1-2001 pax interchange format (indeed extended ustar)
[ w] "restricted" pax format, which will create ustar archives except for
entries that require pax extensions (for long filenames, ACLs, etc).
[rw] POSIX octet-oriented cpio
[r ] SVR4 ASCII cpio
[r ] Binary cpio (big-endian or little-endian)
[r ] ISO9660 CD-ROM images (with optional Rockridge extensions)
[r ] ZIP archives (with uncompressed or "deflate" compressed entries)
[ w] shar archives
[rw] GNU and BSD 'ar' archives
<<
DescUsage: <<
You can usually use bsdtar in the same way to GNU tar but there are
some differences. Read bsdtar(1) manpage for details.
<<
<<
DescDetail: <<
Libarchive is a stream-oriented library for variety of archives.
It focuses on tar format and its variants primarily, but can also
read and/or write other families of archive formats.
Following formats are supported ('r' for reading and 'w' for writing).
On read, compression and format are always detected automatically.
[rw] gzip compression
[rw] bzip2 compression
[r ] compress/LZW compression
[r ] GNU tar format (including GNU long filenames, long link names, and
sparse files)
[r ] Solaris 9 extended tar format (including ACLs)
[r ] Old V7 tar archives
[rw] POSIX 1003.1-1988 ustar
[rw] POSIX 1003.1-2001 pax interchange format (indeed extended ustar)
[ w] "restricted" pax format, which will create ustar archives except for
entries that require pax extensions (for long filenames, ACLs, etc).
[rw] POSIX octet-oriented cpio
[r ] SVR4 ASCII cpio
[r ] Binary cpio (big-endian or little-endian)
[r ] ISO9660 CD-ROM images (with optional Rockridge extensions)
[r ] ZIP archives (with uncompressed or "deflate" compressed entries)
[ w] shar archives
[rw] GNU and BSD 'ar' archives
<<
DescUsage: <<
Guide to Documentation installed by this system:
* libarchive.3 gives an overview of the library as a whole
* archive_read.3, archive_write.3, and archive_write_disk.3 provide
detailed calling sequences for the read and write APIs
* archive_entry.3 details the "struct archive_entry" utility class
* libarchive-formats.5 documents the file formats supported by the library
* tar.5 provides some detailed information about a variety of different
"tar" formats.
<<
DescPort: <<
Since Darwin/MacOS X does not support any tape device, the default
device is changed to stdio. The manpage warns users not to rely on
this behaviour or they knock the real tape device on other platforms.
<<
DescPackaging: <<
Bsdtar command is changed to link libarchive dynamically.
<<
License: BSD
Maintainer: AIDA Shinra <[EMAIL PROTECTED]>
Homepage: http://people.freebsd.org/~kientzle/libarchive/
Index: suikyo.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/suikyo.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- suikyo.patch 16 Dec 2006 21:45:54 -0000 1.2
+++ suikyo.patch 5 May 2007 12:01:54 -0000 1.3
@@ -1,12 +1,12 @@
-diff -Naur suikyo-1.3.2.orig/fink/suikyo-el-install
suikyo-1.3.2/fink/suikyo-el-install
---- suikyo-1.3.2.orig/fink/suikyo-el-install Thu Jan 1 09:00:00 1970
-+++ suikyo-1.3.2/fink/suikyo-el-install Wed Mar 17 17:45:28 2004
-@@ -0,0 +1,83 @@
+diff -Nuar suikyo-2.1.0.orig/fink/suikyo-el-install
suikyo-2.1.0/fink/suikyo-el-install
+--- suikyo-2.1.0.orig/fink/suikyo-el-install Thu Jan 1 09:00:00 1970
++++ suikyo-2.1.0/fink/suikyo-el-install Mon Apr 4 18:42:40 2005
+@@ -0,0 +1,86 @@
+#! /bin/sh -e
+# @PREFIX@/lib/emacsen-common/packages/install/suikyo-el
+
+FLAVOR=$1
-+VERSION=1.3.2-1
[EMAIL PROTECTED]@
+PACKAGE=suikyo-el
+
+if [ "X${FLAVOR}" = "X" ]; then
@@ -30,16 +30,18 @@
+# FLAVOR_BODY determines xemacs20 or xemacs21
+ FLAVOR_BODY=`echo ${FLAVOR} | cut -d - -f 1`
+ if [ "X${FLAVOR_SUFFIX}" = "Xmule" ]; then
-+ EMACSEN_MULE=`ls @PREFIX@/bin/${FLAVOR_BODY}*-mule* 2>/dev/null | head -1`
++ EMACSEN_MULE=`ls @PREFIX@/bin/${FLAVOR_BODY}*-mule* 2>/dev/null |
++ head -1`
+ if [ -n "${EMACSEN_MULE}" ]; then
+ EMACSEN_MULE=`basename ${EMACSEN_MULE}`
+ fi
+ elif [ "X${FLAVOR_SUFFIX}" = "Xnomule" ]; then
+ exit 0
+ else
-+ EMACSEN_MULE=`ls @PREFIX@/bin/${FLAVOR}*-mule* 2>/dev/null | head -1`
++ EMACSEN_MULE=`ls @PREFIX@/bin/${FLAVOR}*-mule* 2>/dev/null |
++ head -1`
+ if [ -n "${EMACSEN_MULE}" ]; then
-+ EMACSEN_MULE=`basename ${EMACSEN_MULE}`
++ EMACSEN_MULE=`basename ${EMACSEN_MULE}`
+ fi
+ fi
+else
@@ -55,13 +57,14 @@
+
+LOG=CompilationLog
+
-+/bin/echo "install/${PACKAGE}: Handling install for emacsen flavor
${FLAVOR}...\c"
++/bin/echo "install/${PACKAGE}: Handling install for emacsen flavor
++${FLAVOR}...\c"
+if [ -e "${STAMP}" ]; then
+ if [ "X${VERSION}" = X"$(cat ${STAMP})" ]; then
-+ echo " skipped. (already compiled)"
-+ exit 0
++ echo " skipped. (already compiled)"
++ exit 0
+ else
-+ rm -f ${STAMP}
++ rm -f ${STAMP}
+ fi
+fi
+
@@ -85,9 +88,9 @@
+
+echo " done."
+exit 0
-diff -Naur suikyo-1.3.2.orig/fink/suikyo-el-remove
suikyo-1.3.2/fink/suikyo-el-remove
---- suikyo-1.3.2.orig/fink/suikyo-el-remove Thu Jan 1 09:00:00 1970
-+++ suikyo-1.3.2/fink/suikyo-el-remove Wed Mar 17 17:46:02 2004
+diff -Nuar suikyo-2.1.0.orig/fink/suikyo-el-remove
suikyo-2.1.0/fink/suikyo-el-remove
+--- suikyo-2.1.0.orig/fink/suikyo-el-remove Thu Jan 1 09:00:00 1970
++++ suikyo-2.1.0/fink/suikyo-el-remove Mon Apr 4 18:42:53 2005
@@ -0,0 +1,11 @@
+#!/bin/sh -e
+# @PREFIX@/lib/emacsen-common/packages/remove/suikyo-el
@@ -100,9 +103,9 @@
+ echo remove/${PACKAGE}: purging byte-compiled files for ${FLAVOR}
+ rm -rf @PREFIX@/share/${FLAVOR}/site-lisp/${PACKAGE}
+fi
-diff -Naur suikyo-1.3.2.orig/fink/suikyo-el-startup
suikyo-1.3.2/fink/suikyo-el-startup
---- suikyo-1.3.2.orig/fink/suikyo-el-startup Thu Jan 1 09:00:00 1970
-+++ suikyo-1.3.2/fink/suikyo-el-startup Tue Mar 16 22:24:05 2004
+diff -Nuar suikyo-2.1.0.orig/fink/suikyo-el-startup
suikyo-2.1.0/fink/suikyo-el-startup
+--- suikyo-2.1.0.orig/fink/suikyo-el-startup Thu Jan 1 09:00:00 1970
++++ suikyo-2.1.0/fink/suikyo-el-startup Mon Apr 4 18:43:05 2005
@@ -0,0 +1,10 @@
+;; -*-emacs-lisp-*-
+;;
@@ -111,6 +114,6 @@
+;; We have to add this to the load-path:
+(setq load-path (cons (concat "@PREFIX@/share/"
+ (symbol-name fink-emacs-flavor)
-+ "/site-lisp/suikyo-el") load-path))
++ "/site-lisp/suikyo-el") load-path))
+
+(require 'init-suikyo nil t)
--- NEW FILE: libotf.patch ---
--- libotf-0.9.2/configure.orig Fri Aug 13 18:24:36 2004
+++ libotf-0.9.2/configure Sat Nov 6 13:36:52 2004
@@ -9237,6 +9237,7 @@
# Shared library suffix (normally ".so").
shrext_cmds='$shrext_cmds'
+shared_ext='.dylib'
# Executable file suffix (normally "").
exeext="$exeext"
@@ -12813,6 +12814,7 @@
# Shared library suffix (normally ".so").
shrext_cmds='$shrext_cmds'
+shared_ext='.dylib'
# Executable file suffix (normally "").
exeext="$exeext"
@@ -15157,6 +15159,7 @@
# Shared library suffix (normally ".so").
shrext_cmds='$shrext_cmds'
+shared_ext='.dylib'
# Executable file suffix (normally "").
exeext="$exeext"
@@ -18309,6 +18312,7 @@
# Shared library suffix (normally ".so").
shrext_cmds='$shrext_cmds'
+shared_ext='.dylib'
# Executable file suffix (normally "").
exeext="$exeext"
@@ -18754,6 +18758,7 @@
# Shared library suffix (normally ".so").
shrext_cmds='$shrext_cmds'
+shared_ext='.dylib'
# Executable file suffix (normally "").
exeext="$exeext"
--- NEW FILE: m17n-lib.patch ---
diff -Naru m17n-lib-1.3.4/README m17n-lib-1.3.4.fink/README
--- m17n-lib-1.3.4/README 2006-07-14 16:03:34.000000000 +0900
+++ m17n-lib-1.3.4.fink/README 2007-04-29 08:48:24.000000000 +0900
@@ -78,17 +78,18 @@
% ./configure --without-gui
This file under `example' sub-directory is a Japanese resource file
-for m17n-edit. It is not installed but useful in Japanese locale. Copy
-it to your home directory (or, for instance,
-/usr/X11R6/lib/X11/ja/app-defaults) and rename it to "M17NEdit" if you
-want to see labels in Japanese:
+for m17n-edit:
M17NEdit.ja
+It is installed as (the latter is converted to UTF-8 before):
+ @PREFIX@/etc/app-defaults/ja_JP.eucJP/M17NEdit
+ @PREFIX@/etc/app-defaults/ja_JP.UTF-8/M17NEdit
-These text files under `example' sub-directory are not installed but
-useful for testing the rendering engine of the m17n library:
+These text files under `example' sub-directory are useful for testing
+the rendering engine of the m17n library:
HELLO.utf8 HELLO.xml HELLO-ja.utf8 HELLO-ja.xml HELLO.html
XXX.xml are generated from XXX.utf8 by attaching text property
-`language' and serializing.
+`language' and serializing. They are installed into:
+ @PREFIX@/share/m17n-lib/examples
Please read also INSTALL for the generic installation instructions.
diff -Naru m17n-lib-1.3.4/configure m17n-lib-1.3.4.fink/configure
--- m17n-lib-1.3.4/configure 2006-11-27 15:50:49.000000000 +0900
+++ m17n-lib-1.3.4.fink/configure 2007-04-29 08:51:50.000000000 +0900
@@ -36588,7 +36588,7 @@
esac
cat >>confdefs.h <<_ACEOF
-#define DLOPEN_SHLIB_EXT "$SHLIB_EXT"
+#define DLOPEN_SHLIB_EXT ".so"
_ACEOF
diff -Naru m17n-lib-1.3.4/src/input.c m17n-lib-1.3.4.fink/src/input.c
--- m17n-lib-1.3.4/src/input.c 2006-12-05 10:28:00.000000000 +0900
+++ m17n-lib-1.3.4.fink/src/input.c 2007-04-29 08:56:13.000000000 +0900
@@ -1137,9 +1137,9 @@
module = msymbol ((char *) MTEXT_DATA (MPLIST_MTEXT (plist)));
else if (MPLIST_SYMBOL_P (plist))
module = MPLIST_SYMBOL (plist);
- module_file = alloca (strlen (MSYMBOL_NAME (module))
+ module_file = alloca (strlen("@PREFIX@/lib/") + strlen (MSYMBOL_NAME
(module))
+ strlen (DLOPEN_SHLIB_EXT) + 1);
- sprintf (module_file, "%s%s", MSYMBOL_NAME (module), DLOPEN_SHLIB_EXT);
+ sprintf (module_file, "@PREFIX@/lib/%s%s", MSYMBOL_NAME (module),
DLOPEN_SHLIB_EXT);
handle = dlopen (module_file, RTLD_NOW);
if (MFAILP (handle))
diff -Naru m17n-lib-1.3.4/src/m17n-gui.c m17n-lib-1.3.4.fink/src/m17n-gui.c
--- m17n-lib-1.3.4/src/m17n-gui.c 2006-07-11 11:24:03.000000000 +0900
+++ m17n-lib-1.3.4.fink/src/m17n-gui.c 2007-04-29 08:58:07.000000000 +0900
@@ -125,9 +125,9 @@
MDeviceLibraryInterface *interface;
MSTRUCT_CALLOC (interface, MERROR_WIN);
- interface->library = malloc (strlen (lib)
+ interface->library = malloc (strlen("@PREFIX@/lib/") + strlen (lib)
+ strlen (DLOPEN_SHLIB_EXT) + 1);
- sprintf (interface->library, "%s%s", lib, DLOPEN_SHLIB_EXT);
+ sprintf (interface->library, "@PREFIX@/lib/%s%s", lib, DLOPEN_SHLIB_EXT);
if (! device_library_list)
device_library_list = mplist ();
mplist_add (device_library_list, name, interface);
--- NEW FILE: libotf.info ---
Package: libotf
Version: 0.9.5
Revision: 1
Depends: %N-shlibs (= %v-%r)
BuildDepends: x11
Source: http://www.m17n.org/%n/%n-%v.tar.gz
Source-MD5: f8b71fe2d88b51b7dfe1dbd62a56f0bd
Patch: %n.patch
DocFiles: AUTHORS COPYING NEWS README
BuildDependsOnly: True
CompileScript: <<
PATH=%p/lib/freetype219/bin:$PATH ./configure %c
make
<<
SplitOff: <<
Package: %N-shlibs
Depends: freetype219-shlibs
Files: lib/libotf.*.dylib
Shlibs: %p/lib/libotf.0.0.0.dylib 1.0.0 %n (>= 0.9.2-2)
DocFiles: AUTHORS COPYING NEWS README
<<
SplitOff2: <<
Package: %N-bin
Depends: freetype219-shlibs
Files: bin/otf*
DocFiles: AUTHORS COPYING NEWS README
<<
Description: Library for handling OpenType Font (OTF)
DescPackaging: <<
Any package which BuildDepends on this one must also BuildDepend on:
freetype219
Originally packaged by Etsushi Kato <[EMAIL PROTECTED]>
<<
License: LGPL
Maintainer: Todai Fink Team <[EMAIL PROTECTED]>
Homepage: http://www.m17n.org/libotf/
--- NEW FILE: m17n-db.info ---
Package: m17n-db
Version: 1.3.4
Revision: 1
Source: http://www.m17n.org/m17n-lib-download/%n-%v.tar.gz
Source-MD5: 41dee6d06743b83a6950d5d0a500cef6
Source2: mirror:gnu:glibc/glibc-2.3.4.tar.bz2
Source2-MD5: 174ac5ed4f2851fcc866a3bac1e4a6a5
ConfigureParams: --with-charmaps=../glibc-2.3.4/localedata/charmaps
InstallScript: <<
make install DESTDIR=%d
<<
DocFiles: AUTHORS COPYING NEWS README
Description: Database for the m17n library
DescPackaging: <<
Originally packaged by Etsushi Kato <[EMAIL PROTECTED]>
<<
License: LGPL
Maintainer: Todai Fink Team <[EMAIL PROTECTED]>
Index: suikyo.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/suikyo.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- suikyo.info 16 Dec 2006 21:45:54 -0000 1.2
+++ suikyo.info 5 May 2007 12:01:54 -0000 1.3
@@ -1,17 +1,17 @@
Package: suikyo
-Version: 1.3.2
-Revision: 3
+Version: 2.1.0
+Revision: 2
BuildDepends: fink (>= 0.24.12)
Description: Romaji Hiragana conversion library
License: GPL
Maintainer: Todai Fink Team <[EMAIL PROTECTED]>
Source: http://prime.sourceforge.jp/src/%n-%v.tar.gz
-Source-MD5: aae0f0119f5eee3bc9db128f2ed01a60
+Source-MD5: d33d713c57522f5c28323e19b3f635b2
PatchFile: %n.patch
-PatchFile-MD5: e158904c865319a46adb68296335e4a1
+PatchFile-MD5: 0d943c040db3dc7a96e1411588c055c9
PatchScript: <<
-perl -i -pe "s|[EMAIL PROTECTED]@|[EMAIL PROTECTED]@-el|g"
elisp/etc/_init-%n.el.in
-sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
+perl -i.bak -pe "s|[EMAIL PROTECTED]@|[EMAIL PROTECTED]@-el|g"
elisp/etc/_init-%n.el.in
+sed 's|@PREFIX@|%p|g' < %{PatchFile} | sed 's|@VERSION@|%v-%r|g' | patch -p1
<<
ConfigureParams: --infodir='${prefix}/share/info'
--mandir='${prefix}/share/man' --with-rubydir='$(libdir)/ruby/site_ruby'
--with-emacs-initdir='$(emacs_sitelisp_dir)/%n-el'
InstallScript: <<
--- NEW FILE: m17n-lib.info ---
Package: m17n-lib
Version: 1.3.4
Revision: 1
BuildDepends: <<
libxml2, expat, libiconv-dev, libgettext3-dev,
fribidi, freetype219, libotf, gd2, libpng3, libjpeg (>= 6b-3),
fontconfig2-dev, xft2-dev, x11-dev,
pkgconfig, fink (>= 0.24.12)
<<
Depends: %N-shlibs
BuildDependsOnly: true
Source: http://www.m17n.org/m17n-lib-download/m17n-lib-%v.tar.gz
Source-MD5: 2941f70281baaaced75fc2715476cfa9
PatchFile: %n.patch
PatchFile-MD5: ca24fc012aac4ce0ccf028efe25e6583
PatchScript: sed 's|@PREFIX@|%p|' < %{PatchFile} | patch -p1
NoSetMAKEFLAGS: true
SetMAKEFLAGS: -j1
SetLIBS: -lintl -framework CoreFoundation
CompileScript: <<
CC="gcc -I%p/lib/fontconfig2/include -L%p/lib/fontconfig2/lib"
PATH=%p/lib/freetype219/bin:$PATH
PKG_CONFIG_PATH=%p/lib/fontconfig2/lib/pkgconfig:$PKG_CONFIG_PATH ./configure %c
make
iconv -f euc-jp -t utf-8 example/M17NEdit.ja | sed 1s/euc-jp/utf-8/ >
example/M17NEdit.ja.utf8
<<
InstallScript: <<
make install DESTDIR=%d
mkdir -p %i/share/%n/examples
install -m 644 example/HELLO* %i/share/%N/examples
mkdir -p %i/etc/app-defaults/ja_JP.eucJP %i/etc/app-defaults/ja_JP.UTF-8
install -m 644 example/M17NEdit.ja %i/etc/app-defaults/ja_JP.eucJP/M17NEdit
install -m 644 example/M17NEdit.ja.utf8
%i/etc/app-defaults/ja_JP.UTF-8/M17NEdit
# Before the anthy and wordcut packages are completed, don't include mimx
rm %i/lib/libmimx*
<<
SplitOff: <<
Package: %N-shlibs
Depends: libxml2-shlibs, libiconv, libgettext3-shlibs, m17n-db
Files: lib/libm17n-core.*.dylib lib/libm17n.*.dylib
Shlibs: <<
%p/lib/libm17n-core.0.1.0.dylib 2.0.0 %n (>= 1.2.0-2)
%p/lib/libm17n.0.1.0.dylib 2.0.0 %n (>= 1.2.0-2)
<<
DocFiles: AUTHORS COPYING NEWS README
<<
SplitOff2: <<
Package: %N-gui
Depends: %N-gui-shlibs
BuildDependsOnly: true
Files: lib/libm17n-gui.{dylib,a,la} lib/libm17n-{gd,X}.{a,la}
lib/pkgconfig/m17n-gui.pc include/m17n-{gui,X}.h
DocFiles: AUTHORS COPYING NEWS README
<<
SplitOff3: <<
Package: %N-gui-shlibs
Depends: <<
%N-shlibs, expat-shlibs, libgettext3-shlibs,
fribidi-shlibs, freetype219-shlibs, libotf-shlibs, gd2-shlibs,
fontconfig2-shlibs, xft2-shlibs, x11-shlibs
<<
Files: lib/libm17n-gui.*.dylib lib/libm17n-*.so
Shlibs: <<
%p/lib/libm17n-gui.0.1.0.dylib 2.0.0 %n (>= 1.2.0-2)
<<
DocFiles: AUTHORS COPYING NEWS README
<<
SplitOff4: <<
Package: %N-examples
Depends: %N-gui-shlibs, app-defaults
Files: bin/m17n-conv bin/m17n-date bin/m17n-dump bin/m17n-edit bin/m17n-view
share/%N etc
# add lib/libmimx* to Files later
DocFiles: AUTHORS COPYING NEWS README
<<
DocFiles: AUTHORS COPYING NEWS README
Description: Multilingual text processing library for C
DescPackaging: <<
TODO: anthy and wordcut support for -examples
Originally packaged by Etsushi Kato <[EMAIL PROTECTED]>
<<
License: LGPL
Maintainer: Todai Fink Team <[EMAIL PROTECTED]>
Homepage: http://www.m17n.org/m17n-lib/
--- NEW FILE: libarchive.patch ---
diff -Naur libarchive-2.1.10.orig/Makefile.am libarchive-2.1.10/Makefile.am
--- libarchive-2.1.10.orig/Makefile.am 2007-04-25 04:25:05.000000000 +0000
+++ libarchive-2.1.10/Makefile.am 2007-05-01 09:59:59.000000000 +0000
@@ -196,6 +196,6 @@
bsdtar_LDADD= -larchive
bsdtar_CPPFLAGS=-I$(top_builddir)/libarchive
-# Link libarchive statically...
-bsdtar_LDFLAGS= -static -I$(destdir)/libarchive
+# Original bsdtar links libarchive statically, but Fink does dynamically
+bsdtar_LDFLAGS= -I$(destdir)/libarchive
bsdtar_dist_man_MANS= tar/bsdtar.1
diff -Naur libarchive-2.1.10.orig/Makefile.in libarchive-2.1.10/Makefile.in
--- libarchive-2.1.10.orig/Makefile.in 2007-05-01 04:05:51.000000000 +0000
+++ libarchive-2.1.10/Makefile.in 2007-05-01 09:59:59.000000000 +0000
@@ -540,8 +540,8 @@
bsdtar_LDADD = -larchive
bsdtar_CPPFLAGS = -I$(top_builddir)/libarchive
-# Link libarchive statically...
-bsdtar_LDFLAGS = -static -I$(destdir)/libarchive
+# Original bsdtar links libarchive statically, but Fink does dynamically
+bsdtar_LDFLAGS= -I$(destdir)/libarchive
bsdtar_dist_man_MANS = tar/bsdtar.1
all: $(BUILT_SOURCES) config.h
$(MAKE) $(AM_MAKEFLAGS) all-am
diff -Naur libarchive-2.1.10.orig/tar/bsdtar.1 libarchive-2.1.10/tar/bsdtar.1
--- libarchive-2.1.10.orig/tar/bsdtar.1 2007-04-15 22:24:05.000000000 +0000
+++ libarchive-2.1.10/tar/bsdtar.1 2007-04-22 11:26:55.000000000 +0000
@@ -152,13 +152,31 @@
.It Fl -format Ar format ( Fl W Cm format Ns = Ns Ar format )
(c mode only)
Use the specified format for the created archive.
-Supported formats include
-.Dq cpio ,
-.Dq pax ,
-.Dq shar ,
-and
-.Dq ustar .
-Other formats may also be supported; see
+Following formats are supported. If none is specified,
+"restricted pax" (mostly compatible with ustar) is used.
+.Bl -tag -compact -width 8n -offset indent
+.It ustar
+standard tar archive compatible with the most of tar(1) implementations
+.It pax
+extended tar format introduced by POSIX 1003.1-2001 standard
+.It posix
+synonym of pax
+.It cpio
+standard cpio archive
+.It arbsd
+static library compatible with BSD ar(1)
+.It ar
+synonym of arbsd
+.It arsvr4
+static library compatible with SVR4 ar(1)
+.It argnu
+synonym of arsvr4
+.It shar
+shell archive composed of text files only
+.It shardump
+shell archive supporting binary files, but depends on uuencode and uudecode
+.El
+See
.Xr libarchive-formats 5
for more information about currently-supported formats.
.It Fl f Ar file
@@ -166,11 +184,14 @@
The filename can be
.Pa -
for standard input or standard output.
-If not specified, the default tape device will be used.
-(On
-.Fx ,
-the default tape device is
-.Pa /dev/sa0 . )
+If not specified,
+.Pa standard input
+or
+.Pa standard output
+will be used on Fink. Generally speaking, omitting the
+.Fl f
+option is a bad practice because the default is usually a tape device
+(such as /dev/sa0) in other UNIX-like platforms.
.It Fl -fast-read ( Fl W Cm fast-read )
(x and t mode only)
Extract or list only the first archive entry that matches each pattern
@@ -435,15 +456,6 @@
.Xr environ 7
for more information.
.El
-.Sh FILES
-.Bl -tag -width ".Ev BLOCKSIZE"
-.It Pa /dev/sa0
-The default tape device, if not overridden by the
-.Ev TAPE
-environment variable or the
-.Fl f
-option.
-.El
.Sh EXIT STATUS
.Ex -std
.Sh EXAMPLES
@@ -666,10 +678,7 @@
public-domain implementation (circa November, 1987)
was quite influential, and formed the basis of GNU tar.
GNU tar was included as the standard system tar
-in
-.Fx
-beginning with
-.Fx 1.0 .
+in FreeBSD beginning with FreeBSD 1.0 .
.Pp
This is a complete re-implementation based on the
.Xr libarchive 3
diff -Naur libarchive-2.1.10.orig/tar/bsdtar.c libarchive-2.1.10/tar/bsdtar.c
--- libarchive-2.1.10.orig/tar/bsdtar.c 2007-04-15 16:55:31.000000000 +0000
+++ libarchive-2.1.10/tar/bsdtar.c 2007-04-22 10:20:16.000000000 +0000
@@ -257,8 +257,10 @@
/* Default: open tape drive. */
bsdtar->filename = getenv("TAPE");
+#if !(defined(__APPLE__) && defined(__MACH__)) /* default to stdio on MacOS
X/Fink */
if (bsdtar->filename == NULL)
bsdtar->filename = _PATH_DEFTAPE;
+#endif
/* Default: preserve mod time on extract */
bsdtar->extract_flags = ARCHIVE_EXTRACT_TIME;
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
