From owner-svn-ports-all@FreeBSD.ORG Fri Apr 25 12:37:29 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2E008CC1; Fri, 25 Apr 2014 12:37:29 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 006421D2A; Fri, 25 Apr 2014 12:37:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3PCbS1P023436; Fri, 25 Apr 2014 12:37:28 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3PCbSR9023434; Fri, 25 Apr 2014 12:37:28 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201404251237.s3PCbSR9023434@svn.freebsd.org> From: Antoine Brodin Date: Fri, 25 Apr 2014 12:37:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r352118 - head/graphics/cairo-java X-SVN-Group: ports-head 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.17 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: Fri, 25 Apr 2014 12:37:29 -0000 Author: antoine Date: Fri Apr 25 12:37:28 2014 New Revision: 352118 URL: http://svnweb.freebsd.org/changeset/ports/352118 QAT: https://qat.redports.org/buildarchive/r352118/ Log: Fix packaging with openjdk 6 With hat: portmgr Modified: head/graphics/cairo-java/Makefile head/graphics/cairo-java/pkg-plist Modified: head/graphics/cairo-java/Makefile ============================================================================== --- head/graphics/cairo-java/Makefile Fri Apr 25 12:28:01 2014 (r352117) +++ head/graphics/cairo-java/Makefile Fri Apr 25 12:37:28 2014 (r352118) @@ -34,6 +34,14 @@ SUB_LIST= JAVAJARDIR=${JAVAJARDIR} CAIRO CONFIGURE_ENV+= BOOTCLASSPATH=${JAVA_CLASSES} MAKE_ENV+= BOOTCLASSPATH=${JAVA_CLASSES} +.include + +.if ${JAVA_PORT_VERSION} == 1.6.0 +PLIST_SUB+= JDK16="" NOTJDK16="@comment " +.else +PLIST_SUB+= JDK16="@comment " NOTJDK16="" +.endif + post-patch: @${REINPLACE_CMD} -e 's|echo aout|echo elf|g' \ ${WRKSRC}/configure @@ -57,4 +65,4 @@ do-install: cd ${WRKSRC}/doc/api && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/api ${TOUCH} ${STAGEDIR}${DOCSDIR}/api/packages.html -.include +.include Modified: head/graphics/cairo-java/pkg-plist ============================================================================== --- head/graphics/cairo-java/pkg-plist Fri Apr 25 12:28:01 2014 (r352117) +++ head/graphics/cairo-java/pkg-plist Fri Apr 25 12:37:28 2014 (r352118) @@ -53,10 +53,11 @@ libdata/pkgconfig/%%PORTNAME%%.pc %%PORTDOCS%%%%DOCSDIR%%/api/overview-tree.html %%PORTDOCS%%%%DOCSDIR%%/api/package-list %%PORTDOCS%%%%DOCSDIR%%/api/packages.html -%%PORTDOCS%%%%DOCSDIR%%/api/resources/background.gif -%%PORTDOCS%%%%DOCSDIR%%/api/resources/tab.gif -%%PORTDOCS%%%%DOCSDIR%%/api/resources/titlebar.gif -%%PORTDOCS%%%%DOCSDIR%%/api/resources/titlebar_end.gif +%%JDK16%%%%PORTDOCS%%%%DOCSDIR%%/api/resources/inherit.gif +%%NOTJDK16%%%%PORTDOCS%%%%DOCSDIR%%/api/resources/background.gif +%%NOTJDK16%%%%PORTDOCS%%%%DOCSDIR%%/api/resources/tab.gif +%%NOTJDK16%%%%PORTDOCS%%%%DOCSDIR%%/api/resources/titlebar.gif +%%NOTJDK16%%%%PORTDOCS%%%%DOCSDIR%%/api/resources/titlebar_end.gif %%PORTDOCS%%%%DOCSDIR%%/api/serialized-form.html %%PORTDOCS%%%%DOCSDIR%%/api/stylesheet.css share/java/classes/cairo%%CAIRO_API_VERSION%%.jar