Index: head/audio/x11amp/Makefile
===================================================================
--- head/audio/x11amp/Makefile	(revision 368429)
+++ head/audio/x11amp/Makefile	(revision 368430)
@@ -1,34 +1,32 @@
 # Created by: Donald Burr <dburr@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	x11amp
 PORTVERSION=	0.9.b1.1
 PORTREVISION=	8
 CATEGORIES=	audio
 MASTER_SITES=	LOCAL/hrs
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.b/-beta/}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	X11-based MP3 player with nice graphical interface
 
 LICENSE=	GPLv2
 
 BROKEN=		hangs at start with gtk and linker errors
 
 USES=		libtool
 USE_GNOME=	gtk12 esound
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-static
 CONFIGURE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}"
 MAKE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}"
 
 post-extract:
 	@${CP} ${FILESDIR}/main.xpm ${WRKSRC}/x11amp/defskin
-	@${CHMOD} a+x ${WRKSRC}/ltconfig
 
 post-patch:
-	@${REINPLACE_CMD} -e '/objformat=/s|=.*|=elf|' ${WRKSRC}/ltconfig
 	@${REINPLACE_CMD} 's|-o root -g wheel||' ${WRKSRC}/libx11amp/Makefile.in
 
 .include <bsd.port.mk>
Index: head/audio/x11amp/files/patch-configure
===================================================================
--- head/audio/x11amp/files/patch-configure	(revision 368429)
+++ head/audio/x11amp/files/patch-configure	(revision 368430)
@@ -1,47 +1,38 @@
 --- configure.orig	Tue May 31 17:38:58 2005
 +++ configure	Tue May 31 17:39:14 2005
-@@ -1316,7 +1316,7 @@
- # Actually configure libtool.  ac_aux_dir is where install-sh is found.
- CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
- LD="$LD" NM="$NM" RANLIB="$RANLIB" LN_S="$LN_S" \
--${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \
-+$ac_aux_dir/ltconfig \
- $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
- || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
- 
 @@ -2202,14 +2202,14 @@
    
    rm -f conf.gtktest
  
 -echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
 -echo "configure:2207: checking for pthread_create in -lpthread" >&5
 +echo $ac_n "checking for pthread_create in ${PTHREAD_LIBS}""... $ac_c" 1>&6
 +echo "configure:2207: checking for pthread_create in ${PTHREAD_LIBS}" >&5
  ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    ac_save_LIBS="$LIBS"
 -LIBS="-lpthread  $LIBS"
 +LIBS="${PTHREAD_LIBS}  $LIBS"
  cat > conftest.$ac_ext <<EOF
  #line 2215 "configure"
  #include "confdefs.h"
 @@ -2243,7 +2243,7 @@
  #define $ac_tr_lib 1
  EOF
  
 -  LIBS="-lpthread $LIBS"
 +  LIBS="${PTHREAD_LIBS} $LIBS"
  
  else
    echo "$ac_t""no" 1>&6
 @@ -2495,7 +2495,7 @@
    HAVE_ESD_FALSE=
  fi
  
 -CFLAGS=$GTK_CFLAGS
 +CFLAGS="$CFLAGS $GTK_CFLAGS"
  LIBS=$GTK_LIBS
  
  echo $ac_n "checking for thread-safe Xlib""... $ac_c" 1>&6