[PC-BSD Commits] r3294 - in pbibuild/modules/gftp: . overlay-dir

[svn at pcbsd.org]

Author: kris
Date: 2009-01-20 09:30:44 -0800 (Tue, 20 Jan 2009)
New Revision: 3294

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

Update gftp, now 100% self-contained



Modified: pbibuild/modules/gftp/build.sh
===================================================================
--- pbibuild/modules/gftp/build.sh	2009-01-20 17:13:08 UTC (rev 3293)
+++ pbibuild/modules/gftp/build.sh	2009-01-20 17:30:44 UTC (rev 3294)
@@ -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="gftp.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/gftp/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/gftp/overlay-dir/PBI.RemoveScript.sh	2009-01-20 17:13:08 UTC (rev 3293)
+++ pbibuild/modules/gftp/overlay-dir/PBI.RemoveScript.sh	2009-01-20 17:30:44 UTC (rev 3294)
@@ -6,18 +6,6 @@
 # ${2} is the username of person performing the deletion.
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
-rm -fR /usr/local/bin/gftp-gtk
-rm -fR /usr/local/bin/gftp-text
-rm -fR /usr/local/bin/gftp
-rm -fR /usr/local/man/man1/gftp.1.gz
-rm -fR /usr/local/share/gftp
-# Remove the old locale files since we are uninstalling
-LANGFILE="gftp.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/gftp/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/gftp/overlay-dir/PBI.SetupScript.sh	2009-01-20 17:13:08 UTC (rev 3293)
+++ pbibuild/modules/gftp/overlay-dir/PBI.SetupScript.sh	2009-01-20 17:30:44 UTC (rev 3294)
@@ -14,19 +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/gftp /usr/local/bin/gftp
-ln -s /Programs/${PROGDIR}/.sbin/gftp-gtk /usr/local/bin/gftp-gtk
-ln -s /Programs/${PROGDIR}/.sbin/gftp-text /usr/local/bin/gftp-text
-ln -s /Programs/${PROGDIR}/man/man1/gftp.1.gz /usr/local/man/man1/gftp.1.gz
-ln -s /Programs/${PROGDIR}/share/gftp /usr/local/share/gftp
-sed "s:prefix=/usr/local:prefix=/Programs/${PROGDIR}:g" /Programs/${PROGDIR}/bin/gftp > tempfile && mv -- tempfile /Programs/${PROGDIR}/bin/gftp
-# Copy over all the LANG files
-LANGFILE="gftp.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
-chmod +x /Programs/${PROGDIR}/bin/gftp
-echo "LAUNCHCLOSE: /usr/local/bin/gftp"
+
+# 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/gftp"

Modified: pbibuild/modules/gftp/pbi.conf
===================================================================
--- pbibuild/modules/gftp/pbi.conf	2009-01-20 17:13:08 UTC (rev 3293)
+++ pbibuild/modules/gftp/pbi.conf	2009-01-20 17:30:44 UTC (rev 3294)
@@ -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="12"
+BUILDKEY="01"
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY