From owner-svn-ports-head@FreeBSD.ORG Thu May 30 14:25:03 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 056F86B; Thu, 30 May 2013 14:25:03 +0000 (UTC) (envelope-from bf@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 D0CC07D0; Thu, 30 May 2013 14:25:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4UEP2QK015546; Thu, 30 May 2013 14:25:02 GMT (envelope-from bf@svn.freebsd.org) Received: (from bf@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4UEP28P015545; Thu, 30 May 2013 14:25:02 GMT (envelope-from bf@svn.freebsd.org) Message-Id: <201305301425.r4UEP28P015545@svn.freebsd.org> From: Brendan Fabeny Date: Thu, 30 May 2013 14:25:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r319430 - in head/graphics/pgplot: . files 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.14 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, 30 May 2013 14:25:03 -0000 Author: bf Date: Thu May 30 14:25:02 2013 New Revision: 319430 URL: http://svnweb.freebsd.org/changeset/ports/319430 Log: Minor style changes and clean-up, including: use shebangfix and remove a redundant patch [1] Submitted by: J. Marino [1] Deleted: head/graphics/pgplot/files/patch-aa Modified: head/graphics/pgplot/Makefile (contents, props changed) Modified: head/graphics/pgplot/Makefile ============================================================================== --- head/graphics/pgplot/Makefile Thu May 30 14:07:20 2013 (r319429) +++ head/graphics/pgplot/Makefile Thu May 30 14:25:02 2013 (r319430) @@ -1,9 +1,5 @@ -# New ports collection makefile for: pgplot -# Date created: 21 December 1996 -# Whom: jmz -# +# Created by: jmz # $FreeBSD$ -# PORTNAME= pgplot PORTVERSION= 5.2.2 @@ -13,23 +9,25 @@ MASTER_SITES= ftp://ftp.astro.caltech.ed DISTNAME= ${PORTNAME}${PORTVERSION:R} MAINTAINER= bf@FreeBSD.org -COMMENT= A C/FORTRAN library for drawing graphs on a variety of display devices +COMMENT= C/FORTRAN library for drawing graphs on a variety of display devices LIB_DEPENDS= png15:${PORTSDIR}/graphics/png MAKE_JOBS_UNSAFE= yes +USES= shebangfix USE_FORTRAN= yes USE_LDCONFIG= yes USE_XORG= x11 xproto xt MAKE_ENV= SSP_CFLAGS= +SHEBANG_FILES= makehtml maketex SUFFIXES= flib clib bin WRKSRC= ${WRKDIR}/${PORTNAME} -.include +.include -.if !empty(ARCH:M*64*) +.if ${ARCH:M*64*} EXTRA_PATCHES += ${FILESDIR}/drivers_64bit_patch .endif @@ -37,7 +35,7 @@ EXTRA_PATCHES += ${FILESDIR}/drivers_64b PORTDATA= grfont.dat .endif -.ifndef(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} DOCS= cpg/cpgplot.doc pgplot-routines.tex pgplot.doc pgplot.html \ readme.pgdisp rgb.txt SUFFIXES+= doc @@ -45,14 +43,12 @@ PORTDOCS= ${DOCS:C|.*/||} USE_PERL5_BUILD= yes .endif -.ifndef(NOPORTEXAMPLES) +.if ${PORT_OPTIONS:MEXAMPLES} EXAMPLES= Makefile.demo cpg/cpgdemo.c examples/pgdemo*.f PORTEXAMPLES= ${EXAMPLES:C|.*/||} .endif post-patch: - @${REINPLACE_CMD} -e 's|/usr/local/bin/perl|${PERL}|' \ - ${WRKSRC}/makehtml ${WRKSRC}/maketex @${REINPLACE_CMD} -e 's|png_ptr->jmpbuf|png_jmpbuf(png_ptr)|' \ ${WRKSRC}/drivers/pndriv.c @${REINPLACE_CMD} -e 's|/usr/local/pgplot|${DATADIR}|g' \ @@ -78,12 +74,12 @@ do-install: @${MKDIR} ${DATADIR} @cd ${WRKSRC}; ${INSTALL_DATA} ${PORTDATA} ${DATADIR} .endif -.ifndef(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} @cd ${WRKSRC}; ${CP} pgdispd/aaaread.me readme.pgdisp; \ ${INSTALL_DATA} ${DOCS} ${DOCSDIR} .endif -.ifndef(NOPORTEXAMPLES) +.if ${PORT_OPTIONS:MEXAMPLES} @${MKDIR} ${EXAMPLESDIR} @cd ${WRKSRC}; ${INSTALL_DATA} ${EXAMPLES} ${EXAMPLESDIR} .endif @@ -99,4 +95,4 @@ check test: build PGPLOT_DIR="${WRKSRC}" PGPLOT_DEV="/xwin" ${WRKSRC}/${DEMO} .endif -.include +.include