[PC-BSD Commits] r3166 - in pbibuild/modules/pidgin: . overlay-dir
svn at pcbsd.org
svn at pcbsd.org
Tue Dec 30 13:25:46 PST 2008
Author: kris
Date: 2008-12-30 13:25:45 -0800 (Tue, 30 Dec 2008)
New Revision: 3166
Modified:
pbibuild/modules/pidgin/build.sh
pbibuild/modules/pidgin/copy-files
pbibuild/modules/pidgin/overlay-dir/PBI.RemoveScript.sh
pbibuild/modules/pidgin/overlay-dir/PBI.SetupScript.sh
pbibuild/modules/pidgin/pbi.conf
pbibuild/modules/pidgin/preportmake.sh
Log:
Updated pidgin to use the new LOCALBASE properly, and also improve it with QT-based GTk themes now, looks nice :)
Modified: pbibuild/modules/pidgin/build.sh
===================================================================
--- pbibuild/modules/pidgin/build.sh 2008-12-30 21:14:43 UTC (rev 3165)
+++ pbibuild/modules/pidgin/build.sh 2008-12-30 21:25:45 UTC (rev 3166)
@@ -11,14 +11,14 @@
# Get all the various language files and copy them to the PBI
LANGFILE="pidgin.mo"
-mkdir ${PBIDIR}/locale/
+mkdir -p ${PBIDIR}/share/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}/
+ mkdir ${PBIDIR}/share/locale/${i}
+ cp /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE} ${PBIDIR}/share/locale/${i}/
fi
done
Modified: pbibuild/modules/pidgin/copy-files
===================================================================
--- pbibuild/modules/pidgin/copy-files 2008-12-30 21:14:43 UTC (rev 3165)
+++ pbibuild/modules/pidgin/copy-files 2008-12-30 21:25:45 UTC (rev 3166)
@@ -1,4 +1,5 @@
/usr/local/bin/pidgin bin/
+/usr/local/bin/es* bin/
/usr/local/share/purple share/
/usr/local/share/pixmaps/purple share/pixmaps/
/usr/local/share/pixmaps/pidgin share/pixmaps/
@@ -13,6 +14,15 @@
/usr/local/lib/libmad* autolibs/
/usr/local/lib/libgnut* autolibs/
/usr/local/lib/libgcrypt* autolibs/
-/usr/local/lib/pidgin lib2/
-/usr/local/lib/purple-2 lib2/
+/usr/local/lib/nss autolibs/
+/usr/local/lib/libnnss3* autolibs/
+/usr/local/lib/libes* autolibs/
+/usr/local/lib/libnssckpi* autolibs/
+/usr/local/lib/libplc* autolibs/
+/usr/local/lib/libplds4* autolibs/
+/usr/local/lib/libsmime3* autolibs/
+/usr/local/lib/libsoftokn3* autolibs/
+/usr/local/lib/libsssl3* autolibs/
+/usr/local/lib/pidgin lib/
+/usr/local/lib/purple-2 lib/
/usr/local/share/sounds/purple share/sounds/
Modified: pbibuild/modules/pidgin/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/pidgin/overlay-dir/PBI.RemoveScript.sh 2008-12-30 21:14:43 UTC (rev 3165)
+++ pbibuild/modules/pidgin/overlay-dir/PBI.RemoveScript.sh 2008-12-30 21:25:45 UTC (rev 3166)
@@ -7,24 +7,6 @@
# TIP: 'kdialog' should be used for user interaction.
#########################################
-rm /usr/local/bin/pidgin
-rm /usr/local/share/purple
-rm /usr/local/share/pixmaps/purple
-rm /usr/local/share/pixmaps/pidgin
-rm /usr/local/share/sounds/purple
-rm /usr/local/lib/purple-2
-rm /usr/local/lib/pidgin
-rm /Programs/Pidgin
-
-
-# Remove the old locale files since we are uninstalling
-LANGFILE="pidgin.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/pidgin/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/pidgin/overlay-dir/PBI.SetupScript.sh 2008-12-30 21:14:43 UTC (rev 3165)
+++ pbibuild/modules/pidgin/overlay-dir/PBI.SetupScript.sh 2008-12-30 21:25:45 UTC (rev 3166)
@@ -14,37 +14,15 @@
cd /Programs/${PROGDIR}
-ln -s /Programs/${PROGDIR}/share/purple /usr/local/share/purple
-ln -s /Programs/${PROGDIR}/.sbin/pidgin /usr/local/bin/pidgin
+# 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
-mkdir /usr/local/share/pixmaps
-# Make our various symlinks for program data
-ln -s /Programs/${PROGDIR}/share/pixmaps/purple /usr/local/share/pixmaps/purple
-ln -s /Programs/${PROGDIR}/share/pixmaps/pidgin /usr/local/share/pixmaps/pidgin
-ln -s /Programs/${PROGDIR}/share/sounds/purple /usr/local/share/sounds/purple
-ln -s /Programs/${PROGDIR}/lib2/purple-2 /usr/local/lib/purple-2
-ln -s /Programs/${PROGDIR}/lib2/pidgin /usr/local/lib/pidgin
-ln -s /Programs/${PROGDIR}/autolibs /Programs/${PROGDIR}/lib
-
-# Copy the icons over
-cp icons/16x16/apps/pidgin.png /usr/local/share/icons/crystalsvg/16x16/apps/
-cp icons/22x22/apps/pidgin.png /usr/local/share/icons/crystalsvg/22x22/apps/
-cp icons/32x32/apps/pidgin.png /usr/local/share/icons/crystalsvg/32x32/apps/
-cp icons/48x48/apps/pidgin.png /usr/local/share/icons/crystalsvg/48x48/apps/
-
-# Make our symlink so that gstreamer works properly
-ln -s /Programs/${PROGDIR} /Programs/Pidgin
-
-# Copy over all the LANG files
-LANGFILE="pidgin.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
-
# Make sure we add pidgin to the list of programs to exclude on startup via
# ksmserver
cd /home
@@ -80,4 +58,4 @@
done
-echo "LAUNCHCLOSE: /usr/local/bin/pidgin"
+echo "LAUNCHCLOSE: /Programs/bin/pidgin"
Modified: pbibuild/modules/pidgin/pbi.conf
===================================================================
--- pbibuild/modules/pidgin/pbi.conf 2008-12-30 21:14:43 UTC (rev 3165)
+++ pbibuild/modules/pidgin/pbi.conf 2008-12-30 21:25:45 UTC (rev 3166)
@@ -31,15 +31,16 @@
/usr/ports/net-im/pidgin-twitter
/usr/ports/net-im/pidgin-rhythmbox
/usr/ports/audio/pidgin-musictracker
-/usr/ports/net-im/pidgin-facebookchat"
+/usr/ports/net-im/pidgin-facebookchat
+/usr/ports/x11-themes/qtcurve-gtk2"
# Enter your custom make options here
-MAKEOPTS="PREFIX=/Programs/Pidgin"
+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="06"
+BUILDKEY="01"
# If this port has a non-standard port version variable in Makefile, then
# list the key here such as "OOOVERSION="
Modified: pbibuild/modules/pidgin/preportmake.sh
===================================================================
--- pbibuild/modules/pidgin/preportmake.sh 2008-12-30 21:14:43 UTC (rev 3165)
+++ pbibuild/modules/pidgin/preportmake.sh 2008-12-30 21:25:45 UTC (rev 3166)
@@ -1,7 +1,2 @@
#!/bin/sh
-# Remove any /Programs/Pidgin link, and recreate it, so we can use PREFIX
-# in our make.conf properly
-rm -rf /Programs/Pidgin
-mkdir /Programs
-ln -s /usr/local /Programs/Pidgin
More information about the Commits
mailing list