Date: Fri, 14 Aug 2015 16:57:56 +0000 (UTC) From: Jason Unovitch <junovitch@FreeBSD.org> 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 Message-ID: <201508141657.t7EGvun9045058@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <xjflyttp@gmail.com> (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 <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: 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) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508141657.t7EGvun9045058>