From owner-svn-ports-head@FreeBSD.ORG Wed Jan 29 21:30:32 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2F562EE8; Wed, 29 Jan 2014 21:30:32 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 1B2481760; Wed, 29 Jan 2014 21:30:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0TLUV0F056365; Wed, 29 Jan 2014 21:30:31 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0TLUVoa056362; Wed, 29 Jan 2014 21:30:31 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201401292130.s0TLUVoa056362@svn.freebsd.org> From: Pawel Pekala Date: Wed, 29 Jan 2014 21:30:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r341784 - in head/x11/tabbed: . 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-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Jan 2014 21:30:32 -0000 Author: pawel Date: Wed Jan 29 21:30:31 2014 New Revision: 341784 URL: http://svnweb.freebsd.org/changeset/ports/341784 QAT: https://qat.redports.org/buildarchive/r341784/ Log: - Update to version 0.6 [1] - Support staging [1] - Respect CFLAGS PR: ports/185903 [1] Submitted by: maintainer Modified: head/x11/tabbed/Makefile head/x11/tabbed/distinfo head/x11/tabbed/files/patch-config.mk Modified: head/x11/tabbed/Makefile ============================================================================== --- head/x11/tabbed/Makefile Wed Jan 29 21:13:47 2014 (r341783) +++ head/x11/tabbed/Makefile Wed Jan 29 21:30:31 2014 (r341784) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= tabbed -PORTVERSION= 0.3 +PORTVERSION= 0.6 CATEGORIES= x11 MASTER_SITES= http://dl.suckless.org/tools/ @@ -13,11 +13,12 @@ LICENSE= MIT USE_XORG= x11 -MAN1= tabbed.1 -PLIST_FILES= bin/tabbed +OPTIONS_DEFINE= DOCS + +PLIST_FILES= bin/tabbed \ + man/man1/tabbed.1.gz PORTDOCS= LICENSE README -NO_STAGE= yes pre-everything:: @${ECHO_MSG} "You can build tabbed with your own config.h using the TABBED_CONF knob:" @${ECHO_MSG} "make TABBED_CONF=/path/to/tabbed/config.h install clean" @@ -27,13 +28,11 @@ post-extract: @${ECHO_MSG} "creating config.h from ${TABBED_CONF}" @${CP} ${TABBED_CONF} ${WRKSRC}/config.h .endif + @${REINPLACE_CMD} 's|-std=c99 -pedantic -Wall -O0|${CFLAGS}|' \ + ${WRKSRC}/config.mk post-install: -.if !defined(NOPORTDOCS) - @${ECHO_MSG} "installing additional documentation to ${DOCSDIR}" - @${MKDIR} ${DOCSDIR} - @${INSTALL_MAN} ${WRKSRC}/LICENSE ${DOCSDIR} - @${INSTALL_MAN} ${WRKSRC}/README ${DOCSDIR} -.endif + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .include Modified: head/x11/tabbed/distinfo ============================================================================== --- head/x11/tabbed/distinfo Wed Jan 29 21:13:47 2014 (r341783) +++ head/x11/tabbed/distinfo Wed Jan 29 21:30:31 2014 (r341784) @@ -1,2 +1,2 @@ -SHA256 (tabbed-0.3.tar.gz) = bb72aa6e4831e0aadee8a6232d8532a548e736236bbaaed970e77fb5d3177ff0 -SIZE (tabbed-0.3.tar.gz) = 9177 +SHA256 (tabbed-0.6.tar.gz) = 7651ea3acbec5d6a25469e8665da7fc70aba2b4fa61a2a6a5449eafdfd641c42 +SIZE (tabbed-0.6.tar.gz) = 12926 Modified: head/x11/tabbed/files/patch-config.mk ============================================================================== --- head/x11/tabbed/files/patch-config.mk Wed Jan 29 21:13:47 2014 (r341783) +++ head/x11/tabbed/files/patch-config.mk Wed Jan 29 21:30:31 2014 (r341784) @@ -1,25 +1,39 @@ ---- config.mk.orig 2010-09-03 23:40:32.000000000 -0500 -+++ config.mk 2010-09-03 23:42:18.000000000 -0500 -@@ -4,12 +4,12 @@ - # Customize below to fit your system - - # paths --PREFIX = /usr/local --MANPREFIX = ${PREFIX}/share/man -+PREFIX?= /usr/local -+MANPREFIX = ${PREFIX}/man - - # includes and libs --INCS = -I. -I/usr/include --LIBS = -L/usr/lib -lc -lX11 -+INCS = -I. -I/usr/include -I/usr/local/include -+LIBS = -L/usr/lib -L/usr/local/lib -lc -lX11 - - # flags - CPPFLAGS = -DVERSION=\"${VERSION}\" -@@ -21,4 +21,4 @@ - #LDFLAGS = ${LIBS} - - # compiler and linker --CC = cc -+CC?= cc +*** config.mk.orig 2014-01-19 21:53:24.000000000 +0400 +--- config.mk 2014-01-19 22:40:13.000000000 +0400 +*************** +*** 5,15 **** + + # paths + PREFIX = /usr/local +! MANPREFIX = ${PREFIX}/share/man + + # includes and libs +! INCS = -I. -I/usr/include +! LIBS = -L/usr/lib -lc -lX11 + + # flags + CPPFLAGS = -DVERSION=\"${VERSION}\" -D_BSD_SOURCE +--- 5,15 ---- + + # paths + PREFIX = /usr/local +! MANPREFIX = ${PREFIX}/man + + # includes and libs +! INCS = -I. -I/usr/local/include +! LIBS = -L/usr/local/lib -lc -lX11 + + # flags + CPPFLAGS = -DVERSION=\"${VERSION}\" -D_BSD_SOURCE +*************** +*** 21,25 **** + #LDFLAGS = ${LIBS} + + # compiler and linker +! CC = cc + +--- 21,25 ---- + #LDFLAGS = ${LIBS} + + # compiler and linker +! CC?= cc