Date: Fri, 27 Aug 2004 13:34:23 +0400 From: Roman Bogorodskiy <bogorodskiy@inbox.ru> To: FreeBSD-gnats-submit@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/71021: [ maintainer ] ftp/wzdftpd: update to 0.4.0 Message-ID: <20040827093423.GD711@lame.novel.ru> In-Reply-To: <200408270930.i7R9UPIh022020@freefall.freebsd.org> References: <E1C0czZ-000KfR-00.bogorodskiy-inbox-ru@mx1.mail.ru> <200408270930.i7R9UPIh022020@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--5CUMAwwhRxlRszMD
Content-Type: multipart/mixed; boundary="2qXFWqzzG3v1+95a"
Content-Disposition: inline
--2qXFWqzzG3v1+95a
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
FreeBSD-gnats-submit wrote:
> >Category: ports
> >Responsible: freebsd-ports-bugs
> >Synopsis: [ maintainer ] ftp/wzdftpd: update to 0.4.0
> >Arrival-Date: Fri Aug 27 09:30:25 GMT 2004
Oops, forgot to `portlint`. Correct diff attached.
-Roman Bogorodskiy
--2qXFWqzzG3v1+95a
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="port.wzd.update"
Content-Transfer-Encoding: quoted-printable
diff -ruN wzdftpd.orig/Makefile wzdftpd/Makefile
--- wzdftpd.orig/Makefile Fri Aug 27 10:18:50 2004
+++ wzdftpd/Makefile Fri Aug 27 13:28:20 2004
@@ -6,7 +6,7 @@
#
=20
PORTNAME=3D wzdftpd
-PORTVERSION=3D 0.3.3
+PORTVERSION=3D 0.4.0
CATEGORIES=3D ftp ipv6
MASTER_SITES=3D ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=3D ${PORTNAME}
@@ -14,26 +14,28 @@
MAINTAINER=3D bogorodskiy@inbox.ru
COMMENT=3D Modular FTP server configurable online using SITE commands
=20
+USE_PERL5=3D yes
USE_RC_SUBR=3D yes
USE_REINPLACE=3D yes
USE_GMAKE=3D yes
-USE_GETOPT_LONG=3Dyes
GNU_CONFIGURE=3D yes
INSTALLS_SHLIB=3D yes
USE_INC_LIBTOOL_VER=3D13
-CONFIGURE_ARGS+=3D --without-mysql
+CONFIGURE_ARGS+=3D --without-mysql --without-pam
CONFIGURE_TARGET=3D --build=3D${MACHINE_ARCH}-portbld-freebsd${OSREL}
PKGMESSAGE=3D ${WRKDIR}/pkg-message
=20
+OPTIONS=3D UFT8 "Enable UTF8 support" off \
+ TCL "Enable TCL support" off \
+ SSL "Enable OpenSSL support" on \
+ IPV6 "Enable IPv6 support" on
+
+MAN1=3D siteconfig.1 \
+ siteuptime.1 \
+ sitewho.1 \
+ wzd-config.1
MAN8=3D wzdftpd.8
=20
-.if defined(PACKAGE_BUILDING)
-WITH_UTF8=3D yes
-WITH_TCL=3D yes
-WITH_SSL=3D yes
-WITH_IPV6=3D yes
-.endif
-
.if defined(WITH_UTF8)
USE_ICONV=3D yes
CONFIGURE_ARGS+=3D --enable-utf8
@@ -41,38 +43,39 @@
=20
.if defined(WITH_TCL)
LIB_DEPENDS+=3D tcl84:${PORTSDIR}/lang/tcl84
-CONFIGURE_ARGS+=3D --with-tcl=3D'${PREFIX}/include/tcl8.4:${PREFIX}/lib'
+CONFIGURE_ARGS+=3D --with-tcl=3D'${PREFIX}/lib/tcl8.4'
PLIST_SUB+=3D TCL=3D""
.else
+CONFIGURE_ARGS+=3D --without-tcl
PLIST_SUB+=3D TCL=3D"@comment "
.endif
=20
.if defined(WITH_SSL)
USE_OPENSSL=3D yes
-CONFIGURE_ARGS+=3D --enable-ssl
+.else
+CONFIGURE_ARGS+=3D --with-openssl=3D/dev/null
.endif
=20
.if defined(WITH_IPV6)
CONFIGURE_ARGS+=3D --enable-ipv6
.endif
=20
-DOCS=3D AUTHORS Permissions.ReadMeFirst README TLS.ReadMeFirst \
+.include <bsd.port.pre.mk>
+
+PORTDOCS=3D AUTHORS Permissions.ReadMeFirst README TLS.ReadMeFirst \
ChangeLog src/DOCS_XFERLOG_FORMAT src/KNOWN_BUGS src/TODO
=20
RC_SCRIPTS_SUB=3D PREFIX=3D${PREFIX} \
RC_SUBR=3D${RC_SUBR}
=20
-post-extract:
-.if defined(WITH_TCL)
- @${REINPLACE_CMD} -e 's|-ltcl8.4|-ltcl84|g' ${WRKSRC}/configure
-.endif
-
post-install:
${MV} ${PREFIX}/etc/wzd.cfg ${PREFIX}/etc/wzd.cfg.sample
${MV} ${PREFIX}/etc/users ${PREFIX}/etc/users.sample
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
- cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
+.for i in ${PORTDOCS}
+ @${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
+.endfor
.endif
@${SED} -e 's,PREFIX,${PREFIX},g' ${FILESDIR}/pkg-message.in > ${PKGMESSA=
GE}
@${CAT} ${PKGMESSAGE}
@@ -80,4 +83,4 @@
${FILESDIR}/wzdftpd.sh > ${PREFIX}/etc/rc.d/wzdftpd.sh
@${CHMOD} ${BINMODE} ${PREFIX}/etc/rc.d/wzdftpd.sh
=20
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -ruN wzdftpd.orig/distinfo wzdftpd/distinfo
--- wzdftpd.orig/distinfo Fri Aug 27 10:18:50 2004
+++ wzdftpd/distinfo Fri Aug 27 10:49:35 2004
@@ -1,2 +1,2 @@
-MD5 (wzdftpd-0.3.3.tar.gz) =3D 38222ee7e727a7d872fc301c6d449f95
-SIZE (wzdftpd-0.3.3.tar.gz) =3D 626454
+MD5 (wzdftpd-0.4.0.tar.gz) =3D 3d5dbf7b66170a9828d9b6e540af8857
+SIZE (wzdftpd-0.4.0.tar.gz) =3D 749260
diff -ruN wzdftpd.orig/files/patch-src-wzd_ServerThread.c wzdftpd/files/pat=
ch-src-wzd_ServerThread.c
--- wzdftpd.orig/files/patch-src-wzd_ServerThread.c Fri Aug 27 10:18:49 2004
+++ wzdftpd/files/patch-src-wzd_ServerThread.c Thu Jan 1 03:00:00 1970
@@ -1,18 +0,0 @@
---- src/wzd_ServerThread.c.orig Thu Apr 15 10:27:07 2004
-+++ src/wzd_ServerThread.c Tue Apr 20 10:52:06 2004
-@@ -28,6 +28,7 @@
- #include <winsock2.h>
- #else
-=20
-+#include <sys/types.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
-@@ -39,7 +40,6 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
--#include <sys/types.h>
- #include <sys/stat.h>
- #include <time.h>
- #include <errno.h>
diff -ruN wzdftpd.orig/pkg-plist wzdftpd/pkg-plist
--- wzdftpd.orig/pkg-plist Fri Aug 27 10:18:50 2004
+++ wzdftpd/pkg-plist Fri Aug 27 12:53:02 2004
@@ -2,23 +2,43 @@
bin/siteconfig
bin/siteuptime
bin/sitewho
+bin/wzd-config
etc/rc.d/wzdftpd.sh
etc/users.sample
etc/wzd.cfg.sample
etc/wzd.pem
+include/wzdftpd/wzd_action.h
+include/wzdftpd/wzd_backend.h
+include/wzdftpd/wzd_cache.h
+include/wzdftpd/wzd_crc32.h
+include/wzdftpd/wzd_crontab.h
+include/wzdftpd/wzd_debug.h
+include/wzdftpd/wzd_dir.h
+include/wzdftpd/wzd_file.h
+include/wzdftpd/wzd_hardlimits.h
+include/wzdftpd/wzd_ip.h
+include/wzdftpd/wzd_libmain.h
+include/wzdftpd/wzd_log.h
+include/wzdftpd/wzd_md5.h
+include/wzdftpd/wzd_messages.h
+include/wzdftpd/wzd_misc.h
+include/wzdftpd/wzd_mod.h
+include/wzdftpd/wzd_mutex.h
+include/wzdftpd/wzd_perm.h
+include/wzdftpd/wzd_section.h
+include/wzdftpd/wzd_shm.h
+include/wzdftpd/wzd_strlcat.h
+include/wzdftpd/wzd_strtok_r.h
+include/wzdftpd/wzd_structs.h
+include/wzdftpd/wzd_types.h
+include/wzdftpd/wzd_utf8.h
+include/wzdftpd/wzd_vars.h
+include/wzdftpd/wzd_vfs.h
lib/libwzd.a
lib/libwzd.so
lib/libwzd.la
+share/aclocal/wzd.m4
sbin/wzdftpd
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/Permissions.ReadMeFirst
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/TLS.ReadMeFirst
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/DOCS_XFERLOG_FORMAT
-%%PORTDOCS%%%%DOCSDIR%%/KNOWN_BUGS
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
etc/file_ginfo.txt
etc/file_help.txt
etc/file_swho.txt
@@ -35,9 +55,13 @@
%%DATADIR%%/modules/libwzd_sfv.la
%%DATADIR%%/modules/libwzd_sfv.a
%%DATADIR%%/modules/libwzd_sfv.so
+%%DATADIR%%/modules/libwzd_perl.a
+%%DATADIR%%/modules/libwzd_perl.la=20
+%%DATADIR%%/modules/libwzd_perl.so
%%TCL%%%%DATADIR%%/modules/libwzd_tcl.a
%%TCL%%%%DATADIR%%/modules/libwzd_tcl.la
%%TCL%%%%DATADIR%%/modules/libwzd_tcl.so
@dirrm %%DATADIR%%/modules/
@dirrm %%DATADIR%%/backends/
@dirrm %%DATADIR%%/
+@dirrm include/wzdftpd
--2qXFWqzzG3v1+95a--
--5CUMAwwhRxlRszMD
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.5 (FreeBSD)
iQCVAwUBQS8AH4B0WzgdqspGAQKJnAQAouelWDqc+V5h0JFWel4mZJgjnImTUNKp
BGiAjo/qC1j26LdXf8NdkQKvq0TxpzVF4FZWWZbqHQNW4vG8epGhuwUA6pwU9Lcb
F9mUwmixcCgl8Jrv9ycUmjgA/c4S2fNrV0O/bv/iXFWvEXYPE2qnZJX531zTur/j
XRB4LtHSf2E=
=qnm2
-----END PGP SIGNATURE-----
--5CUMAwwhRxlRszMD--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040827093423.GD711>