From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Mar 6 22:50:03 2014 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7336867B for ; Thu, 6 Mar 2014 22:50:03 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (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 4D32E791 for ; Thu, 6 Mar 2014 22:50:03 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.8/8.14.8) with ESMTP id s26Mo2gX060619 for ; Thu, 6 Mar 2014 22:50:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s26Mo2Pg060618; Thu, 6 Mar 2014 22:50:02 GMT (envelope-from gnats) Resent-Date: Thu, 6 Mar 2014 22:50:02 GMT Resent-Message-Id: <201403062250.s26Mo2Pg060618@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Dmitry Marakasov Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3618E48C for ; Thu, 6 Mar 2014 22:43:41 +0000 (UTC) Received: from smtpout3.timeweb.ru (smtpout3.timeweb.ru [92.53.117.25]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E455074C for ; Thu, 6 Mar 2014 22:43:40 +0000 (UTC) Received: from [213.148.20.85] (helo=hive.panopticon) by smtp.timeweb.ru with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1WLh0s-0003DM-R6; Fri, 07 Mar 2014 02:43:38 +0400 Received: from hades.panopticon (hades.panopticon [192.168.0.32]) by hive.panopticon (Postfix) with ESMTP id 8B2F9F16; Fri, 7 Mar 2014 02:43:38 +0400 (MSK) Received: by hades.panopticon (Postfix, from userid 1000) id 699C927D23; Fri, 7 Mar 2014 02:43:38 +0400 (MSK) Message-Id: <20140306224338.699C927D23@hades.panopticon> Date: Fri, 7 Mar 2014 02:43:38 +0400 (MSK) From: Dmitry Marakasov To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: ports/187332: [PATCH] misc/sloccount: support staging Cc: freaky@aagh.net X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Mar 2014 22:50:03 -0000 >Number: 187332 >Category: ports >Synopsis: [PATCH] misc/sloccount: support staging >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Mar 06 22:50:02 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Dmitry Marakasov >Release: FreeBSD 10.0-RELEASE amd64 >Organization: >Environment: System: FreeBSD hades.panopticon 10.0-RELEASE FreeBSD 10.0-RELEASE #0 r260807: Fri Jan 17 13:14:28 MSK >Description: - Support staging Port maintainer (freaky@aagh.net) is cc'd. Generated with FreeBSD Port Tools 1.00.2014.02.18 (mode: change, diff: ports) >How-To-Repeat: >Fix: --- sloccount-2.26.patch begins here --- diff -ruN /usr/ports/misc/sloccount/Makefile ./Makefile --- /usr/ports/misc/sloccount/Makefile 2013-09-21 00:50:57.000000000 +0400 +++ ./Makefile 2014-03-06 18:49:32.985971489 +0400 @@ -16,19 +16,13 @@ PORTDOCS= ChangeLog README TODO sloccount.html -MAN1= sloccount.1 -MANCOMPRESSED= yes - -NO_STAGE= yes post-install: .for file in lexcount1 c_count java_count php_count - @${STRIP_CMD} ${PREFIX}/bin/${file} + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${file} .endfor -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} .for docs in ${PORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/${docs} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${docs} ${STAGEDIR}${DOCSDIR} .endfor -.endif .include diff -ruN /usr/ports/misc/sloccount/files/patch-makefile ./files/patch-makefile --- /usr/ports/misc/sloccount/files/patch-makefile 2014-01-22 21:40:44.000000000 +0400 +++ ./files/patch-makefile 2014-03-06 18:50:45.539966697 +0400 @@ -1,5 +1,5 @@ ---- makefile.orig 2009-08-29 15:28:59.000000000 -0300 -+++ makefile 2009-08-29 15:30:34.000000000 -0300 +--- makefile.orig 2004-08-01 22:52:06.000000000 +0400 ++++ makefile 2014-03-06 18:50:45.513966851 +0400 @@ -28,7 +28,6 @@ # Set this for where to store the man pages and executables. # If you want to store this as part of an official distribution, @@ -16,12 +16,14 @@ # Set this to the name of your "install" program. On some systems, # "install -C" would be useful (so unchanged files won't be modified), -@@ -70,7 +68,7 @@ +@@ -69,8 +67,8 @@ + RPM_VERSION=1 ARCH=i386 VERSIONEDNAME=$(NAME)-$(VERSION) - INSTALL_DIR=$(PREFIX)/bin +-INSTALL_DIR=$(PREFIX)/bin -MAN_DIR=$(PREFIX)/share/man -+MAN_DIR=$(PREFIX)/man ++INSTALL_DIR=${DESTDIR}$(PREFIX)/bin ++MAN_DIR=${DESTDIR}$(PREFIX)/man MAN_DIR_MAN1=$(MAN_DIR)/man1 DOC_DIR=$(PREFIX)/share/doc/$(VERSIONEDNAME)-$(RPM_VERSION) POSTED_DIR=/home/dwheeler/dwheeler.com/sloccount diff -ruN /usr/ports/misc/sloccount/pkg-plist ./pkg-plist --- /usr/ports/misc/sloccount/pkg-plist 2014-01-22 19:16:56.000000000 +0400 +++ ./pkg-plist 2014-03-06 19:14:16.627869726 +0400 @@ -38,3 +38,4 @@ bin/sloccount bin/sql_count bin/tcl_count +man/man1/sloccount.1.gz --- sloccount-2.26.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: