Skip to content

Commit

Permalink
emulators/vice: update to 3.8
Browse files Browse the repository at this point in the history
new option ETHERNET
add html docs
  • Loading branch information
Dirk Meyer authored and Dirk Meyer committed Feb 26, 2024
1 parent ce7d703 commit a9b19d5
Show file tree
Hide file tree
Showing 6 changed files with 186 additions and 132 deletions.
32 changes: 25 additions & 7 deletions emulators/vice/Makefile
@@ -1,6 +1,6 @@
PORTNAME= vice
PORTVERSION= 3.7.1
PORTREVISION= 7
PORTVERSION= 3.8
PORTREVISION= 0
CATEGORIES= emulators
MASTER_SITES= SF/vice-emu/releases

Expand Down Expand Up @@ -29,9 +29,8 @@ LIB_DEPENDS= libpng.so:graphics/png \
libfreetype.so:print/freetype2 \
libpcre2-8.so:devel/pcre2 \
libgnutls.so:security/gnutls \
libharfbuzz.so:print/harfbuzz

BROKEN_FreeBSD_aarch64= undeclared function 'inb'
libharfbuzz.so:print/harfbuzz \
libcurl.so:ftp/curl

USES= compiler:c++11-lang pkgconfig perl5 localbase:ldflags \
gmake iconv:wchar_t jpeg readline gettext xorg
Expand All @@ -41,24 +40,29 @@ HAS_CONFIGURE= yes
MAKE_ENV+= XDG_DATA_DIRS=${STAGEDIR}${PREFIX}/share
CFLAGS+= -fcommon
CONFIGURE_ARGS+= --prefix=${PREFIX} \
--with-lame \
--with-portaudio \
--enable-ipv6 \
--enable-x64 \
--disable-realdevice \
--disable-pdf-docs \
--localedir="${LOCALBASE}/share/locale" \
--disable-dependency-tracking \
DOS2UNIX=true
TXTFILES= CIA-README.txt iec-bus.txt \
readmes/Readme-SDL.txt readmes/Readme-SDL2.txt

OPTIONS_DEFINE= SDLSOUND ALSA PULSEAUDIO FFMPEG DOCS
OPTIONS_DEFINE= SDLSOUND ALSA PULSEAUDIO FFMPEG ETHERNET DOCS
OPTIONS_SINGLE= GUI
OPTIONS_SINGLE_GUI= GTK3UI SDLUI2
OPTIONS_DEFAULT?= GTK3UI SDLSOUND ALSA
OPTIONS_DEFAULT?= GTK3UI SDLSOUND ALSA ETHERNET
NO_OPTIONS_SORT=yes
OPTIONS_SUB= yes
GTK3UI_DESC= use GTK3 user interface
SDLUI2_DESC= use SDL2 user interface
SDLSOUND_DESC= build with SDL2 sound system support
FFMPEG_CONFIGURE_ENABLE= ffmpeg
ETHERNET_DESC= Network capture/injection support

GTK3UI_USES= desktop-file-utils
GTK3UI_CONFIGURE_ENABLE= gtk3ui desktop-files
Expand All @@ -73,6 +77,10 @@ ALSA_CONFIGURE_OFF= --without-alsa
ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib
PULSEAUDIO_CONFIGURE_OFF= --without-pulse
PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio
#ETHERNET_LIB_DEPENDS= libpcap.so:net/libpcap # conflict with base
ETHERNET_BUILD_DEPENDS= ${LOCALBASE}/include/pcap.h:net/libpcap
ETHERNET_RUN_DEPENDS= ${LOCALBASE}/include/pcap.h:net/libpcap
ETHERNET_CONFIGURE_ENABLE= ethernet

.include <bsd.port.options.mk>

Expand Down Expand Up @@ -100,4 +108,14 @@ pre-configure:
pre-install-GTK3UI-on:
${MKDIR} ${STAGEDIR}/${PREFIX}/share/desktop-directories

post-install-DOCS-on:
${MKDIR} ${STAGEDIR}${DOCSDIR}
.for i in ${TXTFILES}
${INSTALL_DATA} ${WRKSRC}/doc/${i} ${STAGEDIR}${DOCSDIR}/
.endfor
cd ${WRKSRC}/doc/html && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/html/ "-name *\.html -or -name *\.css -or -name *\.txt"
cd ${WRKSRC}/doc/html/fonts && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/html/fonts/
cd ${WRKSRC}/doc/html/images && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/html/images/
${INSTALL_DATA} ${WRKSRC}/doc/vice.texi ${STAGEDIR}${DOCSDIR}/html/

.include <bsd.port.mk>
6 changes: 3 additions & 3 deletions emulators/vice/distinfo
@@ -1,3 +1,3 @@
TIMESTAMP = 1675259238
SHA256 (vice-3.7.1.tar.gz) = 7e3811e6024db0698bfbc321bb324572446b8853d01b4073f09865957b0cab98
SIZE (vice-3.7.1.tar.gz) = 13444946
TIMESTAMP = 1703538775
SHA256 (vice-3.8.tar.gz) = 1d7dc4d0f2bbcc2a871bb954ff4a5df63048dea9c16f5f1e9bc8260fa41a1004
SIZE (vice-3.8.tar.gz) = 13564021
10 changes: 5 additions & 5 deletions emulators/vice/files/patch-src_arch_gtk3_data_unix_Makefile.in
@@ -1,11 +1,11 @@
--- src/arch/gtk3/data/unix/Makefile.in.orig 2022-12-24 19:45:17 UTC
--- src/arch/gtk3/data/unix/Makefile.in.orig 2023-12-24 17:42:17 UTC
+++ src/arch/gtk3/data/unix/Makefile.in
@@ -735,7 +735,7 @@ uninstall-am:
@@ -732,7 +732,7 @@ uninstall-am:
@INSTALL_DESKTOP_FILES_TRUE@@MACOS_COMPILE_FALSE@@UNIX_COMPILE_TRUE@ "SID_1024.svg"

@INSTALL_DESKTOP_FILES_TRUE@@MACOS_COMPILE_FALSE@@UNIX_COMPILE_TRUE@install-data-hook: $(VICE_DIR_FILE) $(VICE_DESKTOP_FILES)
-@INSTALL_DESKTOP_FILES_TRUE@@MACOS_COMPILE_FALSE@@UNIX_COMPILE_TRUE@ $(XDG_DESKTOP_MENU) install "$(VICE_DIR_FILE)" $(VICE_DESKTOP_FILES)
+@INSTALL_DESKTOP_FILES_TRUE@@MACOS_COMPILE_FALSE@@UNIX_COMPILE_TRUE@ $(XDG_DESKTOP_MENU) install --mode system "$(VICE_DIR_FILE)" $(VICE_DESKTOP_FILES)

# Seems GNU disapproves of this, but it works to uninstall the .desktop/.directory
# files.
@INSTALL_DESKTOP_FILES_TRUE@@MACOS_COMPILE_FALSE@@UNIX_COMPILE_TRUE@ $(XDG_DESKTOP_MENU) forceupdate
@INSTALL_DESKTOP_FILES_TRUE@@MACOS_COMPILE_FALSE@@UNIX_COMPILE_TRUE@ @echo " "
@INSTALL_DESKTOP_FILES_TRUE@@MACOS_COMPILE_FALSE@@UNIX_COMPILE_TRUE@ @echo "* Remember that for desktop updates to show up, you may have to log off and on,"

This file was deleted.

41 changes: 0 additions & 41 deletions emulators/vice/files/patch-src_arch_shared_iodrv_io-unix-access.c

This file was deleted.

0 comments on commit a9b19d5

Please sign in to comment.