Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 1 Dec 2010 12:58:24 +0100 (CET)
From:      Lapo Luchini <lapo@lapo.it>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        Lapo Luchini <lapo@lapo.it>, Guido Falsi <mad@madpilot.net>
Subject:   ports/152740: [MAINTAINER] devel/monotone-viz: un-break
Message-ID:  <201012011158.oB1BwOhm001810@lapo.andxor.it>
Resent-Message-ID: <201012011200.oB1C0Kg5072312@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         152740
>Category:       ports
>Synopsis:       [MAINTAINER] devel/monotone-viz: un-break
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Dec 01 12:00:20 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Lapo Luchini
>Release:        FreeBSD 8.1-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD lapo.andxor.it 8.1-RELEASE FreeBSD 8.1-RELEASE #0: Mon Jul 19 02:36:49 UTC 2010
>Description:
Un-break the port avoiding to use internal lablgtk.
Depends on lablgtk upgrade as in ports/152461.
I added a patch-Makefile to cirvumvent necessity of ports/149958 (which I still think being a cleaner approach).

Added file(s):
- files/patch-Makefile

Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:

--- monotone-viz-1.0.2_1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/devel/monotone-viz/Makefile /usr/home/lapo/ports/monotone-viz/Makefile
--- /usr/ports/devel/monotone-viz/Makefile	2010-11-20 16:36:36.000000000 +0100
+++ /usr/home/lapo/ports/monotone-viz/Makefile	2010-12-01 12:53:44.000000000 +0100
@@ -7,29 +7,25 @@
 
 PORTNAME=	monotone-viz
 PORTVERSION=	1.0.2
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://oandrieu.nerim.net/monotone-viz/
 
 MAINTAINER=	lapo@lapo.it
 COMMENT=	Visual interface for Monotone VCS with revision graphs
 
-# BUILD_DEPENDS=	lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2
+BUILD_DEPENDS=	lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2
 RUN_DEPENDS+=	dot:${PORTSDIR}/graphics/graphviz \
-		mtn:${PORTSDIR}/devel/monotone
-# 		lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2
+		mtn:${PORTSDIR}/devel/monotone \
+		lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BROKEN=		Doesn't build with Glib-2.26
-
 USE_GMAKE=	yes
 USE_OCAML=	yes
 GNU_CONFIGURE=	yes
-# following line can (and should) be used only after ports/149958 is closed
-#CONFIGURE_ARGS+=	--without-local-lablgtk
-# Remove USE_GNOME and enable dependency on lablgtk2 when ports/149958 is fixed
-USE_GNOME=	gtk20 libgnomecanvas
+CONFIGURE_ARGS+=	--without-local-lablgtk
 
 ALL_TARGET=
 MAKE_JOBS_UNSAFE=	yes
diff -ruN --exclude=CVS /usr/ports/devel/monotone-viz/files/patch-Makefile /usr/home/lapo/ports/monotone-viz/files/patch-Makefile
--- /usr/ports/devel/monotone-viz/files/patch-Makefile	1970-01-01 01:00:00.000000000 +0100
+++ /usr/home/lapo/ports/monotone-viz/files/patch-Makefile	2010-12-01 12:44:14.000000000 +0100
@@ -0,0 +1,11 @@
+--- Makefile.orig	2009-12-08 00:43:26.000000000 +0100
++++ Makefile	2010-12-01 12:44:12.000000000 +0100
+@@ -105,7 +105,7 @@ PP = $(if $(findstring $(1),$(USE_P4)),-
+ 	cd $(<D) ; $(OCAMLC) $(CINCDIRS) $(if $(CPPFLAGS),-ccopt "$(CPPFLAGS)") $(<F)
+ 
+ %.c %.h : %.var
+-	cd $(<D) ; $(LABLGTK_DIR)/varcc -static $(<F)
++	cd $(<D) ; ${LOCALBASE}/bin/ocamlrun $(LABLGTK_DIR)/varcc -static $(<F)
+ 
+ clean :
+ 	rm -f *.a *.so *.o *.cm* monotone-viz
--- monotone-viz-1.0.2_1.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



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