svn commit: r316867 - head/ftp/twoftpd

[Martin Wilke]

Author: miwi
Date: Tue Apr 30 02:22:56 2013
New Revision: 316867
URL: http://svnweb.freebsd.org/changeset/ports/316867

Log:
  - Update to 1.42
  
  PR:		177924
  Submitted by:	Ports Fury

Deleted:
  head/ftp/twoftpd/pkg-plist
Modified:
  head/ftp/twoftpd/Makefile   (contents, props changed)
  head/ftp/twoftpd/distinfo   (contents, props changed)

Modified: head/ftp/twoftpd/Makefile
==============================================================================
--- head/ftp/twoftpd/Makefile	Tue Apr 30 02:21:54 2013	(r316866)
+++ head/ftp/twoftpd/Makefile	Tue Apr 30 02:22:56 2013	(r316867)
@@ -1,13 +1,8 @@
-# New ports collection makefile for:	twoftpd
-# Date created:				14 September 2001
-# Whom:					Gea-Suan Lin (gslin at ccca.nctu.edu.tw)
-#
+# Created by: Gea-Suan Lin (gslin at ccca.nctu.edu.tw)
 # $FreeBSD$
-#
 
 PORTNAME=	twoftpd
-PORTVERSION=	1.41
-PORTREVISION=	1
+PORTVERSION=	1.42
 CATEGORIES=	ftp
 MASTER_SITES=	http://untroubled.org/${PORTNAME}/
 
@@ -15,32 +10,46 @@ MAINTAINER=	ports at FreeBSD.org
 COMMENT=	A simple, secure, efficient FTP server
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/bg-installer:${PORTSDIR}/devel/bglibs
-LIB_DEPENDS=	cvm-v2client.2:${PORTSDIR}/security/cvm
+LIB_DEPENDS=	cvm-v2client:${PORTSDIR}/security/cvm
 
-CFLAGS+=	-I${LOCALBASE}/include
-#-I${LOCALBASE}/include/bglibs
+#LICENSE=	GPLv2
+
+OPTIONS_DEFINE=	DOCS
+
+MAKE_JOBS_SAFE=	yes
+
+CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
+
 BGLIBS_LIB=	${LOCALBASE}/lib/bglibs
 BGLIBS_INCLUDE=	${LOCALBASE}/include/bglibs
 
-DOCS=		NEWS README TODO
 MAN1=		twoftpd-auth.1 twoftpd-switch.1 twoftpd-xfer.1
+PORTDOCS=	NEWS README TODO
+PLIST_FILES=	bin/twoftpd-anon bin/twoftpd-anon-conf \
+		bin/twoftpd-auth bin/twoftpd-bind-port \
+		bin/twoftpd-conf bin/twoftpd-drop \
+		bin/twoftpd-switch bin/twoftpd-xfer
+
+.include <bsd.port.options.mk>
 
-do-patch:
-	${REINPLACE_CMD} -e 's,timezone,tm.tm_gmtoff,' ${WRKSRC}/statmod.c
+post-patch:
+	@${REINPLACE_CMD} -e 's,timezone,tm.tm_gmtoff,' ${WRKSRC}/statmod.c
 
 do-configure:
-	${ECHO_CMD} "${PREFIX}/bin"	> ${WRKSRC}/conf-bin
-	${ECHO_CMD} "${MANPREFIX}/man"	> ${WRKSRC}/conf-man
-	${ECHO_CMD} "${CC} ${CFLAGS}"	> ${WRKSRC}/conf-cc
-	${ECHO_CMD} "${CC} ${STRIP} ${LDFLAGS}"       > ${WRKSRC}/conf-ld
-	${ECHO_CMD} "${BGLIBS_INCLUDE}"	> ${WRKSRC}/conf-bgincs
-	${ECHO_CMD} "${BGLIBS_LIB}"	> ${WRKSRC}/conf-bglibs
+	@${ECHO_CMD} "${PREFIX}/bin" > ${WRKSRC}/conf-bin
+	@${ECHO_CMD} "${MANPREFIX}/man" > ${WRKSRC}/conf-man
+	@${ECHO_CMD} "${CC} ${CFLAGS} ${CPPFLAGS}" > ${WRKSRC}/conf-cc
+	@${ECHO_CMD} "${CC} ${STRIP} ${LDFLAGS}" > ${WRKSRC}/conf-ld
+	@${ECHO_CMD} "${BGLIBS_INCLUDE}" > ${WRKSRC}/conf-bgincs
+	@${ECHO_CMD} "${BGLIBS_LIB}" > ${WRKSRC}/conf-bglibs
 
-.if !defined(NOPORTDOCS)
 post-install:
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
+.for i in NEWS README TODO
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${DOCSDIR})
+.endfor
 .endif
 
 .include <bsd.port.mk>

Modified: head/ftp/twoftpd/distinfo
==============================================================================
--- head/ftp/twoftpd/distinfo	Tue Apr 30 02:21:54 2013	(r316866)
+++ head/ftp/twoftpd/distinfo	Tue Apr 30 02:22:56 2013	(r316867)
@@ -1,2 +1,2 @@
-SHA256 (twoftpd-1.41.tar.gz) = 1b269fdcef6a351ca339aa3516cda593c29c9bb2522eee1233f3815f0f59d683
-SIZE (twoftpd-1.41.tar.gz) = 84923
+SHA256 (twoftpd-1.42.tar.gz) = 5eafc789668e40122b8bb0c1f1bea407bba2e835227035f8475891e60169da66
+SIZE (twoftpd-1.42.tar.gz) = 87596