Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 28 Jan 2015 06:35:18 +0000 (UTC)
From:      Antoine Brodin <antoine@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r378045 - in head/devel/tcllib: . files
Message-ID:  <201501280635.t0S6ZILd040316@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: antoine
Date: Wed Jan 28 06:35:17 2015
New Revision: 378045
URL: https://svnweb.freebsd.org/changeset/ports/378045
QAT: https://qat.redports.org/buildarchive/r378045/

Log:
  Backout r378043, creates a dependency loop and break INDEX
  
  With hat:	portmgr
  Pointy hat:	mi

Deleted:
  head/devel/tcllib/files/patch-jpeg
  head/devel/tcllib/files/patch-json
  head/devel/tcllib/files/patch-tests
  head/devel/tcllib/files/patch-warnings
Modified:
  head/devel/tcllib/Makefile
  head/devel/tcllib/pkg-plist

Modified: head/devel/tcllib/Makefile
==============================================================================
--- head/devel/tcllib/Makefile	Wed Jan 28 05:37:26 2015	(r378044)
+++ head/devel/tcllib/Makefile	Wed Jan 28 06:35:17 2015	(r378045)
@@ -3,7 +3,6 @@
 
 PORTNAME=	tcllib
 PORTVERSION=	1.16
-PORTREVISION=	1
 CATEGORIES=	devel tcl
 
 MAINTAINER=	tcltk@FreeBSD.org
@@ -14,8 +13,6 @@ LICENSE_NAME=	Tcl/Tk License
 LICENSE_FILE=	${WRKSRC}/license.terms
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-BUILD_DEPENDS=	critcl:${PORTSDIR}/devel/critcl
-
 OPTIONS_DEFINE=	DOCS MANPAGES
 
 USE_GITHUB=	yes
@@ -27,12 +24,9 @@ GH_TAGNAME=	${PORTNAME}_${PORTVERSION:S/
 USES+=		tcl
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	ac_cv_path_tclsh="${TCLSH}"
-ALL_TARGET=	critcl
+ALL_TARGET=	all
 MAKE_ENV+=	LANG=C
 PORTDOCS=	*
-REINPLACE_ARGS=	-i'""'
-CFLAGS+=	-Wno-pointer-sign -Werror
-PLIST_SUB+=	BINARCH=${OPSYS:tl}-${ARCH}
 
 INSTALL_ARGS=	-pkgs -pkg-path ${STAGEDIR}${PREFIX}/lib/tcllib \
 		-apps -app-path ${STAGEDIR}${PREFIX}/bin \
@@ -79,6 +73,11 @@ post-patch:
 	   ${WRKSRC}/modules/doctools/tests/text/04 > ${WRKSRC}/modules/doctools/tests/text/04.new
 	${MV} ${WRKSRC}/modules/doctools/tests/text/04.new ${WRKSRC}/modules/doctools/tests/text/04
 #
+#	 .orig files confuse the pt module test suite and eventually get
+#	 installed
+#
+	${FIND} ${WRKSRC} -name "*.orig" -delete
+#
 #	man pages have the .tcllib suffix, so there's no need to have a
 #	tcllib_ prefix too
 #
@@ -100,12 +99,9 @@ post-patch:
 	for man in `${FIND} . -name "*.n"`; do \
 	    ${MV} $$man `echo $$man | ${SED} -e 's|n$$|tcllib.n|'`; \
 	done
-	cd ${WRKSRC}/modules/json/c && ${YACC} -b json json.y
 
 do-install:
 	cd ${WRKSRC} && ${TCLSH} ./installer.tcl ${INSTALL_ARGS}
-	${CP} -Rp ${WRKSRC}/modules/tcllibc ${STAGEDIR}${PREFIX}/lib/tcllib/
-	rm ${STAGEDIR}${PREFIX}/lib/tcllib/tcllibc/license.terms
 
 regression-test: build
 	cd ${WRKSRC} && ${SETENV} LANG=C LC_ALL=C DISPLAY= ${MAKE} test

Modified: head/devel/tcllib/pkg-plist
==============================================================================
--- head/devel/tcllib/pkg-plist	Wed Jan 28 05:37:26 2015	(r378044)
+++ head/devel/tcllib/pkg-plist	Wed Jan 28 06:35:17 2015	(r378045)
@@ -522,10 +522,6 @@ lib/tcllib/struct/tree_tcl.tcl
 lib/tcllib/tar/pkgIndex.tcl
 lib/tcllib/tar/tar.tcl
 lib/tcllib/tar/test-support.tcl
-lib/tcllib/tcllibc/%%BINARCH%%/tcllibc.so
-lib/tcllib/tcllibc/pkgIndex.tcl
-lib/tcllib/tcllibc/critcl-rt.tcl
-lib/tcllib/tcllibc/teapot.txt
 lib/tcllib/tepam/pkgIndex.tcl
 lib/tcllib/tepam/tepam.tcl
 lib/tcllib/tepam/tepam_doc_gen.tcl



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