Index: head/emulators/stonx/Makefile
===================================================================
--- head/emulators/stonx/Makefile	(revision 428645)
+++ head/emulators/stonx/Makefile	(revision 428646)
@@ -1,71 +1,73 @@
 # Created by: Tobias Reifenberger <tr@freebsd.mayn.de>
 # $FreeBSD$
 
 PORTNAME=	stonx
 PORTVERSION=	0.6.7e.6
 CATEGORIES=	emulators
 MASTER_SITES=	SF/stonx/stonx/0.6.7.6
 DISTNAME=	STonX-0.6.7.6
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	AtariST emulator
 
+LICENSE=	GPLv2+
+
 BUILD_DEPENDS=	bdftopcf:x11-fonts/bdftopcf \
 		gccmakedep:devel/gccmakedep \
 		mkfontdir:x11-fonts/mkfontdir \
 		mkfontscale:x11-fonts/mkfontscale \
 		${LOCALBASE}/share/fonts/misc/10x20-ISO8859-1.pcf.gz:x11-fonts/font-misc-misc
 
 RESTRICTED=	Contains ROM (C) by Atari
 
 TOSIMG?=	tos.img
 USES=		fonts
 FONTNAME=	# empty
 USE_XORG=	x11 sm ice xext xextproto
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--x-includes=${LOCALBASE}/include \
 		--x-libraries=${LOCALBASE}/lib
 ALL_TARGET=	all fnttobdf tosfonts fonts
 
 BINDIR=	${PREFIX}/bin
 FNTDIR=	${PREFIX}/share/fonts/misc
 
 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
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 .include <bsd.port.options.mk>
 
 pre-build:
 	${CP} ${DISTDIR}/${TOSIMG} ${WRKSRC}/tos.img
 
 post-install:
 .for f in ${ETCFILES}
 	${INSTALL_DATA} ${WRKSRC}/etc/$f ${STAGEDIR}${ETCDIR}/
 .endfor
 	@${ECHO_MSG} "===> Installing fonts"
 	${MKDIR} ${STAGEDIR}${FNTDIR}
 .for f in ${FONTS}
 	${INSTALL_DATA} ${WRKSRC}/data/$f ${STAGEDIR}${FNTDIR}/
 	${GZIP_CMD} ${STAGEDIR}${FNTDIR}/$f
 .endfor
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DOCS:S,^,${WRKSRC}/docs/,} ${STAGEDIR}${DOCSDIR}/
 
 post-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${DATA:S,^,${WRKSRC}/,} ${STAGEDIR}${EXAMPLESDIR}/
 
 .if !exists(${DISTDIR}/${TOSIMG})
 IGNORE=	please get a ROM dump from your AtariST and save it as\
 "${TOSIMG}" in "${DISTDIR}" manually, and then make again
 .endif
 
 .include <bsd.port.mk>
Index: head/emulators/stonx/files/patch-configure
===================================================================
--- head/emulators/stonx/files/patch-configure	(revision 428645)
+++ head/emulators/stonx/files/patch-configure	(revision 428646)
@@ -1,33 +1,33 @@
 --- configure.orig	2004-08-15 15:36:21.000000000 +0200
 +++ configure	2010-04-03 09:57:44.000000000 +0200
 @@ -3989,6 +3990,30 @@
  	esac
  	copt="$copt -funroll-loops"
  	;;
 +*freebsd*)
 +	echo 'A FreeBSD box...'
 +	case $t in
-+	i*86-*)
++	i*86-*freebsd9*)
 +	  cat >>confdefs.h <<\_ACEOF
 +#define NZREG "%ebx"
 +_ACEOF
 +
 +	  cat >>confdefs.h <<\_ACEOF
 +#define PCREG "%ebp"
 +_ACEOF
 +
 + 	  regs="-fomit-frame-pointer -ffixed-ebx -ffixed-ebp"
 +	  ;;
 +	*)
 +	  regs=""
 +	esac
 +	# Most BSD systems support OSS audio, too:
 +	cat >>confdefs.h <<\_ACEOF
 +#define STONX_AUDIO_LINUX 1
 +_ACEOF
 +
 +	libs=""
 + 	;;
  *bsd*)
   	echo 'A BSD box...'
  	case $t in