4 files changed, 28 insertions, 56 deletions

diff --git a/net/mmucl/Makefile b/net/mmucl/Makefile
index 774d44de3f07..59c8fa1d61ce 100644
--- a/net/mmucl/Makefile
+++ b/net/mmucl/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	mmucl
-PORTVERSION=	1.5.1
-PORTREVISION=	1
+PORTVERSION=	1.5.2
 CATEGORIES=	net
 MASTER_SITES=	http://download.sourceforge.net/mmucl/
 
@@ -17,14 +16,14 @@ COMMENT=	Powerful GUI MUD client written in TCL
 LIB_DEPENDS=	tcl84.1:${PORTSDIR}/lang/tcl84
 RUN_DEPENDS=	wish8.4:${PORTSDIR}/x11-toolkits/tk84
 
-USE_GMAKE=	YES
+USE_GMAKE=	yes
+MAKE_ARGS=	BASE_DIR=${PREFIX} TCLSH=tclsh8.4 INFO_DIR=${PREFIX}/info \
+		INSTALL_INFO=/usr/bin/install-info
 INFO=		mmucl
 
 post-install:
-	${MKDIR} ${PREFIX}/share/doc/${DISTNAME}
-	${MKDIR} ${PREFIX}/share/doc/${DISTNAME}/examples
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/${DISTNAME}
-	${INSTALL_DATA} ${WRKSRC}/CHANGES ${PREFIX}/share/doc/${DISTNAME}
-	${INSTALL_DATA} ${WRKSRC}/examples/* ${PREFIX}/share/doc/${DISTNAME}/examples
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/CHANGES ${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/net/mmucl/distinfo b/net/mmucl/distinfo
index 06b63a4fa8e5..a396c2eff410 100644
--- a/net/mmucl/distinfo
+++ b/net/mmucl/distinfo
@@ -1 +1,3 @@
-MD5 (mmucl-1.5.1.tar.gz) = 0d667ed47f539186d7ad2013d66fe0d0
+MD5 (mmucl-1.5.2.tar.gz) = d38ad0b1a51325dada8ac6b1b15113e2
+SHA256 (mmucl-1.5.2.tar.gz) = 7bc5ca6c35ffc92bd1ceca08cd7121a1edd1d5a1935a81e6976f1404e9b4a94d
+SIZE (mmucl-1.5.2.tar.gz) = 144697
diff --git a/net/mmucl/files/patch-aa b/net/mmucl/files/patch-aa
index 1652472080e7..b7150b768e9f 100644
--- a/net/mmucl/files/patch-aa
+++ b/net/mmucl/files/patch-aa
@@ -1,37 +1,9 @@
---- Makefile.orig	Sun Oct  6 18:53:40 2002
-+++ Makefile	Fri Aug 29 22:46:28 2003
-@@ -3,7 +3,7 @@
- 
- # Mmucl installs itself under BASE_DIR
- 
--BASE_DIR = /usr/local
-+BASE_DIR = ${PREFIX}
- 
- # The startup script, mmucl, is put in BIN_DIR
- # Everything else is put in LIB_DIR
-@@ -13,15 +13,15 @@
- 
- # Which tclsh to use.
- 
--TCLSH = tclsh
-+TCLSH = tclsh8.4
- 
- # Where info files are stored.
- 
--INFO_DIR = $(BASE_DIR)/share/info
-+INFO_DIR = $(BASE_DIR)/info
- 
- # Location of install-info
- 
--INSTALL_INFO = /sbin/install-info
-+INSTALL_INFO = /usr/bin/install-info
- 
- # Location of install
- 
-@@ -43,7 +43,7 @@
- 	$(INSTALL) -cm 0644 images/*.gif $(LIB_DIR)/images
+--- Makefile.orig	Tue Nov 15 16:54:01 2005
++++ Makefile	Tue Nov 15 16:54:16 2005
+@@ -45,7 +45,7 @@
  	$(INSTALL) -cm 0644 interface/*.tcl $(LIB_DIR)/interface
- 	$(INSTALL) -cm 0644 examples/mmucl.rc $(LIB_DIR)/examples
+ 	$(INSTALL) -cm 0644 script/*.tcl script/*.rc $(LIB_DIR)/script
+ 	$(INSTALL) -cm 0644 script/contrib/*.tcl $(LIB_DIR)/script/contrib
 -	$(INSTALL) -cm 0755 mmucl2 $(BIN_DIR)
 +	$(INSTALL) -cm 0755 mmucl2 $(BIN_DIR)/mmucl
  	$(INSTALL) -cm 0644 mmucl.info $(INFO_DIR)
diff --git a/net/mmucl/pkg-plist b/net/mmucl/pkg-plist
index 2b644e52b32e..dcf9b44725ba 100644
--- a/net/mmucl/pkg-plist
+++ b/net/mmucl/pkg-plist
@@ -17,24 +17,23 @@ lib/mmucl2/interface/readline.tcl
 lib/mmucl2/interface/text.tcl
 lib/mmucl2/interface/tk.tcl
 @dirrm lib/mmucl2/interface
-lib/mmucl2/examples/mmucl.rc
-@dirrm lib/mmucl2/examples
 lib/mmucl2/lib/connect.tcl
 lib/mmucl2/lib/connect_test.tcl
 lib/mmucl2/lib/misc.tcl
 lib/mmucl2/lib/mmucl.tcl
 lib/mmucl2/lib/ntkinfo.tcl
+lib/mmucl2/script/channel.tcl
+lib/mmucl2/script/contrib/mmchat.tcl
+lib/mmucl2/script/email.tcl
+lib/mmucl2/script/map.tcl
+lib/mmucl2/script/mmucl.rc
+lib/mmucl2/script/monitor.tcl
+lib/mmucl2/script/msp.tcl
+lib/mmucl2/script/robot.tcl
+@dirrm lib/mmucl2/script/contrib
+@dirrm lib/mmucl2/script
 @dirrm lib/mmucl2/lib
 @dirrm lib/mmucl2
-share/doc/mmucl-1.5.1/CHANGES
-share/doc/mmucl-1.5.1/README
-share/doc/mmucl-1.5.1/examples/Arithon
-share/doc/mmucl-1.5.1/examples/channel.tcl
-share/doc/mmucl-1.5.1/examples/email.tcl
-share/doc/mmucl-1.5.1/examples/map.tcl
-share/doc/mmucl-1.5.1/examples/mmucl.rc
-share/doc/mmucl-1.5.1/examples/monitor.tcl
-share/doc/mmucl-1.5.1/examples/msp.tcl
-share/doc/mmucl-1.5.1/examples/robot.tcl
-@dirrm share/doc/mmucl-1.5.1/examples
-@dirrm share/doc/mmucl-1.5.1
+%%DOCSDIR%%/CHANGES
+%%DOCSDIR%%/README
+@dirrm %%DOCSDIR%%