aboutsummaryrefslogtreecommitdiff
path: root/emulators/stonx
diff options
context:
space:
mode:
authorDirk Meyer <dinoex@FreeBSD.org>2010-01-22 09:55:56 +0000
committerDirk Meyer <dinoex@FreeBSD.org>2010-01-22 09:55:56 +0000
commit3ad72ebd62924e085a2e70641768315c8b87d247 (patch)
tree8ff4059914ad3da0ac72661f66a11dfc5f2f504f /emulators/stonx
parentcdc51f707984e62965b38bbad0e35cb5fe1bc2c4 (diff)
downloadports-3ad72ebd62924e085a2e70641768315c8b87d247.tar.gz
ports-3ad72ebd62924e085a2e70641768315c8b87d247.zip
- fix build for amd64
Approved by: (implizit by mainatiner)
Notes
Notes: svn path=/head/; revision=248353
Diffstat (limited to 'emulators/stonx')
-rw-r--r--emulators/stonx/Makefile4
-rw-r--r--emulators/stonx/files/patch-aa17
2 files changed, 16 insertions, 5 deletions
diff --git a/emulators/stonx/Makefile b/emulators/stonx/Makefile
index 83ac882f8be6..0527844cfe90 100644
--- a/emulators/stonx/Makefile
+++ b/emulators/stonx/Makefile
@@ -28,13 +28,11 @@ 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
pre-build:
${CP} ${DISTDIR}/${TOSIMG} ${WRKSRC}/tos.img
-post-build:
- (cd ${WRKSRC}; make fnttobdf fonts)
-
# Installing
#
BINDIR= ${PREFIX}/bin
diff --git a/emulators/stonx/files/patch-aa b/emulators/stonx/files/patch-aa
index b47bbce4138f..fa6320cbf10b 100644
--- a/emulators/stonx/files/patch-aa
+++ b/emulators/stonx/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.in.orig Sat Oct 16 19:24:54 1999
-+++ Makefile.in Sat Oct 16 19:25:26 1999
+--- Makefile.in.orig 1997-05-24 22:49:30.000000000 +0200
++++ Makefile.in 2010-01-22 10:38:08.000000000 +0100
@@ -28,7 +28,7 @@
#XLIBS=@X_LIBS@ -lvgagl -lvga
#SFLAGS=-DUSE_SVGALIB
@@ -9,3 +9,16 @@
DEF= @def@ -DINLINE=@inline@ -DSTONXDIR=\"$(STONXDIR)\"
# Compiler
+@@ -117,10 +117,10 @@
+ $(SCC) @static@ -o $@ $(OBJ) $(MOREOBJ) $(XLIBS) @X_PRE_LIBS@ -lXext -lX11 @X_EXTRA_LIBS@ @xtra@
+
+ fnttobdf: fnttobdf.c
+- $(CC) -o $@ fnttobdf.c $(XLIBS) @X_PRE_LIBS@ -lXext -lX11 @X_EXTRA_LIBS@
++ $(CC) -o $@ fnttobdf.c $(CFLAGS) $(XLIBS) @X_PRE_LIBS@ -lXext -lX11 @X_EXTRA_LIBS@
+
+ tosfonts: tosfonts.c
+- $(CC) -o $@ tosfonts.c $(XLIBS) @X_PRE_LIBS@ -lXext -lX11 @X_EXTRA_LIBS@
++ $(CC) -o $@ tosfonts.c $(CFLAGS) $(XLIBS) @X_PRE_LIBS@ -lXext -lX11 @X_EXTRA_LIBS@
+
+ clean:
+ rm -f $(OBJ) $(MOREOBJ) stonx mon.out gmon.out fonts-done.stmp