Update to version 1.0.

PR:		11938
Submitted by:	maintainer
This commit is contained in:
Steve Price 1999-06-06 16:51:45 +00:00
parent 2e3ee07db2
commit 50b0a02137
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=19249
10 changed files with 159 additions and 261 deletions

View file

@ -1,43 +1,37 @@
# New ports collection makefile for: vice
# Version required: 0.14.1
# Version required: 1.0
# Date created: Mar 28, 1998
# Whom: dchapes@ddm.on.ca
#
# $Id: Makefile,v 1.8 1998/09/19 00:41:10 hoek Exp $
# $Id: Makefile,v 1.9 1998/09/21 01:35:30 steve Exp $
DISTNAME= vice-0.14.1
DISTNAME= vice-1.0
CATEGORIES= emulators
MASTER_SITES= ftp://ftp.funet.fi/pub/cbm/crossplatform/emulators/VICE/
MAINTAINER= dchapes@ddm.on.ca
LIB_DEPENDS= Xaw3d.6:${PORTSDIR}/x11-toolkits/Xaw3d
WRKSRC= ${WRKDIR}/vice-1.0
USE_XLIB= yes
WRKSRC= ${WRKDIR}/vice-0.14.1/src
RESTRICTED= ROMs are copyrighted by Commodore Business Machines
NO_CDROM= ${RESTRICTED}
NO_PACKAGE= ${RESTRICTED}
GNU_CONFIGURE= yes
CONFIGURE_ENV= CFLAGS="${CFLAGS} -O3 -Wall -fomit-frame-pointer \
CONFIGURE_ENV= CFLAGS="${CFLAGS} -Wall -O5 -fomit-frame-pointer \
-funroll-loops -finline-functions -fno-strength-reduce"
CONFIGURE_ARGS= --with-xaw3d
MAN1= vice.1 c1541.1 petcat.1
MLINKS= vice.1 x64.1 vice.1 xvic.1 vice.1 xpet.1 \
vice.1 recomment.1
pre-build:
@${ECHO} "NOTE: When compiling on FreeBSD some source files cause\
gcc to go over the default memory limits. Either fix\
/etc/login.conf or temporarily adjust the limits with your\
shell's limit command (\"unlimit\" works in [t]csh)." | fmt
MLINKS= vice.1 x64.1 \
vice.1 x128.1 \
vice.1 xvic.1 \
vice.1 xpet.1 \
vice.1 xcbm2.1
post-install:
.for m in ${MAN1}
${INSTALL_MAN} ${WRKSRC}/../man/${m:S/.1$/.man/} ${PREFIX}/man/man1/$m
.endfor
@${LN} -sf vice-toc.html ${PREFIX}/lib/vice/doc/index.html
.include <bsd.port.mk>

View file

@ -1 +1 @@
MD5 (vice-0.14.1.tar.gz) = 5f13d74c29219d7840a65365d2bc04cd
MD5 (vice-1.0.tar.gz) = ac0302262270fec358a1c89bfb008e82

View file

@ -1,71 +1,12 @@
--- ./arch/unix/joystick.c.orig Sat Mar 7 09:01:51 1998
+++ ./arch/unix/joystick.c Sat Mar 28 09:19:42 1998
@@ -1,5 +1,5 @@
/*
- * joystick.c - Joystick support for Linux.
+ * joystick.c - Joystick support for Linux and *BSD
*
* Written by
* Bernhard Kuhn (kuhn@eikon.e-technik.tu-muenchen.de)
@@ -7,6 +7,7 @@
*
* Patches by
* Daniel Sladic (sladic@eecg.toronto.edu)
+ * Dave Chapeskie <dchapes@ddm.on.ca>
*
* This file is part of VICE, the Versatile Commodore Emulator.
* See README for copyright notice.
@@ -32,7 +33,13 @@
#ifdef HAS_JOYSTICK
+#ifdef __linux__
#include <linux/joystick.h>
+#else
+#include <machine/joystick.h>
+#define JS_DATA_TYPE joystick
+#define JS_RETURN (sizeof(struct joystick))
+#endif
#include <unistd.h>
#include <stdio.h>
#include <sys/types.h>
@@ -89,7 +96,11 @@
for(i=0;i<2;i++) {
char* dev;
+#ifdef __linux__
dev=(i==0)?"/dev/js0":"/dev/js1";
+#else
+ dev=(i==0)?"/dev/joy0":"/dev/joy1";
+#endif
ajoyfd[i]=open(dev,O_RDONLY);
if (ajoyfd[i] < 0) {
@@ -132,6 +143,7 @@
}
}
+#ifdef __linux__
/* open device files for digital joystick */
for(i=0;i<2;i++) {
char* dev;
@@ -142,6 +154,7 @@
fprintf(stderr, "Warning: couldn't open the joystick device %s!\n",dev);
}
}
+#endif
}
void joyclose(void)
@@ -195,7 +208,11 @@
else joy[i] &= ~4;
if (js.x>joyxmax[ajoyport]) joy[i] |= 8;
else joy[i] &= ~8;
+#ifdef __linux__
if(js.buttons) joy[i] |= 16;
+#else
+ if(js.b1 | js.b2) joy[i] |= 16;
+#endif
else joy[i] &= ~16;
}
}
--- ./man/c1541.1.orig Sat May 29 11:34:58 1999
+++ ./man/c1541.1 Sat May 29 11:35:16 1999
@@ -77,7 +77,8 @@
.B \-
as a file name, it stands for \fIstdin\fR or \fIstdout\fR.
.SH SEE ALSO
-.BR VICE (1),
+.BR vice (1),
+.BR c1541 (1),
.BR petcat (1)
.SH AUTHORS
Teemu Rantanen <tvr@cs.hut.fi>

View file

@ -1,54 +1,11 @@
--- ./configure.orig Wed Mar 11 15:59:28 1998
+++ ./configure Sat Mar 28 09:19:42 1998
@@ -2362,7 +2362,41 @@
fi
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
- LINUXJOYSTICK=-DHAS_JOYSTICK ;
+ JOYSTICK=-DHAS_JOYSTICK ;
+ JOY_OBJS='$(ARCHDIR)/joystick.o'
+else
+ echo "$ac_t""no" 1>&6
+fi
+
+ ac_safe=`echo "machine/joystick.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for machine/joystick.h""... $ac_c" 1>&6
+echo "configure:2374: checking for machine/joystick.h" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+else
+ cat > conftest.$ac_ext <<EOF
+#line 2379 "configure"
+#include "confdefs.h"
+#include <machine/joystick.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:2384: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out`
+if test -z "$ac_err"; then
+ rm -rf conftest*
+ eval "ac_cv_header_$ac_safe=yes"
+else
+ echo "$ac_err" >&5
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+ JOYSTICK=-DHAS_JOYSTICK ;
JOY_OBJS='$(ARCHDIR)/joystick.o'
else
echo "$ac_t""no" 1>&6
@@ -4705,7 +4739,7 @@
s%@MAKE2@%$MAKE2%g
s%@PERL@%$PERL%g
s%@MKDEP@%$MKDEP%g
-s%@LINUXJOYSTICK@%$LINUXJOYSTICK%g
+s%@JOYSTICK@%$JOYSTICK%g
s%@JOY_OBJS@%$JOY_OBJS%g
s%@LIBOBJS@%$LIBOBJS%g
s%@SUBDIRS@%$SUBDIRS%g
--- ./man/vice.1.orig Sat May 29 11:35:37 1999
+++ ./man/vice.1 Sat May 29 11:35:49 1999
@@ -32,7 +32,7 @@
.PP
The whole documentation for these programs is available in HTML
format; the main file should be installed on your system as
-/usr/local/lib/VICE/doc/vice_toc.html.
+/usr/local/lib/vice/doc/vice_toc.html.
.P
For up to date news about VICE, have a look at the official home page
at

View file

@ -1,23 +0,0 @@
--- ./configure.in.orig Wed Mar 11 15:59:28 1998
+++ ./configure.in Sat Mar 28 09:19:42 1998
@@ -195,7 +195,10 @@
if test "$host_vendor" != "go32" -a "$host_vendor" != "msdos"; then
AC_CHECK_HEADER(linux/joystick.h,
- [ LINUXJOYSTICK=-DHAS_JOYSTICK ;
+ [ JOYSTICK=-DHAS_JOYSTICK ;
+ JOY_OBJS='$(ARCHDIR)/joystick.o' ], )
+ AC_CHECK_HEADER(machine/joystick.h,
+ [ JOYSTICK=-DHAS_JOYSTICK ;
JOY_OBJS='$(ARCHDIR)/joystick.o' ], )
if test "$ac_cv_header_linux_joystick_h" = "yes" ; then
AC_MSG_CHECKING(whether linux/joystick.h supports digital joysticks)
@@ -204,7 +207,7 @@
[ LINUXJOYSTICK="$LINUXJOYSTICK -DHAS_DIGITAL_JOYSTICK"
AC_MSG_RESULT(yes) ], AC_MSG_RESULT(no))
fi
- AC_SUBST(LINUXJOYSTICK)
+ AC_SUBST(JOYSTICK)
AC_SUBST(JOY_OBJS)
AC_CHECK_HEADERS(linux/soundcard.h machine/soundcard.h dmedia/audio.h)
AC_CHECK_HEADERS(SDL_audio.h SDL_sleep.h)

View file

@ -1,28 +0,0 @@
--- ./Makefile.in.orig Sat Mar 21 08:53:32 1998
+++ ./Makefile.in Sat Mar 28 09:28:52 1998
@@ -59,7 +59,7 @@
ARCH = @host@
LDFLAGS = @X_LIBS@ @LDFLAGS@
-DEFS = @DEFS@ @LINUXJOYSTICK@ -DPREFIX=\"@prefix@\"
+DEFS = @DEFS@ @JOYSTICK@ -DPREFIX=\"@prefix@\"
MKDEP = @MKDEP@
CFLAGS = @X_CFLAGS@ @CFLAGS@
INCLUDES = -I$(SRCDIR) -I./include -I$(ARCHDIR) -I$(INCLUDEDIR)
@@ -67,6 +67,7 @@
LN_S = @LN_S@
+RM = rm
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
@@ -510,7 +511,7 @@
$(INSTALL_BINDIR)/$$a; \
done; \
$(RM) -f $(INSTALL_BINDIR)/recomment; \
- $(INSTALL_PROGRAM) $(UTILDIR)/recomment \
+ $(INSTALL) -m 555 $(UTILDIR)/recomment \
$(INSTALL_LIBDIR)/$(ARCH)/recomment-$$VERSION; \
$(LN_S) $(INSTALL_LIBDIR)/$(ARCH)/recomment-$$VERSION \
$(INSTALL_BINDIR)/recomment )

View file

@ -1,11 +0,0 @@
--- ../man/vice.man.orig Sat Mar 28 14:42:29 1998
+++ ../man/vice.man Sat Mar 28 14:43:01 1998
@@ -32,7 +32,7 @@
.PP
The whole documentation for these programs is available in HTML
format; the main file should be installed on your system as
-/usr/local/lib/VICE/doc/MANUAL.html.
+/usr/local/lib/vice/doc/MANUAL.html.
.P
For up to date news about VICE, have a look at the official home page
at

View file

@ -1 +1 @@
Emulator for Commodore 64/PET/VIC-20.
Emulator for Commodore's C64, C128, VIC20, PET, and CBM-II.

View file

@ -1,18 +1,15 @@
Versatile Commodore 8-bit Emulator
This is version 0.14.1 of VICE, the multi-platform PET/VIC20/C64 emulator.
VICE, the multi-platform C64, C128, VIC20, PET and CBM-II emulator.
The following programs are included:
- x64, a C64 emulator;
- x128, a C128 emulator;
- xvic, a VIC20 emulator;
- xpet, a PET emulator;
- xcbm2, a CBM=II emulator;
- c1541, a stand-alone disk image maintenance utility;
- petcat, a CBM BASIC de-tokenizer;
- recomment, an iterative database driven reassembler;
WWW: http://www.tu-chemnitz.de/~fachat/vice/vice.html
WWW: http://www.cs.cmu.edu/~dsladic/vice/vice.html
VICE is Copyright (c) 1993-1998 Ettore Perazzoli, Teemu Rantanen,
André Fachat, Jouko Valta, Jarkko Sonninen and Daniel Sladic.
The ROM files in the `C64', `PET' and `VIC20' directories are
Copyright (c) by Commodore Business Machines.
The ROM files are Copyright by Commodore Business Machines.

View file

@ -1,56 +1,127 @@
bin/x64
bin/x128
bin/xvic
bin/xpet
bin/xcbm2
bin/c1541
bin/petcat
@unexec install-info --delete %D/info/vice.info %D/info/dir
info/vice.info
info/vice.info-1
info/vice.info-2
info/vice.info-3
info/vice.info-4
info/vice.info-5
@exec install-info %D/info/vice.info %D/info/dir
lib/vice/C64/basic
lib/vice/C64/c64s.vpl
lib/vice/C64/ccs64.vpl
lib/vice/C64/chargen
lib/vice/C64/dos1541
lib/vice/C64/default.vkm
lib/vice/C64/default.vpl
lib/vice/C64/default.vrs
lib/vice/C64/frodo.vpl
lib/vice/C64/godot.vpl
lib/vice/C64/kernal
@dirrm lib/vice/C64
lib/vice/C64/pc64.vpl
lib/vice/C64/position.vkm
lib/vice/C128/basic
lib/vice/C128/c64s.vpl
lib/vice/C128/ccs64.vpl
lib/vice/C128/chargen
lib/vice/C128/default.vkm
lib/vice/C128/default.vpl
lib/vice/C128/default.vrs
lib/vice/C128/frodo.vpl
lib/vice/C128/godot.vpl
lib/vice/C128/kernal
lib/vice/C128/pc64.vpl
lib/vice/C128/position.vkm
lib/vice/VIC20/basic
lib/vice/VIC20/chargen
lib/vice/VIC20/dos1541
lib/vice/VIC20/default.vkm
lib/vice/VIC20/default.vpl
lib/vice/VIC20/kernal
@dirrm lib/vice/VIC20
lib/vice/VIC20/position.vkm
lib/vice/VIC20/default.vrs
lib/vice/PET/busi_uk.vkm
lib/vice/PET/graphics.vkm
lib/vice/PET/posg_de.vkm
lib/vice/PET/busi_de.vkm
lib/vice/PET/basic1
lib/vice/PET/basic2
lib/vice/PET/basic4
lib/vice/PET/kernal1
lib/vice/PET/kernal2
lib/vice/PET/kernal4
lib/vice/PET/edit1g
lib/vice/PET/edit2g
lib/vice/PET/edit2b
lib/vice/PET/edit4g40
lib/vice/PET/edit4b40
lib/vice/PET/edit4b80
lib/vice/PET/chargen
lib/vice/PET/edit2.b
lib/vice/PET/edit4.b40
lib/vice/PET/edit4.b80
lib/vice/PET/pet2001
lib/vice/PET/pet3032
lib/vice/PET/pet4032
@dirrm lib/vice/PET
lib/vice/doc/64doc
lib/vice/doc/BUGS
lib/vice/doc/CHANGES
lib/vice/doc/COPYING
lib/vice/PET/chargen.de
lib/vice/PET/amber.vpl
lib/vice/PET/default.vpl
lib/vice/PET/white.vpl
lib/vice/PET/rom1g.vrs
lib/vice/PET/rom2b.vrs
lib/vice/PET/rom2g.vrs
lib/vice/PET/rom4b40.vrs
lib/vice/PET/rom4b80.vrs
lib/vice/PET/rom4g40.vrs
lib/vice/CBM-II/amber.vpl
lib/vice/CBM-II/basic.128
lib/vice/CBM-II/basic.256
lib/vice/CBM-II/chargen.600
lib/vice/CBM-II/chargen.700
lib/vice/CBM-II/busi_uk.vkm
lib/vice/CBM-II/default.vpl
lib/vice/CBM-II/kernal
lib/vice/CBM-II/white.vpl
lib/vice/CBM-II/rom128l.vrs
lib/vice/CBM-II/rom128h.vrs
lib/vice/CBM-II/rom256l.vrs
lib/vice/CBM-II/rom256h.vrs
lib/vice/DRIVES/dos1541
lib/vice/DRIVES/dos1541II
lib/vice/DRIVES/dos1571
lib/vice/DRIVES/dos1581
lib/vice/DRIVES/dos2031
lib/vice/doc/vice_1.html
lib/vice/doc/vice_2.html
lib/vice/doc/vice_3.html
lib/vice/doc/vice_4.html
lib/vice/doc/vice_5.html
lib/vice/doc/vice_6.html
lib/vice/doc/vice_7.html
lib/vice/doc/vice_8.html
lib/vice/doc/vice_9.html
lib/vice/doc/vice_10.html
lib/vice/doc/vice_11.html
lib/vice/doc/vice_12.html
lib/vice/doc/vice_13.html
lib/vice/doc/vice_14.html
lib/vice/doc/vice_15.html
lib/vice/doc/vice_16.html
lib/vice/doc/vice_toc.html
@exec ln -sf %f %B/index.html
@unexec rm -f %B/index.html
lib/vice/doc/64doc.txt
lib/vice/doc/Evaluation
lib/vice/doc/INSTALL
lib/vice/doc/MANUAL.html
@exec ln -s %f %B/index.html
@unexec rm %B/index.html
lib/vice/doc/PETdoc
lib/vice/doc/README
lib/vice/doc/TODO
lib/vice/doc/cbm_basic_tokens
lib/vice/doc/drive_info
lib/vice/doc/mnemonics
lib/vice/doc/recomment.html
lib/vice/doc/serial
lib/vice/doc/PETdoc.txt
lib/vice/doc/Readme.dos
lib/vice/doc/cbm_basic_tokens.txt
lib/vice/doc/drive_info.txt
lib/vice/doc/mnemonics.txt
lib/vice/doc/mon.txt
lib/vice/doc/serial.txt
@dirrm lib/vice/C64
@dirrm lib/vice/C128
@dirrm lib/vice/VIC20
@dirrm lib/vice/PET
@dirrm lib/vice/CBM-II
@dirrm lib/vice/DRIVES
@dirrm lib/vice/doc
lib/vice/i386-unknown-freebsd2.2.5/c1541-0.14.1
@exec ln -s ../%F %D/bin/c1541
@unexec rm %D/bin/c1541
lib/vice/i386-unknown-freebsd2.2.5/petcat-0.14.1
@exec ln -s ../%F %D/bin/petcat
@unexec rm %D/bin/petcat
lib/vice/i386-unknown-freebsd2.2.5/recomment-0.14.1
@exec ln -s ../%F %D/bin/recomment
@unexec rm %D/bin/recomment
lib/vice/i386-unknown-freebsd2.2.5/x64-0.14.1
@exec ln -s ../%F %D/bin/x64
@unexec rm %D/bin/x64
lib/vice/i386-unknown-freebsd2.2.5/xpet-0.14.1
@exec ln -s ../%F %D/bin/xpet
@unexec rm %D/bin/xpet
lib/vice/i386-unknown-freebsd2.2.5/xvic-0.14.1
@exec ln -s ../%F %D/bin/xvic
@unexec rm %D/bin/xvic
@dirrm lib/vice/i386-unknown-freebsd2.2.5
@dirrm lib/vice