Update to 0.2.1

6 files changed, 58 insertions, 70 deletions

diff --git a/net/mute-net/Makefile b/net/mute-net/Makefile
index e66f9e8b4b6d..dddb52bb0325 100644
--- a/net/mute-net/Makefile
+++ b/net/mute-net/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mute
-PORTVERSION=	0.2
+PORTVERSION=	0.2.1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}-net
@@ -22,7 +22,7 @@ HAS_CONFIGURE=	yes
 USE_PERL5_BUILD=yes
 USE_REINPLACE=	yes
 
-RELEASE_DIRECTORY=	MUTE_fileSharing-0.2-rc1_UnixSource
+RELEASE_DIRECTORY=	MUTE_fileSharing-${PORTVERSION}-rc1_UnixSource
 
 WRKSRC=		${WRKDIR}/${RELEASE_DIRECTORY}/MUTE
 PATCH_WRKSRC=	${WRKDIR}/${RELEASE_DIRECTORY}
@@ -34,13 +34,12 @@ WX_CONFIG?=	${X11BASE}/bin/wxgtk2-2.4-config
 .endif
 
 #
+MUTE_SETTINGS=		otherApps/fileSharing/userInterface/settings/
 MUTE_CORE_GUI=		otherApps/fileSharing/userInterface/wxWindows/fileSharingMUTE
 MUTE_CORE_GUI_FILE=	fileSharingMUTE
-MUTE_SETTINGS_GUI=	otherApps/fileSharing/userInterface/wxWindows/settings/
 #
 MUTE_CORE_TEXT=		otherApps/fileSharing/userInterface/textBased/textFileSharingMUTE
 MUTE_CORE_TEXT_FILE=	textFileSharingMUTE
-MUTE_SETTINGS_TEXT=	otherApps/fileSharing/userInterface/textBased/settings/
 
 pre-everything::
 #
@@ -110,6 +109,10 @@ post-build:
 .endif
 
 do-install:
+# install initial settings
+	@${MKDIR} ${DATADIR}/settings/
+	@${INSTALL_DATA} ${INSTALL_WRKSRC}/${MUTE_SETTINGS}/* \
+		${DATADIR}/settings/
 # gui interface
 .ifndef(WITHOUT_GUI)
 # install binary
@@ -118,10 +121,6 @@ do-install:
 # install wrapper
 	@${INSTALL_SCRIPT} ${WRKDIR}/wrapper-gui.sh \
 		${PREFIX}/bin/${MUTE_CORE_GUI_FILE}
-# install initial settings
-	@${MKDIR} ${DATADIR}/gui_settings/
-	@${INSTALL_DATA} ${INSTALL_WRKSRC}/${MUTE_SETTINGS_GUI}/* \
-		${DATADIR}/gui_settings/
 .endif
 # text interface
 .ifndef(WITHOUT_TEXT)
@@ -131,10 +130,6 @@ do-install:
 # install wrapper
 	@${INSTALL_SCRIPT} ${WRKDIR}/wrapper-text.sh \
 		${PREFIX}/bin/${MUTE_CORE_TEXT_FILE}
-# install initial settings
-	@${MKDIR} ${DATADIR}/text_settings/
-	@${INSTALL_DATA} ${INSTALL_WRKSRC}/${MUTE_SETTINGS_TEXT}/* \
-		${DATADIR}/text_settings/
 .endif
 
 post-install:
diff --git a/net/mute-net/distinfo b/net/mute-net/distinfo
index 171cc04fef0a..965df8fbdcb7 100644
--- a/net/mute-net/distinfo
+++ b/net/mute-net/distinfo
@@ -1 +1 @@
-MD5 (MUTE_fileSharing-0.2_UnixSource.tar.gz) = 363b02b7da922e0b46c3d0867f6671d2
+MD5 (MUTE_fileSharing-0.2.1_UnixSource.tar.gz) = b358bb8251113628fa1739f65f0951e1
diff --git a/net/mute-net/files/patch-MUTE::configure b/net/mute-net/files/patch-MUTE::configure
index 1a3b1934babd..f5aa5d595f7f 100644
--- a/net/mute-net/files/patch-MUTE::configure
+++ b/net/mute-net/files/patch-MUTE::configure
@@ -1,17 +1,17 @@
---- MUTE/configure.orig	Mon Dec 15 13:17:49 2003
-+++ MUTE/configure	Fri Dec 19 23:19:02 2003
+--- MUTE/configure.orig	Sat Jan 24 18:19:44 2004
++++ MUTE/configure	Sat Jan 24 18:21:35 2004
 @@ -1,4 +1,4 @@
 -#!/bin/bash
 +#!/bin/sh
  
  #
  # Modification History
-@@ -31,23 +31,9 @@
+@@ -37,20 +37,10 @@
  
  while [ -z "$userEntry" ]
  do
 -    echo "select platform:"
--
+ 
 -    echo "  1 --  GNU/Linux X86"
 -    echo "  2 --  GNU/Linux PPC"
 -    echo "  3 --  FreeBSD X86"
@@ -19,20 +19,16 @@
 -    echo "  5 --  Solaris"
 -    echo "  6 --  Win32 using MinGW"
 -    echo "  q --  quit"
--
+ 
 -    echo ""
 -    echo -n "> "
--
+ 
 -    read userEntry
--
 +userEntry=3
+ 
  	
--	if [ "$userEntry" == "q" ]
-+	if [ "$userEntry" = "q" ]
-     then
-         exit
-     fi
-@@ -55,12 +41,12 @@
+ 	if [ "$userEntry" = "q" ]
+@@ -61,12 +51,12 @@
  
      # use ASCII comparison.
  
@@ -47,7 +43,7 @@
      then
          userEntry=""
      fi
-@@ -316,20 +302,10 @@
+@@ -330,17 +320,9 @@
  esac
  
  
@@ -57,16 +53,12 @@
 -echo "   Example:   /usr/bin/wx-config"
 -echo "To us the default setting, or if you do not plan to build the"
 -echo "wxWindows-based GUI, leave this blank."
--
+ 
 -echo ""
 -echo -n "> "
--
+ 
 -read userEntry
 +userEntry=%%WX_CONFIG%%
  
  
--if [ "$userEntry" == "" ]
-+if [ "$userEntry" = "" ]
- then
-     userEntry="/usr/bin/wx-config"
- fi
+ if [ "$userEntry" = "" ]
diff --git a/net/mute-net/files/patch-MUTE::layers::messageRouting::test::testMessageRouter.cpp b/net/mute-net/files/patch-MUTE::layers::messageRouting::test::testMessageRouter.cpp
new file mode 100644
index 000000000000..db605b5a4b64
--- /dev/null
+++ b/net/mute-net/files/patch-MUTE::layers::messageRouting::test::testMessageRouter.cpp
@@ -0,0 +1,17 @@
+--- MUTE/layers/messageRouting/test/testMessageRouter.cpp.orig	Sat Jan 24 18:30:19 2004
++++ MUTE/layers/messageRouting/test/testMessageRouter.cpp	Sat Jan 24 18:32:02 2004
+@@ -21,12 +21,13 @@
+ #include <stdio.h>
+ 
+ 
+-void messageHandler( char *inFromAddress, char *inToAddress, char *inBody,
++int messageHandler( char *inFromAddress, char *inToAddress, char *inBody,
+                      void *inExtraArgument ) {
+     
+     printf( "Got message from %s to %s:\n%s\n", inFromAddress,
+             inToAddress, inBody );
+ 
++    return (0);
+     }
+ 
+ 
diff --git a/net/mute-net/files/wrapper.sh b/net/mute-net/files/wrapper.sh
index ed905246f9be..0620fc43a4d8 100644
--- a/net/mute-net/files/wrapper.sh
+++ b/net/mute-net/files/wrapper.sh
@@ -4,7 +4,7 @@ PREFIX="%%PREFIX%%"
 PROGRAM="${0}"
 DIRNAME="${HOME}/.mute-net/%%INTERFACE%%"
 DIR_FILES="${DIRNAME}/files"
-DIR_SETTINGS_ORIGINAL="%%DATADIR%%/%%INTERFACE%%_settings"
+DIR_SETTINGS_ORIGINAL="%%DATADIR%%/settings"
 DIR_SETTINGS="${DIRNAME}/settings"
 
 if [ ! -d ${DIRNAME} ]
diff --git a/net/mute-net/pkg-plist b/net/mute-net/pkg-plist
index 8f2ccbfe820d..296138a791ae 100644
--- a/net/mute-net/pkg-plist
+++ b/net/mute-net/pkg-plist
@@ -2,39 +2,23 @@
 %%GUI%%bin/fileSharingMUTE-real
 %%TEXT%%bin/textFileSharingMUTE
 %%TEXT%%bin/textFileSharingMUTE-real
-%%GUI%%%%DATADIR%%/gui_settings/broadcastProbability.ini
-%%GUI%%%%DATADIR%%/gui_settings/inboundMessageLimit.ini
-%%GUI%%%%DATADIR%%/gui_settings/logConnections.ini
-%%GUI%%%%DATADIR%%/gui_settings/logLevel.ini
-%%GUI%%%%DATADIR%%/gui_settings/logMessageHistory.ini
-%%GUI%%%%DATADIR%%/gui_settings/logRoutingHistory.ini
-%%GUI%%%%DATADIR%%/gui_settings/maxMessageUtility.ini
-%%GUI%%%%DATADIR%%/gui_settings/maxSubfolderDepth.ini
-%%GUI%%%%DATADIR%%/gui_settings/mime.ini
-%%GUI%%%%DATADIR%%/gui_settings/outboundMessageLimit.ini
-%%GUI%%%%DATADIR%%/gui_settings/port.ini
-%%GUI%%%%DATADIR%%/gui_settings/seedHosts.ini
-%%GUI%%%%DATADIR%%/gui_settings/sharingPath.ini
-%%GUI%%%%DATADIR%%/gui_settings/showNiceQuit.ini
-%%GUI%%%%DATADIR%%/gui_settings/targetConnectionCount.ini
-%%GUI%%%%DATADIR%%/gui_settings/useMajorityRouting.ini
-%%GUI%%%%DATADIR%%/gui_settings/webHostCaches.ini
-%%TEXT%%%%DATADIR%%/text_settings/broadcastProbability.ini
-%%TEXT%%%%DATADIR%%/text_settings/inboundMessageLimit.ini
-%%TEXT%%%%DATADIR%%/text_settings/logConnections.ini
-%%TEXT%%%%DATADIR%%/text_settings/logLevel.ini
-%%TEXT%%%%DATADIR%%/text_settings/logMessageHistory.ini
-%%TEXT%%%%DATADIR%%/text_settings/logRoutingHistory.ini
-%%TEXT%%%%DATADIR%%/text_settings/maxMessageUtility.ini
-%%TEXT%%%%DATADIR%%/text_settings/maxSubfolderDepth.ini
-%%TEXT%%%%DATADIR%%/text_settings/mime.ini
-%%TEXT%%%%DATADIR%%/text_settings/outboundMessageLimit.ini
-%%TEXT%%%%DATADIR%%/text_settings/port.ini
-%%TEXT%%%%DATADIR%%/text_settings/seedHosts.ini
-%%TEXT%%%%DATADIR%%/text_settings/sharingPath.ini
-%%TEXT%%%%DATADIR%%/text_settings/targetConnectionCount.ini
-%%TEXT%%%%DATADIR%%/text_settings/useMajorityRouting.ini
-%%TEXT%%%%DATADIR%%/text_settings/webHostCaches.ini
-%%TEXT%%@dirrm %%DATADIR%%/text_settings
-%%GUI%%@dirrm %%DATADIR%%/gui_settings
+%%DATADIR%%/settings/broadcastProbability.ini
+%%DATADIR%%/settings/inboundMessageLimit.ini
+%%DATADIR%%/settings/logConnections.ini
+%%DATADIR%%/settings/logLevel.ini
+%%DATADIR%%/settings/logMessageHistory.ini
+%%DATADIR%%/settings/logRoutingHistory.ini
+%%DATADIR%%/settings/maxMessageUtility.ini
+%%DATADIR%%/settings/maxSubfolderDepth.ini
+%%DATADIR%%/settings/mime.ini
+%%DATADIR%%/settings/muteVersion.ini
+%%DATADIR%%/settings/outboundMessageLimit.ini
+%%DATADIR%%/settings/port.ini
+%%DATADIR%%/settings/seedHosts.ini
+%%DATADIR%%/settings/sharingPath.ini
+%%DATADIR%%/settings/showNiceQuit.ini
+%%DATADIR%%/settings/targetConnectionCount.ini
+%%DATADIR%%/settings/useMajorityRouting.ini
+%%DATADIR%%/settings/webHostCaches.ini
+@dirrm %%DATADIR%%/settings
 @dirrm %%DATADIR%%