From owner-svn-ports-branches@FreeBSD.ORG Sat Dec 21 10:28:35 2013 Return-Path: Delivered-To: svn-ports-branches@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8F8C7C37; Sat, 21 Dec 2013 10:28:35 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6F1C219C5; Sat, 21 Dec 2013 10:28:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBLASZK9079110; Sat, 21 Dec 2013 10:28:35 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBLASY8e079107; Sat, 21 Dec 2013 10:28:34 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312211028.rBLASY8e079107@svn.freebsd.org> From: Mathieu Arnold Date: Sat, 21 Dec 2013 10:28:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r337129 - in branches/2014Q1/graphics/libecwj2: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 21 Dec 2013 10:28:35 -0000 Author: mat Date: Sat Dec 21 10:28:34 2013 New Revision: 337129 URL: http://svnweb.freebsd.org/changeset/ports/337129 Log: MFH: r337106 - Fix build with the recent clang/gcc [1] - Support staging PR: 185042 [1] Submitted by: Christoph Moench-Tegeder [1] Approved by: maintainer [1] Approved by: portmgr (implicit) Added: branches/2014Q1/graphics/libecwj2/files/patch-Source-C-NCSnet-NCScnet3-NCSProxy.h - copied unchanged from r337106, head/graphics/libecwj2/files/patch-Source-C-NCSnet-NCScnet3-NCSProxy.h Modified: branches/2014Q1/graphics/libecwj2/Makefile branches/2014Q1/graphics/libecwj2/files/patch-Source-NCSBuildGnu-Makefile.in Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/graphics/libecwj2/Makefile ============================================================================== --- branches/2014Q1/graphics/libecwj2/Makefile Sat Dec 21 10:27:33 2013 (r337128) +++ branches/2014Q1/graphics/libecwj2/Makefile Sat Dec 21 10:28:34 2013 (r337129) @@ -18,9 +18,9 @@ USE_ZIP= yes USE_AUTOTOOLS= libtool autoconf USE_LDCONFIG= yes GNU_CONFIGURE= yes -USE_GMAKE= yes -NO_STAGE= yes +USES= gmake + .include .if ${OSVERSION} < 800000 Copied: branches/2014Q1/graphics/libecwj2/files/patch-Source-C-NCSnet-NCScnet3-NCSProxy.h (from r337106, head/graphics/libecwj2/files/patch-Source-C-NCSnet-NCScnet3-NCSProxy.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2014Q1/graphics/libecwj2/files/patch-Source-C-NCSnet-NCScnet3-NCSProxy.h Sat Dec 21 10:28:34 2013 (r337129, copy of r337106, head/graphics/libecwj2/files/patch-Source-C-NCSnet-NCScnet3-NCSProxy.h) @@ -0,0 +1,11 @@ +--- Source/C/NCSnet/NCScnet3/NCSProxy.h.orig 2013-12-20 19:22:52.000000000 +0100 ++++ Source/C/NCSnet/NCScnet3/NCSProxy.h 2013-12-20 19:23:26.000000000 +0100 +@@ -35,6 +35,7 @@ + //#include + #include + #include ++#include + #include + #include + #include + Modified: branches/2014Q1/graphics/libecwj2/files/patch-Source-NCSBuildGnu-Makefile.in ============================================================================== --- branches/2014Q1/graphics/libecwj2/files/patch-Source-NCSBuildGnu-Makefile.in Sat Dec 21 10:27:33 2013 (r337128) +++ branches/2014Q1/graphics/libecwj2/files/patch-Source-NCSBuildGnu-Makefile.in Sat Dec 21 10:28:34 2013 (r337129) @@ -1,5 +1,5 @@ ---- Source/NCSBuildGnu/Makefile.in.orig 2006-08-29 11:57:09.000000000 +0400 -+++ Source/NCSBuildGnu/Makefile.in 2010-07-29 19:56:41.000000000 +0400 +--- Source/NCSBuildGnu/Makefile.in.orig 2006-08-29 08:57:09.000000000 +0100 ++++ Source/NCSBuildGnu/Makefile.in 2013-12-21 00:03:30.000000000 +0000 @@ -246,22 +246,6 @@ ../C/NCSEcw/shared_src/qmf_util.c \ ../C/NCSEcw/shared_src/quantize.c \ @@ -96,7 +96,16 @@ @AMDEP_TRUE@ ./$(DEPDIR)/collapse_pyr.Plo \ @AMDEP_TRUE@ ./$(DEPDIR)/compress.Plo ./$(DEPDIR)/dynamiclib.Plo \ @AMDEP_TRUE@ ./$(DEPDIR)/ecw_open.Plo ./$(DEPDIR)/ecw_read.Plo \ -@@ -1321,22 +1262,6 @@ +@@ -1036,8 +977,6 @@ + @list='$(lib_LIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + p="`echo $$p | sed -e 's|^.*/||'`"; \ +- echo " $(RANLIB) $(DESTDIR)$(libdir)/$$p"; \ +- $(RANLIB) $(DESTDIR)$(libdir)/$$p; \ + else :; fi; \ + done + +@@ -1321,22 +1260,6 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/______lib_libecwj2_a-NCSWorldFile.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/______lib_libecwj2_a-NCScnet.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/______lib_libecwj2_a-build_pyr.Po@am__quote@ @@ -119,7 +128,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/______lib_libecwj2_a-collapse_pyr.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/______lib_libecwj2_a-compress.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/______lib_libecwj2_a-dynamiclib.Po@am__quote@ -@@ -1364,22 +1289,6 @@ +@@ -1364,22 +1287,6 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/______lib_libecwj2_a-unpack.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/______lib_libecwj2_a-util.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/build_pyr.Plo@am__quote@ @@ -142,7 +151,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collapse_pyr.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/compress.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dynamiclib.Plo@am__quote@ -@@ -1935,534 +1844,6 @@ +@@ -1935,534 +1842,6 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(______lib_libecwj2_a_CPPFLAGS) $(CPPFLAGS) $(______lib_libecwj2_a_CFLAGS) $(CFLAGS) -c -o ______lib_libecwj2_a-unpack.lo `test -f '../C/NCSEcw/shared_src/unpack.c' || echo '$(srcdir)/'`../C/NCSEcw/shared_src/unpack.c @@ -677,7 +686,7 @@ ______lib_libecwj2_a-dynamiclib.o: ../C/NCSUtil/dynamiclib.c @am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(______lib_libecwj2_a_CPPFLAGS) $(CPPFLAGS) $(______lib_libecwj2_a_CFLAGS) $(CFLAGS) -MT ______lib_libecwj2_a-dynamiclib.o -MD -MP -MF "$(DEPDIR)/______lib_libecwj2_a-dynamiclib.Tpo" \ @am__fastdepCC_TRUE@ -c -o ______lib_libecwj2_a-dynamiclib.o `test -f '../C/NCSUtil/dynamiclib.c' || echo '$(srcdir)/'`../C/NCSUtil/dynamiclib.c; \ -@@ -3288,534 +2669,6 @@ +@@ -3288,534 +2667,6 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o unpack.lo `test -f '../C/NCSEcw/shared_src/unpack.c' || echo '$(srcdir)/'`../C/NCSEcw/shared_src/unpack.c