[PC-BSD Commits] r3312 - in pbibuild/modules/gxmms2: . overlay-dir

[svn at pcbsd.org]

Author: kris
Date: 2009-01-21 13:06:38 -0800 (Wed, 21 Jan 2009)
New Revision: 3312

Removed:
   pbibuild/modules/gxmms2/overlay-dir/lib
Modified:
   pbibuild/modules/gxmms2/build.sh
   pbibuild/modules/gxmms2/overlay-dir/PBI.FirstRun.sh
   pbibuild/modules/gxmms2/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/gxmms2/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/gxmms2/pbi.conf
Log:

Updated gxmms2, now 100% self-contained



Modified: pbibuild/modules/gxmms2/build.sh
===================================================================
--- pbibuild/modules/gxmms2/build.sh	2009-01-21 21:02:25 UTC (rev 3311)
+++ pbibuild/modules/gxmms2/build.sh	2009-01-21 21:06:38 UTC (rev 3312)
@@ -8,17 +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="xmms2.mo"
-mkdir -p ${PBIDIR}/share/locale/
-cd /usr/local/share/locale
-for i in `ls`
-do
-  if [ -e "/usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE}" ]
-  then
-    mkdir -p ${PBIDIR}/share/locale/${i}/LC_MESSAGES
-    cp /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE} ${PBIDIR}/share/locale/${i}/LC_MESSAGES/
-  fi
-done
-

Modified: pbibuild/modules/gxmms2/overlay-dir/PBI.FirstRun.sh
===================================================================
--- pbibuild/modules/gxmms2/overlay-dir/PBI.FirstRun.sh	2009-01-21 21:02:25 UTC (rev 3311)
+++ pbibuild/modules/gxmms2/overlay-dir/PBI.FirstRun.sh	2009-01-21 21:06:38 UTC (rev 3312)
@@ -17,13 +17,7 @@
 #########################################
 
 
-if [ -e "/usr/local/bin/gxmms2" ]
-then
-  kdialog -error "gxmms2 is already installed! Please remove it before re-installing!"
-  exit 2
-fi
-
-ls /usr/local/bin/xmms2d 2>/dev/null
+which xmms2d 2>/dev/null
 if [ "$?" != "0" ]
 then
   kdialog -error "Warning: xmms2 does not appear to be installed. Gxmms2 requires xmms2 to be installed for proper function. The install will continue anyway. Please install xmms2 from www.pbidir.com"

Modified: pbibuild/modules/gxmms2/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/gxmms2/overlay-dir/PBI.RemoveScript.sh	2009-01-21 21:02:25 UTC (rev 3311)
+++ pbibuild/modules/gxmms2/overlay-dir/PBI.RemoveScript.sh	2009-01-21 21:06:38 UTC (rev 3312)
@@ -7,8 +7,6 @@
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
 
-rm /usr/local/bin/gxmms2
-rm /Programs/gxmms2
 
 
 if [ ! -z "$DISPLAY" ]

Modified: pbibuild/modules/gxmms2/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/gxmms2/overlay-dir/PBI.SetupScript.sh	2009-01-21 21:02:25 UTC (rev 3311)
+++ pbibuild/modules/gxmms2/overlay-dir/PBI.SetupScript.sh	2009-01-21 21:06:38 UTC (rev 3312)
@@ -15,10 +15,12 @@
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
 
-rm /Programs/gxmms2
-ln -s /Programs/${PROGDIR} /Programs/gxmms2
+# 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
 
-ln -s /Programs/${PROGDIR}/.sbin/gxmms2 /usr/local/bin/gxmms2
-
-
-echo "LAUNCHCLOSE: /usr/local/bin/gxmms2"
+echo "LAUNCHCLOSE: /Programs/bin/gxmms2"

Modified: pbibuild/modules/gxmms2/pbi.conf
===================================================================
--- pbibuild/modules/gxmms2/pbi.conf	2009-01-21 21:02:25 UTC (rev 3311)
+++ pbibuild/modules/gxmms2/pbi.conf	2009-01-21 21:06:38 UTC (rev 3312)
@@ -25,15 +25,14 @@
 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="LDFLAGS=\"-Wl,--rpath=/Programs/gxmms2\"
-PREFIX=/Programs/gxmms2"
+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="06"
+BUILDKEY="01"
 
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY