- Update MASTER_SITES and WWW: line

- Add LICENSE
- Support PLIST_FILES

PR:		164985
Submitted by:	Ports Fury

3 files changed, 28 insertions, 20 deletions

diff --git a/biology/gff2ps/Makefile b/biology/gff2ps/Makefile
index 2e4151842928..b95c40ae5545 100644
--- a/biology/gff2ps/Makefile
+++ b/biology/gff2ps/Makefile
@@ -9,36 +9,47 @@ PORTNAME=	gff2ps
 PORTVERSION=	0.98d
 PORTREVISION=	2
 CATEGORIES=	biology
-MASTER_SITES=	ftp://www1.imim.es/pub/gff_tools/gff2ps/:prog \
-		http://www1.imim.es/software/gfftools/gff2ps_docs/manual/:doc
-DISTFILES=	${PORTNAME}_v${PORTVERSION}.gz:prog ${GFF2PS_MAN}.gz:doc
+MASTER_SITES=	ftp://genome.crg.es/pub/gff_tools/gff2ps/ \
+		http://genome.crg.es/software/gfftools/gff2ps_docs/manual/:doc
+DISTFILES=	${PORTNAME}_v${PORTVERSION}.gz
+.if !defined(NOPORTDOCS)
+DISTFILES+=	${GFF2PS_MAN}.gz:doc
+.endif
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Converts gff-formated genomic data-sets to PostScript
 
+LICENSE=	GPLv2 # (or later)
+
 RUN_DEPENDS=	gawk:${PORTSDIR}/lang/gawk \
 		bash:${PORTSDIR}/shells/bash
 
-GFF2PS_MAN=	MANUAL_GFF2PS_v0.96.ps
-PATCH_WRKSRC=	${WRKDIR}
-
+NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 
-post-patch:
-	@${REINPLACE_CMD} -e 's,^#!/bin/bash,#!${LOCALBASE}/bin/bash,; \
-		s,/usr/local/bin/gawk,${LOCALBASE}/bin/gawk,' ${WRKDIR}/gff2ps
+PORTDOCS=	${GFF2PS_MAN}
+PLIST_FILES=	bin/${PORTNAME}
+
+GFF2PS_MAN=	MANUAL_GFF2PS_v0.96.ps
 
 do-extract:
 	@${MKDIR} ${WRKDIR}
 	@${GZCAT} ${DISTDIR}/${PORTNAME}_v${PORTVERSION}.gz \
 		> ${WRKDIR}/${PORTNAME}
+.if !defined(NOPORTDOCS)
 	@${GZCAT} ${DISTDIR}/${GFF2PS_MAN}.gz > ${WRKDIR}/${GFF2PS_MAN}
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} -e \
+		's|^#!/bin/bash|#!${LOCALBASE}/bin/bash| ; \
+		 s|/usr/local/bin/gawk|${LOCALBASE}/bin/gawk|' ${WRKSRC}/gff2ps
 
 do-install:
-	@${INSTALL_SCRIPT} ${WRKDIR}/gff2ps ${PREFIX}/bin
-.ifndef(NOPORTDOCS)
+	${INSTALL_SCRIPT} ${WRKDIR}/gff2ps ${PREFIX}/bin
+.if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKDIR}/${GFF2PS_MAN} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKDIR}/${GFF2PS_MAN} ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/biology/gff2ps/pkg-descr b/biology/gff2ps/pkg-descr
index 2b95b1c331a1..ab2374a01ad8 100644
--- a/biology/gff2ps/pkg-descr
+++ b/biology/gff2ps/pkg-descr
@@ -1,6 +1,6 @@
-gff2ps is a script program developed with the aim of converting gff-formatted
-records into high quality one-dimensional plots in PostScript. Such plots maybe
-useful for comparing genomic structures and to visualizing outputs from genome
-annotation programs.
+gff2ps is a script program developed with the aim of converting
+gff-formatted records into high quality one-dimensional plots in
+PostScript. Such plots maybe useful for comparing genomic structures
+and to visualizing outputs from genome annotation programs.
 
-WWW: http://www1.imim.es/software/gfftools/GFF2PS.html
+WWW: http://genome.crg.es/software/gfftools/GFF2PS.html
diff --git a/biology/gff2ps/pkg-plist b/biology/gff2ps/pkg-plist
deleted file mode 100644
index 9b7f6e1fa96a..000000000000
--- a/biology/gff2ps/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-bin/gff2ps
-%%PORTDOCS%%%%DOCSDIR%%/MANUAL_GFF2PS_v0.96.ps
-%%PORTDOCS%%@dirrm %%DOCSDIR%%