git: 1e4e7251be16 - main - emulators/vice: drop INFO, fix build as user
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 30 Apr 2022 19:59:03 UTC
The branch main has been updated by dinoex:
URL: https://cgit.FreeBSD.org/ports/commit/?id=1e4e7251be160278971a656523f013a03243d825
commit 1e4e7251be160278971a656523f013a03243d825
Author: Dirk Meyer <dinoex@FreeBSD.org>
AuthorDate: 2022-04-30 19:58:39 +0000
Commit: Dirk Meyer <dinoex@FreeBSD.org>
CommitDate: 2022-04-30 19:58:39 +0000
emulators/vice: drop INFO, fix build as user
---
emulators/vice/Makefile | 10 ++--------
.../vice/files/patch-src_arch_gtk3_data_unix_Makefile.in | 11 +++++++++++
2 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile
index b2be2eca0ecc..675a556a3c6d 100644
--- a/emulators/vice/Makefile
+++ b/emulators/vice/Makefile
@@ -32,20 +32,18 @@ LIB_DEPENDS= libpng.so:graphics/png \
libgnutls.so:security/gnutls \
libharfbuzz.so:print/harfbuzz
-USES= compiler:c++11-lang pkgconfig makeinfo localbase:ldflags \
+USES= compiler:c++11-lang pkgconfig perl5 localbase:ldflags \
gmake iconv:wchar_t jpeg readline gettext xorg
USE_XORG= xpm ice sm xext xv xt x11 xmu xxf86vm
USE_XORG+= xrender xinerama xi xrandr xcursor xcomposite xdamage xfixes
HAS_CONFIGURE= yes
-MAKE_ENV+= MAKEINFOFLAGS="--no-split" \
- XDG_DATA_DIRS=${STAGEDIR}${PREFIX}/share
+MAKE_ENV+= XDG_DATA_DIRS=${STAGEDIR}${PREFIX}/share
CFLAGS+= -fcommon
CONFIGURE_ARGS+= --enable-ipv6 \
--enable-external-ffmpeg \
--enable-x64 \
--disable-realdevice \
--disable-pdf-docs \
- --infodir="${PREFIX}/${INFO_PATH}" \
--localedir="${LOCALBASE}/share/locale" \
--disable-dependency-tracking \
DOS2UNIX=true
@@ -91,10 +89,6 @@ USE_GNOME+= gtk30 vte3 cairo gdkpixbuf2 pango
USE_GL+= glu gl glew
.endif
-.if ${PORT_OPTIONS:MDOCS}
-INFO+= vice
-.endif
-
pre-configure:
.if ! ${PORT_OPTIONS:MDOCS}
${REINPLACE_CMD} -e 's| doc||' ${WRKSRC}/Makefile.in
diff --git a/emulators/vice/files/patch-src_arch_gtk3_data_unix_Makefile.in b/emulators/vice/files/patch-src_arch_gtk3_data_unix_Makefile.in
new file mode 100644
index 000000000000..56a625947856
--- /dev/null
+++ b/emulators/vice/files/patch-src_arch_gtk3_data_unix_Makefile.in
@@ -0,0 +1,11 @@
+--- src/arch/gtk3/data/unix/Makefile.in.orig 2022-01-24 00:13:58 UTC
++++ src/arch/gtk3/data/unix/Makefile.in
+@@ -738,7 +738,7 @@ uninstall-am:
+ @INSTALL_DESKTOP_FILES_TRUE@@UNIX_COMPILE_TRUE@@UNIX_MACOSX_COMPILE_FALSE@ "SID_1024.svg"
+
+ @INSTALL_DESKTOP_FILES_TRUE@@UNIX_COMPILE_TRUE@@UNIX_MACOSX_COMPILE_FALSE@install-data-hook: $(VICE_DIR_FILE) $(VICE_DESKTOP_FILES)
+-@INSTALL_DESKTOP_FILES_TRUE@@UNIX_COMPILE_TRUE@@UNIX_MACOSX_COMPILE_FALSE@ $(XDG_DESKTOP_MENU) install "$(VICE_DIR_FILE)" $(VICE_DESKTOP_FILES)
++@INSTALL_DESKTOP_FILES_TRUE@@UNIX_COMPILE_TRUE@@UNIX_MACOSX_COMPILE_FALSE@ $(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.