Date: Tue, 1 Aug 2006 01:56:14 +0400 (MSD) From: Stanislav Sedov <ssedov@mbsd.msk.ru> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/101130: [PATCH] x11-toolkits/ocaml-lablgtk2: CFLAGS, perms safety, take maintainership Message-ID: <20060731215614.EC1A012065@fonon.realnet> Resent-Message-ID: <200607312200.k6VM0Umd016664@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 101130 >Category: ports >Synopsis: [PATCH] x11-toolkits/ocaml-lablgtk2: CFLAGS, perms safety, take maintainership >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: Mon Jul 31 22:00:29 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Stanislav Sedov >Release: FreeBSD 7.0-CURRENT i386 >Organization: MBSD labs, Inc. >Environment: System: FreeBSD fonon.realnet 7.0-CURRENT FreeBSD 7.0-CURRENT #7: Sun Jun 18 20:51:36 MSD 2006 >Description: - CFLAGS safety - Fix permissions (change cp->install in Makefile) - Use new OCaml framework - Take maintainership Note: This PR heavily depends on ports/101122 >How-To-Repeat: >Fix: --- ocaml-lablgtk2-2.6.0_2.patch begins here --- diff -ruN --exclude=CVS /usr/ports/x11-toolkits/ocaml-lablgtk2/Makefile /var/tmp/ocaml-lablgtk2/Makefile --- /usr/ports/x11-toolkits/ocaml-lablgtk2/Makefile Sun May 28 19:54:10 2006 +++ /var/tmp/ocaml-lablgtk2/Makefile Tue Aug 1 01:45:14 2006 @@ -6,7 +6,7 @@ PORTNAME= lablgtk2 PORTVERSION= 2.6.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-toolkits MASTER_SITES= ftp://ftp.kurims.kyoto-u.ac.jp/pub/lang/olabl/ \ http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/ \ @@ -15,14 +15,12 @@ PKGNAMEPREFIX= ocaml- DISTNAME= lablgtk-${PORTVERSION} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= ssedov@mbsd.msk.ru COMMENT= An Objective Caml interface to GTK+ 2.x -BUILD_DEPENDS+= ocamlc:${PORTSDIR}/lang/ocaml -RUN_DEPENDS+= ocamlc:${PORTSDIR}/lang/ocaml - USE_GMAKE= yes USE_GNOME= gtk20 +USE_OCAML= yes OPTIONS= GLADE "With glade support" ON \ GNOMECANVAS "With gnomecanvas support" ON \ @@ -40,7 +38,11 @@ CONFIGURE_ARGS= --prefix=${PREFIX} --with-libdir=${PREFIX}/lib/ocaml +MASTERPORT= ${PORTSDIR}/devel/ocaml-camlidl +PATTERN= [[:space:]]*(do|then)?[[:space:]]*)cp([[:space:]] + .include <bsd.port.pre.mk> +.include "${MASTERPORT}/bsd.ocaml.mk" .if (exists(${LOCALBASE}/bin/lablgl) && exists(${X11BASE}/libdata/pkgconfig/gtkgl-2.0.pc)) || defined(WITH_GTKTL) CONFIGURE_ARGS+= --with-gl @@ -115,6 +117,14 @@ PLIST_SUB+= GTKSPELL="@comment " .endif +post-extract: + @${REINPLACE_CMD} -E \ + -e 's,^(CFLAGS[[:space:]]*\+=[[:space:]]*-O),\1 ${CFLAGS},' \ + -e 's,^(${PATTERN}+.*INSTALLDIR),\1\$${BSD_INSTALL_DATA} \3,' \ + -e 's,^(${PATTERN}+.*BINDIR),\1\$${BSD_INSTALL_SCRIPT} \3,' \ + -e 's,^(${PATTERN}+.*LIBDIR),\1\$${BSD_INSTALL_DATA} \3,' \ + ${WRKSRC}/src/Makefile + post-install: .if !defined(NOPORTDOCS) @${MKDIR} ${EXAMPLESDIR} --- ocaml-lablgtk2-2.6.0_2.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060731215614.EC1A012065>