From owner-svn-ports-head@FreeBSD.ORG Sat Mar 29 14:04:01 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 635DBA9B; Sat, 29 Mar 2014 14:04:01 +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 35DC83DD; Sat, 29 Mar 2014 14:04:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2TE41n4004684; Sat, 29 Mar 2014 14:04:01 GMT (envelope-from amdmi3@svn.freebsd.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2TE407I004676; Sat, 29 Mar 2014 14:04:00 GMT (envelope-from amdmi3@svn.freebsd.org) Message-Id: <201403291404.s2TE407I004676@svn.freebsd.org> From: Dmitry Marakasov Date: Sat, 29 Mar 2014 14:04:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r349513 - in head/misc/sloccount: . 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: Sat, 29 Mar 2014 14:04:01 -0000 Author: amdmi3 Date: Sat Mar 29 14:04:00 2014 New Revision: 349513 URL: http://svnweb.freebsd.org/changeset/ports/349513 QAT: https://qat.redports.org/buildarchive/r349513/ Log: - Support staging PR: 187332 Submitted by: amdmi3 Approved by: maintainer timeout, portmgr (blanket) Modified: head/misc/sloccount/Makefile head/misc/sloccount/files/patch-makefile head/misc/sloccount/pkg-plist Modified: head/misc/sloccount/Makefile ============================================================================== --- head/misc/sloccount/Makefile Sat Mar 29 14:02:29 2014 (r349512) +++ head/misc/sloccount/Makefile Sat Mar 29 14:04:00 2014 (r349513) @@ -16,19 +16,13 @@ INSTALL_TARGET= install_programs install 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 Modified: head/misc/sloccount/files/patch-makefile ============================================================================== --- head/misc/sloccount/files/patch-makefile Sat Mar 29 14:02:29 2014 (r349512) +++ head/misc/sloccount/files/patch-makefile Sat Mar 29 14:04:00 2014 (r349513) @@ -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 Modified: head/misc/sloccount/pkg-plist ============================================================================== --- head/misc/sloccount/pkg-plist Sat Mar 29 14:02:29 2014 (r349512) +++ head/misc/sloccount/pkg-plist Sat Mar 29 14:04:00 2014 (r349513) @@ -38,3 +38,4 @@ bin/show_filecount bin/sloccount bin/sql_count bin/tcl_count +man/man1/sloccount.1.gz