- Update to 1.6.4

PR:		ports/126537 (based on)
Submitted by:	Vitaly Magerya <vmagerya@gmail.com>
Approved by:	maintainer timeout (novel; 6 months)

17 files changed, 35 insertions, 546 deletions

diff --git a/audio/mpg123/Makefile b/audio/mpg123/Makefile
index b703109f977f..849531f3b961 100644
--- a/audio/mpg123/Makefile
+++ b/audio/mpg123/Makefile
@@ -6,87 +6,45 @@
 #
 
 PORTNAME=	mpg123
-PORTVERSION=	0.59r
-PORTREVISION=	17
+PORTVERSION=	1.6.4
 CATEGORIES=	audio ipv6
-MASTER_SITES=	http://www.mpg123.de/mpg123/ \
-		http://www-ti.informatik.uni-tuebingen.de/~hippm/mpg123/
-DISTNAME=	mpg123-0.59r-pl1
-
-PATCH_SITES=	ftp://ftp.kame.net/pub/kame/misc/:ipv6 \
-		http://www.unix-ag.org/Linux-Alpha/Packages/:l3 \
-		${MASTER_SITE_LOCAL:S/$/:recode/}
-PATCH_SITE_SUBDIR=	sobomax/:recode
-PATCHFILES=	mpg123-059r-v6-20000713b.diff.gz:ipv6 \
-		mpg123-059r-recode-20010410.diff.gz:recode \
-		l3.diff.gz:l3
-PATCH_DIST_STRIP=	-p1
+MASTER_SITES=	SF \
+		http://www.mpg123.de/download/
 
 MAINTAINER=	novel@FreeBSD.org
 COMMENT=	Command-line player for mpeg layer 1, 2 and 3 audio
 
-WANT_GNOME=	yes
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-MAKE_ENV=	USE_INET6=yes
+USE_BZIP2=	yes
+USE_AUTOTOOLS=	libltdl
+USE_LDCONFIG=	yes
 
-.if defined(WITH_ICONV)
-MAKE_ARGS+=	WITH_ICONV=yes
-.if defined(DEFAULT_RECODE)
-MAKE_ARGS+=	DEFAULT_RECODE=${DEFAULT_RECODE}
-.endif
-USE_ICONV=	yes
-.endif
-
-.if defined(WITH_NAS)
-HAVE_NAS=	yes
-LIB_DEPENDS=	audio.2:${PORTSDIR}/audio/nas
-MAKE_ENV+=	HAVE_NAS=${HAVE_NAS}
-.endif
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-audio=oss \
+		--with-default-audio=oss
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV=	CONFIG_SHELL=${SH} CFLAGS="${CFLAGS} -I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
 
 MAN1=		mpg123.1
-PLIST_FILES=	bin/mpg123
 
 .include <bsd.port.pre.mk>
 
-.if ${HAVE_GNOME:Mesound}!=""
-USE_GNOME+=	esound
-ALL_TARGET=	freebsd-esd
-PKGNAMESUFFIX=	-esound
-MAKE_ENV+=	HAVE_ESOUND=yes
-.elif defined(HAVE_NAS)
-PKGNAMESUFFIX=	-nas
-ALL_TARGET=	freebsd-nas
-.else
-ALL_TARGET=	freebsd
-CFLAGS+=	 -DWITH_FREEBSD_DSP_ONLY
-.endif
-
-pre-fetch:
-.if !defined(WITH_NAS)
-	@${ECHO_MSG}
-	@${ECHO_MSG} "If you want to compile with NAS support,"
-	@${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_NAS=yes\""
-	@${ECHO_MSG}
-.endif
-.if !defined(WITH_ICONV)
-	@${ECHO_MSG}
-	@${ECHO_MSG} "If you want to enable ID3 tags charset recoding,"
-	@${ECHO_MSG} "hit Ctrl-C and use \"make WITH_ICONV=yes\"; you can"
-	@${ECHO_MSG} "also specify DEFAULT_RECODE in 'from:to' format"
-	@${ECHO_MSG}
-.endif
 .if ${ARCH} == "i386"
 .if ${MACHINE_CPU:M3dnow}
-OPT_ARCH=	3dnow
+WITH_CPU=	3dnow
+.elif ${MACHINE_CPU:Msse}
+WITH_CPU=	sse
 .elif ${MACHINE_CPU:Mi586}
-OPT_ARCH=	i586
+WITH_CPU=	i586
 .elif ${MACHINE_CPU:Mi486}
-OPT_ARCH=	i486
+WITH_CPU=	i486
 .endif
 .endif
 
-.if defined(OPT_ARCH)
-MAKE_ARGS+=	OPT_ARCH=${OPT_ARCH}
+.if defined(WITH_CPU)
+CONFIGURE_ARGS+=--with-cpu=${WITH_CPU}
 .endif
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|' ${WRKSRC}/Makefile.in
+
 .include <bsd.port.post.mk>
diff --git a/audio/mpg123/distinfo b/audio/mpg123/distinfo
index c54d5e55c1e2..7e046c47c133 100644
--- a/audio/mpg123/distinfo
+++ b/audio/mpg123/distinfo
@@ -1,12 +1,3 @@
-MD5 (mpg123-0.59r-pl1.tar.gz) = 2648708fac9203ef58292adf5e54e4ba
-SHA256 (mpg123-0.59r-pl1.tar.gz) = cba184ad1984d811caba448969663b186f3b71294b9d059c83547cf1f944636e
-SIZE (mpg123-0.59r-pl1.tar.gz) = 158874
-MD5 (mpg123-059r-v6-20000713b.diff.gz) = b830cefc8805c8ad827f73985c03d27f
-SHA256 (mpg123-059r-v6-20000713b.diff.gz) = f13a822ccccd08c1a93a0f9c269efb8753e99d634fd8dc431f7ecb6099805591
-SIZE (mpg123-059r-v6-20000713b.diff.gz) = 5600
-MD5 (mpg123-059r-recode-20010410.diff.gz) = 8f9e18cf27f9e048c5369cf3b78b6b11
-SHA256 (mpg123-059r-recode-20010410.diff.gz) = c29355f3fdf734ea977c21d5e8770b808236fcd85d12a775f82fc639e7a5f0a1
-SIZE (mpg123-059r-recode-20010410.diff.gz) = 1908
-MD5 (l3.diff.gz) = b8749f4709ed1a9df8a00d51c4a02dd5
-SHA256 (l3.diff.gz) = 3f5771647dc130a44e83ce07aaca082fa5ef948c8e8ebff0d33111512f056a40
-SIZE (l3.diff.gz) = 689
+MD5 (mpg123-1.6.4.tar.bz2) = a111bcb82628e602abd9a5860928e870
+SHA256 (mpg123-1.6.4.tar.bz2) = 94acb66cdb1f4bf2349729767de8edd46cd58863fc1682f2771fc5fc758354ae
+SIZE (mpg123-1.6.4.tar.bz2) = 1055119
diff --git a/audio/mpg123/files/patch-CAN-2004-0991 b/audio/mpg123/files/patch-CAN-2004-0991
deleted file mode 100644
index 8cb494117f5f..000000000000
--- a/audio/mpg123/files/patch-CAN-2004-0991
+++ /dev/null
@@ -1,11 +0,0 @@
---- layer2.c.orig	Tue Sep  7 14:32:13 2004
-+++ layer2.c	Sat Jan  1 20:21:47 2005
-@@ -240,7 +240,7 @@
-        { alloc_0, alloc_1, alloc_2, alloc_3 , alloc_4 };
-   static int sblims[5] = { 27 , 30 , 8, 12 , 30 };
- 
--  if(fr->lsf)
-+  if(fr->sampling_frequency >= 3) /* Or equivalent: (fr->lsf == 1) */
-     table = 4;
-   else
-     table = translate[fr->sampling_frequency][2-fr->stereo][fr->bitrate_index];
diff --git a/audio/mpg123/files/patch-aa b/audio/mpg123/files/patch-aa
deleted file mode 100644
index 52d06c426a28..000000000000
--- a/audio/mpg123/files/patch-aa
+++ /dev/null
@@ -1,123 +0,0 @@
---- Makefile.orig	Wed Sep 15 21:14:24 2004
-+++ Makefile	Wed Sep 15 21:14:41 2004
-@@ -4,13 +4,15 @@
- 
- # Where to install binary and manpage on "make install":
- 
--PREFIX=/usr/local
-+#PREFIX=/usr/local
- BINDIR=$(PREFIX)/bin
- MANDIR=$(PREFIX)/man
- SECTION=1
- 
- # Enable the below line If your plathome support IPv6
--#CFLAGS+= -DINET6
-+.if defined(USE_INET6)
-+CFLAGS+= -DINET6
-+.endif
- # Additional LIBDIR and libraries if exist
- IPV6LIBDIR=
- IPV6LIB=
-@@ -300,6 +302,9 @@
- #CFLAGS='$(CFLAGS) -DI386_ASSEM -O2 -DREAL_IS_FLOAT -DLINUX -Wall -g'
- #CFLAGS='$(CFLAGS) -DI386_ASSEM -DREAL_IS_FLOAT -DLINUX -Wall -O2 -m486 -fomit-frame-pointer -funroll-all-loops -finline-functions -ffast-math -malign-loops=2 -malign-jumps=2 -malign-functions=2'
- 
-+CC ?= cc
-+LDFLAGS =
-+
- .if defined(WITH_ICONV)
- CFLAGS+=-DWITH_ICONV -I${LOCALBASE}/include
- LDFLAGS+=-L${LOCALBASE}/lib -liconv
-@@ -308,35 +313,62 @@
- .endif
- .endif
- 
-+.if ${MACHINE_ARCH} == "i386"
-+ARCHOPT= -funroll-all-loops -ffast-math -fomit-frame-pointer \
-+	 -DROT_I386 -DI386_ASSEM -DREAL_IS_FLOAT 
-+ARCHFILES= decode_i386.o
-+CFLAGS ?=-O4 -m486
-+.if !defined(OPT_ARCH)
-+ARCHFILES+= dct64_i386.c
-+.else
-+.if (${OPT_ARCH} == "i486")
-+ARCHOPT+= -DI486_OPT
-+ARCHFILES+= decode_i486.o dct64_i486.o dct64_i386.o
-+.elif (${OPT_ARCH} == "i586")
-+ARCHOPT+= -DPENTIUM_OPT
-+ARCHFILES+= decode_i586.o dct64_i386.o
-+.elif (${OPT_ARCH} == "3dnow")
-+ARCHOPT+= -DPENTIUM_OPT -DUSE_3DNOW
-+ARCHFILES+= dct64_3dnow.o decode_3dnow.o
-+dct64_3dnow.o:
-+	${INSTALL} ./precompiled/linux-i386/dct64_3dnow.o .
-+decode_3dnow.o:
-+	${INSTALL} ./precompiled/linux-i386/decode_3dnow.o .
-+.endif
-+.endif
-+.else 
-+ARCHOPT= -funroll-loops
-+ARCHFILES= decode.o dct64.o
-+.endif
-+
-+CFLAGS +=-Wall -ansi -pedantic ${ARCHOPT} \
-+	 -DREAD_MMAP -DUSE_MMAP -DOSS -DTERM_CONTROL
-+
-+.if defined(HAVE_ESOUND)
-+CFLAGS +=-I${LOCALBASE}/include
-+LDFLAGS+=-L${LOCALBASE}/lib
-+.elif defined(HAVE_NAS)
-+CFLAGS +=-I${LOCALBASE}/include -DNAS
-+LDFLAGS+=-L${LOCALBASE}/lib
-+.endif
-+
- freebsd:
--	$(MAKE) CC=cc LDFLAGS= \
--		OBJECTS='decode_i386.o dct64_i386.o audio_oss.o' \
--		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -m486 -fomit-frame-pointer \
--			-funroll-all-loops -ffast-math -DROT_I386 \
--			-DREAD_MMAP \
--			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DOSS' \
-+	${MAKE}	OBJECTS='${ARCHFILES} audio_oss.o term.o' \
- 		mpg123-make
- 
- freebsd-esd:
--	$(MAKE) CC=cc LDFLAGS= \
--		AUDIO_LIB='-lesd -laudiofile' \
--		OBJECTS='decode_i386.o dct64_i386.o $(GETBITS) audio_esd.o' \
--		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -m486 -fomit-frame-pointer \
--			-funroll-all-loops -ffast-math -DROT_I386 \
--			-DREAD_MMAP \
--			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DOSS \
--			-I/usr/local/include -L/usr/local/lib \
--			$(CFLAGS)' \
-+	$(MAKE) AUDIO_LIB='-lesd -laudiofile' \
-+		OBJECTS='${ARCHFILES} audio_esd.o term.o' \
-+		mpg123-make
-+
-+freebsd-nas:
-+	$(MAKE) AUDIO_LIB='-laudio -lXau -lXt' \
-+		OBJECTS='${ARCHFILES} audio_nas.o term.o' \
- 		mpg123-make
- 
- freebsd-frontend:
--	$(MAKE) CC=cc LDFLAGS= \
--		OBJECTS='decode_i386.o dct64_i386.o audio_oss.o \
-+	$(MAKE) OBJECTS='${ARCHFILES} audio_oss.o \
- 			control_sajber.o control_tk3play.o' \
--		CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -m486 -fomit-frame-pointer \
--			-funroll-all-loops -ffast-math -DROT_I386 \
--			-DFRONTEND \
--			-DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DOSS' \
- 		$(FRONTEND)
-  
- 
-@@ -575,7 +607,7 @@
- 	@ $(MAKE) CFLAGS='$(CFLAGS)' BINNAME=mpg123m mpg123
- 
- mpg123-make:
--	@ $(MAKE) CFLAGS='$(CFLAGS)' BINNAME=mpg123 mpg123
-+	@ $(MAKE) LDFLAGS='$(LDFLAGS)' CFLAGS='$(CFLAGS)' BINNAME=mpg123 mpg123
- 
- mpg123: mpg123.o common.o $(OBJECTS) decode_2to1.o decode_4to1.o \
- 		tabinit.o audio.o layer1.o layer2.o layer3.o buffer.o \
diff --git a/audio/mpg123/files/patch-ab b/audio/mpg123/files/patch-ab
deleted file mode 100644
index a2554a40d46d..000000000000
--- a/audio/mpg123/files/patch-ab
+++ /dev/null
@@ -1,51 +0,0 @@
---- mpg123.c.orig	Tue Aug 21 19:48:17 2001
-+++ mpg123.c	Tue Aug 21 19:49:02 2001
-@@ -27,6 +27,10 @@
- #include <sched.h>
- #endif
- 
-+#ifdef __FreeBSD__
-+#include <ieeefp.h>
-+#endif
-+
- #include "mpg123.h"
- #include "getlopt.h"
- #include "buffer.h"
-@@ -223,7 +227,7 @@
- {
-     int loop, rannum;
- 
--    srand(time(NULL));
-+    srandomdev();
-     if(shuffleord)
-       free(shuffleord);
-     shuffleord = (int *) malloc((numfiles + 1) * sizeof(int));
-@@ -239,7 +243,7 @@
-     /* now shuffle them */
-     if(numfiles >= 2) {
-       for (loop = 0; loop < numfiles; loop++) {
--	rannum = (rand() % (numfiles * 4 - 4)) / 4;
-+	rannum = (random() % (numfiles * 4 - 4)) / 4;
-         rannum += (rannum >= loop);
- 	shuffleord[loop] ^= shuffleord[rannum];
- 	shuffleord[rannum] ^= shuffleord[loop];
-@@ -381,7 +385,7 @@
-         curfile++;
-     }
-     else {
--       newfile = shufflist[ rand() % shuffle_listsize ];
-+       newfile = shufflist[ random() % shuffle_listsize ];
-     }
- 
-     return newfile;
-@@ -784,6 +788,10 @@
-         _wildcard(&argc,&argv);
- #endif
- 
-+#ifdef __FreeBSD__
-+	fpsetmask(0);
-+#endif
-+
- 	if(sizeof(short) != 2) {
- 		fprintf(stderr,"Ouch SHORT has size of %d bytes (required: '2')\n",(int)sizeof(short));
- 		exit(1);
diff --git a/audio/mpg123/files/patch-ac b/audio/mpg123/files/patch-ac
deleted file mode 100644
index 4de29e5762b2..000000000000
--- a/audio/mpg123/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- audio_esd.c--	Fri May 28 20:36:29 1999
-+++ audio_esd.c	Thu Nov 11 10:14:30 1999
-@@ -75,7 +75,7 @@
-   else if (ai->rate > esd_rate)
-     return -1;
- 
--  ai->fn = esd_play_stream_fallback(format, ai->rate, esdserver, "mpg123");
-+  ai->fn = esd_play_stream_fallback(format, ai->rate, NULL, "mpg123");
-   return (ai->fn);
- }
- 
diff --git a/audio/mpg123/files/patch-ae b/audio/mpg123/files/patch-ae
deleted file mode 100644
index 21c9bbcc9401..000000000000
--- a/audio/mpg123/files/patch-ae
+++ /dev/null
@@ -1,11 +0,0 @@
---- control_generic.c.orig	Fri Mar  2 16:10:49 2001
-+++ control_generic.c	Fri Mar  2 16:10:51 2001
-@@ -26,6 +26,8 @@
- extern int buffer_pid;
- extern int tabsel_123[2][3][16];
- 
-+void generic_sendmsg (char *, ...) __printflike(1,2);
-+
- void generic_sendmsg (char *fmt, ...)
- {
- 	va_list ap;
diff --git a/audio/mpg123/files/patch-af b/audio/mpg123/files/patch-af
deleted file mode 100644
index 36f059cfb493..000000000000
--- a/audio/mpg123/files/patch-af
+++ /dev/null
@@ -1,11 +0,0 @@
---- audio_oss.c.orig    Sat Jan 31 23:14:08 1998
-+++ audio_oss.c Sun May 12 15:35:49 2002
-@@ -31,7 +31,7 @@
- #elif defined(__bsdi__)
- #include <sys/soundcard.h>
- #else
--#include <machine/soundcard.h>
-+#include <sys/soundcard.h>
- #endif
-
- int audio_open(struct audio_info_struct *ai)
diff --git a/audio/mpg123/files/patch-ag b/audio/mpg123/files/patch-ag
deleted file mode 100644
index 3080572f240b..000000000000
--- a/audio/mpg123/files/patch-ag
+++ /dev/null
@@ -1,17 +0,0 @@
---- mpg123.c.orig	Fri Jun 18 14:18:11 1999
-+++ mpg123.c	Mon Feb 10 11:58:08 2003
-@@ -920,10 +920,10 @@
- 
- #if !defined(GENERIC)
- {
--     const char *term_type;
--         term_type = getenv("TERM");
--         if (!strcmp(term_type,"xterm"))
--         {
-+  const char *term_type;
-+
-+         if (((term_type = getenv("TERM")) != NULL)
-+		&& (!strcmp(term_type,"xterm"))) {
-            fprintf(stderr, "\033]0;%s\007", filename);
-          }
- }
diff --git a/audio/mpg123/files/patch-ah b/audio/mpg123/files/patch-ah
deleted file mode 100644
index a2154c97378f..000000000000
--- a/audio/mpg123/files/patch-ah
+++ /dev/null
@@ -1,56 +0,0 @@
---- layer3.c.xx	Wed Oct 22 19:19:01 2003
-+++ layer3.c	Wed Oct 22 19:20:30 2003
-@@ -608,7 +608,7 @@
-  * Dequantize samples (includes huffman decoding)
-  */
- /* 24 is enough because tab13 has max. a 19 bit huffvector */
--#ifdef __alpha
-+#ifndef __i386__
- #define BITSHIFT ((sizeof(int)-1)*8)
- #define REFRESH_MASK \
-   while(num < BITSHIFT) { \
-@@ -634,7 +634,7 @@
-   int *me;
- 
-   int num=getbitoffset();
--#ifdef __alpha
-+#ifndef __i386__
-   int mask = (int) getbits(num)<<(BITSHIFT+8-num);
- #else
-   long mask = (long) getbits(num)<<(BITSHIFT+8-num);
-@@ -722,7 +722,7 @@
-         if(x == 15 && h->linbits) {
-           max[lwin] = cb;
-           REFRESH_MASK;
--#ifdef __alpha
-+#ifndef __i386__
-           x += ((unsigned int) mask) >> (BITSHIFT+8-h->linbits);
- #else
-           x += ((unsigned long) mask) >> (BITSHIFT+8-h->linbits);
-@@ -750,7 +750,7 @@
-         if(y == 15 && h->linbits) {
-           max[lwin] = cb;
-           REFRESH_MASK;
--#ifdef __alpha
-+#ifndef __i386__
-           y += ((unsigned int) mask) >> (BITSHIFT+8-h->linbits);
- #else
-           y += ((unsigned long) mask) >> (BITSHIFT+8-h->linbits);
-@@ -904,7 +904,7 @@
-         if (x == 15 && h->linbits) {
-           max = cb;
- 	  REFRESH_MASK;
--#ifdef __alpha
-+#ifndef __i386__
-           x += ((unsigned int) mask) >> (BITSHIFT+8-h->linbits);
- #else
-           x += ((unsigned long) mask) >> (BITSHIFT+8-h->linbits);
-@@ -932,7 +932,7 @@
-         if (y == 15 && h->linbits) {
-           max = cb;
- 	  REFRESH_MASK;
--#ifdef __alpha
-+#ifndef __i386__
-           y += ((unsigned int) mask) >> (BITSHIFT+8-h->linbits);
- #else
-           y += ((unsigned long) mask) >> (BITSHIFT+8-h->linbits);
diff --git a/audio/mpg123/files/patch-ai b/audio/mpg123/files/patch-ai
deleted file mode 100644
index 2fbba50665c2..000000000000
--- a/audio/mpg123/files/patch-ai
+++ /dev/null
@@ -1,41 +0,0 @@
---- audio.c.orig	Tue Apr  6 17:53:05 1999
-+++ audio.c	Sat Jan 31 18:41:14 2004
-@@ -75,7 +75,11 @@
- 		return;
- 	}
- 
-+#ifdef WITH_FREEBSD_DSP_ONLY
-+	memset(capabilities,1,sizeof(capabilities));
-+#else
- 	memset(capabilities,0,sizeof(capabilities));
-+#endif
- 	if(param.force_rate) {
- 		rates[NUM_RATES-1] = param.force_rate;
- 		k1 = NUM_RATES;
-@@ -86,8 +90,16 @@
- 		exit(1);
- 	}
- 
-+#ifdef WITH_FREEBSD_DSP_ONLY
-+	if(param.force_rate)
-+#endif
- 	for(i=0;i<NUM_CHANNELS;i++) {
--		for(j=0;j<NUM_RATES;j++) {
-+#ifdef WITH_FREEBSD_DSP_ONLY
-+		j = NUM_RATES - 1;
-+#else
-+		for(j=0;j<NUM_RATES;j++)
-+#endif
-+		{
- 			ai1.channels = channels[i];
- 			ai1.rate = rates[j];
- 			fmts = audio_get_formats(&ai1);
-@@ -96,6 +108,8 @@
- 			for(k=0;k<NUM_ENCODINGS;k++) {
- 				if((fmts & encodings[k]) == encodings[k])
- 					capabilities[i][k][j] = 1;
-+				else
-+					capabilities[i][k][j] = 0;
- 			}
- 		}
- 	}
diff --git a/audio/mpg123/files/patch-aj b/audio/mpg123/files/patch-aj
deleted file mode 100644
index d0d827ce404a..000000000000
--- a/audio/mpg123/files/patch-aj
+++ /dev/null
@@ -1,15 +0,0 @@
---- mpg123.c.orig      Tue Aug 21 19:48:17 2001
-+++ mpg123.c   Tue Aug 21 19:49:02 2001
-@@ -307,9 +311,9 @@
-                 if (line[0]=='\0' || line[0]=='#')
-                     continue;
- 		if ((listnamedir) && (line[0]!='/') && (line[0]!='\\')){
--                    strcpy (linetmp, listnamedir);
--                    strcat (linetmp, line);
--		    strcpy (line, linetmp);
-+                    strlcpy (linetmp, listnamedir, sizeof(linetmp));
-+                    strlcat (linetmp, line, sizeof(linetmp));
-+		     strlcpy (line, linetmp, sizeof(linetmp));
-                 }
-                 return (line);
-             }
diff --git a/audio/mpg123/files/patch-buffer.c b/audio/mpg123/files/patch-buffer.c
deleted file mode 100644
index be3d6ab60475..000000000000
--- a/audio/mpg123/files/patch-buffer.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- buffer.c.orig	Tue Apr 13 14:08:08 1999
-+++ buffer.c	Fri Apr 21 20:17:12 2006
-@@ -41,7 +41,8 @@
- void buffer_end(void)
- {
- #ifndef NOXFERMEM
--	xfermem_putcmd(buffermem->fd[XF_WRITER], XF_CMD_TERMINATE);
-+	if (buffermem)
-+		xfermem_putcmd(buffermem->fd[XF_WRITER], XF_CMD_TERMINATE);
- #endif
- }
- 
diff --git a/audio/mpg123/files/patch-common.c b/audio/mpg123/files/patch-common.c
deleted file mode 100644
index 4b1f6a0e1e4d..000000000000
--- a/audio/mpg123/files/patch-common.c
+++ /dev/null
@@ -1,36 +0,0 @@
---- common.c.orig	Thu Mar 10 15:33:55 2005
-+++ common.c	Thu Mar 10 15:34:53 2005
-@@ -137,7 +137,7 @@
- 	return FALSE;
-     if(!((head>>17)&3))
- 	return FALSE;
--    if( ((head>>12)&0xf) == 0xf)
-+    if( ((head>>12)&0xf) == 0xf || ((head>>12)&0xf) == 0)
- 	return FALSE;
-     if( ((head>>10)&0x3) == 0x3 )
- 	return FALSE;
-@@ -356,9 +356,12 @@
-       fr->mpeg25 = 1;
-     }
-     
--    if (!param.tryresync || !oldhead) {
--          /* If "tryresync" is true, assume that certain
--             parameters do not change within the stream! */
-+    if (!param.tryresync || !oldhead ||
-+        (((oldhead>>19)&0x3) ^ ((newhead>>19)&0x3))) {
-+          /* If "tryresync" is false, assume that certain
-+             parameters do not change within the stream!
-+	     Force an update if lsf or mpeg25 settings
-+	     have changed. */
-       fr->lay = 4-((newhead>>17)&3);
-       if( ((newhead>>10)&0x3) == 0x3) {
-         fprintf(stderr,"Stream error\n");
-@@ -525,7 +528,7 @@
- 	decodestr(comment,tag->comment,30);
- 	decodestr(year,tag->year,4);
- 
--	if ( tag->genre <= sizeof(genre_table)/sizeof(*genre_table) ) {
-+	if ( tag->genre < sizeof(genre_table)/sizeof(*genre_table) ) {
- 		strncpy(genre, genre_table[tag->genre], 30);
- 	} else {
- 		strncpy(genre,"Unknown",30);
diff --git a/audio/mpg123/files/patch-httpget.c b/audio/mpg123/files/patch-httpget.c
deleted file mode 100644
index d74ea4f3811d..000000000000
--- a/audio/mpg123/files/patch-httpget.c
+++ /dev/null
@@ -1,62 +0,0 @@
---- httpget.c.orig	Fri Nov  5 16:11:04 2004
-+++ httpget.c	Fri Nov  5 16:43:27 2004
-@@ -55,11 +55,10 @@
- #endif
- 	int pos = 0;
- 
--	while(1) {
-+	while(pos < maxlen) {
- 		if( read(fileno(f),string+pos,1) == 1) {
- 			pos++;
- 			if(string[pos-1] == '\n') {
--				string[pos] = 0;
- 				break;
- 			}
- 		}
-@@ -68,6 +67,7 @@
- 			exit(1);
- 		}
- 	}
-+	string[pos] = 0;
- #if 0
- 	do {
- 		result = fgets(string, maxlen, f);
-@@ -114,6 +114,7 @@
- int getauthfromURL(char *url,char *auth)
- {
-   char *pos;
-+  int len;
- 
-   *auth = 0;
- 
-@@ -126,8 +127,14 @@
-       if( url[i] == '/' )
-          return 0;
-     }
--    strncpy(auth,url,pos-url);
--    auth[pos-url] = 0;
-+
-+    if ((pos-url) > 255)
-+      len = 255;
-+    else
-+      len = pos-url;
-+
-+    strncpy(auth,url,len);
-+    auth[len] = 0;
-     strcpy(url,pos+1);
-     return 1;
-   }
-@@ -292,11 +299,11 @@
- 			}
- 			strcat (request, sptr);
- 		}
--		sprintf (request + strlen(request),
-+		snprintf (request + strlen(request), linelength - strlen(request),
- 			" HTTP/1.0\r\nUser-Agent: %s/%s\r\n",
- 			prgName, prgVersion);
- 		if (host) {
--			sprintf(request + strlen(request),
-+			snprintf(request + strlen(request), linelength - strlen(request),
- 				"Host: %s:%s\r\n", host, myport);
- #if 0
- 			free (host);
diff --git a/audio/mpg123/files/patch-layer2.c b/audio/mpg123/files/patch-layer2.c
deleted file mode 100644
index f87a4ff36913..000000000000
--- a/audio/mpg123/files/patch-layer2.c
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -u -r1.1.1.1 layer2.c
---- layer2.c	1999/02/10 12:13:06	1.1.1.1
-+++ layer2.c	2004/09/02 21:43:58
-@@ -265,6 +265,11 @@
-   fr->jsbound = (fr-&gt;>mode == MPG_MD_JOINT_STEREO) ?
-      (fr->mode_ext<<2)+4 : fr->II_sblimit;
- 
-+  if (fr->jsbound > fr->II_sblimit) {
-+	  fprintf(stderr, "Truncating stereo boundary to sideband limit.\n");
-+	  fr->jsbound=fr->II_sblimit;
-+  }
-+  
-   if(stereo == 1 || single == 3)
-     single = 0;
diff --git a/audio/mpg123/pkg-plist b/audio/mpg123/pkg-plist
new file mode 100644
index 000000000000..ba7e5b48e075
--- /dev/null
+++ b/audio/mpg123/pkg-plist
@@ -0,0 +1,11 @@
+bin/mpg123
+include/mpg123.h
+lib/libmpg123.la
+lib/libmpg123.so
+lib/libmpg123.so.11
+lib/mpg123/output_dummy.la
+lib/mpg123/output_dummy.so
+lib/mpg123/output_oss.la
+lib/mpg123/output_oss.so
+libdata/pkgconfig/libmpg123.pc
+@dirrm lib/mpg123