Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 1 Jun 2014 11:26:39 +0000 (UTC)
From:      Olli Hauer <ohauer@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r356098 - head/biology/njplot
Message-ID:  <201406011126.s51BQdPl011352@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ohauer
Date: Sun Jun  1 11:26:39 2014
New Revision: 356098
URL: http://svnweb.freebsd.org/changeset/ports/356098
QAT: https://qat.redports.org/buildarchive/r356098/

Log:
  - add stage support
  - add OPTION for X11
  - bump PORTREVISION

Modified:
  head/biology/njplot/Makefile

Modified: head/biology/njplot/Makefile
==============================================================================
--- head/biology/njplot/Makefile	Sun Jun  1 11:23:36 2014	(r356097)
+++ head/biology/njplot/Makefile	Sun Jun  1 11:26:39 2014	(r356098)
@@ -3,14 +3,19 @@
 
 PORTNAME=	njplot
 PORTVERSION=	2.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	biology
 MASTER_SITES=	ftp://pbil.univ-lyon1.fr/pub/mol_phylogeny/njplot/archive/
 
 MAINTAINER=	mzaki@m.u-tokyo.ac.jp
 COMMENT=	Phylogenetic tree drawing program capable of interactive manipulation
 
-.ifndef (WITHOUT_X11)
+OPTIONS_DEFINE=		DOCS X11
+OPTIONS_DEFAULT=	DOCS X11
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MX11}
 BUILD_DEPENDS=	${LOCALBASE}/lib/ncbi/libvibrant.a:${PORTSDIR}/biology/ncbi-toolkit
 USE_XORG=	x11 xt xmu xp
 USES=		motif
@@ -19,7 +24,7 @@ USES=		motif
 MAKEFILE=	makefile
 
 BINARIES=	newicktops newicktotxt
-.ifndef (WITHOUT_X11)
+.if ${PORT_OPTIONS:MX11}
 BINARIES+=	njplot unrooted
 .endif
 .for file in ${BINARIES}
@@ -28,30 +33,19 @@ PLIST_FILES+=	bin/${file}
 
 PORTDOCS=	njplot.help njplot.html njplot.gif
 
-MAN1=		njplot.1 unrooted.1
-NO_STAGE=	yes
-
-OPTIONS_DEFINE=	DOCS
-
-.include <bsd.port.options.mk>
+MAN_1=		njplot.1 unrooted.1
+PLIST_FILES+=	man/man1/njplot.1.gz \
+		man/man1/unrooted.1.gz
 
-.ifdef (WITHOUT_X11)
+.if !${PORT_OPTIONS:MX11}
 post-patch:
 	${REINPLACE_CMD} -e 's|njplot.*unrooted||' ${WRKSRC}/makefile
 .endif
 
 do-install:
-.for file in ${BINARIES}
-	${INSTALL_PROGRAM} ${WRKSRC}/${file} ${PREFIX}/bin
-.endfor
-.for file in ${MAN1}
-	${INSTALL_MAN} ${WRKSRC}/${file} ${PREFIX}/man/man1
-.endfor
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-.for file in ${PORTDOCS}
-	${INSTALL_MAN} ${WRKSRC}/${file} ${DOCSDIR}
-.endfor
-.endif
+	${INSTALL_PROGRAM} ${BINARIES:S|^|${WRKSRC}/|} ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${MAN_1:S|^|${WRKSRC}/|} ${STAGEDIR}${PREFIX}/man/man1
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_MAN} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406011126.s51BQdPl011352>