From owner-svn-ports-all@freebsd.org  Thu Nov 24 14:50:37 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 58B00C53AB4;
 Thu, 24 Nov 2016 14:50:37 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 28453C4F;
 Thu, 24 Nov 2016 14:50:37 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uAOEoaIG079356;
 Thu, 24 Nov 2016 14:50:36 GMT (envelope-from amdmi3@FreeBSD.org)
Received: (from amdmi3@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id uAOEoabk079355;
 Thu, 24 Nov 2016 14:50:36 GMT (envelope-from amdmi3@FreeBSD.org)
Message-Id: <201611241450.uAOEoabk079355@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to
 amdmi3@FreeBSD.org using -f
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Thu, 24 Nov 2016 14:50:36 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r427020 - head/astro/josm
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.23
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 24 Nov 2016 14:50:37 -0000

Author: amdmi3
Date: Thu Nov 24 14:50:36 2016
New Revision: 427020
URL: https://svnweb.freebsd.org/changeset/ports/427020

Log:
  - Update java version requirement
  - Install icon and .desktop file
  
  PR:		209895

Modified:
  head/astro/josm/Makefile

Modified: head/astro/josm/Makefile
==============================================================================
--- head/astro/josm/Makefile	Thu Nov 24 14:49:33 2016	(r427019)
+++ head/astro/josm/Makefile	Thu Nov 24 14:50:36 2016	(r427020)
@@ -8,7 +8,6 @@ MASTER_SITES=	http://josm.openstreetmap.
 		http://mirror.amdmi3.ru/distfiles/
 DISTNAME=	${PORTNAME}-snapshot-${PORTVERSION}.jar
 EXTRACT_SUFX=	# empty
-EXTRACT_ONLY=	# empty
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Comprehensive editor for OpenStreetMap.org database
@@ -19,8 +18,9 @@ PORTSCOUT=	ignore:1
 
 NO_WRKSUBDIR=	yes
 
+USES=		zip:infozip
 USE_JAVA=	yes
-JAVA_VERSION=	1.7+
+JAVA_VERSION=	1.8+
 
 JOSM_MEMORY_LIMIT?=1024
 
@@ -30,15 +30,25 @@ NO_ARCH=	yes
 SUB_FILES=	josm.sh
 SUB_LIST=	JARNAME=${DISTNAME} JOSM_MEMORY_LIMIT=${JOSM_MEMORY_LIMIT}
 
-PLIST_FILES=	bin/josm ${JAVAJARDIR:C,${PREFIX}/?,,}/${DISTNAME}
+PLIST_FILES=	bin/josm \
+		${JAVAJARDIR:C,${PREFIX}/?,,}/${DISTNAME} \
+		share/pixmaps/josm.png
+
+DESKTOP_ENTRIES="JOSM" \
+		"" \
+		"${PORTNAME}" \
+		"${PORTNAME}" \
+		"Education;Geoscience;Maps;" \
+		true
 
 pre-everything::
 	@${ECHO_CMD} "You can change limit of memory available to josm by defining"
 	@${ECHO_CMD} "JOSM_MEMORY_LIMIT variable in /etc/make.conf. Default is 1024 (MB)."
 
 do-install:
-	${MKDIR} ${STAGEDIR}${JAVAJARDIR}/
+	@${MKDIR} ${STAGEDIR}${JAVAJARDIR}/
 	${INSTALL_DATA} ${DISTDIR}/${DISTNAME} ${STAGEDIR}${JAVAJARDIR}/
 	${INSTALL_SCRIPT} ${WRKDIR}/josm.sh ${STAGEDIR}${PREFIX}/bin/josm
+	${INSTALL_DATA} ${WRKSRC}/images/logo.png ${STAGEDIR}${PREFIX}/share/pixmaps/josm.png
 
 .include <bsd.port.mk>