[PC-BSD Commits] r3178 - in pbibuild/modules/gimp: . overlay-dir

svn at pcbsd.org svn at pcbsd.org
Tue Jan 6 06:32:00 PST 2009


Author: kris
Date: 2009-01-06 06:31:58 -0800 (Tue, 06 Jan 2009)
New Revision: 3178

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

Setup gimp to be 100% self-contained



Modified: pbibuild/modules/gimp/build.sh
===================================================================
--- pbibuild/modules/gimp/build.sh	2009-01-05 21:31:27 UTC (rev 3177)
+++ pbibuild/modules/gimp/build.sh	2009-01-06 14:31:58 UTC (rev 3178)
@@ -8,25 +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="gimp20.mo"
-LANGFILE1="gimp20-python.mo"
-LANGFILE2="gimp20-script-fu.mo"
-LANGFILE3="gimp20-std-plug-ins.mo"
-LANGFILE4="gimp20-libgimp.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}/
-    cp /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE1} ${PBIDIR}/locale/${i}/
-    cp /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE2} ${PBIDIR}/locale/${i}/
-    cp /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE3} ${PBIDIR}/locale/${i}/
-    cp /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE4} ${PBIDIR}/locale/${i}/
-  fi
-done
-

Modified: pbibuild/modules/gimp/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/gimp/overlay-dir/PBI.RemoveScript.sh	2009-01-05 21:31:27 UTC (rev 3177)
+++ pbibuild/modules/gimp/overlay-dir/PBI.RemoveScript.sh	2009-01-06 14:31:58 UTC (rev 3178)
@@ -7,37 +7,15 @@
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
 
-rm /usr/local/etc/gimp
-rm /usr/local/share/gimp
-rm /usr/local/share/gutenprint
-rm /usr/local/libexec/gimp
-rm /usr/local/bin/gimp
-
-# Remove the old locale files since we are uninstalling
-LANGFILE="gimp20.mo"
-LANGFILE1="gimp20-python.mo"
-LANGFILE2="gimp20-script-fu.mo"
-LANGFILE3="gimp20-std-plug-ins.mo"
-LANGFILE4="gimp20-libgimp.mo"
-cd /Programs/${PROGDIR}/locale
-for i in `ls`
-do
-  rm /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE}
-  rm /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE1}
-  rm /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE2}
-  rm /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE3}
-  rm /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE4}
-done
-
 cd /home 
  for i in `ls` 
  do 
-   if [ -d "/home/${i}/.gimp-2.4" ] 
+   if [ -d "/home/${i}/.gimp-2.6" ] 
    then 
      kdialog --title "Uninstalling Gimp" --yesno "Do you want to delete this PBI completely for ${i} user?\nIf you select YES, all Configuration files will be erased. If you select NO, they will be kept." 
      if [ "$?" = "0" ] 
      then 
-       rm -r /home/${i}/.gimp-2.4
+       rm -r /home/${i}/.gimp-2.6
      fi 
    fi 
  done 

Modified: pbibuild/modules/gimp/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/gimp/overlay-dir/PBI.SetupScript.sh	2009-01-05 21:31:27 UTC (rev 3177)
+++ pbibuild/modules/gimp/overlay-dir/PBI.SetupScript.sh	2009-01-06 14:31:58 UTC (rev 3178)
@@ -15,29 +15,13 @@
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
 
-ln -s /Programs/${PROGDIR}/share/gimp /usr/local/share/gimp
-ln -s /Programs/${PROGDIR}/share/gutenprint /usr/local/share/gutenprint
-ln -s /Programs/${PROGDIR}/etc/gimp /usr/local/etc/gimp
-ln -s /Programs/${PROGDIR}/libexec/gimp /usr/local/libexec/gimp
-ln -s /Programs/${PROGDIR}/.sbin/gimp /usr/local/bin/gimp
+# 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
 
-# Copy over all the LANG files
-LANGFILE="gimp20.mo"
-LANGFILE1="gimp20-python.mo"
-LANGFILE2="gimp20-script-fu.mo"
-LANGFILE3="gimp20-std-plug-ins.mo"
-LANGFILE4="gimp20-libgimp.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}
-  cp /Programs/${PROGDIR}/locale/${i}/${LANGFILE1} /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE1}
-  cp /Programs/${PROGDIR}/locale/${i}/${LANGFILE2} /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE2}
-  cp /Programs/${PROGDIR}/locale/${i}/${LANGFILE3} /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE3}
-  cp /Programs/${PROGDIR}/locale/${i}/${LANGFILE4} /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE4}
-done
 
-
-# Enable the start when finished button
-echo "LAUNCHCLOSE: /usr/local/bin/gimp"
+echo "LAUNCHCLOSE: /Programs/bin/gimp"

Modified: pbibuild/modules/gimp/pbi.conf
===================================================================
--- pbibuild/modules/gimp/pbi.conf	2009-01-05 21:31:27 UTC (rev 3177)
+++ pbibuild/modules/gimp/pbi.conf	2009-01-06 14:31:58 UTC (rev 3178)
@@ -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="04"
+BUILDKEY="01"
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY



More information about the Commits mailing list