6 files changed, 86 insertions, 0 deletions

diff --git a/x11-wm/Makefile b/x11-wm/Makefile
index a924fd1671f9..90894a370e81 100644
--- a/x11-wm/Makefile
+++ b/x11-wm/Makefile
@@ -13,6 +13,7 @@
     SUBDIR += awesome-vicious
     SUBDIR += bbkeys
     SUBDIR += bbpager
+    SUBDIR += berry
     SUBDIR += blackbox
     SUBDIR += bspwm
     SUBDIR += cage
diff --git a/x11-wm/berry/Makefile b/x11-wm/berry/Makefile
new file mode 100644
index 000000000000..c2f77ecb8055
--- /dev/null
+++ b/x11-wm/berry/Makefile
@@ -0,0 +1,49 @@
+# $FreeBSD$
+
+PORTNAME=	berry
+PORTVERSION=	0.1.5
+CATEGORIES=	x11-wm
+
+MAINTAINER=	vulcan@wired.sh
+COMMENT=	Byte-sized, Xlib-based window manager
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig
+
+USES=		xorg
+USE_GITHUB=	yes
+GH_ACCOUNT=	JLErvin
+USE_XORG=	x11 xft xinerama
+
+MAKE_ARGS=	CC="${CC}" \
+		FREETYPEINC="${LOCALBASE}/include/freetype2" \
+		MANPREFIX="${MANPREFIX}/man" \
+		X11INC="${LOCALBASE}/include" \
+		X11LIB="${LOCALBASE}/lib"
+
+PLIST_FILES=	bin/${PORTNAME} \
+		bin/${PORTNAME}c \
+		man/man1/${PORTNAME}.1.gz \
+		man/man1/${PORTNAME}c.1.gz
+PORTDOCS=	README.md
+PORTEXAMPLES=	autostart sxhkdrc xephyr.sh
+
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
+post-patch:
+	@${REINPLACE_CMD} -e 's,va_copy(,__&,' ${WRKSRC}/utils.c
+	@${REINPLACE_CMD} -e '/^#!/s,bash,sh,' \
+		${WRKSRC}/examples/autostart ${WRKSRC}/examples/xephyr.sh
+
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
+
+post-install-EXAMPLES-on:
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${PORTEXAMPLES:S,^,${WRKSRC}/examples/,} \
+		${STAGEDIR}${EXAMPLESDIR}
+
+.include <bsd.port.mk>
diff --git a/x11-wm/berry/distinfo b/x11-wm/berry/distinfo
new file mode 100644
index 000000000000..3644af29ce07
--- /dev/null
+++ b/x11-wm/berry/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1587683926
+SHA256 (JLErvin-berry-0.1.5_GH0.tar.gz) = 3d2fa52aeba6ed05d3cc0e8308604c5a83e94a8623f3e66ed53fd5e0fdabfabf
+SIZE (JLErvin-berry-0.1.5_GH0.tar.gz) = 23651
diff --git a/x11-wm/berry/files/patch-Makefile b/x11-wm/berry/files/patch-Makefile
new file mode 100644
index 000000000000..b8e98008c791
--- /dev/null
+++ b/x11-wm/berry/files/patch-Makefile
@@ -0,0 +1,15 @@
+--- Makefile.orig	2020-04-23 23:18:46 UTC
++++ Makefile
+@@ -41,10 +41,8 @@ dist: clean
+ 
+ install: all
+ 	mkdir -p ${DESTDIR}${PREFIX}/bin
+-	cp -f berry ${DESTDIR}${PREFIX}/bin
+-	cp -f berryc ${DESTDIR}${PREFIX}/bin
+-	chmod 755 ${DESTDIR}${PREFIX}/bin/berry
+-	chmod 755 ${DESTDIR}${PREFIX}/bin/berryc
++	${BSD_INSTALL_PROGRAM} berry ${DESTDIR}${PREFIX}/bin
++	${BSD_INSTALL_PROGRAM} berryc ${DESTDIR}${PREFIX}/bin
+ 	mkdir -p ${DESTDIR}${MANPREFIX}/man1
+ 	sed "s/VERSION/${VERSION}/g" < berry.1 > ${DESTDIR}${MANPREFIX}/man1/berry.1
+ 	sed "s/VERSION/${VERSION}/g" < berryc.1 > ${DESTDIR}${MANPREFIX}/man1/berryc.1
diff --git a/x11-wm/berry/files/patch-config.mk b/x11-wm/berry/files/patch-config.mk
new file mode 100644
index 000000000000..31fbb44fc9bf
--- /dev/null
+++ b/x11-wm/berry/files/patch-config.mk
@@ -0,0 +1,13 @@
+--- config.mk.orig	2020-04-23 23:18:46 UTC
++++ config.mk
+@@ -36,8 +36,8 @@ LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIB
+ # flags
+ CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=2 -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} ${DEBUG_CPPFLAGS}
+ #CFLAGS   = -g -std=c99 -pedantic -Wall -O0 ${INCS} ${CPPFLAGS} ${DEBUG_CFLAGS}
+-CFLAGS   = -std=c99 -pedantic -Wall -Wno-deprecated-declarations -Os ${INCS} ${CPPFLAGS} ${DEBUG_CFLAGS} $(NAME_DEFINES)
+-LDFLAGS  = ${LIBS}
++CFLAGS  += -std=c99 -pedantic -Wall -Wno-deprecated-declarations ${INCS} ${CPPFLAGS} ${DEBUG_CFLAGS} $(NAME_DEFINES)
++LDFLAGS += ${LIBS} -lm
+ 
+ # Solaris
+ #CFLAGS  = -fast ${INCS} -DVERSION=\"${VERSION}\"
diff --git a/x11-wm/berry/pkg-descr b/x11-wm/berry/pkg-descr
new file mode 100644
index 000000000000..c3fe8801a25e
--- /dev/null
+++ b/x11-wm/berry/pkg-descr
@@ -0,0 +1,5 @@
+Minimal window manager, controlled via a powerful command-line client,
+allowing users to control windows via a hotkey daemon such as sxhkd or
+expand functionality via shell scripts.
+
+WWW: https://berrywm.org/