Attachment #191642 for bug #226632




# $FreeBSD$

PORTNAME=	sterm
DISTVERSION=	0.8
CATEGORIES=	x11
MASTER_SITES=	http://dl.suckless.org/st/
DISTNAME=	st-${PORTVERSION}

MAINTAINER=	pkubaj@anongoth.pl
COMMENT=	Simple X terminal

LICENSE=	MIT
LICENSE_NAME=	MIT/X Consortium License
LICENSE_FILE=	${WRKSRC}/LICENSE
LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept

LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
		libfreetype.so:print/freetype2


PLIST_FILES=	bin/st man/man1/st.1.gz

# This way we avoid running tic on st.info as does not work as expected.
BINARY_ALIAS=	tic=true

PORTDATA=	config.def.h st.info
PORTDOCS=	FAQ LEGACY README TODO

OPTIONS_DEFINE=	DOCS

SUB_FILES=	pkg-message

pre-everything::
	@${ECHO_MSG} "You can build st with your own config.h using the ST_CONF knob:"
	@${ECHO_MSG} "make ST_CONF=/path/to/st/config.h install clean"

post-patch:
.if defined(ST_CONF)
	@${ECHO_MSG} "creating config.h from ${ST_CONF}"
	@${LN} -sf ${ST_CONF} ${WRKSRC}/config.h
.endif
	@${REINPLACE_CMD} -e 's|^VERSION = .*|VERSION = ${PORTVERSION}|' \
		-e 's|^PREFIX = .*|PREFIX = ${PREFIX}|' \
		-e 's|^LOCALBASE = .*|LOCALBASE = ${LOCALBASE}|' \
		-e "s|^MANPREFIX = .*|MANPREFIX = ${MANPREFIX}/man|" \
		-e "s|^X11INC = .*|X11INC = ${LOCALBASE}/include|" \
		-e "s|^X11LIB = .*|X11LIB = ${LOCALBASE}/lib|" \
		-e "s|^CPPFLAGS =|CPPFLAGS +=|" \
		${WRKSRC}/config.mk

post-install:
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/st
	@${MKDIR} ${STAGEDIR}${DATADIR}
.for data in ${PORTDATA}
	${INSTALL_DATA} ${WRKSRC}/${data} ${STAGEDIR}${DATADIR}
.endfor

post-install-DOCS-on:
	@${MKDIR} ${STAGEDIR}${DOCSDIR}

Lines 1-3 Link Here

(-)x11/sterm/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1471840973	1	TIMESTAMP = 1521122661
2	SHA256 (st-0.7.tar.gz) = f7870d906ccc988926eef2cc98950a99cc78725b685e934c422c03c1234e6000	2	SHA256 (st-0.8.tar.gz) = 77353920d07d66c684a0f57ec37c2670c42fdc5c871d6382b701601cdc597576
3	SIZE (st-0.7.tar.gz) = 42418	3	SIZE (st-0.8.tar.gz) = 45401

Removed Link Here

(-)x11/sterm/files/patch-Makefile (-10 lines)
1	--- Makefile.orig 2016-08-11 14:25:58 UTC
2	+++ Makefile
3	@@ -49,7 +49,6 @@ install: all
4	@sed "s/VERSION/${VERSION}/g" < st.1 > ${DESTDIR}${MANPREFIX}/man1/st.1
5	@chmod 644 ${DESTDIR}${MANPREFIX}/man1/st.1
6	@echo Please see the README file regarding the terminfo entry of st.
7	- @tic -s st.info
8
9	uninstall:
10	@echo removing executable file from ${DESTDIR}${PREFIX}/bin




If you are running FreeBSD 11.1 or older then in order to add st.info the the
terminal capability database it is required to:

 * Install tic (included in devel/ncurses).
 * Run:

   # tic -C -K -s -x %%DATADIR%%/st.info >> /usr/share/misc/termcap
   # cd /usr/share/misc
   # cap_mkdb termcap

Thanks to r331006 [1], this hack is not necessary on FreeBSD 11.2-RELEASE,
11-STABLE and 12-CURRENT.

[1]: https://svnweb.freebsd.org/base?view=revision&revision=331006

Lines 3-6 st is a minimalistic X terminal. Link Here

(-)x11/sterm/pkg-descr (-1 / +1 lines)
3	It consists of a single binary, configuration is done at compile-time by a	3	It consists of a single binary, configuration is done at compile-time by a
4	config.h file.	4	config.h file.
5		5
6	WWW: http://st.suckless.org/	6	WWW: https://st.suckless.org/

Return to bug 226632

Lines 2-8 Link Here

(-)x11/sterm/Makefile (-7 / +15 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= sterm	4	PORTNAME= sterm
5	PORTVERSION= 0.7	5	DISTVERSION= 0.8
6	CATEGORIES= x11	6	CATEGORIES= x11
7	MASTER_SITES= http://dl.suckless.org/st/	7	MASTER_SITES= http://dl.suckless.org/st/
8	DISTNAME= st-${PORTVERSION}	8	DISTNAME= st-${PORTVERSION}
Lines 10-19 DISTNAME= st-${PORTVERSION} Link Here
10	MAINTAINER= pkubaj@anongoth.pl	10	MAINTAINER= pkubaj@anongoth.pl
11	COMMENT= Simple X terminal	11	COMMENT= Simple X terminal
12		12
13	LICENSE= MITX	13	LICENSE= MIT
14	LICENSE_NAME= MIT/X Consortium License
15	LICENSE_FILE= ${WRKSRC}/LICENSE	14	LICENSE_FILE= ${WRKSRC}/LICENSE
16	LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
17		15
18	LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \	16	LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
19	libfreetype.so:print/freetype2	17	libfreetype.so:print/freetype2
Lines 23-32 USE_XORG= x11 xext xft Link Here
23		21
24	PLIST_FILES= bin/st man/man1/st.1.gz	22	PLIST_FILES= bin/st man/man1/st.1.gz
25		23
26	PORTDOCS= README	24	# This way we avoid running tic on st.info as does not work as expected.
		25	BINARY_ALIAS= tic=true
		26
		27	PORTDATA= config.def.h st.info
		28	PORTDOCS= FAQ LEGACY README TODO
27		29
28	OPTIONS_DEFINE= DOCS	30	OPTIONS_DEFINE= DOCS
29		31
		32	SUB_FILES= pkg-message
		33
30	pre-everything::	34	pre-everything::
31	@${ECHO_MSG} "You can build st with your own config.h using the ST_CONF knob:"	35	@${ECHO_MSG} "You can build st with your own config.h using the ST_CONF knob:"
32	@${ECHO_MSG} "make ST_CONF=/path/to/st/config.h install clean"	36	@${ECHO_MSG} "make ST_CONF=/path/to/st/config.h install clean"
Lines 34-51 pre-everything:: Link Here
34	post-patch:	38	post-patch:
35	.if defined(ST_CONF)	39	.if defined(ST_CONF)
36	@${ECHO_MSG} "creating config.h from ${ST_CONF}"	40	@${ECHO_MSG} "creating config.h from ${ST_CONF}"
37	@${CP} ${ST_CONF} ${WRKSRC}/config.h	41	@${LN} -sf ${ST_CONF} ${WRKSRC}/config.h
38	.endif	42	.endif
39	@${REINPLACE_CMD} -e 's\|^VERSION = .*\|VERSION = ${PORTVERSION}\|' \	43	@${REINPLACE_CMD} -e 's\|^VERSION = .*\|VERSION = ${PORTVERSION}\|' \
40	-e 's\|^PREFIX = .*\|PREFIX = ${PREFIX}\|' \	44	-e 's\|^PREFIX = .*\|PREFIX = ${PREFIX}\|' \
41	-e 's\|^LOCALBASE = .*\|LOCALBASE = ${LOCALBASE}\|' \
42	-e "s\|^MANPREFIX = .*\|MANPREFIX = ${MANPREFIX}/man\|" \	45	-e "s\|^MANPREFIX = .*\|MANPREFIX = ${MANPREFIX}/man\|" \
43	-e "s\|^X11INC = .*\|X11INC = ${LOCALBASE}/include\|" \	46	-e "s\|^X11INC = .*\|X11INC = ${LOCALBASE}/include\|" \
44	-e "s\|^X11LIB = .*\|X11LIB = ${LOCALBASE}/lib\|" \	47	-e "s\|^X11LIB = .*\|X11LIB = ${LOCALBASE}/lib\|" \
		48	-e "s\|^CPPFLAGS =\|CPPFLAGS +=\|" \
45	${WRKSRC}/config.mk	49	${WRKSRC}/config.mk
46		50
47	post-install:	51	post-install:
48	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/st	52	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/st
		53	@${MKDIR} ${STAGEDIR}${DATADIR}
		54	.for data in ${PORTDATA}
		55	${INSTALL_DATA} ${WRKSRC}/${data} ${STAGEDIR}${DATADIR}
		56	.endfor
49		57
50	post-install-DOCS-on:	58	post-install-DOCS-on:
51	@${MKDIR} ${STAGEDIR}${DOCSDIR}	59	@${MKDIR} ${STAGEDIR}${DOCSDIR}

Added Link Here

(-)x11/sterm/files/pkg-message.in (+14 lines)
1	If you are running FreeBSD 11.1 or older then in order to add st.info the the
2	terminal capability database it is required to:
3
4	* Install tic (included in devel/ncurses).
5	* Run:
6
7	# tic -C -K -s -x %%DATADIR%%/st.info >> /usr/share/misc/termcap
8	# cd /usr/share/misc
9	# cap_mkdb termcap
10
11	Thanks to r331006 [1], this hack is not necessary on FreeBSD 11.2-RELEASE,
12	11-STABLE and 12-CURRENT.
13
14	[1]: https://svnweb.freebsd.org/base?view=revision&revision=331006