From owner-svn-ports-head@FreeBSD.ORG Mon Jan 27 22:15:28 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D2B8C330; Mon, 27 Jan 2014 22:15:28 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A416C16FE; Mon, 27 Jan 2014 22:15:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0RMFSwO032187; Mon, 27 Jan 2014 22:15:28 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0RMFSXK032185; Mon, 27 Jan 2014 22:15:28 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201401272215.s0RMFSXK032185@svn.freebsd.org> From: Mathieu Arnold Date: Mon, 27 Jan 2014 22:15:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r341464 - head/textproc/gmetadom X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Jan 2014 22:15:28 -0000 Author: mat Date: Mon Jan 27 22:15:27 2014 New Revision: 341464 URL: http://svnweb.freebsd.org/changeset/ports/341464 QAT: https://qat.redports.org/buildarchive/r341464/ Log: Convert to staging. Sponsored by: Absolight Modified: head/textproc/gmetadom/Makefile head/textproc/gmetadom/pkg-plist Modified: head/textproc/gmetadom/Makefile ============================================================================== --- head/textproc/gmetadom/Makefile Mon Jan 27 21:56:04 2014 (r341463) +++ head/textproc/gmetadom/Makefile Mon Jan 27 22:15:27 2014 (r341464) @@ -19,37 +19,15 @@ LDFLAGS+= -L${LOCALBASE}/lib USE_LDCONFIG= yes OPTIONS_DEFINE= OCAML +OPTIONS_SUB= yes OCAML_DESC= OCAML language support -NO_STAGE= yes -.include - -.if ${PORT_OPTIONS:MOCAML} -BUILD_DEPENDS+= ocamlfind:${PORTSDIR}/devel/ocaml-findlib \ - ocamlc:${PORTSDIR}/lang/ocaml -PLIST_SUB+= OCAML="" -.else -CONFIGURE_ARGS+= HAVE_OCAMLDEP=no HAVE_OCAMLFIND=no HAVE_OCAMLOPT=no -PLIST_SUB+= OCAML="@comment " -.endif +OCAML_BUILD_DEPENDS= ocamlfind:${PORTSDIR}/devel/ocaml-findlib \ + ocamlc:${PORTSDIR}/lang/ocaml +OCAML_CONFIGURE_OFF= HAVE_OCAMLDEP=no HAVE_OCAMLFIND=no HAVE_OCAMLOPT=no post-patch: @${REINPLACE_CMD} -e 's/-lstdc++//g' ${WRKSRC}/src/gdome_cpp_smart/Makefile.in -# 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 Modified: head/textproc/gmetadom/pkg-plist ============================================================================== --- head/textproc/gmetadom/pkg-plist Mon Jan 27 21:56:04 2014 (r341463) +++ head/textproc/gmetadom/pkg-plist Mon Jan 27 22:15:27 2014 (r341464) @@ -154,6 +154,8 @@ libdata/pkgconfig/gdome2-cpp-smart.pc @dirrm include/gmetadom/gdome_cpp_smart @dirrm include/gmetadom %%OCAML%%@dirrm lib/ocaml/gdome2 +@comment Shim to clean-up a previous bad install - this can be removed +@comment PORTVERSION > 0.2.6 @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