Index: head/math/xgobi/Makefile
===================================================================
--- head/math/xgobi/Makefile	(revision 358413)
+++ head/math/xgobi/Makefile	(revision 358414)
@@ -1,66 +1,61 @@
 # Created by: Tony Maher <tonym@biolateral.com.au>
 # $FreeBSD$
 
 PORTNAME=	xgobi
 PORTVERSION=	2002.06.20
 PORTREVISION=	4
 CATEGORIES=	math graphics
 MASTER_SITES=	http://public.research.att.com/~stat/xgobi/
 DISTNAME=	xgobi
 EXTRACT_SUFX=	.sh.gz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Graphical data visualisation tool
 
 NO_CDROM=	Restrictive copyright (do not sell for profit)
 
 PATCH_WRKSRC=	${WRKDIR}/${PORTNAME}/src
 CONFIGURE_WRKSRC=	${PATCH_WRKSRC}
 BUILD_WRKSRC=	${PATCH_WRKSRC}
 CFLAGS+=	-Wno-return-type
 
 USES=		imake
 USE_XORG=	xbitmaps xaw
 
-XFREE86_HTML_MAN=	no
-MANCOMPRESSED=	no
-MAN1=		xgvis.1 xgobi.1
-
 PROGRAMS=	xgvis xgobi
 MANDIR=		${WRKSRC}/manpages
 
 # The distfile is a shar file.  It also does not extract cleanly.
 # 3 files extract to current directory so use post-extract to move
 # them to proper locations.
 
-NO_STAGE=	yes
 do-extract:
 	@${MKDIR} ${WRKDIR}
 	@for file in ${EXTRACT_ONLY}; do \
 	    cd ${WRKDIR} && \
 	        ${GZCAT} ${DISTDIR}/$${file} | ${SH} > /dev/null 2>&1; \
 	done
 	@${MV} ${WRKDIR}/aclocal.m4 ${WRKSRC}
 	@${MV} ${WRKDIR}/make.out ${WRKSRC}
 	@${MV} ${WRKDIR}/xgobi.html ${MANDIR}
 
 do-install:
 .for file in ${PROGRAMS}
-	${INSTALL_PROGRAM} ${WRKSRC}/src/${file} ${PREFIX}/bin
-	${STRIP_CMD} ${PREFIX}/bin/${file}
-	${INSTALL_MAN} ${MANDIR}/${file}.1 ${PREFIX}/man/man1
+	${INSTALL_PROGRAM} -s ${WRKSRC}/src/${file} ${STAGEDIR}${PREFIX}/bin
+#	${STRIP_CMD} ${PREFIX}/bin/${file}
+	${INSTALL_MAN} ${MANDIR}/${file}.1 ${STAGEDIR}${PREFIX}/man/man1
 .endfor
-	${INSTALL_DATA} ${WRKSRC}/XGobi.ex ${PREFIX}/lib/X11/app-defaults
+	${INSTALL_DATA} ${WRKSRC}/XGobi.ex ${STAGEDIR}${PREFIX}/lib/X11/app-defaults
 .if !defined(NOPORTDOCS)
-	 @${MKDIR} ${EXAMPLESDIR}
+	 @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	 @ cd ${WRKSRC}; \
 	   for dir in data_*; do \
-		${MKDIR} ${EXAMPLESDIR}/$${dir}; \
+		${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/$${dir}; \
 		cd ${WRKSRC}/$${dir}; \
 		for file in *; do \
-			${INSTALL_DATA} $${file} ${EXAMPLESDIR}/$${dir}; \
+			${INSTALL_DATA} $${file} ${STAGEDIR}${EXAMPLESDIR}/$${dir}; \
 		done \
 	   done
 .endif
 
 .include <bsd.port.mk>
Index: head/math/xgobi/pkg-plist
===================================================================
--- head/math/xgobi/pkg-plist	(revision 358413)
+++ head/math/xgobi/pkg-plist	(revision 358414)
@@ -1,107 +1,109 @@
 bin/xgobi
 bin/xgvis
 lib/X11/app-defaults/XGobi.ex
+man/man1/xgobi.1.gz
+man/man1/xgvis.1.gz
 %%PORTDOCS%%share/examples/xgobi/data_xgobi/c60
 %%PORTDOCS%%share/examples/xgobi/data_xgobi/c60.linecolors
 %%PORTDOCS%%share/examples/xgobi/data_xgobi/c60.lines
 %%PORTDOCS%%share/examples/xgobi/data_xgobi/cube6
 %%PORTDOCS%%share/examples/xgobi/data_xgobi/cube6.lines
 %%PORTDOCS%%share/examples/xgobi/data_xgobi/death1987
 %%PORTDOCS%%share/examples/xgobi/data_xgobi/death1987.col
 %%PORTDOCS%%share/examples/xgobi/data_xgobi/death1987.lines
 %%PORTDOCS%%share/examples/xgobi/data_xgobi/death1987.resources
 %%PORTDOCS%%share/examples/xgobi/data_xgobi/death1987.row
 %%PORTDOCS%%share/examples/xgobi/data_xgobi/flea.col
 %%PORTDOCS%%share/examples/xgobi/data_xgobi/flea.colors
 %%PORTDOCS%%share/examples/xgobi/data_xgobi/flea.dat
 %%PORTDOCS%%share/examples/xgobi/data_xgobi/flea.doc
 %%PORTDOCS%%share/examples/xgobi/data_xgobi/flea.glyphs
 %%PORTDOCS%%share/examples/xgobi/data_xgobi/flea.row
 %%PORTDOCS%%share/examples/xgobi/data_xgobi/kai.dat
 %%PORTDOCS%%share/examples/xgobi/data_xgobi/kai.doc
 %%PORTDOCS%%share/examples/xgobi/data_xgobi/kai.lines
 %%PORTDOCS%%share/examples/xgobi/data_xgobi/kai.resources
 %%PORTDOCS%%share/examples/xgobi/data_xgobi/kai.row
 %%PORTDOCS%%share/examples/xgobi/data_xgobi/laser
 %%PORTDOCS%%share/examples/xgobi/data_xgobi/laser.col
 %%PORTDOCS%%share/examples/xgobi/data_xgobi/laser.doc
 %%PORTDOCS%%share/examples/xgobi/data_xgobi/laser.resources
 %%PORTDOCS%%share/examples/xgobi/data_xgobi/laser.vgroups
 %%PORTDOCS%%share/examples/xgobi/data_xgobi/olive
 %%PORTDOCS%%share/examples/xgobi/data_xgobi/olive.col
 %%PORTDOCS%%share/examples/xgobi/data_xgobi/olive.colors
 %%PORTDOCS%%share/examples/xgobi/data_xgobi/olive.glyphs
 %%PORTDOCS%%share/examples/xgobi/data_xgobi/olive.resources
 %%PORTDOCS%%share/examples/xgobi/data_xgobi/olive.row
 %%PORTDOCS%%share/examples/xgobi/data_xgobi/places
 %%PORTDOCS%%share/examples/xgobi/data_xgobi/places.col
 %%PORTDOCS%%share/examples/xgobi/data_xgobi/places.doc
 %%PORTDOCS%%share/examples/xgobi/data_xgobi/places.resources
 %%PORTDOCS%%share/examples/xgobi/data_xgobi/places.row
 %%PORTDOCS%%share/examples/xgobi/data_xgobi/prim7
 %%PORTDOCS%%share/examples/xgobi/data_xgobi/prim7.colors
 %%PORTDOCS%%share/examples/xgobi/data_xgobi/prim7.doc
 %%PORTDOCS%%share/examples/xgobi/data_xgobi/prim7.glyphs
 %%PORTDOCS%%share/examples/xgobi/data_xgobi/prim7.lines
 %%PORTDOCS%%share/examples/xgobi/data_xgobi/prim7.res
 %%PORTDOCS%%share/examples/xgobi/data_xgobi/prim7.resources
 %%PORTDOCS%%share/examples/xgobi/data_xgobi/randu
 %%PORTDOCS%%share/examples/xgobi/data_xgobi/randu.doc
 %%PORTDOCS%%share/examples/xgobi/data_xgobi/river
 %%PORTDOCS%%share/examples/xgobi/data_xgobi/river.col
 %%PORTDOCS%%share/examples/xgobi/data_xgobi/river.doc
 %%PORTDOCS%%share/examples/xgobi/data_xgobi/sleep.col
 %%PORTDOCS%%share/examples/xgobi/data_xgobi/sleep.dat
 %%PORTDOCS%%share/examples/xgobi/data_xgobi/sleep.doc
 %%PORTDOCS%%share/examples/xgobi/data_xgobi/sleep.missing
 %%PORTDOCS%%share/examples/xgobi/data_xgobi/sleep.row
 %%PORTDOCS%%share/examples/xgobi/data_xgobi/sleep.table
 %%PORTDOCS%%share/examples/xgobi/data_xgobi/sphere1.dat
 %%PORTDOCS%%share/examples/xgobi/data_xgobi/sphere1.doc
 %%PORTDOCS%%share/examples/xgobi/data_xgobi/sphere1.resources
 %%PORTDOCS%%share/examples/xgobi/data_xgobi/sphere2.dat
 %%PORTDOCS%%share/examples/xgobi/data_xgobi/sphere2.doc
 %%PORTDOCS%%share/examples/xgobi/data_xgobi/sphere2.resources
 %%PORTDOCS%%share/examples/xgobi/data_xgobi/tips.col
 %%PORTDOCS%%share/examples/xgobi/data_xgobi/tips.dat
 %%PORTDOCS%%share/examples/xgobi/data_xgobi/tips.doc
 %%PORTDOCS%%share/examples/xgobi/data_xgvis/basket.edges
 %%PORTDOCS%%share/examples/xgobi/data_xgvis/basket.pos
 %%PORTDOCS%%share/examples/xgobi/data_xgvis/buckyball.dat
 %%PORTDOCS%%share/examples/xgobi/data_xgvis/buckyball.linecolors
 %%PORTDOCS%%share/examples/xgobi/data_xgvis/buckyball.lines
 %%PORTDOCS%%share/examples/xgobi/data_xgvis/buckyball.resources
 %%PORTDOCS%%share/examples/xgobi/data_xgvis/grid5.edges
 %%PORTDOCS%%share/examples/xgobi/data_xgvis/grid5.pos
 %%PORTDOCS%%share/examples/xgobi/data_xgvis/hyper8.edges
 %%PORTDOCS%%share/examples/xgobi/data_xgvis/hyper8.pos
 %%PORTDOCS%%share/examples/xgobi/data_xgvis/morsecodes.R
 %%PORTDOCS%%share/examples/xgobi/data_xgvis/morsecodes.col
 %%PORTDOCS%%share/examples/xgobi/data_xgvis/morsecodes.colors
 %%PORTDOCS%%share/examples/xgobi/data_xgvis/morsecodes.dat
 %%PORTDOCS%%share/examples/xgobi/data_xgvis/morsecodes.dist
 %%PORTDOCS%%share/examples/xgobi/data_xgvis/morsecodes.doc
 %%PORTDOCS%%share/examples/xgobi/data_xgvis/morsecodes.glyphs
 %%PORTDOCS%%share/examples/xgobi/data_xgvis/morsecodes.linecolors
 %%PORTDOCS%%share/examples/xgobi/data_xgvis/morsecodes.lines
 %%PORTDOCS%%share/examples/xgobi/data_xgvis/morsecodes.pos
 %%PORTDOCS%%share/examples/xgobi/data_xgvis/morsecodes.raw
 %%PORTDOCS%%share/examples/xgobi/data_xgvis/morsecodes.row
 %%PORTDOCS%%share/examples/xgobi/data_xgvis/morsecodes.sim
 %%PORTDOCS%%share/examples/xgobi/data_xgvis/perm4.edges
 %%PORTDOCS%%share/examples/xgobi/data_xgvis/perm4.linecolors
 %%PORTDOCS%%share/examples/xgobi/data_xgvis/perm4.pos
 %%PORTDOCS%%share/examples/xgobi/data_xgvis/perm4.row
 %%PORTDOCS%%share/examples/xgobi/data_xgvis/perm5.edges
 %%PORTDOCS%%share/examples/xgobi/data_xgvis/perm5.labels
 %%PORTDOCS%%share/examples/xgobi/data_xgvis/perm5.pos
 %%PORTDOCS%%share/examples/xgobi/data_xgvis/perm6.edges
 %%PORTDOCS%%share/examples/xgobi/data_xgvis/perm6.labels
 %%PORTDOCS%%share/examples/xgobi/data_xgvis/perm6.pos
 %%PORTDOCS%%share/examples/xgobi/data_xgvis/torus1.edges
 %%PORTDOCS%%share/examples/xgobi/data_xgvis/torus1.pos
 %%PORTDOCS%%share/examples/xgobi/data_xgvis/torus2.edges
 %%PORTDOCS%%share/examples/xgobi/data_xgvis/torus2.pos
 %%PORTDOCS%%@dirrm share/examples/xgobi/data_xgvis
 %%PORTDOCS%%@dirrm share/examples/xgobi/data_xgobi
 %%PORTDOCS%%@dirrm share/examples/xgobi