Attachment #190248 for bug #225607




# $FreeBSD: head/misc/sent/Makefile 418767 2016-07-19 11:04:13Z mat $
PORTNAME=	sent
PORTVERSION=	1
CATEGORIES=	misc
MASTER_SITES=	http://dl.suckless.org/tools/
MAINTAINER=	neel@neelc.org
COMMENT=	Simple plaintext presentation tool
LICENSE=	ISCL
LICENSE_FILE=	${WRKSRC}/LICENSE
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=	install
PLIST_FILES=	bin/sent \
		man/man1/sent.1.gz
PORTDOCS=	README.md
PORTEXAMPLES=	example \
		nyan.png \
		transparent_test.ff
# 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 <bsd.port.mk>

Lines 1-3 Link Here

(-)./distinfo (-3 / +3 lines)
1	SHA256 (sent-0.2.tar.gz) = 53b961f9d92a277a6408df7025b4a6deae6b655a797383c93442290e45391076	1	TIMESTAMP = 1517451687
2	SIZE (sent-0.2.tar.gz) = 13479	2	SHA256 (sent-1.tar.gz) = 7bf3de9311ce291ff36adf5315b78fa72373e3ab80ca71387fb5884bcbd7be33
3	TIMESTAMP = 1463240986	3	SIZE (sent-1.tar.gz) = 15285




--- config.mk.orig	2017-09-03 21:57:26 UTC
+++ config.mk
@@ -11,20 +11,20 @@ X11INC = /usr/X11R6/include
 X11LIB = /usr/X11R6/lib
 MANPREFIX = ${PREFIX}/share/man
-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
+#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
 # 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

Return to bug 225607

Lines 1-29 Link Here

(-)./Makefile (-11 / +29 lines)
1	# $FreeBSD: head/misc/sent/Makefile 418767 2016-07-19 11:04:13Z mat $	1	# $FreeBSD: head/misc/sent/Makefile 418767 2016-07-19 11:04:13Z mat $
2	PORTNAME= sent	2	PORTNAME= sent
3	PORTVERSION= 0.2	3	PORTVERSION= 1
4	CATEGORIES= misc	4	CATEGORIES= misc
5	MASTER_SITES= http://dl.suckless.org/tools/	5	MASTER_SITES= http://dl.suckless.org/tools/
6	MAINTAINER= neel@neelc.org	6	MAINTAINER= neel@neelc.org
7	COMMENT= Simple plaintext presentation tool	7	COMMENT= Simple plaintext presentation tool
8	LICENSE= MIT	8	LICENSE= ISCL
9	LICENSE_FILE= ${WRKSRC}/LICENSE	9	LICENSE_FILE= ${WRKSRC}/LICENSE
10	LIB_DEPENDS= libpng.so:graphics/png\	10	LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig
11	libfontconfig.so:x11-fonts/fontconfig	11	RUN_DEPENDS= 2ff:graphics/farbfeld
		12	OPTIONS_DEFINE= DOCS EXAMPLES
		13
12	USE_XORG= x11 xft	14	USE_XORG= x11 xft
13	ALL_TARGET= ${PORTNAME}	15	MAKE_ARGS= CC="${CC}" PREFIX="${PREFIX}" MANPREFIX="${MANPREFIX}/man" \
		16	X11INC="${LOCALBASE}/include" X11LIB="${LOCALBASE}/lib"
14	PLIST_FILES= bin/${PORTNAME} ${EXAMPLESDIR}/example ${EXAMPLESDIR}/nyan.png	17	ALL_TARGET= install
15	do-install:	18	PLIST_FILES= bin/sent \
16	${INSTALL_PROGRAM} ${WRKSRC}/sent ${STAGEDIR}${PREFIX}/bin	19	man/man1/sent.1.gz
17	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}	20	PORTDOCS= README.md
18	${INSTALL_DATA} ${WRKSRC}/example ${STAGEDIR}${EXAMPLESDIR}/example	21	PORTEXAMPLES= example \
19	${INSTALL_DATA} ${WRKSRC}/nyan.png ${STAGEDIR}${EXAMPLESDIR}/nyan.png	22	nyan.png \
		23	transparent_test.ff
		24	# This fix is required due to the fact that the port's distribution does not
		25	# extracts in ${WRKSRC}.
		26	EXTRACT_AFTER_ARGS= -C ${WRKSRC}
		27	pre-extract:
		28	@${MKDIR} ${WRKSRC}
		29
		30	post-install:
		31	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/sent
		32
		33	do-install-DOCS-on:
		34	cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTDOCS}" ${STAGEDIR}${DOCSDIR}
		35
		36	do-install-EXAMPLES-on:
		37	cd ${WRKSRC} && ${COPYTREE_SHARE} "${PORTEXAMPLES}" ${STAGEDIR}${EXAMPLESDIR}
20	.include <bsd.port.mk>	38	.include <bsd.port.mk>

Lines 1-19 Link Here

(-)./files/patch-config.mk (-11 / +23 lines)
1	--- config.mk.orig 2015-11-19 18:37:08 UTC	1	--- config.mk.orig 2017-09-03 21:57:26 UTC
2	+++ config.mk	2	+++ config.mk
3	@@ -7,12 +7,12 @@ VERSION = 0.2	3	@@ -11,20 +11,20 @@ X11INC = /usr/X11R6/include
4	PREFIX = /usr/local	4	X11LIB = /usr/X11R6/lib
5	MANPREFIX = ${PREFIX}/share/man
6	-X11INC = /usr/X11R6/include
7	-X11LIB = /usr/X11R6/lib
8	+X11INC = /usr/local/X11R6/include
9	+X11LIB = /usr/local/X11R6/lib
10
11	# includes and libs	5	# includes and libs
12	-INCS = -I. -I/usr/include -I/usr/include/freetype2 -I${X11INC}	6	-INCS = -I. -I/usr/include -I/usr/include/freetype2 -I${X11INC}
13	-LIBS = -L/usr/lib -lc -lm -L${X11LIB} -lXft -lfontconfig -lX11 -lpng	7	-LIBS = -L/usr/lib -lc -lm -L${X11LIB} -lXft -lfontconfig -lX11
		8	+#INCS = -I. -I/usr/include -I/usr/include/freetype2 -I${X11INC}
		9	+#LIBS = -L/usr/lib -lc -lm -L${X11LIB} -lXft -lfontconfig -lX11
		10	# OpenBSD (uncomment)
		11	#INCS = -I. -I${X11INC} -I${X11INC}/freetype2
		12	# FreeBSD (uncomment)
		13	-#INCS = -I. -I/usr/local/include -I/usr/local/include/freetype2 -I${X11INC}
		14	-#LIBS = -L/usr/local/lib -lc -lm -L${X11LIB} -lXft -lfontconfig -lX11
14	+INCS = -I. -I/usr/local/include -I/usr/local/include/freetype2 -I${X11INC}	15	+INCS = -I. -I/usr/local/include -I/usr/local/include/freetype2 -I${X11INC}
15	+LIBS = -L/usr/local/lib -lc -lm -L${X11LIB} -lXft -lfontconfig -lX11 -lpng	16	+LIBS = -L/usr/local/lib -lc -lm -L${X11LIB} -lXft -lfontconfig -lX11
16	# flags	17	# flags
17	CPPFLAGS = -DVERSION=\"${VERSION}\" -D_XOPEN_SOURCE=600	18	CPPFLAGS = -DVERSION=\"${VERSION}\" -D_XOPEN_SOURCE=600
		19	-CFLAGS += -g -std=c99 -pedantic -Wall ${INCS} ${CPPFLAGS}
		20	-LDFLAGS += -g ${LIBS}
		21	-#CFLAGS += -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
		22	-#LDFLAGS += ${LIBS}
		23	+#CFLAGS += -g -std=c99 -pedantic -Wall ${INCS} ${CPPFLAGS}
		24	+#LDFLAGS += -g ${LIBS}
		25	+CFLAGS += -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
		26	+LDFLAGS += ${LIBS}
		27
		28	# compiler and linker
		29	CC ?= cc