dists/10.4-transitional/stable/main/finkinfo/text scribus.info,1.4,1.5
Update of /cvsroot/fink/dists/10.4-transitional/stable/main/finkinfo/text In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23696/10.4-transitional/stable/main/finkinfo/text Modified Files: scribus.info Log Message: New version 1.3.0 in unstable; 1.2.2.1 to stable Index: scribus.info === RCS file: /cvsroot/fink/dists/10.4-transitional/stable/main/finkinfo/text/scribus.info,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- scribus.info21 Jun 2005 07:41:15 - 1.4 +++ scribus.info15 Jul 2005 13:07:00 - 1.5 @@ -1,24 +1,17 @@ Package: scribus -Version: 1.2.1 -Revision: 11 +Version: 1.2.2.1 +Revision: 2 GCC: 3.3 -CustomMirror: - eur-GB: http://www.scribus.org.uk/downloads/%v/ - eur-DE: http://web2.altmuehlnet.de/fschmid - aus-AU: http://scribus.planetmirror.com - -#Source: mirror:custom:/%n-%v.tar.bz2 Source: http://www.scribus.org.uk/downloads/%v/%n-%v.tar.bz2 -Source-MD5: 002cb629e817722f4123df7a41fc824b -Source2: http://www.scribus.org.uk/downloads/%v/%n-temp-all-%v.tar.bz2 +Source-MD5: 8c2eac0a358b04c39252586d9d85ab24 +Source2: http://www.scribus.org.uk/downloads/1.2.1/%n-temp-all-1.2.1.tar.bz2 Source2-MD5: 19d102ff16c295e29bb7a051c66c2c58 License: GPL Conflicts: scribus-scripting Replaces: scribus-scripting Recommends: x-ghostscript-fonts, msttcorefonts, applesystemfonts Depends: x11, ghostscript, qt3-shlibs (= 3.3.3-26), libjpeg-shlibs, libjpeg-bin, lcms-shlibs (=1.09), libart2-shlibs, libpng3-shlibs, libtiff-shlibs, freetype219-shlibs, libxml2-shlibs, libiconv -BuildDepends: lcms (=1.09), libjpeg, qt3 (= 3.3.3-26), libart2, libpng3, libtiff, freetype219, x11-dev, libxml2, libiconv-dev -#Patch: %n.patch +BuildDepends: lcms (=1.09), libjpeg, qt3 (= 3.3.3-26), libart2, cups-dev, libpng3, libtiff, freetype219, x11-dev, libxml2, libiconv-dev PatchScript: #!/bin/sh # Fix the building of plugins @@ -41,15 +34,6 @@ perl -pi.baz -e 's|libscriptplugin_la_LIBADD =|libscriptplugin_la_LIBADD = \$\(LIBCUPS\)|g' scribus/plugins/scriptplugin/Makefile.in # remove spurious declaration of ChangeGrid. Otherwise the preferences plugin won't work. perl -pi.bak -e s,.*ChangeGrid.*,,g scribus/libprefs/prefs.h -# include a forgotten header and fix some declarations. Fixme: should be done with a patch file. - perl -pi.bak -e 's|(\# include \unistd\.h\.*)|\#include \sys/stat.h\\n$1|g ; - s|int makedir \(char \*newdir\)|int makedir \(const char \*newdir\)|g ; - s|int mymkdir\(char\* dirname\)|int mymkdir \(const char \*dirname\)|g ; - ' scribus/plugins/fileloader/oodraw/sxwunzip.cpp - cp scribus/plugins/fileloader/oodraw/sxwunzip.cpp scribus/plugins/gettext/sxwim/sxwunzip.cpp -# remove reference to strndup() which doesn't exist in Darwin -# replace it with strdup() which is all that is needed here anyway - perl -pi.bak -e 's|strn(dup\(.*),.*|str$1\)\;|g' scribus/plugins/scriptplugin/scriptplugin.cpp ConfigureParams: --with-qt-dir=%p --with-qt-includes=%p/include/qt --with-qt-libraries=%p/lib --with-extra-includes=%p/include --with-extra-libs=%p/lib --with-pythondir=/System/Library/Frameworks/Python.framework/Versions/2.3/ --disable-dependency-tracking CompileScript: @@ -60,7 +44,7 @@ InstallScript: make install prefix=%i - (cd ../%n-templates-%v; ./configure --prefix=%p; make install DESTDIR=%d) + (cd ../%n-templates-1.2.1; ./configure --prefix=%p; make install DESTDIR=%d) cp /System/Library/ColorSync/Profiles/* %i/lib/scribus/profiles/ rm -f %i/lib/scribus/profiles/*Gray* --- SF.Net email is sponsored by: Discover Easy Linux Migration Strategies from IBM. Find simple to follow Roadmaps, straightforward articles, informative Webcasts and more! Get everything you need to get up to speed, fast. http://ads.osdn.com/?ad_id=7477alloc_id=16492op=click ___ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits
dists/10.4-transitional/unstable/main/finkinfo/text scribus.info,1.4,1.5
Update of /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/text In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23696/10.4-transitional/unstable/main/finkinfo/text Modified Files: scribus.info Log Message: New version 1.3.0 in unstable; 1.2.2.1 to stable Index: scribus.info === RCS file: /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/text/scribus.info,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- scribus.info9 Jul 2005 08:12:52 - 1.4 +++ scribus.info15 Jul 2005 13:07:00 - 1.5 @@ -1,67 +1,39 @@ Package: scribus -Version: 1.2.2.1 +Version: 1.3.0 Revision: 1 -CustomMirror: - eur-GB: http://www.scribus.org.uk/downloads/%v/ - eur-DE: http://web2.altmuehlnet.de/fschmid - aus-AU: http://scribus.planetmirror.com - -#Source: mirror:custom:/%n-%v.tar.bz2 +GCC: 3.3 +#Source: mirror:sourceforge:/%n/%n-%v.tar.bz2 Source: http://www.scribus.org.uk/downloads/%v/%n-%v.tar.bz2 -Source-MD5: 8c2eac0a358b04c39252586d9d85ab24 +Source-MD5: eb7ea966af6c84c5cd0b99ca545fd54f Source2: http://www.scribus.org.uk/downloads/1.2.1/%n-temp-all-1.2.1.tar.bz2 Source2-MD5: 19d102ff16c295e29bb7a051c66c2c58 License: GPL Conflicts: scribus-scripting Replaces: scribus-scripting Recommends: x-ghostscript-fonts, msttcorefonts, applesystemfonts -Depends: x11, ghostscript, qt3-shlibs (= 3.3.3-26), libjpeg-shlibs, libjpeg-bin, lcms-shlibs (=1.09), libart2-shlibs, libpng3-shlibs, libtiff-shlibs, freetype2-shlibs (= 2.1.3-22) | freetype2-hinting-shlibs (= 2.1.3-22), libxml2-shlibs, libiconv -BuildDepends: lcms (=1.09), libjpeg, qt3 (= 3.3.3-26), libart2, cups-dev, libpng3, libtiff, freetype2-dev (= 2.1.3-22) | freetype2-hinting-dev (= 2.1.3-22), x11-dev, libxml2, libiconv-dev -#Patch: %n.patch +Depends: x11, ghostscript, qt3-shlibs (= 3.3.4-11), libjpeg-shlibs, libjpeg-bin, lcms-shlibs, libart2-shlibs, libpng3-shlibs, libtiff-shlibs, freetype219-shlibs, libxml2-shlibs, libiconv +BuildDepends: x11-dev, lcms, libjpeg, qt3 (= 3.3.4-11), libart2, cups-dev, libpng3, libtiff, freetype219, libxml2, libiconv-dev PatchScript: #!/bin/sh -# Fix the building of plugins - perl -pi.bak -e 's|(^AM_LDFLAGS =).*\$\(linkflag\)(.*)|$1 $2 \$(LIB_QT)|g ; - s|\-Xlinker||g ; - s|(lib.*)\.la|$1.so|g ; - s|-version-info 0:0:0|-bundle -undefined dynamic_lookup -bind_at_load|g ; - ' `find . -name Makefile.in` -# make configure find the right version of freetype2 - perl -pi.bak -e 's,usr/X11/bin,usr/X11R6/bin,g ; - s,FREETYPE_CONFIG=\\,FREETYPE_CONFIG=\%p/lib/freetype2/bin/freetype-config\,g ; - s,LIBS=\\-lfreetype,LIBS=\\$LIBFREETYPE_LIBS,g ; - s,(^LIBTOOL=.*)\-\-silent,$1,g ; - ' configure # point to Apple's Python framework perl -pi.bar -e s,PYTHONLIB=.*,PYTHONLIB='-framework Python'\npython_libdir=yes\nLIBPYTHON=' ',g configure perl -pi.bar -e s,LIBPYTHON =.*,LIBPYTHON=,g scribus/plugins/scriptplugin/Makefile.in # avoid indirect linking errors - perl -pi.bar -e 's|libpdf_la_LIBADD =|libpdf_la_LIBADD =\$(LIBTIFF)|g' scribus/libpdf/Makefile.in - perl -pi.baz -e 's|libscriptplugin_la_LIBADD =|libscriptplugin_la_LIBADD = \$\(LIBCUPS\)|g' scribus/plugins/scriptplugin/Makefile.in -# remove spurious declaration of ChangeGrid. Otherwise the preferences plugin won't work. - perl -pi.bak -e s,.*ChangeGrid.*,,g scribus/libprefs/prefs.h -# include a forgotten header and fix some declarations. Fixme: should be done with a patch file. - perl -pi.bak -e 's|(\# include \unistd\.h\.*)|\#include \sys/stat.h\\n$1|g ; - s|int makedir \(char \*newdir\)|int makedir \(const char \*newdir\)|g ; - s|int mymkdir\(char\* dirname\)|int mymkdir \(const char \*dirname\)|g ; - ' scribus/plugins/fileloader/oodraw/sxwunzip.cpp - cp scribus/plugins/fileloader/oodraw/sxwunzip.cpp scribus/plugins/gettext/sxwim/sxwunzip.cpp -# remove reference to strndup() which doesn't exist in Darwin -# replace it with strdup() which is all that is needed here anyway - perl -pi.bak -e 's|strn(dup\(.*),.*|str$1\)\;|g' scribus/plugins/scriptplugin/scriptplugin.cpp +# perl -pi.bar -e 's|libpdf_la_LIBADD =|libpdf_la_LIBADD =\$(LIBTIFF)|g' scribus/libpdf/Makefile.in +# perl -pi.baz -e 's|libscriptplugin_la_LIBADD =|libscriptplugin_la_LIBADD = \$\(LIBCUPS\)|g' scribus/plugins/scriptplugin/Makefile.in ConfigureParams: --with-qt-dir=%p --with-qt-includes=%p/include/qt --with-qt-libraries=%p/lib --with-extra-includes=%p/include --with-extra-libs=%p/lib --with-pythondir=/System/Library/Frameworks/Python.framework/Versions/2.3/ --disable-dependency-tracking CompileScript: - #!/bin/sh - export PATH=%p/lib/freetype2/bin:$PATH +#!/bin/sh + export PATH=%p/lib/freetype219/bin:$PATH + export PYTHONLIB='-framework Python'
dists/10.3/unstable/main/finkinfo/text scribus.info,1.30,1.31
Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/text In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23696/10.3/unstable/main/finkinfo/text Modified Files: scribus.info Log Message: New version 1.3.0 in unstable; 1.2.2.1 to stable Index: scribus.info === RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/text/scribus.info,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- scribus.info9 Jul 2005 08:12:50 - 1.30 +++ scribus.info15 Jul 2005 13:07:00 - 1.31 @@ -1,67 +1,38 @@ Package: scribus -Version: 1.2.2.1 +Version: 1.3.0 Revision: 1 -CustomMirror: - eur-GB: http://www.scribus.org.uk/downloads/%v/ - eur-DE: http://web2.altmuehlnet.de/fschmid - aus-AU: http://scribus.planetmirror.com - -#Source: mirror:custom:/%n-%v.tar.bz2 +#Source: mirror:sourceforge:/%n/%n-%v.tar.bz2 Source: http://www.scribus.org.uk/downloads/%v/%n-%v.tar.bz2 -Source-MD5: 8c2eac0a358b04c39252586d9d85ab24 +Source-MD5: eb7ea966af6c84c5cd0b99ca545fd54f Source2: http://www.scribus.org.uk/downloads/1.2.1/%n-temp-all-1.2.1.tar.bz2 Source2-MD5: 19d102ff16c295e29bb7a051c66c2c58 License: GPL Conflicts: scribus-scripting Replaces: scribus-scripting Recommends: x-ghostscript-fonts, msttcorefonts, applesystemfonts -Depends: x11, ghostscript, qt3-shlibs (= 3.3.3-26), libjpeg-shlibs, libjpeg-bin, lcms-shlibs (=1.09), libart2-shlibs, libpng3-shlibs, libtiff-shlibs, freetype2-shlibs (= 2.1.3-22) | freetype2-hinting-shlibs (= 2.1.3-22), libxml2-shlibs, libiconv -BuildDepends: lcms (=1.09), libjpeg, qt3 (= 3.3.3-26), libart2, cups-dev, libpng3, libtiff, freetype2-dev (= 2.1.3-22) | freetype2-hinting-dev (= 2.1.3-22), x11-dev, libxml2, libiconv-dev -#Patch: %n.patch +Depends: x11, ghostscript, qt3-shlibs (= 3.3.4-11), libjpeg-shlibs, libjpeg-bin, lcms-shlibs, libart2-shlibs, libpng3-shlibs, libtiff-shlibs, freetype219-shlibs, libxml2-shlibs, libiconv +BuildDepends: x11-dev, lcms, libjpeg, qt3 (= 3.3.4-11), libart2, cups-dev, libpng3, libtiff, freetype219, libxml2, libiconv-dev PatchScript: #!/bin/sh -# Fix the building of plugins - perl -pi.bak -e 's|(^AM_LDFLAGS =).*\$\(linkflag\)(.*)|$1 $2 \$(LIB_QT)|g ; - s|\-Xlinker||g ; - s|(lib.*)\.la|$1.so|g ; - s|-version-info 0:0:0|-bundle -undefined dynamic_lookup -bind_at_load|g ; - ' `find . -name Makefile.in` -# make configure find the right version of freetype2 - perl -pi.bak -e 's,usr/X11/bin,usr/X11R6/bin,g ; - s,FREETYPE_CONFIG=\\,FREETYPE_CONFIG=\%p/lib/freetype2/bin/freetype-config\,g ; - s,LIBS=\\-lfreetype,LIBS=\\$LIBFREETYPE_LIBS,g ; - s,(^LIBTOOL=.*)\-\-silent,$1,g ; - ' configure # point to Apple's Python framework perl -pi.bar -e s,PYTHONLIB=.*,PYTHONLIB='-framework Python'\npython_libdir=yes\nLIBPYTHON=' ',g configure perl -pi.bar -e s,LIBPYTHON =.*,LIBPYTHON=,g scribus/plugins/scriptplugin/Makefile.in # avoid indirect linking errors - perl -pi.bar -e 's|libpdf_la_LIBADD =|libpdf_la_LIBADD =\$(LIBTIFF)|g' scribus/libpdf/Makefile.in - perl -pi.baz -e 's|libscriptplugin_la_LIBADD =|libscriptplugin_la_LIBADD = \$\(LIBCUPS\)|g' scribus/plugins/scriptplugin/Makefile.in -# remove spurious declaration of ChangeGrid. Otherwise the preferences plugin won't work. - perl -pi.bak -e s,.*ChangeGrid.*,,g scribus/libprefs/prefs.h -# include a forgotten header and fix some declarations. Fixme: should be done with a patch file. - perl -pi.bak -e 's|(\# include \unistd\.h\.*)|\#include \sys/stat.h\\n$1|g ; - s|int makedir \(char \*newdir\)|int makedir \(const char \*newdir\)|g ; - s|int mymkdir\(char\* dirname\)|int mymkdir \(const char \*dirname\)|g ; - ' scribus/plugins/fileloader/oodraw/sxwunzip.cpp - cp scribus/plugins/fileloader/oodraw/sxwunzip.cpp scribus/plugins/gettext/sxwim/sxwunzip.cpp -# remove reference to strndup() which doesn't exist in Darwin -# replace it with strdup() which is all that is needed here anyway - perl -pi.bak -e 's|strn(dup\(.*),.*|str$1\)\;|g' scribus/plugins/scriptplugin/scriptplugin.cpp +# perl -pi.bar -e 's|libpdf_la_LIBADD =|libpdf_la_LIBADD =\$(LIBTIFF)|g' scribus/libpdf/Makefile.in +# perl -pi.baz -e 's|libscriptplugin_la_LIBADD =|libscriptplugin_la_LIBADD = \$\(LIBCUPS\)|g' scribus/plugins/scriptplugin/Makefile.in ConfigureParams: --with-qt-dir=%p --with-qt-includes=%p/include/qt --with-qt-libraries=%p/lib --with-extra-includes=%p/include --with-extra-libs=%p/lib --with-pythondir=/System/Library/Frameworks/Python.framework/Versions/2.3/ --disable-dependency-tracking CompileScript: - #!/bin/sh - export PATH=%p/lib/freetype2/bin:$PATH +#!/bin/sh + export PATH=%p/lib/freetype219/bin:$PATH + export PYTHONLIB='-framework Python' ./configure %c make InstallScript: make
dists/10.3/unstable/main/finkinfo/sci rpy-py.info,1.3,1.4
Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/sci In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29287 Modified Files: rpy-py.info Log Message: added r-i18n dep back in Index: rpy-py.info === RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/sci/rpy-py.info,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- rpy-py.info 12 Jul 2005 19:59:36 - 1.3 +++ rpy-py.info 15 Jul 2005 13:39:47 - 1.4 @@ -2,12 +2,12 @@ Package: rpy-py%type_pkg[python] Version: 0.4.2.1 -Revision: 1 +Revision: 2 GCC: 3.3 Type: python (2.2 2.3 2.4) Maintainer: Jeffrey Whitaker [EMAIL PROTECTED] BuildDepends: texinfo -Depends: python%type_pkg[python], numeric-py%type_pkg[python], r-base (= 2.0.0-1) +Depends: python%type_pkg[python], numeric-py%type_pkg[python], r-base (= 2.0.0-1) | r-i18n Source: mirror:sourceforge:rpy/rpy-%v.tar.gz Source-MD5: b879ebef95220e308115501efd7d2e69 CompileScript: %p/bin/python%type_raw[python] setup.py build --- SF.Net email is sponsored by: Discover Easy Linux Migration Strategies from IBM. Find simple to follow Roadmaps, straightforward articles, informative Webcasts and more! Get everything you need to get up to speed, fast. http://ads.osdn.com/?ad_id=7477alloc_id=16492op=click ___ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits
dists/10.4-transitional/unstable/main/finkinfo/sci rpy-py.info,1.2,1.3
Update of /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/sci In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29729 Modified Files: rpy-py.info Log Message: Added r-i18n dep back in. Index: rpy-py.info === RCS file: /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/sci/rpy-py.info,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- rpy-py.info 12 Jul 2005 20:03:14 - 1.2 +++ rpy-py.info 15 Jul 2005 13:41:29 - 1.3 @@ -2,12 +2,12 @@ Package: rpy-py%type_pkg[python] Version: 0.4.2.1 -Revision: 1 +Revision: 2 GCC: 3.3 Type: python (2.2 2.3 2.4) Maintainer: Jeffrey Whitaker [EMAIL PROTECTED] BuildDepends: texinfo -Depends: python%type_pkg[python], numeric-py%type_pkg[python], r-base (= 2.0.0-1) +Depends: python%type_pkg[python], numeric-py%type_pkg[python], r-base (= 2.0.0-1) | r-i18n Source: mirror:sourceforge:rpy/rpy-%v.tar.gz Source-MD5: b879ebef95220e308115501efd7d2e69 CompileScript: %p/bin/python%type_raw[python] setup.py build --- SF.Net email is sponsored by: Discover Easy Linux Migration Strategies from IBM. Find simple to follow Roadmaps, straightforward articles, informative Webcasts and more! Get everything you need to get up to speed, fast. http://ads.osdn.com/?ad_id=7477alloc_id=16492op=click ___ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits
dists/10.4-transitional/stable/main/finkinfo/sci emboss.info,1.3,1.4
Update of /cvsroot/fink/dists/10.4-transitional/stable/main/finkinfo/sci In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31282 Modified Files: emboss.info Log Message: move to stable Index: emboss.info === RCS file: /cvsroot/fink/dists/10.4-transitional/stable/main/finkinfo/sci/emboss.info,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- emboss.info 15 Jul 2005 00:20:16 - 1.3 +++ emboss.info 15 Jul 2005 16:13:11 - 1.4 @@ -1,15 +1,15 @@ Package: emboss -Version: 2.9.0 -Revision: 3 +Version: 2.10.0 +Revision: 1 Depends: %N-shlibs (= %v-%r), x11, libpng3-shlibs, libjpeg-shlibs, gd2-shlibs, system-java14 BuildDepends: libpng3, libjpeg, gd2, libiconv-dev, x11-dev, system-java14-dev #Replaces: emboss ( 2.7.1-2) Source: mirror:custom:EMBOSS-%v.tar.gz CustomMirror: - Primary: ftp://ftp.uk.embnet.org/pub/EMBOSS/old/%v/ + Primary: ftp://emboss.open-bio.org/pub/EMBOSS/old/%v/ + Secondary: ftp://ftp.uk.embnet.org/pub/EMBOSS/old/%v/ -Source-MD5: c6facfd1750e88a0c8b7bb7ac826d472 -#Patch: %n.patch +Source-MD5: 4a48388ced7021a8ffece5166c40a364 ConfigureParams: --with-java=/System/Library/Frameworks/JavaVM.framework/Versions/1.4.2/Home --with-javaos=/System/Library/Frameworks/JavaVM.framework/Versions/1.4.2/Home/include Installscript: make install DESTDIR=%d --- SF.Net email is sponsored by: Discover Easy Linux Migration Strategies from IBM. Find simple to follow Roadmaps, straightforward articles, informative Webcasts and more! Get everything you need to get up to speed, fast. http://ads.osdn.com/?ad_id=7477alloc_id=16492op=click ___ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits
dists/10.3/stable/main/finkinfo/sci emboss.info,1.9,1.10
Update of /cvsroot/fink/dists/10.3/stable/main/finkinfo/sci In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31458 Modified Files: emboss.info Log Message: move to stable Index: emboss.info === RCS file: /cvsroot/fink/dists/10.3/stable/main/finkinfo/sci/emboss.info,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- emboss.info 15 Jul 2005 00:21:01 - 1.9 +++ emboss.info 15 Jul 2005 16:14:03 - 1.10 @@ -1,15 +1,15 @@ Package: emboss -Version: 2.9.0 -Revision: 3 +Version: 2.10.0 +Revision: 1 Depends: %N-shlibs (= %v-%r), x11, libpng3-shlibs, libjpeg-shlibs, gd2-shlibs, system-java14 BuildDepends: libpng3, libjpeg, gd2, libiconv-dev, x11-dev, system-java14-dev #Replaces: emboss ( 2.7.1-2) Source: mirror:custom:EMBOSS-%v.tar.gz CustomMirror: - Primary: ftp://ftp.uk.embnet.org/pub/EMBOSS/old/%v/ + Primary: ftp://emboss.open-bio.org/pub/EMBOSS/old/%v/ + Secondary: ftp://ftp.uk.embnet.org/pub/EMBOSS/old/%v/ -Source-MD5: c6facfd1750e88a0c8b7bb7ac826d472 -#Patch: %n.patch +Source-MD5: 4a48388ced7021a8ffece5166c40a364 ConfigureParams: --with-java=/System/Library/Frameworks/JavaVM.framework/Versions/1.4.2/Home --with-javaos=/System/Library/Frameworks/JavaVM.framework/Versions/1.4.2/Home/include Installscript: make install DESTDIR=%d --- SF.Net email is sponsored by: Discover Easy Linux Migration Strategies from IBM. Find simple to follow Roadmaps, straightforward articles, informative Webcasts and more! Get everything you need to get up to speed, fast. http://ads.osdn.com/?ad_id=7477alloc_id=16492op=click ___ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits
fink Makefile,1.17,1.18 ChangeLog,1.354,1.355
Update of /cvsroot/fink/fink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20325
Modified Files:
Makefile ChangeLog
Log Message:
'make clean' removes all files matched by .cvsignore files.
Index: Makefile
===
RCS file: /cvsroot/fink/fink/Makefile,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- Makefile16 May 2005 05:49:39 - 1.17
+++ Makefile15 Jul 2005 17:55:37 - 1.18
@@ -30,4 +30,13 @@
@# (which also must be coded into t/Services/execute_nonroot_okay.t)
@cd t ./testmore.pl || find ${TESTS} -name '*.t' | sort | xargs
/usr/bin/perl -I${PWD}/perlmod -MTest::Harness -e 'runtests(@ARGV)'
+# remove all files that are ignored by CVS
+clean:
+ # BUG: this for...`find` breaks if any dirname relative to the
+ # current one contains whitespace
+ @for ignorefile in `find . -name .cvsignore`; do \
+ echo cleaning $$ignorefile; \
+ ( cd `dirname $$ignorefile` rm -f `cat .cvsignore` ); \
+ done
+
.PHONY: all test install
Index: ChangeLog
===
RCS file: /cvsroot/fink/fink/ChangeLog,v
retrieving revision 1.354
retrieving revision 1.355
diff -u -d -r1.354 -r1.355
--- ChangeLog 13 Jul 2005 06:43:46 - 1.354
+++ ChangeLog 15 Jul 2005 17:55:37 - 1.355
@@ -1,3 +1,8 @@
+2005-07-15 Daniel Macks [EMAIL PROTECTED]
+
+ * Makefile: Add a clean target: recursively find .cvsignore
+ files and remove files that are matched by them
+
2005-07-11 Dave Vasilevsky [EMAIL PROTECTED]
* VERSION: Make fink HEAD always 0.24.x, since that has already
---
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477alloc_id=16492op=click
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
fink USAGE,1.12,1.12.16.1
Update of /cvsroot/fink/fink In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22803 Modified Files: Tag: branch_0_24 USAGE Log Message: Update from HEAD Index: USAGE === RCS file: /cvsroot/fink/fink/USAGE,v retrieving revision 1.12 retrieving revision 1.12.16.1 diff -u -d -r1.12 -r1.12.16.1 --- USAGE 7 Mar 2004 21:00:58 - 1.12 +++ USAGE 15 Jul 2005 18:04:57 - 1.12.16.1 @@ -123,13 +123,13 @@ fetch-all --- -Downloads _all_ package source files. Like fetch, this downloads the -tarballs even when they were downloaded before. +Downloads all package source files. Like fetch, this downloads the tarballs +even when they were downloaded before. fetch-missing --- -Downloads _all_ package source files. This command will only download files +Downloads all package source files. This command will only download files that are not present on the system. @@ -139,7 +139,7 @@ downloaded if they can not be found. The result of this command is an installable .deb package file, which you can quickly install later with the install command. This command will do nothing if the .deb already exists. -Note that dependencies are still _installed_, not just built. +Note that dependencies are still installed, not just built. rebuild --- SF.Net email is sponsored by: Discover Easy Linux Migration Strategies from IBM. Find simple to follow Roadmaps, straightforward articles, informative Webcasts and more! Get everything you need to get up to speed, fast. http://ads.osdn.com/?ad_id=7477alloc_id=16492op=click ___ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits
fink/path-prefix-g++-3.3 g++,1.2.2.2,NONE
Update of /cvsroot/fink/fink/path-prefix-g++-3.3 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25305/path-prefix-g++-3.3 Removed Files: Tag: branch_0_24 g++ Log Message: g++ wrappers are created dynamically --- g++ DELETED --- --- SF.Net email is sponsored by: Discover Easy Linux Migration Strategies from IBM. Find simple to follow Roadmaps, straightforward articles, informative Webcasts and more! Get everything you need to get up to speed, fast. http://ads.osdn.com/?ad_id=7477alloc_id=16492op=click ___ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits
fink ChangeLog,1.304.2.22,1.304.2.23
Update of /cvsroot/fink/fink In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25305 Modified Files: Tag: branch_0_24 ChangeLog Log Message: g++ wrappers are created dynamically Index: ChangeLog === RCS file: /cvsroot/fink/fink/ChangeLog,v retrieving revision 1.304.2.22 retrieving revision 1.304.2.23 diff -u -d -r1.304.2.22 -r1.304.2.23 --- ChangeLog 14 Jul 2005 02:19:46 - 1.304.2.22 +++ ChangeLog 15 Jul 2005 18:16:32 - 1.304.2.23 @@ -1,3 +1,7 @@ +2005-07-15 Daniel Macks [EMAIL PROTECTED] + + * path-prefix-g++-*/g++: deleted; these are created dynamically. + 2005-07-13 Daniel Macks [EMAIL PROTECTED] * fink.8.in, fink.conf.5.in: sync grammar and explantion improvements w/HEAD --- SF.Net email is sponsored by: Discover Easy Linux Migration Strategies from IBM. Find simple to follow Roadmaps, straightforward articles, informative Webcasts and more! Get everything you need to get up to speed, fast. http://ads.osdn.com/?ad_id=7477alloc_id=16492op=click ___ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits
fink/path-prefix-g++-4.0 g++,1.2.2.2,NONE
Update of /cvsroot/fink/fink/path-prefix-g++-4.0 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25305/path-prefix-g++-4.0 Removed Files: Tag: branch_0_24 g++ Log Message: g++ wrappers are created dynamically --- g++ DELETED --- --- SF.Net email is sponsored by: Discover Easy Linux Migration Strategies from IBM. Find simple to follow Roadmaps, straightforward articles, informative Webcasts and more! Get everything you need to get up to speed, fast. http://ads.osdn.com/?ad_id=7477alloc_id=16492op=click ___ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits
fink/perlmod/Fink ChangeLog,1.873.2.51,1.873.2.52 Validation.pm,1.170.2.3,1.170.2.4
Update of /cvsroot/fink/fink/perlmod/Fink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27518
Modified Files:
Tag: branch_0_24
ChangeLog Validation.pm
Log Message:
Backport spotlight-safe default builddir
Index: Validation.pm
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/Validation.pm,v
retrieving revision 1.170.2.3
retrieving revision 1.170.2.4
diff -u -d -r1.170.2.3 -r1.170.2.4
--- Validation.pm 14 Jul 2005 06:53:56 - 1.170.2.3
+++ Validation.pm 15 Jul 2005 18:25:21 - 1.170.2.4
@@ -331,10 +331,10 @@
# determine the base path
if (defined $val_prefix) {
$basepath = $val_prefix;
- $buildpath = $basepath/src;
+ $buildpath = $basepath/src/fink.build;
} else {
$basepath = $config-param_default(basepath, /sw);
- $buildpath = $config-param_default(buildpath,
$basepath/src);
+ $buildpath = $config-param_default(buildpath,
$basepath/src/fink.build);
}
# make sure have InfoN (N=2) if use Info2 features
Index: ChangeLog
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.873.2.51
retrieving revision 1.873.2.52
diff -u -d -r1.873.2.51 -r1.873.2.52
--- ChangeLog 14 Jul 2005 17:15:41 - 1.873.2.51
+++ ChangeLog 15 Jul 2005 18:25:21 - 1.873.2.52
@@ -1,3 +1,7 @@
+2005-07-15 Daniel Macks [EMAIL PROTECTED]
+
+ * Validation.pm: default builddir is now src/fink.build (backport)
+
2005-07-14 Benjamin Reed [EMAIL PROTECTED]
* VirtPackage.pm: Backport: cups-dev, system-sdk-*, gimp-print7,
---
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477alloc_id=16492op=click
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
dists/10.4-transitional/unstable/main/finkinfo/sci emboss.info,1.5,1.6
Update of /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/sci In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4369 Modified Files: emboss.info Log Message: new upstream version Index: emboss.info === RCS file: /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/sci/emboss.info,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- emboss.info 15 Jul 2005 00:18:06 - 1.5 +++ emboss.info 15 Jul 2005 21:11:31 - 1.6 @@ -1,15 +1,15 @@ Package: emboss -Version: 2.10.0 +Version: 3.0.0 Revision: 1 Depends: %N-shlibs (= %v-%r), x11, libpng3-shlibs, libjpeg-shlibs, gd2-shlibs, system-java14 BuildDepends: libpng3, libjpeg, gd2, libiconv-dev, x11-dev, system-java14-dev #Replaces: emboss ( 2.7.1-2) Source: mirror:custom:EMBOSS-%v.tar.gz CustomMirror: - Primary: ftp://emboss.open-bio.org/pub/EMBOSS/old/%v/ - Secondary: ftp://ftp.uk.embnet.org/pub/EMBOSS/old/%v/ + Primary: ftp://emboss.open-bio.org/pub/EMBOSS/ + Secondary: ftp://ftp.uk.embnet.org/pub/EMBOSS/ -Source-MD5: 4a48388ced7021a8ffece5166c40a364 +Source-MD5: 13575fbe66ccdbf6b7b722d6ad01eb62 ConfigureParams: --with-java=/System/Library/Frameworks/JavaVM.framework/Versions/1.4.2/Home --with-javaos=/System/Library/Frameworks/JavaVM.framework/Versions/1.4.2/Home/include Installscript: make install DESTDIR=%d @@ -22,19 +22,19 @@ Replaces: %N (= 2.7.1-2) DocFiles: ChangeLog COPYING README Files: - lib/libajax.0.1.0.dylib - lib/libajax.0.dylib - lib/libajaxg.0.1.0.dylib - lib/libajaxg.0.dylib - lib/libnucleus.0.1.0.dylib - lib/libnucleus.0.dylib + lib/libajax.3.0.0.dylib + lib/libajax.3.dylib + lib/libajaxg.3.0.0.dylib + lib/libajaxg.3.dylib + lib/libnucleus.3.0.0.dylib + lib/libnucleus.3.dylib lib/libplplot.5.0.0.dylib lib/libplplot.5.dylib Shlibs: - %p/lib/libajax.0.dylib 2.0.0 %n (= 2.7.1-3) - %p/lib/libajaxg.0.dylib 2.0.0 %n (= 2.7.1-3) - %p/lib/libnucleus.0.dylib 2.0.0 %n (= 2.7.1-3) + %p/lib/libajax.0.dylib 4.0.0 %n (= 2.7.1-3) + %p/lib/libajaxg.0.dylib 4.0.0 %n (= 2.7.1-3) + %p/lib/libnucleus.0.dylib 4.0.0 %n (= 2.7.1-3) %p/lib/libplplot.5.dylib 6.0.0 %n (= 2.7.1-3) --- SF.Net email is sponsored by: Discover Easy Linux Migration Strategies from IBM. Find simple to follow Roadmaps, straightforward articles, informative Webcasts and more! Get everything you need to get up to speed, fast. http://ads.osdn.com/?ad_id=7477alloc_id=16492op=click ___ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits
dists/10.3/unstable/main/finkinfo/sci emboss.info,1.15,1.16
Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/sci In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4757 Modified Files: emboss.info Log Message: new upstream version Index: emboss.info === RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/sci/emboss.info,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- emboss.info 15 Jul 2005 00:19:06 - 1.15 +++ emboss.info 15 Jul 2005 21:13:29 - 1.16 @@ -1,15 +1,15 @@ Package: emboss -Version: 2.10.0 +Version: 3.0.0 Revision: 1 Depends: %N-shlibs (= %v-%r), x11, libpng3-shlibs, libjpeg-shlibs, gd2-shlibs, system-java14 BuildDepends: libpng3, libjpeg, gd2, libiconv-dev, x11-dev, system-java14-dev #Replaces: emboss ( 2.7.1-2) Source: mirror:custom:EMBOSS-%v.tar.gz CustomMirror: - Primary: ftp://emboss.open-bio.org/pub/EMBOSS/old/%v/ - Secondary: ftp://ftp.uk.embnet.org/pub/EMBOSS/old/%v/ + Primary: ftp://emboss.open-bio.org/pub/EMBOSS/ + Secondary: ftp://ftp.uk.embnet.org/pub/EMBOSS/ -Source-MD5: 4a48388ced7021a8ffece5166c40a364 +Source-MD5: 13575fbe66ccdbf6b7b722d6ad01eb62 ConfigureParams: --with-java=/System/Library/Frameworks/JavaVM.framework/Versions/1.4.2/Home --with-javaos=/System/Library/Frameworks/JavaVM.framework/Versions/1.4.2/Home/include Installscript: make install DESTDIR=%d @@ -22,19 +22,19 @@ Replaces: %N (= 2.7.1-2) DocFiles: ChangeLog COPYING README Files: - lib/libajax.0.1.0.dylib - lib/libajax.0.dylib - lib/libajaxg.0.1.0.dylib - lib/libajaxg.0.dylib - lib/libnucleus.0.1.0.dylib - lib/libnucleus.0.dylib + lib/libajax.3.0.0.dylib + lib/libajax.3.dylib + lib/libajaxg.3.0.0.dylib + lib/libajaxg.3.dylib + lib/libnucleus.3.0.0.dylib + lib/libnucleus.3.dylib lib/libplplot.5.0.0.dylib lib/libplplot.5.dylib Shlibs: - %p/lib/libajax.0.dylib 2.0.0 %n (= 2.7.1-3) - %p/lib/libajaxg.0.dylib 2.0.0 %n (= 2.7.1-3) - %p/lib/libnucleus.0.dylib 2.0.0 %n (= 2.7.1-3) + %p/lib/libajax.0.dylib 4.0.0 %n (= 2.7.1-3) + %p/lib/libajaxg.0.dylib 4.0.0 %n (= 2.7.1-3) + %p/lib/libnucleus.0.dylib 4.0.0 %n (= 2.7.1-3) %p/lib/libplplot.5.dylib 6.0.0 %n (= 2.7.1-3) --- SF.Net email is sponsored by: Discover Easy Linux Migration Strategies from IBM. Find simple to follow Roadmaps, straightforward articles, informative Webcasts and more! Get everything you need to get up to speed, fast. http://ads.osdn.com/?ad_id=7477alloc_id=16492op=click ___ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits
dists/10.3/unstable/main/finkinfo/sound abcde.info,1.7,1.8 abcde.patch,1.5,1.6
Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/sound
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23580
Modified Files:
abcde.info abcde.patch
Log Message:
New upstream. Fixes build-as-nobody.
Index: abcde.patch
===
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/sound/abcde.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- abcde.patch 28 Sep 2004 17:01:35 - 1.5
+++ abcde.patch 15 Jul 2005 22:46:41 - 1.6
@@ -1,25 +1,38 @@
-diff -urN abcde-2.1.19.orig/abcde abcde-2.1.19/abcde
abcde-2.1.19.orig/abcdeFri Apr 9 14:12:15 2004
-+++ abcde-2.1.19/abcde Sat Sep 25 15:48:43 2004
-@@ -1445,7 +1445,7 @@
- cddafs)
- # Find the track's mounted path
- REALTRACKNUM=$(expr $UTRACKNUM + 0)
-- FILEPATH=$(mount | grep $CDROM on | sed 's/^[^ ]* on
\([^(]*\) (.*/\1/')
-+ FILEPATH=$(mount | grep $CDROM on | sed 's/^[^ ]* on
\(.*\) (.*/\1/')
- FILEPATH=$(find $FILEPATH | grep /$REALTRACKNUM );
- # If the file exists, copy it
- if [ -e $FILEPATH ] ; then
-@@ -1505,7 +1505,7 @@
- cddafs)
- # Find the track's mounted path
- REALTRACKNUM=$(expr $UTRACKNUM + 0)
-- FILEPATH=$(mount | grep $CDROM on | sed 's/^[^ ]* on
\([^(]*\) (.*/\1/')
-+ FILEPATH=$(mount | grep $CDROM on | sed 's/^[^ ]* on
\(.*\) (.*/\1/')
- FILEPATH=$(find $FILEPATH | grep /$REALTRACKNUM );
- # If the file exists, copy it
- if [ -e $FILEPATH ] ; then
-@@ -1553,7 +1553,7 @@
+diff -urN abcde-2.2.6.orig/Makefile abcde-2.2.6/Makefile
+--- abcde-2.2.6.orig/Makefile Tue Jun 14 12:41:33 2005
abcde-2.2.6/Makefile Tue Jun 14 12:52:18 2005
+@@ -14,13 +14,13 @@
+
+ install:
+ $(INSTALL) -d -m 755 $(bindir)
+- $(INSTALL) -m 755 -o 0 abcde $(bindir)
+- $(INSTALL) -m 755 -o 0 cddb-tool $(bindir)
++ $(INSTALL) -m 755 abcde $(bindir)
++ $(INSTALL) -m 755 cddb-tool $(bindir)
+ $(INSTALL) -d -m 755 $(mandir)
+- $(INSTALL) -m 644 -o 0 abcde.1 $(mandir)
+- $(INSTALL) -m 644 -o 0 cddb-tool.1 $(mandir)
++ $(INSTALL) -m 644 abcde.1 $(mandir)
++ $(INSTALL) -m 644 cddb-tool.1 $(mandir)
+ $(INSTALL) -d -m 755 $(etcdir)
+- $(INSTALL) -m 644 -o 0 abcde.conf $(etcdir)
++ $(INSTALL) -m 644 abcde.conf $(etcdir)
+
+ tarball:
+ @cd .. tar czvf abcde_$(VERSION).orig.tar.gz \
+diff -urN abcde-2.2.6.orig/abcde abcde-2.2.6/abcde
+--- abcde-2.2.6.orig/abcde Tue Jun 14 12:41:33 2005
abcde-2.2.6/abcde Tue Jun 14 12:47:15 2005
+@@ -1666,7 +1666,7 @@
+ mungefilename ()
+ {
+ #echo $@ | sed s,:,\ -,g | tr \ /\* __+ | tr -d \'\\?\[:cntrl:\]
+- echo $@ | sed s,:,\ -,g | tr \ / __ | tr -d \'\\?\[:cntrl:\]
++ echo $@ | sed s,:,\ -,g | tr / __ | tr -d \'\\?\[:cntrl:\]
+ }
+
+ # Custom genre munging:
+@@ -1694,7 +1694,7 @@
CDDBPROTO=5
HELLOINFO=$(whoami)@$(hostname)
INTERACTIVE=y
@@ -28,9 +41,9 @@
OUTPUTTYPE=ogg
ENCODERSYNTAX=default
-@@ -1562,10 +1562,9 @@
- FLACENCODERSYNTAX=default
- SPEEXENCODERSYNTAX=default
+@@ -1705,10 +1705,9 @@
+ MPPENCODERSYNTAX=default
+ NORMALIZERSYNTAX=default
-OUTPUTFORMAT='${ARTISTFILE}-${ALBUMFILE}/${TRACKNUM}.${TRACKFILE}'
-# Use the following VAOUTPUTFORMAT to revert to 2.0.x VA format:
@@ -42,16 +55,7 @@
ONETRACKOUTPUTFORMAT='${ARTISTFILE}-${ALBUMFILE}/${ALBUMFILE}'
VAONETRACKOUTPUTFORMAT='Various-${ALBUMFILE}/${ALBUMFILE}'
PLAYLISTFORMAT='${ARTISTFILE}-${ALBUMFILE}.${OUTPUT}.m3u'
-@@ -1662,7 +1661,7 @@
- # Custom filename munging:
- mungefilename ()
- {
-- echo $@ | sed s,:,\ -,g | tr \ / __ | tr -d \'\\?\[:cntrl:\]
-+ echo $@ | sed s,:,\ -,g | tr / __ | tr -d \'\\?\[:cntrl:\]
- }
-
- # Pre-read execution:
-@@ -1695,7 +1694,7 @@
+@@ -1829,7 +1828,7 @@
USEID3=y
if [ -z $OUTPUTDIR ]; then
@@ -60,7 +64,7 @@
fi
if [ -z $WAVOUTPUTDIR ]; then
-@@ -1703,8 +1702,8 @@
+@@ -1837,8 +1836,8 @@
fi
# Load system defaults
@@ -71,21 +75,10 @@
fi
# Load user preference defaults
if [ -r $HOME/.abcde.conf ]; then
-@@ -1851,6 +1850,10 @@
- CDROMREADER=$CDDAFS
- CDROMREADEROPTS=$CDDAFSOPTS
- ;;
-+cddafs)
-+CDROMREADER=$CDDAFS
-+CDROMREADEROPTS=$CDDAFSOPTS
-+;;
- esac
-
- # There's only one normalize...
-diff -urN abcde-2.1.19.orig/abcde.conf abcde-2.1.19/abcde.conf
abcde-2.1.19.orig/abcde.conf Sun Apr 4 15:22:05 2004
-+++ abcde-2.1.19/abcde.confSat Sep 25 15:42:56 2004
-@@ -48,7 +48,7 @@
+diff -urN abcde-2.2.6.orig/abcde.conf abcde-2.2.6/abcde.conf
+--- abcde-2.2.6.orig/abcde.confTue Jun 14 12:41:33 2005
dists/10.4-transitional/unstable/main/finkinfo/sound abcde.info,1.1,1.2 abcde.patch,1.1,1.2
Update of /cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/sound
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23729
Modified Files:
abcde.info abcde.patch
Log Message:
New upstream. Fixes build-as-nobody.
Index: abcde.patch
===
RCS file:
/cvsroot/fink/dists/10.4-transitional/unstable/main/finkinfo/sound/abcde.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- abcde.patch 27 Apr 2005 03:26:37 - 1.1
+++ abcde.patch 15 Jul 2005 22:47:24 - 1.2
@@ -1,25 +1,38 @@
-diff -urN abcde-2.1.19.orig/abcde abcde-2.1.19/abcde
abcde-2.1.19.orig/abcdeFri Apr 9 14:12:15 2004
-+++ abcde-2.1.19/abcde Sat Sep 25 15:48:43 2004
-@@ -1445,7 +1445,7 @@
- cddafs)
- # Find the track's mounted path
- REALTRACKNUM=$(expr $UTRACKNUM + 0)
-- FILEPATH=$(mount | grep $CDROM on | sed 's/^[^ ]* on
\([^(]*\) (.*/\1/')
-+ FILEPATH=$(mount | grep $CDROM on | sed 's/^[^ ]* on
\(.*\) (.*/\1/')
- FILEPATH=$(find $FILEPATH | grep /$REALTRACKNUM );
- # If the file exists, copy it
- if [ -e $FILEPATH ] ; then
-@@ -1505,7 +1505,7 @@
- cddafs)
- # Find the track's mounted path
- REALTRACKNUM=$(expr $UTRACKNUM + 0)
-- FILEPATH=$(mount | grep $CDROM on | sed 's/^[^ ]* on
\([^(]*\) (.*/\1/')
-+ FILEPATH=$(mount | grep $CDROM on | sed 's/^[^ ]* on
\(.*\) (.*/\1/')
- FILEPATH=$(find $FILEPATH | grep /$REALTRACKNUM );
- # If the file exists, copy it
- if [ -e $FILEPATH ] ; then
-@@ -1553,7 +1553,7 @@
+diff -urN abcde-2.2.6.orig/Makefile abcde-2.2.6/Makefile
+--- abcde-2.2.6.orig/Makefile Tue Jun 14 12:41:33 2005
abcde-2.2.6/Makefile Tue Jun 14 12:52:18 2005
+@@ -14,13 +14,13 @@
+
+ install:
+ $(INSTALL) -d -m 755 $(bindir)
+- $(INSTALL) -m 755 -o 0 abcde $(bindir)
+- $(INSTALL) -m 755 -o 0 cddb-tool $(bindir)
++ $(INSTALL) -m 755 abcde $(bindir)
++ $(INSTALL) -m 755 cddb-tool $(bindir)
+ $(INSTALL) -d -m 755 $(mandir)
+- $(INSTALL) -m 644 -o 0 abcde.1 $(mandir)
+- $(INSTALL) -m 644 -o 0 cddb-tool.1 $(mandir)
++ $(INSTALL) -m 644 abcde.1 $(mandir)
++ $(INSTALL) -m 644 cddb-tool.1 $(mandir)
+ $(INSTALL) -d -m 755 $(etcdir)
+- $(INSTALL) -m 644 -o 0 abcde.conf $(etcdir)
++ $(INSTALL) -m 644 abcde.conf $(etcdir)
+
+ tarball:
+ @cd .. tar czvf abcde_$(VERSION).orig.tar.gz \
+diff -urN abcde-2.2.6.orig/abcde abcde-2.2.6/abcde
+--- abcde-2.2.6.orig/abcde Tue Jun 14 12:41:33 2005
abcde-2.2.6/abcde Tue Jun 14 12:47:15 2005
+@@ -1666,7 +1666,7 @@
+ mungefilename ()
+ {
+ #echo $@ | sed s,:,\ -,g | tr \ /\* __+ | tr -d \'\\?\[:cntrl:\]
+- echo $@ | sed s,:,\ -,g | tr \ / __ | tr -d \'\\?\[:cntrl:\]
++ echo $@ | sed s,:,\ -,g | tr / __ | tr -d \'\\?\[:cntrl:\]
+ }
+
+ # Custom genre munging:
+@@ -1694,7 +1694,7 @@
CDDBPROTO=5
HELLOINFO=$(whoami)@$(hostname)
INTERACTIVE=y
@@ -28,9 +41,9 @@
OUTPUTTYPE=ogg
ENCODERSYNTAX=default
-@@ -1562,10 +1562,9 @@
- FLACENCODERSYNTAX=default
- SPEEXENCODERSYNTAX=default
+@@ -1705,10 +1705,9 @@
+ MPPENCODERSYNTAX=default
+ NORMALIZERSYNTAX=default
-OUTPUTFORMAT='${ARTISTFILE}-${ALBUMFILE}/${TRACKNUM}.${TRACKFILE}'
-# Use the following VAOUTPUTFORMAT to revert to 2.0.x VA format:
@@ -42,16 +55,7 @@
ONETRACKOUTPUTFORMAT='${ARTISTFILE}-${ALBUMFILE}/${ALBUMFILE}'
VAONETRACKOUTPUTFORMAT='Various-${ALBUMFILE}/${ALBUMFILE}'
PLAYLISTFORMAT='${ARTISTFILE}-${ALBUMFILE}.${OUTPUT}.m3u'
-@@ -1662,7 +1661,7 @@
- # Custom filename munging:
- mungefilename ()
- {
-- echo $@ | sed s,:,\ -,g | tr \ / __ | tr -d \'\\?\[:cntrl:\]
-+ echo $@ | sed s,:,\ -,g | tr / __ | tr -d \'\\?\[:cntrl:\]
- }
-
- # Pre-read execution:
-@@ -1695,7 +1694,7 @@
+@@ -1829,7 +1828,7 @@
USEID3=y
if [ -z $OUTPUTDIR ]; then
@@ -60,7 +64,7 @@
fi
if [ -z $WAVOUTPUTDIR ]; then
-@@ -1703,8 +1702,8 @@
+@@ -1837,8 +1836,8 @@
fi
# Load system defaults
@@ -71,21 +75,10 @@
fi
# Load user preference defaults
if [ -r $HOME/.abcde.conf ]; then
-@@ -1851,6 +1850,10 @@
- CDROMREADER=$CDDAFS
- CDROMREADEROPTS=$CDDAFSOPTS
- ;;
-+cddafs)
-+CDROMREADER=$CDDAFS
-+CDROMREADEROPTS=$CDDAFSOPTS
-+;;
- esac
-
- # There's only one normalize...
-diff -urN abcde-2.1.19.orig/abcde.conf abcde-2.1.19/abcde.conf
abcde-2.1.19.orig/abcde.conf Sun Apr 4 15:22:05 2004
-+++ abcde-2.1.19/abcde.confSat Sep 25 15:42:56 2004
-@@ -48,7 +48,7 @@
+diff -urN abcde-2.2.6.orig/abcde.conf abcde-2.2.6/abcde.conf
+--- abcde-2.2.6.orig/abcde.confTue
scripts/buildfink buildfink,1.16,1.17
Update of /cvsroot/fink/scripts/buildfink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22924
Modified Files:
buildfink
Log Message:
Add support for latest fink HEAD changes: -{parent} may not be an object, in
which case call -get_parent() to get one
Index: buildfink
===
RCS file: /cvsroot/fink/scripts/buildfink/buildfink,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- buildfink 9 Jun 2005 20:19:31 - 1.16
+++ buildfink 16 Jul 2005 01:49:44 - 1.17
@@ -821,7 +821,7 @@
}
if($pkgobj-{parent}) {
- my $parent = $pkgobj-{parent}-get_name();
+ my $parent = ref($pkgobj-{parent}) ?
$pkgobj-{parent}-get_name() : $pkgobj-get_parent()-get_name();
next if $got_families{$parent};
$got_families{$parent} = 1;
push @ret, $parent;
---
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477alloc_id=16492op=click
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
experimental/dmacks/finkinfo/gnome-2.10 gnome-vfs2-ssl.info,1.2,1.3 gnome-vfs2.info,1.2,1.3
Update of /cvsroot/fink/experimental/dmacks/finkinfo/gnome-2.10 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14789 Modified Files: gnome-vfs2-ssl.info gnome-vfs2.info Log Message: Need new fink to build (thanks Apple for breaking gcc linkages). Slightly higher libbonobo2 (as per theid). Index: gnome-vfs2-ssl.info === RCS file: /cvsroot/fink/experimental/dmacks/finkinfo/gnome-2.10/gnome-vfs2-ssl.info,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- gnome-vfs2-ssl.info 8 Jul 2005 18:21:39 - 1.2 +++ gnome-vfs2-ssl.info 16 Jul 2005 05:06:06 - 1.3 @@ -11,6 +11,7 @@ orbit2 (= 2.10.0-1) BuildDepends: + fink (= 0.24.8-1), bzip2-dev, gconf2-dev (= 2.8.0-1), gettext-bin, @@ -18,7 +19,7 @@ glib2-dev (= 2.6.0-1), gtk-doc (= 1.2-1), intltool (= 0.30-1), - libbonobo2-dev (= 2.6.0-1), + libbonobo2-dev (= 2.8.0-1), libgettext3-dev, libiconv-dev, libxml2 (= 2.6.7-1), @@ -74,7 +75,7 @@ gconf2-shlibs (= 2.8.0-1), glib2-shlibs (= 2.6.0-1), gnome-mime-data (= 2.4.0-1), - libbonobo2-shlibs (= 2.6.0-1), + libbonobo2-shlibs (= 2.8.0-1), libgettext3-shlibs, libiconv, libxml2-shlibs (= 2.6.7-1), Index: gnome-vfs2.info === RCS file: /cvsroot/fink/experimental/dmacks/finkinfo/gnome-2.10/gnome-vfs2.info,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- gnome-vfs2.info 8 Jul 2005 18:21:39 - 1.2 +++ gnome-vfs2.info 16 Jul 2005 05:06:06 - 1.3 @@ -11,6 +11,7 @@ orbit2 (= 2.10.0-1) BuildDepends: + fink (= 0.24.8-1), bzip2-dev, gconf2-dev (= 2.8.0-1), gettext-bin, @@ -18,7 +19,7 @@ glib2-dev (= 2.6.0-1), gtk-doc (= 1.2-1), intltool (= 0.30-1), - libbonobo2-dev (= 2.6.0-1), + libbonobo2-dev (= 2.8.0-1), libgettext3-dev, libiconv-dev, libxml2 (= 2.6.7-1), @@ -74,7 +75,7 @@ gconf2-shlibs (= 2.8.0-1), glib2-shlibs (= 2.6.0-1), gnome-mime-data (= 2.4.0-1), - libbonobo2-shlibs (= 2.6.0-1), + libbonobo2-shlibs (= 2.8.0-1), libgettext3-shlibs, libiconv, libxml2-shlibs (= 2.6.7-1), --- SF.Net email is sponsored by: Discover Easy Linux Migration Strategies from IBM. Find simple to follow Roadmaps, straightforward articles, informative Webcasts and more! Get everything you need to get up to speed, fast. http://ads.osdn.com/?ad_id=7477alloc_id=16492op=click ___ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits
fink/perlmod/Fink ChangeLog,1.1054,1.1055 PkgVersion.pm,1.428,1.429
Update of /cvsroot/fink/fink/perlmod/Fink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20093
Modified Files:
ChangeLog PkgVersion.pm
Log Message:
Just die if source unpacking fails (feature requests #823475)
Index: PkgVersion.pm
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/PkgVersion.pm,v
retrieving revision 1.428
retrieving revision 1.429
diff -u -d -r1.428 -r1.429
--- PkgVersion.pm 12 Jul 2005 01:41:26 - 1.428
+++ PkgVersion.pm 16 Jul 2005 05:53:49 - 1.429
@@ -2153,7 +2153,7 @@
sub phase_unpack {
my $self = shift;
my ($archive, $found_archive, $bdir, $destdir, $unpack_cmd);
- my ($suffix, $verbosity, $answer, $tries, $checksum, $continue);
+ my ($suffix, $verbosity, $answer, $checksum, $continue);
my ($renamefield, @renamefiles, $renamefile, $renamelist, $expand);
my ($tarcommand, $tarflags, $cat, $gzip, $bzip2, $unzip,
$found_archive_sum);
@@ -2208,9 +2208,9 @@
return;
}
- $tries = 0;
my $maxtries = should_skip_prompt('fetch') ? 2 : 3;
foreach $suffix ($self-get_source_suffices) {
+ my $tries = 0;
$archive = $self-get_tarball($suffix);
# search for archive, try fetching if not found
@@ -2339,26 +2339,8 @@
# unpack it
chdir $destdir;
if (execute($unpack_cmd, nonroot_okay=1)) {
- $tries++;
-
- # FIXME: this is not the likely problem now since we
already checked MD5
- $answer =
- prompt_boolean(Unpacking the file $archive of
package .
-
$self-get_fullname(). failed. The most likely .
- cause for this
is a corrupted or incomplete .
- download. Do
you want to delete the tarball .
- and download
it again?,
- default =
($tries = $maxtries) ? 0 : 1,
- category =
'fetch',);
- if ($answer) {
- rm_f $found_archive;
- redo; # restart loop with same tarball
- } else {
- die unpacking file $archive of package
.$self-get_fullname(). failed\n;
- }
+ die unpacking file $archive of package
.$self-get_fullname(). failed\n;
}
-
- $tries = 0;
}
}
Index: ChangeLog
===
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1054
retrieving revision 1.1055
diff -u -d -r1.1054 -r1.1055
--- ChangeLog 13 Jul 2005 19:19:56 - 1.1054
+++ ChangeLog 16 Jul 2005 05:53:49 - 1.1055
@@ -1,3 +1,7 @@
+2005-07-16 Daniel Macks [EMAIL PROTECTED]
+
+ * PkgVersion.pm: Make failed unpacking of source a fatal error.
+
2005-07-13 Daniel Macks [EMAIL PROTECTED]
* CLI.pm: Improve POSIX symbol imports.
---
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477alloc_id=16492op=click
___
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
