diff options
author | knu <knu@FreeBSD.org> | 2002-03-20 20:34:39 +0800 |
---|---|---|
committer | knu <knu@FreeBSD.org> | 2002-03-20 20:34:39 +0800 |
commit | 45f8a8857c0ebbf591fa9f98c1b3ceb792c87bc7 (patch) | |
tree | 147ac22b7afdcad56efb4c94310b3d2baadea632 /graphics | |
parent | 332f9f402bd8ab551c19e4410c174828c2fc7dbb (diff) | |
download | freebsd-ports-gnome-45f8a8857c0ebbf591fa9f98c1b3ceb792c87bc7.tar.gz freebsd-ports-gnome-45f8a8857c0ebbf591fa9f98c1b3ceb792c87bc7.tar.zst freebsd-ports-gnome-45f8a8857c0ebbf591fa9f98c1b3ceb792c87bc7.zip |
Update ruby-{gnome,gtk,gdk_imlib,gdk_pixbuf} to 0.27.
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/ruby-gdk_imlib/Makefile | 3 | ||||
-rw-r--r-- | graphics/ruby-gdk_imlib/files/patch-extconf.rb | 11 | ||||
-rw-r--r-- | graphics/ruby-gdk_pixbuf/files/patch-extconf.rb | 42 | ||||
-rw-r--r-- | graphics/ruby-gdk_pixbuf2/files/patch-extconf.rb | 42 |
4 files changed, 6 insertions, 92 deletions
diff --git a/graphics/ruby-gdk_imlib/Makefile b/graphics/ruby-gdk_imlib/Makefile index 5b47ad1dbff9..76f29faff8b5 100644 --- a/graphics/ruby-gdk_imlib/Makefile +++ b/graphics/ruby-gdk_imlib/Makefile @@ -28,8 +28,7 @@ USE_IMLIB= yes WRKSRC= ${RUBY_GNOME_WRKSRC}/${PORTNAME} INSTALL_TARGET= site-install -CONFIGURE_ARGS= --with-glib-config="${GLIB_CONFIG}" \ - --with-imlib-config="${IMLIB_CONFIG}" +CONFIGURE_ARGS= --with-imlib-config="${IMLIB_CONFIG}" DOCS_EN= ChangeLog diff --git a/graphics/ruby-gdk_imlib/files/patch-extconf.rb b/graphics/ruby-gdk_imlib/files/patch-extconf.rb index 2af7fa76438f..a4c2e4bbbc8f 100644 --- a/graphics/ruby-gdk_imlib/files/patch-extconf.rb +++ b/graphics/ruby-gdk_imlib/files/patch-extconf.rb @@ -1,11 +1,10 @@ ---- extconf.rb.orig Sat Jun 3 23:56:38 2000 -+++ extconf.rb Wed Feb 28 20:53:13 2001 -@@ -1,27 +1,26 @@ +--- extconf.rb.orig Thu Oct 4 11:13:45 2001 ++++ extconf.rb Wed Mar 20 20:59:11 2002 +@@ -1,27 +1,25 @@ require 'mkmf' -rubygtk_dir = "../gtk" -rubygtk_dir = ARGV[0] if ARGV[0] -+glib_config = with_config("glib-config", "glib-config") +imlib_config = with_config("imlib-config", "imlib-config") + +while /^--/ =~ ARGV[0] @@ -26,8 +25,8 @@ -$CFLAGS = "-g -I#{rubygtk_dir}/src " + `imlib-config --cflags-gdk`.chomp -$LDFLAGS = `imlib-config --libs-gdk`.chomp -+$CFLAGS += "-g -I#{rubygtk_dir}/src " + `#{glib_config} --cflags`.chomp + ' ' + `#{imlib_config} --cflags-gdk`.chomp -+$LDFLAGS += `#{glib_config} --libs`.chomp + ' ' + `#{imlib_config} --libs-gdk`.chomp ++$CFLAGS += "-g -I#{rubygtk_dir}/src " + `#{imlib_config} --cflags-gdk`.chomp ++$LDFLAGS += `#{imlib_config} --libs-gdk`.chomp have_library("X11", "XOpenDisplay") && have_library("Xi", "XOpenDevice") && diff --git a/graphics/ruby-gdk_pixbuf/files/patch-extconf.rb b/graphics/ruby-gdk_pixbuf/files/patch-extconf.rb deleted file mode 100644 index e2e658733ba7..000000000000 --- a/graphics/ruby-gdk_pixbuf/files/patch-extconf.rb +++ /dev/null @@ -1,42 +0,0 @@ ---- extconf.rb.orig Sat Oct 6 07:46:27 2001 -+++ extconf.rb Wed Nov 21 01:17:41 2001 -@@ -1,26 +1,25 @@ - require 'mkmf' - --rubygtk_dir = "../gtk" --rubygtk_dir = ARGV[0] if ARGV[0] -+glib_config = with_config("glib-config", "glib-config") -+gdk_pixbuf_config = with_config("gdk-pixbuf-config", "gdk-pixbuf-config") -+ -+while /^--/ =~ ARGV[0] -+ ARGV.shift -+end -+ -+rubygtk_dir = ARGV.shift || "../gtk" - unless FileTest.exist?(rubygtk_dir) - raise "Directory #{rubygtk_dir} not found. Please specify Ruby/Gtk source dir." - end --gtklib_dir = [] --`gtk-config --libs`.split(' ').each do |e| -- if e=~ /^-L/ then -- gtklib_dir.push(e) -- end --end - --$CFLAGS = "-I#{rubygtk_dir}/src " + `gdk-pixbuf-config --cflags`.chomp --$LDFLAGS = `gdk-pixbuf-config --libs`.chomp -+$CFLAGS += "-I#{rubygtk_dir}/src " + `#{glib_config} --cflags`.chomp + ' ' + `#{gdk_pixbuf_config} --cflags`.chomp -+$LDFLAGS += `#{glib_config} --libs`.chomp + ' ' + `#{gdk_pixbuf_config} --libs`.chomp - - have_library("X11", "XOpenDisplay") && - have_library("Xi", "XOpenDevice") && - have_library("Xext", "XextFindDisplay") && - have_library("Xmu", "XmuInternAtom") && --have_library("glib", "g_print") && --have_library("gdk", "gdk_init") && --have_library("gdk_pixbuf", "gdk_pixbuf_new") && -- -+have_func("g_print") && -+have_func("gdk_init") && -+have_func("gdk_pixbuf_new") && - create_makefile('gdk_pixbuf') diff --git a/graphics/ruby-gdk_pixbuf2/files/patch-extconf.rb b/graphics/ruby-gdk_pixbuf2/files/patch-extconf.rb deleted file mode 100644 index e2e658733ba7..000000000000 --- a/graphics/ruby-gdk_pixbuf2/files/patch-extconf.rb +++ /dev/null @@ -1,42 +0,0 @@ ---- extconf.rb.orig Sat Oct 6 07:46:27 2001 -+++ extconf.rb Wed Nov 21 01:17:41 2001 -@@ -1,26 +1,25 @@ - require 'mkmf' - --rubygtk_dir = "../gtk" --rubygtk_dir = ARGV[0] if ARGV[0] -+glib_config = with_config("glib-config", "glib-config") -+gdk_pixbuf_config = with_config("gdk-pixbuf-config", "gdk-pixbuf-config") -+ -+while /^--/ =~ ARGV[0] -+ ARGV.shift -+end -+ -+rubygtk_dir = ARGV.shift || "../gtk" - unless FileTest.exist?(rubygtk_dir) - raise "Directory #{rubygtk_dir} not found. Please specify Ruby/Gtk source dir." - end --gtklib_dir = [] --`gtk-config --libs`.split(' ').each do |e| -- if e=~ /^-L/ then -- gtklib_dir.push(e) -- end --end - --$CFLAGS = "-I#{rubygtk_dir}/src " + `gdk-pixbuf-config --cflags`.chomp --$LDFLAGS = `gdk-pixbuf-config --libs`.chomp -+$CFLAGS += "-I#{rubygtk_dir}/src " + `#{glib_config} --cflags`.chomp + ' ' + `#{gdk_pixbuf_config} --cflags`.chomp -+$LDFLAGS += `#{glib_config} --libs`.chomp + ' ' + `#{gdk_pixbuf_config} --libs`.chomp - - have_library("X11", "XOpenDisplay") && - have_library("Xi", "XOpenDevice") && - have_library("Xext", "XextFindDisplay") && - have_library("Xmu", "XmuInternAtom") && --have_library("glib", "g_print") && --have_library("gdk", "gdk_init") && --have_library("gdk_pixbuf", "gdk_pixbuf_new") && -- -+have_func("g_print") && -+have_func("gdk_init") && -+have_func("gdk_pixbuf_new") && - create_makefile('gdk_pixbuf') |