- use FONTNAME

svn path=/head/; revision=428647

emulators/stonx/Makefile

@@ -22,7 +22,7 @@ RESTRICTED=	Contains ROM (C) by Atari
 
 TOSIMG?=	tos.img
 USES=		fonts
-FONTNAME=	# empty
+FONTNAME=	misc
 USE_XORG=	x11 sm ice xext xextproto
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--x-includes=${LOCALBASE}/include \
@@ -30,7 +30,6 @@ CONFIGURE_ARGS=	--x-includes=${LOCALBASE}/include \
 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
@@ -51,10 +50,10 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/etc/$f ${STAGEDIR}${ETCDIR}/
 .endfor
 	@${ECHO_MSG} "===> Installing fonts"
-	${MKDIR} ${STAGEDIR}${FNTDIR}
+	${MKDIR} ${STAGEDIR}${FONTSDIR}
 .for f in ${FONTS}
-	${INSTALL_DATA} ${WRKSRC}/data/$f ${STAGEDIR}${FNTDIR}/
-	${GZIP_CMD} ${STAGEDIR}${FNTDIR}/$f
+	${INSTALL_DATA} ${WRKSRC}/data/$f ${STAGEDIR}${FONTSDIR}/
+	${GZIP_CMD} ${STAGEDIR}${FONTSDIR}/$f
 .endfor
 
 post-install-DOCS-on:

emulators/stonx/pkg-plist

@@ -9,12 +9,12 @@ bin/stonx
 %%DATADIR%%/gemdos_c/final.tos
 %%DATADIR%%/gemdos_c/mint/stonx.xfs
 %%DATADIR%%/tos.img
-%%FONTSDIR%%/misc/System0-iso.pcf.gz
-%%FONTSDIR%%/misc/System0.pcf.gz
-%%FONTSDIR%%/misc/System1-iso.pcf.gz
-%%FONTSDIR%%/misc/System1.pcf.gz
-%%FONTSDIR%%/misc/System2-iso.pcf.gz
-%%FONTSDIR%%/misc/System2.pcf.gz
+%%FONTSDIR%%/System0-iso.pcf.gz
+%%FONTSDIR%%/System0.pcf.gz
+%%FONTSDIR%%/System1-iso.pcf.gz
+%%FONTSDIR%%/System1.pcf.gz
+%%FONTSDIR%%/System2-iso.pcf.gz
+%%FONTSDIR%%/System2.pcf.gz
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/DEBUGGING