- Add staging support

- Remove leading article from COMMENT
- Convert to USES=tar:bzip2
- Use option helper
- Move things to proper places and simplify where needed
- Install striped binaries

2 files changed, 54 insertions, 49 deletions

diff --git a/graphics/geomview/Makefile b/graphics/geomview/Makefile
index c3eaec98809b..9f4de3f4b356 100644
--- a/graphics/geomview/Makefile
+++ b/graphics/geomview/Makefile
@@ -8,16 +8,9 @@ CATEGORIES=	graphics
 MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	An interactive viewer for 3- and 4-D geometric objects
+COMMENT=	Interactive viewer for 3- and 4-D geometric objects
 
-NOT_FOR_ARCHS=	amd64
-NOT_FOR_ARCHS_REASON=	Segfaults on amd64
-
-OPTIONS_DEFINE=	MOTION_AVG DOCS EXAMPLES
-MOTION_AVG_DESC=	Use experimental motion averaging code
-
-USES=		motif
-USE_BZIP2=	yes
+USES=		motif tar:bzip2
 USE_GL=		glu
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS=	--with-motif=${LOCALBASE} --with-opengl=${LOCALBASE}
@@ -25,63 +18,48 @@ USE_LDCONFIG=	yes
 
 PLIST_SUB=	VERSION="${PORTVERSION}"
 
-MAN1=		animate.1gv anytooff.1gv anytoucd.1gv bdy.1gv bez2mesh.1gv \
-		clip.1gv geomview.1gv hvectext.1gv math2oogl.1gv nose.1gv \
-		offconsol.1gv oogl2rib.1gv oogl2vrml.1gv polymerge.1gv \
-		togeomview.1gv ucdtooff.1gv vrml2oogl.1gv
-MAN3=		anytopl.3gv bdy.3gv fsaparse.3gv geomutil.3gv lisp.3gv \
-		plcombine.3gv plconsol.3gv
-MAN5=		discgrp.5gv geomview.5gv oogl.5gv
 INFO=		geomview
 
 # Set "CPU" type for Geomview make
 # Allow user to specify "make install MAPLE_LIB=foo" as geomview wants
 MAKE_ENV=	CPU=FreeBSD MAPLE_LIB=${MAPLE_LIB}
+INSTALL_TARGET=	install-strip
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MMOTION_AVG}
-CONFIGURE_ARGS+=	--enable-motion-averaging
-.endif
+NOT_FOR_ARCHS=   amd64
+NOT_FOR_ARCHS_REASON=  Segfaults on amd64
+ 
+OPTIONS_DEFINE=  MOTION_AVG DOCS EXAMPLES
+ 
+MOTION_AVG_DESC=    Experimental motion averaging code
+MOTION_AVG_CONFIGURE_ENABLE= motion-averaging
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^SUBDIRS =/s|doc||g' ${WRKSRC}/Makefile.in
-.for i in src/bin/geomutil/math2oogl/Makefile.in \
-	src/bin/geomutil/maple2oogl/Makefile.in
-	@${REINPLACE_CMD} -e \
-		'/^install-data-am:/s|install-docDATA||g' ${WRKSRC}/${i}
-.endfor
+	@${REINPLACE_CMD} '/^install-data-am:/s|install-docDATA||g' \
+		${WRKSRC}/src/bin/geomutil/math2oogl/Makefile.in \
+		${WRKSRC}/src/bin/geomutil/maple2oogl/Makefile.in
 
 post-build:
 	cd ${WRKSRC}/doc && /usr/bin/makeinfo --no-split --no-validate \
 		-o geomview.info geomview.texi
 
 post-install:
-	cd ${WRKSRC}/doc && ${INSTALL_MAN} *.3gv ${MAN3PREFIX}/man/man3
-	cd ${WRKSRC}/doc && ${INSTALL_MAN} *.5gv ${MAN5PREFIX}/man/man5
-	cd ${WRKSRC}/doc && ${INSTALL_DATA} *.info ${PREFIX}/${INFO_PATH}
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-.for i in OOGL.m.txt README README.gvplot geomview.pdf geomview-pt_BR.pdf \
-	oogltour oogltour-pt_BR
-	cd ${WRKSRC}/doc && ${INSTALL_DATA} ${i} ${DOCSDIR}
-.endfor
-	@${MKDIR} ${DOCSDIR}/html
+	cd ${WRKSRC}/doc && ${INSTALL_MAN} *.3gv ${STAGEDIR}${MAN3PREFIX}/man/man3
+	cd ${WRKSRC}/doc && ${INSTALL_MAN} *.5gv ${STAGEDIR}${MAN5PREFIX}/man/man5
+	cd ${WRKSRC}/doc && ${INSTALL_DATA} *.info ${STAGEDIR}${PREFIX}/${INFO_PATH}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}/html/figs
+	(cd ${WRKSRC}/doc && ${INSTALL_DATA} OOGL.m.txt README README.gvplot \
+		geomview.pdf geomview-pt_BR.pdf oogltour oogltour-pt_BR \
+		${STAGEDIR}${DOCSDIR})
 	cd ${WRKSRC}/doc/geomview.html \
-		&& ${INSTALL_DATA} *.html ${DOCSDIR}/html
-	@${MKDIR} ${DOCSDIR}/html/figs
+		&& ${INSTALL_DATA} *.html ${STAGEDIR}${DOCSDIR}/html
 	cd ${WRKSRC}/doc/figs \
-		&& ${INSTALL_DATA} *.png ${DOCSDIR}/html/figs
-	@${MKDIR} ${DOCSDIR}/html/pt_BR
+		&& ${INSTALL_DATA} *.png ${STAGEDIR}${DOCSDIR}/html/figs
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}/html/pt_BR
 	cd ${WRKSRC}/doc/geomview-pt_BR.html \
-		&& ${INSTALL_DATA} *.html ${DOCSDIR}/html/pt_BR
-	cd ${DOCSDIR}/html/pt_BR && ${LN} -sf ../figs .
-.endif
-.if ${PORT_OPTIONS:MEXAMPLES}
-	@${MKDIR} ${EXAMPLESDIR}
-	cd ${WRKSRC}/doc && ${INSTALL_DATA} *.c ${EXAMPLESDIR}
-	cd ${WRKSRC}/doc && ${INSTALL_DATA} *.tcl ${EXAMPLESDIR}
-.endif
+		&& ${INSTALL_DATA} *.html ${STAGEDIR}${DOCSDIR}/html/pt_BR
+	cd ${STAGEDIR}${DOCSDIR}/html/pt_BR && ${LN} -sf ../figs .
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	cd ${WRKSRC}/doc && ${INSTALL_DATA} *.c *.tcl ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/graphics/geomview/pkg-plist b/graphics/geomview/pkg-plist
index dd242dfbfc8c..f2593527093d 100644
--- a/graphics/geomview/pkg-plist
+++ b/graphics/geomview/pkg-plist
@@ -170,6 +170,33 @@ libexec/geomview/drawbdy
 libexec/geomview/gvclock
 libexec/geomview/gvx
 libexec/geomview/nose
+man/man1/animate.1gv.gz
+man/man1/anytooff.1gv.gz
+man/man1/anytoucd.1gv.gz
+man/man1/bdy.1gv.gz
+man/man1/bez2mesh.1gv.gz
+man/man1/clip.1gv.gz
+man/man1/geomview.1gv.gz
+man/man1/hvectext.1gv.gz
+man/man1/math2oogl.1gv.gz
+man/man1/nose.1gv.gz
+man/man1/offconsol.1gv.gz
+man/man1/oogl2rib.1gv.gz
+man/man1/oogl2vrml.1gv.gz
+man/man1/polymerge.1gv.gz
+man/man1/togeomview.1gv.gz
+man/man1/ucdtooff.1gv.gz
+man/man1/vrml2oogl.1gv.gz
+man/man3/anytopl.3gv.gz
+man/man3/bdy.3gv.gz
+man/man3/fsaparse.3gv.gz
+man/man3/geomutil.3gv.gz
+man/man3/lisp.3gv.gz
+man/man3/plcombine.3gv.gz
+man/man3/plconsol.3gv.gz
+man/man5/discgrp.5gv.gz
+man/man5/geomview.5gv.gz
+man/man5/oogl.5gv.gz
 %%PORTDOCS%%%%DOCSDIR%%/OOGL.m.txt
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/README.gvplot