Attachment #129881 for bug #173941




# Created by: Matthew Donovan <kitchetech@gmail.com>
# Date created:			April 01, 2011
# Whom:				Matthew Donovan <kitchetech@gmail.com>
#
# $FreeBSD$
#

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


LICENSE=	BSD

LIB_DEPENDS=	fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
		freetype:${PORTSDIR}/print/freetype2
RUN_DEPENDS=	${LOCALBASE}/share/misc/terminfo.db:${PORTSDIR}/devel/ncurses

USE_XORG=	x11 xext xft
MAN1=	st.1
PLIST_FILES=	bin/st

PORTDOCS=	README

.include <bsd.port.options.mk>

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"

		${WRKSRC}/config.mk

post-install:
.if ${PORT_OPTIONS:MDOCS}
	@${MKDIR} ${DOCSDIR}
.for doc in ${PORTDOCS}
	${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (st-0.2.1.tar.gz) = 4bf5817483d3274fae9a205e692b308a5fd0cfcb55ed9f3761d2c564b4f7d897	1	SHA256 (st-0.3.tar.gz) = 6d6ca8e8a110530caf97538eab96f0ec28ad2dc419054afeea91e8187b940e34
2	SIZE (st-0.2.1.tar.gz) = 19804	2	SIZE (st-0.3.tar.gz) = 24424

Lines 1-9 Link Here

(-)files/patch-Makefile (-5 / +5 lines)
1	--- Makefile.orig 2011-04-06 14:22:13.614498469 +0200	1	--- Makefile.orig 2012-11-02 20:09:49.000000000 +0100
2	+++ Makefile 2011-04-06 14:23:02.470588628 +0200	2	+++ Makefile 2012-11-26 21:33:04.882099791 +0100
3	@@ -48,7 +48,7 @@	3	@@ -50,7 +50,7 @@
4	@mkdir -p ${DESTDIR}${MANPREFIX}/man1
5	@sed "s/VERSION/${VERSION}/g" < st.1 > ${DESTDIR}${MANPREFIX}/man1/st.1
6	@chmod 644 ${DESTDIR}${MANPREFIX}/man1/st.1	4	@chmod 644 ${DESTDIR}${MANPREFIX}/man1/st.1
		5	@echo If things do not seem to work, be sure that there is no \
		6	floating st terminfo in the .terminfo directory in your home dir.
7	- @tic -s st.info	7	- @tic -s st.info
8	+ @tic -s -o ${LOCALBASE}/share/misc st.info	8	+ @tic -s -o ${LOCALBASE}/share/misc st.info
9		9




--- config.mk.orig	2012-11-02 20:09:49.000000000 +0100
+++ config.mk	2012-11-26 22:28:12.270095047 +0100
@@ -11,7 +11,7 @@
 X11LIB = /usr/X11R6/lib
 
 # includes and libs
-INCS = -I. -I/usr/include -I${X11INC} -I/usr/include/freetype2
+INCS = -I. -I/usr/include -I${X11INC} -I${X11INC}/freetype2
 LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lutil -lXext -lXft -lfontconfig
 
 X11INC = /usr/X11R6/include
@@ -16,8 +17,8 @@
 
 # flags
 CPPFLAGS = -DVERSION=\"${VERSION}\"
-CFLAGS += -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
-LDFLAGS += -s ${LIBS}
+CFLAGS += -std=c99 -pedantic -Wall ${INCS} ${CPPFLAGS}
+LDFLAGS += ${LIBS}
 
 # compiler and linker
 CC ?= cc

Return to bug 173941

Lines 1-12 Link Here

(-)Makefile (-8 / +8 lines)
1	# New ports collection makefile for: sterm	1	# Created by: Matthew Donovan <kitchetech@gmail.com>
2	# Date created: April 01, 2011
3	# Whom: Matthew Donovan <kitchetech@gmail.com>
4	#
5	# $FreeBSD$	2	# $FreeBSD$
6	#
7		3
8	PORTNAME= sterm	4	PORTNAME= sterm
9	PORTVERSION= 0.2.1	5	PORTVERSION= 0.3
10	CATEGORIES= x11	6	CATEGORIES= x11
11	MASTER_SITES= http://dl.suckless.org/st/	7	MASTER_SITES= http://dl.suckless.org/st/
12	DISTNAME= st-${PORTVERSION}	8	DISTNAME= st-${PORTVERSION}
Lines 16-29 Link Here
16		12
17	LICENSE= BSD	13	LICENSE= BSD
18		14
		15	LIB_DEPENDS= fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
		16	freetype:${PORTSDIR}/print/freetype2
19	RUN_DEPENDS= ${LOCALBASE}/share/misc/terminfo.db:${PORTSDIR}/devel/ncurses	17	RUN_DEPENDS= ${LOCALBASE}/share/misc/terminfo.db:${PORTSDIR}/devel/ncurses
20		18
21	USE_XORG= x11	19	USE_XORG= x11 xext xft
22	MAN1= st.1	20	MAN1= st.1
23	PLIST_FILES= bin/st	21	PLIST_FILES= bin/st
24		22
25	PORTDOCS= README	23	PORTDOCS= README
26		24
		25	.include <bsd.port.options.mk>
		26
27	pre-everything::	27	pre-everything::
28	@${ECHO_MSG} "You can build st with your own config.h using the ST_CONF knob:"	28	@${ECHO_MSG} "You can build st with your own config.h using the ST_CONF knob:"
29	@${ECHO_MSG} "make ST_CONF=/path/to/st/config.h install clean"	29	@${ECHO_MSG} "make ST_CONF=/path/to/st/config.h install clean"
Lines 42-48 Link Here
42	${WRKSRC}/config.mk	42	${WRKSRC}/config.mk
43		43
44	post-install:	44	post-install:
45	.if !defined(NOPORTDOCS)	45	.if ${PORT_OPTIONS:MDOCS}
46	@${MKDIR} ${DOCSDIR}	46	@${MKDIR} ${DOCSDIR}
47	.for doc in ${PORTDOCS}	47	.for doc in ${PORTDOCS}
48	${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}	48	${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR}

Lines 1-21 Link Here

(-)files/patch-config.mk (-18 / +8 lines)
1	--- config.mk.orig 2011-01-23 12:30:01.000000000 +0100	1	--- config.mk.orig 2012-11-02 20:09:49.000000000 +0100
2	+++ config.mk 2011-04-06 14:25:05.291720015 +0200	2	+++ config.mk 2012-11-26 22:28:12.270095047 +0100
3	@@ -5,6 +5,7 @@	3	@@ -11,7 +11,7 @@
		4	X11LIB = /usr/X11R6/lib
4		5
5	# paths	6	# includes and libs
6	PREFIX = /usr/local	7	-INCS = -I. -I/usr/include -I${X11INC} -I/usr/include/freetype2
7	+LOCALBASE= /usr/local	8	+INCS = -I. -I/usr/include -I${X11INC} -I${X11INC}/freetype2
8	MANPREFIX = ${PREFIX}/share/man	9	LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lutil -lXext -lXft -lfontconfig
9		10
10	X11INC = /usr/X11R6/include
11	@@ -16,8 +17,8 @@
12
13	# flags	11	# flags
14	CPPFLAGS = -DVERSION=\"${VERSION}\"
15	-CFLAGS += -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
16	-LDFLAGS += -s ${LIBS}
17	+CFLAGS += -std=c99 -pedantic -Wall ${INCS} ${CPPFLAGS}
18	+LDFLAGS += ${LIBS}
19
20	# compiler and linker
21	CC ?= cc