2 files changed, 104 insertions, 26 deletions

diff --git a/devel/ocaml-annexlib/Makefile b/devel/ocaml-annexlib/Makefile
index 0246db23b086..a165afacd331 100644
--- a/devel/ocaml-annexlib/Makefile
+++ b/devel/ocaml-annexlib/Makefile
@@ -11,43 +11,25 @@ PKGNAMEPREFIX=	ocaml-
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	OCaml subroutines collection
 
+LICENSE=	LGPL21
+
 BUILD_DEPENDS=	${SA_DIR}/pcre/pcre.a:${PORTSDIR}/devel/ocaml-pcre
 RUN_DEPENDS=	${SA_DIR}/pcre/pcre.a:${PORTSDIR}/devel/ocaml-pcre
 
 USES=		gmake
 USE_OCAML=	yes
-USE_OCAML_FINDLIB=yes
-USE_OCAML_LDCONFIG=yes
+USE_OCAML_FINDLIB=	yes
+USE_OCAML_LDCONFIG=	yes
+OPTIONS_DEFINE=	DOCS
 
 GNU_CONFIGURE=	yes
 
 ALL_TARGET=	all opt
 SA_DIR=		${LOCALBASE}/${OCAML_SITELIBDIR}
-
-.if !defined(NOPORTDOCS)
 DOCSDIR=	${PREFIX}/share/doc/ocaml/${PORTNAME}
-PORTDOCS=	*
-.endif
-
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
-
-post-extract:
-# For nonstandard prefixes
-.if !exists(${OCAMLFIND_DESTDIR})
-	${MKDIR} ${OCAMLFIND_DESTDIR}
-.endif
-.if !exists(${OCAMLFIND_LDCONF})
-	${TOUCH} ${OCAMLFIND_LDCONF}
-.endif
 
 post-install:
-	@${FIND} ${OCAMLFIND_DESTDIR}/${PORTNAME} -type f | \
-		${SED} "s,^${PREFIX}/,," >> ${TMPPLIST}
-
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/doc/html/* ${DOCSDIR}
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/doc/html/* ${STAGEDIR}${DOCSDIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/ocaml-annexlib/pkg-plist b/devel/ocaml-annexlib/pkg-plist
new file mode 100644
index 000000000000..54dd8dde0f23
--- /dev/null
+++ b/devel/ocaml-annexlib/pkg-plist
@@ -0,0 +1,96 @@
+%%OCAML_SITELIBDIR%%/annexlib/META
+%%OCAML_SITELIBDIR%%/annexlib/annexlib.a
+%%OCAML_SITELIBDIR%%/annexlib/annexlib.cma
+%%OCAML_SITELIBDIR%%/annexlib/annexlib.cmxa
+%%OCAML_SITELIBDIR%%/annexlib/arrayExtras.cmi
+%%OCAML_SITELIBDIR%%/annexlib/arrayExtras.cmx
+%%OCAML_SITELIBDIR%%/annexlib/arrayExtras.mli
+%%OCAML_SITELIBDIR%%/annexlib/charExtras.cmi
+%%OCAML_SITELIBDIR%%/annexlib/charExtras.cmx
+%%OCAML_SITELIBDIR%%/annexlib/charExtras.mli
+%%OCAML_SITELIBDIR%%/annexlib/dllannexlib_stubs.so
+%%OCAML_SITELIBDIR%%/annexlib/find.cmi
+%%OCAML_SITELIBDIR%%/annexlib/find.cmx
+%%OCAML_SITELIBDIR%%/annexlib/find.mli
+%%OCAML_SITELIBDIR%%/annexlib/glob.cmi
+%%OCAML_SITELIBDIR%%/annexlib/glob.cmx
+%%OCAML_SITELIBDIR%%/annexlib/glob.mli
+%%OCAML_SITELIBDIR%%/annexlib/iOExtras.cmi
+%%OCAML_SITELIBDIR%%/annexlib/iOExtras.cmx
+%%OCAML_SITELIBDIR%%/annexlib/iOExtras.mli
+%%OCAML_SITELIBDIR%%/annexlib/libannexlib_stubs.a
+%%OCAML_SITELIBDIR%%/annexlib/listExtras.cmi
+%%OCAML_SITELIBDIR%%/annexlib/listExtras.cmx
+%%OCAML_SITELIBDIR%%/annexlib/listExtras.mli
+%%OCAML_SITELIBDIR%%/annexlib/locale.cmi
+%%OCAML_SITELIBDIR%%/annexlib/locale.cmx
+%%OCAML_SITELIBDIR%%/annexlib/locale.mli
+%%OCAML_SITELIBDIR%%/annexlib/option.cmi
+%%OCAML_SITELIBDIR%%/annexlib/option.cmx
+%%OCAML_SITELIBDIR%%/annexlib/option.mli
+%%OCAML_SITELIBDIR%%/annexlib/strExtras.cmi
+%%OCAML_SITELIBDIR%%/annexlib/strExtras.cmx
+%%OCAML_SITELIBDIR%%/annexlib/strExtras.mli
+%%OCAML_SITELIBDIR%%/annexlib/syslog.cmi
+%%OCAML_SITELIBDIR%%/annexlib/syslog.cmx
+%%OCAML_SITELIBDIR%%/annexlib/syslog.mli
+%%OCAML_SITELIBDIR%%/annexlib/time.cmi
+%%OCAML_SITELIBDIR%%/annexlib/time.cmx
+%%OCAML_SITELIBDIR%%/annexlib/time.mli
+%%OCAML_SITELIBDIR%%/annexlib/unixExtras.cmi
+%%OCAML_SITELIBDIR%%/annexlib/unixExtras.cmx
+%%OCAML_SITELIBDIR%%/annexlib/unixExtras.mli
+%%OCAML_SITELIBDIR%%/annexlib/variant.cmi
+%%OCAML_SITELIBDIR%%/annexlib/variant.cmx
+%%OCAML_SITELIBDIR%%/annexlib/variant.mli
+%%PORTDOCS%%%%DOCSDIR%%/ArrayExtras.html
+%%PORTDOCS%%%%DOCSDIR%%/CharExtras.html
+%%PORTDOCS%%%%DOCSDIR%%/Find.html
+%%PORTDOCS%%%%DOCSDIR%%/Glob.html
+%%PORTDOCS%%%%DOCSDIR%%/IOExtras.html
+%%PORTDOCS%%%%DOCSDIR%%/ListExtras.ComparableType.html
+%%PORTDOCS%%%%DOCSDIR%%/ListExtras.Make.html
+%%PORTDOCS%%%%DOCSDIR%%/ListExtras.S.html
+%%PORTDOCS%%%%DOCSDIR%%/ListExtras.html
+%%PORTDOCS%%%%DOCSDIR%%/Locale.html
+%%PORTDOCS%%%%DOCSDIR%%/Option.html
+%%PORTDOCS%%%%DOCSDIR%%/StrExtras.CaseInsensitive.html
+%%PORTDOCS%%%%DOCSDIR%%/StrExtras.Collate.html
+%%PORTDOCS%%%%DOCSDIR%%/StrExtras.FastSearch.html
+%%PORTDOCS%%%%DOCSDIR%%/StrExtras.html
+%%PORTDOCS%%%%DOCSDIR%%/Syslog.html
+%%PORTDOCS%%%%DOCSDIR%%/Time.html
+%%PORTDOCS%%%%DOCSDIR%%/UnixExtras.html
+%%PORTDOCS%%%%DOCSDIR%%/Variant.html
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/index_attributes.html
+%%PORTDOCS%%%%DOCSDIR%%/index_class_types.html
+%%PORTDOCS%%%%DOCSDIR%%/index_classes.html
+%%PORTDOCS%%%%DOCSDIR%%/index_exceptions.html
+%%PORTDOCS%%%%DOCSDIR%%/index_methods.html
+%%PORTDOCS%%%%DOCSDIR%%/index_module_types.html
+%%PORTDOCS%%%%DOCSDIR%%/index_modules.html
+%%PORTDOCS%%%%DOCSDIR%%/index_types.html
+%%PORTDOCS%%%%DOCSDIR%%/index_values.html
+%%PORTDOCS%%%%DOCSDIR%%/style.css
+%%PORTDOCS%%%%DOCSDIR%%/type_ArrayExtras.html
+%%PORTDOCS%%%%DOCSDIR%%/type_CharExtras.html
+%%PORTDOCS%%%%DOCSDIR%%/type_Find.html
+%%PORTDOCS%%%%DOCSDIR%%/type_Glob.html
+%%PORTDOCS%%%%DOCSDIR%%/type_IOExtras.html
+%%PORTDOCS%%%%DOCSDIR%%/type_ListExtras.ComparableType.html
+%%PORTDOCS%%%%DOCSDIR%%/type_ListExtras.Make.html
+%%PORTDOCS%%%%DOCSDIR%%/type_ListExtras.S.html
+%%PORTDOCS%%%%DOCSDIR%%/type_ListExtras.html
+%%PORTDOCS%%%%DOCSDIR%%/type_Locale.html
+%%PORTDOCS%%%%DOCSDIR%%/type_Option.html
+%%PORTDOCS%%%%DOCSDIR%%/type_StrExtras.CaseInsensitive.html
+%%PORTDOCS%%%%DOCSDIR%%/type_StrExtras.Collate.html
+%%PORTDOCS%%%%DOCSDIR%%/type_StrExtras.FastSearch.html
+%%PORTDOCS%%%%DOCSDIR%%/type_StrExtras.html
+%%PORTDOCS%%%%DOCSDIR%%/type_Syslog.html
+%%PORTDOCS%%%%DOCSDIR%%/type_Time.html
+%%PORTDOCS%%%%DOCSDIR%%/type_UnixExtras.html
+%%PORTDOCS%%%%DOCSDIR%%/type_Variant.html
+@dirrmtry %%OCAML_SITELIBDIR%%/annexlib
+%%PORTDOCS%%@dirrm %%DOCSDIR%%