freewrl-1.16.1

Package-Manager: portage-2.1_pre1

7 files changed, 159 insertions, 5 deletions

diff --git a/media-gfx/freewrl/ChangeLog b/media-gfx/freewrl/ChangeLog
index ef7c0320e788..cd51fc7cf5e9 100644
--- a/media-gfx/freewrl/ChangeLog
+++ b/media-gfx/freewrl/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-gfx/freewrl
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/ChangeLog,v 1.6 2005/12/16 11:23:46 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/ChangeLog,v 1.7 2005/12/20 03:59:51 hanno Exp $
+
+*freewrl-1.16.1 (20 Dec 2005)
+
+  20 Dec 2005; Hanno Boeck <hanno@gentoo.org>
+  +files/freewrl-1.16.1-disable-rpm.patch,
+  +files/freewrl-1.16.1-plugin-install.patch,
+  +files/freewrl-1.16.1-use-java-home.patch, +freewrl-1.16.1.ebuild:
+  Version bump, thanks to basic in bug #74706.
 
   16 Dec 2005; Diego Pettenò <flameeyes@gentoo.org> freewrl-1.06.ebuild:
   Remove GNUish cp -a call. Bug #103487.
diff --git a/media-gfx/freewrl/Manifest b/media-gfx/freewrl/Manifest
index 2c7d82c2e2bb..64d843c2a2a7 100644
--- a/media-gfx/freewrl/Manifest
+++ b/media-gfx/freewrl/Manifest
@@ -1,15 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 f58c361d19df32d3d599e78cd2585e2b ChangeLog 895
+MD5 b18d3fbecd97590d5b7f3a138520bedd ChangeLog 1174
 MD5 dc0d00c8e6965ece64a0d6e85cf00a57 files/FreeWRL-1.06+gentoo_pd.diff 4123
 MD5 1debb4c7bf95c1ae23a71d9c61830039 files/digest-freewrl-1.06 65
+MD5 3cf4b9ee2c6579e48248c1f418dfcdb1 files/digest-freewrl-1.16.1 67
+MD5 5f41788634df08e7b90b05559692109f files/freewrl-1.16.1-disable-rpm.patch 591
+MD5 9077896dac8854fdaa66354a23277970 files/freewrl-1.16.1-plugin-install.patch 640
+MD5 84a326f975c5a350e047b1e09a30dff0 files/freewrl-1.16.1-use-java-home.patch 1255
 MD5 9a8795105d1111a2c61e57fab9345ce8 freewrl-1.06.ebuild 1540
+MD5 2632a1c54507b9f9a9e233da8ed6d7a2 freewrl-1.16.1.ebuild 1573
 MD5 a72a06a37ca4e5905085ebff07fe9e9e metadata.xml 217
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDoqPOAiZjviIA2XgRAvFuAJ4jb0nD5jryOomisCNnPcuJ8BmVzgCeJN+W
-xls5+ztnzSdPUP9WSSFBIsU=
-=ne2P
+iD8DBQFDp4Jor2QksT29OyARApXmAKCEslTI/3/YNyy3lTZ7MZI8cAe5BACeLIJZ
+4Cj4sB8/CwSY3tJXc9K4B+A=
+=gTaL
 -----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
new file mode 100644
index 000000000000..af1389bb6fb4
--- /dev/null
+++ b/media-gfx/freewrl/files/digest-freewrl-1.16.1
@@ -0,0 +1 @@
+MD5 8cae1d5e9df3f3be9baeb844cae4dffd freewrl-1.16.1.tar.gz 3333751
diff --git a/media-gfx/freewrl/files/freewrl-1.16.1-disable-rpm.patch b/media-gfx/freewrl/files/freewrl-1.16.1-disable-rpm.patch
new file mode 100644
index 000000000000..3225f617adcf
--- /dev/null
+++ b/media-gfx/freewrl/files/freewrl-1.16.1-disable-rpm.patch
@@ -0,0 +1,15 @@
+--- vrml.conf.orig	2005-12-11 11:10:37.000000000 +0800
++++ vrml.conf	2005-12-11 11:30:33.000000000 +0800
+@@ -114,10 +114,10 @@
+ 
+ 	# where the RPMS and SRPMS and SOURCES and SPECS directories live:
+ 	# might be /usr/src/redhat, /usr/src/packages, or...?
+-	RPM_PREFIX => '/usr/src/redhat',
++#	RPM_PREFIX => '/usr/src/redhat',
+ 
+ 	# what OS version is this built on? each Linux release has a different
+ 	# file name here - might be /etc/SuSE-release. Not required if RPM_PREFIX
+ 	# is commented out.
+-	RPM_OSNAME_FILE => '/etc/redhat-release',
++#	RPM_OSNAME_FILE => '/etc/redhat-release',
+ );
diff --git a/media-gfx/freewrl/files/freewrl-1.16.1-plugin-install.patch b/media-gfx/freewrl/files/freewrl-1.16.1-plugin-install.patch
new file mode 100644
index 000000000000..535331754a48
--- /dev/null
+++ b/media-gfx/freewrl/files/freewrl-1.16.1-plugin-install.patch
@@ -0,0 +1,25 @@
+Index: Plugin/Makefile
+===================================================================
+RCS file: /cvsroot/freewrl/freewrl/freewrl/Plugin/Makefile,v
+retrieving revision 1.4
+diff -u -r1.4 Makefile
+--- Plugin/Makefile	21 Mar 2005 13:39:14 -0000	1.4
++++ Plugin/Makefile	11 Dec 2005 08:30:37 -0000
+@@ -38,12 +38,13 @@
+ 
+ SHAREDTARGET=npfreewrl.so
+ 
+-install: npfreewrl
+-	cp npfreewrl.so $(PLUGDIR)
++all: $(SHAREDTARGET)
+ 
+-all:	npfreewrl
+ 
+-npfreewrl: $(OBJ)
++install: $(SHAREDTARGET)
++	cp $(SHAREDTARGET) $(PLUGDIR)
++
++$(SHAREDTARGET): $(OBJ)
+ 	$(CC) -shared -o $(SHAREDTARGET) $(OBJ) $(LDFLAGS)
+ 
+ npfreewrl.o: netscape/source/npfreewrl.c
diff --git a/media-gfx/freewrl/files/freewrl-1.16.1-use-java-home.patch b/media-gfx/freewrl/files/freewrl-1.16.1-use-java-home.patch
new file mode 100644
index 000000000000..232417db8ca7
--- /dev/null
+++ b/media-gfx/freewrl/files/freewrl-1.16.1-use-java-home.patch
@@ -0,0 +1,36 @@
+Index: Makefile.PL
+===================================================================
+RCS file: /cvsroot/freewrl/freewrl/freewrl/Makefile.PL,v
+retrieving revision 1.154
+diff -u -r1.154 Makefile.PL
+--- Makefile.PL	29 Nov 2005 16:31:25 -0000	1.154
++++ Makefile.PL	11 Dec 2005 04:49:51 -0000
+@@ -160,6 +160,12 @@
+ $VRML_CONFIG{LDFLAGS} = join(' ', @ldflags);
+ $VRML_CONFIG{LIBJS_INST} = $sitearchjsdir;
+ 
++if (defined $VRML_CONFIG{'USE_JAVA_HOME'})
++{
++	$VRML_CONFIG{JAVA} = $ENV{JAVA_HOME}.'/bin/java';
++	$VRML_CONFIG{JAVA_INST} = $ENV{JAVA_HOME};
++}
++
+ # write the Config.pm file.
+ print STDERR "Writing Config.pm\n";
+ open OUT, ">Config.pm" or die("Couldn't write to Config.pm");
+Index: vrml.conf
+===================================================================
+RCS file: /cvsroot/freewrl/freewrl/freewrl/vrml.conf,v
+retrieving revision 1.55
+diff -u -r1.55 vrml.conf
+--- vrml.conf	12 Oct 2005 13:01:07 -0000	1.55
++++ vrml.conf	11 Dec 2005 04:49:51 -0000
+@@ -35,6 +35,8 @@
+ # some wrl/x3d files are zipped; how do we unzip them?
+ UNZIP => "/bin/gunzip",	
+ 
++USE_JAVA_HOME => 1,
++
+ # Java compiler. Java, Jikes, etc is ok, so long as it is not ancient.
+ #if you do not have Java, comment this and the JAVA_INST line below out.
+ JAVA => "/usr/bin/java",
diff --git a/media-gfx/freewrl/freewrl-1.16.1.ebuild b/media-gfx/freewrl/freewrl-1.16.1.ebuild
new file mode 100644
index 000000000000..2f3df3ffc1a1
--- /dev/null
+++ b/media-gfx/freewrl/freewrl-1.16.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/freewrl/freewrl-1.16.1.ebuild,v 1.1 2005/12/20 03:59:51 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="virtual/x11
+	virtual/opengl
+	virtual/jdk
+	media-libs/libpng
+	media-libs/jpeg
+	>=media-libs/freetype-2
+	>=dev-lang/perl-5.8.2
+	perl-core/ExtUtils-MakeMaker
+	dev-perl/XML-Parser"
+
+RDEPEND="media-gfx/imagemagick
+	media-sound/sox
+	net-misc/wget
+	${DEPEND}"
+
+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
+
+	epatch "${FILESDIR}/freewrl-1.16.1-plugin-install.patch"
+	epatch "${FILESDIR}/freewrl-1.16.1-use-java-home.patch"
+	epatch "${FILESDIR}/freewrl-1.16.1-disable-rpm.patch"
+}
+
+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"
+}