[PC-BSD Commits] r3197 - in pbibuild/modules/bmpx: . overlay-dir

svn at pcbsd.org svn at pcbsd.org
Wed Jan 7 16:33:38 PST 2009


Author: kris
Date: 2009-01-07 16:33:37 -0800 (Wed, 07 Jan 2009)
New Revision: 3197

Removed:
   pbibuild/modules/bmpx/overlay-dir/autolibs/
   pbibuild/modules/bmpx/overlay-dir/lib
Modified:
   pbibuild/modules/bmpx/build.sh
   pbibuild/modules/bmpx/copy-files
   pbibuild/modules/bmpx/overlay-dir/PBI.FirstRun.sh
   pbibuild/modules/bmpx/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/bmpx/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/bmpx/pbi.conf
   pbibuild/modules/bmpx/preportmake.sh
Log:

Updated bmpx to be 100% self-contained now :)



Modified: pbibuild/modules/bmpx/build.sh
===================================================================
--- pbibuild/modules/bmpx/build.sh	2009-01-07 21:23:19 UTC (rev 3196)
+++ pbibuild/modules/bmpx/build.sh	2009-01-08 00:33:37 UTC (rev 3197)
@@ -9,16 +9,3 @@
 #   PORTVER = Version number of the port we used to build
 ##############################################################################
 
-# Get all the various language files and copy them to the PBI
-LANGFILE="bmpx.mo"
-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 -p ${PBIDIR}/share/locale/${i}/LC_MESSAGES
-    cp /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE} ${PBIDIR}/share/locale/${i}/LC_MESSAGES/
-  fi
-done
-

Modified: pbibuild/modules/bmpx/copy-files
===================================================================
--- pbibuild/modules/bmpx/copy-files	2009-01-07 21:23:19 UTC (rev 3196)
+++ pbibuild/modules/bmpx/copy-files	2009-01-08 00:33:37 UTC (rev 3197)
@@ -15,44 +15,44 @@
 /usr/local/bin/OpenSPC* bin/
 /usr/local/share/bmpx share/bmpx
 /usr/local/share/applications/bmp-* share/applications/
-/usr/local/lib/bmpx autolibs/bmpx
-/usr/local/lib/libflac* autolibs/
-/usr/local/lib/libmad* autolibs/
-/usr/local/lib/libsoup* autolibs/
-/usr/local/lib/libsexy* autolibs/
-/usr/local/lib/enchant autolibs/
-/usr/local/lib/libenchant* autolibs/
-/usr/local/lib/libglademm* autolibs/
-/usr/local/lib/libgst* autolibs/
-/usr/local/lib/libgtkmm* autolibs/
-/usr/local/lib/libgdkmm* autolibs/
-/usr/local/lib/libatkmm* autolibs/
-/usr/local/lib/libpangomm* autolibs/
-/usr/local/lib/libcairomm* autolibs/
-/usr/local/lib/libmp3* autolibs/
-/usr/local/lib/libOpen* autolibs/
-/usr/local/lib/liba52* autolibs/
-/usr/local/lib/libfaad* autolibs/
-/usr/local/lib/liboil* autolibs/
-/usr/local/lib/libsidpl* autolibs/
-/usr/local/lib/libsigc* autolibs/
-/usr/local/lib/libxml* autolibs/
-/usr/local/lib/libpcre* autolibs/
-/usr/local/lib/libintl* autolibs/
-/usr/local/lib/libiconv* autolibs/
-/usr/local/lib/libGL* autolibs/
-/usr/local/lib/libdrm* autolibs/
-/usr/local/lib/libg* autolibs/
-/usr/local/lib/libhal* autolibs/
-/usr/local/lib/libsql* autolibs/
-/usr/local/lib/librsvg* autolibs/
-/usr/local/lib/libstart* autolibs/
-/usr/local/lib/libSM* autolibs/
-/usr/local/lib/libICE* autolibs/
-/usr/local/lib/libboost* autolibs/
-/usr/local/lib/libofa* autolibs/
-/usr/local/lib/libcroco* autolibs/
-/usr/local/lib/libfft* autolibs/
-/usr/local/lib/gstream* autolibs/
-/usr/local/lib/libcdio* autolibs/
+/usr/local/lib/bmpx lib/bmpx
+/usr/local/lib/libflac* lib/
+/usr/local/lib/libmad* lib/
+/usr/local/lib/libsoup* lib/
+/usr/local/lib/libsexy* lib/
+/usr/local/lib/enchant lib/
+/usr/local/lib/libenchant* lib/
+/usr/local/lib/libglademm* lib/
+/usr/local/lib/libgst* lib/
+/usr/local/lib/libgtkmm* lib/
+/usr/local/lib/libgdkmm* lib/
+/usr/local/lib/libatkmm* lib/
+/usr/local/lib/libpangomm* lib/
+/usr/local/lib/libcairomm* lib/
+/usr/local/lib/libmp3* lib/
+/usr/local/lib/libOpen* lib/
+/usr/local/lib/liba52* lib/
+/usr/local/lib/libfaad* lib/
+/usr/local/lib/liboil* lib/
+/usr/local/lib/libsidpl* lib/
+/usr/local/lib/libsigc* lib/
+/usr/local/lib/libxml* lib/
+/usr/local/lib/libpcre* lib/
+/usr/local/lib/libintl* lib/
+/usr/local/lib/libiconv* lib/
+/usr/local/lib/libGL* lib/
+/usr/local/lib/libdrm* lib/
+/usr/local/lib/libg* lib/
+/usr/local/lib/libhal* lib/
+/usr/local/lib/libsql* lib/
+/usr/local/lib/librsvg* lib/
+/usr/local/lib/libstart* lib/
+/usr/local/lib/libSM* lib/
+/usr/local/lib/libICE* lib/
+/usr/local/lib/libboost* lib/
+/usr/local/lib/libofa* lib/
+/usr/local/lib/libcroco* lib/
+/usr/local/lib/libfft* lib/
+/usr/local/lib/gstream* lib/
+/usr/local/lib/libcdio* lib/
 /usr/local/libexec/beep* libexec/

Modified: pbibuild/modules/bmpx/overlay-dir/PBI.FirstRun.sh
===================================================================
--- pbibuild/modules/bmpx/overlay-dir/PBI.FirstRun.sh	2009-01-07 21:23:19 UTC (rev 3196)
+++ pbibuild/modules/bmpx/overlay-dir/PBI.FirstRun.sh	2009-01-08 00:33:37 UTC (rev 3197)
@@ -17,8 +17,3 @@
 #########################################
 
 
-if [ -e "/usr/local/bin/bmp2" ]
-then
-  kdialog -error "BMPx is already installed! Please remove it before re-installing!"
-  exit 2
-fi

Modified: pbibuild/modules/bmpx/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/bmpx/overlay-dir/PBI.RemoveScript.sh	2009-01-07 21:23:19 UTC (rev 3196)
+++ pbibuild/modules/bmpx/overlay-dir/PBI.RemoveScript.sh	2009-01-08 00:33:37 UTC (rev 3197)
@@ -7,20 +7,6 @@
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
 
-rm /usr/local/bin/beep-media-player-2-bin
-rm /usr/local/share/bmpx
-rm /usr/local/libexec/beep-media*
-rm /Programs/BMPx
-
-# Remove the old locale files since we are uninstalling
-LANGFILE="bmpx.mo"
-cd /Programs/${PROGDIR}/share/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/bmpx/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/bmpx/overlay-dir/PBI.SetupScript.sh	2009-01-07 21:23:19 UTC (rev 3196)
+++ pbibuild/modules/bmpx/overlay-dir/PBI.SetupScript.sh	2009-01-08 00:33:37 UTC (rev 3197)
@@ -15,20 +15,13 @@
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
 
-ln -s /Programs/${PROGDIR}/.sbin/beep-media-player-2-bin /usr/local/bin/beep-media-player-2-bin
-ln -s /Programs/${PROGDIR}/share/bmpx /usr/local/share/bmpx
-ln -s /Programs/${PROGDIR}/libexec/beep-media-player-2-bin /usr/local/libexec/beep-media-player-2-bin
-ln -s /Programs/${PROGDIR}/libexec/beep-media-player-2-sentinel /usr/local/libexec/beep-media-player-2-sentinel
+# 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} /Programs/BMPx
 
-# Copy over all the LANG files
-LANGFILE="bmpx.mo"
-cd /Programs/${PROGDIR}/share/locale
-for i in `ls`
-do
-  mkdir -p /usr/local/share/locale/${i}/LC_MESSAGES >/dev/null 2>/dev/null
-  cp /Programs/${PROGDIR}/share/locale/${i}/LC_MESSAGES/${LANGFILE} /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE}
-done
-
-echo "LAUNCHCLOSE: /usr/local/bin/beep-media-player-2-bin"
+echo "LAUNCHCLOSE: /Programs/bin/beep-media-player-2-bin"

Modified: pbibuild/modules/bmpx/pbi.conf
===================================================================
--- pbibuild/modules/bmpx/pbi.conf	2009-01-07 21:23:19 UTC (rev 3196)
+++ pbibuild/modules/bmpx/pbi.conf	2009-01-08 00:33:37 UTC (rev 3197)
@@ -32,11 +32,12 @@
 /usr/ports/audio/gstreamer-plugins-fluendo-mp3
 /usr/ports/audio/gstreamer-plugins-faad
 /usr/ports/audio/gstreamer-plugins-flac
-/usr/ports/multimedia/gstreamer-ffmpeg"
+/usr/ports/multimedia/gstreamer-ffmpeg
+/usr/ports/audio/gstreamer-plugins-cdaudio
+/usr/ports/x11-themes/qtcurve-gtk2"
 
 # Enter your custom make options here
-MAKEOPTS="PREFIX=/Programs/BMPx
-WITH_HAL=yes"
+MAKEOPTS="WITH_HAL=yes"
 
 # Build Key - Change this to anything else to trigger a rebuild 
 #           - The rebuild will take place even if port is still the same ver

Modified: pbibuild/modules/bmpx/preportmake.sh
===================================================================
--- pbibuild/modules/bmpx/preportmake.sh	2009-01-07 21:23:19 UTC (rev 3196)
+++ pbibuild/modules/bmpx/preportmake.sh	2009-01-08 00:33:37 UTC (rev 3197)
@@ -1,7 +1,2 @@
 #!/bin/sh
 
-# Remove any /Programs/BMPx link, and recreate it, so we can use PREFIX
-# in our make.conf properly
-rm -rf /Programs/BMPx
-mkdir /Programs
-ln -s /usr/local /Programs/BMPx



More information about the Commits mailing list