Index: head/x11/Makefile =================================================================== --- head/x11/Makefile (revision 517679) +++ head/x11/Makefile (revision 517680) @@ -1,528 +1,529 @@ # $FreeBSD$ # COMMENT = Ports to support the X window system SUBDIR += 3ddesktop SUBDIR += 9box SUBDIR += 9menu SUBDIR += admiral SUBDIR += alacritty SUBDIR += alltray SUBDIR += alttab SUBDIR += aminal SUBDIR += antimicro SUBDIR += appres SUBDIR += apwal SUBDIR += arandr SUBDIR += aterm SUBDIR += babl SUBDIR += bbappconf SUBDIR += bbdock SUBDIR += bbrun SUBDIR += beforelight SUBDIR += bemenu SUBDIR += bgrot SUBDIR += bgs SUBDIR += bitmap SUBDIR += bmpanel2 SUBDIR += bricons SUBDIR += brisk-menu SUBDIR += cde SUBDIR += cinnamon SUBDIR += cinnamon-desktop SUBDIR += cinnamon-menus SUBDIR += cinnamon-screensaver SUBDIR += cinnamon-session SUBDIR += cl-clx SUBDIR += cl-clx-sbcl SUBDIR += compton-conf SUBDIR += conlecterm SUBDIR += controllermap SUBDIR += cool-retro-term SUBDIR += decurs SUBDIR += deforaos-desktop SUBDIR += deforaos-keyboard SUBDIR += deforaos-libdesktop SUBDIR += deforaos-locker SUBDIR += deforaos-panel SUBDIR += deskmenu SUBDIR += deskpaint SUBDIR += dmenu SUBDIR += dmenu2 SUBDIR += docker-tray SUBDIR += dsbautostart SUBDIR += dxpc SUBDIR += dzen2 SUBDIR += eaglemode SUBDIR += editres SUBDIR += emprint SUBDIR += erun SUBDIR += eterm SUBDIR += evilvte SUBDIR += fbdesk SUBDIR += fbpanel SUBDIR += find-cursor SUBDIR += fireflies SUBDIR += florence SUBDIR += flruler SUBDIR += fluxbg SUBDIR += fpc-x11 SUBDIR += fstobdf SUBDIR += gcb SUBDIR += gdm SUBDIR += gmrun SUBDIR += gnome-clipboard-daemon SUBDIR += gnome-desktop SUBDIR += gnome-menus SUBDIR += gnome-pie SUBDIR += gnome-session SUBDIR += gnome-shell SUBDIR += gnome-shell-extensions SUBDIR += gnome-terminal SUBDIR += gnome3 SUBDIR += gnome3-lite SUBDIR += gnustep-app SUBDIR += gpctool SUBDIR += grabc SUBDIR += grim SUBDIR += gromit SUBDIR += gskrab SUBDIR += gstreamer1-plugins-x SUBDIR += gstreamer1-plugins-ximagesrc SUBDIR += gsynaptics SUBDIR += gtk-theme-switch2 SUBDIR += gtkchtheme SUBDIR += gtkterm2 SUBDIR += guake SUBDIR += gxkb SUBDIR += hhpc SUBDIR += hs-X11 SUBDIR += hs-X11-xft SUBDIR += hs-xmobar SUBDIR += hsetroot SUBDIR += i3blocks SUBDIR += i3lock SUBDIR += i3status SUBDIR += iceauth SUBDIR += ico SUBDIR += idesk SUBDIR += imwheel SUBDIR += innerspace SUBDIR += ipager SUBDIR += j4-dmenu-desktop SUBDIR += kanshi SUBDIR += kb2mb2 SUBDIR += kde-baseapps SUBDIR += kde5 SUBDIR += keybinder SUBDIR += keybinder-gtk3 SUBDIR += keyboardcast SUBDIR += keylaunch SUBDIR += kf5-frameworkintegration SUBDIR += kf5-frameworks SUBDIR += kf5-kactivities SUBDIR += kf5-kactivities-stats SUBDIR += kf5-kded SUBDIR += kf5-kdelibs4support SUBDIR += kf5-kglobalaccel SUBDIR += kf5-kinit SUBDIR += kf5-krunner SUBDIR += kf5-kwayland SUBDIR += kf5-kwindowsystem SUBDIR += kf5-plasma-framework SUBDIR += konsole SUBDIR += lemonbar SUBDIR += libICE SUBDIR += libSM SUBDIR += libX11 SUBDIR += libXScrnSaver SUBDIR += libXau SUBDIR += libXcm SUBDIR += libXcomposite SUBDIR += libXcursor SUBDIR += libXdamage SUBDIR += libXdmcp SUBDIR += libXext SUBDIR += libXfixes SUBDIR += libXi SUBDIR += libXinerama SUBDIR += libXpm SUBDIR += libXpresent SUBDIR += libXrandr SUBDIR += libXrender SUBDIR += libXres SUBDIR += libXtst SUBDIR += libXv SUBDIR += libXvMC SUBDIR += libXxf86dga SUBDIR += libXxf86vm SUBDIR += libdmx SUBDIR += libexo SUBDIR += libfakekey SUBDIR += libfm SUBDIR += libfm-extra SUBDIR += libfm-qt SUBDIR += libgnome SUBDIR += libgnome-reference SUBDIR += libgnomekbd SUBDIR += libgnomemm26 SUBDIR += libinput SUBDIR += libmatekbd SUBDIR += libsx SUBDIR += libsynaptics SUBDIR += libwacom SUBDIR += libxcb SUBDIR += libxdg-basedir SUBDIR += libxfce4menu SUBDIR += libxfce4util SUBDIR += libxkbcommon SUBDIR += libxkbfile SUBDIR += libxklavier SUBDIR += libxshmfence SUBDIR += lightdm SUBDIR += lightdm-gtk-greeter SUBDIR += lilyterm SUBDIR += linux-c6-pixman SUBDIR += linux-c6-xorg-libs SUBDIR += linux-c7-libxkbcommon SUBDIR += linux-c7-pixman SUBDIR += linux-c7-xorg-libs SUBDIR += linux-nvidia-libs SUBDIR += linux-nvidia-libs-304 SUBDIR += linux-nvidia-libs-340 SUBDIR += linux-nvidia-libs-390 SUBDIR += listres SUBDIR += lsw SUBDIR += luit SUBDIR += lumina SUBDIR += lumina-core SUBDIR += lumina-coreutils SUBDIR += lupe SUBDIR += lxde-meta SUBDIR += lxhotkey SUBDIR += lxmenu-data SUBDIR += lxpanel SUBDIR += lxqt-about SUBDIR += lxqt-globalkeys SUBDIR += lxqt-runner SUBDIR += lxrandr + SUBDIR += ly SUBDIR += mate SUBDIR += mate-applets SUBDIR += mate-base SUBDIR += mate-desktop SUBDIR += mate-menus SUBDIR += mate-panel SUBDIR += mate-screensaver SUBDIR += mate-session-manager SUBDIR += mate-terminal SUBDIR += menu-cache SUBDIR += menulibre SUBDIR += mere-about SUBDIR += mere-utils SUBDIR += metalock SUBDIR += metisse SUBDIR += mkcomposecache SUBDIR += mlterm SUBDIR += mons SUBDIR += mrxvt SUBDIR += mrxvt-devel SUBDIR += multi-aterm SUBDIR += mxico SUBDIR += numlockx SUBDIR += nvidia-driver SUBDIR += nvidia-driver-304 SUBDIR += nvidia-driver-340 SUBDIR += nvidia-driver-390 SUBDIR += nvidia-settings SUBDIR += nvidia-xconfig SUBDIR += nxcomp SUBDIR += ooxcb SUBDIR += p5-Clipboard SUBDIR += p5-X11-GUITest SUBDIR += p5-X11-IdleTime SUBDIR += p5-X11-Protocol SUBDIR += p5-X11-Protocol-Other SUBDIR += p5-X11-Resolution SUBDIR += p5-X11-XCB SUBDIR += p5-X11-Xlib SUBDIR += p5-XTerm-Conf SUBDIR += pcdm SUBDIR += perwindowlayoutd SUBDIR += pipeglade SUBDIR += pixman SUBDIR += plank SUBDIR += plasma5-kactivitymanagerd SUBDIR += plasma5-kgamma5 SUBDIR += plasma5-kscreen SUBDIR += plasma5-kwayland-integration SUBDIR += plasma5-libkscreen SUBDIR += plasma5-plasma SUBDIR += plasma5-plasma-desktop SUBDIR += plasma5-plasma-integration SUBDIR += plasma5-plasma-workspace SUBDIR += polybar SUBDIR += printscreen SUBDIR += props SUBDIR += py-caffeine-ng SUBDIR += py-pyscreenshot SUBDIR += py-pyvirtualdisplay SUBDIR += py-qt5-opengl SUBDIR += py-xcffib SUBDIR += py-xdot SUBDIR += py-xdot06 SUBDIR += qimageblitz SUBDIR += qt5-qev SUBDIR += qt5-x11extras SUBDIR += qterminal SUBDIR += radare-cutter SUBDIR += rendercheck SUBDIR += rgb SUBDIR += rofi SUBDIR += rofi-calc SUBDIR += rofi-pass SUBDIR += rox-wallpaper SUBDIR += roxbg SUBDIR += roxterm SUBDIR += rsibreak SUBDIR += rubygem-gnome SUBDIR += run_scaled SUBDIR += rxvt SUBDIR += rxvt-unicode SUBDIR += sakura SUBDIR += sbxkb SUBDIR += screen-message SUBDIR += scripts SUBDIR += sddm SUBDIR += sessreg SUBDIR += setlayout SUBDIR += setxkbmap SUBDIR += simdock SUBDIR += simplestroke SUBDIR += sisctrl SUBDIR += slick-greeter SUBDIR += slim SUBDIR += slock SUBDIR += slop SUBDIR += slurp SUBDIR += smproxy SUBDIR += sselp SUBDIR += stalonetray SUBDIR += startup-notification SUBDIR += sterm SUBDIR += stjerm SUBDIR += swarp SUBDIR += swaybg SUBDIR += swayidle SUBDIR += swaylock SUBDIR += sxhkd SUBDIR += sxpc SUBDIR += tabbed SUBDIR += temperature.app SUBDIR += terminal.app SUBDIR += terminator SUBDIR += terminology SUBDIR += thinglaunch SUBDIR += thingylaunch SUBDIR += tilda SUBDIR += tint SUBDIR += trayer SUBDIR += tycoon SUBDIR += urxvt-font-size SUBDIR += urxvt-perls SUBDIR += vdesk SUBDIR += viewres SUBDIR += virtboard SUBDIR += virtualgl SUBDIR += wallutils SUBDIR += waybar SUBDIR += wbar SUBDIR += wbarconf SUBDIR += wcm SUBDIR += wdisplays SUBDIR += wdm SUBDIR += wev SUBDIR += wf-shell SUBDIR += wl-clipboard SUBDIR += wmappl SUBDIR += wmblob SUBDIR += wmbutton SUBDIR += wmcliphist SUBDIR += wmctrl SUBDIR += wmdrawer SUBDIR += wmmatrix SUBDIR += wmsystemtray SUBDIR += wmutils-core SUBDIR += wmutils-opt SUBDIR += wmxss SUBDIR += workrave SUBDIR += x11perf SUBDIR += x3270 SUBDIR += xaniroc SUBDIR += xantfarm SUBDIR += xascii SUBDIR += xauth SUBDIR += xautolock SUBDIR += xautomation SUBDIR += xbacklight SUBDIR += xballoon SUBDIR += xbanish SUBDIR += xbanner SUBDIR += xbiff SUBDIR += xbindkeys SUBDIR += xbitmaps SUBDIR += xbrightness SUBDIR += xcalc SUBDIR += xcalib SUBDIR += xcape SUBDIR += xcb SUBDIR += xcb-proto SUBDIR += xcb-util SUBDIR += xcb-util-cursor SUBDIR += xcb-util-errors SUBDIR += xcb-util-image SUBDIR += xcb-util-keysyms SUBDIR += xcb-util-renderutil SUBDIR += xcb-util-wm SUBDIR += xcb-util-xrm SUBDIR += xcbautolock SUBDIR += xclip SUBDIR += xclipboard SUBDIR += xcm SUBDIR += xcmd SUBDIR += xcmsdb SUBDIR += xcoloredit SUBDIR += xcolors SUBDIR += xcolorsel SUBDIR += xconsole SUBDIR += xcursorgen SUBDIR += xcut SUBDIR += xditview SUBDIR += xdm SUBDIR += xdotool SUBDIR += xdpyinfo SUBDIR += xdriinfo SUBDIR += xdtm SUBDIR += xedit SUBDIR += xev SUBDIR += xeyes SUBDIR += xf86dga SUBDIR += xfce4-clipman-plugin SUBDIR += xfce4-conf SUBDIR += xfce4-dashboard SUBDIR += xfce4-embed-plugin SUBDIR += xfce4-goodies SUBDIR += xfce4-quicklauncher-plugin SUBDIR += xfce4-screensaver SUBDIR += xfce4-screenshooter-plugin SUBDIR += xfce4-taskmanager SUBDIR += xfce4-terminal SUBDIR += xfce4-verve-plugin SUBDIR += xfce4-whiskermenu-plugin SUBDIR += xfce4-wmdock-plugin SUBDIR += xfd SUBDIR += xfishtank SUBDIR += xforward SUBDIR += xgamma SUBDIR += xgc SUBDIR += xgrab SUBDIR += xhost SUBDIR += xidle SUBDIR += xinit SUBDIR += xinput SUBDIR += xkb-switch SUBDIR += xkbcomp SUBDIR += xkbctrl SUBDIR += xkbevd SUBDIR += xkbind SUBDIR += xkbprint SUBDIR += xkbset SUBDIR += xkbutils SUBDIR += xkeyboard-config SUBDIR += xkeycaps SUBDIR += xkeywrap SUBDIR += xkill SUBDIR += xload SUBDIR += xloadimage SUBDIR += xlockmore SUBDIR += xlogo SUBDIR += xlsatoms SUBDIR += xlsclients SUBDIR += xmag SUBDIR += xman SUBDIR += xmangekyou SUBDIR += xmascot SUBDIR += xmessage SUBDIR += xmh SUBDIR += xmodmap SUBDIR += xmon SUBDIR += xmore SUBDIR += xmotd SUBDIR += xmove SUBDIR += xmsg SUBDIR += xmx SUBDIR += xnee SUBDIR += xnodecor SUBDIR += xorg SUBDIR += xorg-apps SUBDIR += xorg-cf-files SUBDIR += xorg-docs SUBDIR += xorg-libraries SUBDIR += xorg-minimal SUBDIR += xorgproto SUBDIR += xpr SUBDIR += xpra SUBDIR += xprintidle SUBDIR += xprompt SUBDIR += xprop SUBDIR += xrandr SUBDIR += xrdb SUBDIR += xrefresh SUBDIR += xrestop SUBDIR += xrootconsole SUBDIR += xrsh SUBDIR += xrsi SUBDIR += xscope SUBDIR += xscreensaver SUBDIR += xscreensaver.app SUBDIR += xsel-conrad SUBDIR += xset SUBDIR += xsetroot SUBDIR += xsettingsd SUBDIR += xskyroot SUBDIR += xsm SUBDIR += xsnow SUBDIR += xstarroll SUBDIR += xstdcmap SUBDIR += xstroke SUBDIR += xtacy SUBDIR += xterm SUBDIR += xtermcontrol SUBDIR += xtermset SUBDIR += xtestpicture SUBDIR += xtoolwait SUBDIR += xtrans SUBDIR += xtrlock SUBDIR += xtset SUBDIR += xvattr SUBDIR += xvidtune SUBDIR += xvinfo SUBDIR += xvkbd SUBDIR += xvmcinfo SUBDIR += xvt SUBDIR += xwatchwin SUBDIR += xwd SUBDIR += xwininfo SUBDIR += xwinwrap SUBDIR += xwit SUBDIR += xwud SUBDIR += xxkb SUBDIR += xzoom SUBDIR += yad SUBDIR += yakuake SUBDIR += yalias SUBDIR += yeahconsole SUBDIR += yelp SUBDIR += zenity .include Index: head/x11/ly/Makefile =================================================================== --- head/x11/ly/Makefile (nonexistent) +++ head/x11/ly/Makefile (revision 517680) @@ -0,0 +1,66 @@ +# $FreeBSD$ + +PORTNAME= ly +DISTVERSIONPREFIX= v +DISTVERSION= 0.4.0 +CATEGORIES= x11 + +MAINTAINER= 0mp@FreeBSD.org +COMMENT= TUI (ncurses-like) display manager for X and Wayland + +LICENSE= WTFPL +LICENSE_FILE= ${WRKSRC}/license.md + +BUILD_DEPENDS= ginstall:sysutils/coreutils + +USES= gmake localbase xorg +USE_GITHUB= yes +GH_ACCOUNT= cylgom +GH_TUPLE= cylgom:argoat:36c41f09ecc2a10c9acf35e4194e08b6fa10cf45:argoat/sub/argoat \ + cylgom:testoasterror:71620b47872b5535f87c908883576d73153a6911:testoasterror/sub/argoat/sub/testoasterror \ + cylgom:configator:8227b3a835bf4c7e50a57e4ad6aff620ba0dc349:configator/sub/configator \ + cylgom:ctypes:5dd979d3644ab0c85ca14e72b61e6d3d238d432b:ctypes/sub/ctypes \ + cylgom:dragonfail:6b40d1f8b7f6dda9746e688666af623dfbcceb94:dragonfail/sub/dragonfail \ + cylgom:termbox_next:2312da153e44face7bb45aa2798ec284289c17ca:termbox_next/sub/termbox_next +USE_XORG= xcb + +MAKEFILE= makefile +MAKE_ARGS= CC="${CC}" \ + DISTVERSIONFULL="${DISTVERSIONFULL}" +ALL_TARGET= final + +BINARY_ALIAS= install=ginstall + +SUB_FILES= pkg-message + +_GITDIR= ${WRKDIR}/${GH_PROJECT}-git + +post-patch: + # Note to maintainers: patches can be regenerated with + # "make clean extract do-patch makepatch" (YMMV). + @${REINPLACE_CMD} "s|%%ETCDIR%%|${ETCDIR}|g" ${WRKSRC}/src/config.c + @${REINPLACE_CMD} -e "s|%%ETCDIR%%|${ETCDIR}|g" \ + -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \ + ${WRKSRC}/res/config.ini + @${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \ + ${WRKSRC}/res/xsetup.sh + +post-install: + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ly +.for _f in config.ini xsetup.sh wsetup.sh + @${MV} ${STAGEDIR}${ETCDIR}/${_f} \ + ${STAGEDIR}${ETCDIR}/${_f}.sample +.endfor + +# Target for maintainers. Use this target to regenerate GH_TUPLE for Git +# submodules used by the project (and project's dependencies). +_git-submodules-to-gh-tuple: + ${RM} -r ${_GITDIR} + git clone https://github.com/${GH_ACCOUNT}/${GH_PROJECT} ${_GITDIR} + git -C ${_GITDIR} checkout ${GH_TAGNAME} + ${REINPLACE_CMD} 's/make github/${MAKE_CMD} github/g' ${_GITDIR}/makefile + ${MAKE_CMD} -C ${_GITDIR} github + git -C ${_GITDIR} submodule status --recursive | cut -c 2- | \ + ${AWK} -f ${FILESDIR}/git-submodules-to-gh-tuple.awk + +.include Property changes on: head/x11/ly/Makefile ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11/ly/distinfo =================================================================== --- head/x11/ly/distinfo (nonexistent) +++ head/x11/ly/distinfo (revision 517680) @@ -0,0 +1,15 @@ +TIMESTAMP = 1573652164 +SHA256 (cylgom-ly-v0.4.0_GH0.tar.gz) = c4e505be200d54679f27929cffb1f4625c20ab51e8b6ffe7c06b3bccff5fb40d +SIZE (cylgom-ly-v0.4.0_GH0.tar.gz) = 18807 +SHA256 (cylgom-argoat-36c41f09ecc2a10c9acf35e4194e08b6fa10cf45_GH0.tar.gz) = 5c284cae748b1cec4eef311845f53ad673f91996ec425c6e323f0c40e829e77f +SIZE (cylgom-argoat-36c41f09ecc2a10c9acf35e4194e08b6fa10cf45_GH0.tar.gz) = 5497 +SHA256 (cylgom-testoasterror-71620b47872b5535f87c908883576d73153a6911_GH0.tar.gz) = bffa1100ffbb7d541a16a9a543e216748fe6f6264fd2b9137738cebcf68d3e8c +SIZE (cylgom-testoasterror-71620b47872b5535f87c908883576d73153a6911_GH0.tar.gz) = 3360 +SHA256 (cylgom-configator-8227b3a835bf4c7e50a57e4ad6aff620ba0dc349_GH0.tar.gz) = bde1826acb80092bd551985082dc872c7f3e48e03132c377f0e5cdd2f9f331e3 +SIZE (cylgom-configator-8227b3a835bf4c7e50a57e4ad6aff620ba0dc349_GH0.tar.gz) = 4501 +SHA256 (cylgom-ctypes-5dd979d3644ab0c85ca14e72b61e6d3d238d432b_GH0.tar.gz) = 778189ee022a0ad97073372681fb92a7b2a1ecc5a242e99b1f23745f084ee3e1 +SIZE (cylgom-ctypes-5dd979d3644ab0c85ca14e72b61e6d3d238d432b_GH0.tar.gz) = 1242 +SHA256 (cylgom-dragonfail-6b40d1f8b7f6dda9746e688666af623dfbcceb94_GH0.tar.gz) = c185f739e392313c08b0d5fd27e93891b89c36b7b49b83570b601b9cbfbddae1 +SIZE (cylgom-dragonfail-6b40d1f8b7f6dda9746e688666af623dfbcceb94_GH0.tar.gz) = 3348 +SHA256 (cylgom-termbox_next-2312da153e44face7bb45aa2798ec284289c17ca_GH0.tar.gz) = b788c86e1454c32cd218d0478a87def0a4d1322fef407885359d1ed0c343b045 +SIZE (cylgom-termbox_next-2312da153e44face7bb45aa2798ec284289c17ca_GH0.tar.gz) = 23558 Property changes on: head/x11/ly/distinfo ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11/ly/files/git-submodules-to-gh-tuple.awk =================================================================== --- head/x11/ly/files/git-submodules-to-gh-tuple.awk (nonexistent) +++ head/x11/ly/files/git-submodules-to-gh-tuple.awk (revision 517680) @@ -0,0 +1,20 @@ +#! /usr/bin/awk -f +# $FreeBSD$ + +BEGIN { + group_number = 0 + printf "GH_TUPLE=" +} + +{ + account = "cylgom" + project = $2 + gsub(".*/", "", project) + hash = $1 + path = $2 + printf " \\\n\t%s:%s:%s:%s/%s", account, project, hash, project, path +} + +END { + printf "\n" +} Property changes on: head/x11/ly/files/git-submodules-to-gh-tuple.awk ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11/ly/files/patch-makefile =================================================================== --- head/x11/ly/files/patch-makefile (nonexistent) +++ head/x11/ly/files/patch-makefile (revision 517680) @@ -0,0 +1,47 @@ +--- makefile.orig 2019-09-21 16:00:16 UTC ++++ makefile +@@ -1,9 +1,9 @@ + NAME = ly + CC = gcc + FLAGS = -std=c99 -pedantic -g +-FLAGS+= -Wall -Wno-unused-parameter -Wextra -Werror=vla -Werror ++FLAGS+= -Wall -Wno-unused-parameter -Wextra -Werror=vla + #FLAGS+= -DDEBUG +-FLAGS+= -DGIT_VERSION_STRING=\"$(shell git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g')\" ++FLAGS+= -DGIT_VERSION_STRING=\"${DISTVERSIONFULL}\" + LINK = -lpam -lxcb + VALGRIND = --show-leak-kinds=all --track-origins=yes --leak-check=full --suppressions=../res/valgrind.supp + CMD = ./$(NAME) +@@ -12,6 +12,10 @@ OS:= $(shell uname -s) + ifeq ($(OS), Linux) + FLAGS+= -D_DEFAULT_SOURCE + endif ++ifeq ($(OS), FreeBSD) ++ FLAGS+= -D_DEFAULT_SOURCE ${CPPFLAGS} ${CFLAGS} ++ LINK+= ${LIBS} ++endif + + BIND = bin + OBJD = obj +@@ -68,14 +72,13 @@ leakgrind: $(BIND)/$(NAME) + + install: $(BIND)/$(NAME) + @echo "installing" +- @install -dZ ${DESTDIR}/etc/ly +- @install -DZ $(BIND)/$(NAME) -t ${DESTDIR}/usr/bin +- @install -DZ $(RESD)/xsetup.sh -t ${DESTDIR}/etc/ly +- @install -DZ $(RESD)/wsetup.sh -t ${DESTDIR}/etc/ly +- @install -DZ $(RESD)/config.ini -t ${DESTDIR}/etc/ly +- @install -dZ ${DESTDIR}/etc/ly/lang +- @install -DZ $(RESD)/lang/* -t ${DESTDIR}/etc/ly/lang +- @install -DZ $(RESD)/ly.service -t ${DESTDIR}/usr/lib/systemd/system ++ @install -dZ ${DESTDIR}${PREFIX}/etc/ly ++ @install -DZ $(BIND)/$(NAME) -t ${DESTDIR}${PREFIX}/bin ++ @install -DZ $(RESD)/xsetup.sh -t ${DESTDIR}${PREFIX}/etc/ly ++ @install -DZ $(RESD)/wsetup.sh -t ${DESTDIR}${PREFIX}/etc/ly ++ @install -DZ $(RESD)/config.ini -t ${DESTDIR}${PREFIX}/etc/ly ++ @install -dZ ${DESTDIR}${PREFIX}/etc/ly/lang ++ @install -DZ $(RESD)/lang/* -t ${DESTDIR}${PREFIX}/etc/ly/lang + + uninstall: + @echo "uninstalling" Property changes on: head/x11/ly/files/patch-makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11/ly/files/patch-res_config.ini =================================================================== --- head/x11/ly/files/patch-res_config.ini (nonexistent) +++ head/x11/ly/files/patch-res_config.ini (revision 517680) @@ -0,0 +1,69 @@ +--- res/config.ini.orig 2019-06-26 21:11:33 UTC ++++ res/config.ini +@@ -1,3 +1,5 @@ ++# This is a FreeBSD-ready patched version of the upstream configuration file. ++ + # animation enabled + #animate = false + #animate = true +@@ -52,12 +54,15 @@ + + # cookie generator + #mcookie_cmd = /usr/bin/mcookie ++# startx uses the same replacement for mcookie. ++mcookie_cmd = /usr/bin/openssl rand -hex 16 + + # event timeout in milliseconds + #min_refresh_delta = 5 + + # default path + #path = /sbin:/bin:/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/bin/env ++path = /sbin:/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/usr/bin/env + + # command executed when pressing F2 + #restart_cmd = /sbin/shutdown -r now +@@ -67,12 +72,14 @@ + + # file in which to save and load the default desktop and login + #save_file = /etc/ly/save ++save_file = %%ETCDIR%%/save + + # service name (pam needs this set to login) + #service_name = login + + # command executed when pressing F1 + #shutdown_cmd = /sbin/shutdown -a now ++shutdown_cmd = /sbin/shutdown -p now + + # terminal reset command (tput is faster) + #term_reset_cmd = /usr/bin/tput reset +@@ -80,20 +87,29 @@ + # tty in use + #tty = 2 + ++# vt in use by X or Wayland ++#vt = 9 ++ + # wayland setup command + #wayland_cmd = /etc/ly/wsetup.sh ++wayland_cmd = %%ETCDIR%%/wsetup.sh + + # wayland desktop environments + #waylandsessions = /usr/share/wayland-sessions ++waylandsessions = %%LOCALBASE%%/share/wayland-sessions + + # xorg server command + #x_cmd = /usr/bin/X ++x_cmd = %%LOCALBASE%%/bin/X + + # xorg setup command + #x_cmd_setup = /etc/ly/xsetup.sh ++x_cmd_setup = %%ETCDIR%%/xsetup.sh + + # xorg xauthority edition tool + #xauth_cmd = /usr/bin/xauth ++xauth_cmd = %%LOCALBASE%%/bin/xauth + + # xorg desktop environments + #xsessions = /usr/share/xsessions ++xsessions = %%LOCALBASE%%/share/xsessions Property changes on: head/x11/ly/files/patch-res_config.ini ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11/ly/files/patch-res_xsetup.sh =================================================================== --- head/x11/ly/files/patch-res_xsetup.sh (nonexistent) +++ head/x11/ly/files/patch-res_xsetup.sh (revision 517680) @@ -0,0 +1,41 @@ +--- res/xsetup.sh.orig 2019-11-13 13:46:11 UTC ++++ res/xsetup.sh +@@ -55,8 +55,8 @@ esac + [ -f $HOME/.xprofile ] && . $HOME/.xprofile + + # run all system xinitrc shell scripts. +-if [ -d /etc/X11/xinit/xinitrc.d ]; then +- for i in /etc/X11/xinit/xinitrc.d/* ; do ++if [ -d %%LOCALBASE%%/etc/X11/xinit/xinitrc.d ]; then ++ for i in %%LOCALBASE%%/etc/X11/xinit/xinitrc.d/* ; do + if [ -x "$i" ]; then + . "$i" + fi +@@ -66,8 +66,8 @@ fi + # Load Xsession scripts + # OPTIONFILE, USERXSESSION, USERXSESSIONRC and ALTUSERXSESSION are required + # by the scripts to work +-xsessionddir="/etc/X11/Xsession.d" +-OPTIONFILE=/etc/X11/Xsession.options ++xsessionddir="%%LOCALBASE%%/etc/X11/Xsession.d" ++OPTIONFILE=%%LOCALBASE%%/etc/X11/Xsession.options + USERXSESSION=$HOME/.xsession + USERXSESSIONRC=$HOME/.xsessionrc + ALTUSERXSESSION=$HOME/.Xsession +@@ -82,12 +82,12 @@ if [ -d "$xsessionddir" ]; then + done + fi + +-if [ -d /etc/X11/Xresources ]; then +- for i in /etc/X11/Xresources/*; do ++if [ -d %%LOCALBASE%%/etc/X11/Xresources ]; then ++ for i in %%LOCALBASE%%/etc/X11/Xresources/*; do + [ -f $i ] && xrdb -merge $i + done +-elif [ -f /etc/X11/Xresources ]; then +- xrdb -merge /etc/X11/Xresources ++elif [ -f %%LOCALBASE%%/etc/X11/Xresources ]; then ++ xrdb -merge %%LOCALBASE%%/etc/X11/Xresources + fi + [ -f $HOME/.Xresources ] && xrdb -merge $HOME/.Xresources + Property changes on: head/x11/ly/files/patch-res_xsetup.sh ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11/ly/files/patch-src_config.c =================================================================== --- head/x11/ly/files/patch-src_config.c (nonexistent) +++ head/x11/ly/files/patch-src_config.c (revision 517680) @@ -0,0 +1,38 @@ +--- src/config.c.orig 2019-06-26 21:11:33 UTC ++++ src/config.c +@@ -9,8 +9,8 @@ + #include + + #ifndef DEBUG +- #define INI_LANG "/etc/ly/lang/%s.ini" +- #define INI_CONFIG "/etc/ly/config.ini" ++ #define INI_LANG "%%ETCDIR%%/lang/%s.ini" ++ #define INI_CONFIG "%%ETCDIR%%/config.ini" + #else + #define INI_LANG "../res/lang/%s.ini" + #define INI_CONFIG "../res/config.ini" +@@ -179,6 +179,7 @@ void config_load() + {"shutdown_cmd", &config.shutdown_cmd, config_handle_str}, + {"term_reset_cmd", &config.term_reset_cmd, config_handle_str}, + {"tty", &config.tty, config_handle_u8}, ++ {"vt", &config.vt, config_handle_u8}, + {"wayland_cmd", &config.wayland_cmd, config_handle_str}, + {"waylandsessions", &config.waylandsessions, config_handle_str}, + {"x_cmd", &config.x_cmd, config_handle_str}, +@@ -187,7 +188,7 @@ void config_load() + {"xsessions", &config.xsessions, config_handle_str}, + }; + +- uint16_t map_len[] = {34}; ++ uint16_t map_len[] = {35}; + struct configator_param* map[] = + { + map_no_section, +@@ -284,6 +285,7 @@ void config_defaults() + config.shutdown_cmd = strdup("/sbin/shutdown -a now"); + config.term_reset_cmd = strdup("/usr/bin/tput reset"); + config.tty = 2; ++ config.vt = 9; + config.wayland_cmd = strdup("/etc/ly/wsetup.sh"); + config.waylandsessions = strdup("/usr/share/wayland-sessions"); + config.x_cmd = strdup("/usr/bin/X"); Property changes on: head/x11/ly/files/patch-src_config.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11/ly/files/patch-src_config.h =================================================================== --- head/x11/ly/files/patch-src_config.h (nonexistent) +++ head/x11/ly/files/patch-src_config.h (revision 517680) @@ -0,0 +1,10 @@ +--- src/config.h.orig 2019-11-12 22:29:26 UTC ++++ src/config.h +@@ -82,6 +82,7 @@ struct config + char* shutdown_cmd; + char* term_reset_cmd; + u8 tty; ++ u8 vt; + char* wayland_cmd; + char* waylandsessions; + char* x_cmd; Property changes on: head/x11/ly/files/patch-src_config.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11/ly/files/patch-src_login.c =================================================================== --- head/x11/ly/files/patch-src_login.c (nonexistent) +++ head/x11/ly/files/patch-src_login.c (revision 517680) @@ -0,0 +1,30 @@ +--- src/login.c.orig 2019-09-21 16:00:16 UTC ++++ src/login.c +@@ -239,9 +239,15 @@ void env_init(struct passwd* pwd, const char* display_ + + void env_xdg(const char* tty_id, const enum display_server display_server) + { +- char user[15]; +- snprintf(user, 15, "/run/user/%d", getuid()); +- setenv("XDG_RUNTIME_DIR", user, 0); ++ // The "/run/user/%d" directory is not available on FreeBSD. It is much ++ // better to stick to the defaults and let applications using ++ // XDG_RUNTIME_DIR to fall back to directories inside user's home ++ // directory. ++ /* ++ * char user[15]; ++ * snprintf(user, 15, "/run/user/%d", getuid()); ++ * setenv("XDG_RUNTIME_DIR", user, 0); ++ */ + setenv("XDG_SESSION_CLASS", "user", 0); + setenv("XDG_SEAT", "seat0", 0); + setenv("XDG_VTNR", tty_id, 0); +@@ -553,7 +559,7 @@ void auth( + + snprintf(display_name, 3, ":%d", display_id); + snprintf(tty_id, 3, "%d", config.tty); +- snprintf(vt, 5, "vt%d", config.tty); ++ snprintf(vt, 5, "vt%d", config.vt); + + // set env + env_init(pwd, display_name); Property changes on: head/x11/ly/files/patch-src_login.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11/ly/files/pkg-message.in =================================================================== --- head/x11/ly/files/pkg-message.in (nonexistent) +++ head/x11/ly/files/pkg-message.in (revision 517680) @@ -0,0 +1,18 @@ +[ +{ type: install + message: <