Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 30 Dec 2001 03:58:14 -0800 (PST)
From:      KATO Tsuguru <tkato@prontomail.com>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/33337: Update port: emulators/atari800 to 1.2.0
Message-ID:  <200112301158.fBUBwEJ58913@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         33337
>Category:       ports
>Synopsis:       Update port: emulators/atari800 to 1.2.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Dec 30 04:00:03 PST 2001
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        4.4-RELEASE i386
>Organization:
>Environment:
>Description:
- Update to version 1.2.0

Remove file:
files/config.h
files/patch-aa

>How-To-Repeat:

>Fix:
diff -urN /usr/ports/emulators/atari800/Makefile emulators/atari800/Makefile
--- /usr/ports/emulators/atari800/Makefile	Tue Jun 12 10:33:29 2001
+++ emulators/atari800/Makefile	Sun Dec 30 13:18:39 2001
@@ -6,60 +6,64 @@
 #
 
 PORTNAME=	atari800
-PORTVERSION=	1.0.7
+PORTVERSION=	1.2.0
 CATEGORIES=	emulators
-MASTER_SITES=	ftp://ftp.sophics.cz/pub/Atari800/src/ \
-		http://joy.sophics.cz/www/
-DISTFILES=	a800s${PORTVERSION:S/.//g}.zip xf25.zip
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
+DISTFILES=	a800s${PORTVERSION:S/.//g}.tgz xf25.zip
 DIST_SUBDIR=	${PORTNAME}
-EXTRACT_ONLY=	a800s${PORTVERSION:S/.//g}.zip
+EXTRACT_ONLY=	a800s${PORTVERSION:S/.//g}.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 
+BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
+
 RESTRICTED=	"xf25 contains copyright ROMs and cannot be distributed."
 NO_PACKAGE=	${RESTRICTED}
 
-WRKSRC=		${WRKDIR}/Atari800-${PORTVERSION}/src
-USE_ZIP=	yes
+WRKSRC=		${WRKDIR}/Atari800/src
+
 USE_XLIB=	yes
 USE_GMAKE=	yes
-
-.if defined(WITH_SHM)
-ALL_TARGET=	x11-shm
-.else
-ALL_TARGET=	x11
-.endif
+USE_AUTOCONF=	yes
+CONFIGURE_ARGS=	--disable-VERY_SLOW --enable-NO_CYCLE_EXACT \
+		--enable-CRASH_MENU --enable-MONITOR_BREAK \
+		--enable-MONITOR_HINTS --enable-MONITOR_ASSEMBLER \
+		--disable-COMPILED_PALETTE --disable-SNAILMETER \
+		--enable-SOUND --enable-NO_VOL_ONLY \
+		--enable-NO_CONSOL_SOUND --disable-SERIO_SOUND \
+		--enable-NOSNDINTER --disable-CLIP \
+		--disable-STEREO --target=x11
 
 MAN1=		atari800.1
 
-ATARI_LIB=	${PREFIX}/share/${PKGBASE}
 ATARI_XF=	ataribas.rom atariosb.rom atarixl.rom demos1.xfd \
 		demos2.xfd dos25.xfd mydos45d.atr
-ATARI_DOC=	${PREFIX}/share/doc/${PKGBASE}
-DOC_FILES=	BUGS CHANGES CREDITS FAQ INSTALL README TODO USAGE
+PORTDOCS=	BUGS CHANGES CREDITS FAQ INSTALL README TODO USAGE
 
 post-extract:
-	@unzip -q -L -o ${_DISTDIR}/xf25.zip ${ATARI_XF} -d ${WRKSRC}
+	@unzip -q -L -o ${DISTDIR}/${DIST_SUBDIR}/xf25.zip ${ATARI_XF} -d ${WRKSRC}
 
 post-patch:
-	@${LN} -sf Makefile.unix ${WRKSRC}/Makefile
-	@${CP} ${FILESDIR}/config.h ${WRKSRC}
-	@${TOUCH} ${WRKSRC}/.atari800
-	@${SED} -e 's:GUMBY:${ATARI_LIB}:g' \
-		${FILESDIR}/atari800.cfg > ${WRKSRC}/atari800.cfg
-
-post-install:
-	@${MKDIR} ${ATARI_LIB}
-	${INSTALL_DATA} -m 664 ${WRKSRC}/atari800.cfg ${ATARI_LIB}
+	@${CP} ${FILESDIR}/atari800.cfg ${WRKSRC}
+	@${PERL} -pi -e 's|GUMBY|${DATADIR}|g' ${WRKSRC}/atari800.cfg
+	@${PERL} -pi -e 's|/etc|${DATADIR}|g' ${WRKSRC}/rt-config.c
+	@cd ${WRKSRC} && ${AUTOHEADER}
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/atari800 ${PREFIX}/bin/atari800
+	${INSTALL_MAN} ${WRKSRC}/atari800.man ${MANPREFIX}/man/man1/atari800.1
+	@${MKDIR} ${DATADIR}
+	${INSTALL_DATA} -m 664 ${WRKSRC}/atari800.cfg ${DATADIR}
 .for file in ${ATARI_XF}
-	${INSTALL_DATA} ${WRKSRC}/${file} ${ATARI_LIB}
+	${INSTALL_DATA} ${WRKSRC}/${file} ${DATADIR}
 .endfor
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${ATARI_DOC}
-.for file in ${DOC_FILES}
-	${INSTALL_DATA} ${WRKSRC}/../DOC/${file} ${ATARI_DOC}
+	@${MKDIR} ${DOCSDIR}
+.for file in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/../DOC/${file} ${DOCSDIR}
 .endfor
-	${INSTALL_DATA} ${DESCR} ${ATARI_DOC}/README.FreeBSD
+	${INSTALL_DATA} ${DESCR} ${DOCSDIR}/README.FreeBSD
 .endif
 
 .include <bsd.port.mk>
diff -urN /usr/ports/emulators/atari800/distinfo emulators/atari800/distinfo
--- /usr/ports/emulators/atari800/distinfo	Tue Jun 12 10:33:29 2001
+++ emulators/atari800/distinfo	Sun Dec 30 11:00:55 2001
@@ -1,2 +1,2 @@
-MD5 (atari800/a800s107.zip) = 83dd41e8f2e90737627ac0c9484bd621
+MD5 (atari800/a800s120.tgz) = c943d328b2fb9c10449a19c24e14aee0
 MD5 (atari800/xf25.zip) = 4dc3b6b4313e9596c4d474785a37b94d
diff -urN /usr/ports/emulators/atari800/files/config.h emulators/atari800/files/config.h
--- /usr/ports/emulators/atari800/files/config.h	Mon Feb  7 06:46:26 2000
+++ emulators/atari800/files/config.h	Thu Jan  1 09:00:00 1970
@@ -1,4 +0,0 @@
-#ifndef __CONFIG__
-#define __CONFIG__
-#define UNALIGNED_LONG_OK
-#endif
diff -urN /usr/ports/emulators/atari800/files/patch-aa emulators/atari800/files/patch-aa
--- /usr/ports/emulators/atari800/files/patch-aa	Tue Jun 12 10:33:38 2001
+++ emulators/atari800/files/patch-aa	Thu Jan  1 09:00:00 1970
@@ -1,44 +0,0 @@
---- Makefile.unix.orig	Wed Apr  4 07:35:36 2001
-+++ Makefile.unix	Wed May 23 23:29:50 2001
-@@ -1,11 +1,11 @@
- # $Id: Makefile.unix,v 1.5 2001/04/04 05:35:36 knik Exp $
- 
--CC = gcc
-+CC ?= gcc
- EXE=
--CFLAGS = -O2 -Wall
--DEFS = 
-+CFLAGS ?= -O2 -Wall
-+DEFS = -DDEFAULT_CFG_PATH=\\"\"${PREFIX}/share/atari800/atari800.cfg\\"\"
- 
--PREFIX		= /usr/local
-+PREFIX		?= /usr/local
- BIN_PATH	= ${PREFIX}/bin
- LIB_PATH	= ${PREFIX}/lib
- MAN_PATH	= ${PREFIX}/man
-@@ -72,13 +72,13 @@
- 
- x11:
- 	$(MAKE) $(TARGET) DEFS="$(DEFS) -DX11" OBJ="$(OBJ) $(XOBJ)" \
--		INCLUDE="$(INCLUDE) -I/usr/X11R6/include" \
--		LIBS="-L/usr/X11/lib -L/usr/X11R6/lib $(LIBS) -lX11"
-+		INCLUDE="$(INCLUDE) -I${X11BASE}/include" \
-+		LIBS="-L${X11BASE}/lib $(LIBS) -lX11"
- 
- x11-shm:
- 	$(MAKE) $(TARGET) DEFS="$(DEFS) -DX11 -DSHM" OBJ="$(OBJ) $(XOBJ)" \
--		INCLUDE="$(INCLUDE) -I/usr/X11R6/include" \
--		LIBS="-L/usr/X11/lib -L/usr/X11R6/lib $(LIBS) -lX11 -lXext"
-+		INCLUDE="$(INCLUDE) -I${X11BASE}/include" \
-+		LIBS="-L${X11BASE}/lib $(LIBS) -lX11 -lXext"
- 
- hp9000-ansic-x11:
- 	$(MAKE) $(TARGET) \
-@@ -113,5 +113,5 @@
- 	chmod 4755 ${BIN_PATH}/$(TARGET)
- 
- install :
--	cp atari800 ${BIN_PATH}/$(TARGET)
--	cp atari800.man ${MAN_PATH}/man1/atari800.1
-+	${BSD_INSTALL_PROGRAM} atari800 ${BIN_PATH}/$(TARGET)
-+	${BSD_INSTALL_MAN} atari800.man ${MAN_PATH}/man1/atari800.1
diff -urN /usr/ports/emulators/atari800/pkg-descr emulators/atari800/pkg-descr
--- /usr/ports/emulators/atari800/pkg-descr	Tue Jun 12 10:33:29 2001
+++ emulators/atari800/pkg-descr	Sun Dec 30 10:53:01 2001
@@ -14,4 +14,4 @@
 would like to take a further look at XF2.5 you should find it in your
 distfiles directory (if it successfully down-loaded :->).
 
-WWW: http://joy.sophics.cz/a800/
+WWW: http://atari800.sourceforge.net/

>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200112301158.fBUBwEJ58913>