Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 20 Jun 2013 16:43:43 +0000 (UTC)
From:      Boris Samorodov <bsam@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r321402 - head/comms/efax
Message-ID:  <201306201643.r5KGhhRw093046@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bsam
Date: Thu Jun 20 16:43:43 2013
New Revision: 321402
URL: http://svnweb.freebsd.org/changeset/ports/321402

Log:
  . introduce port options (DOCS);
  . use standard DOCSDIR instead of DOCDIR;
  . make use PORTDOCS at Makefile (trim pkg-plist);
  . mute mkdir command;
  . use one line install command;
  . add padding for PKGMESSAGE;
  . use @dirrmtry instead @exexec /bin/rmdir at pkg-plist.

Modified:
  head/comms/efax/Makefile
  head/comms/efax/pkg-plist

Modified: head/comms/efax/Makefile
==============================================================================
--- head/comms/efax/Makefile	Thu Jun 20 16:36:11 2013	(r321401)
+++ head/comms/efax/Makefile	Thu Jun 20 16:43:43 2013	(r321402)
@@ -16,25 +16,32 @@ USE_GMAKE=	YES
 MAN1=		fax.1 \
 		efax.1 \
 		efix.1
-DOCDIR=		${PREFIX}/share/doc/efax
+DOCSDIR=	${PREFIX}/share/doc/efax
+PORTDOCS=	COPYING README printcap.sample efax.html fax.html
 MAKE_ENV=	INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
 		INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
 		INSTALL_DATA="${INSTALL_DATA}"
 
 CONFLICTS=	efax-gtk-*
 
+OPTIONS_DEFINE=	DOCS
+
 post-build:
 	${MV} ${WRKSRC}/fax ${WRKSRC}/fax.orig
 	${CAT} ${WRKSRC}/fax.orig | ${SED} -e s!%%PREFIX%%!${PREFIX}!g > \
 		${WRKSRC}/fax
 
+.include <bsd.port.options.mk>
+
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/efax.rc.sample ${PREFIX}/etc
 	${INSTALL_DATA} ${WRKSRC}/efax.rc.sample.ja ${PREFIX}/etc
-	${MKDIR}	${DOCDIR}
-.for i in COPYING README printcap.sample efax.html fax.html
-	${INSTALL_DATA}	${WRKSRC}/${i}	${DOCDIR}
-.endfor
-	${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}
+.endif
+	@${ECHO_CMD}
+	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+	@${ECHO_CMD}
 
 .include <bsd.port.mk>

Modified: head/comms/efax/pkg-plist
==============================================================================
--- head/comms/efax/pkg-plist	Thu Jun 20 16:36:11 2013	(r321401)
+++ head/comms/efax/pkg-plist	Thu Jun 20 16:43:43 2013	(r321402)
@@ -3,13 +3,7 @@ bin/efax
 bin/efix
 etc/efax.rc.sample
 etc/efax.rc.sample.ja
-share/doc/efax/COPYING
-share/doc/efax/README
-share/doc/efax/efax.html
-share/doc/efax/fax.html
-share/doc/efax/printcap.sample
-@dirrm share/doc/efax
 @unexec /bin/rm /var/spool/fax/outgoing/lock
-@unexec /bin/rmdir /var/spool/fax/incoming
-@unexec /bin/rmdir /var/spool/fax/outgoing
-@unexec /bin/rmdir /var/spool/fax
+@dirrmtry /var/spool/fax/incoming
+@dirrmtry /var/spool/fax/outgoing
+@dirrmtry /var/spool/fax



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306201643.r5KGhhRw093046>