From owner-svn-ports-all@FreeBSD.ORG  Sat Dec 14 19:01:34 2013
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 8A17FA7F;
 Sat, 14 Dec 2013 19:01:34 +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 768A61693;
 Sat, 14 Dec 2013 19:01:34 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBEJ1YSA009329;
 Sat, 14 Dec 2013 19:01:34 GMT (envelope-from wg@svn.freebsd.org)
Received: (from wg@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBEJ1YBt009328;
 Sat, 14 Dec 2013 19:01:34 GMT (envelope-from wg@svn.freebsd.org)
Message-Id: <201312141901.rBEJ1YBt009328@svn.freebsd.org>
From: William Grzybowski <wg@FreeBSD.org>
Date: Sat, 14 Dec 2013 19:01:34 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r336471 - head/sysutils/slurm-hpc
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: Sat, 14 Dec 2013 19:01:34 -0000

Author: wg
Date: Sat Dec 14 19:01:33 2013
New Revision: 336471
URL: http://svnweb.freebsd.org/changeset/ports/336471

Log:
  sysutils/slurm-hpc: fix the usage of python
  
  Reported by:	exp-run (PR 184591)
  Approved by:	portmgr (blanket)

Modified:
  head/sysutils/slurm-hpc/Makefile

Modified: head/sysutils/slurm-hpc/Makefile
==============================================================================
--- head/sysutils/slurm-hpc/Makefile	Sat Dec 14 18:39:20 2013	(r336470)
+++ head/sysutils/slurm-hpc/Makefile	Sat Dec 14 19:01:33 2013	(r336471)
@@ -78,11 +78,17 @@ CONFIGURE_ARGS+=--with-pg_config=/nopost
 # preinstalled on 9.1-RELEASE.  Worked fine on second try.
 USE_GNOME=	glib20 gtk20	# sview
 PLIST_FILES+=	bin/sview
-.else
-# Can't disable configure test, so make it fail
+.endif
+
 post-patch:
+# Can't disable configure test, so make it fail
+.if ! ${PORT_OPTIONS:MGTK2}
 	${REINPLACE_CMD} -e 's|min_gtk_version=2.7.1|min_gtk_version=200.7.1|' \
 		${WRKSRC}/configure
 .endif
+	@${REINPLACE_CMD} \
+		-e 's|/usr/bin/env python|${PYTHON_CMD}|g' \
+		${WRKSRC}/doc/html/shtml2html.py \
+		${WRKSRC}/doc/man/man2html.py
 
 .include <bsd.port.mk>