Date: Mon, 5 Mar 2007 13:39:26 GMT From: "Rashid N. Achilov"<achilov-rn@askd.ru> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/109918: Amarok without ruby dependency Message-ID: <200703051339.l25DdQiS003100@www.freebsd.org> Resent-Message-ID: <200703051340.l25DeAKY051439@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 109918
>Category: ports
>Synopsis: Amarok without ruby dependency
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Mar 05 13:40:10 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: Rashid N. Achilov
>Release: 6.2-RELEASE
>Organization:
LLC "AS-System Complex"
>Environment:
FreeBSD to-495.askd.ru 6.2-RELEASE FreeBSD 6.2-RELEASE #3: Fri Feb 16 18:47:32 NOVT 2007 root@to-495.askd.ru:/usr/obj/usr/src/sys/Sentry i386
>Description:
amarok need ruby. But amarok need it only for some secondary and useless (for me) comnponents. I have spent some time, dig amarok sources and produce patch to switch off ruby dependency. This patch is dirty, real way should correct amarok configure script.
>How-To-Repeat:
Try to install amarok and notify, that it need ruby...
>Fix:
Patch attached with submission follows:
diff -ruN amarok.old.old/Makefile amarok.old/Makefile
--- amarok.old.old/Makefile Sun Feb 18 17:20:25 2007
+++ amarok.old/Makefile Mon Mar 5 19:10:39 2007
@@ -26,12 +26,13 @@
USE_GMAKE= yes
USE_AUTOTOOLS= libtool:15
USE_SDL= sdl
-USE_RUBY= yes
USE_LDCONFIG= yes
OPTIONS= GPOD "iPod support" on \
NJB "Creative Nomad and Dell support" on \
MTP "MTP device support" on \
+ RUBY "Ruby scripts and libraries" off \
+ DAAP "DAAP share music server (required Ruby)" off \
OPENGL "OpenGL support" on \
AMAZON "Amazon cover fetching support" on \
MYSQL "Use MySQL as collection backend" off \
@@ -73,6 +74,25 @@
PLIST_SUB+= MTP=""
.endif
+.if !defined(WITH_DAAP)
+PLIST_SUB+= DAAP="@comment "
+CONFIGURE_ARGS+=--without-libdaap
+.else
+.if !defined(WITH_RUBY)
+USE_RUBY= yes
+.endif
+PLIST_SUB+= DAAP=""
+.endif
+
+.if !defined(WITH_RUBY)
+PLIST_SUB+= RUBY="@comment "
+.else
+.if !defined(WITH_DAAP)
+USE_RUBY= yes
+.endif
+PLIST_SUB+= RUBY=""
+.endif
+
.if defined(WITHOUT_OPENGL)
CONFIGURE_ARGS+=--without-opengl
.endif
@@ -108,6 +128,11 @@
post-install:
.if defined(WITH_MTP) || defined(WITH_NJB) || defined(WITH_GPOD)
@${CAT} ${PKGMESSAGE}
+.endif
+.if !defined(WITH_RUBY)
+.for i in lyrics_astraweb lyrics_lyrc ruby_debug score_default score_impulsive
+ ${RM} -rf ${PREFIX}/share/apps/amarok/scripts/${i}
+.endfor
.endif
check-options-version:
diff -ruN amarok.old.old/files/patch-yy amarok.old/files/patch-yy
--- amarok.old.old/files/patch-yy Thu Jan 1 07:00:00 1970
+++ amarok.old/files/patch-yy Sun Mar 4 22:50:22 2007
@@ -0,0 +1,16 @@
+--- configure.bak Sat Feb 24 02:37:56 2007
++++ configure Sat Feb 24 02:40:37 2007
+@@ -44543,10 +44543,12 @@
+ ###############################################################################
+ ## TODO: Check version number >= 1.8
+
+-if test "x$RUBY" = "xno" -o "x$have_ruby_h" = "xno"; then
++if test "with_daap_TRUE" = ""; then
++ if test "x$RUBY" = "xno" -o "x$have_ruby_h" = "xno"; then
+ amarok_error_noruby=yes
+ DO_NOT_COMPILE="$DO_NOT_COMPILE amarok"
+ no_amarok=yes
++ fi
+ fi
+
+ ###############################################################################
diff -ruN amarok.old.old/pkg-plist amarok.old/pkg-plist
--- amarok.old.old/pkg-plist Tue Feb 13 04:00:10 2007
+++ amarok.old/pkg-plist Mon Mar 5 19:08:03 2007
@@ -1,8 +1,8 @@
bin/amarok
bin/amarokapp
bin/amarokcollectionscanner
-bin/amarok_daapserver.rb
-bin/amarok_proxy.rb
+%%DAAP%%bin/amarok_daapserver.rb
+%%DAAP%%bin/amarok_proxy.rb
lib/libamarok.a
lib/libamarok.la
lib/libamarok.so
@@ -10,9 +10,9 @@
lib/kde3/konqsidebar_universalamarok.a
lib/kde3/konqsidebar_universalamarok.la
lib/kde3/konqsidebar_universalamarok.so
-lib/kde3/libamarok_daap-mediadevice.so
-lib/kde3/libamarok_daap-mediadevice.la
-lib/kde3/libamarok_daap-mediadevice.a
+%%DAAP%%lib/kde3/libamarok_daap-mediadevice.so
+%%DAAP%%lib/kde3/libamarok_daap-mediadevice.la
+%%DAAP%%lib/kde3/libamarok_daap-mediadevice.a
lib/kde3/libamarok_massstorage-device.so
lib/kde3/libamarok_massstorage-device.la
lib/kde3/libamarok_massstorage-device.a
@@ -34,11 +34,11 @@
lib/kde3/libamarok_void-engine_plugin.a
lib/kde3/libamarok_void-engine_plugin.la
lib/kde3/libamarok_void-engine_plugin.so
-lib/ruby_lib/http11.rb
-lib/ruby_lib/libhttp11.so.0
-lib/ruby_lib/libhttp11.so
-lib/ruby_lib/libhttp11.la
-lib/ruby_lib/libhttp11.a
+%%RUBY%%lib/ruby_lib/http11.rb
+%%RUBY%%lib/ruby_lib/libhttp11.so.0
+%%RUBY%%lib/ruby_lib/libhttp11.so
+%%RUBY%%lib/ruby_lib/libhttp11.la
+%%RUBY%%lib/ruby_lib/libhttp11.a
share/applications/kde/amarok.desktop
share/apps/amarok/amarokui.rc
share/apps/amarok/data/Amarok_1.4_Welcome.ogg
@@ -454,71 +454,71 @@
share/apps/amarok/images/wizard_compact.png
share/apps/amarok/images/wizard_xmms.png
share/apps/amarok/images/xine_logo.png
-share/apps/amarok/ruby_lib/codes.rb
-share/apps/amarok/ruby_lib/gemconfigure.rb
-share/apps/amarok/ruby_lib/gem_plugin.rb
-share/apps/amarok/ruby_lib/mongrel.rb
-share/apps/amarok/ruby_lib/rubygems.rb
-share/apps/amarok/ruby_lib/mongrel/cgi.rb
-share/apps/amarok/ruby_lib/mongrel/command.rb
-share/apps/amarok/ruby_lib/mongrel/configurator.rb
-share/apps/amarok/ruby_lib/mongrel/debug.rb
-share/apps/amarok/ruby_lib/mongrel/handlers.rb
-share/apps/amarok/ruby_lib/mongrel/init.rb
-share/apps/amarok/ruby_lib/mongrel/mime_types.yml
-share/apps/amarok/ruby_lib/mongrel/stats.rb
-share/apps/amarok/ruby_lib/mongrel/tcphack.rb
-share/apps/amarok/ruby_lib/rbconfig/datadir.rb
-share/apps/amarok/ruby_lib/rubygems/._gem_commands.rb
-share/apps/amarok/ruby_lib/rubygems/builder.rb
-share/apps/amarok/ruby_lib/rubygems/cmd_manager.rb
-share/apps/amarok/ruby_lib/rubygems/command.rb
-share/apps/amarok/ruby_lib/rubygems/config_file.rb
-share/apps/amarok/ruby_lib/rubygems/custom_require.rb
-share/apps/amarok/ruby_lib/rubygems/dependency_list.rb
-share/apps/amarok/ruby_lib/rubygems/doc_manager.rb
-share/apps/amarok/ruby_lib/rubygems/format.rb
-share/apps/amarok/ruby_lib/rubygems/gem_commands.rb
-share/apps/amarok/ruby_lib/rubygems/gem_openssl.rb
-share/apps/amarok/ruby_lib/rubygems/gem_runner.rb
-share/apps/amarok/ruby_lib/rubygems/incremental_fetcher.rb
-share/apps/amarok/ruby_lib/rubygems/installer.rb
-share/apps/amarok/ruby_lib/rubygems/loadpath_manager.rb
-share/apps/amarok/ruby_lib/rubygems/old_format.rb
-share/apps/amarok/ruby_lib/rubygems/open-uri.rb
-share/apps/amarok/ruby_lib/rubygems/package.rb
-share/apps/amarok/ruby_lib/rubygems/remote_installer.rb
-share/apps/amarok/ruby_lib/rubygems/rubygems_version.rb
-share/apps/amarok/ruby_lib/rubygems/security.rb
-share/apps/amarok/ruby_lib/rubygems/source_index.rb
-share/apps/amarok/ruby_lib/rubygems/specification.rb
-share/apps/amarok/ruby_lib/rubygems/timer.rb
-share/apps/amarok/ruby_lib/rubygems/user_interaction.rb
-share/apps/amarok/ruby_lib/rubygems/validator.rb
-share/apps/amarok/ruby_lib/rubygems/version.rb
+%%RUBY%%share/apps/amarok/ruby_lib/codes.rb
+%%RUBY%%share/apps/amarok/ruby_lib/gemconfigure.rb
+%%RUBY%%share/apps/amarok/ruby_lib/gem_plugin.rb
+%%RUBY%%share/apps/amarok/ruby_lib/mongrel.rb
+%%RUBY%%share/apps/amarok/ruby_lib/rubygems.rb
+%%RUBY%%share/apps/amarok/ruby_lib/mongrel/cgi.rb
+%%RUBY%%share/apps/amarok/ruby_lib/mongrel/command.rb
+%%RUBY%%share/apps/amarok/ruby_lib/mongrel/configurator.rb
+%%RUBY%%share/apps/amarok/ruby_lib/mongrel/debug.rb
+%%RUBY%%share/apps/amarok/ruby_lib/mongrel/handlers.rb
+%%RUBY%%share/apps/amarok/ruby_lib/mongrel/init.rb
+%%RUBY%%share/apps/amarok/ruby_lib/mongrel/mime_types.yml
+%%RUBY%%share/apps/amarok/ruby_lib/mongrel/stats.rb
+%%RUBY%%share/apps/amarok/ruby_lib/mongrel/tcphack.rb
+%%RUBY%%share/apps/amarok/ruby_lib/rbconfig/datadir.rb
+%%RUBY%%share/apps/amarok/ruby_lib/rubygems/._gem_commands.rb
+%%RUBY%%share/apps/amarok/ruby_lib/rubygems/builder.rb
+%%RUBY%%share/apps/amarok/ruby_lib/rubygems/cmd_manager.rb
+%%RUBY%%share/apps/amarok/ruby_lib/rubygems/command.rb
+%%RUBY%%share/apps/amarok/ruby_lib/rubygems/config_file.rb
+%%RUBY%%share/apps/amarok/ruby_lib/rubygems/custom_require.rb
+%%RUBY%%share/apps/amarok/ruby_lib/rubygems/dependency_list.rb
+%%RUBY%%share/apps/amarok/ruby_lib/rubygems/doc_manager.rb
+%%RUBY%%share/apps/amarok/ruby_lib/rubygems/format.rb
+%%RUBY%%share/apps/amarok/ruby_lib/rubygems/gem_commands.rb
+%%RUBY%%share/apps/amarok/ruby_lib/rubygems/gem_openssl.rb
+%%RUBY%%share/apps/amarok/ruby_lib/rubygems/gem_runner.rb
+%%RUBY%%share/apps/amarok/ruby_lib/rubygems/incremental_fetcher.rb
+%%RUBY%%share/apps/amarok/ruby_lib/rubygems/installer.rb
+%%RUBY%%share/apps/amarok/ruby_lib/rubygems/loadpath_manager.rb
+%%RUBY%%share/apps/amarok/ruby_lib/rubygems/old_format.rb
+%%RUBY%%share/apps/amarok/ruby_lib/rubygems/open-uri.rb
+%%RUBY%%share/apps/amarok/ruby_lib/rubygems/package.rb
+%%RUBY%%share/apps/amarok/ruby_lib/rubygems/remote_installer.rb
+%%RUBY%%share/apps/amarok/ruby_lib/rubygems/rubygems_version.rb
+%%RUBY%%share/apps/amarok/ruby_lib/rubygems/security.rb
+%%RUBY%%share/apps/amarok/ruby_lib/rubygems/source_index.rb
+%%RUBY%%share/apps/amarok/ruby_lib/rubygems/specification.rb
+%%RUBY%%share/apps/amarok/ruby_lib/rubygems/timer.rb
+%%RUBY%%share/apps/amarok/ruby_lib/rubygems/user_interaction.rb
+%%RUBY%%share/apps/amarok/ruby_lib/rubygems/validator.rb
+%%RUBY%%share/apps/amarok/ruby_lib/rubygems/version.rb
share/apps/amarok/scripts/common/Publisher.py
share/apps/amarok/scripts/common/Zeroconf.py
-share/apps/amarok/scripts/lyrics_astraweb/COPYING
-share/apps/amarok/scripts/lyrics_astraweb/README
-share/apps/amarok/scripts/lyrics_astraweb/lyrics_astraweb.rb
-share/apps/amarok/scripts/lyrics_astraweb/lyrics_astraweb.spec
-share/apps/amarok/scripts/lyrics_lyrc/COPYING
-share/apps/amarok/scripts/lyrics_lyrc/README
-share/apps/amarok/scripts/lyrics_lyrc/lyrics_lyrc.rb
-share/apps/amarok/scripts/lyrics_lyrc/lyrics_lyrc.spec
+%%RUBY%%share/apps/amarok/scripts/lyrics_astraweb/COPYING
+%%RUBY%%share/apps/amarok/scripts/lyrics_astraweb/README
+%%RUBY%%share/apps/amarok/scripts/lyrics_astraweb/lyrics_astraweb.rb
+%%RUBY%%share/apps/amarok/scripts/lyrics_astraweb/lyrics_astraweb.spec
+%%RUBY%%share/apps/amarok/scripts/lyrics_lyrc/COPYING
+%%RUBY%%share/apps/amarok/scripts/lyrics_lyrc/README
+%%RUBY%%share/apps/amarok/scripts/lyrics_lyrc/lyrics_lyrc.rb
+%%RUBY%%share/apps/amarok/scripts/lyrics_lyrc/lyrics_lyrc.spec
share/apps/amarok/scripts/playlist2html/Playlist.py
share/apps/amarok/scripts/playlist2html/PlaylistServer.py
share/apps/amarok/scripts/playlist2html/README
share/apps/amarok/scripts/playlist2html/playlist2html.py
-share/apps/amarok/scripts/ruby_debug/debug.rb
-share/apps/amarok/scripts/score_default/COPYING
-share/apps/amarok/scripts/score_default/README
-share/apps/amarok/scripts/score_default/score_default.spec
-share/apps/amarok/scripts/score_default/score_default.rb
-share/apps/amarok/scripts/score_impulsive/COPYING
-share/apps/amarok/scripts/score_impulsive/README
-share/apps/amarok/scripts/score_impulsive/score_impulsive.spec
-share/apps/amarok/scripts/score_impulsive/score_impulsive.rb
+%%RUBY%%share/apps/amarok/scripts/ruby_debug/debug.rb
+%%RUBY%%share/apps/amarok/scripts/score_default/COPYING
+%%RUBY%%share/apps/amarok/scripts/score_default/README
+%%RUBY%%share/apps/amarok/scripts/score_default/score_default.spec
+%%RUBY%%share/apps/amarok/scripts/score_default/score_default.rb
+%%RUBY%%share/apps/amarok/scripts/score_impulsive/COPYING
+%%RUBY%%share/apps/amarok/scripts/score_impulsive/README
+%%RUBY%%share/apps/amarok/scripts/score_impulsive/score_impulsive.spec
+%%RUBY%%share/apps/amarok/scripts/score_impulsive/score_impulsive.rb
share/apps/amarok/scripts/templates/amarok.rb
share/apps/amarok/scripts/templates/python_qt_template.py
share/apps/amarok/scripts/templates/ruby_qt_template.rb
@@ -1105,10 +1105,10 @@
@dirrm share/apps/amarok/scripts/lyrics_astraweb
@dirrm share/apps/amarok/scripts/common
@dirrm share/apps/amarok/scripts
-@dirrm share/apps/amarok/ruby_lib/rubygems
-@dirrm share/apps/amarok/ruby_lib/rbconfig
-@dirrm share/apps/amarok/ruby_lib/mongrel
-@dirrm share/apps/amarok/ruby_lib
+%%RUBY%%@dirrm share/apps/amarok/ruby_lib/rubygems
+%%RUBY%%@dirrm share/apps/amarok/ruby_lib/rbconfig
+%%RUBY%%@dirrm share/apps/amarok/ruby_lib/mongrel
+%%RUBY%%@dirrm share/apps/amarok/ruby_lib
@dirrm share/apps/amarok/images
@dirrm share/apps/amarok/icons/crystalsvg/64x64/actions
@dirrm share/apps/amarok/icons/crystalsvg/64x64
@@ -1131,4 +1131,4 @@
@dirrm share/apps/amarok/icons
@dirrm share/apps/amarok/data
@dirrm share/apps/amarok
-@dirrm lib/ruby_lib
+%%RUBY%%@dirrm lib/ruby_lib
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200703051339.l25DdQiS003100>