Attachment #215205 for bug #246954




# $FreeBSD$

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


USES=		compiler:c11 gnome pkgconfig xorg
USE_GNOME=	cairo glib20 pango
USE_XORG=	pixman
MAKE_ARGS=	${WITH_DEBUG:DDEBUG=YES}
SUB_FILES=	${PORTNAME}.desktop
SUB_LIST=	COMMENT="${COMMENT}"
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

MAKE_ARGS+=	${WITH_DEBUG:DDEBUG=YES} \
		WITHOUT_SUID=YES

OPTIONS_DEFINE=		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

post-install:
.ifndef WITH_DEBUG
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/hikari
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/hikari-unlocker
.endif
	${MV} ${STAGEDIR}${ETCDIR}/hikari.conf \
	${STAGEDIR}${ETCDIR}/hikari.conf.sample
	@${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

(-)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

Lines 1-7 Link Here

(-)files/hikari.desktop.in (-7 lines)
1	# $FreeBSD$
2	[Desktop Entry]
3	Type=XSession
4	Name=Hikari
5	Comment=%%COMMENT%%
6	TryExec=%%PREFIX%%/bin/hikari
7	Exec=%%PREFIX%%/bin/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

Line 0 Link Here

(-)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

(-)Makefile (-21 / +14 lines)
1	# $FreeBSD$	1	# $FreeBSD$
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 24-40 Link Here
24	USES= compiler:c11 gnome pkgconfig xorg	24	USES= compiler:c11 gnome pkgconfig xorg
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}
28	SUB_FILES= ${PORTNAME}.desktop
29	SUB_LIST= COMMENT="${COMMENT}"
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		27
37	OPTIONS_DEFINE= EXAMPLES GAMMA LAYERSHELL SCREENCOPY SUID X11	28	MAKE_ARGS+= ${WITH_DEBUG:DDEBUG=YES} \
		29	WITHOUT_SUID=YES
		30
		31	OPTIONS_DEFINE= GAMMA LAYERSHELL SCREENCOPY SUID X11
38	OPTIONS_DEFAULT= GAMMA LAYERSHELL SCREENCOPY SUID X11	32	OPTIONS_DEFAULT= GAMMA LAYERSHELL SCREENCOPY SUID X11
39		33
40	GAMMA_DESC= Include gammacontrol protocol (required by, e.g., Redshift)	34	GAMMA_DESC= Include gammacontrol protocol (required by, e.g., Redshift)
Lines 45-61 Link Here
45	GAMMA_MAKE_ARGS= WITH_GAMMACONTROL=YES	39	GAMMA_MAKE_ARGS= WITH_GAMMACONTROL=YES
46	LAYERSHELL_MAKE_ARGS= WITH_LAYERSHELL=YES	40	LAYERSHELL_MAKE_ARGS= WITH_LAYERSHELL=YES
47	SCREENCOPY_MAKE_ARGS= WITH_SCREENCOPY=YES	41	SCREENCOPY_MAKE_ARGS= WITH_SCREENCOPY=YES
48	SUID_VARS= MAYBE_SUID="@(,,4755) "	42	SUID_PLIST_SUB= MAYBE_SUID="@(,,4755) "
		43	SUID_PLIST_SUB_OFF= MAYBE_SUID=""
49	X11_MAKE_ARGS= WITH_XWAYLAND=YES	44	X11_MAKE_ARGS= WITH_XWAYLAND=YES
50		45
51	do-install:	46	post-install:
52	${INSTALL_PROGRAM} ${WRKSRC}/hikari ${STAGEDIR}${PREFIX}/bin/	47	.ifndef WITH_DEBUG
53	${INSTALL_PROGRAM} ${WRKSRC}/hikari-unlocker ${STAGEDIR}${PREFIX}/bin/	48	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/hikari
54	${INSTALL_DATA} ${WRKSRC}/pam.d/hikari-unlocker.FreeBSD ${STAGEDIR}${PREFIX}/etc/pam.d/hikari-unlocker	49	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/hikari-unlocker
55	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}	50	.endif
56	${INSTALL_MAN} ${WRKSRC}/share/examples/hikari/hikari.conf ${STAGEDIR}${EXAMPLESDIR}/hikari.conf	51	${MV} ${STAGEDIR}${ETCDIR}/hikari.conf \
57	${INSTALL_MAN} ${WRKSRC}/share/man/man1/hikari.1 ${STAGEDIR}${MAN1PREFIX}/share/man/man1/	52	${STAGEDIR}${ETCDIR}/hikari.conf.sample
58	@${MKDIR} ${STAGEDIR}${PREFIX}/share/wayland-sessions
59	${INSTALL_DATA} ${WRKDIR}/hikari.desktop ${STAGEDIR}${PREFIX}/share/wayland-sessions
60		53
61	.include <bsd.port.mk>	54	.include <bsd.port.mk>

Line 0 Link Here

(-)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