Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 18 Apr 2016 07:45:03 +0000 (UTC)
From:      Pietro Cerutti <gahr@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r413558 - head/devel/tclxml
Message-ID:  <201604180745.u3I7j3SM064500@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: gahr
Date: Mon Apr 18 07:45:03 2016
New Revision: 413558
URL: https://svnweb.freebsd.org/changeset/ports/413558

Log:
  devel/tclxml: respect PREFIX and DOCS [1], use TEST_TARGET
  
  PR:		208874 [1]
  Submitted by:	mi [1]

Modified:
  head/devel/tclxml/Makefile

Modified: head/devel/tclxml/Makefile
==============================================================================
--- head/devel/tclxml/Makefile	Mon Apr 18 07:32:02 2016	(r413557)
+++ head/devel/tclxml/Makefile	Mon Apr 18 07:45:03 2016	(r413558)
@@ -23,12 +23,16 @@ USES=		tcl tar:xz
 XML_CONFIG?=	${LOCALBASE}/bin/xml2-config
 GNU_CONFIGURE=	yes
 USE_LDCONFIG?=	${PREFIX}/lib/Tclxml${PORTVERSION}
-CONFIGURE_ARGS=	--with-tcl=${TCL_LIBDIR} \
+CONFIGURE_ARGS=	--prefix=${PREFIX} \
+		--exec-prefix=${PREFIX} \
+		--with-tcl=${TCL_LIBDIR} \
 		XML_CONFIG="${XML_CONFIG}"
 PLIST_SUB=	VER=${PORTVERSION}
 
 OPTIONS_DEFINE=	DOCS
-MAKE_ENV+=	TCLLIBPATH=${STAGEDIR}/usr/local/lib
+MAKE_ENV+=	TCLLIBPATH=${STAGEDIR}/${PREFIX}/lib
+
+TEST_TARGET=	test
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^TCLSH_ENV[[:blank:]]*=/,/[^\]$$/d' \
@@ -36,12 +40,13 @@ post-patch:
 	@${REINPLACE_CMD} -e 's/FreeBSD-\*/FreeBSD-*|DragonFly-*/g' \
 		${WRKSRC}/configure
 
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
 post-install:
 	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} doc)
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
-
-check test: install
-	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} test)
+.endif
 
 .include <bsd.port.mk>



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