diff options
| author | Jimmy Olgeni <olgeni@FreeBSD.org> | 2003-06-04 19:42:09 +0000 |
|---|---|---|
| committer | Jimmy Olgeni <olgeni@FreeBSD.org> | 2003-06-04 19:42:09 +0000 |
| commit | 8c1da5914d325e4c03ed8c8c50c8c864459b7235 (patch) | |
| tree | 31fbcea3926902abfcef851bd7b1cc7824ca9638 /textproc | |
| parent | ea541d44758e101711bd55bc825d741ab2237f42 (diff) | |
Revert the inc/ -> include/ rename, which broke erlang_xmlrpc.
Noticed by: kris
Notes
Notes:
svn path=/head/; revision=82292
Diffstat (limited to 'textproc')
| -rw-r--r-- | textproc/xmerl/Makefile | 10 | ||||
| -rw-r--r-- | textproc/xmerl/files/patch-src_Makefile | 14 | ||||
| -rw-r--r-- | textproc/xmerl/pkg-plist | 6 |
3 files changed, 5 insertions, 25 deletions
diff --git a/textproc/xmerl/Makefile b/textproc/xmerl/Makefile index d0fb1a309c13..401274725950 100644 --- a/textproc/xmerl/Makefile +++ b/textproc/xmerl/Makefile @@ -7,7 +7,7 @@ PORTNAME= xmerl PORTVERSION= 0.18 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= sowap @@ -22,12 +22,6 @@ USE_GMAKE= yes XMERL_DOCS= README.html changes.txt xpath-grammar.txt xslt-example.dtd xslt-example.xls -post-extract: - @${MV} ${WRKSRC}/inc ${WRKSRC}/include - -post-patch: - @${RM} ${WRKSRC}/src/*.orig - do-install: @${MKDIR} ${DOCSDIR} @for FILE in ${XMERL_DOCS}; do \ @@ -36,7 +30,7 @@ do-install: @${MKDIR} ${PREFIX}/lib/erlang/lib/xmerl - @for FILE in ebin include priv src; do \ + @for FILE in ebin inc priv src; do \ ${MKDIR} ${PREFIX}/lib/erlang/lib/xmerl/$${FILE}; \ ${CP} -r ${WRKSRC}/$${FILE}/* \ ${PREFIX}/lib/erlang/lib/xmerl/$${FILE}; \ diff --git a/textproc/xmerl/files/patch-src_Makefile b/textproc/xmerl/files/patch-src_Makefile deleted file mode 100644 index d58816083c4e..000000000000 --- a/textproc/xmerl/files/patch-src_Makefile +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- src/Makefile.orig Fri May 30 20:54:21 2003 -+++ src/Makefile Fri May 30 20:54:26 2003 -@@ -61,7 +61,7 @@ - # FLAGS - # ---------------------------------------------------- - ERL_FLAGS += -W --ERL_COMPILE_FLAGS += $(DEBUG) -I ../inc -+ERL_COMPILE_FLAGS += $(DEBUG) -I ../include - - - # ---------------------------------------------------- diff --git a/textproc/xmerl/pkg-plist b/textproc/xmerl/pkg-plist index e39533bb2bd6..7c14f9796b14 100644 --- a/textproc/xmerl/pkg-plist +++ b/textproc/xmerl/pkg-plist @@ -14,8 +14,8 @@ 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/include/xmerl.hrl -lib/erlang/lib/xmerl/include/xmerl_xlink.hrl +lib/erlang/lib/xmerl/inc/xmerl.hrl +lib/erlang/lib/xmerl/inc/xmerl_xlink.hrl lib/erlang/lib/xmerl/priv/testdata/a_and_c.xml lib/erlang/lib/xmerl/priv/testdata/all_well.xml lib/erlang/lib/xmerl/priv/testdata/femdygnsprognos.xml @@ -59,6 +59,6 @@ lib/erlang/lib/xmerl/src/xmerl_xpath_scan.erl @dirrm lib/erlang/lib/xmerl/src @dirrm lib/erlang/lib/xmerl/priv/testdata @dirrm lib/erlang/lib/xmerl/priv -@dirrm lib/erlang/lib/xmerl/include +@dirrm lib/erlang/lib/xmerl/inc @dirrm lib/erlang/lib/xmerl/ebin @dirrm lib/erlang/lib/xmerl |