Author: ranger
Date: Thu Dec 13 05:00:11 2007
New Revision: 1077

URL: 
http://svn.finkproject.org/websvn/listing.php?sc=1&rev=1077&repname=user%3a+ranger
Log:
ruby mod updates, new radlib, and poppler updates from pangocairo

Modified:
    trunk/experimental/common/main/finkinfo/libs/poppler-data.info
    trunk/experimental/common/main/finkinfo/libs/poppler2-glib.info
    trunk/experimental/common/main/finkinfo/libs/poppler2-glib.patch
    trunk/experimental/common/main/finkinfo/libs/poppler2-qt3.info
    trunk/experimental/common/main/finkinfo/libs/poppler2-qt3.patch
    trunk/experimental/common/main/finkinfo/libs/poppler2.info
    trunk/experimental/common/main/finkinfo/libs/poppler2.patch
    trunk/experimental/common/main/finkinfo/libs/radlib.info
    trunk/experimental/common/main/finkinfo/libs/rubymods/actionmailer-rb.info
    trunk/experimental/common/main/finkinfo/libs/rubymods/actionpack-rb.info
    
trunk/experimental/common/main/finkinfo/libs/rubymods/actionwebservice-rb.info
    trunk/experimental/common/main/finkinfo/libs/rubymods/activerecord-rb.info
    trunk/experimental/common/main/finkinfo/libs/rubymods/activeresource-rb.info
    trunk/experimental/common/main/finkinfo/libs/rubymods/activesupport-rb.info
    trunk/experimental/common/main/finkinfo/libs/rubymods/compositekeys-rb.info
    trunk/experimental/common/main/finkinfo/libs/rubymods/libgems-rb.info
    trunk/experimental/common/main/finkinfo/libs/rubymods/libgems-rb.patch
    trunk/experimental/common/main/finkinfo/libs/rubymods/rails-rb.info
    trunk/experimental/common/main/finkinfo/libs/rubymods/rake-rb.info

Modified: trunk/experimental/common/main/finkinfo/libs/poppler-data.info
URL: 
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/libs/poppler-data.info&rev=1077&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/poppler-data.info (original)
+++ trunk/experimental/common/main/finkinfo/libs/poppler-data.info Thu Dec 13 
05:00:11 2007
@@ -1,6 +1,6 @@
 Package: poppler-data
 Epoch: 1
-Version: 0.1
+Version: 0.2.0
 Revision: 1
 Description: Character-encoding files for poppler
 License: Restrictive/Distributable
@@ -14,7 +14,7 @@
 <<
 
 Source: http://poppler.freedesktop.org/%n-%v.tar.gz
-Source-MD5: 5c700eb06dda9dafec09cd85225e34d4
+Source-MD5: b7f98e84a4d2a2c794271d746ec7ee0b
 
 CompileScript: #
 InstallScript: make -j1 install DESTDIR=%d prefix=%p

Modified: trunk/experimental/common/main/finkinfo/libs/poppler2-glib.info
URL: 
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/libs/poppler2-glib.info&rev=1077&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/poppler2-glib.info (original)
+++ trunk/experimental/common/main/finkinfo/libs/poppler2-glib.info Thu Dec 13 
05:00:11 2007
@@ -1,15 +1,19 @@
 Package: poppler2-glib
-Version: 0.6.1
+Version: 0.6.3
 Revision: 1
 Description: PDF rendering library (GLIB Interface)
 License: GPL
 Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
-Depends: %N-shlibs (>= %v-%r)
+
+Depends: <<
+       %N-shlibs (>= %v-%r),
+       pkgconfig (>= 0.21-1)
+<<
 BuildDepends: <<
        atk1 (>= 1.20.0-1),
        cairo (>= 1.2-1),
        expat1,
-       fontconfig2-dev (>= 2.3.2-13),
+       fontconfig2-dev (>= 2.4.1-1),
        freetype219 (>= 2.3.5-1),
        glib2-dev (>= 2.14.0-1),
        glitz,
@@ -19,23 +23,25 @@
        libjpeg,
        libpng3,
        pango1-xft2-ft219-dev (>= 1.18.2-1),
-       pkgconfig (>= 0.20-1),
+       pkgconfig (>= 0.21-1),
        poppler2 (>= %v-1),
        x11-dev,
        xft2-dev
 <<
 Conflicts: poppler1
 Replaces: poppler1
+BuildDependsOnly: True
+GCC: 4.0
+
+Source: http://poppler.freedesktop.org/poppler-%v.tar.gz
+Source-MD5: a585677188cd56a090c4dc3357e03a95
+PatchScript: sed 's|@PREFIX@|%p|g' <%a/%n.patch | patch -p1 --fuzz=4
+
+SetCPPFLAGS: -I%p/lib/freetype219/include 
-I%p/lib/freetype219/include/freetype2 -I%p/lib/fontconfig2/include 
-I%p/lib/pango-ft219/include -I%p/include
+SetLDFLAGS: -L%p/lib/freetype219/lib -L%p/lib/fontconfig2/lib 
-L%p/lib/pango-ft219/lib -L%p/lib 
-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
 NoSetCPPFLAGS: true
-SetCPPFLAGS: -I%p/lib/freetype219/include 
-I%p/lib/freetype219/include/freetype2 -I%p/lib/fontconfig2/include 
-I%p/lib/pango-ft219/include -I%p/include
 NoSetLDFLAGS: true
-SetLDFLAGS: -L%p/lib/freetype219/lib -L%p/lib/fontconfig2/lib 
-L%p/lib/pango-ft219/lib -L%p/lib 
-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
-BuildDependsOnly: True
-Source: http://poppler.freedesktop.org/poppler-%v.tar.gz
-Source-MD5: 78a5f8ff1a3464eddb127577eea7a191
 ConfigureParams: --mandir=%p/share/man SYSTEM_XPDFRC=%p/etc/xpdfrc.poppler2 
--disable-dependency-tracking --enable-zlib --enable-poppler-glib 
--disable-poppler-qt --disable-poppler-qt4 
FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config 
PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:%p/lib/pango-ft219/lib/pkgconfig:$PKG_CONFIG_PATH"
-PatchScript: sed 's|@PREFIX@|%p|g' <%a/%n.patch | patch -p1 --fuzz=4
-GCC: 3.3
 CompileScript: <<
 #!/bin/sh -ev
 
@@ -48,6 +54,7 @@
        popd
        make poppler-glib.pc
 <<
+
 InstallScript: <<
 #!/bin/sh -ev
 
@@ -65,15 +72,15 @@
                gtk+2-shlibs (>= 2.12.0-1),
                poppler2-shlibs (>= %v-1)
        <<
-       Files: <<
-               lib/libpoppler-glib.2*.dylib
-       <<
        DocFiles: AUTHORS COPYING ChangeLog NEWS README README-XPDF TODO
+       Files: lib/libpoppler-glib.2*.dylib
        Shlibs: %p/lib/libpoppler-glib.2.dylib 3.0.0 %n (>= 0.6-1)
 <<
+
 Homepage: http://poppler.freedesktop.org/
 DescDetail: <<
 Poppler is a PDF rendering library based on the xpdf-3.0 code base.
 
 This is the GLIB plugin for Poppler.
 <<
+

Modified: trunk/experimental/common/main/finkinfo/libs/poppler2-glib.patch
URL: 
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/libs/poppler2-glib.patch&rev=1077&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/poppler2-glib.patch (original)
+++ trunk/experimental/common/main/finkinfo/libs/poppler2-glib.patch Thu Dec 13 
05:00:11 2007
@@ -1,6 +1,6 @@
-diff -uNr poppler-0.6/glib/Makefile.in poppler-0.6-new/glib/Makefile.in
---- poppler-0.6/glib/Makefile.in       2007-09-03 14:55:20.000000000 -0400
-+++ poppler-0.6-new/glib/Makefile.in   2007-09-26 15:07:57.000000000 -0400
+diff -uNr poppler-0.6.3/glib/Makefile.in poppler-0.6.3-new/glib/Makefile.in
+--- poppler-0.6.3/glib/Makefile.in     2007-12-12 13:51:42.000000000 -0500
++++ poppler-0.6.3-new/glib/Makefile.in 2007-12-12 22:54:33.000000000 -0500
 @@ -66,7 +66,7 @@
  @[EMAIL PROTECTED] = $(top_builddir)/poppler/libpoppler-cairo.la \
  @BUILD_CAIRO_OUTPUT_TRUE@     $(am__DEPENDENCIES_1)
@@ -19,7 +19,7 @@
        $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
        $(am__DEPENDENCIES_2)
  DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/poppler
-@@ -290,11 +290,10 @@
+@@ -291,11 +291,10 @@
        -DG_LOG_DOMAIN=\"Poppler\"              \
        -I$(top_srcdir)                         \
        -I$(top_srcdir)/poppler                 \
@@ -33,38 +33,35 @@
  
  stamp_files = stamp-poppler-enums.h
  poppler_glib_public_headers = \
-@@ -323,22 +322,22 @@
+@@ -324,10 +323,10 @@
        poppler-private.h
  
  libpoppler_glib_la_LIBADD = \
 -      $(top_builddir)/poppler/libpoppler.la           \
 -      $(POPPLER_GLIB_LIBS)                            \
-+      $(prefix)/lib/libpoppler.la             \
++      $(prefix)/lib/libpoppler.la \
        $(FREETYPE_LIBS)                                \
        $(FONTCONFIG_LIBS)                              \
--      $(cairo_libs)
-+      $(cairo_libs) \
-+      $(POPPLER_GLIB_LIBS)
++      $(POPPLER_GLIB_LIBS)                            \
+       $(cairo_libs)
  
  libpoppler_glib_la_LDFLAGS = -version-info 2:0:0
- test_poppler_glib_SOURCES = \
-        test-poppler-glib.c
+@@ -335,10 +334,10 @@
+        test-poppler-glib.cc
  
  test_poppler_glib_LDADD = \
 -      $(top_builddir)/poppler/libpoppler.la   \
-+      $(prefix)/lib/libpoppler.la     \
++      $(prefix)/lib/libpoppler.la \
++      $(FREETYPE_LIBS)                        \
        libpoppler-glib.la                      \
--      $(POPPLER_GLIB_LIBS)                    \
-       $(FREETYPE_LIBS)                        \
--      $(cairo_libs)
-+      $(cairo_libs) \
-+      $(POPPLER_GLIB_LIBS)
+       $(POPPLER_GLIB_LIBS)                    \
+-      $(FREETYPE_LIBS)                        \
+       $(cairo_libs)
  
  BUILT_SOURCES = \
-       poppler-enums.c                         \
-diff -uNr poppler-0.6/glib/demo/Makefile.in 
poppler-0.6-new/glib/demo/Makefile.in
---- poppler-0.6/glib/demo/Makefile.in  2007-09-03 14:55:20.000000000 -0400
-+++ poppler-0.6-new/glib/demo/Makefile.in      2007-09-26 15:08:25.000000000 
-0400
+diff -uNr poppler-0.6.3/glib/demo/Makefile.in 
poppler-0.6.3-new/glib/demo/Makefile.in
+--- poppler-0.6.3/glib/demo/Makefile.in        2007-12-12 13:51:42.000000000 
-0500
++++ poppler-0.6.3-new/glib/demo/Makefile.in    2007-12-12 22:52:51.000000000 
-0500
 @@ -58,7 +58,7 @@
  am__DEPENDENCIES_1 =
  poppler_glib_demo_DEPENDENCIES =  \
@@ -74,7 +71,7 @@
  DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/poppler
  depcomp = $(SHELL) $(top_srcdir)/depcomp
  am__depfiles_maybe = depfiles
-@@ -261,7 +261,7 @@
+@@ -263,7 +263,7 @@
  
  LDADD = \
        $(top_builddir)/glib/libpoppler-glib.la \
@@ -83,10 +80,10 @@
        $(GTK_TEST_LIBS)
  
  all: all-am
-diff -uNr poppler-0.6/glib/reference/Makefile.in 
poppler-0.6-new/glib/reference/Makefile.in
---- poppler-0.6/glib/reference/Makefile.in     2007-09-03 14:56:14.000000000 
-0400
-+++ poppler-0.6-new/glib/reference/Makefile.in 2007-09-26 15:08:34.000000000 
-0400
-@@ -293,7 +293,7 @@
+diff -uNr poppler-0.6.3/glib/reference/Makefile.in 
poppler-0.6.3-new/glib/reference/Makefile.in
+--- poppler-0.6.3/glib/reference/Makefile.in   2007-12-12 13:51:43.000000000 
-0500
++++ poppler-0.6.3-new/glib/reference/Makefile.in       2007-12-12 
22:52:51.000000000 -0500
+@@ -294,7 +294,7 @@
        $(POPPLER_GLIB_CFLAGS)                          \
        $(FREETYPE_CFLAGS)
  

Modified: trunk/experimental/common/main/finkinfo/libs/poppler2-qt3.info
URL: 
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/libs/poppler2-qt3.info&rev=1077&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/poppler2-qt3.info (original)
+++ trunk/experimental/common/main/finkinfo/libs/poppler2-qt3.info Thu Dec 13 
05:00:11 2007
@@ -1,34 +1,37 @@
 Package: poppler2-qt3
-Version: 0.6.1
+Version: 0.6.3
 Revision: 1
 Description: PDF rendering library (Qt Interface)
 License: GPL
 Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
+
 Depends: %N-shlibs (>= %v-%r)
 BuildDepends: <<
        expat1,
        freetype219,
        libjpeg,
-       pkgconfig (>= 0.20-1),
+       pkgconfig (>= 0.21-1),
        poppler2 (>= %v-1),
-       qt3 (>= 3.3.8-1),
+       qt3 (>= 3.3.8-1021),
        x11-dev
 <<
 Conflicts: poppler-qt3
 Replaces: poppler-qt3
-NoSetCPPFLAGS: true
-SetCPPFLAGS: -I%p/lib/freetype219/include 
-I%p/lib/freetype219/include/freetype2 -I%p/lib/fontconfig2/include -I%p/include
-NoSetLDFLAGS: true
-SetLDFLAGS: -L%p/lib/freetype219/lib -L%p/lib/fontconfig2/lib -L%p/lib 
-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
 BuildDependsOnly: True
+GCC: 4.0
+
 Source: http://poppler.freedesktop.org/poppler-%v.tar.gz
-Source-MD5: 78a5f8ff1a3464eddb127577eea7a191
-ConfigureParams: --mandir=%p/share/man SYSTEM_XPDFRC=%p/etc/xpdfrc.poppler2 
--disable-dependency-tracking --enable-zlib --disable-poppler-glib 
--disable-poppler-qt4 FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config 
PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH"
+Source-MD5: a585677188cd56a090c4dc3357e03a95
 PatchScript: <<
        sed 's|@PREFIX@|%p|g' <%a/%n.patch | patch -p1 --fuzz=4
        perl -pi -e 's,libqt-mt.so,libqt-mt.dylib,g' configure
 <<
-GCC: 3.3
+
+SetCPPFLAGS: -I%p/lib/freetype219/include 
-I%p/lib/freetype219/include/freetype2 -I%p/lib/fontconfig2/include -I%p/include
+SetLDFLAGS: -L%p/lib/freetype219/lib -L%p/lib/fontconfig2/lib -L%p/lib 
-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
+NoSetCPPFLAGS: true
+NoSetLDFLAGS: true
+ConfigureParams: --mandir=%p/share/man SYSTEM_XPDFRC=%p/etc/xpdfrc.poppler2 
--disable-dependency-tracking --enable-zlib --disable-poppler-glib 
--disable-poppler-qt4 FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config 
PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH"
 CompileScript: <<
 #!/bin/sh -ev
 
@@ -43,6 +46,7 @@
        popd
        make poppler-qt.pc
 <<
+
 InstallScript: <<
 #!/bin/sh -ev
 
@@ -58,17 +62,17 @@
        Depends: <<
                expat1-shlibs,
                poppler2-shlibs (>= %v-1),
-               qt3-shlibs (>= 3.3.8-1)
-       <<
-       Files: <<
-               lib/libpoppler-qt.2*.dylib
+               qt3-shlibs (>= 3.3.8-1021)
        <<
        DocFiles: AUTHORS COPYING ChangeLog NEWS README README-XPDF TODO
+       Files: lib/libpoppler-qt.2*.dylib
        Shlibs: %p/lib/libpoppler-qt.2.dylib 3.0.0 %n (>= 0.6-1)
 <<
+
 Homepage: http://poppler.freedesktop.org/
 DescDetail: <<
 Poppler is a PDF rendering library based on the xpdf-3.0 code base.
 
 This is the Qt plugin for Poppler.
 <<
+

Modified: trunk/experimental/common/main/finkinfo/libs/poppler2-qt3.patch
URL: 
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/libs/poppler2-qt3.patch&rev=1077&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/poppler2-qt3.patch (original)
+++ trunk/experimental/common/main/finkinfo/libs/poppler2-qt3.patch Thu Dec 13 
05:00:11 2007
@@ -1,4 +1,4 @@
-diff -uNr poppler-0.6/qt/Makefile.in poppler-0.6-new/qt/Makefile.in
+
 --- poppler-0.6/qt/Makefile.in 2007-09-03 14:55:21.000000000 -0400
 +++ poppler-0.6-new/qt/Makefile.in     2007-09-26 14:32:05.000000000 -0400
 @@ -63,7 +63,7 @@

Modified: trunk/experimental/common/main/finkinfo/libs/poppler2.info
URL: 
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/libs/poppler2.info&rev=1077&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/poppler2.info (original)
+++ trunk/experimental/common/main/finkinfo/libs/poppler2.info Thu Dec 13 
05:00:11 2007
@@ -1,18 +1,19 @@
 Package: poppler2
-Version: 0.6.1
+Version: 0.6.3
 Revision: 1
 Distribution: 10.4, 10.5
 Description: PDF rendering library
 License: GPL
 Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
+
 Depends: <<
        %N-shlibs (= %v-%r),
-       poppler-data (>= 1:0.1-1)
+       poppler-data (>= 1:0.2-1)
 <<
 BuildDepends: <<
        cairo (>= 1.2-1),
        expat1,
-       fontconfig2-dev (>= 2.3.2-13),
+       fontconfig2-dev (>= 2.4.1-1),
        freetype219 (>= 2.3.5-1),
        glitz,
        gettext-bin,
@@ -22,25 +23,33 @@
        libjpeg,
        libpng3,
        libxml2,
-       pkgconfig (>= 0.20-1),
+       pkgconfig (>= 0.21-1),
        x11-dev,
        xft2-dev
 <<
+Conflicts: <<
+       poppler,
+       poppler1
+<<
+Replaces: <<
+       poppler,
+       poppler1
+<<
 BuildDependsOnly: True
-Conflicts: poppler, poppler1
-Replaces: poppler, poppler1
+GCC: 4.0
+
 Source: http://poppler.freedesktop.org/poppler-%v.tar.gz
-Source-MD5: 78a5f8ff1a3464eddb127577eea7a191
+Source-MD5: a585677188cd56a090c4dc3357e03a95
+PatchScript: sed -e 's|@PREFIX@|%p|g' <%a/%n.patch | patch -p1
+
+SetCFLAGS: -Os
+SetCPPFLAGS: -I%p/lib/pango-ft219/include/pango-1.0 
-I%p/lib/pango-ft219/include -I%p/lib/freetype219/include/freetype2 
-I%p/lib/freetype219/include -I%p/lib/fontconfig2/include -I%p/include 
-I%p/include/sys
+SetCXXFLAGS: -Os
+SetLDFLAGS: -L%p/lib/pango-ft219/lib -L%p/lib/freetype219/lib 
-L%p/lib/fontconfig2/lib -L%p/lib 
-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
+SetLIBS: -L%p/lib -lexpat
+NoSetCPPFLAGS: true
+NoSetLDFLAGS: true
 ConfigureParams: --mandir=%p/share/man SYSTEM_XPDFRC=%p/etc/xpdfrc.%N 
--disable-dependency-tracking --enable-zlib --disable-poppler-glib 
--enable-cairo-output --disable-poppler-qt --disable-poppler-qt4 
--disable-gtk-test FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config 
PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:%p/lib/pango-ft219/lib:$PKG_CONFIG_PATH"
-NoSetCPPFLAGS: true
-SetCPPFLAGS: -I%p/lib/pango-ft219/include/pango-1.0 
-I%p/lib/pango-ft219/include -I%p/lib/freetype219/include/freetype2 
-I%p/lib/freetype219/include -I%p/lib/fontconfig2/include -I%p/include 
-I%p/include/sys
-NoSetLDFLAGS: true
-SetLDFLAGS: -L%p/lib/pango-ft219/lib -L%p/lib/freetype219/lib 
-L%p/lib/fontconfig2/lib -L%p/lib 
-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
-SetCFLAGS: -Os
-SetCXXFLAGS: -Os
-PatchScript: sed -e 's|@PREFIX@|%p|g' <%a/%n.patch | patch -p1
-SetLIBS: -L%p/lib -lexpat
-GCC: 3.3
 CompileScript: <<
 #!/bin/sh -ev
 
@@ -58,6 +67,7 @@
                done
        fi
 <<
+
 InstallScript: <<
 #!/bin/sh -ev
 
@@ -69,37 +79,41 @@
 SplitOff: <<
        Package: %N-shlibs
        Depends: <<
-               poppler-data (>= 1:0.1-1),
-               fontconfig2-shlibs,
-               freetype219-shlibs,
+               poppler-data (>= 1:0.2-1),
+               fontconfig2-shlibs (>= 2.4.1-1),
+               freetype219-shlibs (>= 2.3.5-1),
                libgettext3-shlibs,
                libiconv,
                libxml2-shlibs,
                x11-shlibs
        <<
+       Replaces: <<
+               poppler (<< %v-%r),
+               %N (<< %v-%r)
+       <<
+       DocFiles: AUTHORS COPYING ChangeLog NEWS README README-XPDF TODO
        Files: <<
                lib/libpoppler.2*.dylib
                etc
        <<
-       DocFiles: AUTHORS COPYING ChangeLog NEWS README README-XPDF TODO
+       Shlibs: %p/lib/libpoppler.2.dylib 3.0.0 %n (>= 0.6-1)
        ConfFiles: %p/etc/xpdfrc.%N
-       Shlibs: <<
-               %p/lib/libpoppler.2.dylib 3.0.0 %n (>= 0.6-1)
-       <<
-       Replaces: poppler (<< %v-%r), %N (<< %v-%r)
 <<
 SplitOff2: <<
        Package: poppler-bin
        Depends: %N-shlibs (>= %v-%r)
+       Conflicts: xpdf
+       Replaces: <<
+               poppler (<< %v-%r),
+               %N (<< %v-%r),
+               xpdf
+       <<
+       DocFiles: AUTHORS COPYING ChangeLog NEWS README README-XPDF TODO
        Files: bin share/man
-       DocFiles: AUTHORS COPYING ChangeLog NEWS README README-XPDF TODO
-       Conflicts: xpdf
-       Replaces: poppler (<< %v-%r), %N (<< %v-%r), xpdf
 <<
+
 Homepage: http://poppler.freedesktop.org/
-DescDetail: <<
-Poppler is a PDF rendering library based on the xpdf-3.0 code base.
-<<
+DescDetail: Poppler is a PDF rendering library based on the xpdf-3.0 code base.
 DescPort: <<
        xpdfrc file borrowed from xpdf. It is renamed xpdfrc.%N to avoid
        a conflict with xpdf.  Cairo output is disabled because cairo depends

Modified: trunk/experimental/common/main/finkinfo/libs/poppler2.patch
URL: 
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/libs/poppler2.patch&rev=1077&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/poppler2.patch (original)
+++ trunk/experimental/common/main/finkinfo/libs/poppler2.patch Thu Dec 13 
05:00:11 2007
@@ -1,4 +1,4 @@
-diff -uNr poppler-0.6/configure poppler-0.6-new/configure
+
 --- poppler-0.6/configure      2007-09-03 14:55:19.000000000 -0400
 +++ poppler-0.6-new/configure  2007-09-26 13:46:15.000000000 -0400
 @@ -24760,7 +24760,7 @@
@@ -10,7 +10,6 @@
  
  jpeg_incdir=NO
  for i in $jpeg_incdirs;
-diff -uNr poppler-0.6/glib/Makefile.in poppler-0.6-new/glib/Makefile.in
 --- poppler-0.6/glib/Makefile.in       2007-09-03 14:55:20.000000000 -0400
 +++ poppler-0.6-new/glib/Makefile.in   2007-09-26 13:47:12.000000000 -0400
 @@ -290,10 +290,10 @@
@@ -47,7 +46,6 @@
        $(cairo_libs)
  
  BUILT_SOURCES = \
-diff -uNr poppler-0.6/glib/reference/Makefile.in 
poppler-0.6-new/glib/reference/Makefile.in
 --- poppler-0.6/glib/reference/Makefile.in     2007-09-03 14:56:14.000000000 
-0400
 +++ poppler-0.6-new/glib/reference/Makefile.in 2007-09-26 13:47:37.000000000 
-0400
 @@ -289,14 +289,14 @@
@@ -68,7 +66,6 @@
        $(cairo_libs)
  
  @[EMAIL PROTECTED] = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
-diff -uNr poppler-0.6/poppler/Makefile.in poppler-0.6-new/poppler/Makefile.in
 --- poppler-0.6/poppler/Makefile.in    2007-09-03 14:55:21.000000000 -0400
 +++ poppler-0.6-new/poppler/Makefile.in        2007-09-26 13:48:02.000000000 
-0400
 @@ -385,12 +385,12 @@
@@ -102,7 +99,6 @@
        $(win32_libs)
  
  libpoppler_la_LDFLAGS = -version-info 2:0:0 @create_shared_lib@
-diff -uNr poppler-0.6/qt/Makefile.in poppler-0.6-new/qt/Makefile.in
 --- poppler-0.6/qt/Makefile.in 2007-09-03 14:55:21.000000000 -0400
 +++ poppler-0.6-new/qt/Makefile.in     2007-09-26 13:48:33.000000000 -0400
 @@ -266,10 +266,10 @@
@@ -142,7 +138,6 @@
  
  all: all-am
  
-diff -uNr poppler-0.6/test/Makefile.in poppler-0.6-new/test/Makefile.in
 --- poppler-0.6/test/Makefile.in       2007-09-03 14:55:22.000000000 -0400
 +++ poppler-0.6-new/test/Makefile.in   2007-09-26 13:49:10.000000000 -0400
 @@ -263,17 +263,17 @@
@@ -189,7 +184,6 @@
        $(GTK_TEST_LIBS)
  
  EXTRA_DIST = \
-diff -uNr poppler-0.6/xpdfrc.poppler2 poppler-0.6-new/xpdfrc.poppler2
 --- poppler-0.6/xpdfrc.poppler2        1969-12-31 19:00:00.000000000 -0500
 +++ poppler-0.6-new/xpdfrc.poppler2    2007-09-26 13:49:42.000000000 -0400
 @@ -0,0 +1,91 @@

Modified: trunk/experimental/common/main/finkinfo/libs/radlib.info
URL: 
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/libs/radlib.info&rev=1077&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/radlib.info (original)
+++ trunk/experimental/common/main/finkinfo/libs/radlib.info Thu Dec 13 
05:00:11 2007
@@ -1,8 +1,8 @@
 Package: radlib
-Version: 2.7.0
+Version: 2.7.1
 Revision: 1
 Source: mirror:sourceforge:%n/%n-%v.tar.gz
-Source-MD5: 0023aeb7afd0f3643a95c47dfb3317d6
+Source-MD5: 2835ff27623138f589f0a72bc81d30f5
 BuildDependsOnly: true
 Depends: %N-shlibs (= %v-%r)
 InstallScript: <<

Modified: 
trunk/experimental/common/main/finkinfo/libs/rubymods/actionmailer-rb.info
URL: 
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/libs/rubymods/actionmailer-rb.info&rev=1077&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/rubymods/actionmailer-rb.info 
(original)
+++ trunk/experimental/common/main/finkinfo/libs/rubymods/actionmailer-rb.info 
Thu Dec 13 05:00:11 2007
@@ -1,7 +1,7 @@
 Info2: <<
 Package: actionmailer-rb%type_pkg[ruby]
 Version: 2.0.1
-Revision: 2
+Revision: 3
 Type: ruby (1.8)
 Description: Mail service classes
 License: BSD
@@ -10,12 +10,12 @@
 # Dependencies:
 Depends: <<
        actionpack-rb%type_pkg[ruby] (>= 2.0.1-1),
-       libgems-rb%type_pkg[ruby] (>= 0.9.5-1),
+       libgems-rb%type_pkg[ruby] (>= 0.9.5-2),
        ruby%type_pkg[ruby]
 <<
 BuildDepends: <<
        actionpack-rb%type_pkg[ruby] (>= 2.0.1-1),
-       rubygems-rb%type_pkg[ruby] (>= 0.9.5-1),
+       rubygems-rb%type_pkg[ruby] (>= 0.9.5-2),
        ruby%type_pkg[ruby]-dev
 <<
 

Modified: 
trunk/experimental/common/main/finkinfo/libs/rubymods/actionpack-rb.info
URL: 
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/libs/rubymods/actionpack-rb.info&rev=1077&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/rubymods/actionpack-rb.info 
(original)
+++ trunk/experimental/common/main/finkinfo/libs/rubymods/actionpack-rb.info 
Thu Dec 13 05:00:11 2007
@@ -1,7 +1,7 @@
 Info2: <<
 Package: actionpack-rb%type_pkg[ruby]
 Version: 2.0.1
-Revision: 2
+Revision: 3
 Type: ruby (1.8)
 Description: Web request routing and handling
 License: BSD
@@ -10,12 +10,12 @@
 # Dependencies:
 Depends: <<
        activesupport-rb%type_pkg[ruby] (>= 2.0.1-1),
-       libgems-rb%type_pkg[ruby] (>= 0.9.5-1),
+       libgems-rb%type_pkg[ruby] (>= 0.9.5-2),
        ruby%type_pkg[ruby]
 <<
 BuildDepends: <<
        activesupport-rb%type_pkg[ruby] (>= 2.0.1-1),
-       rubygems-rb%type_pkg[ruby] (>= 0.9.5-1),
+       rubygems-rb%type_pkg[ruby] (>= 0.9.5-2),
        ruby%type_pkg[ruby]-dev
 <<
 

Modified: 
trunk/experimental/common/main/finkinfo/libs/rubymods/actionwebservice-rb.info
URL: 
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/libs/rubymods/actionwebservice-rb.info&rev=1077&repname=user%3a+ranger
==============================================================================
--- 
trunk/experimental/common/main/finkinfo/libs/rubymods/actionwebservice-rb.info 
(original)
+++ 
trunk/experimental/common/main/finkinfo/libs/rubymods/actionwebservice-rb.info 
Thu Dec 13 05:00:11 2007
@@ -1,7 +1,7 @@
 Info2: <<
 Package: actionwebservice-rb%type_pkg[ruby]
 Version: 1.2.6
-Revision: 2
+Revision: 3
 Type: ruby (1.8)
 Description: SOAP and XML-RPC support for Rails
 License: BSD
@@ -12,14 +12,14 @@
        activesupport-rb%type_pkg[ruby] (>= 2.0.1-1),
        actionpack-rb%type_pkg[ruby] (>= 2.0.1-1),
        activerecord-rb%type_pkg[ruby] (>= 2.0.1-1),
-       libgems-rb%type_pkg[ruby] (>= 0.9.5-1),
+       libgems-rb%type_pkg[ruby] (>= 0.9.5-2),
        ruby%type_pkg[ruby]
 <<
 BuildDepends: <<
        activesupport-rb%type_pkg[ruby] (>= 2.0.1-1),
        actionpack-rb%type_pkg[ruby] (>= 2.0.1-1),
        activerecord-rb%type_pkg[ruby] (>= 2.0.1-1),
-       rubygems-rb%type_pkg[ruby] (>= 0.9.5-1),
+       rubygems-rb%type_pkg[ruby] (>= 0.9.5-2),
        ruby%type_pkg[ruby]-dev
 <<
 

Modified: 
trunk/experimental/common/main/finkinfo/libs/rubymods/activerecord-rb.info
URL: 
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/libs/rubymods/activerecord-rb.info&rev=1077&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/rubymods/activerecord-rb.info 
(original)
+++ trunk/experimental/common/main/finkinfo/libs/rubymods/activerecord-rb.info 
Thu Dec 13 05:00:11 2007
@@ -1,7 +1,7 @@
 Info2: <<
 Package: activerecord-rb%type_pkg[ruby]
 Version: 2.0.1
-Revision: 2
+Revision: 3
 Type: ruby (1.8)
 Description: Object-Relational Mapper for Ruby
 License: BSD
@@ -10,12 +10,12 @@
 # Dependencies:
 Depends: <<
        activesupport-rb%type_pkg[ruby] (>= 2.0.1-1),
-       libgems-rb%type_pkg[ruby] (>= 0.9.5-1),
+       libgems-rb%type_pkg[ruby] (>= 0.9.5-2),
        ruby%type_pkg[ruby]
 <<
 BuildDepends: <<
        activesupport-rb%type_pkg[ruby] (>= 2.0.1-1),
-       rubygems-rb%type_pkg[ruby] (>= 0.9.5-1),
+       rubygems-rb%type_pkg[ruby] (>= 0.9.5-2),
        ruby%type_pkg[ruby]-dev
 <<
 

Modified: 
trunk/experimental/common/main/finkinfo/libs/rubymods/activeresource-rb.info
URL: 
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/libs/rubymods/activeresource-rb.info&rev=1077&repname=user%3a+ranger
==============================================================================
--- 
trunk/experimental/common/main/finkinfo/libs/rubymods/activeresource-rb.info 
(original)
+++ 
trunk/experimental/common/main/finkinfo/libs/rubymods/activeresource-rb.info 
Thu Dec 13 05:00:11 2007
@@ -1,7 +1,7 @@
 Info2: <<
 Package: activeresource-rb%type_pkg[ruby]
 Version: 2.0.1
-Revision: 2
+Revision: 3
 Type: ruby (1.8)
 Description: Object-Relational Mapper for Ruby
 License: BSD
@@ -10,12 +10,12 @@
 # Dependencies:
 Depends: <<
        activesupport-rb%type_pkg[ruby] (>= 2.0.1-1),
-       libgems-rb%type_pkg[ruby] (>= 0.9.5-1),
+       libgems-rb%type_pkg[ruby] (>= 0.9.5-2),
        ruby%type_pkg[ruby]
 <<
 BuildDepends: <<
        activesupport-rb%type_pkg[ruby] (>= 2.0.1-1),
-       rubygems-rb%type_pkg[ruby] (>= 0.9.5-1),
+       rubygems-rb%type_pkg[ruby] (>= 0.9.5-2),
        ruby%type_pkg[ruby]-dev
 <<
 

Modified: 
trunk/experimental/common/main/finkinfo/libs/rubymods/activesupport-rb.info
URL: 
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/libs/rubymods/activesupport-rb.info&rev=1077&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/rubymods/activesupport-rb.info 
(original)
+++ trunk/experimental/common/main/finkinfo/libs/rubymods/activesupport-rb.info 
Thu Dec 13 05:00:11 2007
@@ -1,7 +1,7 @@
 Info2: <<
 Package: activesupport-rb%type_pkg[ruby]
 Version: 2.0.1
-Revision: 2
+Revision: 3
 Type: ruby (1.8)
 Description: Utility classes for Rails
 License: BSD
@@ -9,11 +9,11 @@
 
 # Dependencies:
 Depends: <<
-       libgems-rb%type_pkg[ruby] (>= 0.9.5-1),
+       libgems-rb%type_pkg[ruby] (>= 0.9.5-2),
        ruby%type_pkg[ruby]
 <<
 BuildDepends: <<
-       rubygems-rb%type_pkg[ruby] (>= 0.9.5-1),
+       rubygems-rb%type_pkg[ruby] (>= 0.9.5-2),
        ruby%type_pkg[ruby]-dev
 <<
 

Modified: 
trunk/experimental/common/main/finkinfo/libs/rubymods/compositekeys-rb.info
URL: 
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/libs/rubymods/compositekeys-rb.info&rev=1077&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/rubymods/compositekeys-rb.info 
(original)
+++ trunk/experimental/common/main/finkinfo/libs/rubymods/compositekeys-rb.info 
Thu Dec 13 05:00:11 2007
@@ -1,7 +1,7 @@
 Info2: <<
 Package: compositekeys-rb%type_pkg[ruby]
 Version: 0.9.0
-Revision: 2
+Revision: 3
 Type: ruby (1.8)
 Description: Composite primary keys for ActiveRecord
 License: BSD
@@ -11,13 +11,13 @@
 Depends: <<
        activerecord-rb%type_pkg[ruby] (>= 2.0.1-1),
        activesupport-rb%type_pkg[ruby] (>= 2.0.1-1),
-       libgems-rb%type_pkg[ruby] (>= 0.9.5-1),
+       libgems-rb%type_pkg[ruby] (>= 0.9.5-2),
        ruby%type_pkg[ruby]
 <<
 BuildDepends: <<
        activerecord-rb%type_pkg[ruby] (>= 2.0.1-1),
        activesupport-rb%type_pkg[ruby] (>= 2.0.1-1),
-       rubygems-rb%type_pkg[ruby] (>= 0.9.5-1),
+       rubygems-rb%type_pkg[ruby] (>= 0.9.5-2),
        ruby%type_pkg[ruby]-dev
 <<
 

Modified: trunk/experimental/common/main/finkinfo/libs/rubymods/libgems-rb.info
URL: 
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/libs/rubymods/libgems-rb.info&rev=1077&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/rubymods/libgems-rb.info 
(original)
+++ trunk/experimental/common/main/finkinfo/libs/rubymods/libgems-rb.info Thu 
Dec 13 05:00:11 2007
@@ -1,7 +1,7 @@
 Info2: <<
 Package: libgems-rb%type_pkg[ruby]
 Version: 0.9.5
-Revision: 1
+Revision: 2
 Type: ruby (1.6 1.8)
 Description: Package management framework for Ruby
 Homepage: http://rubygems.rubyforge.org/
@@ -19,15 +19,15 @@
 # Patch Phase.
 PatchScript: <<
 #!/bin/sh -ex
-  sed \
-    -e 's|@PREFIX@|%p|g' \
-    -e 's|@INSTALL_DIR@|%i|' %a/%{ni}.patch \
-    > rubygems.patch
-  patch -p1 < rubygems.patch
-  rm rubygems.patch
+       sed \
+               -e 's|@PREFIX@|%p|g' \
+               -e 's|@INSTALL_DIR@|%i|' %a/%{ni}.patch \
+               > rubygems.patch
+       patch -p1 < rubygems.patch
+       rm rubygems.patch
 
-  find . -type f -print0 \
-    | xargs -0 perl -w -p -i -e 's:^#!.*ruby.*:#!%p/bin/ruby%type_raw[ruby]:'
+       find . -type f -print0 \
+               | xargs -0 perl -w -p -i -e 
's:^#!.*ruby.*:#!%p/bin/ruby%type_raw[ruby]:'
 <<
 
 # Compile Phase.
@@ -36,70 +36,72 @@
 # Install Phase.
 InstallScript: <<
 #!/bin/sh -ex
-  RUBYLIBDIR=`%p/bin/ruby%type_raw[ruby] -rrbconfig -e "puts 
Config::CONFIG['rubylibdir']"`
-  mkdir -p %i/var/lib/gems/%type_raw[ruby]
-  %p/bin/ruby%type_raw[ruby] -I lib setup.rb install --prefix "%i" 
--sitelibdir "$RUBYLIBDIR"
-  rm -f %i/bin/update_rubygems
+       RUBYLIBDIR=`%p/bin/ruby%type_raw[ruby] -rrbconfig -e "puts 
Config::CONFIG['rubylibdir']"`
+       install -d "%i/var/lib/gems/%type_raw[ruby]"
+       install -d "%d$RUBYLIBDIR"
+       %p/bin/ruby%type_raw[ruby] -I lib setup.rb install --prefix "%i"
+       mv %i/lib/rbconfig* %i/lib/rubygems* %I/lib/ubygems* "%d$RUBYLIBDIR"
+       rm -f %i/bin/update_rubygems
 
-  mkdir -p %i/share/%n/examples
-  cp -R examples/ %i/share/%n/examples
+       mkdir -p %i/share/%n/examples
+       cp -R examples/ %i/share/%n/examples
 <<
 DocFiles: ChangeLog GPL* LICENSE* README TODO
 
 SplitOff: <<
-  Description: Package management framework for Ruby (binaries)
-  Package: rubygems-rb%type_pkg[ruby]
-  Depends: libgems-rb%type_pkg[ruby], ruby%type_pkg[ruby], (%type_raw[ruby] = 
1.6) ruby (>= 1.6), (%type_raw[ruby] = 1.6) ruby (<< 1.7), (%type_raw[ruby] = 
1.8) ruby (>= 1.8), (%type_raw[ruby] = 1.8) ruby (<< 1.9)
-  Conflicts: rubygems-rb16, rubygems-rb18
-  Replaces: rubygems-rb16, rubygems-rb18
-  DocFiles: ChangeLog GPL* LICENSE* README TODO
-  Files: bin
+       Description: Package management framework for Ruby (binaries)
+       Package: rubygems-rb%type_pkg[ruby]
+       Depends: libgems-rb%type_pkg[ruby], ruby%type_pkg[ruby], 
(%type_raw[ruby] = 1.6) ruby (>= 1.6), (%type_raw[ruby] = 1.6) ruby (<< 1.7), 
(%type_raw[ruby] = 1.8) ruby (>= 1.8), (%type_raw[ruby] = 1.8) ruby (<< 1.9)
+       Conflicts: rubygems-rb16, rubygems-rb18
+       Replaces: rubygems-rb16, rubygems-rb18
+       DocFiles: ChangeLog GPL* LICENSE* README TODO
+       Files: bin
 <<
 
 PreInstScript: <<
-  LIBDIR=`%p/bin/ruby%type_raw[ruby] -rrbconfig -e "puts 
Config::CONFIG['libdir']"`
-  OLD_GEMS_DIR="$LIBDIR/ruby/gems"
-  OLD_GEMS_AND_VER_DIR="$OLD_GEMS_DIR/%type_raw[ruby]"
-  if test -d "$OLD_GEMS_AND_VER_DIR"; then
-    echo ""
-    echo "*******"
-    echo "You currently have or had an older version of the"
-    echo "rubygems-rb%type_pkg[ruby] package installed which stored the"
-    echo "gems into $OLD_GEMS_AND_VER_DIR."
-    echo ""
-    echo "The new location of the gems is %p/var/lib/gems/%type_raw[ruby]."
-    echo "The old gem directory and all of the contained gems"
-    echo "are going to be removed now.  You will need to reinstall"
-    echo "all of your locally installed gems, which are:"
-    echo ""
-    /bin/ls -1 $OLD_GEMS_AND_VER_DIR/gems
-    echo ""
-    echo "Please make a note of this list so you can reinstall"
-    echo "them.  Note that the 'sources' gem does not need to"
-    echo "be reinstalled, as it comes installed with the new"
-    echo "package."
-    echo ""
-    echo "Press return to continue."
-    echo "*******"
-    read
-    echo "Removing $OLD_GEMS_AND_VER_DIR"
-    rm -frv $OLD_GEMS_AND_VER_DIR
-    rmdir $OLD_GEMS_DIR 2>/dev/null
-  fi
+       LIBDIR=`%p/bin/ruby%type_raw[ruby] -rrbconfig -e "puts 
Config::CONFIG['libdir']"`
+       OLD_GEMS_DIR="$LIBDIR/ruby/gems"
+       OLD_GEMS_AND_VER_DIR="$OLD_GEMS_DIR/%type_raw[ruby]"
+       if test -d "$OLD_GEMS_AND_VER_DIR"; then
+               echo ""
+               echo "*******"
+               echo "You currently have or had an older version of the"
+               echo "rubygems-rb%type_pkg[ruby] package installed which stored 
the"
+               echo "gems into $OLD_GEMS_AND_VER_DIR."
+               echo ""
+               echo "The new location of the gems is 
%p/var/lib/gems/%type_raw[ruby]."
+               echo "The old gem directory and all of the contained gems"
+               echo "are going to be removed now.      You will need to 
reinstall"
+               echo "all of your locally installed gems, which are:"
+               echo ""
+               /bin/ls -1 $OLD_GEMS_AND_VER_DIR/gems
+               echo ""
+               echo "Please make a note of this list so you can reinstall"
+               echo "them.     Note that the 'sources' gem does not need to"
+               echo "be reinstalled, as it comes installed with the new"
+               echo "package."
+               echo ""
+               echo "Press return to continue."
+               echo "*******"
+               read
+               echo "Removing $OLD_GEMS_AND_VER_DIR"
+               rm -frv $OLD_GEMS_AND_VER_DIR
+               rmdir $OLD_GEMS_DIR 2>/dev/null
+       fi
 <<
 
 PostRmScript: <<
-  case "$1" in
-    purge)
-      rm -rf %p/var/lib/gems/%type_raw[ruby]
-      ;;
-    remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-      ;;
-    *)
-      echo "postrm called with unknown argument '$1'" >&2
-      exit 1
-      ;;
-  esac
+       case "$1" in
+               purge)
+                       rm -rf %p/var/lib/gems/%type_raw[ruby]
+                       ;;
+               
remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+                       ;;
+               *)
+                       echo "postrm called with unknown argument '$1'" >&2
+                       exit 1
+                       ;;
+       esac
 <<
 
 # Additional Documentation.

Modified: trunk/experimental/common/main/finkinfo/libs/rubymods/libgems-rb.patch
URL: 
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/libs/rubymods/libgems-rb.patch&rev=1077&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/rubymods/libgems-rb.patch 
(original)
+++ trunk/experimental/common/main/finkinfo/libs/rubymods/libgems-rb.patch Thu 
Dec 13 05:00:11 2007
@@ -1,6 +1,5 @@
-diff -uNr rubygems-0.9.5/lib/rubygems/source_index.rb 
rubygems-0.9.5-new/lib/rubygems/source_index.rb
 --- rubygems-0.9.5/lib/rubygems/source_index.rb        2007-11-17 
01:23:34.000000000 -0500
-+++ rubygems-0.9.5-new/lib/rubygems/source_index.rb    2007-12-08 
09:28:08.000000000 -0500
++++ rubygems-0.9.5-new/lib/rubygems/source_index.rb    2007-12-12 
11:55:15.000000000 -0500
 @@ -220,7 +220,7 @@
        else
          version_requirement = platform_only_or_version_req ||
@@ -10,9 +9,8 @@
        end
  
        unless Gem::Requirement === version_requirement then
-diff -uNr rubygems-0.9.5/lib/rubygems.rb rubygems-0.9.5-new/lib/rubygems.rb
 --- rubygems-0.9.5/lib/rubygems.rb     2007-11-13 16:18:38.000000000 -0500
-+++ rubygems-0.9.5-new/lib/rubygems.rb 2007-12-08 09:29:21.000000000 -0500
++++ rubygems-0.9.5-new/lib/rubygems.rb 2007-12-12 11:55:15.000000000 -0500
 @@ -531,7 +531,8 @@
        if defined? RUBY_FRAMEWORK_VERSION
          return File.join(File.dirname(Config::CONFIG["sitedir"]), "Gems", 
Config::CONFIG['ruby_version'])

Modified: trunk/experimental/common/main/finkinfo/libs/rubymods/rails-rb.info
URL: 
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/libs/rubymods/rails-rb.info&rev=1077&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/rubymods/rails-rb.info 
(original)
+++ trunk/experimental/common/main/finkinfo/libs/rubymods/rails-rb.info Thu Dec 
13 05:00:11 2007
@@ -1,7 +1,7 @@
 Info2: <<
 Package: rails-rb%type_pkg[ruby]
 Version: 2.0.1
-Revision: 2
+Revision: 3
 Type: ruby (1.8)
 Description: MVC web application framework
 License: BSD
@@ -15,7 +15,7 @@
        activeresource-rb%type_pkg[ruby] (>= 2.0.1-1),
        activesupport-rb%type_pkg[ruby] (>= 2.0.1-1),
        rake-rb%type_pkg[ruby] (>= 0.7.3-1),
-       libgems-rb%type_pkg[ruby] (>= 0.9.5-1),
+       libgems-rb%type_pkg[ruby] (>= 0.9.5-2),
        ruby%type_pkg[ruby]
 <<
 BuildDepends: <<
@@ -25,7 +25,7 @@
        activerecord-rb%type_pkg[ruby] (>= 2.0.1-1),
        activeresource-rb%type_pkg[ruby] (>= 2.0.1-1),
        activesupport-rb%type_pkg[ruby] (>= 2.0.1-1),
-       rubygems-rb%type_pkg[ruby] (>= 0.9.5-1),
+       rubygems-rb%type_pkg[ruby] (>= 0.9.5-2),
        rake-rb%type_pkg[ruby] (>= 0.7.3-1),
        ruby%type_pkg[ruby]-dev
 <<

Modified: trunk/experimental/common/main/finkinfo/libs/rubymods/rake-rb.info
URL: 
http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/libs/rubymods/rake-rb.info&rev=1077&repname=user%3a+ranger
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/rubymods/rake-rb.info 
(original)
+++ trunk/experimental/common/main/finkinfo/libs/rubymods/rake-rb.info Thu Dec 
13 05:00:11 2007
@@ -1,14 +1,14 @@
 Info2: <<
 Package: rake-rb%type_pkg[ruby]
 Version: 0.7.3
-Revision: 1
+Revision: 2
 Type: ruby (1.8)
 Description: Make-like utility for Ruby
 License: BSD
 Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
 
 # Dependencies:
-Depends: rubygems-rb%type_pkg[ruby], ruby%type_pkg[ruby]
+Depends: libgems-rb%type_pkg[ruby], ruby%type_pkg[ruby]
 BuildDepends: rubygems-rb%type_pkg[ruby], ruby%type_pkg[ruby]-dev
 
 # Unpack Phase:


-------------------------------------------------------------------------
SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services
for just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to