diff options
Diffstat (limited to 'emulators/vice')
-rw-r--r-- | emulators/vice/Makefile | 8 | ||||
-rw-r--r-- | emulators/vice/distinfo | 6 | ||||
-rw-r--r-- | emulators/vice/files/patch-configure | 30 | ||||
-rw-r--r-- | emulators/vice/files/patch-doc-Makefile.in | 10 | ||||
-rw-r--r-- | emulators/vice/files/patch-doc-html-Makefile.in | 10 | ||||
-rw-r--r-- | emulators/vice/pkg-plist | 18 |
6 files changed, 40 insertions, 42 deletions
diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile index a6116952942d..f4b8d3410ea5 100644 --- a/emulators/vice/Makefile +++ b/emulators/vice/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ PORTNAME= vice -PORTVERSION= 1.19 +PORTVERSION= 1.20 CATEGORIES= emulators MASTER_SITES= http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/ \ http://fresh.t-systems-sfr.com/linux/src/ \ @@ -30,7 +30,7 @@ MAKE_ENV+= MAKEINFOFLAGS="--no-split" .if defined(VICE_WITH_GNOME) GNOME_SUFFIX= -gnome -USE_GNOME= gnomelibs +USE_GNOME= gnomelibs libgnomeui CONFIGURE_ARGS= --enable-gnomeui CONFLICTS?= vice-1.* .else @@ -38,9 +38,9 @@ CONFIGURE_ARGS= --with-xaw3d CONFLICTS?= vice-gnome-1.* .endif -CFLAGS+= -I${LOCALBASE}/include +CFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include LDFLAGS+= -L${LOCALBASE}/lib -CPPFLAGS+= -I${LOCALBASE}/include +CPPFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" MAN1= vice.1 c1541.1 petcat.1 MLINKS= vice.1 x64.1 \ diff --git a/emulators/vice/distinfo b/emulators/vice/distinfo index 19d137877f85..2a76bce0a2b8 100644 --- a/emulators/vice/distinfo +++ b/emulators/vice/distinfo @@ -1,3 +1,3 @@ -MD5 (vice-1.19.tar.gz) = 92f828f29e05f57d7a498a861d3dab6a -SHA256 (vice-1.19.tar.gz) = faf354cfef53f5b31c459692fac73dd45b72d9b05d6920348bd881856d75cd7e -SIZE (vice-1.19.tar.gz) = 4796181 +MD5 (vice-1.20.tar.gz) = d02fe05f0f9e839820105cdf51da6b4e +SHA256 (vice-1.20.tar.gz) = be32aabeb9073c25532e6df796e782a2949c464dcccb1648ad0db27fef6fd177 +SIZE (vice-1.20.tar.gz) = 5183757 diff --git a/emulators/vice/files/patch-configure b/emulators/vice/files/patch-configure index 09ea0bd14be5..f3a6479e3b69 100644 --- a/emulators/vice/files/patch-configure +++ b/emulators/vice/files/patch-configure @@ -1,24 +1,6 @@ ---- configure.orig Sun Nov 20 20:43:14 2005 -+++ configure Sat Dec 3 21:00:06 2005 -@@ -1318,7 +1318,7 @@ - - - --if test x"$VICE_VERSION_BUILD" == "x" -o x"$VICE_VERSION_BUILD" == "x0" ; then -+if test x"$VICE_VERSION_BUILD" = "x" -o x"$VICE_VERSION_BUILD" = "x0" ; then - VICE_VERSION=$VICE_VERSION_MAJOR"."$VICE_VERSION_MINOR - else - VICE_VERSION=$VICE_VERSION_MAJOR"."$VICE_VERSION_MINOR"."$VICE_VERSION_BUILD -@@ -1718,7 +1718,7 @@ - ac_config_headers="$ac_config_headers src/config.h" - - --if test x"$VICE_VERSION_BUILD" == "x" -o x"$VICE_VERSION_BUILD" == "x0" ; then -+if test x"$VICE_VERSION_BUILD" = "x" -o x"$VICE_VERSION_BUILD" = "x0" ; then - VERSION_RC=$VICE_VERSION_MAJOR","$VICE_VERSION_MINOR",0,0" - else - VERSION_RC=$VICE_VERSION_MAJOR","$VICE_VERSION_MINOR","$VICE_VERSION_BUILD",0" -@@ -6080,7 +6080,7 @@ +--- configure.orig Sun Aug 27 22:15:37 2006 ++++ configure Thu Sep 7 21:18:29 2006 +@@ -6486,7 +6486,7 @@ fi if test x"$with_sdl" = "xyes"; then @@ -27,7 +9,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -@@ -12594,6 +12594,7 @@ +@@ -14392,6 +14392,7 @@ else ac_check_lib_save_LIBS=$LIBS LIBS="-lesd $SOUND_LIBS $LIBS" @@ -35,7 +17,7 @@ cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" /* confdefs.h. */ -@@ -12655,10 +12656,10 @@ +@@ -14458,10 +14459,10 @@ if test x"$with_sdl" = "xyes"; then old_cflags=$CFLAGS old_libs=$LIBS @@ -49,7 +31,7 @@ do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` if eval "test \"\${$as_ac_Header+set}\" = set"; then -@@ -12800,7 +12801,8 @@ +@@ -14603,7 +14604,8 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS diff --git a/emulators/vice/files/patch-doc-Makefile.in b/emulators/vice/files/patch-doc-Makefile.in index a81b32fc1d90..e03e5773d65a 100644 --- a/emulators/vice/files/patch-doc-Makefile.in +++ b/emulators/vice/files/patch-doc-Makefile.in @@ -1,11 +1,11 @@ ---- doc/Makefile.in.orig Mon Jun 9 00:09:03 2003 -+++ doc/Makefile.in Sun Jun 15 09:24:28 2003 -@@ -216,7 +216,7 @@ +--- doc/Makefile.in.orig Sun Aug 27 22:15:28 2006 ++++ doc/Makefile.in Thu Sep 7 21:24:17 2006 +@@ -245,7 +245,7 @@ xpet_LDFLAGS = @xpet_LDFLAGS@ xplus4_LDFLAGS = @xplus4_LDFLAGS@ xvic_LDFLAGS = @xvic_LDFLAGS@ --docdir = $(prefix)/lib/vice/doc +-docdir = $(VICEDIR)/doc +docdir = $(prefix)/share/doc/vice doc_DATA = \ - NLS-Howto.txt \ + MSDOS-Ethernet-Howto.txt \ diff --git a/emulators/vice/files/patch-doc-html-Makefile.in b/emulators/vice/files/patch-doc-html-Makefile.in index 227f493a5ee0..a48f45ccb489 100644 --- a/emulators/vice/files/patch-doc-html-Makefile.in +++ b/emulators/vice/files/patch-doc-html-Makefile.in @@ -1,11 +1,11 @@ ---- doc/html/Makefile.in.orig Mon Jun 9 00:09:03 2003 -+++ doc/html/Makefile.in Sun Jun 15 09:31:57 2003 -@@ -216,7 +216,7 @@ +--- doc/html/Makefile.in.orig Sun Aug 27 22:15:28 2006 ++++ doc/html/Makefile.in Thu Sep 7 21:25:55 2006 +@@ -245,7 +245,7 @@ xpet_LDFLAGS = @xpet_LDFLAGS@ xplus4_LDFLAGS = @xplus4_LDFLAGS@ xvic_LDFLAGS = @xvic_LDFLAGS@ --docdir = $(prefix)/lib/vice/doc +-docdir = $(VICEDIR)/doc +docdir = $(prefix)/share/doc/vice doc_DATA = \ - images/navbarlogo.gif \ + amigaos.html \ diff --git a/emulators/vice/pkg-plist b/emulators/vice/pkg-plist index e2f3f5902a07..b0c41dc7718f 100644 --- a/emulators/vice/pkg-plist +++ b/emulators/vice/pkg-plist @@ -1,4 +1,5 @@ bin/c1541 +bin/cartconv bin/petcat bin/vsid bin/x128 @@ -13,6 +14,8 @@ bin/xvic %%NLS%%share/locale/nl/LC_MESSAGES/vice.mo %%NLS%%share/locale/pl/LC_MESSAGES/vice.mo %%NLS%%share/locale/sv/LC_MESSAGES/vice.mo +lib/vice/C128/amiga_sym.vkm +lib/vice/C128/amiga_pos.vkm lib/vice/C128/basic64 lib/vice/C128/basichi lib/vice/C128/basiclo @@ -47,6 +50,8 @@ lib/vice/C128/win_pos.vkm lib/vice/C128/win_sym.vkm lib/vice/C128/x11_pos.vkm lib/vice/C128/x11_sym.vkm +lib/vice/C64/amiga_sym.vkm +lib/vice/C64/amiga_pos.vkm lib/vice/C64/basic lib/vice/C64/beos_pos.vkm lib/vice/C64/beos_sym.vkm @@ -72,6 +77,8 @@ lib/vice/C64/win_sym_us.vkm lib/vice/C64/x11_pos.vkm lib/vice/C64/x11_sym.vkm lib/vice/CBM-II/amber.vpl +lib/vice/CBM-II/amiga_bukp.vkm +lib/vice/CBM-II/amiga_buks.vkm lib/vice/CBM-II/basic.128 lib/vice/CBM-II/basic.256 lib/vice/CBM-II/basic.500 @@ -115,6 +122,8 @@ lib/vice/DRIVES/dos2040 lib/vice/DRIVES/dos3040 lib/vice/DRIVES/dos4040 lib/vice/PET/amber.vpl +lib/vice/PET/amiga_bgrs.vkm +lib/vice/PET/amiga_buks.vkm lib/vice/PET/basic1 lib/vice/PET/basic2 lib/vice/PET/basic4 @@ -151,6 +160,8 @@ lib/vice/PET/x11_bgrs.vkm lib/vice/PET/x11_buks.vkm lib/vice/PLUS4/3plus1hi lib/vice/PLUS4/3plus1lo +lib/vice/PLUS4/amiga_sym.vkm +lib/vice/PLUS4/amiga_pos.vkm lib/vice/PLUS4/basic lib/vice/PLUS4/beos_pos.vkm lib/vice/PLUS4/beos_sym.vkm @@ -170,6 +181,8 @@ lib/vice/PRINTER/nl10-cbm lib/vice/PRINTER/mps801 lib/vice/PRINTER/mps803 lib/vice/PRINTER/mps803.vpl +lib/vice/VIC20/amiga_sym.vkm +lib/vice/VIC20/amiga_pos.vkm lib/vice/VIC20/basic lib/vice/VIC20/beos_pos.vkm lib/vice/VIC20/beos_sym.vkm @@ -191,7 +204,7 @@ lib/vice/fonts/vice-cbm.pcf %%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/MSDOS-Ethernet-Howto.txt %%PORTDOCS%%%%DOCSDIR%%/MSDOS-Howto.txt -%%PORTDOCS%%%%DOCSDIR%%/MinixVmd-Howto.txt +%%PORTDOCS%%%%DOCSDIR%%/Minix-Howto.txt %%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/NLS-Howto.txt %%PORTDOCS%%%%DOCSDIR%%/PETdoc.txt @@ -201,6 +214,8 @@ lib/vice/fonts/vice-cbm.pcf %%PORTDOCS%%%%DOCSDIR%%/TODO %%PORTDOCS%%%%DOCSDIR%%/Walkthrough-Howto.txt %%PORTDOCS%%%%DOCSDIR%%/Win32-Howto.txt +%%PORTDOCS%%%%DOCSDIR%%/amigaos.html +%%PORTDOCS%%%%DOCSDIR%%/cartconv.txt %%PORTDOCS%%%%DOCSDIR%%/cbm_basic_tokens.txt %%PORTDOCS%%%%DOCSDIR%%/drive_info.txt %%PORTDOCS%%%%DOCSDIR%%/iec-bus.txt @@ -208,6 +223,7 @@ lib/vice/fonts/vice-cbm.pcf %%PORTDOCS%%%%DOCSDIR%%/mon.txt %%PORTDOCS%%%%DOCSDIR%%/new.gif %%PORTDOCS%%%%DOCSDIR%%/serial.txt +%%PORTDOCS%%%%DOCSDIR%%/solaris.html %%PORTDOCS%%%%DOCSDIR%%/vice_1.html %%PORTDOCS%%%%DOCSDIR%%/vice_10.html %%PORTDOCS%%%%DOCSDIR%%/vice_11.html |