aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ftp/muddleftpd/Makefile31
-rw-r--r--ftp/muddleftpd/distinfo2
-rw-r--r--ftp/muddleftpd/files/patch-doc::Makefile.in20
-rw-r--r--ftp/muddleftpd/files/patch-doc::info::muddleftpd.texi12
-rw-r--r--ftp/muddleftpd/files/patch-src::Makefile.in27
-rw-r--r--ftp/muddleftpd/pkg-plist21
6 files changed, 69 insertions, 44 deletions
diff --git a/ftp/muddleftpd/Makefile b/ftp/muddleftpd/Makefile
index 4fe93c340708..bd051b79537f 100644
--- a/ftp/muddleftpd/Makefile
+++ b/ftp/muddleftpd/Makefile
@@ -7,37 +7,34 @@
#
PORTNAME= muddleftpd
-PORTVERSION= 1.3.9
+PORTVERSION= 1.3.11
CATEGORIES= ftp
MASTER_SITES= http://www.arach.net.au/~wildfire/muddleftpd/
DISTNAME= ${PORTNAME}.${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
+USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_GMAKE= yes
-MAKE_ENV= INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
- INSTALL_MAN="${INSTALL_MAN}" \
- INSTALL_DATA="${INSTALL_DATA}"
+MAN1= muddleftpd.1 ftpwho.1 mudpasswd.1
+
+post-patch:
+ @${PERL} -pi -e 's|^NEWMALLOC|#NEWMALLOC|g' ${WRKSRC}/Makefile.defs
+ @${PERL} -pi -e 's|"/etc|"${PREFIX}/etc|g' ${WRKSRC}/defaults.h
+ @${PERL} -pi -e 's|#include <malloc.h>||g' ${WRKSRC}/src/ftpd.h
-MAN1= muddleftpd.1 ftpwho.1 mudpasswd.1
-EXAMPLES= anon-only.conf anon-reigon.conf ratios.conf standard.conf \
- vserver-host.conf vserver.conf vserverbig.conf
-DOCS= cookie.txt ftpcmds.txt muddleftpd.txt mudpasswd.txt reference.txt
+pre-configure:
+ @${CHMOD} -f u+x ${WRKSRC}/configure
post-install:
install-info ${PREFIX}/info/muddleftpd.info ${PREFIX}/info/dir
- @${MKDIR} ${PREFIX}/share/examples/muddleftpd
- ${CP} ${WRKSRC}/examples/README ${PREFIX}/share/examples/muddleftpd
-.for file in ${EXAMPLES}
- ${CP} ${WRKSRC}/examples/${file} ${PREFIX}/share/examples/muddleftpd
-.endfor
.if !defined(NOPORTDOCS)
+ @${MKDIR} ${PREFIX}/share/examples/muddleftpd
+ ${INSTALL_DATA} ${WRKSRC}/examples/README ${PREFIX}/share/examples/muddleftpd
+ ${INSTALL_DATA} ${WRKSRC}/examples/*.conf ${PREFIX}/share/examples/muddleftpd
@${MKDIR} ${PREFIX}/share/doc/muddleftpd
-.for file in ${DOCS}
- ${CP} ${WRKSRC}/doc/${file} ${PREFIX}/share/doc/muddleftpd
-.endfor
+ ${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${PREFIX}/share/doc/muddleftpd
.endif
.include <bsd.port.mk>
diff --git a/ftp/muddleftpd/distinfo b/ftp/muddleftpd/distinfo
index 3201d1361875..b34173d38626 100644
--- a/ftp/muddleftpd/distinfo
+++ b/ftp/muddleftpd/distinfo
@@ -1 +1 @@
-MD5 (muddleftpd.1.3.9.tar.gz) = a6d2bf0ded488588243970c3f08ab4a2
+MD5 (muddleftpd.1.3.11.tar.gz) = 7f1bfc9ad64d2370cee14cd062279a95
diff --git a/ftp/muddleftpd/files/patch-doc::Makefile.in b/ftp/muddleftpd/files/patch-doc::Makefile.in
index e169e37a90e8..c32bbab0b622 100644
--- a/ftp/muddleftpd/files/patch-doc::Makefile.in
+++ b/ftp/muddleftpd/files/patch-doc::Makefile.in
@@ -1,18 +1,18 @@
---- doc/Makefile.in.orig Mon Apr 23 00:25:01 2001
-+++ doc/Makefile.in Mon Apr 23 00:26:09 2001
-@@ -41,11 +41,11 @@
+--- 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)
-- install man/ftpwho.1 -m 644 $(MANDIR)/man1/$(WHOPROG)
-- install man/mudpasswd.1 -m 644 $(MANDIR)/man1/$(MUDPASSWDPROG)
-+ ${INSTALL_MAN} man/muddleftpd.1 $(MANDIR)/man1
-+ ${INSTALL_MAN} man/ftpwho.1 $(MANDIR)/man1
-+ ${INSTALL_MAN} man/mudpasswd.1 $(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)
-+ ${INSTALL_DATA} $(DOCOBJ) $(INFODIR)
++ ${BSD_INSTALL_DATA} $(DOCOBJ) $(INFODIR)
clean:
diff --git a/ftp/muddleftpd/files/patch-doc::info::muddleftpd.texi b/ftp/muddleftpd/files/patch-doc::info::muddleftpd.texi
new file mode 100644
index 000000000000..02ab7ae50821
--- /dev/null
+++ b/ftp/muddleftpd/files/patch-doc::info::muddleftpd.texi
@@ -0,0 +1,12 @@
+--- doc/info/muddleftpd.texi.orig Tue Mar 20 13:39:59 2001
++++ doc/info/muddleftpd.texi Sat Jul 7 04:41:04 2001
+@@ -3,6 +3,9 @@
+ @setfilename muddleftpd.info
+ @settitle muddleftpd, a file transfer protocol server
+ @dircategory Internet
++@direntry
++* Muddle.ftpd: (muddleftpd). A file transfer protocol server.
++@end direntry
+ @c %**end of header
+
+ @c This file has the new style title page commands.
diff --git a/ftp/muddleftpd/files/patch-src::Makefile.in b/ftp/muddleftpd/files/patch-src::Makefile.in
index 2f4f2217320d..64c22e4d69c9 100644
--- a/ftp/muddleftpd/files/patch-src::Makefile.in
+++ b/ftp/muddleftpd/files/patch-src::Makefile.in
@@ -1,15 +1,28 @@
---- src/Makefile.in.orig Mon Apr 23 00:20:53 2001
-+++ src/Makefile.in Mon Apr 23 00:23:46 2001
-@@ -98,9 +98,9 @@
+--- src/Makefile.in.orig Sun Apr 29 20:43:45 2001
++++ src/Makefile.in Sat Jul 7 04:16:43 2001
+@@ -40,8 +40,8 @@
+ RATIOTOOLSRC = ratiotool.c util/strerror.c version.c utils.c util/snprintf.c \
+ util/pwgrent.c
+
+-MUDLOGDSRC = mudlogd.c util/strerror.c util/snprintf.c config.c utils.c \
+- newfile.c version.c string.c
++MUDLOGDSRC = mudlogd.c util/strerror.c util/snprintf.c util/pwgrent.c \
++ config.c utils.c newfile.c version.c string.c
+
+ 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_PROGRAM} $(MUDOUTPROG) $(BINDIR)
-+ ${INSTALL_PROGRAM} $(WHOPROG) $(BINDIR)
-+ ${INSTALL_PROGRAM} $(MUDPASSWDPROG) $(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)
- ifndef MUDOUTPROG
clean:
+ rm -f $(MUDOUTPROG) $(WHOPROG) *.o *~ core DEADJOE util/*.o
diff --git a/ftp/muddleftpd/pkg-plist b/ftp/muddleftpd/pkg-plist
index 56bfa67459f7..6ebbb96bb171 100644
--- a/ftp/muddleftpd/pkg-plist
+++ b/ftp/muddleftpd/pkg-plist
@@ -1,21 +1,24 @@
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
-share/examples/muddleftpd/README
-share/examples/muddleftpd/anon-only.conf
-share/examples/muddleftpd/anon-reigon.conf
-share/examples/muddleftpd/ratios.conf
-share/examples/muddleftpd/standard.conf
-share/examples/muddleftpd/vserver-host.conf
-share/examples/muddleftpd/vserver.conf
-share/examples/muddleftpd/vserverbig.conf
-@dirrm share/examples/muddleftpd
%%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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 08:11:58 +0000