Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 29 Mar 2014 14:10:03 GMT
From:      dfilter@FreeBSD.ORG (dfilter service)
To:        freebsd-ports-bugs@FreeBSD.org
Subject:   Re: ports/187332: commit references a PR
Message-ID:  <201403291410.s2TEA3Zk066446@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/187332; it has been noted by GNATS.

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/187332: commit references a PR
Date: Sat, 29 Mar 2014 14:04:04 +0000 (UTC)

 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 <bsd.port.mk>
 
 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
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403291410.s2TEA3Zk066446>