From nobody Sat Apr 30 19:59:03 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 3887C1AC2FE0; Sat, 30 Apr 2022 19:59:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KrKtc13LXz3vpM; Sat, 30 Apr 2022 19:59:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651348744; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=g81YeI0datd0ghzjgclfMzI0CYneEgBVuxzBRzWXCDc=; b=jM7ANfJxctQ840rAo3T+4vCH8/9tLmLHokLgZZHZW/ob0zFjKa7aT2uFHPCIamfjY66Ppa s6HAaQ5CCHupHY4yHJiyLlxL5krxsctKyTH4dyGszp4l8fZfCa3W6DxcTzVdJmvXtJJjLV a7qWfFq/P57mEmgWAWpt4QKo3QUuJyXRaP0Sbuutme8CHff5w5HCNe7eN6zmo+BLZBa2QT iYDmlY1Rhq/1Or/Vacb0fH1gp+gDj2uVIcvYYXfqo5e7t5TlcUeDoVtmPA958WbsCMi2Dx smkX61l3QuAVwn2+/1/3ehH73rby5o39PtVEYF3GHtbwsayaByUjB0bpsKVe5w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 04D7B276E7; Sat, 30 Apr 2022 19:59:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23UJx3N3024683; Sat, 30 Apr 2022 19:59:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23UJx3vV024682; Sat, 30 Apr 2022 19:59:03 GMT (envelope-from git) Date: Sat, 30 Apr 2022 19:59:03 GMT Message-Id: <202204301959.23UJx3vV024682@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dirk Meyer Subject: git: 1e4e7251be16 - main - emulators/vice: drop INFO, fix build as user List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dinoex X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1e4e7251be160278971a656523f013a03243d825 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651348744; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=g81YeI0datd0ghzjgclfMzI0CYneEgBVuxzBRzWXCDc=; b=JE8wrEWRide1JdlwPjYcjkJ930/rwE33TppmQ7C8L91F1JgmAFyNV7W1bepSys+3X6wATG muTVO71BgqilXKhsA0N1NnZgi28vFEraU8taQvwhaBJOPJD9OoEsV7QjFjqYvusePcHcWn iRx6ufoVSe1DlfWBPy2EU47in8QdLPqHHHm5YzWBPNuUyt3z0F69LUoqZlQMsEyAXxhRnZ Jl7ppYUPlLMfkX5wcoOpO/q+iRPeEOhLPNcznos82z183oA6mThLvrjw2Q+EPNuuSlXi41 VdglSnIyNL6mHklxObEoo8uHdzRT/glbIcXyAwDX0u56qIPkXT43/7VW1ITxeQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651348744; a=rsa-sha256; cv=none; b=I0uAoaQLQoHzfC8AVPXC8C9MeMpn8ON7kIRBUMb+CtOGq1+8YRWOtepE2N+RyW7+OMRqvJ h/ObtAOQuVVGvTfRi2nfnVwMjcvaj1GVamOPb9nT4UTTDRPYHjaz5VKt9oaaMBPExv+4Lj gAnnTyhWOHwHDuAGGErb9ikqtDnRflCg+JXK2wfkmC8/U6R6JY0RWbpQ1HEiM7byYvm2Ju KTUkaWA3q6yNH0yyWIYNvg1I/LfW3iN8as0nOHfXOPWXgzwX3qYMfjAiVQTUWd+bvOMulr wYcLlyFyc9A6JZdvMQun0seu9iYu9Kkl3z/c1F5RNVJGdO0ibUwz7NWv6djgyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dinoex: URL: https://cgit.FreeBSD.org/ports/commit/?id=1e4e7251be160278971a656523f013a03243d825 commit 1e4e7251be160278971a656523f013a03243d825 Author: Dirk Meyer AuthorDate: 2022-04-30 19:58:39 +0000 Commit: Dirk Meyer 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.