5 files changed, 158 insertions, 2 deletions
diff --git a/media-gfx/freewrl/ChangeLog b/media-gfx/freewrl/ChangeLog
index 536bc75f238d..f7969cc0d013 100644
--- a/media-gfx/freewrl/ChangeLog
+++ b/media-gfx/freewrl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/freewrl
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/ChangeLog,v 1.13 2006/08/27 22:37:16 mr_bones_ Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/ChangeLog,v 1.14 2007/01/17 07:45:27 hanno Exp $
+
+*freewrl-1.18.10 (17 Jan 2007)
+
+  17 Jan 2007; Hanno Boeck <hanno@gentoo.org> +files/freewrl-makefile,
+  +freewrl-1.18.10.ebuild:
+  Version bump and don't install fonts any more, depend on ttf-bitstream-vera
+  instead and set a symlink.
 
   27 Aug 2006; Michael Sterrett <mr_bones_@gentoo.org>
   -files/FreeWRL-1.06+gentoo_pd.diff, -freewrl-1.06.ebuild:
diff --git a/media-gfx/freewrl/files/digest-freewrl-1.16.1 b/media-gfx/freewrl/files/digest-freewrl-1.16.1
index af1389bb6fb4..5fbbc33c7c00 100644
--- a/media-gfx/freewrl/files/digest-freewrl-1.16.1
+++ b/media-gfx/freewrl/files/digest-freewrl-1.16.1
@@ -1 +1,3 @@
 MD5 8cae1d5e9df3f3be9baeb844cae4dffd freewrl-1.16.1.tar.gz 3333751
+RMD160 96643006d28a0aa54222829140fed41446d21a51 freewrl-1.16.1.tar.gz 3333751
+SHA256 51baee1a326d78eac33700de3a9df8ace792785a95b5309fcfadc12ee3288625 freewrl-1.16.1.tar.gz 3333751
diff --git a/media-gfx/freewrl/files/digest-freewrl-1.18.10 b/media-gfx/freewrl/files/digest-freewrl-1.18.10
new file mode 100644
index 000000000000..727b603e4967
--- /dev/null
+++ b/media-gfx/freewrl/files/digest-freewrl-1.18.10
@@ -0,0 +1,3 @@
+MD5 635f3c1c48af869dde074e1e9464234a freewrl-1.18.10.tar.gz 3581122
+RMD160 db3f699ae96104ed347a7ffbb615c1e90600457f freewrl-1.18.10.tar.gz 3581122
+SHA256 7d6dd3ca3f39605b7703736d168e3d99231a3ccf9f199ae6a459adc82463f35e freewrl-1.18.10.tar.gz 3581122
diff --git a/media-gfx/freewrl/files/freewrl-makefile b/media-gfx/freewrl/files/freewrl-makefile
new file mode 100644
index 000000000000..1eb7165ff152
--- /dev/null
+++ b/media-gfx/freewrl/files/freewrl-makefile
@@ -0,0 +1,72 @@
+--- freewrl-1.18.10/Makefile.PL.orig	2007-01-17 07:58:17.000000000 +0100
++++ freewrl-1.18.10/Makefile.PL	2007-01-17 07:58:05.000000000 +0100
+@@ -292,46 +292,46 @@
+ 			print MK "\tstrip SoundEngine/FreeWRL_SoundServer\n";
+ 		}
+ 	}
+-	print MK "\tinstall -D CFrontEnd/freewrl \$(FRONTEND_DIR)/freewrl\n";
+-	print MK "\tinstall -D FreeWRL_Message/FreeWRL_Message \$(FRONTEND_DIR)FreeWRL_Message\n";
++	print MK "\tinstall -D CFrontEnd/freewrl \$(DESTDIR)\$(FRONTEND_DIR)/freewrl\n";
++	print MK "\tinstall -D FreeWRL_Message/FreeWRL_Message \$(DESTDIR)/\$(FRONTEND_DIR)FreeWRL_Message\n";
+ 
+ 	}
+ 	if ($OS eq "Linux") {
+-		print MK "\tinstall -D libFreeWRLFunc.so \$(LIB_DIR)/libFreeWRLFunc.so\n";
+-		print MK "\tinstall -D $libFreeWRLjspath \$(LIB_DIR)/libFreeWRLjs.so\n";
++		print MK "\tinstall -D libFreeWRLFunc.so \$(DESTDIR)/\$(LIB_DIR)/libFreeWRLFunc.so\n";
++		print MK "\tinstall -D $libFreeWRLjspath \$(DESTDIR)/\$(LIB_DIR)/libFreeWRLjs.so\n";
+ 		if ($HAVE_UBUNTU eq "NO") {
+ 			print MK "\t/sbin/ldconfig\n";
+ 		}
+ 	}
+ 	if ($VRML_CONFIG{SOUND_ENGINE}) { 
+-		print MK "\tinstall -D SoundEngine/FreeWRL_SoundServer \$(FRONTEND_DIR)/FreeWRL_SoundServer\n";
++		print MK "\tinstall -D SoundEngine/FreeWRL_SoundServer \$(DESTDIR)/\$(FRONTEND_DIR)/FreeWRL_SoundServer\n";
+ 	}
+ 
+-	if (($JAVAC ne "") || ($VRML_CONFIG{NETSCAPE_INST} ne "")) {
++	if (($JAVAC ne "") && ($VRML_CONFIG{NETSCAPE_INST} ne "")) {
+ 		if ($OS ne "Darwin") {
+-			print MK "\tinstall -D java/classes/vrml.jar $VRML_CONFIG{NETSCAPE_INST}/vrml.jar\n";
+-			print MK "\tinstall -D Plugin/npfreewrl.so $VRML_CONFIG{NETSCAPE_INST}/npfreewrl.so\n";
++			print MK "\tinstall -D java/classes/vrml.jar \$(DESTDIR)/$VRML_CONFIG{NETSCAPE_INST}/vrml.jar\n";
++			print MK "\tinstall -D Plugin/npfreewrl.so \$(DESTDIR)/$VRML_CONFIG{NETSCAPE_INST}/npfreewrl.so\n";
+ 		} else {
+-			print MK "\tinstall -d  \$(INSTALL_DIR)\/freewrl\n";
+-			print MK "\tinstall java/classes/vrml.jar \$(INSTALL_DIR)\/freewrl\n";
++			print MK "\tinstall -d  \$(DESTDIR)/\$(INSTALL_DIR)\/freewrl\n";
++			print MK "\tinstall java/classes/vrml.jar \$(DESTDIR)/\$(INSTALL_DIR)\/freewrl\n";
+ 		}
+ 	}
+ 	if ($OS ne "Darwin") {
+-	print MK "\tinstall -D Desktop/freewrl.png \$(INSTALL_DIR)\/pixmaps/Desktop/freewrl.png\n";
+-	print MK "\tinstall -D Desktop/freewrl.desktop \$(INSTALL_DIR)\/applications/Desktop/freewrl.desktop\n";
++	print MK "\tinstall -D Desktop/freewrl.png \$(DESTDIR)/\$(INSTALL_DIR)\/pixmaps/Desktop/freewrl.png\n";
++	print MK "\tinstall -D Desktop/freewrl.desktop \$(DESTDIR)/\$(INSTALL_DIR)\/applications/Desktop/freewrl.desktop\n";
+ 	# we need the 2 installs for the following; the first makes the directory, the second fills it.
+-	print MK "\tinstall -d fonts \$(INSTALL_DIR)/freewrl/fonts\n";
+-	print MK "\tinstall -D fonts/* \$(INSTALL_DIR)/freewrl/fonts\n";
+-	print MK "\tinstall -d  x3d \$(INSTALL_DIR)/freewrl/x3d\n";
+-	print MK "\tinstall -D  x3d/* \$(INSTALL_DIR)/freewrl/x3d\n";
++	print MK "\tinstall -d fonts \$(DESTDIR)/\$(INSTALL_DIR)/freewrl/fonts\n";
++	print MK "\tinstall -D fonts/* \$(DESTDIR)/\$(INSTALL_DIR)/freewrl/fonts\n";
++	print MK "\tinstall -d  x3d \$(DESTDIR)/\$(INSTALL_DIR)/freewrl/x3d\n";
++	print MK "\tinstall -D  x3d/* \$(DESTDIR)/\$(INSTALL_DIR)/freewrl/x3d\n";
+ 	} else {
+-	print MK "\tinstall -d \$(INSTALL_DIR)/freewrl/fonts\n";
+-	print MK "\tinstall fonts/*.ttf \$(INSTALL_DIR)/freewrl/fonts\n";
+-	print MK "\tinstall fonts/*.TXT \$(INSTALL_DIR)/freewrl/fonts\n";
+-	print MK "\tinstall fonts/*.conf \$(INSTALL_DIR)/freewrl/fonts\n";
+-	print MK "\tinstall -d  \$(INSTALL_DIR)/freewrl/x3d\n";
+-	print MK "\tinstall  x3d/*.dtd \$(INSTALL_DIR)/freewrl/x3d\n";
+-	print MK "\tinstall  x3d/*.xslt \$(INSTALL_DIR)/freewrl/x3d\n";
++	print MK "\tinstall -d \$(DESTDIR)/\$(INSTALL_DIR)/freewrl/fonts\n";
++	print MK "\tinstall fonts/*.ttf \$(DESTDIR)/\$(INSTALL_DIR)/freewrl/fonts\n";
++	print MK "\tinstall fonts/*.TXT \$(DESTDIR)/\$(INSTALL_DIR)/freewrl/fonts\n";
++	print MK "\tinstall fonts/*.conf \$(DESTDIR)/\$(INSTALL_DIR)/freewrl/fonts\n";
++	print MK "\tinstall -d  \$(DESTDIR)/\$(INSTALL_DIR)/freewrl/x3d\n";
++	print MK "\tinstall  x3d/*.dtd \$(DESTDIR)/\$(INSTALL_DIR)/freewrl/x3d\n";
++	print MK "\tinstall  x3d/*.xslt \$(DESTDIR)/\$(INSTALL_DIR)/freewrl/x3d\n";
+ 	}
+ }
+ 
diff --git a/media-gfx/freewrl/freewrl-1.18.10.ebuild b/media-gfx/freewrl/freewrl-1.18.10.ebuild
new file mode 100644
index 000000000000..d8f240b7b3dc
--- /dev/null
+++ b/media-gfx/freewrl/freewrl-1.18.10.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/freewrl-1.18.10.ebuild,v 1.1 2007/01/17 07:45:27 hanno Exp $
+
+inherit nsplugins eutils perl-module toolchain-funcs
+
+IUSE="nsplugin"
+
+DESCRIPTION="VRML2 and X3D compliant browser"
+SRC_URI="mirror://sourceforge/freewrl/${P}.tar.gz"
+HOMEPAGE="http://freewrl.sourceforge.net/"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+DEPEND="|| ( (
+		x11-libs/libXau
+		x11-libs/libXdmcp
+		x11-libs/libXxf86vm
+		x11-libs/libXext
+		x11-libs/libX11
+		media-libs/mesa
+	) virtual/x11 )
+	virtual/opengl
+	virtual/jdk
+	media-libs/libpng
+	media-libs/jpeg
+	>=media-libs/freetype-2
+	>=dev-lang/perl-5.8.2
+	dev-perl/XML-Parser
+	media-fonts/ttf-bitstream-vera
+	!<media-gfx/freewrl-1.18.10"
+RDEPEND="media-gfx/imagemagick
+	media-sound/sox
+	net-misc/wget
+	${DEPEND}"
+MAKEOPTS="${MAKEOPTS} -j1"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	if use nsplugin; then
+		sed -i -e "s:/usr/lib/mozilla/plugins:/usr/$(get_libdir)/${PLUGINS_DIR}:g" vrml.conf
+	else
+		sed -i -e "s:NETSCAPE_:#NETSCAPE_:g" vrml.conf
+	fi
+
+	sed -i -e 's:-DHAVE_MOTIF::g' vrml.conf
+
+	epatch ${FILESDIR}/freewrl-makefile
+}
+
+src_compile() {
+	perl Makefile.PL
+	emake || die "make failed"
+
+	if use nsplugin; then
+		cd ${S}/Plugin
+		# build plugin with -fPIC
+		emake OPTIMIZER="$CFLAGS -DPIC -fPIC" || die "make failed"
+	fi
+}
+
+src_install() {
+	if use nsplugin; then
+		# create plugins dir *before* emake install, so that plugin will get installed
+		insinto /usr/$(get_libdir)/${PLUGINS_DIR}
+		doins java/classes/vrml.jar
+	fi
+	emake DESTDIR=${D} install || die "make install failed"
+	rm -rf ${D}/usr/share/freewrl/fonts
+	dosym /usr/share/fonts/ttf-bitstream-vera /usr/share/freewrl/fonts
+}