old_contents: # Stock plugin configuration and build methods. These factor out the
  # common tasks carried out by plugins in order to configure and build
  # themselves.
  
  import sys
  
  def plugin(name, source=None, configure=False, build=False,
  		   build_replace=False, needs_lib=False, extra_libs=[],
  		   tool='cc', broken=False, output_prio=None):
  	def stock_configure(conf):
  		if broken:
  			conf.check_message_custom('%s plugin' % name, '',
  									  'currently broken, disabled')
  			return
  		if configure and not configure(conf):
  			return
  		conf.env['XMMS_PLUGINS_ENABLED'].append(name)
  		if output_prio:
  			conf.env['XMMS_OUTPUT_PLUGINS'].append((output_prio, name))
  
  	def stock_build(bld):
  		obj = bld.create_obj(tool, 'plugin')
  		obj.target = 'xmms_%s' % name
  		obj.includes = '../../include'
  		if source:
  			obj.source = source
  		else:
  			obj.source = '%s.c' % name
  
  		libs = ['glib2']
  		if needs_lib:
  			libs.append(name)
  		libs += extra_libs
  		obj.uselib = ' '.join(libs)
  		if sys.platform == 'win32':
  			obj.uselib_local = 'xmms2d'
  
  		obj.install_in = 'PLUGINDIR'
  	
  		if build:
  			build(bld, obj)
  
  	if build_replace:
  		return stock_configure, build_replace
  	else:
  		return stock_configure, stock_build
  
new_contents: # Stock plugin configuration and build methods. These factor out the
  # common tasks carried out by plugins in order to configure and build
  # themselves.
  
  import sys
  
  def plugin(name, source=None, configure=False, build=False,
  		   build_replace=False, needs_lib=False, extra_libs=[],
  		   tool='cc', broken=False, output_prio=None):
  	def stock_configure(conf):
  		if broken:
  			conf.check_message_custom('%s plugin' % name, '',
  									  'disabled (broken)')
  			return
  		if configure and not configure(conf):
  			return
  		conf.env['XMMS_PLUGINS_ENABLED'].append(name)
  		if output_prio:
  			conf.env['XMMS_OUTPUT_PLUGINS'].append((output_prio, name))
  
  	def stock_build(bld):
  		obj = bld.create_obj(tool, 'plugin')
  		obj.target = 'xmms_%s' % name
  		obj.includes = '../../include'
  		if source:
  			obj.source = source
  		else:
  			obj.source = '%s.c' % name
  
  		libs = ['glib2']
  		if needs_lib:
  			libs.append(name)
  		libs += extra_libs
  		obj.uselib = ' '.join(libs)
  		if sys.platform == 'win32':
  			obj.uselib_local = 'xmms2d'
  
  		obj.install_in = 'PLUGINDIR'
  	
  		if build:
  			build(bld, obj)
  
  	if build_replace:
  		return stock_configure, build_replace
  	else:
  		return stock_configure, stock_build
  
subject: Change waf broken message to fit 80-col terminal.