- Update to 1.3.6.

PR:		ports/81725
Submitted by:	Ports Fury

4 files changed, 55 insertions, 31 deletions

diff --git a/emulators/atari800/Makefile b/emulators/atari800/Makefile
index 6a47a2e4c637..e46e350213a3 100644
--- a/emulators/atari800/Makefile
+++ b/emulators/atari800/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	atari800
-PORTVERSION=	1.3.5
+PORTVERSION=	1.3.6
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -18,6 +18,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Atari 8-bit computer emulator
 
 BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
+LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
 
 RESTRICTED=	"xf25 contains copyright ROMs and cannot be distributed."
 
@@ -27,15 +28,19 @@ USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 
 MAN1=		atari800.1
 
+CFLAGS+=	-I${LOCALBASE}/include/libpng
+LDFLAGS=	-L${LOCALBASE}/lib
+
 ATARI_XF=	ataribas.rom atariosb.rom atarixl.rom demos1.xfd \
 		demos2.xfd dos25.xfd mydos45d.atr
 
 .if defined(WITH_SDL)
 PKGNAMESUFFIX=	-sdl
-USE_SDL=	yes
+USE_SDL=	sdl
 CONFIGURE_ARGS+=	--target=sdl
 .else
 USE_XLIB=	yes
@@ -54,10 +59,6 @@ CONFIGURE_ARGS+=	--enable-seriosound
 CONFIGURE_ARGS+=	--enable-cripsound
 .endif
 
-.if defined(WITH_SNAILMETER)
-CONFIGURE_ARGS+=	--enable-snailmeter
-.endif
-
 .if defined(WITH_PAGEDATTRIB)
 CONFIGURE_ARGS+=	--enable-pagedattrib
 .endif
@@ -66,33 +67,22 @@ CONFIGURE_ARGS+=	--enable-pagedattrib
 CONFIGURE_ARGS+=	--enable-bufferdlog
 .endif
 
-.if defined(WITH_DISKLED)
-CONFIGURE_ARGS+=	--enable-diskled
-.endif
-
 .if defined(WITH_VERYSLOW)
 CONFIGURE_ARGS+=	--enable-veryslow
 .endif
 
-.if defined(WITH_CURSORBLOCK)
-CONFIGURE_ARGS+=	--enable-cursorblock
-.endif
-
 pre-everything::
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "Atari800 has the following tunable option(s):"
 	@${ECHO_MSG} "	WITHOUT_SHM=yes		Use X11 frontend without shared memory extensions"
 	@${ECHO_MSG} "	WITH_SDL=yes		Use SDL frontend"
 	@${ECHO_MSG} "	WITH_SERIOSOUND=yes	Use serial in/out sound"
-	@${ECHO_MSG} "	WITH_CLIPSOUND=yes	Use bufferd debug output"
-	@${ECHO_MSG} "	WITH_SNAILMETER=yes	Show how much the emulator is slower than the original"
+	@${ECHO_MSG} "	WITH_CLIPSOUND=yes	Use sound clipping"
 	@${ECHO_MSG} "	WITH_PAGEDATTRIB=yes	Use page-based attribute array"
 	@${ECHO_MSG} "	WITH_BUFFERDLOG=yes	Use buffered debug output"
 	@${ECHO_MSG} "				(until the graphics mode switches back to text mode)"
-	@${ECHO_MSG} "	WITH_DISKLED=yes	Show disk LED emulation on screen display"
 	@${ECHO_MSG} "	WITH_VERYSLOW=yes	Use very slow computer support"
-	@${ECHO_MSG} "				(disables generating screen completely)"
-	@${ECHO_MSG} "	WITH_CURSORBLOCK=yes	Using cursor/ctrl keys for keyboard joystick"
+	@${ECHO_MSG} "				(use with the -refresh option)"
 	@${ECHO_MSG} ""
 
 post-patch:
@@ -105,7 +95,7 @@ post-patch:
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 
 pre-configure:
-	@unzip -q -L -o ${DISTDIR}/${DIST_SUBDIR}/xf25.zip ${ATARI_XF} -d ${WRKSRC}
+	@${UNZIP_CMD} -q -L -o ${DISTDIR}/${DIST_SUBDIR}/xf25.zip ${ATARI_XF} -d ${WRKSRC}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/atari800 ${PREFIX}/bin/atari800
diff --git a/emulators/atari800/distinfo b/emulators/atari800/distinfo
index e45c6de05c69..e7c7802175b9 100644
--- a/emulators/atari800/distinfo
+++ b/emulators/atari800/distinfo
@@ -1,4 +1,4 @@
-MD5 (atari800/atari800-1.3.5.tar.gz) = 299922f3a1086410302eafe35c76b1cb
-SIZE (atari800/atari800-1.3.5.tar.gz) = 1007863
+MD5 (atari800/atari800-1.3.6.tar.gz) = 98b58d26aabeedb124233787677c32c3
+SIZE (atari800/atari800-1.3.6.tar.gz) = 1012231
 MD5 (atari800/xf25.zip) = 4dc3b6b4313e9596c4d474785a37b94d
 SIZE (atari800/xf25.zip) = 188942
diff --git a/emulators/atari800/files/patch-configure b/emulators/atari800/files/patch-configure
new file mode 100644
index 000000000000..8b7e3e6dcabf
--- /dev/null
+++ b/emulators/atari800/files/patch-configure
@@ -0,0 +1,34 @@
+--- configure.orig	Sat Apr 30 23:18:04 2005
++++ configure	Sat May 28 02:59:23 2005
+@@ -1369,7 +1369,7 @@
+         a8_target="UNKNOWN"
+         ;;
+ esac
+-if [ "$a8_target" == "UNKNOWN" ]; then
++if [ "$a8_target" = "UNKNOWN" ]; then
+     echo
+     echo "Usage: configure --target=<target> <other options>"
+     echo
+@@ -1569,11 +1569,11 @@
+         ;;
+ esac
+ 
+-if [ "X_$CFLAGS" == "X_" ]; then
++if [ "X_$CFLAGS" = "X_" ]; then
+     CFLAGS="-O2 -Wall"
+ fi
+ 
+-if [ "X_$LDFLAGS" == "X_" ]; then
++if [ "X_$LDFLAGS" = "X_" ]; then
+     LDFLAGS="-s"
+ fi
+
+@@ -4386,7 +4386,7 @@
+ 
+ 
+ OBJS=
+-if [ "$a8_host" == "win" ]; then
++if [ "$a8_host" = "win" ]; then
+ 
+ as_ac_Lib=`echo "ac_cv_lib_gdi32''_main" | $as_tr_sh`
+ echo "$as_me:$LINENO: checking for main in -lgdi32" >&5
diff --git a/emulators/atari800/pkg-plist b/emulators/atari800/pkg-plist
index 8a202efd01fb..987bf97ca1c4 100644
--- a/emulators/atari800/pkg-plist
+++ b/emulators/atari800/pkg-plist
@@ -1,12 +1,12 @@
 bin/atari800
-share/atari800/atari800.cfg
-share/atari800/ataribas.rom
-share/atari800/atariosb.rom
-share/atari800/atarixl.rom
-share/atari800/demos1.xfd
-share/atari800/demos2.xfd
-share/atari800/dos25.xfd
-share/atari800/mydos45d.atr
+%%DATADIR%%/atari800.cfg
+%%DATADIR%%/ataribas.rom
+%%DATADIR%%/atariosb.rom
+%%DATADIR%%/atarixl.rom
+%%DATADIR%%/demos1.xfd
+%%DATADIR%%/demos2.xfd
+%%DATADIR%%/dos25.xfd
+%%DATADIR%%/mydos45d.atr
 %%PORTDOCS%%%%DOCSDIR%%/BUGS
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES.OLD
 %%PORTDOCS%%%%DOCSDIR%%/CREDITS
@@ -17,4 +17,4 @@ share/atari800/mydos45d.atr
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%%%DOCSDIR%%/USAGE
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm share/atari800
+@dirrm %%DATADIR%%