Upgrade to uade 0.80 final

8 files changed, 104 insertions, 33 deletions

diff --git a/audio/xmms-uade/Makefile b/audio/xmms-uade/Makefile
index b652294f7e57..3cf452d1a811 100644
--- a/audio/xmms-uade/Makefile
+++ b/audio/xmms-uade/Makefile
@@ -7,10 +7,10 @@
 
 PORTNAME=	xmms-uade
 PORTVERSION=	0.80
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	audio
-MASTER_SITES=	http://ee.tut.fi/~heikki/uade/pre/
-DISTFILES=	uade-${PORTVERSION}-pre5${EXTRACT_SUFX}
+MASTER_SITES=	http://ee.tut.fi/~heikki/uade/
+DISTFILES=	uade-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	mbr@FreeBSD.org
 COMMENT=	Unix Amiga Delitracker Emulator with XMMS Input plugin.
@@ -31,6 +31,6 @@ CONFIGURE_ARGS=	--prefix=${X11BASE}/lib/xmms \
 
 CONFIGURE_ENV=	SYSCFLAGS='${CFLAGS}'
 
-WRKSRC=		${WRKDIR}/uade-${PORTVERSION}-pre5
+WRKSRC=		${WRKDIR}/uade-${PORTVERSION}
 
 .include <bsd.port.mk>
diff --git a/audio/xmms-uade/distinfo b/audio/xmms-uade/distinfo
index c8ea3891b71f..5f8fcbde749f 100644
--- a/audio/xmms-uade/distinfo
+++ b/audio/xmms-uade/distinfo
@@ -1 +1 @@
-MD5 (uade-0.80-pre5.tar.bz2) = 33c9d566d5e31e967b90952edf6a11e2
+MD5 (uade-0.80.tar.bz2) = 025b75d762f37d9e187f70d6b56554af
diff --git a/audio/xmms-uade/files/patch-Makefile.in b/audio/xmms-uade/files/patch-Makefile.in
index 161ff3dab791..a52da8cba914 100644
--- a/audio/xmms-uade/files/patch-Makefile.in
+++ b/audio/xmms-uade/files/patch-Makefile.in
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Sat Feb 15 18:28:42 2003
-+++ Makefile.in	Sun Feb 16 01:18:56 2003
+--- Makefile.in.orig	Thu Aug 14 20:18:51 2003
++++ Makefile.in	Fri Aug 15 12:19:17 2003
 @@ -1,6 +1,7 @@
  # Top-level Makefile for UADE
  
@@ -8,16 +8,16 @@
  
  FINALBINDIR = {BINDIR}
  FINALDATADIR = {DATADIR}
-@@ -16,10 +17,10 @@
- 	@test "{USEXMMS}" = "no" || $(MAKE) plugin
+@@ -15,10 +16,10 @@
+ 	@chmod u+rx uade
  
  uade-bin:	
 -	@ cd src && $(MAKE)
 +	@ cd src && CFLAGS='$(CFLAGS)' $(MAKE)
  
  plugin:	
--	@ cd plugindir && $(MAKE)
-+	@ cd plugindir && CFLAGS='$(CFLAGS)' $(MAKE)
+-	@ cd plugindir && test "{USEXMMS}" = "no" || $(MAKE)
++	@ cd plugindir && test "{USEXMMS}" = "no" || CFLAGS='$(CFLAGS)' $(MAKE)
  
  config.h:	
  	@echo ""
diff --git a/audio/xmms-uade/files/patch-osdep+uade-os-unix.c b/audio/xmms-uade/files/patch-osdep+uade-os-unix.c
new file mode 100644
index 000000000000..84f8d1f6eb0a
--- /dev/null
+++ b/audio/xmms-uade/files/patch-osdep+uade-os-unix.c
@@ -0,0 +1,33 @@
+--- osdep/uade-os-unix.c.orig	Fri Aug 15 12:46:14 2003
++++ osdep/uade-os-unix.c	Fri Aug 15 12:49:28 2003
+@@ -12,7 +12,7 @@
+ #include <errno.h>
+ #include <limits.h>
+ 
+-#ifndef HAVE_MACOSX
++#if !defined(HAVE_MACOSX) && !defined(__FreeBSD__)
+ #include <ftw.h>
+ #endif
+ 
+@@ -94,7 +94,7 @@
+ static int (*uade_ftw_func) (const char *file, const struct stat *sb, int flag, void *arg);
+ 
+ static int ftw_func(const char *file, const struct stat *sb, int flag) {
+-#ifndef HAVE_MACOSX
++#if !defined(HAVE_MACOSX) && !defined(__FreeBSD__)
+   switch (flag) {
+   case FTW_F: flag = UADE_FTW_F; break;
+   case FTW_D: flag = UADE_FTW_D; break;
+@@ -120,10 +120,10 @@
+ {
+   uade_ftw_arg = arg;
+   uade_ftw_func = fn;
+-#ifndef HAVE_MACOSX
++#if !defined(HAVE_MACOSX) && !defined(__FreeBSD__)
+   return ftw(dir, ftw_func, depth);
+ #else
+-  fprintf(stderr, "uade: error! macosx doesn't have uade_ftw() implemented\n");
++  fprintf(stderr, "uade: error! macosx & FreeBSD doesn't have uade_ftw() implemented\n");
+   return 0;
+ #endif
+ }
diff --git a/audio/xmms-uade/files/patch-plugindir+Makefile.in b/audio/xmms-uade/files/patch-plugindir+Makefile.in
index 89dd186cc542..e13adb4923c0 100644
--- a/audio/xmms-uade/files/patch-plugindir+Makefile.in
+++ b/audio/xmms-uade/files/patch-plugindir+Makefile.in
@@ -1,11 +1,11 @@
---- plugindir/Makefile.in.orig	Tue May 13 17:31:52 2003
-+++ plugindir/Makefile.in	Tue May 13 22:29:02 2003
-@@ -26,7 +26,7 @@
+--- plugindir/Makefile.in.orig	Thu Aug 14 20:18:51 2003
++++ plugindir/Makefile.in	Fri Aug 15 12:21:02 2003
+@@ -30,7 +30,7 @@
  
- UADEDEPS = uade.h defaults.h gui.h ../decrunch/decrunch.h
+ UADEDEPS = uade.h defaults.h gui.h $(DECDIR)/decrunch.h
  INCLUDEFLAGS = -I. -I../osdep -I../effects -I../src/include $(GLIBFLAGS) $(GTKFLAGS) $(XMMSFLAGS) $(INCLUDEFLAG)
--CFLAGS = -O2 -DHAVE_CONFIG_H -D_REENTRANT -DVERSION=\"$(VERSION)\" -W -Wall
-+CFLAGS += -O2 -DHAVE_CONFIG_H -D_REENTRANT -DVERSION=\"$(VERSION)\" -W -Wall
+-CFLAGS = -O2 -DHAVE_CONFIG_H -D_REENTRANT -DVERSION=\"$(VERSION)\" -W -Wall $(DEBUGFLAGS)
++CFLAGS += -O2 -DHAVE_CONFIG_H -D_REENTRANT -DVERSION=\"$(VERSION)\" -W -Wall $(DEBUGFLAGS)
  LDFLAGS = $(LIBFLAG) $(GLIBLIBS) $(XMMSLIBS)
+ DECFLAGS  = -c -O2 -W -Wall -Wno-implicit-int -finline-functions {ARCHFLAGS} $(DEBUGFLAGS)
  
- LIBTOOL = libtool
diff --git a/audio/xmms-uade/files/patch-src+Makefile.in b/audio/xmms-uade/files/patch-src+Makefile.in
index bcc8142ec929..84dd3688fdb0 100644
--- a/audio/xmms-uade/files/patch-src+Makefile.in
+++ b/audio/xmms-uade/files/patch-src+Makefile.in
@@ -1,11 +1,11 @@
---- src/Makefile.in.orig	Tue May 13 17:31:53 2003
-+++ src/Makefile.in	Tue May 13 22:59:48 2003
-@@ -2,7 +2,7 @@
- 
- ARCHFLAGS = {ARCHFLAGS}
+--- src/Makefile.in.orig	Thu Aug 14 20:18:51 2003
++++ src/Makefile.in	Fri Aug 15 12:22:07 2003
+@@ -7,7 +7,7 @@
+ SDLLIBS= {SDLLIBS}
+ SOUNDLIBS= {SOUNDLIBS}
  
 -CFLAGS	= -fomit-frame-pointer  -Wall -Wno-unused -Wno-format -W -Wmissing-prototypes -Wstrict-prototypes -DGCCCONSTFUNC="__attribute__((const))" -D_REENTRANT -fno-exceptions -fno-strength-reduce -DREGPARAM= -D__inline__=inline $(ARCHFLAGS) -O2
 +CFLAGS	+= -fomit-frame-pointer  -Wall -Wno-unused -Wno-format -W -Wmissing-prototypes -Wstrict-prototypes -DGCCCONSTFUNC="__attribute__((const))" -D_REENTRANT -fno-exceptions -fno-strength-reduce -DREGPARAM= -D__inline__=inline $(ARCHFLAGS) -O2
+ LIBRARIES = -lm $(ARCHLIBS) $(SDLLIBS) $(SOUNDLIBS)
  
- SDLLIBS= {SDLLIBS}
- SDLFLAGS= {SDLFLAGS}
+ .SUFFIXES: .a .o .c .h .S
diff --git a/audio/xmms-uade/files/patch-src+unix-shell.c b/audio/xmms-uade/files/patch-src+unix-shell.c
new file mode 100644
index 000000000000..0bda355d68e4
--- /dev/null
+++ b/audio/xmms-uade/files/patch-src+unix-shell.c
@@ -0,0 +1,29 @@
+--- src/unix-shell.c.orig	Fri Aug 15 12:50:41 2003
++++ src/unix-shell.c	Fri Aug 15 12:51:37 2003
+@@ -27,7 +27,7 @@
+ #include "../osdep/strl.c"
+ #include "unix-shell.h"
+ 
+-#ifndef HAVE_MACOSX /* macosx doesn't have ftw. hell.. */
++#if !defined(HAVE_MACOSX) && !defined(__FreeBSD__)
+ #include <ftw.h>
+ #endif
+ 
+@@ -58,7 +58,7 @@
+   }
+ }
+ 
+-#ifndef HAVE_MACOSX
++#if !defined(HAVE_MACOSX) && !defined(__FreeBSD__)
+ static int ftw_func(const char *file, const struct stat *sb, int flag, void *arg) {
+   if (flag == UADE_FTW_F) {
+     char name[PATH_MAX];
+@@ -88,7 +88,7 @@
+     return;
+   }
+ 
+-#ifndef HAVE_MACOSX
++#if !defined(HAVE_MACOSX) && !defined(__FreeBSD__)
+   do {
+     struct stat st;
+     if (!stat(file, &st)) {
diff --git a/audio/xmms-uade/pkg-plist b/audio/xmms-uade/pkg-plist
index 415afb318bc7..f562c6eba61e 100644
--- a/audio/xmms-uade/pkg-plist
+++ b/audio/xmms-uade/pkg-plist
@@ -1,11 +1,19 @@
 lib/xmms/Input/libuade.la
 lib/xmms/Input/libuade.so
+share/uade/players/ENV/EaglePlayer/ahx
+share/uade/players/ENV/EaglePlayer/EP-TFMX_7V.cfg
+share/uade/players/ENV/EaglePlayer/EP-TFMX_Pro.cfg
+share/uade/players/ENV/EaglePlayer/EP-Mugician_II.cfg
+share/uade/players/ENV/EaglePlayer/ahx.waves
+share/uade/players/ENV/EaglePlayer/ems_v6.cfg
+share/uade/players/ENV/EaglePlayer/ems_v6.cfg.txt
 share/uade/db-content
 share/uade/players/AHX
 share/uade/players/AMComposer1.2
 share/uade/players/ActionAmics
 share/uade/players/Art&Magic
 share/uade/players/ArtOfNoise
+share/uade/players/ArtOfNoise8
 share/uade/players/AudioSculpture
 share/uade/players/BeathovenSynthesizer
 share/uade/players/BennDaglish
@@ -22,15 +30,9 @@ share/uade/players/DavidWhittaker
 share/uade/players/Delta2.0
 share/uade/players/DeltaMusic
 share/uade/players/Desire
+share/uade/players/DigitalSonix_Chrome
 share/uade/players/DynamicSynthesizer
 share/uade/players/EMS_v6
-share/uade/players/ENV:EaglePlayer/EP-Mugician_II.cfg
-share/uade/players/ENV:EaglePlayer/EP-TFMX_7V.cfg
-share/uade/players/ENV:EaglePlayer/EP-TFMX_Pro.cfg
-share/uade/players/ENV:EaglePlayer/ems_v6.cfg
-share/uade/players/ENV:EaglePlayer/ems_v6.cfg.txt
-share/uade/players/ENV:EaglePlayer/ahx
-share/uade/players/ENV:EaglePlayer/ahx.waves
 share/uade/players/FC1.3
 share/uade/players/FC1.4
 share/uade/players/Fred
@@ -91,6 +93,7 @@ share/uade/players/SIDMon1.0
 share/uade/players/SIDMon2.0
 share/uade/players/SOPROL
 share/uade/players/SUNtronic
+share/uade/players/ScottJohnston
 share/uade/players/SeanConnolly
 share/uade/players/SeanConran
 share/uade/players/Silmarils
@@ -102,6 +105,7 @@ share/uade/players/SoundMon2.2
 share/uade/players/SoundPlayer
 share/uade/players/Soundcontrol
 share/uade/players/Soundfactory
+share/uade/players/SoundMaster
 share/uade/players/Special_FX
 share/uade/players/SpeedyA1System
 share/uade/players/SpeedySystem
@@ -136,6 +140,8 @@ bin/pwrap.pl
 lib/xmms/doc/uade-0.80/INSTALL.alpha
 lib/xmms/doc/uade-0.80/INSTALL.MorphOS
 lib/xmms/doc/uade-0.80/amplifiers.txt
+lib/xmms/doc/uade-0.80/local-slaves.txt
+lib/xmms/doc/uade-0.80/INSTALL.darwin
 lib/xmms/doc/uade-0.80/players/WantedTeam/WT_Players.txt
 lib/xmms/doc/uade-0.80/players/WantedTeam/EP_BennDaglish.readme
 lib/xmms/doc/uade-0.80/players/WantedTeam/EP_BladePacker.readme
@@ -145,6 +151,7 @@ lib/xmms/doc/uade-0.80/players/WantedTeam/EP_DWhittaker.readme
 lib/xmms/doc/uade-0.80/players/WantedTeam/EP_DaveLowe.readme
 lib/xmms/doc/uade-0.80/players/WantedTeam/EP_DaveLoweNew.readme
 lib/xmms/doc/uade-0.80/players/WantedTeam/EP_Desire.readme
+lib/xmms/doc/uade-0.80/players/WantedTeam/EP_DigitSonix.readme
 lib/xmms/doc/uade-0.80/players/WantedTeam/EP_DynamicSynt.readme
 lib/xmms/doc/uade-0.80/players/WantedTeam/EP_FredGray.readme
 lib/xmms/doc/uade-0.80/players/WantedTeam/EP_HowieDavies.readme
@@ -222,6 +229,8 @@ lib/xmms/doc/uade-0.80/COPYING
 @dirrm lib/xmms/doc/uade-0.80/players
 @dirrm lib/xmms/doc/uade-0.80
 @dirrm lib/xmms/doc
-@dirrm share/uade/players/ENV:EaglePlayer
+@dirrm share/uade/players/ENV/EaglePlayer
+@dirrm share/uade/players/ENV
+@dirrm share/uade/players/S
 @dirrm share/uade/players
 @dirrm share/uade