aboutsummaryrefslogtreecommitdiffstats
path: root/emulators
diff options
context:
space:
mode:
authordinoex <dinoex@FreeBSD.org>2004-09-19 03:17:52 +0800
committerdinoex <dinoex@FreeBSD.org>2004-09-19 03:17:52 +0800
commitc856838864f887434b6b4d573a307c7b94bca145 (patch)
treeec71d0bfbfbda6cf41416a2c596d28623ea2ea79 /emulators
parentee45621124cbd445d4aba4f84c61cc6f54f78bf1 (diff)
downloadfreebsd-ports-gnome-c856838864f887434b6b4d573a307c7b94bca145.tar.gz
freebsd-ports-gnome-c856838864f887434b6b4d573a307c7b94bca145.tar.zst
freebsd-ports-gnome-c856838864f887434b6b4d573a307c7b94bca145.zip
- update to 1.15
- unbreak for gcc2.95 - unbreak for gcc3.4 Approved by: portmgr (marcus)
Diffstat (limited to 'emulators')
-rw-r--r--emulators/vice/Makefile6
-rw-r--r--emulators/vice/distinfo4
-rw-r--r--emulators/vice/files/patch-RegExp.h12
-rw-r--r--emulators/vice/files/patch-sound52
-rw-r--r--emulators/vice/pkg-plist1
5 files changed, 26 insertions, 49 deletions
diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile
index 9d5a5db77ed0..cde78bc58e1d 100644
--- a/emulators/vice/Makefile
+++ b/emulators/vice/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
PORTNAME= vice
-PORTVERSION= 1.14
+PORTVERSION= 1.15
CATEGORIES= emulators
MASTER_SITES= ftp://ftp.funet.fi/pub/cbm/crossplatform/emulators/VICE/
PKGNAMESUFFIX?= ${GNOME_SUFFIX}${PKGNAMESUFFIX2}
@@ -22,7 +22,6 @@ RESTRICTED= ROMs are copyrighted by Commodore Business Machines
USE_XPM= yes
GNU_CONFIGURE= yes
MAKE_ENV+= MAKEINFOFLAGS="--no-split"
-USE_GCC= 3.2
.if defined(VICE_WITH_GNOME)
GNOME_SUFFIX= -gnome
@@ -53,9 +52,6 @@ BUILD_DEPENDS+= bdftopcf:${X_CLIENTS_PORT}
# ../src/resid/libresid.a(wave.o)(.rodata+0x0): relocation truncated to fit: GPREL32 *UND*
BROKEN= "GPREL relocation truncated"
.endif
-.if ${OSVERSION} >= 502122
-BROKEN= gcc34: conflicting types
-.endif
post-extract:
@${RM} -f ${WRKSRC}/doc/vice.info*
diff --git a/emulators/vice/distinfo b/emulators/vice/distinfo
index 66a056f1bb96..48fe7679a7b6 100644
--- a/emulators/vice/distinfo
+++ b/emulators/vice/distinfo
@@ -1,2 +1,2 @@
-MD5 (vice-1.14.tar.gz) = f25df1b8de2bbb536facbc05fcfa1db2
-SIZE (vice-1.14.tar.gz) = 3794698
+MD5 (vice-1.15.tar.gz) = da91ecf6b8d6bf95d3a9c33929b466b4
+SIZE (vice-1.15.tar.gz) = 3912194
diff --git a/emulators/vice/files/patch-RegExp.h b/emulators/vice/files/patch-RegExp.h
new file mode 100644
index 000000000000..0b87db174973
--- /dev/null
+++ b/emulators/vice/files/patch-RegExp.h
@@ -0,0 +1,12 @@
+--- src/arch/unix/x11/xaw/widgets/RegExp.h.orig Sat Dec 4 19:31:32 1999
++++ src/arch/unix/x11/xaw/widgets/RegExp.h Fri Sep 17 07:49:53 2004
+@@ -34,6 +34,9 @@
+ #if defined __FreeBSD__ || defined __NetBSD__
+ #undef HAVE_REGEXP_H
+ #endif
++#if defined __FreeBSD__
++#undef HAVE_REGEX_H
++#endif
+
+ #if defined HAVE_REGEX_H /* POSIX */
+
diff --git a/emulators/vice/files/patch-sound b/emulators/vice/files/patch-sound
index ad9c2774df87..f6884356b005 100644
--- a/emulators/vice/files/patch-sound
+++ b/emulators/vice/files/patch-sound
@@ -1,6 +1,6 @@
---- configure.orig Mon Jun 9 00:09:09 2003
-+++ configure Sun Jun 15 09:49:49 2003
-@@ -5504,7 +5504,7 @@
+--- configure.orig Sun Aug 22 22:05:49 2004
++++ configure Fri Sep 17 07:20:22 2004
+@@ -5587,7 +5587,7 @@
fi
if test x"$with_sdl" = "xyes"; then
@@ -9,25 +9,16 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-@@ -9255,7 +9255,7 @@
+@@ -10823,7 +10823,7 @@
-
-
--for ac_header in linux/soundcard.h machine/soundcard.h
-+for ac_header in linux/soundcard.h machine/soundcard.h sys/soundcard.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-@@ -9825,7 +9825,7 @@
-
- if test x"$with_sdl" = "xyes"; then
+ if test x"$with_sdl" = "xyes"; then
-for ac_header in SDL/SDL_audio.h
+for ac_header in SDL_audio.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
if eval "test \"\${$as_ac_Header+set}\" = set"; then
-@@ -10625,7 +10625,6 @@
+@@ -11627,7 +11627,6 @@
fi
if test x"$with_sdl" = "xyes"; then
@@ -35,7 +26,7 @@
echo "$as_me:$LINENO: checking for SDL_OpenAudio in -lSDL" >&5
echo $ECHO_N "checking for SDL_OpenAudio in -lSDL... $ECHO_C" >&6
-@@ -10633,7 +10632,8 @@
+@@ -11635,7 +11634,8 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -45,7 +36,7 @@
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
/* confdefs.h. */
-@@ -10686,7 +10686,7 @@
+@@ -11688,7 +11688,7 @@
#define HAVE_LIBSDL 1
_ACEOF
@@ -54,7 +45,7 @@
fi
-@@ -10827,7 +10827,8 @@
+@@ -11829,7 +11829,8 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -64,7 +55,7 @@
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
/* confdefs.h. */
-@@ -10880,7 +10881,7 @@
+@@ -11882,7 +11883,7 @@
#define HAVE_LIBESD 1
_ACEOF
@@ -85,17 +76,6 @@
/* Define to 1 if you have the `memmove' function. */
#undef HAVE_MEMMOVE
---- src/sound.c.orig Sat Jan 11 16:38:57 2003
-+++ src/sound.c Fri Feb 14 03:21:39 2003
-@@ -977,7 +977,7 @@
- #if defined(USE_ARTS)
- sound_init_arts_device();
- #endif
--#if defined(HAVE_LINUX_SOUNDCARD_H) || defined(HAVE_MACHINE_SOUNDCARD_H)
-+#if defined(HAVE_LINUX_SOUNDCARD_H) || defined(HAVE_MACHINE_SOUNDCARD_H) || defined (HAVE_SYS_SOUNDCARD_H)
- sound_init_uss_device();
- #endif
- #if defined(HAVE_ESD_H) && defined(HAVE_LIBESD)
--- src/sounddrv/soundsdl.c.orig Sat Jan 12 21:35:58 2002
+++ src/sounddrv/soundsdl.c Fri Feb 14 03:13:41 2003
@@ -26,7 +26,7 @@
@@ -107,15 +87,3 @@
#include <unistd.h>
#include "vice.h"
---- src/sounddrv/sounduss.c.orig Sun Sep 29 20:37:11 2002
-+++ src/sounddrv/sounduss.c Fri Feb 14 03:17:42 2003
-@@ -50,6 +50,9 @@
- #if defined(HAVE_MACHINE_SOUNDCARD_H)
- #include <machine/soundcard.h>
- #endif
-+#if defined(HAVE_SYS_SOUNDCARD_H)
-+#include <sys/soundcard.h>
-+#endif
-
- static int uss_fd = -1;
- static int uss_8bit = 0;
diff --git a/emulators/vice/pkg-plist b/emulators/vice/pkg-plist
index ef450b62ab0d..28f1c8dfc167 100644
--- a/emulators/vice/pkg-plist
+++ b/emulators/vice/pkg-plist
@@ -189,6 +189,7 @@ lib/vice/fonts/vice-cbm.pcf
%%DOCSDIR%%/PETdoc.txt
%%DOCSDIR%%/Readme.beos
%%DOCSDIR%%/Readme.dos
+%%DOCSDIR%%/ReadmeMacOSX.txt
%%DOCSDIR%%/TODO
%%DOCSDIR%%/Walkthrough-Howto.txt
%%DOCSDIR%%/Win32-Howto.txt