Attachment 90361 Details for Bug 127527 – file.diff

[patch] file.diff

file.diff (text/plain), 5.92 KB, created by OH Changsun on 2008-09-21 21:20:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: OH Changsun

Created: 2008-09-21 21:20:01 UTC

Size: 5.92 KB

patch

obsolete

>diff -urN ncftpd.old/Makefile ncftpd/Makefile
>--- ncftpd.old/Makefile	2008-01-23 22:43:35.000000000 +0000
>+++ ncftpd/Makefile	2008-09-21 18:50:15.398555050 +0000
>@@ -6,34 +6,47 @@
> #
> 
> PORTNAME=	ncftpd
>-PORTVERSION=	2.8.3
>+PORTVERSION=	2.8.5
> CATEGORIES=	ftp
> MASTER_SITES=	${MASTER_SITE_LOCAL} \
> 		ftp://ftp.ncftp.com/ncftpd/${PORTVERSION}/ \
> 		ftp://ftp.nl.uu.net/pub/unix/ftp/ncftpd/${PORTVERSION}/
> MASTER_SITE_SUBDIR=	miwi
>-DISTNAME=	${PORTNAME}-${PORTVERSION}-freebsd${BINVER}-${ARCH}-export
>+DISTNAME= ${PORTNAME}-${PORTVERSION}-freebsd${BINVER}-${DIST_ARCH}-export
> 
> MAINTAINER=	beech@FreeBSD.org
> COMMENT=	A well known commercial FTP daemon with a 30-day evaluation license
> 
> WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
> 
>-ONLY_FOR_ARCHS=	i386
>+ONLY_FOR_ARCHS=	i386 amd64
> NO_BUILD=	YES
> LICENSE=	shareware
> RESTRICTED=	30 day evaluation license
> 
>+USE_RC_SUBR=	ncftpd.sh
>+
> .include <bsd.port.pre.mk>
> 
>-.if ${OSVERSION} >= 600000
>+.if ${OSVERSION} >= 700000
>+BINVER=		7.0
>+.elif ${OSVERSION} >= 600000
> BINVER=		6.0
>-.else
>-BINVER=		5.4
>+.elif ${OSVERSION} >= 505000
>+BINVER=		5.5
> .else
> BROKEN=		FreeBSD version too old
> .endif
> 
>+.if ${ARCH} == amd64
>+DIST_ARCH=	x86_64
>+.if ${BINVER} == "6.0"
>+BINVER=		6.2
>+.endif
>+.else
>+DIST_ARCH=	i386
>+.endif
>+
> do-install:
> 	${MKDIR} ${PREFIX}/etc/ncftpd
> 	${INSTALL_PROGRAM} ${WRKSRC}/ncftpd ${PREFIX}/sbin
>@@ -43,7 +56,6 @@
> 	${INSTALL_PROGRAM} ${WRKSRC}/ncftpd_spy ${PREFIX}/bin
> 	${INSTALL_DATA} ${WRKSRC}/conf/general.cf-dist ${PREFIX}/etc/ncftpd
> 	${INSTALL_DATA} ${WRKSRC}/conf/domain.cf-dist ${PREFIX}/etc/ncftpd
>-	${INSTALL_SCRIPT} ${SCRIPTDIR}/ncftpd.sh ${PREFIX}/etc/rc.d
> 
> post-install:
> .if !defined(NOPORTDOCS)
>diff -urN ncftpd.old/distinfo ncftpd/distinfo
>--- ncftpd.old/distinfo	2006-11-10 18:43:34.000000000 +0000
>+++ ncftpd/distinfo	2008-09-21 17:24:25.662261631 +0000
>@@ -1,9 +1,15 @@
>-MD5 (ncftpd-2.8.3-freebsd4.11-i386-export.tar.gz) = e75be6725230604cf666de09466c1f6c
>-SHA256 (ncftpd-2.8.3-freebsd4.11-i386-export.tar.gz) = 909ab2e0ce16f82d8ee78b3d4545035285221df30cbdbe3fce44a3c0da95e40f
>-SIZE (ncftpd-2.8.3-freebsd4.11-i386-export.tar.gz) = 385276
>-MD5 (ncftpd-2.8.3-freebsd5.4-i386-export.tar.gz) = c031cc4938459b1f8aa43decf2f599b3
>-SHA256 (ncftpd-2.8.3-freebsd5.4-i386-export.tar.gz) = 9f73ea925cddac0ca10ec19652058a234c62c93c8d09b1006ad487bfce93c7a9
>-SIZE (ncftpd-2.8.3-freebsd5.4-i386-export.tar.gz) = 391507
>-MD5 (ncftpd-2.8.3-freebsd6.0-i386-export.tar.gz) = 7bea3ded25bcb1025b6a7fe0727027dd
>-SHA256 (ncftpd-2.8.3-freebsd6.0-i386-export.tar.gz) = 17cbf7233794644242642b67f40fa8f569892af224c2d1660a1d3c760ac11029
>-SIZE (ncftpd-2.8.3-freebsd6.0-i386-export.tar.gz) = 389686
>+MD5 (ncftpd-2.8.5-freebsd5.5-i386-export.tar.gz) = 3e2411bdb51b0be01e87d885939289ee
>+SHA256 (ncftpd-2.8.5-freebsd5.5-i386-export.tar.gz) = 8fbaadfd05db7c9663b50e9d3246bc190142959a50dcc43fd2f39a8f0b604dbc
>+SIZE (ncftpd-2.8.5-freebsd5.5-i386-export.tar.gz) = 397590
>+MD5 (ncftpd-2.8.5-freebsd6.0-i386-export.tar.gz) = 372bde47f753a5e49b19d9bac185abf1
>+SHA256 (ncftpd-2.8.5-freebsd6.0-i386-export.tar.gz) = bd2990fc4ae96a5fb314adaab023e84e6994b2f64c0b0a1660b03bb9826cb178
>+SIZE (ncftpd-2.8.5-freebsd6.0-i386-export.tar.gz) = 395805
>+MD5 (ncftpd-2.8.5-freebsd6.2-x86_64-export.tar.gz) = 10ac67c60f54547dcfa3721364119790
>+SHA256 (ncftpd-2.8.5-freebsd6.2-x86_64-export.tar.gz) = 33e182e5e75f7820c3d0b0feea6d821f618eb39e55e757c3e3e6ee7970011be1
>+SIZE (ncftpd-2.8.5-freebsd6.2-x86_64-export.tar.gz) = 440519
>+MD5 (ncftpd-2.8.5-freebsd7.0-i386-export.tar.gz) = 90c2918f99db64900647b7de8c698818
>+SHA256 (ncftpd-2.8.5-freebsd7.0-i386-export.tar.gz) = 6d894075619d85129ee3a4792c6e96f0a74261de83fe9e2714344388933bf59d
>+SIZE (ncftpd-2.8.5-freebsd7.0-i386-export.tar.gz) = 355738
>+MD5 (ncftpd-2.8.5-freebsd7.0-x86_64-export.tar.gz) = d75cb8c38fd5efb1d0c0e429ff717a9e
>+SHA256 (ncftpd-2.8.5-freebsd7.0-x86_64-export.tar.gz) = c3b333101c1d09d709e0065d831904ecd26cdf61c7911aca42d0d474892d9377
>+SIZE (ncftpd-2.8.5-freebsd7.0-x86_64-export.tar.gz) = 379457
>diff -urN ncftpd.old/files/ncftpd.sh.in ncftpd/files/ncftpd.sh.in
>--- ncftpd.old/files/ncftpd.sh.in	1970-01-01 00:00:00.000000000 +0000
>+++ ncftpd/files/ncftpd.sh.in	2008-09-21 18:56:01.629918077 +0000
>@@ -0,0 +1,28 @@
>+#!/bin/sh
>+
>+# PROVIDE: ncftpd
>+# REQUIRE: DAEMON
>+#
>+# Add the following lines to /etc/rc.conf.local or /etc/rc.conf
>+# to enable ncftpd:
>+#
>+# ncftpd_enable="YES"
>+# ncftpd_flags="-dq"	# Not required
>+# ncftpd_config="/path/to/general.cf /path/to/domain.cf" # Not required
>+#
>+
>+. %%RC_SUBR%%
>+
>+name="ncftpd"
>+rcvar=`set_rcvar`
>+
>+load_rc_config $name
>+: ${ncftpd_enable:="NO"}
>+: ${ncftpd_flags:="-dq"}
>+: ${ncftpd_config:="%%PREFIX%%/etc/ncftpd/general.cf %%PREFIX%%/etc/ncftpd/domain.cf"}
>+
>+command=%%PREFIX%%/sbin/${name}
>+required_files="${ncftpd_config}"
>+command_args="${ncftpd_flags} ${ncftpd_config}"
>+
>+run_rc_command "$1"
>diff -urN ncftpd.old/pkg-plist ncftpd/pkg-plist
>--- ncftpd.old/pkg-plist	2004-08-20 08:53:26.000000000 +0000
>+++ ncftpd/pkg-plist	2008-09-21 18:51:26.012334621 +0000
>@@ -8,7 +8,6 @@
> %%PORTDOCS%%%%DOCSDIR%%/install.html
> %%PORTDOCS%%%%DOCSDIR%%/LICENSE
> %%PORTDOCS%%@dirrm %%DOCSDIR%%
>-etc/rc.d/ncftpd.sh
> etc/ncftpd/general.cf-dist
> etc/ncftpd/domain.cf-dist
> @dirrm etc/ncftpd
>diff -urN ncftpd.old/scripts/ncftpd.sh ncftpd/scripts/ncftpd.sh
>--- ncftpd.old/scripts/ncftpd.sh	2004-08-21 03:27:42.000000000 +0000
>+++ ncftpd/scripts/ncftpd.sh	1970-01-01 00:00:00.000000000 +0000
>@@ -1,33 +0,0 @@
>-#!/bin/sh
>-
>-if ! PREFIX=$(expr $0 : "$/.*$/etc/rc\.d/$(basename $0)\$"); then
>-	case $(dirname $0) in
>-	.)
>-	    PREFIX=$(pwd)
>-	    ;;
>-	*)
>-	    echo "$0: Cannot determine the PREFIX" >&2
>-	    exit 1
>-	    ;;
>-esac
>-fi
>-
>-args="${PREFIX}/etc/ncftpd/general.cf ${PREFIX}/etc/ncftpd/domain.cf"
>-
>-case "$1" in
>-start)
>-        if [ -x ${PREFIX}/sbin/ncftpd ]; then
>-		echo -n ' ncftpd'
>-		${PREFIX}/sbin/ncftpd -d $args
>-	fi
>-        ;;
>-stop)
>-        killall ncftpd && echo -n ' ncftpd'
>-        ;;
>-*)
>-        echo "Usage: `basename $0` {start|stop}" >&2
>-        exit 64
>-        ;;
>-esac
>-
>-exit 0

Actions: View | Diff

Attachments on bug 127527: 90361