From owner-svn-ports-head@FreeBSD.ORG Mon Sep 8 19:26:55 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 DCC193C9; Mon, 8 Sep 2014 19:26:55 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AE0A01E20; Mon, 8 Sep 2014 19:26:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s88JQt9p046269; Mon, 8 Sep 2014 19:26:55 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s88JQtft046267; Mon, 8 Sep 2014 19:26:55 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201409081926.s88JQtft046267@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Mon, 8 Sep 2014 19:26:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r367683 - in head/textproc/cwtext: . 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.18-1 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: Mon, 08 Sep 2014 19:26:56 -0000 Author: antoine Date: Mon Sep 8 19:26:54 2014 New Revision: 367683 URL: http://svnweb.freebsd.org/changeset/ports/367683 QAT: https://qat.redports.org/buildarchive/r367683/ Log: - Allow staging as a regular user - USES=python Modified: head/textproc/cwtext/Makefile head/textproc/cwtext/files/patch-makefile Modified: head/textproc/cwtext/Makefile ============================================================================== --- head/textproc/cwtext/Makefile Mon Sep 8 19:24:50 2014 (r367682) +++ head/textproc/cwtext/Makefile Mon Sep 8 19:26:54 2014 (r367683) @@ -9,8 +9,7 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME} MAINTAINER= db@FreeBSD.org COMMENT= Morse Code Generator -USE_PYTHON= yes -USES= gmake +USES= gmake python MAKEFILE= makefile ALL_TARGET= ALL @@ -18,12 +17,8 @@ LICENSE= GPLv2 OPTIONS_DEFINE= DOCS -post-patch: - @${REINPLACE_CMD} -e "s,%%STAGEDIR%%,${STAGEDIR},g" \ - ${WRKSRC}/makefile - post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} .include Modified: head/textproc/cwtext/files/patch-makefile ============================================================================== --- head/textproc/cwtext/files/patch-makefile Mon Sep 8 19:24:50 2014 (r367682) +++ head/textproc/cwtext/files/patch-makefile Mon Sep 8 19:26:54 2014 (r367683) @@ -1,18 +1,17 @@ ---- makefile.orig 2004-12-16 07:15:22.000000000 -0500 -+++ makefile 2013-12-30 18:06:28.000000000 -0500 -@@ -1,11 +1,10 @@ +--- makefile.orig 2004-12-16 12:15:22 UTC ++++ makefile +@@ -1,11 +1,9 @@ -PREFIX=/usr/local - ALL: cwtext cwpcm cwmm -+STAGEDIR=%%STAGEDIR%% install: ALL - install -sc cwtext ${PREFIX}/bin - install -sc cwpcm ${PREFIX}/bin - install -sc cwmm ${PREFIX}/bin -+ install -s -o root -g wheel -m 555 cwtext ${STAGEDIR}${PREFIX}/bin -+ install -s -o root -g wheel -m 555 cwpcm ${STAGEDIR}${PREFIX}/bin -+ install -s -o root -g wheel -m 555 cwmm ${STAGEDIR}${PREFIX}/bin ++ $(BSD_INSTALL_PROGRAM) cwtext ${DESTDIR}${PREFIX}/bin ++ $(BSD_INSTALL_PROGRAM) cwpcm ${DESTDIR}${PREFIX}/bin ++ $(BSD_INSTALL_PROGRAM) cwmm ${DESTDIR}${PREFIX}/bin cwmm: cwmm.o morse.o ${CC} ${CFLAGS} -o cwmm $^