5 files changed, 29 insertions, 59 deletions

diff --git a/ftp/muddleftpd/Makefile b/ftp/muddleftpd/Makefile
index 810e7bf3596a..8dd6b0c3a637 100644
--- a/ftp/muddleftpd/Makefile
+++ b/ftp/muddleftpd/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	muddleftpd
-PORTVERSION=	1.3.12.1
-PORTREVISION=	1
+PORTVERSION=	1.3.13.1
 CATEGORIES=	ftp
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -20,15 +19,22 @@ USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ARGS=	--without-authsmb
 
 MAN1=		ftpwho.1 muddleftpd.1 mudpasswd.1
+INFO=		muddleftpd
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|^NEWMALLOC|#NEWMALLOC|g' ${WRKSRC}/Makefile.defs
-	@${REINPLACE_CMD} -e 's|"/etc|"${PREFIX}/etc|g' ${WRKSRC}/defaults.h
+	@${REINPLACE_CMD} -e 's|"/etc|"${PREFIX}/etc|g' ${WRKSRC}/defaults.h.in
 	@${REINPLACE_CMD} -e 's|#include <malloc.h>||g' ${WRKSRC}/src/ftpd.h
 
-post-install:
+do-install:
+.for file in ftpwho muddleftpd mudlogd mudpasswd
+	${INSTALL_PROGRAM} ${WRKSRC}/src/${file} ${PREFIX}/bin
+.endfor
+	${INSTALL_MAN} ${WRKSRC}/doc/man/*.1 ${MANPREFIX}/man/man1
+	${INSTALL_DATA} ${WRKSRC}/doc/info/muddleftpd.info ${PREFIX}/info
 	@install-info ${PREFIX}/info/muddleftpd.info ${PREFIX}/info/dir
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
diff --git a/ftp/muddleftpd/distinfo b/ftp/muddleftpd/distinfo
index b9959eff35d9..b061e0903858 100644
--- a/ftp/muddleftpd/distinfo
+++ b/ftp/muddleftpd/distinfo
@@ -1,2 +1,2 @@
-MD5 (muddleftpd-1.3.12.1.tar.gz) = 208d94621a31a76a7e9baaac08463c29
-SIZE (muddleftpd-1.3.12.1.tar.gz) = 238910
+MD5 (muddleftpd-1.3.13.1.tar.gz) = 47cf007466395ce43920f5e60234e107
+SIZE (muddleftpd-1.3.13.1.tar.gz) = 446551
diff --git a/ftp/muddleftpd/files/patch-doc::Makefile.in b/ftp/muddleftpd/files/patch-doc::Makefile.in
deleted file mode 100644
index c32bbab0b622..000000000000
--- a/ftp/muddleftpd/files/patch-doc::Makefile.in
+++ /dev/null
@@ -1,18 +0,0 @@
---- doc/Makefile.in.orig	Mon Apr  2 21:37:48 2001
-+++ doc/Makefile.in	Sat Jul  7 02:25:29 2001
-@@ -47,11 +47,11 @@
- 	
- install: all
- 	mkdir -p $(MANDIR)/man1
--	install man/muddleftpd.1 -m 644 $(MANDIR)/man1/$(MUDOUTPROG).1
--	install man/ftpwho.1 -m 644 $(MANDIR)/man1/$(WHOPROG).1
--	install man/mudpasswd.1 -m 644 $(MANDIR)/man1/$(MUDPASSWDPROG).1
-+	${BSD_INSTALL_MAN} man/muddleftpd.1 $(MANDIR)/man1/$(MUDOUTPROG).1
-+	${BSD_INSTALL_MAN} man/ftpwho.1 $(MANDIR)/man1/$(WHOPROG).1
-+	${BSD_INSTALL_MAN} man/mudpasswd.1 $(MANDIR)/man1/$(MUDPASSWDPROG).1
- 	mkdir -p $(INFODIR)
--	install $(DOCOBJ) -m 644 $(INFODIR)
-+	${BSD_INSTALL_DATA} $(DOCOBJ) $(INFODIR)
- 
- clean:
- 
diff --git a/ftp/muddleftpd/files/patch-src::Makefile.in b/ftp/muddleftpd/files/patch-src::Makefile.in
index 64c22e4d69c9..ad5b436efe33 100644
--- a/ftp/muddleftpd/files/patch-src::Makefile.in
+++ b/ftp/muddleftpd/files/patch-src::Makefile.in
@@ -11,18 +11,3 @@
  
  ifdef NEWMALLOC
  SRC += malloc.c
-@@ -108,10 +108,10 @@
- install: all
- 	mkdir -p $(BINDIR)
- 
--	install $(MUDOUTPROG) -m 755 $(BINDIR)
--	install $(WHOPROG) -m 755 $(BINDIR)
--	install $(MUDPASSWDPROG) -m 755 $(BINDIR)
--	install $(MUDLOGD) -m 755 $(BINDIR)
-+	${BSD_INSTALL_PROGRAM} $(MUDOUTPROG) $(BINDIR)
-+	${BSD_INSTALL_PROGRAM} $(WHOPROG) $(BINDIR)
-+	${BSD_INSTALL_PROGRAM} $(MUDPASSWDPROG) $(BINDIR)
-+	${BSD_INSTALL_PROGRAM} $(MUDLOGD) $(BINDIR)
- 
- clean:
- 	rm -f $(MUDOUTPROG) $(WHOPROG) *.o *~ core DEADJOE util/*.o
diff --git a/ftp/muddleftpd/pkg-plist b/ftp/muddleftpd/pkg-plist
index 6ebbb96bb171..0689fd909474 100644
--- a/ftp/muddleftpd/pkg-plist
+++ b/ftp/muddleftpd/pkg-plist
@@ -2,23 +2,20 @@ bin/ftpwho
 bin/muddleftpd
 bin/mudlogd
 bin/mudpasswd
-@unexec install-info --delete %D/info/muddleftpd.info %D/info/dir
-info/muddleftpd.info
-@exec install-info %D/info/muddleftpd.info %D/info/dir
-%%PORTDOCS%%share/doc/muddleftpd/cookie.txt
-%%PORTDOCS%%share/doc/muddleftpd/ftpcmds.txt
-%%PORTDOCS%%share/doc/muddleftpd/muddleftpd.txt
-%%PORTDOCS%%share/doc/muddleftpd/mudlogd.txt
-%%PORTDOCS%%share/doc/muddleftpd/mudpasswd.txt
-%%PORTDOCS%%share/doc/muddleftpd/reference.txt
-%%PORTDOCS%%share/examples/muddleftpd/README
-%%PORTDOCS%%share/examples/muddleftpd/anon-only.conf
-%%PORTDOCS%%share/examples/muddleftpd/anon-reigon.conf
-%%PORTDOCS%%share/examples/muddleftpd/mudlogd.conf
-%%PORTDOCS%%share/examples/muddleftpd/ratios.conf
-%%PORTDOCS%%share/examples/muddleftpd/standard.conf
-%%PORTDOCS%%share/examples/muddleftpd/vserver-host.conf
-%%PORTDOCS%%share/examples/muddleftpd/vserver.conf
-%%PORTDOCS%%share/examples/muddleftpd/vserverbig.conf
-%%PORTDOCS%%@dirrm share/examples/muddleftpd
-%%PORTDOCS%%@dirrm share/doc/muddleftpd
+%%PORTDOCS%%%%DOCSDIR%%/cookie.txt
+%%PORTDOCS%%%%DOCSDIR%%/ftpcmds.txt
+%%PORTDOCS%%%%DOCSDIR%%/muddleftpd.txt
+%%PORTDOCS%%%%DOCSDIR%%/mudlogd.txt
+%%PORTDOCS%%%%DOCSDIR%%/mudpasswd.txt
+%%PORTDOCS%%%%DOCSDIR%%/reference.txt
+%%PORTDOCS%%%%EXAMPLESDIR%%/README
+%%PORTDOCS%%%%EXAMPLESDIR%%/anon-only.conf
+%%PORTDOCS%%%%EXAMPLESDIR%%/anon-reigon.conf
+%%PORTDOCS%%%%EXAMPLESDIR%%/mudlogd.conf
+%%PORTDOCS%%%%EXAMPLESDIR%%/ratios.conf
+%%PORTDOCS%%%%EXAMPLESDIR%%/standard.conf
+%%PORTDOCS%%%%EXAMPLESDIR%%/vserver-host.conf
+%%PORTDOCS%%%%EXAMPLESDIR%%/vserver.conf
+%%PORTDOCS%%%%EXAMPLESDIR%%/vserverbig.conf
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%