From owner-svn-ports-all@freebsd.org Sat Jun 2 22:27:43 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 41E2DFF0153; Sat, 2 Jun 2018 22:27:43 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id DAFA37D565; Sat, 2 Jun 2018 22:27:42 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BC1F115E82; Sat, 2 Jun 2018 22:27:42 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w52MRgob034280; Sat, 2 Jun 2018 22:27:42 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w52MRgEX034278; Sat, 2 Jun 2018 22:27:42 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201806022227.w52MRgEX034278@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Sat, 2 Jun 2018 22:27:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r471431 - in head/graphics/leptonica: . files X-SVN-Group: ports-head X-SVN-Commit-Author: sunpoet X-SVN-Commit-Paths: in head/graphics/leptonica: . files X-SVN-Commit-Revision: 471431 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Jun 2018 22:27:43 -0000 Author: sunpoet Date: Sat Jun 2 22:27:42 2018 New Revision: 471431 URL: https://svnweb.freebsd.org/changeset/ports/471431 Log: Fix and remove unnecessary CONFLICTS_BUILD=openjpeg15 The build fails if you have openjpeg15 installed. It was caused by the order of include paths. /usr/local/include/openjpeg.h (from openjpeg15) will be used instead of /usr/local/include/openjpeg-2.3/openjpeg.h (from openjpeg 2.3.0) -I. -I.. -I/usr/local/include/libpng16 -I/usr/local/include -I/usr/local/include -I/usr/local/include -I/usr/local/include/openjpeg-2.3 -I/usr/local/include Notified by: Walter Schwarzenfeld Approved by: portmgr (blanket) Added: head/graphics/leptonica/files/ head/graphics/leptonica/files/patch-src-Makefile.am (contents, props changed) Modified: head/graphics/leptonica/Makefile Modified: head/graphics/leptonica/Makefile ============================================================================== --- head/graphics/leptonica/Makefile Sat Jun 2 22:27:30 2018 (r471430) +++ head/graphics/leptonica/Makefile Sat Jun 2 22:27:42 2018 (r471431) @@ -17,7 +17,6 @@ LIB_DEPENDS= libgif.so:graphics/giflib \ LICENSE_FILE= leptonica-license.txt CONFLICTS= leptonlib-[0-9]* -CONFLICTS_BUILD= openjpeg15 USES= autoreconf jpeg libtool pathfix pkgconfig Added: head/graphics/leptonica/files/patch-src-Makefile.am ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/leptonica/files/patch-src-Makefile.am Sat Jun 2 22:27:42 2018 (r471431) @@ -0,0 +1,9 @@ +--- src/Makefile.am.orig 2018-05-02 22:12:19 UTC ++++ src/Makefile.am +@@ -1,5 +1,5 @@ + AM_CFLAGS = $(DEBUG_FLAGS) +-AM_CPPFLAGS = $(ZLIB_CFLAGS) $(LIBPNG_CFLAGS) $(JPEG_CFLAGS) $(LIBTIFF_CFLAGS) $(LIBWEBP_CFLAGS) $(LIBJP2K_CFLAGS) ++AM_CPPFLAGS = $(LIBJP2K_CFLAGS) $(ZLIB_CFLAGS) $(LIBPNG_CFLAGS) $(JPEG_CFLAGS) $(LIBTIFF_CFLAGS) $(LIBWEBP_CFLAGS) + + lib_LTLIBRARIES = liblept.la + liblept_la_LIBADD = $(LIBM) $(ZLIB_LIBS) $(LIBPNG_LIBS) $(JPEG_LIBS) $(GIFLIB_LIBS) $(LIBTIFF_LIBS) $(LIBWEBP_LIBS) $(LIBJP2K_LIBS) $(GDI_LIBS)