Attachment 46225 Details for Bug 71021 – file.diff

[patch] file.diff

file.diff (text/plain), 5.67 KB, created by Roman Bogorodskiy on 2004-08-27 10:30:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Roman Bogorodskiy

Created: 2004-08-27 10:30:25 UTC

Size: 5.67 KB

patch

obsolete

>diff -ruN wzdftpd.orig/Makefile wzdftpd/Makefile
>--- wzdftpd.orig/Makefile	Fri Aug 27 10:18:50 2004
>+++ wzdftpd/Makefile	Fri Aug 27 13:09:56 2004
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	wzdftpd
>-PORTVERSION=	0.3.3
>+PORTVERSION=	0.4.0
> CATEGORIES=	ftp ipv6
> MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
> MASTER_SITE_SUBDIR=	${PORTNAME}
>@@ -14,26 +14,30 @@
> MAINTAINER=	bogorodskiy@inbox.ru
> COMMENT=	Modular FTP server configurable online using SITE commands
> 
>+USE_PERL5=	yes
> USE_RC_SUBR=	yes
> USE_REINPLACE=	yes
> USE_GMAKE=	yes
>-USE_GETOPT_LONG=yes
> GNU_CONFIGURE=	yes
> INSTALLS_SHLIB=	yes
> USE_INC_LIBTOOL_VER=13
>-CONFIGURE_ARGS+=	--without-mysql
>+CONFIGURE_ARGS+=	--without-mysql --without-pam
> CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
> PKGMESSAGE=	${WRKDIR}/pkg-message
> 
>+OPTIONS=	UFT8 "Enable UTF8 support" off \
>+		TCL "Enable TCL support" off \
>+		SSL "Enable OpenSSL support" on \
>+		IPV6 "Enable IPv6 support" on
>+
>+.include <bsd.port.pre.mk>
>+
>+MAN1=	siteconfig.1 \
>+	siteuptime.1 \
>+	sitewho.1 \
>+     	wzd-config.1
> MAN8=	wzdftpd.8
> 
>-.if defined(PACKAGE_BUILDING)
>-WITH_UTF8=	yes
>-WITH_TCL=	yes
>-WITH_SSL=	yes
>-WITH_IPV6=	yes
>-.endif
>-
> .if defined(WITH_UTF8)
> USE_ICONV=	yes
> CONFIGURE_ARGS+=	--enable-utf8
>@@ -41,38 +45,37 @@
> 
> .if defined(WITH_TCL)
> LIB_DEPENDS+=	tcl84:${PORTSDIR}/lang/tcl84
>-CONFIGURE_ARGS+=	--with-tcl='${PREFIX}/include/tcl8.4:${PREFIX}/lib'
>+CONFIGURE_ARGS+=	--with-tcl='${PREFIX}/lib/tcl8.4'
> PLIST_SUB+=	TCL=""
> .else
>+CONFIGURE_ARGS+=	--without-tcl
> PLIST_SUB+=	TCL="@comment "
> .endif
> 
> .if defined(WITH_SSL)
> USE_OPENSSL=	yes
>-CONFIGURE_ARGS+=	--enable-ssl
>+.else
>+CONFIGURE_ARGS+=	--with-openssl=/dev/null
> .endif
> 
> .if defined(WITH_IPV6)
> CONFIGURE_ARGS+=	--enable-ipv6
> .endif
> 
>-DOCS=		AUTHORS Permissions.ReadMeFirst README TLS.ReadMeFirst \
>+PORTDOCS=		AUTHORS Permissions.ReadMeFirst README TLS.ReadMeFirst \
> 		ChangeLog src/DOCS_XFERLOG_FORMAT src/KNOWN_BUGS src/TODO
> 
> RC_SCRIPTS_SUB=	PREFIX=${PREFIX} \
> 		RC_SUBR=${RC_SUBR}
> 
>-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 > ${PKGMESSAGE}
> 	@${CAT} ${PKGMESSAGE}
>@@ -80,4 +83,4 @@
> 		${FILESDIR}/wzdftpd.sh > ${PREFIX}/etc/rc.d/wzdftpd.sh
> 	@${CHMOD} ${BINMODE} ${PREFIX}/etc/rc.d/wzdftpd.sh
> 
>-.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) = 38222ee7e727a7d872fc301c6d449f95
>-SIZE (wzdftpd-0.3.3.tar.gz) = 626454
>+MD5 (wzdftpd-0.4.0.tar.gz) = 3d5dbf7b66170a9828d9b6e540af8857
>+SIZE (wzdftpd-0.4.0.tar.gz) = 749260
>diff -ruN wzdftpd.orig/files/patch-src-wzd_ServerThread.c wzdftpd/files/patch-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
>- 
>-+#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 
>+%%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

Actions: View | Diff

Attachments on bug 71021: 46225