[ 20:58 naddy  ]

• 375355 multimedia/xmms/files/patch-General-ir-ir.c
• 375355 multimedia/xmms/files/patch-General_ir_ir.c
• 375355 multimedia/xmms/files/patch-Output_OSS_OSS.h
• 375355 multimedia/xmms/files/patch-Output_OSS_audio.c
• 375355 multimedia/xmms/files/patch-Output_OSS_mixer.c
• 375355 multimedia/xmms/files/patch-Output__OSS__mixer.c
• 375355 multimedia/xmms/files/patch-Output__esd__mixer.c
• 375355 multimedia/xmms/files/patch-Output_esd_esdout.h
• 375355 multimedia/xmms/files/patch-Output_esd_mixer.c
• 375355 multimedia/xmms/files/patch-am64

Disentangle overlapping patches, rename and regenerate.  No code changes.

[ 08:30 tijl  ]

• 331240 chinese/xmms/Makefile
• 331240 chinese/xmms/files/extra-patch-xmms-1.2.x-xfont
• 331240 multimedia/xmms/Makefile
• 331240 multimedia/xmms/distinfo
• 331240 multimedia/xmms/files/extra-patch-Visualization_Makefile.am
• 331240 multimedia/xmms/files/patch-General-ir-ir.c
• 331240 multimedia/xmms/files/patch-Output__OSS__mixer.c
• 331240 multimedia/xmms/files/patch-Output__esd__mixer.c
• 331240 multimedia/xmms/files/patch-aclocal.m4
• 331240 multimedia/xmms/files/patch-am64

multimedia/xmms:
- Add zh-xmms to CONFLICTS.
- Convert USE_GNOME=desktopfileutils and USE_GMAKE to USES.
- Make USE_GL conditional on the SPEC option.
- Make gettext conditional on new NLS option.
- Only set USE_AUTOTOOLS for the RUSXMMS_PATCHES option.
- Remove LIBS from CONFIGURE_ENV.  Set LDFLAGS instead.
- Add missing xorg dependencies.
- Add xmms_cv_newpcm_driver=yes to CONFIGURE_ARGS.  The configure test
  fails on recent version of FreeBSD but the code it enables is still
  relevant.  Without it you cannot select a different output device.
- Remove SUB_FILES.  None of the files require substitutions.
- Remove IPV6 from OPTIONS_DEFAULT.  It's implicit.
- Don't exclude SIMD option from amd64.
- Use option helpers like OPTIONS_SUB, opt_CONFIGURE_ENABLE, etc.

(Only the first 15 lines of the commit message are shown above )