From owner-svn-ports-head@freebsd.org Fri Aug 14 16:57:56 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DDF7C9BAECE; Fri, 14 Aug 2015 16:57:56 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B457E1C2B; Fri, 14 Aug 2015 16:57:56 +0000 (UTC) (envelope-from junovitch@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7EGvuep045061; Fri, 14 Aug 2015 16:57:56 GMT (envelope-from junovitch@FreeBSD.org) Received: (from junovitch@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7EGvun9045058; Fri, 14 Aug 2015 16:57:56 GMT (envelope-from junovitch@FreeBSD.org) Message-Id: <201508141657.t7EGvun9045058@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: junovitch set sender to junovitch@FreeBSD.org using -f From: Jason Unovitch Date: Fri, 14 Aug 2015 16:57:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r394236 - in head/ftp/vsftpd-ext: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Aug 2015 16:57:57 -0000 Author: junovitch Date: Fri Aug 14 16:57:55 2015 New Revision: 394236 URL: https://svnweb.freebsd.org/changeset/ports/394236 Log: 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 (maintainer - original version) Approved by: delphij (mentor) MFH: 2015Q3 Deleted: head/ftp/vsftpd-ext/pkg-deinstall head/ftp/vsftpd-ext/pkg-install Modified: head/ftp/vsftpd-ext/Makefile head/ftp/vsftpd-ext/files/patch-utility Modified: head/ftp/vsftpd-ext/Makefile ============================================================================== --- head/ftp/vsftpd-ext/Makefile Fri Aug 14 16:48:54 2015 (r394235) +++ head/ftp/vsftpd-ext/Makefile Fri Aug 14 16:57:55 2015 (r394236) @@ -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@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 -.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: head/ftp/vsftpd-ext/files/patch-utility ============================================================================== --- head/ftp/vsftpd-ext/files/patch-utility Fri Aug 14 16:48:54 2015 (r394235) +++ head/ftp/vsftpd-ext/files/patch-utility Fri Aug 14 16:57:55 2015 (r394236) @@ -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) {