5 files changed, 32 insertions, 50 deletions

diff --git a/emulators/uae/Makefile b/emulators/uae/Makefile
index 7e73e06d85f5..e6c00338ce83 100644
--- a/emulators/uae/Makefile
+++ b/emulators/uae/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	uae
-PORTVERSION=	0.8.22
-PORTREVISION=	2
+PORTVERSION=	0.8.25
 CATEGORIES=	emulators
 MASTER_SITES=	ftp://ftp.freiburg.linux.de/pub/uae/sources/develop/
 
@@ -16,10 +15,10 @@ COMMENT=	Amiga emulator
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_AUTOCONF_VER=	213
+USE_AUTOCONF_VER=	259
 CONFIGURE_ARGS=	--enable-sound --enable-vidmode --enable-dga
 USE_XLIB=	yes
-USE_GNOME=	gtk12
+USE_GNOME=	gtk20
 USE_REINPLACE=	yes
 
 CFLAGS+=	${PTHREAD_CFLAGS}
@@ -31,6 +30,7 @@ pre-configure:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/uae ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/readdisk ${PREFIX}/bin
+.if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/COMPATIBILITY ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/CREDITS ${DOCSDIR}
@@ -39,6 +39,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/docs/README ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/README.PROGRAMMERS ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/unix/README ${DOCSDIR}/README.unix
+.endif
 	@${MKDIR} ${DATADIR}/amiga
 	${INSTALL_DATA} ${WRKSRC}/amiga/mousehack ${DATADIR}/amiga/
 	${INSTALL_DATA} ${WRKSRC}/amiga/timehack ${DATADIR}/amiga/
@@ -48,5 +49,16 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/amiga/uae-control.info ${DATADIR}/amiga/
 	${INSTALL_DATA} ${WRKSRC}/amiga/uae_rcli ${DATADIR}/amiga/
 	${INSTALL_DATA} ${WRKSRC}/amiga/uaectrl ${DATADIR}/amiga/
+	@${MKDIR} ${DATADIR}/amiga/devs
+	@${MKDIR} ${DATADIR}/amiga/devs/AHI
+	@${MKDIR} ${DATADIR}/amiga/devs/AudioModes
+	${INSTALL_DATA} ${WRKSRC}/amiga/devs/AHI/uae.audio ${DATADIR}/amiga/devs/AHI/
+	${INSTALL_DATA} ${WRKSRC}/amiga/devs/AudioModes/UAE ${DATADIR}/amiga/devs/AudioModes/
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 500000
+BROKEN=	"Doesn't build on FreeBSD < 5.x"
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/emulators/uae/distinfo b/emulators/uae/distinfo
index 02e8fc0fb9ac..7a42c3d407dc 100644
--- a/emulators/uae/distinfo
+++ b/emulators/uae/distinfo
@@ -1,2 +1,2 @@
-MD5 (uae-0.8.22.tar.gz) = f3d1d0fabf6fa626dc531687cb2bb94d
-SIZE (uae-0.8.22.tar.gz) = 937486
+MD5 (uae-0.8.25.tar.gz) = e660ca2bec3c016c978ef88117b0c432
+SIZE (uae-0.8.25.tar.gz) = 970727
diff --git a/emulators/uae/files/patch-src+Makefile.in b/emulators/uae/files/patch-src+Makefile.in
deleted file mode 100644
index b9a2a5448068..000000000000
--- a/emulators/uae/files/patch-src+Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/Makefile.in.orig	Mon Feb 24 23:47:30 2003
-+++ src/Makefile.in	Mon Feb 24 23:49:01 2003
-@@ -120,10 +120,8 @@
- cpustbl.c: cpuemu.c
- cputbl.h: cpuemu.c
- 
--cpufast.s: cpuemu.c tools/cpuopti
--	$(CC) $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $(NO_SCHED_CFLAGS) $< -o cputmp.s
--	./tools/cpuopti <cputmp.s >$@
--	rm cputmp.s
-+cpufast.s: cpuemu.c
-+	$(CC) $(INCLUDES) -S $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $(NO_SCHED_CFLAGS) $< -o $@
- 
- console_missing.o: missing.c
- 	$(CC) $(INCLUDES) -c $(INCDIRS) $(CFLAGS) $(X_CFLAGS) $(DEBUGFLAGS) $(CFLAGS_$@) $< -o $@
diff --git a/emulators/uae/files/patch-src+include+sysdeps.h b/emulators/uae/files/patch-src+include+sysdeps.h
deleted file mode 100644
index 318339a4ade4..000000000000
--- a/emulators/uae/files/patch-src+include+sysdeps.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/include/sysdeps.h.orig	Mon Nov 19 23:58:46 2001
-+++ src/include/sysdeps.h	Thu Sep 30 16:59:24 2004
-@@ -103,12 +103,12 @@
- };
- #endif
- 
--#if defined(__GNUC__) && defined(AMIGA)
--/* gcc on the amiga need that __attribute((regparm)) must */
--/* be defined in function prototypes as well as in        */
--/* function definitions !                                 */
-+#if defined(__GNUC__)
-+/* recent gcc needs that __attribute((regparm)) must */
-+/* be defined in function prototypes as well as in   */
-+/* function definitions !                            */
- #define REGPARAM2 REGPARAM
--#else /* not(GCC & AMIGA) */
-+#else /* not GCC */
- #define REGPARAM2
- #endif
- 
diff --git a/emulators/uae/pkg-plist b/emulators/uae/pkg-plist
index 801681ede05b..1871ffb5c18e 100644
--- a/emulators/uae/pkg-plist
+++ b/emulators/uae/pkg-plist
@@ -8,13 +8,18 @@ bin/readdisk
 %%DATADIR%%/amiga/uae-control.info
 %%DATADIR%%/amiga/uae_rcli
 %%DATADIR%%/amiga/uaectrl
-%%DOCSDIR%%/COMPATIBILITY
-%%DOCSDIR%%/CREDITS
-%%DOCSDIR%%/FAQ
-%%DOCSDIR%%/NEWS
-%%DOCSDIR%%/README
-%%DOCSDIR%%/README.PROGRAMMERS
-%%DOCSDIR%%/README.unix
-@dirrm %%DOCSDIR%%
+%%DATADIR%%/amiga/devs/AHI/uae.audio
+%%DATADIR%%/amiga/devs/AudioModes/UAE
+%%PORTDOCS%%%%DOCSDIR%%/COMPATIBILITY
+%%PORTDOCS%%%%DOCSDIR%%/CREDITS
+%%PORTDOCS%%%%DOCSDIR%%/FAQ
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.PROGRAMMERS
+%%PORTDOCS%%%%DOCSDIR%%/README.unix
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%DATADIR%%/amiga/devs/AudioModes
+@dirrm %%DATADIR%%/amiga/devs/AHI
+@dirrm %%DATADIR%%/amiga/devs
 @dirrm %%DATADIR%%/amiga
 @dirrm %%DATADIR%%