From owner-svn-ports-head@FreeBSD.ORG  Fri Apr 25 12:28:02 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@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 AE535A57;
 Fri, 25 Apr 2014 12:28:02 +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 811311C34;
 Fri, 25 Apr 2014 12:28:02 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3PCS2HB019372;
 Fri, 25 Apr 2014 12:28:02 GMT (envelope-from antoine@svn.freebsd.org)
Received: (from antoine@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3PCS2lF019370;
 Fri, 25 Apr 2014 12:28:02 GMT (envelope-from antoine@svn.freebsd.org)
Message-Id: <201404251228.s3PCS2lF019370@svn.freebsd.org>
From: Antoine Brodin <antoine@FreeBSD.org>
Date: Fri, 25 Apr 2014 12:28:02 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r352117 - head/devel/glib-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-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 25 Apr 2014 12:28:02 -0000

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