[PC-BSD Commits] r3341 - in pbibuild/modules: pdfedit pdfedit/overlay-dir pgadmin pgadmin/overlay-dir pgadmin/overlay-dir/share pingus pingus/overlay-dir pingus/overlay-dir/share predict predict/overlay-dir putty putty/overlay-dir
svn at pcbsd.org
svn at pcbsd.org
Tue Jan 27 10:29:59 PST 2009
Author: kris
Date: 2009-01-27 10:29:58 -0800 (Tue, 27 Jan 2009)
New Revision: 3341
Removed:
pbibuild/modules/pgadmin/overlay-dir/share/pgadmin3/
pbibuild/modules/pingus/overlay-dir/share/pingus/
Modified:
pbibuild/modules/pdfedit/overlay-dir/PBI.FirstRun.sh
pbibuild/modules/pdfedit/overlay-dir/PBI.RemoveScript.sh
pbibuild/modules/pdfedit/overlay-dir/PBI.SetupScript.sh
pbibuild/modules/pdfedit/pbi.conf
pbibuild/modules/pgadmin/build.sh
pbibuild/modules/pgadmin/copy-files
pbibuild/modules/pgadmin/overlay-dir/PBI.FirstRun.sh
pbibuild/modules/pgadmin/overlay-dir/PBI.RemoveScript.sh
pbibuild/modules/pgadmin/overlay-dir/PBI.SetupScript.sh
pbibuild/modules/pgadmin/pbi.conf
pbibuild/modules/pingus/overlay-dir/PBI.FirstRun.sh
pbibuild/modules/pingus/overlay-dir/PBI.RemoveScript.sh
pbibuild/modules/pingus/overlay-dir/PBI.SetupScript.sh
pbibuild/modules/pingus/pbi.conf
pbibuild/modules/predict/overlay-dir/PBI.FirstRun.sh
pbibuild/modules/predict/overlay-dir/PBI.RemoveScript.sh
pbibuild/modules/predict/overlay-dir/PBI.SetupScript.sh
pbibuild/modules/predict/pbi.conf
pbibuild/modules/putty/overlay-dir/PBI.FirstRun.sh
pbibuild/modules/putty/overlay-dir/PBI.RemoveScript.sh
pbibuild/modules/putty/overlay-dir/PBI.SetupScript.sh
pbibuild/modules/putty/pbi.conf
Log:
Updated pdfedit, pgadmin, pingus, predict, and putty to be 100% self-contained
Modified: pbibuild/modules/pdfedit/overlay-dir/PBI.FirstRun.sh
===================================================================
--- pbibuild/modules/pdfedit/overlay-dir/PBI.FirstRun.sh 2009-01-27 18:09:27 UTC (rev 3340)
+++ pbibuild/modules/pdfedit/overlay-dir/PBI.FirstRun.sh 2009-01-27 18:29:58 UTC (rev 3341)
@@ -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/pdfedit" ]
-then
- # Looks like FF is installed, ask if they want to remove the old one
- ls -al /usr/local/bin/pdfedit | grep Programs 2>/dev/null
- if [ "$?" = "0" ]
- then
- kdialog --yesno "PDFEdit is already installed, do you wish to uninstall it?"
- if [ "$?" = "0" ]
- then
- FF="`ls -al /usr/local/bin/pdfedit | cut -d '>' -f 2 | cut -d "/" -f 3`"
- echo $FF | grep PDFEdit 2>/dev/null
- if [ "$?" = "0" ]
- then
- PBIdelete -remove ${FF}
- else
- kdialog --sorry "PDFEdit could not be automatically removed... Please remove it in Add / Remove Programs and try again."
- return 2
- fi
- else
- kdialog --sorry "PDFEdit 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 "PDFEdit is already installed, it must be uninstalled before loading this PBI"
- return 2
- fi
-fi
Modified: pbibuild/modules/pdfedit/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/pdfedit/overlay-dir/PBI.RemoveScript.sh 2009-01-27 18:09:27 UTC (rev 3340)
+++ pbibuild/modules/pdfedit/overlay-dir/PBI.RemoveScript.sh 2009-01-27 18:29:58 UTC (rev 3341)
@@ -6,10 +6,6 @@
# ${2} is the username of person performing the deletion.
# TIP: 'kdialog' should be used for user interaction.
#########################################
-rm -fR /usr/local/bin/pdfedit
-rm -fR /usr/local/man/man1/pdfedit.1.gz
-rm -fR /usr/local/share/doc/pdfedit
-rm -fR /usr/local/share/pdfedit
if [ ! -z "$DISPLAY" ]
then
Modified: pbibuild/modules/pdfedit/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/pdfedit/overlay-dir/PBI.SetupScript.sh 2009-01-27 18:09:27 UTC (rev 3340)
+++ pbibuild/modules/pdfedit/overlay-dir/PBI.SetupScript.sh 2009-01-27 18:29:58 UTC (rev 3341)
@@ -14,9 +14,14 @@
# 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/pdfedit /usr/local/bin/pdfedit
-ln -s /Programs/${PROGDIR}/man/man1/pdfedit.1.gz /usr/local/man/man1/pdfedit.1.gz
-ln -s /Programs/${PROGDIR}/share/doc/pdfedit /usr/local/share/doc/pdfedit
-ln -s /Programs/${PROGDIR}/share/pdfedit /usr/local/share/pdfedit
-echo "LAUNCHCLOSE: /usr/local/bin/pdfedit"
+# 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/pdfedit"
Modified: pbibuild/modules/pdfedit/pbi.conf
===================================================================
--- pbibuild/modules/pdfedit/pbi.conf 2009-01-27 18:09:27 UTC (rev 3340)
+++ pbibuild/modules/pdfedit/pbi.conf 2009-01-27 18:29:58 UTC (rev 3341)
@@ -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/pgadmin/build.sh
===================================================================
--- pbibuild/modules/pgadmin/build.sh 2009-01-27 18:09:27 UTC (rev 3340)
+++ pbibuild/modules/pgadmin/build.sh 2009-01-27 18:29:58 UTC (rev 3341)
@@ -9,7 +9,3 @@
# PORTVER = Version number of the port we used to build
##############################################################################
-# Save the right version number in the removepbi.sh script
-sed -e "s,CHANGE,pgAdmin${PORTVER},g" ${PBIDIR}/bin/pgadmin3.sh > /tmp/pgadmin3.sh
-mv /tmp/pgadmin3.sh ${PBIDIR}/bin/pgadmin3.sh
-chmod 755 ${PBIDIR}/bin/pgadmin3.sh
Modified: pbibuild/modules/pgadmin/copy-files
===================================================================
--- pbibuild/modules/pgadmin/copy-files 2009-01-27 18:09:27 UTC (rev 3340)
+++ pbibuild/modules/pgadmin/copy-files 2009-01-27 18:29:58 UTC (rev 3341)
@@ -1,2 +1,3 @@
/usr/local/bin/pgadmin3 bin/
/usr/local/bin/pgagent bin/
+/usr/local/share/pgad* share/
Modified: pbibuild/modules/pgadmin/overlay-dir/PBI.FirstRun.sh
===================================================================
--- pbibuild/modules/pgadmin/overlay-dir/PBI.FirstRun.sh 2009-01-27 18:09:27 UTC (rev 3340)
+++ pbibuild/modules/pgadmin/overlay-dir/PBI.FirstRun.sh 2009-01-27 18:29:58 UTC (rev 3341)
@@ -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/pgadmin3" ]
-then
- # Looks like FF is installed, ask if they want to remove the old one
- ls -al /usr/local/bin/pgadmin3 | grep Programs 2>/dev/null
- if [ "$?" = "0" ]
- then
- kdialog --yesno "pgAdmin is already installed, do you wish to uninstall it?"
- if [ "$?" = "0" ]
- then
- FF="`ls -al /usr/local/bin/pgadmin3 | cut -d '>' -f 2 | cut -d "/" -f 3`"
- echo $FF | grep pgAdmin 2>/dev/null
- if [ "$?" = "0" ]
- then
- PBIdelete -remove ${FF}
- else
- kdialog --sorry "pgAdmin could not be automatically removed... Please remove it in Add / Remove Programs and try again."
- return 2
- fi
- else
- kdialog --sorry "pgAdmin 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 "pgAdmin is already installed, it must be uninstalled before loading this PBI"
- return 2
- fi
-fi
Modified: pbibuild/modules/pgadmin/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/pgadmin/overlay-dir/PBI.RemoveScript.sh 2009-01-27 18:09:27 UTC (rev 3340)
+++ pbibuild/modules/pgadmin/overlay-dir/PBI.RemoveScript.sh 2009-01-27 18:29:58 UTC (rev 3341)
@@ -6,9 +6,6 @@
# ${2} is the username of person performing the deletion.
# TIP: 'kdialog' should be used for user interaction.
#########################################
-rm -fR /usr/local/bin/pgadmin3
-rm -fR /usr/local/bin/pgagent
-rm -fR /usr/local/share/pgadmin3
if [ ! -z "$DISPLAY" ]
then
# Ask if we want to remove the user profiles
Modified: pbibuild/modules/pgadmin/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/pgadmin/overlay-dir/PBI.SetupScript.sh 2009-01-27 18:09:27 UTC (rev 3340)
+++ pbibuild/modules/pgadmin/overlay-dir/PBI.SetupScript.sh 2009-01-27 18:29:58 UTC (rev 3341)
@@ -14,7 +14,12 @@
# 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/pgadmin3.sh /usr/local/bin/pgadmin3
-ln -s /Programs/${PROGDIR}/.sbin/pgagent /usr/local/bin/pgagent
-ln -s /Programs/${PROGDIR}/share/pgadmin3 /usr/local/share/pgadmin3
-echo "LAUNCHCLOSE: /usr/local/bin/pgadmin3"
+# 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/pgadmin3"
Modified: pbibuild/modules/pgadmin/pbi.conf
===================================================================
--- pbibuild/modules/pgadmin/pbi.conf 2009-01-27 18:09:27 UTC (rev 3340)
+++ pbibuild/modules/pgadmin/pbi.conf 2009-01-27 18:29:58 UTC (rev 3341)
@@ -25,13 +25,13 @@
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="22"
+BUILDKEY="01"
export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY
Modified: pbibuild/modules/pingus/overlay-dir/PBI.FirstRun.sh
===================================================================
--- pbibuild/modules/pingus/overlay-dir/PBI.FirstRun.sh 2009-01-27 18:09:27 UTC (rev 3340)
+++ pbibuild/modules/pingus/overlay-dir/PBI.FirstRun.sh 2009-01-27 18:29:58 UTC (rev 3341)
@@ -15,32 +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/pingus" ]
-then
- # Looks like FF is installed, ask if they want to remove the old one
- ls -al /usr/local/bin/pingus | grep Programs 2>/dev/null
- if [ "$?" = "0" ]
- then
- kdialog --yesno "Pingus is already installed, do you wish to uninstall it?"
- if [ "$?" = "0" ]
- then
- FF="`ls -al /usr/local/bin/pingus | cut -d '>' -f 2 | cut -d "/" -f 3`"
- echo $FF | grep Pingus 2>/dev/null
- if [ "$?" = "0" ]
- then
- PBIdelete -remove ${FF}
- else
- kdialog --sorry "Pingus could not be automatically removed... Please remove it in Add / Remove Programs and try again."
- return 2
- fi
- else
- kdialog --sorry "Pingus 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 "Pingus is already installed, it must be uninstalled before loading this PBI"
- return 2
- fi
-fi
Modified: pbibuild/modules/pingus/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/pingus/overlay-dir/PBI.RemoveScript.sh 2009-01-27 18:09:27 UTC (rev 3340)
+++ pbibuild/modules/pingus/overlay-dir/PBI.RemoveScript.sh 2009-01-27 18:29:58 UTC (rev 3341)
@@ -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/pingus
-rm -fR /usr/local/share/pingus
if [ ! -z "$DISPLAY" ]
then
Modified: pbibuild/modules/pingus/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/pingus/overlay-dir/PBI.SetupScript.sh 2009-01-27 18:09:27 UTC (rev 3340)
+++ pbibuild/modules/pingus/overlay-dir/PBI.SetupScript.sh 2009-01-27 18:29:58 UTC (rev 3341)
@@ -14,6 +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/pingus /usr/local/bin/pingus
-ln -s /Programs/${PROGDIR}/share/pingus /usr/local/share/pingus
-echo "LAUNCHCLOSE: /usr/local/bin/pingus"
+
+# 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/pingus"
Modified: pbibuild/modules/pingus/pbi.conf
===================================================================
--- pbibuild/modules/pingus/pbi.conf 2009-01-27 18:09:27 UTC (rev 3340)
+++ pbibuild/modules/pingus/pbi.conf 2009-01-27 18:29:58 UTC (rev 3341)
@@ -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/predict/overlay-dir/PBI.FirstRun.sh
===================================================================
--- pbibuild/modules/predict/overlay-dir/PBI.FirstRun.sh 2009-01-27 18:09:27 UTC (rev 3340)
+++ pbibuild/modules/predict/overlay-dir/PBI.FirstRun.sh 2009-01-27 18:29:58 UTC (rev 3341)
@@ -16,36 +16,3 @@
# echo 'MSG: <text>' # Display this text above progress bar
#########################################
-PROG="predict"
-PROGL="PREDICT"
-BINARY="/usr/local/bin/predict"
-
-if [ -e ${BINARY} ]
-then
- # Looks like ${PROG} is installed, ask if they want to remove the old one
- ls -al ${BINARY} | grep Programs 2>/dev/null
- if [ "$?" = "0" ]
- then
- kdialog --yesno "${PROGL} is already installed, do you wish to uninstall it?"
- if [ "$?" = "0" ]
- then
- TODEL="`ls -al ${BINARY} | cut -d '>' -f 2 | cut -d "/" -f 3`"
- echo ${TODEL} | grep ${PROG}
- if [ "$?" = "0" ]
- then
- PBIdelete -remove ${TODEL}
- else
- kdialog --sorry "${PROGL} could not be automatically removed... Please remove it in Add / Remove Programs and try again."
- return 2
- fi
- else
- kdialog --sorry "${PROGL} 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 "${PROGL} is already installed, it must be uninstalled before loading this PBI"
- return 2
- fi
-fi
Modified: pbibuild/modules/predict/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/predict/overlay-dir/PBI.RemoveScript.sh 2009-01-27 18:09:27 UTC (rev 3340)
+++ pbibuild/modules/predict/overlay-dir/PBI.RemoveScript.sh 2009-01-27 18:29:58 UTC (rev 3341)
@@ -7,10 +7,6 @@
# TIP: 'kdialog' should be used for user interaction.
#########################################
-rm /usr/local/bin/predict
-rm /usr/local/bin/vocalizer
-rm /usr/local/share/predict
-rm /usr/local/man/man1/predict.1.gz
cd /home
for i in *
Modified: pbibuild/modules/predict/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/predict/overlay-dir/PBI.SetupScript.sh 2009-01-27 18:09:27 UTC (rev 3340)
+++ pbibuild/modules/predict/overlay-dir/PBI.SetupScript.sh 2009-01-27 18:29:58 UTC (rev 3341)
@@ -14,9 +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}/bin/predict /usr/local/bin/predict
-ln -s /Programs/${PROGDIR}/bin/vocalizer /usr/local/bin/vocalizer
-ln -s /Programs/${PROGDIR}/share/predict /usr/local/share/predict
-ln -s /Programs/${PROGDIR}/man/man1/predict.1.gz /usr/local/man/man1/predict.1.gz
-echo "LAUNCHCLOSE: /usr/local/bin/predict
+# 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/predict
Modified: pbibuild/modules/predict/pbi.conf
===================================================================
--- pbibuild/modules/predict/pbi.conf 2009-01-27 18:09:27 UTC (rev 3340)
+++ pbibuild/modules/predict/pbi.conf 2009-01-27 18:29:58 UTC (rev 3341)
@@ -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="02"
+BUILDKEY="01"
export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY
Modified: pbibuild/modules/putty/overlay-dir/PBI.FirstRun.sh
===================================================================
--- pbibuild/modules/putty/overlay-dir/PBI.FirstRun.sh 2009-01-27 18:09:27 UTC (rev 3340)
+++ pbibuild/modules/putty/overlay-dir/PBI.FirstRun.sh 2009-01-27 18:29:58 UTC (rev 3341)
@@ -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/putty" ]
-then
- # Looks like FF is installed, ask if they want to remove the old one
- ls -al /usr/local/bin/putty | grep Programs 2>/dev/null
- if [ "$?" = "0" ]
- then
- kdialog --yesno "PuTTY is already installed, do you wish to uninstall it?"
- if [ "$?" = "0" ]
- then
- FF="`ls -al /usr/local/bin/putty | cut -d '>' -f 2 | cut -d "/" -f 3`"
- echo $FF | grep PuTTY 2>/dev/null
- if [ "$?" = "0" ]
- then
- PBIdelete -remove ${FF}
- else
- kdialog --sorry "PuTTY could not be automatically removed... Please remove it in Add / Remove Programs and try again."
- return 2
- fi
- else
- kdialog --sorry "PuTTY 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 "PuTTY is already installed, it must be uninstalled before loading this PBI"
- return 2
- fi
-fi
Modified: pbibuild/modules/putty/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/putty/overlay-dir/PBI.RemoveScript.sh 2009-01-27 18:09:27 UTC (rev 3340)
+++ pbibuild/modules/putty/overlay-dir/PBI.RemoveScript.sh 2009-01-27 18:29:58 UTC (rev 3341)
@@ -6,20 +6,6 @@
# ${2} is the username of person performing the deletion.
# TIP: 'kdialog' should be used for user interaction.
#########################################
-rm -fR /usr/local/bin/plink
-rm -fR /usr/local/bin/pscp
-rm -fR /usr/local/bin/psftp
-rm -fR /usr/local/bin/pterm
-rm -fR /usr/local/bin/putty
-rm -fR /usr/local/bin/puttygen
-rm -fR /usr/local/bin/puttytel
-rm -fR /usr/local/man/man1/plink.1.gz
-rm -fR /usr/local/man/man1/pscp.1.gz
-rm -fR /usr/local/man/man1/psftp.1.gz
-rm -fR /usr/local/man/man1/pterm.1.gz
-rm -fR /usr/local/man/man1/putty.1.gz
-rm -fR /usr/local/man/man1/puttygen.1.gz
-rm -fR /usr/local/man/man1/puttytel.1.gz
if [ ! -z "$DISPLAY" ]
then
# Ask if we want to remove the user profiles
Modified: pbibuild/modules/putty/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/putty/overlay-dir/PBI.SetupScript.sh 2009-01-27 18:09:27 UTC (rev 3340)
+++ pbibuild/modules/putty/overlay-dir/PBI.SetupScript.sh 2009-01-27 18:29:58 UTC (rev 3341)
@@ -14,18 +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/plink /usr/local/bin/plink
-ln -s /Programs/${PROGDIR}/.sbin/pscp /usr/local/bin/pscp
-ln -s /Programs/${PROGDIR}/.sbin/psftp /usr/local/bin/psftp
-ln -s /Programs/${PROGDIR}/.sbin/pterm /usr/local/bin/pterm
-ln -s /Programs/${PROGDIR}/.sbin/putty /usr/local/bin/putty
-ln -s /Programs/${PROGDIR}/.sbin/puttygen /usr/local/bin/puttygen
-ln -s /Programs/${PROGDIR}/.sbin/puttytel /usr/local/bin/puttytel
-ln -s /Programs/${PROGDIR}/man/man1/plink.1.gz /usr/local/man/man1/plink.1.gz
-ln -s /Programs/${PROGDIR}/man/man1/pscp.1.gz /usr/local/man/man1/pscp.1.gz
-ln -s /Programs/${PROGDIR}/man/man1/psftp.1.gz /usr/local/man/man1/psftp.1.gz
-ln -s /Programs/${PROGDIR}/man/man1/pterm.1.gz /usr/local/man/man1/pterm.1.gz
-ln -s /Programs/${PROGDIR}/man/man1/putty.1.gz /usr/local/man/man1/putty.1.gz
-ln -s /Programs/${PROGDIR}/man/man1/puttygen.1.gz /usr/local/man/man1/puttygen.1.gz
-ln -s /Programs/${PROGDIR}/man/man1/puttytel.1.gz /usr/local/man/man1/puttytel.1.gz
-echo "LAUNCHCLOSE: /usr/local/bin/putty"
+
+# 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/putty"
Modified: pbibuild/modules/putty/pbi.conf
===================================================================
--- pbibuild/modules/putty/pbi.conf 2009-01-27 18:09:27 UTC (rev 3340)
+++ pbibuild/modules/putty/pbi.conf 2009-01-27 18:29:58 UTC (rev 3341)
@@ -25,13 +25,13 @@
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"
export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY
More information about the Commits
mailing list