From nobody Fri Jan 26 22:56:26 2024 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 4TMCjk69CSz591ZQ; Fri, 26 Jan 2024 22:56:26 +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 4TMCjk5fDyz4k80; Fri, 26 Jan 2024 22:56:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706309786; 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=nXmdhmKLl2Udv5gNjDfZftY2mXnNXhBsE4SDpgJ+cuY=; b=b79u7QyrxpFqzLPj0ZyrXOgaY80a136DuAWXGufj9Ub+HfLYN/JKq7XKZMyRN0yV0dEbuz TWcDmeKAWHdv2UFrgt7eRk9mBGvbkQhS2szlmo4vOTC8LUQ/m04a/rjEBCj4mJhHobaTOd eV2+VorTJsqQ2UdlPdcH5dyjuTY8Wcd/4yS16kKP2lQQoIrj/AeiNTHlfGNNZz085+xX/1 Ykxd+/LBBKx7sRO8IZm3U9Xh3GOXRKqdXPl7AFYSBNmuucdh41vX1nSoREG6aF/nNLtZ3g 6KB0gIOO48A8OM9JjDSHxt8gPfKvGpNoKRJxApSllBIC9c52gJFBvye6XA2AeA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706309786; 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=nXmdhmKLl2Udv5gNjDfZftY2mXnNXhBsE4SDpgJ+cuY=; b=fYonm9go9eN1prCaJCzZMFQgv36CyY4P8itP/0rsB9EGZx18bDr6ZTFiJ1Rz/7+V0qz+ng cnAB7hioBV9fnrAz52f5V39OFX+C/xLdx7YJmfSHrJ3Bu/2k/9WPcgTXpmD0tbgBzj1rkW r323KJtsCEd0Dfz4ggREJSvUe/S1PP0M3+s6x9Z/TSL12SEh1cCMcuHoV7y5Rn3EKQ+CSR AjtyICUGW7vS09IO8j1nC3UrTEgTly+B+mCmDDt3ch5B7Fssa1H/udCo4WcjVelceFN2wA Hr/JnCE7mQO7IS+kH/49vB5TnQs/1i06X4/88NHKPa7kjQzkCJdy7DWyo83GLw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706309786; a=rsa-sha256; cv=none; b=qDK5d5AEiLDKV+6ZrPfU8zxuLJlqV58PNDrYDskM66fAXVIsNSScUwYn9hSjJ9X8e5h2dl OR4Bvoafn5OeRZ9/QpLsYvT+ypyTu1NxihTMa8CF4elJZe6X8OF4syj8mdyjFQJpSMJ4A4 cgQPkhDQHAmxOwhbBxRfZS3xOc9fZyf55zEv3VNJFGf/IUJu4Zd9dLS135c+kNWKqmEUdV AvYo6MJnhH+DOnkY8DxYxH1nLJ9wje3ssuEdKWoXn9FLEv/4cax/p95Vks695m4DMqJ/xy 4odkbtJo9M/JkhCxI1pKv07mo+5ItKtEYXMiie5Yl6/1+zULYtyRvxc4goYGNw== 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 4TMCjk4QWpz11Hw; Fri, 26 Jan 2024 22:56:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40QMuQL5068686; Fri, 26 Jan 2024 22:56:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40QMuQH2068684; Fri, 26 Jan 2024 22:56:26 GMT (envelope-from git) Date: Fri, 26 Jan 2024 22:56:26 GMT Message-Id: <202401262256.40QMuQH2068684@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Larry Rosenman Subject: git: a2e8585ffdf1 - main - x11/xdialog: Register bsdconfig as an application in x11/xdialog 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: ler X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a2e8585ffdf110d5fcc05fa54b7524380a7d9afe Auto-Submitted: auto-generated The branch main has been updated by ler: URL: https://cgit.FreeBSD.org/ports/commit/?id=a2e8585ffdf110d5fcc05fa54b7524380a7d9afe commit a2e8585ffdf110d5fcc05fa54b7524380a7d9afe Author: Larry Rosenman AuthorDate: 2024-01-26 22:53:58 +0000 Commit: Larry Rosenman CommitDate: 2024-01-26 22:56:22 +0000 x11/xdialog: Register bsdconfig as an application in x11/xdialog Since bsdconfig may be presumed as always available, and uses xdialog when invoked for use as a graphical interface (ie with -X), this package may just as well expose bsdconfig to the end user. This also installs a scaled-down copy of the FreeBSD logo from /boot/images for use as its icon (48 pixels tall and wide), where the trademark sign was removed since it is unrecognizable as this scale. Finally, this also documents the requirements in pkg-message. (Running as root or being a sudoer) PR: 275796 Reported by: khorben@defora.org --- x11/xdialog/Makefile | 13 +++++++++++-- x11/xdialog/files/bsdconfig-48.png | Bin 0 -> 5209 bytes x11/xdialog/files/bsdconfig.desktop | 12 ++++++++++++ x11/xdialog/pkg-message | 5 +++++ x11/xdialog/pkg-plist | 3 +++ 5 files changed, 31 insertions(+), 2 deletions(-) diff --git a/x11/xdialog/Makefile b/x11/xdialog/Makefile index 088280c75b08..c6df165e3d26 100644 --- a/x11/xdialog/Makefile +++ b/x11/xdialog/Makefile @@ -1,6 +1,6 @@ PORTNAME= xdialog PORTVERSION= 2.3.1 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= x11 MASTER_SITES= http://xdialog.free.fr/ DISTNAME= ${PORTNAME:S/x/X/}-${PORTVERSION} @@ -12,8 +12,12 @@ WWW= http://xdialog.free.fr/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING +LIB_DEPENDS= libharfbuzz.so:print/harfbuzz +LIB_DEPENDS+= libfontconfig.so:x11-fonts/fontconfig +LIB_DEPENDS+= libfreetype.so:print/freetype2 + USES= gnome localbase pkgconfig tar:bzip2 -USE_GNOME= gtk20 +USE_GNOME= cairo gdkpixbuf2 gtk20 GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-gtk2 @@ -32,6 +36,11 @@ post-patch: @${REINPLACE_CMD} -e 's,Xdialog\\-%%version%%,xdialog,' \ ${WRKSRC}/doc/Xdialog.man +post-install: + @${MKDIR} ${STAGEDIR}${DATADIR}${DESKTOPDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/48x48/apps + ${INSTALL_DATA} ${PATCHDIR}/bsdconfig.desktop ${STAGEDIR}${DESKTOPDIR} + ${INSTALL_DATA} ${PATCHDIR}/bsdconfig-48.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/48x48/apps/bsdconfig.png + post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR}/samples ${INSTALL_DATA} ${WRKSRC}/doc/*.html ${STAGEDIR}${DOCSDIR} diff --git a/x11/xdialog/files/bsdconfig-48.png b/x11/xdialog/files/bsdconfig-48.png new file mode 100644 index 000000000000..f4521c422639 Binary files /dev/null and b/x11/xdialog/files/bsdconfig-48.png differ diff --git a/x11/xdialog/files/bsdconfig.desktop b/x11/xdialog/files/bsdconfig.desktop new file mode 100644 index 000000000000..5e1cf996a683 --- /dev/null +++ b/x11/xdialog/files/bsdconfig.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Version=1.5 +Encoding=UTF-8 +Type=Application +Name=bsdconfig +GenericName=System configuration utility +Icon=bsdconfig +Exec=/usr/sbin/bsdconfig -X +Comment=Set up many system configuration settings +Terminal=false +StartupNotify=false +Categories=Settings;System;GTK; diff --git a/x11/xdialog/pkg-message b/x11/xdialog/pkg-message new file mode 100644 index 000000000000..428494cdcbd2 --- /dev/null +++ b/x11/xdialog/pkg-message @@ -0,0 +1,5 @@ +This package also installs a desktop application file for bsdconfig(8), +FreeBSD's system configuration tool, for operation as a graphical +interface (starting with -X) as permitted with xdialog(1) as helper tool. +However, for proper operation this requires either running as the root user, or +sudo(8) to be installed and the user to be allowed in the sudoers(5) file. diff --git a/x11/xdialog/pkg-plist b/x11/xdialog/pkg-plist index bbf5e7301f6e..0e2d0dc19ed1 100644 --- a/x11/xdialog/pkg-plist +++ b/x11/xdialog/pkg-plist @@ -1,5 +1,8 @@ bin/Xdialog man/man1/Xdialog.1.gz +@dir %%DATADIR%%/usr/local/share/applications +share/applications/bsdconfig.desktop +share/icons/hicolor/48x48/apps/bsdconfig.png %%PORTDOCS%%%%DOCSDIR%%/2ranges.png %%PORTDOCS%%%%DOCSDIR%%/authors.html %%PORTDOCS%%%%DOCSDIR%%/box.html