mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-04 01:48:54 +00:00
Code Issues Releases Activity

- update to 1.18

Browse Source 
- new options WITHOUT_NLS, WITH_ESOUND
re-enable uss sound support
update dependencys
This commit is contained in:
Dirk Meyer 2005-12-03 20:07:52 +00:00
parent 3986ac7c82
commit 5053e19457
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=150307
9 changed files with 146 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
emulators/vice/Makefile
View File

@ -5,7 +5,7 @@
# $FreeBSD$
PORTNAME= vice
PORTVERSION= 1.17
PORTVERSION= 1.18
CATEGORIES= emulators
MASTER_SITES= http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/ \
ftp://ftp.zimmers.net/pub/cbm/crossplatform/emulators/VICE/
@ -14,8 +14,9 @@ PKGNAMESUFFIX?= ${GNOME_SUFFIX}${PKGNAMESUFFIX2}
MAINTAINER= dinoex@FreeBSD.org
COMMENT= Emulator for Commodore's C64, C128, VIC20, PET, and CBM-II
LIB_DEPENDS= png:${PORTSDIR}/graphics/png
.if !defined(VICE_WITH_GNOME)
LIB_DEPENDS= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
LIB_DEPENDS+= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
.endif
RESTRICTED= ROMs are copyrighted by Commodore Business Machines
@ -35,6 +36,10 @@ CONFIGURE_ARGS= --with-xaw3d
CONFLICTS?= vice-gnome-1.*
.endif
CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
CPPFLAGS+= -I${LOCALBASE}/include
CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
INFO= vice
MAN1= vice.1 c1541.1 petcat.1
MLINKS= vice.1 x64.1 \
@ -44,11 +49,37 @@ MLINKS= vice.1 x64.1 \
vice.1 xplus4.1 \
vice.1 xcbm2.1
.if !defined(WITHOUT_SDL)
USE_SDL= sdl
.include <bsd.port.pre.mk>
.if exists(${LOCALBASE}/include/esd.h) && !defined(WITHOUT_ESOUND)
WITH_ESOUND?=yes
.endif
.include <bsd.port.pre.mk>
# will be picked up by configure
.if exists(${LOCALBASE}/include/ffmpeg/avformat.h)
LIB_DEPENDS+= avcodec.1:${PORTSDIR}/multimedia/ffmpeg
.endif
.if !defined(WITHOUT_NLS)
USE_GETTEXT= yes
LIBS+= -lgettextlib
.else
CONFIGURE_ARGS+= --disable-nls
.endif
.if !defined(WITHOUT_SDL)
USE_SDL= sdl
CONFIGURE_ARGS+= --with-sdl
CFLAGS+= -DHAVE_LIBSDL=1 -DHAVE_SDL_SDL_AUDIO_H=1
CPPFLAGS+= -I${LOCALBASE}/include/SDL11
.endif
.if defined(WITH_ESOUND)
LIB_DEPENDS+= esd.2:${PORTSDIR}/audio/esound
CFLAGS+= -DHAVE_LIBESD=1 -DHAVE_SDL_SDL_AUDIO_H=1
.else
CONFIGURE_ARGS+= --without-esd
.endif
.if ${X_WINDOW_SYSTEM:L} != xfree86-3
BUILD_DEPENDS+= bdftopcf:${X_CLIENTS_PORT}
@ -65,9 +96,6 @@ post-extract:
post-patch:
${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" \
${WRKSRC}/man/vice.1
${REINPLACE_CMD} -e "s|sdl-config|${SDL_CONFIG}|g" \
-e "s|l-lesd|${SDL_CONFIG}|g" \
${WRKSRC}/configure
pre-install:
${MKDIR} ${DOCSDIR} ${PREFIX}/lib/vice/fonts

6
emulators/vice/distinfo
View File

@ -1,3 +1,3 @@
MD5 (vice-1.17.tar.gz) = a3b70d5fcef0b345599b6d452401e18e
SHA256 (vice-1.17.tar.gz) = cb7bed2e200ea53d207a627f7d758c6daffe0461edf7ceb9654d1f3363c53a1d
SIZE (vice-1.17.tar.gz) = 4412711
MD5 (vice-1.18.tar.gz) = 44266d2427510adcac58cbf58da05be1
SHA256 (vice-1.18.tar.gz) = dfc78cb3d3e91527f3c9c40ada9e9c8fe51e7f165887a1d1b9db5a11e8934718
SIZE (vice-1.18.tar.gz) = 4733819

61
emulators/vice/files/patch-configure Normal file
View File

@ -0,0 +1,61 @@
--- 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 @@
fi
if test x"$with_sdl" = "xyes"; then
- for ac_prog in sdl-config
+ for ac_prog in ${SDL_CONFIG##*/}
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 @@
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-lesd $SOUND_LIBS $LIBS"
+CPPFLAGS="`esd-config --cflags` $CPPFLAGS"
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
/* confdefs.h. */
@@ -12655,10 +12656,10 @@
if test x"$with_sdl" = "xyes"; then
old_cflags=$CFLAGS
old_libs=$LIBS
- CFLAGS="$CFLAGS `sdl-config --cflags`"
- LIBS="$LIBS `sdl-config --libs`"
+ CFLAGS="$CFLAGS `${SDL_CONFIG} --cflags`"
+ LIBS="$LIBS `${SDL_CONFIG} --libs`"
-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
@@ -12800,7 +12801,8 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lSDL $SOUND_LIBS $LIBS"
+LIBS="`${SDL_CONFIG} --libs` $SOUND_LIBS $LIBS"
+CFLAGS="`${SDL_CONFIG} --cflags` $CFLAGS"
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
/* confdefs.h. */

12
emulators/vice/files/patch-network.c Normal file
View File

@ -0,0 +1,12 @@
--- src/network.c.orig Sat Nov 19 15:36:06 2005
+++ src/network.c Sat Dec 3 17:38:37 2005
@@ -35,8 +35,8 @@
#ifdef WIN32
#include <winsock.h>
#else
-#include <sys/socket.h>
#include <sys/types.h>
+#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <netdb.h>

51
emulators/vice/files/patch-sound
View File

@ -1,51 +0,0 @@
--- configure.orig Mon Oct 3 00:50:43 2005
+++ configure Tue Oct 25 11:03:40 2005
@@ -11670,7 +11670,8 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lesd $SOUND_LIBS $LIBS"
+LIBS="`esd-config --libs` $SOUND_LIBS $LIBS"
+CPPFLAGS="`esd-config --cflags` $CPPFLAGS"
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
/* confdefs.h. */
@@ -11720,7 +11721,7 @@
echo "${ECHO_T}$ac_cv_lib_esd_esd_open_sound" >&6
if test $ac_cv_lib_esd_esd_open_sound = yes; then
SOUND_DRIVERS="$SOUND_DRIVERS soundesd.o";
- SOUND_LIBS="$SOUND_LIBS -lesd"; break
+ SOUND_LIBS="$SOUND_LIBS `esd-config --libs`"; break
fi
fi
@@ -11735,7 +11736,7 @@
CFLAGS="$CFLAGS `sdl-config --cflags`"
LIBS="$LIBS `sdl-config --libs`"
-for ac_header in SDL/SDL_audio.h
+for ac_header in SDL/SDL_audio.h 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
@@ -11877,7 +11878,8 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lSDL $SOUND_LIBS $LIBS"
+LIBS="`sdl-config --libs` $SOUND_LIBS $LIBS"
+CFLAGS="`sdl-config --cflags` $CFLAGS"
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
/* confdefs.h. */
--- 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 @@
/* XXX: includes */
-#include <SDL/SDL_audio.h>
+#include <SDL_audio.h>
#include <unistd.h>
#include "vice.h"

11
emulators/vice/files/patch-sound.c Normal file
View File

@ -0,0 +1,11 @@
--- src/sound.c.orig Wed Sep 14 22:27:31 2005
+++ src/sound.c Sat Dec 3 18:54:20 2005
@@ -1233,7 +1233,7 @@
/* don't use uss for FreeBSD or BSDI */
-#if !defined(__FreeBSD__) && !defined(__bsdi__)
+#if !defined(__bsdi__)
sound_init_uss_device();
#endif
#endif

11
emulators/vice/files/patch-soundsdl.c Normal file
View File

@ -0,0 +1,11 @@
--- 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 @@
/* XXX: includes */
-#include <SDL/SDL_audio.h>
+#include <SDL_audio.h>
#include <unistd.h>
#include "vice.h"

11
emulators/vice/files/patch-sounduss.c Normal file
View File

@ -0,0 +1,11 @@
--- src/sounddrv/sounduss.c.orig Sun May 29 19:05:49 2005
+++ src/sounddrv/sounduss.c Sat Dec 3 19:09:24 2005
@@ -30,7 +30,7 @@
sound driver. For BSDI this uss sound driver should
not be used either. */
-#if !defined(__FreeBSD__) && !defined(__bsdi__)
+#if !defined(__bsdi__)
#include "vice.h"

1
emulators/vice/pkg-plist
View File

@ -185,6 +185,7 @@ lib/vice/fonts/vice-cbm.pcf
%%DOCSDIR%%/COPYING
%%DOCSDIR%%/MSDOS-Ethernet-Howto.txt
%%DOCSDIR%%/MSDOS-Howto.txt
%%DOCSDIR%%/MinixVmd-Howto.txt
%%DOCSDIR%%/NEWS
%%DOCSDIR%%/NLS-Howto.txt
%%DOCSDIR%%/PETdoc.txt