kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- Update to 0.5.2

Browse source 
PR:		136982
Submitted by:	Stas Timokhin <stast@bsdportal.ru> (maintainer)
This commit is contained in:
Martin Wilke 2009-07-26 20:52:54 +00:00
parent dab9893008
commit e305282ed0
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=238406
5 changed files with 78 additions and 98 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
net/dimes/Makefile
View file

@ -5,12 +5,12 @@
#
#
PORTNAME= DIMES
PORTVERSION= 0.4.3b
PORTNAME= dimes
PORTVERSION= 0.5.2
CATEGORIES= net java
MASTER_SITES= http://netdimes.org/downloads/ \
MASTER_SITES= http://www.netdimes.org/PublicData/downloads/ \
http://www.stasyan.com/devel/distfiles/
DISTNAME= ${PORTNAME}-0-4-3b
DISTNAME= Dimes_Agent_052_Linux
MAINTAINER= stast@bsdportal.ru
COMMENT= Distributed research project for measurement topology of the Internet
@ -18,24 +18,31 @@ COMMENT= Distributed research project for measurement topology of the Internet
NO_PACKAGE= There is the string in properties.xml which system-depends
WRKSRC= ${WRKDIR}/DIMES
BUILD_WRKSRC= ${WRKSRC}/scripts_linux
USE_JAVA= YES
JAVA_BUILD= YES
JAVA_VERSION= 1.4+
JAVA_VERSION= 1.6+
#java-linux required
JAVA_OS= linux
#all vendors except forbidden: ibm
JAVA_VENDOR= sun blackdown
DATADIR= ${JAVASHAREDIR}/dimes
post-patch:
cd ${WRKSRC}; echo "JAVA_HOME=${JAVA_HOME}" >> ${WRKSRC}/colors.sh;
post-extract:
${REINPLACE_CMD} 's|$$CURRENT_DIR/..|${DATADIR}/|g' ${WRKSRC}/scripts_linux/agent.sh
${REINPLACE_CMD} 's|#. colors.sh|JAVA_HOME=${JAVA_HOME}|g' ${WRKSRC}/scripts_linux/agent.sh
${REINPLACE_CMD} 's|./bash|/bin/sh|g' ${WRKSRC}/scripts_linux/Makefile
${REINPLACE_CMD} 's|/opt/DIMES|${DATADIR}|g' ${WRKSRC}/Classes/Base/conf/properties.xml
do-install:
cd ${WRKSRC}; ${SH} ./fix_permissions.sh; ./configure.sh ${JAVASHAREDIR}
@${MKDIR} ${DATADIR}
@${MKDIR} ${DATADIR}/scripts_linux
@${MKDIR} ${DATADIR}/Classes
@${MKDIR} ${DATADIR}/Classes/Base
@${MKDIR} ${DATADIR}/Classes/Base/dimes
@${MKDIR} ${DATADIR}/Classes/Base/dimes/service
@${MKDIR} ${DATADIR}/Classes/dimes
@${MKDIR} ${DATADIR}/Classes/dimes/service
@${MKDIR} -m 0777 ${DATADIR}/Classes/Base/History
@${MKDIR} -m 0777 ${DATADIR}/Classes/Base/Incoming
@${MKDIR} -m 0777 ${DATADIR}/Classes/Base/Incoming/Keepalive
@ -43,6 +50,7 @@ do-install:
@${MKDIR} -m 0777 ${DATADIR}/Classes/Base/Outgoing/log
@${MKDIR} -m 0777 ${DATADIR}/Classes/Base/Outgoing/results
@${MKDIR} ${DATADIR}/Classes/Base/conf
@${MKDIR} ${DATADIR}/Classes/Base/bin_linux
@${MKDIR} ${DATADIR}/Classes/Base/resources
@${MKDIR} ${DATADIR}/Classes/Base
@${MKDIR} ${DATADIR}/Classes/Base
@ -54,12 +62,16 @@ do-install:
${DATADIR}/Classes/'AgentLauncher$$2.class'
@${INSTALL_DATA} ${WRKSRC}/Classes/AgentLauncher.class \
${DATADIR}/Classes/AgentLauncher.class
@${INSTALL_DATA} ${WRKSRC}/Classes/Start.class \
${DATADIR}/Classes/Start.class
@cd ${WRKSRC}/Classes/ && \
${FIND} . -type f -and \( -name "*.jpg" -or -name "*.gif" \
-or -name "*.dll" -or -name "*.ico" -or -name "*.so" \
-or -name "*.dll" -or -name "*.ico" \
-or -name "*.zip" -or -name "*.GIF" -or -name "*.txt" \
-or -name "*.properties" \) \
-exec ${INSTALL_DATA} {} ${DATADIR}/Classes/{} \;
@cd ${WRKSRC}/Classes/Base/bin_linux && \
${FIND} . -type f -exec ${INSTALL_DATA} -m 055 {} ${DATADIR}/Classes/Base/bin_linux/{} \;
@cd ${WRKSRC}/Classes/Base/resources/ && \
${FIND} . -type f -and \( -name "*.jar" -or -name "*.txt" \
-or -name "*.keystore" \) \
@ -68,17 +80,30 @@ do-install:
${DATADIR}/Classes/Base/resources/layouts.bin
@${INSTALL_DATA} -m 0666 ${WRKSRC}/Classes/Base/resources/layouts.meta \
${DATADIR}/Classes/Base/resources/layouts.meta
@${INSTALL_DATA} -m 0666 ${WRKSRC}/Classes/Base/resources/default.in \
${DATADIR}/Classes/Base/resources/default.in
@${INSTALL_DATA} -m 0666 ${WRKSRC}/Classes/Base/resources/dimespacket.sys \
${DATADIR}/Classes/Base/resources/dimespacket.sys
@${INSTALL_DATA} -m 0666 ${WRKSRC}/Classes/Base/resources/libcallmtr.so \
${DATADIR}/Classes/Base/resources/libcallmtr.so
@${INSTALL_DATA} -m 0666 ${WRKSRC}/Classes/dimes/service/Stop.class \
${DATADIR}/Classes/dimes/service/Stop.class
@${INSTALL_DATA} -m 0666 ${WRKSRC}/Classes/Base/conf/properties.xml \
${DATADIR}/Classes/Base/conf/properties.xml
@${INSTALL_PROGRAM} ${WRKSRC}/Classes/JARs/jarsigner \
${DATADIR}/Classes/JARs/jarsigner
@${INSTALL_DATA} -m 0666 ${WRKSRC}/Classes/Base/conf/wrapper.conf \
${DATADIR}/Classes/Base/conf/wrapper.conf
@${INSTALL_DATA} ${WRKSRC}/Classes/JARs/10.jar \
${DATADIR}/Classes/JARs/10.jar
@${INSTALL_DATA} ${WRKSRC}/Classes/JARs/dimesAgent.keystore \
${DATADIR}/Classes/JARs/dimesAgent.keystore
@cd ${WRKSRC}/Licences/ && ${FIND} . -type f -name "*.txt" \
-exec ${INSTALL_MAN} {} ${DATADIR}/Licences/{} \;
@${INSTALL_SCRIPT} -m 4755 ${WRKSRC}/agent.sh ${DATADIR}/agent.sh
@${INSTALL_SCRIPT} ${WRKSRC}/colors.sh ${DATADIR}/colors.sh
@${INSTALL_SCRIPT} -m 4755 ${WRKSRC}/scripts_linux/agent.sh ${DATADIR}/scripts_linux/agent.sh
@${INSTALL_SCRIPT} ${WRKSRC}/scripts_linux/colors.sh ${DATADIR}/scripts_linux/colors.sh
@${INSTALL_DATA} ${WRKSRC}/scripts_linux/Makefile ${DATADIR}/scripts_linux/Makefile
@${INSTALL_SCRIPT} ${WRKSRC}/linuxAgent.sh ${DATADIR}/linuxAgent.sh
@${INSTALL_SCRIPT} ${WRKSRC}/linuxService.sh ${DATADIR}/linuxService.sh
@${INSTALL_SCRIPT} ${WRKSRC}/linuxServiceStatus.sh ${DATADIR}/linuxServiceStatus.sh
@${INSTALL_SCRIPT} ${WRKSRC}/linuxStopService.sh ${DATADIR}/linuxStopService.sh
.include <bsd.port.mk>

6
net/dimes/distinfo
View file

@ -1,3 +1,3 @@
MD5 (DIMES-0-4-3b.tar.gz) = 8c903e054ff506fd0ab88ade28b91e7f
SHA256 (DIMES-0-4-3b.tar.gz) = ba15d9f16cab51deb6a9f33c44b512ec8aeca76c988bc5e9471e73294c372755
SIZE (DIMES-0-4-3b.tar.gz) = 4970732
MD5 (Dimes_Agent_052_Linux.tar.gz) = 9bd7b03833a73d5d6fd8d2cb1904c1dc
SHA256 (Dimes_Agent_052_Linux.tar.gz) = 1c13247c2925ddbeaf7d5ccebf04ff1c1b4666247e975cb77394eebf157c3dc5
SIZE (Dimes_Agent_052_Linux.tar.gz) = 12882796

11
net/dimes/files/patch-agent_sh
View file

@ -1,11 +0,0 @@
--- agent.sh.orig Thu Feb 7 12:45:01 2008
+++ agent.sh Thu Feb 7 12:45:09 2008
@@ -24,7 +24,7 @@
# verify java version (1.4* or 1.5*)
echo -n "Checking Java version......"
-ret=`${JAVA} -version 2>&1 | grep --regexp="1\.[4|5]"`
+ret=`${JAVA} -version 2>&1 | grep --regexp="1\.[4|5|6]"`
verify $? "Wrong java version. Should be 1.4.*"
# verify display settings :

60
net/dimes/files/patch-configure_sh
View file

@ -1,60 +0,0 @@
*** configure.sh.orig Thu Nov 17 16:23:48 2005
--- configure.sh Wed Apr 19 23:00:24 2006
***************
*** 1,40 ****
#!/bin/sh
# Written by Danny Bickson, HUJI
# modified by Ohad Serfaty , TAU (11.9.05)
! #USERNAME=`whoami`
CURRENT_DIR=$(pwd)
- CLASSES_DIR="$CURRENT_DIR/Classes"
- BASE_DIR="$CURRENT_DIR/Classes/Base"
- CONF_DIR="$BASE_DIR/conf"
! . colors.sh
! echo "Installing DIMES"
! echo "Updating properties file $CONF_DIR/properties.xml"
! echo -n "You can later edit this file manually if needed........."
! test -f $CONF_DIR/properties.xml
! verify $? "Missing properties file: $CONF_DIR/properties.xml"
echo -n "setting JARS dir: $CLASSES_DIR/JARs.........................."
! sed -i "s#<jarDir>.*</jarDir>#<jarDir>$CLASSES_DIR/JARs</jarDir>#g" $CONF_DIR/properties.xml
! sed -i "s#<base>.*</base>#<base>$BASE_DIR</base>#g" $CONF_DIR/properties.xml
! verify $?
!
!
! # deprecated : set IP address :
! #IP_ADDR=`ifconfig eth0 | grep "inet addr" | awk '{print $2}' | sed -e "s/addr\://g"`
! #echo -n "setting IP address: $IP_ADDR............................"
! #if [ $IP_ADDR != "" ]; then
! # sed -i "s#132.66.48.22#$IP_ADDR#g" $CONF_DIR/properties.xml
! #fi
! #verify $?
!
! chmod a+rx . *.sh > /dev/null 2>&1
! #verify $? "failed to setup file permissions"
!
! #The following should be executed as root!
! echo "Going to set root priviliges for running ping and traceroute"
! echo "Please enter root password"
! sudo bash ./fix_permissions.sh
!
! echo "Installation OK!"
--- 1,15 ----
#!/bin/sh
# Written by Danny Bickson, HUJI
# modified by Ohad Serfaty , TAU (11.9.05)
! # modified by Stas Timokhin for FreeBSD port
CURRENT_DIR=$(pwd)
! CLASSES_DIR="$1/dimes/Classes"
! BASE_DIR="$1/dimes/Classes/Base"
! CONF_DIR="$CURRENT_DIR/Classes/Base/conf"
+ echo "Updating properties file $CONF_DIR/properties.xml"
echo -n "setting JARS dir: $CLASSES_DIR/JARs.........................."
! sed -i .bak "s#<jarDir>.*</jarDir>#<jarDir>$CLASSES_DIR/JARs</jarDir>#g" $CONF_DIR/properties.xml
! sed -i .bak "s#<base>.*</base>#<base>$BASE_DIR</base>#g" $CONF_DIR/properties.xml

46
net/dimes/pkg-plist
View file

@ -1,27 +1,31 @@
%%DATADIR%%/Classes/AgentLauncher$1.class
%%DATADIR%%/Classes/AgentLauncher$2.class
%%DATADIR%%/Classes/AgentLauncher.class
%%DATADIR%%/Classes/Start.class
%%DATADIR%%/Classes/Base/bin_linux/Dimes
%%DATADIR%%/Classes/Base/bin_linux/libwrapper-linux-x86-32.so
%%DATADIR%%/Classes/Base/bin_linux/libwrapper.so
%%DATADIR%%/Classes/Base/bin_linux/testwrapper
%%DATADIR%%/Classes/Base/bin_linux/wrapper
%%DATADIR%%/Classes/Base/bin_linux/wrapper.jar
%%DATADIR%%/Classes/Base/bin_linux/wrapper-linux-x86-32
%%DATADIR%%/Classes/Base/conf/countries-xml.txt
%%DATADIR%%/Classes/Base/conf/logging.properties
%%DATADIR%%/Classes/Base/conf/properties.xml
%%DATADIR%%/Classes/Base/conf/wrapper.conf
%%DATADIR%%/Classes/Base/resources/About16.gif
%%DATADIR%%/Classes/Base/resources/CommunicationDetector.dll
%%DATADIR%%/Classes/Base/resources/DIMES.gif
%%DATADIR%%/Classes/Base/resources/DIMESIcon.ico
%%DATADIR%%/Classes/Base/resources/DIMES_Large.jpg
%%DATADIR%%/Classes/Base/resources/Delete16.gif
%%DATADIR%%/Classes/Base/resources/DimesSplash.jpg
%%DATADIR%%/Classes/Base/resources/Help16.gif
%%DATADIR%%/Classes/Base/resources/IDW.jar
%%DATADIR%%/Classes/Base/resources/MTR.dll
%%DATADIR%%/Classes/Base/resources/MySystray4j.jar
%%DATADIR%%/Classes/Base/resources/Pause16.gif
%%DATADIR%%/Classes/Base/resources/Play16.gif
%%DATADIR%%/Classes/Base/resources/Properties16.gif
%%DATADIR%%/Classes/Base/resources/Save16.gif
%%DATADIR%%/Classes/Base/resources/Stop16.gif
%%DATADIR%%/Classes/Base/resources/StopRed16.gif
%%DATADIR%%/Classes/Base/resources/WebComponent16.gif
%%DATADIR%%/Classes/Base/resources/WebComponent24.gif
%%DATADIR%%/Classes/Base/resources/a1.GIF
%%DATADIR%%/Classes/Base/resources/about.txt
@ -44,7 +48,6 @@
%%DATADIR%%/Classes/Base/resources/m1.GIF
%%DATADIR%%/Classes/Base/resources/n1.GIF
%%DATADIR%%/Classes/Base/resources/network.gif
%%DATADIR%%/Classes/Base/resources/packettrain.dll
%%DATADIR%%/Classes/Base/resources/pacman.gif
%%DATADIR%%/Classes/Base/resources/redWebComponent.gif
%%DATADIR%%/Classes/Base/resources/s1.GIF
@ -53,18 +56,35 @@
%%DATADIR%%/Classes/Base/resources/skinlf.jar
%%DATADIR%%/Classes/Base/resources/snail.ico
%%DATADIR%%/Classes/Base/resources/snail.jpg
%%DATADIR%%/Classes/Base/resources/systray4j.dll
%%DATADIR%%/Classes/Base/resources/toxicthemepack.zip
%%DATADIR%%/Classes/Base/resources/winnerFace.gif
%%DATADIR%%/Classes/Base/resources/default.in
%%DATADIR%%/Classes/Base/resources/dimespacket.sys
%%DATADIR%%/Classes/Base/resources/BrowserLauncher2-1_3.jar
%%DATADIR%%/Classes/Base/resources/DIMESIcon.gif
%%DATADIR%%/Classes/Base/resources/JavaNetworkStack.jar
%%DATADIR%%/Classes/Base/resources/aquathemepack.zip
%%DATADIR%%/Classes/Base/resources/commons-io-1.3.2.jar
%%DATADIR%%/Classes/Base/resources/fatalEthemepack.zip
%%DATADIR%%/Classes/Base/resources/modernthemepack.zip
%%DATADIR%%/Classes/Base/resources/restart2.gif
%%DATADIR%%/Classes/Base/resources/skinlf-old.jar
%%DATADIR%%/Classes/Base/resources/stunt.jar
%%DATADIR%%/Classes/Base/resources/tigerGraphitethemepack.zip
%%DATADIR%%/Classes/JARs/10.jar
%%DATADIR%%/Classes/JARs/dimesAgent.keystore
%%DATADIR%%/Classes/JARs/jarsigner
%%DATADIR%%/Classes/dimes/service/Stop.class
%%DATADIR%%/Licences/DIMES-license.txt
%%DATADIR%%/Licences/dom4j-license.txt
%%DATADIR%%/Licences/gpl.txt
%%DATADIR%%/Licences/lgpl.txt
%%DATADIR%%/agent.sh
%%DATADIR%%/colors.sh
%%DATADIR%%/scripts_linux/Makefile
%%DATADIR%%/scripts_linux/agent.sh
%%DATADIR%%/scripts_linux/colors.sh
%%DATADIR%%/linuxAgent.sh
%%DATADIR%%/linuxService.sh
%%DATADIR%%/linuxStopService.sh
%%DATADIR%%/linuxServiceStatus.sh
@dirrm %%DATADIR%%/Licences
@dirrm %%DATADIR%%/Classes/JARs
@dirrm %%DATADIR%%/Classes/Base/resources
@ -75,6 +95,12 @@
@dirrm %%DATADIR%%/Classes/Base/Incoming/Keepalive
@dirrm %%DATADIR%%/Classes/Base/Incoming
@dirrm %%DATADIR%%/Classes/Base/History
@dirrm %%DATADIR%%/Classes/Base/bin_linux
@dirrm %%DATADIR%%/Classes/Base/dimes/service
@dirrm %%DATADIR%%/Classes/Base/dimes
@dirrm %%DATADIR%%/Classes/Base
@dirrm %%DATADIR%%/Classes/dimes/service
@dirrm %%DATADIR%%/Classes/dimes
@dirrm %%DATADIR%%/Classes
@dirrm %%DATADIR%%/scripts_linux
@dirrm %%DATADIR%%