svn commit: r318024 - in head/lang/xotcl: . files

Tue May 21 23:19:50 UTC 2013

Ping?

On 5/16/2013 12:39 PM, Bryan Drewery wrote:
> I think this breaks the build with 8.5.
> 
> See http://people.freebsd.org/~bdrewery/xotcl-1.6.7.log
> 
> On 5/13/2013 5:14 AM, Pietro Cerutti wrote:
>> Author: gahr
>> Date: Mon May 13 09:14:15 2013
>> New Revision: 318024
>> URL: http://svnweb.freebsd.org/changeset/ports/318024
>>
>> Log:
>>   - Update to 1.6.7
>>   - Unbreak with Tcl 8.6 [1]
>>   
>>   Reported by:	miwi (Tcl/Tk 86 exp-run) [1]
>>
>> Modified:
>>   head/lang/xotcl/Makefile
>>   head/lang/xotcl/distinfo   (contents, props changed)
>>   head/lang/xotcl/files/patch-Makefile.in   (contents, props changed)
>>   head/lang/xotcl/files/patch-configure   (contents, props changed)
>>
>> Modified: head/lang/xotcl/Makefile
>> ==============================================================================
>> --- head/lang/xotcl/Makefile	Mon May 13 09:13:55 2013	(r318023)
>> +++ head/lang/xotcl/Makefile	Mon May 13 09:14:15 2013	(r318024)
>> @@ -1,13 +1,8 @@
>> -# New ports collection makefile for:	xotcl
>> -# Date created:				Mon Sep 25 15:31:00 CET 2006
>> -# Whom:					Martin Matuska <mm at FreeBSD.org>
>> -#
>> +# Created by: Martin Matuska <mm at FreeBSD.org>
>>  # $FreeBSD$
>> -#
>>  
>>  PORTNAME=	xotcl
>> -PORTVERSION=	1.6.6
>> -PORTREVISION=	1
>> +PORTVERSION=	1.6.7
>>  CATEGORIES?=	lang tcl
>>  MASTER_SITES=	SF \
>>  		http://media.wu-wien.ac.at/download/
>>
>> Modified: head/lang/xotcl/distinfo
>> ==============================================================================
>> --- head/lang/xotcl/distinfo	Mon May 13 09:13:55 2013	(r318023)
>> +++ head/lang/xotcl/distinfo	Mon May 13 09:14:15 2013	(r318024)
>> @@ -1,2 +1,2 @@
>> -SHA256 (xotcl-1.6.6.tar.gz) = 40f0eb7068aca0fe344b284019e0570eed928654b95b696805b3796be495c040
>> -SIZE (xotcl-1.6.6.tar.gz) = 1923067
>> +SHA256 (xotcl-1.6.7.tar.gz) = b2b09acd61bc2c76703f8d0de504d578862f24ccfea2f21c3140c62fd8378618
>> +SIZE (xotcl-1.6.7.tar.gz) = 1506814
>>
>> Modified: head/lang/xotcl/files/patch-Makefile.in
>> ==============================================================================
>> --- head/lang/xotcl/files/patch-Makefile.in	Mon May 13 09:13:55 2013	(r318023)
>> +++ head/lang/xotcl/files/patch-Makefile.in	Mon May 13 09:14:15 2013	(r318024)
>> @@ -1,6 +1,14 @@
>> ---- Makefile.in.orig	2009-03-04 16:11:13.000000000 +0100
>> -+++ Makefile.in	2010-05-11 10:36:59.435600858 +0200
>> -@@ -264,11 +264,11 @@
>> +--- Makefile.in.orig	2011-11-01 13:24:01.000000000 +0100
>> ++++ Makefile.in	2013-05-13 11:07:34.000000000 +0200
>> +@@ -30,6 +30,7 @@
>> + src_generic_dir		= ${srcdir}/generic
>> + src_man_dir		= ${srcdir}/man
>> + TCL_LIB_SPEC		= @TCL_LIB_SPEC@
>> ++TCL_STUB_LIB_SPEC	= @TCL_STUB_LIB_SPEC@
>> + TK_LIB_SPEC		= @TK_LIB_SPEC@
>> + subdirs			= @subdirs@
>> + aol_prefix		= @aol_prefix@
>> +@@ -264,11 +265,11 @@
>>   #========================================================================
>>   # This rule installs platform-independent files, such as header files.
>>   #========================================================================
>> @@ -15,7 +23,7 @@
>>   	done;
>>   	@echo "Installing Libraries to $(DESTDIR)$(pkglibdir)/"
>>   	@for i in $(libdirs) ; do \
>> -@@ -286,7 +286,7 @@
>> +@@ -286,7 +287,7 @@
>>   	    $(INSTALL_DATA) $(src_lib_dir)/$$i $(DESTDIR)$(pkglibdir)/$$i ; \
>>   	done;
>>   	cat unix/pkgIndex.unix >> $(DESTDIR)$(pkglibdir)/pkgIndex.tcl
>> @@ -24,25 +32,28 @@
>>   	@echo "Installing Applications to $(DESTDIR)$(pkglibdir)/apps/"
>>   	@for i in $(appdirs) ; do \
>>   	    echo "    Installing $$i/" ; \
>> -@@ -430,13 +430,15 @@
>> +@@ -429,14 +430,16 @@
>> + xotclsh: tclAppInit.o $(PKG_OBJECTS) $(CONDITIONAL_STUB_OBJECTS)
>>   	$(CC) -rdynamic -o $@ tclAppInit.o \
>>   		$(PKG_OBJECTS) \
>> - 		$(CFLAGS)  $(TCL_LIB_SPEC) \
>> +-		$(CFLAGS)  $(TCL_LIB_SPEC) \
>>  -		$(DMALLOC_LIB) $(CONDITIONAL_STUB_OBJECTS)
>> ++		$(CFLAGS)  $(TCL_STUB_LIB_SPEC) $(TCL_LIB_SPEC) \
>>  +		$(DMALLOC_LIB) $(CONDITIONAL_STUB_OBJECTS) \
>>  +		$(LDFLAGS_DEFAULT)
>>   
>>   xowish: tkAppInit.o $(PKG_OBJECTS) $(CONDITIONAL_STUB_OBJECTS)
>>   	$(CC) -rdynamic -o $@ tkAppInit.o \
>>   		$(PKG_OBJECTS) \
>> - 		$(CFLAGS)  $(TCL_LIB_SPEC) $(TK_LIB_SPEC) \
>> +-		$(CFLAGS)  $(TCL_LIB_SPEC) $(TK_LIB_SPEC) \
>>  -		$(DMALLOC_LIB) $(CONDITIONAL_STUB_OBJECTS)
>> ++		$(CFLAGS)  $(TCL_STUB_LIB_SPEC) $(TCL_LIB_SPEC) $(TK_LIB_SPEC) \
>>  +		$(DMALLOC_LIB) $(CONDITIONAL_STUB_OBJECTS) \
>>  +		$(LDFLAGS_DEFAULT)
>>   
>>   install-shells:
>>   	@if test -f xotclsh; then \
>> -@@ -550,7 +552,6 @@
>> +@@ -550,7 +553,6 @@
>>   	    else \
>>   		echo " $(RANLIB) $(DESTDIR)$(pkglibdir)/$$p"; \
>>   		$(RANLIB) $(DESTDIR)$(pkglibdir)/$$p; \
>> @@ -50,7 +61,7 @@
>>   	    fi; \
>>   	    ext=`echo $$p|sed -e "s/.*\.//"`; \
>>   	    if test "x$$ext" = "xdll"; then \
>> -@@ -607,12 +608,12 @@
>> +@@ -607,12 +609,12 @@
>>   	  rm -f $(DESTDIR)$(bindir)/$$p; \
>>   	done
>>   
>>
>> Modified: head/lang/xotcl/files/patch-configure
>> ==============================================================================
>> --- head/lang/xotcl/files/patch-configure	Mon May 13 09:13:55 2013	(r318023)
>> +++ head/lang/xotcl/files/patch-configure	Mon May 13 09:14:15 2013	(r318024)
>> @@ -1,11 +1,11 @@
>> ---- configure.orig	2010-03-06 11:14:38.000000000 +0100
>> -+++ configure	2010-05-11 10:30:25.126687046 +0200
>> -@@ -7341,7 +7342,7 @@
>> +--- configure.orig	2011-11-03 13:20:08.000000000 +0100
>> ++++ configure	2013-05-13 11:03:08.000000000 +0200
>> +@@ -5499,7 +5499,7 @@
>>   	    esac
>>   	    result="Using ${TCL_INCLUDES}"
>>   	else
>>  -	    if test ! -f "${TCL_SRC_DIR}/generic/tclInt.h" ; then
>>  +	    if test ! -f "${TCL_INCLUDEDIR}/generic/tclInt.h" ; then
>> - 		{ { echo "$as_me:$LINENO: error: Cannot find private header tclInt.h in ${TCL_SRC_DIR}" >&5
>> - echo "$as_me: error: Cannot find private header tclInt.h in ${TCL_SRC_DIR}" >&2;}
>> -    { (exit 1); exit 1; }; }
>> + 		as_fn_error $? "Cannot find private header tclInt.h in ${TCL_SRC_DIR}" "$LINENO" 5
>> + 	    fi
>> + 	    result="Using srcdir found in tclConfig.sh: ${TCL_SRC_DIR}"
>>
> 
> 

-- 
Regards,
Bryan Drewery

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 898 bytes
Desc: OpenPGP digital signature
URL: <http://lists.freebsd.org/pipermail/svn-ports-all/attachments/20130521/9bc40df1/attachment.sig>