svn commit: r394239 - in branches/2015Q3/ftp/vsftpd-ext: . files

[Jason Unovitch]

Author: junovitch
Date: Fri Aug 14 17:06:48 2015
New Revision: 394239
URL: https://svnweb.freebsd.org/changeset/ports/394239

Log:
  MFH: r394236
  
  ftp/vsftpd-ext: unbreak build on 9.x i386 and clean up port
  
  - Force clang on FreeBSD < 10.0 to resolve 9.x i386 build issues
  - Modernize USES with tar:tgz
  - Rely on USERS/GROUPS; remove pkg-install/pkg deinstall scripts
  - Remove direct chmod usage
  - Regen patch to pet portlint
  
  PR:		200791
  Submitted by:	Xu Jing <xjflyttp at gmail.com> (maintainer - original version)
  Approved by:	ports-secteam (feld), delphij (mentor)

Deleted:
  branches/2015Q3/ftp/vsftpd-ext/pkg-deinstall
  branches/2015Q3/ftp/vsftpd-ext/pkg-install
Modified:
  branches/2015Q3/ftp/vsftpd-ext/Makefile
  branches/2015Q3/ftp/vsftpd-ext/files/patch-utility
Directory Properties:
  branches/2015Q3/   (props changed)

Modified: branches/2015Q3/ftp/vsftpd-ext/Makefile
==============================================================================
--- branches/2015Q3/ftp/vsftpd-ext/Makefile	Fri Aug 14 16:59:24 2015	(r394238)
+++ branches/2015Q3/ftp/vsftpd-ext/Makefile	Fri Aug 14 17:06:48 2015	(r394239)
@@ -8,19 +8,16 @@ CATEGORIES=	ftp ipv6
 MASTER_SITES=	http://vsftpd.devnet.ru/files/${UPSTREAMVERSION}/ext.${EXTVERSION}/
 PKGNAMESUFFIX?=	${SSL_SUFFIX}${PKGNAMESUFFIX2}
 DISTNAME=	vsFTPd-${UPSTREAMVERSION}-ext${EXTVERSION}
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	xjflyttp at gmail.com
 COMMENT=	FTP daemon that aims to be "very secure". Extended build
 
-BROKEN_FreeBSD_9_i386=	does not link
-
 LICENSE=	GPLv2
 
 UPSTREAMVERSION=3.0.2
 EXTVERSION=	1
 
-USES=		alias gmake
+USES=		alias gmake tar:tgz
 WRKSRC=		${WRKDIR}/vsFTPd-${UPSTREAMVERSION}-ext.${EXTVERSION}
 ALL_TARGET=	vsftpd
 
@@ -41,11 +38,12 @@ CONFLICTS=	vsftpd-3* vsftpd${SSL_SUFFIX}
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ${OSVERSION} < 902001
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000
+.if exists(/usr/bin/clang)
+CC=		clang
+.else
 BUILD_DEPENDS+=	clang33:${PORTSDIR}/lang/clang33
 CC=		clang33
-.if ${ARCH} == i386
-BROKEN=		does not build on 9.x i386
 .endif
 .endif
 
@@ -115,7 +113,6 @@ do-install:
 .for i in EXAMPLE SECURITY
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/${i}
 	${CP} -p -R -L ${WRKSRC}/${i}/./ ${STAGEDIR}${DOCSDIR}/${i}/
-	${CHMOD} -R -L a+rX,go-w ${STAGEDIR}${DOCSDIR}/${i}/
 .endfor
 .endif
 

Modified: branches/2015Q3/ftp/vsftpd-ext/files/patch-utility
==============================================================================
--- branches/2015Q3/ftp/vsftpd-ext/files/patch-utility	Fri Aug 14 16:59:24 2015	(r394238)
+++ branches/2015Q3/ftp/vsftpd-ext/files/patch-utility	Fri Aug 14 17:06:48 2015	(r394239)
@@ -1,6 +1,6 @@
---- utility.c.orig      Fri Jul  2 18:26:30 2004
-+++ utility.c   Mon Oct 10 01:19:02 2005
-@@ -33,6 +33,10 @@
+--- utility.c.orig	2012-10-26 20:05:38 UTC
++++ utility.c
+@@ -40,6 +40,10 @@ die2(const char* p_text1, const char* p_
  void
  bug(const char* p_text)
  {