Date: Fri, 25 Apr 2014 12:28:02 +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: r352117 - head/devel/glib-java Message-ID: <201404251228.s3PCS2lF019370@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: antoine Date: Fri Apr 25 12:28:01 2014 New Revision: 352117 URL: http://svnweb.freebsd.org/changeset/ports/352117 QAT: https://qat.redports.org/buildarchive/r352117/ Log: Fix packaging with openjdk 6 With hat: portmgr Modified: head/devel/glib-java/Makefile head/devel/glib-java/pkg-plist Modified: head/devel/glib-java/Makefile ============================================================================== --- head/devel/glib-java/Makefile Fri Apr 25 12:22:54 2014 (r352116) +++ head/devel/glib-java/Makefile Fri Apr 25 12:28:01 2014 (r352117) @@ -66,4 +66,12 @@ do-install: s|%%GLIB_API_VERSION%%|${GLIB_API_VERSION}|g' \ < ${PKGDIR}/pkg-message > ${PKGMESSAGE} -.include <bsd.port.mk> +.include <bsd.port.pre.mk> + +.if ${JAVA_PORT_VERSION} == 1.6.0 +PLIST_SUB+= JDK16="" NOTJDK16="@comment " +.else +PLIST_SUB+= JDK16="@comment " NOTJDK16="" +.endif + +.include <bsd.port.post.mk> Modified: head/devel/glib-java/pkg-plist ============================================================================== --- head/devel/glib-java/pkg-plist Fri Apr 25 12:22:54 2014 (r352116) +++ head/devel/glib-java/pkg-plist Fri Apr 25 12:28:01 2014 (r352117) @@ -47,10 +47,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 %%DATADIR%%/macros/ac_prog_jar.m4
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404251228.s3PCS2lF019370>