From owner-svn-ports-head@FreeBSD.ORG Thu Jan 16 16:57:21 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org 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 23F4E324; Thu, 16 Jan 2014 16:57:21 +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 103C41FFA; Thu, 16 Jan 2014 16:57:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0GGvKNS095329; Thu, 16 Jan 2014 16:57:20 GMT (envelope-from gahr@svn.freebsd.org) Received: (from gahr@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0GGvKAe095328; Thu, 16 Jan 2014 16:57:20 GMT (envelope-from gahr@svn.freebsd.org) Message-Id: <201401161657.s0GGvKAe095328@svn.freebsd.org> From: Pietro Cerutti Date: Thu, 16 Jan 2014 16:57:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r339933 - head/lang/nx X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Jan 2014 16:57:21 -0000 Author: gahr Date: Thu Jan 16 16:57:20 2014 New Revision: 339933 URL: http://svnweb.freebsd.org/changeset/ports/339933 QAT: https://qat.redports.org/buildarchive/r339933/ Log: - Remove unneeded conditional around DOCS installation - Re-order LICENSE and OPTIONS_DEFINE Modified: head/lang/nx/Makefile Modified: head/lang/nx/Makefile ============================================================================== --- head/lang/nx/Makefile Thu Jan 16 16:45:29 2014 (r339932) +++ head/lang/nx/Makefile Thu Jan 16 16:57:20 2014 (r339933) @@ -10,10 +10,10 @@ DISTNAME= nsf${DISTVERSION} MAINTAINER= tcltk@FreeBSD.org COMMENT= Highly flexible, Tcl-based, object-oriented scripting language -OPTIONS_DEFINE= DOCS - LICENSE= MIT +OPTIONS_DEFINE= DOCS + CONFLICTS= xotcl-1.* USES+= tcl:85+ @@ -25,16 +25,12 @@ CONFIGURE_ARGS+=--exec-prefix=${PREFIX} PLIST_SUB+= PKGNAME=${DISTNAME} PORTDOCS= * -.include - post-patch: ${CP} ${FILESDIR}/genStubs.tcl ${WRKSRC} post-install: -.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR} -.endif regression-test: build cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} test