From owner-svn-ports-all@FreeBSD.ORG  Wed Jul 10 15:19:11 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id B4615C5A;
 Wed, 10 Jul 2013 15:19:11 +0000 (UTC)
 (envelope-from danfe@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 8DD26167A;
 Wed, 10 Jul 2013 15:19:11 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6AFJB0q079722;
 Wed, 10 Jul 2013 15:19:11 GMT (envelope-from danfe@svn.freebsd.org)
Received: (from danfe@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6AFJBTw079720;
 Wed, 10 Jul 2013 15:19:11 GMT (envelope-from danfe@svn.freebsd.org)
Message-Id: <201307101519.r6AFJBTw079720@svn.freebsd.org>
From: Alexey Dokuchaev <danfe@FreeBSD.org>
Date: Wed, 10 Jul 2013 15:19:11 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r322703 - head/lang/yorick
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.14
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: Wed, 10 Jul 2013 15:19:11 -0000

Author: danfe
Date: Wed Jul 10 15:19:11 2013
New Revision: 322703
URL: http://svnweb.freebsd.org/changeset/ports/322703

Log:
  - Cleanup Makefile before making the port make jobs safe
  - Convert NOPORTDOCS to OPTIONS; pet portlint(1)

Modified:
  head/lang/yorick/Makefile

Modified: head/lang/yorick/Makefile
==============================================================================
--- head/lang/yorick/Makefile	Wed Jul 10 15:00:29 2013	(r322702)
+++ head/lang/yorick/Makefile	Wed Jul 10 15:19:11 2013	(r322703)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	Yorick
-# Date created:         26 Oct 97
-# Whom:                 Pedro Giffuni <giffunip@asme.org>
-#
+# Created by: Pedro Giffuni <giffunip@asme.org>
 # $FreeBSD$
-#
 
 PORTNAME=	yorick
 PORTVERSION=	2.1.06
@@ -12,47 +8,47 @@ MASTER_SITES=	SF
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	johans@FreeBSD.org
-COMMENT=	Interpreted language and scientific graphics
-
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
+COMMENT=	Interpreted language for scientific simulations
 
 USE_XORG=	x11
 MAKE_ARGS=	Y_HOME=relocatable Y_DOCDIR=/dev/null
 MAN1=		yorick.1 gist.1
 INFO=		yorick
 
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
+
 PORTDOCS=	FILE_FORMATS README drat.doc graph.doc hex.doc \
 		library.doc math.doc refs.pdf refs.tex std.doc \
 		yorick.pdf yorick.tex
 
+OPTIONS_DEFINE=	DOCS
+
+.include <bsd.port.options.mk>
+
 do-configure:
 	@(cd ${CONFIGURE_WRKSRC}; ${SETENV} ${MAKE_ENV} \
 		${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ysite config)
 
 post-build:
-	cd ${WRKSRC}/doc; make yorick.info
+	${MAKE} -C ${WRKSRC}/doc yorick.info
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/emacs/yorick.el ${WRKSRC}/relocatable
 	@${RM} -rf ${WRKSRC}/relocatable/doc
 	@${RM} -rf ${PREFIX}/lib/${PORTNAME}
 	@${MV} ${WRKSRC}/relocatable ${PREFIX}/lib/${PORTNAME}
-.for file in gist yorick
-	${INSTALL_MAN} ${WRKSRC}/doc/${file}.1 ${PREFIX}/man/man1
-	@${STRIP_CMD} ${PREFIX}/lib/${PORTNAME}/bin/${file}
-	@${LN} -sf ${PREFIX}/lib/${PORTNAME}/bin/${file} ${PREFIX}/bin/${file}
+.for f in gist yorick
+	${INSTALL_MAN} ${WRKSRC}/doc/${f}.1 ${MANPREFIX}/man/man1
+	@${STRIP_CMD} ${PREFIX}/lib/${PORTNAME}/bin/${f}
+	@${LN} -sf ${PREFIX}/lib/${PORTNAME}/bin/${f} ${PREFIX}/bin/${f}
 .endfor
 	@${STRIP_CMD} ${PREFIX}/lib/${PORTNAME}/lib/codger
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
-.for file in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR}
-.endfor
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${DOCSDIR}
 	@${LN} -sf ${DOCSDIR} ${PREFIX}/lib/${PORTNAME}/doc
 .endif
-	for f in ${WRKSRC}/doc/yorick.info*; do \
-	  ${INSTALL_DATA} $$f ${PREFIX}/${INFO_PATH}; \
-	done
+	${INSTALL_DATA} ${WRKSRC}/doc/yorick.info* ${PREFIX}/${INFO_PATH}
 
 # Hidden by default: this requires an X terminal to run all checks
 .ifdef MAINTAINER_MODE