Attachment #215199 for bug #246954




# $FreeBSD: head/x11-wm/hikari/Makefile 529872 2020-03-30 10:07:26Z jbeich $

PORTNAME=	hikari
DISTVERSION=	2.0.0
CATEGORIES=	x11-wm
MASTER_SITES=	https://hikari.acmelabs.space/releases/


USE_GNOME=	cairo glib20 pango
USE_XORG=	pixman
MAKE_ARGS=	${WITH_DEBUG:DDEBUG=YES}

OPTIONS_DEFINE=		GAMMA LAYERSHELL SCREENCOPY SUID X11
PLIST_FILES=	"${MAYBE_SUID}bin/${PORTNAME}" \
		"${MAYBE_SUID}bin/${PORTNAME}-unlocker" \
		etc/pam.d/${PORTNAME}-unlocker \
		share/man/man1/${PORTNAME}.1.gz \
		share/wayland-sessions/${PORTNAME}.desktop
PORTEXAMPLES=	${PORTNAME}.conf

OPTIONS_DEFINE=		EXAMPLES GAMMA LAYERSHELL SCREENCOPY SUID X11
OPTIONS_DEFAULT=	GAMMA LAYERSHELL SCREENCOPY SUID X11

GAMMA_DESC=		Include gammacontrol protocol (required by, e.g., Redshift)

GAMMA_MAKE_ARGS=	WITH_GAMMACONTROL=YES
LAYERSHELL_MAKE_ARGS=	WITH_LAYERSHELL=YES
SCREENCOPY_MAKE_ARGS=	WITH_SCREENCOPY=YES
SUID_PLIST_SUB=		MAYBE_SUID="@(,,4755) "
SUID_PLIST_SUB_OFF=	MAYBE_SUID=""
X11_MAKE_ARGS=		WITH_XWAYLAND=YES

MAKE_ARGS=	WITHOUT_SUID=YES

post-install:
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/hikari
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/hikari-unlocker
	${INSTALL_MAN} ${WRKSRC}/share/examples/hikari/hikari.conf ${STAGEDIR}${EXAMPLESDIR}/hikari.conf
	${INSTALL_MAN} ${WRKSRC}/share/man/man1/hikari.1 ${STAGEDIR}${MAN1PREFIX}/share/man/man1/
	@${MKDIR} ${STAGEDIR}${PREFIX}/share/wayland-sessions
	${INSTALL_DATA} ${WRKDIR}/hikari.desktop ${STAGEDIR}${PREFIX}/share/wayland-sessions

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/x11-wm/hikari/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1590253300	1	TIMESTAMP = 1591118564
2	SHA256 (hikari-1.2.1.tar.gz) = f361ec9a367c03a9e678a8d04361426f6982e661719b9e6a3e742572eae0a8e5	2	SHA256 (hikari-2.0.0.tar.gz) = 0230bd89c90da1082e7d59bd991118e0b76c621ee55d21506893866a44adb5fe
3	SIZE (hikari-1.2.1.tar.gz) = 99489	3	SIZE (hikari-2.0.0.tar.gz) = 1002997

Removed Link Here

(-)a/x11-wm/hikari/files/hikari.desktop.in (-6 lines)
1	# $FreeBSD: head/x11-wm/hikari/files/hikari.desktop.in 502633 2019-05-25 20:51:47Z swills $
2	[Desktop Entry]
3	Type=Application
4	Name=hikari
5	Comment=%%COMMENT%%
6	Exec=hikari




--- Makefile.orig	2020-06-01 09:25:10 UTC
+++ Makefile
@@ -221,10 +221,10 @@ install: hikari hikari-unlocker share/man/man1/hikari.
 	mkdir -p ${DESTDIR}/${PREFIX}/share/wayland-sessions
 	mkdir -p ${DESTDIR}/${ETC_PREFIX}/etc/hikari
 	mkdir -p ${DESTDIR}/${ETC_PREFIX}/etc/pam.d
-	sed "s,PREFIX,/${PREFIX}," etc/hikari/hikari.conf > ${DESTDIR}/${ETC_PREFIX}/etc/hikari/hikari.conf
+	sed "s,PREFIX,${PREFIX}," etc/hikari/hikari.conf > ${DESTDIR}/${ETC_PREFIX}/etc/hikari/hikari.conf
 	chmod 644 ${DESTDIR}/${ETC_PREFIX}/etc/hikari/hikari.conf
 	install -m ${PERMS} hikari ${DESTDIR}/${PREFIX}/bin
-	install -m 4555 hikari-unlocker ${DESTDIR}/${PREFIX}/bin
+	install -m 555 hikari-unlocker ${DESTDIR}/${PREFIX}/bin
 	install -m 644 share/man/man1/hikari.1 ${DESTDIR}/${PREFIX}/share/man/man1
 	install -m 644 share/backgrounds/hikari/hikari_wallpaper.png ${DESTDIR}/${PREFIX}/share/backgrounds/hikari/hikari_wallpaper.png
 	install -m 644 share/wayland-sessions/hikari.desktop ${DESTDIR}/${PREFIX}/share/wayland-sessions/hikari.desktop

Added Link Here

(-)b/x11-wm/hikari/pkg-plist (+7 lines)
1	%%MAYBE_SUID%%bin/hikari
2	%%MAYBE_SUID%%bin/hikari-unlocker
3	etc/pam.d/hikari-unlocker
4	@sample %%ETCDIR%%/hikari.conf.sample
5	share/backgrounds/hikari/hikari_wallpaper.png
6	share/man/man1/hikari.1.gz
7	share/wayland-sessions/hikari.desktop

Return to bug 246954

Lines 1-7 Link Here

(-)b/x11-wm/hikari/Makefile (-21 / +10 lines)
1	# $FreeBSD: head/x11-wm/hikari/Makefile 529872 2020-03-30 10:07:26Z jbeich $	1	# $FreeBSD: head/x11-wm/hikari/Makefile 529872 2020-03-30 10:07:26Z jbeich $
2		2
3	PORTNAME= hikari	3	PORTNAME= hikari
4	DISTVERSION= 1.2.1	4	DISTVERSION= 2.0.0
5	CATEGORIES= x11-wm	5	CATEGORIES= x11-wm
6	MASTER_SITES= https://hikari.acmelabs.space/releases/	6	MASTER_SITES= https://hikari.acmelabs.space/releases/
7		7
Lines 25-40 USES= compiler:c11 gnome pkgconfig xorg Link Here
25	USE_GNOME= cairo glib20 pango	25	USE_GNOME= cairo glib20 pango
26	USE_XORG= pixman	26	USE_XORG= pixman
27	MAKE_ARGS= ${WITH_DEBUG:DDEBUG=YES}	27	MAKE_ARGS= ${WITH_DEBUG:DDEBUG=YES}
28	SUB_FILES= ${PORTNAME}.desktop	28
29	SUB_LIST= COMMENT="${COMMENT}"	29	OPTIONS_DEFINE= GAMMA LAYERSHELL SCREENCOPY SUID X11
30	PLIST_FILES= "${MAYBE_SUID}bin/${PORTNAME}" \
31	"${MAYBE_SUID}bin/${PORTNAME}-unlocker" \
32	etc/pam.d/${PORTNAME}-unlocker \
33	share/man/man1/${PORTNAME}.1.gz \
34	share/wayland-sessions/${PORTNAME}.desktop
35	PORTEXAMPLES= ${PORTNAME}.conf
36
37	OPTIONS_DEFINE= EXAMPLES GAMMA LAYERSHELL SCREENCOPY SUID X11
38	OPTIONS_DEFAULT= GAMMA LAYERSHELL SCREENCOPY SUID X11	30	OPTIONS_DEFAULT= GAMMA LAYERSHELL SCREENCOPY SUID X11
39		31
40	GAMMA_DESC= Include gammacontrol protocol (required by, e.g., Redshift)	32	GAMMA_DESC= Include gammacontrol protocol (required by, e.g., Redshift)
Lines 45-61 SUID_DESC= Setuid bit on binaries (required for DRM and PAM) Link Here
45	GAMMA_MAKE_ARGS= WITH_GAMMACONTROL=YES	37	GAMMA_MAKE_ARGS= WITH_GAMMACONTROL=YES
46	LAYERSHELL_MAKE_ARGS= WITH_LAYERSHELL=YES	38	LAYERSHELL_MAKE_ARGS= WITH_LAYERSHELL=YES
47	SCREENCOPY_MAKE_ARGS= WITH_SCREENCOPY=YES	39	SCREENCOPY_MAKE_ARGS= WITH_SCREENCOPY=YES
48	SUID_VARS= MAYBE_SUID="@(,,4755) "	40	SUID_PLIST_SUB= MAYBE_SUID="@(,,4755) "
		41	SUID_PLIST_SUB_OFF= MAYBE_SUID=""
49	X11_MAKE_ARGS= WITH_XWAYLAND=YES	42	X11_MAKE_ARGS= WITH_XWAYLAND=YES
50		43
51	do-install:	44	MAKE_ARGS= WITHOUT_SUID=YES
52	${INSTALL_PROGRAM} ${WRKSRC}/hikari ${STAGEDIR}${PREFIX}/bin/	45
53	${INSTALL_PROGRAM} ${WRKSRC}/hikari-unlocker ${STAGEDIR}${PREFIX}/bin/	46	post-install:
54	${INSTALL_DATA} ${WRKSRC}/pam.d/hikari-unlocker.FreeBSD ${STAGEDIR}${PREFIX}/etc/pam.d/hikari-unlocker	47	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/hikari
55	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}	48	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/hikari-unlocker
56	${INSTALL_MAN} ${WRKSRC}/share/examples/hikari/hikari.conf ${STAGEDIR}${EXAMPLESDIR}/hikari.conf
57	${INSTALL_MAN} ${WRKSRC}/share/man/man1/hikari.1 ${STAGEDIR}${MAN1PREFIX}/share/man/man1/
58	@${MKDIR} ${STAGEDIR}${PREFIX}/share/wayland-sessions
59	${INSTALL_DATA} ${WRKDIR}/hikari.desktop ${STAGEDIR}${PREFIX}/share/wayland-sessions
60		49
61	.include <bsd.port.mk>	50	.include <bsd.port.mk>

Added Link Here

(-)b/x11-wm/hikari/files/patch-Makefile (+15 lines)
1	--- Makefile.orig 2020-06-01 09:25:10 UTC
2	+++ Makefile
3	@@ -221,10 +221,10 @@ install: hikari hikari-unlocker share/man/man1/hikari.
4	mkdir -p ${DESTDIR}/${PREFIX}/share/wayland-sessions
5	mkdir -p ${DESTDIR}/${ETC_PREFIX}/etc/hikari
6	mkdir -p ${DESTDIR}/${ETC_PREFIX}/etc/pam.d
7	- sed "s,PREFIX,/${PREFIX}," etc/hikari/hikari.conf > ${DESTDIR}/${ETC_PREFIX}/etc/hikari/hikari.conf
8	+ sed "s,PREFIX,${PREFIX}," etc/hikari/hikari.conf > ${DESTDIR}/${ETC_PREFIX}/etc/hikari/hikari.conf
9	chmod 644 ${DESTDIR}/${ETC_PREFIX}/etc/hikari/hikari.conf
10	install -m ${PERMS} hikari ${DESTDIR}/${PREFIX}/bin
11	- install -m 4555 hikari-unlocker ${DESTDIR}/${PREFIX}/bin
12	+ install -m 555 hikari-unlocker ${DESTDIR}/${PREFIX}/bin
13	install -m 644 share/man/man1/hikari.1 ${DESTDIR}/${PREFIX}/share/man/man1
14	install -m 644 share/backgrounds/hikari/hikari_wallpaper.png ${DESTDIR}/${PREFIX}/share/backgrounds/hikari/hikari_wallpaper.png
15	install -m 644 share/wayland-sessions/hikari.desktop ${DESTDIR}/${PREFIX}/share/wayland-sessions/hikari.desktop