From chalpin@cs.wisc.edu  Sat May 17 18:05:57 2014
Return-Path: <chalpin@cs.wisc.edu>
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 C412ACE8
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 17 May 2014 18:05:57 +0000 (UTC)
Received: from sabe.cs.wisc.edu (sabe.cs.wisc.edu [128.105.6.20])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(Client CN "sabe.cs.wisc.edu", Issuer "InCommon Server CA" (verified OK))
	by mx1.freebsd.org (Postfix) with ESMTPS id 84BCE29DA
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 17 May 2014 18:05:56 +0000 (UTC)
Received: from spiff.home.crhalpin.org (108-249-32-238.lightspeed.mdsnwi.sbcglobal.net [108.249.32.238])
	(authenticated bits=0)
	by sabe.cs.wisc.edu (8.14.1/8.14.1) with ESMTP id s4HI5r6v028665
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO)
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 17 May 2014 13:05:55 -0500
Received: from localhost (1001@localhost [local]);
	by localhost (OpenSMTPD) with ESMTPA id 515e7fde;
	for <FreeBSD-gnats-submit@freebsd.org>;
	Sat, 17 May 2014 13:05:48 -0500 (CDT)
Message-Id: <17349474655723664852.enqueue@spiff.home.crhalpin.org>
Date: Sat, 17 May 2014 13:05:48 -0500 (CDT)
From: Corey Halpin <chalpin@cs.wisc.edu>
Reply-To: Corey Halpin <chalpin+d+1400781615.bf84c7@cs.wisc.edu>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: mail/hashcash: Stage support [PATCH]
X-Send-Pr-Version: 3.114
X-GNATS-Notify:

>Number:         189891
>Category:       ports
>Synopsis:       mail/hashcash: Stage support [PATCH]
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    miwi
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat May 17 18:10:00 UTC 2014
>Closed-Date:    Mon May 19 03:36:43 UTC 2014
>Last-Modified:  Mon May 19 03:40:01 UTC 2014
>Originator:     Corey Halpin
>Release:        FreeBSD 9.2-RELEASE-p4 i386
>Organization:
>Environment:
System: FreeBSD spiff.home.crhalpin.org 9.2-RELEASE-p4 FreeBSD 9.2-RELEASE-p4 #0: Tue Apr 8 18:05:06 UTC 2014 root@amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC i386


>Description:
	Update hashcash with stage support and better portlint complance.
>How-To-Repeat:
	NA
>Fix:


--- hashcash_stage.patch begins here ---
diff -ruN hashcash.orig/Makefile hashcash/Makefile
--- hashcash.orig/Makefile	2014-05-16 18:45:01.998014505 -0500
+++ hashcash/Makefile	2014-05-17 10:24:39.542904431 -0500
@@ -10,16 +10,29 @@
 MAINTAINER=	chalpin@cs.wisc.edu
 COMMENT=	Anti-spam / denial of service counter-measure tool
 
+LICENSE=BSD LGPL21 GPLv2
+LICENSE_COMB=dual
+
+# Also CPL: https://en.wikipedia.org/wiki/Common_Public_License
+# and Public Domain
+
 MAN1=		hashcash.1 sha1-hashcash.1
 PLIST_FILES=	bin/hashcash bin/sha1
+PLIST_FILES+= man/man1/hashcash.1.gz
+PLIST_FILES+= man/man1/sha1-hashcash.1.gz
+
 PORTDOCS=	CHANGELOG LICENSE README
 ALL_TARGET=	generic
-NO_STAGE=	yes
 
-.if defined(NOPORTDOCS)
+MAKE_ENV+= STAGEDIR=${STAGEDIR}
+
+.include <bsd.port.options.mk>
+
+.if !${PORT_OPTIONS:MDOCS}
 
 post-patch:
 	${REINPLACE_CMD} -e '/DOC_INSTALL_PATH/d' ${WRKSRC}/Makefile
+
 .endif
 
 .include <bsd.port.mk>
diff -ruN hashcash.orig/files/patch-Makefile hashcash/files/patch-Makefile
--- hashcash.orig/files/patch-Makefile	2014-05-16 18:45:01.973068608 -0500
+++ hashcash/files/patch-Makefile	2014-05-16 19:42:02.459594945 -0500
@@ -7,9 +7,9 @@
 -INSTALL_PATH = /usr/bin
 -MAN_INSTALL_PATH = /usr/share/man/man1
 -DOC_INSTALL_PATH = /usr/share/doc/hashcash-$(HC_VERS)
-+INSTALL_PATH = ${PREFIX}/bin
-+MAN_INSTALL_PATH = ${PREFIX}/man/man1
-+DOC_INSTALL_PATH = ${PREFIX}/share/doc/hashcash
++INSTALL_PATH = ${STAGEDIR}${PREFIX}/bin
++MAN_INSTALL_PATH = ${STAGEDIR}${PREFIX}/man/man1
++DOC_INSTALL_PATH = ${STAGEDIR}${PREFIX}/share/doc/hashcash
  MAKEDEPEND = makedepend
  MSLIB = mslib 
  # here you can choose the regexp style your system has
diff -ruN hashcash.orig/pkg-descr hashcash/pkg-descr
--- hashcash.orig/pkg-descr	2014-05-16 18:45:01.986831734 -0500
+++ hashcash/pkg-descr	2014-05-17 10:25:02.555897525 -0500
@@ -4,4 +4,4 @@
 parameterizable amount of work to compute for the sender.  
 
 Author: Adam Back <adam@cypherspace.org>
-WWW:    http://www.hashcash.org/
+WWW: http://www.hashcash.org/
--- hashcash_stage.patch ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: miwi 
Responsible-Changed-When: Sun May 18 06:46:18 UTC 2014 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=189891 
State-Changed-From-To: open->closed 
State-Changed-By: miwi 
State-Changed-When: Mon May 19 03:36:43 UTC 2014 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=189891 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/189891: commit references a PR
Date: Mon, 19 May 2014 03:36:46 +0000 (UTC)

 Author: miwi
 Date: Mon May 19 03:36:42 2014
 New Revision: 354485
 URL: http://svnweb.freebsd.org/changeset/ports/354485
 QAT: https://qat.redports.org/buildarchive/r354485/
 
 Log:
   - Stage support
   
   PR:		189891
   Submitted by:	maintainer
 
 Modified:
   head/mail/hashcash/Makefile
   head/mail/hashcash/files/patch-Makefile
   head/mail/hashcash/pkg-descr
 
 Modified: head/mail/hashcash/Makefile
 ==============================================================================
 --- head/mail/hashcash/Makefile	Mon May 19 03:35:53 2014	(r354484)
 +++ head/mail/hashcash/Makefile	Mon May 19 03:36:42 2014	(r354485)
 @@ -10,16 +10,29 @@ EXTRACT_SUFX=	.tgz
  MAINTAINER=	chalpin@cs.wisc.edu
  COMMENT=	Anti-spam / denial of service counter-measure tool
  
 +LICENSE=BSD LGPL21 GPLv2
 +LICENSE_COMB=dual
 +
 +# Also CPL: https://en.wikipedia.org/wiki/Common_Public_License
 +# and Public Domain
 +
  MAN1=		hashcash.1 sha1-hashcash.1
  PLIST_FILES=	bin/hashcash bin/sha1
 +PLIST_FILES+= man/man1/hashcash.1.gz
 +PLIST_FILES+= man/man1/sha1-hashcash.1.gz
 +
  PORTDOCS=	CHANGELOG LICENSE README
  ALL_TARGET=	generic
 -NO_STAGE=	yes
  
 -.if defined(NOPORTDOCS)
 +MAKE_ENV+= STAGEDIR=${STAGEDIR}
 +
 +.include <bsd.port.options.mk>
 +
 +.if !${PORT_OPTIONS:MDOCS}
  
  post-patch:
  	${REINPLACE_CMD} -e '/DOC_INSTALL_PATH/d' ${WRKSRC}/Makefile
 +
  .endif
  
  .include <bsd.port.mk>
 
 Modified: head/mail/hashcash/files/patch-Makefile
 ==============================================================================
 --- head/mail/hashcash/files/patch-Makefile	Mon May 19 03:35:53 2014	(r354484)
 +++ head/mail/hashcash/files/patch-Makefile	Mon May 19 03:36:42 2014	(r354485)
 @@ -7,9 +7,9 @@
  -INSTALL_PATH = /usr/bin
  -MAN_INSTALL_PATH = /usr/share/man/man1
  -DOC_INSTALL_PATH = /usr/share/doc/hashcash-$(HC_VERS)
 -+INSTALL_PATH = ${PREFIX}/bin
 -+MAN_INSTALL_PATH = ${PREFIX}/man/man1
 -+DOC_INSTALL_PATH = ${PREFIX}/share/doc/hashcash
 ++INSTALL_PATH = ${STAGEDIR}${PREFIX}/bin
 ++MAN_INSTALL_PATH = ${STAGEDIR}${PREFIX}/man/man1
 ++DOC_INSTALL_PATH = ${STAGEDIR}${PREFIX}/share/doc/hashcash
   MAKEDEPEND = makedepend
   MSLIB = mslib 
   # here you can choose the regexp style your system has
 
 Modified: head/mail/hashcash/pkg-descr
 ==============================================================================
 --- head/mail/hashcash/pkg-descr	Mon May 19 03:35:53 2014	(r354484)
 +++ head/mail/hashcash/pkg-descr	Mon May 19 03:36:42 2014	(r354485)
 @@ -4,4 +4,4 @@ receive. A hashcash token constitutes a 
  parameterizable amount of work to compute for the sender.  
  
  Author: Adam Back <adam@cypherspace.org>
 -WWW:    http://www.hashcash.org/
 +WWW: http://www.hashcash.org/
 _______________________________________________
 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"
 
>Unformatted:
