Skip site navigation (1)Skip section navigation (2)
Date:      25 Mar 2003 13:49:48 -0000
From:      Sergei Kolobov <sergei@kolobov.com>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        gslin@ccca.nctu.edu.tw
Subject:   ports/50275: [PATCH] Update ftp/twoftpd to 1.17
Message-ID:  <20030325134948.59024.qmail@outpost.globcon.net>

next in thread | raw e-mail | index | archive | help

>Number:         50275
>Category:       ports
>Synopsis:       [PATCH] Update ftp/twoftpd to 1.17
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Mar 25 05:50:11 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Sergei Kolobov
>Release:        FreeBSD 4.7-STABLE i386
>Organization:
>Environment:
System: FreeBSD outpost.globcon.net 4.7-STABLE FreeBSD 4.7-STABLE #0: Thu Jan  2 03:13:48 MSK
>Description:
- Update to 1.17
- Now depends on devel/bglibs
- Use twoftpd's own installer
- Install some documentation

NOTE: this port requires devel/bglibs >= 1.006.
It has not been committed yet - please refer to the following PRs:
- ports/48900: initial submission of devel/bglibs 1.005
- ports/49962: update devel/bglibs to 1.006

Port maintainer - gslin@ccca.nctu.edu.tw - has been copied.
>How-To-Repeat:
>Fix:

--- twoftpd-1.17.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/ftp/twoftpd/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- Makefile	2003/02/21 12:00:39	1.5
+++ Makefile	2003/03/25 13:45:22
@@ -6,23 +6,32 @@
 #
 
 PORTNAME=	twoftpd
-PORTVERSION=	1.15
+PORTVERSION=	1.17
 CATEGORIES=	ftp
 MASTER_SITES=	http://untroubled.org/twoftpd/
 
 MAINTAINER=	gslin@ccca.nctu.edu.tw
 COMMENT=	A simple, secure, efficient FTP server
 
+BUILD_DEPENDS=	${BGLIBS_ROOT}/include/iobuf/iobuf.h:${PORTSDIR}/devel/bglibs
+
+BGLIBS_ROOT?=	${LOCALBASE}
+
 MAN1=		twoftpd-auth.1 twoftpd-xfer.1
+DOCS=		NEWS README TODO
 
-BIN=		twoftpd-anon twoftpd-anon-conf twoftpd-auth twoftpd-conf twoftpd-xfer
+pre-build:
+	${ECHO_CMD} "${BGLIBS_ROOT}/include"	> ${WRKSRC}/conf-bgincs
+	${ECHO_CMD} "${BGLIBS_ROOT}/lib"	> ${WRKSRC}/conf-bglibs
+	${ECHO_CMD} "${PREFIX}/bin"		> ${WRKSRC}/conf-bin
+	${ECHO_CMD} "${MANPREFIX}/man"		> ${WRKSRC}/conf-man
+	${ECHO_CMD} "${CC} ${CFLAGS}"		> ${WRKSRC}/conf-cc
 
 do-install:
-.for FILE in ${MAN1}
-	${INSTALL_MAN} ${WRKSRC}/${FILE} ${PREFIX}/man/man1
-.endfor
-.for FILE in ${BIN}
-	${INSTALL_PROGRAM} ${WRKSRC}/${FILE} ${PREFIX}/sbin
-.endfor
+	cd ${WRKSRC} && ./installer
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
+.endif
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/ftp/twoftpd/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo	2002/05/21 03:33:11	1.3
+++ distinfo	2003/03/25 13:45:22
@@ -1 +1 @@
-MD5 (twoftpd-1.15.tar.gz) = 1a247c51f3b99ca1414ad39d02d3728f
+MD5 (twoftpd-1.17.tar.gz) = 818e12c71cee805d49fc732757358806
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/ftp/twoftpd/pkg-plist,v
retrieving revision 1.1
diff -u -r1.1 pkg-plist
--- pkg-plist	2001/09/16 16:18:47	1.1
+++ pkg-plist	2003/03/25 13:45:22
@@ -1,5 +1,10 @@
-sbin/twoftpd-anon 
-sbin/twoftpd-anon-conf
-sbin/twoftpd-auth
-sbin/twoftpd-conf
-sbin/twoftpd-xfer
+bin/twoftpd-anon
+bin/twoftpd-anon-conf
+bin/twoftpd-auth
+bin/twoftpd-bind-port
+bin/twoftpd-conf
+bin/twoftpd-xfer
+%%PORTDOCS%%share/doc/twoftpd/NEWS
+%%PORTDOCS%%share/doc/twoftpd/README
+%%PORTDOCS%%share/doc/twoftpd/TODO
+%%PORTDOCS%%@dirrm share/doc/twoftpd
--- twoftpd-1.17.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports-bugs" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030325134948.59024.qmail>