4 files changed, 78 insertions, 19 deletions

diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile
index 36ac1a1444a7..d04f72f7d061 100644
--- a/emulators/vice/Makefile
+++ b/emulators/vice/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Mar 28, 1998
 # Whom:			dchapes@ddm.on.ca
 #
-# $Id: Makefile,v 1.5 1998/07/19 19:32:02 dburr Exp $
+# $Id: Makefile,v 1.6 1998/08/07 23:56:19 asami Exp $
 
 DISTNAME=	vice-0.14.1
 CATEGORIES=	emulators
@@ -12,6 +12,7 @@ MASTER_SITES=	ftp://ftp.funet.fi/pub/cbm/crossplatform/emulators/VICE/
 MAINTAINER=	dchapes@ddm.on.ca
 
 LIB_DEPENDS=	Xaw3d\\.6\\.:${PORTSDIR}/x11-toolkits/Xaw3d
+USE_XLIB=	yes
 
 WRKSRC=		${WRKDIR}/vice-0.14.1/src
 
@@ -19,25 +20,23 @@ 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 -funroll-loops -finline-functions -fno-strength-reduce"
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CFLAGS="${CFLAGS} -O3 -Wall -fomit-frame-pointer \
+		-funroll-loops -finline-functions -fno-strength-reduce"
 CONFIGURE_ARGS=	--with-xaw3d
 
-MANPAGES=	vice c1541 petcat
 MAN1=		vice.1 c1541.1 petcat.1
 
 pre-build:
-	@${ECHO} "NOTE:  When compiling on FreeBSD some source files cause gcc to go over the"
-	@${ECHO} "default memory limits.  Either fix /etc/login.conf or temporaryily adjust"
-	@${ECHO} "the limits with your shells limit command (\"unlimit\" works in [t]csh)."
-
-pre-install:
-	${SED} -e "s,%VER%,`uname -r | ${SED} -e 's,-.*$$,,'`," < ${PKGDIR}/PLIST.in > ${PKGDIR}/PLIST
+	@${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
 
 post-install:
-	for m in ${MANPAGES} ; do \
-	  ${INSTALL_MAN} ${WRKSRC}/../man/$$m.man ${PREFIX}/man/man1/$$m.1; \
-	done
+.for m in ${MAN1}
+	${INSTALL_MAN} ${WRKSRC}/../man/${m:S/.1$/.man/} ${PREFIX}/man/man1/$m
+.endfor
 .if defined(NOMANCOMPRESS)
 	${LN} -sf vice.1 ${PREFIX}/man/man1/x64.1
 	${LN} -sf vice.1 ${PREFIX}/man/man1/xvic.1
@@ -50,7 +49,4 @@ post-install:
 	${LN} -sf vice.1.gz ${PREFIX}/man/man1/recomment.1.gz
 .endif
 
-pre-clean:
-	@${RM} -f ${PKGDIR}/PLIST
-
 .include <bsd.port.mk>
diff --git a/emulators/vice/pkg-comment b/emulators/vice/pkg-comment
index ab5b342649f8..3e5814529406 100644
--- a/emulators/vice/pkg-comment
+++ b/emulators/vice/pkg-comment
@@ -1 +1 @@
-Emulator that emulates Commodore 64/PET/VIC-20.
+Emulator for Commodore 64/PET/VIC-20.
diff --git a/emulators/vice/pkg-descr b/emulators/vice/pkg-descr
index 68ba5d5a3195..52f0ec648e76 100644
--- a/emulators/vice/pkg-descr
+++ b/emulators/vice/pkg-descr
@@ -9,8 +9,7 @@ The following programs are included:
   - petcat, a CBM BASIC de-tokenizer;
   - recomment, an iterative database driven reassembler;
 
-For the latest news, have a look at the VICE home page:
-    http://www.tu-chemnitz.de/~fachat/vice/vice.html
+http://www.tu-chemnitz.de/~fachat/vice/vice.html
 
 VICE is Copyright (c) 1993-1998 Ettore Perazzoli, Teemu Rantanen,
 André Fachat, Jouko Valta, Jarkko Sonninen and Daniel Sladic.
diff --git a/emulators/vice/pkg-plist b/emulators/vice/pkg-plist
new file mode 100644
index 000000000000..2a873b5eb818
--- /dev/null
+++ b/emulators/vice/pkg-plist
@@ -0,0 +1,64 @@
+lib/vice/C64/basic
+lib/vice/C64/chargen
+lib/vice/C64/dos1541
+lib/vice/C64/kernal
+@dirrm lib/vice/C64
+lib/vice/VIC20/basic
+lib/vice/VIC20/chargen
+lib/vice/VIC20/dos1541
+lib/vice/VIC20/kernal
+@dirrm lib/vice/VIC20
+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/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
+@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
+@exec ln -sf vice.1.gz %D/man/man1/x64.1.gz
+@exec ln -sf vice.1.gz %D/man/man1/xvic.1.gz
+@exec ln -sf vice.1.gz %D/man/man1/xpet.1.gz
+@exec ln -sf vice.1.gz %D/man/man1/recomment.1.gz
+@unexec rm %D/man/man1/x64.1.gz
+@unexec rm %D/man/man1/xvic.1.gz
+@unexec rm %D/man/man1/xpet.1.gz
+@unexec rm %D/man/man1/recomment.1.gz