From sahil@spartan.hamla.org  Sat Dec 12 05:27:52 2009
Return-Path: <sahil@spartan.hamla.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1208D106566B;
	Sat, 12 Dec 2009 05:27:52 +0000 (UTC)
	(envelope-from sahil@spartan.hamla.org)
Received: from spartan.hamla.org (spartan.hamla.org [206.251.255.30])
	by mx1.freebsd.org (Postfix) with ESMTP id 0031A8FC15;
	Sat, 12 Dec 2009 05:27:51 +0000 (UTC)
Received: by spartan.hamla.org (Postfix, from userid 1001)
	id 9682F170BD; Sat, 12 Dec 2009 00:27:51 -0500 (EST)
Message-Id: <20091212052751.9682F170BD@spartan.hamla.org>
Date: Sat, 12 Dec 2009 00:27:51 -0500 (EST)
From: Sahil Tandon <sahil@tandon.net>
Reply-To: Sahil Tandon <sahil@tandon.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc: miwi@FreeBSD.org 
Subject: [PATCH] shells/osh: update to 20091127 + respect NOPORTDOCS and NOPORTEXAMPLES
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         141396
>Category:       ports
>Synopsis:       [PATCH] shells/osh: update to 20091127 + respect NOPORTDOCS and NOPORTEXAMPLES
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    miwi
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Dec 12 05:30:03 UTC 2009
>Closed-Date:    Sat Dec 12 13:48:27 UTC 2009
>Last-Modified:  Sat Dec 12 13:50:08 UTC 2009
>Originator:     Sahil Tandon
>Release:        FreeBSD 7.2-RELEASE i386
>Organization:
>Environment:

	
>Description:
- Update to 20091127
- Respect NOPORTDOCS and NOPORTEXAMPLES
- Adjust MAKE_ENV to ensure that files are installed in appropriate locations 
>How-To-Repeat:
	
>Fix:

	



--- osh.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/shells/osh/Makefile,v
retrieving revision 1.27
diff -u -r1.27 Makefile
--- Makefile	28 May 2009 23:16:31 -0000	1.27
+++ Makefile	12 Dec 2009 05:21:29 -0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	osh
-DISTVERSION=	20090527
+DISTVERSION=	20091127
 CATEGORIES=	shells
 MASTER_SITES=	http://v6shell.org/src/ \
 		http://freebsd.unixfreunde.de/sources/
@@ -14,8 +14,33 @@
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	An implementation of the UNIX 6th Edition shell
 
+MAKE_ENV+=	DOCDIR=${DOCSDIR} \
+		DESTEXPDIR=${EXAMPLESDIR} \
+		MANDIR=${MANPREFIX}/man/man1
+
 MAN1=		fd2.1 goto.1 if.1 osh.1 sh6.1 glob6.1
 
+PORTDOCS=	*
+PORTEXAMPLES=	*
+
+.include <bsd.port.pre.mk>
+
+post-patch:
+	@${REINPLACE_CMD} -E -e 's|(DESTEXPDIR)=|\1?=|' \
+		${WRKSRC}/Makefile
+.if defined(NOPORTDOCS)
+	@${REINPLACE_CMD} -e /^install-doc/d \
+		-e /\ $$\(DESTDOCDIR\)/d \
+		-e 's/install-doc//' \
+		${WRKSRC}/Makefile
+.endif
+.if defined(NOPORTEXAMPLES)
+	@${REINPLACE_CMD} -e /^install-exp/d \
+		-e /\ $$\(DESTEXPDIR\)/d \
+		-e 's/install-exp//' \
+		${WRKSRC}/Makefile
+.endif
+
 post-install:
 	@${ECHO_MSG} "updating /etc/shells"
 	@${CP} /etc/shells /etc/shells.bak
@@ -23,4 +48,4 @@
 	 ${ECHO_CMD} ${PREFIX}/bin/osh) > /etc/shells
 	@${RM} /etc/shells.bak
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/shells/osh/distinfo,v
retrieving revision 1.20
diff -u -r1.20 distinfo
--- distinfo	28 May 2009 23:16:31 -0000	1.20
+++ distinfo	12 Dec 2009 05:21:29 -0000
@@ -1,3 +1,3 @@
-MD5 (osh-20090527.tar.gz) = 179f79cfe6eb30036189e5ff111aa4ec
-SHA256 (osh-20090527.tar.gz) = 3fb3337d2b3264331ff1542de8ae675a6d77245c70d2bff8e07dee204a1d39ab
-SIZE (osh-20090527.tar.gz) = 92440
+MD5 (osh-20091127.tar.gz) = 3af1073896d5ce099ce0b09f156ffdfc
+SHA256 (osh-20091127.tar.gz) = 250b3e2bd4a8e2dd9eb9ed4d50e4839ee03427a9b04c0b97e92a889e6dc433f4
+SIZE (osh-20091127.tar.gz) = 98780
--- osh.diff ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sat Dec 12 05:30:16 UTC 2009 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=141396 
State-Changed-From-To: open->closed 
State-Changed-By: miwi 
State-Changed-When: Sat Dec 12 13:48:26 UTC 2009 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/141396: commit references a PR
Date: Sat, 12 Dec 2009 13:48:30 +0000 (UTC)

 miwi        2009-12-12 13:48:21 UTC
 
   FreeBSD ports repository
 
   Modified files:
     shells/osh           Makefile distinfo 
   Log:
   - Update to 20091127
   
   PR:             141396
   Submitted by:   Sahil Tandon <sahil@tandon.net>
   
   Revision  Changes    Path
   1.28      +27 -2     ports/shells/osh/Makefile
   1.21      +3 -3      ports/shells/osh/distinfo
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
