From owner-svn-ports-all@FreeBSD.ORG  Wed Nov 28 23:52:18 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id EB09921E;
 Wed, 28 Nov 2012 23:52:18 +0000 (UTC)
 (envelope-from amdmi3@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id B50FB8FC14;
 Wed, 28 Nov 2012 23:52:18 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qASNqI1m053457;
 Wed, 28 Nov 2012 23:52:18 GMT (envelope-from amdmi3@svn.freebsd.org)
Received: (from amdmi3@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qASNqI6L053455;
 Wed, 28 Nov 2012 23:52:18 GMT (envelope-from amdmi3@svn.freebsd.org)
Message-Id: <201211282352.qASNqI6L053455@svn.freebsd.org>
From: Dmitry Marakasov <amdmi3@FreeBSD.org>
Date: Wed, 28 Nov 2012 23:52:18 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r307948 - 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.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://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: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 28 Nov 2012 23:52:19 -0000

Author: amdmi3
Date: Wed Nov 28 23:52:18 2012
New Revision: 307948
URL: http://svnweb.freebsd.org/changeset/ports/307948

Log:
  - Remove webkit-image leftovers
  - Trim header
  
  PR:		173805
  Submitted by:	Chris Petrik <c.petrik.sosa@gmail.com>
  Feature safe:	yes

Modified:
  head/astro/josm/Makefile
  head/astro/josm/distinfo

Modified: head/astro/josm/Makefile
==============================================================================
--- head/astro/josm/Makefile	Wed Nov 28 23:48:14 2012	(r307947)
+++ head/astro/josm/Makefile	Wed Nov 28 23:52:18 2012	(r307948)
@@ -1,18 +1,13 @@
-# New ports collection makefile for:	josm
-# Date created:		2009/02/24
-# Whom:			Gleb Smirnoff <glebius@FreeBSD.org>
-#
+# Created by: Gleb Smirnoff <glebius@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	josm
 PORTVERSION=	5576
 CATEGORIES=	astro java
-MASTER_SITES=	http://josm.openstreetmap.de/download/:josm \
-		http://mirror.amdmi3.ru/distfiles/:josm \
-		http://mirror.amdmi3.ru/distfiles/:wmsplugin
+MASTER_SITES=	http://josm.openstreetmap.de/download/ \
+		http://mirror.amdmi3.ru/distfiles/
 DISTNAME=	${PORTNAME}-snapshot-${PORTVERSION}.jar
-DISTFILES=	${DISTNAME}:josm ${WEBKITIMG_SRC}:wmsplugin
+EXTRACT_SUFX=	# empty
 EXTRACT_ONLY=	# empty
 
 MAINTAINER=	amdmi3@FreeBSD.org
@@ -20,7 +15,7 @@ COMMENT=	A comprehensive editor for Open
 
 NO_WRKSUBDIR=	yes
 
-USE_JAVA=	YES
+USE_JAVA=	yes
 JAVA_VERSION=	1.5+
 
 JOSM_MEMORY_LIMIT?=1024
@@ -30,9 +25,6 @@ NO_BUILD=	yes
 SUB_FILES=	josm.sh
 SUB_LIST=	JARNAME=${DISTNAME} JOSM_MEMORY_LIMIT=${JOSM_MEMORY_LIMIT}
 
-WEBKITIMG=	webkit-image
-WEBKITIMG_SRC=	${WEBKITIMG}.cpp
-
 PLIST_FILES=	bin/josm ${JAVAJARDIR:C,${PREFIX}/?,,}/${DISTNAME}
 
 pre-everything::
@@ -43,8 +35,5 @@ do-install:
 	${MKDIR} ${JAVAJARDIR}/
 	${INSTALL_DATA} ${DISTDIR}/${DISTNAME} ${JAVAJARDIR}/
 	${INSTALL_SCRIPT} ${WRKDIR}/josm.sh ${PREFIX}/bin/josm
-.if defined(WITH_WEBKIT_IMAGE)
-	${INSTALL_PROGRAM} ${WRKDIR}/${WEBKITIMG} ${PREFIX}/bin
-.endif
 
 .include <bsd.port.mk>

Modified: head/astro/josm/distinfo
==============================================================================
--- head/astro/josm/distinfo	Wed Nov 28 23:48:14 2012	(r307947)
+++ head/astro/josm/distinfo	Wed Nov 28 23:52:18 2012	(r307948)
@@ -1,4 +1,2 @@
 SHA256 (josm-snapshot-5576.jar) = a82e653337724d8ef4462d22cc623bd8e3d7656cb6df68b2a2dbce94544c69cd
 SIZE (josm-snapshot-5576.jar) = 7553493
-SHA256 (webkit-image.cpp) = 431f5b956c0e3d1615289dd6cb64effb988b30ace7c80f5a51f9546aa80d300d
-SIZE (webkit-image.cpp) = 2718