[PC-BSD Commits] r3316 - in pbibuild/modules/inkscape: . overlay-dir

svn at pcbsd.org svn at pcbsd.org
Thu Jan 22 12:09:02 PST 2009


Author: kris
Date: 2009-01-22 12:08:59 -0800 (Thu, 22 Jan 2009)
New Revision: 3316

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

Inkscape - now 100% self-contained :)



Modified: pbibuild/modules/inkscape/build.sh
===================================================================
--- pbibuild/modules/inkscape/build.sh	2009-01-22 16:49:53 UTC (rev 3315)
+++ pbibuild/modules/inkscape/build.sh	2009-01-22 20:08:59 UTC (rev 3316)
@@ -9,18 +9,3 @@
 #   PORTVER = Version number of the port we used to build
 ##############################################################################
 
-
-# Get all the various Inkscape language files and copy them to the PBI
-LANGFILE="inkscape.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/inkscape/overlay-dir/PBI.FirstRun.sh
===================================================================
--- pbibuild/modules/inkscape/overlay-dir/PBI.FirstRun.sh	2009-01-22 16:49:53 UTC (rev 3315)
+++ pbibuild/modules/inkscape/overlay-dir/PBI.FirstRun.sh	2009-01-22 20:08:59 UTC (rev 3316)
@@ -16,9 +16,3 @@
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
 
-
-if [ -e "/usr/local/bin/inkscape" ]
-then
-  kdialog -error "Inkscape is already installed! Please remove it before re-installing!"
-  exit 2
-fi

Modified: pbibuild/modules/inkscape/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/inkscape/overlay-dir/PBI.RemoveScript.sh	2009-01-22 16:49:53 UTC (rev 3315)
+++ pbibuild/modules/inkscape/overlay-dir/PBI.RemoveScript.sh	2009-01-22 20:08:59 UTC (rev 3316)
@@ -7,10 +7,6 @@
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
 
-rm /usr/local/bin/inkscape
-rm /usr/local/share/inkscape
-rm /usr/local/share/pixmaps/inkscape.png
-
 if [ ! -z "$DISPLAY" ]
 then
  # Ask if we want to remove the user profiles
@@ -27,12 +23,3 @@
   done
  fi
 fi
-
-# Remove the old locale files since we are uninstalling
-LANGFILE="inkscape.mo"
-cd /Programs/${PROGDIR}/locale
-for i in `ls`
-do
-  rm /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE}
-done
-

Modified: pbibuild/modules/inkscape/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/inkscape/overlay-dir/PBI.SetupScript.sh	2009-01-22 16:49:53 UTC (rev 3315)
+++ pbibuild/modules/inkscape/overlay-dir/PBI.SetupScript.sh	2009-01-22 20:08:59 UTC (rev 3316)
@@ -15,18 +15,12 @@
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
 
-ln -s /Programs/${PROGDIR}/.sbin/inkscape /usr/local/bin/inkscape
-ln -s /Programs/${PROGDIR}/share/inkscape /usr/local/share/inkscape
-ln -s /Programs/${PROGDIR}/inkscape.png /usr/local/share/pixmaps/inkscape.png
+# 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="inkscape.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/inkscape"
+echo "LAUNCHCLOSE: /Programs/bin/inkscape"

Modified: pbibuild/modules/inkscape/pbi.conf
===================================================================
--- pbibuild/modules/inkscape/pbi.conf	2009-01-22 16:49:53 UTC (rev 3315)
+++ pbibuild/modules/inkscape/pbi.conf	2009-01-22 20:08:59 UTC (rev 3316)
@@ -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="03"
+BUILDKEY="01"
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY



More information about the Commits mailing list