freewrl update

Package-Manager: portage-2.1.2

6 files changed, 188 insertions, 10 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/Manifest b/media-gfx/freewrl/Manifest
index b7f9318272d9..40ecedcf2927 100644
--- a/media-gfx/freewrl/Manifest
+++ b/media-gfx/freewrl/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX freewrl-1.16.1-disable-rpm.patch 591 RMD160 8b42f4094feb10fd188ce62cc83bee2df8b57ea8 SHA1 47eaf37377ecc5db0003f4fc7cc95832820b9577 SHA256 4f4bf14807f4166ef3a016db5a1699b38dbf88e4658ddb53b41e42d6134bce66
 MD5 5f41788634df08e7b90b05559692109f files/freewrl-1.16.1-disable-rpm.patch 591
 RMD160 8b42f4094feb10fd188ce62cc83bee2df8b57ea8 files/freewrl-1.16.1-disable-rpm.patch 591
@@ -10,19 +13,38 @@ AUX freewrl-1.16.1-use-java-home.patch 1255 RMD160 ba020dca6f6be2f92b032418e3579
 MD5 84a326f975c5a350e047b1e09a30dff0 files/freewrl-1.16.1-use-java-home.patch 1255
 RMD160 ba020dca6f6be2f92b032418e35795c184450d5d files/freewrl-1.16.1-use-java-home.patch 1255
 SHA256 55c92277470ce0dcddac47758a4ea001c4b7ff9a44bf7dae20d51d0daa4945af files/freewrl-1.16.1-use-java-home.patch 1255
-DIST freewrl-1.16.1.tar.gz 3333751
+AUX freewrl-makefile 4245 RMD160 45a2cd63f334a28df4404bb69eb368050f4def94 SHA1 f4af9556843e1024db78681090add2c5ba3651f9 SHA256 feb737b64a323ddeae9384d54e1a40b1a9fd371d034607dc266e9ceadd12045a
+MD5 fec564f07c9e3ffd6d1456bc34b9706a files/freewrl-makefile 4245
+RMD160 45a2cd63f334a28df4404bb69eb368050f4def94 files/freewrl-makefile 4245
+SHA256 feb737b64a323ddeae9384d54e1a40b1a9fd371d034607dc266e9ceadd12045a files/freewrl-makefile 4245
+DIST freewrl-1.16.1.tar.gz 3333751 RMD160 96643006d28a0aa54222829140fed41446d21a51 SHA1 b9c8b6455a343998dc6dc0a1343d3d58998a3679 SHA256 51baee1a326d78eac33700de3a9df8ace792785a95b5309fcfadc12ee3288625
+DIST freewrl-1.18.10.tar.gz 3581122 RMD160 db3f699ae96104ed347a7ffbb615c1e90600457f SHA1 e6912e36da1c27753284c03c7fcc37b67827a436 SHA256 7d6dd3ca3f39605b7703736d168e3d99231a3ccf9f199ae6a459adc82463f35e
 EBUILD freewrl-1.16.1.ebuild 1698 RMD160 415390aac601028abf54095c0d99ac4edb2ecfef SHA1 51888bd2d84fbe2cc4b10a960a6880ec9af33ea6 SHA256 fddff7304d8faa22c85c56731a49829cf1156cdc9e0d79125422ca00312a528a
 MD5 de4fad77fcdc029307b52f8066b12f74 freewrl-1.16.1.ebuild 1698
 RMD160 415390aac601028abf54095c0d99ac4edb2ecfef freewrl-1.16.1.ebuild 1698
 SHA256 fddff7304d8faa22c85c56731a49829cf1156cdc9e0d79125422ca00312a528a freewrl-1.16.1.ebuild 1698
-MISC ChangeLog 1871 RMD160 993ad36e2aa6a50f7b7138c19982e57ebf70ba9c SHA1 cbd90b9c734f5527f05c48fe88fce1a36b40c1c6 SHA256 b4b48801a71e5b8ce3d1654e7bd7024f0d3291e7097672c6162140b635bd8ad4
-MD5 a3c1d4b6d2a7e131c4226ec8f207aa4e ChangeLog 1871
-RMD160 993ad36e2aa6a50f7b7138c19982e57ebf70ba9c ChangeLog 1871
-SHA256 b4b48801a71e5b8ce3d1654e7bd7024f0d3291e7097672c6162140b635bd8ad4 ChangeLog 1871
+EBUILD freewrl-1.18.10.ebuild 1770 RMD160 288bb438d8cdfb1cbcefeeccc7d0363a2ef129d6 SHA1 a2f44209d858073a33ebe614df201632eb380335 SHA256 b4e2b58e937c48a47682da81d0ae53258e089de7c125c1cbce7d95c8ac45a930
+MD5 391de3e7e63fde651b16a548f715808b freewrl-1.18.10.ebuild 1770
+RMD160 288bb438d8cdfb1cbcefeeccc7d0363a2ef129d6 freewrl-1.18.10.ebuild 1770
+SHA256 b4e2b58e937c48a47682da81d0ae53258e089de7c125c1cbce7d95c8ac45a930 freewrl-1.18.10.ebuild 1770
+MISC ChangeLog 2105 RMD160 f3548cbfb1b557c3d765a835ae8ba6817d19a068 SHA1 7c7c11ee96e34d6a0cd19184e6540c3659895916 SHA256 cfc2e1cb44f595439f3601ff41120cc4e719d0977b61ada06276fc88d656ce27
+MD5 8973b0dad8f064aef8abad367506ef26 ChangeLog 2105
+RMD160 f3548cbfb1b557c3d765a835ae8ba6817d19a068 ChangeLog 2105
+SHA256 cfc2e1cb44f595439f3601ff41120cc4e719d0977b61ada06276fc88d656ce27 ChangeLog 2105
 MISC metadata.xml 217 RMD160 3b01d5dab901ee93217f72b711954d3cccbb1717 SHA1 e304788b60dd2cf214d360a21d267e8635474d98 SHA256 2f5dfc1eb79d2d9ee02663da6e1449f499c3a37b7f4cc2391e18d7789a314669
 MD5 a72a06a37ca4e5905085ebff07fe9e9e metadata.xml 217
 RMD160 3b01d5dab901ee93217f72b711954d3cccbb1717 metadata.xml 217
 SHA256 2f5dfc1eb79d2d9ee02663da6e1449f499c3a37b7f4cc2391e18d7789a314669 metadata.xml 217
-MD5 3cf4b9ee2c6579e48248c1f418dfcdb1 files/digest-freewrl-1.16.1 67
-RMD160 a122626006a47c737f68b8cf591fafbd48715150 files/digest-freewrl-1.16.1 67
-SHA256 5ac5f114d38aaebf26033bf4df39852db299b5608720753e2cfe3cde48d362ed files/digest-freewrl-1.16.1 67
+MD5 8bc3a93f084eef5dc6cd693970871da4 files/digest-freewrl-1.16.1 247
+RMD160 7c5559710afb41377fdfad26066d5e7385e9e42c files/digest-freewrl-1.16.1 247
+SHA256 fc70e62d716957cc39fd88b2f9a4ab77ad9f3c5f875310289ba5d183b0a78525 files/digest-freewrl-1.16.1 247
+MD5 69b250d7890deaeca9f1738e4dd689ef files/digest-freewrl-1.18.10 250
+RMD160 fb5ef696e11c7aec88e8170df014667f602aacaf files/digest-freewrl-1.18.10 250
+SHA256 3141e2a636c2aa1c126a80801a5bc48d4e17273a2f943c8c7c5c0cd573553cba files/digest-freewrl-1.18.10 250
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.1 (GNU/Linux)
+
+iD8DBQFFrdQNr2QksT29OyARAmVPAJ44T5iUxoThXq0jS8cb0pgjFEGYmgCdGhpg
+eXeSdhdAYlLhmTx6gyse5Q8=
+=rjeZ
+-----END PGP SIGNATURE-----
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
+}