Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 4 Jul 2016 13:24:21 +0000 (UTC)
From:      Mathieu Arnold <mat@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r418021 - in head/devel/monotone-viz: . files
Message-ID:  <201607041324.u64DOLxJ005292@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mat
Date: Mon Jul  4 13:24:21 2016
New Revision: 418021
URL: https://svnweb.freebsd.org/changeset/ports/418021

Log:
  Fix build.
  
  PR:		210792
  Submitted by:	tkato432 yahoo com
  Sponsored by:	Absolight

Deleted:
  head/devel/monotone-viz/files/patch-agraph.ml
  head/devel/monotone-viz/files/patch-automate.ml
Modified:
  head/devel/monotone-viz/Makefile   (contents, props changed)
  head/devel/monotone-viz/distinfo   (contents, props changed)

Modified: head/devel/monotone-viz/Makefile
==============================================================================
--- head/devel/monotone-viz/Makefile	Mon Jul  4 13:24:15 2016	(r418020)
+++ head/devel/monotone-viz/Makefile	Mon Jul  4 13:24:21 2016	(r418021)
@@ -3,37 +3,58 @@
 
 PORTNAME=	monotone-viz
 PORTVERSION=	1.0.2
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	devel
 MASTER_SITES=	http://oandrieu.nerim.net/monotone-viz/
 
+PATCH_SITES=	DEBIAN_POOL
+PATCHFILES=	${PORTNAME}_${PORTVERSION}-4.diff.gz
+PATCH_DIST_STRIP=	-p1
+
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Visual interface for Monotone VCS with revision graphs
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BROKEN=		fails to build
-DEPRECATED=	Broken for more than 6 months
-EXPIRATION_DATE=	2016-07-04
-
-BUILD_DEPENDS=	lablgtk2:x11-toolkits/ocaml-lablgtk2
-RUN_DEPENDS+=	dot:graphics/graphviz \
+BUILD_DEPENDS=	xpmtoppm:graphics/netpbm \
+		lablgtk2:x11-toolkits/ocaml-lablgtk2
+RUN_DEPENDS=	dot:graphics/graphviz \
 		mtn:devel/monotone \
+		bash:shells/bash \
 		lablgtk2:x11-toolkits/ocaml-lablgtk2
 
 USES=		gmake
 USE_OCAML=	yes
 USE_OCAML_CAMLP4=yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--without-local-lablgtk
+CONFIGURE_ARGS=	--without-local-lablgtk
 
-ALL_TARGET=
+ALL_TARGET=	monotone-viz
 MAKE_JOBS_UNSAFE=	yes
 
-PLIST_FILES=	bin/monotone-viz
+PLIST_FILES=	bin/monotone-viz share/pixmaps/monotone-viz.png
+
+DESKTOP_ENTRIES="Monotone-viz" "" "monotone-viz" "monotone-viz" \
+		"Development;RevisionControl;GTK;" ""
+
+post-patch:
+.for i in 10-new-stdio.diff 20-dot-rankdir.diff 50-ocaml-4.02.2.diff
+	@${PATCH} -d ${WRKSRC} -p1 --quiet < ${WRKSRC}/debian/patches/${i}
+.endfor
+	@${REINPLACE_CMD} -e 's|"/bin/bash"|"${LOCALBASE}/bin/bash"|' \
+		${WRKSRC}/agraph.ml
+
+# Monkey patch the icon.ml into an xpm file.
+post-build:
+	@${SED} -e 's|^(\(\* XPM \*\))$$|/\1/|; \
+		 s/^let \(monotone_xpm\) = \[|$$/static char * \1[] = {/; \
+		 s/";$$/",/; s/|\]$$/};/; /GdkPixbuf/d' ${WRKSRC}/icon.ml | \
+		xpmtoppm --alphaout=${WRKDIR}/icon.pgm | \
+		pnmtopng --alpha=${WRKDIR}/icon.pgm > ${WRKDIR}/monotone-viz.png
 
 post-install:
+	${INSTALL_DATA} ${WRKDIR}/monotone-viz.png ${STAGEDIR}${PREFIX}/share/pixmaps
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/monotone-viz
 
 .include <bsd.port.mk>

Modified: head/devel/monotone-viz/distinfo
==============================================================================
--- head/devel/monotone-viz/distinfo	Mon Jul  4 13:24:15 2016	(r418020)
+++ head/devel/monotone-viz/distinfo	Mon Jul  4 13:24:21 2016	(r418021)
@@ -1,2 +1,4 @@
 SHA256 (monotone-viz-1.0.2.tar.gz) = 404ee47378b144a62eb2dcdfb80430e68d193360216d120977a457cdbf85b7f6
 SIZE (monotone-viz-1.0.2.tar.gz) = 545631
+SHA256 (monotone-viz_1.0.2-4.diff.gz) = aed1582e303395790f4b2f3d9a2838d98440f5e3c307e8222d7015fe72fd1bda
+SIZE (monotone-viz_1.0.2-4.diff.gz) = 11922



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