[PC-BSD Commits] r3333 - in pbibuild/modules/gxmms2: . kmenu-dir overlay-dir overlay-dir/bin

svn at pcbsd.org svn at pcbsd.org
Mon Jan 26 12:56:08 PST 2009


Author: kris
Date: 2009-01-26 12:56:08 -0800 (Mon, 26 Jan 2009)
New Revision: 3333

Added:
   pbibuild/modules/gxmms2/kmenu-dir/xmms2
   pbibuild/modules/gxmms2/kmenu-dir/xmms2-admin
   pbibuild/modules/gxmms2/kmenu-dir/xmms2d
   pbibuild/modules/gxmms2/overlay-dir/bin/xmms2-admin.sh
Modified:
   pbibuild/modules/gxmms2/build.sh
   pbibuild/modules/gxmms2/copy-files
   pbibuild/modules/gxmms2/overlay-dir/PBI.FirstRun.sh
   pbibuild/modules/gxmms2/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/gxmms2/pbi.conf
Log:

Updated gxmms2 to include xmms2 now, effectively merging the two PBIs, so that the user doesn't need to install 2 programs just to play music



Modified: pbibuild/modules/gxmms2/build.sh
===================================================================
--- pbibuild/modules/gxmms2/build.sh	2009-01-26 19:51:25 UTC (rev 3332)
+++ pbibuild/modules/gxmms2/build.sh	2009-01-26 20:56:08 UTC (rev 3333)
@@ -8,3 +8,8 @@
 # MODULEDIR = The location of the module directory for this PBI
 #   PORTVER = Version number of the port we used to build
 ##############################################################################
+
+sed -e "s,CHANGEME,gxmms2${PORTVER},g" ${PBIDIR}/bin/xmms2-admin.sh > /tmp/sed
+mv /tmp/sed ${PBIDIR}/bin/xmms2-admin.sh
+chmod 755 ${PBIDIR}/bin/xmms2-admin.sh
+

Modified: pbibuild/modules/gxmms2/copy-files
===================================================================
--- pbibuild/modules/gxmms2/copy-files	2009-01-26 19:51:25 UTC (rev 3332)
+++ pbibuild/modules/gxmms2/copy-files	2009-01-26 20:56:08 UTC (rev 3333)
@@ -1,2 +1,14 @@
 /usr/local/bin/gxmms* bin/
 /usr/local/share/gxmms2 share/
+/usr/local/bin/xmms* bin/
+/usr/local/bin/faad bin/
+/usr/local/bin/flac bin/
+/usr/local/bin/nasm* bin/
+/usr/local/bin/ndisasm* bin/
+/usr/local/bin/curl* bin/
+/usr/local/share/xmms2 share/
+/usr/local/lib/xmms2* autolibs/
+/usr/local/lib/libmad* autolibs/
+/usr/local/lib/libOgg* autolibs/
+/usr/local/lib/libFLAC* autolibs/
+/usr/local/lib/libvorbis* autolibs/

Modified: pbibuild/modules/gxmms2/overlay-dir/PBI.FirstRun.sh
===================================================================
--- pbibuild/modules/gxmms2/overlay-dir/PBI.FirstRun.sh	2009-01-26 19:51:25 UTC (rev 3332)
+++ pbibuild/modules/gxmms2/overlay-dir/PBI.FirstRun.sh	2009-01-26 20:56:08 UTC (rev 3333)
@@ -15,11 +15,3 @@
 # echo 'SETSTEPS: <num>' # Set the current progress of the progress bar
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
-
-
-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"
-fi
-

Modified: pbibuild/modules/gxmms2/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/gxmms2/overlay-dir/PBI.SetupScript.sh	2009-01-26 19:51:25 UTC (rev 3332)
+++ pbibuild/modules/gxmms2/overlay-dir/PBI.SetupScript.sh	2009-01-26 20:56:08 UTC (rev 3333)
@@ -23,4 +23,3 @@
   ln -s /usr/local/etc/fonts /Programs/${PROGDIR}/etc/fonts
 fi
 
-echo "LAUNCHCLOSE: /Programs/bin/gxmms2"


Property changes on: pbibuild/modules/gxmms2/overlay-dir/bin/xmms2-admin.sh
___________________________________________________________________
Added: svn:executable
   + *

Modified: pbibuild/modules/gxmms2/pbi.conf
===================================================================
--- pbibuild/modules/gxmms2/pbi.conf	2009-01-26 19:51:25 UTC (rev 3332)
+++ pbibuild/modules/gxmms2/pbi.conf	2009-01-26 20:56:08 UTC (rev 3333)
@@ -25,14 +25,20 @@
 PBIUPDATE="http://update.pbidir.com"
 
 # Other Ports we need built (One per line)
-OTHERPORT="/usr/ports/x11-themes/qtcurve-gtk2"
+OTHERPORT="/usr/ports/audio/xmms2/
+/usr/ports/x11-themes/qtcurve-gtk2"
 
 # Enter your custom make options here
-MAKEOPTS=""
+MAKEOPTS="MODPLUG=on
+MUSEPACK=on
+MMS=on
+SAMBA=on
+FAM=on
+ICES=on"
 
 # 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="01"
+BUILDKEY="02"
 
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY



More information about the Commits mailing list