Date: 11 Jan 2004 03:31:57 -0000 From: Chris Pressey <cpressey@catseye.mine.nu> To: FreeBSD-gnats-submit@FreeBSD.org Cc: olgeni@FreeBSD.org Subject: ports/61190: [PATCH] address various issues in textproc/xmerl port Message-ID: <20040111033157.69076.qmail@catseye.mine.nu> Resent-Message-ID: <200401110330.i0B3UH6q009523@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>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 <bsd.port.mk>
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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040111033157.69076.qmail>