From owner-svn-ports-head@FreeBSD.ORG Sun May 3 15:12:09 2015 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6C050CD5; Sun, 3 May 2015 15:12:09 +0000 (UTC) Received: from svn.freebsd.org (svn.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 415AC175A; Sun, 3 May 2015 15:12:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t43FC9NB036288; Sun, 3 May 2015 15:12:09 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t43FC96x036287; Sun, 3 May 2015 15:12:09 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201505031512.t43FC96x036287@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Sun, 3 May 2015 15:12:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r385280 - head/news/ifmail 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: Sun, 03 May 2015 15:12:09 -0000 Author: bapt Date: Sun May 3 15:12:08 2015 New Revision: 385280 URL: https://svnweb.freebsd.org/changeset/ports/385280 Log: Overwrite variables via MAKE_ARGS instead of patching a file Set OWNER/GROUP to the current building user so that we can stage as a user plist make sure the owner of the final files when installed are the right one Do not create a user from port plist makes it already Do not modify /etc/services from ports plist does is already Remove now uneeded NEED_ROOT Modified: head/news/ifmail/Makefile Modified: head/news/ifmail/Makefile ============================================================================== --- head/news/ifmail/Makefile Sun May 3 15:12:06 2015 (r385279) +++ head/news/ifmail/Makefile Sun May 3 15:12:08 2015 (r385280) @@ -10,28 +10,21 @@ MASTER_SITE_SUBDIR= system/fido MAINTAINER= dinoex@FreeBSD.org COMMENT= FidoNet(tm) support package for UN*X platform -NEED_ROOT= yes - MAN3= parsedate.3 MAN8= ifmail.8 iftoss.8 IFMAIL_RUNAS?= ifmail PLIST_SUB+= IFMAIL_RUNAS="${IFMAIL_RUNAS}" # USERS does not work here #USERS= ifmail +CFLAGS+= -DHAS_STDARG_H -Wall +GID!= id -g +MAKE_ARGS= OWNER=${UID} CC="${CC}" GROUP=${GID} CFLAGS="${CFLAGS}" OPTIONS_DEFINE= DOCS EXAMPLES .include -pre-configure: - ${REINPLACE_CMD} -e 's|OWNER = ifmail|OWNER = ${IFMAIL_RUNAS}|' \ - -e 's|CC = gcc|CC = ${CC}|' \ - -e 's|-O2 -Wall|${CFLAGS} -DHAS_STDARG_H -Wall|' \ - ${WRKSRC}/CONFIG - pre-install: - if ! pw usershow ${IFMAIL_RUNAS}; then pw useradd ${IFMAIL_RUNAS} -g uucp -u 75 \ - -h - -d /nonexistent -s /nonexistent -c "Ifmail Server"; fi ${MKDIR} ${STAGEDIR}${PREFIX}/libexec/ifmail post-install: @@ -41,11 +34,6 @@ post-install: .for i in ${MAN3} ${INSTALL_MAN} ${WRKSRC}/iflib/${i} ${STAGEDIR}${PREFIX}/man/man3/ .endfor - @${ECHO_CMD} "updating ${ROOTDIR}/etc/services" - @${CP} ${ROOTDIR}/etc/services ${ROOTDIR}/etc/services.bak - @(grep -v ^ifcico ${ROOTDIR}/etc/services.bak; \ - ${ECHO_CMD} "ifcico 60179/tcp #ifcico server (ifmail)") \ - > ${ROOTDIR}/etc/services .if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/