From owner-svn-ports-head@FreeBSD.ORG Sun Jun 23 20:21:54 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id D8682C8; Sun, 23 Jun 2013 20:21:54 +0000 (UTC) (envelope-from eadler@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id C9DB61C07; Sun, 23 Jun 2013 20:21:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5NKLsos066965; Sun, 23 Jun 2013 20:21:54 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5NKLsgl066964; Sun, 23 Jun 2013 20:21:54 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201306232021.r5NKLsgl066964@svn.freebsd.org> From: Eitan Adler Date: Sun, 23 Jun 2013 20:21:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r321650 - head/ftp/bsdftpd-ssl 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.14 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: Sun, 23 Jun 2013 20:21:54 -0000 Author: eadler Date: Sun Jun 23 20:21:54 2013 New Revision: 321650 URL: http://svnweb.freebsd.org/changeset/ports/321650 Log: - Convert to OptionsNG - add OBJFORMAT to the make envrionment as it will be removed shortly. Approved by: skynick@mail.sc.ru (maintainer) Modified: head/ftp/bsdftpd-ssl/Makefile Modified: head/ftp/bsdftpd-ssl/Makefile ============================================================================== --- head/ftp/bsdftpd-ssl/Makefile Sun Jun 23 20:14:01 2013 (r321649) +++ head/ftp/bsdftpd-ssl/Makefile Sun Jun 23 20:21:54 2013 (r321650) @@ -1,9 +1,5 @@ -# New ports collection makefile for: bsdftpd-ssl -# Date created: 5 Apr 2003 -# Whom: Nick Leuta -# +# Created by: Nick Leuta # $FreeBSD$ -# PORTNAME= bsdftpd-ssl PORTVERSION= 1.1.0 @@ -23,6 +19,8 @@ COMMENT= FTP command-line client utility USE_OPENSSL= yes +MAKE_ENV+= OBJFORMAT= elf + .include # Client only part @@ -37,7 +35,7 @@ MAN1= ftps.1 MAN5= ftpchroot.5 xferlog.5 MAN8= ftpd.8 MLINKS= ftpd.8 ftpd-ssl.8 ftpchroot.5 ftpchroot-ssl.5 -.ifndef NOPORTEXAMPLES +.if ${PORT_OPTIONS:MEXAMPLES} SUB_FILES= pkg-message .endif USE_RC_SUBR= ${PORTNAME} @@ -82,7 +80,7 @@ do-install: .endif post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${DOCDIR} ${INSTALL_DATA} -p ${WRKSRC}/COPYRIGHT ${DOCDIR}/COPYRIGHT ${INSTALL_DATA} -p ${WRKSRC}/README ${DOCDIR}/README @@ -106,7 +104,7 @@ post-install: ${INSTALL_SCRIPT} -p ${WRKSRC}/cert/xCA.sh ${DOCDIR}/cert/xCA.sh .endif .if !defined(CLIENT_ONLY) -.if !defined(NOPORTEXAMPLES) +.if ${PORT_OPTIONS:MEXAMPLES} ${MKDIR} ${EXAMPLESDIR}/rc.conf.d ${INSTALL_DATA} -p ${FILESDIR}/README.examples ${EXAMPLESDIR}/README ${INSTALL_DATA} -p ${FILESDIR}/ftpchroot ${EXAMPLESDIR}/ftpchroot