From owner-svn-ports-all@FreeBSD.ORG Tue Nov 27 13:10:42 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 76A1DF63; Tue, 27 Nov 2012 13:10:42 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 52F278FC16; Tue, 27 Nov 2012 13:10:42 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qARDAgm1072079; Tue, 27 Nov 2012 13:10:42 GMT (envelope-from madpilot@svn.freebsd.org) Received: (from madpilot@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qARDAgea072075; Tue, 27 Nov 2012 13:10:42 GMT (envelope-from madpilot@svn.freebsd.org) Message-Id: <201211271310.qARDAgea072075@svn.freebsd.org> From: Guido Falsi Date: Tue, 27 Nov 2012 13:10:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r307840 - in head/x11/sterm: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Nov 2012 13:10:42 -0000 Author: madpilot Date: Tue Nov 27 13:10:41 2012 New Revision: 307840 URL: http://svnweb.freebsd.org/changeset/ports/307840 Log: - Update to 0.3 - Use new options framework for DOCS - Trim Makefile headers PR: ports/173941 Submitted by: Matthew Donovan (maintainer) Feature safe: yes Modified: head/x11/sterm/Makefile head/x11/sterm/distinfo (contents, props changed) head/x11/sterm/files/patch-Makefile (contents, props changed) head/x11/sterm/files/patch-config.mk (contents, props changed) Modified: head/x11/sterm/Makefile ============================================================================== --- head/x11/sterm/Makefile Tue Nov 27 12:26:28 2012 (r307839) +++ head/x11/sterm/Makefile Tue Nov 27 13:10:41 2012 (r307840) @@ -1,12 +1,8 @@ -# New ports collection makefile for: sterm -# Date created: April 01, 2011 -# Whom: Matthew Donovan -# +# Created by: Matthew Donovan # $FreeBSD$ -# PORTNAME= sterm -PORTVERSION= 0.2.1 +PORTVERSION= 0.3 CATEGORIES= x11 MASTER_SITES= http://dl.suckless.org/st/ DISTNAME= st-${PORTVERSION} @@ -16,14 +12,18 @@ COMMENT= A simple X terminal 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 +USE_XORG= x11 xext xft MAN1= st.1 PLIST_FILES= bin/st PORTDOCS= README +.include + 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" @@ -42,7 +42,7 @@ post-patch: ${WRKSRC}/config.mk post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} .for doc in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR} Modified: head/x11/sterm/distinfo ============================================================================== --- head/x11/sterm/distinfo Tue Nov 27 12:26:28 2012 (r307839) +++ head/x11/sterm/distinfo Tue Nov 27 13:10:41 2012 (r307840) @@ -1,2 +1,2 @@ -SHA256 (st-0.2.1.tar.gz) = 4bf5817483d3274fae9a205e692b308a5fd0cfcb55ed9f3761d2c564b4f7d897 -SIZE (st-0.2.1.tar.gz) = 19804 +SHA256 (st-0.3.tar.gz) = 6d6ca8e8a110530caf97538eab96f0ec28ad2dc419054afeea91e8187b940e34 +SIZE (st-0.3.tar.gz) = 24424 Modified: head/x11/sterm/files/patch-Makefile ============================================================================== --- head/x11/sterm/files/patch-Makefile Tue Nov 27 12:26:28 2012 (r307839) +++ head/x11/sterm/files/patch-Makefile Tue Nov 27 13:10:41 2012 (r307840) @@ -1,9 +1,9 @@ ---- Makefile.orig 2011-04-06 14:22:13.614498469 +0200 -+++ Makefile 2011-04-06 14:23:02.470588628 +0200 -@@ -48,7 +48,7 @@ - @mkdir -p ${DESTDIR}${MANPREFIX}/man1 - @sed "s/VERSION/${VERSION}/g" < st.1 > ${DESTDIR}${MANPREFIX}/man1/st.1 +--- Makefile.orig 2012-11-02 20:09:49.000000000 +0100 ++++ Makefile 2012-11-26 21:33:04.882099791 +0100 +@@ -50,7 +50,7 @@ @chmod 644 ${DESTDIR}${MANPREFIX}/man1/st.1 + @echo If things do not seem to work, be sure that there is no \ + floating st terminfo in the .terminfo directory in your home dir. - @tic -s st.info + @tic -s -o ${LOCALBASE}/share/misc st.info Modified: head/x11/sterm/files/patch-config.mk ============================================================================== --- head/x11/sterm/files/patch-config.mk Tue Nov 27 12:26:28 2012 (r307839) +++ head/x11/sterm/files/patch-config.mk Tue Nov 27 13:10:41 2012 (r307840) @@ -1,21 +1,11 @@ ---- config.mk.orig 2011-01-23 12:30:01.000000000 +0100 -+++ config.mk 2011-04-06 14:25:05.291720015 +0200 -@@ -5,6 +5,7 @@ +--- 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 - # paths - PREFIX = /usr/local -+LOCALBASE= /usr/local - MANPREFIX = ${PREFIX}/share/man - - X11INC = /usr/X11R6/include -@@ -16,8 +17,8 @@ + # 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 # 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