aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--graphics/cairo-java/Makefile10
-rw-r--r--graphics/cairo-java/pkg-plist9
2 files changed, 14 insertions, 5 deletions
diff --git a/graphics/cairo-java/Makefile b/graphics/cairo-java/Makefile
index 6d428f8c0594..9de3304cfec9 100644
--- a/graphics/cairo-java/Makefile
+++ b/graphics/cairo-java/Makefile
@@ -34,6 +34,14 @@ SUB_LIST= JAVAJARDIR=${JAVAJARDIR} CAIRO_API_VERSION=${CAIRO_API_VERSION}
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>
diff --git a/graphics/cairo-java/pkg-plist b/graphics/cairo-java/pkg-plist
index ce5c8e40c6f1..b0c749b543a5 100644
--- a/graphics/cairo-java/pkg-plist
+++ b/graphics/cairo-java/pkg-plist
@@ -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