[PC-BSD Commits] r3069 - in pbibuild/modules/rtcw: . kmenu-dir overlay-dir overlay-dir/bin

svn at pcbsd.org svn at pcbsd.org
Fri Dec 12 09:47:17 PST 2008


Author: kris
Date: 2008-12-12 09:47:16 -0800 (Fri, 12 Dec 2008)
New Revision: 3069

Added:
   pbibuild/modules/rtcw/overlay-dir/default.cfg
Removed:
   pbibuild/modules/rtcw/overlay-dir/bin/wolf.sh
   pbibuild/modules/rtcw/overlay-dir/bin/wolfded.sh
   pbibuild/modules/rtcw/overlay-dir/bin/wolfsp.sh
Modified:
   pbibuild/modules/rtcw/build.sh
   pbibuild/modules/rtcw/kmenu-dir/wolf
   pbibuild/modules/rtcw/kmenu-dir/wolfded
   pbibuild/modules/rtcw/kmenu-dir/wolfsp
   pbibuild/modules/rtcw/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/rtcw/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/rtcw/pbi.conf
Log:

Fixed up the rtcw module, now builds / runs properly. Still need some missing pk3 files from the windows install for all the graphics to be present. Gon will add them soon.



Modified: pbibuild/modules/rtcw/build.sh
===================================================================
--- pbibuild/modules/rtcw/build.sh	2008-12-12 17:05:28 UTC (rev 3068)
+++ pbibuild/modules/rtcw/build.sh	2008-12-12 17:47:16 UTC (rev 3069)
@@ -9,3 +9,6 @@
 #   PORTVER = Version number of the port we used to build
 ##############################################################################
 
+# Copy over our standard default.cfg setup file
+mv ${PBIDIR}/default.cfg ${PBIDIR}/share/rtcw/main/
+

Modified: pbibuild/modules/rtcw/kmenu-dir/wolf
===================================================================
--- pbibuild/modules/rtcw/kmenu-dir/wolf	2008-12-12 17:05:28 UTC (rev 3068)
+++ pbibuild/modules/rtcw/kmenu-dir/wolf	2008-12-12 17:47:16 UTC (rev 3069)
@@ -1,4 +1,4 @@
-ExePath: bin/wolf.sh
+ExePath: bin/wolf
 ExeIcon: share/pixmaps/WolfMP.xpm
 ExeDescr: RTCW MultiPlayer
 ExeNoDesktop: 0

Modified: pbibuild/modules/rtcw/kmenu-dir/wolfded
===================================================================
--- pbibuild/modules/rtcw/kmenu-dir/wolfded	2008-12-12 17:05:28 UTC (rev 3068)
+++ pbibuild/modules/rtcw/kmenu-dir/wolfded	2008-12-12 17:47:16 UTC (rev 3069)
@@ -1,4 +1,4 @@
-ExePath: bin/wolfded.sh
+ExePath: bin/wolfded
 ExeIcon: share/pixmaps/WolfMP.xpm
 ExeDescr: RTCW Server
 ExeNoDesktop: 1

Modified: pbibuild/modules/rtcw/kmenu-dir/wolfsp
===================================================================
--- pbibuild/modules/rtcw/kmenu-dir/wolfsp	2008-12-12 17:05:28 UTC (rev 3068)
+++ pbibuild/modules/rtcw/kmenu-dir/wolfsp	2008-12-12 17:47:16 UTC (rev 3069)
@@ -1,4 +1,4 @@
-ExePath: bin/wolfsp.sh
+ExePath: bin/wolfsp
 ExeIcon: share/pixmaps/WolfSP.xpm
 ExeDescr: RTCW SinglePlayer
 ExeNoDesktop: 0

Modified: pbibuild/modules/rtcw/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/rtcw/overlay-dir/PBI.RemoveScript.sh	2008-12-12 17:05:28 UTC (rev 3068)
+++ pbibuild/modules/rtcw/overlay-dir/PBI.RemoveScript.sh	2008-12-12 17:47:16 UTC (rev 3069)
@@ -7,15 +7,7 @@
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
 rm -r /usr/local/share/rtcw
-rm -r /compat/linux/usr/share/rtcw
 rm -r /usr/local/share/doc/rtcw
-rm -r /compat/linux/usr/share/doc/rtcw
 rm /usr/local/bin/wolfsp
 rm /usr/local/bin/wolfded
 rm /usr/local/bin/wolf
-
-
-
-
-
-

Modified: pbibuild/modules/rtcw/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/rtcw/overlay-dir/PBI.SetupScript.sh	2008-12-12 17:05:28 UTC (rev 3068)
+++ pbibuild/modules/rtcw/overlay-dir/PBI.SetupScript.sh	2008-12-12 17:47:16 UTC (rev 3069)
@@ -14,24 +14,16 @@
 # echo 'SETSTEPS: <num>' # Set the current progress of the progress bar
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
-PROG_PATH="/Programs/${PROGDIR}"
+chmod 755 ${PROG_PATH}/bin/wolf*
 
-sed "s/PROGDIR/${PROGDIR}/g" ${PROG_PATH}/bin/wolf.sh > ${PROG_PATH}/bin/wolf.sh.1
-mv ${PROG_PATH}/bin/wolf.sh.1 ${PROG_PATH}/bin/wolf.sh
-sed "s/PROGDIR/${PROGDIR}/g" ${PROG_PATH}/bin/wolfded.sh > ${PROG_PATH}/bin/wolfded.sh.1
-mv ${PROG_PATH}/bin/wolfded.sh.1 ${PROG_PATH}/bin/wolfded.sh
-sed "s/PROGDIR/${PROGDIR}/g" ${PROG_PATH}/bin/wolfsp.sh > ${PROG_PATH}/bin/wolfsp.sh.1
-mv ${PROG_PATH}/bin/wolfsp.sh.1 ${PROG_PATH}/bin/wolfsp.sh
+ln -s /Programs/${PROGDIR}/.sbin/wolfsp /usr/local/bin/wolfsp
+ln -s /Programs/${PROGDIR}/.sbin/wolfded /usr/local/bin/wolfded
+ln -s /Programs/${PROGDIR}/.sbin/wolf /usr/local/bin/wolf
 
-chmod 7755 ${PROG_PATH}/bin/wolf*
-
-ln -s /Programs/${PROGDIR}/.sbin/wolfsp.sh /usr/local/bin/wolfsp
-ln -s /Programs/${PROGDIR}/.sbin/wolfded.sh /usr/local/bin/wolfded
-ln -s /Programs/${PROGDIR}/.sbin/wolf.sh /usr/local/bin/wolf
-
-if [ -f /compat/linux/usr/share/rtcw ]
+if [ -f /usr/local/share/rtcw ]
 then
-	rm -r //compat/linux/usr/share/rtcw
+	rm -r /usr/local/share/rtcw
 fi
-ln -s /Programs/${PROGDIR}/share/rtcw /compat/linux/usr/share/rtcw
-ln -s /Programs/${PROGDIR}/share/doc/rtcw /compat/linux/usr/share/doc/rtcw
+
+ln -s /Programs/${PROGDIR}/share/rtcw /usr/local/share/rtcw
+ln -s /Programs/${PROGDIR}/share/doc/rtcw /usr/local/share/doc/rtcw

Modified: pbibuild/modules/rtcw/pbi.conf
===================================================================
--- pbibuild/modules/rtcw/pbi.conf	2008-12-12 17:05:28 UTC (rev 3068)
+++ pbibuild/modules/rtcw/pbi.conf	2008-12-12 17:47:16 UTC (rev 3069)
@@ -35,6 +35,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="01"
+BUILDKEY="02"
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY



More information about the Commits mailing list