Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 6 Sep 2014 15:10:18 +0000 (UTC)
From:      Adam Weinberger <adamw@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r367442 - in head/lang: yap yap-devel
Message-ID:  <201409061510.s86FAIEW049783@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: adamw
Date: Sat Sep  6 15:10:18 2014
New Revision: 367442
URL: http://svnweb.freebsd.org/changeset/ports/367442
QAT: https://qat.redports.org/buildarchive/r367442/

Log:
  Fix build by removing texlive from USE_TEX.
  
  While here, just add install_docs to INSTALL_TARGET rather than
  calling a separate ${MAKE} without MAKE_ENV or MAKE_ARGS.

Modified:
  head/lang/yap-devel/Makefile
  head/lang/yap/Makefile

Modified: head/lang/yap-devel/Makefile
==============================================================================
--- head/lang/yap-devel/Makefile	Sat Sep  6 14:51:52 2014	(r367441)
+++ head/lang/yap-devel/Makefile	Sat Sep  6 15:10:18 2014	(r367442)
@@ -20,9 +20,10 @@ OPTIONS_DEFINE=	DOCS MYDDAS
 OPTIONS_SUB=	yes
 MYDDAS_DESC=	Enable MySQL support
 
-DOCS_USE=		TEX=formats:build,dvipsk:build,texlive
+DOCS_USE=		TEX=formats:build,dvipsk:build
 DOCS_BUILD_DEPENDS=	${LOCALBASE}/bin/texi2html:${PORTSDIR}/textproc/texi2html \
 			${LOCALBASE}/bin/texi2pdf:${PORTSDIR}/print/texinfo
+DOCS_INSTALL_TARGET=	install install_doc
 
 MYDDAS_LIB_DEPENDS=		libiodbc.so:${PORTSDIR}/databases/libiodbc
 MYDDAS_CONFIGURE_ENABLE=	myddas myddas-top-level
@@ -32,7 +33,7 @@ STRIP=	#none
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--enable-max-performance --disable-clpbn-bp
-USES=	gmake
+USES=		gmake
 USE_GCC=	any
 
 EXTRACT_CMD=	${GZIP_CMD}
@@ -50,9 +51,4 @@ post-build:
 	${REINPLACE_CMD} -e '758,761d' ${WRKSRC}/Makefile
 .endif
 
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	(cd ${WRKSRC} ; ${MAKE} DESTDIR=${STAGEDIR} install_docs)
-.endif
-
 .include <bsd.port.mk>

Modified: head/lang/yap/Makefile
==============================================================================
--- head/lang/yap/Makefile	Sat Sep  6 14:51:52 2014	(r367441)
+++ head/lang/yap/Makefile	Sat Sep  6 15:10:18 2014	(r367442)
@@ -15,14 +15,15 @@ CONFLICTS=	yap-6.3.*
 
 OPTIONS_DEFINE=	DOCS
 
-DOCS_USE=		TEX=formats:build,dvipsk:build,texlive
+DOCS_USE=		TEX=formats:build,dvipsk:build
 DOCS_BUILD_DEPENDS=	${LOCALBASE}/bin/texi2html:${PORTSDIR}/textproc/texi2html \
 			${LOCALBASE}/bin/texi2pdf:${PORTSDIR}/print/texinfo
+DOCS_INSTALL_TARGET=	install install_docs
 
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-max-performance
-USES=	gmake
+USES=		gmake
 USE_GCC=	any
 
 DOCSDIR=	${PREFIX}/share/doc/Yap
@@ -36,9 +37,4 @@ post-build:
 	${REINPLACE_CMD} -e '559,562d' ${WRKSRC}/Makefile
 .endif
 
-post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	(cd ${WRKSRC} ; ${MAKE} DESTDIR=${STAGEDIR} install_docs)
-.endif
-
 .include <bsd.port.mk>



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