169252 – [patch] textproc/gmetadom cannot disable building against ocaml if not present; causes future installs to fail

Bug 169252 - [patch] textproc/gmetadom cannot disable building against ocaml if not present; causes future installs to fail

Summary: [patch] textproc/gmetadom cannot disable building against ocaml if not presen...

Status:	Closed FIXED

Alias:	None

Product:	Ports & Packages
Classification:	Unclassified
Component:	Individual Port(s) (show other bugs)
Version:	Latest
Hardware:	Any Any

Importance:	Normal Affects Only Me
Assignee:	Jase Thew

URL:
Keywords:

Depends on:
Blocks:

Reported:	2012-06-20 04:50 UTC by Edward.Sanford.Sutton, III
Modified:	2012-08-31 13:30 UTC (History)
CC List:	0 users

See Also:

Attachments
file.diff (266 bytes, patch) 2012-06-20 04:50 UTC, Edward.Sanford.Sutton, III	no flags	Details \| Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.

Description Edward.Sanford.Sutton, III 2012-06-20 04:50:09 UTC

gmetadom runs a configure script to detect ocaml, which was not altered by the config option OCAML=off. If ocaml content is present, gmetadom still built against it which made the pkg-plist incorrect. An uninstall leaves debris and a reinstall fails as follows: 

        install  -o root -g wheel -m 444 dllmlgdome.so /usr/local/lib/ocaml/stublibs;   \
fi
ocamlfind: Conflict with another package: Library dllmlgdome.so is already installed
gmake[4]: *** [install-data-local] Error 2

Fix: I had to execute a manual command of rm -r /usr/local/lib/ocaml/gdome2.saved/ /usr/local/lib/ocaml/stublibs/dllmlgdome.so on the system before being able to get `make install` to succeed; should that be noted in UPDATING or should the port be updated to do that as cleanup for debris from older copies of the port? Once debris is cleaned out, the following patch will clean it up.

Patch attached with submission follows:
How-To-Repeat: I assume installing the ocaml dependencies and then building the port without the OCAML option enabled will cause it to fail; I had this problem before trying to test how to get it to go away and it is on a machine with many ports installed.

Comment 1 Jase Thew freebsd_committer

2012-06-30 19:30:50 UTC

Responsible Changed
From-To: freebsd-ports-bugs->jase

I'll take it.

Comment 2 Jase Thew freebsd_committer

2012-08-31 13:24:07 UTC

State Changed
From-To: open->closed

Committed. Thanks!

Comment 3 dfilter service freebsd_committer

2012-08-31 13:24:26 UTC

Author: jase
Date: Fri Aug 31 12:23:32 2012
New Revision: 303419
URL: http://svn.freebsd.org/changeset/ports/303419

Log:
  - Update to 0.2.6
  - Convert to optionsNG
  - Fix silent dependency on ocaml if option was disabled but ocaml was
    installed [1]
  - Add pre-install and pkg-plist shims to clean-up previous install
    leftovers if found
  - Rename OCAML option PLIST_SUB entry and associated marker in pkg-plist
  
  PR:		ports/169252 [1]
  Submitted by:	Edward Sanford Sutton III <mirror176@cox.net>
  Approved by:	flo (mentor)

Modified:
  head/textproc/gmetadom/Makefile   (contents, props changed)
  head/textproc/gmetadom/distinfo   (contents, props changed)
  head/textproc/gmetadom/pkg-plist   (contents, props changed)

Modified: head/textproc/gmetadom/Makefile
==============================================================================
--- head/textproc/gmetadom/Makefile	Fri Aug 31 12:04:07 2012	(r303418)
+++ head/textproc/gmetadom/Makefile	Fri Aug 31 12:23:32 2012	(r303419)
@@ -7,16 +7,14 @@
 #
 
 PORTNAME=	gmetadom
-PORTVERSION=	0.2.4
-PORTREVISION=	1
+PORTVERSION=	0.2.6
 CATEGORIES=	textproc
 MASTER_SITES=	SF
-DISTNAME=	${PORTNAME}-${PORTVERSION}b
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A Collection of DOM Implementations
 
-LIB_DEPENDS=	gdome.8:${PORTSDIR}/textproc/gdome2
+LIB_DEPENDS=	gdome:${PORTSDIR}/textproc/gdome2
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USE_GNOME=	glib20 gnomehack libxml2
@@ -27,16 +25,34 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 USE_LDCONFIG=	yes
 USE_PKGCONFIG=	yes
 
-OPTIONS=	OCAML "OCAML language support" off
+OPTIONS_DEFINE=	OCAML
 
-.include <bsd.port.pre.mk>
+OCAML_DESC=	OCAML language support
 
-.if defined(WITH_OCAML)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MOCAML}
 BUILD_DEPENDS+=	ocamlfind:${PORTSDIR}/devel/ocaml-findlib \
 		ocamlc:${PORTSDIR}/lang/ocaml
-PLIST_SUB+=	WITH_OCAML=""
+PLIST_SUB+=	OCAML=""
 .else
-PLIST_SUB+=	WITH_OCAML="@comment "
+CONFIGURE_ARGS+=	HAVE_OCAMLDEP=no HAVE_OCAMLFIND=no HAVE_OCAMLOPT=no
+PLIST_SUB+=	OCAML="@comment "
 .endif
 
-.include <bsd.port.post.mk>
+# Shim to clean-up a previous bad install - this can be removed
+# PORTVERSION > 0.2.6 along with the associated pkg-plist @exec
+# entries.
+pre-install:
+	@if [ -d ${LOCALBASE}/lib/ocaml/gdome2 ]; then \
+		${RM} -f ${LOCALBASE}/lib/ocaml/gdome2/* 2>/dev/null && \
+		${RMDIR} ${LOCALBASE}/lib/ocaml/gdome2 2>/dev/null; \
+	fi
+	@if [ -f ${LOCALBASE}/lib/ocaml/stublibs/dllmlgdome.so ]; then \
+		${RM} -f ${LOCALBASE}/lib/ocaml/stublibs/dllmlgdome.so 2>/dev/null; \
+	fi
+	@if [ -f ${LOCALBASE}/lib/ocaml/stublibs/dllmlgdome.so.owner ]; then \
+		${RM} -f ${LOCALBASE}/lib/ocaml/stublibs/dllmlgdome.so.owner 2>/dev/null; \
+	fi
+
+.include <bsd.port.mk>

Modified: head/textproc/gmetadom/distinfo
==============================================================================
--- head/textproc/gmetadom/distinfo	Fri Aug 31 12:04:07 2012	(r303418)
+++ head/textproc/gmetadom/distinfo	Fri Aug 31 12:23:32 2012	(r303419)
@@ -1,2 +1,2 @@
-SHA256 (gmetadom-0.2.4b.tar.gz) = f69ca2fbea196aa521eeafc5f33709c0f4296664a8c5f9717228f8cae8f67ec3
-SIZE (gmetadom-0.2.4b.tar.gz) = 494144
+SHA256 (gmetadom-0.2.6.tar.gz) = 2f1e286dfceb7877f90c72de7e5e17a87d0e3f8121feff794a6f637bc1a6756a
+SIZE (gmetadom-0.2.6.tar.gz) = 509165

Modified: head/textproc/gmetadom/pkg-plist
==============================================================================
--- head/textproc/gmetadom/pkg-plist	Fri Aug 31 12:04:07 2012	(r303418)
+++ head/textproc/gmetadom/pkg-plist	Fri Aug 31 12:23:32 2012	(r303419)
@@ -36,121 +36,124 @@ include/gmetadom/gdome_cpp_smart/GdomeSm
 lib/libgmetadom_gdome_cpp_smart.a
 lib/libgmetadom_gdome_cpp_smart.so
 lib/libgmetadom_gdome_cpp_smart.so.2
-%%WITH_OCAML%%lib/ocaml/gdome2/META
-%%WITH_OCAML%%lib/ocaml/gdome2/gdome.cmi
-%%WITH_OCAML%%lib/ocaml/gdome2/gdome.mli
-%%WITH_OCAML%%lib/ocaml/gdome2/gdomeDOMExceptionT.cmi
-%%WITH_OCAML%%lib/ocaml/gdome2/gdomeDOMExceptionT.mli
-%%WITH_OCAML%%lib/ocaml/gdome2/gdomeInit.cmi
-%%WITH_OCAML%%lib/ocaml/gdome2/gdomeInit.cmo
-%%WITH_OCAML%%lib/ocaml/gdome2/gdomeInit.cmx
-%%WITH_OCAML%%lib/ocaml/gdome2/gdomeInit.ml
-%%WITH_OCAML%%lib/ocaml/gdome2/gdomeInit.mli
-%%WITH_OCAML%%lib/ocaml/gdome2/gdomeInit.o
-%%WITH_OCAML%%lib/ocaml/gdome2/gdomeNodeTypeT.cmi
-%%WITH_OCAML%%lib/ocaml/gdome2/gdomeNodeTypeT.mli
-%%WITH_OCAML%%lib/ocaml/gdome2/gdomeT.cmi
-%%WITH_OCAML%%lib/ocaml/gdome2/gdomeT.mli
-%%WITH_OCAML%%lib/ocaml/gdome2/iAttr.cmi
-%%WITH_OCAML%%lib/ocaml/gdome2/iAttr.ml
-%%WITH_OCAML%%lib/ocaml/gdome2/iCDATASection.cmi
-%%WITH_OCAML%%lib/ocaml/gdome2/iCDATASection.ml
-%%WITH_OCAML%%lib/ocaml/gdome2/iCharacterData.cmi
-%%WITH_OCAML%%lib/ocaml/gdome2/iCharacterData.ml
-%%WITH_OCAML%%lib/ocaml/gdome2/iComment.cmi
-%%WITH_OCAML%%lib/ocaml/gdome2/iComment.ml
-%%WITH_OCAML%%lib/ocaml/gdome2/iDOMImplementation.cmi
-%%WITH_OCAML%%lib/ocaml/gdome2/iDOMImplementation.ml
-%%WITH_OCAML%%lib/ocaml/gdome2/iDOMImplementation.mli
-%%WITH_OCAML%%lib/ocaml/gdome2/iDOMString.cmi
-%%WITH_OCAML%%lib/ocaml/gdome2/iDOMString.ml
-%%WITH_OCAML%%lib/ocaml/gdome2/iDocument.cmi
-%%WITH_OCAML%%lib/ocaml/gdome2/iDocument.ml
-%%WITH_OCAML%%lib/ocaml/gdome2/iDocumentFragment.cmi
-%%WITH_OCAML%%lib/ocaml/gdome2/iDocumentFragment.ml
-%%WITH_OCAML%%lib/ocaml/gdome2/iDocumentType.cmi
-%%WITH_OCAML%%lib/ocaml/gdome2/iDocumentType.ml
-%%WITH_OCAML%%lib/ocaml/gdome2/iElement.cmi
-%%WITH_OCAML%%lib/ocaml/gdome2/iElement.ml
-%%WITH_OCAML%%lib/ocaml/gdome2/iEntity.cmi
-%%WITH_OCAML%%lib/ocaml/gdome2/iEntity.ml
-%%WITH_OCAML%%lib/ocaml/gdome2/iEntityReference.cmi
-%%WITH_OCAML%%lib/ocaml/gdome2/iEntityReference.ml
-%%WITH_OCAML%%lib/ocaml/gdome2/iEvent.cmi
-%%WITH_OCAML%%lib/ocaml/gdome2/iEvent.ml
-%%WITH_OCAML%%lib/ocaml/gdome2/iEventTarget.cmi
-%%WITH_OCAML%%lib/ocaml/gdome2/iEventTarget.ml
-%%WITH_OCAML%%lib/ocaml/gdome2/iMutationEvent.cmi
-%%WITH_OCAML%%lib/ocaml/gdome2/iMutationEvent.ml
-%%WITH_OCAML%%lib/ocaml/gdome2/iNamedNodeMap.cmi
-%%WITH_OCAML%%lib/ocaml/gdome2/iNamedNodeMap.ml
-%%WITH_OCAML%%lib/ocaml/gdome2/iNode.cmi
-%%WITH_OCAML%%lib/ocaml/gdome2/iNode.ml
-%%WITH_OCAML%%lib/ocaml/gdome2/iNodeList.cmi
-%%WITH_OCAML%%lib/ocaml/gdome2/iNodeList.ml
-%%WITH_OCAML%%lib/ocaml/gdome2/iNotation.cmi
-%%WITH_OCAML%%lib/ocaml/gdome2/iNotation.ml
-%%WITH_OCAML%%lib/ocaml/gdome2/iProcessingInstruction.cmi
-%%WITH_OCAML%%lib/ocaml/gdome2/iProcessingInstruction.ml
-%%WITH_OCAML%%lib/ocaml/gdome2/iText.cmi
-%%WITH_OCAML%%lib/ocaml/gdome2/iText.ml
-%%WITH_OCAML%%lib/ocaml/gdome2/libmlgdome.a
-%%WITH_OCAML%%lib/ocaml/gdome2/mlgdome.a
-%%WITH_OCAML%%lib/ocaml/gdome2/mlgdome.cma
-%%WITH_OCAML%%lib/ocaml/gdome2/mlgdome.cmxa
-%%WITH_OCAML%%lib/ocaml/gdome2/mlgdomevalue.h
-%%WITH_OCAML%%lib/ocaml/gdome2/mlogdome.a
-%%WITH_OCAML%%lib/ocaml/gdome2/mlogdome.cma
-%%WITH_OCAML%%lib/ocaml/gdome2/mlogdome.cmxa
-%%WITH_OCAML%%lib/ocaml/gdome2/tAttr.cmi
-%%WITH_OCAML%%lib/ocaml/gdome2/tAttr.mli
-%%WITH_OCAML%%lib/ocaml/gdome2/tCDATASection.cmi
-%%WITH_OCAML%%lib/ocaml/gdome2/tCDATASection.mli
-%%WITH_OCAML%%lib/ocaml/gdome2/tCharacterData.cmi
-%%WITH_OCAML%%lib/ocaml/gdome2/tCharacterData.mli
-%%WITH_OCAML%%lib/ocaml/gdome2/tComment.cmi
-%%WITH_OCAML%%lib/ocaml/gdome2/tComment.mli
-%%WITH_OCAML%%lib/ocaml/gdome2/tDOMImplementation.cmi
-%%WITH_OCAML%%lib/ocaml/gdome2/tDOMImplementation.mli
-%%WITH_OCAML%%lib/ocaml/gdome2/tDOMString.cmi
-%%WITH_OCAML%%lib/ocaml/gdome2/tDOMString.mli
-%%WITH_OCAML%%lib/ocaml/gdome2/tDOMTimeStamp.cmi
-%%WITH_OCAML%%lib/ocaml/gdome2/tDOMTimeStamp.mli
-%%WITH_OCAML%%lib/ocaml/gdome2/tDocument.cmi
-%%WITH_OCAML%%lib/ocaml/gdome2/tDocument.mli
-%%WITH_OCAML%%lib/ocaml/gdome2/tDocumentFragment.cmi
-%%WITH_OCAML%%lib/ocaml/gdome2/tDocumentFragment.mli
-%%WITH_OCAML%%lib/ocaml/gdome2/tDocumentType.cmi
-%%WITH_OCAML%%lib/ocaml/gdome2/tDocumentType.mli
-%%WITH_OCAML%%lib/ocaml/gdome2/tElement.cmi
-%%WITH_OCAML%%lib/ocaml/gdome2/tElement.mli
-%%WITH_OCAML%%lib/ocaml/gdome2/tEntity.cmi
-%%WITH_OCAML%%lib/ocaml/gdome2/tEntity.mli
-%%WITH_OCAML%%lib/ocaml/gdome2/tEntityReference.cmi
-%%WITH_OCAML%%lib/ocaml/gdome2/tEntityReference.mli
-%%WITH_OCAML%%lib/ocaml/gdome2/tEvent.cmi
-%%WITH_OCAML%%lib/ocaml/gdome2/tEvent.mli
-%%WITH_OCAML%%lib/ocaml/gdome2/tEventListener.cmi
-%%WITH_OCAML%%lib/ocaml/gdome2/tEventListener.mli
-%%WITH_OCAML%%lib/ocaml/gdome2/tEventTarget.cmi
-%%WITH_OCAML%%lib/ocaml/gdome2/tEventTarget.mli
-%%WITH_OCAML%%lib/ocaml/gdome2/tMutationEvent.cmi
-%%WITH_OCAML%%lib/ocaml/gdome2/tMutationEvent.mli
-%%WITH_OCAML%%lib/ocaml/gdome2/tNamedNodeMap.cmi
-%%WITH_OCAML%%lib/ocaml/gdome2/tNamedNodeMap.mli
-%%WITH_OCAML%%lib/ocaml/gdome2/tNode.cmi
-%%WITH_OCAML%%lib/ocaml/gdome2/tNode.mli
-%%WITH_OCAML%%lib/ocaml/gdome2/tNodeList.cmi
-%%WITH_OCAML%%lib/ocaml/gdome2/tNodeList.mli
-%%WITH_OCAML%%lib/ocaml/gdome2/tNotation.cmi
-%%WITH_OCAML%%lib/ocaml/gdome2/tNotation.mli
-%%WITH_OCAML%%lib/ocaml/gdome2/tProcessingInstruction.cmi
-%%WITH_OCAML%%lib/ocaml/gdome2/tProcessingInstruction.mli
-%%WITH_OCAML%%lib/ocaml/gdome2/tText.cmi
-%%WITH_OCAML%%lib/ocaml/gdome2/tText.mli
-%%WITH_OCAML%%lib/ocaml/stublibs/dllmlgdome.so
-%%WITH_OCAML%%lib/ocaml/stublibs/dllmlgdome.so.owner
+%%OCAML%%lib/ocaml/gdome2/META
+%%OCAML%%lib/ocaml/gdome2/gdome.cmi
+%%OCAML%%lib/ocaml/gdome2/gdome.mli
+%%OCAML%%lib/ocaml/gdome2/gdomeDOMExceptionT.cmi
+%%OCAML%%lib/ocaml/gdome2/gdomeDOMExceptionT.mli
+%%OCAML%%lib/ocaml/gdome2/gdomeInit.cmi
+%%OCAML%%lib/ocaml/gdome2/gdomeInit.cmo
+%%OCAML%%lib/ocaml/gdome2/gdomeInit.cmx
+%%OCAML%%lib/ocaml/gdome2/gdomeInit.ml
+%%OCAML%%lib/ocaml/gdome2/gdomeInit.mli
+%%OCAML%%lib/ocaml/gdome2/gdomeInit.o
+%%OCAML%%lib/ocaml/gdome2/gdomeNodeTypeT.cmi
+%%OCAML%%lib/ocaml/gdome2/gdomeNodeTypeT.mli
+%%OCAML%%lib/ocaml/gdome2/gdomeT.cmi
+%%OCAML%%lib/ocaml/gdome2/gdomeT.mli
+%%OCAML%%lib/ocaml/gdome2/iAttr.cmi
+%%OCAML%%lib/ocaml/gdome2/iAttr.ml
+%%OCAML%%lib/ocaml/gdome2/iCDATASection.cmi
+%%OCAML%%lib/ocaml/gdome2/iCDATASection.ml
+%%OCAML%%lib/ocaml/gdome2/iCharacterData.cmi
+%%OCAML%%lib/ocaml/gdome2/iCharacterData.ml
+%%OCAML%%lib/ocaml/gdome2/iComment.cmi
+%%OCAML%%lib/ocaml/gdome2/iComment.ml
+%%OCAML%%lib/ocaml/gdome2/iDOMImplementation.cmi
+%%OCAML%%lib/ocaml/gdome2/iDOMImplementation.ml
+%%OCAML%%lib/ocaml/gdome2/iDOMImplementation.mli
+%%OCAML%%lib/ocaml/gdome2/iDOMString.cmi
+%%OCAML%%lib/ocaml/gdome2/iDOMString.ml
+%%OCAML%%lib/ocaml/gdome2/iDocument.cmi
+%%OCAML%%lib/ocaml/gdome2/iDocument.ml
+%%OCAML%%lib/ocaml/gdome2/iDocumentFragment.cmi
+%%OCAML%%lib/ocaml/gdome2/iDocumentFragment.ml
+%%OCAML%%lib/ocaml/gdome2/iDocumentType.cmi
+%%OCAML%%lib/ocaml/gdome2/iDocumentType.ml
+%%OCAML%%lib/ocaml/gdome2/iElement.cmi
+%%OCAML%%lib/ocaml/gdome2/iElement.ml
+%%OCAML%%lib/ocaml/gdome2/iEntity.cmi
+%%OCAML%%lib/ocaml/gdome2/iEntity.ml
+%%OCAML%%lib/ocaml/gdome2/iEntityReference.cmi
+%%OCAML%%lib/ocaml/gdome2/iEntityReference.ml
+%%OCAML%%lib/ocaml/gdome2/iEvent.cmi
+%%OCAML%%lib/ocaml/gdome2/iEvent.ml
+%%OCAML%%lib/ocaml/gdome2/iEventTarget.cmi
+%%OCAML%%lib/ocaml/gdome2/iEventTarget.ml
+%%OCAML%%lib/ocaml/gdome2/iMutationEvent.cmi
+%%OCAML%%lib/ocaml/gdome2/iMutationEvent.ml
+%%OCAML%%lib/ocaml/gdome2/iNamedNodeMap.cmi
+%%OCAML%%lib/ocaml/gdome2/iNamedNodeMap.ml
+%%OCAML%%lib/ocaml/gdome2/iNode.cmi
+%%OCAML%%lib/ocaml/gdome2/iNode.ml
+%%OCAML%%lib/ocaml/gdome2/iNodeList.cmi
+%%OCAML%%lib/ocaml/gdome2/iNodeList.ml
+%%OCAML%%lib/ocaml/gdome2/iNotation.cmi
+%%OCAML%%lib/ocaml/gdome2/iNotation.ml
+%%OCAML%%lib/ocaml/gdome2/iProcessingInstruction.cmi
+%%OCAML%%lib/ocaml/gdome2/iProcessingInstruction.ml
+%%OCAML%%lib/ocaml/gdome2/iText.cmi
+%%OCAML%%lib/ocaml/gdome2/iText.ml
+%%OCAML%%lib/ocaml/gdome2/libmlgdome.a
+%%OCAML%%lib/ocaml/gdome2/mlgdome.a
+%%OCAML%%lib/ocaml/gdome2/mlgdome.cma
+%%OCAML%%lib/ocaml/gdome2/mlgdome.cmxa
+%%OCAML%%lib/ocaml/gdome2/mlgdomevalue.h
+%%OCAML%%lib/ocaml/gdome2/mlogdome.a
+%%OCAML%%lib/ocaml/gdome2/mlogdome.cma
+%%OCAML%%lib/ocaml/gdome2/mlogdome.cmxa
+%%OCAML%%lib/ocaml/gdome2/tAttr.cmi
+%%OCAML%%lib/ocaml/gdome2/tAttr.mli
+%%OCAML%%lib/ocaml/gdome2/tCDATASection.cmi
+%%OCAML%%lib/ocaml/gdome2/tCDATASection.mli
+%%OCAML%%lib/ocaml/gdome2/tCharacterData.cmi
+%%OCAML%%lib/ocaml/gdome2/tCharacterData.mli
+%%OCAML%%lib/ocaml/gdome2/tComment.cmi
+%%OCAML%%lib/ocaml/gdome2/tComment.mli
+%%OCAML%%lib/ocaml/gdome2/tDOMImplementation.cmi
+%%OCAML%%lib/ocaml/gdome2/tDOMImplementation.mli
+%%OCAML%%lib/ocaml/gdome2/tDOMString.cmi
+%%OCAML%%lib/ocaml/gdome2/tDOMString.mli
+%%OCAML%%lib/ocaml/gdome2/tDOMTimeStamp.cmi
+%%OCAML%%lib/ocaml/gdome2/tDOMTimeStamp.mli
+%%OCAML%%lib/ocaml/gdome2/tDocument.cmi
+%%OCAML%%lib/ocaml/gdome2/tDocument.mli
+%%OCAML%%lib/ocaml/gdome2/tDocumentFragment.cmi
+%%OCAML%%lib/ocaml/gdome2/tDocumentFragment.mli
+%%OCAML%%lib/ocaml/gdome2/tDocumentType.cmi
+%%OCAML%%lib/ocaml/gdome2/tDocumentType.mli
+%%OCAML%%lib/ocaml/gdome2/tElement.cmi
+%%OCAML%%lib/ocaml/gdome2/tElement.mli
+%%OCAML%%lib/ocaml/gdome2/tEntity.cmi
+%%OCAML%%lib/ocaml/gdome2/tEntity.mli
+%%OCAML%%lib/ocaml/gdome2/tEntityReference.cmi
+%%OCAML%%lib/ocaml/gdome2/tEntityReference.mli
+%%OCAML%%lib/ocaml/gdome2/tEvent.cmi
+%%OCAML%%lib/ocaml/gdome2/tEvent.mli
+%%OCAML%%lib/ocaml/gdome2/tEventListener.cmi
+%%OCAML%%lib/ocaml/gdome2/tEventListener.mli
+%%OCAML%%lib/ocaml/gdome2/tEventTarget.cmi
+%%OCAML%%lib/ocaml/gdome2/tEventTarget.mli
+%%OCAML%%lib/ocaml/gdome2/tMutationEvent.cmi
+%%OCAML%%lib/ocaml/gdome2/tMutationEvent.mli
+%%OCAML%%lib/ocaml/gdome2/tNamedNodeMap.cmi
+%%OCAML%%lib/ocaml/gdome2/tNamedNodeMap.mli
+%%OCAML%%lib/ocaml/gdome2/tNode.cmi
+%%OCAML%%lib/ocaml/gdome2/tNode.mli
+%%OCAML%%lib/ocaml/gdome2/tNodeList.cmi
+%%OCAML%%lib/ocaml/gdome2/tNodeList.mli
+%%OCAML%%lib/ocaml/gdome2/tNotation.cmi
+%%OCAML%%lib/ocaml/gdome2/tNotation.mli
+%%OCAML%%lib/ocaml/gdome2/tProcessingInstruction.cmi
+%%OCAML%%lib/ocaml/gdome2/tProcessingInstruction.mli
+%%OCAML%%lib/ocaml/gdome2/tText.cmi
+%%OCAML%%lib/ocaml/gdome2/tText.mli
+%%OCAML%%lib/ocaml/stublibs/dllmlgdome.so
+%%OCAML%%lib/ocaml/stublibs/dllmlgdome.so.owner
 libdata/pkgconfig/gdome2-cpp-smart.pc
 @dirrm include/gmetadom/gdome_cpp_smart
 @dirrm include/gmetadom
-%%WITH_OCAML%%@dirrm lib/ocaml/gdome2
+%%OCAML%%@dirrm lib/ocaml/gdome2
+@exec if [ -d %D/lib/ocaml/gdome2 ] ; then /bin/rm -f %D/lib/ocaml/gdome2/* 2>/dev/null && /bin/rmdir %D/lib/ocaml/gdome2 2>/dev/null ; fi
+@exec if [ -f %D/lib/ocaml/stublibs/dllmlgdome.so ] ; then /bin/rm -f %D/lib/ocaml/stublibs/dllmlgdome.so 2>/dev/null ; fi
+@exec if [ -f %D/lib/ocaml/stublibs/dllmlgdome.so.owner ] ; then /bin/rm -f %D/lib/ocaml/stublibs/dllmlgdome.so.owner 2>/dev/null ; fi
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"