[PC-BSD Commits] r3261 - in pbibuild/modules: atunes atunes/overlay-dir javajre16 javajre16/overlay-dir
svn at pcbsd.org
svn at pcbsd.org
Wed Jan 14 11:22:35 PST 2009
Author: kris
Date: 2009-01-14 11:22:35 -0800 (Wed, 14 Jan 2009)
New Revision: 3261
Modified:
pbibuild/modules/atunes/copy-files
pbibuild/modules/atunes/overlay-dir/PBI.FirstRun.sh
pbibuild/modules/atunes/overlay-dir/PBI.RemoveScript.sh
pbibuild/modules/atunes/overlay-dir/PBI.SetupScript.sh
pbibuild/modules/atunes/pbi.conf
pbibuild/modules/atunes/preportmake.sh
pbibuild/modules/javajre16/overlay-dir/PBI.RemoveScript.sh
pbibuild/modules/javajre16/overlay-dir/PBI.SetupScript.sh
pbibuild/modules/javajre16/preportmake.sh
Log:
Updated atunes to be 100% self-contained, doesn't need seperate java anymore. Also updated javajre16 to build
Modified: pbibuild/modules/atunes/copy-files
===================================================================
--- pbibuild/modules/atunes/copy-files 2009-01-14 19:14:47 UTC (rev 3260)
+++ pbibuild/modules/atunes/copy-files 2009-01-14 19:22:35 UTC (rev 3261)
@@ -1,2 +1,6 @@
/usr/local/bin/atunes bin/
/usr/local/share/atunes share/
+/usr/local/bin/java* bin/
+/usr/local/bin/classpath bin/
+/usr/local/etc/java* etc/
+/usr/local/diablo-jre1.6.0 ./
Modified: pbibuild/modules/atunes/overlay-dir/PBI.FirstRun.sh
===================================================================
--- pbibuild/modules/atunes/overlay-dir/PBI.FirstRun.sh 2009-01-14 19:14:47 UTC (rev 3260)
+++ pbibuild/modules/atunes/overlay-dir/PBI.FirstRun.sh 2009-01-14 19:22:35 UTC (rev 3261)
@@ -13,9 +13,9 @@
# echo 'MSG: <text>' # Display this text above progress bar
#########################################
-if [ ! -e "/usr/local/bin/java" ]
-then
- kdialog --msgbox "Atunes requires Java! Please install Java from www.pbidir.com "
- exit 2
-fi
+#if [ ! -e "/usr/local/bin/java" ]
+#then
+# kdialog --msgbox "Atunes requires Java! Please install Java from www.pbidir.com "
+# exit 2
+#fi
Modified: pbibuild/modules/atunes/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/atunes/overlay-dir/PBI.RemoveScript.sh 2009-01-14 19:14:47 UTC (rev 3260)
+++ pbibuild/modules/atunes/overlay-dir/PBI.RemoveScript.sh 2009-01-14 19:22:35 UTC (rev 3261)
@@ -7,8 +7,3 @@
# TIP: 'kdialog' should be used for user interaction.
#########################################
-
-# Cleanup our main symlinks
-rm /usr/local/bin/atunes
-rm /usr/local/share/atunes
-
Modified: pbibuild/modules/atunes/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/atunes/overlay-dir/PBI.SetupScript.sh 2009-01-14 19:14:47 UTC (rev 3260)
+++ pbibuild/modules/atunes/overlay-dir/PBI.SetupScript.sh 2009-01-14 19:22:35 UTC (rev 3261)
@@ -12,10 +12,13 @@
# echo 'MSG: <text>' # Display this text above progress bar
#########################################
-cd /Programs/${PROGDIR}
-ln -s /Programs/${PROGDIR}/.sbin/atunes /usr/local/bin/atunes
-ln -s /Programs/${PROGDIR}/share/atunes /usr/local/share/atunes
+# Check which font config we want to link to
+if [ -d "/PCBSD/local/etc/fonts" ]
+then
+ ln -s /PCBSD/local/etc/fonts /Programs/${PROGDIR}/etc/fonts
+else
+ ln -s /usr/local/etc/fonts /Programs/${PROGDIR}/etc/fonts
+fi
-
-echo "LAUNCHCLOSE: /usr/local/bin/atunes"
+echo "LAUNCHCLOSE: /Programs/bin/atunes"
Modified: pbibuild/modules/atunes/pbi.conf
===================================================================
--- pbibuild/modules/atunes/pbi.conf 2009-01-14 19:14:47 UTC (rev 3260)
+++ pbibuild/modules/atunes/pbi.conf 2009-01-14 19:22:35 UTC (rev 3261)
@@ -25,20 +25,20 @@
PBIUPDATE="http://update.pbidir.com"
# Other Ports we need built (One per line)
-OTHERPORT=""
+OTHERPORT="/usr/ports/x11-themes/qtcurve-gtk2"
# Enter your custom make options here
MAKEOPTS=""
# Build Key - Change this to anything else to trigger a rebuild
# - The rebuild will take place even if port is still the same ver
-BUILDKEY="02"
+BUILDKEY="01"
# If this port has a non-standard port version variable in Makefile, then
# list the key here such as "OOOVERSION="
#VERKEY=""
# Mark this port as broken, until we can find compile fix
-PORTBROKE="YES" ; export PORTBROKE
+#PORTBROKE="YES" ; export PORTBROKE
export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY VERKEY
Modified: pbibuild/modules/atunes/preportmake.sh
===================================================================
--- pbibuild/modules/atunes/preportmake.sh 2009-01-14 19:14:47 UTC (rev 3260)
+++ pbibuild/modules/atunes/preportmake.sh 2009-01-14 19:22:35 UTC (rev 3261)
@@ -2,9 +2,8 @@
# Script to grab the java files and place them in the right directory
# before starting the build
-mkdir -p /usr/ports/distfiles
cd /usr/ports/distfiles
-
+
# Get the Java files / patchset
fetch http://www.pcbsd.org/~kris/autobuildpkgs/bsd-jdk16-patches-4.tar.bz2
fetch http://www.pcbsd.org/~kris/autobuildpkgs/jdk-6u3-fcs-src-b05-jrl-24_sep_2007.jar
@@ -30,15 +29,11 @@
# Get the tzupdater files
fetch http://www.pcbsd.org/~kris/autobuildpkgs/tzupdater-1_3_11-2008i.zip
-cd /usr/ports/lang/perl5.8
-make clean
-make
-make install
-make clean
-
cd /usr/ports/java/jdk16/
echo "#!/bin/sh
exit 0" > /usr/ports/java/jdk16/files/license.sh
+
+cd /usr/ports/java/diablo-jre16
make install
cd /usr/ports/devel/automake15
Modified: pbibuild/modules/javajre16/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/javajre16/overlay-dir/PBI.RemoveScript.sh 2009-01-14 19:14:47 UTC (rev 3260)
+++ pbibuild/modules/javajre16/overlay-dir/PBI.RemoveScript.sh 2009-01-14 19:22:35 UTC (rev 3261)
@@ -7,7 +7,6 @@
# TIP: 'kdialog' should be used for user interaction.
#########################################
-
# Cleanup our main symlinks
rm /usr/local/diablo-jre1.6.0
rm /usr/local/bin/javavm
@@ -21,13 +20,6 @@
rm /usr/local/bin/${line}
done < bin-links
-cd etc
-for i in `ls`
-do
- rm /usr/local/etc/${i}
-done
-
-
# UnLink the mozilla plugin
cd /home
for i in `ls`
Modified: pbibuild/modules/javajre16/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/javajre16/overlay-dir/PBI.SetupScript.sh 2009-01-14 19:14:47 UTC (rev 3260)
+++ pbibuild/modules/javajre16/overlay-dir/PBI.SetupScript.sh 2009-01-14 19:22:35 UTC (rev 3261)
@@ -23,12 +23,6 @@
ln -s /usr/local/bin/javavm /usr/local/bin/${line}
done < bin-links
-cd etc
-for i in `ls`
-do
- ln -s /Programs/${PROGDIR}/etc/${i} /usr/local/etc/${i}
-done
-
ARCH="`uname -m`"
# Link the mozilla plugin
Modified: pbibuild/modules/javajre16/preportmake.sh
===================================================================
--- pbibuild/modules/javajre16/preportmake.sh 2009-01-14 19:14:47 UTC (rev 3260)
+++ pbibuild/modules/javajre16/preportmake.sh 2009-01-14 19:22:35 UTC (rev 3261)
@@ -2,7 +2,6 @@
# Script to grab the java files and place them in the right directory
# before starting the build
-mkdir -p /usr/ports/distfiles
cd /usr/ports/distfiles
ARCH="`uname -p`"
@@ -32,8 +31,6 @@
# Get the tzupdater files
fetch http://www.pcbsd.org/~kris/autobuildpkgs/tzupdater-1_3_11-2008i.zip
-pkg_add -r perl
-
cd /usr/ports/java/jdk16/
echo "#!/bin/sh
exit 0" > /usr/ports/java/jdk16/files/license.sh
More information about the Commits
mailing list