[PC-BSD Commits] r3346 - in pbibuild/modules: ultimatestunts ultimatestunts/overlay-dir valknut valknut/overlay-dir vba vba/overlay-dir vdrift vdrift/kmenu-dir vdrift/overlay-dir vegastrike vegastrike/overlay-dir vlc vlc/overlay-dir vsftpd vsftpd/overlay-dir
svn at pcbsd.org
svn at pcbsd.org
Tue Jan 27 12:00:17 PST 2009
Author: kris
Date: 2009-01-27 12:00:17 -0800 (Tue, 27 Jan 2009)
New Revision: 3346
Removed:
pbibuild/modules/vdrift/kmenu-dir/uninstall
Modified:
pbibuild/modules/ultimatestunts/overlay-dir/PBI.FirstRun.sh
pbibuild/modules/ultimatestunts/overlay-dir/PBI.RemoveScript.sh
pbibuild/modules/ultimatestunts/overlay-dir/PBI.SetupScript.sh
pbibuild/modules/ultimatestunts/pbi.conf
pbibuild/modules/valknut/overlay-dir/PBI.FirstRun.sh
pbibuild/modules/valknut/overlay-dir/PBI.RemoveScript.sh
pbibuild/modules/valknut/overlay-dir/PBI.SetupScript.sh
pbibuild/modules/valknut/pbi.conf
pbibuild/modules/vba/overlay-dir/PBI.RemoveScript.sh
pbibuild/modules/vba/overlay-dir/PBI.SetupScript.sh
pbibuild/modules/vba/pbi.conf
pbibuild/modules/vdrift/build.sh
pbibuild/modules/vdrift/overlay-dir/PBI.FirstRun.sh
pbibuild/modules/vdrift/overlay-dir/PBI.RemoveScript.sh
pbibuild/modules/vdrift/overlay-dir/PBI.SetupScript.sh
pbibuild/modules/vegastrike/build.sh
pbibuild/modules/vegastrike/overlay-dir/PBI.RemoveScript.sh
pbibuild/modules/vegastrike/overlay-dir/PBI.SetupScript.sh
pbibuild/modules/vegastrike/pbi.conf
pbibuild/modules/vlc/build.sh
pbibuild/modules/vlc/overlay-dir/PBI.RemoveScript.sh
pbibuild/modules/vlc/overlay-dir/PBI.SetupScript.sh
pbibuild/modules/vlc/pbi.conf
pbibuild/modules/vsftpd/overlay-dir/PBI.FirstRun.sh
pbibuild/modules/vsftpd/overlay-dir/PBI.RemoveScript.sh
pbibuild/modules/vsftpd/overlay-dir/PBI.SetupScript.sh
pbibuild/modules/vsftpd/pbi.conf
Log:
Updated ultimatestunts, valknut, vba, vdrift, vegastrike, vlc, and vsftpd to be 100% self-contained. vsftpd will need some additional testing however to ensure that rc.d scripts are setup properly
Modified: pbibuild/modules/ultimatestunts/overlay-dir/PBI.FirstRun.sh
===================================================================
--- pbibuild/modules/ultimatestunts/overlay-dir/PBI.FirstRun.sh 2009-01-27 19:49:41 UTC (rev 3345)
+++ pbibuild/modules/ultimatestunts/overlay-dir/PBI.FirstRun.sh 2009-01-27 20:00:17 UTC (rev 3346)
@@ -16,33 +16,3 @@
# echo 'MSG: <text>' # Display this text above progress bar
#########################################
-
-if [ -e "/usr/local/bin/ustunts" ]
-then
- # Looks like FF is installed, ask if they want to remove the old one
- ls -al /usr/local/bin/ustunts | grep Programs 2>/dev/null
- if [ "$?" = "0" ]
- then
- kdialog --yesno "UltimateStunts is already installed, do you wish to uninstall it?"
- if [ "$?" = "0" ]
- then
- FF="`ls -al /usr/local/bin/ustunts | cut -d '>' -f 2 | cut -d "/" -f 3`"
- echo $FF | grep UltimateStunts 2>/dev/null
- if [ "$?" = "0" ]
- then
- PBIdelete -remove ${FF}
- else
- kdialog --sorry "Ultimate Stunts could not be automatically removed... Please remove it in Add / Remove Programs and try again."
- return 2
- fi
- else
- kdialog --sorry "Ultimate Stunts is already installed, it must be uninstalled before loading this PBI"
- return 2
- fi
-
- else
- # Could not find a link to PBI folder
- kdialog --sorry "Ultimate Stunts is already installed, it must be uninstalled before loading this PBI"
- return 2
- fi
-fi
Modified: pbibuild/modules/ultimatestunts/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/ultimatestunts/overlay-dir/PBI.RemoveScript.sh 2009-01-27 19:49:41 UTC (rev 3345)
+++ pbibuild/modules/ultimatestunts/overlay-dir/PBI.RemoveScript.sh 2009-01-27 20:00:17 UTC (rev 3346)
@@ -6,15 +6,6 @@
# ${2} is the username of person performing the deletion.
# TIP: 'kdialog' should be used for user interaction.
#########################################
-rm -fR /usr/local/bin/ustunts
-rm -fR /usr/local/bin/ustunts3dedit
-rm -fR /usr/local/bin/ustuntsai
-rm -fR /usr/local/bin/ustuntsserver
-rm -fR /usr/local/bin/ustuntstrackedit
-rm -fR /usr/local/etc/ultimatestunts.conf.sample
-rm -fR /usr/local/share/ultimatestunts
-rm -fR /usr/local/share/doc/ultimatestunts
-rm -fR /usr/local/etc/ultimatestunts.conf
if [ ! -z "$DISPLAY" ]
then
# Ask if we want to remove the user profiles
Modified: pbibuild/modules/ultimatestunts/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/ultimatestunts/overlay-dir/PBI.SetupScript.sh 2009-01-27 19:49:41 UTC (rev 3345)
+++ pbibuild/modules/ultimatestunts/overlay-dir/PBI.SetupScript.sh 2009-01-27 20:00:17 UTC (rev 3346)
@@ -14,14 +14,13 @@
# echo 'SETSTEPS: <num>' # Set the current progress of the progress bar
# echo 'MSG: <text>' # Display this text above progress bar
#########################################
-ln -s /Programs/${PROGDIR}/.sbin/ustunts /usr/local/bin/ustunts
-ln -s /Programs/${PROGDIR}/.sbin/ustunts3dedit /usr/local/bin/ustunts3dedit
-ln -s /Programs/${PROGDIR}/.sbin/ustuntsai /usr/local/bin/ustuntsai
-ln -s /Programs/${PROGDIR}/.sbin/ustuntsserver /usr/local/bin/ustuntsserver
-ln -s /Programs/${PROGDIR}/.sbin/ustuntstrackedit /usr/local/bin/ustuntstrackedit
-ln -s /Programs/${PROGDIR}/etc/ultimatestunts.conf.sample /usr/local/etc/ultimatestunts.conf.sample
-ln -s /Programs/${PROGDIR}/share/ultimatestunts /usr/local/share/ultimatestunts
-ln -s /Programs/${PROGDIR}/share/doc/ultimatestunts /usr/local/share/doc/ultimatestunts
-cp -fR /Programs/${PROGDIR}/etc/ultimatestunts.conf.sample /usr/local/etc/ultimatestunts.conf
-chmod 777 /usr/local/etc/ultimatestunts.conf
-echo "LAUNCHCLOSE: /usr/local/bin/ustunts"
+
+# 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: /Programs/bin/ustunts"
Modified: pbibuild/modules/ultimatestunts/pbi.conf
===================================================================
--- pbibuild/modules/ultimatestunts/pbi.conf 2009-01-27 19:49:41 UTC (rev 3345)
+++ pbibuild/modules/ultimatestunts/pbi.conf 2009-01-27 20:00:17 UTC (rev 3346)
@@ -36,6 +36,6 @@
# 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="05"
+BUILDKEY="28"
export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY
Modified: pbibuild/modules/valknut/overlay-dir/PBI.FirstRun.sh
===================================================================
--- pbibuild/modules/valknut/overlay-dir/PBI.FirstRun.sh 2009-01-27 19:49:41 UTC (rev 3345)
+++ pbibuild/modules/valknut/overlay-dir/PBI.FirstRun.sh 2009-01-27 20:00:17 UTC (rev 3346)
@@ -16,33 +16,3 @@
# echo 'MSG: <text>' # Display this text above progress bar
#########################################
-
-if [ -e "/usr/local/bin/valknut" ]
-then
- # Looks like FF is installed, ask if they want to remove the old one
- ls -al /usr/local/bin/valknut | grep Programs 2>/dev/null
- if [ "$?" = "0" ]
- then
- kdialog --yesno "Valknut is already installed, do you wish to uninstall it?"
- if [ "$?" = "0" ]
- then
- FF="`ls -al /usr/local/bin/valknut | cut -d '>' -f 2 | cut -d "/" -f 3`"
- echo $FF | grep Valknut 2>/dev/null
- if [ "$?" = "0" ]
- then
- PBIdelete -remove ${FF}
- else
- kdialog --sorry "Valknut could not be automatically removed... Please remove it in Add / Remove Programs and try again."
- return 2
- fi
- else
- kdialog --sorry "Valknut is already installed, it must be uninstalled before loading this PBI"
- return 2
- fi
-
- else
- # Could not find a link to PBI folder
- kdialog --sorry "Valknut is already installed, it must be uninstalled before loading this PBI"
- return 2
- fi
-fi
Modified: pbibuild/modules/valknut/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/valknut/overlay-dir/PBI.RemoveScript.sh 2009-01-27 19:49:41 UTC (rev 3345)
+++ pbibuild/modules/valknut/overlay-dir/PBI.RemoveScript.sh 2009-01-27 20:00:17 UTC (rev 3346)
@@ -6,8 +6,6 @@
# ${2} is the username of person performing the deletion.
# TIP: 'kdialog' should be used for user interaction.
#########################################
-rm -fR /usr/local/bin/valknut
-rm -fR /usr/local/share/valknut
if [ ! -z "$DISPLAY" ]
then
Modified: pbibuild/modules/valknut/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/valknut/overlay-dir/PBI.SetupScript.sh 2009-01-27 19:49:41 UTC (rev 3345)
+++ pbibuild/modules/valknut/overlay-dir/PBI.SetupScript.sh 2009-01-27 20:00:17 UTC (rev 3346)
@@ -14,7 +14,13 @@
# echo 'SETSTEPS: <num>' # Set the current progress of the progress bar
# echo 'MSG: <text>' # Display this text above progress bar
#########################################
-ln -s /Programs/${PROGDIR}/.sbin/valknut /usr/local/bin/valknut
-ln -s /Programs/${PROGDIR}/share/valknut /usr/local/share/valknut
-echo "LAUNCHCLOSE: /usr/local/bin/valknut"
+# 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: /Programs/bin/valknut"
Modified: pbibuild/modules/valknut/pbi.conf
===================================================================
--- pbibuild/modules/valknut/pbi.conf 2009-01-27 19:49:41 UTC (rev 3345)
+++ pbibuild/modules/valknut/pbi.conf 2009-01-27 20:00:17 UTC (rev 3346)
@@ -32,6 +32,6 @@
# 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="03"
+BUILDKEY="01"
export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY
Modified: pbibuild/modules/vba/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/vba/overlay-dir/PBI.RemoveScript.sh 2009-01-27 19:49:41 UTC (rev 3345)
+++ pbibuild/modules/vba/overlay-dir/PBI.RemoveScript.sh 2009-01-27 20:00:17 UTC (rev 3346)
@@ -7,8 +7,6 @@
# TIP: 'kdialog' should be used for user interaction.
#########################################
-rm -f /usr/local/bin/vba
-rm -f /usr/local/bin/VisualBoyAdvance
if [ ! -z "$DISPLAY" ]
then
Modified: pbibuild/modules/vba/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/vba/overlay-dir/PBI.SetupScript.sh 2009-01-27 19:49:41 UTC (rev 3345)
+++ pbibuild/modules/vba/overlay-dir/PBI.SetupScript.sh 2009-01-27 20:00:17 UTC (rev 3346)
@@ -12,9 +12,11 @@
# echo 'MSG: <text>' # Display this text above progress bar
#########################################
-cd /Programs/${PROGDIR}
-# Setup the external links
-ln -s /Programs/${PROGDIR}/.sbin/vba /usr/local/bin/vba
-ln -s /Programs/${PROGDIR}/.sbin/VisualBoyAdvance /usr/local/bin/VisualBoyAdvance
-
+# 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
Modified: pbibuild/modules/vba/pbi.conf
===================================================================
--- pbibuild/modules/vba/pbi.conf 2009-01-27 19:49:41 UTC (rev 3345)
+++ pbibuild/modules/vba/pbi.conf 2009-01-27 20:00:17 UTC (rev 3346)
@@ -25,14 +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=""
# 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="03"
+BUILDKEY="01"
# If this port has a non-standard port version variable in Makefile, then
# list the key here such as "OOOVERSION="
Modified: pbibuild/modules/vdrift/build.sh
===================================================================
--- pbibuild/modules/vdrift/build.sh 2009-01-27 19:49:41 UTC (rev 3345)
+++ pbibuild/modules/vdrift/build.sh 2009-01-27 20:00:17 UTC (rev 3346)
@@ -8,21 +8,3 @@
# MODULEDIR = The location of the module directory for this PBI
# PORTVER = Version number of the port we used to build
##############################################################################
-# Save the right version number in the removepbi.sh script
-sed -e "s,CHANGEME,VDrift${PORTVER},g" ${PBIDIR}/scripts/removepbi.sh > /tmp/removepbi.sh
-mv /tmp/removepbi.sh ${PBIDIR}/scripts/removepbi.sh
-chmod 755 ${PBIDIR}/scripts/removepbi.sh
-
-# Get all the various language files and copy them to the PBI
-LANGFILE="VDrift.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/vdrift/overlay-dir/PBI.FirstRun.sh
===================================================================
--- pbibuild/modules/vdrift/overlay-dir/PBI.FirstRun.sh 2009-01-27 19:49:41 UTC (rev 3345)
+++ pbibuild/modules/vdrift/overlay-dir/PBI.FirstRun.sh 2009-01-27 20:00:17 UTC (rev 3346)
@@ -16,42 +16,10 @@
# echo 'MSG: <text>' # Display this text above progress bar
#########################################
-
-if [ -e "/usr/local/bin/vdrift" ]
-then
- # Looks like FF is installed, ask if they want to remove the old one
- ls -al /usr/local/bin/vdrift | grep Programs 2>/dev/null
- if [ "$?" = "0" ]
- then
- kdialog --yesno "VDrift is already installed, do you wish to uninstall it?"
- if [ "$?" = "0" ]
- then
- FF="`ls -al /usr/local/bin/vdrift | cut -d '>' -f 2 | cut -d "/" -f 3`"
- echo $FF | grep VDrift 2>/dev/null
- if [ "$?" = "0" ]
- then
- PBIdelete -remove ${FF}
- else
- kdialog --sorry "VDrift could not be automatically removed... Please remove it in Add / Remove Programs and try again."
- return 2
- fi
- else
- kdialog --sorry "VDrift is already installed, it must be uninstalled before loading this PBI"
- return 2
- fi
-
- else
- # Could not find a link to PBI folder
- kdialog --sorry "VDrift is already installed, it must be uninstalled before loading this PBI"
- return 2
- fi
-fi
#3D APPLICATION: 3D ACC IS NEEDED
glxinfo | grep "direct rendering:" | grep " Yes" 2>/dev/null
if [ "$?" != "0" ]
then
- kdialog --msgbox "Your system does not appear to have hardware 3D
-support enabled. This application requires 3D acceleration to function
-properly."
-fi
\ No newline at end of file
+kdialog --msgbox "Your system does not appear to have hardware 3D support enabled. This application requires 3D acceleration to function properly."
+fi
Modified: pbibuild/modules/vdrift/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/vdrift/overlay-dir/PBI.RemoveScript.sh 2009-01-27 19:49:41 UTC (rev 3345)
+++ pbibuild/modules/vdrift/overlay-dir/PBI.RemoveScript.sh 2009-01-27 20:00:17 UTC (rev 3346)
@@ -6,19 +6,7 @@
# ${2} is the username of person performing the deletion.
# TIP: 'kdialog' should be used for user interaction.
#########################################
-rm -fR /usr/local/bin/vdrift
-rm -fR /usr/local/share/vdrift
-rm -fR /usr/local/share/doc/vdrift
-# Remove the old locale files since we are uninstalling
-LANGFILE="VDrift.mo"
-cd /Programs/${PROGDIR}/locale
-for i in `ls`
-do
- rm /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE}
-done
-
-
if [ ! -z "$DISPLAY" ]
then
# Ask if we want to remove the user profiles
Modified: pbibuild/modules/vdrift/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/vdrift/overlay-dir/PBI.SetupScript.sh 2009-01-27 19:49:41 UTC (rev 3345)
+++ pbibuild/modules/vdrift/overlay-dir/PBI.SetupScript.sh 2009-01-27 20:00:17 UTC (rev 3346)
@@ -14,16 +14,13 @@
# echo 'SETSTEPS: <num>' # Set the current progress of the progress bar
# echo 'MSG: <text>' # Display this text above progress bar
#########################################
-ln -s /Programs/${PROGDIR}/.sbin/vdrift /usr/local/bin/vdrift
-ln -s /Programs/${PROGDIR}/share/vdrift /usr/local/share/vdrift
-ln -s /Programs/${PROGDIR}/share/doc/vdrift /usr/local/share/doc/vdrift
-# Copy over all the LANG files
-LANGFILE="VDrift.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
-echo "LAUNCHCLOSE: /usr/local/bin/vdrift"
+# 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: /Programs/bin/vdrift"
Modified: pbibuild/modules/vegastrike/build.sh
===================================================================
--- pbibuild/modules/vegastrike/build.sh 2009-01-27 19:49:41 UTC (rev 3345)
+++ pbibuild/modules/vegastrike/build.sh 2009-01-27 20:00:17 UTC (rev 3346)
@@ -9,16 +9,3 @@
# PORTVER = Version number of the port we used to build
##############################################################################
-# Get all the various language files and copy them to the PBI
-LANGFILE="banshee-1.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/vegastrike/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/vegastrike/overlay-dir/PBI.RemoveScript.sh 2009-01-27 19:49:41 UTC (rev 3345)
+++ pbibuild/modules/vegastrike/overlay-dir/PBI.RemoveScript.sh 2009-01-27 20:00:17 UTC (rev 3346)
@@ -8,12 +8,6 @@
#########################################
-rm /usr/local/bin/vegastrike
-rm /usr/local/bin/vegaserver
-rm /usr/local/bin/vssetup
-rm /usr/local/share/vegastrike
-
-
if [ ! -z "$DISPLAY" ]
then
# Ask if we want to remove the user profiles
Modified: pbibuild/modules/vegastrike/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/vegastrike/overlay-dir/PBI.SetupScript.sh 2009-01-27 19:49:41 UTC (rev 3345)
+++ pbibuild/modules/vegastrike/overlay-dir/PBI.SetupScript.sh 2009-01-27 20:00:17 UTC (rev 3346)
@@ -15,9 +15,13 @@
# echo 'MSG: <text>' # Display this text above progress bar
#########################################
-ln -s /Programs/${PROGDIR}/.sbin/vegastrike /usr/local/bin/vegastrike
-ln -s /Programs/${PROGDIR}/.sbin/vegaserver /usr/local/bin/vegaserver
-ln -s /Programs/${PROGDIR}/.sbin/vssetup /usr/local/bin/vssetup
-ln -s /Programs/${PROGDIR}/share/vegastrike /usr/local/share/vegastrike
+# 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/vegastrike"
+
+echo "LAUNCHCLOSE: /Programs/bin/vegastrike"
Modified: pbibuild/modules/vegastrike/pbi.conf
===================================================================
--- pbibuild/modules/vegastrike/pbi.conf 2009-01-27 19:49:41 UTC (rev 3345)
+++ pbibuild/modules/vegastrike/pbi.conf 2009-01-27 20:00:17 UTC (rev 3346)
@@ -32,7 +32,7 @@
# 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"
# Don't build this PBI on certian processors (i386 / amd64)
#ARCHIGNORE="amd64" ; export ARCHIGNORE
Modified: pbibuild/modules/vlc/build.sh
===================================================================
--- pbibuild/modules/vlc/build.sh 2009-01-27 19:49:41 UTC (rev 3345)
+++ pbibuild/modules/vlc/build.sh 2009-01-27 20:00:17 UTC (rev 3346)
@@ -8,7 +8,3 @@
# MODULEDIR = The location of the module directory for this PBI
# PORTVER = Version number of the port we used to build
##############################################################################
-cd /usr/local/share/locale/
-tar cpf - */LC_MESSAGES/vlc.mo | tar xpf - -C /pbi/share/locale
-cd /usr/local/lib
-rm *.a
Modified: pbibuild/modules/vlc/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/vlc/overlay-dir/PBI.RemoveScript.sh 2009-01-27 19:49:41 UTC (rev 3345)
+++ pbibuild/modules/vlc/overlay-dir/PBI.RemoveScript.sh 2009-01-27 20:00:17 UTC (rev 3346)
@@ -7,11 +7,6 @@
# TIP: 'kdialog' should be used for user interaction.
#########################################
-rm /usr/local/lib/vlc
-rm /usr/local/share/vlc
-rm /usr/local/bin/vlc
-cd /usr/local/share/locale/
-rm */LC_MESSAGES/vlc.mo
if [ ! -z "$DISPLAY" ]
then
# Ask if we want to remove the user profiles
Modified: pbibuild/modules/vlc/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/vlc/overlay-dir/PBI.SetupScript.sh 2009-01-27 19:49:41 UTC (rev 3345)
+++ pbibuild/modules/vlc/overlay-dir/PBI.SetupScript.sh 2009-01-27 20:00:17 UTC (rev 3346)
@@ -15,9 +15,11 @@
# echo 'MSG: <text>' # Display this text above progress bar
#########################################
-ln -s /Programs/${PROGDIR}/lib/vlc /usr/local/lib/vlc
-ln -s /Programs/${PROGDIR}/share/vlc /usr/local/share/vlc
-ln -s /Programs/${PROGDIR}/.sbin/vlc.sh /usr/local/bin/vlc
-cd /Programs/${PROGDIR}/share/locale/
-cp -rv * /usr/local/share/locale/
+# 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
Modified: pbibuild/modules/vlc/pbi.conf
===================================================================
--- pbibuild/modules/vlc/pbi.conf 2009-01-27 19:49:41 UTC (rev 3345)
+++ pbibuild/modules/vlc/pbi.conf 2009-01-27 20:00:17 UTC (rev 3346)
@@ -25,7 +25,7 @@
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="WITH_A52=true
@@ -65,7 +65,7 @@
# 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="12"
+BUILDKEY="01"
# Don't build this PBI on certian processors (i386 / amd64)
#ARCHIGNORE="amd64" ; export ARCHIGNORE
Modified: pbibuild/modules/vsftpd/overlay-dir/PBI.FirstRun.sh
===================================================================
--- pbibuild/modules/vsftpd/overlay-dir/PBI.FirstRun.sh 2009-01-27 19:49:41 UTC (rev 3345)
+++ pbibuild/modules/vsftpd/overlay-dir/PBI.FirstRun.sh 2009-01-27 20:00:17 UTC (rev 3346)
@@ -15,34 +15,3 @@
# echo 'SETSTEPS: <num>' # Set the current progress of the progress bar
# echo 'MSG: <text>' # Display this text above progress bar
#########################################
-
-
-if [ -e "/usr/local/bin/vsftpdstart" ]
-then
- # Looks like FF is installed, ask if they want to remove the old one
- ls -al /usr/local/bin/vsftpdstart | grep Programs 2>/dev/null
- if [ "$?" = "0" ]
- then
- kdialog --yesno "vsftpd is already installed, do you wish to uninstall it?"
- if [ "$?" = "0" ]
- then
- FF="`ls -al /usr/local/bin/vsftpdstart | cut -d '>' -f 2 | cut -d "/" -f 3`"
- echo $FF | grep vsftpd 2>/dev/null
- if [ "$?" = "0" ]
- then
- PBIdelete -remove ${FF}
- else
- kdialog --sorry "vsftpd could not be automatically removed... Please remove it in Add / Remove Programs and try again."
- return 2
- fi
- else
- kdialog --sorry "vsftpd is already installed, it must be uninstalled before loading this PBI"
- return 2
- fi
-
- else
- # Could not find a link to PBI folder
- kdialog --sorry "vsftpd is already installed, it must be uninstalled before loading this PBI"
- return 2
- fi
-fi
Modified: pbibuild/modules/vsftpd/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/vsftpd/overlay-dir/PBI.RemoveScript.sh 2009-01-27 19:49:41 UTC (rev 3345)
+++ pbibuild/modules/vsftpd/overlay-dir/PBI.RemoveScript.sh 2009-01-27 20:00:17 UTC (rev 3346)
@@ -18,17 +18,6 @@
fi
-rm -fR /usr/local/libexec/vsftpd
-rm -fR /usr/local/man/man5/vsftpd.conf.5.gz
-rm -fR /usr/local/man/man8/vsftpd.8.gz
-rm -fR /usr/local/share/doc/vsftpd
-rm -fR /usr/local/share/vsftpd
-rm -fR /usr/local/etc/vsftpd.conf.dist
-rm -fR /usr/local/etc/vsftpd.conf
-rm -fR /usr/local/bin/vsftpdstart
-rm -fR /usr/local/bin/vsftpdstop
-rm -fR /usr/local/bin/vsftpdcfg
-rm -fR /usr/local/etc/rc.d/vsftpd
rm -fR /PCBSD/Services/vsftpd
pw user del -n ftp
rm -Rf /usr/home/ftp
Modified: pbibuild/modules/vsftpd/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/vsftpd/overlay-dir/PBI.SetupScript.sh 2009-01-27 19:49:41 UTC (rev 3345)
+++ pbibuild/modules/vsftpd/overlay-dir/PBI.SetupScript.sh 2009-01-27 20:00:17 UTC (rev 3346)
@@ -15,27 +15,11 @@
# echo 'MSG: <text>' # Display this text above progress bar
#########################################
-# Save the right version number in the removepbi.sh script
-sed -e "s,CHANGEME,vsftpd${PORTVER},g" /Programs/$PBIDIR/scripts/removepbi.sh > /tmp/removepbi.sh
-mv /tmp/removepbi.sh /Programs/$PBIDIR/removepbi.sh
-chmod 755 /Programs/$PBIDIR/removepbi.sh
-
# Save the right version number in the vsftpd.conf file
sed -e "s,CHANGEME,/Programs/$PROGDIR,g" /Programs/$PBIDIR/vsftpdcfg > /tmp/vsftpdcfg
mv /tmp/vsftpdcfg /Programs/$PROGDIR/vsftpdcfg
chmod 755 /Programs/$PROGDIR/vsftpdcfg
-cp /Programs/${PROGDIR}/bin/vsftpd /usr/local/libexec/vsftpd
-ln -s /Programs/${PROGDIR}/man/man5/vsftpd.conf.5.gz /usr/local/man/man5/vsftpd.conf.5.gz
-ln -s /Programs/${PROGDIR}/man/man8/vsftpd.8.gz /usr/local/man/man8/vsftpd.8.gz
-ln -s /Programs/${PROGDIR}/share/doc/vsftpd /usr/local/share/doc/vsftpd
-ln -s /Programs/${PROGDIR}/share/vsftpd /usr/local/share/vsftpd
-ln -s /Programs/${PROGDIR}/vsftpd.conf.dist /usr/local/etc/vsftpd.conf.dist
-ln -s /Programs/${PROGDIR}/vsftpd.conf /usr/local/etc/vsftpd.conf
-ln -s /Programs/${PROGDIR}/.sbin/vsftpdstart /usr/local/bin/vsftpdstart
-ln -s /Programs/${PROGDIR}/.sbin/vsftpdstop /usr/local/bin/vsftpdstop
-ln -s /Programs/${PROGDIR}/vsftpdcfg /usr/local/bin/vsftpdcfg
-
ln -s /Programs/${PROGDIR}/services/vsftpd /PCBSD/Services/vsftpd
echo "vsftpd_enable=\"YES\"" >> /etc/rc.conf
Modified: pbibuild/modules/vsftpd/pbi.conf
===================================================================
--- pbibuild/modules/vsftpd/pbi.conf 2009-01-27 19:49:41 UTC (rev 3345)
+++ pbibuild/modules/vsftpd/pbi.conf 2009-01-27 20:00:17 UTC (rev 3346)
@@ -32,6 +32,6 @@
# 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="27"
+BUILDKEY="01"
export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY
More information about the Commits
mailing list