[PC-BSD Commits] r3160 - in pbibuild/modules/doomlegacy: . overlay-dir

[svn at pcbsd.org]

Author: kris
Date: 2008-12-30 08:56:37 -0800 (Tue, 30 Dec 2008)
New Revision: 3160

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

Fixed up DoomLegacy, now doesn't need any external sym-links :)



Modified: pbibuild/modules/doomlegacy/copy-files
===================================================================
--- pbibuild/modules/doomlegacy/copy-files	2008-12-30 16:15:37 UTC (rev 3159)
+++ pbibuild/modules/doomlegacy/copy-files	2008-12-30 16:56:37 UTC (rev 3160)
@@ -1,5 +1,7 @@
 /usr/local/lib/doomlegacy autolibs/
 /usr/local/lib/doomlegacy/lib/doomlegacy/llsndserv bin/
 /usr/local/lib/doomlegacy/lib/doomlegacy/lsdldoom bin/
+/usr/local/lib/libSD* autolibs/
+/usr/local/lib/libmi* autolibs/
 /usr/local/share/doom share/
-/usr/local/share/doc/doomlegacy share/doc/
\ No newline at end of file
+/usr/local/share/doc/doomlegacy share/doc/

Modified: pbibuild/modules/doomlegacy/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/doomlegacy/overlay-dir/PBI.RemoveScript.sh	2008-12-30 16:15:37 UTC (rev 3159)
+++ pbibuild/modules/doomlegacy/overlay-dir/PBI.RemoveScript.sh	2008-12-30 16:56:37 UTC (rev 3160)
@@ -6,8 +6,7 @@
 # ${2} is the username of person performing the deletion.
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
-rm -fR  /usr/local/bin/doomlegacy
-#rm -fR /usr/local/share/doc/doomlegacy
+
 if [ ! -z "$DISPLAY" ]
 then
  # Ask if we want to remove the user profiles
@@ -23,4 +22,4 @@
    fi
   done
  fi
-fi
\ No newline at end of file
+fi

Modified: pbibuild/modules/doomlegacy/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/doomlegacy/overlay-dir/PBI.SetupScript.sh	2008-12-30 16:15:37 UTC (rev 3159)
+++ pbibuild/modules/doomlegacy/overlay-dir/PBI.SetupScript.sh	2008-12-30 16:56:37 UTC (rev 3160)
@@ -14,8 +14,14 @@
 # echo 'SETSTEPS: <num>' # Set the current progress of the progress bar
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
-ln -s /Programs/${PROGDIR}/.sbin/doomlegacy /usr/local/bin/doomlegacy
-#ln -s /Programs/${PROGDIR}/share/doom /usr/local/share/doom
-ln -s /Programs/${PROGDIR}/autolibs /Programs/${PROGDIR}/lib
-#ln -s /Programs/${PROGDIR}/share/doc/doomlegacy /usr/local/share/doc/doomlegacy
-echo "LAUNCHCLOSE: /usr/local/bin/doomlegacy"
+
+# 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: /Programs/bin/doomlegacy"

Modified: pbibuild/modules/doomlegacy/pbi.conf
===================================================================
--- pbibuild/modules/doomlegacy/pbi.conf	2008-12-30 16:15:37 UTC (rev 3159)
+++ pbibuild/modules/doomlegacy/pbi.conf	2008-12-30 16:56:37 UTC (rev 3160)
@@ -32,6 +32,6 @@
 
 # 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="05"
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY