mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-18 19:49:40 +00:00
Code Issues Releases Activity

x11-wm/berry: Update to 0.1.8

Browse Source 
Changes:	https://github.com/JLErvin/berry/compare/0.1.7...0.1.8
This commit is contained in:
Lewis Cook 2021-05-14 20:42:42 +01:00
parent ba97af3167
commit 5e614e8a50
4 changed files with 16 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
x11-wm/berry/Makefile
View File

@ -1,5 +1,5 @@
PORTNAME= berry
PORTVERSION= 0.1.7
DISTVERSION= 0.1.8
CATEGORIES= x11-wm
MAINTAINER= lcook@FreeBSD.org
@ -8,18 +8,17 @@ COMMENT= Byte-sized, Xlib-based window manager
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig
LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2
USES= xorg
USES= gmake pkgconfig 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"
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --mandir=${MANPREFIX}/man \
--prefix=${PREFIX}
PLIST_FILES= bin/${PORTNAME} \
bin/${PORTNAME}c \
@ -31,13 +30,16 @@ PORTEXAMPLES= autostart sxhkdrc xephyr.sh
OPTIONS_DEFINE= DOCS EXAMPLES
post-patch:
@${REINPLACE_CMD} -e 's,va_copy(,__&,' ${WRKSRC}/utils.c
@${REINPLACE_CMD} -e 's,va_copy(,__&,' \
${WRKSRC}/utils.c
@${REINPLACE_CMD} -e '/^#!/s,bash,sh,' \
${WRKSRC}/examples/autostart ${WRKSRC}/examples/xephyr.sh
${WRKSRC}/examples/autostart \
${WRKSRC}/examples/xephyr.sh
post-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} \
${STAGEDIR}${DOCSDIR}
post-install-EXAMPLES-on:
@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}

6
x11-wm/berry/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1604446171
SHA256 (JLErvin-berry-0.1.7_GH0.tar.gz) = 4d5de2a32be34e1dcb591f5ee821b2437e10093cb7f04b4b2ed873332fbe5763
SIZE (JLErvin-berry-0.1.7_GH0.tar.gz) = 25570
TIMESTAMP = 1621012160
SHA256 (JLErvin-berry-0.1.8_GH0.tar.gz) = bcdf93805ad023d5635f5017230636bbfbe2698721cf4a0041a48ffb19d58844
SIZE (JLErvin-berry-0.1.8_GH0.tar.gz) = 28468

15
x11-wm/berry/files/patch-Makefile
View File

@ -1,15 +0,0 @@
--- 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

13
x11-wm/berry/files/patch-config.mk
View File

@ -1,13 +0,0 @@
--- 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}\"