--- ./Makefile 2016-07-19 13:04:13.000000000 +0200 +++ ./Makefile 2018-02-01 17:15:41.385756000 +0100 @@ -1,29 +1,47 @@ # $FreeBSD: head/misc/sent/Makefile 418767 2016-07-19 11:04:13Z mat $ PORTNAME= sent -PORTVERSION= 0.2 +PORTVERSION= 1 CATEGORIES= misc MASTER_SITES= http://dl.suckless.org/tools/ MAINTAINER= neel@neelc.org COMMENT= Simple plaintext presentation tool -LICENSE= MIT +LICENSE= ISCL LICENSE_FILE= ${WRKSRC}/LICENSE -LIB_DEPENDS= libpng.so:graphics/png\ - libfontconfig.so:x11-fonts/fontconfig +LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig +RUN_DEPENDS= 2ff:graphics/farbfeld +OPTIONS_DEFINE= DOCS EXAMPLES + USE_XORG= x11 xft +MAKE_ARGS= CC="${CC}" PREFIX="${PREFIX}" MANPREFIX="${MANPREFIX}/man" \ + X11INC="${LOCALBASE}/include" X11LIB="${LOCALBASE}/lib" -ALL_TARGET= ${PORTNAME} +ALL_TARGET= install -PLIST_FILES= bin/${PORTNAME} ${EXAMPLESDIR}/example ${EXAMPLESDIR}/nyan.png +PLIST_FILES= bin/sent \ + man/man1/sent.1.gz +PORTDOCS= README.md +PORTEXAMPLES= example \ + nyan.png \ + transparent_test.ff -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/sent ${STAGEDIR}${PREFIX}/bin - ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/example ${STAGEDIR}${EXAMPLESDIR}/example - ${INSTALL_DATA} ${WRKSRC}/nyan.png ${STAGEDIR}${EXAMPLESDIR}/nyan.png +# This fix is required due to the fact that the port's distribution does not +# extracts in ${WRKSRC}. +EXTRACT_AFTER_ARGS= -C ${WRKSRC} +pre-extract: + @${MKDIR} ${WRKSRC} + +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/sent + +do-install-DOCS-on: + cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDOCS}" ${STAGEDIR}${DOCSDIR} + +do-install-EXAMPLES-on: + cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTEXAMPLES}" ${STAGEDIR}${EXAMPLESDIR} .include --- ./distinfo 2016-05-15 20:07:11.000000000 +0200 +++ ./distinfo 2018-02-01 15:27:55.822455000 +0100 @@ -1,3 +1,3 @@ -SHA256 (sent-0.2.tar.gz) = 53b961f9d92a277a6408df7025b4a6deae6b655a797383c93442290e45391076 -SIZE (sent-0.2.tar.gz) = 13479 -TIMESTAMP = 1463240986 +TIMESTAMP = 1517451687 +SHA256 (sent-1.tar.gz) = 7bf3de9311ce291ff36adf5315b78fa72373e3ab80ca71387fb5884bcbd7be33 +SIZE (sent-1.tar.gz) = 15285 --- ./files/patch-config.mk 2016-05-15 20:07:11.000000000 +0200 +++ ./files/patch-config.mk 2018-02-01 17:22:27.277316000 +0100 @@ -1,19 +1,31 @@ ---- config.mk.orig 2015-11-19 18:37:08 UTC +--- config.mk.orig 2017-09-03 21:57:26 UTC +++ config.mk -@@ -7,12 +7,12 @@ VERSION = 0.2 - PREFIX = /usr/local - MANPREFIX = ${PREFIX}/share/man +@@ -11,20 +11,20 @@ X11INC = /usr/X11R6/include + X11LIB = /usr/X11R6/lib --X11INC = /usr/X11R6/include --X11LIB = /usr/X11R6/lib -+X11INC = /usr/local/X11R6/include -+X11LIB = /usr/local/X11R6/lib - # 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 +-LIBS = -L/usr/lib -lc -lm -L${X11LIB} -lXft -lfontconfig -lX11 ++#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 + # 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 +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 -lpng ++LIBS = -L/usr/local/lib -lc -lm -L${X11LIB} -lXft -lfontconfig -lX11 # 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