ports/152393: [patch] upate of emulators/stonx

dirk.meyer at dinoex.sub.org dirk.meyer at dinoex.sub.org
Fri Nov 19 06:20:10 UTC 2010 

>Number:         152393
>Category:       ports
>Synopsis:       [patch] upate of emulators/stonx
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Nov 19 06:20:09 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Dirk Meyer
>Release:        FreeBSD 8.1-RELEASE
>Organization:
privat
>Environment:

>Description:

Stonx has been updated.
Maintainer was contacted 2010-04-03, no feedback received.

>How-To-Repeat:

Vist Website of the project

>Fix:

	I am willing to take over maintainership for this port.
	Apply this patch.

Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/emulators/stonx/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- Makefile	22 Jan 2010 09:55:56 -0000	1.21
+++ Makefile	19 Nov 2010 06:10:50 -0000
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	stonx
-PORTVERSION=	0.6.7e
-PORTREVISION=	1
+PORTVERSION=	0.6.7e.6
 CATEGORIES=	emulators
-MASTER_SITES=	ftp://ftp.complang.tuwien.ac.at/pub/nino/stonx-current/
-DISTNAME=	STonX-0.6.7-epsilon
+MASTER_SITES=	SF/stonx/stonx/0.6.7.6
+DISTNAME=	STonX-0.6.7.6
 
 MAINTAINER=	treif at mayn.de
 COMMENT=	AtariST emulator
@@ -36,50 +35,37 @@
 # Installing
 #
 BINDIR=	${PREFIX}/bin
-LIBDIR=	${PREFIX}/lib/X11/STonX
 FNTDIR=	${PREFIX}/lib/X11/fonts/misc
 
-DATA=	tos.img cartridge.img Keysyms Keysyms.G atari/FLOPPY-4MB \
-	atari/bench1.pas atari/bench1.prg atari/final.tos
-DOCS=	../COPYING DEBUGGING FONTS INSTALL PROGRAMS README RELEASE_NOTES \
+DATA=	atari/bench1.pas atari/bench1.prg
+ETCFILES=	keysyms-alternative keysyms-german keysyms-spanish
+DOCS=	../COPYING AUTHORS DEBUGGING INSTALL README RELEASE_NOTES \
 	TOS-VERSIONS
 FONTS=	System0-iso.pcf System0.pcf System1-iso.pcf System1.pcf \
 	System2-iso.pcf System2.pcf
 
-pre-install:
-	@${ECHO_MSG} "#!/bin/sh" > ${WRKSRC}/stonx.script
-	@${ECHO_MSG} "cd ${LIBDIR}" >> ${WRKSRC}/stonx.script
-	@${ECHO_MSG} "${BINDIR}/stonx.bin -noaudio \
-		-disk A:FLOPPY-4MB -fs C:." >> ${WRKSRC}/stonx.script
-
-do-install:
-	@${ECHO_MSG} "===> Installing programs"
-	${INSTALL_SCRIPT} ${WRKSRC}/stonx.script ${BINDIR}/stonx
-	${INSTALL_PROGRAM} ${WRKSRC}/stonx ${BINDIR}/stonx.bin
-
-	@${ECHO_MSG} "===> Installing data"
-	@${MKDIR} ${LIBDIR}
-.for f in ${DATA}
-	${INSTALL_DATA} ${WRKSRC}/$f ${LIBDIR}
+post-install:
+.for f in ${ETCFILES}
+	${INSTALL_DATA} ${WRKSRC}/etc/$f ${ETCDIR}/
 .endfor
-
 	@${ECHO_MSG} "===> Installing fonts"
 .for f in ${FONTS}
-	${INSTALL_DATA} ${WRKSRC}/data/$f ${FNTDIR}
+	${INSTALL_DATA} ${WRKSRC}/data/$f ${FNTDIR}/
 	@${GZIP_CMD} ${FNTDIR}/$f
 .endfor
 	@mkfontdir ${FNTDIR}
-
 .if !defined(NOPORTDOCS)
 	@${ECHO_MSG} "===> Installing docs"
-	@${MKDIR} ${LIBDIR}/docs
+	@${MKDIR} ${DOCSDIR}
 .for f in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/docs/$f ${LIBDIR}/docs
+	${INSTALL_DATA} ${WRKSRC}/docs/$f ${DOCSDIR}/
+.endfor
+	@${MKDIR} ${EXAMPLESDIR}
+.for f in ${DATA}
+	${INSTALL_DATA} ${WRKSRC}/$f ${EXAMPLESDIR}/
 .endfor
 .endif
-
 .if (defined(DISPLAY) && ${DISPLAY} != "")
-post-install:
 	@xset fp+ ${FNTDIR}
 	@xset fp rehash
 .endif
@@ -88,7 +74,7 @@
 
 .if !exists(${DISTDIR}/${TOSIMG})
 IGNORE="Please get a ROM dump from your AtariST and save it as"\
-"\"${TOSIMG}\" in \"${DISTDIR}\" manually, and then make install again"
+"\"${TOSIMG}\" in \"${DISTDIR}\" manually, and then make again"
 .endif
 
 BUILD_DEPENDS+=		${LOCALBASE}/lib/X11/fonts/misc/10x20-ISO8859-1.pcf.gz:${PORTSDIR}/x11-fonts/font-misc-misc
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/emulators/stonx/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo	13 Nov 2005 09:26:35 -0000	1.3
+++ distinfo	19 Nov 2010 06:10:50 -0000
@@ -1,5 +1,3 @@
-MD5 (STonX-0.6.7-epsilon.tar.gz) = c8a5a3bbf6a7c13c1c1e6176c6e6d93a
-SHA256 (STonX-0.6.7-epsilon.tar.gz) = 814b0a3978c4dc1b233ca5696e6979adc4a84a19d43a7a26eb8e3f469db773b6
-SIZE (STonX-0.6.7-epsilon.tar.gz) = 192149
-MD5 (tos.img) = IGNORE
-SHA256 (tos.img) = IGNORE
+MD5 (STonX-0.6.7.6.tar.gz) = 77f356c428666b31318190b2d28a049a
+SHA256 (STonX-0.6.7.6.tar.gz) = 664df47df3be34be852dff24d4a43f507bf0a1d4d137e8016128a23486aafbd8
+SIZE (STonX-0.6.7.6.tar.gz) = 379738
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/emulators/stonx/pkg-plist,v
retrieving revision 1.3
diff -u -r1.3 pkg-plist
--- pkg-plist	26 Oct 2005 11:37:47 -0000	1.3
+++ pkg-plist	19 Nov 2010 06:10:50 -0000
@@ -1,29 +1,35 @@
 bin/stonx
-bin/stonx.bin
-lib/X11/STonX/FLOPPY-4MB
-lib/X11/STonX/Keysyms
-lib/X11/STonX/Keysyms.G
-lib/X11/STonX/bench1.pas
-lib/X11/STonX/bench1.prg
-lib/X11/STonX/cartridge.img
-lib/X11/STonX/final.tos
-lib/X11/STonX/tos.img
+%%ETCDIR%%/keysyms
+%%ETCDIR%%/keysyms-alternative
+%%ETCDIR%%/keysyms-german
+%%ETCDIR%%/keysyms-spanish
+%%ETCDIR%%/stonxrc
+%%DATADIR%%/cartridge.img
+%%DATADIR%%/gemdos_c/bench1.prg
+%%DATADIR%%/gemdos_c/final.tos
+%%DATADIR%%/gemdos_c/mint/stonx.xfs
+%%DATADIR%%/tos.img
 lib/X11/fonts/misc/System0-iso.pcf.gz
 lib/X11/fonts/misc/System0.pcf.gz
 lib/X11/fonts/misc/System1-iso.pcf.gz
 lib/X11/fonts/misc/System1.pcf.gz
 lib/X11/fonts/misc/System2-iso.pcf.gz
 lib/X11/fonts/misc/System2.pcf.gz
-lib/X11/STonX/docs/COPYING
-lib/X11/STonX/docs/DEBUGGING
-lib/X11/STonX/docs/FONTS
-lib/X11/STonX/docs/INSTALL
-lib/X11/STonX/docs/PROGRAMS
-lib/X11/STonX/docs/README
-lib/X11/STonX/docs/RELEASE_NOTES
-lib/X11/STonX/docs/TOS-VERSIONS
- at dirrm lib/X11/STonX/docs
- at dirrm lib/X11/STonX
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/DEBUGGING
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
+%%PORTDOCS%%%%DOCSDIR%%/TOS-VERSIONS
+%%PORTDOCS%%%%EXAMPLESDIR%%/bench1.pas
+%%PORTDOCS%%%%EXAMPLESDIR%%/bench1.prg
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+ at dirrm %%DATADIR%%/gemdos_c/mint
+ at dirrm %%DATADIR%%/gemdos_c
+ at dirrm %%DATADIR%%
+ at dirrmtry %%ETCDIR%%
 @exec mkfontdir %D/lib/X11/fonts/misc
 @exec xset fp+ %D/lib/X11/fonts/misc
 @exec xset fp rehash
Index: files/patch-audio.c
===================================================================
RCS file: /home/pcvs/ports/emulators/stonx/files/patch-audio.c,v
retrieving revision 1.1
diff -u -r1.1 patch-audio.c
--- files/patch-audio.c	1 Nov 2006 11:23:57 -0000	1.1
+++ files/patch-audio.c	19 Nov 2010 06:10:50 -0000
@@ -1,11 +1,12 @@
---- audio.c.orig	Mon May  5 03:07:05 1997
-+++ audio.c	Wed Oct 25 19:33:27 2006
-@@ -36,7 +36,7 @@
+--- audio.c.orig	2004-08-15 16:07:55.000000000 +0200
++++ audio.c	2010-04-03 09:44:58.000000000 +0200
+@@ -45,6 +45,9 @@
+ #include <linux/sched.h>
  #include <linux/unistd.h>
  #endif
- #else /* FreeBSD? */
--#include <machine/soundcard.h>
++#elif defined(__FreeBSD__)
 +#include <sys/soundcard.h>
- #endif
- #include <unistd.h>
- #define LINUX_DEFAULT_FREQ (22050)
++#define SOUND_DEVICE "/dev/dsp"
+ #elif defined(__NetBSD__) || defined(__OpenBSD__)
+ /* NetBSD's Linux API emulation, require -lossaudio too */
+ #include <soundcard.h>


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

More information about the freebsd-ports-bugs mailing list