Index: head/emulators/vice/Makefile =================================================================== --- head/emulators/vice/Makefile (revision 267362) +++ head/emulators/vice/Makefile (revision 267363) @@ -1,145 +1,153 @@ # New ports collection makefile for: vice # Date created: Mar 28, 1998 # Whom: dchapes@ddm.on.ca # # $FreeBSD$ PORTNAME= vice PORTVERSION= 2.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= emulators MASTER_SITES= http://www.viceteam.org/online/ \ http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/ \ ftp://ftp.zimmers.net/pub/cbm/crossplatform/emulators/VICE/ PKGNAMESUFFIX?= ${GNOME_SUFFIX}${PKGNAMESUFFIX2} MAINTAINER= dinoex@FreeBSD.org COMMENT= Emulator for Commodore C64, C128, VIC20, PET, and CBM-II BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \ mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale \ pkg-config:${PORTSDIR}/devel/pkg-config -LIB_DEPENDS= png:${PORTSDIR}/graphics/png +LIB_DEPENDS= png:${PORTSDIR}/graphics/png \ + gif:${PORTSDIR}/graphics/giflib \ + mp3lame:${PORTSDIR}/audio/lame .if defined(VICE_WITH_XAW3D) LIB_DEPENDS+= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d .endif RESTRICTED= "ROMs are copyrighted by Commodore Business Machines" LICENSE= GPLv2 USE_XORG= xpm ice sm xext xv xt x11 xmu USE_XORG+= xrender xinerama xi xrandr xcursor xcomposite xdamage xfixes USE_GMAKE= yes GNU_CONFIGURE= yes MAKE_ENV+= MAKEINFOFLAGS="--no-split" .if defined(VICE_WITH_XAW3D) GNOME_SUFFIX= -xaw3d CONFIGURE_ARGS= --with-xaw3d --disable-gnomeui CONFLICTS?= vice-gnome-1.* vice-1.* .else .if !defined(VICE_WITHOUT_GNOME) GNOME_SUFFIX= -gnome USE_GNOME= gtk20 CONFIGURE_ARGS= --enable-gnomeui CONFLICTS?= vice-1.* vice-xaw3d-1.* .else CONFIGURE_ARGS= --without-xaw3d --disable-gnomeui CONFLICTS?= vice-xaw3d-1.* vice-gnome-1.* USE_XORG+= xaw .endif .endif CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CPPFLAGS+= -I${LOCALBASE}/include PKG_CONFIG?= ${LOCALBASE}/bin/pkg-config CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CONFIGURE_ENV+= PKG_CONFIG="${LOCALBASE}/bin/pkg-config" CONFIGURE_ARGS+= --enable-fullscreen --enable-ipv6 --disable-dependency-tracking MAN1= vice.1 c1541.1 petcat.1 MLINKS= vice.1 x64.1 \ vice.1 x128.1 \ vice.1 xvic.1 \ vice.1 xpet.1 \ vice.1 xplus4.1 \ vice.1 xcbm2.1 .if !defined(NOPORTDOCS) INFO= vice .endif .include .if defined(WITH_LIBUSB) .if ${OSVERSION}<800063 LIB_DEPENDS+= usb:${PORTSDIR}/devel/libusb .endif .else CONFIGURE_ARGS+= --disable-libusb .endif .if exists(${LOCALBASE}/bin/fc-cache) PLIST_SUB+= FCCACHE="" PLIST_SUB+= NOFCCACHE="@comment " .else PLIST_SUB+= FCCACHE="@comment " PLIST_SUB+= NOFCCACHE="" .endif .if exists(${LOCALBASE}/include/esd.h) && !defined(WITHOUT_ESOUND) WITH_ESOUND?=yes .endif # 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 LDFLAGS+= -lgettextlib PLIST_SUB+= NLS="" .else CONFIGURE_ARGS+= --disable-nls PLIST_SUB+= NLS="@comment " .endif .if !defined(WITHOUT_SDL) USE_SDL= sdl -CONFIGURE_ARGS+= --with-sdl +CONFIGURE_ARGS+= --with-sdl --with-sdlsound CPPFLAGS+= -I${LOCALBASE}/include/SDL .endif .if defined(WITH_ESOUND) LIB_DEPENDS+= esd.2:${PORTSDIR}/audio/esound CONFIGURE_ARGS+= --with-esd .else CONFIGURE_ARGS+= --without-esd .endif +.if defined(VICE_WITH_ASOUND) +LIB_DEPENDS+= asound.2:${PORTSDIR}/audio/alsa-lib +.endif + post-extract: @${RM} -f ${WRKSRC}/doc/vice.info* post-patch: ${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" \ ${WRKSRC}/man/vice.1 + ${REINPLACE_CMD} -e 's|lungif|lgif|g' -e 's|== "x|= "x|' \ + ${WRKSRC}/configure .if defined(NOPORTDOCS) ${REINPLACE_CMD} -e 's| doc||' ${WRKSRC}/Makefile.in .endif pre-install: .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} .endif ${MKDIR} ${PREFIX}/lib/vice/fonts ${INSTALL_DATA} ${WRKSRC}/data/fonts/vice-cbm.bdf \ ${PREFIX}/lib/vice/fonts/ post-install: .if !defined(NOPORTDOCS) @${LN} -sf vice_toc.html ${DOCSDIR}/index.html .endif .include Property changes on: head/emulators/vice/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.69 \ No newline at end of property +1.70 \ No newline at end of property Index: head/emulators/vice/files/patch-RegExp.c =================================================================== --- head/emulators/vice/files/patch-RegExp.c (nonexistent) +++ head/emulators/vice/files/patch-RegExp.c (revision 267363) @@ -0,0 +1,10 @@ +--- src/arch/unix/x11/xaw/widgets/RegExp.c.orig 2009-10-21 18:46:45.000000000 +0200 ++++ src/arch/unix/x11/xaw/widgets/RegExp.c 2010-08-02 19:58:49.000000000 +0200 +@@ -120,7 +120,6 @@ + /* Dummy for system that don't have neither and . */ + + void RegExpInit(fwf_regex_t *r) +- ; + { + return; + } Property changes on: head/emulators/vice/files/patch-RegExp.c ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/emulators/vice/files/patch-x11video.c =================================================================== --- head/emulators/vice/files/patch-x11video.c (nonexistent) +++ head/emulators/vice/files/patch-x11video.c (revision 267363) @@ -0,0 +1,12 @@ +--- src/arch/unix/x11/xaw/x11video.c.orig 2009-10-21 18:46:45.000000000 +0200 ++++ src/arch/unix/x11/xaw/x11video.c 2010-08-03 06:00:50.000000000 +0200 +@@ -342,6 +342,9 @@ + int mitshm_failed = 0; /* will be set to true if XShmAttach() failed */ + int shmmajor; /* major number of MITSHM error codes */ + ++#include ++#include ++ + /* Catch XShmAttach()-failure. */ + int shmhandler(Display *display, XErrorEvent *err) + { Property changes on: head/emulators/vice/files/patch-x11video.c ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property