[PC-BSD Commits] r3265 - in pbibuild/modules/audacious: . overlay-dir

[svn at pcbsd.org]

Author: kris
Date: 2009-01-14 13:32:45 -0800 (Wed, 14 Jan 2009)
New Revision: 3265

Modified:
   pbibuild/modules/audacious/build.sh
   pbibuild/modules/audacious/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/audacious/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/audacious/pbi.conf
   pbibuild/modules/audacious/preportmake.sh
Log:

Updated audacious to be 100% self-contained



Modified: pbibuild/modules/audacious/build.sh
===================================================================
--- pbibuild/modules/audacious/build.sh	2009-01-14 20:37:41 UTC (rev 3264)
+++ pbibuild/modules/audacious/build.sh	2009-01-14 21:32:45 UTC (rev 3265)
@@ -8,16 +8,3 @@
 # MODULEDIR = The location of the module directory for this PBI
 #   PORTVER = Version number of the port we used to build
 ##############################################################################
-
-# Get all the various language files and copy them to the PBI
-LANGFILE="audacious.mo"
-mkdir ${PBIDIR}/locale/
-cd /usr/local/share/locale
-for i in `ls`
-do
-  if [ -e "/usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE}" ]
-  then
-    mkdir ${PBIDIR}/locale/${i}
-    cp /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE} ${PBIDIR}/locale/${i}/
-  fi
-done

Modified: pbibuild/modules/audacious/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/audacious/overlay-dir/PBI.RemoveScript.sh	2009-01-14 20:37:41 UTC (rev 3264)
+++ pbibuild/modules/audacious/overlay-dir/PBI.RemoveScript.sh	2009-01-14 21:32:45 UTC (rev 3265)
@@ -7,19 +7,7 @@
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
 
-# Remove all of our various symlinks
-rm /usr/local/bin/amarok
-rm /usr/local/bin/audtool
-rm /Programs/Audacious
 
-# Remove the old locale files since we are uninstalling
-LANGFILE="audacious.mo"
-cd /Programs/${PROGDIR}/locale
-for i in `ls`
-do
-  rm /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE}
-done
-
 cd /home
 for i in `ls` 
    do 

Modified: pbibuild/modules/audacious/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/audacious/overlay-dir/PBI.SetupScript.sh	2009-01-14 20:37:41 UTC (rev 3264)
+++ pbibuild/modules/audacious/overlay-dir/PBI.SetupScript.sh	2009-01-14 21:32:45 UTC (rev 3265)
@@ -14,19 +14,15 @@
 # echo 'SETSTEPS: <num>' # Set the current progress of the progress bar
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
-ln -fs /Programs/${PROGDIR}/.sbin/audacious /usr/local/bin/audacious
-ln -fs /Programs/${PROGDIR}/.sbin/audtool /usr/local/bin/audtool
-ln -fs /Programs/${PROGDIR} /Programs/Audacious
 
+# 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
 
-# Copy over all the LANG files
-LANGFILE="audacious.mo"
-cd /Programs/${PROGDIR}/locale
-for i in `ls`
-do
-  mkdir -p /usr/local/share/locale/${i}/LC_MESSAGES >/dev/null 2>/dev/null
-  cp /Programs/${PROGDIR}/locale/${i}/${LANGFILE} /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE}
-done
 
 # Copy over the default config files for audacious
 # This fixes bugs of not using OSS by default
@@ -38,4 +34,4 @@
   chown -R ${i}:${i} ${i}/.config/audacious
 done
 
-echo "LAUNCHCLOSE: /usr/local/bin/audacious"
+echo "LAUNCHCLOSE: /Programs/bin/audacious"

Modified: pbibuild/modules/audacious/pbi.conf
===================================================================
--- pbibuild/modules/audacious/pbi.conf	2009-01-14 20:37:41 UTC (rev 3264)
+++ pbibuild/modules/audacious/pbi.conf	2009-01-14 21:32:45 UTC (rev 3265)
@@ -25,13 +25,14 @@
 PBIUPDATE="http://update.pbidir.com"
 
 # Other Ports we need built (One per line)
-OTHERPORT="/usr/ports/multimedia/audacious-plugins"
+OTHERPORT="/usr/ports/multimedia/audacious-plugins
+/usr/ports/x11-themes/qtcurve-gtk2"
 
 # Enter your custom make options here
-MAKEOPTS="PREFIX=/Programs/Audacious"
+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="37"
+BUILDKEY="01"
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY

Modified: pbibuild/modules/audacious/preportmake.sh
===================================================================
--- pbibuild/modules/audacious/preportmake.sh	2009-01-14 20:37:41 UTC (rev 3264)
+++ pbibuild/modules/audacious/preportmake.sh	2009-01-14 21:32:45 UTC (rev 3265)
@@ -1,13 +1,3 @@
 #!/bin/sh
 ##############################################################
 
-# Make our new prefix dir
-rm -rf /Programs/Audacious
-mkdir /Programs
-ln -s /usr/local /Programs/Audacious
-
-cd /usr/ports/lang/python25
-make clean
-make 
-make install
-make clean