- Update MASTER_SITES and WWW: line

- Utilize PLIST_FILES/PORTEXAMPLES

PR:		155828
Submitted by:	Ports Fury

3 files changed, 23 insertions, 34 deletions

diff --git a/textproc/foiltex/Makefile b/textproc/foiltex/Makefile
index 358f1843f928..5aaeaf66bc58 100644
--- a/textproc/foiltex/Makefile
+++ b/textproc/foiltex/Makefile
@@ -7,18 +7,15 @@
 
 PORTNAME=	foiltex
 PORTVERSION=	2.1.4b
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_TEX_CTAN}
-MASTER_SITE_SUBDIR=	nonfree/macros/latex/contrib/${PORTNAME}
+MASTER_SITE_SUBDIR=	macros/latex/contrib/${PORTNAME}
 DISTFILES=	foiltex.dtx foiltex.ins
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A collection of LaTeX files for making foils
 
-DEPRECATED=     Upstream disapear and distfile is no more available
-EXPIRATION_DATE=        2011-05-01
-
 BUILD_DEPENDS=	latex:${PORTSDIR}/print/teTeX-base
 RUN_DEPENDS=	latex:${PORTSDIR}/print/teTeX-base
 
@@ -28,14 +25,14 @@ NO_WRKSUBDIR=	yes
 
 LATEX_CMD=	${LOCALBASE}/bin/latex
 
-FOIL_DIR=	${PREFIX}/share/texmf/tex/latex/${PORTNAME}
-DOC_FILES=	${WRKDIR}/foiltex.dtx ${WRKDIR}/foiltex.dvi
-EXAMPLE_FILES=	${WRKDIR}/sampfoil.tex
-FOIL_FILES=	${WRKDIR}/foil17.clo ${WRKDIR}/foil20.clo \
-		${WRKDIR}/foil25.clo ${WRKDIR}/foil30.clo \
-		${WRKDIR}/foils.cls ${WRKDIR}/foils.sty \
-		${WRKDIR}/foilshrt.clo ${WRKDIR}/fltfonts.def
-PLIST_SUB=	FOIL_DIR="${FOIL_DIR:S,^${PREFIX}/,,}"
+FOIL_DIR=	share/texmf/tex/latex/${PORTNAME}
+FOIL_FILES=	foil17.clo foil20.clo foil25.clo foil30.clo foils.cls \
+		foils.sty foilshrt.clo fltfonts.def
+
+PORTDOCS=	foiltex.dtx foiltex.dvi
+PORTEXAMPLES=	sampfoil.tex
+PLIST_FILES=	${FOIL_FILES:S,^,${FOIL_DIR}/,}
+PLIST_DIRS=	${FOIL_DIR}
 
 do-extract:
 	${MKDIR} ${WRKDIR}
@@ -49,18 +46,26 @@ do-build:
 		${LATEX_CMD} foiltex.dtx
 
 do-install:
+# install data files
+	@${MKDIR} ${PREFIX}/${FOIL_DIR}
+.for file in ${FOIL_FILES}
+	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/${FOIL_DIR}
+.endfor
 # install docs and example file?
 .if !defined(NOPORTDOCS)
 # install docs...
 	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${DOC_FILES} ${DOCSDIR}
+.for file in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
+.endfor
+.endif
+.if !defined(NOPORTEXAMPLES)
 # ...and examples
 	@${MKDIR} ${EXAMPLESDIR}
-	@${INSTALL_DATA} ${EXAMPLE_FILES} ${EXAMPLESDIR}
+.for file in ${PORTEXAMPLES}
+	${INSTALL_DATA} ${WRKSRC}/${file} ${EXAMPLESDIR}
+.endfor
 .endif
-# install data files
-	@${MKDIR} ${FOIL_DIR}
-	@${INSTALL_DATA} ${FOIL_FILES} ${FOIL_DIR}
 
 post-install:
 	${SETENV} LOCALBASE=${LOCALBASE} PKG_PREFIX=${PREFIX} \
diff --git a/textproc/foiltex/distinfo b/textproc/foiltex/distinfo
index 12a40f93e60e..288e9b4bd4bc 100644
--- a/textproc/foiltex/distinfo
+++ b/textproc/foiltex/distinfo
@@ -1,6 +1,4 @@
-MD5 (foiltex.dtx) = 439ead7ad5487c30d7e5daa7e2f85eb0
 SHA256 (foiltex.dtx) = ff6236c475e9662d12f7cf2e16c1ae3d5ea184cc3c7b45399bf3fc9b27f8d91d
 SIZE (foiltex.dtx) = 174081
-MD5 (foiltex.ins) = 9628fceb4b45f016fcc713e5a10024d1
 SHA256 (foiltex.ins) = 2939b7a6477e0a9bb49d213659fb0d11ae7a3de5c168d7f1fec38ed95bf49327
 SIZE (foiltex.ins) = 6311
diff --git a/textproc/foiltex/pkg-plist b/textproc/foiltex/pkg-plist
deleted file mode 100644
index b52a4b62b4f2..000000000000
--- a/textproc/foiltex/pkg-plist
+++ /dev/null
@@ -1,14 +0,0 @@
-%%PORTDOCS%%%%DOCSDIR%%/foiltex.dtx
-%%PORTDOCS%%%%DOCSDIR%%/foiltex.dvi
-%%PORTDOCS%%%%EXAMPLESDIR%%/sampfoil.tex
-%%FOIL_DIR%%/foil17.clo
-%%FOIL_DIR%%/foil20.clo
-%%FOIL_DIR%%/foil25.clo
-%%FOIL_DIR%%/foil30.clo
-%%FOIL_DIR%%/foils.cls
-%%FOIL_DIR%%/foils.sty
-%%FOIL_DIR%%/foilshrt.clo
-%%FOIL_DIR%%/fltfonts.def
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
-@dirrm %%FOIL_DIR%%