Date: Fri, 25 Apr 2014 12:37:28 +0000 (UTC) From: Antoine Brodin <antoine@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r352118 - head/graphics/cairo-java Message-ID: <201404251237.s3PCbSR9023434@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <bsd.port.pre.mk> + +.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 <bsd.port.mk> +.include <bsd.port.post.mk> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404251237.s3PCbSR9023434>