[PC-BSD Commits] r3235 - in pbibuild/modules/wireshark: . overlay-dir

svn at pcbsd.org svn at pcbsd.org
Mon Jan 12 13:40:21 PST 2009


Author: kris
Date: 2009-01-12 13:40:20 -0800 (Mon, 12 Jan 2009)
New Revision: 3235

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

Updated wireshark, now 100% self-contained :)



Modified: pbibuild/modules/wireshark/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/wireshark/overlay-dir/PBI.RemoveScript.sh	2009-01-12 21:30:21 UTC (rev 3234)
+++ pbibuild/modules/wireshark/overlay-dir/PBI.RemoveScript.sh	2009-01-12 21:40:20 UTC (rev 3235)
@@ -6,33 +6,6 @@
 # ${2} is the username of person performing the deletion.
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
-rm -fR /usr/local/bin/dftest
-rm -fR /usr/local/bin/dumpcap
-rm -fR /usr/local/bin/editcap
-rm -fR /usr/local/bin/idl2wrs
-rm -fR /usr/local/bin/mergecap
-rm -fR /usr/local/bin/randpkt
-rm -fR /usr/local/bin/text2pcap
-rm -fR /usr/local/bin/tshark
-rm -fR /usr/local/bin/wireshark
-rm -fR /usr/local/lib/wireshark
-rm -fR /usr/local/lib/libwireshark.la
-rm -fR /usr/local/lib/libwireshark.so
-rm -fR /usr/local/lib/libwireshark.so.0
-rm -fR /usr/local/lib/libwiretap.la
-rm -fR /usr/local/lib/libwiretap.so
-rm -fR /usr/local/lib/libwiretap.so.0
-rm -fR /usr/local/man/man1/capinfos.1.gz
-rm -fR /usr/local/man/man1/dumpcap.1.gz
-rm -fR /usr/local/man/man1/editcap.1.gz
-rm -fR /usr/local/man/man1/idl2wrs.1.gz
-rm -fR /usr/local/man/man1/mergecap.1.gz
-rm -fR /usr/local/man/man1/text2pcap.1.gz
-rm -fR /usr/local/man/man1/tshark.1.gz
-rm -fR /usr/local/man/man1/wireshark.1.gz
-rm -fR /usr/local/man/man4/wireshark-filter.4.gz
-rm -fR /usr/local/share/wireshark
-rm -fR /usr/local/share/smi
 if [ ! -z "$DISPLAY" ]
 then
  # Ask if we want to remove the user profiles

Modified: pbibuild/modules/wireshark/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/wireshark/overlay-dir/PBI.SetupScript.sh	2009-01-12 21:30:21 UTC (rev 3234)
+++ pbibuild/modules/wireshark/overlay-dir/PBI.SetupScript.sh	2009-01-12 21:40:20 UTC (rev 3235)
@@ -14,31 +14,13 @@
 # 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/capinfos /usr/local/bin/capinfos
-ln -s /Programs/${PROGDIR}/.sbin/dftest /usr/local/bin/dftest
-ln -s /Programs/${PROGDIR}/.sbin/dumpcap /usr/local/bin/dumpcap
-ln -s /Programs/${PROGDIR}/.sbin/editcap /usr/local/bin/editcap
-ln -s /Programs/${PROGDIR}/.sbin/idl2wrs /usr/local/bin/idl2wrs
-ln -s /Programs/${PROGDIR}/.sbin/mergecap /usr/local/bin/mergecap
-ln -s /Programs/${PROGDIR}/.sbin/randpkt /usr/local/bin/randpkt
-ln -s /Programs/${PROGDIR}/.sbin/text2pcap /usr/local/bin/text2pcap
-ln -s /Programs/${PROGDIR}/.sbin/tshark /usr/local/bin/tshark
-ln -s /Programs/${PROGDIR}/.sbin/wireshark /usr/local/bin/wireshark
-ln -s /Programs/${PROGDIR}/lib/wireshark /usr/local/lib/wireshark
-ln -s /Programs/${PROGDIR}/lib/libwireshark.la /usr/local/lib/libwireshark.la
-ln -s /Programs/${PROGDIR}/lib/libwireshark.so /usr/local/lib/libwireshark.so
-ln -s /Programs/${PROGDIR}/lib/libwireshark.so.0 /usr/local/lib/libwireshark.so.0
-ln -s /Programs/${PROGDIR}/lib/libwiretap.la /usr/local/lib/libwiretap.la
-ln -s /Programs/${PROGDIR}/lib/libwiretap.so /usr/local/lib/libwiretap.so
-ln -s /Programs/${PROGDIR}/lib/libwiretap.so.0 /usr/local/lib/libwiretap.so.0
-ln -s /Programs/${PROGDIR}/man/man1/capinfos.1.gz /usr/local/man/man1/capinfos.1.gz
-ln -s /Programs/${PROGDIR}/man/man1/dumpcap.1.gz /usr/local/man/man1/dumpcap.1.gz
-ln -s /Programs/${PROGDIR}/man/man1/editcap.1.gz /usr/local/man/man1/editcap.1.gz
-ln -s /Programs/${PROGDIR}/man/man1/idl2wrs.1.gz /usr/local/man/man1/idl2wrs.1.gz
-ln -s /Programs/${PROGDIR}/man/man1/mergecap.1.gz /usr/local/man/man1/mergecap.1.gz
-ln -s /Programs/${PROGDIR}/man/man1/text2pcap.1.gz /usr/local/man/man1/text2pcap.1.gz
-ln -s /Programs/${PROGDIR}/man/man1/tshark.1.gz /usr/local/man/man1/tshark.1.gz
-ln -s /Programs/${PROGDIR}/man/man1/wireshark.1.gz /usr/local/man/man1/wireshark.1.gz
-ln -s /Programs/${PROGDIR}/man/man4/wireshark-filter.4.gz /usr/local/man/man4/wireshark-filter.4.gz
-ln -s /Programs/${PROGDIR}/share/wireshark /usr/local/share/wireshark
-ln -s /Programs/${PROGDIR}/share/smi /usr/local/share/smi
+
+
+# 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
+

Modified: pbibuild/modules/wireshark/pbi.conf
===================================================================
--- pbibuild/modules/wireshark/pbi.conf	2009-01-12 21:30:21 UTC (rev 3234)
+++ pbibuild/modules/wireshark/pbi.conf	2009-01-12 21:40:20 UTC (rev 3235)
@@ -25,13 +25,13 @@
 PBIUPDATE="http://update.pbidir.com"
 
 # Other Ports we need built (One per line)
-OTHERPORT=""
+OTHERPORT="/usr/ports/x11-themes/qtcurve-gtk2"
 
 # Enter your custom make options here
 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="43"
+BUILDKEY="01"
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY



More information about the Commits mailing list