[PC-BSD Commits] r3349 - in pbibuild/modules/kdesvn: . overlay-dir

svn at pcbsd.org svn at pcbsd.org
Tue Jan 27 13:17:51 PST 2009


Author: kris
Date: 2009-01-27 13:17:50 -0800 (Tue, 27 Jan 2009)
New Revision: 3349

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

Updated kdesvn, now 100% self-contained and seems to work great!



Modified: pbibuild/modules/kdesvn/build.sh
===================================================================
--- pbibuild/modules/kdesvn/build.sh	2009-01-27 20:27:05 UTC (rev 3348)
+++ pbibuild/modules/kdesvn/build.sh	2009-01-27 21:17:50 UTC (rev 3349)
@@ -8,77 +8,3 @@
 # MODULEDIR = The location of the module directory for this PBI
 #   PORTVER = Version number of the port we used to build
 ##############################################################################
-#icons
-mkdir -p ${PBIDIR}/share
-cp -Rf /usr/local/share/icons ${PBIDIR}/share
-
-#service
-mkdir -p ${PBIDIR}/share/services
-cp -Rf /usr/local/share/services/ksvn+file.protocol ${PBIDIR}/share/services
-cp -Rf /usr/local/share/services/ksvn+http.protocol ${PBIDIR}/share/services
-cp -Rf /usr/local/share/services/ksvn+https.protocol ${PBIDIR}/share/services
-cp -Rf /usr/local/share/services/ksvn+ssh.protocol ${PBIDIR}/share/services
-cp -Rf /usr/local/share/services/ksvn.protocol ${PBIDIR}/share/services
-
-cp -Rf /usr/local/share/services/svn+file.protocol ${PBIDIR}/share/services
-cp -Rf /usr/local/share/services/svn+http.protocol ${PBIDIR}/share/services
-cp -Rf /usr/local/share/services/svn+https.protocol ${PBIDIR}/share/services
-cp -Rf /usr/local/share/services/svn+ssh.protocol ${PBIDIR}/share/services
-cp -Rf /usr/local/share/services/svn.protocol ${PBIDIR}/share/services
-
-
-#binaries
-mkdir ${PBIDIR}/bin
-cp /usr/local/bin/kdesvn ${PBIDIR}/bin
-cp /usr/local/bin/kdesvnaskpass ${PBIDIR}/bin
-
-#extras
-mkdir -p ${PBIDIR}/include
-cp -Rf /usr/local/include/svnqt ${PBIDIR}/include
-
-#extra libs
-mkdir -p ${PBIDIR}/lib/kde3
-cp /usr/local/lib/kde3/kded_kdesvnd.la ${PBIDIR}/lib/kde3
-cp /usr/local/lib/kde3/kded_kdesvnd.so ${PBIDIR}/lib/kde3
-cp /usr/local/lib/kde3/kio_ksvn.la ${PBIDIR}/lib/kde3
-cp /usr/local/lib/kde3/kio_ksvn.so ${PBIDIR}/lib/kde3
-cp /usr/local/lib/kde3/libkdesvnpart.la ${PBIDIR}/lib/kde3
-cp /usr/local/lib/kde3/libkdesvnpart.so ${PBIDIR}/lib/kde3
-
-cp /usr/local/lib/libsvnqt.so* ${PBIDIR}/lib
-
-mkdir -p ${PBIDIR}/share/applications/kde
-cp -Rf /usr/local/share/applications/kde/kdesvn.desktop ${PBIDIR}/share/applications/kde/
-
-mkdir -p ${PBIDIR}/share/services/kded
-cp -Rf /usr/local/share/services/kded/kdesvnd.desktop ${PBIDIR}/share/services/kded/
-
-mkdir -p ${PBIDIR}/share/apps/kconf_update
-cp -Rf /usr/local/share/apps/kconf_update/kdesvn-use-external-update.sh ${PBIDIR}/share/apps/kconf_update/
-cp -Rf /usr/local/share/apps/kconf_update/kdesvnpartrc-use-external.upd ${PBIDIR}/share/apps/kconf_update/
-
-cp -Rf /usr/local/share/apps/kdesvn ${PBIDIR}/share/apps
-cp -Rf /usr/local/share/apps/kdesvnpart ${PBIDIR}/share/apps
-
-mkdir -p ${PBIDIR}/share/apps/konqueror/servicemenus/
-cp -Rf /usr/local/share/apps/konqueror/servicemenus/kdesvn_subversion.desktop ${PBIDIR}/share/apps/konqueror/servicemenus/
-
-mkdir -p ${PBIDIR}/share/config.kcfg
-cp -Rf /usr/local/share/config.kcfg/kdesvn_part.kcfg ${PBIDIR}/share/config.kcfg/
-
-mkdir -p ${PBIDIR}/share/doc/HTML/en
-cp -Rf /usr/local/share/doc/HTML/en/kdesvn ${PBIDIR}/share/doc/HTML/en
-
-
-# Get all the various language files and copy them to the PBI
-LANGFILE="kdesvn.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/kdesvn/copy-files
===================================================================
--- pbibuild/modules/kdesvn/copy-files	2009-01-27 20:27:05 UTC (rev 3348)
+++ pbibuild/modules/kdesvn/copy-files	2009-01-27 21:17:50 UTC (rev 3349)
@@ -1 +1,18 @@
-
+/usr/local/bin/*svn* bin/
+/usr/local/bin/kio* bin/
+/usr/local/bin/*dcop* bin/
+/usr/local/bin/*arts* bin/
+/usr/local/lib/kde3/*svn* lib/kde3
+/usr/local/lib/kde3/*kio* autolibs/kde3/
+/usr/local/lib/kde3/*knoti* autolibs/kde3/
+/usr/local/lib/kde3/kded* autolibs/kde3/
+/usr/local/lib/*svn* autolibs/
+/usr/local/share/apps share/
+/usr/local/share/config.kcfg share/config.kcfg
+/usr/local/share/config share/config
+/usr/local/share/services share/services
+/usr/local/share/servicetypes share/servicetypes
+/usr/local/share/mime share/mime
+/usr/local/share/mimelnk share/mimelnk
+/usr/local/libexec/gam* libexec/
+/usr/local/share/icons share/

Modified: pbibuild/modules/kdesvn/overlay-dir/PBI.FirstRun.sh
===================================================================
--- pbibuild/modules/kdesvn/overlay-dir/PBI.FirstRun.sh	2009-01-27 20:27:05 UTC (rev 3348)
+++ pbibuild/modules/kdesvn/overlay-dir/PBI.FirstRun.sh	2009-01-27 21:17:50 UTC (rev 3349)
@@ -12,10 +12,3 @@
 # echo 'SETSTEPS: <num>' # Set the current progress of the progress bar
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
-INSTALLED=`ls /Programs | grep kdesvn`
-if [ $? = 0 ]
-then
-	kdialog --msgbox "Please remove the previous version of KDESvnfirst"
-	exit 2
-fi
-

Modified: pbibuild/modules/kdesvn/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/kdesvn/overlay-dir/PBI.RemoveScript.sh	2009-01-27 20:27:05 UTC (rev 3348)
+++ pbibuild/modules/kdesvn/overlay-dir/PBI.RemoveScript.sh	2009-01-27 21:17:50 UTC (rev 3349)
@@ -6,55 +6,7 @@
 # ${2} is the username of person performing the deletion.
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
-killall -9 kdesvn
-killall -9 ksvn
 
-cd /Programs/${PROGDIR}/share/icons
-find * -type f -name "*.svgz" -exec rm /usr/local/share/icons/\{\} \;
-find * -type f -name "*.png" -exec rm /usr/local/share/icons/\{\} \;
-cd -
-
-rm -Rf \
-	/usr/local/bin/kdesvn \
-	/usr/local/bin/kdesvnaskpass \
-	/usr/local/include/svnqt \
-	/usr/local/share/applications/kde/kdesvn.desktop \
-	/usr/local/share/services/kded/kdesvnd.desktop \
-	/usr/local/share/apps/kconf_update/kdesvn-use-external-update.sh \
-	/usr/local/share/apps/kconf_update/kdesvnpartrc-use-external.upd \
-	/usr/local/share/apps/kdesvn \
-	/usr/local/share/apps/kdesvnpart \
-	/usr/local/share/apps/konqueror/servicemenus/kdesvn_subversion.desktop \
-	/usr/local/share/config.kcfg/kdesvn_part.kcfg \
-	/usr/local/share/doc/HTML/en/kdesvn \
-	/usr/local/lib/kde3/kded_kdesvnd.la \
-	/usr/local/lib/kde3/kded_kdesvnd.so \
-	/usr/local/lib/kde3/kio_ksvn.la \
-	/usr/local/lib/kde3/kio_ksvn.so \
-	/usr/local/lib/kde3/libkdesvnpart.la \
-	/usr/local/lib/kde3/libkdesvnpart.so \
-	/usr/local/share/services/ksvn+file.protocol \
-	/usr/local/share/services/ksvn+http.protocol \
-	/usr/local/share/services/ksvn+https.protocol \
-	/usr/local/share/services/ksvn+ssh.protocol \
-	/usr/local/share/services/ksvn.protocol \
-        /usr/local/share/services/svn+file.protocol \
-        /usr/local/share/services/svn+http.protocol \
-        /usr/local/share/services/svn+https.protocol \
-        /usr/local/share/services/svn+ssh.protocol \
-        /usr/local/share/services/svn.protocol \
-	/usr/local/lib/libsvnqt.so \
-	/usr/local/lib/libsvnqt.so.4 \
-	/usr/local/lib/libsvnqt.so.4.1.1
-
-# Remove the old locale files since we are uninstalling
-LANGFILE="kdesvn.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/kdesvn/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/kdesvn/overlay-dir/PBI.SetupScript.sh	2009-01-27 20:27:05 UTC (rev 3348)
+++ pbibuild/modules/kdesvn/overlay-dir/PBI.SetupScript.sh	2009-01-27 21:17:50 UTC (rev 3349)
@@ -11,62 +11,14 @@
 # echo 'SETSTEPS: <num>' # Set the current progress of the progress bar
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
-cd /Programs/${PROGDIR}/share/icons
-find * -type f -name "*.svgz" -exec ln -s /Programs/${PROGDIR}/share/icons/\{\} /usr/local/share/icons/\{\} \;
-find * -type f -name "*.png" -exec ln -s /Programs/${PROGDIR}/share/icons/\{\} /usr/local/share/icons/\{\} \;
-cd -
 
-ln -s /Programs/${PROGDIR}/bin/kdesvn /usr/local/bin/kdesvn
-ln -s /Programs/${PROGDIR}/bin/kdesvnaskpass /usr/local/bin/kdesvnaskpass
+# 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
 
-ln -s /Programs/${PROGDIR}/include/svnqt /usr/local/include/svnqt
 
-ln -s /Programs/${PROGDIR}/share/services/ksvn+file.protocol /usr/local/share/services/ksvn+file.protocol
-ln -s /Programs/${PROGDIR}/share/services/ksvn+http.protocol /usr/local/share/services/ksvn+http.protocol
-ln -s /Programs/${PROGDIR}/share/services/ksvn+https.protocol /usr/local/share/services/ksvn+https.protocol
-ln -s /Programs/${PROGDIR}/share/services/ksvn+ssh.protocol /usr/local/share/services/ksvn+ssh.protocol
-ln -s /Programs/${PROGDIR}/share/services/ksvn.protocol /usr/local/share/services/ksvn.protocol
-
-ln -s /Programs/${PROGDIR}/share/services/svn+file.protocol /usr/local/share/services/svn+file.protocol
-ln -s /Programs/${PROGDIR}/share/services/svn+http.protocol /usr/local/share/services/svn+http.protocol
-ln -s /Programs/${PROGDIR}/share/services/svn+https.protocol /usr/local/share/services/svn+https.protocol
-ln -s /Programs/${PROGDIR}/share/services/svn+ssh.protocol /usr/local/share/services/svn+ssh.protocol
-ln -s /Programs/${PROGDIR}/share/services/svn.protocol /usr/local/share/services/svn.protocol
-
-
-ln -s /Programs/${PROGDIR}/lib/kde3/kded_kdesvnd.la /usr/local/lib/kde3/kded_kdesvnd.la
-ln -s /Programs/${PROGDIR}/lib/kde3/kded_kdesvnd.so /usr/local/lib/kde3/kded_kdesvnd.so
-ln -s /Programs/${PROGDIR}/lib/kde3/kio_ksvn.la /usr/local/lib/kde3/kio_ksvn.la
-ln -s /Programs/${PROGDIR}/lib/kde3/kio_ksvn.so /usr/local/lib/kde3/kio_ksvn.so
-ln -s /Programs/${PROGDIR}/lib/kde3/libkdesvnpart.la /usr/local/lib/kde3/libkdesvnpart.la
-ln -s /Programs/${PROGDIR}/lib/kde3/libkdesvnpart.so /usr/local/lib/kde3/libkdesvnpart.so
-
-ln -s /Programs/${PROGDIR}/lib/libsvnqt.so /usr/local/lib/libsvnqt.so
-ln -s /Programs/${PROGDIR}/lib/libsvnqt.so.4 /usr/local/lib/libsvnqt.so.4
-ln -s /Programs/${PROGDIR}/lib/libsvnqt.so.4.1.1 /usr/local/lib/libsvnqt.so.4.1.1
-
-ln -s /Programs/${PROGDIR}/share/applications/kde/kdesvn.desktop /usr/local/share/applications/kde/kdesvn.desktop
-ln -s /Programs/${PROGDIR}/share/services/kded/kdesvnd.desktop /usr/local/share/services/kded/kdesvnd.desktop
-
-ln -s /Programs/${PROGDIR}/share/apps/kconf_update/kdesvn-use-external-update.sh /usr/local/share/apps/kconf_update/kdesvn-use-external-update.sh
-ln -s /Programs/${PROGDIR}/share/apps/kconf_update/kdesvnpartrc-use-external.upd /usr/local/share/apps/kconf_update/kdesvnpartrc-use-external.upd
-
-ln -s /Programs/${PROGDIR}/share/apps/kdesvn /usr/local/share/apps/kdesvn
-ln -s /Programs/${PROGDIR}/share/apps/kdesvnpart /usr/local/share/apps/kdesvnpart
-
-ln -s /Programs/${PROGDIR}/share/apps/konqueror/servicemenus/kdesvn_subversion.desktop /usr/local/share/apps/konqueror/servicemenus/kdesvn_subversion.desktop
-
-ln -s /Programs/${PROGDIR}/share/config.kcfg/kdesvn_part.kcfg /usr/local/share/config.kcfg/kdesvn_part.kcfg
-
-ln -s /Programs/${PROGDIR}/share/doc/HTML/en/kdesvn /usr/local/share/doc/HTML/en/kdesvn
-
-# Copy over all the LANG files
-LANGFILE="kdesvn.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/kdesvn"
+echo "LAUNCHCLOSE: /Programs/bin/kdesvn"

Modified: pbibuild/modules/kdesvn/pbi.conf
===================================================================
--- pbibuild/modules/kdesvn/pbi.conf	2009-01-27 20:27:05 UTC (rev 3348)
+++ pbibuild/modules/kdesvn/pbi.conf	2009-01-27 21:17:50 UTC (rev 3349)
@@ -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="12"
+BUILDKEY="01"
 
 # If this port has a non-standard port version variable in Makefile, then
 # list the key here such as "OOOVERSION="



More information about the Commits mailing list