Date: Thu, 8 Oct 2009 06:27:27 -0800 (AKDT) From: Mel <mel@rachie.is-a-geek.net> To: FreeBSD-gnats-submit@FreeBSD.org Cc: MAINTAINER <datahead4@gmail.com> Subject: ports/139438: [PATCH] audio/liblastfm: Fix build with ruby>=1.9 Message-ID: <20091008142727.AD5172283B@smell.akgeeks.com> Resent-Message-ID: <200910081920.n98JK2XM059426@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 139438
>Category: ports
>Synopsis: [PATCH] audio/liblastfm: Fix build with ruby>=1.9
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Thu Oct 08 19:20:02 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: Mel
>Release: FreeBSD 7.2-RELEASE-p4 amd64
>Organization:
>Environment:
System: FreeBSD smell.lan.akgeeks.org 7.2-RELEASE-p4 FreeBSD 7.2-RELEASE-p4 #0 r197770M: Mon Oct 5 06:53:57 AKDT 2009 mdev@smell.lan.akgeeks.org:/usr/obj/usr/src/sys/GENERIC amd64
>Description:
lang/ruby18 currently does not build in IA32 jail on amd64, so I'm forced to use
lang/ruby19, yet audio/liblastfm's build system uses ftools, which has been
replaced by fileutils.
>How-To-Repeat:
make -C /usr/ports/lang/ruby19 RUBY_DEFAULT_VER=1.9 install && \
make -C /usr/ports/audio/liblastfm configure
(configure finishes, but no Makefile created so build fails with no target to
make).
>Fix:
--- patch-audio_liblastfm_Makefile begins here ---
Index: audio/liblastfm/Makefile
===================================================================
RCS file: /home/ncvs/ports/audio/liblastfm/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- audio/liblastfm/Makefile 5 Sep 2009 12:31:33 -0000 1.5
+++ audio/liblastfm/Makefile 8 Oct 2009 14:16:04 -0000
@@ -28,6 +28,7 @@
USE_LDCONFIG= yes
+.include <bsd.port.pre.mk>
post-extract:
${REINPLACE_CMD} -e 's|#!/usr/bin/ruby|#!${LOCALBASE}/bin/ruby|' ${WRKSRC}/configure
${REINPLACE_CMD} -e 's|__demos __tests||' ${WRKSRC}/admin/Makefile.rb
@@ -35,5 +36,8 @@
-e 's|linux:|unix:|' ${WRKSRC}/.qmake.cache
${FIND} ${WRKSRC}/admin -type f | ${XARGS} \
${REINPLACE_CMD} -e 's|#!/usr/bin/ruby|#!${LOCALBASE}/bin/ruby|'
+.if ${RUBY_VERSION_CODE} >= 190000
+ ${REINPLACE_CMD} -e "s|'ftools'|'fileutils'|" ${WRKSRC}/admin/qpp ${WRKSRC}/admin/Makefile.rb
+.endif
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
--- patch-audio_liblastfm_Makefile ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20091008142727.AD5172283B>