Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 10 Feb 2016 09:00:18 +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: r408619 - in head/devel/tcllib: . files
Message-ID:  <201602100900.u1A90IYN074314@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: gahr
Date: Wed Feb 10 09:00:17 2016
New Revision: 408619
URL: https://svnweb.freebsd.org/changeset/ports/408619

Log:
  devel/tcllibc: fix build on 32-bit platforms, don't build doc or man

Modified:
  head/devel/tcllib/Makefile
  head/devel/tcllib/files/patch-warnings

Modified: head/devel/tcllib/Makefile
==============================================================================
--- head/devel/tcllib/Makefile	Wed Feb 10 02:10:03 2016	(r408618)
+++ head/devel/tcllib/Makefile	Wed Feb 10 09:00:17 2016	(r408619)
@@ -4,6 +4,7 @@
 PORTNAME=	tcllib
 DISTVERSIONPREFIX=	${PORTNAME}_
 DISTVERSION=	1_18
+PORTREVISION=	1
 CATEGORIES=	devel tcl
 
 MAINTAINER=	tcltk@FreeBSD.org
@@ -36,9 +37,7 @@ INSTALL_ARGS=	-pkgs -pkg-path ${STAGEDIR
 #
 # Man pages
 #
-.if !(defined(ALL_TARGET) && !empty(${ALL_TARGET:Mcritcl}))
-
-.if ${PORT_OPTIONS:MMANPAGES}
+.if ${PORT_OPTIONS:MMANPAGES} && !(defined(ALL_TARGET) && !empty(${ALL_TARGET:Mcritcl}))
 ALL_TARGET+=	nroff-doc
 INSTALL_ARGS+=	-nroff-path ${STAGEDIR}${PREFIX}/man/mann
 .else
@@ -48,15 +47,13 @@ INSTALL_ARGS+=	-no-nroff
 #
 # HTML documentation
 #
-.if ${PORT_OPTIONS:MDOCS}
+.if ${PORT_OPTIONS:MDOCS} && !(defined(ALL_TARGET) && !empty(${ALL_TARGET:Mcritcl}))
 ALL_TARGET+=	html-doc
 INSTALL_ARGS+=	-html-path ${STAGEDIR}${DOCSDIR}
 .else
 INSTALL_ARGS+=	-no-html
 .endif
 
-.endif # ${ALL_TARGET} != "crictl"
-
 .if !target(post-patch)
 post-patch:
 #

Modified: head/devel/tcllib/files/patch-warnings
==============================================================================
--- head/devel/tcllib/files/patch-warnings	Wed Feb 10 02:10:03 2016	(r408618)
+++ head/devel/tcllib/files/patch-warnings	Wed Feb 10 09:00:17 2016	(r408619)
@@ -192,13 +192,6 @@
 +#include <stdint.h> /* intptr_t */
  
  /*
-@@ -55,5 +55,5 @@ SCOPE Tcl_Obj*           rde_param_query
- SCOPE void               rde_param_query_es      (RDE_PARAM p, long int* ec, ERROR_STATE*** ev);
- SCOPE void               rde_param_query_ls      (RDE_PARAM p, long int* lc, void*** lv);
--SCOPE long int           rde_param_query_lstop   (RDE_PARAM p);
-+SCOPE intptr_t           rde_param_query_lstop   (RDE_PARAM p);
- SCOPE Tcl_HashTable*     rde_param_query_nc      (RDE_PARAM p);
- SCOPE int                rde_param_query_st      (RDE_PARAM p);
 --- modules/pt/rde_critcl/param.c	2015-04-30 04:21:20 UTC
 +++ modules/pt/rde_critcl/param.c	2015-05-27 18:11:57
 @@ -4,9 +4,11 @@



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