[arch-commits] Commit in icedtea-web/trunk (PKGBUILD fix-man-location.patch)

[Ionut Biru]

    Date: Thursday, January 13, 2011 @ 16:48:52
  Author: ibiru
Revision: 105899

split build into plugin and doc, fix man location

Added:
  icedtea-web/trunk/fix-man-location.patch
Modified:
  icedtea-web/trunk/PKGBUILD

------------------------+
 PKGBUILD               |   32 ++++++++++++++++++++++----------
 fix-man-location.patch |   14 ++++++++++++++
 2 files changed, 36 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-01-13 21:46:11 UTC (rev 105898)
+++ PKGBUILD	2011-01-13 21:48:52 UTC (rev 105899)
@@ -1,7 +1,7 @@
 # $Id$
 # Maintainer: Andreas Radke <andyrtr at archlinux.org>
-
-pkgname=icedtea-web
+pkgbase=icedtea-web
+pkgname=('icedtea-web' 'icedtea-web-doc')
 pkgver=0.9.hg20110107
 pkgrel=1
 pkgdesc="provides a Free Software web browser plugin running applets written in the Java programming language and an implementation of Java Web Start, originally based on the NetX project"
@@ -22,9 +22,11 @@
 source=(#$pkgname-$pkgver.tar.gz
 	# latest snapshot from 1.0 release branch
 	# see http://icedtea.classpath.org/hg/release/icedtea-web-1.0/rev/b3647620fa41 for state
-	http://icedtea.classpath.org/hg/release/icedtea-web-1.0/archive/b3647620fa41.tar.bz2)
+	http://icedtea.classpath.org/hg/release/icedtea-web-1.0/archive/b3647620fa41.tar.bz2
+        fix-man-location.patch)
 noextract=()
-md5sums=('0468c20ad57d1d1f5e5b490956301d8e')
+md5sums=('0468c20ad57d1d1f5e5b490956301d8e'
+         '1608d3141594a272d330db6adb64a572')
 
 build() {
 #  cd "$srcdir/$pkgname-$pkgver"
@@ -39,18 +41,28 @@
   fi
 
 
-  cd $srcdir/$pkgname-*
+  cd $srcdir/$pkgbase-*
 
+  patch -Np1 -i $srcdir/fix-man-location.patch
+
   ./autogen.sh
-  ./configure --prefix=/usr \
-	--mandir=/usr/share/man \
+  ./configure --prefix=/usr/lib/jvm/java-6-openjdk \
+      --datarootdir=/usr/share
 #	--disable-doc \
 #	--disable-plugin #--help
   make
 }
 
-package() {
+package_icedtea-web() {
 #  cd "$srcdir/$pkgname-$pkgver"
-  cd $srcdir/$pkgname-*
-  make DESTDIR="$pkgdir/" install-data-local
+  cd $srcdir/$pkgbase-*
+  make DESTDIR="$pkgdir" install-exec-local
 }
+
+package_icedtea-web-doc() {
+#  cd "$srcdir/$pkgname-$pkgver"
+  cd $srcdir/$pkgbase-*
+  install -m755 -d $pkgdir/usr/lib/jvm/java-6-openjdk/jre/lib
+  make DESTDIR="$pkgdir" install-data-local
+}
+

Added: fix-man-location.patch
===================================================================
--- fix-man-location.patch	                        (rev 0)
+++ fix-man-location.patch	2011-01-13 21:48:52 UTC (rev 105899)
@@ -0,0 +1,14 @@
+diff -Nur icedtea-web-1-0-b3647620fa41.orig/Makefile.am icedtea-web-1-0-b3647620fa41/Makefile.am
+--- icedtea-web-1-0-b3647620fa41.orig/Makefile.am	2011-01-07 05:08:41.000000000 -0800
++++ icedtea-web-1-0-b3647620fa41/Makefile.am	2011-01-13 13:25:41.170004189 -0800
+@@ -114,8 +114,8 @@
+ 	${INSTALL_PROGRAM} $(NETX_DIR)/launcher/controlpanel/itweb-settings $(DESTDIR)$(bindir)
+ 
+ install-data-local:
+-	${mkinstalldirs} -d $(DESTDIR)$(prefix)/man/man1
+-	${INSTALL_DATA} $(NETX_SRCDIR)/javaws.1 $(DESTDIR)$(prefix)/man/man1
++	${mkinstalldirs} -d $(DESTDIR)$(mandir)/man1
++	${INSTALL_DATA} $(NETX_SRCDIR)/javaws.1 $(DESTDIR)$(mandir)/man1
+ 	${INSTALL_DATA} $(NETX_RESOURCE_DIR)/about.jnlp $(DESTDIR)$(prefix)/jre/lib
+ if ENABLE_DOCS
+ 	${mkinstalldirs} $(DESTDIR)$(htmldir)