Page MenuHomeFreeBSD

D23544.id67947.diff
No OneTemporary

D23544.id67947.diff

Index: Makefile
===================================================================
--- Makefile
+++ Makefile
@@ -1,67 +1,46 @@
# $FreeBSD$
PORTNAME= hikari
-DISTVERSION= 0.1.3
-PORTREVISION= 1
+DISTVERSION= 1.0.0-alpha2
CATEGORIES= x11-wm
MASTER_SITES= https://acmelabs.space/~raichoo/
-MAINTAINER= alex@xanderio.de
-COMMENT= Stacking window manager with tiling capabilities
+MAINTAINER= ports@xanderio.de
+COMMENT= Stacking Wayland compositor with tiling capabilities
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-LIB_DEPENDS= libxcb-ewmh.so:x11/xcb-util-wm \
- libxcb-icccm.so:x11/xcb-util-wm \
- libxcb-keysyms.so:x11/xcb-util-keysyms
+BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \
+ wayland-protocols>=1.14:graphics/wayland-protocols \
+ wlroots>=0.9.0<0.11.0:x11-toolkits/wlroots
+LIB_DEPENDS= libepoll-shim.so:devel/libepoll-shim \
+ libinput.so:x11/libinput \
+ libucl.so:textproc/libucl \
+ libwayland-server.so:graphics/wayland \
+ libwlroots.so:x11-toolkits/wlroots \
+ libxkbcommon.so:x11/libxkbcommon
-USES= compiler:c11 localbase:ldflags xorg
-USE_XORG= x11 xcb
+USES= gnome pkgconfig xorg
+USE_GNOME= cairo glib20 pango
+USE_XORG= pixman
-OPTIONS_DEFINE= DOCS
+ALL_TARGET= ${WITH_DEBUG:Ddebug}
-NO_WRKSUBDIR= yes
+OPTIONS_DEFINE= SUID
+OPTIONS_DEFAULT= SUID
+OPTIONS_SUB= yes
-SUB_FILES= hikari.desktop
-SUB_LIST= COMMENT="${COMMENT}"
-PLIST_FILES= bin/hikari \
- man/man1/hikari.1.gz \
- share/xsessions/hikari.desktop
-PORTDATA= config.def.h
-PORTDOCS= README.md
+SUID_DESC= setuid bit on "hikari" and "hikari-unlocker" binary (required for DRM and PAM)
+SUID_PLIST_SUB_OFF= MAYBE_SUID=""
+SUID_PLIST_SUB= MAYBE_SUID="@(,,4755) "
.include <bsd.port.pre.mk>
-.if defined(WITH_DEBUG)
-ALL_TARGET= debug
-.else
-ALL_TARGET= hikari
-.endif
-
-pre-everything::
- @${ECHO_MSG} "You can build hikari with your own config.h using the HIKARI_CONF knob:"
- @${ECHO_MSG} "make HIKARI_CONF=/path/to/hikari/config.h install clean"
- @${ECHO_MSG} "Note: Pre-${PORTVERSION} config.h files may not work."
-
-post-patch:
-.if defined(HIKARI_CONF)
- @${ECHO_MSG} "Creating config.h from ${HIKARI_CONF}"
- @${LN} -sf ${HIKARI_CONF} ${WRKSRC}/config.h
-.else
- @${LN} -sf ${WRKSRC}/config.def.h ${WRKSRC}/config.h
-.endif
-
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/hikari ${STAGEDIR}${PREFIX}/bin/
- ${INSTALL_MAN} ${WRKSRC}/hikari.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/
- @${MKDIR} ${STAGEDIR}${DATADIR}
- ${INSTALL_DATA} ${WRKSRC}/${PORTDATA} ${STAGEDIR}${DATADIR}
- @${MKDIR} ${STAGEDIR}${PREFIX}/share/xsessions
- ${INSTALL_DATA} ${WRKDIR}/hikari.desktop ${STAGEDIR}${PREFIX}/share/xsessions
+ ${INSTALL_PROGRAM} ${WRKSRC}/hikari-unlocker ${STAGEDIR}${PREFIX}/bin/
+ @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+ ${INSTALL_MAN} ${WRKSRC}/doc/example_hikari.conf ${STAGEDIR}${EXAMPLESDIR}/hikari.conf
-post-install-DOCS-on:
- @${MKDIR} ${STAGEDIR}${DOCSDIR}
- ${INSTALL_MAN} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
-
.include <bsd.port.post.mk>
Index: distinfo
===================================================================
--- distinfo
+++ distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1558731796
-SHA256 (hikari-0.1.3.tar.gz) = 703805682ccc586746d53fbd37890d7ca2366bc80b43ce3043f7245a41693ff2
-SIZE (hikari-0.1.3.tar.gz) = 58669
+TIMESTAMP = 1581019256
+SHA256 (hikari-1.0.0-alpha2.tar.gz) = dfb8b90e29116267e1a9500427a0114619ab3dfb70bb4b1524a660f49065b04a
+SIZE (hikari-1.0.0-alpha2.tar.gz) = 63806
Index: pkg-descr
===================================================================
--- pkg-descr
+++ pkg-descr
@@ -1,5 +1,5 @@
-Hikari is a stacking window manager with additional tiling capabilities, it is
-heavily inspired by the Calm Window manager (cwm(1)). Its core concepts are
-windows, groups, sheets and the workspace.
+Hikari is a stacking Wayland compositor with additional tiling capabilities, it
+is heavily inspired by the Calm Window manager (cwm(1)). Its core concepts are
+views, groups, sheets and the workspace.
WWW: https://hub.darcs.net/raichoo/hikari
Index: pkg-plist
===================================================================
--- pkg-plist
+++ pkg-plist
@@ -0,0 +1,3 @@
+%%MAYBE_SUID%%bin/hikari
+%%MAYBE_SUID%%bin/hikari-unlocker
+%%EXAMPLESDIR%%/hikari.conf

File Metadata

Mime Type
text/plain
Expires
Sun, Mar 1, 1:29 PM (19 h, 14 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29115134
Default Alt Text
D23544.id67947.diff (4 KB)

Event Timeline