Attachment 215199 Details for Bug 246954 – Update to 2.0.0 with request improvements

[patch] Update to 2.0.0 with request improvements

patch (text/plain), 4.66 KB, created by Alexander Sieg on 2020-06-03 16:18:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alexander Sieg

Created: 2020-06-03 16:18:05 UTC

Size: 4.66 KB

patch

obsolete

>diff --git a/x11-wm/hikari/Makefile b/x11-wm/hikari/Makefile
>index 50a3c8b..d4484f3 100644
>--- a/x11-wm/hikari/Makefile
>+++ b/x11-wm/hikari/Makefile
>@@ -1,7 +1,7 @@
> # $FreeBSD: head/x11-wm/hikari/Makefile 529872 2020-03-30 10:07:26Z jbeich $
> 
> PORTNAME=	hikari
>-DISTVERSION=	1.2.1
>+DISTVERSION=	2.0.0
> CATEGORIES=	x11-wm
> MASTER_SITES=	https://hikari.acmelabs.space/releases/
> 
>@@ -25,16 +25,8 @@ 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
>-
>-OPTIONS_DEFINE=		EXAMPLES GAMMA LAYERSHELL SCREENCOPY SUID X11
>+
>+OPTIONS_DEFINE=		GAMMA LAYERSHELL SCREENCOPY SUID X11
> OPTIONS_DEFAULT=	GAMMA LAYERSHELL SCREENCOPY SUID X11
> 
> GAMMA_DESC=		Include gammacontrol protocol (required by, e.g., Redshift)
>@@ -45,17 +37,14 @@ SUID_DESC=		Setuid bit on binaries (required for DRM and PAM)
> GAMMA_MAKE_ARGS=	WITH_GAMMACONTROL=YES
> LAYERSHELL_MAKE_ARGS=	WITH_LAYERSHELL=YES
> SCREENCOPY_MAKE_ARGS=	WITH_SCREENCOPY=YES
>-SUID_VARS=		MAYBE_SUID="@(,,4755) "
>+SUID_PLIST_SUB=		MAYBE_SUID="@(,,4755) "
>+SUID_PLIST_SUB_OFF=	MAYBE_SUID=""
> X11_MAKE_ARGS=		WITH_XWAYLAND=YES
> 
>-do-install:
>-	${INSTALL_PROGRAM} ${WRKSRC}/hikari ${STAGEDIR}${PREFIX}/bin/
>-	${INSTALL_PROGRAM} ${WRKSRC}/hikari-unlocker ${STAGEDIR}${PREFIX}/bin/
>-	${INSTALL_DATA} ${WRKSRC}/pam.d/hikari-unlocker.FreeBSD ${STAGEDIR}${PREFIX}/etc/pam.d/hikari-unlocker
>-	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
>-	${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
>+MAKE_ARGS=	WITHOUT_SUID=YES
>+
>+post-install:
>+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/hikari
>+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/hikari-unlocker
> 
> .include <bsd.port.mk>
>diff --git a/x11-wm/hikari/distinfo b/x11-wm/hikari/distinfo
>index 54da652..12967c3 100644
>--- a/x11-wm/hikari/distinfo
>+++ b/x11-wm/hikari/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1590253300
>-SHA256 (hikari-1.2.1.tar.gz) = f361ec9a367c03a9e678a8d04361426f6982e661719b9e6a3e742572eae0a8e5
>-SIZE (hikari-1.2.1.tar.gz) = 99489
>+TIMESTAMP = 1591118564
>+SHA256 (hikari-2.0.0.tar.gz) = 0230bd89c90da1082e7d59bd991118e0b76c621ee55d21506893866a44adb5fe
>+SIZE (hikari-2.0.0.tar.gz) = 1002997
>diff --git a/x11-wm/hikari/files/hikari.desktop.in b/x11-wm/hikari/files/hikari.desktop.in
>deleted file mode 100644
>index 3048fc2..0000000
>--- a/x11-wm/hikari/files/hikari.desktop.in
>+++ /dev/null
>@@ -1,6 +0,0 @@
>-# $FreeBSD: head/x11-wm/hikari/files/hikari.desktop.in 502633 2019-05-25 20:51:47Z swills $
>-[Desktop Entry]
>-Type=Application
>-Name=hikari
>-Comment=%%COMMENT%%
>-Exec=hikari
>diff --git a/x11-wm/hikari/files/patch-Makefile b/x11-wm/hikari/files/patch-Makefile
>new file mode 100644
>index 0000000..287f3a2
>--- /dev/null
>+++ b/x11-wm/hikari/files/patch-Makefile
>@@ -0,0 +1,15 @@
>+--- 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
>diff --git a/x11-wm/hikari/pkg-plist b/x11-wm/hikari/pkg-plist
>new file mode 100644
>index 0000000..0e9bb83
>--- /dev/null
>+++ b/x11-wm/hikari/pkg-plist
>@@ -0,0 +1,7 @@
>+%%MAYBE_SUID%%bin/hikari
>+%%MAYBE_SUID%%bin/hikari-unlocker
>+etc/pam.d/hikari-unlocker
>+@sample %%ETCDIR%%/hikari.conf.sample
>+share/backgrounds/hikari/hikari_wallpaper.png
>+share/man/man1/hikari.1.gz
>+share/wayland-sessions/hikari.desktop

Flags:

ports: maintainer-approval+

Actions: View | Diff

Attachments on bug 246954: 215188 | 215189 | 215199 | 215205