Re: pkg/47223: [maintainer update] vice-2.4 is out

[Rhialto <rhialto%falu.nl@localhost>]

Hi Thomas,

On Fri 23 Nov 2012 at 13:35:05 +0000, Thomas Klausner wrote:
>  Can you please add a comment to the new patch file, and provide a
>  short list of changes between vice 2.3 and 2.4?

Changes between 2.3 and 2.4: http://vice-emu.sourceforge.net/plain/NEWS
In very short: Lots of extra hardware is emulated (including the long
awaited SuperPET 6809 parts), and several new host platforms are added.

While thinking of the comment for patch-data_fonts_Makefile.in, I
decided to change it a bit. Below is the new version.
It adds a new file to PLIST.x11: share/vice/fonts/vice-cbm.pcf
It can remove mkfontdir from USE_TOOLS.
In case it is helpful, I've re-done the diffs (not of the patches).


$NetBSD$

- Don't try to mess in ${HOME}.
- Don't erase vice-cbm.bdf or try mkfontdir (that is done at pkg_add time).

--- data/fonts/Makefile.in.orig 2012-11-02 21:06:50.000000000 +0000
+++ data/fonts/Makefile.in
@@ -528,23 +528,9 @@ uninstall-am: uninstall-fontsDATA
 
 
 install: install-data-am
-@HAVE_FC_CACHE_TRUE@@SDL_COMPILE_FALSE@        @echo "Preparing fontdir, 
please wait..." ; \
-@HAVE_FC_CACHE_TRUE@@SDL_COMPILE_FALSE@        if [ ! `fc-cache --list > 
/dev/null 2>&1` ] ; then \
-@HAVE_FC_CACHE_TRUE@@SDL_COMPILE_FALSE@          if test "x${HOME}" != "x" ; 
then \
-@HAVE_FC_CACHE_TRUE@@SDL_COMPILE_FALSE@            mkdir ${HOME}/.fonts > 
/dev/null 2>&1 ; \
-@HAVE_FC_CACHE_TRUE@@SDL_COMPILE_FALSE@            cp $(fontsdir)/CBM.ttf 
${HOME}/.fonts ; \
-@HAVE_FC_CACHE_TRUE@@SDL_COMPILE_FALSE@            fc-cache ; \
-@HAVE_FC_CACHE_TRUE@@SDL_COMPILE_FALSE@          else \
-@HAVE_FC_CACHE_TRUE@@SDL_COMPILE_FALSE@            echo '$$HOME not set... 
giving up.' ; \
-@HAVE_FC_CACHE_TRUE@@SDL_COMPILE_FALSE@          fi \
-@HAVE_FC_CACHE_TRUE@@SDL_COMPILE_FALSE@        else \
-@HAVE_FC_CACHE_TRUE@@SDL_COMPILE_FALSE@          echo 'fc-cache not 
available... giving up.' ; \
-@HAVE_FC_CACHE_TRUE@@SDL_COMPILE_FALSE@        fi
-@HAVE_FC_CACHE_FALSE@@SDL_COMPILE_FALSE@       @echo "Preparing fontdir..." ; \
-@HAVE_FC_CACHE_FALSE@@SDL_COMPILE_FALSE@       cd $(DESTDIR)$(fontsdir) ; \
-@HAVE_FC_CACHE_FALSE@@SDL_COMPILE_FALSE@       bdftopcf -o vice-cbm.pcf 
vice-cbm.bdf ; \
-@HAVE_FC_CACHE_FALSE@@SDL_COMPILE_FALSE@       rm vice-cbm.bdf ; \
-@HAVE_FC_CACHE_FALSE@@SDL_COMPILE_FALSE@       mkfontdir .
+@SDL_COMPILE_FALSE@    @echo "Preparing fontdir..." ; \
+@SDL_COMPILE_FALSE@    cd $(DESTDIR)$(fontsdir) ; \
+@SDL_COMPILE_FALSE@    bdftopcf -o vice-cbm.pcf vice-cbm.bdf 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.


? patches/patch-data_fonts_Makefile.in
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/vice/Makefile,v
retrieving revision 1.99.2.1
diff -u -r1.99.2.1 Makefile
--- Makefile    3 Oct 2012 12:07:39 -0000       1.99.2.1
+++ Makefile    23 Nov 2012 15:23:19 -0000
@@ -1,9 +1,8 @@
 # $NetBSD: Makefile,v 1.99.2.1 2012/10/03 12:07:39 spz Exp $
 
-DISTNAME=              vice-2.3
-PKGREVISION=           10
+DISTNAME=              vice-2.4
 CATEGORIES=            emulators
-MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=vice-emu:Q}/
+MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=vice-emu/}
 MASTER_SITES+=         
ftp://ftp.zimmers.net/pub/cbm/crossplatform/emulators/VICE/
 MASTER_SITES+=         
http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/
 
@@ -23,10 +22,11 @@
 EXTRACT_ONLY=          ${DISTNAME}${EXTRACT_SUFX}
 
 USE_PKGLOCALEDIR=      YES
-USE_TOOLS+=            bdftopcf gmake mkfontdir msgfmt
+USE_TOOLS+=            bdftopcf gmake msgfmt
 USE_TOOLS+=            pkg-config
 USE_LANGUAGES=         c c++
 GNU_CONFIGURE=         YES
+CONFIGURE_ENV+=                toolchain_check=no
 
 INFO_FILES=            YES
 FONTS_DIRS.x11=                ${PREFIX}/share/vice/fonts
@@ -51,7 +51,7 @@
 .include "../../devel/readline/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
+.include "../../mk/giflib.buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/vice/PLIST,v
retrieving revision 1.23
diff -u -r1.23 PLIST
--- PLIST       4 Apr 2011 13:42:08 -0000       1.23
+++ PLIST       23 Nov 2012 15:23:19 -0000
@@ -2,11 +2,13 @@
 bin/c1541
 bin/cartconv
 bin/petcat
+bin/vsid
 bin/x128
 bin/x64
 bin/x64dtv
 bin/x64sc
 bin/xcbm2
+bin/xcbm5x0
 bin/xpet
 bin/xplus4
 bin/xvic
@@ -17,31 +19,37 @@
 man/man1/petcat.1
 man/man1/vice.1
 share/doc/vice/64doc.txt
+share/doc/vice/65C02.txt
 share/doc/vice/BUGS
 share/doc/vice/CIA-README.txt
 share/doc/vice/COPYING
 share/doc/vice/CommodoreInnovationPriceSoftware2008.jpg
+share/doc/vice/Documentation-Howto.txt
+share/doc/vice/Doxygen-Howto.txt
 share/doc/vice/GP2X-Howto.txt
+share/doc/vice/Linux-Mingw32-Howto.txt
 share/doc/vice/MSDOS-Ethernet-Howto.txt
 share/doc/vice/MSDOS-Howto.txt
-share/doc/vice/MacOSX-Build.txt
+share/doc/vice/MacOSX-Howto.txt
 share/doc/vice/MacOSX-ResourceTree.txt
 share/doc/vice/Minix-Howto.txt
 share/doc/vice/NEWS
 share/doc/vice/NLS-Howto.txt
 share/doc/vice/OpenVMS-Howto.txt
 share/doc/vice/PETdoc.txt
-share/doc/vice/Readme.beos
-share/doc/vice/Readme.dos
-share/doc/vice/ReadmeMacOSX.txt
-share/doc/vice/ReadmeSDL.txt
+share/doc/vice/Readme-Amiga.txt
+share/doc/vice/Readme-BeOS.txt
+share/doc/vice/Readme-DOS.txt
+share/doc/vice/Readme-MacOSX.txt
+share/doc/vice/Readme-OS2.txt
+share/doc/vice/Readme-SDL.txt
+share/doc/vice/SDL-Howto.txt
 share/doc/vice/TODO
 share/doc/vice/VIC-Addendum.txt
 share/doc/vice/VIC-Article.txt
 share/doc/vice/VIC-Artikel.txt
-share/doc/vice/Walkthrough-Howto.txt
-share/doc/vice/Win32-Cygwin-HOWTO.txt
-share/doc/vice/Win32-Howto.txt
+share/doc/vice/Win32-Cygwin-Howto.txt
+share/doc/vice/Win32-Mingw32-Howto.txt
 share/doc/vice/amigaos.html
 share/doc/vice/beos.html
 share/doc/vice/cbm_basic_tokens.txt
@@ -51,12 +59,21 @@
 share/doc/vice/index.html
 share/doc/vice/macosx.html
 share/doc/vice/new.gif
-share/doc/vice/openGLsync-howto.txt
+share/doc/vice/pixel_aspect.txt
 share/doc/vice/qnx.html
 share/doc/vice/sco.html
 share/doc/vice/serial.txt
 share/doc/vice/solaris.html
+share/doc/vice/vice-logo-small.png
 share/doc/vice/vice-logo.jpg
+share/doc/vice/vice.chm
+share/doc/vice/vice.css
+share/doc/vice/vice.guide
+share/doc/vice/vice.hlp
+share/doc/vice/vice.inf
+share/doc/vice/vice.info
+share/doc/vice/vice.pdf
+share/doc/vice/vice.txt
 share/doc/vice/vice_1.html
 share/doc/vice/vice_10.html
 share/doc/vice/vice_11.html
@@ -65,7 +82,11 @@
 share/doc/vice/vice_14.html
 share/doc/vice/vice_15.html
 share/doc/vice/vice_16.html
+share/doc/vice/vice_17.html
+share/doc/vice/vice_18.html
+share/doc/vice/vice_19.html
 share/doc/vice/vice_2.html
+share/doc/vice/vice_20.html
 share/doc/vice/vice_3.html
 share/doc/vice/vice_4.html
 share/doc/vice/vice_5.html
@@ -150,14 +171,17 @@
 share/vice/DRIVES/dos1570
 share/vice/DRIVES/dos1571
 share/vice/DRIVES/dos1581
+share/vice/DRIVES/dos2000
 share/vice/DRIVES/dos2031
 share/vice/DRIVES/dos2040
 share/vice/DRIVES/dos3040
+share/vice/DRIVES/dos4000
 share/vice/DRIVES/dos4040
 share/vice/PET/amber.vpl
 share/vice/PET/basic1
 share/vice/PET/basic2
 share/vice/PET/basic4
+share/vice/PET/characters.901640-01.bin
 share/vice/PET/chargen
 share/vice/PET/chargen.de
 share/vice/PET/edit1g
@@ -176,13 +200,23 @@
 share/vice/PET/rom4b40.vrs
 share/vice/PET/rom4b80.vrs
 share/vice/PET/rom4g40.vrs
+share/vice/PET/romsuperpet.vrs
+share/vice/PET/waterloo-a000.901898-01.bin
+share/vice/PET/waterloo-b000.901898-02.bin
+share/vice/PET/waterloo-c000.901898-03.bin
+share/vice/PET/waterloo-d000.901898-04.bin
+share/vice/PET/waterloo-e000.901897-01.bin
+share/vice/PET/waterloo-f000.901898-05.bin
 share/vice/PET/white.vpl
 share/vice/PLUS4/3plus1hi
 share/vice/PLUS4/3plus1lo
 share/vice/PLUS4/basic
+share/vice/PLUS4/c2lo.364
 share/vice/PLUS4/default.vpl
 share/vice/PLUS4/default.vrs
 share/vice/PLUS4/kernal
+share/vice/PLUS4/kernal.232
+share/vice/PLUS4/kernal.364
 share/vice/PLUS4/vice.vpl
 share/vice/PRINTER/cbm1526
 share/vice/PRINTER/mps801
Index: PLIST.x11
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/vice/PLIST.x11,v
retrieving revision 1.1
diff -u -r1.1 PLIST.x11
--- PLIST.x11   4 Apr 2011 13:42:08 -0000       1.1
+++ PLIST.x11   23 Nov 2012 15:23:19 -0000
@@ -1,12 +1,14 @@
 @comment $NetBSD: PLIST.x11,v 1.1 2011/04/04 13:42:08 wiz Exp $
-bin/vsid
 share/locale/da/LC_MESSAGES/vice.mo
 share/locale/de/LC_MESSAGES/vice.mo
+share/locale/es/LC_MESSAGES/vice.mo
 share/locale/fr/LC_MESSAGES/vice.mo
 share/locale/hu/LC_MESSAGES/vice.mo
 share/locale/it/LC_MESSAGES/vice.mo
+share/locale/ko/LC_MESSAGES/vice.mo
 share/locale/nl/LC_MESSAGES/vice.mo
 share/locale/pl/LC_MESSAGES/vice.mo
+share/locale/ru/LC_MESSAGES/vice.mo
 share/locale/sv/LC_MESSAGES/vice.mo
 share/locale/tr/LC_MESSAGES/vice.mo
 share/vice/C128/x11_pos.vkm
@@ -36,3 +38,4 @@
 share/vice/PLUS4/x11_sym_de.vkm
 share/vice/VIC20/x11_pos.vkm
 share/vice/VIC20/x11_sym.vkm
+share/vice/fonts/vice-cbm.pcf
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/vice/distinfo,v
retrieving revision 1.39
diff -u -r1.39 distinfo
--- distinfo    14 Aug 2012 18:49:43 -0000      1.39
+++ distinfo    23 Nov 2012 15:23:19 -0000
@@ -1,7 +1,8 @@
 $NetBSD: distinfo,v 1.39 2012/08/14 18:49:43 marino Exp $
 
-SHA1 (vice-2.3.tar.gz) = 5e7e1a375a4ca8c4895dc1552162955fdffce296
-RMD160 (vice-2.3.tar.gz) = 056e48ffedfaecd470892c73b97af89c1e002ff9
-Size (vice-2.3.tar.gz) = 11602378 bytes
+SHA1 (vice-2.4.tar.gz) = 719aa96cc72e7578983fadea1a31c21898362bc7
+RMD160 (vice-2.4.tar.gz) = 6ff3b4a410ef70aa135e2245e6855cfa63373e2c
+Size (vice-2.4.tar.gz) = 13656511 bytes
 SHA1 (patch-aa) = 7ecda5911a2dd0e7ef8676959d9dc021323d393f
-SHA1 (patch-ab) = dada25dfd5c40db040b1b99fd7071986db5b50cc
+SHA1 (patch-ab) = ab982bb762bebf56eb54859a38fe47b58d31ac67
+SHA1 (patch-data_fonts_Makefile.in) = 89b2a57822f58242d8d325d467b54353cf230906
Index: options.mk
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/vice/options.mk,v
retrieving revision 1.6
diff -u -r1.6 options.mk
--- options.mk  4 Apr 2011 13:42:08 -0000       1.6
+++ options.mk  23 Nov 2012 15:23:19 -0000
@@ -21,6 +21,7 @@
 CONFIGURE_ARGS+=       --enable-gnomeui
 PLIST_SRC+=            PLIST.x11
 .  include "../../x11/gtk2/buildlink3.mk"
+.  include "../../x11/vte/buildlink3.mk"
 .endif
 
 .if !empty(PKG_OPTIONS:Msdl)

-Olaf.
-- 
___ Olaf 'Rhialto' Seibert  -- There's no point being grown-up if you 
\X/ rhialto/at/xs4all.nl    -- can't be childish sometimes. -The 4th Doctor