3 files changed, 129 insertions, 123 deletions

diff --git a/textproc/gmetadom/Makefile b/textproc/gmetadom/Makefile
index 467f3ecc073f..65ba64fd5006 100644
--- a/textproc/gmetadom/Makefile
+++ b/textproc/gmetadom/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	gmetadom
-PORTVERSION=	0.1.8
+PORTVERSION=	0.2.1
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,13 +15,19 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	yinjieh@csie.nctu.edu.tw
 COMMENT=	A Collection of DOM Implementations
 
-BUILD_DEPENDS=	ocamlfind:${PORTSDIR}/devel/ocaml-findlib \
-		pkg-config:${PORTSDIR}/devel/pkgconfig \
-		ocamlc:${PORTSDIR}/lang/ocaml
-LIB_DEPENDS=	gdome.7:${PORTSDIR}/textproc/gdome2
+BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
+LIB_DEPENDS=	gdome.8:${PORTSDIR}/textproc/gdome2
 RUN_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
 
-USE_GNOME=	glib12 gnomehack libxslt
+.if defined(WITH_OCAML)
+BUILD_DEPENDS+=	ocamlfind:${PORTSDIR}/devel/ocaml-findlib \
+		ocamlc:${PORTSDIR}/lang/ocaml
+PLIST_SUB+=	WITH_OCAML=""
+.else
+PLIST_SUB+=	WITH_OCAML="@comment "
+.endif
+
+USE_GNOME=	glib20 gnomehack libxml2
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/textproc/gmetadom/distinfo b/textproc/gmetadom/distinfo
index 2251fa6f9c8a..8e7a46daa065 100644
--- a/textproc/gmetadom/distinfo
+++ b/textproc/gmetadom/distinfo
@@ -1 +1 @@
-MD5 (gmetadom-0.1.8.tar.gz) = 2799db817f67c872af14ae9497aa202f
+MD5 (gmetadom-0.2.1.tar.gz) = d49465d563d83e99ea1c4f7816d1ac9a
diff --git a/textproc/gmetadom/pkg-plist b/textproc/gmetadom/pkg-plist
index 80207a778260..de040a44b0af 100644
--- a/textproc/gmetadom/pkg-plist
+++ b/textproc/gmetadom/pkg-plist
@@ -35,122 +35,122 @@ include/gmetadom/gdome_cpp_smart/GdomeSmartDOMUTF16String.hh
 include/gmetadom/gdome_cpp_smart/GdomeSmartDOMUTF8String.hh
 lib/libgmetadom_gdome_cpp_smart.a
 lib/libgmetadom_gdome_cpp_smart.so
-lib/libgmetadom_gdome_cpp_smart.so.1
-lib/ocaml/gdome2/META
-lib/ocaml/gdome2/gdome.cmi
-lib/ocaml/gdome2/gdome.mli
-lib/ocaml/gdome2/gdomeDOMExceptionT.cmi
-lib/ocaml/gdome2/gdomeDOMExceptionT.mli
-lib/ocaml/gdome2/gdomeInit.cmi
-lib/ocaml/gdome2/gdomeInit.cmo
-lib/ocaml/gdome2/gdomeInit.cmx
-lib/ocaml/gdome2/gdomeInit.ml
-lib/ocaml/gdome2/gdomeInit.mli
-lib/ocaml/gdome2/gdomeInit.o
-lib/ocaml/gdome2/gdomeNodeTypeT.cmi
-lib/ocaml/gdome2/gdomeNodeTypeT.mli
-lib/ocaml/gdome2/gdomeT.cmi
-lib/ocaml/gdome2/gdomeT.mli
-lib/ocaml/gdome2/iAttr.cmi
-lib/ocaml/gdome2/iAttr.ml
-lib/ocaml/gdome2/iCDATASection.cmi
-lib/ocaml/gdome2/iCDATASection.ml
-lib/ocaml/gdome2/iCharacterData.cmi
-lib/ocaml/gdome2/iCharacterData.ml
-lib/ocaml/gdome2/iComment.cmi
-lib/ocaml/gdome2/iComment.ml
-lib/ocaml/gdome2/iDOMImplementation.cmi
-lib/ocaml/gdome2/iDOMImplementation.ml
-lib/ocaml/gdome2/iDOMImplementation.mli
-lib/ocaml/gdome2/iDOMString.cmi
-lib/ocaml/gdome2/iDOMString.ml
-lib/ocaml/gdome2/iDocument.cmi
-lib/ocaml/gdome2/iDocument.ml
-lib/ocaml/gdome2/iDocumentFragment.cmi
-lib/ocaml/gdome2/iDocumentFragment.ml
-lib/ocaml/gdome2/iDocumentType.cmi
-lib/ocaml/gdome2/iDocumentType.ml
-lib/ocaml/gdome2/iElement.cmi
-lib/ocaml/gdome2/iElement.ml
-lib/ocaml/gdome2/iEntity.cmi
-lib/ocaml/gdome2/iEntity.ml
-lib/ocaml/gdome2/iEntityReference.cmi
-lib/ocaml/gdome2/iEntityReference.ml
-lib/ocaml/gdome2/iEvent.cmi
-lib/ocaml/gdome2/iEvent.ml
-lib/ocaml/gdome2/iEventTarget.cmi
-lib/ocaml/gdome2/iEventTarget.ml
-lib/ocaml/gdome2/iMutationEvent.cmi
-lib/ocaml/gdome2/iMutationEvent.ml
-lib/ocaml/gdome2/iNamedNodeMap.cmi
-lib/ocaml/gdome2/iNamedNodeMap.ml
-lib/ocaml/gdome2/iNode.cmi
-lib/ocaml/gdome2/iNode.ml
-lib/ocaml/gdome2/iNodeList.cmi
-lib/ocaml/gdome2/iNodeList.ml
-lib/ocaml/gdome2/iNotation.cmi
-lib/ocaml/gdome2/iNotation.ml
-lib/ocaml/gdome2/iProcessingInstruction.cmi
-lib/ocaml/gdome2/iProcessingInstruction.ml
-lib/ocaml/gdome2/iText.cmi
-lib/ocaml/gdome2/iText.ml
-lib/ocaml/gdome2/mlgdome.a
-lib/ocaml/gdome2/mlgdome.cma
-lib/ocaml/gdome2/mlgdome.cmxa
-lib/ocaml/gdome2/mlgdomevalue.h
-lib/ocaml/gdome2/mlogdome.a
-lib/ocaml/gdome2/mlogdome.cma
-lib/ocaml/gdome2/mlogdome.cmxa
-lib/ocaml/gdome2/tAttr.cmi
-lib/ocaml/gdome2/tAttr.mli
-lib/ocaml/gdome2/tCDATASection.cmi
-lib/ocaml/gdome2/tCDATASection.mli
-lib/ocaml/gdome2/tCharacterData.cmi
-lib/ocaml/gdome2/tCharacterData.mli
-lib/ocaml/gdome2/tComment.cmi
-lib/ocaml/gdome2/tComment.mli
-lib/ocaml/gdome2/tDOMImplementation.cmi
-lib/ocaml/gdome2/tDOMImplementation.mli
-lib/ocaml/gdome2/tDOMString.cmi
-lib/ocaml/gdome2/tDOMString.mli
-lib/ocaml/gdome2/tDOMTimeStamp.cmi
-lib/ocaml/gdome2/tDOMTimeStamp.mli
-lib/ocaml/gdome2/tDocument.cmi
-lib/ocaml/gdome2/tDocument.mli
-lib/ocaml/gdome2/tDocumentFragment.cmi
-lib/ocaml/gdome2/tDocumentFragment.mli
-lib/ocaml/gdome2/tDocumentType.cmi
-lib/ocaml/gdome2/tDocumentType.mli
-lib/ocaml/gdome2/tElement.cmi
-lib/ocaml/gdome2/tElement.mli
-lib/ocaml/gdome2/tEntity.cmi
-lib/ocaml/gdome2/tEntity.mli
-lib/ocaml/gdome2/tEntityReference.cmi
-lib/ocaml/gdome2/tEntityReference.mli
-lib/ocaml/gdome2/tEvent.cmi
-lib/ocaml/gdome2/tEvent.mli
-lib/ocaml/gdome2/tEventListener.cmi
-lib/ocaml/gdome2/tEventListener.mli
-lib/ocaml/gdome2/tEventTarget.cmi
-lib/ocaml/gdome2/tEventTarget.mli
-lib/ocaml/gdome2/tMutationEvent.cmi
-lib/ocaml/gdome2/tMutationEvent.mli
-lib/ocaml/gdome2/tNamedNodeMap.cmi
-lib/ocaml/gdome2/tNamedNodeMap.mli
-lib/ocaml/gdome2/tNode.cmi
-lib/ocaml/gdome2/tNode.mli
-lib/ocaml/gdome2/tNodeList.cmi
-lib/ocaml/gdome2/tNodeList.mli
-lib/ocaml/gdome2/tNotation.cmi
-lib/ocaml/gdome2/tNotation.mli
-lib/ocaml/gdome2/tProcessingInstruction.cmi
-lib/ocaml/gdome2/tProcessingInstruction.mli
-lib/ocaml/gdome2/tText.cmi
-lib/ocaml/gdome2/tText.mli
-lib/ocaml/stublibs/dllmlgdome.so
-lib/ocaml/stublibs/dllmlgdome.so.owner
-lib/ocaml/stublibs/libmlgdome.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/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
+%%WITH_OCAML%%lib/ocaml/stublibs/libmlgdome.so
 libdata/pkgconfig/gdome2-cpp-smart.pc
 @dirrm include/gmetadom/gdome_cpp_smart
 @dirrm include/gmetadom
-@dirrm lib/ocaml/gdome2
+%%WITH_OCAML%%@dirrm lib/ocaml/gdome2