From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Jul 17 14:00:13 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2BF94106566B for ; Fri, 17 Jul 2009 14:00:13 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id F408D8FC1E for ; Fri, 17 Jul 2009 14:00:12 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n6HE0CO1073312 for ; Fri, 17 Jul 2009 14:00:12 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n6HE0Cu7073311; Fri, 17 Jul 2009 14:00:12 GMT (envelope-from gnats) Resent-Date: Fri, 17 Jul 2009 14:00:12 GMT Resent-Message-Id: <200907171400.n6HE0Cu7073311@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Rick van der Zwet Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9D3E0106566C for ; Fri, 17 Jul 2009 13:54:24 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id 70ACC8FC19 for ; Fri, 17 Jul 2009 13:54:24 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.3/8.14.3) with ESMTP id n6HDsNVc044996 for ; Fri, 17 Jul 2009 13:54:23 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.3/8.14.3/Submit) id n6HDsNEj044994; Fri, 17 Jul 2009 13:54:23 GMT (envelope-from nobody) Message-Id: <200907171354.n6HDsNEj044994@www.freebsd.org> Date: Fri, 17 Jul 2009 13:54:23 GMT From: Rick van der Zwet To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/136868: Update port: devel/ocaml-findlib honor NO_TK option of lang/ocaml X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Jul 2009 14:00:13 -0000 >Number: 136868 >Category: ports >Synopsis: Update port: devel/ocaml-findlib honor NO_TK option of lang/ocaml >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Jul 17 14:00:12 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Rick van der Zwet >Release: 7.2-RELEASE >Organization: Wireless Leiden >Environment: FreeBSD richard.wleiden.net 7.2-RELEASE FreeBSD 7.2-RELEASE #0: Thu Jun 4 12:12:30 UTC 2009 root@richard.wleiden.net:/usr/obj/usr/src/sys/GENERIC i386 >Description: The port does not honor, when lang/ocaml is build WITHOUT_TK option. This is kind of painful on package building, as it fails to find some files and failing of that cause. >How-To-Repeat: # cd /usr/ports/devel/ocaml-findlib # make install # make deinstall ===> Deinstalling for devel/ocaml-findlib ===> Deinstalling ocaml-findlib-1.2.4 pkg_delete: file '/usr/local/lib/ocaml/site-lib/labltk/META' doesn't exist pkg_delete: file '/usr/local/lib/ocaml/site-lib/labltk' doesn't exist pkg_delete: unable to completely remove directory '/usr/local/lib/ocaml/site-lib/labltk' pkg_delete: couldn't entirely delete package (perhaps the packing list is incorrectly specified?) >Fix: Attached patch checks if requested directory is installed and disables plist flags if needs. Patch attached with submission follows: diff -ur devel/ocaml-findlib.orig/Makefile devel/ocaml-findlib/Makefile --- devel/ocaml-findlib.orig/Makefile 2009-03-10 07:07:56.000000000 +0000 +++ devel/ocaml-findlib/Makefile 2009-07-17 13:38:16.000000000 +0000 @@ -33,6 +33,16 @@ MAN1= ocamlfind.1 MAN5= META.5 findlib.conf.5 site-lib.5 +.if !exists(${LOCALBASE}/lib/ocaml/site-lib/labltk) +WITHOUT_TK= yes +.endif + +.if defined(WITHOUT_TK) +PLIST_SUB+= TK="@comment " +.else +PLIST_SUB+= TK="" +.endif + post-patch: @${REINPLACE_CMD} -E \ -e 's,(${PATTERN}+.*INSTALLDIR),\1\$${BSD_INSTALL_DATA} \3,' \ diff -ur devel/ocaml-findlib.orig/pkg-plist devel/ocaml-findlib/pkg-plist --- devel/ocaml-findlib.orig/pkg-plist 2008-04-07 06:05:58.000000000 +0000 +++ devel/ocaml-findlib/pkg-plist 2009-07-17 13:28:02.000000000 +0000 @@ -20,7 +20,7 @@ lib/ocaml/site-lib/findlib/topfind.cmi lib/ocaml/site-lib/findlib/topfind.mli lib/ocaml/site-lib/graphics/META -lib/ocaml/site-lib/labltk/META +%%TK%%lib/ocaml/site-lib/labltk/META lib/ocaml/site-lib/num-top/META lib/ocaml/site-lib/num-top/num_top.cma lib/ocaml/site-lib/num-top/num_top.cmi @@ -106,7 +106,7 @@ @dirrm lib/ocaml/site-lib/stdlib @dirrm lib/ocaml/site-lib/num-top @dirrm lib/ocaml/site-lib/num -@dirrm lib/ocaml/site-lib/labltk +%%TK%%@dirrm lib/ocaml/site-lib/labltk @dirrm lib/ocaml/site-lib/graphics @dirrm lib/ocaml/site-lib/findlib @dirrm lib/ocaml/site-lib/dynlink >Release-Note: >Audit-Trail: >Unformatted: