From owner-svn-ports-all@FreeBSD.ORG  Tue Jun 24 08:42:38 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 8E19FFA;
 Tue, 24 Jun 2014 08:42:38 +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 7B63E2E9E;
 Tue, 24 Jun 2014 08:42:38 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5O8gcrJ087504;
 Tue, 24 Jun 2014 08:42:38 GMT (envelope-from antoine@svn.freebsd.org)
Received: (from antoine@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5O8gcFV087503;
 Tue, 24 Jun 2014 08:42:38 GMT (envelope-from antoine@svn.freebsd.org)
Message-Id: <201406240842.s5O8gcFV087503@svn.freebsd.org>
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Tue, 24 Jun 2014 08:42:38 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-svnadmin@freebsd.org
Subject: svn commit: r359061 - svnadmin/hooks/scripts
X-SVN-Group: ports-svnadmin
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.18
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: Tue, 24 Jun 2014 08:42:38 -0000

Author: antoine
Date: Tue Jun 24 08:42:37 2014
New Revision: 359061
URL: http://svnweb.freebsd.org/changeset/ports/359061
QAT: https://qat.redports.org/buildarchive/r359061/

Log:
  Prevent committing ports with obsolete NOPORT*
  
  Phabric:	D277
  Reviewed by:	mat
  With hat:	portmgr

Modified:
  svnadmin/hooks/scripts/stage-only.sh

Modified: svnadmin/hooks/scripts/stage-only.sh
==============================================================================
--- svnadmin/hooks/scripts/stage-only.sh	Tue Jun 24 08:18:35 2014	(r359060)
+++ svnadmin/hooks/scripts/stage-only.sh	Tue Jun 24 08:42:37 2014	(r359061)
@@ -23,6 +23,24 @@ for line in $(svnlook changed -t $TXN $R
 			echo "https://wiki.freebsd.org/ports/StageDir" 1>&2
 			exit 1
 		fi
+		if svnlook cat -t ${TXN} ${REPO} $fpath | grep -qE "if.*def.*(NOPORTDOCS|NOPORTEXAMPLES)" ; then
+			echo "Do not commit ports with NOPORTDOCS or NOPORTEXAMPLES." 1>&2
+			echo "The port must be converted to proper OPTIONS.  See" 1>&2
+			echo "http://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/makefile-options.html" 1>&2
+			exit 1
+		fi
+		if svnlook cat -t ${TXN} ${REPO} $fpath | grep -q "if.*def.*NOPORTDATA" ; then
+			echo "Do not commit ports with NOPORTDATA." 1>&2
+			echo "NOPORTDATA is nonsense as a variable affecting all ports." 1>&2
+			exit 1
+		fi
+	;;
+	head/*/*/pkg-plist*)
+		if svnlook cat -t ${TXN} ${REPO} $fpath | grep -q "%%PORTDATA%%" ; then
+			echo "Do not commit ports with %%PORTDATA%%." 1>&2
+			echo "NOPORTDATA is nonsense as a variable affecting all ports." 1>&2
+			exit 1
+		fi
 	;;
 	esac
 done