diff options
| author | Michael Scheidell <scheidell@FreeBSD.org> | 2011-12-23 19:18:55 +0000 |
|---|---|---|
| committer | Michael Scheidell <scheidell@FreeBSD.org> | 2011-12-23 19:18:55 +0000 |
| commit | a5e3cf835e049278af88832af10ae305b5aefe4f (patch) | |
| tree | 6395f078d425eaf5710617a6f92e35fa1ce8309e /ftp/vsftpd-ext | |
| parent | 32bd9da6f798749bcee047420992c911c88c2ad6 (diff) | |
| download | ports-a5e3cf835e049278af88832af10ae305b5aefe4f.tar.gz ports-a5e3cf835e049278af88832af10ae305b5aefe4f.zip | |
- respect CC/CFLAGS/STRIP on vsftpd-ext
PR: ports/163550
Submitted by: Jan Beich <jbeich@tormail.net>
Approved by: gelraen.ua@gmail.com (maintainer), gabor(mentor)
Notes
Notes:
svn path=/head/; revision=287944
Diffstat (limited to 'ftp/vsftpd-ext')
| -rw-r--r-- | ftp/vsftpd-ext/Makefile | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/ftp/vsftpd-ext/Makefile b/ftp/vsftpd-ext/Makefile index d17eb685e43b..df9f552b0144 100644 --- a/ftp/vsftpd-ext/Makefile +++ b/ftp/vsftpd-ext/Makefile @@ -9,6 +9,7 @@ PORTNAME= vsftpd-ext UPSTREAMVERSION= 2.3.4 EXTVERSION= 2 PORTVERSION= ${UPSTREAMVERSION}.${EXTVERSION} +PORTREVISION= 1 CATEGORIES= ftp ipv6 MASTER_SITES= http://vsftpd.devnet.ru/files/${UPSTREAMVERSION}/ext.${EXTVERSION}/ PKGNAMESUFFIX?= ${SSL_SUFFIX}${PKGNAMESUFFIX2} @@ -28,8 +29,6 @@ DOCFILES= AUDIT BENCHMARKS BUGS Changelog FAQ INSTALL LICENSE \ README README.security README.ssl REFS REWARD \ SIZE SPEED TODO TUNING -LDFLAGS+= -lwrap - OPTIONS= RC_SCRIPT "install RC_SCRIPT" on \ VSFTPD_SSL "Include support for SSL" off @@ -53,10 +52,12 @@ do-configure: ${REINPLACE_CMD} -e "s|/etc/vsftpd.conf|${PREFIX}/etc/vsftpd.conf|" \ ${WRKSRC}/defs.h ${WRKSRC}/vsftpd.conf ${REINPLACE_CMD} \ - -e "s|^CC = gcc|CC = ${CC}|" \ - -e "s|^CFLAGS =|CFLAGS = ${CFLAGS}|" \ - -e "s| -Wl,-s| -Wl,-s ${LDFLAGS}|" \ + -e '/^CC/s/=/?=/' \ + -e '/^CFLAGS/{s/=/+=/;s/-O[0-9]//;}' \ + -e '/^LIBS/s|=.*|= `./vsf_findlibs.sh`|' \ + -e '/^LINK/s/=.*/=/' \ ${WRKSRC}/Makefile + ${REINPLACE_CMD} -e '/-lutil/d' ${WRKSRC}/vsf_findlibs.sh ${REINPLACE_CMD} -e \ "s|#undef VSF_BUILD_TCPWRAPPERS|#define VSF_BUILD_TCPWRAPPERS 1|" \ ${WRKSRC}/builddefs.h |