2 files changed, 21 insertions, 37 deletions

diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile
index b46c735d88af..9932bb29558f 100644
--- a/editors/xemacs/Makefile
+++ b/editors/xemacs/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xemacs
 PORTVERSION=	${XEMACS_VER}
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES+=	editors
 MASTER_SITES=	${MASTER_SITE_XEMACS}
 MASTER_SITE_SUBDIR=	xemacs-${XEMACS_REL}
@@ -42,6 +42,21 @@ CONFIGURE_ARGS?=--with-clash-detection \
 MAKE_ARGS=	prefix=${PREFIX}
 MAN1=		ctags.1 etags.1 gnuattach.1 gnuclient.1 gnudoit.1 \
 		gnuserv.1 xemacs.1
+INFO=		xemacs-${XEMACS_VER}/cl \
+		xemacs-${XEMACS_VER}/custom \
+		xemacs-${XEMACS_VER}/emodules \
+		xemacs-${XEMACS_VER}/external-widget \
+		xemacs-${XEMACS_VER}/info \
+		xemacs-${XEMACS_VER}/internals \
+		xemacs-${XEMACS_VER}/lispref \
+		xemacs-${XEMACS_VER}/new-users-guide \
+		xemacs-${XEMACS_VER}/standards \
+		xemacs-${XEMACS_VER}/term \
+		xemacs-${XEMACS_VER}/termcap \
+		xemacs-${XEMACS_VER}/texinfo \
+		xemacs-${XEMACS_VER}/widget \
+		xemacs-${XEMACS_VER}/xemacs-faq \
+		xemacs-${XEMACS_VER}/xemacs
 ALL_TARGET=	all dist
 
 PLIST_SUB=	XEMACS_VER=${XEMACS_VER} XEMACS_ARCH=${XEMACS_ARCH} \
@@ -125,6 +140,10 @@ pre-patch:
 	@${ECHO_MSG} "want to use X11."
 .endif
 
+post-patch::
+	@${REINPLACE_CMD} -e 's,@mandir@,@mandir@/man1,' \
+		${WRKSRC}/Makefile.in.in
+
 # Drop faces (libcompface) and offix (libDnd) if building package,
 # autodetect otherwise
 .if defined(PACKAGE_BUILDING)
diff --git a/editors/xemacs/pkg-plist b/editors/xemacs/pkg-plist
index 0e98cf29579d..8cdc2900abb2 100644
--- a/editors/xemacs/pkg-plist
+++ b/editors/xemacs/pkg-plist
@@ -10,6 +10,7 @@ bin/rcs-checkin
 bin/xemacs
 bin/xemacs-%%XEMACS_VER%%
 %%PDUMP%%bin/xemacs-%%XEMACS_VER%%.dmp
+info/xemacs-%%XEMACS_VER%%/dir
 @exec mkdir -p %D/lib/xemacs/site-lisp ; chmod 755 %D/lib/xemacs/site-lisp
 lib/xemacs-%%XEMACS_VER%%/etc/BETA
 lib/xemacs-%%XEMACS_VER%%/etc/CHARSETS
@@ -756,41 +757,6 @@ lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/sorted-doc
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/vcdiff
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/wakeup
 lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/yow
-lib/xemacs-%%XEMACS_VER%%/info/cl.info
-lib/xemacs-%%XEMACS_VER%%/info/custom.info
-lib/xemacs-%%XEMACS_VER%%/info/dir
-lib/xemacs-%%XEMACS_VER%%/info/emodules.info
-lib/xemacs-%%XEMACS_VER%%/info/external-widget.info
-lib/xemacs-%%XEMACS_VER%%/info/info.info
-lib/xemacs-%%XEMACS_VER%%/info/internals.info
-lib/xemacs-%%XEMACS_VER%%/info/internals.info-1
-lib/xemacs-%%XEMACS_VER%%/info/internals.info-2
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-1
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-2
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-3
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-4
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-5
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-6
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-7
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-8
-lib/xemacs-%%XEMACS_VER%%/info/lispref.info-9
-lib/xemacs-%%XEMACS_VER%%/info/new-users-guide.info
-lib/xemacs-%%XEMACS_VER%%/info/standards.info
-lib/xemacs-%%XEMACS_VER%%/info/term.info
-lib/xemacs-%%XEMACS_VER%%/info/termcap.info
-lib/xemacs-%%XEMACS_VER%%/info/texinfo.info
-lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-1
-lib/xemacs-%%XEMACS_VER%%/info/texinfo.info-2
-lib/xemacs-%%XEMACS_VER%%/info/widget.info
-lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info
-lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info-1
-lib/xemacs-%%XEMACS_VER%%/info/xemacs-faq.info-2
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-1
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-2
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-3
-lib/xemacs-%%XEMACS_VER%%/info/xemacs.info-4
 lib/xemacs-%%XEMACS_VER%%/lisp/ChangeLog
 lib/xemacs-%%XEMACS_VER%%/lisp/ChangeLog.1
 lib/xemacs-%%XEMACS_VER%%/lisp/ChangeLog.GTK
@@ -1244,7 +1210,6 @@ lib/xemacs-%%XEMACS_VER%%/lisp/x-win-xfree86.elc
 @dirrm lib/xemacs-%%XEMACS_VER%%/lisp/term
 @dirrm lib/xemacs-%%XEMACS_VER%%/lisp/mule
 @dirrm lib/xemacs-%%XEMACS_VER%%/lisp
-@dirrm lib/xemacs-%%XEMACS_VER%%/info
 @dirrm lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/m
 @dirrm lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include/s
 @dirrm lib/xemacs-%%XEMACS_VER%%/%%XEMACS_ARCH%%/include