5 files changed, 74 insertions, 27 deletions

diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile
index 0da5821d1ee5..f8f47345d781 100644
--- a/emulators/vice/Makefile
+++ b/emulators/vice/Makefile
@@ -5,21 +5,20 @@
 # $FreeBSD$
 
 PORTNAME=	vice
-PORTVERSION=	1.6
+PORTVERSION=	1.7
 CATEGORIES=	emulators
 MASTER_SITES=	ftp://ftp.funet.fi/pub/cbm/crossplatform/emulators/VICE/
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
 
-USE_XLIB=	yes
 RESTRICTED=	ROMs are copyrighted by Commodore Business Machines
 NO_CDROM=	${RESTRICTED}
 NO_PACKAGE=	${RESTRICTED}
 
+USE_XPM=	yes
+WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-xaw3d
 
 MAN1=		vice.1 c1541.1 petcat.1
 MLINKS=		vice.1 x64.1 \
@@ -28,7 +27,23 @@ MLINKS=		vice.1 x64.1 \
 		vice.1 xpet.1 \
 		vice.1 xcbm2.1
 
+.include <bsd.port.pre.mk>
+
+.if defined(HAVE_GNOME)
+USE_GNOME=	yes
+CONFIGURE_ARGS=	--enable-gnomeui
+.else
+LIB_DEPENDS=	Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
+CONFIGURE_ARGS=	--with-xaw3d
+.endif
+
+post-extract:
+	@${RM} -f ${WRKSRC}/doc/vice.info*
+
+post-patch:
+	@${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/man/vice.1
+
 post-install:
-	@${LN} -sf vice_toc.html ${PREFIX}/share/doc/vice/index.html
+	@${LN} -sf vice_toc.html ${DOCSDIR}/index.html
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/emulators/vice/distinfo b/emulators/vice/distinfo
index 98fde9aeafa1..18cf2b1b151b 100644
--- a/emulators/vice/distinfo
+++ b/emulators/vice/distinfo
@@ -1 +1 @@
-MD5 (vice-1.6.tar.gz) = b948d3bf066c0d5f4e851305b661cb65
+MD5 (vice-1.7.tar.gz) = e582144f7d0300110318dfacaae46603
diff --git a/emulators/vice/files/patch-ac b/emulators/vice/files/patch-ac
index ad3b5451992d..d107826f8370 100644
--- a/emulators/vice/files/patch-ac
+++ b/emulators/vice/files/patch-ac
@@ -1,11 +1,11 @@
---- man/vice.1.orig	Sun Nov 21 16:25:55 1999
-+++ man/vice.1	Wed Feb  2 15:18:42 2000
+--- man/vice.1.orig	Mon Nov 22 06:25:55 1999
++++ man/vice.1	Fri Nov 23 02:01:16 2001
 @@ -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/share/doc/vice/vice_toc.html.
++%%PREFIX%%/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
index b7a6e32bbaf9..f1cec2dd2511 100644
--- a/emulators/vice/files/patch-ad
+++ b/emulators/vice/files/patch-ad
@@ -1,11 +1,20 @@
---- 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 @@
+--- doc/Makefile.in.orig	Tue Jul 24 03:09:37 2001
++++ doc/Makefile.in	Fri Nov 23 02:15:32 2001
+@@ -128,7 +128,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
+ doc_DATA =  	64doc.txt 	Evaluation 	PETdoc.txt 	Readme.beos 	Readme.dos 	Win32-Howto.txt 	cbm_basic_tokens.txt 	drive_info.txt 	mon.txt 	serial.txt
  
+@@ -176,7 +176,7 @@
+ .texi.info:
+ 	@cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9]
+ 	cd $(srcdir) \
+-	  && $(MAKEINFO) `echo $< | sed 's,.*/,,'`
++	  && $(MAKEINFO) --no-split `echo $< | sed 's,.*/,,'`
+ 
+ .texi.dvi:
+ 	TEXINPUTS=.:$$TEXINPUTS \
diff --git a/emulators/vice/pkg-plist b/emulators/vice/pkg-plist
index 231cb6bfeed5..34a9e6d4c08d 100644
--- a/emulators/vice/pkg-plist
+++ b/emulators/vice/pkg-plist
@@ -6,18 +6,23 @@ bin/x64
 bin/xcbm2
 bin/xpet
 bin/xvic
+include/resid/envelope.h
+include/resid/extfilt.h
+include/resid/filter.h
+include/resid/pot.h
+include/resid/sid.h
+include/resid/siddefs.h
+include/resid/spline.h
+include/resid/voice.h
+include/resid/wave.h
 @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
-info/vice.info-6
 @exec install-info %D/info/vice.info %D/info/dir
 lib/vice/C128/basic
+lib/vice/C128/basic64
 lib/vice/C128/c64s.vpl
 lib/vice/C128/ccs64.vpl
+lib/vice/C128/charg64
 lib/vice/C128/chargen
 lib/vice/C128/default.vkm
 lib/vice/C128/default.vpl
@@ -25,10 +30,12 @@ lib/vice/C128/default.vrs
 lib/vice/C128/frodo.vpl
 lib/vice/C128/godot.vpl
 lib/vice/C128/kernal
+lib/vice/C128/kernal64
 lib/vice/C128/os2.vkm
 lib/vice/C128/pc64.vpl
 lib/vice/C128/position.vkm
 lib/vice/C128/vdc_deft.vpl
+lib/vice/C128/vice.vpl
 lib/vice/C128/z80bios
 lib/vice/C64/basic
 lib/vice/C64/c64s.vpl
@@ -44,19 +51,30 @@ lib/vice/C64/os2.vkm
 lib/vice/C64/os2_sym.vkm
 lib/vice/C64/pc64.vpl
 lib/vice/C64/position.vkm
+lib/vice/C64/vice.vpl
 lib/vice/CBM-II/amber.vpl
 lib/vice/CBM-II/basic.128
 lib/vice/CBM-II/basic.256
+lib/vice/CBM-II/basic.500
 lib/vice/CBM-II/busi_uk.vkm
+lib/vice/CBM-II/c64s.vpl
+lib/vice/CBM-II/ccs64.vpl
+lib/vice/CBM-II/chargen.500
 lib/vice/CBM-II/chargen.600
 lib/vice/CBM-II/chargen.700
 lib/vice/CBM-II/default.vpl
+lib/vice/CBM-II/frodo.vpl
+lib/vice/CBM-II/godot.vpl
+lib/vice/CBM-II/green.vpl
 lib/vice/CBM-II/kernal
+lib/vice/CBM-II/kernal.500
 lib/vice/CBM-II/os2.vkm
+lib/vice/CBM-II/pc64.vpl
 lib/vice/CBM-II/rom128h.vrs
 lib/vice/CBM-II/rom128l.vrs
 lib/vice/CBM-II/rom256h.vrs
 lib/vice/CBM-II/rom256l.vrs
+lib/vice/CBM-II/rom500.vrs
 lib/vice/CBM-II/white.vpl
 lib/vice/DRIVES/d1541II
 lib/vice/DRIVES/dos1001
@@ -75,7 +93,6 @@ lib/vice/PET/busi_de.vkm
 lib/vice/PET/busi_uk.vkm
 lib/vice/PET/chargen
 lib/vice/PET/chargen.de
-lib/vice/PET/default.vpl
 lib/vice/PET/edit1g
 lib/vice/PET/edit2b
 lib/vice/PET/edit2g
@@ -83,6 +100,7 @@ lib/vice/PET/edit4b40
 lib/vice/PET/edit4b80
 lib/vice/PET/edit4g40
 lib/vice/PET/graphics.vkm
+lib/vice/PET/green.vpl
 lib/vice/PET/kernal1
 lib/vice/PET/kernal2
 lib/vice/PET/kernal4
@@ -96,6 +114,9 @@ lib/vice/PET/rom4b40.vrs
 lib/vice/PET/rom4b80.vrs
 lib/vice/PET/rom4g40.vrs
 lib/vice/PET/white.vpl
+lib/vice/PRINTER/cbm1526
+lib/vice/PRINTER/mps801
+lib/vice/PRINTER/mps803
 lib/vice/VIC20/basic
 lib/vice/VIC20/chargen
 lib/vice/VIC20/default.vkm
@@ -134,12 +155,14 @@ share/doc/vice/vice_7.html
 share/doc/vice/vice_8.html
 share/doc/vice/vice_9.html
 share/doc/vice/vice_toc.html
-@dirrm lib/vice/C128
-@dirrm lib/vice/C64
-@dirrm lib/vice/CBM-II
-@dirrm lib/vice/DRIVES
-@dirrm lib/vice/PET
+@dirrm share/doc/vice
 @dirrm lib/vice/VIC20
+@dirrm lib/vice/PRINTER
+@dirrm lib/vice/PET
+@dirrm lib/vice/DRIVES
+@dirrm lib/vice/CBM-II
+@dirrm lib/vice/C64
+@dirrm lib/vice/C128
 @dirrm lib/vice/fonts
 @dirrm lib/vice
-@dirrm share/doc/vice
+@dirrm include/resid