From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Jan 10 19:30:21 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DB29916A4CE for ; Sat, 10 Jan 2004 19:30:20 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id CEE5443D53 for ; Sat, 10 Jan 2004 19:30:17 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i0B3UHFR009524 for ; Sat, 10 Jan 2004 19:30:17 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.10/8.12.10/Submit) id i0B3UH6q009523; Sat, 10 Jan 2004 19:30:17 -0800 (PST) (envelope-from gnats) Resent-Date: Sat, 10 Jan 2004 19:30:17 -0800 (PST) Resent-Message-Id: <200401110330.i0B3UH6q009523@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Chris Pressey Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CC10D16A4D1 for ; Sat, 10 Jan 2004 19:27:50 -0800 (PST) Received: from catseye.mine.nu (d207-81-17-215.bchsia.telus.net [207.81.17.215]) by mx1.FreeBSD.org (Postfix) with SMTP id A46C443D58 for ; Sat, 10 Jan 2004 19:27:47 -0800 (PST) (envelope-from catseye@catseye.mine.nu) Received: (qmail 69077 invoked by uid 1001); 11 Jan 2004 03:31:57 -0000 Message-Id: <20040111033157.69076.qmail@catseye.mine.nu> Date: 11 Jan 2004 03:31:57 -0000 From: Chris Pressey To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: olgeni@FreeBSD.org Subject: ports/61190: [PATCH] address various issues in textproc/xmerl port X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Chris Pressey List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Jan 2004 03:30:21 -0000 >Number: 61190 >Category: ports >Synopsis: [PATCH] address various issues in textproc/xmerl port >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sat Jan 10 19:30:17 PST 2004 >Closed-Date: >Last-Modified: >Originator: Chris Pressey >Release: FreeBSD 4.9-STABLE i386 >Organization: Cat's Eye Technologies >Environment: System: FreeBSD catseye.biscuit.boo 4.9-STABLE FreeBSD 4.9-STABLE #0: Wed Dec 17 15:25:44 PST 2003 root@catseye.biscuit.boo:/usr/obj/usr/src/sys/CATSEYE i386 >Description: Attached patch address various issues with the textproc/xmerl port: - fix RUN_DEPENDS (was 'erlc', should be just 'erl'.) - honour NOPORTDOCS. - xmerl installed as ${PREFIX}/lib/erlang/lib/xmerl-0.19/ with ${PREFIX}/lib/erlang/lib/xmerl created as a symlink to that directory. This conforms to the convention established by other Erlang ports, and also allows other ports to (more easily) depend on a specific version of xmerl. - symbolic link from ${PREFIX}/lib/erlang/lib/xmerl-0.19/doc to ${DOCSDIR}, following informal Erlang subdirectory convention. - minor aesthetic changes to make Makefile maintenance easier. - bump PORTREVISION (although I'm not 100% certain it's necessary to do so in this instance.) >How-To-Repeat: N/A >Fix: --- xmerl.diff begins here --- diff -ru xmerl/Makefile xmerl.new/Makefile --- xmerl/Makefile Sat Nov 8 09:56:15 2003 +++ xmerl.new/Makefile Sat Jan 10 17:20:25 2004 @@ -7,6 +7,7 @@ PORTNAME= xmerl PORTVERSION= 0.19 +PORTREVISION= 1 CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= sowap @@ -16,25 +17,31 @@ COMMENT= A library for XML processing in Erlang BUILD_DEPENDS= erlc:${PORTSDIR}/lang/erlang -RUN_DEPENDS= erlc:${PORTSDIR}/lang/erlang +RUN_DEPENDS= erl:${PORTSDIR}/lang/erlang + +PLIST_SUB= VERSION="${PORTVERSION}" USE_GMAKE= yes +XMERL= ${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION} + do-install: + @${MKDIR} ${PREFIX}/lib/erlang/lib/${PORTNAME}-${PORTVERSION} + +.if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} @${CP} -r ${WRKSRC}/doc/* ${DOCSDIR} @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR} + @${LN} -s ${DOCSDIR} ${XMERL}/doc +.endif - @${MKDIR} ${PREFIX}/lib/erlang/lib/${PORTNAME} - - @for FILE in ebin inc src; do \ - ${MKDIR} ${PREFIX}/lib/erlang/lib/${PORTNAME}/$${FILE}; \ - ${CP} -r ${WRKSRC}/$${FILE}/* \ - ${PREFIX}/lib/erlang/lib/${PORTNAME}/$${FILE}; \ - ${CHMOD} ${SHAREMODE} \ - ${PREFIX}/lib/erlang/lib/${PORTNAME}/$${FILE}/*; \ + @for SUBDIR in ebin inc src; do \ + ${MKDIR} ${XMERL}/$${SUBDIR}; \ + ${CP} -r ${WRKSRC}/$${SUBDIR}/* ${XMERL}/$${SUBDIR}; \ + ${CHMOD} ${SHAREMODE} ${XMERL}/$${SUBDIR}/*; \ done - @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/lib/erlang/lib/${PORTNAME} + @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${XMERL} + @${LN} -sf ${PORTNAME}-${PORTVERSION} ${PREFIX}/lib/erlang/lib/${PORTNAME} .include diff -ru xmerl/pkg-plist xmerl.new/pkg-plist --- xmerl/pkg-plist Sat Nov 8 09:56:15 2003 +++ xmerl.new/pkg-plist Sat Jan 10 17:56:34 2004 @@ -1,67 +1,71 @@ -lib/erlang/lib/xmerl/ebin/xmerl.app -lib/erlang/lib/xmerl/ebin/xmerl.beam -lib/erlang/lib/xmerl/ebin/xmerl_eventp.beam -lib/erlang/lib/xmerl/ebin/xmerl_html.beam -lib/erlang/lib/xmerl/ebin/xmerl_lib.beam -lib/erlang/lib/xmerl/ebin/xmerl_scan.beam -lib/erlang/lib/xmerl/ebin/xmerl_simple.beam -lib/erlang/lib/xmerl/ebin/xmerl_text.beam -lib/erlang/lib/xmerl/ebin/xmerl_validate.beam -lib/erlang/lib/xmerl/ebin/xmerl_xlate.beam -lib/erlang/lib/xmerl/ebin/xmerl_xml.beam -lib/erlang/lib/xmerl/ebin/xmerl_xpath.beam -lib/erlang/lib/xmerl/ebin/xmerl_xpath_parse.beam -lib/erlang/lib/xmerl/ebin/xmerl_xpath_pred.beam -lib/erlang/lib/xmerl/ebin/xmerl_xpath_scan.beam -lib/erlang/lib/xmerl/ebin/xmerl_xs.beam -lib/erlang/lib/xmerl/inc/xmerl.hrl -lib/erlang/lib/xmerl/inc/xmerl_xlink.hrl -lib/erlang/lib/xmerl/src/Makefile -lib/erlang/lib/xmerl/src/xmerl.app.src -lib/erlang/lib/xmerl/src/xmerl.erl -lib/erlang/lib/xmerl/src/xmerl_eventp.erl -lib/erlang/lib/xmerl/src/xmerl_html.erl -lib/erlang/lib/xmerl/src/xmerl_lib.erl -lib/erlang/lib/xmerl/src/xmerl_scan.erl -lib/erlang/lib/xmerl/src/xmerl_simple.erl -lib/erlang/lib/xmerl/src/xmerl_text.erl -lib/erlang/lib/xmerl/src/xmerl_validate.erl -lib/erlang/lib/xmerl/src/xmerl_xlate.erl -lib/erlang/lib/xmerl/src/xmerl_xml.erl -lib/erlang/lib/xmerl/src/xmerl_xpath.erl -lib/erlang/lib/xmerl/src/xmerl_xpath_parse.erl -lib/erlang/lib/xmerl/src/xmerl_xpath_parse.yrl -lib/erlang/lib/xmerl/src/xmerl_xpath_pred.erl -lib/erlang/lib/xmerl/src/xmerl_xpath_scan.erl -lib/erlang/lib/xmerl/src/xmerl_xs.erl -%%DOCSDIR%%/contributors.html -%%DOCSDIR%%/examples/Makefile -%%DOCSDIR%%/examples/mkdocs.erl -%%DOCSDIR%%/examples/sdocbook2xhtml.erl -%%DOCSDIR%%/examples/test_html.erl -%%DOCSDIR%%/examples/xmerl_test.erl -%%DOCSDIR%%/examples/xml/test.xml -%%DOCSDIR%%/examples/xml/test2.xml -%%DOCSDIR%%/examples/xml/test3.xml -%%DOCSDIR%%/examples/xml/test4.xml -%%DOCSDIR%%/examples/xml/test5.xml -%%DOCSDIR%%/examples/xml/testdtd.dtd -%%DOCSDIR%%/examples/xml/xmerl.xml -%%DOCSDIR%%/examples/xml/xmerl_xs.xml -%%DOCSDIR%%/examples/xserl_test.erl -%%DOCSDIR%%/index.html -%%DOCSDIR%%/stylesheet.css -%%DOCSDIR%%/xmerl.html -%%DOCSDIR%%/xmerl_eventp.html -%%DOCSDIR%%/xmerl_examples.html -%%DOCSDIR%%/xmerl_scan.html -%%DOCSDIR%%/xmerl_xpath.html -%%DOCSDIR%%/xmerl_xs.html -%%DOCSDIR%%/xmerl_xs_examples.html -@dirrm lib/erlang/lib/xmerl/src -@dirrm lib/erlang/lib/xmerl/inc -@dirrm lib/erlang/lib/xmerl/ebin -@dirrm lib/erlang/lib/xmerl -@dirrm %%DOCSDIR%%/examples/xml -@dirrm %%DOCSDIR%%/examples -@dirrm %%DOCSDIR%% +lib/erlang/lib/xmerl-%%VERSION%%/ebin/xmerl.app +lib/erlang/lib/xmerl-%%VERSION%%/ebin/xmerl.beam +lib/erlang/lib/xmerl-%%VERSION%%/ebin/xmerl_eventp.beam +lib/erlang/lib/xmerl-%%VERSION%%/ebin/xmerl_html.beam +lib/erlang/lib/xmerl-%%VERSION%%/ebin/xmerl_lib.beam +lib/erlang/lib/xmerl-%%VERSION%%/ebin/xmerl_scan.beam +lib/erlang/lib/xmerl-%%VERSION%%/ebin/xmerl_simple.beam +lib/erlang/lib/xmerl-%%VERSION%%/ebin/xmerl_text.beam +lib/erlang/lib/xmerl-%%VERSION%%/ebin/xmerl_validate.beam +lib/erlang/lib/xmerl-%%VERSION%%/ebin/xmerl_xlate.beam +lib/erlang/lib/xmerl-%%VERSION%%/ebin/xmerl_xml.beam +lib/erlang/lib/xmerl-%%VERSION%%/ebin/xmerl_xpath.beam +lib/erlang/lib/xmerl-%%VERSION%%/ebin/xmerl_xpath_parse.beam +lib/erlang/lib/xmerl-%%VERSION%%/ebin/xmerl_xpath_pred.beam +lib/erlang/lib/xmerl-%%VERSION%%/ebin/xmerl_xpath_scan.beam +lib/erlang/lib/xmerl-%%VERSION%%/ebin/xmerl_xs.beam +lib/erlang/lib/xmerl-%%VERSION%%/inc/xmerl.hrl +lib/erlang/lib/xmerl-%%VERSION%%/inc/xmerl_xlink.hrl +lib/erlang/lib/xmerl-%%VERSION%%/src/Makefile +lib/erlang/lib/xmerl-%%VERSION%%/src/xmerl.app.src +lib/erlang/lib/xmerl-%%VERSION%%/src/xmerl.erl +lib/erlang/lib/xmerl-%%VERSION%%/src/xmerl_eventp.erl +lib/erlang/lib/xmerl-%%VERSION%%/src/xmerl_html.erl +lib/erlang/lib/xmerl-%%VERSION%%/src/xmerl_lib.erl +lib/erlang/lib/xmerl-%%VERSION%%/src/xmerl_scan.erl +lib/erlang/lib/xmerl-%%VERSION%%/src/xmerl_simple.erl +lib/erlang/lib/xmerl-%%VERSION%%/src/xmerl_text.erl +lib/erlang/lib/xmerl-%%VERSION%%/src/xmerl_validate.erl +lib/erlang/lib/xmerl-%%VERSION%%/src/xmerl_xlate.erl +lib/erlang/lib/xmerl-%%VERSION%%/src/xmerl_xml.erl +lib/erlang/lib/xmerl-%%VERSION%%/src/xmerl_xpath.erl +lib/erlang/lib/xmerl-%%VERSION%%/src/xmerl_xpath_parse.erl +lib/erlang/lib/xmerl-%%VERSION%%/src/xmerl_xpath_parse.yrl +lib/erlang/lib/xmerl-%%VERSION%%/src/xmerl_xpath_pred.erl +lib/erlang/lib/xmerl-%%VERSION%%/src/xmerl_xpath_scan.erl +lib/erlang/lib/xmerl-%%VERSION%%/src/xmerl_xs.erl +%%PORTDOCS%%%%DOCSDIR%%/contributors.html +%%PORTDOCS%%%%DOCSDIR%%/examples/Makefile +%%PORTDOCS%%%%DOCSDIR%%/examples/mkdocs.erl +%%PORTDOCS%%%%DOCSDIR%%/examples/sdocbook2xhtml.erl +%%PORTDOCS%%%%DOCSDIR%%/examples/test_html.erl +%%PORTDOCS%%%%DOCSDIR%%/examples/xmerl_test.erl +%%PORTDOCS%%%%DOCSDIR%%/examples/xml/test.xml +%%PORTDOCS%%%%DOCSDIR%%/examples/xml/test2.xml +%%PORTDOCS%%%%DOCSDIR%%/examples/xml/test3.xml +%%PORTDOCS%%%%DOCSDIR%%/examples/xml/test4.xml +%%PORTDOCS%%%%DOCSDIR%%/examples/xml/test5.xml +%%PORTDOCS%%%%DOCSDIR%%/examples/xml/testdtd.dtd +%%PORTDOCS%%%%DOCSDIR%%/examples/xml/xmerl.xml +%%PORTDOCS%%%%DOCSDIR%%/examples/xml/xmerl_xs.xml +%%PORTDOCS%%%%DOCSDIR%%/examples/xserl_test.erl +%%PORTDOCS%%%%DOCSDIR%%/index.html +%%PORTDOCS%%%%DOCSDIR%%/stylesheet.css +%%PORTDOCS%%%%DOCSDIR%%/xmerl.html +%%PORTDOCS%%%%DOCSDIR%%/xmerl_eventp.html +%%PORTDOCS%%%%DOCSDIR%%/xmerl_examples.html +%%PORTDOCS%%%%DOCSDIR%%/xmerl_scan.html +%%PORTDOCS%%%%DOCSDIR%%/xmerl_xpath.html +%%PORTDOCS%%%%DOCSDIR%%/xmerl_xs.html +%%PORTDOCS%%%%DOCSDIR%%/xmerl_xs_examples.html +%%PORTDOCS%%@exec ln -sf %D/%%DOCSDIR%% %D/lib/erlang/lib/xmerl-%%VERSION%%/doc +%%PORTDOCS%%@unexec rm -f %D/lib/erlang/lib/xmerl/doc +%%PORTDOCS%%@dirrm %%DOCSDIR%%/examples/xml +%%PORTDOCS%%@dirrm %%DOCSDIR%%/examples +%%PORTDOCS%%@dirrm %%DOCSDIR%% +@dirrm lib/erlang/lib/xmerl-%%VERSION%%/src +@dirrm lib/erlang/lib/xmerl-%%VERSION%%/inc +@dirrm lib/erlang/lib/xmerl-%%VERSION%%/ebin +@dirrm lib/erlang/lib/xmerl-%%VERSION%% +@exec ln -sf xmerl-%%VERSION%% %D/lib/erlang/lib/xmerl +@unexec rm -f %D/lib/erlang/lib/xmerl --- xmerl.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: