summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--wm/Makefile3
-rw-r--r--wm/berry/DESCR1
-rw-r--r--wm/berry/Makefile26
-rw-r--r--wm/berry/PLIST5
-rw-r--r--wm/berry/distinfo7
-rw-r--r--wm/berry/patches/patch-config.mk17
6 files changed, 58 insertions, 1 deletions
diff --git a/wm/Makefile b/wm/Makefile
index 980fdc62625..8c64e7b61e6 100644
--- a/wm/Makefile
+++ b/wm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.154 2020/11/10 01:56:20 nia Exp $
+# $NetBSD: Makefile,v 1.155 2020/12/05 13:13:42 nia Exp $
#
COMMENT= X11 window managers, configuration tools, and themes
@@ -10,6 +10,7 @@ SUBDIR+= aewm++
SUBDIR+= afterstep
SUBDIR+= amiwm
SUBDIR+= awesome
+SUBDIR+= berry
SUBDIR+= bbkeys
SUBDIR+= bbkeys09
SUBDIR+= bbpager
diff --git a/wm/berry/DESCR b/wm/berry/DESCR
new file mode 100644
index 00000000000..3fe3b8d8916
--- /dev/null
+++ b/wm/berry/DESCR
@@ -0,0 +1 @@
+A healthy, bite-sized window manager written in C over the XLib library.
diff --git a/wm/berry/Makefile b/wm/berry/Makefile
new file mode 100644
index 00000000000..6a4f9cf4154
--- /dev/null
+++ b/wm/berry/Makefile
@@ -0,0 +1,26 @@
+# $NetBSD: Makefile,v 1.1 2020/12/05 13:13:42 nia Exp $
+
+DISTNAME= berry-0.1.7
+CATEGORIES= wm x11
+MASTER_SITES= ${MASTER_SITE_GITHUB:=JLErvin/}
+
+MAINTAINER= pkgsrc-users@NetBSD.org
+HOMEPAGE= https://github.com/JLErvin/berry
+COMMENT= Healthy, byte-sized window manager
+LICENSE= mit
+
+USE_TOOLS+= gmake
+
+MAKE_FLAGS+= CC=${CC}
+MAKE_FLAGS+= PREFIX=${PREFIX}
+MAKE_FLAGS+= MANPREFIX=${PREFIX}/${PKGMANDIR}
+MAKE_FLAGS+= X11INC=${X11BASE}/include
+MAKE_FLAGS+= X11LIB=${X11BASE}/lib
+MAKE_FLAGS+= FREETYPEINC=${BUILDLINK_PREFIX.freetype2}/include
+
+.include "../../fonts/fontconfig/buildlink3.mk"
+.include "../../graphics/freetype2/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
+.include "../../x11/libXinerama/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/wm/berry/PLIST b/wm/berry/PLIST
new file mode 100644
index 00000000000..e0fb8022cdb
--- /dev/null
+++ b/wm/berry/PLIST
@@ -0,0 +1,5 @@
+@comment $NetBSD: PLIST,v 1.1 2020/12/05 13:13:42 nia Exp $
+bin/berry
+bin/berryc
+man/man1/berry.1
+man/man1/berryc.1
diff --git a/wm/berry/distinfo b/wm/berry/distinfo
new file mode 100644
index 00000000000..74c6dfea957
--- /dev/null
+++ b/wm/berry/distinfo
@@ -0,0 +1,7 @@
+$NetBSD: distinfo,v 1.1 2020/12/05 13:13:42 nia Exp $
+
+SHA1 (berry-0.1.7.tar.gz) = 3825d018e6ed4dfb8972a2f738875954c8647b76
+RMD160 (berry-0.1.7.tar.gz) = 25350583990c24d098bf8bbd29a5bd90b7107651
+SHA512 (berry-0.1.7.tar.gz) = 2920890324d25b71da616960b1914aafcfabf542049696daecfe699ed447ee4e78427067fc1c11e27a466196f9c6d9b7c3b2a36f85c80ac03f5856f38e2e2e66
+Size (berry-0.1.7.tar.gz) = 25570 bytes
+SHA1 (patch-config.mk) = fd3c16781bd3b9ea51b1398275be4c77380ea489
diff --git a/wm/berry/patches/patch-config.mk b/wm/berry/patches/patch-config.mk
new file mode 100644
index 00000000000..b299142c07e
--- /dev/null
+++ b/wm/berry/patches/patch-config.mk
@@ -0,0 +1,17 @@
+$NetBSD: patch-config.mk,v 1.1 2020/12/05 13:13:43 nia Exp $
+
+Respect CFLAGS/LDFLAGS.
+
+--- config.mk.orig 2020-11-02 17:22:47.000000000 +0000
++++ config.mk
+@@ -36,8 +36,8 @@ LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS}
+ # 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 -Os ${INCS} ${CPPFLAGS} ${DEBUG_CFLAGS} $(NAME_DEFINES)
++LDFLAGS += ${LIBS}
+
+ # Solaris
+ #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"