8 files changed, 32 insertions, 92 deletions

diff --git a/audio/xmms/Makefile b/audio/xmms/Makefile
index 1a2948a78b1b..436d14c3f9e4 100644
--- a/audio/xmms/Makefile
+++ b/audio/xmms/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xmms
-PORTVERSION=	1.2.2
+PORTVERSION=	1.2.3
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.xmms.org/xmms/1.2.x/ \
 		ftp://ftp.uk.xmms.org/xmms/1.2.x/ \
@@ -71,7 +71,7 @@ CONFIGURE_ENV+=	GTK_CONFIG="${GTK_CONFIG}" \
 .include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_3DNOW) && ${OSVERSION} >= 400021
-PATCHFILES=	xmms-1.2.1-3dnow-20000620.patch.gz
+PATCHFILES=	xmms-${PORTVERSION}-3dnow.patch.gz
 CONFIGURE_ARGS+=	--enable-3dnow
 .endif
 
@@ -104,4 +104,7 @@ post-extract:
 	  ${WRKSRC}/Visualization/blur_scope/Makefile.in
 .endif
 
+pre-patch:
+	@${PERL} -pi -e 's|-lpthread|-pthread|g' ${WRKSRC}/configure
+
 .include <bsd.port.post.mk>
diff --git a/audio/xmms/distinfo b/audio/xmms/distinfo
index 06444c8cce12..99b6e3f3a16f 100644
--- a/audio/xmms/distinfo
+++ b/audio/xmms/distinfo
@@ -1,2 +1,2 @@
-MD5 (xmms-1.2.2.tar.gz) = c4a99b69eb913329597ba52d727b3394
-MD5 (xmms-1.2.1-3dnow-20000620.patch.gz) = ea221913036248cef5c3cae0ad17b211
+MD5 (xmms-1.2.3.tar.gz) = 5880503c9f51cd4cc14566eb1d8f54ff
+MD5 (xmms-1.2.3-3dnow.patch.gz) = 6dfabc4c460adb5062af86ca44303cd4
diff --git a/audio/xmms/files/patch-ad b/audio/xmms/files/patch-ad
index 63149d20c29d..1077b1f1963d 100644
--- a/audio/xmms/files/patch-ad
+++ b/audio/xmms/files/patch-ad
@@ -1,33 +1,6 @@
---- configure.orig	Mon Jun 19 16:19:25 2000
-+++ configure	Wed Jun 21 10:34:30 2000
-@@ -3290,14 +3290,14 @@
- 
- fi
- if test "x$PTHREAD_LIBS" = xerror; then
--        echo $ac_n "checking for pthread_attr_init in -lc_r""... $ac_c" 1>&6
--echo "configure:3295: checking for pthread_attr_init in -lc_r" >&5
-+        echo $ac_n "checking for pthread_attr_init in -pthread""... $ac_c" 1>&6
-+echo "configure:3295: checking for pthread_attr_init in -pthread" >&5
- ac_lib_var=`echo c_r'_'pthread_attr_init | 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="-lc_r  $LIBS"
-+LIBS="-pthread  $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 3303 "configure"
- #include "confdefs.h"
-@@ -3325,7 +3325,7 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--  PTHREAD_LIBS="-lc_r"
-+  PTHREAD_LIBS="-pthread"
- else
-   echo "$ac_t""no" 1>&6
- fi
-@@ -3927,7 +3927,9 @@
+--- configure.orig	Thu Sep 21 19:06:59 2000
++++ configure	Thu Sep 21 19:10:00 2000
+@@ -4024,7 +4024,9 @@
    echo "$ac_t""no" 1>&6
  fi
  
@@ -38,7 +11,7 @@
  
  if test "x$have_esd" = xyes; then
    HAVE_ESD_TRUE=
-@@ -4208,7 +4210,9 @@
+@@ -4305,7 +4307,9 @@
    
    rm -f conf.mikmodtest
  
@@ -49,7 +22,7 @@
  
  if test "x$have_mikmod" = xyes; then
    HAVE_MIKMOD_TRUE=
-@@ -5475,7 +5479,7 @@
+@@ -5551,7 +5555,7 @@
    cat conftest.$ac_ext >&5
    rm -rf conftest*
    CATOBJEXT=.mo
@@ -58,15 +31,7 @@
  fi
  rm -f conftest*
  		INSTOBJEXT=.mo
-@@ -7113,14 +7117,14 @@
- 
- if test -n "$GCC"
- then
--	CFLAGS="$CFLAGS -fomit-frame-pointer -funroll-all-loops -finline-functions -ffast-math"
-+	CFLAGS="$CFLAGS -fomit-frame-pointer -finline-functions -ffast-math"
- fi
- 
- arch_type=other
+@@ -7205,7 +7209,7 @@
  ARCH_DEFINES=""
  case "$host" in 
  	i386-*-* | i486-*-* | i586-*-* | i686-*-* | i86pc-*-*)
diff --git a/audio/xmms/pkg-plist b/audio/xmms/pkg-plist
index 1c115f9822bf..03bdbdba71bc 100644
--- a/audio/xmms/pkg-plist
+++ b/audio/xmms/pkg-plist
@@ -39,15 +39,17 @@ share/locale/ca/LC_MESSAGES/xmms.mo
 share/locale/cs/LC_MESSAGES/xmms.mo
 share/locale/da/LC_MESSAGES/xmms.mo
 share/locale/de/LC_MESSAGES/xmms.mo
-share/locale/el_GR/LC_MESSAGES/xmms.mo
+share/locale/el/LC_MESSAGES/xmms.mo
 share/locale/eo/LC_MESSAGES/xmms.mo
 share/locale/es/LC_MESSAGES/xmms.mo
 share/locale/fr/LC_MESSAGES/xmms.mo
+share/locale/ga/LC_MESSAGES/xmms.mo
 share/locale/hr/LC_MESSAGES/xmms.mo
 share/locale/hu/LC_MESSAGES/xmms.mo
 share/locale/ja/LC_MESSAGES/xmms.mo
 share/locale/ko/LC_MESSAGES/xmms.mo
 share/locale/lt/LC_MESSAGES/xmms.mo
+share/locale/lv/LC_MESSAGES/xmms.mo
 share/locale/nl/LC_MESSAGES/xmms.mo
 share/locale/no/LC_MESSAGES/xmms.mo
 share/locale/pl/LC_MESSAGES/xmms.mo
diff --git a/multimedia/xmms/Makefile b/multimedia/xmms/Makefile
index 1a2948a78b1b..436d14c3f9e4 100644
--- a/multimedia/xmms/Makefile
+++ b/multimedia/xmms/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xmms
-PORTVERSION=	1.2.2
+PORTVERSION=	1.2.3
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.xmms.org/xmms/1.2.x/ \
 		ftp://ftp.uk.xmms.org/xmms/1.2.x/ \
@@ -71,7 +71,7 @@ CONFIGURE_ENV+=	GTK_CONFIG="${GTK_CONFIG}" \
 .include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_3DNOW) && ${OSVERSION} >= 400021
-PATCHFILES=	xmms-1.2.1-3dnow-20000620.patch.gz
+PATCHFILES=	xmms-${PORTVERSION}-3dnow.patch.gz
 CONFIGURE_ARGS+=	--enable-3dnow
 .endif
 
@@ -104,4 +104,7 @@ post-extract:
 	  ${WRKSRC}/Visualization/blur_scope/Makefile.in
 .endif
 
+pre-patch:
+	@${PERL} -pi -e 's|-lpthread|-pthread|g' ${WRKSRC}/configure
+
 .include <bsd.port.post.mk>
diff --git a/multimedia/xmms/distinfo b/multimedia/xmms/distinfo
index 06444c8cce12..99b6e3f3a16f 100644
--- a/multimedia/xmms/distinfo
+++ b/multimedia/xmms/distinfo
@@ -1,2 +1,2 @@
-MD5 (xmms-1.2.2.tar.gz) = c4a99b69eb913329597ba52d727b3394
-MD5 (xmms-1.2.1-3dnow-20000620.patch.gz) = ea221913036248cef5c3cae0ad17b211
+MD5 (xmms-1.2.3.tar.gz) = 5880503c9f51cd4cc14566eb1d8f54ff
+MD5 (xmms-1.2.3-3dnow.patch.gz) = 6dfabc4c460adb5062af86ca44303cd4
diff --git a/multimedia/xmms/files/patch-ad b/multimedia/xmms/files/patch-ad
index 63149d20c29d..1077b1f1963d 100644
--- a/multimedia/xmms/files/patch-ad
+++ b/multimedia/xmms/files/patch-ad
@@ -1,33 +1,6 @@
---- configure.orig	Mon Jun 19 16:19:25 2000
-+++ configure	Wed Jun 21 10:34:30 2000
-@@ -3290,14 +3290,14 @@
- 
- fi
- if test "x$PTHREAD_LIBS" = xerror; then
--        echo $ac_n "checking for pthread_attr_init in -lc_r""... $ac_c" 1>&6
--echo "configure:3295: checking for pthread_attr_init in -lc_r" >&5
-+        echo $ac_n "checking for pthread_attr_init in -pthread""... $ac_c" 1>&6
-+echo "configure:3295: checking for pthread_attr_init in -pthread" >&5
- ac_lib_var=`echo c_r'_'pthread_attr_init | 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="-lc_r  $LIBS"
-+LIBS="-pthread  $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 3303 "configure"
- #include "confdefs.h"
-@@ -3325,7 +3325,7 @@
- fi
- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-   echo "$ac_t""yes" 1>&6
--  PTHREAD_LIBS="-lc_r"
-+  PTHREAD_LIBS="-pthread"
- else
-   echo "$ac_t""no" 1>&6
- fi
-@@ -3927,7 +3927,9 @@
+--- configure.orig	Thu Sep 21 19:06:59 2000
++++ configure	Thu Sep 21 19:10:00 2000
+@@ -4024,7 +4024,9 @@
    echo "$ac_t""no" 1>&6
  fi
  
@@ -38,7 +11,7 @@
  
  if test "x$have_esd" = xyes; then
    HAVE_ESD_TRUE=
-@@ -4208,7 +4210,9 @@
+@@ -4305,7 +4307,9 @@
    
    rm -f conf.mikmodtest
  
@@ -49,7 +22,7 @@
  
  if test "x$have_mikmod" = xyes; then
    HAVE_MIKMOD_TRUE=
-@@ -5475,7 +5479,7 @@
+@@ -5551,7 +5555,7 @@
    cat conftest.$ac_ext >&5
    rm -rf conftest*
    CATOBJEXT=.mo
@@ -58,15 +31,7 @@
  fi
  rm -f conftest*
  		INSTOBJEXT=.mo
-@@ -7113,14 +7117,14 @@
- 
- if test -n "$GCC"
- then
--	CFLAGS="$CFLAGS -fomit-frame-pointer -funroll-all-loops -finline-functions -ffast-math"
-+	CFLAGS="$CFLAGS -fomit-frame-pointer -finline-functions -ffast-math"
- fi
- 
- arch_type=other
+@@ -7205,7 +7209,7 @@
  ARCH_DEFINES=""
  case "$host" in 
  	i386-*-* | i486-*-* | i586-*-* | i686-*-* | i86pc-*-*)
diff --git a/multimedia/xmms/pkg-plist b/multimedia/xmms/pkg-plist
index 1c115f9822bf..03bdbdba71bc 100644
--- a/multimedia/xmms/pkg-plist
+++ b/multimedia/xmms/pkg-plist
@@ -39,15 +39,17 @@ share/locale/ca/LC_MESSAGES/xmms.mo
 share/locale/cs/LC_MESSAGES/xmms.mo
 share/locale/da/LC_MESSAGES/xmms.mo
 share/locale/de/LC_MESSAGES/xmms.mo
-share/locale/el_GR/LC_MESSAGES/xmms.mo
+share/locale/el/LC_MESSAGES/xmms.mo
 share/locale/eo/LC_MESSAGES/xmms.mo
 share/locale/es/LC_MESSAGES/xmms.mo
 share/locale/fr/LC_MESSAGES/xmms.mo
+share/locale/ga/LC_MESSAGES/xmms.mo
 share/locale/hr/LC_MESSAGES/xmms.mo
 share/locale/hu/LC_MESSAGES/xmms.mo
 share/locale/ja/LC_MESSAGES/xmms.mo
 share/locale/ko/LC_MESSAGES/xmms.mo
 share/locale/lt/LC_MESSAGES/xmms.mo
+share/locale/lv/LC_MESSAGES/xmms.mo
 share/locale/nl/LC_MESSAGES/xmms.mo
 share/locale/no/LC_MESSAGES/xmms.mo
 share/locale/pl/LC_MESSAGES/xmms.mo