Update of /cvsroot/fink/fink/10.3
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv16232/10.3
Modified Files:
dpkg.info gettext.info ncurses-shlibs.info tar.info
Log Message:
sync with stable
Index: gettext.info
===================================================================
RCS file: /cvsroot/fink/fink/10.3/gettext.info,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- gettext.info 24 May 2006 02:19:08 -0000 1.10
+++ gettext.info 29 Jun 2006 13:44:14 -0000 1.11
@@ -1,9 +1,10 @@
Package: gettext
Version: 0.10.40
-Revision: 19
-Source: mirror:gnu:gettext/gettext-%v.tar.gz
+Revision: 25
+#Source: mirror:gnu:gettext/gettext-%v.tar.gz
+Source: mirror:sourceforge:fink/gettext-%v.tar.gz
Source-MD5: 6a17767b47ffb45b4866cec9fb0a39b0
-Essential: yes
+Essential: no
Depends: libiconv, libiconv-bin, base-files
BuildDepends: libiconv-dev, fink (>= 0.13.6), fink-prebinding
Shlibs: %p/lib/libintl.1.dylib 2.0.0 %n (>= 0.10.40-5)
@@ -13,10 +14,10 @@
Previous versions by Christoph Pfisterer.
- This version of gettext has a new splitoff, gettext-tools, in preparation
- for the forthcoming update of gettext. In this version *only*, gettext-bin
- depends on gettext-tools. In future versions, this will not be true,
- so modifications of .info files will be made to accomodate this change.
+ This version of gettext contains the old gettext shared libraries, and
+ has a corresponding gettext-dev splitoff. The gettext-bin and gettext-tools
+ splitoffs have been moved to the libgettext3-shlibs package. (Note that
+ gettext-bin no longer depends on gettext-tools.)
<<
Patch: %n.patch
NoSetMAKEFLAGS: true
@@ -24,39 +25,33 @@
SetCPPFLAGS: -no-cpp-precomp
ConfigureParams: --infodir=%p/share/info --mandir=%p/share/man
--with-included-gettext
SetLDFLAGS: -L%b/intl/.libs
-CompileScript: <<
- ./configure %c
- make lispdir=%p/share/emacs/site-lisp
-<<
+CompileScript: env ac_cv_path_EMACS=no ./configure %c ; make
InstallScript: <<
make install DESTDIR=%d docdir=%p/share/doc/%n
sed 's;-L%b/intl/.libs;;' <%i/lib/libintl.la >%i/lib/libintl.la.tmp
mv -f %i/lib/libintl.la.tmp %i/lib/libintl.la
rm -f %i/lib/charset.alias
rm -f %i/share/emacs/site-lisp/po-mode.elc
+
+ rm %i/bin/gettext
+ rm %i/bin/ngettext
+ rm -R %i/share/aclocal
+ rm %i/share/doc/gettext/*.html
+ rm -Rf %i/share/emacs
+ rm -R %i/share/gettext
+ rm -R %i/share/info
+ rm -R %i/share/locale
+ rm -R %i/share/man
+ rm %i/bin/gettextize
+ rm %i/bin/m*
+ rm %i/bin/xgettext
<<
DocFiles: README* AUTHORS BUGS COPYING* NEWS THANKS TODO
-SplitOff: <<
- Package: gettext-bin
- Depends: %N (= %v-%r), gettext-tools
- Replaces: %N (<= 0.10.40-4)
- Files: bin/gettext bin/ngettext share/aclocal share/doc/gettext/*.html
share/emacs share/gettext share/info share/locale share/man
- Description: Executables for gettext package
- InfoDocs: gettext.info
- DocFiles: README* AUTHORS BUGS COPYING* NEWS THANKS TODO
-<<
-SplitOff3: <<
- Package: gettext-tools
- Depends: %N (= %v-%r)
- Replaces: %N (<= 0.10.40-4), %N-bin (<= 0.10.40-18)
- Files: bin/gettextize bin/m* bin/xgettext
- Description: Developer executables for gettext package
- DocFiles: README* AUTHORS BUGS COPYING* NEWS THANKS TODO
-<<
SplitOff2: <<
Package: gettext-dev
Depends: gettext (= %v-%r)
- Replaces: gettext (<= 0.10.40-4)
+ Replaces: gettext (<= 0.10.40-4), libgettext3-dev
+ Conflicts: libgettext3-dev
BuildDependsOnly: true
Files: include lib/libintl.dylib lib/*.a lib/*.la
Description: Developer files for gettext package
@@ -83,11 +78,6 @@
charset.alias is deleted because it is empty on Darwin anyway and
causes unnecessary conflicts between packages.
-
-po-mode.elc is deleted to comply with fink's emacs policy. Better
-compliance must wait for a further revision.
-
-Force the correct lispdir even if user's system is misconfigured.
<<
License: GPL/LGPL
Maintainer: Fink Core Group <[EMAIL PROTECTED]>
Index: dpkg.info
===================================================================
RCS file: /cvsroot/fink/fink/10.3/dpkg.info,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- dpkg.info 24 May 2006 02:19:08 -0000 1.20
+++ dpkg.info 29 Jun 2006 13:44:14 -0000 1.21
@@ -1,21 +1,27 @@
Package: dpkg
Version: 1.10.21
-Revision: 217
-GCC: 3.3
-Depends: gettext, libiconv, gzip, tar, libncurses5-shlibs
+Revision: 220
+GCC: 4.0
+Depends: libgettext3-shlibs, libiconv, gzip, tar, libncurses5-shlibs (>=
5.4-20041023-6)
Essential: yes
Maintainer: Fink Core Group <[EMAIL PROTECTED]>
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
+Source2: mirror:sourceforge:fink/gettext-0.14.5.tar.gz
+Source2-MD5: e2f6581626a22a0de66dce1d81d00de3
+PatchScript: <<
+ sed 's|@PREFIX@|%p|g' <%a/dpkg.patch | patch -p1
+ cd %b/../gettext-0.14.5/build-aux; perl -pi -e 's/.*chmod.*777.*$//g'
ltmain.sh
+<<
SetCFLAGS: -no-cpp-precomp -I%p/include
NoSetMAKEFLAGS: true
SetMAKEFLAGS: -j1
CompileScript: <<
- %p/bin/fink -y install gettext-bin gettext-dev gettext-tools libiconv-dev
libncurses5
- PERL=/usr/bin/perl ./configure --build=%m-apple-darwin %c
- make EXEFLAGS=-force_flat_namespace
+ %p/bin/fink -y install gettext-bin libgettext3-dev libiconv-dev libncurses5
+ cd %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; make; rm -rf %b/../_inst; make install
+ PERL=/usr/bin/perl ac_cv_path_MSGFMT="%b/../_inst%p/bin/msgfmt"
ac_cv_path_XGETTEXT="%b/../_inst%p/bin/xgettext" ./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: <<
@@ -30,6 +36,21 @@
distribution. This package also contains some helper programs and
dselect, a full-screen console frontend to dpkg.
<<
+DescPackaging: <<
+ With the current fink dependency engine, essential packages may neither
+ depend nor builddepend on non-essential packages. Thus, to make sure
+ that non-essential splitoffs of essential packages (like gettext-bin
+ and *-dev) are present at build time, we call 'fink install' during
+ the compile script. Note that since the corresponding essential packages
+ are dependencies of this one, they should already have been built, so
+ 'fink install' should merely make sure they are in place.
+
+ We now build gettext-tools during the build of dpkg, but don't install it;
+ it is built only so that msgfmt and xgettext are available during the
+ dpkg build. The only alternative would be to make gettext-tools an essential
+ pakcages, since essential packages cannot depend or builddepend on
+ non-essential packages.
+<<
DescPort: <<
1.10.9
- Removed --without-zlib flag
Index: ncurses-shlibs.info
===================================================================
RCS file: /cvsroot/fink/fink/10.3/ncurses-shlibs.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ncurses-shlibs.info 24 Feb 2005 15:25:07 -0000 1.2
+++ ncurses-shlibs.info 29 Jun 2006 13:44:14 -0000 1.3
@@ -1,7 +1,7 @@
Package: ncurses-shlibs
Version: 5.3-20031018
-Revision: 501
-GCC: 3.3
+Revision: 502
+GCC: 4.0
Source: mirror:sourceforge:fink/ncurses-5.3.tar.gz
Source-MD5: 5dcc9faa93157eafa572494bffed131a
Source2: mirror:sourceforge:fink/ncurses-5.3-20031004-patch.sh.bz2
@@ -19,9 +19,8 @@
<<
Replaces: ncurses (<= 5.3-1)
Depends: base-files
-Essential: yes
+Essential: no
BuildDepends: fink (>= 0.13.0)
-AddShlibDeps: true
ConfigureParams: --without-ada --without-debug --with-shared --with-debug
--enable-termcap --mandir=%p/share/man
--with-terminfo-dirs="%p/share/terminfo:/usr/share/terminfo"
--with-default-terminfo-dir="%p/share/terminfo" --enable-no-padding
--enable-sigwinch --enable-tcap-names --enable-hard-tabs
NoSetCFLAGS: true
NoSetLDFLAGS: true
@@ -58,7 +57,6 @@
Depends: ncurses-shlibs (= %v-%r)
Replaces: ncurses (<= 5.3-1), libncurses5
Conflicts: libncurses5
- AddShlibDeps: true
BuildDependsOnly: True
Files: include lib/libform.dylib lib/libmenu.dylib lib/libncurses.dylib
lib/libpanel.dylib lib/*.a
Description: Development files for ncurses package
Index: tar.info
===================================================================
RCS file: /cvsroot/fink/fink/10.3/tar.info,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- tar.info 22 Jun 2006 16:13:53 -0000 1.9
+++ tar.info 29 Jun 2006 13:44:14 -0000 1.10
@@ -1,13 +1,17 @@
Package: tar
Version: 1.15.1
-Revision: 13
+Revision: 14
Essential: yes
-Depends: gettext, libiconv, gzip, bzip2, base-files
-BuildDepends: gettext-dev, libiconv-dev
+Depends: libgettext3-shlibs, libiconv, gzip, bzip2, base-files
Source: mirror:sourceforge:fink/%n-%v.tar.gz
Source-MD5: d87021366fe6488e9dc398fcdcb6ed7d
UpdateConfigGuess: true
ConfigureParams: --program-transform-name=s/tar/gtar/ --infodir=%p/share/info
--libexecdir=%p/lib
+CompileScript: <<
+ %p/bin/fink -y install libgettext3-dev libiconv-dev
+ ./configure %c
+ make
+<<
InstallScript: <<
make install DESTDIR=%d
cd %i/lib ; rm -rf charset.alias; cd ..;
@@ -24,7 +28,17 @@
InfoDocs: tar.info
#
Description: GNU tar - tape archiver
-DescPackaging: Previous versions by Christoph Pfisterer.
+DescPackaging: <<
+ With the current fink dependency engine, essential packages may neither
+ depend nor builddepend on non-essential packages. Thus, to make sure
+ that non-essential splitoffs of essential packages (like gettext-bin
+ and *-dev) are present at build time, we call 'fink install' during
+ the compile script. Note that since the corresponding essential packages
+ are dependencies of this one, they should already have been built, so
+ 'fink install' should merely make sure they are in place.
+
+ Previous versions by Christoph Pfisterer.
+<<
License: GPL
Maintainer: Fink Core Group <[EMAIL PROTECTED]>
Homepage: http://www.gnu.org/software/tar/
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
