- Update to 4.0f

PR:		ports/62106
Submitted by:	Igor Pokrovsky <tiamat@comset.net> (maintainer)

3 files changed, 76 insertions, 67 deletions

diff --git a/graphics/linux-ac3d/Makefile b/graphics/linux-ac3d/Makefile
index 7307f122ce57..5efe2424aaa2 100644
--- a/graphics/linux-ac3d/Makefile
+++ b/graphics/linux-ac3d/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	ac3d
-PORTVERSION=	4.0a
+PORTVERSION=	4.0f
 CATEGORIES=	graphics linux
 MASTER_SITES=	http://inivis.swmirror.com/
 PKGNAMEPREFIX=	linux-
-DISTNAME=	ac3dlx${PORTVERSION:R}
+DISTNAME=	${PORTNAME}lx${PORTVERSION:R}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	tiamat@comset.net
@@ -23,7 +23,7 @@ LIB_DEPENDS=	${LINUXBASE}/usr/X11R6/libGLU.so.1:${PORTSDIR}/graphics/linux_mesa3
 USE_LINUX=	yes
 NO_BUILD=	yes
 ONLY_FOR_ARCHS=	i386
-WRKSRC=		${WRKDIR}/ac3dlx
+WRKSRC=		${WRKDIR}/${PORTNAME}lx
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
@@ -51,9 +51,10 @@ pre-everything::
 .endif
 
 post-patch:
-	@${CAT} pkg-message | ${SED} -e 's|%%PORTNAME%%|${PORTNAME}|; \
-		s|%%PREFIX%%|${PREFIX}|; \
-		s|%%EXAMPLESDIR%%|${EXAMPLESDIR}|' > ${PKGMESSAGE}
+	@${CAT} pkg-message | \
+		${SED} -e 's|%%PORTNAME%%|${PORTNAME}|; \
+			   s|%%PREFIX%%|${PREFIX}|; \
+			   s|%%EXAMPLESDIR%%|${EXAMPLESDIR}|' > ${PKGMESSAGE}
 
 pre-install:
 # Generate startup script
@@ -83,6 +84,12 @@ do-install:
 	@${INSTALL_DATA} ${WRKSRC}/lib/tk8.4/*.tcl ${DATADIR}/lib/tk8.4
 	@${MKDIR} ${DATADIR}/tcl
 	@${INSTALL_DATA} ${WRKSRC}/tcl/*.tcl ${DATADIR}/tcl
+
+# fonts
+.for i in font fontwire
+	${INSTALL_DATA} ${WRKSRC}/${i}.ac ${DATADIR}
+.endfor
+
 .ifndef	(NOPORTDOCS)
 # docs
 	@${MKDIR} ${DOCSDIR}
diff --git a/graphics/linux-ac3d/distinfo b/graphics/linux-ac3d/distinfo
index d34baf8a586a..5cd26a642782 100644
--- a/graphics/linux-ac3d/distinfo
+++ b/graphics/linux-ac3d/distinfo
@@ -1 +1 @@
-MD5 (ac3dlx4.tgz) = 981d5b3502ce7b7ed7fb44b3a68e2127
+MD5 (ac3dlx4.tgz) = 4ea053e24e740726c5df7763f620df34
diff --git a/graphics/linux-ac3d/pkg-plist b/graphics/linux-ac3d/pkg-plist
index 541a776e364f..74158a2be9ed 100644
--- a/graphics/linux-ac3d/pkg-plist
+++ b/graphics/linux-ac3d/pkg-plist
@@ -1,66 +1,68 @@
 bin/ac3d.sh
 %%DYNAMIC_VERSION%%bin/real-ac3d
 %%STATIC_VERSION%%bin/real-ac3ds
-share/ac3d/lib/tcl8.4/auto.tcl
-share/ac3d/lib/tcl8.4/history.tcl
-share/ac3d/lib/tcl8.4/init.tcl
-share/ac3d/lib/tcl8.4/ldAout.tcl
-share/ac3d/lib/tcl8.4/package.tcl
-share/ac3d/lib/tcl8.4/parray.tcl
-share/ac3d/lib/tcl8.4/safe.tcl
-share/ac3d/lib/tcl8.4/tclIndex
-share/ac3d/lib/tcl8.4/word.tcl
-share/ac3d/lib/tk8.4/bgerror.tcl
-share/ac3d/lib/tk8.4/button.tcl
-share/ac3d/lib/tk8.4/choosedir.tcl
-share/ac3d/lib/tk8.4/clrpick.tcl
-share/ac3d/lib/tk8.4/comdlg.tcl
-share/ac3d/lib/tk8.4/console.tcl
-share/ac3d/lib/tk8.4/dialog.tcl
-share/ac3d/lib/tk8.4/entry.tcl
-share/ac3d/lib/tk8.4/focus.tcl
-share/ac3d/lib/tk8.4/listbox.tcl
-share/ac3d/lib/tk8.4/menu.tcl
-share/ac3d/lib/tk8.4/mkpsenc.tcl
-share/ac3d/lib/tk8.4/msgbox.tcl
-share/ac3d/lib/tk8.4/obsolete.tcl
-share/ac3d/lib/tk8.4/optMenu.tcl
-share/ac3d/lib/tk8.4/palette.tcl
-share/ac3d/lib/tk8.4/panedwindow.tcl
-share/ac3d/lib/tk8.4/pkgIndex.tcl
-share/ac3d/lib/tk8.4/safetk.tcl
-share/ac3d/lib/tk8.4/scale.tcl
-share/ac3d/lib/tk8.4/scrlbar.tcl
-share/ac3d/lib/tk8.4/spinbox.tcl
-share/ac3d/lib/tk8.4/tclIndex
-share/ac3d/lib/tk8.4/tearoff.tcl
-share/ac3d/lib/tk8.4/text.tcl
-share/ac3d/lib/tk8.4/tk.tcl
-share/ac3d/lib/tk8.4/tkfbox.tcl
-share/ac3d/lib/tk8.4/unsupported.tcl
-share/ac3d/lib/tk8.4/xmfbox.tcl
-@dirrm share/ac3d/lib/tk8.4
-@dirrm share/ac3d/lib/tcl8.4
-@dirrm share/ac3d/lib
-share/ac3d/tcl/ac3d.tcl
-share/ac3d/tcl/ac3dfsbox.tcl
-share/ac3d/tcl/ac3dhier.tcl
-share/ac3d/tcl/ac3dkeys.tcl
-share/ac3d/tcl/ac3dobject.tcl
-share/ac3d/tcl/ac3dobjlib.tcl
-share/ac3d/tcl/ac3dops.tcl
-share/ac3d/tcl/ac3dpalette.tcl
-share/ac3d/tcl/ac3dplugins.tcl
-share/ac3d/tcl/ac3dprefs.tcl
-share/ac3d/tcl/ac3drender.tcl
-share/ac3d/tcl/ac3dtips.tcl
-share/ac3d/tcl/ac3dttfont.tcl
-share/ac3d/tcl/ac3dutil.tcl
-share/ac3d/tcl/ac3duvedit.tcl
-share/ac3d/tcl/ac3dview.tcl
-share/ac3d/tcl/combobox.tcl
-@dirrm share/ac3d/tcl
-@dirrm share/ac3d
+%%DATADIR%%/font.ac
+%%DATADIR%%/fontwire.ac
+%%DATADIR%%/lib/tcl8.4/auto.tcl
+%%DATADIR%%/lib/tcl8.4/history.tcl
+%%DATADIR%%/lib/tcl8.4/init.tcl
+%%DATADIR%%/lib/tcl8.4/ldAout.tcl
+%%DATADIR%%/lib/tcl8.4/package.tcl
+%%DATADIR%%/lib/tcl8.4/parray.tcl
+%%DATADIR%%/lib/tcl8.4/safe.tcl
+%%DATADIR%%/lib/tcl8.4/tclIndex
+%%DATADIR%%/lib/tcl8.4/word.tcl
+%%DATADIR%%/lib/tk8.4/bgerror.tcl
+%%DATADIR%%/lib/tk8.4/button.tcl
+%%DATADIR%%/lib/tk8.4/choosedir.tcl
+%%DATADIR%%/lib/tk8.4/clrpick.tcl
+%%DATADIR%%/lib/tk8.4/comdlg.tcl
+%%DATADIR%%/lib/tk8.4/console.tcl
+%%DATADIR%%/lib/tk8.4/dialog.tcl
+%%DATADIR%%/lib/tk8.4/entry.tcl
+%%DATADIR%%/lib/tk8.4/focus.tcl
+%%DATADIR%%/lib/tk8.4/listbox.tcl
+%%DATADIR%%/lib/tk8.4/menu.tcl
+%%DATADIR%%/lib/tk8.4/mkpsenc.tcl
+%%DATADIR%%/lib/tk8.4/msgbox.tcl
+%%DATADIR%%/lib/tk8.4/obsolete.tcl
+%%DATADIR%%/lib/tk8.4/optMenu.tcl
+%%DATADIR%%/lib/tk8.4/palette.tcl
+%%DATADIR%%/lib/tk8.4/panedwindow.tcl
+%%DATADIR%%/lib/tk8.4/pkgIndex.tcl
+%%DATADIR%%/lib/tk8.4/safetk.tcl
+%%DATADIR%%/lib/tk8.4/scale.tcl
+%%DATADIR%%/lib/tk8.4/scrlbar.tcl
+%%DATADIR%%/lib/tk8.4/spinbox.tcl
+%%DATADIR%%/lib/tk8.4/tclIndex
+%%DATADIR%%/lib/tk8.4/tearoff.tcl
+%%DATADIR%%/lib/tk8.4/text.tcl
+%%DATADIR%%/lib/tk8.4/tk.tcl
+%%DATADIR%%/lib/tk8.4/tkfbox.tcl
+%%DATADIR%%/lib/tk8.4/unsupported.tcl
+%%DATADIR%%/lib/tk8.4/xmfbox.tcl
+@dirrm %%DATADIR%%/lib/tk8.4
+@dirrm %%DATADIR%%/lib/tcl8.4
+@dirrm %%DATADIR%%/lib
+%%DATADIR%%/tcl/ac3d.tcl
+%%DATADIR%%/tcl/ac3dfsbox.tcl
+%%DATADIR%%/tcl/ac3dhier.tcl
+%%DATADIR%%/tcl/ac3dkeys.tcl
+%%DATADIR%%/tcl/ac3dobject.tcl
+%%DATADIR%%/tcl/ac3dobjlib.tcl
+%%DATADIR%%/tcl/ac3dops.tcl
+%%DATADIR%%/tcl/ac3dpalette.tcl
+%%DATADIR%%/tcl/ac3dplugins.tcl
+%%DATADIR%%/tcl/ac3dprefs.tcl
+%%DATADIR%%/tcl/ac3drender.tcl
+%%DATADIR%%/tcl/ac3dtips.tcl
+%%DATADIR%%/tcl/ac3dttfont.tcl
+%%DATADIR%%/tcl/ac3dutil.tcl
+%%DATADIR%%/tcl/ac3duvedit.tcl
+%%DATADIR%%/tcl/ac3dview.tcl
+%%DATADIR%%/tcl/combobox.tcl
+@dirrm %%DATADIR%%/tcl
+@dirrm %%DATADIR%%
 %%PORTDOCS%%%%DOCSDIR%%/IMPORTANT
 %%PORTDOCS%%%%DOCSDIR%%/LICENCE
 %%PORTDOCS%%%%DOCSDIR%%/README