Update to 0.2

7 files changed, 19 insertions, 83 deletions

diff --git a/net/mute-net/Makefile b/net/mute-net/Makefile
index 0dfff252d5ba..c9145e7f8b8c 100644
--- a/net/mute-net/Makefile
+++ b/net/mute-net/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	mute
-PORTVERSION=	0.1
+PORTVERSION=	0.2
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}-net
@@ -22,8 +22,10 @@ HAS_CONFIGURE=	yes
 USE_PERL5_BUILD=yes
 USE_REINPLACE=	yes
 
-WRKSRC=		${WRKDIR}/MUTE_fileSharing-0.1-rc5_UnixSource/MUTE
-PATCH_WRKSRC=	${WRKDIR}/MUTE_fileSharing-0.1-rc5_UnixSource
+RELEASE_DIRECTORY=	MUTE_fileSharing-0.2-rc1_UnixSource
+
+WRKSRC=		${WRKDIR}/${RELEASE_DIRECTORY}/MUTE
+PATCH_WRKSRC=	${WRKDIR}/${RELEASE_DIRECTORY}
 
 .ifndef(WITHOUT_GUI)
 LIB_DEPENDS+=	wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2
@@ -99,9 +101,6 @@ post-configure:
 	@${REINPLACE_CMD} -E \
 		-e 's|g\+\+|${CXX}|' \
 		${WRKSRC}/otherApps/fileSharing/userInterface/wxWindows/Makefile
-# add our post-configure_patch
-	@cd ${PATCH_WRKSRC} ; ${PATCH} < \
-		${FILESDIR}/post-configure_patch-MUTE::layers::messageRouting::Makefile
 
 post-build:
 .ifndef(WITHOUT_GUI)
@@ -145,7 +144,7 @@ post-install:
 
 # we cannot install if either a slave or master port is already
 # installed
-CONFLICTS+=	mute-net-*
+CONFLICTS+=	mute-net-[0-9]*
 
 # gui interface
 .ifndef(WITHOUT_GUI)
@@ -156,6 +155,8 @@ PLIST_SUB+=	GUI=""
 PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-text
 
 PLIST_SUB+=	GUI="@comment "
+
+CONFLICTS+=	mute-net-text-*
 .endif
 
 # text interface
@@ -166,6 +167,8 @@ PLIST_SUB+=	TEXT=""
 PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-gui
 
 PLIST_SUB+=	TEXT="@comment "
+
+CONFLICTS+=	mute-net-gui-*
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/net/mute-net/distinfo b/net/mute-net/distinfo
index 9c8c871a0dc8..171cc04fef0a 100644
--- a/net/mute-net/distinfo
+++ b/net/mute-net/distinfo
@@ -1 +1 @@
-MD5 (MUTE_fileSharing-0.1_UnixSource.tar.gz) = 914cda62258ba5f03f7d824f5c073f32
+MD5 (MUTE_fileSharing-0.2_UnixSource.tar.gz) = 363b02b7da922e0b46c3d0867f6671d2
diff --git a/net/mute-net/files/patch-MUTE::layers::fileTransfer::Makefile.all b/net/mute-net/files/patch-MUTE::layers::fileTransfer::Makefile.all
deleted file mode 100644
index cbba317c99e7..000000000000
--- a/net/mute-net/files/patch-MUTE::layers::fileTransfer::Makefile.all
+++ /dev/null
@@ -1,11 +0,0 @@
---- MUTE/layers/fileTransfer/Makefile.all.orig	Sun Dec 21 01:05:38 2003
-+++ MUTE/layers/fileTransfer/Makefile.all	Sun Dec 21 01:05:56 2003
-@@ -50,7 +50,7 @@
- 
- # targets
- 
--all: libmuteFileTransfer.a test/testFileTransfer 
-+all: libmuteFileTransfer.a
- clean:
- 	rm -f ${DEPENDENCY_FILE} ${LAYER_OBJECTS} ${TEST_OBJECTS} ${NEEDED_MINOR_GEMS_OBJECTS} libmuteFileTransfer.a test/testFileTransfer
- 
diff --git a/net/mute-net/files/patch-MUTE::layers::pointToPoint::Makefile.all b/net/mute-net/files/patch-MUTE::layers::pointToPoint::Makefile.all
deleted file mode 100644
index 7db95eebf9e9..000000000000
--- a/net/mute-net/files/patch-MUTE::layers::pointToPoint::Makefile.all
+++ /dev/null
@@ -1,10 +0,0 @@
---- MUTE/layers/pointToPoint/Makefile.all.orig	Sun Dec 21 00:53:18 2003
-+++ MUTE/layers/pointToPoint/Makefile.all	Sun Dec 21 00:53:26 2003
-@@ -34,6 +34,7 @@
- LAYER_OBJECTS = ${LAYER_SOURCE:.cpp=.o}
- 
- NEEDED_MINOR_GEMS_OBJECTS = \
-+${SHA1_O}
-  
- 
- CRYPTO_LIB = ${ROOT_PATH}/MUTE/crypto/libcrypto.a
diff --git a/net/mute-net/files/patch-MUTE::layers::pointToPoint::pointToPointCommunicator.cpp b/net/mute-net/files/patch-MUTE::layers::pointToPoint::pointToPointCommunicator.cpp
deleted file mode 100644
index 9bec3d21a8ad..000000000000
--- a/net/mute-net/files/patch-MUTE::layers::pointToPoint::pointToPointCommunicator.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
---- MUTE/layers/pointToPoint/pointToPointCommunicator.cpp.orig	Sun Dec 21 00:02:08 2003
-+++ MUTE/layers/pointToPoint/pointToPointCommunicator.cpp	Sun Dec 21 00:32:22 2003
-@@ -1153,7 +1153,7 @@
- 
- // handler to receive all messages from the routing layer
- // extra argument not used
--void mute_internalLowLevelMessageHandler( char *inFromAddress,
-+int mute_internalLowLevelMessageHandler( char *inFromAddress,
-                                           char *inToAddress,
-                                           char *inBody,
-                                           void *inExtraArgument ) {
-@@ -1544,6 +1544,7 @@
-         delete [] *( tokens->getElement( i ) );
-         }
-     delete tokens;
-+    return (0);
-     }
- 
- 
diff --git a/net/mute-net/files/post-configure_patch-MUTE::layers::messageRouting::Makefile b/net/mute-net/files/post-configure_patch-MUTE::layers::messageRouting::Makefile
deleted file mode 100644
index bd4ee53ae7bb..000000000000
--- a/net/mute-net/files/post-configure_patch-MUTE::layers::messageRouting::Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
---- MUTE/layers/messageRouting/Makefile.orig	Sat Dec 20 00:01:04 2003
-+++ MUTE/layers/messageRouting/Makefile	Sat Dec 20 00:02:01 2003
-@@ -532,10 +532,10 @@
- 
- # targets
- 
--all: libmuteMessageRouter.a test/testMessageRouter test/testMessageRouter2 test/testTalker test/testBystander test/testCatcher
-+all: libmuteMessageRouter.a test/testMessageRouter2 test/testTalker test/testBystander test/testCatcher
- 
- clean:
--	rm -f ${DEPENDENCY_FILE} ${LAYER_OBJECTS} ${TEST_OBJECTS} ${NEEDED_MINOR_GEMS_OBJECTS} libmuteMessageRouter.a test/testMessageRouter test/testMessageRouter2 test/testTalker test/testBystander test/testCatcher
-+	rm -f ${DEPENDENCY_FILE} ${LAYER_OBJECTS} ${NEEDED_MINOR_GEMS_OBJECTS} libmuteMessageRouter.a test/testMessageRouter2 test/testTalker test/testBystander test/testCatcher
- 
- 
- 
-@@ -576,7 +576,6 @@
- s/^SecureInputStream.o/$${STREAM_PATH}\/SecureInputStream.o/; \
- s/^SecureOutpuStream.o/$${STREAM_PATH}\/SecureOutputStream.o/; \
- s/^SecureStreamFactory.o/$${STREAM_PATH}\/SecureStreamFactory.o/; \
--s/^testMessageRouter.o/test\/testMessageRouter.o/; \
- s/^testMessageRouter2.o/test\/testMessageRouter2.o/; \
- s/^testTalker.o/test\/testTalker.o/; \
- s/^testBystander.o/test\/testBystander.o/; \
-@@ -585,9 +584,9 @@
- 
- 
- # build the dependency file
--${DEPENDENCY_FILE}: ${LAYER_SOURCE} ${TEST_SOURCE}
-+${DEPENDENCY_FILE}: ${LAYER_SOURCE}
- 	rm -f ${DEPENDENCY_FILE}
--	${COMPILE} -I${ROOT_PATH} -MM ${LAYER_SOURCE} ${TEST_SOURCE} >> ${DEPENDENCY_FILE}.temp
-+	${COMPILE} -I${ROOT_PATH} -MM ${LAYER_SOURCE} >> ${DEPENDENCY_FILE}.temp
- 	cat ${DEPENDENCY_FILE}.temp | ${MESSAGE_ROUTING_SED_FIX_COMMAND} >> ${DEPENDENCY_FILE}
- 	rm -f ${DEPENDENCY_FILE}.temp
- 
diff --git a/net/mute-net/pkg-plist b/net/mute-net/pkg-plist
index da8ece810acc..8f2ccbfe820d 100644
--- a/net/mute-net/pkg-plist
+++ b/net/mute-net/pkg-plist
@@ -8,6 +8,8 @@
 %%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
@@ -15,18 +17,24 @@
 %%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
 @dirrm %%DATADIR%%