diff options
author | jmc <jmc> | 2001-12-16 08:18:18 +0000 |
---|---|---|
committer | jmc <jmc> | 2001-12-16 08:18:18 +0000 |
commit | 74381fbb175a1395c3d0de9556af2dcf4866afd7 (patch) | |
tree | ae3d66c0fbd67260678fbea6fb95edabea06caa8 | |
parent | e8f26c6fc8ad015bbd6c3178bfce152a17e71dfe (diff) | |
download | pkgsrc-74381fbb175a1395c3d0de9556af2dcf4866afd7.tar.gz |
Fix patch so it doesn't try and treat x11-links as -links
-rw-r--r-- | x11/ruby-gtk/Makefile | 5 | ||||
-rw-r--r-- | x11/ruby-gtk/distinfo | 4 | ||||
-rw-r--r-- | x11/ruby-gtk/patches/patch-aa | 4 |
3 files changed, 6 insertions, 7 deletions
diff --git a/x11/ruby-gtk/Makefile b/x11/ruby-gtk/Makefile index d889be30019..a3249bc8285 100644 --- a/x11/ruby-gtk/Makefile +++ b/x11/ruby-gtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2001/09/27 23:19:02 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2001/12/16 08:18:18 jmc Exp $ # FreeBSD: ports/x11-toolkits/ruby-gtk/Makefile,v 1.16 2000/10/15 15:45:59 knu Exp DISTNAME= ruby-gtk-0.25 @@ -14,7 +14,6 @@ WRKSRC= ${WRKDIR}/${DISTNAME:S/ruby-//} DIST_SUBDIR= ruby USE_RUBY_EXTCONF= yes -USE_X11= yes INSTALL_TARGET= site-install @@ -24,7 +23,7 @@ DOCS_EN= README README.EXT doc/rbbr.rb DOCS_JA= README.ja README.EXT.ja do-configure: - @(cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${RUBY} extconf.rb) + (cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${RUBY} extconf.rb) post-install: ${INSTALL_DATA_DIR} ${RUBY_EXAMPLESDIR}/gtk diff --git a/x11/ruby-gtk/distinfo b/x11/ruby-gtk/distinfo index bfe99b7eead..10248728ece 100644 --- a/x11/ruby-gtk/distinfo +++ b/x11/ruby-gtk/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.3 2001/06/30 15:23:01 taca Exp $ +$NetBSD: distinfo,v 1.4 2001/12/16 08:18:18 jmc Exp $ SHA1 (ruby/ruby-gtk-0.25.tar.gz) = 8ccf112fd7c760a3bed9e9c59addb48735be22c0 Size (ruby/ruby-gtk-0.25.tar.gz) = 257279 bytes -SHA1 (patch-aa) = 407cbbb3630647417276adf3318ada48a1fe1246 +SHA1 (patch-aa) = b9aa5335a9c5563b00c01559c4d047458a87339d diff --git a/x11/ruby-gtk/patches/patch-aa b/x11/ruby-gtk/patches/patch-aa index 6f75d411c3b..9dc2fbb01dc 100644 --- a/x11/ruby-gtk/patches/patch-aa +++ b/x11/ruby-gtk/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.4 2001/06/30 15:23:02 taca Exp $ +$NetBSD: patch-aa,v 1.5 2001/12/16 08:18:18 jmc Exp $ --- extconf.rb.orig Thu Feb 15 17:49:31 2001 +++ extconf.rb @@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.4 2001/06/30 15:23:02 taca Exp $ if not version.chomp.empty? config_libs, config_cflags = "--libs", "--cflags" - $LDFLAGS, *libs = `#{config_cmd} #{config_libs}`.chomp.split(/(-l.*)/) -+ $LDFLAGS, *libs = `#{config_cmd} #{config_libs}`.chomp.gsub("-Wl,", "").split(/(-l.*)/) ++ $LDFLAGS, *libs = `#{config_cmd} #{config_libs}`.chomp.gsub("-Wl,", "").split(/( -l.*)/) $libs = libs.join(' ') + ' ' + $libs $CFLAGS = `#{config_cmd} #{config_cflags}`.chomp break |