5 files changed, 99 insertions, 76 deletions

diff --git a/graphics/linux-ac3d/Makefile b/graphics/linux-ac3d/Makefile
index 2154346d631c..7307f122ce57 100644
--- a/graphics/linux-ac3d/Makefile
+++ b/graphics/linux-ac3d/Makefile
@@ -1,19 +1,19 @@
 # New ports collection makefile for:	linux-ac3d
 # Date created:		12 July 2002
-# Whom:			Igor Pokrovsky <tiamat@telegraph.spb.ru>
+# Whom:			Igor Pokrovsky <tiamat@comset.net>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	ac3d
-PORTVERSION=	3.6
+PORTVERSION=	4.0a
 CATEGORIES=	graphics linux
 MASTER_SITES=	http://inivis.swmirror.com/
 PKGNAMEPREFIX=	linux-
-DISTNAME=	ac3d${PORTVERSION:S/.//}lx
+DISTNAME=	ac3dlx${PORTVERSION:R}
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	tiamat@comset.net
 COMMENT=	Easy to use and powerful 3D graphics modeller (trial version)
 
 .ifdef(INSTALL_DYNLINKED_VERSION)
@@ -25,6 +25,8 @@ NO_BUILD=	yes
 ONLY_FOR_ARCHS=	i386
 WRKSRC=		${WRKDIR}/ac3dlx
 
+PKGMESSAGE=	${WRKDIR}/pkg-message
+
 .ifndef(INSTALL_DYNLINKED_VERSION)
 PLIST_SUB=	DYNAMIC_VERSION="@comment "	\
 		STATIC_VERSION=""
@@ -48,6 +50,11 @@ pre-everything::
 	@${ECHO_MSG} ''
 .endif
 
+post-patch:
+	@${CAT} pkg-message | ${SED} -e 's|%%PORTNAME%%|${PORTNAME}|; \
+		s|%%PREFIX%%|${PREFIX}|; \
+		s|%%EXAMPLESDIR%%|${EXAMPLESDIR}|' > ${PKGMESSAGE}
+
 pre-install:
 # Generate startup script
 	@${ECHO_CMD} "#!${SH}" > ${WRKDIR}/ac3d.sh
@@ -68,21 +75,14 @@ do-install:
 # data
 	@${MKDIR} ${DATADIR}
 	@${MKDIR} ${DATADIR}/lib
-	@${MKDIR} ${DATADIR}/lib/tcl8.3
-	@${INSTALL_DATA} ${WRKSRC}/lib/tcl8.3/tclIndex \
-		${DATADIR}/lib/tcl8.3
-	@${INSTALL_DATA} ${WRKSRC}/lib/tcl8.3/*.tcl ${DATADIR}/lib/tcl8.3
-	@${INSTALL_DATA} ${WRKSRC}/lib/tcl8.3/license.terms \
-		${DATADIR}/lib/tcl8.3
-	@${MKDIR} ${DATADIR}/lib/tk8.3
-	@${INSTALL_DATA} ${WRKSRC}/lib/tk8.3/tclIndex ${DATADIR}/lib/tk8.3
-	@${INSTALL_DATA} ${WRKSRC}/lib/tk8.3/*.tcl ${DATADIR}/lib/tk8.3
-	@${INSTALL_DATA} ${WRKSRC}/lib/tk8.3/license.terms \
-		${DATADIR}/lib/tk8.3
+	@${MKDIR} ${DATADIR}/lib/tcl8.4
+	@${INSTALL_DATA} ${WRKSRC}/lib/tcl8.4/tclIndex ${DATADIR}/lib/tcl8.4
+	@${INSTALL_DATA} ${WRKSRC}/lib/tcl8.4/*.tcl ${DATADIR}/lib/tcl8.4
+	@${MKDIR} ${DATADIR}/lib/tk8.4
+	@${INSTALL_DATA} ${WRKSRC}/lib/tk8.4/tclIndex ${DATADIR}/lib/tk8.4
+	@${INSTALL_DATA} ${WRKSRC}/lib/tk8.4/*.tcl ${DATADIR}/lib/tk8.4
 	@${MKDIR} ${DATADIR}/tcl
 	@${INSTALL_DATA} ${WRKSRC}/tcl/*.tcl ${DATADIR}/tcl
-	@${INSTALL_DATA} ${WRKSRC}/font.ac ${DATADIR}
-	@${INSTALL_DATA} ${WRKSRC}/fontwire.ac ${DATADIR}
 .ifndef	(NOPORTDOCS)
 # docs
 	@${MKDIR} ${DOCSDIR}
@@ -91,10 +91,8 @@ do-install:
 	@${INSTALL_DATA} ${WRKSRC}/IMPORTANT ${DOCSDIR}
 # examples
 	@${MKDIR} ${EXAMPLESDIR}
-	@${INSTALL_DATA} ${WRKSRC}/models/* ${EXAMPLESDIR}
+	@${INSTALL_DATA} ${WRKSRC}/models/samples/* ${EXAMPLESDIR}
+	@${CAT} ${PKGMESSAGE}
 .endif
 
-post-install:
-	@${SED} -e 's|/usr/local/|${PREFIX}/|' ${PKGMESSAGE}
-
 .include <bsd.port.mk>
diff --git a/graphics/linux-ac3d/distinfo b/graphics/linux-ac3d/distinfo
index 50d2b25274a5..d34baf8a586a 100644
--- a/graphics/linux-ac3d/distinfo
+++ b/graphics/linux-ac3d/distinfo
@@ -1 +1 @@
-MD5 (ac3d36lx.tgz) = 8c04028b436b89c975790e9462d58cb5
+MD5 (ac3dlx4.tgz) = 981d5b3502ce7b7ed7fb44b3a68e2127
diff --git a/graphics/linux-ac3d/pkg-descr b/graphics/linux-ac3d/pkg-descr
index 26cc31a30686..167953a4a02a 100644
--- a/graphics/linux-ac3d/pkg-descr
+++ b/graphics/linux-ac3d/pkg-descr
@@ -7,4 +7,4 @@ RenderMan, Dive, Massive and other formats.
 WWW:	http://www.ac3d.org/
 
 - Igor Pokrovsky
-tiamat@telegraph.spb.ru
+tiamat@comset.net
diff --git a/graphics/linux-ac3d/pkg-message b/graphics/linux-ac3d/pkg-message
index 3993f1d721e2..21f493f64b87 100644
--- a/graphics/linux-ac3d/pkg-message
+++ b/graphics/linux-ac3d/pkg-message
@@ -1,7 +1,4 @@
 *******************************************************************************
-Now you can start program by running /usr/local/bin/ac3d.sh
-
-TIP: Fonts were installed in /usr/local/share/ac3d
-To use them, you can change variable <fontpath> in ~/.ac3dprefs after first run
-There is also some examples, installed in /usr/local/share/examples/ac3d
+Now you can start program by running %%PREFIX%%/bin/%%PORTNAME%%.sh
+There are also some sample models installed in %%EXAMPLESDIR%%
 *******************************************************************************
diff --git a/graphics/linux-ac3d/pkg-plist b/graphics/linux-ac3d/pkg-plist
index f038a69d8dde..541a776e364f 100644
--- a/graphics/linux-ac3d/pkg-plist
+++ b/graphics/linux-ac3d/pkg-plist
@@ -1,63 +1,91 @@
 bin/ac3d.sh
 %%DYNAMIC_VERSION%%bin/real-ac3d
 %%STATIC_VERSION%%bin/real-ac3ds
-share/ac3d/font.ac
-share/ac3d/fontwire.ac
-share/ac3d/lib/tcl8.3/auto.tcl
-share/ac3d/lib/tcl8.3/history.tcl
-share/ac3d/lib/tcl8.3/init.tcl
-share/ac3d/lib/tcl8.3/ldAout.tcl
-share/ac3d/lib/tcl8.3/license.terms
-share/ac3d/lib/tcl8.3/package.tcl
-share/ac3d/lib/tcl8.3/parray.tcl
-share/ac3d/lib/tcl8.3/safe.tcl
-share/ac3d/lib/tcl8.3/tclIndex
-share/ac3d/lib/tcl8.3/word.tcl
-share/ac3d/lib/tk8.3/bgerror.tcl
-share/ac3d/lib/tk8.3/button.tcl
-share/ac3d/lib/tk8.3/choosedir.tcl
-share/ac3d/lib/tk8.3/clrpick.tcl
-share/ac3d/lib/tk8.3/comdlg.tcl
-share/ac3d/lib/tk8.3/console.tcl
-share/ac3d/lib/tk8.3/dialog.tcl
-share/ac3d/lib/tk8.3/entry.tcl
-share/ac3d/lib/tk8.3/focus.tcl
-share/ac3d/lib/tk8.3/license.terms
-share/ac3d/lib/tk8.3/listbox.tcl
-share/ac3d/lib/tk8.3/menu.tcl
-share/ac3d/lib/tk8.3/msgbox.tcl
-share/ac3d/lib/tk8.3/obsolete.tcl
-share/ac3d/lib/tk8.3/optMenu.tcl
-share/ac3d/lib/tk8.3/palette.tcl
-share/ac3d/lib/tk8.3/safetk.tcl
-share/ac3d/lib/tk8.3/scale.tcl
-share/ac3d/lib/tk8.3/scrlbar.tcl
-share/ac3d/lib/tk8.3/tclIndex
-share/ac3d/lib/tk8.3/tearoff.tcl
-share/ac3d/lib/tk8.3/text.tcl
-share/ac3d/lib/tk8.3/tk.tcl
-share/ac3d/lib/tk8.3/tkfbox.tcl
-share/ac3d/lib/tk8.3/xmfbox.tcl
+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
-%%PORTDOCS%%share/doc/ac3d/IMPORTANT
-%%PORTDOCS%%share/doc/ac3d/LICENCE
-%%PORTDOCS%%share/doc/ac3d/README
-%%PORTDOCS%%share/examples/ac3d/tie3.ac
-%%PORTDOCS%%share/examples/ac3d/tree.ac
-%%PORTDOCS%%share/examples/ac3d/tree_transparent.gif
-%%PORTDOCS%%@dirrm share/examples/ac3d
-%%PORTDOCS%%@dirrm share/doc/ac3d
+share/ac3d/tcl/combobox.tcl
 @dirrm share/ac3d/tcl
-@dirrm share/ac3d/lib/tk8.3
-@dirrm share/ac3d/lib/tcl8.3
-@dirrm share/ac3d/lib
 @dirrm share/ac3d
+%%PORTDOCS%%%%DOCSDIR%%/IMPORTANT
+%%PORTDOCS%%%%DOCSDIR%%/LICENCE
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%EXAMPLESDIR%%/Penguin_beak.rgb
+%%EXAMPLESDIR%%/Penguin_body.rgb
+%%EXAMPLESDIR%%/amp.ac
+%%EXAMPLESDIR%%/car.ac
+%%EXAMPLESDIR%%/celtic12.ac
+%%EXAMPLESDIR%%/diningtable.ac
+%%EXAMPLESDIR%%/enterprise.ac
+%%EXAMPLESDIR%%/falcon.ac
+%%EXAMPLESDIR%%/glider.ac
+%%EXAMPLESDIR%%/gym2.ac
+%%EXAMPLESDIR%%/head.ac
+%%EXAMPLESDIR%%/mydesk4.ac
+%%EXAMPLESDIR%%/racecar.ac
+%%EXAMPLESDIR%%/rocket.ac
+%%EXAMPLESDIR%%/rose.ac
+%%EXAMPLESDIR%%/subdivided hand.ac
+%%EXAMPLESDIR%%/sword.ac
+%%EXAMPLESDIR%%/tie3.ac
+%%EXAMPLESDIR%%/tree.ac
+%%EXAMPLESDIR%%/tree_transparent.gif
+%%EXAMPLESDIR%%/tuxedo.ac
+%%EXAMPLESDIR%%/world.ac
+%%EXAMPLESDIR%%/world.rgb
+@dirrm %%EXAMPLESDIR%%