Update port to 1.0

Submitted by:	Martin Blapp <mb@imp.ch>

5 files changed, 85 insertions, 13 deletions

diff --git a/audio/kmp3/Makefile b/audio/kmp3/Makefile
index e31a86d654c1..1c5ff84b1316 100644
--- a/audio/kmp3/Makefile
+++ b/audio/kmp3/Makefile
@@ -1,24 +1,27 @@
 # New ports collection makefile for:   kmpg
-# Version required:    0.2.2
+# Version required:    1.0
 # Date created:        24 May 1999
 # Whom:                Oscar Bonilla <obonilla@fisicc-ufm.edu>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	kmp3-0.2.2
+DISTNAME=	kmp3-1.0
 CATEGORIES=	audio kde
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/1.1/apps/multimedia/sound
+MASTER_SITES=	http://www.kmp3.org/tarballs/
 
-MAINTAINER=	obonilla@fisicc-ufm.edu
+MAINTAINER=	mb@imp.ch
 
 LIB_DEPENDS=	kdecore.3:${PORTSDIR}/x11/kdelibs11 \
-		kdeui.3:${PORTSDIR}/x11/kdelibs11
+		QwSpriteField.7:${PORTSDIR}/converters/kdesupport11
 
+FETCH_BEFORE_ARGS+= -b
 USE_QT=		yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 WRKSRC=		${WRKDIR}/kmp3
 
+pre-configure:
+	${PERL} -pi.orig -e 's|-O4 -m486|${CFLAGS}|' ${WRKSRC}/src/mpeg/configure
+
 .include <bsd.port.mk>
diff --git a/audio/kmp3/distinfo b/audio/kmp3/distinfo
index 20e4e94e19b6..3751762e6792 100644
--- a/audio/kmp3/distinfo
+++ b/audio/kmp3/distinfo
@@ -1 +1 @@
-MD5 (kmp3-0.2.2.tar.gz) = 40afffe0902d7214e60b7ab8c669d285
+MD5 (kmp3-1.0.tar.gz) = 8630aa108c7a01a999d094801d63f5da
diff --git a/audio/kmp3/files/patch-ae b/audio/kmp3/files/patch-ae
new file mode 100644
index 000000000000..d0428c42c2db
--- /dev/null
+++ b/audio/kmp3/files/patch-ae
@@ -0,0 +1,14 @@
+--- src/mpeg/buffer.c	Sun Nov  7 17:17:03 1999
++++ src/mpeg/buffer.c	Sun Mar  5 13:28:11 2000
+@@ -63,11 +63,6 @@
+   for (;;) {
+     if (intflag) {
+       intflag = FALSE;
+-//#if defined(SOLARIS) || defined(__NetBSD__)
+-//      if (param.outmode == DECODE_AUDIO)
+-//	audio_queueflush (ai);
+-//#endif
+-//    xf->readindex = xf->freeindex;
+ #if defined(SOLARIS) || defined(__NetBSD__)
+ 	  if (param.outmode == DECODE_AUDIO)
+ 	      audio_queueflush (ai);
diff --git a/audio/kmp3/pkg-descr b/audio/kmp3/pkg-descr
index 541fbe223578..303c44874305 100644
--- a/audio/kmp3/pkg-descr
+++ b/audio/kmp3/pkg-descr
@@ -1,4 +1,4 @@
-This is an mp3 player for the K Desktop Environment. 
+This is an enchanced mp3 player for the K Desktop Environment. 
 Looks like the cd player that comes with kmultimedia (kscd).
 
--Oscar Bonilla <obonilla@fisicc-ufm.edu>
+-Martin Blapp <mb@imp.ch>
diff --git a/audio/kmp3/pkg-plist b/audio/kmp3/pkg-plist
index e21158454f5a..21eafcd85f7f 100644
--- a/audio/kmp3/pkg-plist
+++ b/audio/kmp3/pkg-plist
@@ -1,14 +1,69 @@
 bin/kmp3
-bin/kmp3player
 share/applnk/Multimedia/KMp3.kdelnk
+share/icons/kmp3.xpm
+share/icons/mini/kmp3.xpm
+share/apps/kmp3/pics/add.xpm
+share/apps/kmp3/pics/addpl.xpm
+share/apps/kmp3/pics/clear.xpm
+share/apps/kmp3/pics/del.xpm
 share/apps/kmp3/pics/dock_idle.xpm
+share/apps/kmp3/pics/dock_idle2.xpm
+share/apps/kmp3/pics/dock_paused.xpm
+share/apps/kmp3/pics/dock_paused2.xpm
 share/apps/kmp3/pics/dock_playing.xpm
+share/apps/kmp3/pics/dock_playing2.xpm
+share/apps/kmp3/pics/down.xpm
 share/apps/kmp3/pics/logo.xpm
-share/icons/kmp3.xpm
-share/icons/mini/kmp3.xpm
+share/apps/kmp3/pics/new.xpm
+share/apps/kmp3/pics/open.xpm
+share/apps/kmp3/pics/rename.xpm
+share/apps/kmp3/pics/save.xpm
+share/apps/kmp3/pics/saveas.xpm
+share/apps/kmp3/pics/shuff.xpm
+share/apps/kmp3/pics/up.xpm 
+share/apps/kmp3/plugins/plugMP3.so
+share/apps/kmp3/skins/.default/default_skin.xpm
+share/apps/kmp3/skins/winamp/Panic/cbuttons.bmp
+share/apps/kmp3/skins/winamp/Panic/eq_ex.bmp
+share/apps/kmp3/skins/winamp/Panic/eqmain.bmp
+share/apps/kmp3/skins/winamp/Panic/font.bmp
+share/apps/kmp3/skins/winamp/Panic/main.bmp
+share/apps/kmp3/skins/winamp/Panic/monoster.bmp
+share/apps/kmp3/skins/winamp/Panic/numbers.bmp
+share/apps/kmp3/skins/winamp/Panic/nums_ex.bmp
+share/apps/kmp3/skins/winamp/Panic/playpaus.bmp
+share/apps/kmp3/skins/winamp/Panic/pledit.bmp
+share/apps/kmp3/skins/winamp/Panic/pledit.txt
+share/apps/kmp3/skins/winamp/Panic/posbar.bmp
+share/apps/kmp3/skins/winamp/Panic/posbar_urk.bmp
+share/apps/kmp3/skins/winamp/Panic/shufrep.bmp
+share/apps/kmp3/skins/winamp/Panic/spec.bmp
+share/apps/kmp3/skins/winamp/Panic/text.bmp
+share/apps/kmp3/skins/winamp/Panic/titlebar.bmp
+share/apps/kmp3/skins/winamp/Panic/viscolor.txt
+share/apps/kmp3/skins/winamp/Panic/volume.bmp
+share/locale/cs/LC_MESSAGES/kmp3.mo
+share/locale/fr/LC_MESSAGES/kmp3.mo
+share/locale/fi/LC_MESSAGES/kmp3.mo
+share/locale/da/LC_MESSAGES/kmp3.mo
 share/locale/de/LC_MESSAGES/kmp3.mo
+share/locale/el/LC_MESSAGES/kmp3.mo
 share/locale/es/LC_MESSAGES/kmp3.mo
-share/locale/fr/LC_MESSAGES/kmp3.mo
+share/locale/hu/LC_MESSAGES/kmp3.mo
+share/locale/hr/LC_MESSAGES/kmp3.mo
 share/locale/is/LC_MESSAGES/kmp3.mo
+share/locale/it/LC_MESSAGES/kmp3.mo
+share/locale/nl/LC_MESSAGES/kmp3.mo
+share/locale/no/LC_MESSAGES/kmp3.mo
+share/locale/pl/LC_MESSAGES/kmp3.mo
+share/locale/pt_BR/LC_MESSAGES/kmp3.mo
+share/locale/ro/LC_MESSAGES/kmp3.mo
+share/locale/ru/LC_MESSAGES/kmp3.mo
+share/apps/kmp3/formats
+@dirrm share/apps/kmp3/skins/.default
 @dirrm share/apps/kmp3/pics
+@dirrm share/apps/kmp3/skins/winamp/Panic
+@dirrm share/apps/kmp3/skins/winamp
+@dirrm share/apps/kmp3/plugins
+@dirrm share/apps/kmp3/skins
 @dirrm share/apps/kmp3