Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 9 Oct 2012 15:26:58 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r305591 - head/astro/josm
Message-ID:  <201210091526.q99FQwks028847@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Tue Oct  9 15:26:58 2012
New Revision: 305591
URL: http://svn.freebsd.org/changeset/ports/305591

Log:
  - Update to 5531

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

Modified: head/astro/josm/Makefile
==============================================================================
--- head/astro/josm/Makefile	Tue Oct  9 14:18:24 2012	(r305590)
+++ head/astro/josm/Makefile	Tue Oct  9 15:26:58 2012	(r305591)
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	josm
-PORTVERSION=	5485
+PORTVERSION=	5531
 CATEGORIES=	astro java
 MASTER_SITES=	http://josm.openstreetmap.de/download/:josm \
 		http://mirror.amdmi3.ru/distfiles/:josm \
@@ -25,6 +25,8 @@ JAVA_VERSION=	1.5+
 
 JOSM_MEMORY_LIMIT?=1024
 
+NO_BUILD=	yes
+
 SUB_FILES=	josm.sh
 SUB_LIST=	JARNAME=${DISTNAME} JOSM_MEMORY_LIMIT=${JOSM_MEMORY_LIMIT}
 
@@ -33,31 +35,10 @@ WEBKITIMG_SRC=	${WEBKITIMG}.cpp
 
 PLIST_FILES=	bin/josm ${JAVAJARDIR:C,${PREFIX}/?,,}/${DISTNAME}
 
-OPTIONS=	WEBKIT_IMAGE "Build webkit-image (needed for Yahoo imagery)" off
-
-.include <bsd.port.options.mk>
-
 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)."
 
-.if defined(WITH_WEBKIT_IMAGE)
-PLIST_FILES+=	bin/webkit-image
-
-USE_QT4=	corelib gui webkit moc_build
-
-do-build:
-	cd ${WRKSRC} && \
-		${MOC} ${DISTDIR}/${WEBKITIMG_SRC} > ${WEBKITIMG}.h && \
-		${CXX} ${CFLAGS} ${PTHREAD_LIBS} -I. -I${QT_INCDIR} -L${QT_LIBDIR} \
-		${DISTDIR}/${WEBKITIMG_SRC} -o ${WEBKITIMG} -lQtCore -lQtWebKit \
-		-lQtGui
-.else
-# setting NO_BUILD here won't work
-do-build:
-	@${DO_NADA}
-.endif
-
 do-install:
 	${MKDIR} ${JAVAJARDIR}/
 	${INSTALL_DATA} ${DISTDIR}/${DISTNAME} ${JAVAJARDIR}/

Modified: head/astro/josm/distinfo
==============================================================================
--- head/astro/josm/distinfo	Tue Oct  9 14:18:24 2012	(r305590)
+++ head/astro/josm/distinfo	Tue Oct  9 15:26:58 2012	(r305591)
@@ -1,4 +1,4 @@
-SHA256 (josm-snapshot-5485.jar) = c392040d84539e68add3ecf60fb886cfb6fa5f36c125329ec5f55c92397d4bc2
-SIZE (josm-snapshot-5485.jar) = 7530751
+SHA256 (josm-snapshot-5531.jar) = 7e10272416903a0cc70249769f876e19a68bce346c69d587a9cf512c6fa67035
+SIZE (josm-snapshot-5531.jar) = 7578075
 SHA256 (webkit-image.cpp) = 431f5b956c0e3d1615289dd6cb64effb988b30ace7c80f5a51f9546aa80d300d
 SIZE (webkit-image.cpp) = 2718



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210091526.q99FQwks028847>