ports/136868: Update port: devel/ocaml-findlib honor NO_TK option of lang/ocaml

[Rick van der Zwet]

>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 at 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
- at 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: