Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 27 Jul 2013 11:49:21 +0000 (UTC)
From:      Alexey Dokuchaev <danfe@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r323781 - head/mail/mairix
Message-ID:  <201307271149.r6RBnLxa058647@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: danfe
Date: Sat Jul 27 11:49:20 2013
New Revision: 323781
URL: http://svnweb.freebsd.org/changeset/ports/323781

Log:
  - Convert USE_GMAKE (add gmake to USES)
  - Define LICENSE (GPLv2)
  - Make the port parallel build (-jX) safe
  - Install manpages relative to MANPREFIX
  - Add DOCS and EXAMPLES options; use new smart syntax
  - Rename BZIP option to our standard BZIP2
  
  Reported by:	pointyhat-west

Modified:
  head/mail/mairix/Makefile

Modified: head/mail/mairix/Makefile
==============================================================================
--- head/mail/mairix/Makefile	Sat Jul 27 11:19:10 2013	(r323780)
+++ head/mail/mairix/Makefile	Sat Jul 27 11:49:20 2013	(r323781)
@@ -9,40 +9,42 @@ MASTER_SITES=	SF
 MAINTAINER=	jjuanino@gmail.com
 COMMENT=	Indexing and searching in Maildir, MH, or mbox folders
 
-USE_GMAKE=	yes
+LICENSE=	GPLv2
+
+USES=		bison gmake
 HAS_CONFIGURE=	yes
-USES=		bison
 
-MAN1=	mairix.1
-MAN5=	mairixrc.5
-PLIST_FILES=	bin/mairix %%EXAMPLESDIR%%/dotmairixrc.eg
-PLIST_DIRS=	%%EXAMPLESDIR%%
-
-OPTIONS_DEFINE=	GZIP BZIP
-GZIP_DESC=	Enable gzip mbox support
-BZIP_DESC=	Enable bzip2 mbox support
+MAN1=		mairix.1
+MAN5=		mairixrc.5
+PORTDOCS=	NEWS README
+PORTEXAMPLES=	dotmairixrc.eg
+PLIST_FILES=	bin/mairix
+
+OPTIONS_DEFINE=	GZIP BZIP2 EXAMPLES DOCS
+GZIP_DESC=	gzip compressed mbox support
+BZIP2_DESC=	bzip2 compressed mbox support
 
-OPTIONS_DEFAULT=
+GZIP_CONFIGURE_ENABLE=	gzip-mbox
+BZIP2_CONFIGURE_ENABLE=	bzip-mbox
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MGZIP}
-CONFIGURE_ARGS+=	--enable-gzip-mbox
-.else
-CONFIGURE_ARGS+=	--disable-gzip-mbox
-.endif
-
-.if ${PORT_OPTIONS:MBZIP}
-CONFIGURE_ARGS+=	--enable-bzip-mbox
-.else
-CONFIGURE_ARGS+=	--disable-bzip-mbox
-.endif
+# Do not hardcode make(1) binary name and fix atomicity to allow -jX builds
+post-patch:
+	@${REINPLACE_CMD} -E 's|cd (.+) ; make|$$(MAKE) -C \1|' \
+		${WRKSRC}/Makefile.in
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/mairix ${PREFIX}/bin
-	${MKDIR} ${EXAMPLESDIR}
+	${INSTALL_MAN} ${WRKSRC}/mairix.1 ${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/mairixrc.5 ${MANPREFIX}/man/man5
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/NEWS ${WRKSRC}/README ${DOCSDIR}
+.endif
+.if ${PORT_OPTIONS:MEXAMPLES}
+	@${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/dotmairixrc.eg ${EXAMPLESDIR}
-	${INSTALL_MAN} ${WRKSRC}/mairix.1 ${PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/mairixrc.5 ${PREFIX}/man/man5
+.endif
 
 .include <bsd.port.mk>



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