From owner-svn-ports-head@FreeBSD.ORG Thu Oct 10 00:19:03 2013 Return-Path: Delivered-To: svn-ports-head@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 ESMTP id F2697746; Thu, 10 Oct 2013 00:19:02 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) 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 D0F4F20CC; Thu, 10 Oct 2013 00:19:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9A0J2Pf028656; Thu, 10 Oct 2013 00:19:02 GMT (envelope-from madpilot@svn.freebsd.org) Received: (from madpilot@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9A0J2ns028650; Thu, 10 Oct 2013 00:19:02 GMT (envelope-from madpilot@svn.freebsd.org) Message-Id: <201310100019.r9A0J2ns028650@svn.freebsd.org> From: Guido Falsi Date: Thu, 10 Oct 2013 00:19:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r329949 - in head/graphics/openjpeg: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Oct 2013 00:19:03 -0000 Author: madpilot Date: Thu Oct 10 00:19:01 2013 New Revision: 329949 URL: http://svnweb.freebsd.org/changeset/ports/329949 Log: - Convert to staging - Convert LIB_DEPENDS to new format - Use DOS2UNIX and regenerate patch without DOS style newlines Modified: head/graphics/openjpeg/Makefile head/graphics/openjpeg/files/patch-opj_malloc.h (contents, props changed) head/graphics/openjpeg/pkg-plist (contents, props changed) Modified: head/graphics/openjpeg/Makefile ============================================================================== --- head/graphics/openjpeg/Makefile Thu Oct 10 00:17:27 2013 (r329948) +++ head/graphics/openjpeg/Makefile Thu Oct 10 00:19:01 2013 (r329949) @@ -13,16 +13,13 @@ COMMENT= Open-source JPEG 2000 codec LICENSE= BSD LICENSE_FILE= ${WRKSRC}/LICENSE -LIB_DEPENDS= tiff:${PORTSDIR}/graphics/tiff \ - png15:${PORTSDIR}/graphics/png \ - lcms2:${PORTSDIR}/graphics/lcms2 +LIB_DEPENDS= libtiff.so:${PORTSDIR}/graphics/tiff \ + libpng15.so:${PORTSDIR}/graphics/png \ + liblcms2.so:${PORTSDIR}/graphics/lcms2 +USE_DOS2UNIX= opj_malloc.h GNU_CONFIGURE= yes USES= cmake USE_LDCONFIG= yes -MAN1= image_to_j2k.1 j2k_dump.1 j2k_to_image.1 -MAN3= libopenjpeg.3 - -NO_STAGE= yes .include Modified: head/graphics/openjpeg/files/patch-opj_malloc.h ============================================================================== --- head/graphics/openjpeg/files/patch-opj_malloc.h Thu Oct 10 00:17:27 2013 (r329948) +++ head/graphics/openjpeg/files/patch-opj_malloc.h Thu Oct 10 00:19:01 2013 (r329949) @@ -1,12 +1,12 @@ ---- libopenjpeg/opj_malloc.h.orig 2012-02-07 11:49:55.000000000 +0100 -+++ libopenjpeg/opj_malloc.h 2012-06-02 11:25:56.000000000 +0200 +--- libopenjpeg/opj_malloc.h.orig 2013-10-08 17:19:09.755013928 +0200 ++++ libopenjpeg/opj_malloc.h 2013-10-08 17:20:11.403012744 +0200 @@ -85,8 +85,7 @@ - #define HAVE_MEMALIGN - /* Linux x86_64 and OSX always align allocations to 16 bytes */ - #elif !defined(__amd64__) && !defined(__APPLE__) -- #define HAVE_MEMALIGN -- #include -+ #include - #endif - #endif - + #define HAVE_MEMALIGN + /* Linux x86_64 and OSX always align allocations to 16 bytes */ + #elif !defined(__amd64__) && !defined(__APPLE__) +- #define HAVE_MEMALIGN +- #include ++ #include + #endif + #endif + Modified: head/graphics/openjpeg/pkg-plist ============================================================================== --- head/graphics/openjpeg/pkg-plist Thu Oct 10 00:17:27 2013 (r329948) +++ head/graphics/openjpeg/pkg-plist Thu Oct 10 00:19:01 2013 (r329949) @@ -5,6 +5,10 @@ include/openjpeg.h lib/libopenjpeg.so lib/libopenjpeg.so.1.5.0 lib/libopenjpeg.so.2 +man/man1/image_to_j2k.1.gz +man/man1/j2k_dump.1.gz +man/man1/j2k_to_image.1.gz +man/man3/libopenjpeg.3.gz %%DOCSDIR%%/CHANGES %%DOCSDIR%%/LICENSE %%DATADIR%%/OpenJPEGConfig.cmake