Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 26 Jan 2024 22:56:26 GMT
From:      Larry Rosenman <ler@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: a2e8585ffdf1 - main - x11/xdialog: Register bsdconfig as an application in x11/xdialog
Message-ID:  <202401262256.40QMuQH2068684@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by ler:

URL: https://cgit.FreeBSD.org/ports/commit/?id=a2e8585ffdf110d5fcc05fa54b7524380a7d9afe

commit a2e8585ffdf110d5fcc05fa54b7524380a7d9afe
Author:     Larry Rosenman <ler@FreeBSD.org>
AuthorDate: 2024-01-26 22:53:58 +0000
Commit:     Larry Rosenman <ler@FreeBSD.org>
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202401262256.40QMuQH2068684>