9 files changed, 9 insertions, 87 deletions

diff --git a/editors/Makefile b/editors/Makefile
index 09d78cac72bd..d8fd1f92f87c 100644
--- a/editors/Makefile
+++ b/editors/Makefile
@@ -54,6 +54,7 @@
     SUBDIR += glimmer
     SUBDIR += gmanedit
     SUBDIR += gnotepad+
+    SUBDIR += gnuserv
     SUBDIR += gnuserv-emacs20
     SUBDIR += gxedit
     SUBDIR += hexcurse
diff --git a/editors/gnuserv-emacs20/Makefile b/editors/gnuserv-emacs20/Makefile
index 4d74735d0769..40149b9cedf2 100644
--- a/editors/gnuserv-emacs20/Makefile
+++ b/editors/gnuserv-emacs20/Makefile
@@ -5,44 +5,12 @@
 # $FreeBSD$
 #
 
-PORTNAME=	gnuserv
-PORTVERSION=	3.12.4
-CATEGORIES=	editors
-MASTER_SITES=	http://meltin.net/hacks/emacs/src/
-PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
+# This is a slave port.
+PORTCLASS=	slave
 
-MAINTAINER=	ports@FreeBSD.org
+MASTERDIR=	${.CURDIR}/../../editors/gnuserv
 
-HAS_CONFIGURE=	yes
+# emacs port setup
+EMACS_PORT_NAME=	emacs20
 
-EMACS_PORT_NAME?=emacs20
-
-CONFIGURE_ARGS=	--prefix=${PREFIX}
-
-PORTDOCDIR=	share/doc/gnuserv-${EMACS_PORT_NAME}
-MAN1=		gnuserv.1
-MLINKS=		gnuserv.1 gnuattach.1 \
-		gnuserv.1 gnuclient.1 \
-		gnuserv.1 gnudoit.1
-DOCS=		COPYING ChangeLog INSTALL README README.orig
-SOURCES=	devices.el gnuserv-compat.el gnuserv.el
-ELCS=		${SOURCES:S/.el/.elc/g}
-
-PLIST_SUB=	EMACS_PORT_NAME=${EMACS_PORT_NAME} \
-		EMACS_SITE_LISPDIR=${EMACS_SITE_LISPDIR}
-
-lispdir=	${PREFIX}/${EMACS_SITE_LISPDIR}/gnuserv
-post-install:
-	${MKDIR} ${lispdir};
-.for i in ${SOURCES} ${ELCS}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${lispdir}
-.endfor
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/${PORTDOCDIR}
-.for i in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/${PORTDOCDIR}
-.endfor
-.endif
-	@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.mk>
+.include <${MASTERDIR}/Makefile>
diff --git a/editors/gnuserv-emacs20/distinfo b/editors/gnuserv-emacs20/distinfo
deleted file mode 100644
index d813e9922be1..000000000000
--- a/editors/gnuserv-emacs20/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (gnuserv-3.12.4.tar.gz) = d0e8143cadf4b62edd3dd606c8327b8e
diff --git a/editors/gnuserv-emacs20/files/patch-aa b/editors/gnuserv-emacs20/files/patch-aa
deleted file mode 100644
index b0f8bb0aa727..000000000000
--- a/editors/gnuserv-emacs20/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- gnuserv.c~	Thu Jan 25 13:41:48 2001
-+++ gnuserv.c	Sat Feb 10 18:00:44 2001
-@@ -790,7 +790,7 @@
- 	     + strlen (server.sun_path) + 1);
-   server.sun_len = bindlen;
- #else
--  bindlen = strlen (server.sun_path) + sizeof (server.sun_family);
-+  bindlen = strlen (server.sun_path) + 1 + sizeof (server.sun_family);
- #endif
- 
-   if (bind(ls,(struct sockaddr *)&server,bindlen) < 0)
diff --git a/editors/gnuserv-emacs20/pkg-comment b/editors/gnuserv-emacs20/pkg-comment
deleted file mode 100644
index 089532c88781..000000000000
--- a/editors/gnuserv-emacs20/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A standalone release of gnuserv for GNU Emacs
diff --git a/editors/gnuserv-emacs20/pkg-descr b/editors/gnuserv-emacs20/pkg-descr
deleted file mode 100644
index db64c04118d3..000000000000
--- a/editors/gnuserv-emacs20/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-gnuserv allows you to attach to an already running Emacs.  This allows
-external programs to make use of Emacs' editing capabilities.  It is
-like GNU Emacs' emacsserver/server.el, but has many more features.
-
-WWW: http://meltin.net/hacks/emacs/
-
--- ported by Ilya Martynov <ilya@martynov.org>
diff --git a/editors/gnuserv-emacs20/pkg-message b/editors/gnuserv-emacs20/pkg-message
deleted file mode 100644
index 2553879a1178..000000000000
--- a/editors/gnuserv-emacs20/pkg-message
+++ /dev/null
@@ -1,10 +0,0 @@
-*****************************************************************************
-
-Add following code into your .emacs to enable autoloading of gnuserv lisp
-files:
-
-    (autoload 'gnuserv-start "gnuserv-compat"
-              "Allow this Emacs process to be a server for client processes."
-	      t)
-
-*****************************************************************************
diff --git a/editors/gnuserv-emacs20/pkg-plist b/editors/gnuserv-emacs20/pkg-plist
deleted file mode 100644
index 303adc252c42..000000000000
--- a/editors/gnuserv-emacs20/pkg-plist
+++ /dev/null
@@ -1,17 +0,0 @@
-%%EMACS_SITE_LISPDIR%%/gnuserv/devices.el
-%%EMACS_SITE_LISPDIR%%/gnuserv/devices.elc
-%%EMACS_SITE_LISPDIR%%/gnuserv/gnuserv-compat.el
-%%EMACS_SITE_LISPDIR%%/gnuserv/gnuserv-compat.elc
-%%EMACS_SITE_LISPDIR%%/gnuserv/gnuserv.el
-%%EMACS_SITE_LISPDIR%%/gnuserv/gnuserv.elc
-bin/gnuattach
-bin/gnuclient
-bin/gnudoit
-bin/gnuserv
-share/doc/gnuserv-%%EMACS_PORT_NAME%%/COPYING
-share/doc/gnuserv-%%EMACS_PORT_NAME%%/ChangeLog
-share/doc/gnuserv-%%EMACS_PORT_NAME%%/INSTALL
-share/doc/gnuserv-%%EMACS_PORT_NAME%%/README
-share/doc/gnuserv-%%EMACS_PORT_NAME%%/README.orig
-@dirrm %%EMACS_SITE_LISPDIR%%/gnuserv
-@dirrm share/doc/gnuserv-%%EMACS_PORT_NAME%%
diff --git a/editors/gnuserv/Makefile b/editors/gnuserv/Makefile
index 4d74735d0769..f0575352d805 100644
--- a/editors/gnuserv/Makefile
+++ b/editors/gnuserv/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for:   gnuserv-emacs20
+# New ports collection makefile for:   gnuserv
 # Date created:        10 February 2001
 # Whom:                ilya
 #
@@ -15,7 +15,7 @@ MAINTAINER=	ports@FreeBSD.org
 
 HAS_CONFIGURE=	yes
 
-EMACS_PORT_NAME?=emacs20
+EMACS_PORT_NAME?=emacs21
 
 CONFIGURE_ARGS=	--prefix=${PREFIX}