From owner-svn-ports-all@FreeBSD.ORG  Thu Mar  6 15:13:32 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@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 C78855FE;
 Thu,  6 Mar 2014 15:13:32 +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 9A056109;
 Thu,  6 Mar 2014 15:13:32 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s26FDWGJ054956;
 Thu, 6 Mar 2014 15:13:32 GMT (envelope-from ehaupt@svn.freebsd.org)
Received: (from ehaupt@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s26FDWDs054950;
 Thu, 6 Mar 2014 15:13:32 GMT (envelope-from ehaupt@svn.freebsd.org)
Message-Id: <201403061513.s26FDWDs054950@svn.freebsd.org>
From: Emanuel Haupt <ehaupt@FreeBSD.org>
Date: Thu, 6 Mar 2014 15:13:32 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r347257 - in head/mail/nohtml: . 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-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 06 Mar 2014 15:13:32 -0000

Author: ehaupt
Date: Thu Mar  6 15:13:31 2014
New Revision: 347257
URL: http://svnweb.freebsd.org/changeset/ports/347257
QAT: https://qat.redports.org/buildarchive/r347257/

Log:
  Support staging

Added:
  head/mail/nohtml/files/
  head/mail/nohtml/files/patch-Makefile   (contents, props changed)
Modified:
  head/mail/nohtml/Makefile
  head/mail/nohtml/pkg-plist

Modified: head/mail/nohtml/Makefile
==============================================================================
--- head/mail/nohtml/Makefile	Thu Mar  6 15:11:59 2014	(r347256)
+++ head/mail/nohtml/Makefile	Thu Mar  6 15:13:31 2014	(r347257)
@@ -11,16 +11,12 @@ COMMENT=	Strip HTML attachments from ema
 
 USE_PYTHON=	yes
 
-MANCOMPRESSED=	yes
-MAN1=		nohtml.1
+OPTIONS_DEFINE=	DOCS
 
-NO_STAGE=	yes
 post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in nohtml-license.txt nohtml.html nohtml.pdf nohtml.ps nohtml.txt
-	@${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 
 .include <bsd.port.mk>

Added: head/mail/nohtml/files/patch-Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/mail/nohtml/files/patch-Makefile	Thu Mar  6 15:13:31 2014	(r347257)
@@ -0,0 +1,10 @@
+--- Makefile.orig	2014-03-06 16:09:13.534356472 +0100
++++ Makefile	2014-03-06 16:09:37.863354792 +0100
+@@ -4,5 +4,5 @@
+ all:	# Do nothing - this is a python script that needs no build
+ 
+ install:
+-	${BSD_INSTALL_SCRIPT} nohtml.py   ${PREFIX}/bin
+-	${BSD_INSTALL_MAN}    nohtml.1.gz ${PREFIX}/man/man1
++	${BSD_INSTALL_SCRIPT} nohtml.py   ${DESTDIR}${PREFIX}/bin
++	${BSD_INSTALL_MAN}    nohtml.1.gz ${DESTDIR}${MANPREFIX}/man/man1

Modified: head/mail/nohtml/pkg-plist
==============================================================================
--- head/mail/nohtml/pkg-plist	Thu Mar  6 15:11:59 2014	(r347256)
+++ head/mail/nohtml/pkg-plist	Thu Mar  6 15:13:31 2014	(r347257)
@@ -1,4 +1,5 @@
 bin/nohtml.py
+man/man1/nohtml.1.gz
 %%PORTDOCS%%share/doc/nohtml/nohtml-license.txt
 %%PORTDOCS%%share/doc/nohtml/nohtml.html
 %%PORTDOCS%%share/doc/nohtml/nohtml.pdf