NetBSD Problem Report #44820

From rhialto@falu.nl  Sun Apr  3 19:15:17 2011
Return-Path: <rhialto@falu.nl>
Received: from mail.netbsd.org (mail.netbsd.org [204.152.190.11])
	by www.NetBSD.org (Postfix) with ESMTP id 8053563B84D
	for <gnats-bugs@gnats.NetBSD.org>; Sun,  3 Apr 2011 19:15:17 +0000 (UTC)
Message-Id: <201104031915.p33JF43t029385@radl.falu.nl>
Date: Sun, 3 Apr 2011 21:15:04 +0200 (CEST)
From: rhialto@falu.nl
Reply-To: rhialto@falu.nl
To: gnats-bugs@gnats.NetBSD.org
Cc: rhialto@falu.nl
Subject: [maintainer update] emulators/vice 2.3
X-Send-Pr-Version: 3.95

>Number:         44820
>Category:       pkg
>Synopsis:       [maintainer update] emulators/vice 2.3
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          closed
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Sun Apr 03 19:20:01 +0000 2011
>Closed-Date:    Mon Apr 04 13:43:02 +0000 2011
>Last-Modified:  Sat Apr 16 21:30:02 +0000 2011
>Originator:     Rhialto
>Release:        NetBSD 5.1
>Organization:

>Environment:


System: NetBSD radl.falu.nl 5.1 NetBSD 5.1 (Radl-s_Pervasion_of_the_Incorrect_Chord) #0: Mon Jan 24 20:25:13 CET 2011 root@vargaz.falu.nl:/usr/src/sys/arch/amd64/compile/RADL5.1 amd64
Architecture: x86_64
Machine: amd64
>Description:
	Vice 2.3 is out.
	Here is a diff of the pkgsrc files, but it is rather unreadable.
	There are also some new files that ``cvs diff'' doesn't tell you about.
	Therefore I add a shar file of all files too.
>How-To-Repeat:
>Fix:

? PLIST.sdl
? PLIST.x11
Index: DESCR
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/vice/DESCR,v
retrieving revision 1.1
diff -u -r1.1 DESCR
--- DESCR	31 Oct 2001 23:54:04 -0000	1.1
+++ DESCR	3 Apr 2011 19:12:02 -0000
@@ -1,8 +1,8 @@
 VICE is the one and only Versatile Commodore Emulator. It provides
-emulation of the Commodore 64, 128, VIC20 and PET 8-bit computers
-within a single package. The emulators run as separate programs, but
-have the same user interface, share the same settings and support the
-same file formats.
+emulation of the Commodore 64, 128, VIC20, PET, Plus/4 and C16 8-bit
+computers within a single package. The emulators run as separate
+programs, but have the same user interface, share the same settings and
+support the same file formats.

 All the emulators provide an accurate 6502/6510 emulator, with
 emulation of all the opcodes (both documented and undocumented ones)
@@ -14,4 +14,4 @@
 as the C64 one, as they are still under construction.

 The current version emulates the C64, the C128, the VIC20, the CBM-II
-line (B128, B256), and all the PET models.
+line (B128, B256), Plus/4 and C16, and all the PET models.
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/vice/Makefile,v
retrieving revision 1.87
diff -u -r1.87 Makefile
--- Makefile	23 Dec 2010 11:44:30 -0000	1.87
+++ Makefile	3 Apr 2011 19:12:02 -0000
@@ -1,21 +1,17 @@
 # $NetBSD: Makefile,v 1.87 2010/12/23 11:44:30 dsainty Exp $
 #

-DISTNAME=		vice-2.2
-PKGREVISION=		2
+DISTNAME=		vice-2.3
 CATEGORIES=		emulators
-MASTER_SITES=		ftp://ftp.zimmers.net/pub/cbm/crossplatform/emulators/VICE/ \
-			http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/ \
-			http://www.trikaliotis.net/Download/vice/
+MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=vice-emu:Q}/
+MASTER_SITES+=		ftp://ftp.zimmers.net/pub/cbm/crossplatform/emulators/VICE/
+MASTER_SITES+=		http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/

 MAINTAINER=		rhialto@falu.nl
 HOMEPAGE=		http://vice-emu.sourceforge.net/
-COMMENT=		Emulator for C64, C128, CBM-II, PET, and VIC20
+COMMENT=		Emulator for C64, C128, CBM-II, PET, VIC20, Plus4 and C16
 LICENSE=		gnu-gpl-v2

-PATCH_SITES=            http://www.students.tut.fi/~nuotio/
-PATCHFILES+=            vice_2_2_netbsd.patch
-
 PKG_DESTDIR_SUPPORT=	user-destdir

 RESTRICTED=		ROM image copyright is questionable.
@@ -28,15 +24,17 @@

 USE_PKGLOCALEDIR=	YES
 USE_TOOLS+=		bdftopcf gmake mkfontdir msgfmt
+USE_TOOLS+=		pkg-config
 USE_LANGUAGES=		c c++
 GNU_CONFIGURE=		YES
-CONFIGURE_ARGS+=	--enable-fullscreen

 INFO_FILES=		YES
 FONTS_DIRS.x11=		${PREFIX}/share/vice/fonts
 REQD_DIRS+=		${PREFIX}/share/vice/fonts
 REQD_DIRS+=		${PREFIX}/share/vice

+PLIST_SRC+=		PLIST
+
 .include "options.mk"

 .include "../../mk/bsd.prefs.mk"
@@ -50,10 +48,4 @@
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
-.include "../../x11/libXaw/buildlink3.mk"
-.include "../../x11/libXpm/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/libXrandr/buildlink3.mk"
-.include "../../x11/libXxf86dga/buildlink3.mk"
-.include "../../x11/libXxf86vm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/vice/PLIST,v
retrieving revision 1.22
diff -u -r1.22 PLIST
--- PLIST	24 Jul 2010 09:44:57 -0000	1.22
+++ PLIST	3 Apr 2011 19:12:02 -0000
@@ -2,20 +2,23 @@
 bin/c1541
 bin/cartconv
 bin/petcat
-bin/vsid
 bin/x128
 bin/x64
 bin/x64dtv
+bin/x64sc
 bin/xcbm2
 bin/xpet
 bin/xplus4
 bin/xvic
 info/vice.info
+info/vice.pdf
+info/vice.txt
 man/man1/c1541.1
 man/man1/petcat.1
 man/man1/vice.1
 share/doc/vice/64doc.txt
 share/doc/vice/BUGS
+share/doc/vice/CIA-README.txt
 share/doc/vice/COPYING
 share/doc/vice/CommodoreInnovationPriceSoftware2008.jpg
 share/doc/vice/GP2X-Howto.txt
@@ -33,19 +36,20 @@
 share/doc/vice/ReadmeMacOSX.txt
 share/doc/vice/ReadmeSDL.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/amigaos.html
 share/doc/vice/beos.html
-share/doc/vice/cartconv.txt
 share/doc/vice/cbm_basic_tokens.txt
 share/doc/vice/coding-guidelines.txt
 share/doc/vice/drive_info.txt
 share/doc/vice/iec-bus.txt
 share/doc/vice/index.html
 share/doc/vice/macosx.html
-share/doc/vice/mon.txt
 share/doc/vice/new.gif
 share/doc/vice/openGLsync-howto.txt
 share/doc/vice/qnx.html
@@ -70,15 +74,6 @@
 share/doc/vice/vice_8.html
 share/doc/vice/vice_9.html
 share/doc/vice/vice_toc.html
-share/locale/da/LC_MESSAGES/vice.mo
-share/locale/de/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/nl/LC_MESSAGES/vice.mo
-share/locale/pl/LC_MESSAGES/vice.mo
-share/locale/sv/LC_MESSAGES/vice.mo
-share/locale/tr/LC_MESSAGES/vice.mo
 share/vice/C128/basic64
 share/vice/C128/basichi
 share/vice/C128/basiclo
@@ -105,8 +100,6 @@
 share/vice/C128/vdc_comp.vpl
 share/vice/C128/vdc_deft.vpl
 share/vice/C128/vice.vpl
-share/vice/C128/x11_pos.vkm
-share/vice/C128/x11_sym.vkm
 share/vice/C64/basic
 share/vice/C64/c64hq.vpl
 share/vice/C64/c64mem.sym
@@ -120,18 +113,12 @@
 share/vice/C64/kernal
 share/vice/C64/pc64.vpl
 share/vice/C64/vice.vpl
-share/vice/C64/x11_pos.vkm
-share/vice/C64/x11_posger.vkm
-share/vice/C64/x11_sym.vkm
-share/vice/C64/x11_symger.vkm
 share/vice/C64DTV/basic
 share/vice/C64DTV/c64mem.sym
 share/vice/C64DTV/chargen
 share/vice/C64DTV/default.vrs
 share/vice/C64DTV/dtvrom.bin
 share/vice/C64DTV/kernal
-share/vice/C64DTV/x11_pos.vkm
-share/vice/C64DTV/x11_sym.vkm
 share/vice/CBM-II/amber.vpl
 share/vice/CBM-II/basic.128
 share/vice/CBM-II/basic.256
@@ -155,7 +142,6 @@
 share/vice/CBM-II/rom256l.vrs
 share/vice/CBM-II/rom500.vrs
 share/vice/CBM-II/white.vpl
-share/vice/CBM-II/x11_buks.vkm
 share/vice/DRIVES/d1541II
 share/vice/DRIVES/d1571cr
 share/vice/DRIVES/dos1001
@@ -191,10 +177,6 @@
 share/vice/PET/rom4b80.vrs
 share/vice/PET/rom4g40.vrs
 share/vice/PET/white.vpl
-share/vice/PET/x11_bdep.vkm
-share/vice/PET/x11_bdes.vkm
-share/vice/PET/x11_bgrs.vkm
-share/vice/PET/x11_buks.vkm
 share/vice/PLUS4/3plus1hi
 share/vice/PLUS4/3plus1lo
 share/vice/PLUS4/basic
@@ -202,8 +184,6 @@
 share/vice/PLUS4/default.vrs
 share/vice/PLUS4/kernal
 share/vice/PLUS4/vice.vpl
-share/vice/PLUS4/x11_pos.vkm
-share/vice/PLUS4/x11_sym.vkm
 share/vice/PRINTER/cbm1526
 share/vice/PRINTER/mps801
 share/vice/PRINTER/mps803
@@ -214,7 +194,5 @@
 share/vice/VIC20/default.vpl
 share/vice/VIC20/default.vrs
 share/vice/VIC20/kernal
-share/vice/VIC20/x11_pos.vkm
-share/vice/VIC20/x11_sym.vkm
 share/vice/fonts/CBM.ttf
 share/vice/fonts/vice-cbm.bdf
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/vice/distinfo,v
retrieving revision 1.35
diff -u -r1.35 distinfo
--- distinfo	24 Jul 2010 09:44:57 -0000	1.35
+++ distinfo	3 Apr 2011 19:12:02 -0000
@@ -1,11 +1,7 @@
 $NetBSD: distinfo,v 1.35 2010/07/24 09:44:57 wiz Exp $

-SHA1 (vice-2.2.tar.gz) = 88ec1f4fefc708957b242805a28ca9b26a3e2738
-RMD160 (vice-2.2.tar.gz) = d3fb33deb776ffcae297df413849437fb4e49840
-Size (vice-2.2.tar.gz) = 9597027 bytes
-SHA1 (vice_2_2_netbsd.patch) = fd6ca57372efde9d467da221f4b5b8454b8062fc
-RMD160 (vice_2_2_netbsd.patch) = 26cd48aa79eae7976f41f4dacf972d81c5da788e
-Size (vice_2_2_netbsd.patch) = 4437 bytes
-SHA1 (patch-aa) = 08ac51c0674fde12ff0032a69f7c301464c1b408
-SHA1 (patch-ab) = 982424905a9fb8eb011d19b3ec649b5d7a01ca83
-SHA1 (patch-ad) = 0ace2e00ed2f66c8669ec745b62118570187735a
+SHA1 (vice-2.3.tar.gz) = 5e7e1a375a4ca8c4895dc1552162955fdffce296
+RMD160 (vice-2.3.tar.gz) = 056e48ffedfaecd470892c73b97af89c1e002ff9
+Size (vice-2.3.tar.gz) = 11602378 bytes
+SHA1 (patch-aa) = 7ecda5911a2dd0e7ef8676959d9dc021323d393f
+SHA1 (patch-ab) = 095839b7f234f803d01296dc72c37ec9909bcbce
Index: options.mk
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/vice/options.mk,v
retrieving revision 1.5
diff -u -r1.5 options.mk
--- options.mk	24 Jul 2010 09:44:57 -0000	1.5
+++ options.mk	3 Apr 2011 19:12:02 -0000
@@ -1,28 +1,72 @@
 # $NetBSD: options.mk,v 1.5 2010/07/24 09:44:57 wiz Exp $

 PKG_OPTIONS_VAR=	PKG_OPTIONS.vice
-PKG_SUPPORTED_OPTIONS=	esound ffmpeg lame gnome
+PKG_SUPPORTED_OPTIONS=	ffmpeg lame vice-fullscreen vice-hwscaling vice-ethernet
+PKG_OPTIONS_REQUIRED_GROUPS = gui
+PKG_OPTIONS_GROUP.gui = xaw gnome sdl
+PKG_DEFAULT_OPTIONS=	ffmpeg lame vice-fullscreen vice-hwscaling vice-ethernet
+PKG_DEFAULT_OPTIONS+=	xaw

 .include "../../mk/bsd.options.mk"

-.if !empty(PKG_OPTIONS:Mesound)
-.include "../../audio/esound/buildlink3.mk"
-.else
-CONFIGURE_ARGS+=	--without-esd
+.if !empty(PKG_OPTIONS:Mxaw)
+.  include "../../x11/libXt/buildlink3.mk"
+.  include "../../x11/libXmu/buildlink3.mk"
+.  include "../../x11/libXaw/buildlink3.mk"
+.  include "../../x11/libXpm/buildlink3.mk"
+PLIST_SRC += PLIST.x11
 .endif

-.if !empty(PKG_OPTIONS:Mffmpeg)
-CONFIGURE_ARGS+=	--enable-ffmpeg
-USE_TOOLS+=		pkg-config
-.include "../../multimedia/ffmpeg/buildlink3.mk"
-.  if !empty(PKG_OPTIONS:Mlame)
-.  include "../../audio/lame/buildlink3.mk"
+.if !empty(PKG_OPTIONS:Mgnome)
+CONFIGURE_ARGS+=	--enable-gnomeui
+PLIST_SRC+=		PLIST.x11
+.  include "../../x11/gtk2/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Msdl)
+CONFIGURE_ARGS+=	--enable-sdlui
+PLIST_SRC+=		PLIST.sdl
+.  include "../../devel/SDL/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mvice-fullscreen)
+CONFIGURE_ARGS+=	--enable-fullscreen
+.  if !empty(PKG_OPTIONS:Mxaw)
+.    include "../../x11/libXrandr/buildlink3.mk"
+.    include "../../x11/libXxf86vm/buildlink3.mk"
+.  endif
+.  if !empty(PKG_OPTIONS:Mgnome)
+.    include "../../x11/libXrandr/buildlink3.mk"
+.    include "../../x11/libXxf86vm/buildlink3.mk"
+.  endif
+.  if !empty(PKG_OPTIONS:Msdl)
 .  endif
 .endif

-.if !empty(PKG_OPTIONS:Mgnome)
-CONFIGURE_ARGS+=	--enable-gnomeui
-USE_TOOLS+=		pkg-config
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../devel/libgnomeui/buildlink3.mk"
+.if !empty(PKG_OPTIONS:Mvice-hwscaling)
+.  if !empty(PKG_OPTIONS:Mxaw)
+.    include "../../x11/libXv/buildlink3.mk"
+.  endif
+.  if !empty(PKG_OPTIONS:Mgnome)
+.    include "../../graphics/gtkglext/buildlink3.mk"
+.  endif
+.  if !empty(PKG_OPTIONS:Msdl)
+.  endif
+.endif
+
+.if !empty(PKG_OPTIONS:Mvice-ethernet)
+CONFIGURE_ARGS+=	--enable-ethernet
+.  include "../../net/libpcap/buildlink3.mk"
+.endif
+
+# If desired, ffmpeg and lame can be build-time-only dependencies,
+# since they are loaded dynamically only.
+.if !empty(PKG_OPTIONS:Mffmpeg)
+#BUILDLINK_DEPMETHOD.ffmpeg?=	build
+CONFIGURE_ARGS+=	--enable-ffmpeg
+.  include "../../multimedia/ffmpeg/buildlink3.mk"
+.endif
+.if !empty(PKG_OPTIONS:Mlame)
+#BUILDLINK_DEPMETHOD.lame?=	build
+.  include "../../audio/lame/buildlink3.mk"
 .endif
Index: patches/patch-aa
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/vice/patches/patch-aa,v
retrieving revision 1.10
diff -u -r1.10 patch-aa
--- patches/patch-aa	24 Jul 2010 09:44:57 -0000	1.10
+++ patches/patch-aa	3 Apr 2011 19:12:02 -0000
@@ -1,27 +1,21 @@
 $NetBSD: patch-aa,v 1.10 2010/07/24 09:44:57 wiz Exp $

-Better destdir support.
+Bring back DESTDIR support which is somehow patched out by pkgsrc.
+    localedir = $(DESTDIR)$(datadir)/locale
+is changed to
+    localedir = /usr/pkg/share/locale
+and the same for gnulocaledir.

---- po/Makefile.in.in.orig	2008-06-18 16:02:50.000000000 +0000
-+++ po/Makefile.in.in
-@@ -116,16 +116,16 @@ install-data: install-data-@USE_NLS@
- install-data-no: all
- install-data-yes: all
- 	if test -r "$(MKINSTALLDIRS)"; then \
--	  $(MKINSTALLDIRS) $(datadir); \
-+	  $(MKINSTALLDIRS) ${DESTDIR}$(datadir); \
- 	else \
--	  $(SHELL) $(top_srcdir)/mkinstalldirs $(datadir); \
-+	  $(SHELL) $(top_srcdir)/mkinstalldirs ${DESTDIR}$(datadir); \
- 	fi
- 	@catalogs='$(CATALOGS)'; \
+--- po/Makefile.in.in.dist	2011-02-27 00:39:47.000000000 +0100
++++ po/Makefile.in.in	2011-02-27 01:11:12.000000000 +0100
+@@ -126,8 +126,8 @@
  	for cat in $$catalogs; do \
  	  cat=`basename $$cat`; \
  	  case "$$cat" in \
 -	    *.gmo) destdir=$(gnulocaledir);; \
 -	    *)     destdir=$(localedir);; \
-+	    *.gmo) destdir=${DESTDIR}$(gnulocaledir);; \
-+	    *)     destdir=${DESTDIR}$(localedir);; \
++	    *.gmo) destdir=$(DESTDIR)$(gnulocaledir);; \
++	    *)     destdir=$(DESTDIR)$(localedir);; \
  	  esac; \
  	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
  	  dir=$$destdir/$$lang/LC_MESSAGES; \
Index: patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/emulators/vice/patches/patch-ab,v
retrieving revision 1.10
diff -u -r1.10 patch-ab
--- patches/patch-ab	24 Jul 2010 09:44:57 -0000	1.10
+++ patches/patch-ab	3 Apr 2011 19:12:02 -0000
@@ -1,157 +1,42 @@
 $NetBSD: patch-ab,v 1.10 2010/07/24 09:44:57 wiz Exp $

 1. dynamic lib support does not depend on the existence of libdl
-2. fix test(1) == (only supported by bash)
-3. fix png detection, was looking for symbol that is a #define
-   in png>=1.4
+2. patch out error message about --without-iconv-base

---- configure.orig	2009-12-14 19:40:01.000000000 +0000
-+++ configure
-@@ -12642,6 +12642,7 @@ fi
- echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
- if test $ac_cv_lib_dl_dlopen = yes; then
-    DYNLIB_LIBS="-ldl";
-+fi
- 
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_DYNLIB_SUPPORT
-@@ -12649,7 +12650,6 @@ _ACEOF
- 
-                    dynlib_support=yes
- 
--fi
- 
+--- configure.orig	2011-02-26 19:07:06.000000000 +0100
++++ configure	2011-02-27 13:56:52.000000000 +0100
+@@ -3381,7 +3381,7 @@
+       ;;
+   esac
+   if test x"$argvalid" = "xno"; then
+-    as_fn_error $? "invalid option: $argcheck" "$LINENO" 5
++    echo "WARNING: invalid option: $argcheck"
    fi
- elif test x"$is_win32" = "xyes" ; then
-@@ -19019,7 +19019,7 @@ fi
  done

+@@ -10381,13 +10381,13 @@

--  if test x"$with_pulse" == "xyes"; then
-+  if test x"$with_pulse" = "xyes"; then
- 
- for ac_header in pulse/simple.h
- do
-@@ -26103,10 +26103,10 @@ fi
- 
- 
-     if test x"$ac_cv_header_png_h" = "xyes" ; then
--      unset ac_cv_lib_png_png_check_sig
--      { echo "$as_me:$LINENO: checking for png_check_sig in -lpng" >&5
--echo $ECHO_N "checking for png_check_sig in -lpng... $ECHO_C" >&6; }
--if test "${ac_cv_lib_png_png_check_sig+set}" = set; then
-+      unset ac_cv_lib_png_png_sig_cmp
-+      { echo "$as_me:$LINENO: checking for png_sig_cmp in -lpng" >&5
-+echo $ECHO_N "checking for png_sig_cmp in -lpng... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_png_png_sig_cmp+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
-@@ -26124,11 +26124,11 @@ cat >>conftest.$ac_ext <<_ACEOF
- #ifdef __cplusplus
- extern "C"
- #endif
--char png_check_sig ();
-+char png_sig_cmp ();
- int
- main ()
- {
--return png_check_sig ();
-+return png_sig_cmp ();
-   ;
-   return 0;
- }
-@@ -26151,21 +26151,21 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
- 	 test ! -s conftest.err
-        } && test -s conftest$ac_exeext &&
-        $as_test_x conftest$ac_exeext; then
--  ac_cv_lib_png_png_check_sig=yes
-+  ac_cv_lib_png_png_sig_cmp=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5

--	ac_cv_lib_png_png_check_sig=no
-+	ac_cv_lib_png_png_sig_cmp=no
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_check_sig" >&5
--echo "${ECHO_T}$ac_cv_lib_png_png_check_sig" >&6; }
--if test $ac_cv_lib_png_png_check_sig = yes; then
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_sig_cmp" >&5
-+echo "${ECHO_T}$ac_cv_lib_png_png_sig_cmp" >&6; }
-+if test $ac_cv_lib_png_png_sig_cmp = yes; then
-    GFXOUTPUT_LIBS="-lpng $GFXOUTPUT_LIBS";
-                      GFXOUTPUT_DRIVERS="$GFXOUTPUT_DRIVERS pngdrv.o";
- 
-@@ -26175,11 +26175,11 @@ _ACEOF
- 
- fi
- 
--      if test "$ac_cv_lib_png_png_check_sig" = "no"; then
--        unset ac_cv_lib_png_png_check_sig
--        { echo "$as_me:$LINENO: checking for png_check_sig in -lpng" >&5
--echo $ECHO_N "checking for png_check_sig in -lpng... $ECHO_C" >&6; }
--if test "${ac_cv_lib_png_png_check_sig+set}" = set; then
-+      if test "$ac_cv_lib_png_png_sig_cmp" = "no"; then
-+        unset ac_cv_lib_png_png_sig_cmp
-+        { echo "$as_me:$LINENO: checking for png_sig_cmp in -lpng" >&5
-+echo $ECHO_N "checking for png_sig_cmp in -lpng... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_png_png_sig_cmp+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
+   if test x"$ac_cv_header_dlfcn_h" = "xyes" ; then
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+-$as_echo_n "checking for dlopen in -ldl... " >&6; }
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen" >&5
++$as_echo_n "checking for dlopen... " >&6; }
+ if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
+   $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -26197,11 +26197,11 @@ cat >>conftest.$ac_ext <<_ACEOF
- #ifdef __cplusplus
- extern "C"
- #endif
--char png_check_sig ();
-+char png_sig_cmp ();
- int
- main ()
- {
--return png_check_sig ();
-+return png_sig_cmp ();
-   ;
-   return 0;
- }
-@@ -26224,21 +26224,21 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
- 	 test ! -s conftest.err
-        } && test -s conftest$ac_exeext &&
-        $as_test_x conftest$ac_exeext; then
--  ac_cv_lib_png_png_check_sig=yes
-+  ac_cv_lib_png_png_sig_cmp=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
+-LIBS="-ldl  $LIBS"
++#LIBS="-ldl  $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+@@ -10418,7 +10418,7 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+ $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+ if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
+-   DYNLIB_LIBS="-ldl";
++   DYNLIB_LIBS="";

--	ac_cv_lib_png_png_check_sig=no
-+	ac_cv_lib_png_png_sig_cmp=no
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_check_sig" >&5
--echo "${ECHO_T}$ac_cv_lib_png_png_check_sig" >&6; }
--if test $ac_cv_lib_png_png_check_sig = yes; then
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_sig_cmp" >&5
-+echo "${ECHO_T}$ac_cv_lib_png_png_sig_cmp" >&6; }
-+if test $ac_cv_lib_png_png_sig_cmp = yes; then
-    GFXOUTPUT_LIBS="-lpng -lz $GFXOUTPUT_LIBS";
-                        GFXOUTPUT_DRIVERS="$GFXOUTPUT_DRIVERS pngdrv.o";
- 
-@@ -26250,7 +26250,7 @@ fi
- 
-       fi
-     fi
--    if test x"$ac_cv_lib_png_png_check_sig" != "xyes"; then
-+    if test x"$ac_cv_lib_png_png_sig_cmp" != "xyes"; then
-       if test x"$with_zlib" != "xno" ; then
+ $as_echo "#define HAVE_DYNLIB_SUPPORT /**/" >>confdefs.h

- cat >>confdefs.h <<\_ACEOF



# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#	.
#	./patches
#	./patches/patch-aa
#	./patches/patch-ab
#	./Makefile
#	./DESCR
#	./distinfo
#	./PLIST
#	./options.mk
#	./PLIST.sdl
#	./PLIST.x11
#
echo c - .
mkdir -p . > /dev/null 2>&1
echo c - ./patches
mkdir -p ./patches > /dev/null 2>&1
echo x - ./patches/patch-aa
sed 's/^X//' >./patches/patch-aa << 'END-of-./patches/patch-aa'
X$NetBSD: patch-aa,v 1.10 2010/07/24 09:44:57 wiz Exp $
X
XBring back DESTDIR support which is somehow patched out by pkgsrc.
X    localedir = $(DESTDIR)$(datadir)/locale
Xis changed to
X    localedir = /usr/pkg/share/locale
Xand the same for gnulocaledir.
X
X--- po/Makefile.in.in.dist	2011-02-27 00:39:47.000000000 +0100
X+++ po/Makefile.in.in	2011-02-27 01:11:12.000000000 +0100
X@@ -126,8 +126,8 @@
X 	for cat in $$catalogs; do \
X 	  cat=`basename $$cat`; \
X 	  case "$$cat" in \
X-	    *.gmo) destdir=$(gnulocaledir);; \
X-	    *)     destdir=$(localedir);; \
X+	    *.gmo) destdir=$(DESTDIR)$(gnulocaledir);; \
X+	    *)     destdir=$(DESTDIR)$(localedir);; \
X 	  esac; \
X 	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
X 	  dir=$$destdir/$$lang/LC_MESSAGES; \
END-of-./patches/patch-aa
echo x - ./patches/patch-ab
sed 's/^X//' >./patches/patch-ab << 'END-of-./patches/patch-ab'
X$NetBSD: patch-ab,v 1.10 2010/07/24 09:44:57 wiz Exp $
X
X1. dynamic lib support does not depend on the existence of libdl
X2. patch out error message about --without-iconv-base
X
X--- configure.orig	2011-02-26 19:07:06.000000000 +0100
X+++ configure	2011-02-27 13:56:52.000000000 +0100
X@@ -3381,7 +3381,7 @@
X       ;;
X   esac
X   if test x"$argvalid" = "xno"; then
X-    as_fn_error $? "invalid option: $argcheck" "$LINENO" 5
X+    echo "WARNING: invalid option: $argcheck"
X   fi
X done
X 
X@@ -10381,13 +10381,13 @@
X 
X 
X   if test x"$ac_cv_header_dlfcn_h" = "xyes" ; then
X-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
X-$as_echo_n "checking for dlopen in -ldl... " >&6; }
X+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen" >&5
X+$as_echo_n "checking for dlopen... " >&6; }
X if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
X   $as_echo_n "(cached) " >&6
X else
X   ac_check_lib_save_LIBS=$LIBS
X-LIBS="-ldl  $LIBS"
X+#LIBS="-ldl  $LIBS"
X cat confdefs.h - <<_ACEOF >conftest.$ac_ext
X /* end confdefs.h.  */
X 
X@@ -10418,7 +10418,7 @@
X { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
X $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
X if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
X-   DYNLIB_LIBS="-ldl";
X+   DYNLIB_LIBS="";
X 
X $as_echo "#define HAVE_DYNLIB_SUPPORT /**/" >>confdefs.h
X 
END-of-./patches/patch-ab
echo x - ./Makefile
sed 's/^X//' >./Makefile << 'END-of-./Makefile'
X# $NetBSD: Makefile,v 1.87 2010/12/23 11:44:30 dsainty Exp $
X#
X
XDISTNAME=		vice-2.3
XCATEGORIES=		emulators
XMASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=vice-emu:Q}/
XMASTER_SITES+=		ftp://ftp.zimmers.net/pub/cbm/crossplatform/emulators/VICE/
XMASTER_SITES+=		http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/
X
XMAINTAINER=		rhialto@falu.nl
XHOMEPAGE=		http://vice-emu.sourceforge.net/
XCOMMENT=		Emulator for C64, C128, CBM-II, PET, VIC20, Plus4 and C16
XLICENSE=		gnu-gpl-v2
X
XPKG_DESTDIR_SUPPORT=	user-destdir
X
XRESTRICTED=		ROM image copyright is questionable.
XNO_BIN_ON_CDROM=	${RESTRICTED}
XNO_SRC_ON_CDROM=	${RESTRICTED}
XNO_BIN_ON_FTP=		${RESTRICTED}
XNO_SRC_ON_FTP=		${RESTRICTED}
X
XEXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}
X
XUSE_PKGLOCALEDIR=	YES
XUSE_TOOLS+=		bdftopcf gmake mkfontdir msgfmt
XUSE_TOOLS+=		pkg-config
XUSE_LANGUAGES=		c c++
XGNU_CONFIGURE=		YES
X
XINFO_FILES=		YES
XFONTS_DIRS.x11=		${PREFIX}/share/vice/fonts
XREQD_DIRS+=		${PREFIX}/share/vice/fonts
XREQD_DIRS+=		${PREFIX}/share/vice
X
XPLIST_SRC+=		PLIST
X
X.include "options.mk"
X
X.include "../../mk/bsd.prefs.mk"
X
X.if (${OPSYS} == NetBSD)
XCONFIGURE_ARGS+=	--without-oss
X.endif
X
X.include "../../devel/readline/buildlink3.mk"
X.include "../../devel/gettext-lib/buildlink3.mk"
X.include "../../devel/zlib/buildlink3.mk"
X.include "../../graphics/png/buildlink3.mk"
X.include "../../mk/jpeg.buildlink3.mk"
X.include "../../mk/bsd.pkg.mk"
END-of-./Makefile
echo x - ./DESCR
sed 's/^X//' >./DESCR << 'END-of-./DESCR'
XVICE is the one and only Versatile Commodore Emulator. It provides
Xemulation of the Commodore 64, 128, VIC20, PET, Plus/4 and C16 8-bit
Xcomputers within a single package. The emulators run as separate
Xprograms, but have the same user interface, share the same settings and
Xsupport the same file formats.
X
XAll the emulators provide an accurate 6502/6510 emulator, with
Xemulation of all the opcodes (both documented and undocumented ones)
Xand accurate timing. Unlike other emulators, VICE aims to be cycle
Xaccurate; it tries to emulate chip timings as precisely as possible
Xand does so efficiently.
X
XPlease do not expect the VIC20, C128 and PET emulators to be as good
Xas the C64 one, as they are still under construction.
X
XThe current version emulates the C64, the C128, the VIC20, the CBM-II
Xline (B128, B256), Plus/4 and C16, and all the PET models.
END-of-./DESCR
echo x - ./distinfo
sed 's/^X//' >./distinfo << 'END-of-./distinfo'
X$NetBSD: distinfo,v 1.35 2010/07/24 09:44:57 wiz Exp $
X
XSHA1 (vice-2.3.tar.gz) = 5e7e1a375a4ca8c4895dc1552162955fdffce296
XRMD160 (vice-2.3.tar.gz) = 056e48ffedfaecd470892c73b97af89c1e002ff9
XSize (vice-2.3.tar.gz) = 11602378 bytes
XSHA1 (patch-aa) = 7ecda5911a2dd0e7ef8676959d9dc021323d393f
XSHA1 (patch-ab) = 095839b7f234f803d01296dc72c37ec9909bcbce
END-of-./distinfo
echo x - ./PLIST
sed 's/^X//' >./PLIST << 'END-of-./PLIST'
X@comment $NetBSD: PLIST,v 1.22 2010/07/24 09:44:57 wiz Exp $
Xbin/c1541
Xbin/cartconv
Xbin/petcat
Xbin/x128
Xbin/x64
Xbin/x64dtv
Xbin/x64sc
Xbin/xcbm2
Xbin/xpet
Xbin/xplus4
Xbin/xvic
Xinfo/vice.info
Xinfo/vice.pdf
Xinfo/vice.txt
Xman/man1/c1541.1
Xman/man1/petcat.1
Xman/man1/vice.1
Xshare/doc/vice/64doc.txt
Xshare/doc/vice/BUGS
Xshare/doc/vice/CIA-README.txt
Xshare/doc/vice/COPYING
Xshare/doc/vice/CommodoreInnovationPriceSoftware2008.jpg
Xshare/doc/vice/GP2X-Howto.txt
Xshare/doc/vice/MSDOS-Ethernet-Howto.txt
Xshare/doc/vice/MSDOS-Howto.txt
Xshare/doc/vice/MacOSX-Build.txt
Xshare/doc/vice/MacOSX-ResourceTree.txt
Xshare/doc/vice/Minix-Howto.txt
Xshare/doc/vice/NEWS
Xshare/doc/vice/NLS-Howto.txt
Xshare/doc/vice/OpenVMS-Howto.txt
Xshare/doc/vice/PETdoc.txt
Xshare/doc/vice/Readme.beos
Xshare/doc/vice/Readme.dos
Xshare/doc/vice/ReadmeMacOSX.txt
Xshare/doc/vice/ReadmeSDL.txt
Xshare/doc/vice/TODO
Xshare/doc/vice/VIC-Addendum.txt
Xshare/doc/vice/VIC-Article.txt
Xshare/doc/vice/VIC-Artikel.txt
Xshare/doc/vice/Walkthrough-Howto.txt
Xshare/doc/vice/Win32-Cygwin-HOWTO.txt
Xshare/doc/vice/Win32-Howto.txt
Xshare/doc/vice/amigaos.html
Xshare/doc/vice/beos.html
Xshare/doc/vice/cbm_basic_tokens.txt
Xshare/doc/vice/coding-guidelines.txt
Xshare/doc/vice/drive_info.txt
Xshare/doc/vice/iec-bus.txt
Xshare/doc/vice/index.html
Xshare/doc/vice/macosx.html
Xshare/doc/vice/new.gif
Xshare/doc/vice/openGLsync-howto.txt
Xshare/doc/vice/qnx.html
Xshare/doc/vice/sco.html
Xshare/doc/vice/serial.txt
Xshare/doc/vice/solaris.html
Xshare/doc/vice/vice-logo.jpg
Xshare/doc/vice/vice_1.html
Xshare/doc/vice/vice_10.html
Xshare/doc/vice/vice_11.html
Xshare/doc/vice/vice_12.html
Xshare/doc/vice/vice_13.html
Xshare/doc/vice/vice_14.html
Xshare/doc/vice/vice_15.html
Xshare/doc/vice/vice_16.html
Xshare/doc/vice/vice_2.html
Xshare/doc/vice/vice_3.html
Xshare/doc/vice/vice_4.html
Xshare/doc/vice/vice_5.html
Xshare/doc/vice/vice_6.html
Xshare/doc/vice/vice_7.html
Xshare/doc/vice/vice_8.html
Xshare/doc/vice/vice_9.html
Xshare/doc/vice/vice_toc.html
Xshare/vice/C128/basic64
Xshare/vice/C128/basichi
Xshare/vice/C128/basiclo
Xshare/vice/C128/c64hq.vpl
Xshare/vice/C128/c64s.vpl
Xshare/vice/C128/ccs64.vpl
Xshare/vice/C128/chargde
Xshare/vice/C128/chargen
Xshare/vice/C128/chargfr
Xshare/vice/C128/chargse
Xshare/vice/C128/default.vpl
Xshare/vice/C128/default.vrs
Xshare/vice/C128/frodo.vpl
Xshare/vice/C128/godot.vpl
Xshare/vice/C128/kernal
Xshare/vice/C128/kernal64
Xshare/vice/C128/kernalde
Xshare/vice/C128/kernalfi
Xshare/vice/C128/kernalfr
Xshare/vice/C128/kernalit
Xshare/vice/C128/kernalno
Xshare/vice/C128/kernalse
Xshare/vice/C128/pc64.vpl
Xshare/vice/C128/vdc_comp.vpl
Xshare/vice/C128/vdc_deft.vpl
Xshare/vice/C128/vice.vpl
Xshare/vice/C64/basic
Xshare/vice/C64/c64hq.vpl
Xshare/vice/C64/c64mem.sym
Xshare/vice/C64/c64s.vpl
Xshare/vice/C64/ccs64.vpl
Xshare/vice/C64/chargen
Xshare/vice/C64/default.vpl
Xshare/vice/C64/default.vrs
Xshare/vice/C64/frodo.vpl
Xshare/vice/C64/godot.vpl
Xshare/vice/C64/kernal
Xshare/vice/C64/pc64.vpl
Xshare/vice/C64/vice.vpl
Xshare/vice/C64DTV/basic
Xshare/vice/C64DTV/c64mem.sym
Xshare/vice/C64DTV/chargen
Xshare/vice/C64DTV/default.vrs
Xshare/vice/C64DTV/dtvrom.bin
Xshare/vice/C64DTV/kernal
Xshare/vice/CBM-II/amber.vpl
Xshare/vice/CBM-II/basic.128
Xshare/vice/CBM-II/basic.256
Xshare/vice/CBM-II/basic.500
Xshare/vice/CBM-II/c64hq.vpl
Xshare/vice/CBM-II/c64s.vpl
Xshare/vice/CBM-II/ccs64.vpl
Xshare/vice/CBM-II/chargen.500
Xshare/vice/CBM-II/chargen.600
Xshare/vice/CBM-II/chargen.700
Xshare/vice/CBM-II/default.vpl
Xshare/vice/CBM-II/frodo.vpl
Xshare/vice/CBM-II/godot.vpl
Xshare/vice/CBM-II/green.vpl
Xshare/vice/CBM-II/kernal
Xshare/vice/CBM-II/kernal.500
Xshare/vice/CBM-II/pc64.vpl
Xshare/vice/CBM-II/rom128h.vrs
Xshare/vice/CBM-II/rom128l.vrs
Xshare/vice/CBM-II/rom256h.vrs
Xshare/vice/CBM-II/rom256l.vrs
Xshare/vice/CBM-II/rom500.vrs
Xshare/vice/CBM-II/white.vpl
Xshare/vice/DRIVES/d1541II
Xshare/vice/DRIVES/d1571cr
Xshare/vice/DRIVES/dos1001
Xshare/vice/DRIVES/dos1541
Xshare/vice/DRIVES/dos1551
Xshare/vice/DRIVES/dos1570
Xshare/vice/DRIVES/dos1571
Xshare/vice/DRIVES/dos1581
Xshare/vice/DRIVES/dos2031
Xshare/vice/DRIVES/dos2040
Xshare/vice/DRIVES/dos3040
Xshare/vice/DRIVES/dos4040
Xshare/vice/PET/amber.vpl
Xshare/vice/PET/basic1
Xshare/vice/PET/basic2
Xshare/vice/PET/basic4
Xshare/vice/PET/chargen
Xshare/vice/PET/chargen.de
Xshare/vice/PET/edit1g
Xshare/vice/PET/edit2b
Xshare/vice/PET/edit2g
Xshare/vice/PET/edit4b40
Xshare/vice/PET/edit4b80
Xshare/vice/PET/edit4g40
Xshare/vice/PET/green.vpl
Xshare/vice/PET/kernal1
Xshare/vice/PET/kernal2
Xshare/vice/PET/kernal4
Xshare/vice/PET/rom1g.vrs
Xshare/vice/PET/rom2b.vrs
Xshare/vice/PET/rom2g.vrs
Xshare/vice/PET/rom4b40.vrs
Xshare/vice/PET/rom4b80.vrs
Xshare/vice/PET/rom4g40.vrs
Xshare/vice/PET/white.vpl
Xshare/vice/PLUS4/3plus1hi
Xshare/vice/PLUS4/3plus1lo
Xshare/vice/PLUS4/basic
Xshare/vice/PLUS4/default.vpl
Xshare/vice/PLUS4/default.vrs
Xshare/vice/PLUS4/kernal
Xshare/vice/PLUS4/vice.vpl
Xshare/vice/PRINTER/cbm1526
Xshare/vice/PRINTER/mps801
Xshare/vice/PRINTER/mps803
Xshare/vice/PRINTER/mps803.vpl
Xshare/vice/PRINTER/nl10-cbm
Xshare/vice/VIC20/basic
Xshare/vice/VIC20/chargen
Xshare/vice/VIC20/default.vpl
Xshare/vice/VIC20/default.vrs
Xshare/vice/VIC20/kernal
Xshare/vice/fonts/CBM.ttf
Xshare/vice/fonts/vice-cbm.bdf
END-of-./PLIST
echo x - ./options.mk
sed 's/^X//' >./options.mk << 'END-of-./options.mk'
X# $NetBSD: options.mk,v 1.5 2010/07/24 09:44:57 wiz Exp $
X
XPKG_OPTIONS_VAR=	PKG_OPTIONS.vice
XPKG_SUPPORTED_OPTIONS=	ffmpeg lame vice-fullscreen vice-hwscaling vice-ethernet
XPKG_OPTIONS_REQUIRED_GROUPS = gui
XPKG_OPTIONS_GROUP.gui = xaw gnome sdl
XPKG_DEFAULT_OPTIONS=	ffmpeg lame vice-fullscreen vice-hwscaling vice-ethernet
XPKG_DEFAULT_OPTIONS+=	xaw
X
X.include "../../mk/bsd.options.mk"
X
X.if !empty(PKG_OPTIONS:Mxaw)
X.  include "../../x11/libXt/buildlink3.mk"
X.  include "../../x11/libXmu/buildlink3.mk"
X.  include "../../x11/libXaw/buildlink3.mk"
X.  include "../../x11/libXpm/buildlink3.mk"
XPLIST_SRC += PLIST.x11
X.endif
X
X.if !empty(PKG_OPTIONS:Mgnome)
XCONFIGURE_ARGS+=	--enable-gnomeui
XPLIST_SRC+=		PLIST.x11
X.  include "../../x11/gtk2/buildlink3.mk"
X.endif
X
X.if !empty(PKG_OPTIONS:Msdl)
XCONFIGURE_ARGS+=	--enable-sdlui
XPLIST_SRC+=		PLIST.sdl
X.  include "../../devel/SDL/buildlink3.mk"
X.endif
X
X.if !empty(PKG_OPTIONS:Mvice-fullscreen)
XCONFIGURE_ARGS+=	--enable-fullscreen
X.  if !empty(PKG_OPTIONS:Mxaw)
X.    include "../../x11/libXrandr/buildlink3.mk"
X.    include "../../x11/libXxf86vm/buildlink3.mk"
X.  endif
X.  if !empty(PKG_OPTIONS:Mgnome)
X.    include "../../x11/libXrandr/buildlink3.mk"
X.    include "../../x11/libXxf86vm/buildlink3.mk"
X.  endif
X.  if !empty(PKG_OPTIONS:Msdl)
X.  endif
X.endif
X
X.if !empty(PKG_OPTIONS:Mvice-hwscaling)
X.  if !empty(PKG_OPTIONS:Mxaw)
X.    include "../../x11/libXv/buildlink3.mk"
X.  endif
X.  if !empty(PKG_OPTIONS:Mgnome)
X.    include "../../graphics/gtkglext/buildlink3.mk"
X.  endif
X.  if !empty(PKG_OPTIONS:Msdl)
X.  endif
X.endif
X
X.if !empty(PKG_OPTIONS:Mvice-ethernet)
XCONFIGURE_ARGS+=	--enable-ethernet
X.  include "../../net/libpcap/buildlink3.mk"
X.endif
X
X# If desired, ffmpeg and lame can be build-time-only dependencies,
X# since they are loaded dynamically only.
X.if !empty(PKG_OPTIONS:Mffmpeg)
X#BUILDLINK_DEPMETHOD.ffmpeg?=	build
XCONFIGURE_ARGS+=	--enable-ffmpeg
X.  include "../../multimedia/ffmpeg/buildlink3.mk"
X.endif
X.if !empty(PKG_OPTIONS:Mlame)
X#BUILDLINK_DEPMETHOD.lame?=	build
X.  include "../../audio/lame/buildlink3.mk"
X.endif
END-of-./options.mk
echo x - ./PLIST.sdl
sed 's/^X//' >./PLIST.sdl << 'END-of-./PLIST.sdl'
X@comment $NetBSD$
Xshare/vice/C128/sdl_sym.vkm
Xshare/vice/C64/sdl_sym.vkm
Xshare/vice/C64/sdl_sym_da.vkm
Xshare/vice/C64/sdl_sym_de.vkm
Xshare/vice/C64/sdl_sym_fi.vkm
Xshare/vice/C64/sdl_sym_no.vkm
Xshare/vice/C64DTV/sdl_sym.vkm
Xshare/vice/C64DTV/sdl_sym_da.vkm
Xshare/vice/C64DTV/sdl_sym_de.vkm
Xshare/vice/C64DTV/sdl_sym_fi.vkm
Xshare/vice/C64DTV/sdl_sym_no.vkm
Xshare/vice/CBM-II/sdl_buks.vkm
Xshare/vice/PET/sdl_bgrs.vkm
Xshare/vice/PET/sdl_buks.vkm
Xshare/vice/PLUS4/sdl_sym.vkm
Xshare/vice/VIC20/sdl_pos_fi.vkm
Xshare/vice/VIC20/sdl_sym.vkm
END-of-./PLIST.sdl
echo x - ./PLIST.x11
sed 's/^X//' >./PLIST.x11 << 'END-of-./PLIST.x11'
X@comment $NetBSD$
Xbin/vsid
Xshare/locale/da/LC_MESSAGES/vice.mo
Xshare/locale/de/LC_MESSAGES/vice.mo
Xshare/locale/fr/LC_MESSAGES/vice.mo
Xshare/locale/hu/LC_MESSAGES/vice.mo
Xshare/locale/it/LC_MESSAGES/vice.mo
Xshare/locale/nl/LC_MESSAGES/vice.mo
Xshare/locale/pl/LC_MESSAGES/vice.mo
Xshare/locale/sv/LC_MESSAGES/vice.mo
Xshare/locale/tr/LC_MESSAGES/vice.mo
Xshare/vice/C128/x11_pos.vkm
Xshare/vice/C128/x11_sym.vkm
Xshare/vice/C64/x11_pos.vkm
Xshare/vice/C64/x11_posger.vkm
Xshare/vice/C64/x11_sym.vkm
Xshare/vice/C64/x11_symger.vkm
Xshare/vice/C64DTV/x11_pos.vkm
Xshare/vice/C64DTV/x11_sym.vkm
Xshare/vice/CBM-II/x11_buks.vkm
Xshare/vice/CBM-II/x11_buks_de.vkm
Xshare/vice/PET/x11_bdep.vkm
Xshare/vice/PET/x11_bdep_de.vkm
Xshare/vice/PET/x11_bdes.vkm
Xshare/vice/PET/x11_bdes_de.vkm
Xshare/vice/PET/x11_bgrp.vkm
Xshare/vice/PET/x11_bgrp_de.vkm
Xshare/vice/PET/x11_bgrs.vkm
Xshare/vice/PET/x11_bgrs_de.vkm
Xshare/vice/PET/x11_bukp.vkm
Xshare/vice/PET/x11_bukp_de.vkm
Xshare/vice/PET/x11_buks.vkm
Xshare/vice/PET/x11_buks_de.vkm
Xshare/vice/PLUS4/x11_pos.vkm
Xshare/vice/PLUS4/x11_sym.vkm
Xshare/vice/PLUS4/x11_sym_de.vkm
Xshare/vice/VIC20/x11_pos.vkm
Xshare/vice/VIC20/x11_sym.vkm
END-of-./PLIST.x11
exit


-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

>Release-Note:

>Audit-Trail:

State-Changed-From-To: open->closed
State-Changed-By: wiz@NetBSD.org
State-Changed-When: Mon, 04 Apr 2011 13:43:02 +0000
State-Changed-Why:
Committed, thank you. Two minor things:
It's PKG_SUGGESTED_OPTIONS, not PKG_DEFAULT_OPTIONS.
Could you please provide descriptions for the new options (vice-*)?
Thanks.


From: "Thomas Klausner" <wiz@netbsd.org>
To: gnats-bugs@gnats.NetBSD.org
Cc: 
Subject: PR/44820 CVS commit: pkgsrc/emulators/vice
Date: Mon, 4 Apr 2011 13:42:09 +0000

 Module Name:	pkgsrc
 Committed By:	wiz
 Date:		Mon Apr  4 13:42:08 UTC 2011

 Modified Files:
 	pkgsrc/emulators/vice: DESCR Makefile PLIST distinfo options.mk
 	pkgsrc/emulators/vice/patches: patch-aa patch-ab
 Added Files:
 	pkgsrc/emulators/vice: PLIST.sdl PLIST.x11
 Removed Files:
 	pkgsrc/emulators/vice/patches: patch-ac patch-ad

 Log Message:
 Update to 2.3, provided by Olaf 'Rhialto' Seibert in PR 44820, with a
 slight fix.

 * Changes in VICE 2.3
 ======================

 ** General
 ----------

 - Added x64sc, the accurate C64 emulator:

   * VIC-II emulation rewritten from scratch using results from extensive
     testing with newly written test programs on real hardware.

   * Emulation is done on a cycle by cycle basis combined with pixel exact
     dot clock domain handling.

   * Accurate handling of all possible in-line splits of VIC-II registers
     and graphics data.

   * C64 model and even individual chip revisions can be selected for very
     detailed emulation of their differences.

   * Equally accurate PAL, NTSC and PAL-N emulation.

   We believe x64sc is one of the most accurate C64 emulators at the
   moment.

 - Drive improvements, including weak bit emulation.

 - Major reSID overhaul:

   * Emulation of all known pipeline delays for full cycle accuracy.
   * New shift register model based on revectorized die photograps.
   * Accurate DAC models based on revectorized die photograps.
   * Emulation of floating waveform DAC input for waveform 0.
   * Advanced 6581 transistor level filter model based on revectorized
     die photograps, yielding unprecedented accuracy.

 - CRT Emulation (former "PAL emulation") is now available regardless of
   video mode or -chip and works in all emulators.

   NOTE: Color gamma range changed. You may need to set to 2.200 manually.
   (ColorGamma=2200)

 - Added "True aspect ratio" option.

 - Sound buffer overflows reduced and the error replaced with a warning.

 - Various monitor improvements (io details, expansion port status ...)

 - Removed little used Emulator ID feature.

 - VIA wrap handling rewritten to fix problems with timer 2.

 - Added autostart option to do LOAD ,8 instead of ,8,1.

 - RESTORE key presses are now distributed randomly across a frame.

 - Improved accuracy of CIA interrupts. (6526/6526A selectable)

 ** C64/C128 changes
 -------------------

 - Cartridge emulation improvements. Many broken cartridges fixed, and the
   following ones added:

   * Action Replay 2
   * Action Replay 3
   * Capture
   * Diashow Maker
   * EXOS
   * Final Cartridge Plus
   * Freeze Frame
   * Freeze Machine
   * Game Killer
   * MACH 5
   * Magic Voice
   * MMC Replay
   * Prophet 64
   * Snapshot 64
   * Super Explode V5
   * Super Snapshot

 - Added emulation of the passthrough port of MMC64, Magic Voice and IEEE488
   cartridges.

 - CIA TOD 50/60 Hz toggle emulation fixed.

 - Improved 1351/paddles port MUX emulation.

 ** C64 changes
 --------------

 - Added Drean (PAL-N) emulation.

 - Fixed bug with autostart mode Inject-to-RAM.  It now writes to RAM under
   I/O correctly.

 ** C128 changes
 ---------------

 - Fixed a bug with autostarting t64 images.

 ** VIC20 changes
 ----------------

 - Added Vic Flash Plugin cartridge emulation.

 - Fixed video cache & reverse bug.

 - Fixed bug in attaching 4kB cartridges.

 - Fixed autostarting bug, mostly seen with tape images.

 ** PLUS4 changes
 ----------------

 - Fixed crashes in NTSC mode.

 - Added v364 speech emulation.

 ** PET changes
 --------------

 - Added DWW emulation.

 - Added userport DAC emulation.

 ** CBM2 changes
 ---------------

 - Split 5x0 and 6x0/7x0 settings in the configuration file.

 ** Unix changes
 ---------------

 - (Xaw) The menus can now be operated without holding the
   mouse button down. Keyboard control is also available
   (Shift-Alt-Z for left menu, Shift-Alt-X for right menu).

 - (Xaw) Lightpen/gun support added.

 - (GTK+) Fixed aspect ratio option added.

 ** SDL UI changes
 -----------------

 - Added vsid UI, FFMPEG and printer menus. The UI is complete.


 To generate a diff of this commit:
 cvs rdiff -u -r1.1 -r1.2 pkgsrc/emulators/vice/DESCR
 cvs rdiff -u -r1.88 -r1.89 pkgsrc/emulators/vice/Makefile
 cvs rdiff -u -r1.22 -r1.23 pkgsrc/emulators/vice/PLIST
 cvs rdiff -u -r0 -r1.1 pkgsrc/emulators/vice/PLIST.sdl \
     pkgsrc/emulators/vice/PLIST.x11
 cvs rdiff -u -r1.37 -r1.38 pkgsrc/emulators/vice/distinfo
 cvs rdiff -u -r1.5 -r1.6 pkgsrc/emulators/vice/options.mk
 cvs rdiff -u -r1.10 -r1.11 pkgsrc/emulators/vice/patches/patch-aa \
     pkgsrc/emulators/vice/patches/patch-ab
 cvs rdiff -u -r1.19 -r0 pkgsrc/emulators/vice/patches/patch-ac
 cvs rdiff -u -r1.14 -r0 pkgsrc/emulators/vice/patches/patch-ad

 Please note that diffs are not public domain; they are subject to the
 copyright notices on the relevant files.

From: Rhialto <rhialto@falu.nl>
To: gnats-bugs@NetBSD.org
Cc: pkg-manager@NetBSD.org, pkgsrc-bugs@NetBSD.org, gnats-admin@NetBSD.org,
        wiz@NetBSD.org, rhialto@falu.nl
Subject: Re: pkg/44820 ([maintainer update] emulators/vice 2.3)
Date: Tue, 5 Apr 2011 00:37:53 +0200

 On Mon 04 Apr 2011 at 13:43:03 +0000, wiz@NetBSD.org wrote:
 > Committed, thank you. Two minor things:
 > It's PKG_SUGGESTED_OPTIONS, not PKG_DEFAULT_OPTIONS.

 Thanks for fixing that.

 > Could you please provide descriptions for the new options (vice-*)?

 vice-fullscreen		Enable full-screen support
 vice-hwscaling		Enable hardware-assisted screen scaling
 vice-ethernet		Enable ethernet cartridge support

 > Thanks.
 -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

From: "S.P.Zeidler" <spz@netbsd.org>
To: gnats-bugs@gnats.NetBSD.org
Cc: 
Subject: PR/44820 CVS commit: [pkgsrc-2011Q1] pkgsrc/emulators/vice
Date: Sat, 16 Apr 2011 21:27:34 +0000

 Module Name:	pkgsrc
 Committed By:	spz
 Date:		Sat Apr 16 21:27:34 UTC 2011

 Modified Files:
 	pkgsrc/emulators/vice [pkgsrc-2011Q1]: DESCR Makefile PLIST distinfo
 	    options.mk
 	pkgsrc/emulators/vice/patches [pkgsrc-2011Q1]: patch-aa patch-ab
 Added Files:
 	pkgsrc/emulators/vice [pkgsrc-2011Q1]: PLIST.sdl PLIST.x11
 Removed Files:
 	pkgsrc/emulators/vice/patches [pkgsrc-2011Q1]: patch-ac patch-ad

 Log Message:
 Pullup ticket #3410 - requested by wiz
 emulators/vice: build fix for NetBSD 5

 Revisions pulled up:
 - emulators/vice/DESCR                                          1.2
 - emulators/vice/Makefile                                       1.89-1.90
 - emulators/vice/PLIST                                          1.23
 - emulators/vice/PLIST.sdl                                      1.1
 - emulators/vice/PLIST.x11                                      1.1
 - emulators/vice/distinfo                                       1.38
 - emulators/vice/options.mk                                     1.6
 - emulators/vice/patches/patch-aa                               1.11
 - emulators/vice/patches/patch-ab                               1.11
 - emulators/vice/patches/patch-ac                               deleted
 - emulators/vice/patches/patch-ad                               deleted

 -----------------------------------------------------------------------------
    Module Name:	pkgsrc
    Committed By:	wiz
    Date:		Mon Apr  4 13:42:08 UTC 2011

    Modified Files:
    	pkgsrc/emulators/vice: DESCR Makefile PLIST distinfo options.mk
    	pkgsrc/emulators/vice/patches: patch-aa patch-ab
    Added Files:
    	pkgsrc/emulators/vice: PLIST.sdl PLIST.x11
    Removed Files:
    	pkgsrc/emulators/vice/patches: patch-ac patch-ad

    Log Message:
    Update to 2.3, provided by Olaf 'Rhialto' Seibert in PR 44820, with a
    slight fix.

    * Changes in VICE 2.3
    ======================

    ** General
    ----------

    - Added x64sc, the accurate C64 emulator:

      * VIC-II emulation rewritten from scratch using results from extensive
        testing with newly written test programs on real hardware.

      * Emulation is done on a cycle by cycle basis combined with pixel exact
        dot clock domain handling.

      * Accurate handling of all possible in-line splits of VIC-II registers
        and graphics data.

      * C64 model and even individual chip revisions can be selected for very
        detailed emulation of their differences.

      * Equally accurate PAL, NTSC and PAL-N emulation.

      We believe x64sc is one of the most accurate C64 emulators at the
      moment.

    - Drive improvements, including weak bit emulation.

    - Major reSID overhaul:

      * Emulation of all known pipeline delays for full cycle accuracy.
      * New shift register model based on revectorized die photograps.
      * Accurate DAC models based on revectorized die photograps.
      * Emulation of floating waveform DAC input for waveform 0.
      * Advanced 6581 transistor level filter model based on revectorized
        die photograps, yielding unprecedented accuracy.

    - CRT Emulation (former "PAL emulation") is now available regardless of
      video mode or -chip and works in all emulators.

      NOTE: Color gamma range changed. You may need to set to 2.200 manually.
      (ColorGamma=2200)

    - Added "True aspect ratio" option.

    - Sound buffer overflows reduced and the error replaced with a warning.

    - Various monitor improvements (io details, expansion port status ...)

    - Removed little used Emulator ID feature.

    - VIA wrap handling rewritten to fix problems with timer 2.

    - Added autostart option to do LOAD ,8 instead of ,8,1.

    - RESTORE key presses are now distributed randomly across a frame.

    - Improved accuracy of CIA interrupts. (6526/6526A selectable)

    ** C64/C128 changes
    -------------------

    - Cartridge emulation improvements. Many broken cartridges fixed, and the
      following ones added:

      * Action Replay 2
      * Action Replay 3
      * Capture
      * Diashow Maker
      * EXOS
      * Final Cartridge Plus
      * Freeze Frame
      * Freeze Machine
      * Game Killer
      * MACH 5
      * Magic Voice
      * MMC Replay
      * Prophet 64
      * Snapshot 64
      * Super Explode V5
      * Super Snapshot

    - Added emulation of the passthrough port of MMC64, Magic Voice and IEEE488
      cartridges.

    - CIA TOD 50/60 Hz toggle emulation fixed.

    - Improved 1351/paddles port MUX emulation.

    ** C64 changes
    --------------

    - Added Drean (PAL-N) emulation.

    - Fixed bug with autostart mode Inject-to-RAM.  It now writes to RAM under
      I/O correctly.

    ** C128 changes
    ---------------

    - Fixed a bug with autostarting t64 images.

    ** VIC20 changes
    ----------------

    - Added Vic Flash Plugin cartridge emulation.

    - Fixed video cache & reverse bug.

    - Fixed bug in attaching 4kB cartridges.

    - Fixed autostarting bug, mostly seen with tape images.

    ** PLUS4 changes
    ----------------

    - Fixed crashes in NTSC mode.

    - Added v364 speech emulation.

    ** PET changes
    --------------

    - Added DWW emulation.

    - Added userport DAC emulation.

    ** CBM2 changes
    ---------------

    - Split 5x0 and 6x0/7x0 settings in the configuration file.

    ** Unix changes
    ---------------

    - (Xaw) The menus can now be operated without holding the
      mouse button down. Keyboard control is also available
      (Shift-Alt-Z for left menu, Shift-Alt-X for right menu).

    - (Xaw) Lightpen/gun support added.

    - (GTK+) Fixed aspect ratio option added.

    ** SDL UI changes
    -----------------

    - Added vsid UI, FFMPEG and printer menus. The UI is complete.

    To generate a diff of this commit:
    cvs rdiff -u -r1.1 -r1.2 pkgsrc/emulators/vice/DESCR
    cvs rdiff -u -r1.88 -r1.89 pkgsrc/emulators/vice/Makefile
    cvs rdiff -u -r1.22 -r1.23 pkgsrc/emulators/vice/PLIST
    cvs rdiff -u -r0 -r1.1 pkgsrc/emulators/vice/PLIST.sdl \
        pkgsrc/emulators/vice/PLIST.x11
    cvs rdiff -u -r1.37 -r1.38 pkgsrc/emulators/vice/distinfo
    cvs rdiff -u -r1.5 -r1.6 pkgsrc/emulators/vice/options.mk
    cvs rdiff -u -r1.10 -r1.11 pkgsrc/emulators/vice/patches/patch-aa \
        pkgsrc/emulators/vice/patches/patch-ab
    cvs rdiff -u -r1.19 -r0 pkgsrc/emulators/vice/patches/patch-ac
    cvs rdiff -u -r1.14 -r0 pkgsrc/emulators/vice/patches/patch-ad

 -----------------------------------------------------------------------------
    Module Name:	pkgsrc
    Committed By:	tron
    Date:		Sat Apr 16 11:05:33 UTC 2011

    Modified Files:
    	pkgsrc/emulators/vice: Makefile

    Log Message:
    Fix build problem under NetBSD/i386 current.

    To generate a diff of this commit:
    cvs rdiff -u -r1.89 -r1.90 pkgsrc/emulators/vice/Makefile


 To generate a diff of this commit:
 cvs rdiff -u -r1.1 -r1.1.72.1 pkgsrc/emulators/vice/DESCR
 cvs rdiff -u -r1.88 -r1.88.2.1 pkgsrc/emulators/vice/Makefile
 cvs rdiff -u -r1.22 -r1.22.6.1 pkgsrc/emulators/vice/PLIST
 cvs rdiff -u -r0 -r1.1.2.2 pkgsrc/emulators/vice/PLIST.sdl \
     pkgsrc/emulators/vice/PLIST.x11
 cvs rdiff -u -r1.37 -r1.37.2.1 pkgsrc/emulators/vice/distinfo
 cvs rdiff -u -r1.5 -r1.5.6.1 pkgsrc/emulators/vice/options.mk
 cvs rdiff -u -r1.10 -r1.10.6.1 pkgsrc/emulators/vice/patches/patch-aa \
     pkgsrc/emulators/vice/patches/patch-ab
 cvs rdiff -u -r1.19 -r0 pkgsrc/emulators/vice/patches/patch-ac
 cvs rdiff -u -r1.14 -r0 pkgsrc/emulators/vice/patches/patch-ad

 Please note that diffs are not public domain; they are subject to the
 copyright notices on the relevant files.

>Unformatted:

NetBSD Home
NetBSD PR Database Search

(Contact us) $NetBSD: query-full-pr,v 1.51 2026/08/10 02:28:17 riastradh Exp $
$NetBSD: gnats_config.sh,v 1.10 2026/05/13 22:00:09 riastradh Exp $
Copyright © 1994-2026 The NetBSD Foundation, Inc. ALL RIGHTS RESERVED.