Update to sent-1; now uses farbfeld as an RDEP.

Pick up MAINTAINER
ok jung@ (previous MAINTAINER)
This commit is contained in:
bcallah 2017-11-14 17:19:37 +00:00
parent 3d0524115e
commit 43376ecdb7
6 changed files with 48 additions and 46 deletions

View File

@ -1,24 +1,24 @@
# $OpenBSD: Makefile,v 1.3 2017/04/24 08:46:19 sthen Exp $
# $OpenBSD: Makefile,v 1.4 2017/11/14 17:19:37 bcallah Exp $
COMMENT= simple plaintext presentation tool
DISTNAME= sent-0.2
REVISION= 0
DISTNAME= sent-1
CATEGORIES= misc productivity
HOMEPAGE= http://tools.suckless.org/sent
MAINTAINER = Joerg Jung <jung@openbsd.org>
MAINTAINER = Brian Callahan <bcallah@openbsd.org>
# MIT/X
PERMIT_PACKAGE_CDROM= Yes
WANTLIB= X11 Xft c fontconfig m png
WANTLIB= X11 Xft c fontconfig m
MASTER_SITES= http://dl.suckless.org/tools/
LIB_DEPENDS= graphics/png
RUN_DEPENDS= archivers/bzip2 \
graphics/farbfeld
MAKE_FLAGS= CC="${CC}"
MAKE_ENV= LDFLAGS="${LDFLAGS}"
@ -26,4 +26,6 @@ FAKE_FLAGS= DESTDIR=""
NO_TEST= Yes
WRKDIST = ${WRKDIR}
.include <bsd.port.mk>

View File

@ -1,2 +1,2 @@
SHA256 (sent-0.2.tar.gz) = U7lh+dkqJ3pkCN9wJbSm3q5rZVp5c4PJNEIpDkU5EHY=
SIZE (sent-0.2.tar.gz) = 13479
SHA256 (sent-1.tar.gz) = e/PekxHOKR/zat9TFbePpyNz46uAynE4f7WIS8vXvjM=
SIZE (sent-1.tar.gz) = 15285

View File

@ -1,6 +1,7 @@
$OpenBSD: patch-Makefile,v 1.1.1.1 2015/11/14 19:38:55 jung Exp $
--- Makefile.orig Wed Nov 11 23:46:24 2015
+++ Makefile Fri Nov 13 22:09:56 2015
$OpenBSD: patch-Makefile,v 1.2 2017/11/14 17:19:37 bcallah Exp $
Index: Makefile
--- Makefile.orig
+++ Makefile
@@ -18,14 +18,12 @@ config.h:
cp config.def.h config.h
@ -18,7 +19,7 @@ $OpenBSD: patch-Makefile,v 1.1.1.1 2015/11/14 19:38:55 jung Exp $
cscope: ${SRC} config.h
@echo cScope
@@ -44,10 +42,10 @@ dist: clean
@@ -44,14 +42,11 @@ dist: clean
@rm -rf sent-${VERSION}
install: all
@ -26,10 +27,15 @@ $OpenBSD: patch-Makefile,v 1.1.1.1 2015/11/14 19:38:55 jung Exp $
- @mkdir -p ${DESTDIR}${PREFIX}/bin
- @cp -f sent ${DESTDIR}${PREFIX}/bin
- @chmod 755 ${DESTDIR}${PREFIX}/bin/sent
- @echo installing manual page to ${DESTDIR}${MANPREFIX}/man1
- @mkdir -p ${DESTDIR}${MANPREFIX}/man1
- @cp sent.1 ${DESTDIR}${MANPREFIX}/man1/sent.1
- @chmod 644 ${DESTDIR}${MANPREFIX}/man1/sent.1
+ ${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin
+ ${BSD_INSTALL_PROGRAM} sent ${DESTDIR}${PREFIX}/bin
+ ${BSD_INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/sent
+ ${BSD_INSTALL_DATA} example nyan.png ${DESTDIR}${PREFIX}/share/examples/sent
+ ${BSD_INSTALL_DATA} example nyan.png transparent_test.ff \
+ ${DESTDIR}${PREFIX}/share/examples/sent
uninstall:
@echo removing executable file from ${DESTDIR}${PREFIX}/bin

View File

@ -1,14 +1,15 @@
$OpenBSD: patch-config_def_h,v 1.2 2015/11/26 09:57:07 jung Exp $
--- config.def.h.orig Thu Nov 19 19:37:08 2015
+++ config.def.h Wed Nov 25 12:35:33 2015
@@ -8,8 +8,8 @@ static char *fontfallbacks[] = {
#define NUMFONTSCALES 42
$OpenBSD: patch-config_def_h,v 1.3 2017/11/14 17:19:37 bcallah Exp $
Index: config.def.h
--- config.def.h.orig
+++ config.def.h
@@ -9,8 +9,8 @@ static char *fontfallbacks[] = {
#define FONTSZ(x) ((int)(10.0 * powf(1.1288, (x)))) /* x in [0, NUMFONTSCALES-1] */
-static const char *fgcol = "#000000";
-static const char *bgcol = "#FFFFFF";
+static const char *fgcol = "#c0c0c0";
+static const char *bgcol = "#202020";
static const char *colors[] = {
- "#000000", /* foreground color */
- "#FFFFFF", /* background color */
+ "#c0c0c0", /* foreground color */
+ "#202020", /* background color */
};
static const float linespacing = 1.4;

View File

@ -1,14 +1,15 @@
$OpenBSD: patch-config_mk,v 1.3 2017/04/24 08:46:19 sthen Exp $
--- config.mk.orig Thu Nov 19 18:37:08 2015
+++ config.mk Mon Apr 24 09:42:16 2017
@@ -4,22 +4,22 @@ VERSION = 0.2
$OpenBSD: patch-config_mk,v 1.4 2017/11/14 17:19:37 bcallah Exp $
Index: config.mk
--- config.mk.orig
+++ config.mk
@@ -4,17 +4,17 @@ VERSION = 1
# Customize below to fit your system
# paths
-PREFIX = /usr/local
-MANPREFIX = ${PREFIX}/share/man
+PREFIX ?= /usr/local
+MANPREFIX = ${PREFIX}/man
+MANPREFIX ?= ${PREFIX}/share/man
-X11INC = /usr/X11R6/include
-X11LIB = /usr/X11R6/lib
@ -17,20 +18,11 @@ $OpenBSD: patch-config_mk,v 1.3 2017/04/24 08:46:19 sthen Exp $
# includes and libs
-INCS = -I. -I/usr/include -I/usr/include/freetype2 -I${X11INC}
-LIBS = -L/usr/lib -lc -lm -L${X11LIB} -lXft -lfontconfig -lX11 -lpng
+INCS = -I${PREFIX}/include -I${X11INC}/freetype2 -I${X11INC}
+LIBS = -L${PREFIX}/lib -L${X11LIB} -lXft -lfontconfig -lX11 -lpng -lm
# flags
CPPFLAGS = -DVERSION=\"${VERSION}\" -D_XOPEN_SOURCE=600
-CFLAGS += -g -std=c99 -pedantic -Wall ${INCS} ${CPPFLAGS}
-LDFLAGS += -g ${LIBS}
-#CFLAGS += -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
-#LDFLAGS += ${LIBS}
+#CFLAGS += -g -std=c99 -pedantic -Wall ${INCS} ${CPPFLAGS}
+#LDFLAGS += -g ${LIBS}
+CFLAGS += -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
+LDFLAGS += ${LIBS}
# compiler and linker
CC ?= cc
+#INCS = -I. -I/usr/include -I/usr/include/freetype2 -I${X11INC}
LIBS = -L/usr/lib -lc -lm -L${X11LIB} -lXft -lfontconfig -lX11
# OpenBSD (uncomment)
-#INCS = -I. -I${X11INC} -I${X11INC}/freetype2
+INCS = -I. -I${X11INC} -I${X11INC}/freetype2
# FreeBSD (uncomment)
#INCS = -I. -I/usr/local/include -I/usr/local/include/freetype2 -I${X11INC}
#LIBS = -L/usr/local/lib -lc -lm -L${X11LIB} -lXft -lfontconfig -lX11

View File

@ -1,5 +1,6 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2015/11/14 19:38:55 jung Exp $
@comment $OpenBSD: PLIST,v 1.2 2017/11/14 17:19:37 bcallah Exp $
@bin bin/sent
share/examples/sent/
share/examples/sent/example
share/examples/sent/nyan.png
share/examples/sent/transparent_test.ff