Replace the complicated hack that caused my head to feel like I just

hopped ten blocks on a concrete floor, upside down, with a much
simpler "DIST_SUBDIR=iv".

While I'm here, replace the "gzip ${PREFIX}/interviews/man/mann/*.n" with
MANPREFIX and MANN definitions.

2 files changed, 42 insertions, 22 deletions

diff --git a/x11-toolkits/iv/Makefile b/x11-toolkits/iv/Makefile
index ccaca83618ee..c117d781192d 100644
--- a/x11-toolkits/iv/Makefile
+++ b/x11-toolkits/iv/Makefile
@@ -3,39 +3,59 @@
 # Date created:		23.sept.1994
 # Whom:			adam
 #
-# $Id: Makefile,v 1.13 1997/01/24 10:39:20 asami Exp $
+# $Id: Makefile,v 1.14 1997/02/13 00:40:55 asami Exp $
 #
 
-VERSION=	3.1
-# don't change this to "=" !
-DISTNAME?=	iv-${VERSION}
+DISTNAME=	iv-3.1
 CATEGORIES=	x11
 MASTER_SITES=	ftp://interviews.stanford.edu/pub/
-EXTRACT_SUFX=	.tar.Z
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
+DISTFILES=	3.1.tar.Z
 
+DIST_SUBDIR=	iv
 WRKSRC=		${WRKDIR}/iv
 MAKEFILE=	makefile
 
-.if ${DISTNAME} != ${VERSION}
-pre-fetch:
-	@if [ ! -f ${DISTDIR}/${DISTFILES} ]; then \
-	    mkdir -p ${DISTDIR}/${DISTNAME} ; \
-	    ${MAKE} \
-		DISTDIR=${DISTDIR}/${DISTNAME} DISTNAME=${VERSION} fetch ; \
-	    mv ${DISTDIR}/${DISTNAME}/${VERSION}${EXTRACT_SUFX} \
-		${DISTDIR}/${DISTFILES} ; \
-	    rmdir ${DISTDIR}/${DISTNAME} ; \
-	fi
-.endif
+MANPREFIX=	${PREFIX}/interviews
+MANN=		Adjuster.n Banner.n BasicDialog.n Border.n Box2_6.n \
+		BrushCmd.n Button2_6.n CGlue.n CSolver.n Catalog.n \
+		Clipboard.n ColorCmd.n Command.n CompletionEditor.n \
+		Component.n ComponentView.n ConnectTool.n Connector.n \
+		Control.n ControlInfo.n Creator.n Damage.n Data.n \
+		Deck2_6.n Dialog.n Dispatcher.n Editor.n EditorInfo.n \
+		EllipseComp.n ExternView.n FileBrowser.n FileChooser.n \
+		FontCmd.n Frame.n GVUpdater.n Glue2_6.n Graphic.n \
+		GraphicBlock.n GraphicComp.n GraphicCompTool.n \
+		GraphicView.n Grid.n IOCallback.n IOHandler.n \
+		ImportCmd.n Interactor.n Iterator.n KeyMap.n \
+		LineComp.n LinkComp.n MacroCmd.n MagnifyTool.n \
+		Manipulator.n MatchEditor.n Menu2_6.n Message.n \
+		MoveTool.n NOPCmd.n PadComp.n Page.n Painter.n \
+		Panner.n Path.n Pattern.n PatternCmd.n Perspective.n \
+		Picture.n PinComp.n PolygonComp.n PostScriptView.n \
+		RasterComp.n RasterRect.n RectComp.n Regexp.n ReqErr.n \
+		ReshapeTool.n Resource.n RotateTool.n RpcHdr.n \
+		RpcPeer.n RpcReader.n RpcRegistry.n RpcService.n \
+		RpcWriter.n Rubband.n ScaleTool.n Scene.n Scroller.n \
+		SelectTool.n Selection.n Sensor.n Shape.n SlotComp.n \
+		SplineComp.n StateVar.n StateVarView.n StencilComp.n \
+		StrBrowser.n StrChooser.n StretchTool.n StringEditor.n \
+		Subject.n TextBuffer.n TextComp.n TextDisplay.n \
+		TextEditor.n Tool.n TransferFunct.n Tray.n UArray.n \
+		UControl.n UHashTable.n ULabel.n UList.n UMap.n \
+		UStencil.n Unidraw.n UnidrawIntro.n Vertices.n \
+		VerticesComp.n Viewer.n Viewport.n World.n alert.n \
+		align.n catcmds.n classes.n datas.n dclock.n doc.n \
+		edit.n ellipses.n geomobjs.n globals.n ibuild.n \
+		iclass.n idraw.n ifb.n ifc.n iostreamb.n ivmkmf.n \
+		kybd.n lines.n logo.n mailbox.n manips.n polygons.n \
+		pspaint.n remind.n rpcbuf.n rpcstream.n splines.n \
+		statevars.n stateviews.n struct.n transfns.n \
+		transforms.n uctrls.n viewcmds.n
 
 post-install:
-.if !defined(NOMANCOMPRESS)
-	${GZIP_CMD} ${PREFIX}/interviews/man/mann/*.n
-.endif
 # need these in ${PREFIX}/lib so that ldconfig can find them
 	ln -fs ../interviews/lib/FREEBSD/libIV.so.3.1 ${PREFIX}/lib
 	ln -fs ../interviews/lib/FREEBSD/libUnidraw.so.3.1 ${PREFIX}/lib
-	ldconfig -m ${PREFIX}/lib
+	${LDCONFIG} -m ${PREFIX}/lib
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/iv/distinfo b/x11-toolkits/iv/distinfo
index a0fe8e74beec..9320408051a4 100644
--- a/x11-toolkits/iv/distinfo
+++ b/x11-toolkits/iv/distinfo
@@ -1 +1 @@
-MD5 (iv-3.1.tar.Z) = 83707e13b4ca484e0d98c41bc76a6e64
+MD5 (iv/3.1.tar.Z) = 83707e13b4ca484e0d98c41bc76a6e64