Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 5 Jun 2015 13:39:23 +0000 (UTC)
From:      Mikhail Teterin <mi@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r388577 - in head/devel: tcllib tcllibc
Message-ID:  <201506051339.t55DdNCJ011965@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mi
Date: Fri Jun  5 13:39:23 2015
New Revision: 388577
URL: https://svnweb.freebsd.org/changeset/ports/388577

Log:
  Minor follow-ups on the last commit separating pure-Tcl and compiled
  pieces of tcllib:
  
  	* make the compiled child-port RUN_DEPEND on the master --
  	  it is not useful without it.
  	* disable OPTIONS, when building the child-port -- they
  	  aren't meaningful there
  
  Pointed out by:	gahr

Modified:
  head/devel/tcllib/Makefile
  head/devel/tcllibc/Makefile

Modified: head/devel/tcllib/Makefile
==============================================================================
--- head/devel/tcllib/Makefile	Fri Jun  5 13:04:58 2015	(r388576)
+++ head/devel/tcllib/Makefile	Fri Jun  5 13:39:23 2015	(r388577)
@@ -16,7 +16,7 @@ LICENSE_NAME=	Tcl/Tk License
 LICENSE_FILE=	${WRKSRC}/license.terms
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-OPTIONS_DEFINE=	DOCS MANPAGES
+OPTIONS_DEFINE?=DOCS MANPAGES
 
 WRKSRC=		${WRKDIR}/tcllib-tcllib_${DISTVERSION}
 USES+=		tcl

Modified: head/devel/tcllibc/Makefile
==============================================================================
--- head/devel/tcllibc/Makefile	Fri Jun  5 13:04:58 2015	(r388576)
+++ head/devel/tcllibc/Makefile	Fri Jun  5 13:39:23 2015	(r388577)
@@ -6,11 +6,13 @@ PKGNAMESUFFIX=	c
 COMMENT=	Compiled implementations of some of the modules of Tcllib
 
 BUILD_DEPENDS=	critcl:${PORTSDIR}/devel/critcl
+RUN_DEPENDS=	${PREFIX}/lib/tcllib/pkgIndex.tcl:${MASTERDIR}	# PREFIX, not LOCALBASE
 
 MASTERDIR=	${.CURDIR:H}/tcllib
 TMPPLIST=		${WRKDIR}/PLIST
 DESCR=		${.CURDIR}/pkg-descr
 ALL_TARGET=	critcl
+OPTIONS_DEFINE=
 
 post-patch:
 	cd ${WRKSRC}/modules/json/c && ${YACC} -b json json.y



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