aboutsummaryrefslogtreecommitdiffstats
path: root/editors
diff options
context:
space:
mode:
authorhrs <hrs@FreeBSD.org>2013-05-02 13:43:40 +0800
committerhrs <hrs@FreeBSD.org>2013-05-02 13:43:40 +0800
commit283b1e7731240502f4bcffd1aaf1176f4308de8d (patch)
treeca03340a1997ed82a8ee6735fcef5e8f020543d3 /editors
parenta6377295cb203c853dda7d278805699497a84257 (diff)
downloadfreebsd-ports-gnome-283b1e7731240502f4bcffd1aaf1176f4308de8d.tar.gz
freebsd-ports-gnome-283b1e7731240502f4bcffd1aaf1176f4308de8d.tar.zst
freebsd-ports-gnome-283b1e7731240502f4bcffd1aaf1176f4308de8d.zip
- Remove obsolete editors/nxml-emacs21.
- Trim old-style header. - Use OPTIONS_DEFINE. PR: ports/177287
Diffstat (limited to 'editors')
-rw-r--r--editors/Makefile1
-rw-r--r--editors/nxml-emacs21/Makefile13
-rw-r--r--editors/nxml/Makefile14
-rw-r--r--editors/nxml/pkg-plist1
4 files changed, 8 insertions, 21 deletions
diff --git a/editors/Makefile b/editors/Makefile
index 4ebd0db52762..71596e166ac3 100644
--- a/editors/Makefile
+++ b/editors/Makefile
@@ -232,7 +232,6 @@
SUBDIR += nvi-devel
SUBDIR += nvi-m17n
SUBDIR += nxml
- SUBDIR += nxml-emacs21
SUBDIR += omegaT
SUBDIR += openoffice-3
SUBDIR += openoffice-devel
diff --git a/editors/nxml-emacs21/Makefile b/editors/nxml-emacs21/Makefile
deleted file mode 100644
index b2ff3343c60f..000000000000
--- a/editors/nxml-emacs21/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-# New ports collection makefile for: nxml for emacs
-# Date created: 26 Oct 2003
-# Whom: Fritz Heinrichmeyer
-#
-# $FreeBSD$
-#
-
-MAINTAINER= hrs@FreeBSD.org
-MASTERDIR= ${.CURDIR}/../nxml
-
-EMACS_PORT_NAME= emacs21
-
-.include "${MASTERDIR}/Makefile"
diff --git a/editors/nxml/Makefile b/editors/nxml/Makefile
index 4c6f800d364a..2a2d09d9f13f 100644
--- a/editors/nxml/Makefile
+++ b/editors/nxml/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: nxml for emacs
-# Date created: 26 Oct 2003
-# Whom: Fritz Heinrichmeyer
-#
+# Created by: Fritz Heinrichmeyer
# $FreeBSD$
-#
PORTNAME= nxml-mode
PORTVERSION= ${NXML_VER}
@@ -28,6 +24,10 @@ 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
+OPTIONS_DEFINE= DOCS
+
+.include <bsd.port.options.mk>
+
do-install:
@${MKDIR} ${NXML_INSTDIRS:S,^,${NXML_LISPDIR}/,}
.for D in ${NXML_INSTDIRS}
@@ -39,7 +39,7 @@ do-install:
post-install:
@${INSTALL_DATA} ${INSTALL_WRKSRC}/nxml-mode.info ${PREFIX}/info
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${DOCSDIR}
@cd ${INSTALL_WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
.endif
@@ -48,7 +48,7 @@ post-install:
.include <bsd.port.pre.mk>
.if ${EMACS_PORT_NAME} == "emacs23" || ${EMACS_PORT_NAME} == "emacs24"
-IGNORE= incorporated into ${EMACS_PORT_NAME}
+IGNORE= incorporated into ${EMACS_PORT_NAME}
.endif
.include <bsd.port.post.mk>
diff --git a/editors/nxml/pkg-plist b/editors/nxml/pkg-plist
index c409210f6351..a19723a0fcb0 100644
--- a/editors/nxml/pkg-plist
+++ b/editors/nxml/pkg-plist
@@ -1,3 +1,4 @@
+@comment $FreeBSD$
%%EMACS_VERSION_SITE_LISPDIR%%/nxml/nxml-enc.el
%%EMACS_VERSION_SITE_LISPDIR%%/nxml/nxml-enc.elc
%%EMACS_VERSION_SITE_LISPDIR%%/nxml/nxml-glyph.el