svn commit: r400639 - head/arabic/arabtex

Alexey Dokuchaev danfe at FreeBSD.org
Mon Nov 2 08:24:52 UTC 2015


Author: danfe
Date: Mon Nov  2 08:24:51 2015
New Revision: 400639
URL: https://svnweb.freebsd.org/changeset/ports/400639

Log:
  - Rework broken conversion to option helpers in r399610: while ARABTEXDIRS
    ends up with the correct values, .for loop in `do-install' recipe would
    not iterate over `doc' subdirectory.  So instead, get rid of ARABTEXDIRS
    altogether and install docs in dedicated `do-install-DOCS-on' target
  - While here, optimize away MKTEXLSR variable that was used only to amend
    PLIST_SUB knob and convert EXTRACT_SUFX to USES=tar:tgz per portlint(1)
  
  Reported by:	marino

Modified:
  head/arabic/arabtex/Makefile

Modified: head/arabic/arabtex/Makefile
==============================================================================
--- head/arabic/arabtex/Makefile	Mon Nov  2 08:14:30 2015	(r400638)
+++ head/arabic/arabtex/Makefile	Mon Nov  2 08:24:51 2015	(r400639)
@@ -7,32 +7,28 @@ PORTREVISION=	5
 CATEGORIES=	arabic print
 MASTER_SITES=	ftp://ftp.informatik.uni-stuttgart.de/pub/${PORTNAME}/
 DISTNAME=	arab${PORTVERSION:S/.//}
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	nivit at FreeBSD.org
 COMMENT=	TeX/LaTeX package to generate Arabic writing
 
 LICENSE=	LPPL10
 
+USES=		tar:tgz
 USE_TEX=	base texmf
 
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 
-ARABTEXDIRS=	fonts tex
-MKTEXLSR=	${LOCALBASE}/bin/mktexlsr
-
-PLIST_SUB=	MKTEXLSR=${MKTEXLSR}
+PLIST_SUB=	MKTEXLSR=${LOCALBASE}/bin/mktexlsr
 
 OPTIONS_DEFINE=	DOCS
 
-DOCS_VARS=	ARABTEXDIRS+=doc
-
 do-install:
-.for dir in ${ARABTEXDIRS}
-	@${MKDIR} ${STAGEDIR}${PREFIX}/${TEXMFLOCALDIR}/${dir}
-	(cd ${WRKDIR}/${dir} && \
-	${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${TEXMFLOCALDIR}/${dir})
-.endfor
+	(cd ${WRKDIR} && ${COPYTREE_SHARE} "fonts tex" \
+		${STAGEDIR}${PREFIX}/${TEXMFLOCALDIR})
+
+do-install-DOCS-on:
+	(cd ${WRKDIR} && ${COPYTREE_SHARE} doc \
+		${STAGEDIR}${PREFIX}/${TEXMFLOCALDIR})
 
 .include <bsd.port.mk>


More information about the svn-ports-all mailing list