From owner-svn-ports-branches@FreeBSD.ORG Sat Dec 21 10:26:25 2013 Return-Path: Delivered-To: svn-ports-branches@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 CCE32993; Sat, 21 Dec 2013 10:26:25 +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 AE8341980; Sat, 21 Dec 2013 10:26:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBLAQPuK078561; Sat, 21 Dec 2013 10:26:25 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBLAQPt9078559; Sat, 21 Dec 2013 10:26:25 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312211026.rBLAQPt9078559@svn.freebsd.org> From: Mathieu Arnold Date: Sat, 21 Dec 2013 10:26:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337126 - branches/2014Q1/deskutils/tpb X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Dec 2013 10:26:26 -0000 Author: mat Date: Sat Dec 21 10:26:24 2013 New Revision: 337126 URL: http://svnweb.freebsd.org/changeset/ports/337126 Log: MFH: r337092 - Fix build with clang - Add LICENSE - Define OPTIONS, use options subs and helpers - Support staging PR: ports/184889 Submitted by: KATO Tsuguru Approved by: portmgr (implicit) Modified: branches/2014Q1/deskutils/tpb/Makefile branches/2014Q1/deskutils/tpb/pkg-plist (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/deskutils/tpb/Makefile ============================================================================== --- branches/2014Q1/deskutils/tpb/Makefile Sat Dec 21 10:25:23 2013 (r337125) +++ branches/2014Q1/deskutils/tpb/Makefile Sat Dec 21 10:26:24 2013 (r337126) @@ -5,45 +5,44 @@ PORTNAME= tpb PORTVERSION= 0.6.4 PORTREVISION= 10 CATEGORIES= deskutils -MASTER_SITES= ${MASTER_SITE_SAVANNAH} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SAVANNAH MAINTAINER= ports@FreeBSD.org COMMENT= On-Screen-Display for hotkeys of IBM ThinkPads +LICENSE= GPLv2 + LIB_DEPENDS= libxosd.so:${PORTSDIR}/misc/xosd +OPTIONS_DEFINE= DOCS NLS +OPTIONS_SUB= yes + ONLY_FOR_ARCHS= i386 amd64 +USES= bison gmake iconv pkgconfig GNU_CONFIGURE= yes -USES= bison iconv gmake pkgconfig - CONFIGURE_ARGS= ${ICONV_CONFIGURE_ARG} -MAN1= tpb.1 - -NO_STAGE= yes -.include +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALABASE}/lib -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -PLIST_SUB+= NLS="" -.else -CONFIGURE_ARGS+=--disable-nls -PLIST_SUB+= NLS="@comment " -.endif +NLS_USES= gettext +NLS_CONFIGURE_OFF= --disable-nls post-patch: - @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g; \ - s|%%LOCALBASE%%|${LOCALBASE}|g' \ - ${WRKSRC}/src/cfg.h \ - ${WRKSRC}/man/tpb.1 +.for i in man/tpb.1 src/cfg.h + @${REINPLACE_CMD} -e \ + 's|%%PREFIX%%|${PREFIX}|g ; \ + s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/${i} +.endfor + @${REINPLACE_CMD} -e \ + 's|void test()||' ${WRKSRC}/configure post-install: - ${INSTALL_DATA} ${WRKSRC}/doc/tpbrc ${PREFIX}/etc/tpbrc.default -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - ${INSTALL_SCRIPT} ${WRKSRC}/doc/callback_example.sh ${DOCSDIR} -.endif + (cd ${WRKSRC}/doc && ${INSTALL_DATA} tpbrc \ + ${STAGEDIR}${PREFIX}/etc/tpbrc.default) + @${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC}/doc && ${INSTALL_DATA} callback_example.sh \ + ${STAGEDIR}${DOCSDIR}) .include Modified: branches/2014Q1/deskutils/tpb/pkg-plist ============================================================================== --- branches/2014Q1/deskutils/tpb/pkg-plist Sat Dec 21 10:25:23 2013 (r337125) +++ branches/2014Q1/deskutils/tpb/pkg-plist Sat Dec 21 10:26:24 2013 (r337126) @@ -1,5 +1,6 @@ bin/tpb etc/tpbrc.default +man/man1/tpb.1.gz %%PORTDOCS%%%%DOCSDIR%%/callback_example.sh %%NLS%%share/locale/da/LC_MESSAGES/tpb.mo %%NLS%%share/locale/de/LC_MESSAGES/tpb.mo