Index: head/astro/josm/Makefile
===================================================================
--- head/astro/josm/Makefile	(revision 427019)
+++ head/astro/josm/Makefile	(revision 427020)
@@ -1,44 +1,54 @@
 # Created by: Gleb Smirnoff <glebius@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	josm
 PORTVERSION=	11223
 CATEGORIES=	astro java
 MASTER_SITES=	http://josm.openstreetmap.de/download/ \
 		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
 
 LICENSE=	GPLv2+
 
 PORTSCOUT=	ignore:1
 
 NO_WRKSUBDIR=	yes
 
+USES=		zip:infozip
 USE_JAVA=	yes
-JAVA_VERSION=	1.7+
+JAVA_VERSION=	1.8+
 
 JOSM_MEMORY_LIMIT?=1024
 
 NO_BUILD=	yes
 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>