Update port to 1.2

Approved by:	Maintainer

7 files changed, 78 insertions, 43 deletions

diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile
index 97f9c1f9d16b..f74b3b36829a 100644
--- a/emulators/vice/Makefile
+++ b/emulators/vice/Makefile
@@ -1,11 +1,11 @@
 # New ports collection makefile for:	vice
-# Version required:	1.0
+# Version required:	1.2
 # Date created:		Mar 28, 1998
 # Whom:			dchapes@ddm.on.ca
 #
 # $FreeBSD$
 
-DISTNAME=	vice-1.0
+DISTNAME=	vice-1.2
 CATEGORIES=	emulators
 MASTER_SITES=	ftp://ftp.funet.fi/pub/cbm/crossplatform/emulators/VICE/
 
@@ -13,15 +13,13 @@ MAINTAINER=	dchapes@ddm.on.ca
 
 LIB_DEPENDS=	Xaw3d.6:${PORTSDIR}/x11-toolkits/Xaw3d
 
-WRKSRC=		${WRKDIR}/vice-1.0
+WRKSRC=		${WRKDIR}/vice-1.2
 USE_XLIB=	yes
 RESTRICTED=	ROMs are copyrighted by Commodore Business Machines
 NO_CDROM=	${RESTRICTED}
 NO_PACKAGE=	${RESTRICTED}
 
 GNU_CONFIGURE=	yes
-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
@@ -32,6 +30,6 @@ MLINKS=		vice.1 x64.1 \
 		vice.1 xcbm2.1
 
 post-install:
-	@${LN} -sf vice-toc.html ${PREFIX}/lib/vice/doc/index.html
+	@${LN} -sf vice_toc.html ${PREFIX}/share/doc/vice/index.html
 
 .include <bsd.port.mk>
diff --git a/emulators/vice/distinfo b/emulators/vice/distinfo
index a997a018748c..c912af4d64d7 100644
--- a/emulators/vice/distinfo
+++ b/emulators/vice/distinfo
@@ -1 +1 @@
-MD5 (vice-1.0.tar.gz) = ac0302262270fec358a1c89bfb008e82
+MD5 (vice-1.2.tar.gz) = b082f24c4b49558b0cfaa3162a880712
diff --git a/emulators/vice/files/patch-ac b/emulators/vice/files/patch-ac
index d17afdeb082b..ad3b5451992d 100644
--- a/emulators/vice/files/patch-ac
+++ b/emulators/vice/files/patch-ac
@@ -1,11 +1,11 @@
---- ./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 @@
+--- man/vice.1.orig	Sun Nov 21 16:25:55 1999
++++ man/vice.1	Wed Feb  2 15:18:42 2000
+@@ -31,7 +31,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.
++/usr/local/share/doc/vice/vice_toc.html.
  .P
  For up to date news about VICE, have a look at the official home page
  at
diff --git a/emulators/vice/files/patch-ad b/emulators/vice/files/patch-ad
new file mode 100644
index 000000000000..b7a6e32bbaf9
--- /dev/null
+++ b/emulators/vice/files/patch-ad
@@ -0,0 +1,11 @@
+--- doc/Makefile.in.orig	Tue Nov 23 18:42:37 1999
++++ doc/Makefile.in	Wed Feb  2 14:30:35 2000
+@@ -108,7 +108,7 @@
+ xpet_LDFLAGS = @xpet_LDFLAGS@
+ xvic_LDFLAGS = @xvic_LDFLAGS@
+ 
+-docdir = $(prefix)/lib/vice/doc
++docdir = $(prefix)/share/doc/vice
+ 
+ doc_DATA =  	64doc.txt 	Evaluation 	PETdoc.txt 	Readme.dos 	Win32-Howto.txt 	cbm_basic_tokens.txt 	drive_info.txt 	mnemonics.txt 	mon.txt 	serial.txt
+ 
diff --git a/emulators/vice/files/patch-ae b/emulators/vice/files/patch-ae
new file mode 100644
index 000000000000..97caf9b562e0
--- /dev/null
+++ b/emulators/vice/files/patch-ae
@@ -0,0 +1,11 @@
+--- doc/html/Makefile.in.orig	Tue Nov 23 18:42:38 1999
++++ doc/html/Makefile.in	Wed Feb  2 14:35:59 2000
+@@ -108,7 +108,7 @@
+ xpet_LDFLAGS = @xpet_LDFLAGS@
+ xvic_LDFLAGS = @xvic_LDFLAGS@
+ 
+-docdir = $(prefix)/lib/vice/doc
++docdir = $(prefix)/share/doc/vice
+ 
+ doc_DATA =  	vice_1.html 	vice_2.html 	vice_3.html 	vice_4.html 	vice_5.html 	vice_6.html 	vice_7.html 	vice_8.html 	vice_9.html 	vice_10.html 	vice_11.html 	vice_12.html 	vice_13.html 	vice_14.html 	vice_15.html 	vice_16.html 	vice_toc.html
+ 
diff --git a/emulators/vice/files/patch-af b/emulators/vice/files/patch-af
new file mode 100644
index 000000000000..6a69c94aa23c
--- /dev/null
+++ b/emulators/vice/files/patch-af
@@ -0,0 +1,11 @@
+--- src/arch/unix/archdep.h.orig	Tue Nov 16 10:19:50 1999
++++ src/arch/unix/archdep.h	Wed Feb  2 15:17:12 2000
+@@ -52,7 +52,7 @@
+ 
+ /* Define the default system directory (where the ROMs are).  */
+ #define LIBDIR          PREFIX "/lib/vice"
+-#define DOCDIR          LIBDIR "/doc"
++#define DOCDIR          PREFIX "/share/doc/vice"
+ #define VICEUSERDIR     ".vice"
+ 
+ extern const char *archdep_home_path(void);
diff --git a/emulators/vice/pkg-plist b/emulators/vice/pkg-plist
index 0f777f98a726..e399d066ed06 100644
--- a/emulators/vice/pkg-plist
+++ b/emulators/vice/pkg-plist
@@ -12,6 +12,7 @@ info/vice.info-2
 info/vice.info-3
 info/vice.info-4
 info/vice.info-5
+info/vice.info-6
 @exec install-info %D/info/vice.info %D/info/dir
 lib/vice/C64/basic
 lib/vice/C64/c64s.vpl
@@ -36,7 +37,9 @@ lib/vice/C128/frodo.vpl
 lib/vice/C128/godot.vpl
 lib/vice/C128/kernal
 lib/vice/C128/pc64.vpl
+lib/vice/C128/vdc_deft.vpl
 lib/vice/C128/position.vkm
+lib/vice/C128/z80bios
 lib/vice/VIC20/basic
 lib/vice/VIC20/chargen
 lib/vice/VIC20/default.vkm
@@ -85,43 +88,44 @@ 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/d1541II
 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/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
+lib/vice/DRIVES/dos1001
+share/doc/vice/vice_1.html
+share/doc/vice/vice_2.html
+share/doc/vice/vice_3.html
+share/doc/vice/vice_4.html
+share/doc/vice/vice_5.html
+share/doc/vice/vice_6.html
+share/doc/vice/vice_7.html
+share/doc/vice/vice_8.html
+share/doc/vice/vice_9.html
+share/doc/vice/vice_10.html
+share/doc/vice/vice_11.html
+share/doc/vice/vice_12.html
+share/doc/vice/vice_13.html
+share/doc/vice/vice_14.html
+share/doc/vice/vice_15.html
+share/doc/vice/vice_16.html
+share/doc/vice/vice_toc.html
+share/doc/vice/64doc.txt
+share/doc/vice/Evaluation
+share/doc/vice/PETdoc.txt
+share/doc/vice/Readme.dos
+share/doc/vice/Win32-Howto.txt
+share/doc/vice/cbm_basic_tokens.txt
+share/doc/vice/drive_info.txt
+share/doc/vice/mnemonics.txt
+share/doc/vice/mon.txt
+share/doc/vice/serial.txt
+share/doc/vice/index.html
 @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
+@dirrm lib/vice/VIC20
+@dirrm lib/vice/PET
 @dirrm lib/vice
+@dirrm share/doc/vice