From a32c2dce7c875b9dbf650b0b871ec226693e7470 Mon Sep 17 00:00:00 2001 From: Hiroki Sato Date: Sun, 2 Sep 2007 13:14:52 +0000 Subject: [PATCH] - EMACS_PORT_NAME cleanups: editors/nxml-emacs21 is now a slave port of editors/nxml. - Some style fixes in editors/nxml. PR: ports/115154 --- editors/Makefile | 1 + editors/nxml-emacs21/Makefile | 49 +------ editors/nxml-emacs21/distinfo | 3 - editors/nxml-emacs21/pkg-descr | 9 -- editors/nxml-emacs21/pkg-message | 15 --- editors/nxml-emacs21/pkg-plist | 212 ------------------------------- editors/nxml/Makefile | 44 +++---- editors/nxml/pkg-plist | 10 -- 8 files changed, 24 insertions(+), 319 deletions(-) delete mode 100644 editors/nxml-emacs21/distinfo delete mode 100644 editors/nxml-emacs21/pkg-descr delete mode 100644 editors/nxml-emacs21/pkg-message delete mode 100644 editors/nxml-emacs21/pkg-plist diff --git a/editors/Makefile b/editors/Makefile index b5a78f5accc0..86547b7bfae4 100644 --- a/editors/Makefile +++ b/editors/Makefile @@ -112,6 +112,7 @@ SUBDIR += nvi-devel SUBDIR += nvi-m17n SUBDIR += nvi-perl + SUBDIR += nxml SUBDIR += nxml-emacs21 SUBDIR += ooo-build SUBDIR += openoffice.org-1.0 diff --git a/editors/nxml-emacs21/Makefile b/editors/nxml-emacs21/Makefile index 76b3be79aeb5..b2ff3343c60f 100644 --- a/editors/nxml-emacs21/Makefile +++ b/editors/nxml-emacs21/Makefile @@ -5,50 +5,9 @@ # $FreeBSD$ # -PORTNAME= nxml-mode -PORTVERSION= ${NXML_VER} -PORTREVISION= 1 -CATEGORIES= editors elisp -MASTER_SITES= http://www.thaiopensource.com/download/ +MAINTAINER= hrs@FreeBSD.org +MASTERDIR= ${.CURDIR}/../nxml -MAINTAINER= hrs@FreeBSD.org -COMMENT= A major mode for editing XML documents for emacs21 +EMACS_PORT_NAME= emacs21 -# distfile version -NXML_VER= 20041004 -NXML_STARTUPEL= nxml-startup.el -USE_EMACS= yes -EMACS_PORT_NAME?=emacs21 - -INFO= nxml-mode -DOCUMENTS= README NEWS VERSION TODO COPYING \ - nxml-mode.xml nxml-mode.rnc test.invalid.xml test.valid.xml -NXML_LISPDIR= ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/nxml - -post-build: - cd ${WRKSRC}; \ - ${MAKE} nxml-mode.info - -pre-su-install: - @${MKDIR} ${NXML_LISPDIR} - -do-install: - cd ${INSTALL_WRKSRC}; \ - ${INSTALL_DATA} *.el ${NXML_LISPDIR}; \ - ${INSTALL_DATA} *.elc ${NXML_LISPDIR} -.for DIR in char-name schema - cd ${INSTALL_WRKSRC}; \ - ${FIND} ${DIR} -type d -exec ${MKDIR} ${NXML_LISPDIR}/\{} \; ;\ - ${FIND} ${DIR} -type f -exec ${INSTALL_DATA} \{} ${NXML_LISPDIR}/\{} \; -.endfor - -post-install: - ${INSTALL_DATA} ${INSTALL_WRKSRC}/nxml-mode.info ${PREFIX}/info -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} -.for F in ${DOCUMENTS} - ${INSTALL_DATA} ${INSTALL_WRKSRC}/${F} ${DOCSDIR} -.endfor -.endif - -.include +.include "${MASTERDIR}/Makefile" diff --git a/editors/nxml-emacs21/distinfo b/editors/nxml-emacs21/distinfo deleted file mode 100644 index 14d0b296a284..000000000000 --- a/editors/nxml-emacs21/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -MD5 (nxml-mode-20041004.tar.gz) = ac137024cf337d6f11d8ab278d39b4db -SHA256 (nxml-mode-20041004.tar.gz) = 8cf71922962b134e08c4ad9048cd66e85c8297372f14dd1f1ada2d26c69c62ae -SIZE (nxml-mode-20041004.tar.gz) = 443020 diff --git a/editors/nxml-emacs21/pkg-descr b/editors/nxml-emacs21/pkg-descr deleted file mode 100644 index 2ad8f9bccf0a..000000000000 --- a/editors/nxml-emacs21/pkg-descr +++ /dev/null @@ -1,9 +0,0 @@ -This is a new major mode for GNU Emacs for editing XML documents. It -supports editing well-formed XML documents and also provides -schema-sensitive editing of XML documents using RELAX NG Compact -Syntax. - -To use this, you need GNU Emacs version 21.x, preferably 21.3. GNU -Emacs version 20 will not work properly, nor will XEmacs. - --- port by Fritz Heinrichmeyer diff --git a/editors/nxml-emacs21/pkg-message b/editors/nxml-emacs21/pkg-message deleted file mode 100644 index 3f80768be47f..000000000000 --- a/editors/nxml-emacs21/pkg-message +++ /dev/null @@ -1,15 +0,0 @@ - -To get started, do - - M-x load-file rng-auto.el - -This defines the necessary autoloads. Now, visit a file containing -an XML document, and do - - M-x nxml-mode - -Now do - - C-h m - -for information on how to use nxml-mode. diff --git a/editors/nxml-emacs21/pkg-plist b/editors/nxml-emacs21/pkg-plist deleted file mode 100644 index c2ab890d68fe..000000000000 --- a/editors/nxml-emacs21/pkg-plist +++ /dev/null @@ -1,212 +0,0 @@ -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/nxml-enc.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/nxml-enc.elc -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/nxml-glyph.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/nxml-glyph.elc -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/nxml-maint.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/nxml-maint.elc -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/nxml-mode.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/nxml-mode.elc -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/nxml-ns.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/nxml-ns.elc -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/nxml-outln.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/nxml-outln.elc -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/nxml-parse.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/nxml-parse.elc -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/nxml-rap.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/nxml-rap.elc -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/nxml-uchnm.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/nxml-uchnm.elc -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/nxml-util.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/nxml-util.elc -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/rng-auto.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/rng-cmpct.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/rng-cmpct.elc -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/rng-dt.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/rng-dt.elc -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/rng-loc.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/rng-loc.elc -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/rng-maint.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/rng-maint.elc -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/rng-match.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/rng-match.elc -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/rng-nxml.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/rng-nxml.elc -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/rng-parse.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/rng-parse.elc -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/rng-pttrn.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/rng-pttrn.elc -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/rng-uri.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/rng-uri.elc -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/rng-util.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/rng-util.elc -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/rng-valid.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/rng-valid.elc -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/rng-xsd.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/rng-xsd.elc -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/xmltok.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/xmltok.elc -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/xsd-regexp.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/xsd-regexp.elc -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/00000-0007F.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/00080-000FF.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/00100-0017F.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/00180-0024F.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/00250-002AF.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/002B0-002FF.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/00300-0036F.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/00370-003FF.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/00400-004FF.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/00500-0052F.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/00530-0058F.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/00590-005FF.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/00600-006FF.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/00700-0074F.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/00780-007BF.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/00900-0097F.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/00980-009FF.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/00A00-00A7F.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/00A80-00AFF.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/00B00-00B7F.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/00B80-00BFF.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/00C00-00C7F.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/00C80-00CFF.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/00D00-00D7F.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/00D80-00DFF.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/00E00-00E7F.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/00E80-00EFF.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/00F00-00FFF.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/01000-0109F.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/010A0-010FF.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/01100-011FF.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/01200-0137F.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/013A0-013FF.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/01400-0167F.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/01680-0169F.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/016A0-016FF.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/01700-0171F.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/01720-0173F.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/01740-0175F.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/01760-0177F.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/01780-017FF.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/01800-018AF.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/01E00-01EFF.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/01F00-01FFF.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/02000-0206F.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/02070-0209F.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/020A0-020CF.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/020D0-020FF.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/02100-0214F.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/02150-0218F.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/02190-021FF.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/02200-022FF.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/02300-023FF.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/02400-0243F.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/02440-0245F.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/02460-024FF.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/02500-0257F.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/02580-0259F.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/025A0-025FF.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/02600-026FF.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/02700-027BF.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/027C0-027EF.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/027F0-027FF.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/02800-028FF.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/02900-0297F.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/02980-029FF.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/02A00-02AFF.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/02E80-02EFF.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/02F00-02FDF.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/02FF0-02FFF.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/03000-0303F.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/03040-0309F.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/030A0-030FF.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/03100-0312F.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/03130-0318F.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/03190-0319F.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/031A0-031BF.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/031F0-031FF.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/03200-032FF.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/03300-033FF.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/03400-04DBF.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/0A000-0A48F.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/0A490-0A4CF.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/0FB00-0FB4F.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/0FB50-0FDFF.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/0FE00-0FE0F.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/0FE20-0FE2F.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/0FE30-0FE4F.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/0FE50-0FE6F.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/0FE70-0FEFF.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/0FF00-0FFEF.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/0FFF0-0FFFF.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/10300-1032F.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/10330-1034F.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/10400-1044F.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/1D000-1D0FF.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/1D100-1D1FF.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/1D400-1D7FF.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode/E0000-E007F.el -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/schema/calstbl.rnc -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/schema/dbcalstbl.rnc -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/schema/dbdyntbl.rnc -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/schema/dbhier.rnc -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/schema/dbnotn.rnc -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/schema/dbpool.rnc -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/schema/dbsoextbl.rnc -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/schema/dbstart.rnc -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/schema/docbook-dyntbl.rnc -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/schema/docbook.rnc -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/schema/docbook-soextbl.rnc -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/schema/locate.rnc -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/schema/rdfxml.rnc -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/schema/relaxng.rnc -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/schema/schemas.xml -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/schema/soextbl.rnc -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/schema/xhtml-applet.rnc -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/schema/xhtml-attribs.rnc -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/schema/xhtml-base.rnc -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/schema/xhtml-basic-form.rnc -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/schema/xhtml-basic-table.rnc -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/schema/xhtml-bdo.rnc -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/schema/xhtml-csismap.rnc -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/schema/xhtml-datatypes.rnc -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/schema/xhtml-edit.rnc -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/schema/xhtml-events.rnc -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/schema/xhtml-form.rnc -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/schema/xhtml-frames.rnc -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/schema/xhtml-hypertext.rnc -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/schema/xhtml-iframe.rnc -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/schema/xhtml-image.rnc -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/schema/xhtml-inlstyle.rnc -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/schema/xhtml-legacy.rnc -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/schema/xhtml-link.rnc -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/schema/xhtml-list.rnc -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/schema/xhtml-meta.rnc -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/schema/xhtml-nameident.rnc -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/schema/xhtml-object.rnc -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/schema/xhtml-param.rnc -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/schema/xhtml-pres.rnc -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/schema/xhtml.rnc -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/schema/xhtml-ruby.rnc -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/schema/xhtml-script.rnc -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/schema/xhtml-ssismap.rnc -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/schema/xhtml-struct.rnc -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/schema/xhtml-style.rnc -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/schema/xhtml-table.rnc -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/schema/xhtml-target.rnc -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/schema/xhtml-text.rnc -%%EMACS_VERSION_SITE_LISPDIR%%/nxml/schema/xslt.rnc -@dirrm %%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name/unicode -@dirrm %%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name -@dirrm %%EMACS_VERSION_SITE_LISPDIR%%/nxml/schema -@dirrm %%EMACS_VERSION_SITE_LISPDIR%%/nxml -%%PORTDOCS%%%%DOCSDIR%%/COPYING -%%PORTDOCS%%%%DOCSDIR%%/NEWS -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/TODO -%%PORTDOCS%%%%DOCSDIR%%/VERSION -%%PORTDOCS%%%%DOCSDIR%%/nxml-mode.xml -%%PORTDOCS%%%%DOCSDIR%%/nxml-mode.rnc -%%PORTDOCS%%%%DOCSDIR%%/test.invalid.xml -%%PORTDOCS%%%%DOCSDIR%%/test.valid.xml -%%PORTDOCS%%@dirrm %%DOCSDIR%% diff --git a/editors/nxml/Makefile b/editors/nxml/Makefile index 76b3be79aeb5..7b81e271db9b 100644 --- a/editors/nxml/Makefile +++ b/editors/nxml/Makefile @@ -10,45 +10,39 @@ PORTVERSION= ${NXML_VER} PORTREVISION= 1 CATEGORIES= editors elisp MASTER_SITES= http://www.thaiopensource.com/download/ +PKGNAMESUFFIX= -${EMACS_PORT_NAME} MAINTAINER= hrs@FreeBSD.org -COMMENT= A major mode for editing XML documents for emacs21 +COMMENT= A major mode for editing XML documents for ${EMACS_PORT_NAME} -# distfile version -NXML_VER= 20041004 -NXML_STARTUPEL= nxml-startup.el USE_EMACS= yes -EMACS_PORT_NAME?=emacs21 INFO= nxml-mode -DOCUMENTS= README NEWS VERSION TODO COPYING \ +PORTDOCS= README NEWS VERSION TODO COPYING \ nxml-mode.xml nxml-mode.rnc test.invalid.xml test.valid.xml + +NXML_VER= 20041004 +NXML_STARTUPEL= nxml-startup.el NXML_LISPDIR= ${PREFIX}/${EMACS_VERSION_SITE_LISPDIR}/nxml - -post-build: - cd ${WRKSRC}; \ - ${MAKE} nxml-mode.info - -pre-su-install: - @${MKDIR} ${NXML_LISPDIR} +NXML_INSTDIRS= . char-name char-name/unicode schema +NXML_INCLEXP= \.el$$\|\.elc$$\|\.rnc$$\|\.xml$$ +NXML_EXCLEXP= nxml-mode.xml\|nxml-mode.rnc\|test.invalid.xml\|test.valid.xml do-install: - cd ${INSTALL_WRKSRC}; \ - ${INSTALL_DATA} *.el ${NXML_LISPDIR}; \ - ${INSTALL_DATA} *.elc ${NXML_LISPDIR} -.for DIR in char-name schema - cd ${INSTALL_WRKSRC}; \ - ${FIND} ${DIR} -type d -exec ${MKDIR} ${NXML_LISPDIR}/\{} \; ;\ - ${FIND} ${DIR} -type f -exec ${INSTALL_DATA} \{} ${NXML_LISPDIR}/\{} \; + @${MKDIR} ${NXML_INSTDIRS:S,^,${NXML_LISPDIR}/,} +.for D in ${NXML_INSTDIRS} + @cd ${INSTALL_WRKSRC}/${D} && \ + ${LS} \ + | ${GREP} '${NXML_INCLEXP}' | ${GREP} -v '${NXML_EXCLEXP}' \ + | ${XARGS} -J % ${INSTALL_DATA} % ${NXML_LISPDIR}/${D} .endfor post-install: - ${INSTALL_DATA} ${INSTALL_WRKSRC}/nxml-mode.info ${PREFIX}/info + @${INSTALL_DATA} ${INSTALL_WRKSRC}/nxml-mode.info ${PREFIX}/info .if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} -.for F in ${DOCUMENTS} - ${INSTALL_DATA} ${INSTALL_WRKSRC}/${F} ${DOCSDIR} -.endfor + @${MKDIR} ${DOCSDIR} + @cd ${INSTALL_WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} .endif + @${CAT} ${PKGMESSAGE} .include diff --git a/editors/nxml/pkg-plist b/editors/nxml/pkg-plist index c2ab890d68fe..c409210f6351 100644 --- a/editors/nxml/pkg-plist +++ b/editors/nxml/pkg-plist @@ -200,13 +200,3 @@ @dirrm %%EMACS_VERSION_SITE_LISPDIR%%/nxml/char-name @dirrm %%EMACS_VERSION_SITE_LISPDIR%%/nxml/schema @dirrm %%EMACS_VERSION_SITE_LISPDIR%%/nxml -%%PORTDOCS%%%%DOCSDIR%%/COPYING -%%PORTDOCS%%%%DOCSDIR%%/NEWS -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/TODO -%%PORTDOCS%%%%DOCSDIR%%/VERSION -%%PORTDOCS%%%%DOCSDIR%%/nxml-mode.xml -%%PORTDOCS%%%%DOCSDIR%%/nxml-mode.rnc -%%PORTDOCS%%%%DOCSDIR%%/test.invalid.xml -%%PORTDOCS%%%%DOCSDIR%%/test.valid.xml -%%PORTDOCS%%@dirrm %%DOCSDIR%%