2 files changed, 34 insertions, 31 deletions

diff --git a/emulators/uae/Makefile b/emulators/uae/Makefile
index 9bf22eda9b7d..7b22aaf1b8ab 100644
--- a/emulators/uae/Makefile
+++ b/emulators/uae/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: uae
-# Date created: 22 May 2000
-# Whom: Simon Dick <simond@irrelevant.org>
-#
+# Created by: Simon Dick <simond@irrelevant.org>
 # $FreeBSD$
-#
 
 PORTNAME=	uae
 PORTVERSION=	0.8.29
@@ -12,27 +8,29 @@ CATEGORIES=	emulators
 MASTER_SITES=	http://www.amigaemulator.org/files/sources/develop/
 
 MAINTAINER=	simond@irrelevant.org
-COMMENT=	Amiga emulator
+COMMENT=	Commodore Amiga emulator
+
+LICENSE=	GPLv2
 
 CONFLICTS=	e-uae-[0-9]*
 
 USE_BZIP2=	yes
-USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
+USES=		gmake
 USE_AUTOTOOLS=	autoconf
 CONFIGURE_ARGS=	--enable-sound
 USE_GNOME=	gtk20
 
-CFLAGS+=	${PTHREAD_CFLAGS}
+OPTIONS_DEFINE=	DOCS
+
+.include <bsd.port.options.mk>
 
 pre-configure:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \
-		${WRKSRC}/configure.in
+	@${REINPLACE_CMD} -e 's|build68kc|build68k|' \
+		${WRKSRC}/src/Makefile.in
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/uae ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/readdisk ${PREFIX}/bin
-.if !defined(NOPORTDOCS)
+	${INSTALL_PROGRAM} ${WRKSRC}/uae ${WRKSRC}/readdisk ${PREFIX}/bin
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/COMPATIBILITY ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/CREDITS ${DOCSDIR}
@@ -42,25 +40,23 @@ do-install:
 	${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/
-	${INSTALL_DATA} ${WRKSRC}/amiga/transdisk ${DATADIR}/amiga/
-	${INSTALL_DATA} ${WRKSRC}/amiga/transrom ${DATADIR}/amiga/
-	${INSTALL_DATA} ${WRKSRC}/amiga/uae-control ${DATADIR}/amiga/
-	${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.pre.mk>
+	${INSTALL_DATA} ${WRKSRC}/amiga/mousehack ${DATADIR}/amiga
+	${INSTALL_DATA} ${WRKSRC}/amiga/timehack ${DATADIR}/amiga
+	${INSTALL_DATA} ${WRKSRC}/amiga/transdisk ${DATADIR}/amiga
+	${INSTALL_DATA} ${WRKSRC}/amiga/transrom ${DATADIR}/amiga
+	${INSTALL_DATA} ${WRKSRC}/amiga/uae-control ${DATADIR}/amiga
+	${INSTALL_DATA} ${WRKSRC}/amiga/uae-control.info ${DATADIR}/amiga
+	${INSTALL_DATA} ${WRKSRC}/amiga/uae_rcli ${DATADIR}/amiga
+	${INSTALL_DATA} ${WRKSRC}/amiga/uaectrl ${DATADIR}/amiga
+	${INSTALL_DATA} ${WRKSRC}/amiga/devs/AHI/uae.audio \
+		${DATADIR}/amiga/devs/AHI
+	${INSTALL_DATA} ${WRKSRC}/amiga/devs/AudioModes/UAE \
+		${DATADIR}/amiga/devs/AudioModes
 
 .if ${ARCH} == "powerpc"
 BROKEN=		Does not compile on powerpc
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/emulators/uae/pkg-descr b/emulators/uae/pkg-descr
index c2ae9359c2b8..0337cb4a2488 100644
--- a/emulators/uae/pkg-descr
+++ b/emulators/uae/pkg-descr
@@ -1,4 +1,11 @@
-This is a port for UAE, the Universal Amiga Emulator.
-You will require a valid Amiga ROM file in order for this to be useful.
+UAE is a mostly complete software emulation of the hardware of the Commodore
+Amiga 500/1000/2000.  Commodore Amiga, for those who don't know, is a 16/32
+bit computer system based on the Motorola 680x0 CPU and a few specially
+designed custom chips that provide very good graphics and sound capabilities.
+
+Its first incarnation, the A1000, appeared in 1985, followed by the highly
+successful A500 and A2000 models.
+
+Requires a valid Amiga ROM file in order to be useful.
 
 WWW: http://www.amigaemulator.org/