[PC-BSD Commits] r3239 - in pbibuild/modules/amsn: . overlay-dir

[svn at pcbsd.org]

Author: kris
Date: 2009-01-13 09:14:47 -0800 (Tue, 13 Jan 2009)
New Revision: 3239

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

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



Modified: pbibuild/modules/amsn/build.sh
===================================================================
--- pbibuild/modules/amsn/build.sh	2009-01-13 15:59:23 UTC (rev 3238)
+++ pbibuild/modules/amsn/build.sh	2009-01-13 17:14:47 UTC (rev 3239)
@@ -10,11 +10,11 @@
 ##############################################################################
 
 # Update links to tclsh to the right dir
-sed -e "s,/usr/bin,/Programs/aMSN/bin,g" ${PBIDIR}/share/amsn/amsn-remote > /tmp/amsn-remote
+sed -e "s,/usr/bin,/Programs/aMSN${PORTVER}/bin,g" ${PBIDIR}/share/amsn/amsn-remote > /tmp/amsn-remote
 mv /tmp/amsn-remote ${PBIDIR}/share/amsn/amsn-remote
 chmod 755 ${PBIDIR}/share/amsn/amsn-remote
 
 # Update links to tclsh to the right dir
-sed -e "s,/usr/bin,/Programs/aMSN/bin,g" ${PBIDIR}/share/amsn/amsn-remote-CLI > /tmp/amsn-remote-CLI
+sed -e "s,/usr/bin,/Programs/aMSN${PORTVER}/bin,g" ${PBIDIR}/share/amsn/amsn-remote-CLI > /tmp/amsn-remote-CLI
 mv /tmp/amsn-remote-CLI ${PBIDIR}/share/amsn/amsn-remote-CLI
 chmod 755 ${PBIDIR}/share/amsn/amsn-remote-CLI

Modified: pbibuild/modules/amsn/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/amsn/overlay-dir/PBI.RemoveScript.sh	2009-01-13 15:59:23 UTC (rev 3238)
+++ pbibuild/modules/amsn/overlay-dir/PBI.RemoveScript.sh	2009-01-13 17:14:47 UTC (rev 3239)
@@ -7,8 +7,6 @@
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
 
-rm /usr/local/bin/amsn
-rm /Programs/aMSN
 
 if [ ! -z "$DISPLAY" ]
 then

Modified: pbibuild/modules/amsn/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/amsn/overlay-dir/PBI.SetupScript.sh	2009-01-13 15:59:23 UTC (rev 3238)
+++ pbibuild/modules/amsn/overlay-dir/PBI.SetupScript.sh	2009-01-13 17:14:47 UTC (rev 3239)
@@ -12,7 +12,13 @@
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
 
-ln -fs /Programs/${PROGDIR} /Programs/aMSN
-ln -fs /Programs/${PROGDIR}/.sbin/amsn /usr/local/bin/amsn
+# 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
 
-echo "LAUNCHCLOSE: /usr/local/bin/amsn"
+
+echo "LAUNCHCLOSE: /Programs/bin/amsn"

Modified: pbibuild/modules/amsn/pbi.conf
===================================================================
--- pbibuild/modules/amsn/pbi.conf	2009-01-13 15:59:23 UTC (rev 3238)
+++ pbibuild/modules/amsn/pbi.conf	2009-01-13 17:14:47 UTC (rev 3239)
@@ -28,11 +28,11 @@
 OTHERPORT=""
 
 # Enter your custom make options here
-MAKEOPTS="PREFIX=/Programs/aMSN"
+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="01"
+BUILDKEY="05"
 
 # If this port has a non-standard port version variable in Makefile, then
 # list the key here such as "OOOVERSION="

Modified: pbibuild/modules/amsn/preportmake.sh
===================================================================
--- pbibuild/modules/amsn/preportmake.sh	2009-01-13 15:59:23 UTC (rev 3238)
+++ pbibuild/modules/amsn/preportmake.sh	2009-01-13 17:14:47 UTC (rev 3239)
@@ -1,19 +1,3 @@
 #!/bin/sh
 ##############################################################
 
-rm -rf /Programs/aMSN
-mkdir /Programs
-ln -s /usr/local /Programs/aMSN
-
-cd /usr/ports/lang/perl5.8
-make clean
-make 
-make install
-make clean
-
-cd /usr/ports/lang/python25
-make clean
-make 
-make install
-make clean
-