audio/amarok: make TRYBROKEN=yes reinstall worked!

Steve Wills swills at FreeBSD.org
Sat Aug 27 15:24:47 UTC 2011 

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 08/27/11 10:37, Conrad J. Sabatier wrote:
> On Sat, 27 Aug 2011 12:22:56 +0300
> Andriy Gapon <avg at freebsd.org> wrote:
> 
>> on 27/08/2011 12:03 Matthias Andree said the following:
>> ...
>>> .if ${RUBY_VER} == 1.9
>>> BROKEN=	does not build with ruby 1.9
>>             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
>>> .endif
>> ...
>>> - does your newly-built Amarok _use_ Ruby? Or did the configuration
>>> or build weazel out of it?
>>>
>>> - do Ruby-related features _work properly_ in your Amarok build?
>>>
>>> Then and only then we can remove this BROKEN= tag.
>>
>> I'd think that it would be sufficient to fix the reason why the
>> BROKEN line was added in the first place.
>>
> 
> Perhaps not.  At Chris Rees' suggestion, I deinstalled ruby18 and tried
> building amarok again.  No dice.
> 
> It seems that the paths to the ruby includes amarok's configure script
> is looking for differ in ruby19.  Grrrr!
> 

I just happen to be working on fixing this. Please try the attached
patch, also available here:

http://people.freebsd.org/~swills/amarok_patch.txt

This corrects the build for me. If you can confirm that and also that
the port works properly, I'll commit this.

Steve

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (FreeBSD)

iQEcBAEBAgAGBQJOWQw2AAoJEPXPYrMgexuhwWIH/j2XMNZ7zjelv0LtTBqxasZA
nJcyLhw/XVbo3bCVfoxxxjkZoDAsrhT/0ewUWNKfvHZdaN6rdLVesdD28QBDTG/C
wNLKzTJ5lf0kigUBpAVAQgXSxUzIPkvCMtjkWjI/zCPPP47TDUu0tAgVK1rE7OKH
Bm8TECZsSv/v0pzFUhKluVWj/nzHty4LuPX2MZlo9gassFtNgIIVaKYOMnDleG18
4qVHT8im6vPfPySspwfBLT63MCS7F+g93jfiCaZO+o46Tzc5TcDkDDDS6Nb8+4ez
cpB/HtsGGiRu60xsLHWcTEFpEVBZ5pk4g1NXN3lNprlLqqyHgHqJmN8WlvrJi7k=
=MXDo
-----END PGP SIGNATURE-----
-------------- next part --------------
Index: audio/amarok/Makefile
===================================================================
RCS file: /home/ncvs/ports/audio/amarok/Makefile,v
retrieving revision 1.107
diff -u -r1.107 Makefile
--- audio/amarok/Makefile	29 Jul 2011 17:53:20 -0000	1.107
+++ audio/amarok/Makefile	27 Aug 2011 14:52:15 -0000
@@ -43,14 +43,12 @@
 
 .include <bsd.port.pre.mk>
 
-.if ${RUBY_VER} == 1.9
-BROKEN=	does not build with ruby 1.9
-.endif
-
 CONFIGURE_ARGS+=--without-exscalibar \
 		--with-mp4v2 \
 		--with-mp4v2-dir=${PREFIX}
 
+CFLAGS+=	-I${LOCALBASE}/include/ruby-${RUBY_VER} -I${LOCALBASE}/include/ruby-${RUBY_VER}/${RUBY_ARCH}
+
 .if !defined(WITH_GPOD)
 PLIST_SUB+=	GPOD="@comment "
 CONFIGURE_ARGS+=--without-libgpod
Index: audio/amarok/files/patch-amarok_src_mediadevice_daap_mongrel_http11_http11.c
===================================================================
RCS file: audio/amarok/files/patch-amarok_src_mediadevice_daap_mongrel_http11_http11.c
diff -N audio/amarok/files/patch-amarok_src_mediadevice_daap_mongrel_http11_http11.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ audio/amarok/files/patch-amarok_src_mediadevice_daap_mongrel_http11_http11.c	27 Aug 2011 14:58:56 -0000
@@ -0,0 +1,48 @@
+--- ./amarok/src/mediadevice/daap/mongrel/http11/http11.c.orig	2011-08-27 14:56:26.000000000 +0000
++++ ./amarok/src/mediadevice/daap/mongrel/http11/http11.c	2011-08-27 14:58:15.000000000 +0000
+@@ -74,7 +74,7 @@
+   f = rb_str_dup(global_http_prefix);
+   f = rb_str_buf_cat(f, field, flen); 
+ 
+-  for(ch = RSTRING(f)->ptr, end = ch + RSTRING(f)->len; ch < end; ch++) {
++  for(ch = RSTRING_PTR(f), end = ch + RSTRING_LEN(f); ch < end; ch++) {
+     if(*ch == '-') {
+       *ch = '_';
+     } else {
+@@ -157,12 +157,12 @@
+ 
+   rb_hash_aset(req, global_gateway_interface, global_gateway_interface_value);
+   if((temp = rb_hash_aref(req, global_http_host)) != Qnil) {
+-    colon = strchr(RSTRING(temp)->ptr, ':');
++    colon = strchr(RSTRING_PTR(temp), ':');
+     if(colon != NULL) {
+-      rb_hash_aset(req, global_server_name, rb_str_substr(temp, 0, colon - RSTRING(temp)->ptr));
++      rb_hash_aset(req, global_server_name, rb_str_substr(temp, 0, colon - RSTRING_PTR(temp)));
+       rb_hash_aset(req, global_server_port, 
+-          rb_str_substr(temp, colon - RSTRING(temp)->ptr+1, 
+-            RSTRING(temp)->len));
++          rb_str_substr(temp, colon - RSTRING_PTR(temp)+1, 
++            RSTRING_LEN(temp)));
+     } else {
+       rb_hash_aset(req, global_server_name, temp);
+       rb_hash_aset(req, global_server_port, global_port_80);
+@@ -281,8 +281,8 @@
+   DATA_GET(self, http_parser, http);
+ 
+   from = FIX2INT(start);
+-  dptr = RSTRING(data)->ptr;
+-  dlen = RSTRING(data)->len;
++  dptr = RSTRING_PTR(data);
++  dlen = RSTRING_LEN(data);
+ 
+   if(from >= dlen) {
+     rb_raise(eHttpParserError, "Requested start is after data buffer end.");
+@@ -512,7 +512,7 @@
+     if(pref_len == 1 && uri_str[0] == '/') {
+       rb_ary_push(result, uri);
+     } else {
+-      rb_ary_push(result, rb_str_substr(uri, pref_len, RSTRING(uri)->len));
++      rb_ary_push(result, rb_str_substr(uri, pref_len, RSTRING_LEN(uri)));
+     }
+ 
+     rb_ary_push(result, (VALUE)handler);
Index: audio/amarok/files/patch-configure
===================================================================
RCS file: /home/ncvs/ports/audio/amarok/files/patch-configure,v
retrieving revision 1.4
diff -u -r1.4 patch-configure
--- audio/amarok/files/patch-configure	2 Aug 2009 19:32:11 -0000	1.4
+++ audio/amarok/files/patch-configure	27 Aug 2011 14:49:41 -0000
@@ -32,3 +32,12 @@
  
  
    succeeded=no
+@@ -40872,7 +40872,7 @@
+ 
+ 
+ OLDCFLAGS="$CFLAGS"
+-CFLAGS="-I$ruby_includes -Wall"
++CFLAGS+="-I$ruby_includes -Wall"
+ OLDCPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="-I$ruby_includes" #no I don't know why CPPFLAGS is used
+ 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: amarok_patch.txt.sig
Type: application/octet-stream
Size: 287 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/freebsd-ports/attachments/20110827/5c39105b/amarok_patch.txt.obj

More information about the freebsd-ports mailing list