From owner-svn-ports-head@FreeBSD.ORG Mon May 18 18:49:21 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 A5887E67; Mon, 18 May 2015 18:49:21 +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 9369012D5; Mon, 18 May 2015 18:49:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4IInLSR062058; Mon, 18 May 2015 18:49:21 GMT (envelope-from dinoex@FreeBSD.org) Received: (from dinoex@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4IInL7Y062056; Mon, 18 May 2015 18:49:21 GMT (envelope-from dinoex@FreeBSD.org) Message-Id: <201505181849.t4IInL7Y062056@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dinoex set sender to dinoex@FreeBSD.org using -f From: Dirk Meyer Date: Mon, 18 May 2015 18:49:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r386700 - 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: Mon, 18 May 2015 18:49:21 -0000 Author: dinoex Date: Mon May 18 18:49:20 2015 New Revision: 386700 URL: https://svnweb.freebsd.org/changeset/ports/386700 Log: - remove option broken by r385280 - remove @dirrm - use USERS - rename MAN macros Modified: head/news/ifmail/Makefile head/news/ifmail/pkg-plist Modified: head/news/ifmail/Makefile ============================================================================== --- head/news/ifmail/Makefile Mon May 18 18:44:27 2015 (r386699) +++ head/news/ifmail/Makefile Mon May 18 18:49:20 2015 (r386700) @@ -9,16 +9,14 @@ MASTER_SITES= SUNSITE/system/fido MAINTAINER= dinoex@FreeBSD.org COMMENT= FidoNet(tm) support package for UN*X platform -MAN3= parsedate.3 -MAN8= ifmail.8 iftoss.8 -IFMAIL_RUNAS?= ifmail -PLIST_SUB+= IFMAIL_RUNAS="${IFMAIL_RUNAS}" -# USERS does not work here -#USERS= ifmail +USERS= ifmail CFLAGS+= -DHAS_STDARG_H -Wall GID!= id -g MAKE_ARGS= OWNER=${UID} CC="${CC}" GROUP=${GID} CFLAGS="${CFLAGS}" +LMAN3= parsedate.3 +LMAN8= ifmail.8 iftoss.8 + OPTIONS_DEFINE= DOCS EXAMPLES .include @@ -27,10 +25,11 @@ pre-install: ${MKDIR} ${STAGEDIR}${PREFIX}/libexec/ifmail post-install: -.for i in ${MAN8} + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/ifmail/* +.for i in ${LMAN8} ${INSTALL_MAN} ${WRKSRC}/ifgate/${i} ${STAGEDIR}${PREFIX}/man/man8/ .endfor -.for i in ${MAN3} +.for i in ${LMAN3} ${INSTALL_MAN} ${WRKSRC}/iflib/${i} ${STAGEDIR}${PREFIX}/man/man3/ .endfor .if ${PORT_OPTIONS:MDOCS} Modified: head/news/ifmail/pkg-plist ============================================================================== --- head/news/ifmail/pkg-plist Mon May 18 18:44:27 2015 (r386699) +++ head/news/ifmail/pkg-plist Mon May 18 18:49:20 2015 (r386700) @@ -1,8 +1,6 @@ man/man3/parsedate.3.gz man/man8/ifmail.8.gz man/man8/iftoss.8.gz -@exec if ! pw usershow %%IFMAIL_RUNAS%% 2>/dev/null; then pw useradd %%IFMAIL_RUNAS%% -g uucp -u 75 -h - -d /nonexistent -s /nonexistent -c "Ifmail Server"; fi -@unexec if pw usershow %%IFMAIL_RUNAS%% | grep -q 75:66; then pw userdel %%IFMAIL_RUNAS%%; fi @owner ifmail @group uucp libexec/ifmail/ifcico @@ -17,12 +15,10 @@ libexec/ifmail/ifunpack libexec/ifmail/nlpatch @owner @group -@dirrm libexec/ifmail %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/README.ifcico %%PORTDOCS%%%%DOCSDIR%%/README.ifgate %%PORTDOCS%%%%DOCSDIR%%/README.iflib -%%PORTDOCS%%@dirrm %%DOCSDIR%% %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Areas %%PORTEXAMPLES%%%%EXAMPLESDIR%%/DEBUG %%PORTEXAMPLES%%%%EXAMPLESDIR%%/FAQ @@ -158,27 +154,5 @@ libexec/ifmail/nlpatch %%PORTEXAMPLES%%%%EXAMPLESDIR%%/zmailer/routes %%PORTEXAMPLES%%%%EXAMPLESDIR%%/zmailer/scheduler.conf %%PORTEXAMPLES%%%%EXAMPLESDIR%%/zmailer/sm.conf -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/cnews -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/contrib/abbs2nf -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/contrib/areafix-0.5.07 -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/contrib/areafix-0.5.07-jv10 -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/contrib/areafix-0.6.02 -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/contrib/mmdf -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/contrib/tic/config -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/contrib/tic -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/contrib/u-tic -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/contrib/news_via_mail -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/contrib/fdpass -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/contrib/iftelnetd -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/contrib -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/exim -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/inn -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/inouttabs -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/sendmail/ifmail.m4-srtxg -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/sendmail -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/smail -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/tcp -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/zmailer -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% @exec echo "updating /etc/services"; cp /etc/services /etc/services.bak; (grep -v ^ifcico /etc/services.bak ; echo "ifcico 60179/tcp #ifcico server (ifmail)") > /etc/services @unexec echo "updating /etc/services"; cp /etc/services /etc/services.bak; (grep -v ^ifcico /etc/services.bak ) > /etc/services